diff --git a/.clang-tidy b/.clang-tidy
index e1032aaa5f3..aa361594f56 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -18,18 +18,20 @@ Checks: >
         -objc-*,
         -openmp-*,
         -zircon-*,
-        cert-err34-c,
+        cppcoreguidelines-avoid-const-or-ref-data-members,
         cppcoreguidelines-pro-type-static-cast-downcast,
         cppcoreguidelines-rvalue-reference-param-not-moved,
         google-explicit-constructor,
         -bugprone-assignment-in-if-condition,
         -bugprone-branch-clone,
+        -bugprone-command-processor,
         -bugprone-easily-swappable-parameters,
         -bugprone-empty-catch,
         -bugprone-macro-parentheses,
         -bugprone-narrowing-conversions,
         -bugprone-signed-char-misuse,
         -bugprone-switch-missing-default-case,
+        -bugprone-throwing-static-initialization,
         -bugprone-unchecked-optional-access,
         -clang-analyzer-*,
         -concurrency-mt-unsafe,
@@ -41,7 +43,9 @@ Checks: >
         -modernize-avoid-c-arrays,
         -modernize-deprecated-ios-base-aliases,
         -misc-include-cleaner,
+        -misc-multiple-inheritance,
         -misc-unused-using-decls,
+        -modernize-avoid-c-style-cast,
         -modernize-loop-convert,
         -modernize-macro-to-enum,
         -modernize-raw-string-literal,
@@ -67,11 +71,14 @@ Checks: >
         -readability-identifier-length,
         -readability-identifier-naming,
         -readability-implicit-bool-conversion,
+        -readability-inconsistent-ifelse-braces,
         -readability-isolate-declaration,
         -readability-magic-numbers,
+        -readability-redundant-parentheses,
         -readability-suspicious-call-argument,
         -readability-uppercase-literal-suffix,
-        -readability-use-concise-preprocessor-directives
+        -readability-use-concise-preprocessor-directives,
+        -misc-unconventional-assign-operator
 WarningsAsErrors: '*'
 HeaderFilterRegex: '(cli|gui|frontend|lib|oss-fuzz|test|triage)\/[a-z_]+\.h'
 ExcludeHeaderFilterRegex: 'ui_.*.h'
@@ -82,3 +89,7 @@ CheckOptions:
     value:           '0'
   - key:             modernize-use-trailing-return-type.TransformFunctions
     value:           false
+  - key:             misc-override-with-different-visibility.DisallowedVisibilityChange
+    value:           widening
+  - key:             misc-use-internal-linkage.AnalyzeTypes
+    value:           false
diff --git a/.github/workflows/CI-cygwin.yml b/.github/workflows/CI-cygwin.yml
index 445c0953eb5..6b0ad2cc5bd 100644
--- a/.github/workflows/CI-cygwin.yml
+++ b/.github/workflows/CI-cygwin.yml
@@ -37,13 +37,14 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: Set up Cygwin
-        uses: cygwin/cygwin-install-action@master
+        uses: cygwin/cygwin-install-action@v6
         with:
+          site: https://mirrors.cicku.me/cygwin/
           platform: ${{ matrix.platform }}
           packages: ${{ matrix.packages }}
 
diff --git a/.github/workflows/CI-mingw.yml b/.github/workflows/CI-mingw.yml
index 1b0cf3e5672..eb88a4a57fc 100644
--- a/.github/workflows/CI-mingw.yml
+++ b/.github/workflows/CI-mingw.yml
@@ -33,7 +33,7 @@ jobs:
     timeout-minutes: 19 # max + 3*std of the last 7K runs
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -49,7 +49,7 @@ jobs:
             mingw-w64-x86_64-gcc
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.24
         with:
           key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
 
diff --git a/.github/workflows/CI-unixish-docker.yml b/.github/workflows/CI-unixish-docker.yml
index 4df9b4e9340..02afca633b7 100644
--- a/.github/workflows/CI-unixish-docker.yml
+++ b/.github/workflows/CI-unixish-docker.yml
@@ -20,11 +20,16 @@ jobs:
 
     strategy:
       matrix:
-        image: ["ubuntu:24.04"]
         include:
-          - build_gui: false
           - image: "ubuntu:24.04"
-            build_gui: true
+            with_gui: true
+            full_build: true
+          - image: "ubuntu:25.10"
+            with_gui: true
+            full_build: true
+          - image: "alpine:3.23"
+            with_gui: false  # it appears FindQt6.cmake is not provided by any package
+            full_build: false  # FIXME: test-signalhandler.cpp fails to build since feenableexcept() is missing
       fail-fast: false # Prefer quick result
 
     runs-on: ubuntu-22.04
@@ -38,7 +43,7 @@ jobs:
       image: ${{ matrix.image }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -49,29 +54,29 @@ jobs:
           apt-get install -y cmake g++ make libxml2-utils libpcre3-dev
 
       - name: Install missing software (gui) on latest ubuntu
-        if: matrix.build_gui
+        if: contains(matrix.image, 'ubuntu')
         run: |
           apt-get install -y qt6-base-dev qt6-charts-dev qt6-tools-dev
 
+      - name: Install missing software on Alpine
+        if: contains(matrix.image, 'alpine')
+        run: |
+          apk add cmake make g++ pcre-dev
+
       # needs to be called after the package installation since
       # - it doesn't call "apt-get update"
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.24
         with:
           key: ${{ github.workflow }}-${{ matrix.image }}
 
-      - name: CMake build
-        if: ${{ !matrix.build_gui }}
+      - name: Run CMake
         run: |
-          mkdir cmake.output
-          cd cmake.output
-          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)
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=${{ matrix.with_gui }} -DWITH_QCHART=On -DBUILD_TRIAGE=${{ matrix.with_gui }} -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
-      - name: CMake build (with GUI)
-        if: matrix.build_gui
+      - name: CMake build
+        if: matrix.full_build
         run: |
-          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
@@ -82,7 +87,7 @@ jobs:
 
     strategy:
       matrix:
-        image: ["ubuntu:24.04"]
+        image: ["ubuntu:24.04", "ubuntu:25.10", "alpine:3.23"]
       fail-fast: false # Prefer quick result
 
     runs-on: ubuntu-22.04
@@ -91,7 +96,7 @@ jobs:
       image: ${{ matrix.image }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -101,21 +106,28 @@ jobs:
           apt-get update
           apt-get install -y g++ make python3 libxml2-utils libpcre3-dev
 
+      - name: Install missing software on Alpine
+        if: contains(matrix.image, 'alpine')
+        run: |
+          apk add make g++ pcre-dev bash python3 libxml2-utils
+
       # needs to be called after the package installation since
       # - it doesn't call "apt-get update"
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.24
         with:
           key: ${{ github.workflow }}-${{ matrix.image }}
 
+      # /usr/lib/ccache/bin - Alpine Linux
+
       - name: Build cppcheck
         run: |
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          export PATH="/usr/lib/ccache/bin:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
           make -j$(nproc) HAVE_RULES=yes CXXOPTS="-Werror"
 
       - name: Build test
         run: |
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          export PATH="/usr/lib/ccache/bin:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
           make -j$(nproc) HAVE_RULES=yes CXXOPTS="-Werror" testrunner
 
       - name: Run test
diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
index 68d4c867367..b172327d18b 100644
--- a/.github/workflows/CI-unixish.yml
+++ b/.github/workflows/CI-unixish.yml
@@ -30,12 +30,12 @@ jobs:
       CCACHE_SLOPPINESS: pch_defines,time_macros
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.24
         with:
           key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
 
@@ -58,13 +58,13 @@ jobs:
       - name: CMake build on ubuntu (with GUI / system tinyxml2)
         if: contains(matrix.os, 'ubuntu')
         run: |
-          cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          cmake -S . -B cmake.output.tinyxml2 -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
           cmake --build cmake.output.tinyxml2 -- -j$(nproc)
 
       - name: CMake build on macos (with GUI / system tinyxml2)
         if: contains(matrix.os, 'macos')
         run: |
-          cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
+          cmake -S . -B cmake.output.tinyxml2 -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
           cmake --build cmake.output.tinyxml2 -- -j$(nproc)
 
       - name: Run CMake test (system tinyxml2)
@@ -85,19 +85,19 @@ jobs:
       CCACHE_SLOPPINESS: pch_defines,time_macros
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.24
         with:
           key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
 
       # TODO: move latest compiler to separate step
       # TODO: bail out on warnings with latest GCC
       - name: Set up GCC
-        uses: egor-tensin/setup-gcc@v1
+        uses: egor-tensin/setup-gcc@v2
         if: false  # matrix.os == 'ubuntu-22.04'
         with:
           version: 13
@@ -127,12 +127,12 @@ jobs:
       - name: Run CMake on ubuntu (with GUI)
         if: contains(matrix.os, 'ubuntu')
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install
 
       - name: Run CMake on macos (with GUI)
         if: contains(matrix.os, 'macos')
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
 
       - name: Run CMake build
         run: |
@@ -150,17 +150,18 @@ jobs:
       - name: Run CMake install
         run: |
           cmake --build cmake.output --target install
+          # TODO: validate the installed files
 
       - name: Run CMake on ubuntu (no CLI)
         if: matrix.os == 'ubuntu-22.04'
         run: |
-          cmake -S . -B cmake.output_nocli -G "Unix Makefiles" -DBUILD_CLI=Off
+          cmake -S . -B cmake.output_nocli -Werror=dev --warn-uninitialized -DBUILD_TESTING=Off -DBUILD_CLI=Off
 
       - name: Run CMake on ubuntu (no CLI / with tests)
         if: matrix.os == 'ubuntu-22.04'
         run: |
           # the test and CLI code are too intertwined so for now we need to reject that
-          if cmake -S . -B cmake.output_nocli_tests -G "Unix Makefiles" -DBUILD_TESTS=On -DBUILD_CLI=Off; then
+          if cmake -S . -B cmake.output_nocli_tests -Werror=dev --warn-uninitialized -DBUILD_TESTING=On -DBUILD_CLI=Off; then
             exit 1
           else
             exit 0
@@ -169,18 +170,18 @@ jobs:
       - name: Run CMake on ubuntu (no CLI / with GUI)
         if: matrix.os == 'ubuntu-22.04'
         run: |
-          cmake -S . -B cmake.output_nocli_gui -G "Unix Makefiles" -DBUILD_CLI=Off -DBUILD_GUI=On
+          cmake -S . -B cmake.output_nocli_gui -Werror=dev --warn-uninitialized -DBUILD_TESTING=Off -DBUILD_CLI=Off -DBUILD_GUI=On
 
       - name: Run CMake on ubuntu (no GUI)
         if: matrix.os == 'ubuntu-22.04'
         run: |
-          cmake -S . -B cmake.output_nogui -G "Unix Makefiles" -DBUILD_GUI=Off
+          cmake -S . -B cmake.output_nogui -Werror=dev --warn-uninitialized -DBUILD_TESTING=Off -DBUILD_GUI=Off
 
       - name: Run CMake on ubuntu (no GUI / with triage)
         if: matrix.os == 'ubuntu-22.04'
         run: |
           # cannot build triage without GUI
-          if cmake -S . -B cmake.output_nogui_triage -G "Unix Makefiles" -DBUILD_GUI=Off -DBUILD_TRIAGE=On; then
+          if cmake -S . -B cmake.output_nogui_triage -Werror=dev --warn-uninitialized -DBUILD_TESTING=Off -DBUILD_GUI=Off -DBUILD_TRIAGE=On; then
             exit 1
           else
             exit 0
@@ -189,14 +190,23 @@ jobs:
       - name: Run CMake on ubuntu (no CLI / no GUI)
         if: matrix.os == 'ubuntu-22.04'
         run: |
-          cmake -S . -B cmake.output_nocli_nogui -G "Unix Makefiles" -DBUILD_GUI=Off
+          cmake -S . -B cmake.output_nocli_nogui -Werror=dev --warn-uninitialized -DBUILD_TESTING=Off -DBUILD_GUI=Off
 
   build_cmake_cxxstd:
 
     strategy:
       matrix:
         os: [ubuntu-22.04, macos-15]
-        cxxstd: [14, 17]
+        cxxstd: [14, 17, 20]
+        # FIXME: macos-15 fails to compile with C++20
+        #
+        # /Users/runner/work/cppcheck/cppcheck/cmake.output/gui/test/projectfile/moc_testprojectfile.cpp:84:1: error: 'constinit' specifier is incompatible with C++ standards before C++20 [-Werror,-Wc++20-compat]
+        #    84 | Q_CONSTINIT const QMetaObject TestProjectFile::staticMetaObject = { {
+        #       | ^
+        # /opt/homebrew/opt/qt/lib/QtCore.framework/Headers/qcompilerdetection.h:1409:23: note: expanded from macro 'Q_CONSTINIT'
+        exclude:
+          - os: macos-15
+            cxxstd: 20
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
@@ -206,12 +216,12 @@ jobs:
       CCACHE_SLOPPINESS: pch_defines,time_macros
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.24
         with:
           key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}-${{ matrix.cxxstd }}
 
@@ -234,12 +244,12 @@ jobs:
       - name: Run CMake on ubuntu (with GUI)
         if: contains(matrix.os, 'ubuntu')
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
       - name: Run CMake on macos (with GUI)
         if: contains(matrix.os, 'macos')
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
 
       - name: Run CMake build
         run: |
@@ -255,12 +265,12 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.24
         with:
           key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
 
@@ -289,12 +299,12 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.24
         with:
           key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
 
@@ -323,7 +333,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -351,12 +361,12 @@ jobs:
       CCACHE_SLOPPINESS: pch_defines,time_macros
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.24
         with:
           key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
 
@@ -364,7 +374,7 @@ jobs:
         run: |
           # make sure we fail when Boost is requested and not available.
           # will fail because no package configuration is available.
-          if cmake -S . -B cmake.output.boost-force-noavail -G "Unix Makefiles" -DUSE_BOOST=On; then
+          if cmake -S . -B cmake.output.boost-force-noavail -Werror=dev --warn-uninitialized -DBUILD_TESTING=Off -DUSE_BOOST=On; then
             exit 1
           else
             exit 0
@@ -377,12 +387,12 @@ jobs:
 
       - name: Run CMake on macOS (force Boost)
         run: |
-          cmake -S . -B cmake.output.boost-force -G "Unix Makefiles" -DUSE_BOOST=On
+          cmake -S . -B cmake.output.boost-force -Werror=dev --warn-uninitialized -DBUILD_TESTING=Off -DUSE_BOOST=On
 
       - name: Run CMake on macOS (no Boost)
         run: |
           # make sure Boost is not used when disabled even though it is available
-          cmake -S . -B cmake.output.boost-no -G "Unix Makefiles" -DUSE_BOOST=Off
+          cmake -S . -B cmake.output.boost-no -Werror=dev --warn-uninitialized -DBUILD_TESTING=Off -DUSE_BOOST=Off
           if grep -q '\-DHAVE_BOOST' ./cmake.output.boost-no/compile_commands.json; then
             exit 1
           else
@@ -391,13 +401,51 @@ jobs:
 
       - name: Run CMake on macOS (with Boost)
         run: |
-          cmake -S . -B cmake.output.boost -G "Unix Makefiles" -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 -S . -B cmake.output.boost -Werror=dev --warn-uninitialized -DBUILD_TESTING=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
           grep -q '\-DHAVE_BOOST' ./cmake.output.boost/compile_commands.json
 
       - name: Build with CMake on macOS (with Boost)
         run: |
           cmake --build cmake.output.boost -- -j$(nproc)
 
+  build_cmake_minimum:  # TODO: move to docker workflow?
+
+    runs-on: ubuntu-22.04  # use the oldest available runner
+
+    env:
+      CMAKE_VERSION: 3.22
+      CMAKE_VERSION_FULL: 3.22.6
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: Install missing software
+        run: |
+          sudo apt-get update
+          sudo apt-get install libxml2-utils
+          # qt6-tools-dev-tools for lprodump
+          # qt6-l10n-tools for lupdate
+          sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
+
+      - name: Install CMake
+        run: |
+          wget https://cmake.org/files/v${{ env.CMAKE_VERSION }}/cmake-${{ env.CMAKE_VERSION_FULL }}-linux-x86_64.tar.gz
+          tar xf cmake-${{ env.CMAKE_VERSION_FULL }}-linux-x86_64.tar.gz
+
+      - name: Run CMake (without GUI)
+        run: |
+          export PATH=cmake-${{ env.CMAKE_VERSION_FULL }}-linux-x86_64/bin:$PATH
+          # FIXME: cannot use --warn-uninitialized here as it completely breaks the build
+          cmake -S . -B cmake.output -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On
+
+      - name: Run CMake (with GUI)
+        run: |
+          export PATH=cmake-${{ env.CMAKE_VERSION_FULL }}-linux-x86_64/bin:$PATH
+          # FIXME: cannot use --warn-uninitialized here as it completely breaks the build
+          cmake -S . -B cmake.output.gui -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On
+
   build:
 
     strategy:
@@ -413,12 +461,12 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.24
         with:
           key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
 
@@ -551,7 +599,7 @@ jobs:
 
       - name: Test Signalhandler
         run: |
-          cmake -S . -B build.cmake.signal -G "Unix Makefiles" -DBUILD_TESTS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On
+          cmake -S . -B build.cmake.signal -Werror=dev --warn-uninitialized -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On
           cmake --build build.cmake.signal --target test-signalhandler -- -j$(nproc)
           # TODO: how to run this without copying the file?
           cp build.cmake.signal/bin/test-s* .
@@ -562,7 +610,7 @@ jobs:
       - name: Test Stacktrace
         if: contains(matrix.os, 'ubuntu')
         run: |
-          cmake -S . -B build.cmake.stack -G "Unix Makefiles" -DBUILD_TESTS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On
+          cmake -S . -B build.cmake.stack -Werror=dev --warn-uninitialized -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On
           cmake --build build.cmake.stack --target test-stacktrace -- -j$(nproc)
           # TODO: how to run this without copying the file?
           cp build.cmake.stack/bin/test-s* .
@@ -634,6 +682,19 @@ jobs:
           test -z "$(nm processexecutor.o)"
           # TODO: test NO_* defines
 
+      - name: Test execinfo.h detection
+        run: |
+          make clean
+          make cli/stacktrace.o | grep HAVE_EXECINFO_H=1         
+          test -n "$(nm cli/stacktrace.o)"
+
+      - name: Test testrunner inclusion/exclusion
+        run: |
+          ! ./testrunner -d TestUtils | grep -v TestUtils > /dev/null
+          ! ./testrunner -d TestUtils::trim | grep -v TestUtils::trim > /dev/null
+          ! ./testrunner -d -x TestUtils | grep TestUtils > /dev/null
+          ! ./testrunner -d -x TestUtils:trim | grep TestUtils:trim > /dev/null
+
       - name: Show all ignored files
         if: false  # TODO: currently lists all the contents of ignored folders - we only need what actually matched
         run: |
@@ -651,12 +712,12 @@ jobs:
     runs-on: ubuntu-22.04 # run on the latest image only
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.24
         with:
           key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
 
@@ -676,7 +737,7 @@ jobs:
 
       - name: CMake
         run: |
-          cmake -S . -B cmake.output -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On
 
       - name: Generate dependencies
         run: |
@@ -686,31 +747,4 @@ jobs:
 
       - name: Self check
         run: |
-          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=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt"
-          ec=0
-          
-          # TODO: add --check-config          
-         
-          # early exit
-          if [ $ec -eq 1 ]; then
-            exit $ec
-          fi
-          
-          # self check externals
-          ./cppcheck $selfcheck_options externals || ec=1
-          # self check lib/cli
-          mkdir b1
-          ./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json frontend || ec=1
-          ./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json -Ifrontend cli || ec=1
-          ./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 --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
-          # triage
-          ./cppcheck $selfcheck_options $cppcheck_options $gui_options -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage || ec=1
-          exit $ec
+          ./selfcheck.sh
diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml
index 1c572a9dc3d..66858c7afbe 100644
--- a/.github/workflows/CI-windows.yml
+++ b/.github/workflows/CI-windows.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -47,41 +47,42 @@ jobs:
           modules: 'qtcharts'
           setup-python: 'false'
           cache: true
-          aqtversion: '==3.1.*'  # TODO: remove when aqtinstall 3.2.2 is available
 
       - name: Run CMake
         run: |
           rem TODO: enable rules?
-          rem specify Release build so matchcompiler is used
-          cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DBUILD_ONLINE_HELP=On -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
+          cmake -S . -B build -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=Debug -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DBUILD_TESTING=Off -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DBUILD_ONLINE_HELP=On -DISABLE_DMAKE=On -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
 
-      - name: Build GUI release
+      - name: Build GUI
         run: |
-          cmake --build build --target cppcheck-gui --config Release || exit /b !errorlevel!
+          cmake --build build --config Debug --target cppcheck-gui || exit /b !errorlevel!
 
+      # TODO: can this be done in CMake?
       - name: Deploy GUI
         run: |
-          windeployqt build\bin\Release || exit /b !errorlevel!
-          del build\bin\Release\cppcheck-gui.ilk || exit /b !errorlevel!
-          del build\bin\Release\cppcheck-gui.pdb || exit /b !errorlevel!
+          windeployqt --no-translations build\bin\Debug || exit /b !errorlevel!
+          del build\bin\Debug\cppcheck-gui.pdb || exit /b !errorlevel!
 
       # TODO: run GUI tests
 
       - name: Run CMake install
         run: |
-          cmake --build build --target install
+          rem TODO: the Qt DLLs are not being installed
+          cmake --build build --config Debug --target install
+          rem TODO: validate the installed files
+          rem TODO: the structure does not match an actual Windows installation
 
   build_cmake_cxxstd:
     strategy:
       matrix:
         os: [windows-2022, windows-2025]
-        cxxstd: [14, 17]
+        cxxstd: [14, 17, 20]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -92,12 +93,53 @@ jobs:
 
       - name: Run CMake
         run: |
-          cmake -S . -B build.cxxstd -G "Visual Studio 17 2022" -A x64 -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
+          cmake -S . -B build.cxxstd -Werror=dev --warn-uninitialized -A x64 -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
 
       - name: Build
         run: |
           cmake --build build.cxxstd --config Debug || exit /b !errorlevel!
 
+  build_cmake_minimum:
+
+    runs-on: windows-2022  # use the oldest available runner
+
+    env:
+      CMAKE_VERSION: 3.22
+      CMAKE_VERSION_FULL: 3.22.6
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: Install CMake
+        run: |
+          curl -fsSL https://cmake.org/files/v${{ env.CMAKE_VERSION }}/cmake-${{ env.CMAKE_VERSION_FULL }}-windows-x86_64.zip -o cmake.zip || exit /b !errorlevel!
+          7z x cmake.zip || exit /b !errorlevel!
+
+      - name: Set up Visual Studio environment
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: x64
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: 6.10.0
+          modules: 'qtcharts'
+          setup-python: 'false'
+          cache: true
+
+      - name: Run CMake (without GUI)
+        run: |
+          :: TODO: enable DHAVE_RULES?
+          cmake-${{ env.CMAKE_VERSION_FULL }}-windows-x86_64\bin\cmake.exe -S . -B cmake.output -A x64 -DHAVE_RULES=Off -DBUILD_TESTING=On
+
+      - name: Run CMake (with GUI)
+        run: |
+          :: TODO: enable DHAVE_RULES?
+          cmake-${{ env.CMAKE_VERSION_FULL }}-windows-x86_64\bin\cmake.exe -S . -B cmake.output.gui -A x64 -DHAVE_RULES=Off -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On
+
   build:
     strategy:
       matrix:
@@ -112,13 +154,13 @@ jobs:
       PCRE_VERSION: 8.45
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: Set up Python
         if: matrix.config == 'release'
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.14'
           check-latest: true
@@ -130,7 +172,7 @@ jobs:
 
       - name: Cache PCRE
         id: cache-pcre
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: |
             externals\pcre.h
@@ -177,7 +219,7 @@ jobs:
 
       - name: Run Debug test
         if: matrix.config == 'debug'
-        run: .\bin\debug\testrunner.exe || exit /b !errorlevel!
+        run: .\bin\debug\testrunner.exe -t || exit /b !errorlevel!
 
       - name: Build CLI release configuration using MSBuild
         if: matrix.config == 'release'
@@ -230,7 +272,7 @@ jobs:
       - name: Test SEH wrapper
         if: matrix.config == 'release'
         run: |
-          cmake -S . -B build.cmake.seh -DBUILD_TESTS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
+          cmake -S . -B build.cmake.seh -Werror=dev --warn-uninitialized -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
           cmake --build build.cmake.seh --target test-sehwrapper || exit /b !errorlevel!
           :: TODO: how to run this without copying the file?
           copy build.cmake.seh\bin\Debug\test-sehwrapper.exe . || exit /b !errorlevel!
diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml
deleted file mode 100644
index 70b3a30f0ae..00000000000
--- a/.github/workflows/asan.yml
+++ /dev/null
@@ -1,158 +0,0 @@
-# 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: address sanitizer
-
-on:
-  push:
-    branches:
-      - 'main'
-      - 'releases/**'
-      - '2.*'
-    tags:
-      - '2.*'
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-
-    runs-on: ubuntu-22.04
-
-    env:
-      QT_VERSION: 6.10.0
-      ASAN_OPTIONS: detect_stack_use_after_return=1
-      LSAN_OPTIONS: suppressions=lsan-suppr.txt:print_suppressions=0
-      # TODO: figure out why there are cache misses with PCH enabled
-      CCACHE_SLOPPINESS: pch_defines,time_macros
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.14'
-          check-latest: true
-
-      - name: Install missing software on ubuntu
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y cmake make libpcre3-dev libboost-container-dev libxml2-utils
-          sudo apt-get install -y libcups2-dev  # required for Qt6PrintSupport in CMake since Qt 6.7.3
-
-      - name: Install clang
-        run: |
-          sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh 21
-
-      - name: Install Qt ${{ env.QT_VERSION }}
-        uses: jurplel/install-qt-action@v4
-        with:
-          version: ${{ env.QT_VERSION }}
-          modules: 'qtcharts'
-          setup-python: 'false'
-          cache: true
-
-      - name: Install missing Python packages
-        run: |
-          python3 -m pip install pip --upgrade
-          python3 -m pip install pytest
-          python3 -m pip install pytest-timeout
-          python3 -m pip install pytest-xdist
-          python3 -m pip install psutil
-
-      - name: CMake
-        run: |
-          cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DANALYZE_ADDRESS=On -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DFILESDIR= -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-        env:
-          CC: clang-21
-          CXX: clang++-21
-
-      - name: Build cppcheck
-        run: |
-          cmake --build cmake.output --target cppcheck -- -j $(nproc)
-
-      - name: Build test
-        run: |
-          cmake --build cmake.output --target testrunner -- -j $(nproc)
-
-      - name: Build GUI tests
-        run: |
-          cmake --build cmake.output --target gui-tests -- -j $(nproc)
-
-      - name: Run tests
-        run: ./cmake.output/bin/testrunner
-
-      - name: Run cfg tests
-        run: |
-          cmake --build cmake.output --target checkcfg -- -j $(nproc)
-
-      - name: Run CTest
-        run: |
-          cp lsan-suppr.txt cmake.output/bin
-          ctest --test-dir cmake.output --output-on-failure -j$(nproc)
-
-      - name: Run test/cli
-        run: |
-          pwd=$(pwd)
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
-
-      - name: Run test/cli (-j2)
-        run: |
-          pwd=$(pwd)
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
-        env:
-          TEST_CPPCHECK_INJECT_J: 2
-
-      - name: Run test/cli (--clang)
-        if: false
-        run: |
-          pwd=$(pwd)
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
-        env:
-          TEST_CPPCHECK_INJECT_CLANG: clang
-
-      - name: Run test/cli (--cppcheck-build-dir)
-        run: |
-          pwd=$(pwd)
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
-        env:
-          TEST_CPPCHECK_INJECT_BUILDDIR: injected
-
-      - name: Generate dependencies
-        if: false
-        run: |
-          # make sure auto-generated GUI files exist
-          make -C cmake.output autogen
-          make -C cmake.output gui-build-deps triage-build-ui-deps
-
-      # TODO: this is currently way too slow (~60 minutes) to enable it
-      # TODO: only fail the step on sanitizer issues - since we use processes it will only fail the underlying process which will result in an cppcheckError
-      - name: Self check
-        if: false
-        run: |
-          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 --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
-          exit $ec
diff --git a/.github/workflows/buildman.yml b/.github/workflows/buildman.yml
index b0b399dd851..e84cf4bffd9 100644
--- a/.github/workflows/buildman.yml
+++ b/.github/workflows/buildman.yml
@@ -19,7 +19,7 @@ jobs:
   convert_via_pandoc:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -38,7 +38,7 @@ jobs:
         with:
           args: --output=output/manual-premium.pdf man/manual-premium.md
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: output
           path: output
@@ -46,7 +46,7 @@ jobs:
   manpage:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -59,7 +59,7 @@ jobs:
         run: |
           make man
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: cppcheck.1
           path: cppcheck.1
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index 7b462c688f0..400fb929786 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -10,7 +10,7 @@ permissions:
 jobs:
   Fuzzing:
     runs-on: ubuntu-latest
-    if: ${{ github.repository_owner == 'danmar' }}
+    if: ${{ github.repository_owner == 'cppcheck-opensource' }}
     steps:
     - name: Build Fuzzers
       id: build
@@ -27,7 +27,7 @@ jobs:
         dry-run: false
         language: c++
     - name: Upload Crash
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index 7b2c4f4e2c7..4f2db4ab113 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -27,7 +27,7 @@ jobs:
       QT_VERSION: 6.10.0
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -43,8 +43,8 @@ jobs:
           sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 21
-          sudo apt-get install -y clang-tidy-21
+          sudo ./llvm.sh 22
+          sudo apt-get install -y clang-tidy-22
 
       - name: Install Qt ${{ env.QT_VERSION }}
         uses: jurplel/install-qt-action@v4
@@ -57,14 +57,14 @@ jobs:
 
       - name: Verify clang-tidy configuration
         run: |
-          clang-tidy-21 --verify-config
+          clang-tidy-22 --verify-config
 
       - name: Prepare CMake
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off -DWARNINGS_ARE_ERRORS=On
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_COMPILE_WARNING_AS_ERROR=On
         env:
-          CC: clang-21
-          CXX: clang++-21
+          CC: clang-22
+          CXX: clang++-22
 
       - name: Prepare CMake dependencies
         run: |
@@ -86,7 +86,7 @@ jobs:
         run: |
           cmake --build cmake.output --target run-clang-tidy-csa 2> /dev/null
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: success() || failure()
         with:
           name: Compilation Database
diff --git a/.github/workflows/claude-review.yml b/.github/workflows/claude-review.yml
new file mode 100644
index 00000000000..b53d8d8b4f9
--- /dev/null
+++ b/.github/workflows/claude-review.yml
@@ -0,0 +1,53 @@
+# Automated code review of pull requests using Claude
+#
+# A member/owner/collaborator requests a review by writing a PR comment
+# containing "@claude review".
+#
+# pull_request_target is not used because the Claude GitHub App token exchange
+# rejects OIDC tokens from that event (401 "Invalid OIDC token").
+#
+# issue_comment runs the workflow file from the default branch with access to
+# secrets. The PR code is never checked out or executed.
+name: claude-review
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  review:
+    if: |
+      github.event.issue.pull_request &&
+      contains(github.event.comment.body, '@claude review') &&
+      contains(fromJSON('["OWNER","MEMBER","COLLABORATOR"]'), github.event.comment.author_association)
+
+    runs-on: ubuntu-24.04
+
+    permissions:
+      contents: read
+      pull-requests: write
+      id-token: write
+
+    steps:
+    # checks out the base branch, not the PR head
+    - uses: actions/checkout@v7
+      with:
+        fetch-depth: 1
+
+    - name: Claude review
+      uses: anthropics/claude-code-action@v1
+      with:
+        anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+        prompt: |
+          REPO: ${{ github.repository }}
+          PR NUMBER: ${{ github.event.issue.number }}
+
+          Review this pull request. Focus on correctness bugs, potential
+          false positives/false negatives in checkers, performance problems
+          and missing tests. Be concise and only report real issues.
+
+          Use `gh pr diff` to see the changes. Post specific issues as inline
+          comments with `mcp__github_inline_comment__create_inline_comment`
+          and post a short overall summary with `gh pr comment`.
+        claude_args: |
+          --allowedTools "mcp__github_inline_comment__create_inline_comment,Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*)"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 12e758d2c9e..4fe5620680d 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -33,15 +33,18 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         persist-credentials: false
       
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
+        config: |
+          paths-ignore:
+            - gui/manualtest
 
     - name: Build cppcheck
       if: matrix.language == 'cpp'
@@ -49,4 +52,4 @@ jobs:
          make -j$(nproc) CXXOPTS="-Werror" HAVE_RULES=yes CPPCHK_GLIBCXX_DEBUG= cppcheck
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
diff --git a/.github/workflows/corpus.yml b/.github/workflows/corpus.yml
new file mode 100644
index 00000000000..d462222b268
--- /dev/null
+++ b/.github/workflows/corpus.yml
@@ -0,0 +1,58 @@
+# 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: corpus
+
+on:
+  schedule:
+    - cron: '0 0 * * 0'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  corpus:
+    runs-on: ubuntu-22.04
+    if: ${{ github.repository_owner == 'cppcheck-opensource' }}
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2.24
+        with:
+          key: ${{ github.workflow }}-${{ runner.os }}
+
+      - name: Install missing software on ubuntu
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y fdupes
+
+      - name: build testrunner
+        run: |
+          store_dir=$(pwd)/store
+          mkdir $store_dir
+          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          make -j$(nproc) CXXOPTS="-Werror" CPPOPTS="-DSTORE_INPUT_DIR=\"\\\"$store_dir\\\"\"" testrunner
+
+      - name: run testrunner
+        run: |
+          ./testrunner -q
+
+      - name: de-duplicate files
+        run: |
+          set -x
+          ls -l ./store | wc -l
+          echo "removing duplicates"
+          fdupes -qdN ./store > /dev/null
+          ls -l ./store | wc -l
+          # print largest size
+          ls -l ./store | cut -d' ' -f5 | sort -u -n -r | head -n1
+
+      - uses: actions/upload-artifact@v7
+        if: success()
+        with:
+          name: corpus
+          path: ./store
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 13f56172a80..fd3b5063049 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -21,12 +21,12 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.24
         with:
           key: ${{ github.workflow }}-${{ runner.os }}
 
@@ -57,12 +57,12 @@ jobs:
           lcov --extract lcov_tmp.info "$(pwd)/*" --output-file lcov.info
           genhtml lcov.info -o coverage_report --frame --legend --demangle-cpp
           
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
          name: Coverage results
          path: coverage_report
          
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           # file: ./coverage.xml # optional
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index 3c07b61d7c7..4c62971e4c4 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -12,9 +12,9 @@ permissions:
 jobs:
   scan:
     runs-on: ubuntu-latest
-    if: ${{ github.repository_owner == 'danmar' }}
+    if: ${{ github.repository_owner == 'cppcheck-opensource' }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         persist-credentials: false
     - name: Install missing software on ubuntu
diff --git a/.github/workflows/cppcheck-premium.yml b/.github/workflows/cppcheck-premium.yml
index 5cb63ca4d5e..9febf366138 100644
--- a/.github/workflows/cppcheck-premium.yml
+++ b/.github/workflows/cppcheck-premium.yml
@@ -25,7 +25,7 @@ jobs:
   build:
     runs-on: ubuntu-24.04 # run on the latest image only
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -33,9 +33,9 @@ jobs:
         run: |
           premium_version=${{ inputs.premium_version }}
           if [ -z $premium_version ]; then
-            premium_version=25.8.3
+            premium_version=26.9.0
             #wget https://files.cppchecksolutions.com/devdrop/cppcheckpremium-$premium_version-amd64.tar.gz -O cppcheckpremium.tar.gz
-            wget https://files.cppchecksolutions.com/$premium_version/ubuntu-24.04/cppcheckpremium-$premium_version-amd64.tar.gz -O cppcheckpremium.tar.gz
+            wget https://files.cppchecksolutions.com/release/2026/$premium_version/ubuntu-24.04/cppcheckpremium-$premium_version-amd64.tar.gz -O cppcheckpremium.tar.gz
           else
             wget https://files.cppchecksolutions.com/$premium_version/ubuntu-24.04/cppcheckpremium-$premium_version-amd64.tar.gz -O cppcheckpremium.tar.gz
           fi
@@ -44,29 +44,31 @@ jobs:
 
       - name: Generate a license file
         run: |
-          echo cppcheck > cppcheck.lic
-          echo 261231 >> cppcheck.lic
-          echo 80000 >> cppcheck.lic
-          echo 4b64673f03fb6230 >> cppcheck.lic
-          echo path:lib >> cppcheck.lic
+          echo 1 > cppcheck-premium-git.lic
+          echo 271231 >> cppcheck-premium-git.lic
+          echo 70c84e8412a64e58 >> cppcheck-premium-git.lic
+          echo fbb65b6bd40de73b >> cppcheck-premium-git.lic
+          echo autosar:1 >> cppcheck-premium-git.lic
+          echo cert:1 >> cppcheck-premium-git.lic
+          echo misra:1 >> cppcheck-premium-git.lic
+          echo licensed-to:Cppcheck CI >> cppcheck-premium-git.lic
 
       - name: Check
         run: |
-          cppcheckpremium/premiumaddon --check-loc-license cppcheck.lic > cppcheck-premium-loc
-          cppcheckpremium/cppcheck --premium=safety-off -j$(nproc) -D__GNUC__ -D__CPPCHECK__ --suppressions-list=cppcheckpremium-suppressions --platform=unix64 --enable=style --premium=misra-c++-2023 --premium=cert-c++-2016 --inline-suppr lib --error-exitcode=0 --output-format=sarif 2> results.sarif
+          cppcheckpremium/cppcheck --premium-license-file=cppcheck-premium-git.lic --premium=safety-off -j$(nproc) -D__GNUC__ -D__CPPCHECK__ --suppressions-list=cppcheckpremium-suppressions --platform=unix64 --enable=style --premium=misra-c++-2023 --premium=cert-c++-2016 --inline-suppr lib --error-exitcode=0 --output-format=sarif 2> results.sarif
 
       - name: Cat results
         run: |
           #sed -i 's|"security-severity":.*||' results.sarif
           cat results.sarif
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: results
           path: results.sarif
 
       - name: Upload report
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
         with:
           sarif_file: results.sarif
           category: cppcheckpremium
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index fd491c0ec0e..4ec72f935fd 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -24,12 +24,12 @@ jobs:
       UNCRUSTIFY_VERSION: 0.80.1
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: Cache uncrustify
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: cache-uncrustify
         with:
           path: |
diff --git a/.github/workflows/gcc-versions.yml b/.github/workflows/gcc-versions.yml
new file mode 100644
index 00000000000..3402bade743
--- /dev/null
+++ b/.github/workflows/gcc-versions.yml
@@ -0,0 +1,39 @@
+# the purpose of this github action is to test that cppcheck source code can be compiled using old gcc versions.
+# the gcc images we use here are copied from the official gcc images on docker hub
+
+name: gcc-versions
+
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    strategy:
+      matrix:
+        #image: ["ghcr.io/cppcheck-opensource/gcc:5.4", "ghcr.io/cppcheck-opensource/gcc:6.5", "ghcr.io/cppcheck-opensource/gcc:7.5", "ghcr.io/cppcheck-opensource/gcc:8.5", "ghcr.io/cppcheck-opensource/gcc:9.5"]
+        image: ["ghcr.io/cppcheck-opensource/gcc:5.4"]
+      fail-fast: false
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Build cppcheck
+        run: |
+          # FIXME: simplecpp-1.8.0 can't be compiled with gcc 5.4, so we can't run 'make test' now
+          #docker run --rm -v ${{ github.workspace }}:/cppcheck -w /cppcheck ${{ matrix.image }} make -j$(nproc) CXXOPTS="-Werror" test
+          docker run --rm -v ${{ github.workspace }}:/cppcheck -w /cppcheck ${{ matrix.image }} g++ -fsyntax-only -Iexternals -Iexternals/picojson -Iexternals/simplecpp -Iexternals/tinyxml2 -std=c++11 -Wno-multichar lib/*.cpp
diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml
index 649991f9373..2e54b92541e 100644
--- a/.github/workflows/iwyu.yml
+++ b/.github/workflows/iwyu.yml
@@ -15,25 +15,22 @@ jobs:
 
     strategy:
       matrix:
-        # "opensuse/tumbleweed:latest" / "fedora:latest" / "debian:unstable" / "archlinux:latest"
+        # "opensuse/tumbleweed:latest" / "fedora:rawhide" / "debian:unstable" / "archlinux:latest"
         include:
           - os: ubuntu-22.04
-            image: "fedora:latest"
+            image: "fedora:rawhide"
             stdlib: libstdc++
-            clang_inc: '-isystem/usr/lib/clang/20/include'
-          # TODO: disable because it currently fails with "error: <cstddef> tried including <stddef.h> but didn't find libc++'s <stddef.h> header."
-          #- os: ubuntu-22.04
-          #  image: "fedora:latest"
-          #  stdlib: libc++
-          #  clang_inc: '-isystem/usr/lib/clang/20/include'
-          - os: macos-13
+          - os: ubuntu-22.04
+            image: "fedora:rawhide"
+            stdlib: libc++
+          - os: macos-26
             image: ""
             stdlib: libc++  # no libstdc++ on macOS
             mapping_file_opt: '-Xiwyu --mapping_file=$(realpath ./macos.imp)'
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
-    if: ${{ github.repository_owner == 'danmar' }}
+    if: ${{ github.repository_owner == 'cppcheck-opensource' }}
 
     container:
       image: ${{ matrix.image }}
@@ -42,7 +39,7 @@ jobs:
       QT_VERSION: 6.10.0
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -74,7 +71,7 @@ jobs:
       - name: Install missing software on Fedora
         if: contains(matrix.image, 'fedora')
         run: |
-          dnf install -y cmake clang pcre-devel
+          dnf install -y cmake clang
           dnf install -y libglvnd-devel  # fixes missing dependency for Qt in CMake
           dnf install -y p7zip-plugins  # required as fallback for py7zr in Qt installation
           dnf install -y python3-pip  # fixes missing pip module in jurplel/install-qt-action
@@ -100,18 +97,21 @@ jobs:
         if: contains(matrix.os, 'macos')
         run: |
           brew install include-what-you-use pcre coreutils
-          ln -s iwyu_tool.py /usr/local/bin/iwyu_tool
+          # on Apple Silicon files are symlinked under /opt/homebrew/bin
+          ln -s /opt/homebrew/bin/iwyu_tool.py /usr/local/bin/iwyu_tool
 
       # Fails on OpenSUSE:
       # Warning: Failed to restore: Tar failed with error: Unable to locate executable file: tar. Please verify either the file path exists or the file can be found within a directory specified by the PATH environment variable. Also check the file mode to verify the file is executable.
       # Also the shell is broken afterwards:
       # OCI runtime exec failed: exec failed: unable to start container process: exec: "sh": executable file not found in $PATH: unknown
+      #
+      # On macos-26 we need to perform the Python setup because the default installation is managed externally managed
       - name: Install Qt ${{ env.QT_VERSION }}
         uses: jurplel/install-qt-action@v4
         with:
           version: ${{ env.QT_VERSION }}
           modules: 'qtcharts'
-          setup-python: 'false'
+          setup-python: ${{ contains(matrix.os, 'macos') }}
           install-deps: false
           cache: true
 
@@ -125,7 +125,8 @@ jobs:
 
       - name: Prepare CMake
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.stdlib == 'libc++' }}
+          # TODO: re-enable HAVE_RULES
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=Off -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.stdlib == 'libc++' }}
         env:
           CC: clang
           CXX: clang++
@@ -147,8 +148,7 @@ jobs:
 
       - name: iwyu_tool
         run: |
-          # TODO: remove -stdlib= - it should have been taken from the compilation database
-          iwyu_tool -p cmake.output -j $(nproc) -- -w -Xiwyu --max_line_length=1024 -Xiwyu --comment_style=long -Xiwyu --quoted_includes_first -Xiwyu --update_comments -stdlib=${{ matrix.stdlib }} ${{ matrix.mapping_file_opt }} ${{ matrix.clang_inc }} > iwyu.log
+          iwyu_tool -p cmake.output -j $(nproc) -- -w -Xiwyu --max_line_length=1024 -Xiwyu --comment_style=long -Xiwyu --quoted_includes_first -Xiwyu --update_comments ${{ matrix.mapping_file_opt }} ${{ matrix.clang_inc }} > iwyu.log
 
       # TODO: run with all configurations
       - name: test/cfg
@@ -160,13 +160,13 @@ jobs:
           IWYU: include-what-you-use
           IWYU_CLANG_INC: ${{ matrix.clang_inc }}
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: success() || failure()
         with:
           name: Compilation Database (include-what-you-use - ${{ matrix.os }} ${{ matrix.stdlib }})
           path: ./cmake.output/compile_commands.json
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: ${{ contains(matrix.os, 'macos') && (success() || failure()) }}
         with:
           name: macOS Mappings
@@ -174,7 +174,7 @@ jobs:
             ./iwyu-mapgen-apple-libc.py
             ./macos.imp
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: success() || failure()
         with:
           name: Logs (include-what-you-use - ${{ matrix.os }} ${{ matrix.stdlib }})
@@ -193,13 +193,13 @@ jobs:
       fail-fast: false
 
     runs-on: ubuntu-22.04
-    if: ${{ github.repository_owner == 'danmar' }}
+    if: ${{ github.repository_owner == 'cppcheck-opensource' }}
 
     env:
       QT_VERSION: 6.10.0
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -214,13 +214,13 @@ jobs:
           sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 21
-          sudo apt-get install -y clang-tools-21
+          sudo ./llvm.sh 22
+          sudo apt-get install -y clang-tools-22
 
       - name: Install libc++
         if: matrix.stdlib == 'libc++'
         run: |
-          sudo apt-get install -y libc++-21-dev
+          sudo apt-get install -y libc++-22-dev
 
       - name: Install Qt ${{ env.QT_VERSION }}
         uses: jurplel/install-qt-action@v4
@@ -233,10 +233,11 @@ jobs:
 
       - name: Prepare CMake
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.use_libcxx }}
+          # TODO: re-enable HAVE_RULES
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=Off -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.use_libcxx }}
         env:
-          CC: clang-21
-          CXX: clang++-21
+          CC: clang-22
+          CXX: clang++-22
 
       - name: Prepare CMake dependencies
         run: |
@@ -253,15 +254,15 @@ jobs:
       - name: clang-include-cleaner
         run: |
           # TODO: run multi-threaded
-          find $PWD/cli $PWD/lib $PWD/test $PWD/gui -maxdepth 1 -name "*.cpp" | xargs -t -n 1 clang-include-cleaner-21 --print=changes --extra-arg=-w --extra-arg=-stdlib=${{ matrix.stdlib }} -p cmake.output > clang-include-cleaner.log 2>&1
+          find $PWD/cli $PWD/lib $PWD/test $PWD/gui -maxdepth 1 -name "*.cpp" | xargs -t -n 1 clang-include-cleaner-22 --print=changes --extra-arg=-w --extra-arg=-stdlib=${{ matrix.stdlib }} -p cmake.output > clang-include-cleaner.log 2>&1
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: success() || failure()
         with:
           name: Compilation Database (clang-include-cleaner - ${{ matrix.stdlib }})
           path: ./cmake.output/compile_commands.json
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: success() || failure()
         with:
           name: Logs (clang-include-cleaner - ${{ matrix.stdlib }})
diff --git a/.github/workflows/release-windows-mingw.yml b/.github/workflows/release-windows-mingw.yml
index 3b9b836347f..8085990e39d 100644
--- a/.github/workflows/release-windows-mingw.yml
+++ b/.github/workflows/release-windows-mingw.yml
@@ -33,7 +33,7 @@ jobs:
     timeout-minutes: 19 # max + 3*std of the last 7K runs
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -63,7 +63,7 @@ jobs:
           cp /mingw64/bin/libstdc*.dll cppcheck-mingw/
           cp /mingw64/bin/libwinpthread-1.dll cppcheck-mingw/
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: cppcheck-mingw
           path: cppcheck-mingw
diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml
index 2836000acc5..aa467d7b875 100644
--- a/.github/workflows/release-windows.yml
+++ b/.github/workflows/release-windows.yml
@@ -22,19 +22,26 @@ jobs:
   build:
 
     runs-on: windows-2025
-    if: ${{ github.repository_owner == 'danmar' }}
+    if: ${{ github.repository_owner == 'cppcheck-opensource' }}
 
     env:
+      PYTHON_VERSION: 3.14
       # see https://www.pcre.org/original/changelog.txt
       PCRE_VERSION: 8.45
       QT_VERSION: 6.10.0
       BOOST_MINOR_VERSION: 89
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          check-latest: true
+
       - name: Set up Visual Studio environment
         uses: ilammy/msvc-dev-cmd@v1
 
@@ -48,8 +55,8 @@ jobs:
           7z x pcre-%PCRE_VERSION%.zip || exit /b !errorlevel!
           cd pcre-%PCRE_VERSION% || exit /b !errorlevel!
           git apply --ignore-space-change ..\externals\pcre.patch || exit /b !errorlevel!
-          cmake . -G "Visual Studio 17 2022" -A x64 -DPCRE_BUILD_PCRECPP=OFF -DPCRE_BUILD_PCREGREP=OFF -DPCRE_BUILD_TESTS=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
-          msbuild -m PCRE.sln -p:Configuration=Release -p:Platform=x64 || exit /b !errorlevel!
+          cmake . -A x64 -DPCRE_BUILD_PCRECPP=OFF -DPCRE_BUILD_PCREGREP=OFF -DPCRE_BUILD_TESTS=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
+          msbuild -m PCRE.slnx -p:Configuration=Release -p:Platform=x64 || exit /b !errorlevel!
           copy pcre.h ..\externals || exit /b !errorlevel!
           copy Release\pcre.lib ..\externals\pcre64.lib || exit /b !errorlevel!
 
@@ -65,21 +72,20 @@ jobs:
 
       # available modules: https://github.com/miurahr/aqtinstall/blob/master/docs/getting_started.rst#installing-modules
       # available tools:   https://github.com/miurahr/aqtinstall/blob/master/docs/getting_started.rst#installing-tools
-      - name: Install Qt ${{ env.QT_VERSION }}
+      - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
           version: ${{ env.QT_VERSION }}
           modules: 'qtcharts'
           setup-python: 'false'
           tools: 'tools_opensslv3_x64'
-          aqtversion: '==3.1.*'  # TODO: remove when aqtinstall 3.2.2 is available
 
       # TODO: build with multiple threads
       - name: Build x64 release GUI
         run: |
           :: TODO: enable rules?
           :: specify Release build so matchcompiler is used
-          cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_ONLINE_HELP=On -DUSE_BOOST=ON -DBOOST_INCLUDEDIR=%GITHUB_WORKSPACE%\boost -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
+          cmake -S . -B build -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=Off -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_ONLINE_HELP=On -DUSE_BOOST=ON -DBOOST_INCLUDEDIR=%GITHUB_WORKSPACE%\boost -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
           cmake --build build --target cppcheck-gui --config Release || exit /b !errorlevel!
 
       # TODO: package PDBs
@@ -89,7 +95,7 @@ jobs:
           del build\bin\Release\cppcheck-gui.ilk || exit /b !errorlevel!
           del build\bin\Release\cppcheck-gui.pdb || exit /b !errorlevel!
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: deploy
           path: build\bin\Release
@@ -103,7 +109,7 @@ jobs:
         env:
           _CL_: /WX
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: bin
           path: bin
@@ -152,7 +158,7 @@ jobs:
           :: copy libcrypto-3-x64.dll and libssl-3-x64.dll
           copy %RUNNER_WORKSPACE%\Qt\Tools\OpenSSLv3\Win_x64\bin\lib*.dll win_installer\files || exit /b !errorlevel!
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: collect
           path: win_installer\files
@@ -167,7 +173,7 @@ jobs:
           @echo ProductVersion="%PRODUCTVER%" || exit /b !errorlevel!
           msbuild -m cppcheck.wixproj -p:Platform=x64,ProductVersion=%PRODUCTVER%.${{ github.run_number }} || exit /b !errorlevel!
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: installer
           path: win_installer/Build/
@@ -203,7 +209,7 @@ jobs:
           del win_installer\files\Qt6Svg.dll || exit /b !errorlevel!
           del win_installer\files\vc_redist.x64.exe || exit /b !errorlevel!
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: portable
           path: win_installer\files
diff --git a/.github/workflows/ubsan.yml b/.github/workflows/sanitizers.yml
similarity index 60%
rename from .github/workflows/ubsan.yml
rename to .github/workflows/sanitizers.yml
index 64eb02a4b25..9d5a6007a69 100644
--- a/.github/workflows/ubsan.yml
+++ b/.github/workflows/sanitizers.yml
@@ -1,6 +1,6 @@
 # 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: undefined behaviour sanitizers
+name: sanitizers
 
 on:
   push:
@@ -18,26 +18,49 @@ permissions:
 jobs:
   build:
 
+    strategy:
+      matrix:
+        include:
+          - sanitizer: 'asan'
+            cmake_opts: '-DANALYZE_ADDRESS=On'
+            run_ctest: true
+            inject_executor: 'process'
+            run_selfcheck: false  # TODO: this is currently way too slow (~60 minutes) to enable it
+          - sanitizer: 'tsan'
+            cmake_opts: '-DANALYZE_THREAD=On'
+            run_ctest: false   # TODO: test-filelist fails with data race in pthread_cond_destroy
+            inject_executor: 'thread'
+            run_selfcheck: false  # TODO: disabled for now as it takes around 40 minutes to finish
+            selfcheck_opts: '--executor=thread --error-exitcode=0'  # set --error-exitcode=0 so we only fail on sanitizer issues - since it uses threads for execution it will exit the whole process on the first issue
+          - sanitizer: 'ubsan'
+            cmake_opts: '-DANALYZE_UNDEFINED=On'
+            run_ctest: true
+            inject_executor: 'process'
+            run_selfcheck: true
+      fail-fast: false
+
     runs-on: ubuntu-22.04
 
     env:
       QT_VERSION: 6.10.0
+      ASAN_OPTIONS: detect_stack_use_after_return=1
+      TSAN_OPTIONS: halt_on_error=1
       UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1:report_error_type=1
       # TODO: figure out why there are cache misses with PCH enabled
       CCACHE_SLOPPINESS: pch_defines,time_macros
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.24
         with:
-          key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
+          key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}-${{ matrix.sanitizer }}
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.14'
           check-latest: true
@@ -53,7 +76,7 @@ jobs:
           sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 21
+          sudo ./llvm.sh 22
 
       - name: Install Qt ${{ env.QT_VERSION }}
         uses: jurplel/install-qt-action@v4
@@ -73,10 +96,10 @@ jobs:
 
       - name: CMake
         run: |
-          cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DANALYZE_UNDEFINED=On -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DFILESDIR= -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify ${{ matrix.cmake_opts }} -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DFILESDIR= -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
         env:
-          CC: clang-21
-          CXX: clang++-21
+          CC: clang-22
+          CXX: clang++-22
 
       - name: Build cppcheck
         run: |
@@ -91,13 +114,14 @@ jobs:
           cmake --build cmake.output --target gui-tests -- -j $(nproc)
 
       - name: Run tests
-        run: ./cmake.output/bin/testrunner
+        run: ./cmake.output/bin/testrunner -t
 
       - name: Run cfg tests
         run: |
           cmake --build cmake.output --target checkcfg -- -j $(nproc)
 
       - name: Run CTest
+        if: matrix.run_ctest
         run: |
           ctest --test-dir cmake.output --output-on-failure -j$(nproc)
 
@@ -105,6 +129,8 @@ jobs:
         run: |
           pwd=$(pwd)
           TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
+        env:
+          TEST_CPPCHECK_INJECT_EXECUTOR: ${{ matrix.inject_executor }}
 
       - name: Run test/cli (-j2)
         run: |
@@ -129,6 +155,7 @@ jobs:
           TEST_CPPCHECK_INJECT_BUILDDIR: injected
 
       - name: Generate dependencies
+        if: matrix.run_selfcheck
         run: |
           # make sure auto-generated GUI files exist
           make -C cmake.output autogen
@@ -136,18 +163,6 @@ jobs:
 
       # TODO: only fail the step on sanitizer issues - since we use processes it will only fail the underlying process which will result in an cppcheckError
       - name: Self check
+        if: matrix.run_selfcheck
         run: |
-          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 --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
-          exit $ec
+          ./selfcheck_san.sh ./cmake.output ${{ matrix.selfcheck_opts }}
diff --git a/.github/workflows/scriptcheck.yml b/.github/workflows/scriptcheck.yml
index 844b1d5c2f3..35efc35ca1b 100644
--- a/.github/workflows/scriptcheck.yml
+++ b/.github/workflows/scriptcheck.yml
@@ -21,17 +21,17 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.24
         with:
           key: ${{ github.workflow }}-${{ runner.os }}
 
       - name: Cache Cppcheck
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: cppcheck
           key: ${{ runner.os }}-scriptcheck-cppcheck-${{ github.sha }}
@@ -56,19 +56,19 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       # TODO: bailout on error
       - name: Restore Cppcheck
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: cppcheck
           key: ${{ runner.os }}-scriptcheck-cppcheck-${{ github.sha }}
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -209,7 +209,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/selfcheck.yml b/.github/workflows/selfcheck.yml
index 3a2fd2fffc0..77d6d1bc483 100644
--- a/.github/workflows/selfcheck.yml
+++ b/.github/workflows/selfcheck.yml
@@ -24,12 +24,12 @@ jobs:
       QT_VERSION: 6.10.0
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.24
         with:
           key: ${{ github.workflow }}-${{ runner.os }}
 
@@ -64,7 +64,7 @@ jobs:
       # unusedFunction - start
       - name: CMake
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=ON -DWITH_QCHART=ON -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=ON -DWITH_QCHART=ON -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off
 
       - name: Generate dependencies
         run: |
@@ -90,7 +90,7 @@ jobs:
       # unusedFunction notest - start
       - name: CMake (no test)
         run: |
-          cmake -S . -B cmake.output.notest -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_GUI=ON -DBUILD_TRIAGE=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off
+          cmake -S . -B cmake.output.notest -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=Off -DBUILD_GUI=ON -DBUILD_TRIAGE=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off
 
       - name: Generate dependencies (no test)
         run: |
@@ -112,7 +112,7 @@ jobs:
       # unusedFunction notest nogui - start
       - name: CMake (no test / no gui)
         run: |
-          cmake -S . -B cmake.output.notest_nogui -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off
+          cmake -S . -B cmake.output.notest_nogui -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=Off -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off
 
       - name: Generate dependencies (no test / no gui)
         run: |
@@ -121,8 +121,25 @@ jobs:
 
       - name: Self check (unusedFunction / no test / no gui)
         run: |
-          supprs="--suppress=unusedFunction:lib/errorlogger.h:196 --suppress=unusedFunction:lib/importproject.cpp:1516 --suppress=unusedFunction:lib/importproject.cpp:1540"
-          ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib -D__CPPCHECK__ -D__GNUC__ --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.notest_nogui/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr $supprs
+          echo '<?xml version="1.0"?>
+                <suppressions>
+                  <suppress>
+                    <id>unusedFunction</id>
+                    <fileName>lib/errorlogger.h</fileName>
+                    <symbolName>verboseMessage</symbolName>
+                  </suppress>
+                  <suppress>
+                    <id>unusedFunction</id>
+                    <fileName>lib/importproject.cpp</fileName>
+                    <symbolName>selectVsConfigurations</symbolName>
+                  </suppress>
+                  <suppress>
+                    <id>unusedFunction</id>
+                    <fileName>lib/importproject.cpp</fileName>
+                    <symbolName>getVSConfigs</symbolName>
+                  </suppress>
+                </suppressions>' > supprs.xml
+          ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib -D__CPPCHECK__ -D__GNUC__ --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.notest_nogui/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr --suppress-xml=supprs.xml
         env:
           DISABLE_VALUEFLOW: 1
           UNUSEDFUNCTION_ONLY: 1
@@ -131,7 +148,7 @@ jobs:
       # unusedFunction notest nocli - start
       - name: CMake (no test / no cli)
         run: |
-          cmake -S . -B cmake.output.notest_nocli -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_CLI=Off -DBUILD_GUI=ON -DWITH_QCHART=ON -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off
+          cmake -S . -B cmake.output.notest_nocli -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=Off -DBUILD_CLI=Off -DBUILD_GUI=ON -DWITH_QCHART=ON -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off
 
       - name: Generate dependencies (no test / no cli)
         run: |
@@ -154,7 +171,7 @@ jobs:
       # unusedFunction notest nocli nogui - start
       - name: CMake (no test / no cli / no gui)
         run: |
-          cmake -S . -B cmake.output.notest_nocli_nogui -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_CLI=Off -DBUILD_GUI=Off -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off
+          cmake -S . -B cmake.output.notest_nocli_nogui -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=Off -DBUILD_CLI=Off -DBUILD_GUI=Off -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off
 
       - name: Generate dependencies (no test / no cli / no gui)
         run: |
@@ -172,12 +189,12 @@ jobs:
 
       - name: Fetch corpus
         run: |
-          wget https://github.com/danmar/cppcheck/archive/refs/tags/2.8.tar.gz
+          wget https://github.com/cppcheck-opensource/cppcheck/archive/refs/tags/2.8.tar.gz
           tar xvf 2.8.tar.gz
 
       - name: CMake (corpus / no test)
         run: |
-          cmake -S cppcheck-2.8 -B cmake.output.corpus -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_GUI=ON -DUSE_QT6=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+          cmake -S cppcheck-2.8 -B cmake.output.corpus -DHAVE_RULES=On -DBUILD_TESTING=Off -DBUILD_GUI=ON -DUSE_QT6=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
       - name: Generate dependencies (corpus)
         run: |
@@ -198,7 +215,20 @@ jobs:
         env:
           DISABLE_VALUEFLOW: 1
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: Callgrind Output
           path: ./callgrind.*
+
+      - name: Self check (unusedFunction / corpus / no test / memcheck)
+        run: |
+          # TODO: fix -rp so the suppressions actually work
+          valgrind --error-limit=yes --leak-check=full --num-callers=50 --show-reachable=yes --track-origins=yes --gen-suppressions=all --log-fd=9 --error-exitcode=42 ./cppcheck --template=selfcheck --error-exitcode=0 --library=cppcheck-lib --library=qt -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.corpus/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr 9>memcheck.log || (cat memcheck.log && false)
+          cat memcheck.log
+        env:
+          DISABLE_VALUEFLOW: 1
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: Memcheck Output
+          path: ./memcheck.*
diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml
deleted file mode 100644
index 27ed6606386..00000000000
--- a/.github/workflows/tsan.yml
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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: thread sanitizer
-
-on:
-  push:
-    branches:
-      - 'main'
-      - 'releases/**'
-      - '2.*'
-    tags:
-      - '2.*'
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-
-    runs-on: ubuntu-22.04
-
-    env:
-      QT_VERSION: 6.10.0
-      TSAN_OPTIONS: halt_on_error=1
-      # TODO: figure out why there are cache misses with PCH enabled
-      CCACHE_SLOPPINESS: pch_defines,time_macros
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.14'
-          check-latest: true
-
-      - name: Install missing software on ubuntu
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y cmake make libpcre3-dev libboost-container-dev libxml2-utils
-          sudo apt-get install -y libcups2-dev  # required for Qt6PrintSupport in CMake since Qt 6.7.3
-
-      - name: Install clang
-        run: |
-          sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh 21
-
-      - name: Install Qt ${{ env.QT_VERSION }}
-        uses: jurplel/install-qt-action@v4
-        with:
-          version: ${{ env.QT_VERSION }}
-          modules: 'qtcharts'
-          setup-python: 'false'
-          cache: true
-
-      - name: Install missing Python packages
-        run: |
-          python3 -m pip install pip --upgrade
-          python3 -m pip install pytest
-          python3 -m pip install pytest-timeout
-          python3 -m pip install pytest-xdist
-          python3 -m pip install psutil
-
-      - name: CMake
-        run: |
-          cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DANALYZE_THREAD=On -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=Off -DDISABLE_DMAKE=On -DFILESDIR= -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-        env:
-          CC: clang-21
-          CXX: clang++-21
-
-      - name: Build cppcheck
-        run: |
-          cmake --build cmake.output --target cppcheck -- -j $(nproc)
-
-      - name: Build test
-        run: |
-          cmake --build cmake.output --target testrunner -- -j $(nproc)
-
-      - name: Build GUI tests
-        run: |
-          cmake --build cmake.output --target gui-tests -- -j $(nproc)
-
-      - name: Run tests
-        run: ./cmake.output/bin/testrunner
-
-      - name: Run cfg tests
-        run: |
-          cmake --build cmake.output --target checkcfg -- -j $(nproc)
-
-      - name: Run CTest
-        if: false # TODO: test-filelist fails with data race in pthread_cond_destroy
-        run: |
-          ctest --test-dir cmake.output --output-on-failure -j$(nproc)
-
-      - name: Run test/cli
-        run: |
-          pwd=$(pwd)
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
-        env:
-          TEST_CPPCHECK_INJECT_EXECUTOR: thread
-
-      - name: Run test/cli (-j2)
-        run: |
-          pwd=$(pwd)
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
-        env:
-          TEST_CPPCHECK_INJECT_J: 2
-
-      - name: Run test/cli (--clang)
-        if: false
-        run: |
-          pwd=$(pwd)
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
-        env:
-          TEST_CPPCHECK_INJECT_CLANG: clang
-
-      - name: Run test/cli (--cppcheck-build-dir)
-        run: |
-          pwd=$(pwd)
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
-        env:
-          TEST_CPPCHECK_INJECT_BUILDDIR: injected
-
-      - name: Generate dependencies
-        if: false
-        run: |
-          # make sure auto-generated GUI files exist
-          make -C cmake.output autogen
-          make -C cmake.output gui-build-deps triage-build-ui-deps
-
-      # TODO: disabled for now as it takes around 40 minutes to finish
-      # set --error-exitcode=0 so we only fail on sanitizer issues - since it uses threads for execution it will exit the whole process on the first issue
-      - name: Self check
-        if: false
-        run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=file-total -D__GNUC__ --error-exitcode=0 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=gnu --inconclusive --enable=style,performance,portability,warning,missingInclude,information --exception-handling --debug-warnings --check-level=exhaustive"
-          selfcheck_options="$selfcheck_options --executor=thread"
-          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 --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
-          exit $ec
diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml
index 9a6026aa25b..44f762030c3 100644
--- a/.github/workflows/valgrind.yml
+++ b/.github/workflows/valgrind.yml
@@ -21,12 +21,12 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2.24
         with:
           key: ${{ github.workflow }}-${{ runner.os }}
 
@@ -51,14 +51,20 @@ jobs:
       - name: Run valgrind
         run: |
           ec=0
-          valgrind --error-limit=yes --leak-check=full --num-callers=50 --show-reachable=yes --track-origins=yes --suppressions=valgrind/testrunner.supp --gen-suppressions=all --log-fd=9 --error-exitcode=42 ./testrunner TestGarbage TestOther TestSimplifyTemplate 9>memcheck.log || ec=1
+          # disabled all tests invoking processes because the child processes fail with still reachable memory.
+          # some of the TestProcessExecutor* tests are also extremely slow.
+          excluded_tests="TestProcessExecutorFS \
+            TestProcessExecutorFiles \
+            TestSuppressions::suppressionsSettingsProcessesFiles \
+            TestSuppressions::suppressionsSettingsProcessesFS"
+          valgrind --error-limit=yes --leak-check=full --num-callers=50 --show-reachable=yes --track-origins=yes --suppressions=valgrind/testrunner.supp --gen-suppressions=all -s --log-fd=9 --error-exitcode=42 ./testrunner -t -x $excluded_tests 9>memcheck.log || ec=1
           cat memcheck.log
           exit $ec
         # TODO: debuginfod.ubuntu.com is currently not responding to any requests causing it to run into a 40(!) minute timeout
         #env:
         #  DEBUGINFOD_URLS: https://debuginfod.ubuntu.com
           
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: success() || failure()
         with:
           name: Logs
diff --git a/.gitignore b/.gitignore
index 434203fe2a9..a821204bf2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.gcno
 *.gch
 *.o
+*.a
 *.pyc
 /cppcheck
 /cppcheck.exe
diff --git a/.selfcheck_suppressions b/.selfcheck_suppressions
index 1b6dcc1965b..a8ee87de10f 100644
--- a/.selfcheck_suppressions
+++ b/.selfcheck_suppressions
@@ -1,22 +1,55 @@
 missingIncludeSystem
 # should not be reported - see #13387
 checkersReport
-# false positive - see #14308
-nullPointerRedundantCheck:externals/simplecpp/simplecpp.cpp:3246
 
 # warnings in Qt generated code we cannot fix
+funcArgNamesDifferentUnnamed:*/moc_aboutdialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_applicationdialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_applicationlist.cpp
 funcArgNamesDifferent:*/moc_checkthread.cpp
+funcArgNamesDifferentUnnamed:*/moc_checkthread.cpp
+funcArgNamesDifferentUnnamed:*/moc_codeeditor.cpp
 funcArgNamesDifferent:*/moc_codeeditstylecontrols.cpp
+funcArgNamesDifferentUnnamed:*/moc_codeeditstylecontrols.cpp
+funcArgNamesDifferentUnnamed:*/moc_compliancereportdialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_codeeditstyledialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_fileviewdialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_helpdialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_libraryaddfunctiondialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_librarydialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_libraryeditargdialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_mainwindow.cpp
+funcArgNamesDifferentUnnamed:*/moc_newsuppressiondialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_platforms.cpp
+funcArgNamesDifferentUnnamed:*/moc_projectfile.cpp
+funcArgNamesDifferentUnnamed:*/moc_projectfiledialog.cpp
 funcArgNamesDifferent:*/moc_resultstree.cpp
+funcArgNamesDifferentUnnamed:*/moc_resultstree.cpp
 funcArgNamesDifferent:*/moc_resultsview.cpp
+funcArgNamesDifferentUnnamed:*/moc_resultsview.cpp
+funcArgNamesDifferentUnnamed:*/moc_scratchpad.cpp
+funcArgNamesDifferentUnnamed:*/moc_settingsdialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_statsdialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_testcppchecklibrarydata.cpp
+funcArgNamesDifferentUnnamed:*/moc_testfilelist.cpp
+funcArgNamesDifferentUnnamed:*/moc_testprojectfile.cpp
+funcArgNamesDifferentUnnamed:*/moc_testresultstree.cpp
+funcArgNamesDifferentUnnamed:*/moc_testtranslationhandler.cpp
+funcArgNamesDifferentUnnamed:*/moc_testxmlreportv2.cpp
+funcArgNamesDifferentUnnamed:*/moc_threaddetails.cpp
 funcArgNamesDifferent:*/moc_threadhandler.cpp
+funcArgNamesDifferentUnnamed:*/moc_threadhandler.cpp
 funcArgNamesDifferent:*/moc_threadresult.cpp
+funcArgNamesDifferentUnnamed:*/moc_threadresult.cpp
+funcArgNamesDifferentUnnamed:*/moc_translationhandler.cpp
+funcArgNamesDifferentUnnamed:*/moc_txtreport.cpp
 naming-varname:*/gui/ui_*.h
-functionStatic:*/ui_fileview.h
+functionStatic:*/gui/ui_*.h
 
 # --debug-warnings suppressions
 valueFlowBailout
 valueFlowBailoutIncompleteVar
+valueFlowMaxIterations:gui/resultstree.cpp
 autoNoType:externals/simplecpp/simplecpp.cpp
 autoNoType:cli/*.cpp
 autoNoType:lib/*.cpp
@@ -29,6 +62,8 @@ templateInstantiation:test/testutils.cpp
 
 naming-varname:externals/simplecpp/simplecpp.h
 naming-privateMemberVariable:externals/simplecpp/simplecpp.h
+# false positive; lambda captures its owner
+danglingLifetime:externals/simplecpp/simplecpp.h:505
 
 # TODO: these warnings need to be addressed upstream
 uninitMemberVar:externals/tinyxml2/tinyxml2.h
@@ -38,6 +73,11 @@ invalidPrintfArgType_sint:externals/tinyxml2/tinyxml2.h
 naming-privateMemberVariable:externals/tinyxml2/tinyxml2.h
 functionStatic:externals/tinyxml2/tinyxml2.cpp
 funcArgNamesDifferent:externals/tinyxml2/tinyxml2.cpp
+funcArgNamesDifferentUnnamed:externals/tinyxml2/tinyxml2.cpp
+funcArgNamesDifferentUnnamed:externals/tinyxml2/tinyxml2.h
+knownConditionTrueFalse:externals/tinyxml2/tinyxml2.cpp
 nullPointerRedundantCheck:externals/tinyxml2/tinyxml2.cpp
 useStlAlgorithm:externals/simplecpp/simplecpp.cpp
+funcArgNamesDifferentUnnamed:externals/simplecpp/simplecpp.h
 missingMemberCopy:externals/simplecpp/simplecpp.h
+shadowFunction:externals/simplecpp/simplecpp.h
diff --git a/AUTHORS b/AUTHORS
index be41c3c525c..50ba3a4f67e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,7 @@
 The cppcheck team, in alphabetical order:
 
 0x41head
+Aaron Danen
 Abhijit Sawant
 Abhishek Bharadwaj
 Abigail Buccaneer
@@ -10,6 +11,7 @@ Ahti Legonkov
 Akhilesh Nema
 Akio Idehara
 Albert Aribaud
+Alvin Che-Chia Chang
 Aleksandr Pikalev
 Aleksey Palazhchenko
 Alexander Alekseev
@@ -22,6 +24,7 @@ Alexey Eryomenko
 Alexey Zhikhartsev
 Alfi Maulana
 Ali Can Demiralp
+Alvin Che-Chia Chang
 Allen Winter
 Alon Alexander
 Alon Liberman
@@ -33,6 +36,7 @@ Andreas Lutsch
 Andreas Pokorny
 Andreas Rönnquist
 Andreas Vollenweider
+Andreas Wilhelm
 Andrei Karas
 Andrew C Aitchison
 Andrew C. Martin
@@ -82,6 +86,7 @@ Cary Converse
 Cary R
 Caspar Kielwein
 Changkyoon Kim
+Chencheng Mao
 Chris Lalancette
 Christian Ehrlicher
 Christian Franke
@@ -94,17 +99,21 @@ Cilyan Olowen
 Claus Jensby Madsen
 Colomban Wendling
 Conrado Gouvea
+correctmost
 daisuke-chiba
 Daniel Friedrich
 David Korczynski
 Daniel Marjamäki
+Daschle Newberry
 David Hallas
 David Korth
+David Ramnerö
 Dávid Slivka
 Debrard Sebastien
 Deepak Gupta
 Degen's Regens
 dencat
+Devansh Varshney
 Diego de las Heras
 Dirk Jagdmann
 Dirk Mueller
@@ -130,7 +139,9 @@ Felipe Pena
 Felix Faber
 Felix Geyer
 Felix Passenberg
+Felix Patschkowski
 Felix Wolff
+Florian Mueller
 Florin Iucha
 flovent
 Francesc Elies
@@ -139,6 +150,7 @@ Frank Winklmeier
 Frank Zingsheim
 Frederik Schwarzer
 fu7mu4
+Gaël Bonithon
 Galimov Albert
 Garrett Bodily
 Gary Leutheuser
@@ -151,6 +163,7 @@ Gerhard Zlabinger
 Gerik Rhoden
 Gianfranco Costamagna
 Gianluca Scacco
+Gilmar Santos Jr
 Gleydson Soares
 Goncalo Mao-Cheia
 Goran Džaferi
@@ -181,10 +194,13 @@ Jan Egil Ruud
 Jan Hellwig
 János Maros
 Jay Sigbrandt
+Jean-François Deverge
 Jedrzej Klocek
+Jeewoong Kim
 Jens Bäckman
 Jens Yllman
 Jérémy Lefaure
+Jérôme Duval
 Jes Ramsing
 Jesse Boswell
 Jim Kuhn
@@ -192,6 +208,7 @@ Jim Zhou
 jlguardi
 Joel Johnson
 Johan Bertrand
+Johan Crone
 Johan Samuelson
 John Marshall
 John-Paul Ore
@@ -200,6 +217,7 @@ Jonathan Clohessy
 Jonathan Haehne
 Jonathan Neuschäfer
 Jonathan Thackray
+Jonny Paton
 José Martins
 Jose Roquette
 Joshua Beck
@@ -251,6 +269,7 @@ Maarten van der Schrieck
 Maksim Derbasov
 Malcolm Parsons
 Marc-Antoine Perennou
+Marcel Petrick
 Marcel Raad
 Marco Trevisan
 Marek Zmysłowski
@@ -258,6 +277,7 @@ Marian Klymov
 Mark de Wever
 Mark Hermeling
 Markus Elfring
+Martin Boye Petersen
 Martin Delille
 Martin Ettl
 Martin Exner
@@ -278,6 +298,7 @@ Matt Johnson
 Maurice Gilden
 Mavik
 Melroy van den Berg
+Michael de Lang
 Michael Drake
 Michael Løiten
 Miika-Petteri Matikainen
@@ -295,6 +316,7 @@ ms
 Neszt Tibor
 Nguyen Duong Tuan
 Ni2c2k
+Nick James Kirkby
 Nick Ridgway
 Nicolás Alvarez
 Nicolas Le Cam
@@ -323,6 +345,7 @@ Philip Chimento
 Philipp Kloke
 Pierre Schweitzer
 Pieter Duchi
+Piotr Idzik
 Pino Toscano
 Pranav Khanna
 Radek Jarecki
@@ -359,6 +382,7 @@ Samuel Degrande
 Samuel Polá�ek
 Sandeep Dutta
 Savvas Etairidis
+Sayed Kaif
 Scott Ehlert
 Scott Furry
 Seafarix Ltd.
@@ -425,10 +449,12 @@ Vesa Pikki
 Ville-Pekka Vahteala
 Ville Skyttä
 Vincent Le Garrec
+Vít Ku�era
 Vladimir Petrigo
 Wang Haoyu
 Wang Yang
 WenChung Chiu
+William Jakobsson
 Wolfgang Stöggl
 x29a
 XhmikosR
@@ -442,4 +468,5 @@ Zhu Lei
 Дмитрий Старцев
 
 GUI graphics courtesy of Tango Desktop Project:
-http://tango.freedesktop.org
+https://gitlab.freedesktop.org/tango/tango-icon-theme
+https://commons.wikimedia.org/wiki/File:Refresh_file.svg
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3595154f7ae..f4e104cf96f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 3.13)
-project(Cppcheck VERSION 2.18.99 LANGUAGES CXX)
+cmake_minimum_required(VERSION 3.22)
+project(Cppcheck VERSION 2.22.99 LANGUAGES CXX)
 
 include(cmake/options.cmake)
 
@@ -11,11 +11,13 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 include(GNUInstallDirs)
+include(CTest)
 
 include(cmake/compilerCheck.cmake)
 include(cmake/versions.cmake)
 include(cmake/findDependencies.cmake)
 include(cmake/compileroptions.cmake)
+include(cmake/includechecks.cmake)
 include(cmake/compilerDefinitions.cmake)
 include(cmake/buildFiles.cmake)
 if(BUILD_GUI)
@@ -77,10 +79,6 @@ endif()
 # - Cygwin handling
 # - MinGW handling
 
-if(BUILD_TESTS)
-    enable_testing()
-endif()
-
 add_custom_target(copy_cfg ALL
     ${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/cfg"
         "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/cfg"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 715a913b6fc..09e88f021e2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ These are some guidelines *any* contributor should follow. They will help to mak
 
 ## Code Changes
 
-Code contributions are handled via GitHub pull requests: https://github.com/danmar/cppcheck/pulls.
+Code contributions are handled via GitHub pull requests: https://github.com/cppcheck-opensource/cppcheck/pulls.
 
 If you file a pull request you might not get a reply immediately. We are a very small team and it might not fit in the current scope or time.
 
@@ -18,7 +18,7 @@ Also after you filed a pull request please be ready to reply to questions and fe
 
 Please do not be discouraged if your change was rejected or if the review process might not have been as smooth as it could have been.
 
-Each change should be accompanied with a unit ([C++](https://github.com/danmar/cppcheck/tree/main/test)) or integration ([Python](https://github.com/danmar/cppcheck/tree/main/test/cli)) test to ensure that it doesn't regress with future changes. Negative tests (testing the opposite behavior) would be favorable but might not be required or might already exist depending on the change. Tests which introduce `TODO_ASSERT_` or `@pytest.mark.skip`/`@pytest.mark.xfail` should have tickets filed.
+Each change should be accompanied with a unit ([C++](https://github.com/cppcheck-opensource/cppcheck/tree/main/test)) or integration ([Python](https://github.com/cppcheck-opensource/cppcheck/tree/main/test/cli)) test to ensure that it doesn't regress with future changes. Negative tests (testing the opposite behavior) would be favorable but might not be required or might already exist depending on the change. Tests which introduce `TODO_ASSERT_` or `@pytest.mark.skip`/`@pytest.mark.xfail` should have tickets filed.
 
 If the change is modifying existing behavior (i.e. adding a feature or fixing a bug) it should be accompanied by an issue in the [tracker](https://trac.cppcheck.net) (if you do not have access we can assist with that). Depending on the change it might also warrant an entry in `releasenotes.txt`.
 
@@ -56,7 +56,7 @@ So if you start spending a lot of time on these, you might want to get into touc
 
 ## simplecpp
 
-At its core Cppcheck is relying on the `simplecpp` library which is a preprocessor implementation which was spun off into its [separate project](https://github.com/danmar/simplecpp) with its own [bug tracker](https://github.com/danmar/simplecpp/issues). This is also maintained by the Cppcheck developers and contributions to it are also welcome.
+At its core Cppcheck is relying on the `simplecpp` library which is a preprocessor implementation which was spun off into its [separate project](https://github.com/cppcheck-opensource/simplecpp) with its own [bug tracker](https://github.com/cppcheck-opensource/simplecpp/issues). This is also maintained by the Cppcheck developers and contributions to it are also welcome.
 
 ## Translations
 
diff --git a/Makefile b/Makefile
index 02482206b9a..6f86e205f77 100644
--- a/Makefile
+++ b/Makefile
@@ -155,6 +155,15 @@ else ifneq ($(HAVE_RULES),)
     $(error invalid HAVE_RULES value '$(HAVE_RULES)')
 endif
 
+# older make versions do not support # in $(shell) and newer ones handle the escape sequence literally
+REQUIRE_ESCAPE=$(shell echo "\#define DEF" | $(CXX) -c -xc - 2> /dev/null && echo "1" || echo "0")
+ifeq ($(REQUIRE_ESCAPE),1)
+    HAVE_EXECINFO_H=$(shell echo "\#include <execinfo.h>" | $(CXX) -c -xc - 2> /dev/null && echo "1" || echo "0")
+else
+    HAVE_EXECINFO_H=$(shell echo "#include <execinfo.h>" | $(CXX) -c -xc - 2> /dev/null && echo "1" || echo "0")
+endif
+override CPPFLAGS += -DHAVE_EXECINFO_H=$(HAVE_EXECINFO_H)
+
 override CXXFLAGS += $(CXXOPTS)
 override CPPFLAGS += $(CPPOPTS)
 override LDFLAGS += $(LDOPTS)
@@ -199,7 +208,6 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/addoninfo.o \
               $(libcppdir)/analyzerinfo.o \
               $(libcppdir)/astutils.o \
-              $(libcppdir)/check.o \
               $(libcppdir)/check64bit.o \
               $(libcppdir)/checkassert.o \
               $(libcppdir)/checkautovariables.o \
@@ -212,6 +220,7 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/checkersreport.o \
               $(libcppdir)/checkexceptionsafety.o \
               $(libcppdir)/checkfunctions.o \
+              $(libcppdir)/checkimpl.o \
               $(libcppdir)/checkinternal.o \
               $(libcppdir)/checkio.o \
               $(libcppdir)/checkleakautovar.o \
@@ -219,6 +228,7 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/checknullpointer.o \
               $(libcppdir)/checkother.o \
               $(libcppdir)/checkpostfixoperator.o \
+              $(libcppdir)/checks.o \
               $(libcppdir)/checksizeof.o \
               $(libcppdir)/checkstl.o \
               $(libcppdir)/checkstring.o \
@@ -294,6 +304,7 @@ TESTOBJ =     test/fixture.o \
               test/testbufferoverrun.o \
               test/testcharvar.o \
               test/testcheck.o \
+              test/testcheckersreport.o \
               test/testclangimport.o \
               test/testclass.o \
               test/testcmdlineparser.o \
@@ -327,6 +338,7 @@ TESTOBJ =     test/fixture.o \
               test/testpreprocessor.o \
               test/testprocessexecutor.o \
               test/testprogrammemory.o \
+              test/testrefthunk.o \
               test/testregex.o \
               test/testsarifreport.o \
               test/testsettings.o \
@@ -472,46 +484,43 @@ check-nonneg:
 
 ###### Build
 
-$(libcppdir)/valueflow.o: lib/valueflow.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.h lib/calculate.h lib/check.h lib/checkers.h lib/checkuninitvar.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/findtoken.h lib/forwardanalyzer.h lib/infer.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/programmemory.h lib/reverseanalyzer.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vf_analyzers.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
+$(libcppdir)/valueflow.o: lib/valueflow.cpp lib/analyzer.h lib/astutils.h lib/calculate.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkuninitvar.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/findtoken.h lib/forwardanalyzer.h lib/infer.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/programmemory.h lib/refthunk.h lib/reverseanalyzer.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vf_analyzers.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/valueflow.cpp
 
-$(libcppdir)/tokenize.o: lib/tokenize.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/summaries.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/tokenize.o: lib/tokenize.cpp externals/simplecpp/simplecpp.h lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/summaries.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/tokenize.cpp
 
-$(libcppdir)/symboldatabase.o: lib/symboldatabase.cpp lib/addoninfo.h lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/keywords.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/symboldatabase.o: lib/symboldatabase.cpp lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/keywords.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/symboldatabase.cpp
 
 $(libcppdir)/addoninfo.o: lib/addoninfo.cpp externals/picojson/picojson.h lib/addoninfo.h lib/config.h lib/json.h lib/path.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/addoninfo.cpp
 
-$(libcppdir)/analyzerinfo.o: lib/analyzerinfo.cpp externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/mathlib.h lib/path.h lib/platform.h lib/standards.h lib/utils.h lib/xml.h
+$(libcppdir)/analyzerinfo.o: lib/analyzerinfo.cpp externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/standards.h lib/utils.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/analyzerinfo.cpp
 
-$(libcppdir)/astutils.o: lib/astutils.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkclass.h lib/checkers.h lib/config.h lib/errortypes.h lib/findtoken.h lib/infer.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
+$(libcppdir)/astutils.o: lib/astutils.cpp lib/astutils.h lib/check.h lib/checkclass.h lib/checkers.h lib/checkimpl.h lib/config.h lib/errortypes.h lib/findtoken.h lib/infer.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/astutils.cpp
 
-$(libcppdir)/check.o: lib/check.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
-	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/check.cpp
-
-$(libcppdir)/check64bit.o: lib/check64bit.cpp lib/addoninfo.h lib/check.h lib/check64bit.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/check64bit.o: lib/check64bit.cpp lib/check.h lib/check64bit.h lib/checkers.h lib/checkimpl.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/check64bit.cpp
 
-$(libcppdir)/checkassert.o: lib/checkassert.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkassert.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkassert.o: lib/checkassert.cpp lib/astutils.h lib/check.h lib/checkassert.h lib/checkers.h lib/checkimpl.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkassert.cpp
 
-$(libcppdir)/checkautovariables.o: lib/checkautovariables.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkautovariables.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/checkautovariables.o: lib/checkautovariables.cpp lib/astutils.h lib/check.h lib/checkautovariables.h lib/checkers.h lib/checkimpl.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkautovariables.cpp
 
-$(libcppdir)/checkbool.o: lib/checkbool.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkbool.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkbool.o: lib/checkbool.cpp lib/astutils.h lib/check.h lib/checkbool.h lib/checkers.h lib/checkimpl.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkbool.cpp
 
-$(libcppdir)/checkbufferoverrun.o: lib/checkbufferoverrun.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/astutils.h lib/check.h lib/checkbufferoverrun.h lib/checkers.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/checkbufferoverrun.o: lib/checkbufferoverrun.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/checkbufferoverrun.h lib/checkers.h lib/checkimpl.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vf_common.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkbufferoverrun.cpp
 
-$(libcppdir)/checkclass.o: lib/checkclass.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/astutils.h lib/check.h lib/checkclass.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/checkclass.o: lib/checkclass.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/checkclass.h lib/checkers.h lib/checkimpl.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkclass.cpp
 
-$(libcppdir)/checkcondition.o: lib/checkcondition.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkcondition.h lib/checkers.h lib/checkother.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkcondition.o: lib/checkcondition.cpp lib/astutils.h lib/check.h lib/checkcondition.h lib/checkers.h lib/checkimpl.h lib/checkother.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkcondition.cpp
 
 $(libcppdir)/checkers.o: lib/checkers.cpp lib/checkers.h lib/config.h
@@ -520,73 +529,79 @@ $(libcppdir)/checkers.o: lib/checkers.cpp lib/checkers.h lib/config.h
 $(libcppdir)/checkersidmapping.o: lib/checkersidmapping.cpp lib/checkers.h lib/config.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkersidmapping.cpp
 
-$(libcppdir)/checkersreport.o: lib/checkersreport.cpp lib/addoninfo.h lib/checkers.h lib/checkersreport.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h
+$(libcppdir)/checkersreport.o: lib/checkersreport.cpp lib/addoninfo.h lib/checkers.h lib/checkersreport.h lib/config.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkersreport.cpp
 
-$(libcppdir)/checkexceptionsafety.o: lib/checkexceptionsafety.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkexceptionsafety.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkexceptionsafety.o: lib/checkexceptionsafety.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkexceptionsafety.h lib/checkimpl.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkexceptionsafety.cpp
 
-$(libcppdir)/checkfunctions.o: lib/checkfunctions.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkfunctions.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/checkfunctions.o: lib/checkfunctions.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkfunctions.h lib/checkimpl.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkfunctions.cpp
 
-$(libcppdir)/checkinternal.o: lib/checkinternal.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkinternal.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkimpl.o: lib/checkimpl.cpp lib/checkers.h lib/checkimpl.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkimpl.cpp
+
+$(libcppdir)/checkinternal.o: lib/checkinternal.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkinternal.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkinternal.cpp
 
-$(libcppdir)/checkio.o: lib/checkio.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkio.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkio.o: lib/checkio.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkio.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkio.cpp
 
-$(libcppdir)/checkleakautovar.o: lib/checkleakautovar.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkleakautovar.h lib/checkmemoryleak.h lib/checknullpointer.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkleakautovar.o: lib/checkleakautovar.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkleakautovar.h lib/checkmemoryleak.h lib/checknullpointer.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkleakautovar.cpp
 
-$(libcppdir)/checkmemoryleak.o: lib/checkmemoryleak.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkmemoryleak.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkmemoryleak.o: lib/checkmemoryleak.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkmemoryleak.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkmemoryleak.cpp
 
-$(libcppdir)/checknullpointer.o: lib/checknullpointer.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checknullpointer.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/findtoken.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/checknullpointer.o: lib/checknullpointer.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checknullpointer.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/findtoken.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checknullpointer.cpp
 
-$(libcppdir)/checkother.o: lib/checkother.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkother.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/checkother.o: lib/checkother.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkother.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkother.cpp
 
-$(libcppdir)/checkpostfixoperator.o: lib/checkpostfixoperator.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkpostfixoperator.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkpostfixoperator.o: lib/checkpostfixoperator.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkpostfixoperator.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkpostfixoperator.cpp
 
-$(libcppdir)/checksizeof.o: lib/checksizeof.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checksizeof.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checks.o: lib/checks.cpp lib/check.h lib/check64bit.h lib/checkassert.h lib/checkautovariables.h lib/checkbool.h lib/checkbufferoverrun.h lib/checkclass.h lib/checkcondition.h lib/checkexceptionsafety.h lib/checkfunctions.h lib/checkimpl.h lib/checkinternal.h lib/checkio.h lib/checkleakautovar.h lib/checkmemoryleak.h lib/checknullpointer.h lib/checkother.h lib/checkpostfixoperator.h lib/checks.h lib/checksizeof.h lib/checkstl.h lib/checkstring.h lib/checktype.h lib/checkuninitvar.h lib/checkunusedvar.h lib/checkvaarg.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/refthunk.h lib/standards.h lib/vfvalue.h
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checks.cpp
+
+$(libcppdir)/checksizeof.o: lib/checksizeof.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checksizeof.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checksizeof.cpp
 
-$(libcppdir)/checkstl.o: lib/checkstl.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checknullpointer.h lib/checkstl.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/pathanalysis.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/checkstl.o: lib/checkstl.cpp lib/astutils.h lib/calculate.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checknullpointer.h lib/checkstl.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/pathanalysis.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkstl.cpp
 
-$(libcppdir)/checkstring.o: lib/checkstring.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkstring.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkstring.o: lib/checkstring.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkstring.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkstring.cpp
 
-$(libcppdir)/checktype.o: lib/checktype.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checktype.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/checktype.o: lib/checktype.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checktype.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checktype.cpp
 
-$(libcppdir)/checkuninitvar.o: lib/checkuninitvar.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checknullpointer.h lib/checkuninitvar.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkuninitvar.o: lib/checkuninitvar.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checknullpointer.h lib/checkuninitvar.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkuninitvar.cpp
 
-$(libcppdir)/checkunusedfunctions.o: lib/checkunusedfunctions.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/astutils.h lib/checkers.h lib/checkunusedfunctions.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/checkunusedfunctions.o: lib/checkunusedfunctions.cpp externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/astutils.h lib/checkers.h lib/checkunusedfunctions.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkunusedfunctions.cpp
 
-$(libcppdir)/checkunusedvar.o: lib/checkunusedvar.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkunusedvar.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/checkunusedvar.o: lib/checkunusedvar.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkunusedvar.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkunusedvar.cpp
 
-$(libcppdir)/checkvaarg.o: lib/checkvaarg.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkvaarg.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkvaarg.o: lib/checkvaarg.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkvaarg.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkvaarg.cpp
 
-$(libcppdir)/clangimport.o: lib/clangimport.cpp lib/addoninfo.h lib/checkers.h lib/clangimport.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/clangimport.o: lib/clangimport.cpp lib/clangimport.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/refthunk.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/clangimport.cpp
 
 $(libcppdir)/color.o: lib/color.cpp lib/color.h lib/config.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/color.cpp
 
-$(libcppdir)/cppcheck.o: lib/cppcheck.cpp externals/picojson/picojson.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/checkunusedfunctions.h lib/clangimport.h lib/color.h lib/config.h lib/cppcheck.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/regex.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/version.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/cppcheck.o: lib/cppcheck.cpp externals/picojson/picojson.h externals/simplecpp/simplecpp.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/checks.h lib/checkunusedfunctions.h lib/clangimport.h lib/color.h lib/config.h lib/cppcheck.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/refthunk.h lib/regex.h lib/rule.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/version.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/cppcheck.cpp
 
-$(libcppdir)/ctu.o: lib/ctu.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/ctu.o: lib/ctu.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/refthunk.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/ctu.cpp
 
-$(libcppdir)/errorlogger.o: lib/errorlogger.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/errorlogger.o: lib/errorlogger.cpp externals/tinyxml2/tinyxml2.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/errorlogger.cpp
 
 $(libcppdir)/errortypes.o: lib/errortypes.cpp lib/config.h lib/errortypes.h lib/utils.h
@@ -595,13 +610,13 @@ $(libcppdir)/errortypes.o: lib/errortypes.cpp lib/config.h lib/errortypes.h lib/
 $(libcppdir)/findtoken.o: lib/findtoken.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/findtoken.h lib/library.h lib/mathlib.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/findtoken.cpp
 
-$(libcppdir)/forwardanalyzer.o: lib/forwardanalyzer.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/forwardanalyzer.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueptr.h lib/vfvalue.h
+$(libcppdir)/forwardanalyzer.o: lib/forwardanalyzer.cpp lib/analyzer.h lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/forwardanalyzer.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueptr.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/forwardanalyzer.cpp
 
-$(libcppdir)/fwdanalysis.o: lib/fwdanalysis.cpp lib/addoninfo.h lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/fwdanalysis.o: lib/fwdanalysis.cpp lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/fwdanalysis.cpp
 
-$(libcppdir)/importproject.o: lib/importproject.cpp externals/picojson/picojson.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/importproject.o: lib/importproject.cpp externals/picojson/picojson.h externals/tinyxml2/tinyxml2.h lib/checkers.h lib/config.h lib/filesettings.h lib/importproject.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/importproject.cpp
 
 $(libcppdir)/infer.o: lib/infer.cpp lib/calculate.h lib/config.h lib/errortypes.h lib/infer.h lib/mathlib.h lib/smallvector.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueptr.h lib/vfvalue.h
@@ -610,7 +625,7 @@ $(libcppdir)/infer.o: lib/infer.cpp lib/calculate.h lib/config.h lib/errortypes.
 $(libcppdir)/keywords.o: lib/keywords.cpp lib/config.h lib/keywords.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/keywords.cpp
 
-$(libcppdir)/library.o: lib/library.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/library.o: lib/library.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/refthunk.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/library.cpp
 
 $(libcppdir)/mathlib.o: lib/mathlib.cpp externals/simplecpp/simplecpp.h lib/config.h lib/errortypes.h lib/mathlib.h lib/smallvector.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
@@ -619,334 +634,340 @@ $(libcppdir)/mathlib.o: lib/mathlib.cpp externals/simplecpp/simplecpp.h lib/conf
 $(libcppdir)/path.o: lib/path.cpp externals/simplecpp/simplecpp.h lib/config.h lib/path.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/path.cpp
 
-$(libcppdir)/pathanalysis.o: lib/pathanalysis.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/pathanalysis.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/pathanalysis.o: lib/pathanalysis.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/pathanalysis.h lib/refthunk.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/pathanalysis.cpp
 
 $(libcppdir)/pathmatch.o: lib/pathmatch.cpp lib/config.h lib/path.h lib/pathmatch.h lib/standards.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/pathmatch.cpp
 
-$(libcppdir)/platform.o: lib/platform.cpp externals/tinyxml2/tinyxml2.h lib/config.h lib/mathlib.h lib/path.h lib/platform.h lib/standards.h lib/xml.h
+$(libcppdir)/platform.o: lib/platform.cpp externals/tinyxml2/tinyxml2.h lib/config.h lib/mathlib.h lib/path.h lib/platform.h lib/standards.h lib/utils.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/platform.cpp
 
-$(libcppdir)/preprocessor.o: lib/preprocessor.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
+$(libcppdir)/preprocessor.o: lib/preprocessor.cpp externals/simplecpp/simplecpp.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/refthunk.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/preprocessor.cpp
 
-$(libcppdir)/programmemory.o: lib/programmemory.cpp lib/addoninfo.h lib/astutils.h lib/calculate.h lib/checkers.h lib/config.h lib/errortypes.h lib/infer.h lib/library.h lib/mathlib.h lib/platform.h lib/programmemory.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
+$(libcppdir)/programmemory.o: lib/programmemory.cpp lib/astutils.h lib/calculate.h lib/checkers.h lib/config.h lib/errortypes.h lib/infer.h lib/library.h lib/mathlib.h lib/platform.h lib/programmemory.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/programmemory.cpp
 
 $(libcppdir)/regex.o: lib/regex.cpp lib/config.h lib/regex.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/regex.cpp
 
-$(libcppdir)/reverseanalyzer.o: lib/reverseanalyzer.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/forwardanalyzer.h lib/library.h lib/mathlib.h lib/platform.h lib/reverseanalyzer.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueptr.h lib/vfvalue.h
+$(libcppdir)/reverseanalyzer.o: lib/reverseanalyzer.cpp lib/analyzer.h lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/forwardanalyzer.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/reverseanalyzer.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueptr.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/reverseanalyzer.cpp
 
-$(libcppdir)/sarifreport.o: lib/sarifreport.cpp externals/picojson/picojson.h lib/addoninfo.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/json.h lib/library.h lib/mathlib.h lib/platform.h lib/sarifreport.h lib/settings.h lib/standards.h lib/utils.h
+$(libcppdir)/sarifreport.o: lib/sarifreport.cpp externals/picojson/picojson.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/json.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/sarifreport.h lib/settings.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/sarifreport.cpp
 
-$(libcppdir)/settings.o: lib/settings.cpp externals/picojson/picojson.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/summaries.h lib/suppressions.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/settings.o: lib/settings.cpp externals/picojson/picojson.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/rule.h lib/settings.h lib/standards.h lib/summaries.h lib/suppressions.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/settings.cpp
 
 $(libcppdir)/standards.o: lib/standards.cpp externals/simplecpp/simplecpp.h lib/config.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/standards.cpp
 
-$(libcppdir)/summaries.o: lib/summaries.cpp lib/addoninfo.h lib/analyzerinfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/summaries.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/summaries.o: lib/summaries.cpp lib/analyzerinfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/summaries.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/summaries.cpp
 
-$(libcppdir)/suppressions.o: lib/suppressions.cpp externals/tinyxml2/tinyxml2.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/smallvector.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/suppressions.o: lib/suppressions.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/suppressions.cpp
 
-$(libcppdir)/templatesimplifier.o: lib/templatesimplifier.cpp lib/addoninfo.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/templatesimplifier.o: lib/templatesimplifier.cpp lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/templatesimplifier.cpp
 
 $(libcppdir)/timer.o: lib/timer.cpp lib/config.h lib/timer.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/timer.cpp
 
-$(libcppdir)/token.o: lib/token.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/tokenrange.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/token.o: lib/token.cpp externals/simplecpp/simplecpp.h lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/tokenrange.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/token.cpp
 
-$(libcppdir)/tokenlist.o: lib/tokenlist.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/keywords.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/tokenlist.o: lib/tokenlist.cpp externals/simplecpp/simplecpp.h lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/keywords.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/tokenlist.cpp
 
 $(libcppdir)/utils.o: lib/utils.cpp lib/config.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/utils.cpp
 
-$(libcppdir)/vf_analyzers.o: lib/vf_analyzers.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.h lib/calculate.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/programmemory.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vf_analyzers.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
+$(libcppdir)/vf_analyzers.o: lib/vf_analyzers.cpp lib/analyzer.h lib/astutils.h lib/calculate.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/programmemory.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vf_analyzers.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_analyzers.cpp
 
-$(libcppdir)/vf_common.o: lib/vf_common.cpp lib/addoninfo.h lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
+$(libcppdir)/vf_common.o: lib/vf_common.cpp lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_common.cpp
 
-$(libcppdir)/vf_settokenvalue.o: lib/vf_settokenvalue.cpp lib/addoninfo.h lib/astutils.h lib/calculate.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
+$(libcppdir)/vf_settokenvalue.o: lib/vf_settokenvalue.cpp lib/astutils.h lib/calculate.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_settokenvalue.cpp
 
 $(libcppdir)/vfvalue.o: lib/vfvalue.cpp lib/config.h lib/errortypes.h lib/mathlib.h lib/smallvector.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vfvalue.cpp
 
-frontend/frontend.o: frontend/frontend.cpp frontend/frontend.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h
+frontend/frontend.o: frontend/frontend.cpp frontend/frontend.h lib/checkers.h lib/config.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_FE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ frontend/frontend.cpp
 
-cli/cmdlineparser.o: cli/cmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/filelister.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/regex.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h lib/xml.h
+cli/cmdlineparser.o: cli/cmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/filelister.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/checks.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/refthunk.h lib/regex.h lib/rule.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cmdlineparser.cpp
 
-cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h cli/executor.h cli/processexecutor.h cli/sehwrapper.h cli/signalhandler.h cli/singleexecutor.h cli/threadexecutor.h externals/picojson/picojson.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/checkersreport.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/sarifreport.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
+cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h cli/executor.h cli/processexecutor.h cli/sehwrapper.h cli/signalhandler.h cli/singleexecutor.h cli/threadexecutor.h externals/picojson/picojson.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/checkersreport.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/sarifreport.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cppcheckexecutor.cpp
 
-cli/executor.o: cli/executor.cpp cli/executor.h lib/addoninfo.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
+cli/executor.o: cli/executor.cpp cli/executor.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/executor.cpp
 
 cli/filelister.o: cli/filelister.cpp cli/filelister.h lib/config.h lib/filesettings.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/filelister.cpp
 
-cli/main.o: cli/main.cpp cli/cppcheckexecutor.h lib/config.h lib/errortypes.h lib/filesettings.h lib/mathlib.h lib/path.h lib/platform.h lib/standards.h
+cli/main.o: cli/main.cpp cli/cppcheckexecutor.h lib/config.h lib/filesettings.h lib/mathlib.h lib/path.h lib/platform.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/main.cpp
 
-cli/processexecutor.o: cli/processexecutor.cpp cli/executor.h cli/processexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
+cli/processexecutor.o: cli/processexecutor.cpp cli/executor.h cli/processexecutor.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/processexecutor.cpp
 
 cli/sehwrapper.o: cli/sehwrapper.cpp cli/sehwrapper.h lib/config.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/sehwrapper.cpp
 
-cli/signalhandler.o: cli/signalhandler.cpp cli/signalhandler.h cli/stacktrace.h lib/config.h lib/utils.h
+cli/signalhandler.o: cli/signalhandler.cpp cli/signalhandler.h cli/stacktrace.h lib/config.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/signalhandler.cpp
 
-cli/singleexecutor.o: cli/singleexecutor.cpp cli/executor.h cli/singleexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/timer.h lib/utils.h
+cli/singleexecutor.o: cli/singleexecutor.cpp cli/executor.h cli/singleexecutor.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/singleexecutor.cpp
 
 cli/stacktrace.o: cli/stacktrace.cpp cli/stacktrace.h lib/config.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/stacktrace.cpp
 
-cli/threadexecutor.o: cli/threadexecutor.cpp cli/executor.h cli/threadexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
+cli/threadexecutor.o: cli/threadexecutor.cpp cli/executor.h cli/threadexecutor.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/threadexecutor.cpp
 
-test/fixture.o: test/fixture.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/fixture.h test/helpers.h test/options.h test/redirect.h
+test/fixture.o: test/fixture.cpp externals/tinyxml2/tinyxml2.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/fixture.h test/helpers.h test/options.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/fixture.cpp
 
-test/helpers.o: test/helpers.cpp cli/filelister.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/helpers.h
+test/helpers.o: test/helpers.cpp cli/filelister.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/checkers.h lib/config.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/helpers.cpp
 
-test/main.o: test/main.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h test/options.h
+test/main.o: test/main.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h test/options.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/main.cpp
 
-test/options.o: test/options.cpp test/options.h
+test/options.o: test/options.cpp lib/config.h lib/timer.h test/options.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/options.cpp
 
-test/test64bit.o: test/test64bit.cpp lib/addoninfo.h lib/check.h lib/check64bit.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/test64bit.o: test/test64bit.cpp lib/check.h lib/check64bit.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/test64bit.cpp
 
-test/testanalyzerinformation.o: test/testanalyzerinformation.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h lib/xml.h test/fixture.h
+test/testanalyzerinformation.o: test/testanalyzerinformation.cpp externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h lib/xml.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testanalyzerinformation.cpp
 
-test/testassert.o: test/testassert.cpp lib/addoninfo.h lib/check.h lib/checkassert.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testassert.o: test/testassert.cpp lib/check.h lib/checkassert.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testassert.cpp
 
-test/testastutils.o: test/testastutils.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testastutils.o: test/testastutils.cpp lib/astutils.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testastutils.cpp
 
-test/testautovariables.o: test/testautovariables.cpp lib/addoninfo.h lib/check.h lib/checkautovariables.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testautovariables.o: test/testautovariables.cpp lib/check.h lib/checkautovariables.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testautovariables.cpp
 
-test/testbool.o: test/testbool.cpp lib/addoninfo.h lib/check.h lib/checkbool.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testbool.o: test/testbool.cpp lib/check.h lib/checkbool.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testbool.cpp
 
-test/testbufferoverrun.o: test/testbufferoverrun.cpp lib/addoninfo.h lib/check.h lib/checkbufferoverrun.h lib/checkers.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testbufferoverrun.o: test/testbufferoverrun.cpp lib/check.h lib/checkbufferoverrun.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testbufferoverrun.cpp
 
-test/testcharvar.o: test/testcharvar.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testcharvar.o: test/testcharvar.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcharvar.cpp
 
-test/testcheck.o: test/testcheck.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+test/testcheck.o: test/testcheck.cpp lib/check.h lib/checkers.h lib/checks.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcheck.cpp
 
-test/testclangimport.o: test/testclangimport.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/clangimport.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
+test/testcheckersreport.o: test/testcheckersreport.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkersreport.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcheckersreport.cpp
+
+test/testclangimport.o: test/testclangimport.cpp lib/check.h lib/checkers.h lib/clangimport.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testclangimport.cpp
 
-test/testclass.o: test/testclass.cpp lib/addoninfo.h lib/check.h lib/checkclass.h lib/checkers.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testclass.o: test/testclass.cpp lib/check.h lib/checkclass.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testclass.cpp
 
-test/testcmdlineparser.o: test/testcmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
+test/testcmdlineparser.o: test/testcmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/regex.h lib/rule.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcmdlineparser.cpp
 
-test/testcolor.o: test/testcolor.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+test/testcolor.o: test/testcolor.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcolor.cpp
 
-test/testcondition.o: test/testcondition.cpp lib/addoninfo.h lib/check.h lib/checkcondition.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testcondition.o: test/testcondition.cpp lib/check.h lib/checkcondition.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcondition.cpp
 
-test/testconstructors.o: test/testconstructors.cpp lib/addoninfo.h lib/check.h lib/checkclass.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testconstructors.o: test/testconstructors.cpp lib/check.h lib/checkclass.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testconstructors.cpp
 
-test/testcppcheck.o: test/testcppcheck.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
+test/testcppcheck.o: test/testcppcheck.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/refthunk.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcppcheck.cpp
 
-test/testerrorlogger.o: test/testerrorlogger.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/fixture.h test/helpers.h
+test/testerrorlogger.o: test/testerrorlogger.cpp externals/tinyxml2/tinyxml2.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testerrorlogger.cpp
 
-test/testexceptionsafety.o: test/testexceptionsafety.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkexceptionsafety.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testexceptionsafety.o: test/testexceptionsafety.cpp lib/check.h lib/checkers.h lib/checkexceptionsafety.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testexceptionsafety.cpp
 
-test/testexecutor.o: test/testexecutor.cpp cli/executor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testexecutor.o: test/testexecutor.cpp cli/executor.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testexecutor.cpp
 
-test/testfilelister.o: test/testfilelister.cpp cli/filelister.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+test/testfilelister.o: test/testfilelister.cpp cli/filelister.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfilelister.cpp
 
-test/testfilesettings.o: test/testfilesettings.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+test/testfilesettings.o: test/testfilesettings.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfilesettings.cpp
 
-test/testfrontend.o: test/testfrontend.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+test/testfrontend.o: test/testfrontend.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfrontend.cpp
 
-test/testfunctions.o: test/testfunctions.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkfunctions.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testfunctions.o: test/testfunctions.cpp lib/check.h lib/checkers.h lib/checkfunctions.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfunctions.cpp
 
-test/testgarbage.o: test/testgarbage.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testgarbage.o: test/testgarbage.cpp lib/check.h lib/checkers.h lib/checks.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testgarbage.cpp
 
-test/testimportproject.o: test/testimportproject.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h lib/xml.h test/fixture.h test/redirect.h
+test/testimportproject.o: test/testimportproject.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testimportproject.cpp
 
-test/testincompletestatement.o: test/testincompletestatement.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testincompletestatement.o: test/testincompletestatement.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testincompletestatement.cpp
 
-test/testinternal.o: test/testinternal.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkinternal.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testinternal.o: test/testinternal.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkinternal.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testinternal.cpp
 
-test/testio.o: test/testio.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkio.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testio.o: test/testio.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkio.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testio.cpp
 
-test/testleakautovar.o: test/testleakautovar.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkleakautovar.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testleakautovar.o: test/testleakautovar.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkleakautovar.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testleakautovar.cpp
 
-test/testlibrary.o: test/testlibrary.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testlibrary.o: test/testlibrary.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testlibrary.cpp
 
-test/testmathlib.o: test/testmathlib.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
+test/testmathlib.o: test/testmathlib.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testmathlib.cpp
 
-test/testmemleak.o: test/testmemleak.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkmemoryleak.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testmemleak.o: test/testmemleak.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkmemoryleak.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testmemleak.cpp
 
-test/testnullpointer.o: test/testnullpointer.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checknullpointer.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testnullpointer.o: test/testnullpointer.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checknullpointer.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testnullpointer.cpp
 
-test/testoptions.o: test/testoptions.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h test/options.h
+test/testoptions.o: test/testoptions.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h test/options.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testoptions.cpp
 
-test/testother.o: test/testother.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testother.o: test/testother.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testother.cpp
 
-test/testpath.o: test/testpath.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testpath.o: test/testpath.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpath.cpp
 
-test/testpathmatch.o: test/testpathmatch.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+test/testpathmatch.o: test/testpathmatch.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpathmatch.cpp
 
-test/testplatform.o: test/testplatform.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h lib/xml.h test/fixture.h
+test/testplatform.o: test/testplatform.cpp externals/tinyxml2/tinyxml2.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h lib/xml.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testplatform.cpp
 
-test/testpostfixoperator.o: test/testpostfixoperator.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkpostfixoperator.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testpostfixoperator.o: test/testpostfixoperator.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkpostfixoperator.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpostfixoperator.cpp
 
-test/testpreprocessor.o: test/testpreprocessor.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testpreprocessor.o: test/testpreprocessor.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/refthunk.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpreprocessor.cpp
 
-test/testprocessexecutor.o: test/testprocessexecutor.cpp cli/executor.h cli/processexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
+test/testprocessexecutor.o: test/testprocessexecutor.cpp cli/executor.h cli/processexecutor.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testprocessexecutor.cpp
 
-test/testprogrammemory.o: test/testprogrammemory.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/programmemory.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testprogrammemory.o: test/testprogrammemory.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/programmemory.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testprogrammemory.cpp
 
-test/testregex.o: test/testregex.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/regex.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+test/testrefthunk.o: test/testrefthunk.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testrefthunk.cpp
+
+test/testregex.o: test/testregex.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/regex.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testregex.cpp
 
-test/testsarifreport.o: test/testsarifreport.cpp externals/picojson/picojson.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/json.h lib/library.h lib/mathlib.h lib/platform.h lib/sarifreport.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+test/testsarifreport.o: test/testsarifreport.cpp externals/picojson/picojson.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/json.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/sarifreport.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsarifreport.cpp
 
-test/testsettings.o: test/testsettings.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testsettings.o: test/testsettings.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsettings.cpp
 
-test/testsimplifytemplate.o: test/testsimplifytemplate.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testsimplifytemplate.o: test/testsimplifytemplate.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytemplate.cpp
 
-test/testsimplifytokens.o: test/testsimplifytokens.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testsimplifytokens.o: test/testsimplifytokens.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytokens.cpp
 
-test/testsimplifytypedef.o: test/testsimplifytypedef.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testsimplifytypedef.o: test/testsimplifytypedef.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytypedef.cpp
 
-test/testsimplifyusing.o: test/testsimplifyusing.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testsimplifyusing.o: test/testsimplifyusing.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifyusing.cpp
 
-test/testsingleexecutor.o: test/testsingleexecutor.cpp cli/executor.h cli/singleexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
+test/testsingleexecutor.o: test/testsingleexecutor.cpp cli/executor.h cli/singleexecutor.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsingleexecutor.cpp
 
-test/testsizeof.o: test/testsizeof.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checksizeof.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testsizeof.o: test/testsizeof.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checksizeof.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsizeof.cpp
 
-test/teststandards.o: test/teststandards.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+test/teststandards.o: test/teststandards.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststandards.cpp
 
-test/teststl.o: test/teststl.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkstl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/teststl.o: test/teststl.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkstl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststl.cpp
 
-test/teststring.o: test/teststring.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkstring.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/teststring.o: test/teststring.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkstring.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststring.cpp
 
-test/testsummaries.o: test/testsummaries.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/summaries.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testsummaries.o: test/testsummaries.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/summaries.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsummaries.cpp
 
-test/testsuppressions.o: test/testsuppressions.cpp cli/cppcheckexecutor.h cli/executor.h cli/processexecutor.h cli/singleexecutor.h cli/threadexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testsuppressions.o: test/testsuppressions.cpp cli/cppcheckexecutor.h cli/executor.h cli/processexecutor.h cli/singleexecutor.h cli/threadexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsuppressions.cpp
 
-test/testsymboldatabase.o: test/testsymboldatabase.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testsymboldatabase.o: test/testsymboldatabase.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsymboldatabase.cpp
 
-test/testthreadexecutor.o: test/testthreadexecutor.cpp cli/executor.h cli/threadexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
+test/testthreadexecutor.o: test/testthreadexecutor.cpp cli/executor.h cli/threadexecutor.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testthreadexecutor.cpp
 
-test/testtimer.o: test/testtimer.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/timer.h lib/utils.h test/fixture.h
+test/testtimer.o: test/testtimer.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/timer.h lib/utils.h test/fixture.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtimer.cpp
 
-test/testtoken.o: test/testtoken.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testtoken.o: test/testtoken.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtoken.cpp
 
-test/testtokenize.o: test/testtokenize.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testtokenize.o: test/testtokenize.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtokenize.cpp
 
-test/testtokenlist.o: test/testtokenlist.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testtokenlist.o: test/testtokenlist.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtokenlist.cpp
 
-test/testtokenrange.o: test/testtokenrange.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/tokenrange.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testtokenrange.o: test/testtokenrange.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/tokenrange.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtokenrange.cpp
 
-test/testtype.o: test/testtype.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checktype.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testtype.o: test/testtype.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checktype.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtype.cpp
 
-test/testuninitvar.o: test/testuninitvar.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkuninitvar.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testuninitvar.o: test/testuninitvar.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkuninitvar.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testuninitvar.cpp
 
-test/testunusedfunctions.o: test/testunusedfunctions.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkunusedfunctions.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testunusedfunctions.o: test/testunusedfunctions.cpp lib/check.h lib/checkers.h lib/checkunusedfunctions.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedfunctions.cpp
 
-test/testunusedprivfunc.o: test/testunusedprivfunc.cpp lib/addoninfo.h lib/check.h lib/checkclass.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testunusedprivfunc.o: test/testunusedprivfunc.cpp lib/check.h lib/checkclass.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedprivfunc.cpp
 
-test/testunusedvar.o: test/testunusedvar.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkers.h lib/checkunusedvar.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testunusedvar.o: test/testunusedvar.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkunusedvar.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedvar.cpp
 
-test/testutils.o: test/testutils.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+test/testutils.o: test/testutils.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testutils.cpp
 
-test/testvaarg.o: test/testvaarg.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkvaarg.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testvaarg.o: test/testvaarg.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkvaarg.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvaarg.cpp
 
-test/testvalueflow.o: test/testvalueflow.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testvalueflow.o: test/testvalueflow.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvalueflow.cpp
 
-test/testvarid.o: test/testvarid.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testvarid.o: test/testvarid.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvarid.cpp
 
-test/testvfvalue.o: test/testvfvalue.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h lib/vfvalue.h test/fixture.h
+test/testvfvalue.o: test/testvfvalue.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h lib/vfvalue.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvfvalue.cpp
 
 externals/simplecpp/simplecpp.o: externals/simplecpp/simplecpp.cpp externals/simplecpp/simplecpp.h
diff --git a/TUNING.md b/TUNING.md
index 4643e7d506a..ba1f7f49738 100644
--- a/TUNING.md
+++ b/TUNING.md
@@ -46,7 +46,7 @@ In our case Clang is mostly faster than GCC. See https://trac.cppcheck.net/ticke
 
 ### Use More Advanced Optimizations
 
-By default we enforce the `-O2` optimization level. Even when using the `Release` build type in CMake which defaults to `-O3`. It might be possible that building with `-O3` might yield a perfomance increase.
+By default we enforce the `-O2` optimization level. Even when using the `Release` build type in CMake which defaults to `-O3`. It might be possible that building with `-O3` might yield a performance increase.
 
 There are also no additional code generation flags provided so the resulting binary can run on any system. You might be able to tune this and apply more optimization which is tailored to the system you will be running the binary on.
 
diff --git a/addons/README.md b/addons/README.md
index 8df8229b970..05502f547b6 100644
--- a/addons/README.md
+++ b/addons/README.md
@@ -4,19 +4,19 @@ Addons are scripts that analyses Cppcheck dump files to check compatibility with
 
 ## Supported addons
 
-+ [misra.py](https://github.com/danmar/cppcheck/blob/main/addons/misra.py) 
-  Used to verify compliance with MISRA C 2012 - a proprietary set of guidelines to avoid such questionable code, developed for embedded systems. Since this standard is proprietary, cppcheck does not display error text by specifying only the number of violated rules (for example, [c2012-21.3]). If you want to display full texts for violated rules, you will need to create a text file containing MISRA rules, which you will have to pass when calling the script with `--rule-texts` key. Some examples of rule texts files available in [tests directory](https://github.com/danmar/cppcheck/blob/main/addons/test/misra/).
-+ [y2038.py](https://github.com/danmar/cppcheck/blob/main/addons/y2038.py) 
-  Checks code for [year 2038 problem](https://en.wikipedia.org/wiki/Year_2038_problem) safety. See complete description [here](https://github.com/danmar/cppcheck/blob/main/addons/doc/y2038.md).
-+ [threadsafety.py](https://github.com/danmar/cppcheck/blob/main/addons/threadsafety.py) 
++ [misra.py](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/misra.py) 
+  Used to verify compliance with MISRA C 2012 - a proprietary set of guidelines to avoid such questionable code, developed for embedded systems. Since this standard is proprietary, cppcheck does not display error text by specifying only the number of violated rules (for example, [c2012-21.3]). If you want to display full texts for violated rules, you will need to create a text file containing MISRA rules, which you will have to pass when calling the script with `--rule-texts` key. Some examples of rule texts files available in [tests directory](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/test/misra/).
++ [y2038.py](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/y2038.py) 
+  Checks code for [year 2038 problem](https://en.wikipedia.org/wiki/Year_2038_problem) safety. See complete description [here](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/doc/y2038.md).
++ [threadsafety.py](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/threadsafety.py) 
   Analyse Cppcheck dump files to locate threadsafety issues like static local objects used by multiple threads.
-+ [naming.py](https://github.com/danmar/cppcheck/blob/main/addons/naming.py)
++ [naming.py](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/naming.py)
   Enforces naming conventions across the code.
-+ [namingng.py](https://github.com/danmar/cppcheck/blob/main/addons/namingng.py)
++ [namingng.py](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/namingng.py)
   Enforces naming conventions across the code. Enhanced version with support for type prefixes in variable and function names.
-+ [findcasts.py](https://github.com/danmar/cppcheck/blob/main/addons/findcasts.py)
++ [findcasts.py](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/findcasts.py)
   Locates casts in the code.
-+ [misc.py](https://github.com/danmar/cppcheck/blob/main/addons/misc.py)
++ [misc.py](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/misc.py)
   Performs miscellaneous checks.
 
 ### Other files
@@ -68,5 +68,5 @@ This allows you to add additional parameters when calling the script (for exampl
 
 When using the graphical interface `cppcheck-gui`, the selection and configuration of addons is carried out on the tab `Addons and tools` in the project settings (`Edit Project File`):
 
-![Screenshot](https://raw.githubusercontent.com/danmar/cppcheck/main/addons/doc/img/cppcheck-gui-addons.png)
+![Screenshot](https://raw.githubusercontent.com/cppcheck-opensource/cppcheck/main/addons/doc/img/cppcheck-gui-addons.png)
 
diff --git a/addons/cppcheckdata.py b/addons/cppcheckdata.py
index dbe36d56a57..4271bd81376 100755
--- a/addons/cppcheckdata.py
+++ b/addons/cppcheckdata.py
@@ -7,7 +7,11 @@
 """
 
 import argparse
+import contextlib
+import functools
+import gc
 import json
+import mmap
 import os
 import sys
 import subprocess
@@ -38,6 +42,48 @@
 
 current_dumpfile_suppressions = []
 
+# Size of the chunks that are fed to the XML parser
+_PARSE_CHUNK_SIZE = 1 << 16
+
+_DUMP_START_TAG = b'<dump '
+_DUMP_END_TAG = b'</dump>'
+
+
+@contextlib.contextmanager
+def _gc_disabled():
+    # Loading a dump file creates a lot of objects and none of them become
+    # garbage. The cyclic garbage collector would traverse them again and
+    # again, which takes about half of the loading time.
+    enabled = gc.isenabled()
+    gc.disable()
+    try:
+        yield
+    finally:
+        if enabled:
+            gc.enable()
+
+
+def _feed_without_configurations(parser, filename):
+    """
+    Feed the dump file to the parser, except for the <dump> elements.
+    The configurations are most of the file, and skipping them avoids
+    parsing the whole file to get the data that is written after them.
+    A '<' in attribute values is escaped, so the tags are found with a
+    plain search.
+    """
+    with open(filename, 'rb') as f:
+        if os.fstat(f.fileno()).st_size == 0:
+            return
+        with mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ) as data:
+            first = data.find(_DUMP_START_TAG)
+            last = data.rfind(_DUMP_END_TAG)
+            if first < 0 or last < first:
+                parser.feed(data[:])
+            else:
+                parser.feed(data[:first])
+                parser.feed(data[last + len(_DUMP_END_TAG):])
+
+
 def _load_location(location, element):
     """Load location from element/dict"""
     location.file = element.get('file')
@@ -274,7 +320,7 @@ class Token:
         astParent          ast parent
         astOperand1        ast operand1
         astOperand2        ast operand2
-        orriginalName      orriginal name of the token
+        orriginalName      original name of the token
         valueType          type information: container/..
         file               file name
         linenr             line number
@@ -1003,7 +1049,7 @@ def isMatch(self, file, line, message, errorId):
                 and (self.symbolName is None or fnmatch(message, '*'+self.symbolName+'*'))
                 and fnmatch(errorId, self.errorId)):
             return True
-        # Other Suppression (Globaly set via suppression file or cli command)
+        # Other Suppression (Globally set via suppression file or cli command)
         if ((self.fileName is None or fnmatch(file, self.fileName))
                 and (self.suppressionType is None)
                 and (self.symbolName is None or fnmatch(message, '*'+self.symbolName+'*'))
@@ -1180,6 +1226,155 @@ def __repr__(self):
         )
 
 
+class _DumpInfoBuilder:
+    """
+    XML parser target that loads the data that is not part of a configuration:
+    the language, platform, raw tokens and suppressions.
+    """
+
+    def __init__(self, cppcheck_data):
+        # Note: a 'data' attribute would be called by the parser for character data
+        self.cppcheck_data = cppcheck_data
+
+    def start(self, tag, attrib):
+        data = self.cppcheck_data
+        if tag == 'tok':
+            tok = Token(attrib)
+            tok.file = data.files[int(attrib.get('fileIndex'))]
+            data.rawTokens.append(tok)
+        elif tag == 'file':
+            data.files.append(attrib.get('name'))
+        elif tag == 'suppression':
+            data.suppressions.append(Suppression(attrib))
+        elif tag == 'platform':
+            data.platform = Platform(attrib)
+        elif tag == 'dumps':
+            data.language = attrib.get('language')
+
+
+class _ConfigurationBuilder:
+    """
+    XML parser target that creates a Configuration for each <dump> element.
+    The objects are created directly from the attributes, no element tree is built.
+    """
+
+    def __init__(self):
+        self.configurations = []  # completed configurations
+        self.cfg = None
+        self.cfg_arguments = []  # function arguments for Configuration node initialization
+
+        # Iterating <varlist> in a <scope>.
+        self.iter_scope_varlist = False
+
+        # Iterating <typedef-info>
+        self.iter_typedef_info = False
+
+        # Iterating <directive>
+        self.iter_directive = False
+
+    def take_configurations(self):
+        configurations = self.configurations
+        self.configurations = []
+        return configurations
+
+    def start(self, tag, attrib):
+        # The most common elements are checked first
+        cfg = self.cfg
+
+        # Parse tokens
+        if tag == 'token':
+            if not self.iter_directive and not self.iter_typedef_info:
+                cfg.tokenlist.append(Token(attrib))
+
+        # Parse valueflows (list of values)
+        elif tag == 'value':
+            cfg.valueflow[-1].values.append(Value(attrib))
+        elif tag == 'values':
+            cfg.valueflow.append(ValueFlow(attrib))
+
+        # Parse scopes
+        elif tag == 'scope':
+            cfg.scopes.append(Scope(attrib))
+        elif tag == 'varlist':
+            self.iter_scope_varlist = True
+
+        # Parse variables
+        elif tag == 'var':
+            if self.iter_scope_varlist:
+                cfg.scopes[-1].varlistId.append(attrib.get('id'))
+            else:
+                var = Variable(attrib)
+                if var.nameTokenId:
+                    cfg.variables.append(var)
+                else:
+                    self.cfg_arguments.append(var)
+
+        # Parse functions
+        elif tag == 'function':
+            cfg.functions.append(Function(attrib, cfg.scopes[-1]))
+
+        # Parse function arguments
+        elif tag == 'arg':
+            arg_nr = int(attrib.get('nr'))
+            arg_variable_id = attrib.get('variable')
+            cfg.functions[-1].argumentId[arg_nr] = arg_variable_id
+
+        # Parse directives list
+        elif tag == 'directive':
+            cfg.directives.append(Directive(attrib))
+            self.iter_directive = True
+
+        # Parse macro usage
+        elif tag == 'macro':
+            cfg.macro_usage.append(MacroUsage(attrib))
+
+        # Preprocessor #if/#elif condition
+        elif tag == 'if-cond':
+            cfg.preprocessor_if_conditions.append(PreprocessorIfCondition(attrib))
+
+        # Parse containers
+        elif tag == 'container':
+            cfg.containers.append(Container(attrib))
+
+        # Parse typedef info
+        elif tag == 'typedef-info':
+            self.iter_typedef_info = True
+        elif tag == 'info':
+            if self.iter_typedef_info:
+                cfg.typedefInfo.append(TypedefInfo(attrib))
+
+        # Serialize new configuration node
+        elif tag == 'dump':
+            self.cfg = Configuration(attrib.get('cfg'))
+
+        elif tag == 'clang-warning':
+            cfg.clang_warnings.append({'file': attrib.get('file'),
+                                       'line': int(attrib.get('line')),
+                                       'column': int(attrib.get('column')),
+                                       'message': attrib.get('message')})
+
+        # Parse standards
+        elif tag == 'c':
+            cfg.standards.set_c(attrib)
+        elif tag == 'cpp':
+            cfg.standards.set_cpp(attrib)
+        elif tag == 'posix':
+            cfg.standards.set_posix(attrib)
+
+    def end(self, tag):
+        if tag == 'directive':
+            self.iter_directive = False
+        elif tag == 'varlist':
+            self.iter_scope_varlist = False
+        elif tag == 'typedef-info':
+            self.iter_typedef_info = False
+        elif tag == 'dump':
+            self.cfg.setIdMap(self.cfg_arguments)
+            self.configurations.append(self.cfg)
+            self.cfg = None
+            self.cfg_arguments = []
+
+
 class CppcheckData:
     """
     Class that makes cppcheck dump data available
@@ -1191,6 +1386,10 @@ class CppcheckData:
         suppressions      List of Suppressions
         files             Source files for elements occurred in this configuration
 
+    To iterate more than once, use the configurations property: it parses the
+    dump file once and keeps all configurations. To iterate once, use
+    iterconfigurations(): it parses on each call but uses less memory.
+
     To iterate through all configurations use such code:
     @code
     data = cppcheckdata.parsedump(...)
@@ -1229,35 +1428,14 @@ def __init__(self, filename):
         self.platform = None
         self.suppressions = []
         self.files = [] # source files for elements occurred in this configuration
+        self._configurations = None # set by the configurations property
 
-        platform_done = False
-        rawtokens_done = False
-        suppressions_done = False
-
-        # Parse general configuration options from <dumps> node
-        # We intentionally don't clean node resources here because we
-        # want to serialize in memory only small part of the XML tree.
-        for event, node in ElementTree.iterparse(self.filename, events=('start', 'end')):
-            if platform_done and rawtokens_done and suppressions_done:
-                break
-            if node.tag == 'dumps':
-                self.language = node.get('language')
-            if node.tag == 'platform' and event == 'start':
-                self.platform = Platform(node)
-                platform_done = True
-            elif node.tag == 'rawtokens' and event == 'end':
-                for rawtokens_node in node:
-                    if rawtokens_node.tag == 'file':
-                        self.files.append(rawtokens_node.get('name'))
-                    elif rawtokens_node.tag == 'tok':
-                        tok = Token(rawtokens_node)
-                        tok.file = self.files[int(rawtokens_node.get('fileIndex'))]
-                        self.rawTokens.append(tok)
-                rawtokens_done = True
-            elif node.tag == 'suppressions' and event == 'end':
-                for suppressions_node in node:
-                    self.suppressions.append(Suppression(suppressions_node))
-                suppressions_done = True
+        # Parse general configuration options from <dumps> node, the raw tokens
+        # and the suppressions. The configurations are parsed by iterconfigurations.
+        parser = ElementTree.XMLParser(target=_DumpInfoBuilder(self))
+        with _gc_disabled():
+            _feed_without_configurations(parser, self.filename)
+            parser.close()
 
         global current_dumpfile_suppressions
         current_dumpfile_suppressions = self.suppressions
@@ -1271,151 +1449,37 @@ def __init__(self, filename):
     def configurations(self):
         """
         Return the list of all available Configuration objects.
+        The list is loaded on first access and kept for later accesses and
+        iterconfigurations().
         """
-        return list(self.iterconfigurations())
+        if self._configurations is None:
+            self._configurations = list(self.iterconfigurations())
+        return self._configurations
 
     def iterconfigurations(self):
         """
         Create and return iterator for the available Configuration objects.
         The iterator loops over all Configurations in the dump file tree, in document order.
+        Uses the kept list if the configurations property has been accessed,
+        otherwise parses the dump file one configuration at a time.
         """
-        cfg = None
-        cfg_arguments = []  # function arguments for Configuration node initialization
-        cfg_function = None
-        cfg_valueflow = None
-
-        # Iterating <varlist> in a <scope>.
-        iter_scope_varlist = False
-
-        # Iterating <typedef-info>
-        iter_typedef_info = False
-
-        # Iterating <directive>
-        iter_directive = False
-
-        # Use iterable objects to traverse XML tree for dump files incrementally.
-        # Iterative approach is required to avoid large memory consumption.
-        # Calling .clear() is necessary to let the element be garbage collected.
-        for event, node in ElementTree.iterparse(self.filename, events=('start', 'end')):
-            # Serialize new configuration node
-            if node.tag == 'dump':
-                if event == 'start':
-                    cfg = Configuration(node.get('cfg'))
-                    continue
-                if event == 'end':
-                    cfg.setIdMap(cfg_arguments)
-                    yield cfg
-                    cfg = None
-                    cfg_arguments = []
-
-            elif node.tag == 'clang-warning' and event == 'start':
-                cfg.clang_warnings.append({'file': node.get('file'),
-                                           'line': int(node.get('line')),
-                                           'column': int(node.get('column')),
-                                           'message': node.get('message')})
-            # Parse standards
-            elif node.tag == "standards" and event == 'start':
-                continue
-            elif node.tag == 'c' and event == 'start':
-                cfg.standards.set_c(node)
-            elif node.tag == 'cpp' and event == 'start':
-                cfg.standards.set_cpp(node)
-            elif node.tag == 'posix' and event == 'start':
-                cfg.standards.set_posix(node)
-
-            # Parse directives list
-            elif node.tag == 'directive':
-                if event == 'start':
-                    cfg.directives.append(Directive(node))
-                    iter_directive = True
-                elif event == 'end':
-                    iter_directive = False
-            # Parse macro usage
-            elif node.tag == 'macro' and event == 'start':
-                cfg.macro_usage.append(MacroUsage(node))
-
-            # Preprocessor #if/#elif condition
-            elif node.tag == "if-cond" and event == 'start':
-                cfg.preprocessor_if_conditions.append(PreprocessorIfCondition(node))
-
-            # Parse tokens
-            elif node.tag == 'tokenlist' and event == 'start':
-                continue
-            elif node.tag == 'token' and event == 'start' and not iter_directive and not iter_typedef_info:
-                cfg.tokenlist.append(Token(node))
-
-            # Parse scopes
-            elif node.tag == 'scopes' and event == 'start':
-                continue
-            elif node.tag == 'scope' and event == 'start':
-                cfg.scopes.append(Scope(node))
-            elif node.tag == 'varlist':
-                if event == 'start':
-                    iter_scope_varlist = True
-                elif event == 'end':
-                    iter_scope_varlist = False
-
-            # Parse functions
-            elif node.tag == 'functionList' and event == 'start':
-                continue
-            elif node.tag == 'function':
-                if event == 'start':
-                    cfg_function = Function(node, cfg.scopes[-1])
-                    continue
-                if event == 'end':
-                    cfg.functions.append(cfg_function)
-                    cfg_function = None
-
-            # Parse function arguments
-            elif node.tag == 'arg' and event == 'start':
-                arg_nr = int(node.get('nr'))
-                arg_variable_id = node.get('variable')
-                cfg_function.argumentId[arg_nr] = arg_variable_id
-
-            # Parse variables
-            elif node.tag == 'var' and event == 'start':
-                if iter_scope_varlist:
-                    cfg.scopes[-1].varlistId.append(node.get('id'))
-                else:
-                    var = Variable(node)
-                    if var.nameTokenId:
-                        cfg.variables.append(var)
-                    else:
-                        cfg_arguments.append(var)
-
-            # Parse containers
-            elif node.tag == 'containers' and event == 'start':
-                continue
-            elif node.tag == 'container' and event == 'start':
-                cfg.containers.append(Container(node))
-
-            # Parse typedef info
-            elif node.tag == 'typedef-info':
-                iter_typedef_info = (event == 'start')
-            elif iter_typedef_info and node.tag == 'info' and event == 'start':
-                cfg.typedefInfo.append(TypedefInfo(node))
-
-            # Parse template-token
-            #elif node.tag == 'TokenAndName' and event == 'start': #todo add processing of containers
-            #    cfg.containers.append(Container(node))
-
-            # Parse valueflows (list of values)
-            elif node.tag == 'valueflow' and event == 'start':
-                continue
-            elif node.tag == 'values':
-                if event == 'start':
-                    cfg_valueflow = ValueFlow(node)
-                    continue
-                if event == 'end':
-                    cfg.valueflow.append(cfg_valueflow)
-                    cfg_valueflow = None
-
-            # Parse values
-            elif node.tag == 'value' and event == 'start':
-                cfg_valueflow.values.append(Value(node))
-
-            # Remove links to the sibling nodes
-            node.clear()
+        if self._configurations is not None:
+            yield from self._configurations
+            return
+        # Parse the dump file incrementally to avoid large memory consumption.
+        # A configuration is returned as soon as its </dump> has been parsed.
+        # The garbage collector is only disabled while parsing, not while the
+        # caller uses the configuration.
+        builder = _ConfigurationBuilder()
+        parser = ElementTree.XMLParser(target=builder)
+        with open(self.filename, 'rb') as f:
+            for chunk in iter(functools.partial(f.read, _PARSE_CHUNK_SIZE), b''):
+                with _gc_disabled():
+                    parser.feed(chunk)
+                yield from builder.take_configurations()
+        with _gc_disabled():
+            parser.close()
+        yield from builder.take_configurations()
 
     def __repr__(self):
         attrs = ["configurations", "platform"]
diff --git a/addons/misc.py b/addons/misc.py
index 670d6152ff5..5cf073abb72 100644
--- a/addons/misc.py
+++ b/addons/misc.py
@@ -48,7 +48,7 @@ def isStringLiteral(tokenString):
 def stringConcatInArrayInit(data):
     # Get all string macros
     stringMacros = []
-    for cfg in data.iterconfigurations():
+    for cfg in data.configurations:
         for directive in cfg.directives:
             res = re.match(r'#define[ ]+([A-Za-z0-9_]+)[ ]+".*', directive.str)
             if res:
@@ -76,7 +76,7 @@ def stringConcatInArrayInit(data):
 
 
 def implicitlyVirtual(data):
-    for cfg in data.iterconfigurations():
+    for cfg in data.configurations:
         for function in cfg.functions:
             if function.isImplicitlyVirtual is None:
                 continue
@@ -85,7 +85,7 @@ def implicitlyVirtual(data):
             reportError(function.tokenDef, 'style', 'Function \'' + function.name + '\' overrides base class function but is not marked with \'virtual\' keyword.', 'implicitlyVirtual')
 
 def ellipsisStructArg(data):
-    for cfg in data.iterconfigurations():
+    for cfg in data.configurations:
         for tok in cfg.tokenlist:
             if tok.str != '(':
                 continue
diff --git a/addons/misra.py b/addons/misra.py
index cea5596d47d..7c7774c52e3 100755
--- a/addons/misra.py
+++ b/addons/misra.py
@@ -538,6 +538,20 @@ def is_source_file(file):
     return file.endswith('.c')
 
 
+def has_prior_function_prototype(cfg, function):
+    """Return whether a global prototype precedes the function definition."""
+    for token in cfg.tokenlist:
+        if token == function.tokenDef:
+            break
+        if token.str != function.name or token.scope.type != 'Global':
+            continue
+        opening = token.next
+        if opening and opening.str == '(' and opening.link and \
+                opening.link.next and opening.link.next.str == ';':
+            return True
+    return False
+
+
 def is_header(file):
     return file.endswith('.h')
 
@@ -1155,8 +1169,14 @@ def numberOfParentheses(tok1, tok2):
 def findGotoLabel(gotoToken):
     label = gotoToken.next.str
     tok = gotoToken.next.next
+    functionScope = gotoToken.scope
+    while functionScope and functionScope.type != 'Function':
+        functionScope = functionScope.nestedIn
+    functionEnd = functionScope.bodyEnd if functionScope else None
     while tok:
-        if tok.str == '}' and tok.scope.type == 'Function':
+        if tok is functionEnd:
+            break
+        if functionEnd is None and tok.str == '}' and tok.scope and tok.scope.type == 'Function':
             break
         if tok.str == label and tok.next.str == ':':
             return tok
@@ -2249,6 +2269,8 @@ def misra_8_4(self, cfg):
                 continue
             if func.token != func.tokenDef:
                 continue
+            if has_prior_function_prototype(cfg, func):
+                continue
             if func.tokenDef.str == 'main':
                 continue
             self.reportError(func.tokenDef, 8, 4)
@@ -2460,20 +2482,38 @@ def get_category(essential_type):
                 if essential_type.split(' ')[0] in ('unsigned', 'signed'):
                     return essential_type.split(' ')[0]
             return None
+
         for tok in cfg.tokenlist:
-            if tok.isAssignmentOp:
-                lhs = getEssentialType(tok.astOperand1)
-                rhs = getEssentialType(tok.astOperand2)
-                #print(lhs)
-                #print(rhs)
-                if lhs is None or rhs is None:
+            if not tok.isAssignmentOp:
+                continue
+
+            lhs = getEssentialType(tok.astOperand1)
+            rhs = getEssentialType(tok.astOperand2)
+            if lhs is None or rhs is None:
+                continue
+
+            find_std = cfg.standards.c if cfg.standards and cfg.standards.c else self.stdversion
+
+            rhs_tok = tok.astOperand2
+            rhs_macro_name = rhs_tok.macroName if rhs_tok else None
+            rhs_spelling = rhs_macro_name if rhs_macro_name in ('true', 'false') else rhs_tok.str
+
+            rhs_is_source_bool_literal = rhs_spelling in ('true', 'false')
+            rhs_is_source_int_literal_0_1 = rhs_spelling in ('0', '1')
+
+            if lhs == 'bool':
+                if rhs_is_source_bool_literal:
+                    continue
+                if find_std == 'c89' and rhs_is_source_int_literal_0_1:
                     continue
-                lhs_category = get_category(lhs)
-                rhs_category = get_category(rhs)
-                if lhs_category and rhs_category and lhs_category != rhs_category and rhs_category not in ('signed','unsigned'):
-                    self.reportError(tok, 10, 3)
-                if bitsOfEssentialType(lhs) < bitsOfEssentialType(rhs) and (lhs != "bool" or tok.astOperand2.str not in ('0','1')):
-                    self.reportError(tok, 10, 3)
+
+            lhs_category = get_category(lhs)
+            rhs_category = get_category(rhs)
+            if lhs_category and rhs_category and lhs_category != rhs_category and rhs_category not in ('signed', 'unsigned'):
+                self.reportError(tok, 10, 3)
+
+            if bitsOfEssentialType(lhs) < bitsOfEssentialType(rhs):
+                self.reportError(tok, 10, 3)
 
     def misra_10_4(self, data):
         op = {'+', '-', '*', '/', '%', '&', '|', '^', '+=', '-=', ':'}
@@ -3480,8 +3520,9 @@ def misra_17_3(self, cfg):
 
         # Additional check for implicit function calls in expressions
         for token in cfg.tokenlist:
-            if token.isName and token.function is None and token.valueType is None:
-                if token.next and token.next.str == "(" and token.next.valueType is None:
+            if token.isName and token.scope.type != 'Global' and token.function is None and token.valueType is None:
+                if token.next and token.next.str == "(" and token.next.valueType is None and \
+                        isFunctionCall(token.next, cfg.standards.c):
                     if token.next.next.str == "*" and \
                         token.next.next.next.isName and token.next.next.next.valueType is not None and \
                         token.next.next.next.valueType.pointer > 0 :
diff --git a/addons/test/misra/crash10.c b/addons/test/misra/crash10.c
index 455d86e57ec..65e3a14ac96 100644
--- a/addons/test/misra/crash10.c
+++ b/addons/test/misra/crash10.c
@@ -2,7 +2,7 @@
 
 extern uint32_t end;
 
-//#define KEEP // if uncomment this then wont crash
+//#define KEEP // if uncomment this then won't crash
 
 KEEP static const int32_t ptr_to_end = &end;
 
diff --git a/addons/test/misra/misra-regression-prototypes.c b/addons/test/misra/misra-regression-prototypes.c
new file mode 100644
index 00000000000..11ce35c9fa0
--- /dev/null
+++ b/addons/test/misra/misra-regression-prototypes.c
@@ -0,0 +1,13 @@
+int regression_function(int value);
+
+int regression_function(int value)
+{
+    return value;
+}
+
+int main(void)
+{
+    int local_prototype(int value);
+    int (*callback)(int) = regression_function;
+    return callback(0);
+}
\ No newline at end of file
diff --git a/addons/test/misra/misra-test-c11.c b/addons/test/misra/misra-test-c11.c
index 031bc361e5f..aa00b2f0b42 100644
--- a/addons/test/misra/misra-test-c11.c
+++ b/addons/test/misra/misra-test-c11.c
@@ -2,6 +2,7 @@
 // ~/cppcheck/cppcheck --dump misra/misra-test-c11.c --std=c11
 // ~/cppcheck/cppcheck --dump -DDUMMY --suppress=uninitvar --inline-suppr misra/misra-test-c11.c --std=c11 --platform=unix64 && python3 ../misra.py -verify misra/misra-test-c11.c.dump
 
+#include <stdbool.h>
 #include <stdint.h>
 
 typedef unsigned int UINT_TYPEDEF;
@@ -23,3 +24,15 @@ static void misra6_1_fn(void) {
     struct_with_bitfields s;
     s.h = 61;
 }
+
+static void misra_10_3_c11(void) {
+    bool b = false;
+    bool b0 = 0; // 10.3
+    bool b1 = 1; // 10.3
+    bool bf = false; // no-warning
+    bool bt = true; // no-warning
+    b = 0; // 10.3
+    b = 1; // 10.3
+    b = false; // no-warning
+    b = true; // no-warning
+}
diff --git a/addons/test/misra/misra-test.c b/addons/test/misra/misra-test.c
index 743637117a5..2871fd871d4 100644
--- a/addons/test/misra/misra-test.c
+++ b/addons/test/misra/misra-test.c
@@ -726,6 +726,10 @@ static void misra_10_3(uint32_t u32a, uint32_t u32b) {
     const char c = '0'; // no-warning
     bool b = true; // no-warning
     uint32_t u = UINT32_C(10); // no-warning
+    bool b0 = 0; // no-warning
+    bool b1 = 1; // no-warning
+    b = 0; // no-warning
+    b = 1; // no-warning
 }
 
 static void misra_10_4(u32 x, s32 y) {
@@ -1460,6 +1464,23 @@ static void misra_15_3(int a) {
   }
 }
 
+struct misra_15_2_s {
+  int a;
+  int b;
+};
+
+static void misra_15_2_initializer_list(void) {
+  int err = 0;
+  if (err == 0) {
+    err = 1;
+    goto done; // 15.1
+  }
+  struct misra_15_2_s s = { 1, 2 };
+  (void)s;
+done:
+  return;
+}
+
 static void misra_15_4(void) {
   misra_15_4_label:
     return;
diff --git a/addons/test/misra_test.py b/addons/test/misra_test.py
index 55a24cb4b27..dc46d8beef8 100644
--- a/addons/test/misra_test.py
+++ b/addons/test/misra_test.py
@@ -11,6 +11,7 @@
 from addons.misra import C11_STDLIB_IDENTIFIERS, C99_STDLIB_IDENTIFIERS,C90_STDLIB_IDENTIFIERS, isStdLibId, isKeyword
 
 TEST_SOURCE_FILES = [os.path.join('addons','test','misra','misra-test.c')]
+REGRESSION_SOURCE_FILE = os.path.join('addons', 'test', 'misra', 'misra-regression-prototypes.c')
 
 
 def remove_misra_config(s:str):
@@ -93,6 +94,20 @@ def test_json_out(checker, capsys, test_files):
     assert("Required" in json_output['c2012-21.3'][0]['extra'])
     assert("Advisory" in json_output['c2012-20.1'][0]['extra'])
 
+def test_function_prototype_and_pointer_call_regressions(checker, capsys):
+    dump_create(REGRESSION_SOURCE_FILE)
+    sys.argv.append("--cli")
+    try:
+        checker.loadRuleTexts("./addons/test/misra/misra_rules_dummy.txt")
+        checker.parseDump(REGRESSION_SOURCE_FILE + ".dump")
+        captured = capsys.readouterr().out
+        json_output = convert_json_output(captured.splitlines())
+        assert "c2012-8.4" not in json_output
+        assert "c2012-17.3" not in json_output
+    finally:
+        sys.argv.remove("--cli")
+        dump_remove(REGRESSION_SOURCE_FILE)
+
 
 def test_rules_cppcheck_severity(checker, capsys, test_files):
     checker.loadRuleTexts("./addons/test/misra/misra_rules_dummy.txt")
diff --git a/addons/threadsafety.py b/addons/threadsafety.py
index 9475e1a5b0d..25b2c16abe3 100755
--- a/addons/threadsafety.py
+++ b/addons/threadsafety.py
@@ -91,7 +91,6 @@
     'race:stdin',
     'race:stdout',
     'race:streams',
-    'race:strerror',
     'race:strsignal',
     'race:strtok',
     'race:tmbuf',
@@ -111,6 +110,8 @@
     'cuserid',
     'drand48',
     'ecvt',
+    'elf_fill',
+    'elf_flagelf',
     'encrypt',
     'endfsent',
     'endgrent',
@@ -259,7 +260,6 @@
     'siginterrupt',
     'sleep',
     'srand48',
-    'strerror',
     'strsignal',
     'strtok',
     'tmpnam',
diff --git a/cfg/boost.cfg b/cfg/boost.cfg
index d181860f0bc..b09d9ccd9e5 100644
--- a/cfg/boost.cfg
+++ b/cfg/boost.cfg
@@ -83,12 +83,12 @@
   <define name="BOOST_MATH_INT_TABLE_TYPE" value=""/>
   <define name="BOOST_MATH_INT_VALUE_SUFFIX" value=""/>
   <!-- Tell cppcheck to interpret BOOST_AUTO_TEST_CASE as a function definition -->
-  <define name="BOOST_AUTO_TEST_CASE(...)" value="void BOOST_AUTO_TEST_CASE_run(__VA_ARGS__)"/>
+  <define name="BOOST_AUTO_TEST_CASE(test_name, ...)" value="void BOOST_AUTO_TEST_CASE_run ## test_name ()"/>
   <define name="BOOST_AUTO_TEST_CASE_TEMPLATE(test_name, type_name, TL)" value="template&lt;typename type_name&gt;void test_name()"/>
   <define name="BOOST_FIXTURE_TEST_CASE(name, fixture, ...)" value="struct name : fixture { void test_method(); }; void name::test_method()" />
   <define name="BOOST_FIXTURE_TEST_CASE_TEMPLATE(test_name, type_name, TL, F)" value="template&lt;typename type_name&gt; struct test_name : public F { void test_method(); }; template&lt;typename type_name&gt; void test_name&lt;type_name&gt;::test_method()" />
-  <define name="BOOST_DATA_TEST_CASE(...)" value="void BOOST_DATA_TEST_CASE_run(__VA_ARGS__)"/>
-  <define name="BOOST_DATA_TEST_CASE_F(...)" value="void BOOST_DATA_TEST_CASE_F_run(__VA_ARGS__)"/>
+  <define name="BOOST_DATA_TEST_CASE(test_name, ...)" value="void BOOST_DATA_TEST_CASE_run ## test_name ()"/>
+  <define name="BOOST_DATA_TEST_CASE_F(test_name, ...)" value="void BOOST_DATA_TEST_CASE_F_run ## test_name ()"/>
   <define name="BOOST_PYTHON_MODULE(str)" value="void BOOST_PYTHON_MODULE_definition(str)"/>
   <define name="BOOST_SCOPED_ENUM_DECLARE_BEGIN(x)" value=""/>
   <define name="BOOST_SCOPED_ENUM_DECLARE_END(x)" value=""/>
diff --git a/cfg/bsd.cfg b/cfg/bsd.cfg
index 158d7a8a885..5888327cc3c 100644
--- a/cfg/bsd.cfg
+++ b/cfg/bsd.cfg
@@ -443,7 +443,7 @@
     <returnValue type="void *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in">
diff --git a/cfg/cairo.cfg b/cfg/cairo.cfg
index e077c2fc40d..d766abffc2e 100644
--- a/cfg/cairo.cfg
+++ b/cfg/cairo.cfg
@@ -21,6 +21,7 @@
   <define name="CAIRO_MIME_TYPE_PNG" value="&quot;image/png&quot;"/>
   <define name="CAIRO_MIME_TYPE_URI" value="&quot;text/x-uri&quot;"/>
   <define name="CAIRO_MIME_TYPE_UNIQUE_ID" value="&quot;application/x-cairo.uuid&quot;"/>
+  <define name="CAIRO_VERSION_ENCODE(major, minor, micro)" value="(((major) * 10000) + ((minor) * 100) + ((micro) * 1))"/>
   <!-- ########## cairo Allocation / Deallocation ########## -->
   <!-- ########## cairo Functions ########## -->
   <!-- cairo_t * cairo_create (cairo_surface_t *target); -->
diff --git a/cfg/gnu.cfg b/cfg/gnu.cfg
index 1c8d1597a7f..ee0f4c8790c 100644
--- a/cfg/gnu.cfg
+++ b/cfg/gnu.cfg
@@ -168,6 +168,322 @@
     <arg nr="variadic" direction="in">
       <not-uninit/>
     </arg>
+  </function>
+  <!-- https://gcc.gnu.org/onlinedocs/gcc/Integer-Overflow-Builtins.html -->
+  <!-- bool __builtin_add_overflow (type1 a, type2 b, type3 *res) -->
+  <function name="__builtin_add_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_sadd_overflow (int a, int b, int *res) -->
+  <function name="__builtin_sadd_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_saddl_overflow (long int a, long int b, long int *res) -->
+  <function name="__builtin_saddl_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_saddll_overflow (long long int a, long long int b, long long int *res) -->
+  <function name="__builtin_saddll_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_uadd_overflow (unsigned int a, unsigned int b, unsigned int *res) -->
+  <function name="__builtin_uadd_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_uaddl_overflow (unsigned long int a, unsigned long int b, unsigned long int *res) -->
+  <function name="__builtin_uaddl_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_uaddll_overflow (unsigned long long int a, unsigned long long int b, unsigned long long int *res) -->
+  <function name="__builtin_uaddll_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_sub_overflow (type1 a, type2 b, type3 *res) -->
+  <function name="__builtin_sub_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_ssub_overflow (int a, int b, int *res) -->
+  <function name="__builtin_ssub_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_ssubl_overflow (long int a, long int b, long int *res) -->
+  <function name="__builtin_ssubl_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_ssubll_overflow (long long int a, long long int b, long long int *res) -->
+  <function name="__builtin_ssubll_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_usub_overflow (unsigned int a, unsigned int b, unsigned int *res) -->
+  <function name="__builtin_usub_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_usubl_overflow (unsigned long int a, unsigned long int b, unsigned long int *res) -->
+  <function name="__builtin_usubl_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_usubll_overflow (unsigned long long int a, unsigned long long int b, unsigned long long int *res) -->
+  <function name="__builtin_usubll_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_mul_overflow (type1 a, type2 b, type3 *res) -->
+  <function name="__builtin_mul_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_smul_overflow (int a, int b, int *res) -->
+  <function name="__builtin_smul_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_smull_overflow (long int a, long int b, long int *res) -->
+  <function name="__builtin_smull_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_smulll_overflow (long long int a, long long int b, long long int *res) -->
+  <function name="__builtin_smulll_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_umul_overflow (unsigned int a, unsigned int b, unsigned int *res) -->
+  <function name="__builtin_umul_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_umull_overflow (unsigned long int a, unsigned long int b, unsigned long int *res) -->
+  <function name="__builtin_umull_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- bool __builtin_umulll_overflow (unsigned long long int a, unsigned long long int b, unsigned long long int *res) -->
+  <function name="__builtin_umulll_overflow">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out" indirect="1">
+      <not-null/>
+    </arg>
   </function>
     <!-- https://man7.org/linux/man-pages/man3/getenv.3.html -->
     <!-- char * secure_getenv(const char *name); -->
@@ -241,22 +557,100 @@
   <function name="__builtin_trap,__builtin_unreachable">
     <noreturn>true</noreturn>
   </function>
+  <!-- https://gcc.gnu.org/onlinedocs/gcc/Bit-Operation-Builtins.html -->
   <!-- int __builtin_popcount (unsigned int x) -->
+  <!-- int __builtin_popcountl (unsigned long x) -->
+  <!-- int __builtin_popcountll (unsigned long long x) -->
   <!-- int __builtin_parity (unsigned int x) -->
+  <!-- int __builtin_parityl (unsigned long x) -->
+  <!-- int __builtin_parityll (unsigned long long x) -->
   <!-- int __builtin_ffs (int x) -->
-  <!-- int __builtin_ffsl (long) -->
-  <!-- int __builtin_ffsll (long long) -->
+  <!-- int __builtin_ffsl (long x) -->
+  <!-- int __builtin_ffsll (long long x) -->
+  <!-- int __builtin_clrsb (int x) -->
+  <!-- int __builtin_clrsbl (long x) -->
+  <!-- int __builtin_clrsbll (long long x) -->
+  <function name="__builtin_popcount,__builtin_popcountl,__builtin_popcountll,__builtin_parity,__builtin_parityl,__builtin_parityll,__builtin_ffs,__builtin_ffsl,__builtin_ffsll,__builtin_clrsb,__builtin_clrsbl,__builtin_clrsbll">
+    <noreturn>false</noreturn>
+    <returnValue type="int"/>
+    <use-retval/>
+    <const/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
   <!-- int __builtin_clz (unsigned int x) -->
-  <function name="__builtin_popcount,__builtin_parity,__builtin_ffs,__builtin_ffsl,__builtin_ffsll,__builtin_clz">
+  <!-- int __builtin_clzl (unsigned long x) -->
+  <!-- int __builtin_clzll (unsigned long long x) -->
+  <!-- int __builtin_ctz (unsigned int x) -->
+  <!-- int __builtin_ctzl (unsigned long x) -->
+  <!-- int __builtin_ctzll (unsigned long long x) -->
+  <function name="__builtin_clz,__builtin_clzl,__builtin_clzll,__builtin_ctz,__builtin_ctzl,__builtin_ctzll">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <use-retval/>
+    <const/>
     <arg nr="1" direction="in">
       <not-uninit/>
       <not-bool/>
+      <!-- result is undefined if x is 0 -->
+      <valid>1:</valid>
     </arg>
   </function>
-  <!-- https://man7.org/linux/man-pages/man3/mempcpy.3.html-->
+  <!-- int __builtin_ffsg (...) -->
+  <!-- int __builtin_clrsbg (...) -->
+  <!-- int __builtin_popcountg (...) -->
+  <!-- int __builtin_parityg (...) -->
+  <function name="__builtin_ffsg,__builtin_clrsbg,__builtin_popcountg,__builtin_parityg">
+    <noreturn>false</noreturn>
+    <returnValue type="int"/>
+    <use-retval/>
+    <const/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- int __builtin_clzg (...) -->
+  <!-- int __builtin_ctzg (...) -->
+  <function name="__builtin_clzg,__builtin_ctzg">
+    <noreturn>false</noreturn>
+    <returnValue type="int"/>
+    <use-retval/>
+    <const/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="variadic" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- unsigned int __builtin_stdc_bit_width (uintX_t x) -->
+  <!-- unsigned int __builtin_stdc_count_ones (uintX_t x) -->
+  <!-- unsigned int __builtin_stdc_count_zeros (uintX_t x) -->
+  <!-- unsigned int __builtin_stdc_first_leading_one (uintX_t x) -->
+  <!-- unsigned int __builtin_stdc_first_leading_zero (uintX_t x) -->
+  <!-- unsigned int __builtin_stdc_first_trailing_one (uintX_t x) -->
+  <!-- unsigned int __builtin_stdc_first_trailing_zero (uintX_t x) -->
+  <!-- unsigned int __builtin_stdc_leading_ones (uintX_t x) -->
+  <!-- unsigned int __builtin_stdc_leading_zeros (uintX_t x) -->
+  <!-- unsigned int __builtin_stdc_trailing_ones (uintX_t x) -->
+  <!-- unsigned int __builtin_stdc_trailing_zeros (uintX_t x) -->
+  <!-- unsigned int __builtin_stdc_has_single_bit (uintX_t x) -->
+  <function name="__builtin_stdc_bit_width,__builtin_stdc_count_ones,__builtin_stdc_count_zeros,__builtin_stdc_first_leading_one,__builtin_stdc_first_leading_zero,__builtin_stdc_first_trailing_one,__builtin_stdc_first_trailing_zero,__builtin_stdc_leading_ones,__builtin_stdc_leading_zeros,__builtin_stdc_trailing_ones,__builtin_stdc_trailing_zeros,__builtin_stdc_has_single_bit">
+    <noreturn>false</noreturn>
+    <returnValue type="unsigned int"/>
+    <use-retval/>
+    <const/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/wmempcpy.3.html -->
   <!-- wchar_t *wmempcpy(wchar_t *restrict dest, const wchar_t *restrict src, size_t n);-->
   <function name="wmempcpy">
     <returnValue type="wchar_t *"/>
@@ -265,12 +659,12 @@
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" size-arg="3"/>
     <arg nr="1" direction="out">
       <not-null/>
-      <minsize type="argvalue" arg="3"/>
+      <minsize type="argvalue" arg="3" baseType="wchar_t"/>
     </arg>
     <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
-      <minsize type="argvalue" arg="3"/>
+      <minsize type="argvalue" arg="3" baseType="wchar_t"/>
     </arg>
     <arg nr="3" direction="in">
       <not-uninit/>
@@ -1597,7 +1991,7 @@
     <returnValue type="void *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in">
diff --git a/cfg/gtk.cfg b/cfg/gtk.cfg
index 722efb6b76b..024f567c922 100644
--- a/cfg/gtk.cfg
+++ b/cfg/gtk.cfg
@@ -4,16 +4,30 @@
 <def format="2">
   <define name="TRUE" value="(!FALSE)"/>
   <define name="FALSE" value="(0)"/>
-  <define name="g_return_if_fail(expr)" value="do{if(!(expr)){return;}}while(0);"/>
-  <define name="g_return_val_if_fail(expr,val)" value="do{if(!(expr)){return (val);}}while(0);"/>
-  <define name="g_return_if_reached()" value="do{return;}while(0);"/>
-  <define name="g_return_val_if_reached(val)" value="do{return (val);}while(0);"/>
+  <define name="g_return_if_fail(expr)" value="do{if(!(expr)){return;}}while(0)"/>
+  <define name="g_return_val_if_fail(expr,val)" value="do{if(!(expr)){return (val);}}while(0)"/>
+  <define name="g_return_if_reached()" value="do{return;}while(0)"/>
+  <define name="g_return_val_if_reached(val)" value="do{return (val);}while(0)"/>
   <define name="G_CALLBACK(cb)" value="cb"/>
   <define name="GTK_SIGNAL_FUNC(f)" value="G_CALLBACK(f)"/>
+  <define name="G_DIR_SEPARATOR_S" value="&quot;/&quot;"/>
+  <define name="G_GINT32_FORMAT" value="&quot;i&quot;"/>
+  <define name="G_GINT32_MODIFIER" value="&quot;&quot;"/>
+  <define name="G_GINT64_FORMAT" value="&quot;li&quot;"/>
+  <define name="G_GINT64_MODIFIER" value="&quot;l&quot;"/>
+  <define name="G_GSIZE_FORMAT" value="&quot;lu&quot;"/>
+  <define name="G_GSIZE_MODIFIER" value="&quot;l&quot;"/>
+  <define name="G_GSSIZE_FORMAT" value="&quot;li&quot;"/>
+  <define name="G_GSSIZE_MODIFIER" value="&quot;l&quot;"/>
+  <define name="G_GUINT32_FORMAT" value="&quot;u&quot;"/>
+  <define name="G_GUINT64_FORMAT" value="&quot;lu&quot;"/>
   <!-- https://developer.gnome.org/glib/stable/glib-Miscellaneous-Macros.html -->
   <!-- https://github.com/GNOME/glib/blob/master/glib/gmacros.h -->
+  <define name="G_GNUC_CHECK_VERSION(major, minor)" value="1"/>
   <define name="G_GNUC_BEGIN_IGNORE_DEPRECATIONS" value=""/>
   <define name="G_GNUC_END_IGNORE_DEPRECATIONS" value=""/>
+  <define name="G_GNUC_DEPRECATED" value="__attribute__((__deprecated__))"/>
+  <define name="G_GNUC_DEPRECATED_FOR(f)" value="__attribute__((deprecated(&quot;Use &quot; #f &quot; instead&quot;)))"/>
   <define name="G_GNUC_PRETTY_FUNCTION" value="__PRETTY_FUNCTION__"/>
   <define name="G_GNUC_PURE" value="__attribute__((__pure__))"/>
   <define name="G_GNUC_MALLOC" value="__attribute__((__malloc__))"/>
@@ -38,33 +52,39 @@
   <define name="G_STRINGIFY_ARG(contents)" value="#contents"/>
   <define name="G_STRLOC" value="__FILE__ &quot;:&quot; G_STRINGIFY (__LINE__)"/>
   <define name="G_STRFUNC" value="((const char*) (__FUNCTION__))"/>
-  <define name="G_DEFINE_TYPE(TN, t_n, T_P)" value=""/>
-  <define name="G_DEFINE_TYPE_WITH_PRIVATE(TN, t_n, T_P)" value=""/>
-  <define name="G_DEFINE_TYPE_WITH_CODE(TN, t_n, T_P, _C_)" value=""/>
-  <define name="G_DEFINE_FINAL_TYPE(TN, t_n, T_P)" value=""/>
-  <define name="G_DEFINE_FINAL_TYPE_WITH_PRIVATE(TN, t_n, T_P)" value=""/>
-  <define name="G_DEFINE_FINAL_TYPE_WITH_CODE(TN, t_n, T_P, _C_)" value=""/>
   <define name="G_DEFINE_ABSTRACT_TYPE(TN, t_n, T_P)" value=""/>
-  <define name="G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(TN, t_n, T_P)" value=""/>
   <define name="G_DEFINE_ABSTRACT_TYPE_WITH_CODE(TN, t_n, T_P, _C_)" value=""/>
-  <define name="G_DEFINE_DYNAMIC_TYPE(TN, t_n, T_P)" value=""/>
-  <define name="G_DEFINE_DYNAMIC_TYPE_EXTENDED(TN, t_n, T_P, _f_, _C_)" value=""/>
+  <define name="G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(TN, t_n, T_P)" value=""/>
+  <define name="G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(TypeName, func)" value=""/>
+  <define name="G_DEFINE_AUTO_CLEANUP_FREE_FUNC(TypeName, func, none)" value=""/>
+  <define name="G_DEFINE_AUTOPTR_CLEANUP_FUNC(TypeName, func)" value=""/>
   <define name="G_DEFINE_BOXED_TYPE(TypeName,type_name,copy_func,free_func)" value=""/>
   <define name="G_DEFINE_BOXED_TYPE_WITH_CODE(TypeName,type_name,copy_func,free_func,_C_)" value=""/>
+  <define name="G_DEFINE_DYNAMIC_TYPE(TN, t_n, T_P)" value=""/>
+  <define name="G_DEFINE_DYNAMIC_TYPE_EXTENDED(TN, t_n, T_P, _f_, _C_)" value=""/>
+  <define name="G_DEFINE_ENUM_TYPE(TypeName, type_name, ...)" value=""/>
+  <define name="G_DEFINE_ENUM_VALUE(EnumValue, EnumNick)" value=""/>
+  <define name="G_DEFINE_EXTENDED_ERROR(ErrorType, error_type)" value=""/>
+  <define name="G_DEFINE_FINAL_TYPE(TN, t_n, T_P)" value=""/>
+  <define name="G_DEFINE_FINAL_TYPE_WITH_CODE(TN, t_n, T_P, _C_)" value=""/>
+  <define name="G_DEFINE_FINAL_TYPE_WITH_PRIVATE(TN, t_n, T_P)" value=""/>
+  <define name="G_DEFINE_FLAGS_TYPE(TypeName, type_name, ...)" value=""/>
+  <define name="G_DEFINE_INTERFACE(TN, t_n, T_P)" value=""/>
+  <define name="G_DEFINE_INTERFACE_WITH_CODE(TN, t_n, T_P, _C_)" value=""/>
+  <define name="G_DEFINE_POINTER_TYPE(TypeName, type_name)" value=""/>
+  <define name="G_DEFINE_POINTER_TYPE_WITH_CODE(TypeName, type_name, _C_)" value=""/>
   <define name="G_DEFINE_QUARK(QN,q_n)" value=""/>
+  <define name="G_DEFINE_TYPE(TN, t_n, T_P)" value=""/>
+  <define name="G_DEFINE_TYPE_EXTENDED(TN, t_n, T_P, _f_, _C_)" value=""/>
+  <define name="G_DEFINE_TYPE_WITH_CODE(TN, t_n, T_P, _C_)" value=""/>
+  <define name="G_DEFINE_TYPE_WITH_PRIVATE(TN, t_n, T_P)" value=""/>
   <define name="G_BEGIN_DECLS" value=""/>
   <define name="G_END_DECLS" value=""/>
   <define name="G_ADD_PRIVATE(TypeName)" value=""/>
   <define name="G_PRIVATE_OFFSET(TypeName, field)" value=""/>
   <define name="G_PRIVATE_FIELD(TypeName, inst, field_type, field_name)" value=""/>
   <define name="G_PRIVATE_FIELD_P(TypeName, inst, field_name)" value=""/>
-  <define name="G_DEFINE_INTERFACE(TN, t_n, T_P)" value=""/>
-  <define name="G_DEFINE_INTERFACE_WITH_CODE(TN, t_n, T_P, _C_)" value=""/>
-  <define name="G_DEFINE_TYPE_EXTENDED(TN, t_n, T_P, _f_, _C_)" value=""/>
   <define name="G_IMPLEMENT_INTERFACE(TYPE_IFACE, iface_init)" value=""/>
-  <define name="G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(TypeName, func)" value=""/>
-  <define name="G_DEFINE_AUTO_CLEANUP_FREE_FUNC(TypeName, func, none)" value=""/>
-  <define name="G_DEFINE_AUTOPTR_CLEANUP_FUNC(TypeName, func)" value=""/>
   <define name="MAX(a, b)" value="(((a) &gt; (b)) ? (a) : (b))"/>
   <define name="MIN(a, b)" value="(((a) &lt; (b)) ? (a) : (b))"/>
   <define name="ABS(a)" value="(((a) &lt; 0) ? -(a) : (a))"/>
@@ -78,6 +98,7 @@
   <define name="G_LIKELY(expr)" value="(expr)"/>
   <define name="G_UNLIKELY(expr)" value="(expr)"/>
   <define name="G_DEPRECATED" value="__attribute__((__deprecated__))"/>
+  <define name="G_DEPRECATED_FOR(f)" value="__attribute__((__deprecated__(&quot;Use '&quot; #f &quot;' instead&quot;)))"/>
   <define name="G_STMT_START" value="do"/>
   <define name="G_STMT_END" value="while (0)"/>
   <define name="_G_TYPE_CIC(ip, gt, ct)" value="((ct*) ip)"/>
@@ -112,6 +133,7 @@
   <define name="g_try_new(struct_type, n_structs)" value="_G_NEW (struct_type, n_structs, try_malloc)"/>
   <define name="g_try_new0(struct_type, n_structs)" value="_G_NEW (struct_type, n_structs, try_malloc0)"/>
   <define name="g_try_renew(struct_type, mem, n_structs)" value="_G_RENEW (struct_type, mem, n_structs, try_realloc)"/>
+  <define name="G_ENCODE_VERSION(major, minor)" value="((major) &lt;&lt; 16 | (minor) &lt;&lt; 8)"/>
   <define name="GTK_BUTTON(obj)" value="((GtkButton*)(obj))"/>
   <define name="GTK_BOX(obj)" value="((GtkBox*)(obj))"/>
   <define name="GTK_CONTAINER(obj)" value="((GtkContainer*)(obj))"/>
@@ -234,6 +256,86 @@
   <define name="G_VARIANT_TYPE_BYTESTRING_ARRAY" value="((const GVariantType *) &quot;aay&quot;)"/>
   <define name="G_VARIANT_TYPE_VARDICT" value="((const GVariantType *) &quot;a{sv}&quot;)"/>
   <define name="G_VARIANT_TYPE(s)" value="((const GVariantType *) (s))"/>
+  <!-- gio/gfileinfo.h -->
+  <define name="G_FILE_ATTRIBUTE_STANDARD_TYPE" value="&quot;standard::type&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN" value="&quot;standard::is-hidden&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP" value="&quot;standard::is-backup&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK" value="&quot;standard::is-symlink&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL" value="&quot;standard::is-virtual&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_IS_VOLATILE" value="&quot;standard::is-volatile&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_NAME" value="&quot;standard::name&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME" value="&quot;standard::display-name&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME" value="&quot;standard::edit-name&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_COPY_NAME" value="&quot;standard::copy-name&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_DESCRIPTION" value="&quot;standard::description&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_ICON" value="&quot;standard::icon&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_SYMBOLIC_ICON" value="&quot;standard::symbolic-icon&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE" value="&quot;standard::content-type&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE" value="&quot;standard::fast-content-type&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_SIZE" value="&quot;standard::size&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_ALLOCATED_SIZE" value="&quot;standard::allocated-size&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET" value="&quot;standard::symlink-target&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_TARGET_URI" value="&quot;standard::target-uri&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER" value="&quot;standard::sort-order&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ETAG_VALUE" value="&quot;etag::value&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ID_FILE" value="&quot;id::file&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ID_FILESYSTEM" value="&quot;id::filesystem&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ACCESS_CAN_READ" value="&quot;access::can-read&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE" value="&quot;access::can-write&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE" value="&quot;access::can-execute&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE" value="&quot;access::can-delete&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH" value="&quot;access::can-trash&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME" value="&quot;access::can-rename&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT" value="&quot;mountable::can-mount&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT" value="&quot;mountable::can-unmount&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT" value="&quot;mountable::can-eject&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE" value="&quot;mountable::unix-device&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE_FILE" value="&quot;mountable::unix-device-file&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI" value="&quot;mountable::hal-udi&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_MODIFIED" value="&quot;time::modified&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC" value="&quot;time::modified-usec&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_MODIFIED_NSEC" value="&quot;time::modified-nsec&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_ACCESS" value="&quot;time::access&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_ACCESS_USEC" value="&quot;time::access-usec&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_ACCESS_NSEC" value="&quot;time::access-nsec&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_CHANGED" value="&quot;time::changed&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_CHANGED_USEC" value="&quot;time::changed-usec&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_CHANGED_NSEC" value="&quot;time::changed-nsec&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_CREATED" value="&quot;time::created&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_CREATED_USEC" value="&quot;time::created-usec&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_CREATED_NSEC" value="&quot;time::created-nsec&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_DEVICE" value="&quot;unix::device&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_INODE" value="&quot;unix::inode&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_MODE" value="&quot;unix::mode&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_NLINK" value="&quot;unix::nlink&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_UID" value="&quot;unix::uid&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_GID" value="&quot;unix::gid&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_RDEV" value="&quot;unix::rdev&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE" value="&quot;unix::block-size&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_BLOCKS" value="&quot;unix::blocks&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT" value="&quot;unix::is-mountpoint&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE" value="&quot;dos::is-archive&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_DOS_IS_SYSTEM" value="&quot;dos::is-system&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_DOS_IS_MOUNTPOINT" value="&quot;dos::is-mountpoint&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_DOS_REPARSE_POINT_TAG" value="&quot;dos::reparse-point-tag&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_OWNER_USER" value="&quot;owner::user&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_OWNER_USER_REAL" value="&quot;owner::user-real&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_OWNER_GROUP" value="&quot;owner::group&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_THUMBNAIL_PATH" value="&quot;thumbnail::path&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_THUMBNAILING_FAILED" value="&quot;thumbnail::failed&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_PREVIEW_ICON" value="&quot;preview::icon&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_FILESYSTEM_SIZE" value="&quot;filesystem::size&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_FILESYSTEM_FREE" value="&quot;filesystem::free&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_FILESYSTEM_TYPE" value="&quot;filesystem::type&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_FILESYSTEM_READONLY" value="&quot;filesystem::readonly&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW" value="&quot;filesystem::use-preview&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE" value="&quot;filesystem::remote&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_GVFS_BACKEND" value="&quot;gvfs::backend&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_SELINUX_CONTEXT" value="&quot;selinux::context&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT" value="&quot;trash::item-count&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TRASH_ORIG_PATH" value="&quot;trash::orig-path&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TRASH_DELETION_DATE" value="&quot;trash::deletion-date&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_RECENT_MODIFIED" value="&quot;recent::modified&quot;"/>
   <memory>
     <alloc init="true" no-fail="true">g_thread_new</alloc>
     <alloc init="true" no-fail="false">g_thread_try_new</alloc>
@@ -807,7 +909,6 @@
     <alloc init="true" no-fail="true">g_app_info_get_default_for_uri_scheme</alloc>
     <alloc init="true" no-fail="true">g_application_new</alloc>
     <alloc init="true" no-fail="true">g_application_get_dbus_connection</alloc>
-    <alloc init="true" no-fail="true">g_application_get_default</alloc>
     <alloc init="true" no-fail="true">g_buffered_input_stream_new</alloc>
     <alloc init="true" no-fail="true">g_buffered_output_stream_new</alloc>
     <alloc init="true" no-fail="true">g_cancellable_new</alloc>
@@ -910,7 +1011,6 @@
     <alloc init="true" no-fail="true">g_zlib_decompressor_new</alloc>
     <use>g_object_ref</use>
     <dealloc>g_object_unref</dealloc>
-    <dealloc>gtk_widget_destroy</dealloc>
   </memory>
   <memory>
     <alloc init="true" no-fail="true">g_tree_new</alloc>
@@ -926,6 +1026,17 @@
     <use>g_file_attribute_matcher_ref</use>
     <dealloc>g_file_attribute_matcher_unref</dealloc>
   </memory>
+  <memory>
+    <alloc init="true" no-fail="true">gtk_window_new</alloc>
+    <dealloc>gtk_widget_destroy</dealloc>
+    <dealloc>gtk_window_destroy</dealloc>
+  </memory>
+  <function name="g_application_get_default">
+    <leak-ignore/>
+    <noreturn>false</noreturn>
+    <returnValue type="GApplication *"/>
+    <use-retval/>
+  </function>
   <function name="g_exit">
     <noreturn>true</noreturn>
   </function>
@@ -2148,6 +2259,7 @@
   </function>
   <!-- GList * g_list_find (GList *list, gconstpointer data); -->
   <function name="g_list_find">
+    <pure/>
     <leak-ignore/>
     <noreturn>false</noreturn>
     <returnValue type="GList"/>
@@ -3179,8 +3291,7 @@
     <returnValue type="gchar*"/>
     <arg nr="1" direction="out">
       <not-null/>
-      <not-uninit/>
-      <strz/>
+      <minsize type="argvalue" arg="2"/>
     </arg>
     <arg nr="2" direction="in">
       <not-bool/>
@@ -3193,7 +3304,7 @@
       <strz/>
       <formatstr/>
     </arg>
-    <arg nr="4" direction="in">
+    <arg nr="variadic" direction="in">
       <not-bool/>
       <not-uninit/>
     </arg>
@@ -5280,11 +5391,13 @@
     <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
       <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
       <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="3" direction="in">
@@ -6483,6 +6596,7 @@
   </function>
   <!-- gboolean g_error_matches(const GError *error, GQuark domain, gint code); -->
   <function name="g_error_matches">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="gboolean"/>
     <use-retval/>
@@ -8761,7 +8875,7 @@
   <function name="g_variant_builder_init">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="out">
       <not-null/>
     </arg>
     <arg nr="2" direction="in">
@@ -9688,6 +9802,14 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- gtk3: GtkWidget * gtk_window_new(GtkWindowType type)
+       gtk4: GtkWidget * gtk_window_new() -->
+  <function name="gtk_window_new">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <returnValue type="GtkWidget *"/>
+    <arg nr="1" direction="in" default="0"/>
+  </function>
   <function name="gtk_window_list_toplevels">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -21130,10 +21252,6 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="gtk_widget_destroy">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
   <function name="gtk_widget_destroyed">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -21790,6 +21908,13 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <function name="gtk_window_destroy">
+    <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
   <function name="gtk_window_fullscreen">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -22967,6 +23092,13 @@
   <define name="GTK_IMAGE_ICON_NAME" value="1"/>
   <define name="GTK_IMAGE_GICON" value="2"/>
   <define name="GTK_IMAGE_PAINTABLE" value="3"/>
+  <!-- gtk/gtklevelbar.h -->
+  <define name="GTK_LEVEL_BAR_OFFSET_FULL" value="&quot;full&quot;"/>
+  <define name="GTK_LEVEL_BAR_OFFSET_HIGH" value="&quot;high&quot;"/>
+  <define name="GTK_LEVEL_BAR_OFFSET_LOW" value="&quot;low&quot;"/>
+  <!-- gtk/gtkwindow.h -->
+  <define name="GTK_WINDOW_TOPLEVEL" value="0"/>
+  <define name="GTK_WINDOW_POPUP" value="1"/>
   <!-- gtk/gtk.h -->
   <define name="GTK_STOCK_ZOOM_IN" value="&quot;gtk-zoom-in&quot;"/>
   <define name="GTK_STOCK_ZOOM_FIT" value="&quot;gtk-zoom-fit&quot;"/>
@@ -23079,4 +23211,8 @@
   <define name="GTK_PRIORITY_HIGH" value="G_PRIORITY_HIGH"/>
   <define name="GTK_PRIORITY_RESIZE" value="(G_PRIORITY_HIGH_IDLE+10)"/>
   <define name="GTK_PRIORITY_REDRAW" value="(G_PRIORITY_HIGH_IDLE+20)"/>
+  <!-- version check for GLib, ATK and GTK -->
+  <define name="GLIB_CHECK_VERSION(major, minor, micro)" value="1"/>
+  <define name="ATK_CHECK_VERSION(major, minor, micro)" value="1"/>
+  <define name="GTK_CHECK_VERSION(major, minor, micro)" value="1"/>
 </def>
diff --git a/cfg/libcurl.cfg b/cfg/libcurl.cfg
index 381fbb237d7..949b6de0282 100644
--- a/cfg/libcurl.cfg
+++ b/cfg/libcurl.cfg
@@ -167,7 +167,7 @@
     <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3" direction="in">
+    <arg nr="3" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
diff --git a/cfg/microsoft_gsl.cfg b/cfg/microsoft_gsl.cfg
new file mode 100644
index 00000000000..07fbfcb74a6
--- /dev/null
+++ b/cfg/microsoft_gsl.cfg
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<def>
+  <define name="Expects(x)" value=""/>
+  <define name="Ensures(x)" value=""/>
+  <define name="GSL_SUPPRESS(x)" value=""/>
+  <podtype name="gsl::index" sign="s"/>
+  <podtype name="gsl::byte" sign="u" size="1"/><!-- Deprecated in GSL -->
+  <container id="gslSpan" startPattern="gsl :: span" inherits="stdSpan">
+  </container>
+  <smart-pointer class-name="gsl::owner"/>
+  <smart-pointer class-name="gsl::not_null"/>
+  <smart-pointer class-name="gsl::unique_ptr"><!-- Deprecated in GSL -->
+    <unique/>
+  </smart-pointer>
+  <smart-pointer class-name="gsl::shared_ptr"/><!-- Deprecated in GSL -->
+  <smart-pointer class-name="gsl::strict_not_null"/><!-- non-existing in C++ Core Guidelines -->
+</def>
diff --git a/cfg/posix.cfg b/cfg/posix.cfg
index 751142bacc1..19c5f50c4fa 100644
--- a/cfg/posix.cfg
+++ b/cfg/posix.cfg
@@ -2123,11 +2123,13 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
       <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
       <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="3" direction="in">
@@ -2146,11 +2148,13 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
       <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
       <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="3" direction="in">
@@ -2468,7 +2472,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <returnValue type="void *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in">
@@ -2500,7 +2504,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <returnValue type="void *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in">
@@ -4200,7 +4204,6 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
       <not-null/>
       <not-uninit/>
       <strz/>
-      <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="3" direction="in">
       <not-uninit/>
@@ -4600,6 +4603,141 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
       <not-uninit/>
     </arg>
   </function>
+  <function name="pthread_cond_wait">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="pthread_cond_timedwait">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="pthread_cond_init">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="pthread_cond_destroy">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="pthread_cleanup_push">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="pthread_cleanup_pop">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <function name="pthread_mutexattr_init,pthread_mutexattr_destroy">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="inout">
+      <not-null/>
+    </arg>
+  </function>
+  <function name="pthread_mutexattr_gettype">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <function name="pthread_mutexattr_settype">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <valid>0:2</valid>
+    </arg>
+  </function>
+  <function name="pthread_setcancelstate">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <valid>0:2</valid>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <function name="pthread_setcanceltype">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <valid>0:2</valid>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <function name="pthread_cancel">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
   <!-- https://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_create.html -->
   <!-- int pthread_create(pthread_t * thread, const pthread_attr_t * attr, void *(*start_routine)(void*), void * arg); -->
   <function name="pthread_create">
@@ -5470,6 +5608,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
       <minsize type="argvalue" arg="2"/>
     </arg>
     <arg nr="2" direction="in">
@@ -5646,6 +5785,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
       <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="3" direction="in">
@@ -6437,6 +6577,32 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
   <define name="R_OK" value="4"/>
   <define name="W_OK" value="2"/>
   <define name="X_OK" value="1"/>
+  <define name="PTHREAD_STACK_MIN" value="16384"/>
+  <define name="PTHREAD_CANCEL_ASYNCHRONOUS" value="1"/>
+  <define name="PTHREAD_CANCEL_ENABLE" value="0"/>
+  <define name="PTHREAD_CANCEL_DEFERRED" value="0"/>
+  <define name="PTHREAD_CANCEL_DISABLE" value="1"/>
+  <define name="PTHREAD_CANCELED" value="(void *)18446744073709551615U"/>
+  <define name="PTHREAD_COND_INITIALIZER" value="{ { {0}, {0}, {0, 0}, {0, 0}, 0, 0, {0, 0} } }"/>
+  <define name="PTHREAD_CREATE_DETACHED" value="1"/>
+  <define name="PTHREAD_CREATE_JOINABLE" value="0"/>
+  <define name="PTHREAD_EXPLICIT_SCHED" value="1"/>
+  <define name="PTHREAD_INHERIT_SCHED" value="0"/>
+  <define name="PTHREAD_MUTEX_DEFAULT" value="0"/>
+  <define name="PTHREAD_MUTEX_ERRORCHECK" value="2"/>
+  <define name="PTHREAD_MUTEX_NORMAL" value="0"/>
+  <define name="PTHREAD_MUTEX_TIMED_NP" value="0"/>
+  <define name="PTHREAD_MUTEX_INITIALIZER" value="{ { 0, 0, 0, 0, 0, 0, 0, { 0, 0 } } }"/>
+  <define name="PTHREAD_MUTEX_RECURSIVE" value="1"/>
+  <define name="PTHREAD_ONCE_INIT" value="{0, {0}}"/>
+  <define name="PTHREAD_PRIO_INHERIT" value="1"/>
+  <define name="PTHREAD_PRIO_NONE" value="0"/>
+  <define name="PTHREAD_PRIO_PROTECT" value="2"/>
+  <define name="PTHREAD_PROCESS_SHARED" value="1"/>
+  <define name="PTHREAD_PROCESS_PRIVATE" value="0"/>
+  <define name="PTHREAD_RWLOCK_INITIALIZER" value="{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 }, 0, 0 } }"/>
+  <define name="PTHREAD_SCOPE_PROCESS" value="1"/>
+  <define name="PTHREAD_SCOPE_SYSTEM" value="0"/>
   <!-- https://man7.org/linux/man-pages/man3/lockf.3.html -->
   <define name="F_LOCK" value="1"/>
   <define name="F_TEST" value="3"/>
diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index 00cb66c1909..95dc022cf57 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -410,7 +410,6 @@
     </arg>
     <arg nr="4" default="0">
       <not-uninit/>
-      <not-bool/>
     </arg>
     <arg nr="5" default="0">
       <not-uninit/>
@@ -2319,10 +2318,28 @@
       <not-bool/>
     </arg>
   </function>
+  <!-- bool QDir::mkdir(const QString &dirPath) const -->
+  <!-- bool QDir::mkpath(const QString &dirPath) const -->
+  <!-- do not mark as const as it is not const from a side effect standpoint-->
+  <function name="QDir::mkdir,QDir::mkpath">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <use-retval type="error-code"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- QString QDir::path() const -->
+  <function name="QDir::path">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <returnValue type="QString"/>
+  </function>
   <!-- QString absolutePath() const -->
   <!-- QString canonicalPath() const -->
   <!-- QString dirName() const -->
-  <function name="QDir::absoluteFilePath,QDir::canonicalPath,QDir::dirName">
+  <function name="QDir::absolutePath,QDir::canonicalPath,QDir::dirName">
     <noreturn>false</noreturn>
     <returnValue type="QString"/>
     <use-retval/>
@@ -2338,6 +2355,68 @@
       <not-bool/>
     </arg>
   </function>
+  <!-- QString QDir::absoluteFilePath(const QString &fileName) -->
+  <function name="QDir::absoluteFilePath">
+    <noreturn>false</noreturn>
+    <returnValue type="QString"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <const/>
+  </function>
+  <!-- QString QDir::filePath(const QString &fileName) -->
+  <function name="QDir::filePath">
+    <noreturn>false</noreturn>
+    <returnValue type="QString"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <const/>
+  </function>
+  <!-- static QString QDir::cleanPath(const QString &path) -->
+  <function name="QDir::cleanPath">
+    <noreturn>false</noreturn>
+    <returnValue type="QString"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <const/>
+  </function>
+  <!-- static QString QDir::currentPath() -->
+  <!-- static QString QDir::tempPath() -->
+  <function name="QDir::currentPath,QDir::tempPath">
+    <noreturn>false</noreturn>
+    <returnValue type="QString"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!-- QStringList QDir::entryList(const QStringList &nameFilters, QDir::Filters filters = NoFilter, QDir::SortFlags sort = NoSort) const-->
+  <!-- QStringList QDir::entryList(QDir::Filters filters = NoFilter, QDir::SortFlags sort = NoSort)const-->
+  <function name="QDir::entryList">
+    <noreturn>false</noreturn>
+    <returnValue type="QStringList"/>
+    <use-retval/>
+    <arg nr="any">
+      <not-uninit/>
+    </arg>
+    <const/>
+  </function>
+  <!-- QFileInfoList QDir::entryInfoList(const QStringList &nameFilters, QDir::Filters filters = NoFilter, QDir::SortFlags sort = NoSort) const -->
+  <!-- QFileInfoList QDir::entryInfoList(QDir::Filters filters = NoFilter, QDir::SortFlags sort = NoSort) const -->
+  <function name="QDir::entryInfoList">
+    <noreturn>false</noreturn>
+    <returnValue type="QFileInfoList"/>
+    <use-retval/>
+    <arg nr="any">
+      <not-uninit/>
+    </arg>
+    <const/>
+  </function>
   <!-- bool QDir::cdUp() -->
   <function name="QDir::cdUp">
     <noreturn>false</noreturn>
@@ -2346,8 +2425,9 @@
   </function>
   <!-- bool QDir::exists(QString &name) const -->
   <!-- bool QDir::exists() const -->
-  <function name="QDir">
+  <function name="QDir::exists">
     <noreturn>false</noreturn>
+    <pure/>
     <returnValue type="bool"/>
     <use-retval/>
     <leak-ignore/>
@@ -2356,17 +2436,11 @@
       <not-bool/>
     </arg>
   </function>
-  <!-- uint QDir::count() const -->
-  <function name="QDir::count">
-    <noreturn>false</noreturn>
-    <returnValue type="uint"/>
-    <use-retval/>
-    <const/>
-  </function>
   <!-- bool QFile::exists(const QString &fileName) // static -->
   <!-- bool QFile::exists() const -->
   <function name="QFile::exists">
     <noreturn>false</noreturn>
+    <pure/>
     <returnValue type="bool"/>
     <use-retval/>
     <leak-ignore/>
@@ -2375,6 +2449,34 @@
       <not-bool/>
     </arg>
   </function>
+  <!-- uint QDir::count() const -->
+  <function name="QDir::count">
+    <noreturn>false</noreturn>
+    <returnValue type="uint"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!-- QChar QDir::separator() static -->
+  <function name="QDir::separator">
+    <noreturn>false</noreturn>
+    <returnValue type="QChar"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!-- QDir QDir::home() static -->
+  <function name="QDir::home">
+    <noreturn>false</noreturn>
+    <returnValue type="QDir"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!-- QString QDir::homePath() static -->
+  <function name="QDir::homePath">
+    <noreturn>false</noreturn>
+    <returnValue type="QString"/>
+    <use-retval/>
+    <const/>
+  </function>
   <!-- bool QFile::open(OpenMode mode) -->
   <!-- bool QFile::open(FILE *fh, OpenMode mode, FileHandleFlags handleFlags = DontCloseHandle) -->
   <!-- bool QFile::open(int fd, OpenMode mode, FileHandleFlags handleFlags = DontCloseHandle) -->
@@ -5418,7 +5520,7 @@
   <define name="Q_OVERRIDE(x)" value=""/>
   <define name="Q_PLUGIN_METADATA(x)" value=""/>
   <define name="Q_ASSERT(condition)" value="assert(condition)"/>
-  <define name="Q_ASSERT_X(condition, where, what)" value="assert(condition)"/>
+  <define name="Q_ASSERT_X(condition, where, what)" value="assert(condition); (void)(where); (void)(what)"/>
   <define name="QTC_ASSERT_STRINGIFY_HELPER(x)" value="#x"/>
   <define name="QTC_ASSERT_STRINGIFY(x)" value="QTC_ASSERT_STRINGIFY_HELPER(x)"/>
   <define name="QTC_ASSERT_STRING(cond)" value="::Utils::writeAssertLocation( &quot;\&quot;&quot; cond&quot;\&quot; in file &quot; __FILE__ &quot;, line &quot; QTC_ASSERT_STRINGIFY(__LINE__))"/>
diff --git a/cfg/selinux.cfg b/cfg/selinux.cfg
index e2d7ac34dc3..31a48c6da5e 100644
--- a/cfg/selinux.cfg
+++ b/cfg/selinux.cfg
@@ -219,7 +219,7 @@
     <noreturn>false</noreturn>
     <use-retval/>
     <leak-ignore/>
-    <arg nr="1" direction="inout">
+    <arg nr="1" direction="inout" indirect="1">
       <not-uninit/>
       <not-null/>
     </arg>
diff --git a/cfg/std.cfg b/cfg/std.cfg
index fe43af1ec19..fc6a6c4d0f8 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -3,16 +3,16 @@
   <!-- stdint.h -->
   <define name="INT8_MIN" value="-128"/>
   <define name="INT16_MIN" value="-32768"/>
-  <define name="INT32_MIN" value="-2147483648"/>
-  <define name="INT64_MIN" value="-9223372036854775808"/>
+  <define name="INT32_MIN" value="(-2147483647-1)"/>
+  <define name="INT64_MIN" value="(-9223372036854775807-1)"/>
   <define name="INT_FAST8_MIN" value="-128"/>
-  <define name="INT_FAST16_MIN" value="-9223372036854775808"/>
-  <define name="INT_FAST32_MIN" value="-9223372036854775808"/>
-  <define name="INT_FAST64_MIN" value="-9223372036854775808"/>
+  <define name="INT_FAST16_MIN" value="(-9223372036854775807-1)"/>
+  <define name="INT_FAST32_MIN" value="(-9223372036854775807-1)"/>
+  <define name="INT_FAST64_MIN" value="(-9223372036854775807-1)"/>
   <define name="INT_LEAST8_MIN" value="-128"/>
   <define name="INT_LEAST16_MIN" value="-32768"/>
-  <define name="INT_LEAST32_MIN" value="-2147483648"/>
-  <define name="INT_LEAST64_MIN" value="-9223372036854775808"/>
+  <define name="INT_LEAST32_MIN" value="(-2147483647-1)"/>
+  <define name="INT_LEAST64_MIN" value="(-9223372036854775807-1)"/>
   <define name="INT8_MAX" value="127"/>
   <define name="INT16_MAX" value="32767"/>
   <define name="INT32_MAX" value="2147483647"/>
@@ -1665,7 +1665,7 @@
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="inout">
+    <arg nr="1" direction="inout" indirect="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -1929,7 +1929,7 @@
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="inout">
+    <arg nr="1" direction="inout" indirect="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -2255,7 +2255,7 @@
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="inout">
+    <arg nr="1" direction="inout" indirect="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3461,7 +3461,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     </arg>
   </function>
   <!-- int isless(double x, double y); -->
-  <function name="isless,std::isless">
+  <function name="isless">
     <use-retval/>
     <pure/>
     <returnValue type="int">arg1&lt;arg2?1:0</returnValue>
@@ -3474,8 +3474,21 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
+  <function name="std::isless">
+    <use-retval/>
+    <pure/>
+    <returnValue type="bool">arg1&lt;arg2?1:0</returnValue>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
   <!-- int islessequal(double x, double y); -->
-  <function name="islessequal,std::islessequal">
+  <function name="islessequal">
     <use-retval/>
     <pure/>
     <returnValue type="int">arg1 &lt;= arg2?1:0</returnValue>
@@ -3488,8 +3501,21 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
+  <function name="std::islessequal">
+    <use-retval/>
+    <pure/>
+    <returnValue type="bool">arg1 &lt;= arg2?1:0</returnValue>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
   <!-- int islessgreater(double x, double y); -->
-  <function name="islessgreater,std::islessgreater">
+  <function name="islessgreater">
     <use-retval/>
     <pure/>
     <returnValue type="int">(arg1&lt;arg2 || arg1&gt;arg2)?1:0</returnValue>
@@ -3503,6 +3529,20 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
+  <function name="std::islessgreater">
+    <use-retval/>
+    <pure/>
+    <returnValue type="bool">(arg1&lt;arg2 || arg1&gt;arg2)?1:0</returnValue>
+    <!-- true if x < y || x > y, false otherwise -->
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
   <!-- double nan(const char *tagp); -->
   <function name="nan,std::nan">
     <use-retval/>
@@ -3547,7 +3587,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- bool isnan(double x); // since C++11 -->
   <!-- bool isnan(long double x); // since C++11 -->
   <!-- bool isnan(Integral x); // since C++11 -->
-  <function name="isnan,std::isnan">
+  <function name="isnan">
     <use-retval/>
     <pure/>
     <returnValue type="int"/>
@@ -3558,12 +3598,23 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-bool/>
     </arg>
   </function>
+  <function name="std::isnan">
+    <use-retval/>
+    <pure/>
+    <returnValue type="bool"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
   <!-- int isnormal(double x); -->
   <!--bool isnormal(float x); // since C++11 -->
   <!--bool isnormal(double x); // since C++11 -->
   <!--bool isnormal(long double x); // since C++11 -->
   <!--bool isnormal(Integral x); // since C++11 -->
-  <function name="isnormal,std::isnormal">
+  <function name="isnormal">
     <use-retval/>
     <pure/>
     <returnValue type="int"/>
@@ -3574,12 +3625,23 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-bool/>
     </arg>
   </function>
+  <function name="std::isnormal">
+    <use-retval/>
+    <pure/>
+    <returnValue type="bool"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
   <!-- int isunordered(double x, double y);-->
   <!-- bool isunordered(float x, float y); // since C++11 -->
   <!-- bool isunordered(double x, double y); // since C++11 -->
   <!-- bool isunordered(long double x, long double y); // since C++11 -->
   <!-- bool isunordered(Arithmetic x, Arithmetic y); // since C++11 -->
-  <function name="isunordered,std::isunordered">
+  <function name="isunordered">
     <use-retval/>
     <pure/>
     <returnValue type="int"/>
@@ -3594,6 +3656,21 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-bool/>
     </arg>
   </function>
+  <function name="std::isunordered">
+    <use-retval/>
+    <pure/>
+    <returnValue type="bool"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
   <!-- int ilogb(double x); -->
   <function name="ilogb,std::ilogb">
     <use-retval/>
@@ -3928,7 +4005,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <arg nr="1">
       <not-null/>
       <not-uninit/>
-      <minsize type="argvalue" arg="3"/>
+      <minsize type="argvalue" arg="3" baseType="wchar_t"/>
     </arg>
     <arg nr="2" direction="in">
       <not-uninit/>
@@ -3974,12 +4051,12 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
-      <minsize type="argvalue" arg="3"/>
+      <minsize type="argvalue" arg="3" baseType="wchar_t"/>
     </arg>
     <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
-      <minsize type="argvalue" arg="3"/>
+      <minsize type="argvalue" arg="3" baseType="wchar_t"/>
     </arg>
     <arg nr="3" direction="in">
       <not-uninit/>
@@ -3989,11 +4066,11 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- void * memcpy(void *ct, const void *cs, size_t n);-->
   <function name="memcpy,std::memcpy">
-    <returnValue type="void *"/>
+    <returnValue type="void *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" size-arg="3"/>
-    <arg nr="1" direction="out">
+    <arg nr="1" direction="out" indirect="1">
       <not-null/>
       <minsize type="argvalue" arg="3"/>
     </arg>
@@ -4010,18 +4087,18 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- wchar_t* wmemcpy( wchar_t* dest, const wchar_t* src, std::size_t count ); -->
   <function name="wmemcpy,std::wmemcpy">
-    <returnValue type="wchar_t *"/>
+    <returnValue type="wchar_t *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" count-arg="3"/>
     <arg nr="1" direction="out">
       <not-null/>
-      <minsize type="argvalue" arg="3"/>
+      <minsize type="argvalue" arg="3" baseType="wchar_t"/>
     </arg>
     <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
-      <minsize type="argvalue" arg="3"/>
+      <minsize type="argvalue" arg="3" baseType="wchar_t"/>
     </arg>
     <arg nr="3" direction="in">
       <not-uninit/>
@@ -4056,7 +4133,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- void * memmove(void *ct, const void *cs, size_t n); -->
   <function name="memmove,std::memmove">
     <noreturn>false</noreturn>
-    <returnValue type="void *"/>
+    <returnValue type="void *">arg1</returnValue>
     <leak-ignore/>
     <arg nr="1" direction="out">
       <not-null/>
@@ -4077,17 +4154,17 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- wchar_t * wmemmove(wchar_t *ct, const wchar_t *cs, size_t n); -->
   <function name="wmemmove,std::wmemmove">
     <noreturn>false</noreturn>
-    <returnValue type="wchar_t *"/>
+    <returnValue type="wchar_t *">arg1</returnValue>
     <leak-ignore/>
     <arg nr="1" direction="out">
       <not-null/>
-      <minsize type="argvalue" arg="3"/>
+      <minsize type="argvalue" arg="3" baseType="wchar_t"/>
     </arg>
     <arg nr="2">
       <!-- TODO: direction? memory could be overwritten -->
       <not-null/>
       <not-uninit/>
-      <minsize type="argvalue" arg="3"/>
+      <minsize type="argvalue" arg="3" baseType="wchar_t"/>
     </arg>
     <arg nr="3" direction="in">
       <not-uninit/>
@@ -4100,7 +4177,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="errno_t"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="out">
+    <arg nr="1" direction="out" indirect="1">
       <not-null/>
       <minsize type="argvalue" arg="2"/>
     </arg>
@@ -4118,10 +4195,10 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- void *memset(void *s, int c, size_t n); -->
   <function name="memset,std::memset">
-    <returnValue type="void *"/>
+    <returnValue type="void *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="out">
+    <arg nr="1" direction="out" indirect="1">
       <not-null/>
       <minsize type="argvalue" arg="3"/>
     </arg>
@@ -4136,12 +4213,12 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- wchar_t *wmemset(wchar_t *s, wchar_t c, size_t n); -->
   <function name="wmemset,std::wmemset">
-    <returnValue type="wchar_t *"/>
+    <returnValue type="wchar_t *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1" direction="out">
       <not-null/>
-      <minsize type="argvalue" arg="3"/>
+      <minsize type="argvalue" arg="3" baseType="wchar_t"/>
     </arg>
     <arg nr="2" direction="in">
       <not-uninit/>
@@ -4411,7 +4488,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2">
       <not-null/>
       <not-uninit/>
       <minsize type="argvalue" arg="3"/>
@@ -4444,7 +4521,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2">
       <not-null/>
       <not-uninit/>
       <minsize type="argvalue" arg="3"/>
@@ -4671,7 +4748,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     </arg>
   </function>
   <!-- int signbit(double x); -->
-  <function name="signbit,std::signbit">
+  <function name="signbit">
     <use-retval/>
     <pure/>
     <returnValue type="int"/>
@@ -4681,6 +4758,16 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
+  <function name="std::signbit">
+    <use-retval/>
+    <pure/>
+    <returnValue type="bool"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
   <!-- void (*signal(int sig, void (*func)(int)))(int); -->
   <function name="signal,std::signal">
     <noreturn>false</noreturn>
@@ -4812,7 +4899,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- char * strcat(char *deststr, const char *srcstr); -->
   <function name="strcat,std::strcat">
-    <returnValue type="char *"/>
+    <returnValue type="char *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" strlen-arg="2"/>
@@ -4828,9 +4915,9 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <strz/>
     </arg>
   </function>
-  <!-- wchar_t wcscat(wchar_t *deststr, const wchar_t *srcstr); -->
+  <!-- wchar_t* wcscat(wchar_t *deststr, const wchar_t *srcstr); -->
   <function name="wcscat,std::wcscat">
-    <returnValue type="wchar_t"/>
+    <returnValue type="wchar_t *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" strlen-arg="2"/>
@@ -4861,7 +4948,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -4911,7 +4998,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <noreturn>false</noreturn>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" strlen-arg="2"/>
     <leak-ignore/>
-    <arg nr="1" direction="out">
+    <arg nr="1" direction="out" indirect="1">
       <not-null/>
       <minsize type="strlen" arg="2"/>
     </arg>
@@ -4942,7 +5029,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- wchar_t *wcscpy(wchar_t *deststr, const wchar_t *srcstr); -->
   <function name="wcscpy,std::wcscpy">
-    <returnValue type="wchar_t *"/>
+    <returnValue type="wchar_t *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" strlen-arg="2"/>
@@ -5044,7 +5131,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -5057,7 +5144,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- char * strncat(char *ct, const char *s, size_t n); -->
   <function name="strncat,std::strncat">
-    <returnValue type="char *"/>
+    <returnValue type="char *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" size-arg="3"/>
@@ -5123,10 +5210,10 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
-  <!-- wchar_t *wcsncat(wchar_t *ct, const wchar_t *cs, size_t n); -->
+  <!-- wchar_t* *wcsncat(wchar_t *ct, const wchar_t *cs, size_t n); -->
   <function name="wcsncat,std::wcsncat">
     <noreturn>false</noreturn>
-    <returnValue type="wchar_t *"/>
+    <returnValue type="wchar_t *">arg1</returnValue>
     <leak-ignore/>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" count-arg="3"/>
     <arg nr="1" direction="inout">
@@ -5233,7 +5320,6 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-null/>
       <not-uninit/>
       <strz/>
-      <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="3" direction="in">
       <not-uninit/>
@@ -5373,7 +5459,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- wchar_t * wcsncpy(wchar_t *s, const wchar_t *cs, size_t n); -->
   <function name="wcsncpy,std::wcsncpy">
-    <returnValue type="wchar_t *"/>
+    <returnValue type="wchar_t *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" count-arg="3"/>
@@ -5433,7 +5519,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -7130,6 +7216,16 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="const char *"/>
     <noreturn>false</noreturn>
   </function>
+  <!-- const wchar_t* c_str() const; // until C++11 -->
+  <!-- const wchar_t* c_str() const noexcept; // since C++11 -->
+  <!-- const wchar_t* data() const; // until C++11 -->
+  <!-- const wchar_t* data() const noexcept; // since C++11 -->
+  <function name="std::wstring::c_str,std::wstring::data">
+    <use-retval/>
+    <const/>
+    <returnValue type="const wchar_t *"/>
+    <noreturn>false</noreturn>
+  </function>
   <!-- char& front(); -->
   <!-- const char& front() const; -->
   <function name="std::string::front">
@@ -7137,6 +7233,13 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="char &amp;"/>
     <noreturn>false</noreturn>
   </function>
+  <!-- wchar_t& front(); -->
+  <!-- const wchar_t& front() const; -->
+  <function name="std::wstring::front">
+    <use-retval/>
+    <returnValue type="wchar_t &amp;"/>
+    <noreturn>false</noreturn>
+  </function>
   <!-- size_t find (const string& str, size_t pos = 0) const; -->
   <!-- size_t find (const char* s, size_t pos, size_t n) const; -->
   <!-- size_t find (char c, size_t pos = 0) const;-->
@@ -8326,9 +8429,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <leak-ignore/>
     <container yields="size"/>
     <returnValue type="size_t"/>
-    <arg nr="1" direction="in">
-      <not-uninit/>
-    </arg>
+    <arg nr="1" direction="in" indirect="0"/>
   </function>
   <function name="std::ssize">
     <noreturn>false</noreturn>
@@ -8734,7 +8835,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <use-retval/>
     <leak-ignore/>
     <noreturn>false</noreturn>
-    <arg nr="1" direction="in"/>
+    <arg nr="1" direction="in" indirect="0"/>
     <container yields="start-iterator"/>
     <returnValue type="iterator" container="1"/>
   </function>
@@ -8742,7 +8843,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <use-retval/>
     <leak-ignore/>
     <noreturn>false</noreturn>
-    <arg nr="1" direction="in"/>
+    <arg nr="1" direction="in" indirect="0"/>
     <container yields="end-iterator"/>
     <returnValue type="iterator" container="1"/>
   </function>
@@ -8797,6 +8898,12 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <use-retval/>
     <leak-ignore/>
   </function>
+  <function name="std::throw_with_nested">
+    <arg nr="1" direction="in" indirect="0"/>
+    <returnValue type="void"/>
+    <noreturn>true</noreturn>
+    <leak-ignore/>
+  </function>
   <memory>
     <alloc init="false" buffer-size="malloc">malloc,std::malloc</alloc>
     <alloc init="true" buffer-size="calloc">calloc,std::calloc</alloc>
diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 343e12b3906..184bb225db3 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -1331,6 +1331,11 @@
     <alloc init="true" arg="11">AllocateAndInitializeSid</alloc>
     <dealloc>FreeSid</dealloc>
   </memory>
+  <memory>
+    <alloc init="true">_create_locale</alloc>
+    <alloc init="true">_wcreate_locale</alloc>
+    <dealloc>_free_locale</dealloc>
+  </memory>
   <!--SIZE_T RtlCompareMemory(
   _In_ const VOID   *Source1,
   _In_ const VOID   *Source2,
@@ -3504,7 +3509,7 @@ HFONT CreateFont(
     <arg nr="10">
       <not-uninit/>
     </arg>
-    <arg nr="11" direction="in">
+    <arg nr="11">
       <not-uninit/>
     </arg>
   </function>
@@ -3559,7 +3564,7 @@ HFONT CreateFont(
     <arg nr="11">
       <not-uninit/>
     </arg>
-    <arg nr="12" direction="in">
+    <arg nr="12">
       <not-uninit/>
     </arg>
   </function>
@@ -4120,7 +4125,7 @@ HFONT CreateFont(
     <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2">
       <not-uninit/>
     </arg>
     <arg nr="3" direction="out"/>
@@ -4288,11 +4293,13 @@ HFONT CreateFont(
     <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
       <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
       <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="3" direction="in">
@@ -4312,11 +4319,13 @@ HFONT CreateFont(
     <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
       <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
       <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="3" direction="in">
@@ -4579,6 +4588,7 @@ HFONT CreateFont(
     <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
       <minsize type="argvalue" arg="4"/>
     </arg>
     <arg nr="4" direction="in">
@@ -4627,6 +4637,7 @@ HFONT CreateFont(
     <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
       <minsize type="argvalue" arg="4"/>
     </arg>
     <arg nr="4" direction="in">
@@ -5591,11 +5602,43 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
+  <!--_locale_t _create_locale(int category, const char *locale);
+      _locale_t _wcreate_locale(int category, const wchar_t *locale);
+      void _free_locale(_locale_t locale);-->
+  <function name="_create_locale">
+    <returnValue type="_locale_t"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="_wcreate_locale">
+    <returnValue type="_locale_t"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="_free_locale">
+    <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
   <!--char * strlwr(_Inout_z_ char * _Str);-->
   <function name="strlwr">
     <returnValue type="char *">arg1</returnValue>
     <noreturn>false</noreturn>
-    <arg nr="1" direction="inout">
+    <arg nr="1" direction="inout" indirect="1">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -5963,7 +6006,7 @@ HFONT CreateFont(
     <arg nr="2" direction="out">
       <not-null/>
     </arg>
-    <arg nr="3" direction="inout">
+    <arg nr="3" direction="inout" indirect="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -6009,7 +6052,7 @@ HFONT CreateFont(
     <arg nr="4" direction="out">
       <not-null/>
     </arg>
-    <arg nr="5" direction="inout">
+    <arg nr="5" direction="inout" indirect="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -7191,7 +7234,7 @@ HFONT CreateFont(
   <define name="AFX_EXT_CLASS" value=""/>
   <define name="DEBUG_NEW" value="new"/>
   <define name="INVALID_HANDLE_VALUE" value="-1"/>
-  <define name="INVALID_SOCKET" value="~0"/>
+  <define name="INVALID_SOCKET" value="-1"/>
   <define name="WINAPI" value="__stdcall"/>
   <define name="STDMETHODCALLTYPE" value="__stdcall"/>
   <define name="STDMETHODIMP" value="HRESULT STDMETHODCALLTYPE"/>
@@ -13345,9 +13388,9 @@ HFONT CreateFont(
   <define name="MiniDumpWithAvxXStateContext" value="0x0200000"/>
   <define name="MiniDumpWithIptTrace" value="0x0400000"/>
   <define name="MiniDumpValidTypeFlags" value="0x0800000"/>
-  <define name="MAKEINTRESOURCEA(i)" value="i"/>
-  <define name="MAKEINTRESOURCEW(i)" value="i"/>
-  <define name="MAKEINTRESOURCE(i)" value="i"/>
+  <define name="MAKEINTRESOURCEA(i)" value="((LPSTR)((ULONG_PTR)((WORD)(i))))"/>
+  <define name="MAKEINTRESOURCEW(i)" value="((LPWSTR)((ULONG_PTR)((WORD)(i))))"/>
+  <define name="MAKEINTRESOURCE(i)" value="((LPTSTR)((ULONG_PTR)((WORD)(i))))"/>
   <define name="FILE_ATTRIBUTE_ARCHIVE" value="0x20"/>
   <define name="FILE_ATTRIBUTE_COMPRESSED" value="0x800"/>
   <define name="FILE_ATTRIBUTE_DEVICE" value="0x40"/>
diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index c1370373b54..9dea60761d1 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -17078,12 +17078,16 @@ wxItemKind kind = wxITEM_NORMAL) -->
   <!-- bool wxWindow::Layout( void ) -->
   <!-- bool wxWindowBase::Layout( void ) -->
   <!-- bool wxGrid::Layout( void ) -->
-  <!-- bool wxPanel::Layout( void ) -->
-  <function name="wxWindow::Layout,wxWindowBase::Layout,wxFrame::Layout,wxGrid::Layout,wxPanel::Layout">
+  <function name="wxWindow::Layout,wxWindowBase::Layout,wxFrame::Layout,wxGrid::Layout">
       <noreturn>false</noreturn>
       <leak-ignore/>
       <returnValue type="bool"/>
       <use-retval/>
+  </function>  
+  <!-- bool wxPanel::Layout( void ) -->
+  <function name="wxPanel::Layout">
+      <noreturn>false</noreturn>
+      <returnValue type="bool"/>
   </function>
   <!-- void wxSizer::Layout( void ) -->
   <!-- void wxBoxSizer::Layout( void ) -->
diff --git a/clang-tidy.md b/clang-tidy.md
index 72df0375ca1..fe6a6eb7140 100644
--- a/clang-tidy.md
+++ b/clang-tidy.md
@@ -130,11 +130,14 @@ Does not improve the readability.
 `modernize-use-designated-initializers`<br/>
 `readability-enum-initial-value`<br/>
 `modernize-use-trailing-return-type`<br/>
+`misc-unconventional-assign-operator`<br/>
+`bugprone-throwing-static-initialization`<br/>
+`bugprone-command-processor`<br/>
+`misc-multiple-inheritance`<br/>
 
 To be evaluated (need to remove exclusion).
 
 `cppcoreguidelines-missing-std-forward`<br/>
-`cppcoreguidelines-avoid-const-or-ref-data-members`<br/>
 `cppcoreguidelines-macro-usage`<br/>
 `cppcoreguidelines-pro-type-member-init`<br/>
 `cppcoreguidelines-prefer-member-initializer`<br/>
@@ -156,6 +159,22 @@ These apply to codebases which use later standards then C++11 (C++17 is used whe
 
 We are not interested in this.
 
+`readability-redundant-parentheses`<br/>
+
+Reports false positives - see https://github.com/llvm/llvm-project/issues/164125.
+
+`readability-inconsistent-ifelse-braces`<br/>
+
+The suggestions are too intrusive.
+
+`modernize-avoid-c-style-cast`<br/>
+
+Currently flags functional casts - see https://github.com/llvm/llvm-project/issues/186784.
+
+`misc-use-internal-linkage.AnalyzeTypes`<br/>
+
+Adding anonymous namespaces requires identation which is too instrusive right now. Would require changes to our fomatting configuration.
+
 ### Disabled for performance reasons
 
 `portability-std-allocator-const`<br/>
@@ -180,7 +199,7 @@ We are currently using our own `naming.json` to enforce naming schemes. Also dis
 
 `portability-simd-intrinsics`<br/>
 
-We are not using SIMD instructions and it suggests to use `std::experiemental::` features which might not be commonly available. Also disabled for performance reasons - see https://github.com/llvm/llvm-project/issues/57527#issuecomment-1237935132.
+We are not using SIMD instructions and it suggests to use `std::experimental::` features which might not be commonly available. Also disabled for performance reasons - see https://github.com/llvm/llvm-project/issues/57527#issuecomment-1237935132.
 
 `modernize-macro-to-enum`<br/>
 
diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
index 2664a29a65d..52103bdb8ec 100644
--- a/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 file(GLOB hdrs "*.h")
 file(GLOB srcs "*.cpp")
 file(GLOB mainfile "main.cpp")
@@ -41,27 +40,32 @@ if (BUILD_CLI)
     endif()
 
     install(TARGETS cppcheck
-        RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         COMPONENT applications)
 
     install(PROGRAMS ${CMAKE_SOURCE_DIR}/htmlreport/cppcheck-htmlreport
-        DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
+        DESTINATION ${CMAKE_INSTALL_BINDIR}
         COMPONENT applications)
 
+    # TODO: leverage CMAKE_INSTALL_DATAROOTDIR (share)?
+
     install(FILES ${addons_py}
-       DESTINATION ${FILESDIR_DEF}/addons
+       DESTINATION ${FILESDIR_INSTALL}/addons
        COMPONENT headers)
 
     install(FILES ${addons_json}
-       DESTINATION ${FILESDIR_DEF}/addons
+       DESTINATION ${FILESDIR_INSTALL}/addons
        COMPONENT headers)
 
     install(FILES ${cfgs}
-       DESTINATION ${FILESDIR_DEF}/cfg
+       DESTINATION ${FILESDIR_INSTALL}/cfg
        COMPONENT headers)
 
     install(FILES ${platforms}
-       DESTINATION ${FILESDIR_DEF}/platforms
+       DESTINATION ${FILESDIR_INSTALL}/platforms
        COMPONENT headers)
 
+    # TODO: install manpage into CMAKE_INSTALL_MANDIR
+    # TODO: install documentation into CMAKE_INSTALL_DOCDIR?
+
 endif()
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 4e567e47d9f..842d597b0a4 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 
 #include "addoninfo.h"
 #include "check.h"
+#include "checks.h"
 #include "checkers.h"
 #include "color.h"
 #include "config.h"
@@ -36,7 +37,6 @@
 #include "settings.h"
 #include "standards.h"
 #include "suppressions.h"
-#include "timer.h"
 #include "utils.h"
 
 #include "frontend.h"
@@ -50,7 +50,6 @@
 #include <iostream>
 #include <iterator>
 #include <list>
-#include <memory>
 #include <set>
 #include <sstream>
 #include <unordered_set>
@@ -58,9 +57,12 @@
 
 #ifdef HAVE_RULES
 #include "regex.h"
+#include "rule.h"
 
 // xml is used for rules
 #include "xml.h"
+
+#include <memory>
 #endif
 
 static bool addFilesToList(const std::string& fileList, std::vector<std::string>& pathNames)
@@ -76,9 +78,7 @@ static bool addFilesToList(const std::string& fileList, std::vector<std::string>
         files = &infile;
     }
     std::string fileName;
-    // cppcheck-suppress accessMoved - FP
     while (std::getline(*files, fileName)) { // next line
-        // cppcheck-suppress accessMoved - FP
         if (!fileName.empty()) {
             pathNames.emplace_back(std::move(fileName));
         }
@@ -92,7 +92,6 @@ static bool addIncludePathsToList(const std::string& fileList, std::list<std::st
     std::ifstream files(fileList);
     if (files) {
         std::string pathName;
-        // cppcheck-suppress accessMoved - FP
         while (std::getline(files, pathName)) { // next line
             if (!pathName.empty()) {
                 pathName = Path::removeQuotationMarks(std::move(pathName));
@@ -206,8 +205,6 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
     assert(!(!pathnamesRef.empty() && !fileSettingsRef.empty()));
 
     if (!fileSettingsRef.empty()) {
-        // TODO: de-duplicate
-
         std::list<FileSettings> fileSettings;
         if (!mSettings.fileFilters.empty()) {
             // filter only for the selected filenames from all project files
@@ -225,6 +222,8 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
             fileSettings = fileSettingsRef;
         }
 
+        // TODO: de-duplicate
+
         mFileSettings.clear();
 
         frontend::applyLang(fileSettings, mSettings, mEnforcedLang);
@@ -265,19 +264,6 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
             return false;
         }
 
-        // de-duplicate files
-        {
-            auto it = filesResolved.begin();
-            while (it != filesResolved.end()) {
-                const std::string& name = it->path();
-                // TODO: log if duplicated files were dropped
-                filesResolved.erase(std::remove_if(std::next(it), filesResolved.end(), [&](const FileWithDetails& entry) {
-                    return entry.path() == name;
-                }), filesResolved.end());
-                ++it;
-            }
-        }
-
         std::list<FileWithDetails> files;
         if (!mSettings.fileFilters.empty()) {
             files = filterFiles(mSettings.fileFilters, filesResolved);
@@ -291,6 +277,19 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
             files = std::move(filesResolved);
         }
 
+        // de-duplicate files
+        {
+            auto it = files.begin();
+            while (it != files.end()) {
+                const std::string& absname = it->abspath();
+                // TODO: log if duplicated files were dropped
+                files.erase(std::remove_if(std::next(it), files.end(), [&](const FileWithDetails& entry) {
+                    return entry.abspath() == absname;
+                }), files.end());
+                ++it;
+            }
+        }
+
         frontend::applyLang(files, mSettings, mEnforcedLang);
 
         // sort the markup last
@@ -353,7 +352,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         return Result::Fail;
 
     if (argc <= 1) {
-        printHelp(mSettings.premium);
+        printHelp();
         return Result::Exit;
     }
 
@@ -363,9 +362,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         if (std::strcmp(argv[i], "--doc") == 0) {
             std::ostringstream doc;
             // Get documentation..
-            for (const Check * it : Check::instances()) {
-                const std::string& name(it->name());
-                const std::string info(it->classInfo());
+            for (const Check * const c : CheckInstances::get()) {
+                const std::string& name(c->name());
+                const std::string info(c->classInfo());
                 if (!name.empty() && !info.empty())
                     doc << "## " << name << " ##\n"
                         << info << "\n";
@@ -388,7 +387,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
         // Print help
         if (std::strcmp(argv[i], "-h") == 0 || std::strcmp(argv[i], "--help") == 0) {
-            printHelp(mSettings.premium);
+            printHelp();
             return Result::Exit;
         }
 
@@ -462,6 +461,11 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             mSettings.quiet = true;
         }
 
+        // -CC
+        else if (std::strcmp(argv[i], "-CC") == 0) {
+            mSettings.keepComments = true;
+        }
+
         // Include paths
         else if (std::strncmp(argv[i], "-I", 2) == 0) {
             std::string path;
@@ -621,6 +625,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             mSettings.cppHeaderProbe = true;
         }
 
+        else if (std::strcmp(argv[i], "--debug-analyzerinfo") == 0)
+            mSettings.debugainfo = true;
+
         else if (std::strcmp(argv[i], "--debug-ast") == 0)
             mSettings.debugast = true;
 
@@ -632,6 +639,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         else if (std::strcmp(argv[i], "--debug-ignore") == 0)
             mSettings.debugignore = true;
 
+        else if (std::strcmp(argv[i], "--debug-ipc") == 0)
+            mSettings.debugipc = true;
+
         // Show --debug output after the first simplifications
         else if (std::strcmp(argv[i], "--debug") == 0 ||
                  std::strcmp(argv[i], "--debug-normal") == 0)
@@ -753,6 +763,15 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             }
         }
 
+        else if (std::strncmp(argv[i], "--exitcode-suppress=", 20) == 0) {
+            const std::string suppression = argv[i]+20;
+            const std::string errmsg(mSuppressions.nofail.addSuppressionLine(suppression));
+            if (!errmsg.empty()) {
+                mLogger.printError(errmsg);
+                return Result::Fail;
+            }
+        }
+
         // Filter errors
         else if (std::strncmp(argv[i], "--exitcode-suppressions=", 24) == 0) {
             // exitcode-suppressions=filename.txt
@@ -1115,7 +1134,8 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 "misra-c++-2023",
                 "misra-cpp-2023",
                 "bughunting",
-                "safety",  // TODO: deprecate in favor of the regular --saftey/--no-safety
+                "safety",  // TODO: deprecate in favor of the regular --safety/--no-safety
+                "safety-profiles",
                 "debug-progress"};
             // valid options --premium-..=
             const std::set<std::string> valid2{
@@ -1133,13 +1153,21 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 mSettings.premiumArgs += " ";
             const std::string p(argv[i] + 10);
             const std::string p2(p.find('=') != std::string::npos ? p.substr(0, p.find('=')) : "");
-            const bool isCodingStandard = startsWith(p, "autosar") || startsWith(p,"cert-") || startsWith(p,"misra-");
+            const bool isCodingStandard = startsWith(p, "autosar") || startsWith(p,"cert-") || startsWith(p,"misra-") || p == "safety-profiles";
             const std::string p3(endsWith(p,":all") && isCodingStandard ? p.substr(0,p.rfind(':')) : p);
             if (!valid.count(p3) && !valid2.count(p2)) {
                 mLogger.printError("invalid --premium option '" + (p2.empty() ? p : p2) + "'.");
                 return Result::Fail;
             }
-            mSettings.premiumArgs += "--" + p;
+            if (p2 == "cert-c-int-precision") {
+                int tmp;
+                if (!parseNumberArg(argv[i], 31, tmp, true))
+                    return Result::Fail;
+            }
+            if (p.find(' ') != std::string::npos)
+                mSettings.premiumArgs += "\"--" + p + "\"";
+            else
+                mSettings.premiumArgs += "--" + p;
             if (isCodingStandard) {
                 // All checkers related to the coding standard should be enabled. The coding standards
                 // do not all undefined behavior or portability issues.
@@ -1184,7 +1212,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             }
             if (projectType == ImportProject::Type::COMPILE_DB)
                 mSettings.maxConfigsProject = 1;
-            if (projectType == ImportProject::Type::VS_SLN || projectType == ImportProject::Type::VS_VCXPROJ) {
+            if (projectType == ImportProject::Type::VS_SLN ||
+                projectType == ImportProject::Type::VS_SLNX ||
+                projectType == ImportProject::Type::VS_VCXPROJ) {
                 mSettings.libraries.emplace_back("windows");
             }
             for (const auto &error : project.errors)
@@ -1210,7 +1240,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 mLogger.printError("--project-configuration parameter is empty.");
                 return Result::Fail;
             }
-            if (projectType != ImportProject::Type::VS_SLN && projectType != ImportProject::Type::VS_VCXPROJ) {
+            if (projectType != ImportProject::Type::VS_SLN &&
+                projectType != ImportProject::Type::VS_SLNX &&
+                projectType != ImportProject::Type::VS_VCXPROJ) {
                 mLogger.printError("--project-configuration has no effect - no Visual Studio project provided.");
                 return Result::Fail;
             }
@@ -1281,7 +1313,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         // Rule given at command line
         else if (std::strncmp(argv[i], "--rule=", 7) == 0) {
 #ifdef HAVE_RULES
-            Settings::Rule rule;
+            Rule rule;
             rule.pattern = 7 + argv[i];
 
             if (rule.pattern.empty()) {
@@ -1290,7 +1322,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             }
 
             std::string regex_err;
-            auto regex = Regex::create(rule.pattern, regex_err);
+            auto regex = Regex::create(rule.pattern, Regex::Engine::Pcre, regex_err);
             if (!regex) {
                 mLogger.printError("failed to compile rule pattern '" + rule.pattern + "' (" + regex_err + ").");
                 return Result::Fail;
@@ -1317,7 +1349,8 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 if (node && strcmp(node->Value(), "rules") == 0)
                     node = node->FirstChildElement("rule");
                 for (; node && strcmp(node->Value(), "rule") == 0; node = node->NextSiblingElement()) {
-                    Settings::Rule rule;
+                    Rule rule;
+                    Regex::Engine regexEngine = Regex::Engine::Pcre;
 
                     for (const tinyxml2::XMLElement *subnode = node->FirstChildElement(); subnode; subnode = subnode->NextSiblingElement()) {
                         const char * const subname = subnode->Name();
@@ -1347,6 +1380,16 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                                 }
                             }
                         }
+                        else if (std::strcmp(subname, "engine") == 0) {
+                            const char * const engine = empty_if_null(subtext);
+                            if (std::strcmp(engine, "pcre") == 0) {
+                                regexEngine = Regex::Engine::Pcre;
+                            }
+                            else {
+                                mLogger.printError(std::string("unknown regex engine '") + engine + "'.");
+                                return Result::Fail;
+                            }
+                        }
                         else {
                             mLogger.printError("unable to load rule-file '" + ruleFile + "' - unknown element '" + subname + "' encountered in 'rule'.");
                             return Result::Fail;
@@ -1374,7 +1417,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                     }
 
                     std::string regex_err;
-                    auto regex = Regex::create(rule.pattern, regex_err);
+                    auto regex = Regex::create(rule.pattern, regexEngine, regex_err);
                     if (!regex) {
                         mLogger.printError("unable to load rule-file '" + ruleFile + "' - pattern '" + rule.pattern + "' failed to compile (" + regex_err + ").");
                         return Result::Fail;
@@ -1406,17 +1449,17 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         else if (std::strncmp(argv[i], "--showtime=", 11) == 0) {
             const std::string showtimeMode = argv[i] + 11;
             if (showtimeMode == "file")
-                mSettings.showtime = ShowTime::FILE;
+                mSettings.showtime = Settings::ShowTime::FILE;
             else if (showtimeMode == "file-total")
-                mSettings.showtime = ShowTime::FILE_TOTAL;
+                mSettings.showtime = Settings::ShowTime::FILE_TOTAL;
             else if (showtimeMode == "summary")
-                mSettings.showtime = ShowTime::SUMMARY;
+                mSettings.showtime = Settings::ShowTime::SUMMARY;
             else if (showtimeMode == "top5_file")
-                mSettings.showtime = ShowTime::TOP5_FILE;
+                mSettings.showtime = Settings::ShowTime::TOP5_FILE;
             else if (showtimeMode == "top5_summary")
-                mSettings.showtime = ShowTime::TOP5_SUMMARY;
+                mSettings.showtime = Settings::ShowTime::TOP5_SUMMARY;
             else if (showtimeMode == "none")
-                mSettings.showtime = ShowTime::NONE;
+                mSettings.showtime = Settings::ShowTime::NONE;
             else if (showtimeMode.empty()) {
                 mLogger.printError("no mode provided for --showtime");
                 return Result::Fail;
@@ -1645,7 +1688,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         mSettings.platform.defaultSign = defaultSign;
 
     if (!mSettings.analyzeAllVsConfigs) {
-        if (projectType != ImportProject::Type::VS_SLN && projectType != ImportProject::Type::VS_VCXPROJ) {
+        if (projectType != ImportProject::Type::VS_SLN &&
+            projectType != ImportProject::Type::VS_SLNX &&
+            projectType != ImportProject::Type::VS_VCXPROJ) {
             if (mAnalyzeAllVsConfigsSetOnCmdLine) {
                 mLogger.printError("--no-analyze-all-vs-configs has no effect - no Visual Studio project provided.");
                 return Result::Fail;
@@ -1697,16 +1742,17 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
     if (mSettings.basePaths.empty() && mSettings.relativePaths)
         mSettings.basePaths = mPathNames;
 
+    if (mSettings.keepComments && !mSettings.preprocessOnly) {
+        mLogger.printError("-CC may only be used on conjunciton with -E");
+        return Result::Fail;
+    }
+
+
     return Result::Success;
 }
 
-void CmdLineParser::printHelp(bool premium) const
+void CmdLineParser::printHelp() const
 {
-    // TODO: fetch URL from config like product name?
-    const std::string manualUrl(premium ?
-                                "https://files.cppchecksolutions.com/manual.pdf" :
-                                "https://cppcheck.sourceforge.io/manual.pdf");
-
     std::ostringstream oss;
     // TODO: display product name
     oss << "Cppcheck - A tool for static C/C++ code analysis\n"
@@ -1725,6 +1771,7 @@ void CmdLineParser::printHelp(bool premium) const
         "                         addon json files or through this command line option.\n"
         "                         If not present, Cppcheck will try \"python3\" first and\n"
         "                         then \"python\".\n"
+        "    -CC                  Do not remove comments during preprocessing (requires -E).\n"
         "    --cppcheck-build-dir=<dir>\n"
         "                         Cppcheck work folder. Advantages:\n"
         "                          * whole program analysis\n"
@@ -1796,6 +1843,9 @@ void CmdLineParser::printHelp(bool premium) const
         "                         provided. Note that your operating system can modify\n"
         "                         this value, e.g. '256' can become '0'.\n"
         "    --errorlist          Print a list of all the error messages in XML format.\n"
+        "    --exitcode-suppress=<spec>\n"
+        "                         Used to specify an error ID which should not result in\n"
+        "                         a non-zero exitcode."
         "    --exitcode-suppressions=<file>\n"
         "                         Used when certain messages should be displayed but\n"
         "                         should not cause a non-zero exitcode.\n"
@@ -1906,7 +1956,7 @@ void CmdLineParser::printHelp(bool premium) const
         "    --plist-output=<path>\n"
         "                         Generate Clang-plist output files in folder.\n";
 
-    if (premium) {
+    if (mSettings.premium) {
         oss <<
             "    --premium=<option>\n"
             "                         Coding standards:\n"
@@ -1936,13 +1986,13 @@ void CmdLineParser::printHelp(bool premium) const
 
     oss <<
         "    --project=<file>     Run Cppcheck on project. The <file> can be a Visual\n"
-        "                         Studio Solution (*.sln), Visual Studio Project\n"
+        "                         Studio Solution (*.sln) or (*.slnx), Visual Studio Project\n"
         "                         (*.vcxproj), compile database (compile_commands.json),\n"
         "                         or Borland C++ Builder 6 (*.bpr). The files to analyse,\n"
         "                         include paths, defines, platform and undefines in\n"
         "                         the specified file will be used.\n"
         "    --project-configuration=<config>\n"
-        "                         If used together with a Visual Studio Solution (*.sln)\n"
+        "                         If used together with a Visual Studio Solution (*.sln) or (*.slnx)\n"
         "                         or Visual Studio Project (*.vcxproj) you can limit\n"
         "                         the configuration cppcheck should check.\n"
         "                         For example: '--project-configuration=Release|Win32'\n"
@@ -2077,7 +2127,7 @@ void CmdLineParser::printHelp(bool premium) const
         "  cppcheck -I inc1/ -I inc2/ f.cpp\n"
         "\n"
         "For more information:\n"
-        "    " << manualUrl << "\n"
+        "    " << mSettings.manualUrl << "\n"
         "\n"
         "Many thanks to the 3rd party libraries we use:\n"
         " * tinyxml2 -- loading project/library/ctu files.\n"
diff --git a/cli/cmdlineparser.h b/cli/cmdlineparser.h
index 16e9bb56107..e712c3035ff 100644
--- a/cli/cmdlineparser.h
+++ b/cli/cmdlineparser.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,6 +56,8 @@ class CmdLineParser {
      * @param suppressions Suppressions instance that keeps the suppressions
      */
     CmdLineParser(CmdLineLogger &logger, Settings &settings, Suppressions &suppressions);
+    CmdLineParser(const CmdLineParser &) = delete;
+    CmdLineParser &operator=(const CmdLineParser &) = delete;
 
     enum class Result : std::uint8_t { Success, Exit, Fail };
 
@@ -109,7 +111,7 @@ class CmdLineParser {
     /**
      * Print help text to the console.
      */
-    void printHelp(bool premium) const;
+    void printHelp() const;
 
     template<typename T>
     bool parseNumberArg(const char* const arg, std::size_t offset, T& num, bool mustBePositive = false)
@@ -152,10 +154,10 @@ class CmdLineParser {
 
     void outputFormatOptionMixingError() const;
 
-    CmdLineLogger &mLogger;
+    CmdLineLogger& mLogger;
 
-    Settings &mSettings;
-    Suppressions &mSuppressions;
+    Settings& mSettings;
+    Suppressions& mSuppressions;
 
 protected:
     std::vector<std::string> mPathNames;
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
index c5daf5079e9..82d4d70c0a0 100644
--- a/cli/cppcheckexecutor.cpp
+++ b/cli/cppcheckexecutor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,6 +56,7 @@
 #include <iostream>
 #include <list>
 #include <map>
+#include <memory>
 #include <set>
 #include <sstream>
 #include <unordered_set>
@@ -174,10 +175,8 @@ namespace {
             {
                 std::set<std::string> activeCheckers;
                 std::string line;
-                // cppcheck-suppress accessMoved - FP
                 while (std::getline(fin, line))
                 {
-                    // cppcheck-suppress accessMoved - FP
                     activeCheckers.emplace(std::move(line));
                 }
                 mActiveCheckers = std::move(activeCheckers);
@@ -269,7 +268,9 @@ int CppCheckExecutor::check(int argc, const char* const argv[])
         return EXIT_SUCCESS;
     }
 
-    Timer realTimeClock("", settings.showtime, nullptr, Timer::Type::OVERALL);
+    std::unique_ptr<OneShotTimer> overallTimer;
+    if (settings.showtime == Settings::ShowTime::SUMMARY || settings.showtime == Settings::ShowTime::TOP5_SUMMARY)
+        overallTimer.reset(new OneShotTimer("Overall time"));
 
     settings.loadSummaries();
 
@@ -295,19 +296,21 @@ int CppCheckExecutor::check_wrapper(const Settings& settings, Suppressions& supp
 }
 
 /**
- * Report unmatched suppressions
- * @param unmatched list of unmatched suppressions (from Settings::Suppressions::getUnmatched(Local|Global)Suppressions)
- * @return true is returned if errors are reported
+ * Get list of unmatchedSuppression errors
+ * @param unmatched list of unmatched suppressions
+ * @param filters a list of (globbed) IDs to filter out
+ * @return vector of unmatchedSuppression errors
  */
-static bool reportUnmatchedSuppressions(const std::list<SuppressionList::Suppression> &unmatched, ErrorLogger &errorLogger, const std::vector<std::string>& filters)
+static std::vector<ErrorMessage> getUnmatchedSuppressions(const std::list<SuppressionList::Suppression> &unmatched, const std::vector<std::string>& filters)
 {
-    bool err = false;
+    std::vector<ErrorMessage> errors;
+
     // Report unmatched suppressions
     for (const SuppressionList::Suppression &s : unmatched) {
         // check if this unmatched suppression is suppressed
         bool suppressed = false;
         for (const SuppressionList::Suppression &s2 : unmatched) {
-            if (s2.errorId == "unmatchedSuppression") {
+            if (s2.errorId == "unmatchedSuppression") { // TODO: handle unmatchedPolyspaceSuppression?
                 if ((s2.fileName.empty() || s2.fileName == "*" || s2.fileName == s.fileName) &&
                     (s2.lineNumber == SuppressionList::Suppression::NO_LINE || s2.lineNumber == s.lineNumber)) {
                     suppressed = true;
@@ -325,14 +328,15 @@ static bool reportUnmatchedSuppressions(const std::list<SuppressionList::Suppres
         if (skip)
             continue;
 
-        std::list<::ErrorMessage::FileLocation> callStack;
+        std::list<ErrorMessage::FileLocation> callStack;
         if (!s.fileName.empty()) {
-            callStack.emplace_back(s.fileName, s.lineNumber, 0);
+            callStack.emplace_back(s.fileName, s.lineNumber == -1 ? 0 : s.lineNumber, s.column); // TODO: get rid of s.lineNumber == -1 hack
         }
-        errorLogger.reportErr(::ErrorMessage(std::move(callStack), "", Severity::information, "Unmatched suppression: " + s.errorId, "unmatchedSuppression", Certainty::normal));
-        err = true;
+        const std::string unmatchedSuppressionId = s.isPolyspace ? "unmatchedPolyspaceSuppression" : "unmatchedSuppression";
+        errors.emplace_back(std::move(callStack), "", Severity::information, "Unmatched suppression: " + s.errorId, unmatchedSuppressionId, Certainty::normal);
     }
-    return err;
+
+    return errors;
 }
 
 bool CppCheckExecutor::reportUnmatchedSuppressions(const Settings &settings, const SuppressionList& suppressions, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, ErrorLogger& errorLogger) {
@@ -342,6 +346,7 @@ bool CppCheckExecutor::reportUnmatchedSuppressions(const Settings &settings, con
     // bail out if there is a suppression of unmatchedSuppression which matches any file
     auto suppr = suppressions.getSuppressions();
     if (std::any_of(suppr.cbegin(), suppr.cend(), [](const SuppressionList::Suppression& s) {
+        // TODO: handle unmatchedPolyspaceSuppression?
         return s.errorId == "unmatchedSuppression" && (s.fileName.empty() || s.fileName == "*") && s.lineNumber == SuppressionList::Suppression::NO_LINE;
     }))
         return false;
@@ -358,21 +363,55 @@ bool CppCheckExecutor::reportUnmatchedSuppressions(const Settings &settings, con
         supprlist.addSuppression(std::move(s));
     }
 
+    const auto reportErrorsFn = [&](const std::string& sourcefile, std::size_t fsFileId, const std::vector<ErrorMessage>& errors) -> bool {
+        if (errors.empty())
+            return false;
+
+        // TODO: what if sourcefile is empty?
+
+        AnalyzerInformation analyzerInfo;
+        // FIXME: this is a horrible hack
+        // we need to "re-open" the file so we can add the unmatchedSuppression findings.
+        // we cannot keep it open conditionally because the whole program analysis reads the XML.
+        // re-ordering the code is also not an option because the unmatched suppression reporting needs to be run after all other checks.
+        analyzerInfo.reopen(settings.buildDir, sourcefile, /*cfgname*/ "", fsFileId);
+
+        for (const auto& errmsg : errors) {
+            analyzerInfo.reportErr(errmsg);
+            errorLogger.reportErr(errmsg);
+        }
+        return true;
+    };
+
     bool err = false;
 
     for (auto i = files.cbegin(); i != files.cend(); ++i) {
-        err |= ::reportUnmatchedSuppressions(supprlist.getUnmatchedLocalSuppressions(*i), errorLogger, settings.unmatchedSuppressionFilters);
+        const std::vector<ErrorMessage> errors = getUnmatchedSuppressions(supprlist.getUnmatchedLocalSuppressions(*i), settings.unmatchedSuppressionFilters);
+        err |= reportErrorsFn(i->spath(), i->fsFileId(), errors);
     }
 
     for (auto i = fileSettings.cbegin(); i != fileSettings.cend(); ++i) {
-        err |= ::reportUnmatchedSuppressions(supprlist.getUnmatchedLocalSuppressions(i->file), errorLogger, settings.unmatchedSuppressionFilters);
+        const std::vector<ErrorMessage> errors = getUnmatchedSuppressions(supprlist.getUnmatchedLocalSuppressions(i->file), settings.unmatchedSuppressionFilters);
+        err |= reportErrorsFn(i->file.spath(), i->file.fsFileId(), errors);
     }
 
     if (settings.inlineSuppressions) {
-        err |= ::reportUnmatchedSuppressions(supprlist.getUnmatchedInlineSuppressions(), errorLogger, settings.unmatchedSuppressionFilters);
+        const std::vector<ErrorMessage> errors = getUnmatchedSuppressions(supprlist.getUnmatchedInlineSuppressions(), settings.unmatchedSuppressionFilters);
+        for (const auto& errmsg : errors) {
+            std::string sourcefile;
+            if (!errmsg.callStack.empty())
+                sourcefile = errmsg.callStack.cbegin()->getfile(false); // TODO: simplify path?
+            err |= reportErrorsFn(sourcefile, 0, {errmsg});
+        }
     }
 
-    err |= ::reportUnmatchedSuppressions(supprlist.getUnmatchedGlobalSuppressions(), errorLogger, settings.unmatchedSuppressionFilters);
+    const std::vector<ErrorMessage> errors = getUnmatchedSuppressions(supprlist.getUnmatchedGlobalSuppressions(), settings.unmatchedSuppressionFilters);
+    for (const auto& errmsg : errors) {
+        std::string sourcefile;
+        if (!errmsg.callStack.empty())
+            sourcefile = errmsg.callStack.cbegin()->getfile(false); // TODO: simplify path?
+        err |= reportErrorsFn(sourcefile, 0, {errmsg});
+    }
     return err;
 }
 
@@ -382,6 +421,9 @@ bool CppCheckExecutor::reportUnmatchedSuppressions(const Settings &settings, con
 int CppCheckExecutor::check_internal(const Settings& settings, Suppressions& supprs) const
 {
     StdLogger stdLogger(settings);
+    std::unique_ptr<TimerResults> timerResults;
+    if (settings.showtime != Settings::ShowTime::NONE)
+        timerResults.reset(new TimerResults);
 
     if (settings.reportProgress >= 0)
         stdLogger.resetLatestProgressOutputTime();
@@ -394,7 +436,7 @@ int CppCheckExecutor::check_internal(const Settings& settings, Suppressions& sup
         std::list<std::string> fileNames;
         for (auto i = mFiles.cbegin(); i != mFiles.cend(); ++i)
             fileNames.emplace_back(i->path());
-        AnalyzerInformation::writeFilesTxt(settings.buildDir, fileNames, settings.userDefines, mFileSettings);
+        AnalyzerInformation::writeFilesTxt(settings.buildDir, fileNames, mFileSettings);
 
         stdLogger.readActiveCheckers();
     }
@@ -402,31 +444,40 @@ int CppCheckExecutor::check_internal(const Settings& settings, Suppressions& sup
     if (!settings.checkersReportFilename.empty())
         std::remove(settings.checkersReportFilename.c_str());
 
-    CppCheck cppcheck(settings, supprs, stdLogger, true, executeCommand);
+    CppCheck cppcheck(settings, supprs, stdLogger, timerResults.get(), true, executeCommand);
 
     unsigned int returnValue = 0;
     if (settings.useSingleJob()) {
         // Single process
-        SingleExecutor executor(cppcheck, mFiles, mFileSettings, settings, supprs, stdLogger);
+        SingleExecutor executor(cppcheck, mFiles, mFileSettings, settings, supprs, stdLogger, timerResults.get());
         returnValue = executor.check();
     } else {
 #if defined(HAS_THREADING_MODEL_THREAD)
         if (settings.executor == Settings::ExecutorType::Thread) {
-            ThreadExecutor executor(mFiles, mFileSettings, settings, supprs, stdLogger, CppCheckExecutor::executeCommand);
+            ThreadExecutor executor(mFiles, mFileSettings, settings, supprs, stdLogger, timerResults.get(), CppCheckExecutor::executeCommand);
             returnValue = executor.check();
         }
 #endif
 #if defined(HAS_THREADING_MODEL_FORK)
         if (settings.executor == Settings::ExecutorType::Process) {
-            ProcessExecutor executor(mFiles, mFileSettings, settings, supprs, stdLogger, CppCheckExecutor::executeCommand);
+            ProcessExecutor executor(mFiles, mFileSettings, settings, supprs, stdLogger, timerResults.get(), CppCheckExecutor::executeCommand);
             returnValue = executor.check();
         }
 #endif
     }
 
+    // TODO: show time *after* the whole program analysis
+    if (timerResults) {
+        if (settings.showtime == Settings::ShowTime::SUMMARY)
+            timerResults->showResults();
+        else if (settings.showtime == Settings::ShowTime::TOP5_SUMMARY)
+            timerResults->showResults(5);
+    }
+
+    // TODO: is this run again instead of using previously cached results?
     returnValue |= cppcheck.analyseWholeProgram(settings.buildDir, mFiles, mFileSettings, stdLogger.getCtuInfo());
 
-    if (settings.severity.isEnabled(Severity::information) || settings.checkConfiguration) {
+    if ((settings.severity.isEnabled(Severity::information) || settings.checkConfiguration) && !supprs.nomsg.getSuppressions().empty()) {
         const bool err = reportUnmatchedSuppressions(settings, supprs.nomsg, mFiles, mFileSettings, stdLogger);
         if (err && returnValue == 0)
             returnValue = settings.exitCode;
@@ -450,6 +501,7 @@ int CppCheckExecutor::check_internal(const Settings& settings, Suppressions& sup
 
 void StdLogger::writeCheckersReport(const Suppressions& supprs)
 {
+    // TODO: only necessary when we actually issue a checkers report?
     if (!mCheckersFile.empty())
     {
         std::ofstream fout(mCheckersFile);
@@ -459,15 +511,14 @@ void StdLogger::writeCheckersReport(const Suppressions& supprs)
         }
     }
 
-    const bool summary = mSettings.safety || mSettings.severity.isEnabled(Severity::information);
-    const bool xmlReport = mSettings.outputFormat == Settings::OutputFormat::xml && mSettings.xml_version == 3;
-    const bool textReport = !mSettings.checkersReportFilename.empty();
+    bool summary, xmlReport, textReport;
 
-    if (!summary && !xmlReport && !textReport)
+    if (!mSettings.collectLogCheckers(&summary, &xmlReport, &textReport))
         return;
 
     CheckersReport checkersReport(mSettings, mActiveCheckers);
 
+    // TODO: include in summary boolean
     const auto& suppressions = supprs.nomsg.getSuppressions();
     const bool summarySuppressed = std::any_of(suppressions.cbegin(), suppressions.cend(), [](const SuppressionList::Suppression& s) {
         return s.errorId == "checkersReport";
@@ -610,8 +661,13 @@ void StdLogger::reportErr(const ErrorMessage &msg)
     msgCopy.classification = getClassification(msgCopy.guideline, mSettings.reportType);
 
     // TODO: there should be no need for verbose and default messages here
+    // Don't perform redundant reads for these formats, the code is not needed
+    // for deduplication
+    const bool noCode = mSettings.outputFormat == Settings::OutputFormat::xml ||
+                        mSettings.outputFormat == Settings::OutputFormat::sarif;
     const std::string msgStr =
-        msgCopy.toString(mSettings.verbose, mSettings.templateFormat, mSettings.templateLocation);
+        msgCopy.toString(mSettings.verbose, mSettings.templateFormat,
+                         mSettings.templateLocation, noCode);
 
     // Alert only about unique errors
     if (!mSettings.emitDuplicates && !mShownErrors.insert(msgStr).second)
diff --git a/cli/cppcheckexecutor.h b/cli/cppcheckexecutor.h
index 5ef743ef20d..a1b35280597 100644
--- a/cli/cppcheckexecutor.h
+++ b/cli/cppcheckexecutor.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,8 +39,6 @@ struct Suppressions;
  */
 class CppCheckExecutor {
 public:
-    friend class TestSuppressions;
-
     /**
      * Constructor
      */
@@ -61,17 +59,16 @@ class CppCheckExecutor {
      */
     int check(int argc, const char* const argv[]);
 
-private:
+protected:
 
     /**
      * Execute a shell command and read the output from it. Returns exitcode of the executed command,.
      */
     static int executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string &output_);
 
-protected:
-
     static bool reportUnmatchedSuppressions(const Settings &settings, const SuppressionList& suppressions, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, ErrorLogger& errorLogger);
 
+private:
     /**
      * Wrapper around check_internal
      *   - installs optional platform dependent signal handling
diff --git a/cli/executor.cpp b/cli/executor.cpp
index 8ef1de84a90..d0a05eda5f7 100644
--- a/cli/executor.cpp
+++ b/cli/executor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,8 +30,8 @@
 
 struct FileSettings;
 
-Executor::Executor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger)
-    : mFiles(files), mFileSettings(fileSettings), mSettings(settings), mSuppressions(suppressions), mErrorLogger(errorLogger)
+Executor::Executor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, TimerResults* timerResults)
+    : mFiles(files), mFileSettings(fileSettings), mSettings(settings), mSuppressions(suppressions), mErrorLogger(errorLogger), mTimerResults(timerResults)
 {
     // the two inputs may only be used exclusively
     assert(!(!files.empty() && !fileSettings.empty()));
diff --git a/cli/executor.h b/cli/executor.h
index 3f24b1c9b00..7e6fb83eeba 100644
--- a/cli/executor.h
+++ b/cli/executor.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,6 +31,7 @@ class ErrorMessage;
 struct Suppressions;
 struct FileSettings;
 class FileWithDetails;
+class TimerResults;
 
 /// @addtogroup CLI
 /// @{
@@ -41,7 +42,7 @@ class FileWithDetails;
  */
 class Executor {
 public:
-    Executor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger);
+    Executor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, TimerResults* timerResults);
     virtual ~Executor() = default;
 
     Executor(const Executor &) = delete;
@@ -72,6 +73,7 @@ class Executor {
     const Settings &mSettings;
     Suppressions &mSuppressions;
     ErrorLogger &mErrorLogger;
+    TimerResults *mTimerResults;
 
 private:
     std::mutex mErrorListSync;
diff --git a/cli/filelister.cpp b/cli/filelister.cpp
index 24acc186818..1bc03017e79 100644
--- a/cli/filelister.cpp
+++ b/cli/filelister.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -168,11 +168,15 @@ std::string FileLister::addFiles(std::list<FileWithDetails> &files, const std::s
     if (path.empty())
         return "no path specified";
 
+    const std::string::size_type nulPos = path.find('\0');
+    if (nulPos != std::string::npos)
+        return "path '" + path.substr(0, nulPos) + "' contains a NUL character";
+
     std::list<FileWithDetails> filesSorted;
 
     std::string err = addFiles2(filesSorted, path, extra, recursive, ignored, debug);
 
-    // files need to be sorted as the filesystems dosn't provide a stable order
+    // files need to be sorted as the filesystems doesn't provide a stable order
     filesSorted.sort([](const FileWithDetails& a, const FileWithDetails& b) {
         return a.path() < b.path();
     });
@@ -285,6 +289,10 @@ std::string FileLister::addFiles(std::list<FileWithDetails> &files, const std::s
     if (path.empty())
         return "no path specified";
 
+    const std::string::size_type nulPos = path.find('\0');
+    if (nulPos != std::string::npos)
+        return "path '" + path.substr(0, nulPos) + "' contains a NUL character";
+
     std::string corrected_path = path;
     if (endsWith(corrected_path, '/'))
         corrected_path.erase(corrected_path.end() - 1);
@@ -293,7 +301,7 @@ std::string FileLister::addFiles(std::list<FileWithDetails> &files, const std::s
 
     std::string err = addFiles2(filesSorted, corrected_path, extra, recursive, ignored, debug);
 
-    // files need to be sorted as the filesystems dosn't provide a stable order
+    // files need to be sorted as the filesystems doesn't provide a stable order
     filesSorted.sort([](const FileWithDetails& a, const FileWithDetails& b) {
         return a.path() < b.path();
     });
diff --git a/cli/main.cpp b/cli/main.cpp
index d2a8417560e..c7949f4955f 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 /**
  *
  * @mainpage Cppcheck
- * @version 2.18.99
+ * @version 2.22.99
  *
  * @section overview_sec Overview
  * Cppcheck is a simple tool for static analysis of C/C++ code.
@@ -56,17 +56,8 @@
  * When errors are found, they are reported back to the CppCheckExecutor through the ErrorLogger interface.
  */
 
-
 #include "cppcheckexecutor.h"
 
-#ifdef NDEBUG
-#include "errortypes.h"
-
-#include <cstdlib>
-#include <exception>
-#include <iostream>
-#endif
-
 /**
  * Main function of cppcheck
  *
@@ -76,27 +67,6 @@
  */
 int main(int argc, char* argv[])
 {
-    // MS Visual C++ memory leak debug tracing
-#if defined(_MSC_VER) && defined(_DEBUG)
-    _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF);
-#endif
-
     CppCheckExecutor exec;
-
-// *INDENT-OFF*
-#ifdef NDEBUG
-    try {
-#endif
-        return exec.check(argc, argv);
-#ifdef NDEBUG
-    } catch (const InternalError& e) {
-        std::cout << e.errorMessage << std::endl;
-    } catch (const std::exception& error) {
-        std::cout << error.what() << std::endl;
-    } catch (...) {
-        std::cout << "Unknown exception" << std::endl;
-    }
-    return EXIT_FAILURE;
-#endif
-// *INDENT-ON*
+    return exec.check(argc, argv);
 }
diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp
index d0ca09ffec1..f0f01bcffe7 100644
--- a/cli/processexecutor.cpp
+++ b/cli/processexecutor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,6 +37,7 @@
 #include <numeric>
 #include <cassert>
 #include <cerrno>
+#include <chrono>
 #include <csignal>
 #include <cstdint>
 #include <cstdlib>
@@ -44,9 +45,9 @@
 #include <iostream>
 #include <list>
 #include <map>
+#include <memory>
 #include <sstream>
 #include <sys/select.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
@@ -68,8 +69,8 @@ enum class Color : std::uint8_t;
 using std::memset;
 
 
-ProcessExecutor::ProcessExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, CppCheck::ExecuteCmdFn executeCommand)
-    : Executor(files, fileSettings, settings, suppressions, errorLogger)
+ProcessExecutor::ProcessExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, TimerResults* timerResults, CppCheck::ExecuteCmdFn executeCommand)
+    : Executor(files, fileSettings, settings, suppressions, errorLogger, timerResults)
     , mExecuteCommand(std::move(executeCommand))
 {
     assert(mSettings.jobs > 1);
@@ -78,9 +79,9 @@ ProcessExecutor::ProcessExecutor(const std::list<FileWithDetails> &files, const
 namespace {
     class PipeWriter : public ErrorLogger {
     public:
-        enum PipeSignal : std::uint8_t {REPORT_OUT='1',REPORT_ERROR='2',REPORT_SUPPR_INLINE='3',REPORT_SUPPR='4',CHILD_END='5',REPORT_METRIC='6'};
+        enum PipeSignal : std::uint8_t {REPORT_OUT='1',REPORT_ERROR='2',REPORT_SUPPR_INLINE='3',REPORT_SUPPR='4',CHILD_END='5',REPORT_METRIC='6',REPORT_TIMER='7'};
 
-        explicit PipeWriter(int pipe) : mWpipe(pipe) {}
+        explicit PipeWriter(int pipe, bool debug) : mWpipe(pipe), mDebug(debug) {}
 
         void reportOut(const std::string &outmsg, Color c) override {
             writeToPipe(REPORT_OUT, static_cast<char>(c) + outmsg);
@@ -95,7 +96,7 @@ namespace {
             {
                 if (suppr.isInline)
                     writeToPipe(REPORT_SUPPR_INLINE, suppressionToString(suppr));
-                else if (suppr.checked)
+                else if (suppr.checked && suppr.hash == 0)
                     writeToPipe(REPORT_SUPPR, suppressionToString(suppr));
             }
         }
@@ -104,6 +105,18 @@ namespace {
             writeToPipe(REPORT_METRIC, metric);
         }
 
+        void writeTimer(const TimerResults* timerResults) const {
+            if (!timerResults)
+                return;
+
+            for (const auto& entry : timerResults->getResults())
+            {
+                for (const auto& d : entry.second) {
+                    writeToPipe(REPORT_TIMER, entry.first + ";" + std::to_string(d.count()));
+                }
+            }
+        }
+
         void writeEnd(const std::string& str) const {
             writeToPipe(CHILD_END, str);
         }
@@ -113,6 +126,8 @@ namespace {
         {
             std::string suppr_str = suppr.toString();
             suppr_str += ";";
+            suppr_str += std::to_string(suppr.column);
+            suppr_str += ";";
             suppr_str += suppr.checked ? "1" : "0";
             suppr_str += ";";
             suppr_str += suppr.matched ? "1" : "0";
@@ -139,6 +154,9 @@ namespace {
 
         void writeToPipe(PipeSignal type, const std::string &data) const
         {
+            if (mDebug)
+                std::cout << "writeToPipe - " << static_cast<char>(type) << " - " << data << std::endl;
+
             {
                 const auto t = static_cast<char>(type);
                 writeToPipeInternal(type, &t, 1);
@@ -154,7 +172,8 @@ namespace {
                 writeToPipeInternal(type, data.c_str(), len);
         }
 
-        const int mWpipe;
+        int mWpipe;
+        bool mDebug;
     };
 }
 
@@ -186,7 +205,8 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
         type != PipeWriter::REPORT_SUPPR_INLINE &&
         type != PipeWriter::REPORT_SUPPR &&
         type != PipeWriter::CHILD_END &&
-        type != PipeWriter::REPORT_METRIC) {
+        type != PipeWriter::REPORT_METRIC &&
+        type != PipeWriter::REPORT_TIMER) {
         std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") invalid type " << int(type) << std::endl;
         std::exit(EXIT_FAILURE);
     }
@@ -220,6 +240,9 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
         } while (bytes_to_read != 0);
     }
 
+    if (mSettings.debugipc)
+        std::cout << "handleRead - " << type << " - " << buf << std::endl;
+
     bool res = true;
     if (type == PipeWriter::REPORT_OUT) {
         // the first character is the color
@@ -241,7 +264,7 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
         if (!buf.empty()) {
             // TODO: avoid string splitting
             auto parts = splitString(buf, ';');
-            if (parts.size() < 4)
+            if (parts.size() < 5)
             {
                 // TODO: make this non-fatal
                 std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") adding of inline suppression failed - insufficient data" << std::endl;
@@ -249,10 +272,11 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
             }
             auto suppr = SuppressionList::parseLine(parts[0]);
             suppr.isInline = (type == PipeWriter::REPORT_SUPPR_INLINE);
-            suppr.checked = parts[1] == "1";
-            suppr.matched = parts[2] == "1";
-            suppr.extraComment = parts[3];
-            for (std::size_t i = 4; i < parts.size(); i++) {
+            suppr.column = strToInt<int>(parts[1]);
+            suppr.checked = parts[2] == "1";
+            suppr.matched = parts[3] == "1";
+            suppr.extraComment = parts[4];
+            for (std::size_t i = 5; i < parts.size(); i++) {
                 suppr.extraComment += ";" + parts[i];
             }
             const std::string err = mSuppressions.nomsg.addSuppression(suppr);
@@ -269,6 +293,20 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
         res = false;
     } else if (type == PipeWriter::REPORT_METRIC) {
         mErrorLogger.reportMetric(buf);
+    } else if (type == PipeWriter::REPORT_TIMER) {
+        if (!mTimerResults) {
+            // TODO: make this non-fatal
+            std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") received timer results when no timer is enabled" << std::endl;
+            std::exit(EXIT_FAILURE);
+        }
+        const auto parts = splitString(buf, ';');
+        if (parts.size() < 2)
+        {
+            // TODO: make this non-fatal
+            std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") adding of timer result failed - insufficient data" << std::endl;
+            std::exit(EXIT_FAILURE);
+        }
+        mTimerResults->addResults(parts[0], std::chrono::milliseconds{strToInt<long>(parts[1])});
     }
 
     return res;
@@ -305,6 +343,12 @@ unsigned int ProcessExecutor::check()
         return v + p.size();
     });
 
+    // pass unmodified suppressions to forked process so we only transfer back the actual changes done by the fork
+    // and do not see the changes which have already been transferred back
+    Suppressions supprs;
+    supprs.nomsg.addSuppressions(mSuppressions.nomsg.getSuppressions());
+    supprs.nofail.addSuppressions(mSuppressions.nofail.getSuppressions());
+
     std::list<int> rpipes;
     std::map<pid_t, std::string> childFile;
     std::map<int, std::string> pipeFile;
@@ -343,8 +387,13 @@ unsigned int ProcessExecutor::check()
 #endif
                 close(pipes[0]);
 
-                PipeWriter pipewriter(pipes[1]);
-                CppCheck fileChecker(mSettings, mSuppressions, pipewriter, false, mExecuteCommand);
+                // create a separate result object so we do not get the results which have already been transferred back
+                std::unique_ptr<TimerResults> timerResults;
+                if (mTimerResults)
+                    timerResults.reset(new TimerResults);
+
+                PipeWriter pipewriter(pipes[1], mSettings.debugipc);
+                CppCheck fileChecker(mSettings, supprs, pipewriter, timerResults.get(), false, mExecuteCommand);
                 unsigned int resultOfCheck = 0;
 
                 if (iFileSettings != mFileSettings.end()) {
@@ -354,7 +403,9 @@ unsigned int ProcessExecutor::check()
                     resultOfCheck = fileChecker.check(*iFile);
                 }
 
-                pipewriter.writeSuppr(mSuppressions.nomsg);
+                pipewriter.writeSuppr(supprs.nomsg);
+
+                pipewriter.writeTimer(timerResults.get());
 
                 pipewriter.writeEnd(std::to_string(resultOfCheck));
                 std::exit(EXIT_SUCCESS);
@@ -449,9 +500,7 @@ unsigned int ProcessExecutor::check()
         }
     }
 
-    // TODO: wee need to get the timing information from the subprocess
-    if (mSettings.showtime == ShowTime::SUMMARY || mSettings.showtime == ShowTime::TOP5_SUMMARY)
-        CppCheck::printTimerResults(mSettings.showtime);
+    // TODO: we need to get the timing information from the subprocess
 
     return result;
 }
@@ -467,7 +516,7 @@ void ProcessExecutor::reportInternalChildErr(const std::string &childname, const
                               "cppcheckError",
                               Certainty::normal);
 
-    if (!mSuppressions.nomsg.isSuppressed(errmsg, {}))
+    if (hasToLog(errmsg))
         mErrorLogger.reportErr(errmsg);
 }
 
diff --git a/cli/processexecutor.h b/cli/processexecutor.h
index 9ed14e6af96..6c590da4072 100644
--- a/cli/processexecutor.h
+++ b/cli/processexecutor.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,6 +35,7 @@ class ErrorLogger;
 struct Suppressions;
 struct FileSettings;
 class FileWithDetails;
+class TimerResults;
 
 /// @addtogroup CLI
 /// @{
@@ -45,7 +46,7 @@ class FileWithDetails;
  */
 class ProcessExecutor : public Executor {
 public:
-    ProcessExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, CppCheck::ExecuteCmdFn executeCommand);
+    ProcessExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, TimerResults* timerResults, CppCheck::ExecuteCmdFn executeCommand);
     ProcessExecutor(const ProcessExecutor &) = delete;
     ProcessExecutor& operator=(const ProcessExecutor &) = delete;
 
diff --git a/cli/signalhandler.cpp b/cli/signalhandler.cpp
index 4f84f036c7e..64e5038e82e 100644
--- a/cli/signalhandler.cpp
+++ b/cli/signalhandler.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,8 +24,6 @@
 
 #if defined(USE_UNIX_SIGNAL_HANDLING)
 
-#include "utils.h"
-
 #ifdef USE_UNIX_BACKTRACE_SUPPORT
 #include "stacktrace.h"
 #endif
@@ -108,23 +106,24 @@ static const Signalmap_t listofsignals = {
  * but when ending up here something went terribly wrong anyway.
  * And all which is left is just printing some information and terminate.
  */
-static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
+static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context) // cppcheck-suppress constParameterCallback - info can be const
 {
-    int type = -1;
+    const char* typeStr = "";
     pid_t killid;
     // TODO: separate these two defines
 #if defined(__linux__) && defined(REG_ERR)
     const auto* const uc = reinterpret_cast<const ucontext_t*>(context);
     killid = static_cast<pid_t>(syscall(SYS_gettid));
     if (uc) {
-        type = static_cast<int>(uc->uc_mcontext.gregs[REG_ERR]) & 2;
+        const int type = static_cast<int>(uc->uc_mcontext.gregs[REG_ERR]) & 2;
+        typeStr = (type == 0) ? "reading " : "writing ";
     }
 #else
     (void)context;
     killid = getpid();
 #endif
 
-    const auto it = utils::as_const(listofsignals).find(signo);
+    const auto it = listofsignals.find(signo);
     const char * const signame = (it==listofsignals.end()) ? "unknown" : it->second.c_str();
     bool unexpectedSignal=true; // unexpected indicates program failure
     bool terminate=true; // exit process/thread
@@ -238,7 +237,7 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
         }
         fprintf(output, " (at 0x%lx).%s\n",
                 reinterpret_cast<unsigned long>(info->si_addr),
-                (isAddressOnStack)?" Stackoverflow?":"");
+                isAddressOnStack ? " Stackoverflow?" : "");
         break;
     case SIGINT:
         unexpectedSignal=false;     // legal usage: interrupt application via CTRL-C
@@ -260,11 +259,9 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
             break;
         }
         fprintf(output, " (%sat 0x%lx).%s\n",
-                // cppcheck-suppress knownConditionTrueFalse ; FP
-                (type==-1)? "" :
-                (type==0) ? "reading " : "writing ",
+                typeStr,
                 reinterpret_cast<unsigned long>(info->si_addr),
-                (isAddressOnStack)?" Stackoverflow?":""
+                isAddressOnStack ? " Stackoverflow?" : ""
                 );
         break;
     case SIGUSR1:
diff --git a/cli/singleexecutor.cpp b/cli/singleexecutor.cpp
index 2dec1b6ad14..e25fc804490 100644
--- a/cli/singleexecutor.cpp
+++ b/cli/singleexecutor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
 #include "cppcheck.h"
 #include "filesettings.h"
 #include "settings.h"
-#include "timer.h"
 
 #include <cassert>
 #include <cstddef>
@@ -30,8 +29,8 @@
 
 class ErrorLogger;
 
-SingleExecutor::SingleExecutor(CppCheck &cppcheck, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger)
-    : Executor(files, fileSettings, settings, suppressions, errorLogger)
+SingleExecutor::SingleExecutor(CppCheck &cppcheck, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, TimerResults* timerResults)
+    : Executor(files, fileSettings, settings, suppressions, errorLogger, timerResults)
     , mCppcheck(cppcheck)
 {
     assert(mSettings.jobs == 1);
@@ -67,12 +66,10 @@ unsigned int SingleExecutor::check()
             reportStatus(c, mFileSettings.size(), c, mFileSettings.size());
     }
 
+    // TODO: show time after the whole program analysis
     // TODO: CppCheckExecutor::check_internal() is also invoking the whole program analysis - is it run twice?
     if (mCppcheck.analyseWholeProgram())
         result++;
 
-    if (mSettings.showtime == ShowTime::SUMMARY || mSettings.showtime == ShowTime::TOP5_SUMMARY)
-        CppCheck::printTimerResults(mSettings.showtime);
-
     return result;
 }
diff --git a/cli/singleexecutor.h b/cli/singleexecutor.h
index c2294a2e467..8b908bd6c4e 100644
--- a/cli/singleexecutor.h
+++ b/cli/singleexecutor.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,11 +29,12 @@ class CppCheck;
 struct Suppressions;
 struct FileSettings;
 class FileWithDetails;
+class TimerResults;
 
 class SingleExecutor : public Executor
 {
 public:
-    SingleExecutor(CppCheck &cppcheck, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger);
+    SingleExecutor(CppCheck &cppcheck, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, TimerResults* timerResults);
     SingleExecutor(const SingleExecutor &) = delete;
     SingleExecutor& operator=(const SingleExecutor &) = delete;
 
diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
index 4b75f423f23..5d723366574 100644
--- a/cli/threadexecutor.cpp
+++ b/cli/threadexecutor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@
 #include "filesettings.h"
 #include "settings.h"
 #include "suppressions.h"
-#include "timer.h"
 
 #include <cassert>
 #include <cstdlib>
@@ -40,8 +39,8 @@
 #include <utility>
 #include <vector>
 
-ThreadExecutor::ThreadExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, CppCheck::ExecuteCmdFn executeCommand)
-    : Executor(files, fileSettings, settings, suppressions, errorLogger)
+ThreadExecutor::ThreadExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, TimerResults* timerResults, CppCheck::ExecuteCmdFn executeCommand)
+    : Executor(files, fileSettings, settings, suppressions, errorLogger, timerResults)
     , mExecuteCommand(std::move(executeCommand))
 {
     assert(mSettings.jobs > 1);
@@ -87,8 +86,8 @@ class SyncLogForwarder : public ErrorLogger
 class ThreadData
 {
 public:
-    ThreadData(ThreadExecutor &threadExecutor, ErrorLogger &errorLogger, const Settings &settings, Suppressions& supprs, const std::list<FileWithDetails> &files, const std::list<FileSettings> &fileSettings, CppCheck::ExecuteCmdFn executeCommand)
-        : mFiles(files), mFileSettings(fileSettings), mSettings(settings), mSuppressions(supprs), mExecuteCommand(std::move(executeCommand)), logForwarder(threadExecutor, errorLogger)
+    ThreadData(ThreadExecutor &threadExecutor, ErrorLogger &errorLogger, TimerResults *timerResults, const Settings &settings, Suppressions& supprs, const std::list<FileWithDetails> &files, const std::list<FileSettings> &fileSettings, CppCheck::ExecuteCmdFn executeCommand)
+        : mFiles(files), mFileSettings(fileSettings), mTimerResults(timerResults), mSettings(settings), mSuppressions(supprs), mExecuteCommand(std::move(executeCommand)), mLogForwarder(threadExecutor, errorLogger)
     {
         mItNextFile = mFiles.begin();
         mItNextFileSettings = mFileSettings.begin();
@@ -119,8 +118,8 @@ class ThreadData
         return false;
     }
 
-    unsigned int check(ErrorLogger &errorLogger, const FileWithDetails *file, const FileSettings *fs) const {
-        CppCheck fileChecker(mSettings, mSuppressions, errorLogger, false, mExecuteCommand);
+    unsigned int check(const FileWithDetails *file, const FileSettings *fs) {
+        CppCheck fileChecker(mSettings, mSuppressions, mLogForwarder, mTimerResults, false, mExecuteCommand);
 
         unsigned int result;
         if (fs) {
@@ -155,7 +154,7 @@ class ThreadData
         mProcessedSize += fileSize;
         mProcessedFiles++;
         if (!mSettings.quiet)
-            logForwarder.reportStatus(mProcessedFiles, mTotalFiles, mProcessedSize, mTotalFileSize);
+            mLogForwarder.reportStatus(mProcessedFiles, mTotalFiles, mProcessedSize, mTotalFileSize);
     }
 
 private:
@@ -170,12 +169,12 @@ class ThreadData
     std::size_t mTotalFileSize{};
 
     std::mutex mFileSync;
+    TimerResults *mTimerResults;
     const Settings &mSettings;
     Suppressions &mSuppressions;
     CppCheck::ExecuteCmdFn mExecuteCommand;
 
-public:
-    SyncLogForwarder logForwarder;
+    SyncLogForwarder mLogForwarder;
 };
 
 static unsigned int STDCALL threadProc(ThreadData *data)
@@ -187,7 +186,7 @@ static unsigned int STDCALL threadProc(ThreadData *data)
     std::size_t fileSize;
 
     while (data->next(file, fs, fileSize)) {
-        result += data->check(data->logForwarder, file, fs);
+        result += data->check(file, fs);
 
         data->status(fileSize);
     }
@@ -200,7 +199,7 @@ unsigned int ThreadExecutor::check()
     std::vector<std::future<unsigned int>> threadFutures;
     threadFutures.reserve(mSettings.jobs);
 
-    ThreadData data(*this, mErrorLogger, mSettings, mSuppressions, mFiles, mFileSettings, mExecuteCommand);
+    ThreadData data(*this, mErrorLogger, mTimerResults, mSettings, mSuppressions, mFiles, mFileSettings, mExecuteCommand);
 
     for (unsigned int i = 0; i < mSettings.jobs; ++i) {
         try {
@@ -216,9 +215,6 @@ unsigned int ThreadExecutor::check()
         return v + f.get();
     });
 
-    if (mSettings.showtime == ShowTime::SUMMARY || mSettings.showtime == ShowTime::TOP5_SUMMARY)
-        CppCheck::printTimerResults(mSettings.showtime);
-
     return result;
 }
 
diff --git a/cli/threadexecutor.h b/cli/threadexecutor.h
index 1e6001347d3..a0ab4933573 100644
--- a/cli/threadexecutor.h
+++ b/cli/threadexecutor.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@ class ErrorLogger;
 struct Suppressions;
 struct FileSettings;
 class FileWithDetails;
+class TimerResults;
 
 /// @addtogroup CLI
 /// @{
@@ -45,7 +46,7 @@ class ThreadExecutor : public Executor {
     friend class SyncLogForwarder;
 
 public:
-    ThreadExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, CppCheck::ExecuteCmdFn executeCommand);
+    ThreadExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, TimerResults* timerResults, CppCheck::ExecuteCmdFn executeCommand);
     ThreadExecutor(const ThreadExecutor &) = delete;
     ThreadExecutor& operator=(const ThreadExecutor &) = delete;
 
diff --git a/cmake/clang_tidy.cmake b/cmake/clang_tidy.cmake
index e9a9148c6fe..f8324b98d21 100644
--- a/cmake/clang_tidy.cmake
+++ b/cmake/clang_tidy.cmake
@@ -11,7 +11,7 @@ if(NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
         message(STATUS "Cannot use non-Clang compiler with clang-tidy when precompiled headers are enabled - skipping 'run-clang-tidy'/'run-clang-tidy-csa' target generation")
     endif()
 else()
-    set(RUN_CLANG_TIDY_NAMES run-clang-tidy run-clang-tidy-21 run-clang-tidy-20 run-clang-tidy-19 run-clang-tidy-18 run-clang-tidy-17 run-clang-tidy-16 run-clang-tidy-15 run-clang-tidy-14 run-clang-tidy-13 run-clang-tidy-12 run-clang-tidy-11 run-clang-tidy-10 run-clang-tidy-9 run-clang-tidy-8)
+    set(RUN_CLANG_TIDY_NAMES run-clang-tidy run-clang-tidy-22 run-clang-tidy-21 run-clang-tidy-20 run-clang-tidy-19 run-clang-tidy-18 run-clang-tidy-17 run-clang-tidy-16 run-clang-tidy-15 run-clang-tidy-14 run-clang-tidy-13 run-clang-tidy-12 run-clang-tidy-11 run-clang-tidy-10 run-clang-tidy-9 run-clang-tidy-8)
 endif()
 
 if(RUN_CLANG_TIDY_NAMES)
@@ -25,6 +25,12 @@ if(RUN_CLANG_TIDY_NAMES)
         endif()
         message(STATUS "NPROC=${NPROC}")
 
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 22)
+            set(CLANG_TIDY_CONFIG "-enable-check-profile")
+        else()
+            set(CLANG_TIDY_CONFIG "")
+        endif()
+
         # most of these are disabled because they are too noisy in our code
         # clang-analyzer-core.CallAndMessage
         # clang-analyzer-core.NonNullParamChecker
@@ -37,17 +43,18 @@ if(RUN_CLANG_TIDY_NAMES)
         set(CLANG_TIDY_CSA_CONFIG "-config={InheritParentConfig: true, Checks: '-*,clang-analyzer-*,-clang-analyzer-core.CallAndMessage,-clang-analyzer-core.NonNullParamChecker,-clang-analyzer-cplusplus.NewDeleteLeaks,-clang-analyzer-cplusplus.NewDelete,-clang-analyzer-core.NullDereference,-clang-analyzer-unix.Stream,-clang-analyzer-alpha.clone.CloneChecker,-clang-analyzer-alpha.webkit.*'}")
         if (ENABLE_CSA_ALPHA)
             set(CLANG_TIDY_CSA_ALPHA_OPTS "-allow-enabling-alpha-checkers" "-extra-arg=-Xclang" "-extra-arg=-analyzer-config" "-extra-arg=-Xclang" "-extra-arg=aggressive-binary-operation-simplification=true")
+        else()
+            set(CLANG_TIDY_CSA_ALPHA_OPTS "")
         endif()
 
         # TODO: exclude moc_*.cpp
         # TODO: exclude mocs_compilation.cpp
-        # disable all compiler warnings since we are just interested in the tidy ones
         add_custom_target(run-clang-tidy
-                ${Python_EXECUTABLE} ${RUN_CLANG_TIDY} -p=${CMAKE_BINARY_DIR} -j ${NPROC} -quiet
+                ${Python_EXECUTABLE} ${RUN_CLANG_TIDY} -p=${CMAKE_BINARY_DIR} -j ${NPROC} -quiet ${CLANG_TIDY_CONFIG}
                 USES_TERMINAL
                 VERBATIM)
         add_custom_target(run-clang-tidy-csa
-                ${Python_EXECUTABLE} ${RUN_CLANG_TIDY} -p=${CMAKE_BINARY_DIR} -j ${NPROC} -quiet ${CLANG_TIDY_CSA_ALPHA_OPTS} ${CLANG_TIDY_CSA_CONFIG}
+                ${Python_EXECUTABLE} ${RUN_CLANG_TIDY} -p=${CMAKE_BINARY_DIR} -j ${NPROC} -quiet ${CLANG_TIDY_CONFIG} ${CLANG_TIDY_CSA_ALPHA_OPTS} ${CLANG_TIDY_CSA_CONFIG}
                 USES_TERMINAL
                 VERBATIM)
         if(BUILD_GUI)
diff --git a/cmake/compilerCheck.cmake b/cmake/compilerCheck.cmake
index 47c8fc1245e..c26bf9e336e 100644
--- a/cmake/compilerCheck.cmake
+++ b/cmake/compilerCheck.cmake
@@ -2,12 +2,18 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1)
         message(ERROR "GCC >= 5.1 required - detected ${CMAKE_CXX_COMPILER_VERSION} not supported")
     endif()
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
         message(ERROR "Clang >= 3.5 required - detected ${CMAKE_CXX_COMPILER_VERSION} not supported")
     endif()
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+        message(ERROR "AppleClang >= 6.0 required - detected ${CMAKE_CXX_COMPILER_VERSION} not supported")
+    endif()
 elseif(MSVC)
     if(MSVC_VERSION VERSION_LESS 1900)
         message(ERROR "Visual Studio >= 2015 (19.0) required - detected ${MSVC_VERSION} not supported")
     endif()
+else()
+    message(WARNING "Unknown compiler ${CMAKE_CXX_COMPILER_ID}")
 endif()
diff --git a/cmake/compilerDefinitions.cmake b/cmake/compilerDefinitions.cmake
index 4f62e411046..3daf0e7ba87 100644
--- a/cmake/compilerDefinitions.cmake
+++ b/cmake/compilerDefinitions.cmake
@@ -8,26 +8,30 @@ if(MSVC)
     add_definitions(-DWIN32_LEAN_MEAN)
 endif()
 
-# TODO: this should probably apply to the compiler and not the platform - I think it is only "broken" with MinGW
-# TODO: AppleClang only has libc++
-# TODO: what about clang-cl and native Win32 clang?
-if(CPPCHK_GLIBCXX_DEBUG AND UNIX AND CMAKE_BUILD_TYPE STREQUAL "Debug")
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        if(USE_LIBCXX)
-            if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18)
-                add_definitions(-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG)
-            else()
-                add_definitions(-D_LIBCPP_ENABLE_ASSERTIONS=1)
-            endif()
-            # TODO: also add _LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS?
+# libstdc++-specific flags
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR (NOT USE_LIBCXX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+    if(CPPCHK_GLIBCXX_DEBUG AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+        add_definitions(-D_GLIBCXX_DEBUG)
+    endif()
+endif()
+
+# TODO: what about clang-cl?
+# libc++-specific flags - AppleClang only has libc++
+if ((USE_LIBCXX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang") OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    if(CPPCHK_GLIBCXX_DEBUG AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+        # TODO: determine proper version for AppleClang - current value is based on the oldest version avaialble in CI
+        if((CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18) OR
+           (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 17))
+            add_definitions(-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG)
+        else()
+            add_definitions(-D_LIBCPP_ENABLE_ASSERTIONS=1)
         endif()
+        # TODO: also add _LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS?
     else()
         # TODO: check if this can be enabled again for Clang - also done in Makefile
         add_definitions(-D_GLIBCXX_DEBUG)
     endif()
-endif()
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND USE_LIBCXX)
     add_definitions(-D_LIBCPP_REMOVE_TRANSITIVE_INCLUDES)
 endif()
 
@@ -54,10 +58,6 @@ if(DISALLOW_PROCESS_EXECUTOR)
     add_definitions(-DDISALLOW_PROCESS_EXECUTOR)
 endif()
 
-if(MSVC AND DISABLE_CRTDBG_MAP_ALLOC)
-    add_definitions(-DDISABLE_CRTDBG_MAP_ALLOC)
-endif()
-
 if(NO_UNIX_SIGNAL_HANDLING)
     add_definitions(-DNO_UNIX_SIGNAL_HANDLING)
 endif()
@@ -70,6 +70,10 @@ if(NO_WINDOWS_SEH)
     add_definitions(-DNO_WINDOWS_SEH)
 endif()
 
+if(NOT MSVC)
+    add_definitions(-DHAVE_EXECINFO_H=${HAVE_EXECINFO_H})
+endif()
+
 if(FILESDIR_DEF)
     file(TO_CMAKE_PATH "${FILESDIR_DEF}" _filesdir)
     add_definitions(-DFILESDIR="${_filesdir}")
diff --git a/cmake/compileroptions.cmake b/cmake/compileroptions.cmake
index 4112ddd2418..6343a8a5102 100644
--- a/cmake/compileroptions.cmake
+++ b/cmake/compileroptions.cmake
@@ -132,12 +132,8 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     endif()
 
     # TODO: fix and enable these warnings - or move to suppression list below
-    add_compile_options_safe(-Wno-documentation-unknown-command) # TODO: Clang currently does not support all commands
-    add_compile_options_safe(-Wno-unused-exception-parameter)
     add_compile_options_safe(-Wno-sign-conversion)
     add_compile_options_safe(-Wno-shadow-field-in-constructor)
-    add_compile_options_safe(-Wno-covered-switch-default)
-    add_compile_options_safe(-Wno-shorten-64-to-32)
     add_compile_options_safe(-Wno-implicit-int-conversion)
     add_compile_options_safe(-Wno-double-promotion)
     add_compile_options_safe(-Wno-shadow-field)
@@ -173,6 +169,12 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     add_compile_options(-Wno-weak-vtables)
     add_compile_options(-Wno-multichar)
 
+    # FIXME: only reported when running clang-tidy
+    # /home/runner/work/cppcheck/cppcheck/tools/triage/mainwindow.cpp:19:10: error: multiple candidates for header 'mainwindow.h' found; directory '/home/runner/work/cppcheck/cppcheck/tools/triage' chosen, ignoring others including '/home/runner/work/cppcheck/cppcheck/gui' [clang-diagnostic-shadow-header]
+    # 19 | #include "mainwindow.h"
+    # |          ^
+    add_compile_options_safe(-Wno-shadow-header)
+
     if(ENABLE_COVERAGE OR ENABLE_COVERAGE_XML)
       message(FATAL_ERROR "Do not use clang to generate code coverage. Use GCC instead.")
     endif()
diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
index 3fffa420a5e..b1f6571504d 100644
--- a/cmake/findDependencies.cmake
+++ b/cmake/findDependencies.cmake
@@ -3,7 +3,7 @@ if(BUILD_GUI)
     if(WITH_QCHART)
         list(APPEND qt_components Charts)
     endif()
-    if(BUILD_TESTS)
+    if(BUILD_TESTING)
         list(APPEND qt_components Test)
     endif()
     find_package(Qt6 COMPONENTS ${qt_components} REQUIRED)
@@ -13,15 +13,6 @@ if(BUILD_GUI)
         message(WARNING "'Qt6Core_VERSION' is not set - using 6.0.0 as fallback")
         set(QT_VERSION "6.0.0")
     endif()
-    if(MSVC)
-        # disable Visual Studio C++ memory leak detection since it causes compiler errors with Qt 6
-        # D:\a\cppcheck\Qt\6.2.4\msvc2019_64\include\QtCore/qhash.h(179,15): warning C4003: not enough arguments for function-like macro invocation 'free' [D:\a\cppcheck\cppcheck\build\gui\cppcheck-gui.vcxproj]
-        # D:\a\cppcheck\Qt\6.2.4\msvc2019_64\include\QtCore/qhash.h(179,15): error C2059: syntax error: ',' [D:\a\cppcheck\cppcheck\build\gui\cppcheck-gui.vcxproj]
-        # this is supposed to be fixed according to the following tickets but it still happens
-        # https://bugreports.qt.io/browse/QTBUG-40575
-        # https://bugreports.qt.io/browse/QTBUG-86395
-        set(DISABLE_CRTDBG_MAP_ALLOC ON)
-    endif()
 
     if(BUILD_ONLINE_HELP)
         find_program(QHELPGENERATOR qhelpgenerator)
@@ -43,6 +34,8 @@ if(HAVE_RULES)
     if(NOT PCRE_LIBRARY OR NOT PCRE_INCLUDE)
         message(FATAL_ERROR "pcre dependency for RULES has not been found")
     endif()
+else()
+    set(PCRE_LIBRARY "")
 endif()
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -56,7 +49,8 @@ if(NOT Python_Interpreter_FOUND)
     endif()
 else()
     if(${Python_VERSION} VERSION_LESS 3.7)
-        message(FATAL_ERROR "The minimum supported Python version is 3.7 - found ${Python_VERSION}")
+        message(WARNING "The minimum supported Python version is 3.7, found ${Python_VERSION} - disabling matchcompiler.")
+        set(USE_MATCHCOMPILER_OPT "Off")
     endif()
 endif()
 
@@ -79,6 +73,9 @@ if(NOT USE_BUNDLED_TINYXML2)
 endif()
 
 find_package(Threads REQUIRED)
+if(NOT DEFINED CMAKE_THREAD_LIBS_INIT)
+    set(CMAKE_THREAD_LIBS_INIT "")
+endif()
 
 if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.30")
     # avoid legacy warning about Boost lookup in CMake
@@ -99,7 +96,7 @@ if(USE_BOOST)
         endif()
         set(Boost_FOUND ON)
         set(Boost_INCLUDE_DIRS "${BOOST_INCLUDEDIR}")
-        # TODO: set Boost_VERSION_STRING
+        set(Boost_VERSION_STRING "")  # TODO: set proper value
     elseif(USE_BOOST STREQUAL "Auto")
         find_package(Boost)
     else()
diff --git a/cmake/includechecks.cmake b/cmake/includechecks.cmake
new file mode 100644
index 00000000000..b9cbbd03183
--- /dev/null
+++ b/cmake/includechecks.cmake
@@ -0,0 +1,8 @@
+include(CheckIncludeFileCXX)
+
+if(NOT MSVC)
+    check_include_file_cxx(execinfo.h HAVE_EXECINFO_H)
+    if(NOT HAVE_EXECINFO_H)
+        set(HAVE_EXECINFO_H 0)
+    endif()
+endif()
\ No newline at end of file
diff --git a/cmake/options.cmake b/cmake/options.cmake
index 3c093bd7eaa..bda080fe77b 100644
--- a/cmake/options.cmake
+++ b/cmake/options.cmake
@@ -25,7 +25,7 @@ option(ANALYZE_TYPE         "Build with TypeSanitizer to detect aliasing issues"
 option(WARNINGS_ARE_ERRORS  "Treat warnings as errors"                                      OFF)
 if(WARNINGS_ARE_ERRORS)
     if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24")
-        message(WARNING "WARNINGS_ARE_ERRORS is deprecated - please use CMAKE_COMPILE_WARNING_AS_ERROR instead")
+        message(DEPRECATION "WARNINGS_ARE_ERRORS is deprecated - please use CMAKE_COMPILE_WARNING_AS_ERROR instead")
     endif()
     set(CMAKE_COMPILE_WARNING_AS_ERROR On)
 endif()
@@ -56,6 +56,18 @@ option(BUILD_CORE_DLL       "Build lib as cppcheck-core.dll with Visual Studio"
 if(BUILD_CORE_DLL AND NOT MSVC)
     message(FATAL_ERROR "Building of lib as DLL is only supported with Visual Studio")
 endif()
+# need to check before the option() specifying it or it will be defined
+if(DEFINED BUILD_TESTS)
+    message(DEPRECATION "BUILD_TESTS has been deprecated and will be removed in Cppcheck 2.22 - please use BUILD_TESTING instead")
+    if(DEFINED BUILD_TESTING)
+        message(AUTHOR_WARNING "BUILD_TESTS and BUILD_TESTING have been defined at the same time - ignoring BUILD_TESTS")
+    else()
+        set(BUILD_TESTING "${BUILD_TESTS}")
+    endif()
+elseif(NOT DEFINED BUILD_TESTING)
+    # disable tests by default - TODO: remove this
+    set(BUILD_TESTING OFF)
+endif()
 option(BUILD_TESTS          "Build tests"                                                   OFF)
 option(REGISTER_TESTS       "Register tests in CTest"                                       ON)
 option(ENABLE_CHECK_INTERNAL "Enable internal checks"                                       OFF)
@@ -63,7 +75,7 @@ option(DISABLE_DMAKE        "Disable run-dmake dependencies"
 option(BUILD_MANPAGE        "Enable man target to build manpage"                            OFF)
 
 option(BUILD_CLI            "Build the CLI application"                                     ON)
-if(NOT BUILD_CLI AND BUILD_TESTS)
+if(NOT BUILD_CLI AND BUILD_TESTING)
     message(FATAL_ERROR "Building the tests requires the CLI to be build as well")
 endif()
 
@@ -104,7 +116,10 @@ if (NOT USE_BOOST AND USE_BOOST_INT128)
 endif()
 option(USE_LIBCXX           "Use libc++ instead of libstdc++"                               OFF)
 
-option(DISABLE_CRTDBG_MAP_ALLOC "Disable usage of Visual Studio C++ memory leak detection in Debug build" OFF)
+if(USE_LIBCXX AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    message(FATAL_ERROR "libc++ can only be used with a Clang-based compiler")
+endif()
+
 option(NO_UNIX_SIGNAL_HANDLING "Disable usage of Unix Signal Handling"                      OFF)
 option(NO_UNIX_BACKTRACE_SUPPORT "Disable usage of Unix Backtrace support"                  OFF)
 option(NO_WINDOWS_SEH       "Disable usage of Windows SEH"                                  OFF)
@@ -114,27 +129,27 @@ option(ENABLE_CSA_ALPHA     "Enable Clang Static Analyzer alpha checkers for run
 # TODO: disable by default like make build?
 option(FILESDIR "Hard-coded directory for files to load from"                               OFF)
 
-if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16")
-    set(CMAKE_DISABLE_PRECOMPILE_HEADERS Off CACHE BOOL "Disable precompiled headers")
-    # need to disable the prologue or it will be treated like a system header and not emit any warnings
-    # see https://gitlab.kitware.com/cmake/cmake/-/issues/21219
-    set(CMAKE_PCH_PROLOGUE "")
-else()
-    set(CMAKE_DISABLE_PRECOMPILE_HEADERS On CACHE BOOL "Disable precompiled headers")
-endif()
+set(CMAKE_DISABLE_PRECOMPILE_HEADERS Off CACHE BOOL "Disable precompiled headers")
+# need to disable the prologue or it will be treated like a system header and not emit any warnings
+# see https://gitlab.kitware.com/cmake/cmake/-/issues/21219
+set(CMAKE_PCH_PROLOGUE "")
 
+# TODO: do we need to set these?
 set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE ${CMAKE_INSTALL_PREFIX}/include      CACHE PATH "Output directory for headers")
 set(CMAKE_LIB_DIRS_CONFIGCMAKE     ${CMAKE_INSTALL_PREFIX}/lib          CACHE PATH "Output directory for libraries")
 
+# TODO: do we need to set these?
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 
 string(LENGTH "${FILESDIR}" _filesdir_len)
 # override FILESDIR if it is set or empty
+# needs to be an absolute path in Cppcheck but a relative one for CMake install
 if(FILESDIR OR ${_filesdir_len} EQUAL 0)
-# TODO: verify that it is an abolute path?
-    set(FILESDIR_DEF                   ${FILESDIR})
+    set(FILESDIR_INSTALL               "${FILESDIR}") # TODO: make relative - leverage CMAKE_INSTALL_DATAROOTDIR?
+    set(FILESDIR_DEF                   "${FILESDIR}")
 else()
-    set(FILESDIR_DEF                   ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} CACHE STRING "Cppcheck files directory")
+    set(FILESDIR_INSTALL               "share/${PROJECT_NAME}")
+    set(FILESDIR_DEF                   "${CMAKE_INSTALL_PREFIX}/${FILESDIR_INSTALL}")
 endif()
diff --git a/cmake/printInfo.cmake b/cmake/printInfo.cmake
index 8315e414485..7869169708d 100644
--- a/cmake/printInfo.cmake
+++ b/cmake/printInfo.cmake
@@ -8,6 +8,7 @@ message(STATUS "Compiler Version =      ${CMAKE_CXX_COMPILER_VERSION}")
 message(STATUS "Build type =            ${CMAKE_BUILD_TYPE}")
 message(STATUS "CMake C++ Standard =    ${CMAKE_CXX_STANDARD}")
 message(STATUS "CMAKE_INSTALL_PREFIX =  ${CMAKE_INSTALL_PREFIX}")
+message(STATUS "CMAKE_INSTALL_BINDIR =  ${CMAKE_INSTALL_BINDIR}")
 message(STATUS "CMAKE_DISABLE_PRECOMPILE_HEADERS = ${CMAKE_DISABLE_PRECOMPILE_HEADERS}")
 message(STATUS "C++ flags (General) =   ${CMAKE_CXX_FLAGS}")
 message(STATUS "C++ flags (Release) =   ${CMAKE_CXX_FLAGS_RELEASE}")
@@ -15,6 +16,9 @@ message(STATUS "C++ flags (RelWithDebInfo) = ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
 message(STATUS "C++ flags (Debug) =     ${CMAKE_CXX_FLAGS_DEBUG}")
 message(STATUS "CMAKE_EXE_LINKER_FLAGS = ${CMAKE_EXE_LINKER_FLAGS}")
 message(STATUS "CPPCHK_GLIBCXX_DEBUG =  ${CPPCHK_GLIBCXX_DEBUG}")
+if(DEFINED HAVE_EXECINFO_H)
+    message(STATUS "HAVE_EXECINFO_H =       ${HAVE_EXECINFO_H}")
+endif()
 get_directory_property(DirCompileDefs DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS)
 message(STATUS "COMPILE_DEFINITIONS (global) =  ${DirCompileDefs}")
 get_directory_property(DirCompileOptions DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_OPTIONS)
@@ -38,7 +42,6 @@ message(STATUS)
 message(STATUS "USE_MATCHCOMPILER =     ${USE_MATCHCOMPILER}")
 message(STATUS "USE_MATCHCOMPILER_OPT = ${USE_MATCHCOMPILER_OPT}")
 message(STATUS)
-message(STATUS "DISABLE_CRTDBG_MAP_ALLOC = ${DISABLE_CRTDBG_MAP_ALLOC}")
 message(STATUS "NO_UNIX_SIGNAL_HANDLING = ${NO_UNIX_SIGNAL_HANDLING}")
 message(STATUS "NO_UNIX_BACKTRACE_SUPPORT = ${NO_UNIX_BACKTRACE_SUPPORT}")
 message(STATUS "NO_WINDOWS_SEH =        ${NO_WINDOWS_SEH}")
@@ -53,7 +56,8 @@ endif()
 message(STATUS "LIBXML2_XMLLINT_EXECUTABLE = ${LIBXML2_XMLLINT_EXECUTABLE}")
 message(STATUS "BUILD_CORE_DLL =        ${BUILD_CORE_DLL}")
 message(STATUS "BUILD_TESTS =           ${BUILD_TESTS}")
-if(BUILD_TESTS)
+message(STATUS "BUILD_TESTING =         ${BUILD_TESTING}")
+if(BUILD_TESTING)
     message(STATUS "REGISTER_TESTS =        ${REGISTER_TESTS}")
 endif()
 message(STATUS "ENABLE_CHECK_INTERNAL = ${ENABLE_CHECK_INTERNAL}")
@@ -69,7 +73,9 @@ if(BUILD_GUI)
     message(STATUS "QT_VERSION =            ${QT_VERSION}")
     message(STATUS "Qt6Core_LIBRARIES =     ${Qt6Core_LIBRARIES}")
     message(STATUS "Qt6Core_INCLUDE_DIRS =  ${Qt6Core_INCLUDE_DIRS}")
-    message(STATUS "QHELPGENERATOR =        ${QHELPGENERATOR}")
+    if(BUILD_ONLINE_HELP)
+        message(STATUS "QHELPGENERATOR =        ${QHELPGENERATOR}")
+    endif()
 endif()
 message(STATUS)
 message(STATUS "HAVE_RULES =            ${HAVE_RULES}")
@@ -83,21 +89,28 @@ message(STATUS "CMAKE_THREAD_LIBS_INIT = ${CMAKE_THREAD_LIBS_INIT}")
 message(STATUS)
 message(STATUS "USE_BUNDLED_TINYXML2 =  ${USE_BUNDLED_TINYXML2}")
 if(NOT USE_BUNDLED_TINYXML2)
-    message(STATUS "tinyxml2_LIBRARIES =    ${tinyxml2_LIBRARIES}")
-    message(STATUS "tinyxml2_INCLUDE_DIRS = ${tinyxml2_INCLUDE_DIRS}")
+    if(TARGET tinyxml2::tinyxml2)
+        # TODO: print libraries and include dirs
+    else()
+        message(STATUS "tinyxml2_LIBRARIES =    ${tinyxml2_LIBRARIES}")
+        message(STATUS "tinyxml2_INCLUDE_DIRS = ${tinyxml2_INCLUDE_DIRS}")
+    endif()
 endif()
 message(STATUS)
 message(STATUS "USE_BOOST =             ${USE_BOOST}")
 if(USE_BOOST)
     message(STATUS "Boost_FOUND =           ${Boost_FOUND}")
-    message(STATUS "Boost_VERSION_STRING =  ${Boost_VERSION_STRING}")
-    message(STATUS "Boost_INCLUDE_DIRS =    ${Boost_INCLUDE_DIRS}")
-    message(STATUS "USE_BOOST_INT128 =      ${USE_BOOST_INT128}")
+    if(Boost_FOUND)
+        message(STATUS "Boost_VERSION_STRING =  ${Boost_VERSION_STRING}")
+        message(STATUS "Boost_INCLUDE_DIRS =    ${Boost_INCLUDE_DIRS}")
+        message(STATUS "USE_BOOST_INT128 =      ${USE_BOOST_INT128}")
+    endif()
 endif()
 message(STATUS)
 message(STATUS "USE_LIBCXX =            ${USE_LIBCXX}")
 message(STATUS)
 message(STATUS "FILESDIR =              ${FILESDIR}")
+message(STATUS "FILESDIR_INSTALL =      ${FILESDIR_INSTALL}")
 message(STATUS "FILESDIR_DEF =          ${FILESDIR_DEF}")
 message(STATUS)
 
diff --git a/cppcheckpremium-suppressions b/cppcheckpremium-suppressions
index f4c472f0671..4bd66f2f681 100644
--- a/cppcheckpremium-suppressions
+++ b/cppcheckpremium-suppressions
@@ -1,8 +1,10 @@
 
 # open source warnings are handled by the selfcheck.yml
+knownConditionTrueFalse
 noExplicitConstructor
 postfixOperator
 shadowFunction
+uninitMemberVarNoCtor
 useStlAlgorithm
 normalCheckLevelMaxBranches
 
@@ -19,15 +21,24 @@ premium-cert-int36-c
 
 # too picky
 premium-cert-arr30-c
+premium-cert-ctr50-cpp
+premium-cert-dcl06-c
+premium-cert-dcl51-cpp
+premium-cert-exp20-c
+premium-cert-exp34-c
+premium-cert-int13-c
+premium-cert-int30-c
+premium-cert-int31-c
 premium-cert-int32-c
+premium-cert-pre05-c
+premium-cert-pre12-c
 premium-cert-str34-c
+premium-cert-str53-cpp
+
 
 # we intentionally pass structs
 premium-cert-dcl39-c-*
 
-# we need to declare reserved identifier _CRTDBG_MAP_ALLOC
-premium-cert-dcl51-cpp
-
 # we don't want to check the return values of fclose/sprintf/etc
 premium-cert-err33-c
 
@@ -199,7 +210,7 @@ premium-misra-cpp-2023-12.3.1
 # TODO ensure overrides match
 premium-misra-cpp-2023-13.3.2
 
-# TODO use the same parameter names in overriden methods.
+# TODO use the same parameter names in overridden methods.
 premium-misra-cpp-2023-13.3.3
 
 # we sometimes use both public/private data members by intention
diff --git a/createrelease b/createrelease
index 47f9dd74ab2..44ab440b96c 100755
--- a/createrelease
+++ b/createrelease
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# A script for creating release packages. The release packages are create in the home directory.
+# A script for creating release packages. The release packages are created in the home directory.
 #
 # Create release candidate
 # ========================
@@ -8,116 +8,141 @@
 # Review trac roadmap, are tickets closed properly?
 # Only tickets that should be retargeted should be open.
 #
-# update cppcheck used in premium addon CI
-# create jira issue "CI: update cppcheck binary"
-# cd ~/cppchecksolutions/addon/tools && python3 ci-update-cppcheck.py
+# Execute this script to check if trac tickets can be closed
+# tools/release-trac-fixed-open-tickets.py
 #
-# check every isPremiumEnabled call: TODO write helper script
-# - every id should be in --errorlist
-#   git grep 'isPremiumEnabled[(]"' | sed 's/.*isPremiumEnabled[(]"//' | sed 's/".*//' | sort | uniq > ids1.txt
-#   ./cppcheck --errorlist | grep ' id="' | sed 's/.* id="//' | sed 's/".*//' | sort | uniq > ids2.txt
-#   diff -y ids1.txt ids2.txt
-# - premiumaddon: check coverage.py
-#   python3 coverage.py --id ; sort ids-*.txt | uniq > ~/cppcheck/ids3.txt
-#   diff -y ids2.txt ids3.txt
+# Versioning scheme
+# ========================
+# VERSION=2.22.0      # the new release tag created
+# PREV=2.21.0         # the previous release
+# BRANCH=2.22.x       # release branch
+#
+#   2.22.x          BRANCH  - release branch
+#   2.22.0          TAG     - the release
+#   2.22.1, ...     TAG     - patch releases
+#   2.22.0-rc1      TAG     - release candidate
+#
+# Update mappings:
+# cd ~/cppchecksolutions/addon/coverage
+# CPPCHECK_REPO=~/cppchecksolutions/cppcheck python3 coverage.py --code
+#
+# Check that every premium check id is a real, known Cppcheck error id: every
+# id passed to isPremiumEnabled(...) and every id referenced by the premium
+# addon's MISRA/CERT/AUTOSAR/CWE coverage mapping (coverage.py) must show up
+# in `cppcheck --errorlist`, otherwise the id was renamed/removed and the
+# premium check or compliance mapping is silently broken.
+# tools/release-check-premium-ids.py
 #
 # Windows installer:
 # - ensure latest build was successful
 # - ensure cfg files etc are included (win_installer/cppcheck.wxs)
 #
-# self check, fix critical issues:
+# Self check, fix critical issues:
 # make clean && make CXXOPTS=-O2 MATCHCOMPILER=yes -j4
 # ./cppcheck -D__CPPCHECK__ -D__GNUC__ -DCHECK_INTERNAL -DHAVE_RULES --std=c++11 --library=cppcheck-lib --library=qt --enable=style --inconclusive --inline-suppr --suppress=bitwiseOnBoolean --suppress=shadowFunction --suppress=useStlAlgorithm --suppress=*:externals/picojson.h --suppress=functionConst --suppress=functionStatic --suppress=normalCheckLevelMaxBranches --xml cli gui/*.cpp lib 2> selfcheck.xml
 #
-# Generate lib/checkers.cpp (TODO the premium checkers should not be statically coded)
+# Generate lib/checkers.cpp: (TODO the premium checkers should not be statically coded)
 # cd ~/cppchecksolutions/cppcheck && python3 tools/get_checkers.py > lib/checkers.cpp
 #
-# Update copyright year TODO release script
-# git diff 2.8 -- */*.cpp */*.h | grep '^diff --git a/' | sed 's|.* b/||' | xargs sed -i 's/Copyright (C) 2007-20[12]./Copyright (C) 2007-2022/'
+# Update copyright year: TODO release script
+# git grep -l 'Copyright (C) 2007-20' -- '*.cpp' '*.h' '*.py' | while read f; do y=$(git log -1 --format=%ad --date=format:%Y --invert-grep -i --grep=copyright -- "$f"); sed -i "s/Copyright (C) 2007-20[0-9][0-9]/Copyright (C) 2007-$y/" "$f"; done
 # git diff | grep '^diff --git a/'
 #
 # Make sure "cppcheck --errorlist" works:
 # make clean && make -j4 && ./cppcheck --errorlist > errlist.xml && xmllint --noout errlist.xml
 #
 # Update AUTHORS using output from:
-# git log --format='%aN' 2.7..HEAD | sort -u > AUTHORS2 && diff -y AUTHORS AUTHORS2 | less
+# git log --format='%aN' $PREV..HEAD | sort -u > AUTHORS2 && diff -y AUTHORS AUTHORS2 | less
+# Include github usernames in PR title and commit message
 #
-# Update GUI translations
-# lupdate gui.pro
+# Update GUI translations:
+# cd ~/cppchecksolutions/cppcheck/gui && lupdate gui.pro
 #
-# Create 2.18.x branch
-# git checkout -b 2.18.x ; git push -u origin 2.18.x
+# Create new release branch:
+# git checkout -b $BRANCH && git push -u origin $BRANCH
+# in fork:
+#  * add upstream: git remote add upstream git@github.com:cppcheck-opensource/cppcheck.git
+#  * add branch:   git fetch upstream $BRANCH
 #
 # Release notes:
 # - ensure safety critical issues are listed properly
 # - empty the releasenotes.txt in main branch
 #
 # Update version numbers in:
-# python3 tools/release-set-version.py 2.19.0
+# python3 tools/release-set-version.py $VERSION
 # Verify:
 # grep '\.99' */*.[ch]* && grep '[0-9][0-9] dev' */*.[ch]*
 # egrep "2\.[0-9]+" */*.h */*.cpp man/*.md | grep -v "test/test" | less
-# git commit -a -m "2.8: Set versions"
+# git commit -a -m "$VERSION: Set versions"
 #
 # Build and test the windows installer
 #
 # Update the Makefile:
 # make dmake && ./dmake --release
-# git commit -a -m "2.8: Updated Makefile"
+# git commit -a -m "$VERSION: Updated Makefile"
+#
+# Push changes:
+# git push
 #
 # Ensure that CI is happy
 #
 # Tag:
-# git tag 2.8-rc1
+# git tag $VERSION-rc1
 # git push --tags
 #
 # Release
-# =======
+# ========================
 #
 # Remove "-rc1" from versions. Test: git grep "\-rc[0-9]"
 #
 # Create a release folder on sourceforge:
 # https://sourceforge.net/projects/cppcheck/files/cppcheck/
 #
-# git tag 2.8 ; git push --tags
-# ./createrelease 2.8
+# git tag $VERSION && git push --tags
+# ./createrelease $VERSION
 #
-# copy msi from release-windows, install and test cppcheck
-# copy manual from build-manual
+# Copy msi from release-windows, install and test cppcheck
+# Copy manual from build-manual
 #
 # Update download link on index.php main page
 #
 # Trac:
-# 1. Create ticket "2.18 safety cosmetic changes"
-#    git log --format=oneline 2.17.0..HEAD | egrep -v "^[0-9a-f]*[ ][ ]*([Ff]ix|fixed|Fixup|Fixes|refs)?[ ]*#*[0-9]+"
+# 1. Create ticket "$VERSION safety cosmetic changes"
+#    git log --format=oneline $PREV..HEAD | egrep -v "^[0-9a-f]*[ ][ ]*([Ff]ix|fixed|Fixup|Fixes|refs)?[ ]*#*[0-9]+"
 # 2. Check priorities for all tickets in milestone. Should be: safety-*
 # 3. Create new milestone
 # 4. Close old milestone
 #
-# write a news
+# Write a news
 #
-# save "cppcheck --doc" output on wiki
+# Save "cppcheck --doc" output on wiki
 #
-# compile new democlient:
+# Compile new democlient:
 # ssh -t danielmarjamaki,cppcheck@shell.sourceforge.net create
 # ./build-cppcheck.sh
 #
-# run daca with new release
+# Create a ticket with data from http://cppcheck1.osuosl.org:8000/time_gt.html for performance tracking
+# (example: https://trac.cppcheck.net/ticket/13715)
+# - type: defect
+# - component: Performance
+# - summary: [meta] performance regressions in $VERSION
+#
+# Run daca with new release:
 # 1. edit tools/donate-cpu-server.py. Update OLD_VERSION and SERVER_VERSION
 # 2. scp -i ~/.ssh/osuosl_id_rsa tools/donate-cpu-server.py danielmarjamaki@cppcheck1.osuosl.org:/var/daca@home/
 #
 # Backup:
-# * trac: cd /var && nice tar -cJf ~/trac.tar.xz trac-cppcheck/db/trac.db
-# * daca: cd /var && nice tar -cJf ~/daca.tar.xz daca@home
+# * trac: rm -f trac.db trac.tar.xz && cp /var/trac-cppcheck/db/trac.db . && nice tar -cJf trac.tar.xz trac.db
+# * daca: rm -rf daca@home daca.tar.xz && cp -R /var/daca@home . && nice tar -cJf daca.tar.xz daca@home
 # * git: git checkout -f && git checkout main && git pull && tar -cJf git.tar.xz .git
-# * git log 2.16.0..2.17.0 > Changelog
-# * mkdir out && python3 ~/cppchecksolutions/release/getWorkflowAndIssueLogs.py -r danmar/cppcheck -t 2.15.0 -p out
+# * git log $PREV..$VERSION > Changelog
+# * cd ~/cppcheck && mkdir -p out && python3 ~/cppchecksolutions/release/getWorkflowAndIssueLogs.py -r cppcheck-opensource/cppcheck -t $VERSION -p out
 
-# Folder/tag to use
-folder=$1
-tag=$folder.0
+# Folder/tag to use:
+tag=$1
+folder=${tag%.*}
 
-# Name of release
+# Name of release:
 releasename=cppcheck-$tag
 
 set -e
@@ -127,31 +152,29 @@ cd ~/cppcheck
 git checkout $tag
 
 rm -rf upload
-mkdir -p upload
+mkdir -p upload/htdocs upload/frs
 
+# htdocs
 make clean
-
-# Create archives..
-git archive --format=tar --prefix=$releasename/ $tag | gzip > upload/$releasename.tar.gz
-git archive --format=tar --prefix=$releasename/ $tag | bzip2 > upload/$releasename.tar.bz2
-git archive --format=zip -9 --prefix=$releasename/ $tag > upload/$releasename.zip
-cd upload
-scp $releasename.* danielmarjamaki,cppcheck@frs.sourceforge.net:/home/frs/project/c/cp/cppcheck/cppcheck/$folder/
-rm $releasename.*
-cd ..
-
-# Generate version.txt
 make -j12
 rm -f cppcheck.cfg
-./cppcheck --version > upload/version.txt
+./cppcheck --version > upload/htdocs/version.txt
+# TODO manual, update version on webpage
 
-cd ~/cppcheck/upload
-scp version.txt danielmarjamaki,cppcheck@web.sourceforge.net:htdocs/
+# frs
+git archive --format=tar --prefix=$releasename/ $tag | gzip > upload/frs/$releasename.tar.gz
+git archive --format=tar --prefix=$releasename/ $tag | bzip2 > upload/frs/$releasename.tar.bz2
+git archive --format=zip -9 --prefix=$releasename/ $tag > upload/frs/$releasename.zip
+cp releasenotes.txt upload/frs/README.md
+# TODO msi
 
-cd ~/cppcheck
+cd upload
+scp frs/* danielmarjamaki,cppcheck@frs.sourceforge.net:/home/frs/project/c/cp/cppcheck/cppcheck/$folder/
+scp htdocs/* danielmarjamaki,cppcheck@web.sourceforge.net:htdocs/
+cd ..
 rm -rf upload
 
-# Local cppcheck binary
+# Local cppcheck binary:
 mkdir -p ~/.cppcheck/$tag
 cd ~/.cppcheck/$tag
 cp -R ~/cppcheck/cfg .
diff --git a/democlient/democlient.cpp b/democlient/democlient.cpp
index e45baf51cbd..8560596f4f3 100644
--- a/democlient/democlient.cpp
+++ b/democlient/democlient.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@ class CppcheckExecutor : public ErrorLogger {
 public:
     CppcheckExecutor(const Settings& settings)
         : stoptime(std::time(nullptr)+2U)
-        , cppcheck(settings, supprs, *this, false, nullptr)
+        , cppcheck(settings, supprs, *this, nullptr, false, nullptr)
     {}
 
     void run(const char* code) {
diff --git a/externals/simplecpp/simplecpp.cpp b/externals/simplecpp/simplecpp.cpp
index 581c9b10990..8237ac75fab 100644
--- a/externals/simplecpp/simplecpp.cpp
+++ b/externals/simplecpp/simplecpp.cpp
@@ -3,18 +3,12 @@
  * Copyright (C) 2016-2023 simplecpp team
  */
 
+// needs to be specified here otherwise _mingw.h will define it as 0x0601
+// causing FileIdInfo not to be available
 #if defined(_WIN32)
 #  ifndef _WIN32_WINNT
 #    define _WIN32_WINNT 0x0602
 #  endif
-#  ifndef NOMINMAX
-#    define NOMINMAX
-#  endif
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  undef ERROR
 #endif
 
 #include "simplecpp.h"
@@ -51,10 +45,19 @@
 #include <utility>
 #include <vector>
 
-#ifdef _WIN32
+#if defined(_WIN32)
+#  ifndef NOMINMAX
+#    define NOMINMAX
+#  endif
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#  include <windows.h>
+#  undef ERROR
 #  include <direct.h>
 #else
 #  include <sys/stat.h>
+#  include <sys/types.h>
 #endif
 
 static bool isHex(const std::string &s)
@@ -67,14 +70,12 @@ static bool isOct(const std::string &s)
     return s.size()>1 && (s[0]=='0') && (s[1] >= '0') && (s[1] < '8');
 }
 
-// TODO: added an undercore since this conflicts with a function of the same name in utils.h from Cppcheck source when building Cppcheck with MSBuild
-static bool isStringLiteral_(const std::string &s)
+static bool isStringLiteral(const std::string &s)
 {
     return s.size() > 1 && (s[0]=='\"') && (*s.rbegin()=='\"');
 }
 
-// TODO: added an undercore since this conflicts with a function of the same name in utils.h from Cppcheck source when building Cppcheck with MSBuild
-static bool isCharLiteral_(const std::string &s)
+static bool isCharLiteral(const std::string &s)
 {
     // char literal patterns can include 'a', '\t', '\000', '\xff', 'abcd', and maybe ''
     // This only checks for the surrounding '' but doesn't parse the content.
@@ -95,6 +96,8 @@ static const simplecpp::TokenString IFNDEF("ifndef");
 static const simplecpp::TokenString DEFINED("defined");
 static const simplecpp::TokenString ELSE("else");
 static const simplecpp::TokenString ELIF("elif");
+static const simplecpp::TokenString ELIFDEF("elifdef");
+static const simplecpp::TokenString ELIFNDEF("elifndef");
 static const simplecpp::TokenString ENDIF("endif");
 
 static const simplecpp::TokenString PRAGMA("pragma");
@@ -277,8 +280,10 @@ class simplecpp::TokenList::Stream {
         return ch;
     }
 
-    unsigned char peekChar() {
-        auto ch = static_cast<unsigned char>(peek());
+    int peekChar() {
+        int ch = peek();
+        if (ch == EOF)
+            return ch;
 
         // For UTF-16 encoded files the BOM is 0xfeff/0xfffe. If the
         // character is non-ASCII character then replace it with 0xff
@@ -287,7 +292,7 @@ class simplecpp::TokenList::Stream {
             const auto ch2 = static_cast<unsigned char>(peek());
             unget();
             const int ch16 = makeUtf16Char(ch, ch2);
-            ch = static_cast<unsigned char>(((ch16 >= 0x80) ? 0xff : ch16));
+            ch = (ch16 >= 0x80) ? 0xff : ch16;
         }
 
         // Handling of newlines..
@@ -351,146 +356,149 @@ class simplecpp::TokenList::Stream {
     bool isUtf16;
 };
 
-class StdIStream : public simplecpp::TokenList::Stream {
-public:
-    // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
-    explicit StdIStream(std::istream &istr)
-        : istr(istr) {
-        assert(istr.good());
-        init();
-    }
+namespace {
+    class StdIStream : public simplecpp::TokenList::Stream {
+    public:
+        // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
+        explicit StdIStream(std::istream &istr)
+            : istr(istr) {
+            assert(istr.good());
+            init();
+        }
 
-    int get() override {
-        return istr.get();
-    }
-    int peek() override {
-        return istr.peek();
-    }
-    void unget() override {
-        istr.unget();
-    }
-    bool good() override {
-        return istr.good();
-    }
+        int get() override {
+            return istr.get();
+        }
+        int peek() override {
+            return istr.peek();
+        }
+        void unget() override {
+            istr.unget();
+        }
+        bool good() override {
+            return istr.good();
+        }
 
-private:
-    std::istream &istr;
-};
+    private:
+        std::istream &istr;
+    };
 
-class StdCharBufStream : public simplecpp::TokenList::Stream {
-public:
-    // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
-    StdCharBufStream(const unsigned char* str, std::size_t size)
-        : str(str)
-        , size(size)
-    {
-        init();
-    }
+    class StdCharBufStream : public simplecpp::TokenList::Stream {
+    public:
+        // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
+        StdCharBufStream(const unsigned char* str, std::size_t size)
+            : str(str)
+            , size(size)
+        {
+            init();
+        }
 
-    int get() override {
-        if (pos >= size)
-            return lastStatus = EOF;
-        return str[pos++];
-    }
-    int peek() override {
-        if (pos >= size)
-            return lastStatus = EOF;
-        return str[pos];
-    }
-    void unget() override {
-        --pos;
-    }
-    bool good() override {
-        return lastStatus != EOF;
-    }
+        int get() override {
+            if (pos >= size)
+                return lastStatus = EOF;
+            return str[pos++];
+        }
+        int peek() override {
+            if (pos >= size)
+                return lastStatus = EOF;
+            return str[pos];
+        }
+        void unget() override {
+            --pos;
+        }
+        bool good() override {
+            return lastStatus != EOF;
+        }
 
-private:
-    const unsigned char *str;
-    const std::size_t size;
-    std::size_t pos{};
-    int lastStatus{};
-};
+    private:
+        const unsigned char *str;
+        const std::size_t size;
+        std::size_t pos{};
+        int lastStatus{};
+    };
 
-class FileStream : public simplecpp::TokenList::Stream {
-public:
-    /**
-     * @throws simplecpp::Output thrown if file is not found
-     */
-    // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
-    explicit FileStream(const std::string &filename, std::vector<std::string> &files)
-        : file(fopen(filename.c_str(), "rb"))
-    {
-        if (!file) {
-            files.push_back(filename);
-            throw simplecpp::Output(simplecpp::Output::FILE_NOT_FOUND, {}, "File is missing: " + filename);
+    class FileStream : public simplecpp::TokenList::Stream {
+    public:
+        /**
+         * @throws simplecpp::Output thrown if file is not found
+         */
+        // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
+        explicit FileStream(const std::string &filename, std::vector<std::string> &files)
+            : file(fopen(filename.c_str(), "rb"))
+        {
+            if (!file) {
+                files.emplace_back(filename);
+                throw simplecpp::Output(simplecpp::Output::FILE_NOT_FOUND, {}, "File is missing: " + filename);
+            }
+            init();
         }
-        init();
-    }
 
-    FileStream(const FileStream&) = delete;
-    FileStream &operator=(const FileStream&) = delete;
+        FileStream(const FileStream&) = delete;
+        FileStream &operator=(const FileStream&) = delete;
 
-    ~FileStream() override {
-        fclose(file);
-        file = nullptr;
-    }
+        ~FileStream() override {
+            fclose(file);
+            file = nullptr;
+        }
 
-    int get() override {
-        lastStatus = lastCh = fgetc(file);
-        return lastCh;
-    }
-    int peek() override {
-        // keep lastCh intact
-        const int ch = fgetc(file);
-        unget_internal(ch);
-        return ch;
-    }
-    void unget() override {
-        unget_internal(lastCh);
-    }
-    bool good() override {
-        return lastStatus != EOF;
-    }
+        int get() override {
+            lastStatus = lastCh = fgetc(file);
+            return lastCh;
+        }
+        int peek() override {
+            // keep lastCh intact
+            const int ch = fgetc(file);
+            unget_internal(ch);
+            return ch;
+        }
+        void unget() override {
+            unget_internal(lastCh);
+        }
+        bool good() override {
+            return lastStatus != EOF;
+        }
 
-private:
-    void unget_internal(int ch) {
-        if (isUtf16) {
-            // TODO: use ungetc() as well
-            // UTF-16 has subsequent unget() calls
-            fseek(file, -1, SEEK_CUR);
-        } else
-            ungetc(ch, file);
-    }
+    private:
+        void unget_internal(int ch) {
+            if (isUtf16) {
+                // TODO: use ungetc() as well
+                // UTF-16 has subsequent unget() calls
+                fseek(file, -1, SEEK_CUR);
+            } else {
+                ungetc(ch, file);
+            }
+        }
 
-    FILE *file;
-    int lastCh{};
-    int lastStatus{};
-};
+        FILE *file;
+        int lastCh{};
+        int lastStatus{};
+    };
+}
 
 simplecpp::TokenList::TokenList(std::vector<std::string> &filenames) : frontToken(nullptr), backToken(nullptr), files(filenames) {}
 
-simplecpp::TokenList::TokenList(std::istream &istr, std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList)
+simplecpp::TokenList::TokenList(std::istream &istr, std::vector<std::string> &filenames, const std::string &filename, const DUI &dui, OutputList *outputList)
     : frontToken(nullptr), backToken(nullptr), files(filenames)
 {
     StdIStream stream(istr);
-    readfile(stream,filename,outputList);
+    readfile(stream,filename,dui,outputList);
 }
 
-simplecpp::TokenList::TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList, int /*unused*/)
+simplecpp::TokenList::TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename, const DUI &dui, OutputList *outputList, int /*unused*/)
     : frontToken(nullptr), backToken(nullptr), files(filenames)
 {
     StdCharBufStream stream(data, size);
-    readfile(stream,filename,outputList);
+    readfile(stream,filename,dui,outputList);
 }
 
-simplecpp::TokenList::TokenList(const std::string &filename, std::vector<std::string> &filenames, OutputList *outputList)
+simplecpp::TokenList::TokenList(const std::string &filename, std::vector<std::string> &filenames, const DUI &dui, OutputList *outputList)
     : frontToken(nullptr), backToken(nullptr), files(filenames)
 {
     try {
         FileStream stream(filename, filenames);
-        readfile(stream,filename,outputList);
+        readfile(stream,filename,dui,outputList);
     } catch (const simplecpp::Output & e) {
-        outputList->push_back(e);
+        outputList->emplace_back(e);
     }
 }
 
@@ -565,6 +573,7 @@ std::string simplecpp::TokenList::stringify(bool linenrs) const
 {
     std::ostringstream ret;
     Location loc;
+    loc.line = 1;
     bool filechg = true;
     for (const Token *tok = cfront(); tok; tok = tok->next) {
         if (tok->location.line < loc.line || tok->location.fileIndex != loc.fileIndex) {
@@ -596,7 +605,7 @@ std::string simplecpp::TokenList::stringify(bool linenrs) const
     return ret.str();
 }
 
-static bool isNameChar(unsigned char ch)
+static bool isNameChar(int ch)
 {
     return std::isalnum(ch) || ch == '_' || ch == '$';
 }
@@ -619,12 +628,12 @@ static void portabilityBackslash(simplecpp::OutputList *outputList, const simple
 {
     if (!outputList)
         return;
-    simplecpp::Output err = {
+    simplecpp::Output err{
         simplecpp::Output::PORTABILITY_BACKSLASH,
         location,
         "Combination 'backslash space newline' is not portable."
     };
-    outputList->push_back(std::move(err));
+    outputList->emplace_back(std::move(err));
 }
 
 static bool isStringLiteralPrefix(const std::string &str)
@@ -633,10 +642,10 @@ static bool isStringLiteralPrefix(const std::string &str)
            str == "R" || str == "uR" || str == "UR" || str == "LR" || str == "u8R";
 }
 
-void simplecpp::TokenList::lineDirective(unsigned int fileIndex, unsigned int line, Location &location)
+void simplecpp::TokenList::lineDirective(unsigned int fileIndex_, unsigned int line, Location &location)
 {
-    if (fileIndex != location.fileIndex || line >= location.line) {
-        location.fileIndex = fileIndex;
+    if (fileIndex_ != location.fileIndex || line >= location.line) {
+        location.fileIndex = fileIndex_;
         location.line = line;
         return;
     }
@@ -652,28 +661,32 @@ void simplecpp::TokenList::lineDirective(unsigned int fileIndex, unsigned int li
 
 static const std::string COMMENT_END("*/");
 
-void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename, OutputList *outputList)
+void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename, const DUI &dui, OutputList *outputList)
 {
-    std::stack<simplecpp::Location> loc;
-
     unsigned int multiline = 0U;
+    bool trailing_nl = true;
 
     const Token *oldLastToken = nullptr;
 
+    const cstd_t cstd = getCStd(dui.std);
+    const cppstd_t cppstd = getCppStd(dui.std);
+
     Location location(fileIndex(filename), 1, 1);
     while (stream.good()) {
         unsigned char ch = stream.readChar();
         if (!stream.good())
             break;
 
+        trailing_nl = false;
+
         if (ch >= 0x80) {
             if (outputList) {
-                simplecpp::Output err = {
+                simplecpp::Output err{
                     simplecpp::Output::UNHANDLED_CHAR_ERROR,
                     location,
                     "The code contains unhandled character(s) (character code=" + std::to_string(static_cast<int>(ch)) + "). Neither unicode nor extended ascii is supported."
                 };
-                outputList->push_back(std::move(err));
+                outputList->emplace_back(std::move(err));
             }
             clear();
             return;
@@ -688,65 +701,105 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
             } else {
                 location.line += multiline + 1;
                 multiline = 0U;
+                trailing_nl = true;
             }
             if (!multiline)
                 location.col = 1;
 
             if (oldLastToken != cback()) {
                 oldLastToken = cback();
-                const Token * const llTok = isLastLinePreprocessor();
-                if (!llTok)
+
+                // #line 3
+                // #line 3 "file.c"
+                // #3
+                // #3 "file.c"
+                const Token * ppTok = isLastLinePreprocessor();
+                if (!ppTok)
                     continue;
-                const Token * const llNextToken = llTok->next;
-                if (!llTok->next)
+
+                const auto advanceAndSkipComments = [](const Token* tok) {
+                    do {
+                        tok = tok->next;
+                    } while (tok && tok->comment);
+                    return tok;
+                };
+
+                // skip #
+                ppTok = advanceAndSkipComments(ppTok);
+                if (!ppTok)
                     continue;
-                if (llNextToken->next) {
-                    // #file "file.c"
-                    if (llNextToken->str() == "file" &&
-                        llNextToken->next->str()[0] == '\"')
-                    {
-                        const Token *strtok = cback();
-                        while (strtok->comment)
-                            strtok = strtok->previous;
-                        loc.push(location);
-                        location.fileIndex = fileIndex(strtok->str().substr(1U, strtok->str().size() - 2U));
-                        location.line = 1U;
-                    }
-                    // TODO: add support for "# 3"
-                    // #3 "file.c"
-                    // #line 3 "file.c"
-                    else if ((llNextToken->number &&
-                              llNextToken->next->str()[0] == '\"') ||
-                             (llNextToken->str() == "line" &&
-                              llNextToken->next->number &&
-                              llNextToken->next->next &&
-                              llNextToken->next->next->str()[0] == '\"'))
-                    {
-                        const Token *strtok = cback();
-                        while (strtok->comment)
-                            strtok = strtok->previous;
-                        const Token *numtok = strtok->previous;
-                        while (numtok->comment)
-                            numtok = numtok->previous;
-                        lineDirective(fileIndex(replaceAll(strtok->str().substr(1U, strtok->str().size() - 2U),"\\\\","\\")),
-                                      std::atol(numtok->str().c_str()), location);
-                    }
-                    // #line 3
-                    else if (llNextToken->str() == "line" &&
-                             llNextToken->next->number)
-                    {
-                        const Token *numtok = cback();
-                        while (numtok->comment)
-                            numtok = numtok->previous;
-                        lineDirective(location.fileIndex, std::atol(numtok->str().c_str()), location);
+
+                if (ppTok->str() == "line")
+                    ppTok = advanceAndSkipComments(ppTok);
+
+                if (ppTok && (ppTok->str()[0] == '-' || ppTok->str()[0] == '+')) {
+                    if (outputList) {
+                        simplecpp::Output err{
+                            simplecpp::Output::SYNTAX_ERROR,
+                            location,
+                            "Invalid character in line directive: '" + ppTok->str() + "'."
+                        };
+                        outputList->emplace_back(std::move(err));
                     }
+                    clear();
+                    return;
+                }
+
+                if (!ppTok || !ppTok->number)
+                    continue;
+
+                constexpr unsigned long line_limit = std::numeric_limits<decltype(Location::line)>::max();
+                unsigned long line;
+                try {
+                    line = std::min(line_limit, std::stoul(ppTok->str()));
+                } catch (...) {
+                    line = line_limit;
                 }
-                // #endfile
-                else if (llNextToken->str() == "endfile" && !loc.empty())
-                {
-                    location = loc.top();
-                    loc.pop();
+
+                unsigned long maxline;
+                if ((cstd != CUnknown && cstd < C99) || (cppstd != CPPUnknown && cppstd < CPP11))
+                    maxline = 32767;
+                else
+                    maxline = 2147483647;
+
+                if (line == 0 || line > maxline) {
+                    if (outputList) {
+                        const bool unknown_std = cstd == CUnknown && cppstd == CPPUnknown;
+                        std::string msg = "Line number out of range: " + ppTok->str() + ". ";
+                        if (line == 0) {
+                            msg += "Line number zero is undefined behavior.";
+                        } else {
+                            msg += "Line numbers above " + std::to_string(maxline) + " are ";
+                            if (unknown_std)
+                                msg += "undefined behavior or conditionally supported";
+                            else if (cppstd >= CPP26)
+                                msg += "conditionally supported";
+                            else
+                                msg += "undefined behavior";
+                            if (cstd != CUnknown)
+                                msg += std::string(" in ") + getCStdName(cstd);
+                            else if (cppstd != CPPUnknown)
+                                msg += std::string(" in ") + getCppStdName(cppstd);
+                            msg += ".";
+                        }
+                        simplecpp::Output err{
+                            simplecpp::Output::PORTABILITY_LINE_DIRECTIVE,
+                            location, msg
+                        };
+                        outputList->emplace_back(std::move(err));
+                    }
                 }
+
+                ppTok = advanceAndSkipComments(ppTok);
+
+                unsigned int fileindex;
+
+                if (ppTok && ppTok->str()[0] == '\"')
+                    fileindex = fileIndex(replaceAll(ppTok->str().substr(1U, ppTok->str().size() - 2U),"\\\\","\\"));
+                else
+                    fileindex = location.fileIndex;
+
+                lineDirective(fileindex, line, location);
             }
 
             continue;
@@ -769,8 +822,21 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
                     ch = stream.readChar();
                 }
                 stream.ungetChar();
-                push_back(new Token(currentToken, location));
-                location.adjust(currentToken);
+                std::string::size_type pos = 0;
+                unsigned int spliced = 0;
+                while ((pos = currentToken.find('\\', pos)) != std::string::npos) {
+                    if (pos + 1 < currentToken.size() && currentToken[pos + 1] == '\n') {
+                        currentToken.erase(pos, 2);
+                        ++spliced;
+                    } else {
+                        ++pos;
+                    }
+                }
+                if (!currentToken.empty()) {
+                    push_back(new Token(currentToken, location));
+                    location.adjust(currentToken);
+                }
+                location.line += spliced;
                 continue;
             }
         }
@@ -870,12 +936,12 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
                 }
                 if (!stream.good() || ch == '\n') {
                     if (outputList) {
-                        Output err = {
+                        Output err{
                             Output::SYNTAX_ERROR,
                             location,
                             "Invalid newline in raw string delimiter."
                         };
-                        outputList->push_back(std::move(err));
+                        outputList->emplace_back(std::move(err));
                     }
                     return;
                 }
@@ -884,12 +950,12 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
                     currentToken += stream.readChar();
                 if (!endsWith(currentToken, endOfRawString)) {
                     if (outputList) {
-                        Output err = {
+                        Output err{
                             Output::SYNTAX_ERROR,
                             location,
                             "Raw string missing terminating delimiter."
                         };
-                        outputList->push_back(std::move(err));
+                        outputList->emplace_back(std::move(err));
                     }
                     return;
                 }
@@ -958,6 +1024,15 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
             location.adjust(currentToken);
     }
 
+    if ((cstd != CUnknown || cppstd == CPPUnknown) && !trailing_nl && outputList) {
+        Output err{
+            Output::PORTABILITY_NO_EOF_NEWLINE,
+            location,
+            "No newline at end of file is undefined behavior in C."
+        };
+        outputList->emplace_back(std::move(err));
+    }
+
     combineOperators();
 }
 
@@ -1004,10 +1079,17 @@ static bool isFloatSuffix(const simplecpp::Token *tok)
     return c == 'f' || c == 'l';
 }
 
+static const std::string AND("and");
+static const std::string BITAND("bitand");
+static const std::string BITOR("bitor");
+static bool isAlternativeAndBitandBitor(const simplecpp::Token* tok)
+{
+    return isAlternativeBinaryOp(tok, AND) || isAlternativeBinaryOp(tok, BITAND) || isAlternativeBinaryOp(tok, BITOR);
+}
+
 void simplecpp::TokenList::combineOperators()
 {
-    std::stack<bool> executableScope;
-    executableScope.push(false);
+    std::stack<bool, std::vector<bool>> executableScope{{false}};
     for (Token *tok = front(); tok; tok = tok->next) {
         if (tok->op == '{') {
             if (executableScope.top()) {
@@ -1015,7 +1097,7 @@ void simplecpp::TokenList::combineOperators()
                 continue;
             }
             const Token *prev = tok->previous;
-            while (prev && prev->isOneOf(";{}()"))
+            while (prev && prev->isOneOf(";{}("))
                 prev = prev->previous;
             executableScope.push(prev && prev->op == ')');
             continue;
@@ -1039,7 +1121,7 @@ void simplecpp::TokenList::combineOperators()
             if (tok->previous && tok->previous->number && sameline(tok->previous, tok) && tok->previous->str().find_first_of("._") == std::string::npos) {
                 tok->setstr(tok->previous->str() + '.');
                 deleteToken(tok->previous);
-                if (sameline(tok, tok->next) && (isFloatSuffix(tok->next) || (tok->next && tok->next->startsWithOneOf("AaBbCcDdEeFfPp")))) {
+                if (sameline(tok, tok->next) && (isFloatSuffix(tok->next) || (tok->next && tok->next->startsWithOneOf("AaBbCcDdEeFfPp") && !isAlternativeAndBitandBitor(tok->next)))) {
                     tok->setstr(tok->str() + tok->next->str());
                     deleteToken(tok->next);
                 }
@@ -1178,8 +1260,9 @@ void simplecpp::TokenList::constFoldMulDivRem(Token *tok)
             continue;
 
         long long result;
-        if (tok->op == '*')
+        if (tok->op == '*') {
             result = (stringToLL(tok->previous->str()) * stringToLL(tok->next->str()));
+        }
         else if (tok->op == '/' || tok->op == '%') {
             const long long rhs = stringToLL(tok->next->str());
             if (rhs == 0)
@@ -1191,8 +1274,9 @@ void simplecpp::TokenList::constFoldMulDivRem(Token *tok)
                 result = (lhs / rhs);
             else
                 result = (lhs % rhs);
-        } else
+        } else {
             continue;
+        }
 
         tok = tok->previous;
         tok->setstr(toString(result));
@@ -1284,8 +1368,6 @@ void simplecpp::TokenList::constFoldComparison(Token *tok)
     }
 }
 
-static const std::string BITAND("bitand");
-static const std::string BITOR("bitor");
 static const std::string XOR("xor");
 void simplecpp::TokenList::constFoldBitwise(Token *tok)
 {
@@ -1320,7 +1402,6 @@ void simplecpp::TokenList::constFoldBitwise(Token *tok)
     }
 }
 
-static const std::string AND("and");
 static const std::string OR("or");
 void simplecpp::TokenList::constFoldLogicalOp(Token *tok)
 {
@@ -1416,8 +1497,9 @@ std::string simplecpp::TokenList::readUntil(Stream &stream, const Location &loca
                     ret.erase(ret.size()-1U);
                     backslash = (next == '\r');
                     update_ch = false;
-                } else if (next == '\\')
+                } else if (next == '\\') {
                     update_ch = !update_ch;
+                }
                 ret += next;
             } while (next == '\\');
             if (update_ch)
@@ -1428,12 +1510,12 @@ std::string simplecpp::TokenList::readUntil(Stream &stream, const Location &loca
     if (!stream.good() || ch != end) {
         clear();
         if (outputList) {
-            Output err = {
+            Output err{
                 Output::SYNTAX_ERROR,
                 location,
                 std::string("No pair for character (") + start + "). Can't process file. File is either invalid or unicode, which is currently not supported."
             };
-            outputList->push_back(std::move(err));
+            outputList->emplace_back(std::move(err));
         }
         return "";
     }
@@ -1471,7 +1553,7 @@ unsigned int simplecpp::TokenList::fileIndex(const std::string &filename)
         if (files[i] == filename)
             return i;
     }
-    files.push_back(filename);
+    files.emplace_back(filename);
     return files.size() - 1U;
 }
 
@@ -1513,7 +1595,7 @@ namespace simplecpp {
          * @throws std::runtime_error thrown on bad macro syntax
          */
         Macro(const std::string &name, const std::string &value, std::vector<std::string> &f) : nameTokDef(nullptr), files(f), tokenListDefine(f), valueDefinedInCode_(false) {
-            const std::string def(name + ' ' + value);
+            const std::string def(name + ' ' + value + '\n');
             StdCharBufStream stream(reinterpret_cast<const unsigned char*>(def.data()), def.size());
             tokenListDefine.readfile(stream);
             if (!parseDefine(tokenListDefine.cfront()))
@@ -1538,8 +1620,9 @@ namespace simplecpp {
             if (this != &other) {
                 files = other.files;
                 valueDefinedInCode_ = other.valueDefinedInCode_;
-                if (other.tokenListDefine.empty())
+                if (other.tokenListDefine.empty()) {
                     parseDefine(other.nameTokDef);
+                }
                 else {
                     tokenListDefine = other.tokenListDefine;
                     parseDefine(tokenListDefine.cfront());
@@ -1591,7 +1674,7 @@ namespace simplecpp {
                     else if (rawtok->op == ')')
                         --par;
                     else if (rawtok->op == '#' && !sameline(rawtok->previous, rawtok))
-                        throw Error(rawtok->location, "it is invalid to use a preprocessor directive as macro parameter");
+                        throw invalidDirectiveAsMacroParameter(rawtok->location);
                     rawtokens2.push_back(new Token(rawtok->str(), rawtok1->location, rawtok->whitespaceahead));
                     rawtok = rawtok->next;
                 }
@@ -1608,21 +1691,23 @@ namespace simplecpp {
                         if (par==0)
                             break;
                         --par;
-                    } else if (macro2tok->op == ')')
+                    } else if (macro2tok->op == ')') {
                         ++par;
+                    }
                     macro2tok = macro2tok->previous;
                 }
                 if (macro2tok) { // macro2tok->op == '('
                     macro2tok = macro2tok->previous;
                     expandedmacros.insert(name());
-                } else if (rawtok->op == '(')
+                } else if (rawtok->op == '(') {
                     macro2tok = output2.back();
+                }
                 if (!macro2tok || !macro2tok->name)
                     break;
                 if (output2.cfront() != output2.cback() && macro2tok->str() == this->name())
                     break;
                 const MacroMap::const_iterator macro = macros.find(macro2tok->str());
-                if (macro == macros.end() || !macro->second.functionLike())
+                if (macro == macros.end() || !macro->second.functionLike() || macro2tok->isExpandedFrom(&macro->second))
                     break;
                 TokenList rawtokens2(inputFiles);
                 const Location loc(macro2tok->location);
@@ -1636,8 +1721,9 @@ namespace simplecpp {
                 const Token *rawtok2 = rawtok;
                 for (; rawtok2; rawtok2 = rawtok2->next) {
                     rawtokens2.push_back(new Token(rawtok2->str(), loc));
-                    if (rawtok2->op == '(')
+                    if (rawtok2->op == '(') {
                         ++par;
+                    }
                     else if (rawtok2->op == ')') {
                         if (par <= 1U)
                             break;
@@ -1684,6 +1770,11 @@ namespace simplecpp {
             const std::string what;
         };
 
+        struct invalidDirectiveAsMacroParameter : public Error {
+            explicit invalidDirectiveAsMacroParameter(const Location &loc)
+                : Error(loc, "it is invalid to use a preprocessor directive as macro parameter") {}
+        };
+
         /** Struct that is thrown when macro is expanded with wrong number of parameters */
         struct wrongNumberOfParameters : public Error {
             wrongNumberOfParameters(const Location &loc, const std::string &macroName) : Error(loc, "Wrong number of parameters for macro \'" + macroName + "\'.") {}
@@ -1699,19 +1790,19 @@ namespace simplecpp {
                 : Error(loc, format(macroName, message)) {}
 
             static inline invalidHashHash unexpectedToken(const Location &loc, const std::string &macroName, const Token *tokenA) {
-                return invalidHashHash(loc, macroName, "Unexpected token '"+ tokenA->str()+"'");
+                return {loc, macroName, "Unexpected token '"+ tokenA->str()+"'"};
             }
 
             static inline invalidHashHash cannotCombine(const Location &loc, const std::string &macroName, const Token *tokenA, const Token *tokenB) {
-                return invalidHashHash(loc, macroName, "Combining '"+ tokenA->str()+ "' and '"+ tokenB->str() + "' yields an invalid token.");
+                return {loc, macroName, "Combining '"+ tokenA->str()+ "' and '"+ tokenB->str() + "' yields an invalid token."};
             }
 
             static inline invalidHashHash unexpectedNewline(const Location &loc, const std::string &macroName) {
-                return invalidHashHash(loc, macroName, "Unexpected newline");
+                return {loc, macroName, "Unexpected newline"};
             }
 
             static inline invalidHashHash universalCharacterUB(const Location &loc, const std::string &macroName, const Token* tokenA, const std::string& strAB) {
-                return invalidHashHash(loc, macroName, "Combining '\\"+ tokenA->str()+ "' and '"+ strAB.substr(tokenA->str().size()) + "' yields universal character '\\" + strAB + "'. This is undefined behavior according to C standard chapter 5.1.1.2, paragraph 4.");
+                return {loc, macroName, "Combining '\\"+ tokenA->str()+ "' and '"+ strAB.substr(tokenA->str().size()) + "' yields universal character '\\" + strAB + "'. This is undefined behavior according to C standard chapter 5.1.1.2, paragraph 4."};
             }
         };
     private:
@@ -1725,6 +1816,9 @@ namespace simplecpp {
             return tok;
         }
 
+        /**
+         * @throws Error thrown in case of __VA_OPT__ issues
+         */
         bool parseDefine(const Token *nametoken) {
             nameTokDef = nametoken;
             variadic = false;
@@ -1753,7 +1847,7 @@ namespace simplecpp {
                         break;
                     }
                     if (argtok->op != ',')
-                        args.push_back(argtok->str());
+                        args.emplace_back(argtok->str());
                     argtok = argtok->next;
                 }
                 if (!sameline(nametoken, argtok)) {
@@ -1828,22 +1922,24 @@ namespace simplecpp {
 
         std::vector<const Token *> getMacroParameters(const Token *nameTokInst, bool calledInDefine) const {
             if (!nameTokInst->next || nameTokInst->next->op != '(' || !functionLike())
-                return std::vector<const Token *>();
+                return {};
 
             std::vector<const Token *> parametertokens;
-            parametertokens.push_back(nameTokInst->next);
+            parametertokens.emplace_back(nameTokInst->next);
             unsigned int par = 0U;
             for (const Token *tok = nameTokInst->next->next; calledInDefine ? sameline(tok, nameTokInst) : (tok != nullptr); tok = tok->next) {
-                if (tok->op == '(')
+                if (tok->op == '(') {
                     ++par;
+                }
                 else if (tok->op == ')') {
                     if (par == 0U) {
-                        parametertokens.push_back(tok);
+                        parametertokens.emplace_back(tok);
                         break;
                     }
                     --par;
-                } else if (par == 0U && tok->op == ',' && (!variadic || parametertokens.size() < args.size()))
-                    parametertokens.push_back(tok);
+                } else if (par == 0U && tok->op == ',' && (!variadic || parametertokens.size() < args.size())) {
+                    parametertokens.emplace_back(tok);
+                }
             }
             return parametertokens;
         }
@@ -1871,8 +1967,9 @@ namespace simplecpp {
                             tokens.back()->macro = name();
                     }
 
-                    if (tok->op == '(')
+                    if (tok->op == '(') {
                         ++par;
+                    }
                     else if (tok->op == ')') {
                         --par;
                         if (par == 0U)
@@ -1893,18 +1990,21 @@ namespace simplecpp {
             std::cout << "  expand " << name() << " " << locstring(defineLocation()) << std::endl;
 #endif
 
-            usageList.push_back(loc);
+            usageList.emplace_back(loc);
 
             if (nameTokInst->str() == "__FILE__") {
                 output.push_back(new Token('\"'+output.file(loc)+'\"', loc));
+                output.back()->macro = "__FILE__";
                 return nameTokInst->next;
             }
             if (nameTokInst->str() == "__LINE__") {
                 output.push_back(new Token(toString(loc.line), loc));
+                output.back()->macro = "__LINE__";
                 return nameTokInst->next;
             }
             if (nameTokInst->str() == "__COUNTER__") {
                 output.push_back(new Token(toString(usageList.size()-1U), loc));
+                output.back()->macro = "__COUNTER__";
                 return nameTokInst->next;
             }
 
@@ -1945,19 +2045,20 @@ namespace simplecpp {
 
                 const MacroMap::const_iterator m = macros.find("__COUNTER__");
 
-                if (!counter || m == macros.end())
+                if (!counter || m == macros.end()) {
                     parametertokens2.swap(parametertokens1);
+                }
                 else {
                     const Macro &counterMacro = m->second;
                     unsigned int par = 0;
                     for (const Token *tok = parametertokens1[0]; tok && par < parametertokens1.size(); tok = tok->next) {
                         if (tok->str() == "__COUNTER__") {
                             tokensparams.push_back(new Token(toString(counterMacro.usageList.size()), tok->location));
-                            counterMacro.usageList.push_back(tok->location);
+                            counterMacro.usageList.emplace_back(tok->location);
                         } else {
                             tokensparams.push_back(new Token(*tok));
                             if (tok == parametertokens1[par]) {
-                                parametertokens2.push_back(tokensparams.cback());
+                                parametertokens2.emplace_back(tokensparams.cback());
                                 par++;
                             }
                         }
@@ -2063,39 +2164,37 @@ namespace simplecpp {
             return functionLike() ? parametertokens2.back()->next : nameTokInst->next;
         }
 
-        const Token *recursiveExpandToken(TokenList &output, TokenList &temp, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
-            if (!temp.cback() || !temp.cback()->name || !tok->next || tok->next->op != '(') {
-                output.takeTokens(temp);
-                return tok->next;
-            }
-
-            if (!sameline(tok, tok->next)) {
-                output.takeTokens(temp);
-                return tok->next;
-            }
-
+        /** Returns the macro to expand when the last token of @p temp is the name of a
+         *  function-like macro and the tokens after @p tok supply its arguments; nullptr otherwise */
+        static const Macro *rescanMacro(const TokenList &temp, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros) {
+            if (!temp.cback() || !temp.cback()->name || !sameline(tok, tok->next) || tok->next->op != '(')
+                return nullptr;
             const MacroMap::const_iterator it = macros.find(temp.cback()->str());
-            if (it == macros.end() || expandedmacros.find(temp.cback()->str()) != expandedmacros.end()) {
-                output.takeTokens(temp);
-                return tok->next;
-            }
+            if (it == macros.end() || expandedmacros.find(temp.cback()->str()) != expandedmacros.end())
+                return nullptr;
+            if (!it->second.functionLike() || temp.cback()->isExpandedFrom(&it->second))
+                return nullptr;
+            return &it->second;
+        }
 
-            const Macro &calledMacro = it->second;
-            if (!calledMacro.functionLike()) {
+        const Token *recursiveExpandToken(TokenList &output, TokenList &temp, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
+            // Expand while the expansion result ends with the name of a function-like
+            // macro whose arguments are supplied by the tokens that follow it. Each round
+            // consumes that macro call from the token stream, so tok always advances.
+            while (const Macro * const calledMacro = rescanMacro(temp, tok, macros, expandedmacros)) {
+                TokenList temp2(files);
+                temp2.push_back(new Token(temp.cback()->str(), tok->location));
+
+                const Token * const tok2 = appendTokens(temp2, loc, tok->next, macros, expandedmacros, parametertokens);
+                if (!tok2)
+                    break;
                 output.takeTokens(temp);
-                return tok->next;
+                output.deleteToken(output.back());
+                calledMacro->expand(temp, loc, temp2.cfront(), macros, expandedmacros);
+                tok = tok2;
             }
-
-            TokenList temp2(files);
-            temp2.push_back(new Token(temp.cback()->str(), tok->location));
-
-            const Token * const tok2 = appendTokens(temp2, loc, tok->next, macros, expandedmacros, parametertokens);
-            if (!tok2)
-                return tok->next;
             output.takeTokens(temp);
-            output.deleteToken(output.back());
-            calledMacro.expand(output, loc, temp2.cfront(), macros, expandedmacros);
-            return tok2->next;
+            return tok->next;
         }
 
         const Token *expandToken(TokenList &output, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
@@ -2135,8 +2234,9 @@ namespace simplecpp {
                 TokenList tokens(files);
                 tokens.push_back(new Token(*tok));
                 const Token * tok2 = nullptr;
-                if (tok->next->op == '(')
+                if (tok->next->op == '(') {
                     tok2 = appendTokens(tokens, loc, tok->next, macros, expandedmacros, parametertokens);
+                }
                 else if (expandArg(tokens, tok->next, loc, macros, expandedmacros, parametertokens)) {
                     tokens.front()->location = loc;
                     if (tokens.cfront()->next && tokens.cfront()->next->op == '(')
@@ -2182,6 +2282,8 @@ namespace simplecpp {
             }
 
             output.push_back(newMacroToken(tok->str(), loc, true, tok));
+            if (it != macros.end())
+                output.back()->markExpandedFrom(&it->second);
             return tok->next;
         }
 
@@ -2274,7 +2376,7 @@ namespace simplecpp {
                 throw invalidHashHash::unexpectedNewline(tok->location, name());
 
             const bool canBeConcatenatedWithEqual = A->isOneOf("+-*/%&|^") || A->str() == "<<" || A->str() == ">>";
-            const bool canBeConcatenatedStringOrChar = isStringLiteral_(A->str()) || isCharLiteral_(A->str());
+            const bool canBeConcatenatedStringOrChar = isStringLiteral(A->str()) || isCharLiteral(A->str());
             const bool unexpectedA = (!A->name && !A->number && !A->str().empty() && !canBeConcatenatedWithEqual && !canBeConcatenatedStringOrChar);
 
             const Token * const B = tok->next->next;
@@ -2293,9 +2395,6 @@ namespace simplecpp {
             const Token *nextTok = B->next;
 
             if (canBeConcatenatedStringOrChar) {
-                if (unexpectedA)
-                    throw invalidHashHash::unexpectedToken(tok->location, name(), A);
-
                 // It seems clearer to handle this case separately even though the code is similar-ish, but we don't want to merge here.
                 // TODO The question is whether the ## or varargs may still apply, and how to provoke?
                 if (expandArg(tokensB, B, parametertokens)) {
@@ -2312,12 +2411,15 @@ namespace simplecpp {
                 const bool varargs = variadic && !args.empty() && B->str() == args[args.size()-1U];
 
                 if (expandArg(tokensB, B, parametertokens)) {
-                    if (tokensB.empty())
+                    if (tokensB.empty()) {
                         strAB = A->str();
-                    else if (varargs && A->op == ',')
+                    }
+                    else if (varargs && A->op == ',') {
                         strAB = ",";
-                    else if (varargs && unexpectedA)
+                    }
+                    else if (varargs && unexpectedA) {
                         throw invalidHashHash::unexpectedToken(tok->location, name(), A);
+                    }
                     else {
                         strAB = A->str() + tokensB.cfront()->str();
                         tokensB.deleteToken(tokensB.front());
@@ -2336,8 +2438,9 @@ namespace simplecpp {
                         throw invalidHashHash::universalCharacterUB(tok->location, name(), A, strAB);
                 }
 
-                if (varargs && tokensB.empty() && tok->previous->str() == ",")
+                if (varargs && tokensB.empty() && tok->previous->str() == ",") {
                     output.deleteToken(A);
+                }
                 else if (strAB != "," && macros.find(strAB) == macros.end()) {
                     A->setstr(strAB);
                     for (Token *b = tokensB.front(); b; b = b->next)
@@ -2691,7 +2794,7 @@ static void simplifyName(simplecpp::TokenList &expr)
 {
     for (simplecpp::Token *tok = expr.front(); tok; tok = tok->next) {
         if (tok->name) {
-            static const std::set<std::string> altop = {"and","or","bitand","bitor","compl","not","not_eq","xor"};
+            static const std::set<std::string> altop{"and","or","bitand","bitor","compl","not","not_eq","xor"};
             if (altop.find(tok->str()) != altop.end()) {
                 bool alt;
                 if (tok->str() == "not" || tok->str() == "compl") {
@@ -2755,8 +2858,9 @@ long long simplecpp::characterLiteralToLL(const std::string& str)
         pos = 3;
     } else if (str.size() >= 2 && (str[0] == 'L' || str[0] == 'U') && str[1] == '\'') {
         pos = 2;
-    } else
+    } else {
         throw std::runtime_error("expected a character literal");
+    }
 
     unsigned long long multivalue = 0;
 
@@ -2956,6 +3060,7 @@ static void simplifyComments(simplecpp::TokenList &expr)
 /**
  * @throws std::runtime_error thrown on invalid literals, missing sizeof arguments or invalid expressions,
  * missing __has_include() arguments or expressions, undefined function-like macros, invalid number literals
+ * @throws std::overflow_error thrown on overflow or division by zero
  */
 static long long evaluate(simplecpp::TokenList &expr, const simplecpp::DUI &dui, const std::map<std::string, std::size_t> &sizeOfType)
 {
@@ -3045,6 +3150,65 @@ static std::string openHeader(std::ifstream &f, const simplecpp::DUI &dui, const
     return "";
 }
 
+namespace {
+    struct FileID {
+#ifdef _WIN32
+        struct {
+            std::uint64_t VolumeSerialNumber;
+            struct {
+                std::uint64_t IdentifierHi;
+                std::uint64_t IdentifierLo;
+            } FileId;
+        } fileIdInfo;
+
+        bool operator==(const FileID &that) const noexcept {
+            return fileIdInfo.VolumeSerialNumber == that.fileIdInfo.VolumeSerialNumber &&
+                   fileIdInfo.FileId.IdentifierHi == that.fileIdInfo.FileId.IdentifierHi &&
+                   fileIdInfo.FileId.IdentifierLo == that.fileIdInfo.FileId.IdentifierLo;
+        }
+#else
+        dev_t dev;
+        ino_t ino;
+
+        bool operator==(const FileID& that) const noexcept {
+            return dev == that.dev && ino == that.ino;
+        }
+#endif
+        struct Hasher {
+            std::size_t operator()(const FileID &id) const {
+#ifdef _WIN32
+                return static_cast<std::size_t>(id.fileIdInfo.FileId.IdentifierHi ^ id.fileIdInfo.FileId.IdentifierLo ^
+                                                id.fileIdInfo.VolumeSerialNumber);
+#else
+                return static_cast<std::size_t>(id.dev) ^ static_cast<std::size_t>(id.ino);
+#endif
+            }
+        };
+    };
+}
+
+struct simplecpp::FileDataCache::Impl
+{
+    void clear()
+    {
+        mIdMap.clear();
+    }
+
+    using id_map_type = std::unordered_map<FileID, FileData *, FileID::Hasher>;
+
+    id_map_type mIdMap;
+};
+
+simplecpp::FileDataCache::FileDataCache()
+    : mImpl(new Impl)
+{}
+
+simplecpp::FileDataCache::~FileDataCache() = default;
+simplecpp::FileDataCache::FileDataCache(FileDataCache &&) SIMPLECPP_NOEXCEPT = default;
+simplecpp::FileDataCache &simplecpp::FileDataCache::operator=(simplecpp::FileDataCache &&) SIMPLECPP_NOEXCEPT = default;
+
+static bool getFileId(const std::string &path, FileID &id);
+
 std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::tryload(FileDataCache::name_map_type::iterator &name_it, const simplecpp::DUI &dui, std::vector<std::string> &filenames, simplecpp::OutputList *outputList)
 {
     const std::string &path = name_it->first;
@@ -3053,25 +3217,25 @@ std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::tryload(FileDat
     if (!getFileId(path, fileId))
         return {nullptr, false};
 
-    const auto id_it = mIdMap.find(fileId);
-    if (id_it != mIdMap.end()) {
+    const auto id_it = mImpl->mIdMap.find(fileId);
+    if (id_it != mImpl->mIdMap.end()) {
         name_it->second = id_it->second;
         return {id_it->second, false};
     }
 
-    auto *const data = new FileData {path, TokenList(path, filenames, outputList)};
+    auto *const data = new FileData {path, TokenList(path, filenames, {}, outputList)};
 
     if (dui.removeComments)
         data->tokens.removeComments();
 
     name_it->second = data;
-    mIdMap.emplace(fileId, data);
+    mImpl->mIdMap.emplace(fileId, data);
     mData.emplace_back(data);
 
     return {data, true};
 }
 
-std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::get(const std::string &sourcefile, const std::string &header, const simplecpp::DUI &dui, bool systemheader, std::vector<std::string> &filenames, simplecpp::OutputList *outputList)
+std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::get_private(const std::string &sourcefile, const std::string &header, const simplecpp::DUI &dui, bool systemheader, std::vector<std::string> &filenames, simplecpp::OutputList *outputList)
 {
     if (isAbsolutePath(header)) {
         auto ins = mNameMap.emplace(simplecpp::simplifyPath(header), nullptr);
@@ -3117,10 +3281,27 @@ std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::get(const std::
     return {nullptr, false};
 }
 
-bool simplecpp::FileDataCache::getFileId(const std::string &path, FileID &id)
+std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::get(const std::string &sourcefile, const std::string &header, const simplecpp::DUI &dui, bool systemheader, std::vector<std::string> &filenames, simplecpp::OutputList *outputList)
+{
+    auto ret = get_private(sourcefile, header, dui, systemheader, filenames, outputList);
+
+    if (mLoadCallback && ret.first)
+        mLoadCallback(*ret.first, ret.second);
+
+    return ret;
+}
+
+void simplecpp::FileDataCache::clear()
+{
+    mImpl->clear();
+    mNameMap.clear();
+    mData.clear();
+}
+
+static bool getFileId(const std::string &path, FileID &id)
 {
 #ifdef _WIN32
-    HANDLE hFile = CreateFileA(path.c_str(), 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    HANDLE hFile = CreateFileA(path.c_str(), 0, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 
     if (hFile == INVALID_HANDLE_VALUE)
         return false;
@@ -3176,12 +3357,12 @@ simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens,
 
         if (filedata == nullptr) {
             if (outputList) {
-                simplecpp::Output err = {
+                simplecpp::Output err{
                     simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND,
                     {},
                     "Can not open include file '" + filename + "' that is explicitly included."
                 };
-                outputList->push_back(std::move(err));
+                outputList->emplace_back(std::move(err));
             }
             continue;
         }
@@ -3195,7 +3376,7 @@ simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens,
         if (dui.removeComments)
             filedata->tokens.removeComments();
 
-        filelist.push_back(filedata->tokens.front());
+        filelist.emplace_back(filedata->tokens.front());
     }
 
     for (const Token *rawtok = rawtokens.cfront(); rawtok || !filelist.empty(); rawtok = rawtok ? rawtok->next : nullptr) {
@@ -3234,13 +3415,13 @@ simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens,
         if (dui.removeComments)
             filedata->tokens.removeComments();
 
-        filelist.push_back(filedata->tokens.front());
+        filelist.emplace_back(filedata->tokens.front());
     }
 
     return cache;
 }
 
-static bool preprocessToken(simplecpp::TokenList &output, const simplecpp::Token *&tok1, simplecpp::MacroMap &macros, std::vector<std::string> &files, simplecpp::OutputList *outputList)
+static bool preprocessToken(simplecpp::TokenList &output, const simplecpp::Token *&tok1, simplecpp::MacroMap &macros, std::vector<std::string> &files, simplecpp::OutputList *outputList, const simplecpp::DUI &dui)
 {
     const simplecpp::Token * const tok = tok1;
     const simplecpp::MacroMap::const_iterator it = tok->name ? macros.find(tok->str()) : macros.end();
@@ -3248,20 +3429,30 @@ static bool preprocessToken(simplecpp::TokenList &output, const simplecpp::Token
         simplecpp::TokenList value(files);
         try {
             tok1 = it->second.expand(value, tok, macros, files);
+        } catch (const simplecpp::Macro::invalidDirectiveAsMacroParameter &err) {
+            if (outputList) {
+                simplecpp::Output out{
+                    simplecpp::Output::DIRECTIVE_AS_MACRO_PARAMETER,
+                    err.location,
+                    "failed to expand \'" + tok->str() + "\', " + err.what
+                };
+                outputList->emplace_back(std::move(out));
+            }
+            return false;
         } catch (const simplecpp::Macro::Error &err) {
             if (outputList) {
-                simplecpp::Output out = {
+                simplecpp::Output out{
                     simplecpp::Output::SYNTAX_ERROR,
                     err.location,
                     "failed to expand \'" + tok->str() + "\', " + err.what
                 };
-                outputList->push_back(std::move(out));
+                outputList->emplace_back(std::move(out));
             }
             return false;
         }
         output.takeTokens(value);
     } else {
-        if (!tok->comment)
+        if (!tok->comment || !dui.removeComments)
             output.push_back(new simplecpp::Token(*tok));
         tok1 = tok->next;
     }
@@ -3304,20 +3495,20 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
     std::map<std::string, std::size_t> sizeOfType(rawtokens.sizeOfType);
     sizeOfType.insert(std::make_pair("char", sizeof(char)));
     sizeOfType.insert(std::make_pair("short", sizeof(short)));
-    sizeOfType.insert(std::make_pair("short int", sizeOfType["short"]));
+    sizeOfType.insert(std::make_pair("short int", sizeof(short)));
     sizeOfType.insert(std::make_pair("int", sizeof(int)));
     sizeOfType.insert(std::make_pair("long", sizeof(long)));
-    sizeOfType.insert(std::make_pair("long int", sizeOfType["long"]));
+    sizeOfType.insert(std::make_pair("long int", sizeof(long)));
     sizeOfType.insert(std::make_pair("long long", sizeof(long long)));
     sizeOfType.insert(std::make_pair("float", sizeof(float)));
     sizeOfType.insert(std::make_pair("double", sizeof(double)));
     sizeOfType.insert(std::make_pair("long double", sizeof(long double)));
     sizeOfType.insert(std::make_pair("char *", sizeof(char *)));
     sizeOfType.insert(std::make_pair("short *", sizeof(short *)));
-    sizeOfType.insert(std::make_pair("short int *", sizeOfType["short *"]));
+    sizeOfType.insert(std::make_pair("short int *", sizeof(short *)));
     sizeOfType.insert(std::make_pair("int *", sizeof(int *)));
     sizeOfType.insert(std::make_pair("long *", sizeof(long *)));
-    sizeOfType.insert(std::make_pair("long int *", sizeOfType["long *"]));
+    sizeOfType.insert(std::make_pair("long int *", sizeof(long *)));
     sizeOfType.insert(std::make_pair("long long *", sizeof(long long *)));
     sizeOfType.insert(std::make_pair("float *", sizeof(float *)));
     sizeOfType.insert(std::make_pair("double *", sizeof(double *)));
@@ -3340,8 +3531,32 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
             continue;
         const std::string lhs(macrostr.substr(0,eq));
         const std::string rhs(eq==std::string::npos ? std::string("1") : macrostr.substr(eq+1));
-        const Macro macro(lhs, rhs, dummy);
-        macros.insert(std::pair<TokenString,Macro>(macro.name(), macro));
+        try {
+            const Macro macro(lhs, rhs, dummy);
+            macros.insert(std::pair<TokenString,Macro>(macro.name(), macro));
+        } catch (const std::runtime_error& e) {
+            if (outputList) {
+                simplecpp::Output err{
+                    Output::DUI_ERROR,
+                    {},
+                    e.what()
+                };
+                outputList->emplace_back(std::move(err));
+            }
+            output.clear();
+            return;
+        } catch (const simplecpp::Macro::Error& e) {
+            if (outputList) {
+                simplecpp::Output err{
+                    Output::DUI_ERROR,
+                    {},
+                    e.what
+                };
+                outputList->emplace_back(std::move(err));
+            }
+            output.clear();
+            return;
+        }
     }
 
     const bool strictAnsiUndefined = dui.undefined.find("__STRICT_ANSI__") != dui.undefined.cend();
@@ -3351,7 +3566,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
     macros.insert(std::make_pair("__FILE__", Macro("__FILE__", "__FILE__", dummy)));
     macros.insert(std::make_pair("__LINE__", Macro("__LINE__", "__LINE__", dummy)));
     macros.insert(std::make_pair("__COUNTER__", Macro("__COUNTER__", "__COUNTER__", dummy)));
-    struct tm ltime = {};
+    struct tm ltime {};
     getLocaltime(ltime);
     macros.insert(std::make_pair("__DATE__", Macro("__DATE__", getDateDefine(&ltime), dummy)));
     macros.insert(std::make_pair("__TIME__", Macro("__TIME__", getTimeDefine(&ltime), dummy)));
@@ -3366,12 +3581,12 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
             const cppstd_t cpp_std = simplecpp::getCppStd(dui.std);
             if (cpp_std == CPPUnknown) {
                 if (outputList) {
-                    simplecpp::Output err = {
+                    simplecpp::Output err{
                         Output::DUI_ERROR,
                         {},
                         "unknown standard specified: '" + dui.std + "'"
                     };
-                    outputList->push_back(std::move(err));
+                    outputList->emplace_back(std::move(err));
                 }
                 output.clear();
                 return;
@@ -3397,8 +3612,19 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
     includetokenstack.push(rawtokens.cfront());
     for (auto it = dui.includes.cbegin(); it != dui.includes.cend(); ++it) {
         const FileData *const filedata = cache.get("", *it, dui, false, files, outputList).first;
-        if (filedata != nullptr && filedata->tokens.cfront() != nullptr)
+        if (filedata == nullptr) {
+            if (outputList) {
+                simplecpp::Output err{
+                    simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND,
+                    {},
+                    "Can not open include file '" + *it + "' that is explicitly included."
+                };
+                outputList->emplace_back(std::move(err));
+            }
+        }
+        else if (filedata->tokens.cfront() != nullptr) {
             includetokenstack.push(filedata->tokens.cfront());
+        }
     }
 
     std::map<std::string, std::list<Location>> maybeUsedMacros;
@@ -3421,14 +3647,16 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                 continue;
             }
 
-            if (ifstates.size() <= 1U && (rawtok->str() == ELIF || rawtok->str() == ELSE || rawtok->str() == ENDIF)) {
+            if (ifstates.size() <= 1U && (rawtok->str() == ELIF || rawtok->str() == ELIFDEF ||
+                                          rawtok->str() == ELIFNDEF || rawtok->str() == ELSE ||
+                                          rawtok->str() == ENDIF)) {
                 if (outputList) {
-                    simplecpp::Output err = {
+                    simplecpp::Output err{
                         Output::SYNTAX_ERROR,
                         rawtok->location,
                         "#" + rawtok->str() + " without #if"
                     };
-                    outputList->push_back(std::move(err));
+                    outputList->emplace_back(std::move(err));
                 }
                 output.clear();
                 return;
@@ -3443,13 +3671,13 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                         msg += tok->str();
                     }
                     msg = '#' + rawtok->str() + ' ' + msg;
-                    simplecpp::Output err = {
+                    simplecpp::Output err{
                         rawtok->str() == ERROR ? Output::ERROR : Output::WARNING,
                         rawtok->location,
                         std::move(msg)
                     };
 
-                    outputList->push_back(std::move(err));
+                    outputList->emplace_back(std::move(err));
                 }
                 if (rawtok->str() == ERROR) {
                     output.clear();
@@ -3469,25 +3697,25 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                         else
                             it->second = macro;
                     }
-                } catch (const std::runtime_error &) {
+                } catch (const std::runtime_error &err) {
                     if (outputList) {
-                        simplecpp::Output err = {
+                        simplecpp::Output out{
                             Output::SYNTAX_ERROR,
                             rawtok->location,
-                            "Failed to parse #define"
+                            std::string("Failed to parse #define, ") + err.what()
                         };
-                        outputList->push_back(std::move(err));
+                        outputList->emplace_back(std::move(out));
                     }
                     output.clear();
                     return;
                 } catch (const simplecpp::Macro::Error &err) {
                     if (outputList) {
-                        simplecpp::Output out = {
+                        simplecpp::Output out{
                             simplecpp::Output::SYNTAX_ERROR,
                             err.location,
                             "Failed to parse #define, " + err.what
                         };
-                        outputList->push_back(std::move(out));
+                        outputList->emplace_back(std::move(out));
                     }
                     output.clear();
                     return;
@@ -3501,7 +3729,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                 TokenList inc2(files);
                 if (!inc1.empty() && inc1.cfront()->name) {
                     const Token *inctok = inc1.cfront();
-                    if (!preprocessToken(inc2, inctok, macros, files, outputList)) {
+                    if (!preprocessToken(inc2, inctok, macros, files, outputList, dui)) {
                         output.clear();
                         return;
                     }
@@ -3523,12 +3751,12 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
 
                 if (inc2.empty() || inc2.cfront()->str().size() <= 2U) {
                     if (outputList) {
-                        simplecpp::Output err = {
+                        simplecpp::Output err{
                             Output::SYNTAX_ERROR,
                             rawtok->location,
                             "No header in #include"
                         };
-                        outputList->push_back(std::move(err));
+                        outputList->emplace_back(std::move(err));
                     }
                     output.clear();
                     return;
@@ -3541,50 +3769,65 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                 const FileData *const filedata = cache.get(rawtokens.file(rawtok->location), header, dui, systemheader, files, outputList).first;
                 if (filedata == nullptr) {
                     if (outputList) {
-                        simplecpp::Output out = {
+                        simplecpp::Output out{
                             simplecpp::Output::MISSING_HEADER,
                             rawtok->location,
                             "Header not found: " + inctok->str()
                         };
-                        outputList->push_back(std::move(out));
+                        outputList->emplace_back(std::move(out));
                     }
                 } else if (includetokenstack.size() >= 400) {
                     if (outputList) {
-                        simplecpp::Output out = {
+                        simplecpp::Output out{
                             simplecpp::Output::INCLUDE_NESTED_TOO_DEEPLY,
                             rawtok->location,
                             "#include nested too deeply"
                         };
-                        outputList->push_back(std::move(out));
+                        outputList->emplace_back(std::move(out));
                     }
                 } else if (pragmaOnce.find(filedata->filename) == pragmaOnce.end()) {
                     includetokenstack.push(gotoNextLine(rawtok));
                     rawtok = filedata->tokens.cfront();
                     continue;
                 }
-            } else if (rawtok->str() == IF || rawtok->str() == IFDEF || rawtok->str() == IFNDEF || rawtok->str() == ELIF) {
+            } else if (rawtok->str() == IF || rawtok->str() == IFDEF || rawtok->str() == IFNDEF || rawtok->str() == ELIF ||
+                       rawtok->str() == ELIFDEF || rawtok->str() == ELIFNDEF) {
                 if (!sameline(rawtok,rawtok->next)) {
                     if (outputList) {
-                        simplecpp::Output out = {
+                        simplecpp::Output out{
                             simplecpp::Output::SYNTAX_ERROR,
                             rawtok->location,
                             "Syntax error in #" + rawtok->str()
                         };
-                        outputList->push_back(std::move(out));
+                        outputList->emplace_back(std::move(out));
                     }
                     output.clear();
                     return;
                 }
 
                 bool conditionIsTrue;
-                if (ifstates.top() == AlwaysFalse || (ifstates.top() == ElseIsTrue && rawtok->str() != ELIF))
+                if (ifstates.top() == AlwaysFalse || (ifstates.top() == ElseIsTrue && rawtok->str() != ELIF &&
+                                                      rawtok->str() != ELIFDEF && rawtok->str() != ELIFNDEF)) {
                     conditionIsTrue = false;
-                else if (rawtok->str() == IFDEF) {
-                    conditionIsTrue = (macros.find(rawtok->next->str()) != macros.end() || (hasInclude && rawtok->next->str() == HAS_INCLUDE));
-                    maybeUsedMacros[rawtok->next->str()].push_back(rawtok->next->location);
-                } else if (rawtok->str() == IFNDEF) {
-                    conditionIsTrue = (macros.find(rawtok->next->str()) == macros.end() && !(hasInclude && rawtok->next->str() == HAS_INCLUDE));
-                    maybeUsedMacros[rawtok->next->str()].push_back(rawtok->next->location);
+                }
+                else if (rawtok->str() == IFDEF || rawtok->str() == ELIFDEF) {
+                    const std::string &name = rawtok->next->str();
+                    conditionIsTrue = (macros.find(name) != macros.end() || (hasInclude && name == HAS_INCLUDE));
+                    maybeUsedMacros[name].emplace_back(rawtok->next->location);
+                    if (ifCond) {
+                        const std::string E = conditionIsTrue ? "1" : "0";
+                        const long long result = conditionIsTrue ? 1 : 0;
+                        ifCond->emplace_back(rawtok->location, E, result);
+                    }
+                } else if (rawtok->str() == IFNDEF || rawtok->str() == ELIFNDEF) {
+                    const std::string &name = rawtok->next->str();
+                    conditionIsTrue = (macros.find(name) == macros.end() && !(hasInclude && name == HAS_INCLUDE));
+                    maybeUsedMacros[name].emplace_back(rawtok->next->location);
+                    if (ifCond) {
+                        const std::string E = conditionIsTrue ? "1" : "0";
+                        const long long result = conditionIsTrue ? 1 : 0;
+                        ifCond->emplace_back(rawtok->location, E, result);
+                    }
                 } else { /*if (rawtok->str() == IF || rawtok->str() == ELIF)*/
                     TokenList expr(files);
                     for (const Token *tok = rawtok->next; tok && tok->location.sameline(rawtok->location); tok = tok->next) {
@@ -3598,7 +3841,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                             const bool par = (tok && tok->op == '(');
                             if (par)
                                 tok = tok->next;
-                            maybeUsedMacros[rawtok->next->str()].push_back(rawtok->next->location);
+                            maybeUsedMacros[rawtok->next->str()].emplace_back(rawtok->next->location);
                             if (tok) {
                                 if (macros.find(tok->str()) != macros.end())
                                     expr.push_back(new Token("1", tok->location));
@@ -3611,12 +3854,12 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                                 tok = tok ? tok->next : nullptr;
                             if (!tok || !sameline(rawtok,tok) || (par && tok->op != ')')) {
                                 if (outputList) {
-                                    Output out = {
+                                    Output out{
                                         Output::SYNTAX_ERROR,
                                         rawtok->location,
                                         "failed to evaluate " + std::string(rawtok->str() == IF ? "#if" : "#elif") + " condition"
                                     };
-                                    outputList->push_back(std::move(out));
+                                    outputList->emplace_back(std::move(out));
                                 }
                                 output.clear();
                                 return;
@@ -3632,7 +3875,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                             bool closingAngularBracket = false;
                             if (tok) {
                                 const std::string &sourcefile = rawtokens.file(rawtok->location);
-                                const bool systemheader = (tok && tok->op == '<');
+                                const bool systemheader = tok->op == '<';
                                 std::string header;
 
                                 if (systemheader) {
@@ -3654,12 +3897,12 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                                 tok = tok ? tok->next : nullptr;
                             if (!tok || !sameline(rawtok,tok) || (par && tok->op != ')') || (!closingAngularBracket)) {
                                 if (outputList) {
-                                    Output out = {
+                                    Output out{
                                         Output::SYNTAX_ERROR,
                                         rawtok->location,
                                         "failed to evaluate " + std::string(rawtok->str() == IF ? "#if" : "#elif") + " condition"
                                     };
-                                    outputList->push_back(std::move(out));
+                                    outputList->emplace_back(std::move(out));
                                 }
                                 output.clear();
                                 return;
@@ -3667,10 +3910,10 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                             continue;
                         }
 
-                        maybeUsedMacros[rawtok->next->str()].push_back(rawtok->next->location);
+                        maybeUsedMacros[rawtok->next->str()].emplace_back(rawtok->next->location);
 
                         const Token *tmp = tok;
-                        if (!preprocessToken(expr, tmp, macros, files, outputList)) {
+                        if (!preprocessToken(expr, tmp, macros, files, outputList, dui)) {
                             output.clear();
                             return;
                         }
@@ -3695,19 +3938,19 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                             std::string msg = "failed to evaluate " + std::string(rawtok->str() == IF ? "#if" : "#elif") + " condition";
                             if (e.what() && *e.what())
                                 msg += std::string(", ") + e.what();
-                            Output out = {
+                            Output out{
                                 Output::SYNTAX_ERROR,
                                 rawtok->location,
                                 std::move(msg)
                             };
-                            outputList->push_back(std::move(out));
+                            outputList->emplace_back(std::move(out));
                         }
                         output.clear();
                         return;
                     }
                 }
 
-                if (rawtok->str() != ELIF) {
+                if (rawtok->str() != ELIF && rawtok->str() != ELIFDEF && rawtok->str() != ELIFNDEF) {
                     // push a new ifstate..
                     if (ifstates.top() != True)
                         ifstates.push(AlwaysFalse);
@@ -3768,7 +4011,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
         const Location loc(rawtok->location);
         TokenList tokens(files);
 
-        if (!preprocessToken(tokens, rawtok, macros, files, outputList)) {
+        if (!preprocessToken(tokens, rawtok, macros, files, outputList, dui)) {
             output.clear();
             return;
         }
@@ -3799,7 +4042,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                 mu.macroName = macro.name();
                 mu.macroLocation = macro.defineLocation();
                 mu.useLocation = *usageIt;
-                macroUsage->push_back(std::move(mu));
+                macroUsage->emplace_back(std::move(mu));
             }
         }
     }
@@ -3827,6 +4070,20 @@ simplecpp::cstd_t simplecpp::getCStd(const std::string &std)
     return CUnknown;
 }
 
+const char *simplecpp::getCStdName(cstd_t std)
+{
+    switch (std) {
+    case CUnknown: return "C";
+    case C89: return "C89";
+    case C99: return "C99";
+    case C11: return "C11";
+    case C17: return "C17";
+    case C23: return "C23";
+    case C2Y: return "C2Y";
+    }
+    return "";
+}
+
 std::string simplecpp::getCStdString(cstd_t std)
 {
     switch (std) {
@@ -3879,6 +4136,21 @@ simplecpp::cppstd_t simplecpp::getCppStd(const std::string &std)
     return CPPUnknown;
 }
 
+const char *simplecpp::getCppStdName(cppstd_t std)
+{
+    switch (std) {
+    case CPPUnknown: return "C++";
+    case CPP03: return "C++03";
+    case CPP11: return "C++11";
+    case CPP14: return "C++14";
+    case CPP17: return "C++17";
+    case CPP20: return "C++20";
+    case CPP23: return "C++23";
+    case CPP26: return "C++26";
+    }
+    return "";
+}
+
 std::string simplecpp::getCppStdString(cppstd_t std)
 {
     switch (std) {
diff --git a/externals/simplecpp/simplecpp.h b/externals/simplecpp/simplecpp.h
index 9a847d14969..f4dca18374a 100644
--- a/externals/simplecpp/simplecpp.h
+++ b/externals/simplecpp/simplecpp.h
@@ -9,6 +9,7 @@
 #include <cctype>
 #include <cstdint>
 #include <cstring>
+#include <functional>
 #include <iosfwd>
 #include <list>
 #include <map>
@@ -41,10 +42,6 @@
 #  define SIMPLECPP_LIB
 #endif
 
-#ifndef _WIN32
-#  include <sys/types.h>
-#endif
-
 #if defined(_MSC_VER)
 #  pragma warning(push)
 // suppress warnings about "conversion from 'type1' to 'type2', possible loss of data"
@@ -57,10 +54,21 @@
 #ifndef SIMPLECPP_TOKENLIST_ALLOW_PTR
 // still provide the legacy API in case we lack the performant wrappers
 #  if !defined(__cpp_lib_string_view) && !defined(__cpp_lib_span)
-#    define SIMPLECPP_TOKENLIST_ALLOW_PTR
+#    define SIMPLECPP_TOKENLIST_ALLOW_PTR 1
+#  else
+#    define SIMPLECPP_TOKENLIST_ALLOW_PTR 0
 #  endif
 #endif
 
+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 9
+// Hack to workaround GCC bug.
+// Details: https://trac.cppcheck.net/ticket/14850
+// seen on g++ before 10.x
+#define  SIMPLECPP_NOEXCEPT
+#else
+#define  SIMPLECPP_NOEXCEPT  noexcept
+#endif
+
 namespace simplecpp {
     /** C code standard */
     enum cstd_t : std::int8_t { CUnknown=-1, C89, C99, C11, C17, C23, C2Y };
@@ -81,7 +89,7 @@ namespace simplecpp {
             , mSize(strlen(data))
         {}
 
-        // only provide when std::span is not available so using untyped initilization won't use View
+        // only provide when std::span is not available so using untyped initialization won't use View
 #if !defined(__cpp_lib_span)
         View(const char* data, std::size_t size)
             : mData(data)
@@ -141,7 +149,7 @@ namespace simplecpp {
         }
 
         unsigned int fileIndex{};
-        unsigned int line{1};
+        unsigned int line{};
         unsigned int col{};
     };
 
@@ -172,9 +180,9 @@ namespace simplecpp {
         bool isOneOf(const char ops[]) const;
         bool startsWithOneOf(const char c[]) const;
         bool endsWithOneOf(const char c[]) const;
-        static bool isNumberLike(const std::string& str) {
-            return std::isdigit(static_cast<unsigned char>(str[0])) ||
-                   (str.size() > 1U && (str[0] == '-' || str[0] == '+') && std::isdigit(static_cast<unsigned char>(str[1])));
+        static bool isNumberLike(const std::string& s) {
+            return std::isdigit(static_cast<unsigned char>(s[0])) ||
+                   (s.size() > 1U && (s[0] == '-' || s[0] == '+') && std::isdigit(static_cast<unsigned char>(s[1])));
         }
 
         TokenString macro;
@@ -211,6 +219,9 @@ namespace simplecpp {
         bool isExpandedFrom(const Macro* m) const {
             return mExpandedFrom.find(m) != mExpandedFrom.end();
         }
+        void markExpandedFrom(const Macro* m) {
+            mExpandedFrom.insert(m);
+        }
 
         void printAll() const;
         void printOut() const;
@@ -236,7 +247,10 @@ namespace simplecpp {
             MISSING_HEADER,
             INCLUDE_NESTED_TOO_DEEPLY,
             SYNTAX_ERROR,
+            DIRECTIVE_AS_MACRO_PARAMETER,
             PORTABILITY_BACKSLASH,
+            PORTABILITY_LINE_DIRECTIVE,
+            PORTABILITY_NO_EOF_NEWLINE,
             UNHANDLED_CHAR_ERROR,
             EXPLICIT_INCLUDE_NOT_FOUND,
             FILE_NOT_FOUND,
@@ -249,6 +263,21 @@ namespace simplecpp {
 
     using OutputList = std::list<Output>;
 
+    /**
+     * Command line preprocessor settings.
+     * On the command line these are configured by -D, -U, -I, --include, -std
+     */
+    struct SIMPLECPP_LIB DUI {
+        DUI() = default;
+        std::list<std::string> defines;
+        std::set<std::string> undefined;
+        std::list<std::string> includePaths;
+        std::list<std::string> includes;
+        std::string std;
+        bool clearIncludeCache{};
+        bool removeComments{}; /** remove comment tokens from included files */
+    };
+
     /** List of tokens. */
     class SIMPLECPP_LIB TokenList {
     public:
@@ -256,45 +285,45 @@ namespace simplecpp {
 
         explicit TokenList(std::vector<std::string> &filenames);
         /** generates a token list from the given std::istream parameter */
-        TokenList(std::istream &istr, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr);
+        TokenList(std::istream &istr, std::vector<std::string> &filenames, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr);
         /** generates a token list from the given buffer */
         template<size_t size>
-        TokenList(const char (&data)[size], std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
-            : TokenList(reinterpret_cast<const unsigned char*>(data), size-1, filenames, filename, outputList, 0)
+        TokenList(const char (&data)[size], std::vector<std::string> &filenames, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr)
+            : TokenList(reinterpret_cast<const unsigned char*>(data), size-1, filenames, filename, dui, outputList, 0)
         {}
         /** generates a token list from the given buffer */
         template<size_t size>
-        TokenList(const unsigned char (&data)[size], std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
-            : TokenList(data, size-1, filenames, filename, outputList, 0)
+        TokenList(const unsigned char (&data)[size], std::vector<std::string> &filenames, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr)
+            : TokenList(data, size-1, filenames, filename, dui, outputList, 0)
         {}
-#ifdef SIMPLECPP_TOKENLIST_ALLOW_PTR
+#if SIMPLECPP_TOKENLIST_ALLOW_PTR
         /** generates a token list from the given buffer */
-        TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
-            : TokenList(data, size, filenames, filename, outputList, 0)
+        TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr)
+            : TokenList(data, size, filenames, filename, dui, outputList, 0)
         {}
         /** generates a token list from the given buffer */
-        TokenList(const char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
-            : TokenList(reinterpret_cast<const unsigned char*>(data), size, filenames, filename, outputList, 0)
+        TokenList(const char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr)
+            : TokenList(reinterpret_cast<const unsigned char*>(data), size, filenames, filename, dui, outputList, 0)
         {}
 #endif // SIMPLECPP_TOKENLIST_ALLOW_PTR
         /** generates a token list from the given buffer */
-        TokenList(View data, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
-            : TokenList(reinterpret_cast<const unsigned char*>(data.data()), data.size(), filenames, filename, outputList, 0)
+        TokenList(View data, std::vector<std::string> &filenames, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr)
+            : TokenList(reinterpret_cast<const unsigned char*>(data.data()), data.size(), filenames, filename, dui, outputList, 0)
         {}
 #ifdef __cpp_lib_span
         /** generates a token list from the given buffer */
-        TokenList(std::span<const char> data, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
-            : TokenList(reinterpret_cast<const unsigned char*>(data.data()), data.size(), filenames, filename, outputList, 0)
+        TokenList(std::span<const char> data, std::vector<std::string> &filenames, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr)
+            : TokenList(reinterpret_cast<const unsigned char*>(data.data()), data.size(), filenames, filename, dui, outputList, 0)
         {}
 
         /** generates a token list from the given buffer */
-        TokenList(std::span<const unsigned char> data, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
-            : TokenList(data.data(), data.size(), filenames, filename, outputList, 0)
+        TokenList(std::span<const unsigned char> data, std::vector<std::string> &filenames, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr)
+            : TokenList(data.data(), data.size(), filenames, filename, dui, outputList, 0)
         {}
 #endif // __cpp_lib_span
 
         /** generates a token list from the given filename parameter */
-        TokenList(const std::string &filename, std::vector<std::string> &filenames, OutputList *outputList = nullptr);
+        TokenList(const std::string &filename, std::vector<std::string> &filenames, const DUI &dui = {}, OutputList *outputList = nullptr);
         TokenList(const TokenList &other);
         TokenList(TokenList &&other);
         ~TokenList();
@@ -310,7 +339,11 @@ namespace simplecpp {
         void dump(bool linenrs = false) const;
         std::string stringify(bool linenrs = false) const;
 
-        void readfile(Stream &stream, const std::string &filename=std::string(), OutputList *outputList = nullptr);
+        void readfile(Stream &stream, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr);
+        /**
+         * @throws std::overflow_error thrown on overflow or division by zero
+         * @throws std::runtime_error thrown on invalid expressions
+         */
         void constFold();
 
         void removeComments();
@@ -370,7 +403,7 @@ namespace simplecpp {
         const std::string& file(const Location& loc) const;
 
     private:
-        TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList, int unused);
+        TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename, const DUI &dui, OutputList *outputList, int /*unused*/);
 
         void combineOperators();
 
@@ -390,7 +423,7 @@ namespace simplecpp {
         void constFoldQuestionOp(Token *&tok1);
 
         std::string readUntil(Stream &stream, const Location &location, char start, char end, OutputList *outputList);
-        void lineDirective(unsigned int fileIndex, unsigned int line, Location &location);
+        void lineDirective(unsigned int fileIndex_, unsigned int line, Location &location);
 
         const Token* lastLineTok(int maxsize=1000) const;
         const Token* isLastLinePreprocessor(int maxsize=1000) const;
@@ -419,21 +452,6 @@ namespace simplecpp {
         long long result; // condition result
     };
 
-    /**
-     * Command line preprocessor settings.
-     * On the command line these are configured by -D, -U, -I, --include, -std
-     */
-    struct SIMPLECPP_LIB DUI {
-        DUI() = default;
-        std::list<std::string> defines;
-        std::set<std::string> undefined;
-        std::list<std::string> includePaths;
-        std::list<std::string> includes;
-        std::string std;
-        bool clearIncludeCache{};
-        bool removeComments{}; /** remove comment tokens from included files */
-    };
-
     struct SIMPLECPP_LIB FileData {
         /** The canonical filename associated with this data */
         std::string filename;
@@ -443,13 +461,14 @@ namespace simplecpp {
 
     class SIMPLECPP_LIB FileDataCache {
     public:
-        FileDataCache() = default;
+        FileDataCache();
+        ~FileDataCache();
 
         FileDataCache(const FileDataCache &) = delete;
-        FileDataCache(FileDataCache &&) = default;
+        FileDataCache(FileDataCache &&) SIMPLECPP_NOEXCEPT;
 
         FileDataCache &operator=(const FileDataCache &) = delete;
-        FileDataCache &operator=(FileDataCache &&) = default;
+        FileDataCache &operator=(FileDataCache &&) SIMPLECPP_NOEXCEPT;
 
         /** Get the cached data for a file, or load and then return it if it isn't cached.
          *  returns the file data and true if the file was loaded, false if it was cached. */
@@ -463,11 +482,7 @@ namespace simplecpp {
             mNameMap.emplace(newdata->filename, newdata);
         }
 
-        void clear() {
-            mNameMap.clear();
-            mIdMap.clear();
-            mData.clear();
-        }
+        void clear();
 
         using container_type = std::vector<std::unique_ptr<FileData>>;
         using iterator = container_type::iterator;
@@ -496,52 +511,24 @@ namespace simplecpp {
             return mData.cend();
         }
 
-    private:
-        struct FileID {
-#ifdef _WIN32
-            struct {
-                std::uint64_t VolumeSerialNumber;
-                struct {
-                    std::uint64_t IdentifierHi;
-                    std::uint64_t IdentifierLo;
-                } FileId;
-            } fileIdInfo;
-
-            bool operator==(const FileID &that) const noexcept {
-                return fileIdInfo.VolumeSerialNumber == that.fileIdInfo.VolumeSerialNumber &&
-                       fileIdInfo.FileId.IdentifierHi == that.fileIdInfo.FileId.IdentifierHi &&
-                       fileIdInfo.FileId.IdentifierLo == that.fileIdInfo.FileId.IdentifierLo;
-            }
-#else
-            dev_t dev;
-            ino_t ino;
+        using load_callback_type = std::function<void (FileData &, bool)>;
 
-            bool operator==(const FileID& that) const noexcept {
-                return dev == that.dev && ino == that.ino;
-            }
-#endif
-            struct Hasher {
-                std::size_t operator()(const FileID &id) const {
-#ifdef _WIN32
-                    return static_cast<std::size_t>(id.fileIdInfo.FileId.IdentifierHi ^ id.fileIdInfo.FileId.IdentifierLo ^
-                                                    id.fileIdInfo.VolumeSerialNumber);
-#else
-                    return static_cast<std::size_t>(id.dev) ^ static_cast<std::size_t>(id.ino);
-#endif
-                }
-            };
-        };
+        void set_load_callback(load_callback_type cb) {
+            mLoadCallback = std::move(cb);
+        }
 
-        using name_map_type = std::unordered_map<std::string, FileData *>;
-        using id_map_type = std::unordered_map<FileID, FileData *, FileID::Hasher>;
+    private:
+        struct Impl;
+        std::unique_ptr<Impl> mImpl;
 
-        static bool getFileId(const std::string &path, FileID &id);
+        using name_map_type = std::unordered_map<std::string, FileData *>;
 
         std::pair<FileData *, bool> tryload(name_map_type::iterator &name_it, const DUI &dui, std::vector<std::string> &filenames, OutputList *outputList);
+        std::pair<FileData *, bool> get_private(const std::string &sourcefile, const std::string &header, const DUI &dui, bool systemheader, std::vector<std::string> &filenames, OutputList *outputList);
 
         container_type mData;
         name_map_type mNameMap;
-        id_map_type mIdMap;
+        load_callback_type mLoadCallback;
     };
 
     /** Converts character literal (including prefix, but not ud-suffix) to long long value.
@@ -604,9 +591,15 @@ namespace simplecpp {
     /** Returns the C version a given standard */
     SIMPLECPP_LIB cstd_t getCStd(const std::string &std);
 
+    /** Returns the name of a C standard */
+    SIMPLECPP_LIB const char *getCStdName(cstd_t std);
+
     /** Returns the C++ version a given standard */
     SIMPLECPP_LIB cppstd_t getCppStd(const std::string &std);
 
+    /** Returns the name of a C++ standard */
+    SIMPLECPP_LIB const char *getCppStdName(cppstd_t std);
+
     /** Returns the __STDC_VERSION__ value for a given standard */
     SIMPLECPP_LIB std::string getCStdString(const std::string &std);
     SIMPLECPP_LIB std::string getCStdString(cstd_t std);
diff --git a/externals/tinyxml2/CMakeLists.txt b/externals/tinyxml2/CMakeLists.txt
index 9f15c558682..2e1aa036b81 100644
--- a/externals/tinyxml2/CMakeLists.txt
+++ b/externals/tinyxml2/CMakeLists.txt
@@ -15,6 +15,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     target_compile_options_safe(tinyxml2 -Wno-zero-as-null-pointer-constant)
     target_compile_options_safe(tinyxml2 -Wno-format-nonliteral)
     target_compile_options_safe(tinyxml2 -Wno-inconsistent-missing-destructor-override)
+    target_compile_options_safe(tinyxml2 -Wno-sign-conversion)
+    target_compile_options_safe(tinyxml2 -Wno-double-promotion)
 endif()
 if(CYGWIN)
     target_compile_definitions(-D_LARGEFILE_SOURCE)  # required for fseeko() and ftello()
diff --git a/generate_coverage_report b/generate_coverage_report
deleted file mode 100755
index 3f12cea7e0f..00000000000
--- a/generate_coverage_report
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-make clean
-rm -rf coverage_report
-make test CXXOPTS="-g -fprofile-arcs -ftest-coverage"
-test/cfg/runtests.sh
-gcov lib/*.cpp -o lib/
-lcov --directory ./ --capture --output-file lcov_tmp.info -b ./
-lcov --extract lcov_tmp.info "$(pwd)/*" --output-file lcov.info
-genhtml lcov.info -o coverage_report --frame --legend --demangle-cpp
-rm cli/*.gcda
-rm cli/*.gcno
-rm lib/*.gcda
-rm lib/*.gcno
-rm test/*.gcda
-rm test/*.gcno
-rm externals/tinyxml2/*.gcda
-rm externals/tinyxml2/*.gcno
-rm lcov.info lcov_tmp.info
-make clean
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index ff329ad1163..2acb07f03c0 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -15,9 +15,7 @@ CheckOptions:
     file(GLOB tss  "*.ts")
     QT_WRAP_UI(uis_hdrs ${uis})
     QT_ADD_RESOURCES(resources "gui.qrc")
-    # TODO: passing "-no-obsolete" here breaks the translations
-    QT_CREATE_TRANSLATION(qms ${CMAKE_CURRENT_SOURCE_DIR} ${tss})
-    list(APPEND cppcheck-gui-deps ${hdrs} ${uis_hdrs} ${resources} ${qms})
+    list(APPEND cppcheck-gui-deps ${hdrs} ${uis_hdrs} ${resources})
     add_custom_target(gui-build-deps SOURCES ${cppcheck-gui-deps})
 
     list(APPEND cppcheck-gui_SOURCES ${srcs})
@@ -27,6 +25,10 @@ CheckOptions:
 
     add_executable(cppcheck-gui ${cppcheck-gui-deps} ${cppcheck-gui_SOURCES})
     target_link_libraries(cppcheck-gui cppcheck-core simplecpp tinyxml2 picojson frontend)
+    qt_add_translations(cppcheck-gui
+      TS_FILES ${tss}
+      QM_FILES_OUTPUT_VARIABLE qms)
+    add_dependencies(cppcheck-gui release_translations)
 
     set_target_properties(cppcheck-gui PROPERTIES AUTOMOC ON)
     set_target_properties(cppcheck-gui PROPERTIES WIN32_EXECUTABLE ON)
@@ -40,10 +42,6 @@ CheckOptions:
     if(WITH_QCHART)
         target_link_libraries(cppcheck-gui ${QT_CHARTS_LIB})
     endif()
-    if(MSVC)
-        # compilation will fail as e.g. QList::realloc would be replaced by MSVC's macro definition
-        target_compile_definitions(cppcheck-gui PRIVATE $<$<CONFIG:Debug>:DISABLE_CRTDBG_MAP_ALLOC>)
-    endif()
     if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         if(QT_VERSION VERSION_LESS "6.4.0")
             # caused by Qt generated moc code - see https://bugreports.qt.io/browse/QTBUG-100915
@@ -75,8 +73,8 @@ CheckOptions:
         add_dependencies(cppcheck-gui online-help.qhc)
     endif()
 
-    install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
-    install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
+    install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
+    install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
 
     install(FILES cppcheck-gui.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
 
@@ -91,7 +89,7 @@ CheckOptions:
         add_dependencies(cppcheck-gui run-dmake)
     endif()
 
-    if (BUILD_TESTS)
+    if (BUILD_TESTING)
         add_subdirectory(test)
     endif()
 endif()
diff --git a/gui/application.cpp b/gui/application.cpp
index e3cc7b9957b..af68f98bb70 100644
--- a/gui/application.cpp
+++ b/gui/application.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * Copyright (C) 2007-2022 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/gui/applicationdialog.cpp b/gui/applicationdialog.cpp
index bc8804d6f97..4725f59fc39 100644
--- a/gui/applicationdialog.cpp
+++ b/gui/applicationdialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -80,7 +80,7 @@ void ApplicationDialog::ok()
 {
     if (mUI->mName->text().isEmpty() || mUI->mPath->text().isEmpty()) {
         QMessageBox msg(QMessageBox::Warning,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         tr("You must specify a name, a path and optionally parameters for the application!"),
                         QMessageBox::Ok,
                         this);
diff --git a/gui/checkstatistics.cpp b/gui/checkstatistics.cpp
index 25bee336811..830f5eb6b4e 100644
--- a/gui/checkstatistics.cpp
+++ b/gui/checkstatistics.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,8 @@
 
 #include "checkstatistics.h"
 
+#include "utils.h"
+
 #include <QDebug>
 #include <QList>
 #include <QSet>
@@ -59,7 +61,6 @@ void CheckStatistics::addItem(const QString &tool, ShowTypes::ShowType type)
         ::addItem(mInformation, lower);
         break;
     case ShowTypes::ShowNone:
-    default:
         qDebug() << "Unknown error type - not added to statistics.";
         break;
     }
@@ -99,19 +100,19 @@ unsigned CheckStatistics::getCount(const QString &tool, ShowTypes::ShowType type
     case ShowTypes::ShowInformation:
         return mInformation.value(lower,0);
     case ShowTypes::ShowNone:
-    default:
         qDebug() << "Unknown error type - returning zero statistics.";
         return 0;
     }
+    cppcheck::unreachable();
 }
 
 QStringList CheckStatistics::getTools() const
 {
     QSet<QString> ret;
-    for (const QString& tool: mStyle.keys()) ret.insert(tool);
-    for (const QString& tool: mWarning.keys()) ret.insert(tool);
-    for (const QString& tool: mPerformance.keys()) ret.insert(tool);
-    for (const QString& tool: mPortability.keys()) ret.insert(tool);
-    for (const QString& tool: mError.keys()) ret.insert(tool);
+    std::copy(mStyle.keyBegin(), mStyle.keyEnd(), std::inserter(ret, ret.end()));
+    std::copy(mWarning.keyBegin(), mWarning.keyEnd(), std::inserter(ret, ret.end()));
+    std::copy(mPerformance.keyBegin(), mPerformance.keyEnd(), std::inserter(ret, ret.end()));
+    std::copy(mPortability.keyBegin(), mPortability.keyEnd(), std::inserter(ret, ret.end()));
+    std::copy(mError.keyBegin(), mError.keyEnd(), std::inserter(ret, ret.end()));
     return ret.values();
 }
diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
index 090b698a6e7..2b4c9ba654f 100644
--- a/gui/checkthread.cpp
+++ b/gui/checkthread.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -105,20 +105,23 @@ int CheckThread::executeCommand(std::string exe, std::vector<std::string> args,
 }
 
 
-CheckThread::CheckThread(ThreadResult &result) :
-    mResult(result)
+CheckThread::CheckThread(ThreadResult &result, int threadIndex)
+    : mResult(result)
+    , mThreadIndex(threadIndex)
 {}
 
 void CheckThread::setSettings(const Settings &settings, std::shared_ptr<Suppressions> supprs)
 {
     mFiles.clear();
+    mFileSettings.clear();
     mSettings = settings; // this is a copy
     mSuppressions = std::move(supprs);
 }
 
-void CheckThread::analyseWholeProgram(const std::list<FileWithDetails> &files, const std::string& ctuInfo)
+void CheckThread::analyseWholeProgram(const std::list<FileWithDetails> &files, const std::list<FileSettings> &fileSettings, const std::string& ctuInfo)
 {
     mFiles = files;
+    mFileSettings = fileSettings;
     mAnalyseWholeProgram = true;
     mCtuInfo = ctuInfo;
     start();
@@ -128,15 +131,16 @@ void CheckThread::run()
 {
     mState = Running;
 
-    CppCheck cppcheck(mSettings, *mSuppressions, mResult, true, executeCommand);
+    CppCheck cppcheck(mSettings, *mSuppressions, mResult, nullptr, true, executeCommand);
 
     if (!mFiles.empty() || mAnalyseWholeProgram) {
         mAnalyseWholeProgram = false;
         std::string ctuInfo;
         ctuInfo.swap(mCtuInfo);
         qDebug() << "Whole program analysis";
-        cppcheck.analyseWholeProgram(mSettings.buildDir, mFiles, {}, ctuInfo);
+        cppcheck.analyseWholeProgram(mSettings.buildDir, mFiles, mFileSettings, ctuInfo);
         mFiles.clear();
+        mFileSettings.clear();
         emit done();
         return;
     }
@@ -147,9 +151,14 @@ void CheckThread::run()
     while (file && mState == Running) {
         const std::string& fname = file->spath();
         qDebug() << "Checking file" << QString::fromStdString(fname);
+
+        const Details details{ mThreadIndex, QString::fromStdString(fname), QTime::currentTime(), };
+        emit startCheck(details);
+
         cppcheck.check(*file);
         runAddonsAndTools(mSettings, nullptr, QString::fromStdString(fname));
-        emit fileChecked(QString::fromStdString(fname));
+
+        emit finishCheck(details);
 
         if (mState == Running)
             mResult.getNextFile(file);
@@ -160,9 +169,15 @@ void CheckThread::run()
     while (fileSettings && mState == Running) {
         const std::string& fname = fileSettings->filename();
         qDebug() << "Checking file" << QString::fromStdString(fname);
+
+        const Details details{ mThreadIndex, QString::fromStdString(fname), QTime::currentTime(), };
+        emit startCheck(details);
+
         cppcheck.check(*fileSettings);
         runAddonsAndTools(mSettings, fileSettings, QString::fromStdString(fname));
-        emit fileChecked(QString::fromStdString(fname));
+
+        emit finishCheck(details);
+
 
         if (mState == Running)
             mResult.getNextFileSettings(fileSettings);
@@ -178,7 +193,7 @@ void CheckThread::run()
 
 void CheckThread::runAddonsAndTools(const Settings& settings, const FileSettings *fileSettings, const QString &fileName)
 {
-    for (const QString& addon : mAddonsAndTools) {
+    for (const QString& addon : utils::as_const(mAddonsAndTools)) {
         if (addon == CLANG_ANALYZER || addon == CLANG_TIDY) {
             if (!fileSettings)
                 continue;
@@ -238,7 +253,7 @@ void CheckThread::runAddonsAndTools(const Settings& settings, const FileSettings
 
             const std::string &buildDir = settings.buildDir;
             if (!buildDir.empty()) {
-                analyzerInfoFile = QString::fromStdString(AnalyzerInformation::getAnalyzerInfoFile(buildDir, fileSettings->filename(), fileSettings->cfg, fileSettings->fileIndex));
+                analyzerInfoFile = QString::fromStdString(AnalyzerInformation::getAnalyzerInfoFile(buildDir, fileSettings->sfilename(), fileSettings->cfg, fileSettings->file.fsFileId()));
 
                 QStringList args2(args);
                 args2.insert(0,"-E");
@@ -291,7 +306,7 @@ void CheckThread::runAddonsAndTools(const Settings& settings, const FileSettings
             {
                 const QString cmd(clangTidyCmd());
                 QString debug(cmd.contains(" ") ? ('\"' + cmd + '\"') : cmd);
-                for (const QString& arg : args) {
+                for (const QString& arg : utils::as_const(args)) {
                     if (arg.contains(" "))
                         debug += " \"" + arg + '\"';
                     else
@@ -486,3 +501,4 @@ QString CheckThread::clangTidyCmd()
 
     return QString();
 }
+
diff --git a/gui/checkthread.h b/gui/checkthread.h
index 892bdf5258d..74eb292e6e2 100644
--- a/gui/checkthread.h
+++ b/gui/checkthread.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@
 #include <QString>
 #include <QStringList>
 #include <QThread>
+#include <QTime>
 
 class ThreadResult;
 
@@ -49,7 +50,14 @@ class ThreadResult;
 class CheckThread : public QThread {
     Q_OBJECT
 public:
-    explicit CheckThread(ThreadResult &result);
+    struct Details {
+        int threadIndex;
+        QString file;
+        QTime startTime;
+    };
+
+public:
+    CheckThread(ThreadResult &result, int threadIndex);
 
     /**
      * @brief Set settings for cppcheck
@@ -61,10 +69,11 @@ class CheckThread : public QThread {
 
     /**
      * @brief Run whole program analysis
-     * @param files    All files
-     * @param ctuInfo  Ctu info for addons
+     * @param files         All files
+     * @param fileSettings  All files of the project
+     * @param ctuInfo       Ctu info for addons
      */
-    void analyseWholeProgram(const std::list<FileWithDetails> &files, const std::string& ctuInfo);
+    void analyseWholeProgram(const std::list<FileWithDetails> &files, const std::list<FileSettings> &fileSettings, const std::string& ctuInfo);
 
     void setAddonsAndTools(const QStringList &addonsAndTools) {
         mAddonsAndTools = addonsAndTools;
@@ -78,12 +87,6 @@ class CheckThread : public QThread {
         mSuppressionsUi = s;
     }
 
-    /**
-     * @brief method that is run in a thread
-     *
-     */
-    void run() override;
-
     void stop();
 
     /**
@@ -108,8 +111,8 @@ class CheckThread : public QThread {
      */
     void done();
 
-    // NOLINTNEXTLINE(readability-inconsistent-declaration-parameter-name) - caused by generated MOC code
-    void fileChecked(const QString &file);
+    void startCheck(CheckThread::Details details);
+    void finishCheck(CheckThread::Details details);
 protected:
 
     /**
@@ -132,11 +135,18 @@ class CheckThread : public QThread {
     std::atomic<State> mState{Ready};
 
     ThreadResult &mResult;
+    int mThreadIndex{};
 
     Settings mSettings;
     std::shared_ptr<Suppressions> mSuppressions;
 
 private:
+    /**
+     * @brief method that is run in a thread
+     *
+     */
+    void run() override;
+
     void runAddonsAndTools(const Settings& settings, const FileSettings *fileSettings, const QString &fileName);
 
     void parseClangErrors(const QString &tool, const QString &file0, QString err);
@@ -144,11 +154,13 @@ class CheckThread : public QThread {
     bool isSuppressed(const SuppressionList::ErrorMessage &errorMessage) const;
 
     std::list<FileWithDetails> mFiles;
+    std::list<FileSettings> mFileSettings;
     bool mAnalyseWholeProgram{};
     std::string mCtuInfo;
     QStringList mAddonsAndTools;
     QStringList mClangIncludePaths;
     QList<SuppressionList::Suppression> mSuppressionsUi;
 };
+Q_DECLARE_METATYPE(CheckThread::Details);
 /// @}
 #endif // CHECKTHREAD_H
diff --git a/gui/codeeditor.cpp b/gui/codeeditor.cpp
index 7e7f2cbc37c..d6c8c1c4071 100644
--- a/gui/codeeditor.cpp
+++ b/gui/codeeditor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 #include "codeeditor.h"
 
 #include "codeeditorstyle.h"
+#include "utils.h"
 
 #include <QChar>
 #include <QColor>
@@ -133,7 +134,7 @@ Highlighter::Highlighter(QTextDocument *parent,
                     << "volatile"
                     << "wchar_t"
                     << "while";
-    for (const QString &pattern : keywordPatterns) {
+    for (const QString &pattern : utils::as_const(keywordPatterns)) {
         rule.pattern = QRegularExpression("\\b" + pattern + "\\b");
         rule.format = mKeywordFormat;
         rule.ruleRole = RuleRole::Keyword;
@@ -216,7 +217,7 @@ void Highlighter::setStyle(const CodeEditorStyle &newStyle)
 
 void Highlighter::highlightBlock(const QString &text)
 {
-    for (const HighlightingRule &rule : mHighlightingRulesWithSymbols) {
+    for (const HighlightingRule &rule : utils::as_const(mHighlightingRulesWithSymbols)) {
         QRegularExpressionMatchIterator matchIterator = rule.pattern.globalMatch(text);
         while (matchIterator.hasNext()) {
             QRegularExpressionMatch match = matchIterator.next();
@@ -246,7 +247,7 @@ void Highlighter::highlightBlock(const QString &text)
     }
 }
 
-void Highlighter::applyFormat(HighlightingRule &rule)
+void Highlighter::applyFormat(HighlightingRule &rule) const
 {
     switch (rule.ruleRole) {
     case RuleRole::Keyword:
diff --git a/gui/codeeditor.h b/gui/codeeditor.h
index 4f6d07e1e36..00205d1c4e1 100644
--- a/gui/codeeditor.h
+++ b/gui/codeeditor.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,7 +65,7 @@ class Highlighter : public QSyntaxHighlighter {
         RuleRole ruleRole;
     };
 
-    void applyFormat(HighlightingRule &rule);
+    void applyFormat(HighlightingRule &rule) const;
 
     QList<HighlightingRule> mHighlightingRules;
     QList<HighlightingRule> mHighlightingRulesWithSymbols;
@@ -119,6 +119,7 @@ class CodeEditor : public QPlainTextEdit {
         return mFileName;
     }
 
+    // NOLINTNEXTLINE(bugprone-derived-method-shadowing-base-method) - TODO: fix this
     void clear() {
         mFileName.clear();
         setPlainText(QString());
@@ -128,9 +129,9 @@ class CodeEditor : public QPlainTextEdit {
     void resizeEvent(QResizeEvent *event) override;
 
 private slots:
-    void updateLineNumberAreaWidth(int newBlockCount);
+    void updateLineNumberAreaWidth(int /*newBlockCount*/);
     void highlightErrorLine();
-    void updateLineNumberArea(const QRect & /*rect*/, int /*dy*/);
+    void updateLineNumberArea(const QRect& rect, int dy);
 
 private:
     QString generateStyleString();
diff --git a/gui/codeeditorstyle.cpp b/gui/codeeditorstyle.cpp
index 0536c4ba4b3..6d7a15fb2f8 100644
--- a/gui/codeeditorstyle.cpp
+++ b/gui/codeeditorstyle.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 
 #include "codeeditorstyle.h"
 
+#include <QList>
 #include <QSettings>
 #include <QVariant>
 
diff --git a/gui/codeeditstyledialog.cpp b/gui/codeeditstyledialog.cpp
index fa3f0f46f22..44304ddddc1 100644
--- a/gui/codeeditstyledialog.cpp
+++ b/gui/codeeditstyledialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +28,6 @@
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QString>
-#include <QStringList>
 #include <QVBoxLayout>
 #include <QtGlobal>
 
diff --git a/gui/codeeditstyledialog.h b/gui/codeeditstyledialog.h
index 80b8b06214d..763372cbef6 100644
--- a/gui/codeeditstyledialog.h
+++ b/gui/codeeditstyledialog.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 #include <QDialog>
 #include <QFont>
 #include <QObject>
+#include <QStringList>
 
 class CodeEditor;
 class SelectColorButton;
diff --git a/gui/compliancereportdialog.cpp b/gui/compliancereportdialog.cpp
deleted file mode 100644
index ae903f47dc4..00000000000
--- a/gui/compliancereportdialog.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "compliancereportdialog.h"
-
-#include "ui_compliancereportdialog.h"
-
-#include "errortypes.h"
-#include "filelist.h"
-#include "filesettings.h"
-#include "importproject.h"
-#include "projectfile.h"
-
-#include <algorithm>
-#include <iterator>
-#include <list>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <QByteArray>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QCoreApplication>
-#include <QCryptographicHash>
-#include <QDialogButtonBox>
-#include <QDir>
-#include <QFile>
-#include <QFileDialog>
-#include <QFileInfo>
-#include <QIODevice>
-#include <QLineEdit>
-#include <QList>
-#include <QMessageBox>
-#include <QProcess>
-#include <QRegularExpression>
-#include <QSet>
-#include <QStringList>
-#include <QTemporaryFile>
-#include <QTextStream>
-
-static void addHeaders(const QString& file1, QSet<QString> &allFiles) {
-    if (allFiles.contains(file1))
-        return;
-    QFile file(file1);
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
-        return;
-    allFiles << file1;
-    const QRegularExpression re("^#include[ ]*\"([^\">]+)\".*");
-    QTextStream in(&file);
-    QString line = in.readLine();
-    while (!in.atEnd()) {
-        if (line.startsWith("#include")) {
-            const QRegularExpressionMatch match = re.match(line);
-            if (match.hasMatch()) {
-                QString hfile = match.captured(1);
-                if (file1.contains("/"))
-                    hfile = file1.mid(0,file1.lastIndexOf("/") + 1) + hfile;
-                addHeaders(hfile, allFiles);
-            }
-        }
-        line = in.readLine();
-    }
-}
-
-static std::vector<std::string> toStdStringList(const QStringList& from) {
-    std::vector<std::string> ret;
-    std::transform(from.cbegin(), from.cend(), std::back_inserter(ret), [](const QString& e) {
-        return e.toStdString();
-    });
-    return ret;
-}
-
-ComplianceReportDialog::ComplianceReportDialog(ProjectFile* projectFile, QString resultsFile, QString checkersReport)
-    : QDialog(nullptr),
-    mUI(new Ui::ComplianceReportDialog),
-    mProjectFile(projectFile),
-    mResultsFile(std::move(resultsFile)),
-    mCheckersReport(std::move(checkersReport))
-{
-    mUI->setupUi(this);
-    mUI->mEditProjectName->setText(projectFile->getProjectName());
-    connect(mUI->buttonBox, &QDialogButtonBox::clicked, this, &ComplianceReportDialog::buttonClicked);
-    mUI->mCodingStandard->clear();
-    if (!projectFile->getCodingStandards().contains("misra-c-2023") && projectFile->getAddons().contains("misra"))
-        mUI->mCodingStandard->addItem("Misra C 2012");
-    for (QString std: projectFile->getCodingStandards()) {
-        std[0] = std[0].toUpper();
-        std = std.replace("-", " ").replace(" c ", " C ").replace(" cpp ", " C++ ").replace(" c++ ", " C++ ");
-        mUI->mCodingStandard->addItem(std);
-    }
-}
-
-ComplianceReportDialog::~ComplianceReportDialog()
-{
-    delete mUI;
-}
-
-void ComplianceReportDialog::buttonClicked(QAbstractButton* button)
-{
-    switch (mUI->buttonBox->standardButton(button)) {
-    case QDialogButtonBox::StandardButton::Save:
-        save();
-        break;
-    case QDialogButtonBox::StandardButton::Close:
-        close();
-        break;
-    default:
-        break;
-    }
-}
-
-void ComplianceReportDialog::save()
-{
-    const QString std(mUI->mCodingStandard->currentText().toLower().replace(" ", "-"));
-
-    const QString outFile = QFileDialog::getSaveFileName(this,
-                                                         tr("Compliance report"),
-                                                         QDir::homePath() + "/" + std + "-compliance-report.html",
-                                                         tr("HTML files (*.html)"));
-    if (outFile.isEmpty())
-        return;
-
-    close();
-
-    const QString& projectName = mUI->mEditProjectName->text();
-    const QString& projectVersion = mUI->mEditProjectVersion->text();
-    const bool files = mUI->mCheckFiles->isChecked();
-
-    if (projectName != mProjectFile->getProjectName()) {
-        mProjectFile->setProjectName(projectName);
-        mProjectFile->write();
-    }
-
-    QTemporaryFile tempCheckersReport;
-    if (tempCheckersReport.open()) {
-        QTextStream out(&tempCheckersReport);
-        out << mCheckersReport << "\n";
-        tempCheckersReport.close();
-    }
-
-    QTemporaryFile tempFiles;
-    if (files && tempFiles.open()) {
-        QTextStream out(&tempFiles);
-        FileList fileList;
-        fileList.addPathList(mProjectFile->getCheckPaths());
-        if (!mProjectFile->getImportProject().isEmpty()) {
-            QFileInfo inf(mProjectFile->getFilename());
-
-            QString prjfile;
-            if (QFileInfo(mProjectFile->getImportProject()).isAbsolute())
-                prjfile = mProjectFile->getImportProject();
-            else
-                prjfile = inf.canonicalPath() + '/' + mProjectFile->getImportProject();
-
-            ImportProject p;
-            try {
-                p.import(prjfile.toStdString());
-            } catch (InternalError &e) {
-                QMessageBox msg(QMessageBox::Critical,
-                                tr("Save compliance report"),
-                                tr("Failed to import '%1' (%2), can not show files in compliance report").arg(prjfile).arg(QString::fromStdString(e.errorMessage)),
-                                QMessageBox::Ok,
-                                this);
-                msg.exec();
-                return;
-            }
-
-            p.ignorePaths(toStdStringList(mProjectFile->getExcludedPaths()));
-
-            QDir dir(inf.absoluteDir());
-            for (const FileSettings& fs: p.fileSettings)
-                fileList.addFile(dir.relativeFilePath(QString::fromStdString(fs.filename())));
-        }
-
-        QSet<QString> allFiles;
-        for (const QString &sourcefile: fileList.getFileList())
-            addHeaders(sourcefile, allFiles);
-        for (const QString& fileName: allFiles) {
-            QFile f(fileName);
-            if (f.open(QFile::ReadOnly)) {
-                QCryptographicHash hash(QCryptographicHash::Algorithm::Md5);
-                if (hash.addData(&f)) {
-                    for (auto b: hash.result())
-                        out << QString::number(static_cast<unsigned char>(b),16);
-                    out << " " << fileName << "\n";
-                }
-            }
-        }
-        tempFiles.close();
-    }
-
-    QStringList suppressions;
-    for (const auto& suppression: mProjectFile->getSuppressions()) {
-        if (!suppression.errorId.empty())
-            suppressions.append(QString::fromStdString(suppression.errorId));
-    }
-
-    QStringList args{"--project-name=" + projectName,
-                     "--project-version=" + projectVersion,
-                     "--output-file=" + outFile,
-                     "--checkers-report=" + tempCheckersReport.fileName()};
-    if (!suppressions.isEmpty())
-        args << "--suppressions=" + suppressions.join(",");
-
-    args << ("--" + std);
-
-    if (files)
-        args << "--files=" + tempFiles.fileName();
-    args << mResultsFile;
-
-    const QString appPath = QFileInfo(QCoreApplication::applicationFilePath()).canonicalPath();
-
-    QProcess process;
-#ifdef Q_OS_WIN
-    process.start(appPath + "/compliance-report.exe", args);
-#else
-    process.start(appPath + "/compliance-report", args);
-#endif
-    process.waitForFinished();
-    const QString output = process.readAll();
-    if (!output.isEmpty()) {
-        QMessageBox msg(QMessageBox::Critical,
-                        tr("Save compliance report"),
-                        output,
-                        QMessageBox::Ok,
-                        this);
-        msg.exec();
-    }
-}
diff --git a/gui/compliancereportdialog.h b/gui/compliancereportdialog.h
deleted file mode 100644
index c7ef27f1cc5..00000000000
--- a/gui/compliancereportdialog.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- C++ -*-
- * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef COMPLIANCEREPORTDIALOG_H
-#define COMPLIANCEREPORTDIALOG_H
-
-#include <QDialog>
-#include <QObject>
-#include <QString>
-
-namespace Ui {
-    class ComplianceReportDialog;
-}
-
-class ProjectFile;
-class QAbstractButton;
-
-class ComplianceReportDialog final : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit ComplianceReportDialog(ProjectFile* projectFile, QString resultsFile, QString checkersReport);
-    ~ComplianceReportDialog() final;
-
-private slots:
-    void buttonClicked(QAbstractButton* button);
-
-private:
-    void save();
-
-    Ui::ComplianceReportDialog *mUI;
-    ProjectFile* mProjectFile;
-    const QString mResultsFile;
-    const QString mCheckersReport;
-};
-
-#endif // COMPLIANCEREPORTDIALOG_H
diff --git a/gui/compliancereportdialog.ui b/gui/compliancereportdialog.ui
deleted file mode 100644
index b756ec7eab5..00000000000
--- a/gui/compliancereportdialog.ui
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ComplianceReportDialog</class>
- <widget class="QDialog" name="ComplianceReportDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>403</width>
-    <height>199</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Compliance Report</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Project version</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Project name</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QLineEdit" name="mEditProjectName"/>
-     </item>
-     <item row="2" column="1">
-      <widget class="QLineEdit" name="mEditProjectVersion"/>
-     </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Coding Standard</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QComboBox" name="mCodingStandard">
-       <item>
-        <property name="text">
-         <string>Misra C</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Cert C</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Cert C++</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="mCheckFiles">
-     <property name="text">
-      <string>List of files with md5 checksums</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close|QDialogButtonBox::Save</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/cppcheck_de.ts b/gui/cppcheck_de.ts
index 0197f93c728..ee401f8c2a4 100644
--- a/gui/cppcheck_de.ts
+++ b/gui/cppcheck_de.ts
@@ -5,27 +5,32 @@
     <name>About</name>
     <message>
         <location filename="about.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="130"/>
         <source>About Cppcheck</source>
         <translation>Ãœber Cppcheck</translation>
     </message>
     <message>
         <location filename="about.ui" line="64"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="132"/>
         <source>Version %1</source>
         <translation>Version %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="133"/>
         <source>Cppcheck - A tool for static C/C++ code analysis.</source>
         <translation>Cppcheck - Ein Werkzeug zur statischen C/C++-Code-Analyse.</translation>
     </message>
     <message>
         <location filename="about.ui" line="81"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="134"/>
         <source>Copyright © 2007-%1 Cppcheck team.</source>
         <oldsource>Copyright © 2007-2021 Cppcheck team.</oldsource>
         <translation>Copyright © 2007-%1 Cppcheck-Team.</translation>
     </message>
     <message>
         <location filename="about.ui" line="91"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="135"/>
         <source>This program is licensed under the terms
 of the GNU General Public License version 3</source>
         <translation>Dieses Programm ist unter den Bedingungen
@@ -33,11 +38,13 @@ der GNU General Public License Version 3 lizenziert</translation>
     </message>
     <message>
         <location filename="about.ui" line="102"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="137"/>
         <source>Visit Cppcheck homepage at %1</source>
         <translation>Besuchen Sie die Cppcheck-Homepage unter %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;pcre&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;picojson&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tinyxml2&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Vielen Dank den Bibliotheken die wir nutzen:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -47,11 +54,13 @@ der GNU General Public License Version 3 lizenziert</translation>
     <name>ApplicationDialog</name>
     <message>
         <location filename="applicationdialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="161"/>
         <source>Add an application</source>
         <translation>Anwendung hinzufügen</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="162"/>
         <source>Here you can add an application that can open error files. Specify a name for the application, the application executable and command line parameters for the application.
 
 The following texts in parameters are replaced with appropriate values when application is executed:
@@ -78,21 +87,25 @@ Parameter: -l(line) (file)
     </message>
     <message>
         <location filename="applicationdialog.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="173"/>
         <source>&amp;Name:</source>
         <translation>&amp;Name:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="86"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="174"/>
         <source>&amp;Executable:</source>
         <translation>&amp;Ausführbare Datei:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="96"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="175"/>
         <source>&amp;Parameters:</source>
         <translation>&amp;Parameter:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="138"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="176"/>
         <source>Browse</source>
         <translation>Suchen</translation>
     </message>
@@ -107,9 +120,8 @@ Parameter: -l(line) (file)
         <translation>Anzeigeanwendung auswählen</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -120,65 +132,52 @@ Parameter: -l(line) (file)
 <context>
     <name>ComplianceReportDialog</name>
     <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
         <source>Compliance Report</source>
-        <translation>Compliance-Report</translation>
+        <translation type="vanished">Compliance-Report</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
-        <translation>Projektname</translation>
+        <translation type="vanished">Projektname</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
-        <translation>Projekt-Version</translation>
+        <translation type="vanished">Projekt-Version</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
         <source>Coding Standard</source>
-        <translation>Programmierstandards</translation>
+        <translation type="vanished">Programmierstandards</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
         <source>Misra C</source>
-        <translation>Misra C</translation>
+        <translation type="vanished">Misra C</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
         <source>Cert C</source>
-        <translation>Cert C</translation>
+        <translation type="vanished">Cert C</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
         <source>Cert C++</source>
-        <translation>Cert C++</translation>
+        <translation type="vanished">Cert C++</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
         <source>List of files with md5 checksums</source>
-        <translation>Datei-Listen mit MD5-Prüfsummen</translation>
+        <translation type="vanished">Datei-Listen mit MD5-Prüfsummen</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
-        <translation>Compliance-Report</translation>
+        <translation type="vanished">Compliance-Report</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
-        <translation>HTML-Dateien (*.html)</translation>
+        <translation type="vanished">HTML-Dateien (*.html)</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
         <source>Save compliance report</source>
-        <translation>Compliance-Report speichern</translation>
+        <translation type="vanished">Compliance-Report speichern</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
         <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation>Import von &apos;%1&apos; (%2) fehlgeschlagen, Compliance-Report kann nicht angezeigt werden</translation>
+        <translation type="vanished">Import von &apos;%1&apos; (%2) fehlgeschlagen, Compliance-Report kann nicht angezeigt werden</translation>
     </message>
 </context>
 <context>
@@ -189,10 +188,8 @@ Parameter: -l(line) (file)
         <translation>Konnte die Datei nicht finden: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -204,44 +201,49 @@ Parameter: -l(line) (file)
     <name>HelpDialog</name>
     <message>
         <location filename="helpdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="88"/>
         <source>Cppcheck GUI help</source>
         <translation>Cppcheck GUI Hilfe</translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="89"/>
         <source>Contents</source>
         <translation>Inhalt</translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="90"/>
         <source>Index</source>
         <translation>Index</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation>Hilfedatei &apos;%1&apos; nicht gefunden</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
     <name>LibraryAddFunctionDialog</name>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="105"/>
         <source>Add function</source>
         <translation>Funktion hinzufügen</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="106"/>
         <source>Function name(s)</source>
         <translation>Funktionsname(n)</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="107"/>
         <source>Number of arguments</source>
         <translation>Anzahl Argumente</translation>
     </message>
@@ -250,124 +252,138 @@ Parameter: -l(line) (file)
     <name>LibraryDialog</name>
     <message>
         <location filename="librarydialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="275"/>
         <source>Library Editor</source>
         <translation>Bibliothekseditor</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="22"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="276"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="29"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="277"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="36"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="278"/>
         <source>Save as</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="62"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="279"/>
         <source>Functions</source>
         <translation>Funktionen</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="280"/>
         <source>Sort</source>
         <translation>Sortiere</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="111"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="281"/>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="282"/>
         <source>Filter:</source>
         <translation>Filter:</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="164"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="283"/>
         <source>Comments</source>
         <translation>Kommentare</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="204"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="284"/>
         <source>noreturn</source>
         <translation>Zurückkehrend</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="212"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="285"/>
         <source>False</source>
         <translation>Ja</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="286"/>
         <source>True</source>
         <translation>Nein</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="222"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="287"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="232"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="289"/>
         <source>return value must be used</source>
         <translation>Rückgabewert muss genutzt werden</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="239"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="290"/>
         <source>ignore function in leaks checking</source>
         <translation>Ignoriere Funktion in Speicherleck-Prüfung</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="291"/>
         <source>Arguments</source>
         <translation>Argumente</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="258"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="292"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation>Bibliotheksdateien (*.cfg)</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation>Bibliothek öffnen</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <translation>Datei %1 kann nicht geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation>%1 kann nicht geladen werden. %2.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <translation>Datei %1 kann nicht gespeichert werden.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation>Speichere Bibliothek unter</translation>
     </message>
@@ -376,11 +392,13 @@ Parameter: -l(line) (file)
     <name>LibraryEditArgDialog</name>
     <message>
         <location filename="libraryeditargdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="284"/>
         <source>Edit argument</source>
         <translation>Argument bearbeiten</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="286"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is bool value allowed? For instance result from comparison or from &apos;!&apos; operator.&lt;/p&gt;
 &lt;p&gt;Typically, set this if the argument is a pointer, size, etc.&lt;/p&gt;
@@ -396,11 +414,13 @@ Parameter: -l(line) (file)
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="28"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="293"/>
         <source>Not bool</source>
         <translation>Nicht boolsch</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="35"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is a null parameter value allowed?&lt;/p&gt;
 &lt;p&gt;Typically this should be used on any pointer parameter that does not allow null.&lt;/p&gt;
@@ -416,78 +436,99 @@ Parameter: -l(line) (file)
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="43"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="302"/>
         <source>Not null</source>
         <translation>Nicht Null</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="50"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="303"/>
         <source>Not uninit</source>
         <translation>Nicht uninitialisiert</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="57"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="304"/>
         <source>String</source>
         <translation>String</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="70"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="305"/>
         <source>Format string</source>
         <translation>Formatstring</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="306"/>
         <source>Min size of buffer</source>
         <translation>Minimale Puffergröße</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="101"/>
         <location filename="libraryeditargdialog.ui" line="203"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="307"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="316"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="109"/>
         <location filename="libraryeditargdialog.ui" line="214"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="308"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="317"/>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="114"/>
         <location filename="libraryeditargdialog.ui" line="219"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="309"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="318"/>
         <source>argvalue</source>
         <translation>Argumentwert</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="119"/>
         <location filename="libraryeditargdialog.ui" line="224"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="319"/>
         <source>mul</source>
         <translation>Multiplikation</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="124"/>
         <location filename="libraryeditargdialog.ui" line="229"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="311"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="320"/>
         <source>strlen</source>
         <translation>strlen</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="132"/>
         <location filename="libraryeditargdialog.ui" line="237"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="313"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="322"/>
         <source>Arg</source>
         <translation>Argument 1</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="159"/>
         <location filename="libraryeditargdialog.ui" line="264"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="323"/>
         <source>Arg2</source>
         <translation>Argument 2</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="194"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="315"/>
         <source>and</source>
         <translation>und</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="324"/>
         <source>Valid values</source>
         <translation>Zulässige Werte</translation>
     </message>
@@ -495,608 +536,711 @@ Parameter: -l(line) (file)
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="687"/>
-        <location filename="mainwindow.cpp" line="463"/>
-        <location filename="mainwindow.cpp" line="667"/>
-        <location filename="mainwindow.cpp" line="752"/>
-        <location filename="mainwindow.cpp" line="857"/>
-        <location filename="mainwindow.cpp" line="879"/>
-        <location filename="mainwindow.cpp" line="1466"/>
-        <location filename="mainwindow.cpp" line="1595"/>
-        <location filename="mainwindow.cpp" line="1936"/>
-        <location filename="mainwindow.cpp" line="1944"/>
-        <location filename="mainwindow.cpp" line="1998"/>
-        <location filename="mainwindow.cpp" line="2007"/>
-        <location filename="mainwindow.cpp" line="2079"/>
-        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="266"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="749"/>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="740"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="741"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="742"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Symbolleisten</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="209"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="745"/>
         <source>A&amp;nalyze</source>
         <translation>A&amp;nalysieren</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="213"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="746"/>
         <source>C++ standard</source>
         <translation>C++-Standard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="225"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="747"/>
         <source>&amp;C standard</source>
         <translation>&amp;C-Standard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="748"/>
         <source>&amp;Edit</source>
         <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="578"/>
         <source>&amp;License...</source>
         <translation>&amp;Lizenz...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="319"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="579"/>
         <source>A&amp;uthors...</source>
         <translation>&amp;Autoren...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="328"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="580"/>
         <source>&amp;About...</source>
         <translation>Ü&amp;ber...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="333"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="581"/>
         <source>&amp;Files...</source>
         <translation>&amp;Dateien...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="336"/>
         <location filename="mainwindow.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="582"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="584"/>
         <source>Analyze files</source>
         <translation>Analysiere Dateien</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="342"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="587"/>
         <source>Ctrl+F</source>
         <translation>Strg+F</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="351"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="589"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Verzeichnis...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="354"/>
         <location filename="mainwindow.ui" line="357"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="590"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="592"/>
         <source>Analyze directory</source>
         <translation>Analysiere Verzeichnis</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="595"/>
         <source>Ctrl+D</source>
         <translation>Strg+D</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="599"/>
         <source>Ctrl+R</source>
         <translation>Strg+R</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="602"/>
         <source>&amp;Stop</source>
         <translation>&amp;Stoppen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="393"/>
         <location filename="mainwindow.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="603"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="605"/>
         <source>Stop analysis</source>
         <translation>Analyse abbrechen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="608"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="610"/>
         <source>&amp;Save results to file...</source>
         <translation>&amp;Ergebnisse in Datei speichern...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="411"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="612"/>
         <source>Ctrl+S</source>
         <translation>Strg+S</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="416"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="614"/>
         <source>&amp;Quit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="428"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="618"/>
         <source>&amp;Clear results</source>
         <translation>Ergebnisse &amp;löschen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="619"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Einstellungen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="470"/>
         <location filename="mainwindow.ui" line="473"/>
-        <location filename="mainwindow.cpp" line="2379"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="626"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="628"/>
+        <location filename="mainwindow.cpp" line="2408"/>
         <source>Show errors</source>
         <translation>Zeige Fehler</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="616"/>
         <location filename="mainwindow.ui" line="619"/>
-        <location filename="mainwindow.cpp" line="2380"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="668"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="670"/>
+        <location filename="mainwindow.cpp" line="2409"/>
         <source>Show warnings</source>
         <translation>Zeige Warnungen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="634"/>
         <location filename="mainwindow.ui" line="637"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="673"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="675"/>
         <source>Show performance warnings</source>
         <translation>Zeige Performance-Warnungen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="645"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="677"/>
         <source>Show &amp;hidden</source>
         <translation>Zeige &amp;versteckte</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1015"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="660"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="680"/>
         <source>Show information messages</source>
         <translation>Zeige Informationsmeldungen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="675"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="684"/>
         <source>Show portability warnings</source>
         <translation>Zeige Portabilitätswarnungen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="690"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="687"/>
         <source>Show Cppcheck results</source>
         <translation>Zeige Cppcheck-Ergebnisse</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="702"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="689"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="705"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="691"/>
         <source>Show Clang results</source>
         <translation>Zeige Clang-Ergebnisse</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="713"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="693"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filter</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="716"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="695"/>
         <source>Filter results</source>
         <translation>Gefilterte Ergebnisse</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="732"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="697"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit, ANSI</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="740"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="698"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit, Unicode</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="748"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="699"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="756"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="700"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="764"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="701"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="858"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="709"/>
         <source>&amp;Print...</source>
         <translation>Drucken...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="861"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="711"/>
         <source>Print the Current Report</source>
         <translation>Aktuellen Bericht ausdrucken</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="866"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="713"/>
         <source>Print Pre&amp;view...</source>
         <translation>Druckvorschau</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="869"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="715"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation>Druckvorschaudialog für aktuelle Ergebnisse öffnen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="877"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="719"/>
         <source>Open library editor</source>
         <translation>Bibliothekseditor öffnen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="478"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="630"/>
         <source>&amp;Check all</source>
         <translation>Alle &amp;auswählen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="738"/>
         <source>Checking for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="100"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="739"/>
         <source>Hide</source>
         <translation type="unfinished">Verstecken</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="163"/>
         <location filename="mainwindow.ui" line="979"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="730"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="743"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="303"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="751"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="369"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="597"/>
         <source>&amp;Reanalyze modified files</source>
         <translation>Veränderte Dateien neu analysieren</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="381"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="601"/>
         <source>Reanal&amp;yze all files</source>
         <translation>Alle Dateien erneut anal&amp;ysieren</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="419"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="616"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="620"/>
         <source>Style war&amp;nings</source>
         <translation>Stilwar&amp;nungen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="467"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="625"/>
         <source>E&amp;rrors</source>
         <translation>F&amp;ehler</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="483"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="631"/>
         <source>&amp;Uncheck all</source>
         <translation>Alle a&amp;bwählen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="488"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="632"/>
         <source>Collapse &amp;all</source>
         <translation>Alle &amp;reduzieren</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="493"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="633"/>
         <source>&amp;Expand all</source>
         <translation>Alle &amp;erweitern</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="501"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="634"/>
         <source>&amp;Standard</source>
         <translation>&amp;Standard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="636"/>
         <source>Standard items</source>
         <translation>Standardeinträge</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="645"/>
         <source>Toolbar</source>
         <translation>Symbolleiste</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="528"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="646"/>
         <source>&amp;Categories</source>
         <translation>&amp;Kategorien</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="531"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="648"/>
         <source>Error categories</source>
         <translation>Fehler-Kategorien</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="536"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="650"/>
         <source>&amp;Open XML...</source>
         <translation>Öffne &amp;XML...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="545"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="651"/>
         <source>Open P&amp;roject File...</source>
         <translation>Pr&amp;ojektdatei öffnen...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="548"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="653"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="655"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>&amp;Zeige Schmierzettel...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="562"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="656"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;Neue Projektdatei...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="565"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="658"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="570"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="660"/>
         <source>&amp;Log View</source>
         <translation>&amp;Loganzeige</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="573"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="662"/>
         <source>Log View</source>
         <translation>Loganzeige</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="581"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="664"/>
         <source>C&amp;lose Project File</source>
         <translation>Projektdatei &amp;schließen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="589"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="665"/>
         <source>&amp;Edit Project File...</source>
         <translation>Projektdatei &amp;bearbeiten...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="601"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="666"/>
         <source>&amp;Statistics</source>
         <translation>&amp;Statistik</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="613"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="667"/>
         <source>&amp;Warnings</source>
         <translation>&amp;Warnungen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="631"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="672"/>
         <source>Per&amp;formance warnings</source>
         <translation>Per&amp;formance-Warnungen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="657"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="678"/>
         <source>&amp;Information</source>
         <translation>&amp;Information</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="672"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="682"/>
         <source>&amp;Portability</source>
         <translation>&amp;Portabilität</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="772"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="702"/>
         <source>P&amp;latforms</source>
         <translation>P&amp;lattformen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="786"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="703"/>
         <source>C++&amp;11</source>
         <translation>C++&amp;11</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="797"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="704"/>
         <source>C&amp;99</source>
         <translation>C&amp;99</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="805"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="705"/>
         <source>&amp;Posix</source>
         <translation>Posix</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="813"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="706"/>
         <source>C&amp;11</source>
         <translation>C&amp;11</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="845"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="707"/>
         <source>&amp;C89</source>
         <translation>&amp;C89</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="853"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="708"/>
         <source>&amp;C++03</source>
         <translation>&amp;C++03</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="874"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="717"/>
         <source>&amp;Library Editor...</source>
         <translation>&amp;Bibliothekseditor</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="721"/>
         <source>&amp;Auto-detect language</source>
         <translation>Sprache &amp;automatisch erkennen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="893"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="722"/>
         <source>&amp;Enforce C++</source>
         <translation>C++ &amp;erzwingen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="901"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="723"/>
         <source>E&amp;nforce C</source>
         <translation>C e&amp;rzwingen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="912"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="724"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="920"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="725"/>
         <source>Reanalyze and check library</source>
         <translation>Neu analysieren und Bibliothek prüfen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="928"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="726"/>
         <source>Check configuration (defines, includes)</source>
         <translation>Prüfe Konfiguration (Definitionen, Includes)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="936"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="727"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="728"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="729"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="987"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="731"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="995"/>
         <source>Misra C</source>
-        <translation>Misra C</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1003"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Misra C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1011"/>
         <source>Cert C</source>
-        <translation>Cert C</translation>
+        <translation type="vanished">Cert C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1019"/>
         <source>Cert C++</source>
-        <translation>Cert C++</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1027"/>
-        <source>Misra C++ 2023</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Cert C++</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="1035"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="732"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="1040"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="733"/>
         <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="mainwindow.ui" line="1045"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="734"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1048"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="736"/>
+        <source>Show thread details</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="mainwindow.ui" line="509"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="638"/>
         <source>&amp;Contents</source>
         <translation>&amp;Inhalte</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="284"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="750"/>
         <source>Categories</source>
         <translation>Kategorien</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="452"/>
         <location filename="mainwindow.ui" line="455"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="621"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="623"/>
         <source>Show style warnings</source>
         <translation>Zeige Stilwarnungen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="512"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="640"/>
         <source>Open the help contents</source>
         <translation>Öffnet die Hilfe-Inhalte</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="515"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="643"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="198"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="744"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="155"/>
-        <location filename="mainwindow.cpp" line="1781"/>
+        <location filename="mainwindow.cpp" line="176"/>
+        <location filename="mainwindow.cpp" line="1812"/>
         <source>Quick Filter:</source>
         <translation>Schnellfilter:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="601"/>
+        <source>None of the selected files is part of the project, nothing to analyze.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select configuration</source>
         <translation>Konfiguration wählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="858"/>
+        <location filename="mainwindow.cpp" line="890"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1105,102 +1249,102 @@ Do you want to load this project file instead?</source>
 Möchten Sie stattdessen diese öffnen?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="992"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>File not found</source>
         <translation>Datei nicht gefunden</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="995"/>
+        <location filename="mainwindow.cpp" line="1027"/>
         <source>Bad XML</source>
         <translation>Fehlerhaftes XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1030"/>
         <source>Missing attribute</source>
         <translation>Fehlendes Attribut</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1001"/>
+        <location filename="mainwindow.cpp" line="1033"/>
         <source>Bad attribute value</source>
         <translation>Falscher Attributwert</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1007"/>
+        <location filename="mainwindow.cpp" line="1039"/>
         <source>Duplicate platform type</source>
         <translation>Plattformtyp doppelt</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1010"/>
+        <location filename="mainwindow.cpp" line="1042"/>
         <source>Platform type redefined</source>
         <translation>Plattformtyp neu definiert</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1013"/>
+        <location filename="mainwindow.cpp" line="1045"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation>Laden der ausgewählten Bibliothek &apos;%1&apos; schlug fehl.
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1035"/>
+        <location filename="mainwindow.cpp" line="1064"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1058"/>
+        <location filename="mainwindow.cpp" line="1087"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1120"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1700"/>
         <source>License</source>
         <translation>Lizenz</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1654"/>
+        <location filename="mainwindow.cpp" line="1707"/>
         <source>Authors</source>
         <translation>Autoren</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1674"/>
+        <location filename="mainwindow.cpp" line="1727"/>
         <source>Save the report file</source>
         <translation>Speichert die Berichtdatei</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1482"/>
-        <location filename="mainwindow.cpp" line="1681"/>
+        <location filename="mainwindow.cpp" line="1539"/>
+        <location filename="mainwindow.cpp" line="1734"/>
         <source>XML files (*.xml)</source>
         <translation>XML-Dateien (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="458"/>
+        <location filename="mainwindow.cpp" line="477"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -1209,37 +1353,32 @@ This is probably because the settings were changed between the Cppcheck versions
 Dies wurde vermutlich durch einen Wechsel der Cppcheck-Version hervorgerufen. Bitte prüfen (und korrigieren) Sie die Einstellungen, andernfalls könnte die Editor-Anwendung nicht korrekt starten.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="753"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>Sie müssen die Projektdatei schließen, bevor Sie neue Dateien oder Verzeichnisse auswählen!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1015"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>Die Bibliothek &apos;%1&apos; enthält unbekannte Elemente:
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1004"/>
+        <location filename="mainwindow.cpp" line="1036"/>
         <source>Unsupported format</source>
         <translation>Nicht unterstütztes Format</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1016"/>
+        <location filename="mainwindow.cpp" line="1048"/>
         <source>Unknown element</source>
         <translation>Unbekanntes Element</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1019"/>
-        <source>Unknown issue</source>
-        <translation>Unbekannter Fehler</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1080"/>
-        <location filename="mainwindow.cpp" line="1090"/>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1120"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
@@ -1248,80 +1387,78 @@ Dies wurde vermutlich durch einen Wechsel der Cppcheck-Version hervorgerufen. Bi
         <translation type="vanished">Laden von %1 fehlgeschlagen. Ihre Cppcheck-Installation ist defekt. Sie können --data-dir=&lt;Verzeichnis&gt; als Kommandozeilenparameter verwenden, um anzugeben, wo die Datei sich befindet. Bitte beachten Sie, dass --data-dir in Installationsroutinen genutzt werden soll, und die GUI bei dessen Nutzung nicht startet, sondern die Einstellungen konfiguriert.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1484"/>
+        <location filename="mainwindow.cpp" line="1541"/>
         <source>Open the report file</source>
         <translation>Berichtdatei öffnen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1685"/>
+        <location filename="mainwindow.cpp" line="1738"/>
         <source>Text files (*.txt)</source>
         <translation>Textdateien (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1689"/>
+        <location filename="mainwindow.cpp" line="1742"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV-Dateien (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1819"/>
+        <location filename="mainwindow.cpp" line="1850"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Projektdateien (*.cppcheck);;Alle Dateien(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="1852"/>
         <source>Select Project File</source>
         <translation>Projektdatei auswählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="239"/>
-        <location filename="mainwindow.cpp" line="1783"/>
-        <location filename="mainwindow.cpp" line="1849"/>
-        <location filename="mainwindow.cpp" line="2047"/>
+        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="1814"/>
+        <location filename="mainwindow.cpp" line="1880"/>
+        <location filename="mainwindow.cpp" line="2062"/>
         <source>Project:</source>
         <translation>Projekt:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="668"/>
+        <location filename="mainwindow.cpp" line="702"/>
         <source>No suitable files found to analyze!</source>
         <translation>Keine passenden Dateien für Analyse gefunden!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="767"/>
+        <location filename="mainwindow.cpp" line="798"/>
         <source>C/C++ Source</source>
         <translation>C/C++-Quellcode</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="768"/>
+        <location filename="mainwindow.cpp" line="799"/>
         <source>Compile database</source>
         <translation>Compilerdatenbank</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++-Builder 6</translation>
+        <translation type="vanished">Borland C++-Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="773"/>
+        <location filename="mainwindow.cpp" line="804"/>
         <source>Select files to analyze</source>
         <translation>Dateien für Analyse auswählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="819"/>
         <source>Select directory to analyze</source>
         <translation>Verzeichnis für Analyse auswählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>Zu analysierende Konfiguration auswählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="880"/>
+        <location filename="mainwindow.cpp" line="912"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1330,7 +1467,7 @@ Do you want to proceed analysis without using any of these project files?</sourc
 Wollen sie fortfahren, ohne diese Projektdateien zu nutzen?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1467"/>
+        <location filename="mainwindow.cpp" line="1524"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1341,7 +1478,7 @@ Eine neue XML-Datei zu öffnen wird die aktuellen Ergebnisse löschen
 Möchten sie fortfahren?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1591"/>
+        <location filename="mainwindow.cpp" line="1644"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1350,109 +1487,104 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 Wollen sie die Analyse abbrechen und Cppcheck beenden?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1633"/>
+        <location filename="mainwindow.cpp" line="1686"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1672"/>
+        <location filename="mainwindow.cpp" line="1725"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML-Dateien (*.xml);;Textdateien (*.txt);;CSV-Dateien (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1712"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1937"/>
+        <location filename="mainwindow.cpp" line="1951"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>Erstellungsverzeichnis &apos;%1&apos; existiert nicht. Erstellen?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1945"/>
+        <location filename="mainwindow.cpp" line="1959"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1977"/>
+        <location filename="mainwindow.cpp" line="1992"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1995"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1983"/>
+        <location filename="mainwindow.cpp" line="1998"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1999"/>
+        <location filename="mainwindow.cpp" line="2014"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2008"/>
+        <location filename="mainwindow.cpp" line="2023"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2352"/>
+        <location filename="mainwindow.cpp" line="2381"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2353"/>
+        <location filename="mainwindow.cpp" line="2382"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2354"/>
+        <location filename="mainwindow.cpp" line="2383"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2355"/>
+        <location filename="mainwindow.cpp" line="2384"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2372"/>
+        <location filename="mainwindow.cpp" line="2401"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2373"/>
+        <location filename="mainwindow.cpp" line="2402"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2374"/>
+        <location filename="mainwindow.cpp" line="2403"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2381"/>
+        <location filename="mainwindow.cpp" line="2410"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2382"/>
+        <location filename="mainwindow.cpp" line="2411"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2383"/>
+        <location filename="mainwindow.cpp" line="2412"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2384"/>
+        <location filename="mainwindow.cpp" line="2413"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1461,22 +1593,22 @@ Analysis is stopped.</source>
         <translation type="vanished">Import von &apos;%1&apos; fehlgeschlagen; Analyse wurde abgebrochen.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2032"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project files (*.cppcheck)</source>
         <translation>Projektdateien (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2034"/>
+        <location filename="mainwindow.cpp" line="2049"/>
         <source>Select Project Filename</source>
         <translation>Projektnamen auswählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2080"/>
+        <location filename="mainwindow.cpp" line="2095"/>
         <source>No project file loaded</source>
         <translation>Keine Projektdatei geladen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2148"/>
+        <location filename="mainwindow.cpp" line="2177"/>
         <source>The project file
 
 %1
@@ -1493,12 +1625,12 @@ Do you want to remove the file from the recently used projects -list?</source>
 Möchten Sie die Datei von der Liste der zuletzt benutzten Projekte entfernen?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2310"/>
+        <location filename="mainwindow.cpp" line="2339"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2314"/>
+        <location filename="mainwindow.cpp" line="2343"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1543,26 +1675,31 @@ Options:
     <name>NewSuppressionDialog</name>
     <message>
         <location filename="newsuppressiondialog.ui" line="17"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="114"/>
         <source>New suppression</source>
         <translation>Neue Fehlerunterdrückung</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="25"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="115"/>
         <source>Error ID</source>
         <translation>Fehler-ID</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="32"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="116"/>
         <source>File name</source>
         <translation>Dateiname</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="42"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="117"/>
         <source>Line number</source>
         <translation>Zeilennummer</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="52"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="118"/>
         <source>Symbol name</source>
         <translation>Symbolname</translation>
     </message>
@@ -1580,55 +1717,55 @@ Options:
         <translation>Nativ</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit, ANSI</translation>
+        <translation type="vanished">Windows 32-bit, ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit, Unicode</translation>
+        <translation type="vanished">Windows 32-bit, Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
 </context>
 <context>
     <name>ProjectFile</name>
     <message>
         <location filename="projectfile.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="923"/>
         <source>Project File</source>
         <translation>Projektdatei</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="955"/>
         <source>Paths and Defines</source>
         <translation>Pfade und Definitionen</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="30"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="924"/>
         <source>Import Project (Visual studio / compile database/ Borland C++ Builder 6)</source>
         <translation>Importiere Projekt (Visual Studio / Compile-Datenbank / Borland C++-Builder 6)</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="231"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="938"/>
         <source>Defines must be separated by a semicolon. Example: DEF1;DEF2=5;DEF3=int</source>
         <translation>Definitionen müssen mit einem Semikolon getrennt werden. Beispiel: DEF1;DEF2=5;DEF3=int</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="958"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation>Hinweis: Legen Sie eigene .cfg-Dateien in den Ordner der Projektdatei. Dann sollten sie oben sichtbar werden.</translation>
     </message>
@@ -1637,359 +1774,451 @@ Options:
         <translation type="vanished">MISRA C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="876"/>
+        <location filename="projectfile.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1011"/>
         <source>MISRA rule texts</source>
         <translation>MISRA-Regeltexte</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="883"/>
+        <location filename="projectfile.ui" line="892"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1013"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Text aus Anhang A &amp;quot;Summary of guidelines&amp;quot; aus der MISRA-C-2012-PDF in eine Textdatei einfügen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="890"/>
+        <location filename="projectfile.ui" line="899"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1015"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="73"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="928"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You have a choice:&lt;/p&gt;&lt;p&gt; * Analyze all Debug and Release configurations&lt;/p&gt;&lt;p&gt; * Only analyze the first matching Debug configuration&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sie haben die Auswahl:&lt;/p&gt;&lt;p&gt; * Alle Debug- und Release-Konfigurationen analysieren&lt;/p&gt;&lt;p&gt; * Nur die erste passende Debug-Konfiguration analysieren&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="926"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="964"/>
         <source>Browse...</source>
         <translation>Durchsuchen...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="930"/>
         <source>Analyze all Visual Studio configurations</source>
         <translation>Alle Visual-Studio-Konfigurationen analysieren</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="113"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="931"/>
         <source>Selected VS Configurations</source>
         <translation>Ausgewählte VS-Konfiguration</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="147"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="932"/>
         <source>Paths:</source>
         <translation>Pfade:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="181"/>
         <location filename="projectfile.ui" line="296"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="933"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="945"/>
         <source>Add...</source>
         <translation>Hinzufügen...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="934"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="994"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="935"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="995"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="998"/>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="242"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="940"/>
         <source>Undefines:</source>
         <translation>Un-Definitionen:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="252"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="942"/>
         <source>Undefines must be separated by a semicolon. Example: UNDEF1;UNDEF2;UNDEF3</source>
         <translation>Un-Definitionen müssen Semikolon-getrennt sein. Beispiel: UNDEF1;UNDEF2;UNDEF3</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="265"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="944"/>
         <source>Include Paths:</source>
         <translation>Includepfade:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="330"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="948"/>
         <source>Up</source>
         <translation>Auf</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="337"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="949"/>
         <source>Down</source>
         <translation>Ab</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="350"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="950"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="952"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="954"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="956"/>
         <source>Platform</source>
         <translation>Plattform</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="972"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="982"/>
         <source>Analysis</source>
         <translation>Analyse</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="962"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="967"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="968"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="969"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="970"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="971"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="974"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="979"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation>Prüfe Code in ungenutzten Templates (normalerweise AN, theoretisch können Warnungen in ungenutzten Templates gefahrlos ignoriert werden)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="980"/>
         <source>Max CTU depth</source>
         <translation>Maximale CTU-Tiefe</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="981"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1000"/>
         <source>Warning options</source>
         <translation>Warnoptionen</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="983"/>
         <source>Root path:</source>
         <translation>Wurzelverzeichnis:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="985"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="987"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>Warnungs-Tags (Semikolon-getrennt)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="999"/>
         <source>Enable inline suppressions</source>
         <translation>Inline-Fehlerunterdrückung aktivieren</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="851"/>
+        <location filename="projectfile.ui" line="860"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1009"/>
         <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="901"/>
+        <location filename="projectfile.ui" line="910"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1016"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="918"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1017"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="937"/>
+        <location filename="projectfile.ui" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1020"/>
         <source>Cert C</source>
         <translation>Cert C</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="946"/>
+        <location filename="projectfile.ui" line="955"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1021"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="965"/>
+        <location filename="projectfile.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1023"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="981"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1024"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1026"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="991"/>
+        <location filename="projectfile.ui" line="1007"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1027"/>
         <source>External tools</source>
         <translation>Externe Werkzeuge</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="960"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation>Cppcheck-Arbeitsverzeichnis (Vollständige Programmanalyse, inkrementelle Analyse, Statistiken, etc.)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="959"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="957"/>
         <source>Libraries</source>
         <translation>Bibliotheken</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="965"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="966"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="976"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="977"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="978"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="989"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="991"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="992"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="993"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="996"/>
         <source>Suppressions</source>
         <translation>Fehlerunterdrückungen</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="997"/>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1001"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1028"/>
         <source>Addons</source>
         <translation>Add-Ons</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1002"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1003"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1004"/>
         <source>Thread safety</source>
         <translation>Threadsicherheit</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1005"/>
         <source>Coding standards</source>
         <translation>Programmierstandards</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1006"/>
         <source>Misra C</source>
         <translation>Misra C</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1007"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="914"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1008"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1018"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="958"/>
+        <location filename="projectfile.ui" line="967"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1022"/>
         <source>Cert C++</source>
         <translation>Cert C++</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="975"/>
+        <location filename="projectfile.ui" line="991"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1025"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
-        <translation>Clang-Analyzer</translation>
+        <translation type="vanished">Clang-Analyzer</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
-        <translation>Clang-Tidy</translation>
+        <translation type="vanished">Clang-Tidy</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="936"/>
         <source>Defines:</source>
         <translation>Definitionen:</translation>
     </message>
@@ -2002,77 +2231,86 @@ Options:
         <translation>Projektdatei: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="604"/>
+        <location filename="projectfiledialog.cpp" line="585"/>
         <source>Select Cppcheck build dir</source>
         <translation>Wähle Cppcheck-Erstellungsverzeichnis</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="865"/>
+        <location filename="projectfiledialog.cpp" line="861"/>
         <source>Select include directory</source>
         <translation>Wähle Include-Verzeichnisse</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="845"/>
+        <location filename="projectfiledialog.cpp" line="841"/>
         <source>Select a directory to check</source>
         <translation>Wähle zu prüfendes Verzeichnis</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="414"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation>Hinweis: Open-Source Cppcheck implementiert Misra C 2012 nicht vollständig</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="477"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (nicht gefunden)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="644"/>
+        <location filename="projectfiledialog.cpp" line="625"/>
         <source>Compile database</source>
         <translation>Compilerdatenbank</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++-Builder 6</translation>
+        <translation type="vanished">Borland C++-Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="646"/>
+        <location filename="projectfiledialog.cpp" line="627"/>
         <source>Import Project</source>
         <translation>Projekt importieren</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="885"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
+        <source>C/C++ header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="648"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="881"/>
         <source>Select directory to ignore</source>
         <translation>Wähle zu ignorierendes Verzeichnis</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="893"/>
+        <location filename="projectfiledialog.cpp" line="889"/>
         <source>Source files</source>
         <translation>Quelltext-Dateien</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="894"/>
+        <location filename="projectfiledialog.cpp" line="647"/>
+        <location filename="projectfiledialog.cpp" line="890"/>
         <source>All files</source>
         <translation>Alle Dateien</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="895"/>
+        <location filename="projectfiledialog.cpp" line="891"/>
         <source>Exclude file</source>
         <translation>Datei ausschließen</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="978"/>
+        <location filename="projectfiledialog.cpp" line="976"/>
         <source>Select MISRA rule texts file</source>
         <translation>Wähle MISRA-Regeltext-Datei</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="980"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>MISRA rule texts file (%1)</source>
         <translation>MISRA-Regeltext-Datei (%1)</translation>
     </message>
@@ -2105,7 +2343,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="302"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation> (nicht gefunden)</translation>
     </message>
@@ -2155,160 +2393,155 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <translation>Klassen-Vordergrundfarbe</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="142"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="144"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="114"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">Datei</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="115"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Zeile</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="116"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Schweregrad</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="117"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="118"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="119"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished">Unklar</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="120"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">Zusammenfassung</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="121"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="122"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="123"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="124"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished">Seit Datum</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="125"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="126"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
@@ -2356,88 +2589,86 @@ Options:
         <translation type="vanished">Undefinierte Datei</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="657"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="825"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation>Kann Datei nicht finden:</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="829"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation>Bitte wählen Sie den Ordner &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="830"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>Wähle Verzeichnis &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="832"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation>Bitte wählen Sie das Verzeichnis, in dem sich die Datei befindet.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="367"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>Debug</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="298"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation>Anmerkung</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="659"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation>Verstecke alle mit gleicher ID</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="681"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation>Ausgewählte ID(s) unterdrücken</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="660"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation>Übergeordneten Ordner öffnen</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="370"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation>Intern</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="656"/>
+        <location filename="resultstree.cpp" line="667"/>
         <source>Recheck %1 file(s)</source>
         <translation>Erneut %1 Datei(en) prüfen</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="658"/>
+        <location filename="resultstree.cpp" line="669"/>
         <source>Hide %1 result(s)</source>
         <translation>Verstecke %1 Ergebnis(se)</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="701"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation>Tag</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="703"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation>Kein Tag</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="733"/>
-        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="734"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2446,7 +2677,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 Konfigurieren Sie diese unter Einstellungen/Anwendungen.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="748"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2455,12 +2686,12 @@ Please select the default editor application in preferences/Applications.</sourc
  Bitte wählen Sie eine Standardanwendung unter Einstellungen/Anwendungen.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="768"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>Datei konnte nicht gefunden werden!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="811"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2469,37 +2700,37 @@ Please check the application path and parameters are correct.</source>
 Bitte überprüfen Sie ob der Pfad und die Parameter der Anwendung richtig eingestellt sind.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="833"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>Wähle Verzeichnis</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="349"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>Stil</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="352"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="355"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="358"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>Performance</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="361"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>Portabilität</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="364"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>Information</translation>
     </message>
@@ -2507,122 +2738,124 @@ Bitte überprüfen Sie ob der Pfad und die Parameter der Anwendung richtig einge
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="255"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>Bericht drucken</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="274"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation>Keine Funde, nichts zu drucken.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="326"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 von %2 Dateien geprüft)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="350"/>
-        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="351"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>Keine Fehler gefunden.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="358"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Es wurden Fehler gefunden, aber sie sind so konfiguriert, ausgeblendet zu werden.
 Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werden sollen.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>Lesen des Berichts fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>XML-Format-Version 1 wird nicht länger unterstützt.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="460"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation>Zuerst inkludiert von</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="465"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="539"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Clear Log</source>
         <translation>Protokoll leeren</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="540"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy this Log entry</source>
         <translation>Diesen Protokolleintrag kopieren</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="541"/>
+        <location filename="resultsview.cpp" line="538"/>
         <source>Copy complete Log</source>
         <translation>Gesamtes Protokoll kopieren</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="549"/>
+        <location filename="resultsview.cpp" line="545"/>
         <source>Analysis was stopped</source>
         <translation>Analyse wurde gestoppt</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="563"/>
+        <location filename="resultsview.cpp" line="559"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation>Kritischer Fehler mit ID &apos;%1&apos; aufgetreten</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="565"/>
+        <location filename="resultsview.cpp" line="561"/>
         <source>when checking %1</source>
         <translation>beim Prüfen von %1</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="567"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>when checking a file</source>
         <translation>beim Prüfen einer Datei</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="568"/>
+        <location filename="resultsview.cpp" line="564"/>
         <source>Analysis was aborted.</source>
         <translation>Analyse abgebrochen.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="237"/>
-        <location filename="resultsview.cpp" line="245"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>Der Bericht konnte nicht speichern werden.</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="26"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="147"/>
         <source>Results</source>
         <translation>Berichte</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="60"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="148"/>
         <source>Critical errors</source>
         <translation>Kritische Fehler</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="149"/>
         <source>Analysis Log</source>
         <translation>Analyseprotokoll</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="114"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="150"/>
         <source>Warning Details</source>
         <translation>Warnungs-Details</translation>
     </message>
@@ -2631,26 +2864,31 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
     <name>ScratchPad</name>
     <message>
         <location filename="scratchpad.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="107"/>
         <source>Scratchpad</source>
         <translation>Schmierzettel</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="108"/>
         <source>Copy or write some C/C++ code here:</source>
         <translation>Kopieren oder schreiben Sie C/C++-Code hierher:</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="37"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="109"/>
         <source>Optionally enter a filename (mainly for automatic language detection) and click on &quot;Check&quot;:</source>
         <translation>Optional einen Dateinamen (hauptsächlich für automatische Spracherkennung) eingeben und auf &quot;Prüfe&quot; klicken:</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="110"/>
         <source>filename</source>
         <translation>Dateiname</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="78"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="111"/>
         <source>Check</source>
         <translation>Prüfe</translation>
     </message>
@@ -2659,21 +2897,25 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
     <name>Settings</name>
     <message>
         <location filename="settings.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="490"/>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <location filename="settings.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="502"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
         <location filename="settings.ui" line="196"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="503"/>
         <source>Add...</source>
         <translation>Hinzufügen...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="491"/>
         <source>Number of threads: </source>
         <translation>Anzahl der Threads: </translation>
     </message>
@@ -2683,56 +2925,67 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
     </message>
     <message>
         <location filename="settings.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="493"/>
         <source>Force checking all #ifdef configurations</source>
         <translation>Erzwinge Prüfung aller #ifdef-Konfigurationen</translation>
     </message>
     <message>
         <location filename="settings.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="494"/>
         <source>Show full path of files</source>
         <translation>Vollständigen Dateipfad anzeigen</translation>
     </message>
     <message>
         <location filename="settings.ui" line="122"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="495"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>&quot;Keine Fehler gefunden&quot;-Meldung anzeigen, wenn keine Fehler gefunden werden</translation>
     </message>
     <message>
         <location filename="settings.ui" line="129"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="496"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>Zeige Meldungs-Id in Spalte &quot;Id&quot;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="136"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="497"/>
         <source>Enable inline suppressions</source>
         <translation>Inline-Fehlerunterdrückung aktivieren</translation>
     </message>
     <message>
         <location filename="settings.ui" line="143"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="498"/>
         <source>Check for inconclusive errors also</source>
         <translation>Auch nach unklaren Fehlern suchen</translation>
     </message>
     <message>
         <location filename="settings.ui" line="150"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="499"/>
         <source>Show statistics on check completion</source>
         <translation>Zeige Statistiken nach Prüfungsabschluss</translation>
     </message>
     <message>
         <location filename="settings.ui" line="157"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="500"/>
         <source>Check for updates</source>
         <translation>Auf Updates prüfen</translation>
     </message>
     <message>
         <location filename="settings.ui" line="177"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="501"/>
         <source>Show internal warnings in log</source>
         <translation>Interne Warnungen im Log anzeigen</translation>
     </message>
     <message>
         <location filename="settings.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="521"/>
         <source>Addons</source>
         <translation>Add-Ons</translation>
     </message>
     <message>
         <location filename="settings.ui" line="294"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="512"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation>Python-Binärdatei (Python aus PATH wird genutzt, wenn leer)</translation>
     </message>
@@ -2740,117 +2993,143 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
         <location filename="settings.ui" line="305"/>
         <location filename="settings.ui" line="346"/>
         <location filename="settings.ui" line="391"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="513"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="523"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="324"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="515"/>
         <source>MISRA addon</source>
         <translation>MISRA-Addon</translation>
     </message>
     <message>
         <location filename="settings.ui" line="332"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="516"/>
         <source>MISRA rule texts file</source>
         <translation>MISRA-Regeltext-Datei</translation>
     </message>
     <message>
         <location filename="settings.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="518"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Text aus Anhang A &amp;quot;Summary of guidelines&amp;quot; aus der MISRA-C-2012-PDF in eine Textdatei einfügen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="526"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
         <location filename="settings.ui" line="378"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="522"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation>Clang-Verzeichnis (PATH wird genutzt, wenn leer)</translation>
     </message>
     <message>
         <location filename="settings.ui" line="401"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="524"/>
         <source>Visual Studio headers</source>
         <translation>Visual-Studio-Header</translation>
     </message>
     <message>
         <location filename="settings.ui" line="407"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="525"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pfade zu Visual-Studio-Headern, Semikolon-getrennt.&lt;/p&gt;&lt;p&gt;Sie können eine Visual-Studio-Kommandozeile öffnen, &amp;quot;SET INCLUDE&amp;quot; eingeben und dann die Pfade hier reinkopieren.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="533"/>
         <source>Code Editor</source>
         <translation>Code-Editor</translation>
     </message>
     <message>
         <location filename="settings.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="527"/>
         <source>Code Editor Style</source>
         <translation>Code-Editor-Stil</translation>
     </message>
     <message>
         <location filename="settings.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="528"/>
         <source>System Style</source>
         <translation>Systemstil</translation>
     </message>
     <message>
         <location filename="settings.ui" line="456"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="529"/>
         <source>Default Light Style</source>
         <translation>Heller Standardstil</translation>
     </message>
     <message>
         <location filename="settings.ui" line="463"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="530"/>
         <source>Default Dark Style</source>
         <translation>Dunkler Standardstil</translation>
     </message>
     <message>
         <location filename="settings.ui" line="472"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="531"/>
         <source>Custom</source>
         <translation>Benutzerdefiniert</translation>
     </message>
     <message>
         <location filename="settings.ui" line="210"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="505"/>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
         <location filename="settings.ui" line="79"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="492"/>
         <source>Max count:</source>
         <translation>Maximalzahl:</translation>
     </message>
     <message>
         <location filename="settings.ui" line="185"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="507"/>
         <source>Applications</source>
         <translation>Anwendungen</translation>
     </message>
     <message>
         <location filename="settings.ui" line="203"/>
         <location filename="settings.ui" line="479"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="532"/>
         <source>Edit...</source>
         <translation>Bearbeiten...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="506"/>
         <source>Set as default</source>
         <translation>Als Standard festlegen</translation>
     </message>
     <message>
         <location filename="settings.ui" line="240"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="510"/>
         <source>Reports</source>
         <translation>Berichte</translation>
     </message>
     <message>
         <location filename="settings.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="508"/>
         <source>Save all errors when creating report</source>
         <translation>Alle Fehler beim Erstellen von Berichten speichern</translation>
     </message>
     <message>
         <location filename="settings.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="509"/>
         <source>Save full path to files in reports</source>
         <translation>Vollständigen Dateipfad in Berichten speichern</translation>
     </message>
     <message>
         <location filename="settings.ui" line="274"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="511"/>
         <source>Language</source>
         <translation>Sprache</translation>
     </message>
@@ -2907,221 +3186,245 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="395"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="415"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="401"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="33"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="396"/>
         <source>Project:</source>
         <translation>Projekt:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="53"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="397"/>
         <source>Paths:</source>
         <translation>Pfade:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="85"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="398"/>
         <source>Include paths:</source>
         <translation>Include-Pfade:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="399"/>
         <source>Defines:</source>
         <translation>Definitionen:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="400"/>
         <source>Undefines:</source>
         <translation>Un-Definitionen:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="407"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>Vorherige Prüfung</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="171"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="402"/>
         <source>Path Selected:</source>
         <translation>Ausgewählte Pfade:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="181"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="403"/>
         <source>Number of Files Scanned:</source>
         <translation>Anzahl der geprüften Dateien:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="201"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="405"/>
         <source>Scan Duration:</source>
         <translation>Prüfungsdauer:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="254"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="408"/>
         <source>Errors:</source>
         <translation>Fehler:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="271"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="409"/>
         <source>Warnings:</source>
         <translation>Warnungen:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="410"/>
         <source>Stylistic warnings:</source>
         <translation>Stilwarnungen:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="305"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="411"/>
         <source>Portability warnings:</source>
         <translation>Portabilitätswarnungen:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="322"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="412"/>
         <source>Performance issues:</source>
         <translation>Performance-Probleme:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="413"/>
         <source>Information messages:</source>
         <translation>Informationsmeldungen:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="356"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="414"/>
         <source>Active checkers:</source>
         <translation>Aktive Checker:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="374"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="416"/>
         <source>Checkers</source>
         <translation>Checker</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="418"/>
         <source>History</source>
         <translation>Verlauf</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="405"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="417"/>
         <source>File:</source>
         <translation>Datei:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="419"/>
         <source>Copy to Clipboard</source>
         <translation>In die Zwischenablage kopieren</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="420"/>
         <source>Pdf Export</source>
         <translation>PDF-Export</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 Tag</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 Tage</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1 Stunde</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 Stunden</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1 Minute</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 Minuten</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 Sekunde</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 Sekunden</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0,%1 Sekunden</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="171"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> und </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="198"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation>Exportiere PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>Projekteinstellungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>Pfade</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>Include-Pfade</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>Definitionen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation>Un-Definitionen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>Gewählte Pfade</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>Anzahl geprüfter Dateien</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>Prüfungsdauer</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>Fehler</translation>
     </message>
@@ -3136,40 +3439,49 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
         <translation>Kein Cppcheck-Analyseverzeichnis</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>Warnungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>Stilwarnungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>Portabilitätswarnungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>Performance-Warnungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>Informationsmeldungen</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_threaddetails.h" line="47"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="46"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 von %2 Dateien geprüft</translation>
     </message>
@@ -3190,9 +3502,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 Die Sprache wurde auf Englisch zurückgesetzt. Öffnen Sie den Einstellungen-Dialog um eine verfügbare Sprache auszuwählen.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_es.ts b/gui/cppcheck_es.ts
index 2283e346285..b2080055651 100644
--- a/gui/cppcheck_es.ts
+++ b/gui/cppcheck_es.ts
@@ -5,38 +5,45 @@
     <name>About</name>
     <message>
         <location filename="about.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="130"/>
         <source>About Cppcheck</source>
         <translation>Acerca de Cppcheck</translation>
     </message>
     <message>
         <location filename="about.ui" line="64"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="132"/>
         <source>Version %1</source>
         <translation>Versión %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="133"/>
         <source>Cppcheck - A tool for static C/C++ code analysis.</source>
         <translation>Cppcheck - Una utilidad para el análisis estático de código C/C++.</translation>
     </message>
     <message>
         <location filename="about.ui" line="81"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="134"/>
         <source>Copyright © 2007-%1 Cppcheck team.</source>
         <oldsource>Copyright © 2007-2021 Cppcheck team.</oldsource>
         <translation type="unfinished">Copyright © 2007-2021 el equipo de cppcheck.</translation>
     </message>
     <message>
         <location filename="about.ui" line="91"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="135"/>
         <source>This program is licensed under the terms
 of the GNU General Public License version 3</source>
         <translation>Este programa está licenciado bajo los términos de GNU General Public License versión 3</translation>
     </message>
     <message>
         <location filename="about.ui" line="102"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="137"/>
         <source>Visit Cppcheck homepage at %1</source>
         <translation>Visita el sitio de Cppcheck en %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;pcre&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;picojson&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tinyxml2&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
         <translation type="unfinished"></translation>
@@ -46,11 +53,13 @@ of the GNU General Public License version 3</source>
     <name>ApplicationDialog</name>
     <message>
         <location filename="applicationdialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="161"/>
         <source>Add an application</source>
         <translation>Añade una aplicación</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="162"/>
         <source>Here you can add an application that can open error files. Specify a name for the application, the application executable and command line parameters for the application.
 
 The following texts in parameters are replaced with appropriate values when application is executed:
@@ -66,21 +75,25 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="173"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nombre:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="86"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="174"/>
         <source>&amp;Executable:</source>
         <translation>&amp;Ejecutable:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="96"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="175"/>
         <source>&amp;Parameters:</source>
         <translation>&amp;Parámetros:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="138"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="176"/>
         <source>Browse</source>
         <translation>Buscar</translation>
     </message>
@@ -95,9 +108,8 @@ Parameters: -l(line) (file)</source>
         <translation>Selecciona la aplicación para visualizar</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -105,70 +117,6 @@ Parameters: -l(line) (file)</source>
         <translation>¡Debes especificar el nombre, la ruta y opcionalmente los parámetros para la aplicación!</translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -177,10 +125,8 @@ Parameters: -l(line) (file)</source>
         <translation>No se ha encontrado el fichero: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -192,44 +138,49 @@ Parameters: -l(line) (file)</source>
     <name>HelpDialog</name>
     <message>
         <location filename="helpdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="88"/>
         <source>Cppcheck GUI help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="89"/>
         <source>Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="90"/>
         <source>Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
     <name>LibraryAddFunctionDialog</name>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="105"/>
         <source>Add function</source>
         <translation>Añadir función</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="106"/>
         <source>Function name(s)</source>
         <translation>Nombre(s) de la función</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="107"/>
         <source>Number of arguments</source>
         <translation>Número de argumentos</translation>
     </message>
@@ -238,126 +189,140 @@ Parameters: -l(line) (file)</source>
     <name>LibraryDialog</name>
     <message>
         <location filename="librarydialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="275"/>
         <source>Library Editor</source>
         <translation>Editor de bibliotecas</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="22"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="276"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="29"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="277"/>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="36"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="278"/>
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="62"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="279"/>
         <source>Functions</source>
         <translation>Funciones</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="280"/>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="111"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="281"/>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="282"/>
         <source>Filter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="164"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="283"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="204"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="284"/>
         <source>noreturn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="212"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="285"/>
         <source>False</source>
         <translation>Falso</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="286"/>
         <source>True</source>
         <translation>Verdadero</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="222"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="287"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="232"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="289"/>
         <source>return value must be used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="239"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="290"/>
         <source>ignore function in leaks checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="291"/>
         <source>Arguments</source>
         <translation>Argumentos</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="258"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="292"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation>Archivos de biblioteca (*.cfg)</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation>Abrir archivo de biblioteca</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation type="unfinished"></translation>
     </message>
@@ -366,11 +331,13 @@ Parameters: -l(line) (file)</source>
     <name>LibraryEditArgDialog</name>
     <message>
         <location filename="libraryeditargdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="284"/>
         <source>Edit argument</source>
         <translation>Editar argumento</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="286"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is bool value allowed? For instance result from comparison or from &apos;!&apos; operator.&lt;/p&gt;
 &lt;p&gt;Typically, set this if the argument is a pointer, size, etc.&lt;/p&gt;
@@ -381,11 +348,13 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="28"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="293"/>
         <source>Not bool</source>
         <translation>No bool</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="35"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is a null parameter value allowed?&lt;/p&gt;
 &lt;p&gt;Typically this should be used on any pointer parameter that does not allow null.&lt;/p&gt;
@@ -396,78 +365,99 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="43"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="302"/>
         <source>Not null</source>
         <translation>No null</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="50"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="303"/>
         <source>Not uninit</source>
         <translation>No uninit</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="57"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="304"/>
         <source>String</source>
         <translation>String</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="70"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="305"/>
         <source>Format string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="306"/>
         <source>Min size of buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="101"/>
         <location filename="libraryeditargdialog.ui" line="203"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="307"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="316"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="109"/>
         <location filename="libraryeditargdialog.ui" line="214"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="308"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="317"/>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="114"/>
         <location filename="libraryeditargdialog.ui" line="219"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="309"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="318"/>
         <source>argvalue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="119"/>
         <location filename="libraryeditargdialog.ui" line="224"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="319"/>
         <source>mul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="124"/>
         <location filename="libraryeditargdialog.ui" line="229"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="311"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="320"/>
         <source>strlen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="132"/>
         <location filename="libraryeditargdialog.ui" line="237"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="313"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="322"/>
         <source>Arg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="159"/>
         <location filename="libraryeditargdialog.ui" line="264"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="323"/>
         <source>Arg2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="194"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="315"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="324"/>
         <source>Valid values</source>
         <translation>Valores válidos</translation>
     </message>
@@ -475,719 +465,805 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="687"/>
-        <location filename="mainwindow.cpp" line="463"/>
-        <location filename="mainwindow.cpp" line="667"/>
-        <location filename="mainwindow.cpp" line="752"/>
-        <location filename="mainwindow.cpp" line="857"/>
-        <location filename="mainwindow.cpp" line="879"/>
-        <location filename="mainwindow.cpp" line="1466"/>
-        <location filename="mainwindow.cpp" line="1595"/>
-        <location filename="mainwindow.cpp" line="1936"/>
-        <location filename="mainwindow.cpp" line="1944"/>
-        <location filename="mainwindow.cpp" line="1998"/>
-        <location filename="mainwindow.cpp" line="2007"/>
-        <location filename="mainwindow.cpp" line="2079"/>
-        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="740"/>
         <source>&amp;File</source>
         <translation>&amp;Archivo</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="741"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="742"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Herramientas</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="198"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="744"/>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="213"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="746"/>
         <source>C++ standard</source>
         <translation>C++ estándar</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="225"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="747"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation type="unfinished">C estándar</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="748"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="266"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="749"/>
         <source>Standard</source>
         <translation>Estándar</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="284"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="750"/>
         <source>Categories</source>
         <translation>Categorías</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="578"/>
         <source>&amp;License...</source>
         <translation>&amp;Licencia...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="319"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="579"/>
         <source>A&amp;uthors...</source>
         <translation>A&amp;utores...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="328"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="580"/>
         <source>&amp;About...</source>
         <translation>&amp;Acerca de...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="333"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="581"/>
         <source>&amp;Files...</source>
         <translation>&amp;Ficheros...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="336"/>
         <location filename="mainwindow.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="582"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="584"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation type="unfinished">Comprobar archivos</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="342"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="587"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="351"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="589"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Carpeta...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="354"/>
         <location filename="mainwindow.ui" line="357"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="590"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="592"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation type="unfinished">Comprobar carpeta</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="595"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="599"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="602"/>
         <source>&amp;Stop</source>
         <translation>&amp;Detener</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="393"/>
         <location filename="mainwindow.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="603"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="605"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation type="unfinished">Detener comprobación</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="608"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="610"/>
         <source>&amp;Save results to file...</source>
         <translation>&amp;Guardar los resultados en el fichero...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="411"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="612"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="416"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="614"/>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="428"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="618"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Limpiar resultados</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="619"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Preferencias</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="452"/>
         <location filename="mainwindow.ui" line="455"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="621"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="623"/>
         <source>Show style warnings</source>
         <translation>Mostrar advertencias de estilo</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="470"/>
         <location filename="mainwindow.ui" line="473"/>
-        <location filename="mainwindow.cpp" line="2379"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="626"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="628"/>
+        <location filename="mainwindow.cpp" line="2408"/>
         <source>Show errors</source>
         <translation>Mostrar errores</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1015"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Information</source>
         <translation>Información</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="660"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="680"/>
         <source>Show information messages</source>
         <translation>Mostrar mensajes de información</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="675"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="684"/>
         <source>Show portability warnings</source>
         <translation>Mostrar advertencias de portabilidad</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="690"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="687"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="702"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="689"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="705"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="691"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="713"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="693"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filtro</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="716"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="695"/>
         <source>Filter results</source>
         <translation>Resultados del filtro</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="732"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="697"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit ANSI</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="740"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="698"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit Unicode</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="748"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="699"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="756"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="700"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="764"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="701"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="858"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="709"/>
         <source>&amp;Print...</source>
         <translation>Im&amp;primir...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="861"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="711"/>
         <source>Print the Current Report</source>
         <translation>Imprimir el informe actual</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="866"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="713"/>
         <source>Print Pre&amp;view...</source>
         <translation>Pre&amp;visualización de impresión...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="869"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="715"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation>Abre el diálogo de previsualización de impresión para el informe actual</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="877"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="719"/>
         <source>Open library editor</source>
         <translation>Abrir el editor de bibliotecas</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="478"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="630"/>
         <source>&amp;Check all</source>
         <translation>&amp;Seleccionar todo</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="738"/>
         <source>Checking for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="100"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="739"/>
         <source>Hide</source>
         <translation type="unfinished">Ocultar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="163"/>
         <location filename="mainwindow.ui" line="979"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="730"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="743"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="209"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="745"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="303"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="751"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="369"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="597"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="381"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="601"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="419"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="616"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="620"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="467"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="625"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="483"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="631"/>
         <source>&amp;Uncheck all</source>
         <translation>&amp;Deseleccionar todo</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="488"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="632"/>
         <source>Collapse &amp;all</source>
         <translation>Contraer &amp;todo</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="493"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="633"/>
         <source>&amp;Expand all</source>
         <translation>&amp;Expandir todo</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="501"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="634"/>
         <source>&amp;Standard</source>
         <translation>&amp;Estándar</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="636"/>
         <source>Standard items</source>
         <translation>Elementos estándar</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="509"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="638"/>
         <source>&amp;Contents</source>
         <translation>&amp;Contenidos</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="512"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="640"/>
         <source>Open the help contents</source>
         <translation>Abrir la ayuda de contenidos</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="515"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="643"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="645"/>
         <source>Toolbar</source>
         <translation>Barra de herramientas</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="528"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="646"/>
         <source>&amp;Categories</source>
         <translation>&amp;Categorías</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="531"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="648"/>
         <source>Error categories</source>
         <translation>Categorías de error</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="536"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="650"/>
         <source>&amp;Open XML...</source>
         <translation>&amp;Abrir XML...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="545"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="651"/>
         <source>Open P&amp;roject File...</source>
         <translation>Abrir P&amp;royecto...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="548"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="653"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="655"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="562"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="656"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;Nuevo Proyecto...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="565"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="658"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="570"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="660"/>
         <source>&amp;Log View</source>
         <translation>&amp;Visor del log</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="573"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="662"/>
         <source>Log View</source>
         <translation>Visor del log</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="581"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="664"/>
         <source>C&amp;lose Project File</source>
         <translation>C&amp;errar Proyecto</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="589"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="665"/>
         <source>&amp;Edit Project File...</source>
         <translation>&amp;Editar Proyecto...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="601"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="666"/>
         <source>&amp;Statistics</source>
         <translation>&amp;Estadísticas</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="613"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="667"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="631"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="672"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="657"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="678"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="672"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="682"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="772"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="702"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="786"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="703"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="797"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="704"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="805"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="705"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="813"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="706"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="845"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="707"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="853"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="708"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="874"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="717"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="721"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="893"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="722"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="901"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="723"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="912"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="724"/>
         <source>C++14</source>
         <translation type="unfinished">C++14</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="920"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="725"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="928"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="726"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="936"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="727"/>
         <source>C++17</source>
         <translation type="unfinished">C++17</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="728"/>
         <source>C++20</source>
         <translation type="unfinished">C++20</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="729"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="987"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="731"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="995"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1003"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1011"/>
-        <source>Cert C</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="732"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1019"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="733"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1027"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="734"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1035"/>
-        <source>Autosar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1040"/>
-        <source>EULA...</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="736"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="616"/>
         <location filename="mainwindow.ui" line="619"/>
-        <location filename="mainwindow.cpp" line="2380"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="668"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="670"/>
+        <location filename="mainwindow.cpp" line="2409"/>
         <source>Show warnings</source>
         <translation>Mostrar advertencias</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="634"/>
         <location filename="mainwindow.ui" line="637"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="673"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="675"/>
         <source>Show performance warnings</source>
         <translation>Mostrar advertencias de rendimiento</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="645"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="677"/>
         <source>Show &amp;hidden</source>
         <translation>Mostrar &amp;ocultos</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="458"/>
+        <location filename="mainwindow.cpp" line="477"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="753"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>¡Tienes que cerrar el proyecto antes de seleccionar nuevos ficheros o carpetas!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="992"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>File not found</source>
         <translation>Archivo no encontrado</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="995"/>
+        <location filename="mainwindow.cpp" line="1027"/>
         <source>Bad XML</source>
         <translation type="unfinished">XML malformado</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1030"/>
         <source>Missing attribute</source>
         <translation type="unfinished">Falta el atributo</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1001"/>
+        <location filename="mainwindow.cpp" line="1033"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1004"/>
+        <location filename="mainwindow.cpp" line="1036"/>
         <source>Unsupported format</source>
         <translation>Formato no soportado</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1013"/>
+        <location filename="mainwindow.cpp" line="1045"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1035"/>
+        <location filename="mainwindow.cpp" line="1064"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1058"/>
+        <location filename="mainwindow.cpp" line="1087"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1120"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1482"/>
-        <location filename="mainwindow.cpp" line="1681"/>
+        <location filename="mainwindow.cpp" line="1539"/>
+        <location filename="mainwindow.cpp" line="1734"/>
         <source>XML files (*.xml)</source>
         <translation>Archivos XML (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1484"/>
+        <location filename="mainwindow.cpp" line="1541"/>
         <source>Open the report file</source>
         <translation>Abrir informe</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1700"/>
         <source>License</source>
         <translation>Licencia</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1654"/>
+        <location filename="mainwindow.cpp" line="1707"/>
         <source>Authors</source>
         <translation>Autores</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1674"/>
+        <location filename="mainwindow.cpp" line="1727"/>
         <source>Save the report file</source>
         <translation>Guardar informe</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="155"/>
-        <location filename="mainwindow.cpp" line="1781"/>
+        <location filename="mainwindow.cpp" line="176"/>
+        <location filename="mainwindow.cpp" line="1812"/>
         <source>Quick Filter:</source>
         <translation>Filtro rápido:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="858"/>
+        <location filename="mainwindow.cpp" line="890"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1196,117 +1272,107 @@ Do you want to load this project file instead?</source>
 ¿Quiere cargar este fichero de proyecto en su lugar?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1015"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>La biblioteca &apos;%1&apos; contiene elementos deconocidos:
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1007"/>
+        <location filename="mainwindow.cpp" line="1039"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1010"/>
+        <location filename="mainwindow.cpp" line="1042"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1016"/>
+        <location filename="mainwindow.cpp" line="1048"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1019"/>
-        <source>Unknown issue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1080"/>
-        <location filename="mainwindow.cpp" line="1090"/>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1120"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1685"/>
+        <location filename="mainwindow.cpp" line="1738"/>
         <source>Text files (*.txt)</source>
         <translation>Ficheros de texto (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1689"/>
+        <location filename="mainwindow.cpp" line="1742"/>
         <source>CSV files (*.csv)</source>
         <translation>Ficheros CVS (*.cvs)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1819"/>
+        <location filename="mainwindow.cpp" line="1850"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Ficheros de proyecto (*.cppcheck;;Todos los ficheros (*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="1852"/>
         <source>Select Project File</source>
         <translation>Selecciona el archivo de proyecto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="239"/>
-        <location filename="mainwindow.cpp" line="1783"/>
-        <location filename="mainwindow.cpp" line="1849"/>
-        <location filename="mainwindow.cpp" line="2047"/>
+        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="1814"/>
+        <location filename="mainwindow.cpp" line="1880"/>
+        <location filename="mainwindow.cpp" line="2062"/>
         <source>Project:</source>
         <translation>Proyecto:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="668"/>
-        <source>No suitable files found to analyze!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="767"/>
-        <source>C/C++ Source</source>
+        <location filename="mainwindow.cpp" line="601"/>
+        <source>None of the selected files is part of the project, nothing to analyze.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="768"/>
-        <source>Compile database</source>
+        <location filename="mainwindow.cpp" line="702"/>
+        <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="769"/>
-        <source>Visual Studio</source>
+        <location filename="mainwindow.cpp" line="798"/>
+        <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="770"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="mainwindow.cpp" line="799"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="773"/>
+        <location filename="mainwindow.cpp" line="804"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="819"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="880"/>
+        <location filename="mainwindow.cpp" line="912"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1467"/>
+        <location filename="mainwindow.cpp" line="1524"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1314,81 +1380,76 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1591"/>
+        <location filename="mainwindow.cpp" line="1644"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1633"/>
+        <location filename="mainwindow.cpp" line="1686"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1672"/>
+        <location filename="mainwindow.cpp" line="1725"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1712"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1937"/>
+        <location filename="mainwindow.cpp" line="1951"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1945"/>
+        <location filename="mainwindow.cpp" line="1959"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1977"/>
+        <location filename="mainwindow.cpp" line="1992"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1995"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1983"/>
+        <location filename="mainwindow.cpp" line="1998"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1999"/>
+        <location filename="mainwindow.cpp" line="2014"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2008"/>
+        <location filename="mainwindow.cpp" line="2023"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2032"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2034"/>
+        <location filename="mainwindow.cpp" line="2049"/>
         <source>Select Project Filename</source>
         <translation>Selecciona el nombre del proyecto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2080"/>
+        <location filename="mainwindow.cpp" line="2095"/>
         <source>No project file loaded</source>
         <translation>No hay ningún proyecto cargado</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2148"/>
+        <location filename="mainwindow.cpp" line="2177"/>
         <source>The project file
 
 %1
@@ -1405,67 +1466,67 @@ Do you want to remove the file from the recently used projects -list?</source>
 ¿Quiere eliminar el fichero de la lista de proyectos recientes?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2310"/>
+        <location filename="mainwindow.cpp" line="2339"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2314"/>
+        <location filename="mainwindow.cpp" line="2343"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2352"/>
+        <location filename="mainwindow.cpp" line="2381"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2353"/>
+        <location filename="mainwindow.cpp" line="2382"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2354"/>
+        <location filename="mainwindow.cpp" line="2383"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2355"/>
+        <location filename="mainwindow.cpp" line="2384"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2372"/>
+        <location filename="mainwindow.cpp" line="2401"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2373"/>
+        <location filename="mainwindow.cpp" line="2402"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2374"/>
+        <location filename="mainwindow.cpp" line="2403"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2381"/>
+        <location filename="mainwindow.cpp" line="2410"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2382"/>
+        <location filename="mainwindow.cpp" line="2411"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2383"/>
+        <location filename="mainwindow.cpp" line="2412"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2384"/>
+        <location filename="mainwindow.cpp" line="2413"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1509,26 +1570,31 @@ Options:
     <name>NewSuppressionDialog</name>
     <message>
         <location filename="newsuppressiondialog.ui" line="17"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="114"/>
         <source>New suppression</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="25"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="115"/>
         <source>Error ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="32"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="116"/>
         <source>File name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="42"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="117"/>
         <source>Line number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="52"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="118"/>
         <source>Symbol name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1546,414 +1612,498 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit ANSI</translation>
+        <translation type="vanished">Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit Unicode</translation>
+        <translation type="vanished">Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
 </context>
 <context>
     <name>ProjectFile</name>
     <message>
         <location filename="projectfile.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="923"/>
         <source>Project File</source>
         <translation>Archivo de proyecto</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="955"/>
         <source>Paths and Defines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="30"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="924"/>
         <source>Import Project (Visual studio / compile database/ Borland C++ Builder 6)</source>
         <oldsource>Import Project (Visual studio / compile database)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="231"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="938"/>
         <source>Defines must be separated by a semicolon. Example: DEF1;DEF2=5;DEF3=int</source>
         <oldsource>Defines must be separated by a semicolon &apos;;&apos;</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="958"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation>Nota: Ponga sus propios archivos .cfg en la misma carpeta que el proyecto. Debería verlos arriba.</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="989"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="991"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="992"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="993"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1006"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1007"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="914"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1008"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1018"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="876"/>
+        <location filename="projectfile.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1011"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="883"/>
+        <location filename="projectfile.ui" line="892"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1013"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="890"/>
+        <location filename="projectfile.ui" line="899"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1015"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="73"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="928"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You have a choice:&lt;/p&gt;&lt;p&gt; * Analyze all Debug and Release configurations&lt;/p&gt;&lt;p&gt; * Only analyze the first matching Debug configuration&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="926"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="964"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="930"/>
         <source>Analyze all Visual Studio configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="113"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="931"/>
         <source>Selected VS Configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="147"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="932"/>
         <source>Paths:</source>
         <translation>Rutas:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="181"/>
         <location filename="projectfile.ui" line="296"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="933"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="945"/>
         <source>Add...</source>
         <translation>Añadir...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="934"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="994"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="935"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="995"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="998"/>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="242"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="940"/>
         <source>Undefines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="252"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="942"/>
         <source>Undefines must be separated by a semicolon. Example: UNDEF1;UNDEF2;UNDEF3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="265"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="944"/>
         <source>Include Paths:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="950"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="952"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="954"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="959"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="972"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="982"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="962"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="965"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="966"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="968"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="969"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="970"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="971"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="976"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="977"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="979"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="980"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="999"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished">Habilitar supresiones inline</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="851"/>
+        <location filename="projectfile.ui" line="860"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1009"/>
         <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="901"/>
+        <location filename="projectfile.ui" line="910"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1016"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="918"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1017"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="937"/>
+        <location filename="projectfile.ui" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1020"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="946"/>
+        <location filename="projectfile.ui" line="955"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1021"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="965"/>
+        <location filename="projectfile.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1023"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="981"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1024"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1026"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="991"/>
+        <location filename="projectfile.ui" line="1007"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1027"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="330"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="948"/>
         <source>Up</source>
         <translation>Subir</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="337"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="949"/>
         <source>Down</source>
         <translation>Bajar</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="956"/>
         <source>Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="967"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="974"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="978"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="981"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1000"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="983"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="985"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="987"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="960"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="957"/>
         <source>Libraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="996"/>
         <source>Suppressions</source>
         <translation type="unfinished">Supresiones</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="997"/>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1001"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1028"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1002"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1003"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1004"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1005"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="958"/>
+        <location filename="projectfile.ui" line="967"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1022"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="975"/>
+        <location filename="projectfile.ui" line="991"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1025"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="projectfile.ui" line="1004"/>
-        <source>Clang analyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="997"/>
-        <source>Clang-tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="936"/>
         <source>Defines:</source>
         <translation>Definiciones:</translation>
     </message>
@@ -1966,77 +2116,78 @@ Options:
         <translation>Archivo de proyecto: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="604"/>
+        <location filename="projectfiledialog.cpp" line="585"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="865"/>
+        <location filename="projectfiledialog.cpp" line="861"/>
         <source>Select include directory</source>
         <translation>Selecciona una carpeta para incluir</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="845"/>
+        <location filename="projectfiledialog.cpp" line="841"/>
         <source>Select a directory to check</source>
         <translation>Selecciona la carpeta a comprobar</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="414"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="477"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="643"/>
-        <source>Visual Studio</source>
+        <location filename="projectfiledialog.cpp" line="625"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="644"/>
-        <source>Compile database</source>
+        <location filename="projectfiledialog.cpp" line="627"/>
+        <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="645"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="projectfiledialog.cpp" line="646"/>
+        <source>C/C++ header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="646"/>
-        <source>Import Project</source>
+        <location filename="projectfiledialog.cpp" line="648"/>
+        <source>Include file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="885"/>
+        <location filename="projectfiledialog.cpp" line="881"/>
         <source>Select directory to ignore</source>
         <translation>Selecciona la carpeta a ignorar</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="893"/>
+        <location filename="projectfiledialog.cpp" line="889"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="894"/>
+        <location filename="projectfiledialog.cpp" line="647"/>
+        <location filename="projectfiledialog.cpp" line="890"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="895"/>
+        <location filename="projectfiledialog.cpp" line="891"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="978"/>
+        <location filename="projectfiledialog.cpp" line="976"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="980"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2069,7 +2220,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="302"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2119,161 +2270,156 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="142"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="144"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="114"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">Archivo</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="115"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Línea</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="116"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Severidad</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="117"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="118"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="119"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="120"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">Resumen</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="121"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="122"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="123"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="124"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="125"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="126"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
@@ -2321,47 +2467,47 @@ Options:
         <translation type="vanished">Fichero no definido</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="657"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="825"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="829"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="830"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="832"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="361"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>portabilidad</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="298"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="364"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>información</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="367"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>depuración</translation>
     </message>
@@ -2370,53 +2516,51 @@ Options:
         <translation type="vanished">Ocultar</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="659"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation>Ocultar todos con el mismo id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="681"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="660"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation>Abrir carpeta contenedora</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="370"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="656"/>
+        <location filename="resultstree.cpp" line="667"/>
         <source>Recheck %1 file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="658"/>
+        <location filename="resultstree.cpp" line="669"/>
         <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="701"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="703"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="733"/>
-        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="734"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2426,7 +2570,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 Configura el programa para editar en Preferencias/Aplicaciones.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="748"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2435,12 +2579,12 @@ Please select the default editor application in preferences/Applications.</sourc
 Configura el programa para editar por defecto en Preferencias/Aplicaciones.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="768"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>¡No se ha encontrado el fichero!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="811"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2449,7 +2593,7 @@ Please check the application path and parameters are correct.</source>
 Por favor comprueba que la ruta a la aplicación y los parámetros son correctos.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="833"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>Selecciona carpeta</translation>
     </message>
@@ -2458,22 +2602,22 @@ Por favor comprueba que la ruta a la aplicación y los parámetros son correctos
         <translation type="vanished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="349"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>estilo</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="352"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>error</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="355"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>advertencia</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="358"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>ajuste</translation>
     </message>
@@ -2482,121 +2626,123 @@ Por favor comprueba que la ruta a la aplicación y los parámetros son correctos
     <name>ResultsView</name>
     <message>
         <location filename="resultsview.ui" line="26"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="147"/>
         <source>Results</source>
         <translation>Resultados</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="60"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="148"/>
         <source>Critical errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="149"/>
         <source>Analysis Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="114"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="150"/>
         <source>Warning Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="237"/>
-        <location filename="resultsview.cpp" line="245"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>Error al guardar el informe.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="255"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>Imprimir informe</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="274"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation>No se encontraron errores, nada que imprimir.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="326"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 of %2 archivos comprobados)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="350"/>
-        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="351"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>No se han encontrado errores.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="358"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Se han encontrado errores, pero están configurados para que no se muestren.
 Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>Error al leer el informe.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="460"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="465"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="539"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="540"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="541"/>
+        <location filename="resultsview.cpp" line="538"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="549"/>
+        <location filename="resultsview.cpp" line="545"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="563"/>
+        <location filename="resultsview.cpp" line="559"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="565"/>
+        <location filename="resultsview.cpp" line="561"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="567"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="568"/>
+        <location filename="resultsview.cpp" line="564"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2605,26 +2751,31 @@ Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
     <name>ScratchPad</name>
     <message>
         <location filename="scratchpad.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="107"/>
         <source>Scratchpad</source>
         <translation type="unfinished">Scratchpad</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="108"/>
         <source>Copy or write some C/C++ code here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="37"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="109"/>
         <source>Optionally enter a filename (mainly for automatic language detection) and click on &quot;Check&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="110"/>
         <source>filename</source>
         <translation>nombre de archivo</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="78"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="111"/>
         <source>Check</source>
         <translation>Comprobar</translation>
     </message>
@@ -2633,11 +2784,13 @@ Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
     <name>Settings</name>
     <message>
         <location filename="settings.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="490"/>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
         <location filename="settings.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="502"/>
         <source>General</source>
         <translation>General</translation>
     </message>
@@ -2647,46 +2800,55 @@ Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
     </message>
     <message>
         <location filename="settings.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="493"/>
         <source>Force checking all #ifdef configurations</source>
         <translation>Forzar comprobación de todas las configuraciones #ifdef</translation>
     </message>
     <message>
         <location filename="settings.ui" line="129"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="496"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>Mostrar el Id del error en la columna &quot;Id&quot;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="136"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="497"/>
         <source>Enable inline suppressions</source>
         <translation>Habilitar supresiones inline</translation>
     </message>
     <message>
         <location filename="settings.ui" line="143"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="498"/>
         <source>Check for inconclusive errors also</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="150"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="499"/>
         <source>Show statistics on check completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="157"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="500"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="177"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="501"/>
         <source>Show internal warnings in log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="521"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="294"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="512"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2694,137 +2856,167 @@ Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
         <location filename="settings.ui" line="305"/>
         <location filename="settings.ui" line="346"/>
         <location filename="settings.ui" line="391"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="513"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="523"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="324"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="515"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="332"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="516"/>
         <source>MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="518"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="526"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="378"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="522"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="401"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="524"/>
         <source>Visual Studio headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="407"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="525"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="533"/>
         <source>Code Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="527"/>
         <source>Code Editor Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="528"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="456"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="529"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="463"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="530"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="472"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="531"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="196"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="503"/>
         <source>Add...</source>
         <translation>Añadir...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="79"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="492"/>
         <source>Max count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="203"/>
         <location filename="settings.ui" line="479"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="532"/>
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="506"/>
         <source>Set as default</source>
         <translation>Definir por defecto</translation>
     </message>
     <message>
         <location filename="settings.ui" line="274"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="511"/>
         <source>Language</source>
         <translation>Idioma</translation>
     </message>
     <message>
         <location filename="settings.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="491"/>
         <source>Number of threads: </source>
         <translation>Número de hilos:</translation>
     </message>
     <message>
         <location filename="settings.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="494"/>
         <source>Show full path of files</source>
         <translation>Mostrar la ruta completa de los ficheros</translation>
     </message>
     <message>
         <location filename="settings.ui" line="122"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="495"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>Mostrar el mensaje &quot;No se han encontrado errores&quot;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="210"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="505"/>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
         <location filename="settings.ui" line="185"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="507"/>
         <source>Applications</source>
         <translation>Aplicaciones</translation>
     </message>
     <message>
         <location filename="settings.ui" line="240"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="510"/>
         <source>Reports</source>
         <translation>Informes</translation>
     </message>
     <message>
         <location filename="settings.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="508"/>
         <source>Save all errors when creating report</source>
         <translation>Guardar todos los errores cuando se cree el informe</translation>
     </message>
     <message>
         <location filename="settings.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="509"/>
         <source>Save full path to files in reports</source>
         <translation>Guardar la ruta completa en los ficheros de informes</translation>
     </message>
@@ -2881,221 +3073,245 @@ Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="395"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="415"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>Estadísticas</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="401"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>Proyecto</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="33"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="396"/>
         <source>Project:</source>
         <translation>Proyecto:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="53"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="397"/>
         <source>Paths:</source>
         <translation>Rutas:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="85"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="398"/>
         <source>Include paths:</source>
         <translation type="unfinished">Incluye las rutas:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="399"/>
         <source>Defines:</source>
         <translation type="unfinished">Definiciones:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="400"/>
         <source>Undefines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="407"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation type="unfinished">Análisis anterior</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="171"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="402"/>
         <source>Path Selected:</source>
         <translation>Ruta seleccionada:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="181"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="403"/>
         <source>Number of Files Scanned:</source>
         <translation type="unfinished">Número de archivos analizados:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="201"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="405"/>
         <source>Scan Duration:</source>
         <translation type="unfinished">Duración del análisis:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="254"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="408"/>
         <source>Errors:</source>
         <translation>Errores:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="271"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="409"/>
         <source>Warnings:</source>
         <translation>Advertencias:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="410"/>
         <source>Stylistic warnings:</source>
         <translation>Advertencias de estilo:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="305"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="411"/>
         <source>Portability warnings:</source>
         <translation>Advertencias de portabilidad:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="322"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="412"/>
         <source>Performance issues:</source>
         <translation>Problemas de rendimiento:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="413"/>
         <source>Information messages:</source>
         <translation>Mensajes de información:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="356"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="414"/>
         <source>Active checkers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="374"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="416"/>
         <source>Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="418"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="405"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="417"/>
         <source>File:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="419"/>
         <source>Copy to Clipboard</source>
         <translation>Copiar al portapapeles</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="420"/>
         <source>Pdf Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 día</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 días</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1 hora</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 horas</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1 minuto</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 minutos</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 segundo</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 segundos</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 segundos</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="171"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> y </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="198"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>Preferencias del proyecto</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>Rutas</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation type="unfinished">Incluye las rutas</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation type="unfinished">Definiciones</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>Ruta seleccionada</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation type="unfinished">Número de archivos analizados</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation type="unfinished">Duración del análisis</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>Errores</translation>
     </message>
@@ -3110,40 +3326,49 @@ Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>Advertencias</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>Advertencias de estilo</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>Advertencias de portabilidad</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>Advertencias de rendimiento</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>Mensajes de información</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_threaddetails.h" line="47"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="46"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 de %2 archivos comprobados</translation>
     </message>
@@ -3164,9 +3389,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 El idioma de la interfaz gráfica ha sido cambiado a Inglés. Abra la ventana de Preferencias para seleccionar alguno de los idiomas disponibles.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_fi.ts b/gui/cppcheck_fi.ts
index d6ad561fd33..0600febbd04 100644
--- a/gui/cppcheck_fi.ts
+++ b/gui/cppcheck_fi.ts
@@ -5,27 +5,32 @@
     <name>About</name>
     <message>
         <location filename="about.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="130"/>
         <source>About Cppcheck</source>
         <translation>Tietoa ohjelmasta Cppcheck</translation>
     </message>
     <message>
         <location filename="about.ui" line="64"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="132"/>
         <source>Version %1</source>
         <translation>Versio %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="133"/>
         <source>Cppcheck - A tool for static C/C++ code analysis.</source>
         <translation>Cppcheck - Työkalu C/C++ koodin staattiseen analysointiin.</translation>
     </message>
     <message>
         <location filename="about.ui" line="81"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="134"/>
         <source>Copyright © 2007-%1 Cppcheck team.</source>
         <oldsource>Copyright © 2007-2021 Cppcheck team.</oldsource>
         <translation type="unfinished">Copyright (C) 2007-2021 Daniel Marjamäki ja cppcheck tiimi.</translation>
     </message>
     <message>
         <location filename="about.ui" line="91"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="135"/>
         <source>This program is licensed under the terms
 of the GNU General Public License version 3</source>
         <translation>Tämä ohjelma on lisensoitu GNU General
@@ -33,11 +38,13 @@ Public lisenssin version 3 alaisuuteen</translation>
     </message>
     <message>
         <location filename="about.ui" line="102"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="137"/>
         <source>Visit Cppcheck homepage at %1</source>
         <translation>Cppcheckin kotisivu löytyy osoitteesta %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;pcre&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;picojson&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tinyxml2&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
         <translation type="unfinished"></translation>
@@ -47,11 +54,13 @@ Public lisenssin version 3 alaisuuteen</translation>
     <name>ApplicationDialog</name>
     <message>
         <location filename="applicationdialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="161"/>
         <source>Add an application</source>
         <translation>Lisää uusi ohjelma</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="162"/>
         <source>Here you can add an application that can open error files. Specify a name for the application, the application executable and command line parameters for the application.
 
 The following texts in parameters are replaced with appropriate values when application is executed:
@@ -67,21 +76,25 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="173"/>
         <source>&amp;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="86"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="174"/>
         <source>&amp;Executable:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="96"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="175"/>
         <source>&amp;Parameters:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="138"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="176"/>
         <source>Browse</source>
         <translation>Selaa</translation>
     </message>
@@ -96,9 +109,8 @@ Parameters: -l(line) (file)</source>
         <translation>Valitse ohjelma jolla avata virhetiedosto</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -106,70 +118,6 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -180,10 +128,8 @@ Parameters: -l(line) (file)</source>
         <translation>Tiedostoa %1 ei löytynyt</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -195,44 +141,49 @@ Parameters: -l(line) (file)</source>
     <name>HelpDialog</name>
     <message>
         <location filename="helpdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="88"/>
         <source>Cppcheck GUI help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="89"/>
         <source>Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="90"/>
         <source>Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
     <name>LibraryAddFunctionDialog</name>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="105"/>
         <source>Add function</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="106"/>
         <source>Function name(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="107"/>
         <source>Number of arguments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -241,126 +192,140 @@ Parameters: -l(line) (file)</source>
     <name>LibraryDialog</name>
     <message>
         <location filename="librarydialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="275"/>
         <source>Library Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="22"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="276"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="29"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="277"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="36"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="278"/>
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="62"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="279"/>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="280"/>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="111"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="281"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="282"/>
         <source>Filter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="164"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="283"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="204"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="284"/>
         <source>noreturn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="212"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="285"/>
         <source>False</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="286"/>
         <source>True</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="222"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="287"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="232"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="289"/>
         <source>return value must be used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="239"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="290"/>
         <source>ignore function in leaks checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="291"/>
         <source>Arguments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="258"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="292"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation type="unfinished"></translation>
     </message>
@@ -369,11 +334,13 @@ Parameters: -l(line) (file)</source>
     <name>LibraryEditArgDialog</name>
     <message>
         <location filename="libraryeditargdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="284"/>
         <source>Edit argument</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="286"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is bool value allowed? For instance result from comparison or from &apos;!&apos; operator.&lt;/p&gt;
 &lt;p&gt;Typically, set this if the argument is a pointer, size, etc.&lt;/p&gt;
@@ -384,11 +351,13 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="28"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="293"/>
         <source>Not bool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="35"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is a null parameter value allowed?&lt;/p&gt;
 &lt;p&gt;Typically this should be used on any pointer parameter that does not allow null.&lt;/p&gt;
@@ -399,78 +368,99 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="43"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="302"/>
         <source>Not null</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="50"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="303"/>
         <source>Not uninit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="57"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="304"/>
         <source>String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="70"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="305"/>
         <source>Format string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="306"/>
         <source>Min size of buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="101"/>
         <location filename="libraryeditargdialog.ui" line="203"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="307"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="316"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="109"/>
         <location filename="libraryeditargdialog.ui" line="214"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="308"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="317"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="114"/>
         <location filename="libraryeditargdialog.ui" line="219"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="309"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="318"/>
         <source>argvalue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="119"/>
         <location filename="libraryeditargdialog.ui" line="224"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="319"/>
         <source>mul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="124"/>
         <location filename="libraryeditargdialog.ui" line="229"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="311"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="320"/>
         <source>strlen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="132"/>
         <location filename="libraryeditargdialog.ui" line="237"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="313"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="322"/>
         <source>Arg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="159"/>
         <location filename="libraryeditargdialog.ui" line="264"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="323"/>
         <source>Arg2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="194"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="315"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="324"/>
         <source>Valid values</source>
         <translation type="unfinished"></translation>
     </message>
@@ -478,835 +468,911 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="687"/>
-        <location filename="mainwindow.cpp" line="463"/>
-        <location filename="mainwindow.cpp" line="667"/>
-        <location filename="mainwindow.cpp" line="752"/>
-        <location filename="mainwindow.cpp" line="857"/>
-        <location filename="mainwindow.cpp" line="879"/>
-        <location filename="mainwindow.cpp" line="1466"/>
-        <location filename="mainwindow.cpp" line="1595"/>
-        <location filename="mainwindow.cpp" line="1936"/>
-        <location filename="mainwindow.cpp" line="1944"/>
-        <location filename="mainwindow.cpp" line="1998"/>
-        <location filename="mainwindow.cpp" line="2007"/>
-        <location filename="mainwindow.cpp" line="2079"/>
-        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="209"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="745"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="266"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="749"/>
         <source>Standard</source>
         <translation>Vakio</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="740"/>
         <source>&amp;File</source>
         <translation>&amp;Tiedosto</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="741"/>
         <source>&amp;View</source>
         <translation>&amp;Näytä</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="742"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="213"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="746"/>
         <source>C++ standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="225"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="747"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="748"/>
         <source>&amp;Edit</source>
         <translation>&amp;Muokkaa</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="578"/>
         <source>&amp;License...</source>
         <translation>&amp;Lisenssi...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="319"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="579"/>
         <source>A&amp;uthors...</source>
         <translation>&amp;Tekijät...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="328"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="580"/>
         <source>&amp;About...</source>
         <translation>&amp;Tietoa ohjelmasta Cppcheck...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="333"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="581"/>
         <source>&amp;Files...</source>
         <translation>&amp;Tiedostot...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="336"/>
         <location filename="mainwindow.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="582"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="584"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="342"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="587"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="351"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="589"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Hakemisto...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="354"/>
         <location filename="mainwindow.ui" line="357"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="590"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="592"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="595"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="599"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="602"/>
         <source>&amp;Stop</source>
         <translation>&amp;Pysäytä</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="393"/>
         <location filename="mainwindow.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="603"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="605"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="608"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="610"/>
         <source>&amp;Save results to file...</source>
         <translation>&amp;Tallenna tulokset tiedostoon...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="411"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="612"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="416"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="614"/>
         <source>&amp;Quit</source>
         <translation>&amp;Lopeta</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="428"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="618"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Tyhjennä tulokset</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="619"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Asetukset</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="470"/>
         <location filename="mainwindow.ui" line="473"/>
-        <location filename="mainwindow.cpp" line="2379"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="626"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="628"/>
+        <location filename="mainwindow.cpp" line="2408"/>
         <source>Show errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="616"/>
         <location filename="mainwindow.ui" line="619"/>
-        <location filename="mainwindow.cpp" line="2380"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="668"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="670"/>
+        <location filename="mainwindow.cpp" line="2409"/>
         <source>Show warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="634"/>
         <location filename="mainwindow.ui" line="637"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="673"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="675"/>
         <source>Show performance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="645"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="677"/>
         <source>Show &amp;hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1015"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="660"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="680"/>
         <source>Show information messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="675"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="684"/>
         <source>Show portability warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="690"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="687"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="702"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="689"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="705"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="691"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="713"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="693"/>
         <source>&amp;Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="716"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="695"/>
         <source>Filter results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="732"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="697"/>
         <source>Windows 32-bit ANSI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="740"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="698"/>
         <source>Windows 32-bit Unicode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="748"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="699"/>
         <source>Unix 32-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="756"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="700"/>
         <source>Unix 64-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="764"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="701"/>
         <source>Windows 64-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="858"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="709"/>
         <source>&amp;Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="861"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="711"/>
         <source>Print the Current Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="866"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="713"/>
         <source>Print Pre&amp;view...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="869"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="715"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="877"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="719"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="478"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="630"/>
         <source>&amp;Check all</source>
         <translation>&amp;Valitse kaikki</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="738"/>
         <source>Checking for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="100"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="739"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="163"/>
         <location filename="mainwindow.ui" line="979"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="730"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="743"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="303"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="751"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="369"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="597"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="381"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="601"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="419"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="616"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="620"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="467"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="625"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="483"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="631"/>
         <source>&amp;Uncheck all</source>
         <translation>&amp;Poista kaikista valinta</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="488"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="632"/>
         <source>Collapse &amp;all</source>
         <translation>&amp;Pienennä kaikki</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="493"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="633"/>
         <source>&amp;Expand all</source>
         <translation>&amp;Laajenna kaikki</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="501"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="634"/>
         <source>&amp;Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="636"/>
         <source>Standard items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="645"/>
         <source>Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="528"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="646"/>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="531"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="648"/>
         <source>Error categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="536"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="650"/>
         <source>&amp;Open XML...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="545"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="651"/>
         <source>Open P&amp;roject File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="548"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="653"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="655"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="562"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="656"/>
         <source>&amp;New Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="565"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="658"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="570"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="660"/>
         <source>&amp;Log View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="573"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="662"/>
         <source>Log View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="581"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="664"/>
         <source>C&amp;lose Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="589"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="665"/>
         <source>&amp;Edit Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="601"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="666"/>
         <source>&amp;Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="613"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="667"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="631"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="672"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="657"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="678"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="672"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="682"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="772"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="702"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="786"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="703"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="797"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="704"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="805"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="705"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="813"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="706"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="845"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="707"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="853"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="708"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="874"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="717"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="721"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="893"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="722"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="901"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="723"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="912"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="724"/>
         <source>C++14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="920"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="725"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="928"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="726"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="936"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="727"/>
         <source>C++17</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="728"/>
         <source>C++20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="729"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="987"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="731"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="995"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1003"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1011"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1019"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="732"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1027"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="733"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1035"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="734"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1040"/>
-        <source>EULA...</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="736"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="509"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="638"/>
         <source>&amp;Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="284"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="750"/>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="452"/>
         <location filename="mainwindow.ui" line="455"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="621"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="623"/>
         <source>Show style warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="512"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="640"/>
         <source>Open the help contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="515"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="643"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="198"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="744"/>
         <source>&amp;Help</source>
         <translation>&amp;Ohje</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="155"/>
-        <location filename="mainwindow.cpp" line="1781"/>
+        <location filename="mainwindow.cpp" line="176"/>
+        <location filename="mainwindow.cpp" line="1812"/>
         <source>Quick Filter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="858"/>
+        <location filename="mainwindow.cpp" line="890"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="992"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="995"/>
+        <location filename="mainwindow.cpp" line="1027"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1030"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1001"/>
+        <location filename="mainwindow.cpp" line="1033"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1013"/>
+        <location filename="mainwindow.cpp" line="1045"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1035"/>
+        <location filename="mainwindow.cpp" line="1064"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1058"/>
+        <location filename="mainwindow.cpp" line="1087"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1120"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1700"/>
         <source>License</source>
         <translation>Lisenssi</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1654"/>
+        <location filename="mainwindow.cpp" line="1707"/>
         <source>Authors</source>
         <translation>Tekijät</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1674"/>
+        <location filename="mainwindow.cpp" line="1727"/>
         <source>Save the report file</source>
         <translation>Tallenna raportti</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1482"/>
-        <location filename="mainwindow.cpp" line="1681"/>
+        <location filename="mainwindow.cpp" line="1539"/>
+        <location filename="mainwindow.cpp" line="1734"/>
         <source>XML files (*.xml)</source>
         <translation>XML-tiedostot (*xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="458"/>
+        <location filename="mainwindow.cpp" line="477"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="753"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1015"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1004"/>
+        <location filename="mainwindow.cpp" line="1036"/>
         <source>Unsupported format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1007"/>
+        <location filename="mainwindow.cpp" line="1039"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1010"/>
+        <location filename="mainwindow.cpp" line="1042"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1016"/>
+        <location filename="mainwindow.cpp" line="1048"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1019"/>
-        <source>Unknown issue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1080"/>
-        <location filename="mainwindow.cpp" line="1090"/>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1120"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1484"/>
+        <location filename="mainwindow.cpp" line="1541"/>
         <source>Open the report file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1685"/>
+        <location filename="mainwindow.cpp" line="1738"/>
         <source>Text files (*.txt)</source>
         <translation>Tekstitiedostot (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1689"/>
+        <location filename="mainwindow.cpp" line="1742"/>
         <source>CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1819"/>
+        <location filename="mainwindow.cpp" line="1850"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="1852"/>
         <source>Select Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="239"/>
-        <location filename="mainwindow.cpp" line="1783"/>
-        <location filename="mainwindow.cpp" line="1849"/>
-        <location filename="mainwindow.cpp" line="2047"/>
+        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="1814"/>
+        <location filename="mainwindow.cpp" line="1880"/>
+        <location filename="mainwindow.cpp" line="2062"/>
         <source>Project:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="668"/>
-        <source>No suitable files found to analyze!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="767"/>
-        <source>C/C++ Source</source>
+        <location filename="mainwindow.cpp" line="601"/>
+        <source>None of the selected files is part of the project, nothing to analyze.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="768"/>
-        <source>Compile database</source>
+        <location filename="mainwindow.cpp" line="702"/>
+        <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="769"/>
-        <source>Visual Studio</source>
+        <location filename="mainwindow.cpp" line="798"/>
+        <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="770"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="mainwindow.cpp" line="799"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="773"/>
+        <location filename="mainwindow.cpp" line="804"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="819"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="880"/>
+        <location filename="mainwindow.cpp" line="912"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1467"/>
+        <location filename="mainwindow.cpp" line="1524"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1314,81 +1380,76 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1591"/>
+        <location filename="mainwindow.cpp" line="1644"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1633"/>
+        <location filename="mainwindow.cpp" line="1686"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1672"/>
+        <location filename="mainwindow.cpp" line="1725"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1712"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1937"/>
+        <location filename="mainwindow.cpp" line="1951"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1945"/>
+        <location filename="mainwindow.cpp" line="1959"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1977"/>
+        <location filename="mainwindow.cpp" line="1992"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1995"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1983"/>
+        <location filename="mainwindow.cpp" line="1998"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1999"/>
+        <location filename="mainwindow.cpp" line="2014"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2008"/>
+        <location filename="mainwindow.cpp" line="2023"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2032"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2034"/>
+        <location filename="mainwindow.cpp" line="2049"/>
         <source>Select Project Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2080"/>
+        <location filename="mainwindow.cpp" line="2095"/>
         <source>No project file loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2148"/>
+        <location filename="mainwindow.cpp" line="2177"/>
         <source>The project file
 
 %1
@@ -1399,67 +1460,67 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2310"/>
+        <location filename="mainwindow.cpp" line="2339"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2314"/>
+        <location filename="mainwindow.cpp" line="2343"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2352"/>
+        <location filename="mainwindow.cpp" line="2381"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2353"/>
+        <location filename="mainwindow.cpp" line="2382"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2354"/>
+        <location filename="mainwindow.cpp" line="2383"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2355"/>
+        <location filename="mainwindow.cpp" line="2384"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2372"/>
+        <location filename="mainwindow.cpp" line="2401"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2373"/>
+        <location filename="mainwindow.cpp" line="2402"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2374"/>
+        <location filename="mainwindow.cpp" line="2403"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2381"/>
+        <location filename="mainwindow.cpp" line="2410"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2382"/>
+        <location filename="mainwindow.cpp" line="2411"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2383"/>
+        <location filename="mainwindow.cpp" line="2412"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2384"/>
+        <location filename="mainwindow.cpp" line="2413"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1503,26 +1564,31 @@ Options:
     <name>NewSuppressionDialog</name>
     <message>
         <location filename="newsuppressiondialog.ui" line="17"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="114"/>
         <source>New suppression</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="25"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="115"/>
         <source>Error ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="32"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="116"/>
         <source>File name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="42"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="117"/>
         <source>Line number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="52"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="118"/>
         <source>Symbol name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1539,415 +1605,479 @@ Options:
         <source>Native</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="platforms.cpp" line="39"/>
-        <source>Unix 32-bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="40"/>
-        <source>Unix 64-bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="41"/>
-        <source>Windows 32-bit ANSI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="42"/>
-        <source>Windows 32-bit Unicode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="43"/>
-        <source>Windows 64-bit</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ProjectFile</name>
     <message>
         <location filename="projectfile.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="923"/>
         <source>Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="955"/>
         <source>Paths and Defines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="30"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="924"/>
         <source>Import Project (Visual studio / compile database/ Borland C++ Builder 6)</source>
         <oldsource>Import Project (Visual studio / compile database)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="231"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="938"/>
         <source>Defines must be separated by a semicolon. Example: DEF1;DEF2=5;DEF3=int</source>
         <oldsource>Defines must be separated by a semicolon &apos;;&apos;</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="958"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="876"/>
+        <location filename="projectfile.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1011"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="883"/>
+        <location filename="projectfile.ui" line="892"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1013"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="890"/>
+        <location filename="projectfile.ui" line="899"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1015"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="73"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="928"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You have a choice:&lt;/p&gt;&lt;p&gt; * Analyze all Debug and Release configurations&lt;/p&gt;&lt;p&gt; * Only analyze the first matching Debug configuration&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="926"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="964"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="930"/>
         <source>Analyze all Visual Studio configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="113"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="931"/>
         <source>Selected VS Configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="147"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="932"/>
         <source>Paths:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="181"/>
         <location filename="projectfile.ui" line="296"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="933"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="945"/>
         <source>Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="934"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="994"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="935"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="995"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="998"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="242"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="940"/>
         <source>Undefines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="252"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="942"/>
         <source>Undefines must be separated by a semicolon. Example: UNDEF1;UNDEF2;UNDEF3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="265"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="944"/>
         <source>Include Paths:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="330"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="948"/>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="337"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="949"/>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="350"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="950"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="952"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="954"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="956"/>
         <source>Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="972"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="982"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="962"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="967"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="968"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="969"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="970"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="971"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="974"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="979"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="980"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="981"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1000"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="983"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="985"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="987"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="999"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="851"/>
+        <location filename="projectfile.ui" line="860"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1009"/>
         <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="901"/>
+        <location filename="projectfile.ui" line="910"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1016"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="918"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1017"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="937"/>
+        <location filename="projectfile.ui" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1020"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="946"/>
+        <location filename="projectfile.ui" line="955"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1021"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="965"/>
+        <location filename="projectfile.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1023"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="981"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1024"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1026"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="991"/>
+        <location filename="projectfile.ui" line="1007"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1027"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="960"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="959"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="957"/>
         <source>Libraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="965"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="966"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="976"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="977"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="978"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="989"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="991"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="992"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="993"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="996"/>
         <source>Suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="997"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1001"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1028"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1002"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1003"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1004"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1005"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1006"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1007"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="914"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1008"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1018"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="958"/>
+        <location filename="projectfile.ui" line="967"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1022"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="975"/>
+        <location filename="projectfile.ui" line="991"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1025"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="projectfile.ui" line="1004"/>
-        <source>Clang analyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="997"/>
-        <source>Clang-tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="936"/>
         <source>Defines:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1960,77 +2090,78 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="604"/>
+        <location filename="projectfiledialog.cpp" line="585"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="865"/>
+        <location filename="projectfiledialog.cpp" line="861"/>
         <source>Select include directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="845"/>
+        <location filename="projectfiledialog.cpp" line="841"/>
         <source>Select a directory to check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="414"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="477"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="643"/>
-        <source>Visual Studio</source>
+        <location filename="projectfiledialog.cpp" line="625"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="644"/>
-        <source>Compile database</source>
+        <location filename="projectfiledialog.cpp" line="627"/>
+        <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="645"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="projectfiledialog.cpp" line="646"/>
+        <source>C/C++ header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="646"/>
-        <source>Import Project</source>
+        <location filename="projectfiledialog.cpp" line="648"/>
+        <source>Include file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="885"/>
+        <location filename="projectfiledialog.cpp" line="881"/>
         <source>Select directory to ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="893"/>
+        <location filename="projectfiledialog.cpp" line="889"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="894"/>
+        <location filename="projectfiledialog.cpp" line="647"/>
+        <location filename="projectfiledialog.cpp" line="890"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="895"/>
+        <location filename="projectfiledialog.cpp" line="891"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="978"/>
+        <location filename="projectfiledialog.cpp" line="976"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="980"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2065,7 +2196,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="302"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2115,161 +2246,156 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="142"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="144"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="114"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">Tiedosto</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="115"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Rivi</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="116"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Tyyppi</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="117"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="118"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="119"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="120"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="121"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="122"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="123"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="124"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="125"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="126"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
@@ -2313,88 +2439,86 @@ Options:
         <translation type="vanished">Määrittelemätön tiedosto</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="657"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="825"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="829"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="830"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="832"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="367"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="298"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="659"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="681"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="660"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="370"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="656"/>
+        <location filename="resultstree.cpp" line="667"/>
         <source>Recheck %1 file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="658"/>
+        <location filename="resultstree.cpp" line="669"/>
         <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="701"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="703"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="733"/>
-        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="734"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2402,19 +2526,19 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
         <translation type="unfinished">Voit asetuksista määritellä muita ohjelmia joilla avata tämän virheen sisältävän tiedoston.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="748"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="768"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="811"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2423,37 +2547,37 @@ Please check the application path and parameters are correct.</source>
 Tarkista että ohjelman polku ja parametrit ovat oikeat.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="833"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="349"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>Tyyli</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="352"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>Yleinen</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="355"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="358"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="361"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="364"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2461,122 +2585,124 @@ Tarkista että ohjelman polku ja parametrit ovat oikeat.</translation>
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="255"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="274"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="326"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="350"/>
-        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="351"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>Virheitä ei löytynyt.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="358"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Virheitä löytyi, mutta asetuksissa kyseiset virheet on määritelty piilotettavaksi.
 Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valikko.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="460"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="465"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="539"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="540"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="541"/>
+        <location filename="resultsview.cpp" line="538"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="549"/>
+        <location filename="resultsview.cpp" line="545"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="563"/>
+        <location filename="resultsview.cpp" line="559"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="565"/>
+        <location filename="resultsview.cpp" line="561"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="567"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="568"/>
+        <location filename="resultsview.cpp" line="564"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="237"/>
-        <location filename="resultsview.cpp" line="245"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>Raportin tallentaminen epäonnistui.</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="26"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="147"/>
         <source>Results</source>
         <translation>Tulokset</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="60"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="148"/>
         <source>Critical errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="149"/>
         <source>Analysis Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="114"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="150"/>
         <source>Warning Details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2585,26 +2711,31 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik
     <name>ScratchPad</name>
     <message>
         <location filename="scratchpad.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="107"/>
         <source>Scratchpad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="108"/>
         <source>Copy or write some C/C++ code here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="37"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="109"/>
         <source>Optionally enter a filename (mainly for automatic language detection) and click on &quot;Check&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="110"/>
         <source>filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="78"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="111"/>
         <source>Check</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2613,77 +2744,92 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik
     <name>Settings</name>
     <message>
         <location filename="settings.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="490"/>
         <source>Preferences</source>
         <translation>Asetukset</translation>
     </message>
     <message>
         <location filename="settings.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="502"/>
         <source>General</source>
         <translation>Yleiset</translation>
     </message>
     <message>
         <location filename="settings.ui" line="196"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="503"/>
         <source>Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="491"/>
         <source>Number of threads: </source>
         <translation>Säikeiden lukumäärä: </translation>
     </message>
     <message>
         <location filename="settings.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="493"/>
         <source>Force checking all #ifdef configurations</source>
         <oldsource>Check all #ifdef configurations</oldsource>
         <translation type="unfinished">Tarkista kaikki #ifdef kombinaatiot</translation>
     </message>
     <message>
         <location filename="settings.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="494"/>
         <source>Show full path of files</source>
         <translation>Näytä tiedostojen täysi polku</translation>
     </message>
     <message>
         <location filename="settings.ui" line="122"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="495"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>Näytä &quot;virheitä ei löytynyt&quot;-viesti jos virheitä ei löydy</translation>
     </message>
     <message>
         <location filename="settings.ui" line="129"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="496"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="136"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="497"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="143"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="498"/>
         <source>Check for inconclusive errors also</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="150"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="499"/>
         <source>Show statistics on check completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="157"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="500"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="177"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="501"/>
         <source>Show internal warnings in log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="521"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="294"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="512"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2691,117 +2837,143 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik
         <location filename="settings.ui" line="305"/>
         <location filename="settings.ui" line="346"/>
         <location filename="settings.ui" line="391"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="513"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="523"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="324"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="515"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="332"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="516"/>
         <source>MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="518"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="526"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="378"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="522"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="401"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="524"/>
         <source>Visual Studio headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="407"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="525"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="533"/>
         <source>Code Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="527"/>
         <source>Code Editor Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="528"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="456"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="529"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="463"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="530"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="472"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="531"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="210"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="505"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="79"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="492"/>
         <source>Max count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="185"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="507"/>
         <source>Applications</source>
         <translation>Ohjelmat</translation>
     </message>
     <message>
         <location filename="settings.ui" line="203"/>
         <location filename="settings.ui" line="479"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="532"/>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="506"/>
         <source>Set as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="240"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="510"/>
         <source>Reports</source>
         <translation>Raportit</translation>
     </message>
     <message>
         <location filename="settings.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="508"/>
         <source>Save all errors when creating report</source>
         <translation>Tallenna kaikki virheet raporttia luodessa</translation>
     </message>
     <message>
         <location filename="settings.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="509"/>
         <source>Save full path to files in reports</source>
         <translation>Tallenna tiedostojen koko polku raportteihin</translation>
     </message>
     <message>
         <location filename="settings.ui" line="274"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="511"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2854,221 +3026,245 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="395"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="415"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="401"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="33"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="396"/>
         <source>Project:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="53"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="397"/>
         <source>Paths:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="85"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="398"/>
         <source>Include paths:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="399"/>
         <source>Defines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="400"/>
         <source>Undefines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="407"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="171"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="402"/>
         <source>Path Selected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="181"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="403"/>
         <source>Number of Files Scanned:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="201"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="405"/>
         <source>Scan Duration:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="254"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="408"/>
         <source>Errors:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="271"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="409"/>
         <source>Warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="410"/>
         <source>Stylistic warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="305"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="411"/>
         <source>Portability warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="322"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="412"/>
         <source>Performance issues:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="413"/>
         <source>Information messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="356"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="414"/>
         <source>Active checkers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="374"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="416"/>
         <source>Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="418"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="405"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="417"/>
         <source>File:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="419"/>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="420"/>
         <source>Pdf Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="171"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="198"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3083,40 +3279,49 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_threaddetails.h" line="47"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="46"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3133,9 +3338,8 @@ The user interface language has been reset to English. Open the Preferences-dial
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_fr.ts b/gui/cppcheck_fr.ts
index 45ee1549a62..7ac6f3ae89a 100644
--- a/gui/cppcheck_fr.ts
+++ b/gui/cppcheck_fr.ts
@@ -5,21 +5,25 @@
     <name>About</name>
     <message>
         <location filename="about.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="130"/>
         <source>About Cppcheck</source>
         <translation>A propos</translation>
     </message>
     <message>
         <location filename="about.ui" line="64"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="132"/>
         <source>Version %1</source>
         <translation>Version %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="133"/>
         <source>Cppcheck - A tool for static C/C++ code analysis.</source>
         <translation>Cppcheck - Un outil d&apos;analyse statique de code C/C++.</translation>
     </message>
     <message>
         <location filename="about.ui" line="91"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="135"/>
         <source>This program is licensed under the terms
 of the GNU General Public License version 3</source>
         <translation>Ce programme est sous licence GNU
@@ -27,17 +31,20 @@ General Public License version 3</translation>
     </message>
     <message>
         <location filename="about.ui" line="102"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="137"/>
         <source>Visit Cppcheck homepage at %1</source>
         <translation>Visitez le site Cppcheck : %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;pcre&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;picojson&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tinyxml2&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="about.ui" line="81"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="134"/>
         <source>Copyright © 2007-%1 Cppcheck team.</source>
         <oldsource>Copyright © 2007-2021 Cppcheck team.</oldsource>
         <translation type="unfinished"></translation>
@@ -47,11 +54,13 @@ General Public License version 3</translation>
     <name>ApplicationDialog</name>
     <message>
         <location filename="applicationdialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="161"/>
         <source>Add an application</source>
         <translation>Ajouter une application</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="138"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="176"/>
         <source>Browse</source>
         <translation>Parcourir</translation>
     </message>
@@ -65,23 +74,21 @@ General Public License version 3</translation>
         <source>Select viewer application</source>
         <translation>Sélection de l&apos;application</translation>
     </message>
-    <message>
-        <location filename="applicationdialog.cpp" line="83"/>
-        <source>Cppcheck</source>
-        <translation></translation>
-    </message>
     <message>
         <location filename="applicationdialog.ui" line="86"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="174"/>
         <source>&amp;Executable:</source>
         <translation>&amp;Exécutable : </translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="96"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="175"/>
         <source>&amp;Parameters:</source>
         <translation>&amp;Paramètres : </translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="162"/>
         <source>Here you can add an application that can open error files. Specify a name for the application, the application executable and command line parameters for the application.
 
 The following texts in parameters are replaced with appropriate values when application is executed:
@@ -107,6 +114,7 @@ Paramètres : -l(ligne) (fichier)</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="173"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nom : </translation>
     </message>
@@ -116,70 +124,6 @@ Paramètres : -l(ligne) (fichier)</translation>
         <translation>Vous devez spécifier un nom, un chemin, et eventuellement des paramètres en option à l&apos;application !</translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -187,12 +131,6 @@ Paramètres : -l(ligne) (fichier)</translation>
         <source>Could not find the file: %1</source>
         <translation>Ne trouve pas le fichier : %1</translation>
     </message>
-    <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
-        <source>Cppcheck</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
         <source>Could not read the file: %1</source>
@@ -203,44 +141,45 @@ Paramètres : -l(ligne) (fichier)</translation>
     <name>HelpDialog</name>
     <message>
         <location filename="helpdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="88"/>
         <source>Cppcheck GUI help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="89"/>
         <source>Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="90"/>
         <source>Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="helpdialog.cpp" line="86"/>
-        <source>Cppcheck</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LibraryAddFunctionDialog</name>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="105"/>
         <source>Add function</source>
         <translation>Ajouter une fonction</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="106"/>
         <source>Function name(s)</source>
         <translation>Nom(s) de la fonction</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="107"/>
         <source>Number of arguments</source>
         <translation>Nombre d&apos;arguments</translation>
     </message>
@@ -249,124 +188,134 @@ Paramètres : -l(ligne) (fichier)</translation>
     <name>LibraryDialog</name>
     <message>
         <location filename="librarydialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="275"/>
         <source>Library Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="22"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="276"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="29"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="277"/>
         <source>Save</source>
         <translation type="unfinished">Sauvegarder</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="62"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="279"/>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="111"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="281"/>
         <source>Add</source>
         <translation type="unfinished">Ajouter</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="204"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="284"/>
         <source>noreturn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="212"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="285"/>
         <source>False</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="286"/>
         <source>True</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="222"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="287"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="232"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="289"/>
         <source>return value must be used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="239"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="290"/>
         <source>ignore function in leaks checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="291"/>
         <source>Arguments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="258"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="292"/>
         <source>Edit</source>
         <translation type="unfinished">Editer</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="280"/>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="282"/>
         <source>Filter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="164"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="283"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="36"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="278"/>
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
-        <source>Cppcheck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -375,11 +324,13 @@ Paramètres : -l(ligne) (fichier)</translation>
     <name>LibraryEditArgDialog</name>
     <message>
         <location filename="libraryeditargdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="284"/>
         <source>Edit argument</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="286"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is bool value allowed? For instance result from comparison or from &apos;!&apos; operator.&lt;/p&gt;
 &lt;p&gt;Typically, set this if the argument is a pointer, size, etc.&lt;/p&gt;
@@ -390,11 +341,13 @@ Paramètres : -l(ligne) (fichier)</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="28"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="293"/>
         <source>Not bool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="35"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is a null parameter value allowed?&lt;/p&gt;
 &lt;p&gt;Typically this should be used on any pointer parameter that does not allow null.&lt;/p&gt;
@@ -405,591 +358,636 @@ Paramètres : -l(ligne) (fichier)</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="43"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="302"/>
         <source>Not null</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="50"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="303"/>
         <source>Not uninit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="57"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="304"/>
         <source>String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="70"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="305"/>
         <source>Format string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="306"/>
         <source>Min size of buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="101"/>
         <location filename="libraryeditargdialog.ui" line="203"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="307"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="316"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="109"/>
         <location filename="libraryeditargdialog.ui" line="214"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="308"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="317"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="114"/>
         <location filename="libraryeditargdialog.ui" line="219"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="309"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="318"/>
         <source>argvalue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="119"/>
         <location filename="libraryeditargdialog.ui" line="224"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="319"/>
         <source>mul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="124"/>
         <location filename="libraryeditargdialog.ui" line="229"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="311"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="320"/>
         <source>strlen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="132"/>
         <location filename="libraryeditargdialog.ui" line="237"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="313"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="322"/>
         <source>Arg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="159"/>
         <location filename="libraryeditargdialog.ui" line="264"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="323"/>
         <source>Arg2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="194"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="315"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="324"/>
         <source>Valid values</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
-    <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="687"/>
-        <location filename="mainwindow.cpp" line="463"/>
-        <location filename="mainwindow.cpp" line="667"/>
-        <location filename="mainwindow.cpp" line="752"/>
-        <location filename="mainwindow.cpp" line="857"/>
-        <location filename="mainwindow.cpp" line="879"/>
-        <location filename="mainwindow.cpp" line="1466"/>
-        <location filename="mainwindow.cpp" line="1595"/>
-        <location filename="mainwindow.cpp" line="1936"/>
-        <location filename="mainwindow.cpp" line="1944"/>
-        <location filename="mainwindow.cpp" line="1998"/>
-        <location filename="mainwindow.cpp" line="2007"/>
-        <location filename="mainwindow.cpp" line="2079"/>
-        <location filename="mainwindow.cpp" line="2153"/>
-        <source>Cppcheck</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="738"/>
         <source>Checking for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="100"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="739"/>
         <source>Hide</source>
         <translation type="unfinished">Cacher</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="740"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="741"/>
         <source>&amp;View</source>
         <translation>&amp;Affichage</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="163"/>
         <location filename="mainwindow.ui" line="979"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="730"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="743"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="198"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="744"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="748"/>
         <source>&amp;Edit</source>
         <translation>&amp;Édition</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="266"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="749"/>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="578"/>
         <source>&amp;License...</source>
         <translation>&amp;Licence...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="319"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="579"/>
         <source>A&amp;uthors...</source>
         <translation>A&amp;uteurs...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="328"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="580"/>
         <source>&amp;About...</source>
         <translation>À &amp;Propos...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="333"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="581"/>
         <source>&amp;Files...</source>
         <translation>&amp;Fichiers...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="342"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="587"/>
         <source>Ctrl+F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="351"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="589"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Répertoires...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="595"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="599"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="602"/>
         <source>&amp;Stop</source>
         <translation>&amp;Arrêter</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="608"/>
         <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="610"/>
         <source>&amp;Save results to file...</source>
         <translation>&amp;Sauvegarder les résultats dans un fichier...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="411"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="612"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="416"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="614"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="428"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="618"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Effacer les résultats</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="619"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Préférences</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="478"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="630"/>
         <source>&amp;Check all</source>
         <translation>&amp;Tout cocher</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="483"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="631"/>
         <source>&amp;Uncheck all</source>
         <translation>&amp;Tout décocher</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="488"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="632"/>
         <source>Collapse &amp;all</source>
         <translation>&amp;Tout réduire</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="493"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="633"/>
         <source>&amp;Expand all</source>
         <translation>&amp;Tout dérouler</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="509"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="638"/>
         <source>&amp;Contents</source>
         <translation>&amp;Contenus</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="512"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="640"/>
         <source>Open the help contents</source>
         <translation>Ouvir l&apos;aide</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="515"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="643"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="729"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="987"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="731"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="995"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1003"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1011"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1019"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="732"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1027"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="733"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1035"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="734"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1040"/>
-        <source>EULA...</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="736"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1700"/>
         <source>License</source>
         <translation>Licence</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1654"/>
+        <location filename="mainwindow.cpp" line="1707"/>
         <source>Authors</source>
         <translation>Auteurs</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1674"/>
+        <location filename="mainwindow.cpp" line="1727"/>
         <source>Save the report file</source>
         <translation>Sauvegarder le rapport</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1482"/>
-        <location filename="mainwindow.cpp" line="1681"/>
+        <location filename="mainwindow.cpp" line="1539"/>
+        <location filename="mainwindow.cpp" line="1734"/>
         <source>XML files (*.xml)</source>
         <translation>Fichiers XML (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1633"/>
+        <location filename="mainwindow.cpp" line="1686"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1685"/>
+        <location filename="mainwindow.cpp" line="1738"/>
         <source>Text files (*.txt)</source>
         <translation>Fichiers Texte (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1689"/>
+        <location filename="mainwindow.cpp" line="1742"/>
         <source>CSV files (*.csv)</source>
         <translation>Fichiers CSV (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="742"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Boite à outils</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="284"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="750"/>
         <source>Categories</source>
         <translation>Catégories</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="452"/>
         <location filename="mainwindow.ui" line="455"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="621"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="623"/>
         <source>Show style warnings</source>
         <translation>Afficher les avertissements de style</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="470"/>
         <location filename="mainwindow.ui" line="473"/>
-        <location filename="mainwindow.cpp" line="2379"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="626"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="628"/>
+        <location filename="mainwindow.cpp" line="2408"/>
         <source>Show errors</source>
         <translation>Afficher les erreurs</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="501"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="634"/>
         <source>&amp;Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="636"/>
         <source>Standard items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="645"/>
         <source>Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="528"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="646"/>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="531"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="648"/>
         <source>Error categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="536"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="650"/>
         <source>&amp;Open XML...</source>
         <translation>&amp;Ouvrir un fichier XML...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="545"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="651"/>
         <source>Open P&amp;roject File...</source>
         <translation>Ouvrir un P&amp;rojet...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="562"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="656"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;Nouveau Projet...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="570"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="660"/>
         <source>&amp;Log View</source>
         <translation>&amp;Journal</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="573"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="662"/>
         <source>Log View</source>
         <translation>Journal</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="581"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="664"/>
         <source>C&amp;lose Project File</source>
         <translation>F&amp;ermer le projet</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="589"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="665"/>
         <source>&amp;Edit Project File...</source>
         <translation>&amp;Editer le projet</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="601"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="666"/>
         <source>&amp;Statistics</source>
         <translation>Statistiques</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="616"/>
         <location filename="mainwindow.ui" line="619"/>
-        <location filename="mainwindow.cpp" line="2380"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="668"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="670"/>
+        <location filename="mainwindow.cpp" line="2409"/>
         <source>Show warnings</source>
         <translation>Afficher les avertissements</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="634"/>
         <location filename="mainwindow.ui" line="637"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="673"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="675"/>
         <source>Show performance warnings</source>
         <translation>Afficher les avertissements de performance</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="645"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="677"/>
         <source>Show &amp;hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1015"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="660"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="680"/>
         <source>Show information messages</source>
         <translation>Afficher les messages d&apos;information</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="675"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="684"/>
         <source>Show portability warnings</source>
         <translation>Afficher les problèmes de portabilité</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="753"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>Vous devez d&apos;abord fermer le projet avant de choisir des fichiers/répertoires</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1484"/>
+        <location filename="mainwindow.cpp" line="1541"/>
         <source>Open the report file</source>
         <translation>Ouvrir le rapport</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1712"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1819"/>
+        <location filename="mainwindow.cpp" line="1850"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="1852"/>
         <source>Select Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1945"/>
+        <location filename="mainwindow.cpp" line="1959"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1977"/>
+        <location filename="mainwindow.cpp" line="1992"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1995"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1983"/>
+        <location filename="mainwindow.cpp" line="1998"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1999"/>
+        <location filename="mainwindow.cpp" line="2014"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2008"/>
+        <location filename="mainwindow.cpp" line="2023"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2034"/>
+        <location filename="mainwindow.cpp" line="2049"/>
         <source>Select Project Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2080"/>
+        <location filename="mainwindow.cpp" line="2095"/>
         <source>No project file loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2310"/>
+        <location filename="mainwindow.cpp" line="2339"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2314"/>
+        <location filename="mainwindow.cpp" line="2343"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2352"/>
+        <location filename="mainwindow.cpp" line="2381"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2353"/>
+        <location filename="mainwindow.cpp" line="2382"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2354"/>
+        <location filename="mainwindow.cpp" line="2383"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2355"/>
+        <location filename="mainwindow.cpp" line="2384"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2372"/>
+        <location filename="mainwindow.cpp" line="2401"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2373"/>
+        <location filename="mainwindow.cpp" line="2402"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2374"/>
+        <location filename="mainwindow.cpp" line="2403"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2381"/>
+        <location filename="mainwindow.cpp" line="2410"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2382"/>
+        <location filename="mainwindow.cpp" line="2411"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2383"/>
+        <location filename="mainwindow.cpp" line="2412"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2384"/>
+        <location filename="mainwindow.cpp" line="2413"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="458"/>
+        <location filename="mainwindow.cpp" line="477"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -997,37 +995,39 @@ This is probably because the settings were changed between the Cppcheck versions
     </message>
     <message>
         <location filename="mainwindow.ui" line="713"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="693"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filtre</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="716"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="695"/>
         <source>Filter results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="155"/>
-        <location filename="mainwindow.cpp" line="1781"/>
+        <location filename="mainwindow.cpp" line="176"/>
+        <location filename="mainwindow.cpp" line="1812"/>
         <source>Quick Filter:</source>
         <translation>Filtre rapide : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="858"/>
+        <location filename="mainwindow.cpp" line="890"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="239"/>
-        <location filename="mainwindow.cpp" line="1783"/>
-        <location filename="mainwindow.cpp" line="1849"/>
-        <location filename="mainwindow.cpp" line="2047"/>
+        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="1814"/>
+        <location filename="mainwindow.cpp" line="1880"/>
+        <location filename="mainwindow.cpp" line="2062"/>
         <source>Project:</source>
         <translation>Projet : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2148"/>
+        <location filename="mainwindow.cpp" line="2177"/>
         <source>The project file
 
 %1
@@ -1039,31 +1039,37 @@ Do you want to remove the file from the recently used projects -list?</source>
     </message>
     <message>
         <location filename="mainwindow.ui" line="303"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="751"/>
         <source>Filter</source>
         <translation>Filtre</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="732"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="697"/>
         <source>Windows 32-bit ANSI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="740"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="698"/>
         <source>Windows 32-bit Unicode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="748"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="699"/>
         <source>Unix 32-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="756"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="700"/>
         <source>Unix 64-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="764"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="701"/>
         <source>Windows 64-bit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1074,103 +1080,104 @@ Do you want to remove the file from the recently used projects -list?</source>
     </message>
     <message>
         <location filename="mainwindow.ui" line="213"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="746"/>
         <source>C++ standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
-        <location filename="mainwindow.cpp" line="1090"/>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1120"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="992"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>File not found</source>
         <translation>Fichier introuvable</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="995"/>
+        <location filename="mainwindow.cpp" line="1027"/>
         <source>Bad XML</source>
         <translation>Mauvais fichier XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1030"/>
         <source>Missing attribute</source>
         <translation>Attribut manquant</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1001"/>
+        <location filename="mainwindow.cpp" line="1033"/>
         <source>Bad attribute value</source>
         <translation>Mauvaise valeur d&apos;attribut</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation>Echec lors du chargement de la bibliothèque &apos;%1&apos;.
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1004"/>
+        <location filename="mainwindow.cpp" line="1036"/>
         <source>Unsupported format</source>
         <translation>Format non supporté</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1015"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>La bibliothèque &apos;%1&apos; contient des éléments inconnus:
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1007"/>
+        <location filename="mainwindow.cpp" line="1039"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1010"/>
+        <location filename="mainwindow.cpp" line="1042"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="858"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="709"/>
         <source>&amp;Print...</source>
         <translation> &amp;Imprimer...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="861"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="711"/>
         <source>Print the Current Report</source>
         <translation>Imprimer le rapport</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="866"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="713"/>
         <source>Print Pre&amp;view...</source>
         <translation>Apercu d&apos;impression...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="869"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="715"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="877"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="719"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1016"/>
+        <location filename="mainwindow.cpp" line="1048"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1019"/>
-        <source>Unknown issue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1193,104 +1200,116 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1937"/>
+        <location filename="mainwindow.cpp" line="1951"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="336"/>
         <location filename="mainwindow.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="582"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="584"/>
         <source>Analyze files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="354"/>
         <location filename="mainwindow.ui" line="357"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="590"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="592"/>
         <source>Analyze directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="369"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="597"/>
         <source>&amp;Reanalyze modified files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="393"/>
         <location filename="mainwindow.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="603"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="605"/>
         <source>Stop analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1672"/>
+        <location filename="mainwindow.cpp" line="1725"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="668"/>
+        <location filename="mainwindow.cpp" line="702"/>
         <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="773"/>
+        <location filename="mainwindow.cpp" line="601"/>
+        <source>None of the selected files is part of the project, nothing to analyze.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="804"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="819"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="880"/>
+        <location filename="mainwindow.cpp" line="912"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1013"/>
+        <location filename="mainwindow.cpp" line="1045"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1035"/>
+        <location filename="mainwindow.cpp" line="1064"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1058"/>
+        <location filename="mainwindow.cpp" line="1087"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1120"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1591"/>
+        <location filename="mainwindow.cpp" line="1644"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1298,191 +1317,213 @@ Do you want to stop the analysis and exit Cppcheck?</source>
     </message>
     <message>
         <location filename="mainwindow.ui" line="209"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="745"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="225"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="747"/>
         <source>&amp;C standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="381"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="601"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="419"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="616"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="620"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="467"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="625"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="548"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="653"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="655"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="565"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="658"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="613"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="667"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="631"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="672"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="657"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="678"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="672"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="682"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="690"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="687"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="702"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="689"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="705"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="691"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="772"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="702"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="786"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="703"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="797"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="704"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="805"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="705"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="813"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="706"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="845"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="707"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="853"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="708"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="874"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="717"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="721"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="893"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="722"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="901"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="723"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="912"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="724"/>
         <source>C++14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2032"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="920"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="725"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="928"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="726"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="936"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="727"/>
         <source>C++17</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="728"/>
         <source>C++20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="767"/>
+        <location filename="mainwindow.cpp" line="798"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="768"/>
+        <location filename="mainwindow.cpp" line="799"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="769"/>
-        <source>Visual Studio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="770"/>
-        <source>Borland C++ Builder 6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1467"/>
+        <location filename="mainwindow.cpp" line="1524"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1494,26 +1535,31 @@ Do you want to proceed?</source>
     <name>NewSuppressionDialog</name>
     <message>
         <location filename="newsuppressiondialog.ui" line="17"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="114"/>
         <source>New suppression</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="25"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="115"/>
         <source>Error ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="32"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="116"/>
         <source>File name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="42"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="117"/>
         <source>Line number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="52"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="118"/>
         <source>Symbol name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1525,31 +1571,6 @@ Do you want to proceed?</source>
 </context>
 <context>
     <name>Platforms</name>
-    <message>
-        <location filename="platforms.cpp" line="39"/>
-        <source>Unix 32-bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="40"/>
-        <source>Unix 64-bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="41"/>
-        <source>Windows 32-bit ANSI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="42"/>
-        <source>Windows 32-bit Unicode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="43"/>
-        <source>Windows 64-bit</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="platforms.cpp" line="38"/>
         <source>Native</source>
@@ -1560,383 +1581,472 @@ Do you want to proceed?</source>
     <name>ProjectFile</name>
     <message>
         <location filename="projectfile.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="923"/>
         <source>Project File</source>
         <translation>Fichier Projet</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="147"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="932"/>
         <source>Paths:</source>
         <translation>Chemins : </translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="936"/>
         <source>Defines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="181"/>
         <location filename="projectfile.ui" line="296"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="933"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="945"/>
         <source>Add...</source>
         <translation>Ajouter...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="934"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="994"/>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="935"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="995"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="998"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="330"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="948"/>
         <source>Up</source>
         <translation>Monter</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="337"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="949"/>
         <source>Down</source>
         <translation>Descendre</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="996"/>
         <source>Suppressions</source>
         <translation>Suppressions</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="997"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="958"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="890"/>
+        <location filename="projectfile.ui" line="899"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1015"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="265"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="944"/>
         <source>Include Paths:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="955"/>
         <source>Paths and Defines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="73"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="928"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You have a choice:&lt;/p&gt;&lt;p&gt; * Analyze all Debug and Release configurations&lt;/p&gt;&lt;p&gt; * Only analyze the first matching Debug configuration&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="930"/>
         <source>Analyze all Visual Studio configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="983"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="987"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="960"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="113"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="931"/>
         <source>Selected VS Configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="950"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="952"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="954"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="959"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="957"/>
         <source>Libraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="965"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="966"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="976"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="977"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1001"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1028"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1002"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1003"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1004"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1005"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="937"/>
+        <location filename="projectfile.ui" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1020"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="946"/>
+        <location filename="projectfile.ui" line="955"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1021"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="965"/>
+        <location filename="projectfile.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1023"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="projectfile.ui" line="981"/>
-        <source>Bug hunting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="1004"/>
-        <source>Clang analyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="projectfile.ui" line="997"/>
-        <source>Clang-tidy</source>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1026"/>
+        <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="926"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="964"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="231"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="938"/>
         <source>Defines must be separated by a semicolon. Example: DEF1;DEF2=5;DEF3=int</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="956"/>
         <source>Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="962"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="967"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="968"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="969"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="970"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="971"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="974"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="978"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="981"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1000"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="985"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="989"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="991"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="992"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="993"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="999"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1006"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1007"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="914"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1008"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1018"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="851"/>
+        <location filename="projectfile.ui" line="860"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1009"/>
         <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="876"/>
+        <location filename="projectfile.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1011"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="883"/>
+        <location filename="projectfile.ui" line="892"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1013"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="901"/>
+        <location filename="projectfile.ui" line="910"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1016"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="918"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1017"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="958"/>
+        <location filename="projectfile.ui" line="967"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1022"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="975"/>
-        <source>Bug hunting (Premium)</source>
+        <location filename="projectfile.ui" line="981"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1024"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="991"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1025"/>
+        <source>Bug hunting (Premium)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="1007"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1027"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="30"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="924"/>
         <source>Import Project (Visual studio / compile database/ Borland C++ Builder 6)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="242"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="940"/>
         <source>Undefines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="252"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="942"/>
         <source>Undefines must be separated by a semicolon. Example: UNDEF1;UNDEF2;UNDEF3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="972"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="982"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="979"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="980"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1949,78 +2059,79 @@ Do you want to proceed?</source>
         <translation>Fichier projet : %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="865"/>
+        <location filename="projectfiledialog.cpp" line="861"/>
         <source>Select include directory</source>
         <translation>Selectionner un répertoire à inclure</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="885"/>
+        <location filename="projectfiledialog.cpp" line="881"/>
         <source>Select directory to ignore</source>
         <translation>Selectionner un répertoire à ignorer</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="845"/>
+        <location filename="projectfiledialog.cpp" line="841"/>
         <source>Select a directory to check</source>
         <translation>Selectionner un répertoire à vérifier</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="604"/>
+        <location filename="projectfiledialog.cpp" line="585"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="646"/>
+        <location filename="projectfiledialog.cpp" line="627"/>
         <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="477"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="414"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="893"/>
+        <location filename="projectfiledialog.cpp" line="889"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="894"/>
+        <location filename="projectfiledialog.cpp" line="647"/>
+        <location filename="projectfiledialog.cpp" line="890"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="895"/>
-        <source>Exclude file</source>
+        <location filename="projectfiledialog.cpp" line="646"/>
+        <source>C/C++ header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="978"/>
-        <source>Select MISRA rule texts file</source>
+        <location filename="projectfiledialog.cpp" line="648"/>
+        <source>Include file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="980"/>
-        <source>MISRA rule texts file (%1)</source>
+        <location filename="projectfiledialog.cpp" line="891"/>
+        <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="643"/>
-        <source>Visual Studio</source>
+        <location filename="projectfiledialog.cpp" line="976"/>
+        <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="644"/>
-        <source>Compile database</source>
+        <location filename="projectfiledialog.cpp" line="978"/>
+        <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="645"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="projectfiledialog.cpp" line="625"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2052,7 +2163,7 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="302"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2102,160 +2213,155 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="142"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="144"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="114"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">Fichier</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="115"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Ligne</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="116"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Sévérité</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="117"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="118"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="119"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="120"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">Résumé</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="121"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="122"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="123"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="124"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="125"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="126"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
@@ -2299,13 +2405,7 @@ Do you want to proceed?</source>
         <translation type="vanished">Fichier indéterminé</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="733"/>
-        <location filename="resultstree.cpp" line="747"/>
-        <source>Cppcheck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="811"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2314,12 +2414,12 @@ Please check the application path and parameters are correct.</source>
 Merci de vérifier que le chemin de l&apos;application et que les paramètres sont corrects.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="349"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>erreur de style</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="352"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>erreur</translation>
     </message>
@@ -2332,64 +2432,64 @@ Merci de vérifier que le chemin de l&apos;application et que les paramètres so
         <translation type="vanished">Cacher</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="768"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>Fichier introuvable !</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="833"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>Selectionner dossier</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="355"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>avertissement</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="358"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>performance</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="361"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>portabilité</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="364"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>information</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="367"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>débogage</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="370"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="656"/>
+        <location filename="resultstree.cpp" line="667"/>
         <source>Recheck %1 file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="658"/>
+        <location filename="resultstree.cpp" line="669"/>
         <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="734"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="748"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2400,12 +2500,12 @@ Please select the default editor application in preferences/Applications.</sourc
         <translation type="vanished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="659"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="660"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation>Ouvrir l&apos;emplacement du fichier</translation>
     </message>
@@ -2414,47 +2514,47 @@ Please select the default editor application in preferences/Applications.</sourc
         <translation type="vanished">Revérifier</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="298"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="681"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="701"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="703"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="825"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="829"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="830"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="832"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="657"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2463,121 +2563,119 @@ Please select the default editor application in preferences/Applications.</sourc
     <name>ResultsView</name>
     <message>
         <location filename="resultsview.ui" line="26"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="147"/>
         <source>Results</source>
         <translation>Résultats</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="350"/>
-        <location filename="resultsview.cpp" line="361"/>
-        <source>Cppcheck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="351"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>Pas d&apos;erreurs trouvées.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="358"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Des erreurs ont été trouvées mais sont configurées pour rester cachées.
 Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="549"/>
+        <location filename="resultsview.cpp" line="545"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="563"/>
+        <location filename="resultsview.cpp" line="559"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="565"/>
+        <location filename="resultsview.cpp" line="561"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="567"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="568"/>
+        <location filename="resultsview.cpp" line="564"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="237"/>
-        <location filename="resultsview.cpp" line="245"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>Erreur lors de la sauvegarde du rapport.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>Erreur lors de la lecture du rapport</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="326"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 fichiers sur %2 vérifiés)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="465"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="255"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>Imprimer le rapport</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="274"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation>Aucune erreur trouvée. Il n&apos;y a rien à imprimer</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="460"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="60"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="148"/>
         <source>Critical errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="149"/>
         <source>Analysis Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="114"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="150"/>
         <source>Warning Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="539"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="540"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="541"/>
+        <location filename="resultsview.cpp" line="538"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2586,26 +2684,31 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
     <name>ScratchPad</name>
     <message>
         <location filename="scratchpad.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="107"/>
         <source>Scratchpad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="110"/>
         <source>filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="78"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="111"/>
         <source>Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="108"/>
         <source>Copy or write some C/C++ code here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="37"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="109"/>
         <source>Optionally enter a filename (mainly for automatic language detection) and click on &quot;Check&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2614,122 +2717,147 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
     <name>Settings</name>
     <message>
         <location filename="settings.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="490"/>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
         <location filename="settings.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="502"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
         <location filename="settings.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="491"/>
         <source>Number of threads: </source>
         <translation>Nombre de fils : </translation>
     </message>
     <message>
         <location filename="settings.ui" line="79"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="492"/>
         <source>Max count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="494"/>
         <source>Show full path of files</source>
         <translation>Montrer le chemin complet des fichiers</translation>
     </message>
     <message>
         <location filename="settings.ui" line="122"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="495"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>Afficher un message &quot;Pas d&apos;erreur trouvée&quot; lorsque aucune erreur est trouvée</translation>
     </message>
     <message>
         <location filename="settings.ui" line="157"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="500"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="185"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="507"/>
         <source>Applications</source>
         <translation>Applications</translation>
     </message>
     <message>
         <location filename="settings.ui" line="240"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="510"/>
         <source>Reports</source>
         <translation>Rapports</translation>
     </message>
     <message>
         <location filename="settings.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="508"/>
         <source>Save all errors when creating report</source>
         <translation>Sauvegarder toutes les erreurs lorsqu&apos;un rapport est créé</translation>
     </message>
     <message>
         <location filename="settings.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="509"/>
         <source>Save full path to files in reports</source>
         <translation>Sauvegarder le chemin complet des fichiers dans les rapports</translation>
     </message>
     <message>
         <location filename="settings.ui" line="196"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="503"/>
         <source>Add...</source>
         <translation>Ajouter...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="493"/>
         <source>Force checking all #ifdef configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="136"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="497"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="274"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="511"/>
         <source>Language</source>
         <translation>Langue</translation>
     </message>
     <message>
         <location filename="settings.ui" line="210"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="505"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <location filename="settings.ui" line="203"/>
         <location filename="settings.ui" line="479"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="532"/>
         <source>Edit...</source>
         <translation>Editer...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="506"/>
         <source>Set as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="129"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="496"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>Afficher l&apos;identifiant d&apos;erreur Id dans la colonne &quot;Id&quot;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="143"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="498"/>
         <source>Check for inconclusive errors also</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="177"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="501"/>
         <source>Show internal warnings in log</source>
         <translation>Montrer les avertissements internes dans le journal</translation>
     </message>
     <message>
         <location filename="settings.ui" line="150"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="499"/>
         <source>Show statistics on check completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="521"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="294"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="512"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2737,71 +2865,87 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
         <location filename="settings.ui" line="305"/>
         <location filename="settings.ui" line="346"/>
         <location filename="settings.ui" line="391"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="513"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="523"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="526"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="378"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="522"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="401"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="524"/>
         <source>Visual Studio headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="407"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="525"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="324"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="515"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="332"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="516"/>
         <source>MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="518"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="533"/>
         <source>Code Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="527"/>
         <source>Code Editor Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="456"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="529"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="463"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="530"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="472"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="531"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="528"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2854,241 +2998,264 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="395"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="415"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>Statistiques</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="401"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>Projet</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="33"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="396"/>
         <source>Project:</source>
         <translation>Projet :</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="53"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="397"/>
         <source>Paths:</source>
         <translation>Chemins :</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="85"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="398"/>
         <source>Include paths:</source>
         <translation>Inclure les chemins :</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="399"/>
         <source>Defines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="407"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>Analyse précédente</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="171"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="402"/>
         <source>Path Selected:</source>
         <translation>Chemin sélectionné :</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="181"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="403"/>
         <source>Number of Files Scanned:</source>
         <translation>Nombre de fichiers analysés :</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="201"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="405"/>
         <source>Scan Duration:</source>
         <translation>Durée de l&apos;analyse :</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="254"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="408"/>
         <source>Errors:</source>
         <translation>Erreurs :</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="271"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="409"/>
         <source>Warnings:</source>
         <translation>Avertissements</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="410"/>
         <source>Stylistic warnings:</source>
         <translation>Avertissements de style</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="305"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="411"/>
         <source>Portability warnings:</source>
         <translation>Avertissements de portabilité</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="322"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="412"/>
         <source>Performance issues:</source>
         <translation>Problème de performance</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="413"/>
         <source>Information messages:</source>
         <translation>Messages d&apos;information :</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="356"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="414"/>
         <source>Active checkers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="374"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="416"/>
         <source>Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="419"/>
         <source>Copy to Clipboard</source>
         <translation>Copier vers le presse-papier</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="171"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation type="unfinished">Chemins</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation type="unfinished">Erreurs</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation type="unfinished">Avertissements</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation type="unfinished">Avertissement de style</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation type="unfinished">Avertissements de performance</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="420"/>
         <source>Pdf Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="198"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="418"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="405"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="417"/>
         <source>File:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3104,19 +3271,29 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
     </message>
     <message>
         <location filename="statsdialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="400"/>
         <source>Undefines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_threaddetails.h" line="47"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="46"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3132,11 +3309,6 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
 The user interface language has been reset to English. Open the Preferences-dialog to select any of the available languages.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="translationhandler.cpp" line="136"/>
-        <source>Cppcheck</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TxtReport</name>
diff --git a/gui/cppcheck_it.ts b/gui/cppcheck_it.ts
index 811150c9257..4d0823a7053 100644
--- a/gui/cppcheck_it.ts
+++ b/gui/cppcheck_it.ts
@@ -5,27 +5,32 @@
     <name>About</name>
     <message>
         <location filename="about.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="130"/>
         <source>About Cppcheck</source>
         <translation>Informazioni su Cppcheck</translation>
     </message>
     <message>
         <location filename="about.ui" line="64"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="132"/>
         <source>Version %1</source>
         <translation>Versione %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="133"/>
         <source>Cppcheck - A tool for static C/C++ code analysis.</source>
         <translation>Cppcheck - Uno strumento per l&apos;analisi statica di codice C/C++</translation>
     </message>
     <message>
         <location filename="about.ui" line="81"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="134"/>
         <source>Copyright © 2007-%1 Cppcheck team.</source>
         <oldsource>Copyright © 2007-2021 Cppcheck team.</oldsource>
         <translation type="unfinished">Copyright © 2007-2021 il team Cppcheck.</translation>
     </message>
     <message>
         <location filename="about.ui" line="91"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="135"/>
         <source>This program is licensed under the terms
 of the GNU General Public License version 3</source>
         <translation>Questo programma è rilasciato sotto i termini
@@ -33,11 +38,13 @@ della GNU General Public License versione 3</translation>
     </message>
     <message>
         <location filename="about.ui" line="102"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="137"/>
         <source>Visit Cppcheck homepage at %1</source>
         <translation>Visita la pagina iniziale di Cppcheck all&apos;indirizzo: %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;pcre&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;picojson&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tinyxml2&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
         <translation type="unfinished"></translation>
@@ -47,11 +54,13 @@ della GNU General Public License versione 3</translation>
     <name>ApplicationDialog</name>
     <message>
         <location filename="applicationdialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="161"/>
         <source>Add an application</source>
         <translation>Aggiungi un&apos;applicazione</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="162"/>
         <source>Here you can add an application that can open error files. Specify a name for the application, the application executable and command line parameters for the application.
 
 The following texts in parameters are replaced with appropriate values when application is executed:
@@ -78,21 +87,25 @@ Parametri: -l(line) (file)
     </message>
     <message>
         <location filename="applicationdialog.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="173"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nome:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="86"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="174"/>
         <source>&amp;Executable:</source>
         <translation>&amp;Eseguibile:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="96"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="175"/>
         <source>&amp;Parameters:</source>
         <translation>&amp;Parametri:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="138"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="176"/>
         <source>Browse</source>
         <translation>Esplora</translation>
     </message>
@@ -107,9 +120,8 @@ Parametri: -l(line) (file)
         <translation>Seleziona l&apos;applicazione di lettura</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -117,70 +129,6 @@ Parametri: -l(line) (file)
         <translation>Devi specificare un nome, un percorso ed, opzionalmente, i parametri per l&apos;applicazione!</translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -189,10 +137,8 @@ Parametri: -l(line) (file)
         <translation>File non trovato: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -204,44 +150,49 @@ Parametri: -l(line) (file)
     <name>HelpDialog</name>
     <message>
         <location filename="helpdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="88"/>
         <source>Cppcheck GUI help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="89"/>
         <source>Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="90"/>
         <source>Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
     <name>LibraryAddFunctionDialog</name>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="105"/>
         <source>Add function</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="106"/>
         <source>Function name(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="107"/>
         <source>Number of arguments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -250,126 +201,140 @@ Parametri: -l(line) (file)
     <name>LibraryDialog</name>
     <message>
         <location filename="librarydialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="275"/>
         <source>Library Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="22"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="276"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="29"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="277"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="36"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="278"/>
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="62"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="279"/>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="280"/>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="111"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="281"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="282"/>
         <source>Filter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="164"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="283"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="204"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="284"/>
         <source>noreturn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="212"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="285"/>
         <source>False</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="286"/>
         <source>True</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="222"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="287"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="232"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="289"/>
         <source>return value must be used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="239"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="290"/>
         <source>ignore function in leaks checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="291"/>
         <source>Arguments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="258"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="292"/>
         <source>Edit</source>
         <translation type="unfinished">Modifica</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation type="unfinished"></translation>
     </message>
@@ -378,11 +343,13 @@ Parametri: -l(line) (file)
     <name>LibraryEditArgDialog</name>
     <message>
         <location filename="libraryeditargdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="284"/>
         <source>Edit argument</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="286"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is bool value allowed? For instance result from comparison or from &apos;!&apos; operator.&lt;/p&gt;
 &lt;p&gt;Typically, set this if the argument is a pointer, size, etc.&lt;/p&gt;
@@ -393,11 +360,13 @@ Parametri: -l(line) (file)
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="28"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="293"/>
         <source>Not bool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="35"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is a null parameter value allowed?&lt;/p&gt;
 &lt;p&gt;Typically this should be used on any pointer parameter that does not allow null.&lt;/p&gt;
@@ -408,78 +377,99 @@ Parametri: -l(line) (file)
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="43"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="302"/>
         <source>Not null</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="50"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="303"/>
         <source>Not uninit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="57"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="304"/>
         <source>String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="70"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="305"/>
         <source>Format string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="306"/>
         <source>Min size of buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="101"/>
         <location filename="libraryeditargdialog.ui" line="203"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="307"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="316"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="109"/>
         <location filename="libraryeditargdialog.ui" line="214"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="308"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="317"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="114"/>
         <location filename="libraryeditargdialog.ui" line="219"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="309"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="318"/>
         <source>argvalue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="119"/>
         <location filename="libraryeditargdialog.ui" line="224"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="319"/>
         <source>mul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="124"/>
         <location filename="libraryeditargdialog.ui" line="229"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="311"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="320"/>
         <source>strlen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="132"/>
         <location filename="libraryeditargdialog.ui" line="237"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="313"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="322"/>
         <source>Arg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="159"/>
         <location filename="libraryeditargdialog.ui" line="264"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="323"/>
         <source>Arg2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="194"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="315"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="324"/>
         <source>Valid values</source>
         <translation type="unfinished"></translation>
     </message>
@@ -487,613 +477,699 @@ Parametri: -l(line) (file)
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="687"/>
-        <location filename="mainwindow.cpp" line="463"/>
-        <location filename="mainwindow.cpp" line="667"/>
-        <location filename="mainwindow.cpp" line="752"/>
-        <location filename="mainwindow.cpp" line="857"/>
-        <location filename="mainwindow.cpp" line="879"/>
-        <location filename="mainwindow.cpp" line="1466"/>
-        <location filename="mainwindow.cpp" line="1595"/>
-        <location filename="mainwindow.cpp" line="1936"/>
-        <location filename="mainwindow.cpp" line="1944"/>
-        <location filename="mainwindow.cpp" line="1998"/>
-        <location filename="mainwindow.cpp" line="2007"/>
-        <location filename="mainwindow.cpp" line="2079"/>
-        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="209"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="745"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="266"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="749"/>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="740"/>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="741"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizza</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="742"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Barre degli strumenti</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="213"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="746"/>
         <source>C++ standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="225"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="747"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="748"/>
         <source>&amp;Edit</source>
         <translation>&amp;Modifica</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="578"/>
         <source>&amp;License...</source>
         <translation>&amp;Licenza...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="319"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="579"/>
         <source>A&amp;uthors...</source>
         <translation>A&amp;utori...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="328"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="580"/>
         <source>&amp;About...</source>
         <translation>I&amp;nformazioni su...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="333"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="581"/>
         <source>&amp;Files...</source>
         <translation>&amp;File...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="336"/>
         <location filename="mainwindow.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="582"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="584"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation type="unfinished">Scansiona i file</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="342"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="587"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="351"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="589"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Cartella...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="354"/>
         <location filename="mainwindow.ui" line="357"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="590"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="592"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation type="unfinished">Scansiona la cartella</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="595"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="599"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="602"/>
         <source>&amp;Stop</source>
         <translation>&amp;Ferma</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="393"/>
         <location filename="mainwindow.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="603"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="605"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation type="unfinished">Ferma la scansione</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="608"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="610"/>
         <source>&amp;Save results to file...</source>
         <translation>&amp;Salva i risultati nel file...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="411"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="612"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="416"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="614"/>
         <source>&amp;Quit</source>
         <translation>&amp;Esci</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="428"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="618"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Cancella i risultati</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="619"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Preferenze</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="470"/>
         <location filename="mainwindow.ui" line="473"/>
-        <location filename="mainwindow.cpp" line="2379"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="626"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="628"/>
+        <location filename="mainwindow.cpp" line="2408"/>
         <source>Show errors</source>
         <translation>Mostra gli errori</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="616"/>
         <location filename="mainwindow.ui" line="619"/>
-        <location filename="mainwindow.cpp" line="2380"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="668"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="670"/>
+        <location filename="mainwindow.cpp" line="2409"/>
         <source>Show warnings</source>
         <translation>Mostra gli avvisi</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="634"/>
         <location filename="mainwindow.ui" line="637"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="673"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="675"/>
         <source>Show performance warnings</source>
         <translation>Mostra gli avvisi sulle prestazioni</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="645"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="677"/>
         <source>Show &amp;hidden</source>
         <translation>Mostra &amp;i nascosti</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1015"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Information</source>
         <translation>Informazione</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="660"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="680"/>
         <source>Show information messages</source>
         <translation>Mostra messaggi di informazione</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="675"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="684"/>
         <source>Show portability warnings</source>
         <translation>Mostra gli avvisi sulla portabilità</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="690"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="687"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="702"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="689"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="705"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="691"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="713"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="693"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filtro</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="716"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="695"/>
         <source>Filter results</source>
         <translation>Filtra i risultati</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="732"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="697"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit, ANSI</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="740"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="698"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit, Unicode</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="748"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="699"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="756"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="700"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="764"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="701"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="858"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="709"/>
         <source>&amp;Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="861"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="711"/>
         <source>Print the Current Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="866"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="713"/>
         <source>Print Pre&amp;view...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="869"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="715"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="877"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="719"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="478"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="630"/>
         <source>&amp;Check all</source>
         <translation>&amp;Seleziona tutto</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="738"/>
         <source>Checking for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="100"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="739"/>
         <source>Hide</source>
         <translation type="unfinished">Nascondi</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="163"/>
         <location filename="mainwindow.ui" line="979"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="730"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="743"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="303"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="751"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="369"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="597"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="381"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="601"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="419"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="616"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="620"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="467"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="625"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="483"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="631"/>
         <source>&amp;Uncheck all</source>
         <translation>&amp;Deseleziona tutto</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="488"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="632"/>
         <source>Collapse &amp;all</source>
         <translation>Riduci &amp;tutto</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="493"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="633"/>
         <source>&amp;Expand all</source>
         <translation>&amp;Espandi tutto</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="501"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="634"/>
         <source>&amp;Standard</source>
         <translation>&amp;Standard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="636"/>
         <source>Standard items</source>
         <translation>Oggetti standard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="645"/>
         <source>Toolbar</source>
         <translation>Barra degli strumenti</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="528"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="646"/>
         <source>&amp;Categories</source>
         <translation>&amp;Categorie</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="531"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="648"/>
         <source>Error categories</source>
         <translation>Categorie di errore</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="536"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="650"/>
         <source>&amp;Open XML...</source>
         <translation>&amp;Apri XML...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="545"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="651"/>
         <source>Open P&amp;roject File...</source>
         <translation>Apri file di p&amp;rogetto...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="548"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="653"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="655"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="562"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="656"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;Nuovo file di progetto...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="565"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="658"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="570"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="660"/>
         <source>&amp;Log View</source>
         <translation>&amp;Visualizza il rapporto</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="573"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="662"/>
         <source>Log View</source>
         <translation>Visualizza il rapporto</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="581"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="664"/>
         <source>C&amp;lose Project File</source>
         <translation>C&amp;hiudi il file di progetto</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="589"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="665"/>
         <source>&amp;Edit Project File...</source>
         <translation>&amp;Modifica il file di progetto...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="601"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="666"/>
         <source>&amp;Statistics</source>
         <translation>&amp;Statistiche</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="613"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="667"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="631"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="672"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="657"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="678"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="672"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="682"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="772"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="702"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="786"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="703"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="797"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="704"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="805"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="705"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="813"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="706"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="845"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="707"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="853"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="708"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="874"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="717"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="721"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="893"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="722"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="901"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="723"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="912"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="724"/>
         <source>C++14</source>
         <translation type="unfinished">C++14</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="920"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="725"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="928"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="726"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="936"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="727"/>
         <source>C++17</source>
         <translation type="unfinished">C++17</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="728"/>
         <source>C++20</source>
         <translation type="unfinished">C++20</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="729"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="987"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="731"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="995"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1003"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1011"/>
-        <source>Cert C</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="732"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1019"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="733"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1027"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="734"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1035"/>
-        <source>Autosar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1040"/>
-        <source>EULA...</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="736"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="509"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="638"/>
         <source>&amp;Contents</source>
         <translation>&amp;Contenuti</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="284"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="750"/>
         <source>Categories</source>
         <translation>Categorie</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="452"/>
         <location filename="mainwindow.ui" line="455"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="621"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="623"/>
         <source>Show style warnings</source>
         <translation>Mostra gli avvisi sullo stile</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="512"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="640"/>
         <source>Open the help contents</source>
         <translation>Apri i contenuti di aiuto</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="515"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="643"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="198"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="744"/>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="155"/>
-        <location filename="mainwindow.cpp" line="1781"/>
+        <location filename="mainwindow.cpp" line="176"/>
+        <location filename="mainwindow.cpp" line="1812"/>
         <source>Quick Filter:</source>
         <translation>Rapido filtro:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="858"/>
+        <location filename="mainwindow.cpp" line="890"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1102,96 +1178,96 @@ Do you want to load this project file instead?</source>
 Vuoi piuttosto caricare questo file di progetto?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="992"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="995"/>
+        <location filename="mainwindow.cpp" line="1027"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1030"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1001"/>
+        <location filename="mainwindow.cpp" line="1033"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1004"/>
+        <location filename="mainwindow.cpp" line="1036"/>
         <source>Unsupported format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1013"/>
+        <location filename="mainwindow.cpp" line="1045"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1035"/>
+        <location filename="mainwindow.cpp" line="1064"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1058"/>
+        <location filename="mainwindow.cpp" line="1087"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1120"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1700"/>
         <source>License</source>
         <translation>Licenza</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1654"/>
+        <location filename="mainwindow.cpp" line="1707"/>
         <source>Authors</source>
         <translation>Autori</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1674"/>
+        <location filename="mainwindow.cpp" line="1727"/>
         <source>Save the report file</source>
         <translation>Salva il file di rapporto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1482"/>
-        <location filename="mainwindow.cpp" line="1681"/>
+        <location filename="mainwindow.cpp" line="1539"/>
+        <location filename="mainwindow.cpp" line="1734"/>
         <source>XML files (*.xml)</source>
         <translation>File XML (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="458"/>
+        <location filename="mainwindow.cpp" line="477"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -1200,126 +1276,116 @@ This is probably because the settings were changed between the Cppcheck versions
 Probabilmente ciò è avvenuto perché le impostazioni sono state modificate tra le versioni di Cppcheck. Per favore controlla (e sistema) le impostazioni delle applicazioni editor, altrimenti il programma editor può non partire correttamente.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="753"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>Devi chiudere il file di progetto prima di selezionare nuovi file o cartelle!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1015"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1007"/>
+        <location filename="mainwindow.cpp" line="1039"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1010"/>
+        <location filename="mainwindow.cpp" line="1042"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1016"/>
+        <location filename="mainwindow.cpp" line="1048"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1019"/>
-        <source>Unknown issue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1080"/>
-        <location filename="mainwindow.cpp" line="1090"/>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1120"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1484"/>
+        <location filename="mainwindow.cpp" line="1541"/>
         <source>Open the report file</source>
         <translation>Apri il file di rapporto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1685"/>
+        <location filename="mainwindow.cpp" line="1738"/>
         <source>Text files (*.txt)</source>
         <translation>File di testo (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1689"/>
+        <location filename="mainwindow.cpp" line="1742"/>
         <source>CSV files (*.csv)</source>
         <translation>Files CSV (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1819"/>
+        <location filename="mainwindow.cpp" line="1850"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Files di progetto (*.cppcheck);;Tutti i files(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="1852"/>
         <source>Select Project File</source>
         <translation>Seleziona il file di progetto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="239"/>
-        <location filename="mainwindow.cpp" line="1783"/>
-        <location filename="mainwindow.cpp" line="1849"/>
-        <location filename="mainwindow.cpp" line="2047"/>
+        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="1814"/>
+        <location filename="mainwindow.cpp" line="1880"/>
+        <location filename="mainwindow.cpp" line="2062"/>
         <source>Project:</source>
         <translation>Progetto:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="668"/>
-        <source>No suitable files found to analyze!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="767"/>
-        <source>C/C++ Source</source>
+        <location filename="mainwindow.cpp" line="601"/>
+        <source>None of the selected files is part of the project, nothing to analyze.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="768"/>
-        <source>Compile database</source>
+        <location filename="mainwindow.cpp" line="702"/>
+        <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="769"/>
-        <source>Visual Studio</source>
+        <location filename="mainwindow.cpp" line="798"/>
+        <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="770"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="mainwindow.cpp" line="799"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="773"/>
+        <location filename="mainwindow.cpp" line="804"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="819"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="880"/>
+        <location filename="mainwindow.cpp" line="912"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1467"/>
+        <location filename="mainwindow.cpp" line="1524"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1327,81 +1393,76 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1591"/>
+        <location filename="mainwindow.cpp" line="1644"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1633"/>
+        <location filename="mainwindow.cpp" line="1686"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1672"/>
+        <location filename="mainwindow.cpp" line="1725"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1712"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1937"/>
+        <location filename="mainwindow.cpp" line="1951"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1945"/>
+        <location filename="mainwindow.cpp" line="1959"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1977"/>
+        <location filename="mainwindow.cpp" line="1992"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1995"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1983"/>
+        <location filename="mainwindow.cpp" line="1998"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1999"/>
+        <location filename="mainwindow.cpp" line="2014"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2008"/>
+        <location filename="mainwindow.cpp" line="2023"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2032"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2034"/>
+        <location filename="mainwindow.cpp" line="2049"/>
         <source>Select Project Filename</source>
         <translation>Seleziona il nome del file di progetto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2080"/>
+        <location filename="mainwindow.cpp" line="2095"/>
         <source>No project file loaded</source>
         <translation>Nessun file di progetto caricato</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2148"/>
+        <location filename="mainwindow.cpp" line="2177"/>
         <source>The project file
 
 %1
@@ -1418,67 +1479,67 @@ Do you want to remove the file from the recently used projects -list?</source>
 Vuoi rimuovere il file dalla lista dei progetti recentemente usati?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2310"/>
+        <location filename="mainwindow.cpp" line="2339"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2314"/>
+        <location filename="mainwindow.cpp" line="2343"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2352"/>
+        <location filename="mainwindow.cpp" line="2381"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2353"/>
+        <location filename="mainwindow.cpp" line="2382"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2354"/>
+        <location filename="mainwindow.cpp" line="2383"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2355"/>
+        <location filename="mainwindow.cpp" line="2384"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2372"/>
+        <location filename="mainwindow.cpp" line="2401"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2373"/>
+        <location filename="mainwindow.cpp" line="2402"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2374"/>
+        <location filename="mainwindow.cpp" line="2403"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2381"/>
+        <location filename="mainwindow.cpp" line="2410"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2382"/>
+        <location filename="mainwindow.cpp" line="2411"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2383"/>
+        <location filename="mainwindow.cpp" line="2412"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2384"/>
+        <location filename="mainwindow.cpp" line="2413"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1522,26 +1583,31 @@ Options:
     <name>NewSuppressionDialog</name>
     <message>
         <location filename="newsuppressiondialog.ui" line="17"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="114"/>
         <source>New suppression</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="25"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="115"/>
         <source>Error ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="32"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="116"/>
         <source>File name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="42"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="117"/>
         <source>Line number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="52"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="118"/>
         <source>Symbol name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1559,414 +1625,498 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit, ANSI</translation>
+        <translation type="vanished">Windows 32-bit, ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit, Unicode</translation>
+        <translation type="vanished">Windows 32-bit, Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
 </context>
 <context>
     <name>ProjectFile</name>
     <message>
         <location filename="projectfile.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="923"/>
         <source>Project File</source>
         <translation>File di progetto</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="955"/>
         <source>Paths and Defines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="30"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="924"/>
         <source>Import Project (Visual studio / compile database/ Borland C++ Builder 6)</source>
         <oldsource>Import Project (Visual studio / compile database)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="231"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="938"/>
         <source>Defines must be separated by a semicolon. Example: DEF1;DEF2=5;DEF3=int</source>
         <oldsource>Defines must be separated by a semicolon &apos;;&apos;</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="958"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="989"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="991"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="992"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="993"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1006"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1007"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="914"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1008"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1018"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="876"/>
+        <location filename="projectfile.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1011"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="883"/>
+        <location filename="projectfile.ui" line="892"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1013"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="890"/>
+        <location filename="projectfile.ui" line="899"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1015"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="73"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="928"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You have a choice:&lt;/p&gt;&lt;p&gt; * Analyze all Debug and Release configurations&lt;/p&gt;&lt;p&gt; * Only analyze the first matching Debug configuration&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="926"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="964"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="930"/>
         <source>Analyze all Visual Studio configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="113"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="931"/>
         <source>Selected VS Configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="147"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="932"/>
         <source>Paths:</source>
         <translation>Percorsi:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="181"/>
         <location filename="projectfile.ui" line="296"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="933"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="945"/>
         <source>Add...</source>
         <translation>Aggiungi...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="934"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="994"/>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="935"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="995"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="998"/>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="242"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="940"/>
         <source>Undefines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="252"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="942"/>
         <source>Undefines must be separated by a semicolon. Example: UNDEF1;UNDEF2;UNDEF3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="265"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="944"/>
         <source>Include Paths:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="950"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="952"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="954"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="959"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="972"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="982"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="962"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="965"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="966"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="968"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="969"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="970"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="971"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="976"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="977"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="979"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="980"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="999"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished">Abilita le soppressioni</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="851"/>
+        <location filename="projectfile.ui" line="860"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1009"/>
         <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="901"/>
+        <location filename="projectfile.ui" line="910"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1016"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="918"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1017"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="937"/>
+        <location filename="projectfile.ui" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1020"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="946"/>
+        <location filename="projectfile.ui" line="955"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1021"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="965"/>
+        <location filename="projectfile.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1023"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="981"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1024"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1026"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="991"/>
+        <location filename="projectfile.ui" line="1007"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1027"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="330"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="948"/>
         <source>Up</source>
         <translation>Su</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="337"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="949"/>
         <source>Down</source>
         <translation>Giù</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="956"/>
         <source>Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="967"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="974"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="978"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="981"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1000"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="983"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="985"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="987"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="960"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="957"/>
         <source>Libraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="996"/>
         <source>Suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="997"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1001"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1028"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1002"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1003"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1004"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1005"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="958"/>
+        <location filename="projectfile.ui" line="967"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1022"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="975"/>
+        <location filename="projectfile.ui" line="991"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1025"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="projectfile.ui" line="1004"/>
-        <source>Clang analyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="997"/>
-        <source>Clang-tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="936"/>
         <source>Defines:</source>
         <translation>Definizioni:</translation>
     </message>
@@ -1979,77 +2129,78 @@ Options:
         <translation>File di progetto: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="604"/>
+        <location filename="projectfiledialog.cpp" line="585"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="865"/>
+        <location filename="projectfiledialog.cpp" line="861"/>
         <source>Select include directory</source>
         <translation>Seleziona la cartella da includere</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="845"/>
+        <location filename="projectfiledialog.cpp" line="841"/>
         <source>Select a directory to check</source>
         <translation>Seleziona una cartella da scansionare</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="414"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="477"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="643"/>
-        <source>Visual Studio</source>
+        <location filename="projectfiledialog.cpp" line="625"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="644"/>
-        <source>Compile database</source>
+        <location filename="projectfiledialog.cpp" line="627"/>
+        <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="645"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="projectfiledialog.cpp" line="646"/>
+        <source>C/C++ header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="646"/>
-        <source>Import Project</source>
+        <location filename="projectfiledialog.cpp" line="648"/>
+        <source>Include file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="885"/>
+        <location filename="projectfiledialog.cpp" line="881"/>
         <source>Select directory to ignore</source>
         <translation>Seleziona la cartella da ignorare</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="893"/>
+        <location filename="projectfiledialog.cpp" line="889"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="894"/>
+        <location filename="projectfiledialog.cpp" line="647"/>
+        <location filename="projectfiledialog.cpp" line="890"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="895"/>
+        <location filename="projectfiledialog.cpp" line="891"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="978"/>
+        <location filename="projectfiledialog.cpp" line="976"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="980"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2082,7 +2233,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="302"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2132,161 +2283,156 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="142"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="144"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="114"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">File</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="115"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Linea</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="116"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Severità</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="117"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="118"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="119"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="120"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">Riassunto</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="121"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="122"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="123"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="124"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="125"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="126"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
@@ -2334,37 +2480,37 @@ Options:
         <translation type="vanished">File indefinito</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="657"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="825"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="829"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="830"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="832"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="367"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>debug</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="298"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2373,53 +2519,51 @@ Options:
         <translation type="vanished">Nascondi</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="659"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="681"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="660"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="370"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="656"/>
+        <location filename="resultstree.cpp" line="667"/>
         <source>Recheck %1 file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="658"/>
+        <location filename="resultstree.cpp" line="669"/>
         <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="701"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="703"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="733"/>
-        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="734"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2428,7 +2572,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 Configura l&apos;applicazione di scrittura per Cppcheck in Preferenze/Applicazioni.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="748"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2437,12 +2581,12 @@ Please select the default editor application in preferences/Applications.</sourc
 Per favore seleziona l&apos;applicazione di scrittura predefinito in Preferenze/Applicazioni.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="768"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>Non è stato possibile trovare il file!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="811"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2451,7 +2595,7 @@ Please check the application path and parameters are correct.</source>
 Per favore verifica che il percorso dell&apos;applicazione e i parametri siano corretti.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="833"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>Seleziona Cartella</translation>
     </message>
@@ -2460,32 +2604,32 @@ Per favore verifica che il percorso dell&apos;applicazione e i parametri siano c
         <translation type="vanished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="349"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>stile</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="352"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>errore</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="355"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>avviso</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="358"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>performance</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="361"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>portabilità</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="364"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>Informazione</translation>
     </message>
@@ -2493,122 +2637,124 @@ Per favore verifica che il percorso dell&apos;applicazione e i parametri siano c
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="255"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="274"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="326"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 su %2 file scansionati)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="350"/>
-        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="351"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>Nessun errore trovato.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="358"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Sono stati trovati errori, ma sono stati configurati per essere nascosti.
 Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>Apertura del report fallito.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="460"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="465"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="539"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="540"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="541"/>
+        <location filename="resultsview.cpp" line="538"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="549"/>
+        <location filename="resultsview.cpp" line="545"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="563"/>
+        <location filename="resultsview.cpp" line="559"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="565"/>
+        <location filename="resultsview.cpp" line="561"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="567"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="568"/>
+        <location filename="resultsview.cpp" line="564"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="237"/>
-        <location filename="resultsview.cpp" line="245"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>Salvataggio del report fallito.</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="26"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="147"/>
         <source>Results</source>
         <translation>Risultati</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="60"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="148"/>
         <source>Critical errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="149"/>
         <source>Analysis Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="114"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="150"/>
         <source>Warning Details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2617,26 +2763,31 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</transl
     <name>ScratchPad</name>
     <message>
         <location filename="scratchpad.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="107"/>
         <source>Scratchpad</source>
         <translation>Blocchetto per appunti</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="108"/>
         <source>Copy or write some C/C++ code here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="37"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="109"/>
         <source>Optionally enter a filename (mainly for automatic language detection) and click on &quot;Check&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="110"/>
         <source>filename</source>
         <translation>Nome file</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="78"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="111"/>
         <source>Check</source>
         <translation>Scansiona</translation>
     </message>
@@ -2645,21 +2796,25 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</transl
     <name>Settings</name>
     <message>
         <location filename="settings.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="490"/>
         <source>Preferences</source>
         <translation>Preferenze</translation>
     </message>
     <message>
         <location filename="settings.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="502"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
         <location filename="settings.ui" line="196"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="503"/>
         <source>Add...</source>
         <translation>Aggiungi...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="491"/>
         <source>Number of threads: </source>
         <translation>Numero di threads: </translation>
     </message>
@@ -2669,56 +2824,67 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</transl
     </message>
     <message>
         <location filename="settings.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="493"/>
         <source>Force checking all #ifdef configurations</source>
         <translation>Forza la scansione di tutte le configurazioni #ifdef</translation>
     </message>
     <message>
         <location filename="settings.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="494"/>
         <source>Show full path of files</source>
         <translation>Mostra tutto il percorso dei files</translation>
     </message>
     <message>
         <location filename="settings.ui" line="122"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="495"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>Mostra il messaggio &quot;Nessun errore trovato&quot; quando nessun errore è stato trovato</translation>
     </message>
     <message>
         <location filename="settings.ui" line="129"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="496"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>Mostra l&apos;id dell&apos;errore nella colonna &quot;Id&quot;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="136"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="497"/>
         <source>Enable inline suppressions</source>
         <translation>Abilita le soppressioni</translation>
     </message>
     <message>
         <location filename="settings.ui" line="143"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="498"/>
         <source>Check for inconclusive errors also</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="150"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="499"/>
         <source>Show statistics on check completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="157"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="500"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="177"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="501"/>
         <source>Show internal warnings in log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="521"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="294"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="512"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2726,117 +2892,143 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</transl
         <location filename="settings.ui" line="305"/>
         <location filename="settings.ui" line="346"/>
         <location filename="settings.ui" line="391"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="513"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="523"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="324"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="515"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="332"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="516"/>
         <source>MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="518"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="526"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="378"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="522"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="401"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="524"/>
         <source>Visual Studio headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="407"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="525"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="533"/>
         <source>Code Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="527"/>
         <source>Code Editor Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="528"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="456"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="529"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="463"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="530"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="472"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="531"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="210"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="505"/>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
     <message>
         <location filename="settings.ui" line="79"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="492"/>
         <source>Max count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="185"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="507"/>
         <source>Applications</source>
         <translation>Applicazioni</translation>
     </message>
     <message>
         <location filename="settings.ui" line="203"/>
         <location filename="settings.ui" line="479"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="532"/>
         <source>Edit...</source>
         <translation>Modifica...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="506"/>
         <source>Set as default</source>
         <translation>Imposta come predefinito</translation>
     </message>
     <message>
         <location filename="settings.ui" line="240"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="510"/>
         <source>Reports</source>
         <translation>Rapporti</translation>
     </message>
     <message>
         <location filename="settings.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="508"/>
         <source>Save all errors when creating report</source>
         <translation>Salva tutti gli errori quando viene creato il rapporto</translation>
     </message>
     <message>
         <location filename="settings.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="509"/>
         <source>Save full path to files in reports</source>
         <translation>Salva tutto il percorso ai files nei rapporti</translation>
     </message>
     <message>
         <location filename="settings.ui" line="274"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="511"/>
         <source>Language</source>
         <translation>Lingua</translation>
     </message>
@@ -2893,221 +3085,245 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</transl
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="395"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="415"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>Statistiche</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="401"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>Progetto</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="33"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="396"/>
         <source>Project:</source>
         <translation>Progetto:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="53"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="397"/>
         <source>Paths:</source>
         <translation>Percorsi:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="85"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="398"/>
         <source>Include paths:</source>
         <translation>Percorsi di inclusione:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="399"/>
         <source>Defines:</source>
         <translation>Definizioni:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="400"/>
         <source>Undefines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="407"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>Precedente Scansione</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="171"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="402"/>
         <source>Path Selected:</source>
         <translation>Selezionato percorso:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="181"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="403"/>
         <source>Number of Files Scanned:</source>
         <translation>Numero di Files Scansionati:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="201"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="405"/>
         <source>Scan Duration:</source>
         <translation>Durata della scansione:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="254"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="408"/>
         <source>Errors:</source>
         <translation>Errori:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="271"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="409"/>
         <source>Warnings:</source>
         <translation>Avvisi:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="410"/>
         <source>Stylistic warnings:</source>
         <translation>Avvisi sullo stile:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="305"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="411"/>
         <source>Portability warnings:</source>
         <translation>Avvisi sulla portabilità:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="322"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="412"/>
         <source>Performance issues:</source>
         <translation>Casi sulla performance:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="413"/>
         <source>Information messages:</source>
         <translation>Messaggi di informazione:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="356"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="414"/>
         <source>Active checkers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="374"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="416"/>
         <source>Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="418"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="405"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="417"/>
         <source>File:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="419"/>
         <source>Copy to Clipboard</source>
         <translation>Copia negli Appunti</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="420"/>
         <source>Pdf Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 giorno</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 giorni</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1 ora</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 ore</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1 minuto</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 minuti</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 secondo</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 secondi</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0,%1 secondi</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="171"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> e </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="198"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>Impostazioni progetto</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>Percorsi</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>Percorsi di inclusione</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>Definizioni</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>Selezionato percorso</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>Numero di file scansionati</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>Durata della scansione</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>Errori</translation>
     </message>
@@ -3122,40 +3338,49 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>Avvisi</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>Stilwarnungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>Avvisi sulla portabilità</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>Avvisi sulle performance</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>Messaggi di informazione</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_threaddetails.h" line="47"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="46"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 su %2 file scansionati</translation>
     </message>
@@ -3176,9 +3401,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 L&apos;interfaccia utente è stata risettata in Inglese. Apri la finestra di dialogo Preferenze per selezionare una qualunque lingua a disposizione.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_ja.ts b/gui/cppcheck_ja.ts
index 461f1ef3f07..75b2bad9985 100644
--- a/gui/cppcheck_ja.ts
+++ b/gui/cppcheck_ja.ts
@@ -5,38 +5,45 @@
     <name>About</name>
     <message>
         <location filename="about.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="130"/>
         <source>About Cppcheck</source>
         <translation>cppcheck����</translation>
     </message>
     <message>
         <location filename="about.ui" line="64"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="132"/>
         <source>Version %1</source>
         <translation>Version %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="133"/>
         <source>Cppcheck - A tool for static C/C++ code analysis.</source>
         <translation>Cppcheck�C/C++ �的コード解�ツール��.</translation>
     </message>
     <message>
         <location filename="about.ui" line="81"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="134"/>
         <source>Copyright © 2007-%1 Cppcheck team.</source>
         <oldsource>Copyright © 2007-2021 Cppcheck team.</oldsource>
         <translation>Copyright © 2007-%1 Cppcheck team.</translation>
     </message>
     <message>
         <location filename="about.ui" line="91"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="135"/>
         <source>This program is licensed under the terms
 of the GNU General Public License version 3</source>
         <translation>本ソフトウェア�GNU General Public License Version3 ライセンス�元��布�れ��</translation>
     </message>
     <message>
         <location filename="about.ui" line="102"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="137"/>
         <source>Visit Cppcheck homepage at %1</source>
         <translation>Cppcheck�ホームページ���ら %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;pcre&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;picojson&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tinyxml2&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;ライブラリ�開発者�感�を����:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -46,11 +53,13 @@ of the GNU General Public License version 3</source>
     <name>ApplicationDialog</name>
     <message>
         <location filename="applicationdialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="161"/>
         <source>Add an application</source>
         <translation>アプリケーション�追加</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="162"/>
         <source>Here you can add an application that can open error files. Specify a name for the application, the application executable and command line parameters for the application.
 
 The following texts in parameters are replaced with appropriate values when application is executed:
@@ -77,21 +86,25 @@ Parameters: -l(line) (file)</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="173"/>
         <source>&amp;Name:</source>
         <translation>表示�(&amp;N):</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="86"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="174"/>
         <source>&amp;Executable:</source>
         <translation>実行ファイル�パス(&amp;E):</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="96"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="175"/>
         <source>&amp;Parameters:</source>
         <translation>パラメータ(&amp;P):</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="138"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="176"/>
         <source>Browse</source>
         <translation>�照</translation>
     </message>
@@ -106,9 +119,8 @@ Parameters: -l(line) (file)</translation>
         <translation>表示アプリケーション��択</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -119,65 +131,52 @@ Parameters: -l(line) (file)</translation>
 <context>
     <name>ComplianceReportDialog</name>
     <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
         <source>Compliance Report</source>
-        <translation>コンプライアンスレ�ート</translation>
+        <translation type="vanished">コンプライアンスレ�ート</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
-        <translation>プロジェクト�</translation>
+        <translation type="vanished">プロジェクト�</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
-        <translation>プロジェクト�ージョン</translation>
+        <translation type="vanished">プロジェクト�ージョン</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
         <source>Coding Standard</source>
-        <translation>コーディング標準</translation>
+        <translation type="vanished">コーディング標準</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
         <source>Misra C</source>
-        <translation>MISRA C</translation>
+        <translation type="vanished">MISRA C</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
         <source>Cert C</source>
-        <translation>CERT C</translation>
+        <translation type="vanished">CERT C</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
         <source>Cert C++</source>
-        <translation>Cert C++</translation>
+        <translation type="vanished">Cert C++</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
         <source>List of files with md5 checksums</source>
-        <translation>md5�ェックサム��ファイルリスト</translation>
+        <translation type="vanished">md5�ェックサム��ファイルリスト</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
-        <translation>コンプライアンスレ�ート</translation>
+        <translation type="vanished">コンプライアンスレ�ート</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
-        <translation>HTMLファイル(*.html)</translation>
+        <translation type="vanished">HTMLファイル(*.html)</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
         <source>Save compliance report</source>
-        <translation>コンプライアンスレ�ート��存</translation>
+        <translation type="vanished">コンプライアンスレ�ート��存</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
         <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation>&apos;%1&apos; (%2)�イン�ート�失敗����。コンプライアンスレ�ート�表示����ん</translation>
+        <translation type="vanished">&apos;%1&apos; (%2)�イン�ート�失敗����。コンプライアンスレ�ート�表示����ん</translation>
     </message>
     <message>
         <source>Failed to import &apos;%1&apos;, can not show files in compliance report</source>
@@ -192,10 +191,8 @@ Parameters: -l(line) (file)</translation>
         <translation>ファイル：%1 �見��り��ん</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -207,44 +204,49 @@ Parameters: -l(line) (file)</translation>
     <name>HelpDialog</name>
     <message>
         <location filename="helpdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="88"/>
         <source>Cppcheck GUI help</source>
         <translation>Cppcheck GUI ヘルプ</translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="89"/>
         <source>Contents</source>
         <translation>目次</translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="90"/>
         <source>Index</source>
         <translation>インデックス</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation>ヘルプファイル &apos;%1&apos; �見��り��ん</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
     <name>LibraryAddFunctionDialog</name>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="105"/>
         <source>Add function</source>
         <translation>関数�追加</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="106"/>
         <source>Function name(s)</source>
         <translation>関数��称</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="107"/>
         <source>Number of arguments</source>
         <translation>引数�数</translation>
     </message>
@@ -253,126 +255,140 @@ Parameters: -l(line) (file)</translation>
     <name>LibraryDialog</name>
     <message>
         <location filename="librarydialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="275"/>
         <source>Library Editor</source>
         <translation>ライブラリエディタ</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="22"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="276"/>
         <source>Open</source>
         <translation>開�</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="29"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="277"/>
         <source>Save</source>
         <translation>�存�る</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="36"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="278"/>
         <source>Save as</source>
         <translation>別���存�る</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="62"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="279"/>
         <source>Functions</source>
         <translation>関数</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="280"/>
         <source>Sort</source>
         <translation>ソート</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="111"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="281"/>
         <source>Add</source>
         <translation>追加</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="282"/>
         <source>Filter:</source>
         <translation>フィルタ:</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="164"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="283"/>
         <source>Comments</source>
         <translation>コメント</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="204"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="284"/>
         <source>noreturn</source>
         <translation>noreturn(返り値��)</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="212"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="285"/>
         <source>False</source>
         <translation>False(�)</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="286"/>
         <source>True</source>
         <translation>True(真)</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="222"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="287"/>
         <source>Unknown</source>
         <translation>Unknown(�明)</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="232"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="289"/>
         <source>return value must be used</source>
         <translation>返り値�使用�れ��れ��ら��</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="239"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="290"/>
         <source>ignore function in leaks checking</source>
         <translation>リーク�解�中�無視�る関数</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="291"/>
         <source>Arguments</source>
         <translation>Arguments(引数)</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="258"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="292"/>
         <source>Edit</source>
         <translation>編集</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation>ライブラリファイル(*.cfg)</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation>ライブラリファイルを開�</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation>ファイル�見��り��ん %1。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation>読�込��失敗����(%1.%2)。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation>ファイル��存����ん %1。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation>��ライブラリ���を����存�る</translation>
     </message>
@@ -381,11 +397,13 @@ Parameters: -l(line) (file)</translation>
     <name>LibraryEditArgDialog</name>
     <message>
         <location filename="libraryeditargdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="284"/>
         <source>Edit argument</source>
         <translation>引数�編集</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="286"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is bool value allowed? For instance result from comparison or from &apos;!&apos; operator.&lt;/p&gt;
 &lt;p&gt;Typically, set this if the argument is a pointer, size, etc.&lt;/p&gt;
@@ -401,12 +419,14 @@ Parameters: -l(line) (file)</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="28"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="293"/>
         <source>Not bool</source>
         <translatorcomment>�ブール型</translatorcomment>
         <translation>�bool値</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="35"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is a null parameter value allowed?&lt;/p&gt;
 &lt;p&gt;Typically this should be used on any pointer parameter that does not allow null.&lt;/p&gt;
@@ -422,78 +442,99 @@ Parameters: -l(line) (file)</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="43"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="302"/>
         <source>Not null</source>
         <translation>�NULL</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="50"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="303"/>
         <source>Not uninit</source>
         <translation>未�期化</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="57"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="304"/>
         <source>String</source>
         <translation>文字列</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="70"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="305"/>
         <source>Format string</source>
         <translation>フォーマット文字列</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="306"/>
         <source>Min size of buffer</source>
         <translation>�ッファ�最�サイズ</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="101"/>
         <location filename="libraryeditargdialog.ui" line="203"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="307"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="316"/>
         <source>Type</source>
         <translation>Type(åž‹)</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="109"/>
         <location filename="libraryeditargdialog.ui" line="214"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="308"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="317"/>
         <source>None</source>
         <translation>None(ç„¡)</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="114"/>
         <location filename="libraryeditargdialog.ui" line="219"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="309"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="318"/>
         <source>argvalue</source>
         <translation>argvalue(引数�値)</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="119"/>
         <location filename="libraryeditargdialog.ui" line="224"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="319"/>
         <source>mul</source>
         <translation>mul(�)</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="124"/>
         <location filename="libraryeditargdialog.ui" line="229"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="311"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="320"/>
         <source>strlen</source>
         <translation>strlen(文字数)</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="132"/>
         <location filename="libraryeditargdialog.ui" line="237"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="313"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="322"/>
         <source>Arg</source>
         <translation>Arg(引数)</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="159"/>
         <location filename="libraryeditargdialog.ui" line="264"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="323"/>
         <source>Arg2</source>
         <translation>Arg2(第二引数)</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="194"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="315"/>
         <source>and</source>
         <translation>and(和)</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="324"/>
         <source>Valid values</source>
         <translation>妥当�値</translation>
     </message>
@@ -501,602 +542,708 @@ Parameters: -l(line) (file)</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="687"/>
-        <location filename="mainwindow.cpp" line="463"/>
-        <location filename="mainwindow.cpp" line="667"/>
-        <location filename="mainwindow.cpp" line="752"/>
-        <location filename="mainwindow.cpp" line="857"/>
-        <location filename="mainwindow.cpp" line="879"/>
-        <location filename="mainwindow.cpp" line="1466"/>
-        <location filename="mainwindow.cpp" line="1595"/>
-        <location filename="mainwindow.cpp" line="1936"/>
-        <location filename="mainwindow.cpp" line="1944"/>
-        <location filename="mainwindow.cpp" line="1998"/>
-        <location filename="mainwindow.cpp" line="2007"/>
-        <location filename="mainwindow.cpp" line="2079"/>
-        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="740"/>
         <source>&amp;File</source>
         <translation>ファイル(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="741"/>
         <source>&amp;View</source>
         <translation>表示(&amp;V)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="742"/>
         <source>&amp;Toolbars</source>
         <translation>ツール�ー(&amp;T)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="198"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="744"/>
         <source>&amp;Help</source>
         <translation>ヘルプ(&amp;H)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="213"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="746"/>
         <source>C++ standard</source>
         <translation>C++標準</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="225"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="747"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation>&amp;C標準</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="748"/>
         <source>&amp;Edit</source>
         <translation>編集(&amp;E)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="266"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="749"/>
         <source>Standard</source>
         <translation>言語�格</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="284"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="750"/>
         <source>Categories</source>
         <translation>カテゴリ</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="578"/>
         <source>&amp;License...</source>
         <translation>ライセンス(&amp;L)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="319"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="579"/>
         <source>A&amp;uthors...</source>
         <translation>作者(&amp;u)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="328"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="580"/>
         <source>&amp;About...</source>
         <translation>Cppcheck����(&amp;A)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="333"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="581"/>
         <source>&amp;Files...</source>
         <translation>ファイル�択(&amp;F)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="336"/>
         <location filename="mainwindow.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="582"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="584"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation>ファイルを�ェック�る</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="342"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="587"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="351"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="589"/>
         <source>&amp;Directory...</source>
         <translation>ディレクトリ�択(&amp;D)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="354"/>
         <location filename="mainwindow.ui" line="357"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="590"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="592"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation>ディレクトリを�ェック�る</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="595"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="599"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="602"/>
         <source>&amp;Stop</source>
         <translation>�止(&amp;S)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="393"/>
         <location filename="mainwindow.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="603"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="605"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation>�ェックを�止�る</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="608"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="610"/>
         <source>&amp;Save results to file...</source>
         <translation>�果をファイル��存(&amp;S)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="411"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="612"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="416"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="614"/>
         <source>&amp;Quit</source>
         <translation>終了(&amp;Q)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="428"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="618"/>
         <source>&amp;Clear results</source>
         <translation>�果をクリア(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="619"/>
         <source>&amp;Preferences</source>
         <translation>設定(&amp;P)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="452"/>
         <location filename="mainwindow.ui" line="455"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="621"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="623"/>
         <source>Show style warnings</source>
         <translation>スタイル警告を表示</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="470"/>
         <location filename="mainwindow.ui" line="473"/>
-        <location filename="mainwindow.cpp" line="2379"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="626"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="628"/>
+        <location filename="mainwindow.cpp" line="2408"/>
         <source>Show errors</source>
         <translation>エラーを表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1015"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Information</source>
         <translation>情報</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="660"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="680"/>
         <source>Show information messages</source>
         <translation>情報メッセージを表示</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="675"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="684"/>
         <source>Show portability warnings</source>
         <translation>移��能性��題を表示</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="690"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="687"/>
         <source>Show Cppcheck results</source>
         <translation>Cppcheck�果を表示�る</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="702"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="689"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="705"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="691"/>
         <source>Show Clang results</source>
         <translation>Clang��果を表示</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="713"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="693"/>
         <source>&amp;Filter</source>
         <translation>フィルター(&amp;F)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="716"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="695"/>
         <source>Filter results</source>
         <translation>フィルタ�果</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="732"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="697"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit ANSIエンコード</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="740"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="698"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit Unicode</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="748"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="699"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="756"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="700"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="764"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="701"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="858"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="709"/>
         <source>&amp;Print...</source>
         <translation>�刷(&amp;P)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="861"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="711"/>
         <source>Print the Current Report</source>
         <translation>�在�レ�ートを�刷</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="866"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="713"/>
         <source>Print Pre&amp;view...</source>
         <translation>�刷プレビュー(&amp;v)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="869"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="715"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation>�在�レ�ートをプレビュー表示</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="877"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="719"/>
         <source>Open library editor</source>
         <translation>ライブラリエディタを開�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="581"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="664"/>
         <source>C&amp;lose Project File</source>
         <translation>プロジェクトを閉�る(&amp;l)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="589"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="665"/>
         <source>&amp;Edit Project File...</source>
         <translation>プロジェクト�編集(&amp;E)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="601"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="666"/>
         <source>&amp;Statistics</source>
         <translation>統計情報(&amp;S)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="616"/>
         <location filename="mainwindow.ui" line="619"/>
-        <location filename="mainwindow.cpp" line="2380"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="668"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="670"/>
+        <location filename="mainwindow.cpp" line="2409"/>
         <source>Show warnings</source>
         <translation>警告を表示</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="634"/>
         <location filename="mainwindow.ui" line="637"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="673"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="675"/>
         <source>Show performance warnings</source>
         <translation>パフォーマンス警告を表示</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="645"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="677"/>
         <source>Show &amp;hidden</source>
         <translation>�表示を表示(&amp;h)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="478"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="630"/>
         <source>&amp;Check all</source>
         <translation>����エラーを表示(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="738"/>
         <source>Checking for updates</source>
         <translation>更新�確�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="100"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="739"/>
         <source>Hide</source>
         <translation>�表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="163"/>
         <location filename="mainwindow.ui" line="979"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="730"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="743"/>
         <source>Report</source>
         <translation>レ�ート</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="209"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="745"/>
         <source>A&amp;nalyze</source>
         <translation>�ェック(&amp;n)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="303"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="751"/>
         <source>Filter</source>
         <translation>フィルター</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="369"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="597"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation>変更�りファイルを�解�(&amp;R)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="381"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="601"/>
         <source>Reanal&amp;yze all files</source>
         <translation>全ファイル�解�(&amp;y)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="419"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="616"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="620"/>
         <source>Style war&amp;nings</source>
         <translation>スタイル警告(&amp;n)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="467"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="625"/>
         <source>E&amp;rrors</source>
         <translation>エラー(&amp;r)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="483"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="631"/>
         <source>&amp;Uncheck all</source>
         <translation>����エラーを�表示(&amp;U)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="488"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="632"/>
         <source>Collapse &amp;all</source>
         <translation>ツリーを折り畳む(&amp;a)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="493"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="633"/>
         <source>&amp;Expand all</source>
         <translation>ツリーを展開(&amp;E)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="501"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="634"/>
         <source>&amp;Standard</source>
         <translation>言語�格(&amp;S)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="636"/>
         <source>Standard items</source>
         <translation>標準項目</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="509"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="638"/>
         <source>&amp;Contents</source>
         <translation>コンテンツ(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="512"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="640"/>
         <source>Open the help contents</source>
         <translation>ヘルプファイルを開�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="515"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="643"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="645"/>
         <source>Toolbar</source>
         <translation>ツール�ー</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="528"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="646"/>
         <source>&amp;Categories</source>
         <translation>カテゴリ(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="531"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="648"/>
         <source>Error categories</source>
         <translation>エラーカテゴリ</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="536"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="650"/>
         <source>&amp;Open XML...</source>
         <translation>XMLを開�(&amp;O)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="545"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="651"/>
         <source>Open P&amp;roject File...</source>
         <translation>プロジェクトを開�(&amp;R)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="548"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="653"/>
         <source>Ctrl+Shift+O</source>
         <translation>Ctrl+Shift+O</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="655"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>スクラッ�パッドを表示(&amp;o)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="562"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="656"/>
         <source>&amp;New Project File...</source>
         <translation>新�プロジェクト(&amp;N)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="565"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="658"/>
         <source>Ctrl+Shift+N</source>
         <translation>Ctrl+Shift+N</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="570"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="660"/>
         <source>&amp;Log View</source>
         <translation>ログを表示(&amp;L)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="573"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="662"/>
         <source>Log View</source>
         <translation>ログ表示</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="613"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="667"/>
         <source>&amp;Warnings</source>
         <translation>警告(&amp;W)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="631"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="672"/>
         <source>Per&amp;formance warnings</source>
         <translation>パフォーマンス警告(&amp;f)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="657"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="678"/>
         <source>&amp;Information</source>
         <translation>情報(&amp;I)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="672"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="682"/>
         <source>&amp;Portability</source>
         <translation>移��能性(&amp;P)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="772"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="702"/>
         <source>P&amp;latforms</source>
         <translation>プラットフォーム(&amp;l)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="786"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="703"/>
         <source>C++&amp;11</source>
         <translation>C++11(&amp;1)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="797"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="704"/>
         <source>C&amp;99</source>
         <translation>C99(&amp;9)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="805"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="705"/>
         <source>&amp;Posix</source>
         <translation>Posix(&amp;P)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="813"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="706"/>
         <source>C&amp;11</source>
         <translation>C11(&amp;1)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="845"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="707"/>
         <source>&amp;C89</source>
         <translation>C89(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="853"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="708"/>
         <source>&amp;C++03</source>
         <translation>C++03(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="874"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="717"/>
         <source>&amp;Library Editor...</source>
         <translation>ライブラリエディタ(&amp;L)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="721"/>
         <source>&amp;Auto-detect language</source>
         <translation>自動言語検出(&amp;A)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="893"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="722"/>
         <source>&amp;Enforce C++</source>
         <translation>C++ 強制(&amp;E)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="901"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="723"/>
         <source>E&amp;nforce C</source>
         <translation>C 強制(&amp;n)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="912"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="724"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="920"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="725"/>
         <source>Reanalyze and check library</source>
         <translation>ライブラリを��ェック�る</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="928"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="726"/>
         <source>Check configuration (defines, includes)</source>
         <translation>�ェック�設定(define�インクルード)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="936"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="727"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="728"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="729"/>
         <source>Compliance report...</source>
         <translation>コンプライアンスレ�ート...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="987"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="731"/>
         <source>Normal</source>
         <translation>ノーマル</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="995"/>
         <source>Misra C</source>
-        <translation>MISRA C</translation>
+        <translation type="vanished">MISRA C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1003"/>
         <source>Misra C++ 2008</source>
-        <translation>MISRA C++ 2008</translation>
+        <translation type="vanished">MISRA C++ 2008</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1011"/>
         <source>Cert C</source>
-        <translation>CERT C</translation>
+        <translation type="vanished">CERT C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1019"/>
         <source>Cert C++</source>
-        <translation>Cert C++</translation>
+        <translation type="vanished">Cert C++</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1027"/>
         <source>Misra C++ 2023</source>
-        <translation>MISRA C++ 2023</translation>
+        <translation type="vanished">MISRA C++ 2023</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="1035"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="732"/>
         <source>Autosar</source>
         <translation>AUTOSAR</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="1040"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="733"/>
         <source>EULA...</source>
         <translation>EULA...</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="458"/>
+        <location filename="mainwindow.ui" line="1045"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="734"/>
+        <source>Thread Details</source>
+        <translation>スレッド詳細</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1048"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="736"/>
+        <source>Show thread details</source>
+        <translation>スレッド詳細を表示</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="477"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -1105,23 +1252,28 @@ This is probably because the settings were changed between the Cppcheck versions
 Cppcheck����ージョン�設定��互�性��り��ん。エディタアプリケーション�設定を確���修正�������������正��起動�����も�れ��ん。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="753"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>新��ファイル�ディレクトリを�ェック�る���在�プロジェクトを閉������!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="155"/>
-        <location filename="mainwindow.cpp" line="1781"/>
+        <location filename="mainwindow.cpp" line="176"/>
+        <location filename="mainwindow.cpp" line="1812"/>
         <source>Quick Filter:</source>
         <translation>クイックフィルタ：</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="601"/>
+        <source>None of the selected files is part of the project, nothing to analyze.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select configuration</source>
         <translation>コンフィグレーション��択</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="858"/>
+        <location filename="mainwindow.cpp" line="890"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1130,69 +1282,64 @@ Do you want to load this project file instead?</source>
 �在�プロジェクト�代�り���プロジェクトファイルを読�込ん�も�����ん�？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1015"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>��ライブラリ &apos;%1&apos; ��次��明��素���れ����。
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="992"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>File not found</source>
         <translation>ファイル��り��ん</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="995"/>
+        <location filename="mainwindow.cpp" line="1027"/>
         <source>Bad XML</source>
         <translation>�正�XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1030"/>
         <source>Missing attribute</source>
         <translation>属性��り��ん</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1001"/>
+        <location filename="mainwindow.cpp" line="1033"/>
         <source>Bad attribute value</source>
         <translation>�正�属性��り��</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1004"/>
+        <location filename="mainwindow.cpp" line="1036"/>
         <source>Unsupported format</source>
         <translation>サ�ート�れ����フォーマット</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1007"/>
+        <location filename="mainwindow.cpp" line="1039"/>
         <source>Duplicate platform type</source>
         <translation>プラットフォーム�種類��複�����</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1010"/>
+        <location filename="mainwindow.cpp" line="1042"/>
         <source>Platform type redefined</source>
         <translation>プラットフォーム�種類��定義�れ���</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1016"/>
+        <location filename="mainwindow.cpp" line="1048"/>
         <source>Unknown element</source>
         <translation>�明��素</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1019"/>
-        <source>Unknown issue</source>
-        <translation>�明�課題</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation>�択��ライブラリ�読�込��失敗���� &apos;%1&apos;
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
-        <location filename="mainwindow.cpp" line="1090"/>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1120"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
@@ -1205,73 +1352,72 @@ Do you want to load this project file instead?</source>
         <translation type="vanished">%1 - %2 �読�込��失敗</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1482"/>
-        <location filename="mainwindow.cpp" line="1681"/>
+        <location filename="mainwindow.cpp" line="1539"/>
+        <location filename="mainwindow.cpp" line="1734"/>
         <source>XML files (*.xml)</source>
         <translation>XML ファイル (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1484"/>
+        <location filename="mainwindow.cpp" line="1541"/>
         <source>Open the report file</source>
         <translation>レ�ートを開�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1700"/>
         <source>License</source>
         <translation>ライセンス</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1654"/>
+        <location filename="mainwindow.cpp" line="1707"/>
         <source>Authors</source>
         <translation>作者</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1674"/>
+        <location filename="mainwindow.cpp" line="1727"/>
         <source>Save the report file</source>
         <translation>レ�ートを�存</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1685"/>
+        <location filename="mainwindow.cpp" line="1738"/>
         <source>Text files (*.txt)</source>
         <translation>テキストファイル (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1689"/>
+        <location filename="mainwindow.cpp" line="1742"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV形�ファイル (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1712"/>
         <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation>コンプライアンスレ�ートを���生�����ん。解��完了��功�����れ��り��ん。コードを�解����致命的�エラー�����を確�������。</translation>
+        <translation type="vanished">コンプライアンスレ�ートを���生�����ん。解��完了��功�����れ��り��ん。コードを�解����致命的�エラー�����を確�������。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1819"/>
+        <location filename="mainwindow.cpp" line="1850"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>プロジェクトファイル (*.cppcheck);;����ファイル(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="1852"/>
         <source>Select Project File</source>
         <translation>プロジェクトファイルを�択</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1977"/>
+        <location filename="mainwindow.cpp" line="1992"/>
         <source>Failed to open file</source>
         <translation>ファイルを開���失敗����</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1995"/>
         <source>Unknown project file format</source>
         <translation>プロジェクトファイル�形���明��</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1983"/>
+        <location filename="mainwindow.cpp" line="1998"/>
         <source>Failed to import project file</source>
         <translation>プロジェクトファイル�イン�ート�失敗����</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1999"/>
+        <location filename="mainwindow.cpp" line="2014"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
@@ -1280,70 +1426,68 @@ Analysis is stopped.</source>
 解�を�止����。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2008"/>
+        <location filename="mainwindow.cpp" line="2023"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation>&apos;%1&apos; (%2) �イン�ート�失敗����。解���止</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2310"/>
+        <location filename="mainwindow.cpp" line="2339"/>
         <source>Install</source>
         <translation>インストール</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2314"/>
+        <location filename="mainwindow.cpp" line="2343"/>
         <source>New version available: %1. %2</source>
         <translation>新���ージョン�利用�能��。: %1. %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="239"/>
-        <location filename="mainwindow.cpp" line="1783"/>
-        <location filename="mainwindow.cpp" line="1849"/>
-        <location filename="mainwindow.cpp" line="2047"/>
+        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="1814"/>
+        <location filename="mainwindow.cpp" line="1880"/>
+        <location filename="mainwindow.cpp" line="2062"/>
         <source>Project:</source>
         <translation>プロジェクト:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="668"/>
+        <location filename="mainwindow.cpp" line="702"/>
         <source>No suitable files found to analyze!</source>
         <translation>�ェック対象�ファイル����り��ん!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="767"/>
+        <location filename="mainwindow.cpp" line="798"/>
         <source>C/C++ Source</source>
         <translation>C/C++�ソースコード</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="768"/>
+        <location filename="mainwindow.cpp" line="799"/>
         <source>Compile database</source>
         <translation>コンパイルデータベース</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="773"/>
+        <location filename="mainwindow.cpp" line="804"/>
         <source>Select files to analyze</source>
         <translation>�ェック対象�ファイルを�択</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="819"/>
         <source>Select directory to analyze</source>
         <translation>�ェック�るディレクトリを�択������</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>�ェック�設定を�択</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="880"/>
+        <location filename="mainwindow.cpp" line="912"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1352,37 +1496,37 @@ Do you want to proceed analysis without using any of these project files?</sourc
 �����プロジェクトファイルを使用����ェック����?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1013"/>
+        <location filename="mainwindow.cpp" line="1045"/>
         <source>Duplicate define</source>
         <translation>�複��定義</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1035"/>
+        <location filename="mainwindow.cpp" line="1064"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation>ファイル��り��ん: &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1058"/>
+        <location filename="mainwindow.cpp" line="1087"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation>アドオン�読�込����設定�失敗 %1 - %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation>%1�ロード�失敗����。���� Cppcheck �正��インストール�れ����ん。���� --data-dir=&lt;directory&gt; コマンドラインオプションを使����ファイル�場所を指定����。������ --data-dir �インストールスクリプト�よ��使用�れ����れ��り��ん。��GUI版��れを使用���ん。�ら��全��設定�調整済����れ��り��ん。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1120"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation>読�込��失敗 %1 - %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>%1
 
 Analysis is aborted.</source>
@@ -1391,7 +1535,7 @@ Analysis is aborted.</source>
 解��中止��。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1467"/>
+        <location filename="mainwindow.cpp" line="1524"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1401,7 +1545,7 @@ Do you want to proceed?</source>
 新��XMLファイルを開���在��果�削除�れ��。実行����？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1591"/>
+        <location filename="mainwindow.cpp" line="1644"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1410,77 +1554,77 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 �ェックを中断���Cppcheckを終了����?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1633"/>
+        <location filename="mainwindow.cpp" line="1686"/>
         <source>About</source>
         <translation>CppCheck����</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1672"/>
+        <location filename="mainwindow.cpp" line="1725"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML ファイル (*.xml);;テキストファイル (*.txt);;CSVファイル (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1937"/>
+        <location filename="mainwindow.cpp" line="1951"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>ビルドディレクトリ&apos;%1&apos;��り��ん。作�����?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1945"/>
+        <location filename="mainwindow.cpp" line="1959"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation>アドオンを使用��プロジェクトを�ェック�る�����ビルドディレクトリ�必���。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2352"/>
+        <location filename="mainwindow.cpp" line="2381"/>
         <source>Show Mandatory</source>
         <translation>必須を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2353"/>
+        <location filename="mainwindow.cpp" line="2382"/>
         <source>Show Required</source>
         <translation>�求を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2354"/>
+        <location filename="mainwindow.cpp" line="2383"/>
         <source>Show Advisory</source>
         <translation>推奨を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2355"/>
+        <location filename="mainwindow.cpp" line="2384"/>
         <source>Show Document</source>
         <translation>ドキュメントを表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2372"/>
+        <location filename="mainwindow.cpp" line="2401"/>
         <source>Show L1</source>
         <translation>L1を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2373"/>
+        <location filename="mainwindow.cpp" line="2402"/>
         <source>Show L2</source>
         <translation>L2を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2374"/>
+        <location filename="mainwindow.cpp" line="2403"/>
         <source>Show L3</source>
         <translation>L3を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2381"/>
+        <location filename="mainwindow.cpp" line="2410"/>
         <source>Show style</source>
         <translation>スタイルを表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2382"/>
+        <location filename="mainwindow.cpp" line="2411"/>
         <source>Show portability</source>
         <translation>移��能性を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2383"/>
+        <location filename="mainwindow.cpp" line="2412"/>
         <source>Show performance</source>
         <translation>パフォーマンスを表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2384"/>
+        <location filename="mainwindow.cpp" line="2413"/>
         <source>Show information</source>
         <translation>情報を表示</translation>
     </message>
@@ -1489,22 +1633,22 @@ Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="vanished">&apos;%1&apos;�イン�ート�失敗����。(�ェック中断)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2032"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project files (*.cppcheck)</source>
         <translation>プロジェクトファイル (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2034"/>
+        <location filename="mainwindow.cpp" line="2049"/>
         <source>Select Project Filename</source>
         <translation>プロジェクトファイル�を�択</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2080"/>
+        <location filename="mainwindow.cpp" line="2095"/>
         <source>No project file loaded</source>
         <translation>プロジェクトファイル�読�込�れ����ん</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2148"/>
+        <location filename="mainwindow.cpp" line="2177"/>
         <source>The project file
 
 %1
@@ -1566,26 +1710,31 @@ Options:
     <name>NewSuppressionDialog</name>
     <message>
         <location filename="newsuppressiondialog.ui" line="17"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="114"/>
         <source>New suppression</source>
         <translation>新��指摘�抑制</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="25"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="115"/>
         <source>Error ID</source>
         <translation>エラーID</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="32"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="116"/>
         <source>File name</source>
         <translation>ファイル�</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="42"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="117"/>
         <source>Line number</source>
         <translation>行数</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="52"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="118"/>
         <source>Symbol name</source>
         <translation>シンボル�</translation>
     </message>
@@ -1603,57 +1752,57 @@ Options:
         <translation>�イティブ</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit ANSIエンコード</translation>
+        <translation type="vanished">Windows 32-bit ANSIエンコード</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit Unicode</translation>
+        <translation type="vanished">Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
 </context>
 <context>
     <name>ProjectFile</name>
     <message>
         <location filename="projectfile.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="923"/>
         <source>Project File</source>
         <translation>プロジェクトファイル</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="955"/>
         <source>Paths and Defines</source>
         <translation>パス�定義</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="30"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="924"/>
         <source>Import Project (Visual studio / compile database/ Borland C++ Builder 6)</source>
         <oldsource>Import Project (Visual studio / compile database)</oldsource>
         <translation>プロジェクト�イン�ート(Visual studio / compile database Borland C++ Builder 6))</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="231"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="938"/>
         <source>Defines must be separated by a semicolon. Example: DEF1;DEF2=5;DEF3=int</source>
         <oldsource>Defines must be separated by a semicolon &apos;;&apos;</oldsource>
         <translation>定義(Define)�セミコロン&apos;;&apos;�区切る必���り��。 例: DEF1;DEF2=5;DEF3=int</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="958"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation>カスタマイズ�� cfgファイルを��フォルダ�プロジェクトファイル����存������。���表示��るよ���り��。</translation>
     </message>
@@ -1662,324 +1811,417 @@ Options:
         <translation type="vanished">MISRA C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="876"/>
+        <location filename="projectfile.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1011"/>
         <source>MISRA rule texts</source>
         <translation>MISRA ルールテキスト</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="883"/>
+        <location filename="projectfile.ui" line="892"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1013"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;MISRA C 2012 pdf�Appendix A &amp;quot;Summary of guidelines&amp;quot; �らテキストをコピーペースト������。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="890"/>
+        <location filename="projectfile.ui" line="899"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1015"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="73"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="928"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You have a choice:&lt;/p&gt;&lt;p&gt; * Analyze all Debug and Release configurations&lt;/p&gt;&lt;p&gt; * Only analyze the first matching Debug configuration&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;�択済�:&lt;/p&gt;&lt;p&gt; * 全Debug � Release設定を�ェック�る&lt;/p&gt;&lt;p&gt; * 最��マッ��� Debug 設定���ェック�る&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="926"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="964"/>
         <source>Browse...</source>
         <translation>�照...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="930"/>
         <source>Analyze all Visual Studio configurations</source>
         <translation>Visual Studio�全��設定を�ェック�る</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="113"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="931"/>
         <source>Selected VS Configurations</source>
         <translation>�択��VS設定</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="147"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="932"/>
         <source>Paths:</source>
         <translation>パス:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="181"/>
         <location filename="projectfile.ui" line="296"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="933"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="945"/>
         <source>Add...</source>
         <translation>追加...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="934"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="994"/>
         <source>Edit</source>
         <translation>編集</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="935"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="995"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="998"/>
         <source>Remove</source>
         <translation>�り除�</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="242"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="940"/>
         <source>Undefines:</source>
         <translation>定義�り消�(Undefines):</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="252"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="942"/>
         <source>Undefines must be separated by a semicolon. Example: UNDEF1;UNDEF2;UNDEF3</source>
         <translation>定義��り消��セミコロン�区切り��。例: UNDEF1;UNDEF2;UNDEF3</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="265"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="944"/>
         <source>Include Paths:</source>
         <translation>インクルードパス:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="950"/>
+        <source>Include file</source>
+        <translation>インクルードファイル</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="952"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;ヘッダファイルを強制的�インクルード���&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="954"/>
+        <source>Browse..</source>
+        <translation>ブラウズ..</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="959"/>
         <source>Types and Functions</source>
         <translation>型�関数</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="972"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="982"/>
         <source>Analysis</source>
         <translation>�ェック</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="962"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation>Cppcheck������目的�使用�るワークディレクトリ。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="965"/>
         <source>Parser</source>
         <translation>パーサー</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="966"/>
         <source>Cppcheck (built in)</source>
         <translation>Cppcheckビルトイン</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="968"/>
         <source>Check level</source>
         <translation>�ェックレベル</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="969"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation>#R �定的 -- 開発者�直接的��果を得る���解�を�味���。解���定的�高速���より少���果��り��。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="970"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation>#N 通常 -- CI��通常�解�を�味���。解����的�時間内�完了�����。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="971"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation>#E 徹底的 -- ナイトリービルド等を�味���。解�時間�より長��る����り�� (コンパイル�10�以上時間�����もよ�)。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="978"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation>ヘッダファイル�コードも�ェック  (通常�ON��������制��る����OFF)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
         <source>Premium License</source>
-        <translation>プレミアムライセンス</translation>
+        <translation type="vanished">プレミアムライセンス</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="989"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation>タグ�追加�れ�場��警告上��クリック���れら�タグ�中�一�を設定����。警告を分類����。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="991"/>
         <source>Exclude source files</source>
         <translation>除外�るソースファイル</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="992"/>
         <source>Exclude folder...</source>
         <translation>フォルダ�除外...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="993"/>
         <source>Exclude file...</source>
         <translation>ファイル�除外...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="976"/>
         <source>Check that each class has a safe public interface</source>
         <translation>クラス�安全�公開�れ�インターフェースをも���る�確�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="977"/>
         <source>Limit analysis</source>
         <translation>解��制�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="979"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation>未使用テンプレート�コードも�ェック (解��時間���り���正確性�低�)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="980"/>
         <source>Max CTU depth</source>
         <translation>CTU�最大深�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="999"/>
         <source>Enable inline suppressions</source>
         <translation>inline抑制を有効��る</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1006"/>
         <source>Misra C</source>
         <translation>MISRA C</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1007"/>
         <source>2012</source>
         <translation>2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="914"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1008"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1018"/>
         <source>2023</source>
         <translation>2023</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="851"/>
+        <location filename="projectfile.ui" line="860"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1009"/>
         <source>2025</source>
         <translation>2025</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="901"/>
+        <location filename="projectfile.ui" line="910"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1016"/>
         <source>Misra C++</source>
         <translation>MISRA C++</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="918"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1017"/>
         <source>2008</source>
         <translation>2008</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="958"/>
+        <location filename="projectfile.ui" line="967"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1022"/>
         <source>Cert C++</source>
         <translation>Cert C++</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="975"/>
+        <location filename="projectfile.ui" line="981"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1024"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation>安全性プロファイル(C++コアガイドライン�定義)</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="991"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1025"/>
         <source>Bug hunting (Premium)</source>
         <translation>�グ�ンティング(プレミアム)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="991"/>
+        <location filename="projectfile.ui" line="1007"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1027"/>
         <source>External tools</source>
         <translation>外部ツール</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="330"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="948"/>
         <source>Up</source>
         <translation>上</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="337"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="949"/>
         <source>Down</source>
         <translation>下</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="956"/>
         <source>Platform</source>
         <translation>プラットフォーム</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="967"/>
         <source>Clang (experimental)</source>
         <translation>Clang (実験的)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="974"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation>�能��りクラス�柔軟��り堅牢��る��を望む場��公開�れ�インターフェース��常�堅牢��。Cppcheck�引数��らゆる値を�り�る�仮定���。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="981"/>
         <source>Max recursion in template instantiation</source>
         <translation>テンプレートインスタンス化�最大�帰回数</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1000"/>
         <source>Warning options</source>
         <translation>警告オプション</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="983"/>
         <source>Root path:</source>
         <translation>ルートパス:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="985"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation>警告中�ファイルパス���パス�ら�相対パス��り��</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="987"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>警告タグ(セミコロン区切り)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="960"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation>Cppcheck ビルドディレクトリ (全プログラム�ェック, 差分�ェック, 統計等)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="957"/>
         <source>Libraries</source>
         <translation>ライブラリ</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="996"/>
         <source>Suppressions</source>
         <translation>指摘�抑制</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="997"/>
         <source>Add</source>
         <translation>追加</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1001"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1028"/>
         <source>Addons</source>
         <translation>アドオン</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1002"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation>注�: アドオン��&lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt;�必���。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1003"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1004"/>
         <source>Thread safety</source>
         <translation>スレッドセーフ</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1005"/>
         <source>Coding standards</source>
         <translation>コーディング標準</translation>
     </message>
@@ -1988,12 +2230,14 @@ Options:
         <translation type="vanished">MISRA C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="937"/>
+        <location filename="projectfile.ui" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1020"/>
         <source>Cert C</source>
         <translation>CERT C</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="946"/>
+        <location filename="projectfile.ui" line="955"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1021"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation>CERT-INT35-C:  int型�精度 (も�サイズ�精度�一致�る場�空����������)</translation>
     </message>
@@ -2002,27 +2246,28 @@ Options:
         <translation type="vanished">MISRA C++ 2008</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="965"/>
+        <location filename="projectfile.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1023"/>
         <source>Autosar</source>
         <translation>AUTOSAR</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="981"/>
+        <location filename="projectfile.ui" line="997"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1026"/>
         <source>Bug hunting</source>
         <translation>�グ�ント</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
-        <translation>Clang Analyzer</translation>
+        <translation type="vanished">Clang Analyzer</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
-        <translation>Clang-tidy</translation>
+        <translation type="vanished">Clang-tidy</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="936"/>
         <source>Defines:</source>
         <translation>定義(Defines):</translation>
     </message>
@@ -2035,77 +2280,86 @@ Options:
         <translation>プロジェクトファイル:%1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="604"/>
+        <location filename="projectfiledialog.cpp" line="585"/>
         <source>Select Cppcheck build dir</source>
         <translation>Cppcheckビルドディレクトリ</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="865"/>
+        <location filename="projectfiledialog.cpp" line="861"/>
         <source>Select include directory</source>
         <translation>includeディレクトリを�択</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="845"/>
+        <location filename="projectfiledialog.cpp" line="841"/>
         <source>Select a directory to check</source>
         <translation>�ェック�るディレクトリを�択������</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="414"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation>注�: オープンソース�Cppcheck�Misra C 2012を完全�サ�ート�����ん。</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="477"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (���り��ん)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="644"/>
+        <location filename="projectfiledialog.cpp" line="625"/>
         <source>Compile database</source>
         <translation>コンパイルデータベース</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="646"/>
+        <location filename="projectfiledialog.cpp" line="627"/>
         <source>Import Project</source>
         <translation>プロジェクト�イン�ート</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="885"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
+        <source>C/C++ header</source>
+        <translation>C/C++�ヘッダー</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="648"/>
+        <source>Include file</source>
+        <translation>ファイル�インクルード</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="881"/>
         <source>Select directory to ignore</source>
         <translation>除外�るディレクトリを�択������</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="893"/>
+        <location filename="projectfiledialog.cpp" line="889"/>
         <source>Source files</source>
         <translation>ソースファイル</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="894"/>
+        <location filename="projectfiledialog.cpp" line="647"/>
+        <location filename="projectfiledialog.cpp" line="890"/>
         <source>All files</source>
         <translation>全ファイル</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="895"/>
+        <location filename="projectfiledialog.cpp" line="891"/>
         <source>Exclude file</source>
         <translation>除外ファイル</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="978"/>
+        <location filename="projectfiledialog.cpp" line="976"/>
         <source>Select MISRA rule texts file</source>
         <translation>MISRAルールテキストファイルを�択</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="980"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>MISRA rule texts file (%1)</source>
         <translation>MISRAルールテキストファイル (%1)</translation>
     </message>
@@ -2146,7 +2400,7 @@ Options:
         <translation>行 %1: 必須�属性 &apos;%2&apos; � &apos;%3&apos;���</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="302"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation> (見��り��ん)</translation>
     </message>
@@ -2196,160 +2450,159 @@ Options:
         <translation>é»’</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation>エディタ��景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation>エディタ�背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation>�イライト�背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation>行番���景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation>行番��背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation>キーワード��景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation>キーワード�フォント�ウェイト</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation>クラス��景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation>クラスフォント�ウェイト</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation>クォート��景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation>クォート�フォントウェイト</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation>コメント��景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation>コメントフォント�ウェイト</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation>シンボル��景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation>シンボル�背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation>シンボル�フォントウェイト</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="142"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation>デフォルトをライト�設定</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="144"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation>デフォルトをダーク�設定</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="114"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation>ファイル</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="115"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation>行</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="116"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation>警告�種別</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="117"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation>分類</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="118"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation>レベル</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="119"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation>�論����</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="120"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation>�約</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="121"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="122"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation>ガイドライン</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="123"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation>ルール</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="124"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation>日付</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="125"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation>ã‚¿ã‚°</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="126"/>
         <source>CWE</source>
-        <translation>CWE</translation>
+        <translation type="vanished">CWE</translation>
     </message>
 </context>
 <context>
@@ -2398,37 +2651,37 @@ Options:
         <translation type="vanished">未定義ファイル</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="657"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation>コピー</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="825"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation>ファイル�見��り��ん:</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="829"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation>フォルダ &apos;%1&apos; を�択������</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="830"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>ディレクトリ &apos;%1&apos; �択</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="832"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation>ファイル��るディレクトリを�択������。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="367"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>デ�ッグ</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="298"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation>注�</translation>
     </message>
@@ -2441,53 +2694,51 @@ Options:
         <translation type="vanished">�表示</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="659"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation>ID��表示を指定</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="681"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation>�択��idを抑制</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="660"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation>��れるフォルダを開�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="370"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation>内部</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="656"/>
+        <location filename="resultstree.cpp" line="667"/>
         <source>Recheck %1 file(s)</source>
-	<translation>��ェック %1 件�ファイル</translation>
+        <translation>��ェック %1 件�ファイル</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="658"/>
+        <location filename="resultstree.cpp" line="669"/>
         <source>Hide %1 result(s)</source>
         <translation>�表示 %1 件��果</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="701"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation>ã‚¿ã‚°</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="703"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation>タグ��</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="733"/>
-        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="734"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2497,7 +2748,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 Cppcheck�「設定��らテキストファイルを編集�るアプリケーションを設定������。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="748"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2506,12 +2757,12 @@ Please select the default editor application in preferences/Applications.</sourc
 設定�らデフォルト�エディタアプリケーションを設定������。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="768"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>ファイル�見��り��ん!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="811"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2520,7 +2771,7 @@ Please check the application path and parameters are correct.</source>
 実行ファイルパスや引数�設定を確�������。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="833"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>ディレクトリを�択</translation>
     </message>
@@ -2537,32 +2788,32 @@ Please check the application path and parameters are correct.</source>
         <translation type="vanished">日付</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="349"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>スタイル</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="352"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="355"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="358"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>パフォーマンス</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="361"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>移��能性</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="364"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>情報</translation>
     </message>
@@ -2571,80 +2822,82 @@ Please check the application path and parameters are correct.</source>
     <name>ResultsView</name>
     <message>
         <location filename="resultsview.ui" line="26"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="147"/>
         <source>Results</source>
         <translation>�果</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="60"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="148"/>
         <source>Critical errors</source>
         <translation>致命的�エラー</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="149"/>
         <source>Analysis Log</source>
         <translation>�ェックログ</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="114"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="150"/>
         <source>Warning Details</source>
         <translation>警告�詳細</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="237"/>
-        <location filename="resultsview.cpp" line="245"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>レ�ート��存�失敗����。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="255"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>レ�ート��刷</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="274"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation>指摘�������刷�るも���り��ん。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="326"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 / %2 :ファイル数)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="350"/>
-        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="351"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>警告/エラー�見��り��ん���。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="358"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>警告/エラー�見��り������表示設定�������。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>レ�ート�読�込��失敗.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>XML フォーマット�ージョン 1 �も�サ�ート�れ����ん。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="460"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation>�次�も��最��インクルード����</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="465"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>ID</translation>
     </message>
@@ -2653,42 +2906,42 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation type="vanished">�グ�ント�解���完全��</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="539"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Clear Log</source>
         <translation>ログ�消去</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="540"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy this Log entry</source>
         <translation>��ログ項目をコピー</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="541"/>
+        <location filename="resultsview.cpp" line="538"/>
         <source>Copy complete Log</source>
         <translation>ログ全体をコピー</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="549"/>
+        <location filename="resultsview.cpp" line="545"/>
         <source>Analysis was stopped</source>
         <translation>解���止���</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="563"/>
+        <location filename="resultsview.cpp" line="559"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation>id &apos;%1&apos;�致命的�エラー��り��</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="565"/>
+        <location filename="resultsview.cpp" line="561"/>
         <source>when checking %1</source>
         <translation>%1 を�ェック�る��</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="567"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>when checking a file</source>
         <translation>ファイルを�ェック�る��</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="568"/>
+        <location filename="resultsview.cpp" line="564"/>
         <source>Analysis was aborted.</source>
         <translation>解��中止��。</translation>
     </message>
@@ -2697,26 +2950,31 @@ To toggle what kind of errors are shown, open view menu.</source>
     <name>ScratchPad</name>
     <message>
         <location filename="scratchpad.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="107"/>
         <source>Scratchpad</source>
         <translation>スクラッ�パッド</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="108"/>
         <source>Copy or write some C/C++ code here:</source>
         <translation>��� C/C++�コードをコピーペースト���記入������:</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="37"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="109"/>
         <source>Optionally enter a filename (mainly for automatic language detection) and click on &quot;Check&quot;:</source>
         <translation>オプション: ファイル�を入力(言語�自動判定)��&quot;�ェック&quot;をクリック������:</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="110"/>
         <source>filename</source>
         <translation>ファイル�</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="78"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="111"/>
         <source>Check</source>
         <translation>�ェック</translation>
     </message>
@@ -2725,21 +2983,25 @@ To toggle what kind of errors are shown, open view menu.</source>
     <name>Settings</name>
     <message>
         <location filename="settings.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="490"/>
         <source>Preferences</source>
         <translation>設定</translation>
     </message>
     <message>
         <location filename="settings.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="502"/>
         <source>General</source>
         <translation>全般</translation>
     </message>
     <message>
         <location filename="settings.ui" line="196"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="503"/>
         <source>Add...</source>
         <translation>追加...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="491"/>
         <source>Number of threads: </source>
         <translation>解�用�スレッド数: </translation>
     </message>
@@ -2749,57 +3011,68 @@ To toggle what kind of errors are shown, open view menu.</source>
     </message>
     <message>
         <location filename="settings.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="493"/>
         <source>Force checking all #ifdef configurations</source>
         <oldsource>Check all #ifdef configurations</oldsource>
         <translation>���� #ifdef を�ェック�る</translation>
     </message>
     <message>
         <location filename="settings.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="494"/>
         <source>Show full path of files</source>
         <translation>ファイル�フルパスを表示</translation>
     </message>
     <message>
         <location filename="settings.ui" line="122"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="495"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>エラー�無����&quot;エラー��&quot;を表示</translation>
     </message>
     <message>
         <location filename="settings.ui" line="129"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="496"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>エラーIDを &quot;Id&quot; �表示�る</translation>
     </message>
     <message>
         <location filename="settings.ui" line="136"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="497"/>
         <source>Enable inline suppressions</source>
         <translation>inline抑制を有効��る</translation>
     </message>
     <message>
         <location filename="settings.ui" line="143"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="498"/>
         <source>Check for inconclusive errors also</source>
         <translation>�論����指摘も�ェック�る</translation>
     </message>
     <message>
         <location filename="settings.ui" line="150"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="499"/>
         <source>Show statistics on check completion</source>
         <translation>�ェック完了時�統計情報を表示�る</translation>
     </message>
     <message>
         <location filename="settings.ui" line="157"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="500"/>
         <source>Check for updates</source>
         <translation>更新�確�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="177"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="501"/>
         <source>Show internal warnings in log</source>
         <translation>ログ�内部警告も表示�る</translation>
     </message>
     <message>
         <location filename="settings.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="521"/>
         <source>Addons</source>
         <translation>アドオン</translation>
     </message>
     <message>
         <location filename="settings.ui" line="294"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="512"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation>Pythonインタプリタ�場所(空白�場�システム�PATH�ら検索)</translation>
     </message>
@@ -2807,117 +3080,143 @@ To toggle what kind of errors are shown, open view menu.</source>
         <location filename="settings.ui" line="305"/>
         <location filename="settings.ui" line="346"/>
         <location filename="settings.ui" line="391"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="513"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="523"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="324"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="515"/>
         <source>MISRA addon</source>
         <translation>MISRAアドオン</translation>
     </message>
     <message>
         <location filename="settings.ui" line="332"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="516"/>
         <source>MISRA rule texts file</source>
         <translation>MISRA ルールテキストファイル</translation>
     </message>
     <message>
         <location filename="settings.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="518"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf�テキストをテキストファイル�コピー&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="526"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
         <location filename="settings.ui" line="378"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="522"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation>Clang�場所(空白�場�システム�PATH�ら検索)</translation>
     </message>
     <message>
         <location filename="settings.ui" line="401"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="524"/>
         <source>Visual Studio headers</source>
         <translation>Visual Studio�ヘッダ</translation>
     </message>
     <message>
         <location filename="settings.ui" line="407"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="525"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Visual Studio�ヘッダーファイル(セミコロン区切り&apos;;&apos;)。&lt;/p&gt;&lt;p&gt;Visual Studio コマンドプロンプトを開�� &amp;quot;SET INCLUDE&amp;quot;. �入力後���パスをコピーペースト������。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="533"/>
         <source>Code Editor</source>
         <translation>コードエディタ</translation>
     </message>
     <message>
         <location filename="settings.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="527"/>
         <source>Code Editor Style</source>
         <translation>コードエディタスタイル</translation>
     </message>
     <message>
         <location filename="settings.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="528"/>
         <source>System Style</source>
         <translation>システム�デフォルト�スタイル</translation>
     </message>
     <message>
         <location filename="settings.ui" line="456"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="529"/>
         <source>Default Light Style</source>
         <translation>ライトスタイルをデフォルト�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="463"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="530"/>
         <source>Default Dark Style</source>
         <translation>ダークスタイルをデフォルト�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="472"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="531"/>
         <source>Custom</source>
         <translation>カスタム</translation>
     </message>
     <message>
         <location filename="settings.ui" line="210"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="505"/>
         <source>Remove</source>
         <translation>削除</translation>
     </message>
     <message>
         <location filename="settings.ui" line="79"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="492"/>
         <source>Max count:</source>
         <translation>#M 最大数:</translation>
     </message>
     <message>
         <location filename="settings.ui" line="185"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="507"/>
         <source>Applications</source>
         <translation>アプリケーション</translation>
     </message>
     <message>
         <location filename="settings.ui" line="203"/>
         <location filename="settings.ui" line="479"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="532"/>
         <source>Edit...</source>
         <translation>編集...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="506"/>
         <source>Set as default</source>
         <translation>デフォルト���設定</translation>
     </message>
     <message>
         <location filename="settings.ui" line="240"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="510"/>
         <source>Reports</source>
         <translation>レ�ート</translation>
     </message>
     <message>
         <location filename="settings.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="508"/>
         <source>Save all errors when creating report</source>
         <translation>レ�ート作�時�����警告/エラーを�存</translation>
     </message>
     <message>
         <location filename="settings.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="509"/>
         <source>Save full path to files in reports</source>
         <translation>レ�ート�ファイル�フルパスを�存</translation>
     </message>
     <message>
         <location filename="settings.ui" line="274"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="511"/>
         <source>Language</source>
         <translation>言語</translation>
     </message>
@@ -2974,221 +3273,245 @@ To toggle what kind of errors are shown, open view menu.</source>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="395"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="415"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>統計情報</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="401"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>プロジェクト</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="33"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="396"/>
         <source>Project:</source>
         <translation>プロジェクト:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="53"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="397"/>
         <source>Paths:</source>
         <translation>パス:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="85"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="398"/>
         <source>Include paths:</source>
         <translation>インクルードパス:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="399"/>
         <source>Defines:</source>
         <translation>定義(define):</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="400"/>
         <source>Undefines:</source>
         <translation>定義�り消�(undef):</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="407"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>�回�解�</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="171"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="402"/>
         <source>Path Selected:</source>
         <translation>ディレクトリ�択:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="181"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="403"/>
         <source>Number of Files Scanned:</source>
         <translation>解�済�ファイル数:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="201"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="405"/>
         <source>Scan Duration:</source>
         <translation>解������時間:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="254"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="408"/>
         <source>Errors:</source>
         <translation>エラー:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="271"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="409"/>
         <source>Warnings:</source>
         <translation>警告:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="410"/>
         <source>Stylistic warnings:</source>
         <translation>スタイル警告:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="305"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="411"/>
         <source>Portability warnings:</source>
         <translation>移��能性�警告:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="322"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="412"/>
         <source>Performance issues:</source>
         <translation>パフォーマンス警告:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="413"/>
         <source>Information messages:</source>
         <translation>情報メッセージ:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="356"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="414"/>
         <source>Active checkers:</source>
         <translation>有効��ェッカー:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="374"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="416"/>
         <source>Checkers</source>
         <translation>�ェッカー</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="418"/>
         <source>History</source>
         <translation>ヒストリー</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="405"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="417"/>
         <source>File:</source>
         <translation>ファイル:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="419"/>
         <source>Copy to Clipboard</source>
         <translation>クリップボード�コピー</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="420"/>
         <source>Pdf Export</source>
         <translation>PDF エクス�ート</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>一日</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1æ—¥</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>一時間</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1時間</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>一分</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1分</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>一秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.%1秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="171"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> � </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="198"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation>PDF エクス�ート</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>プロジェクト�設定</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>パス</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>インクルードパス</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>定義(define)</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation>定義�り消�(Undef)</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>�択�れ�パス</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>スキャン��ファイル�数</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>スキャン期間</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>エラー</translation>
     </message>
@@ -3203,40 +3526,49 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>cppcheckビルドディレクトリ��り��ん</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>スタイル警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>移��能性警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>パフォーマンス警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>情報メッセージ</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_threaddetails.h" line="47"/>
+        <source>Thread Details</source>
+        <translation>スレッド詳細</translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="46"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>�ェック: %1 / %2 (ファイル数)</translation>
     </message>
@@ -3255,9 +3587,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 ����言語を 英語�リセット���。設定ダイアログ�ら利用�能�言語を�択������。</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_ka.ts b/gui/cppcheck_ka.ts
index 306308fced3..97fe21d6f96 100644
--- a/gui/cppcheck_ka.ts
+++ b/gui/cppcheck_ka.ts
@@ -5,27 +5,32 @@
     <name>About</name>
     <message>
         <location filename="about.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="130"/>
         <source>About Cppcheck</source>
         <translation>Cppcheck-ის შეს�ხებ</translation>
     </message>
     <message>
         <location filename="about.ui" line="64"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="132"/>
         <source>Version %1</source>
         <translation>ვერსი� %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="133"/>
         <source>Cppcheck - A tool for static C/C++ code analysis.</source>
         <translation>Cppcheck - ხელს�წყ� სტ�ტიკური C/C++ კ�დის �ნ�ლიზისთვის.</translation>
     </message>
     <message>
         <location filename="about.ui" line="81"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="134"/>
         <source>Copyright © 2007-%1 Cppcheck team.</source>
         <oldsource>Copyright © 2007-2021 Cppcheck team.</oldsource>
         <translation>Copyright © 2007-%1 Cppcheck-ის გუნდი. ყველ� უფლებ� დ�ცული�.</translation>
     </message>
     <message>
         <location filename="about.ui" line="91"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="135"/>
         <source>This program is licensed under the terms
 of the GNU General Public License version 3</source>
         <translation>ვრცელდებ� GNU-ის ს�ჯ�რ� ლიცენზიის,
@@ -33,11 +38,13 @@ of the GNU General Public License version 3</source>
     </message>
     <message>
         <location filename="about.ui" line="102"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="137"/>
         <source>Visit Cppcheck homepage at %1</source>
         <translation>ეწვიეთ Cppcheck-ის ვებგვერდს მის�მ�რთზე %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;pcre&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;picojson&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tinyxml2&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;დიდი მ�დლ�ბ� �მ ბიბლი�თეკებს, რ�მლებს�ც ვიყენებთ::&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -47,11 +54,13 @@ of the GNU General Public License version 3</source>
     <name>ApplicationDialog</name>
     <message>
         <location filename="applicationdialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="161"/>
         <source>Add an application</source>
         <translation>�პლიკ�ციის დ�მ�ტებ�</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="162"/>
         <source>Here you can add an application that can open error files. Specify a name for the application, the application executable and command line parameters for the application.
 
 The following texts in parameters are replaced with appropriate values when application is executed:
@@ -67,21 +76,25 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="173"/>
         <source>&amp;Name:</source>
         <translation>&amp;ს�ხელი:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="86"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="174"/>
         <source>&amp;Executable:</source>
         <translation>&amp;გ�მშვები ფ�ილი:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="96"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="175"/>
         <source>&amp;Parameters:</source>
         <translation>&amp;პ�რ�მეტრები:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="138"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="176"/>
         <source>Browse</source>
         <translation>დ�თვ�ლიერებ�</translation>
     </message>
@@ -96,9 +109,8 @@ Parameters: -l(line) (file)</source>
         <translation>�ირჩიეთ �პლიკ�ცი�</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -109,65 +121,52 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>ComplianceReportDialog</name>
     <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
         <source>Compliance Report</source>
-        <translation>შეს�ბ�მის�ბის �ნგ�რიში</translation>
+        <translation type="vanished">შეს�ბ�მის�ბის �ნგ�რიში</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
-        <translation>პრ�ექტის ს�ხელი</translation>
+        <translation type="vanished">პრ�ექტის ს�ხელი</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
-        <translation>პრ�ექტის ვერსი�</translation>
+        <translation type="vanished">პრ�ექტის ვერსი�</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
         <source>Coding Standard</source>
-        <translation>კ�დირების სტ�ნდ�რტი</translation>
+        <translation type="vanished">კ�დირების სტ�ნდ�რტი</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
         <source>Misra C</source>
-        <translation>Misra C</translation>
+        <translation type="vanished">Misra C</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
         <source>Cert C</source>
-        <translation>Cert C</translation>
+        <translation type="vanished">Cert C</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
         <source>Cert C++</source>
-        <translation>Cert C++</translation>
+        <translation type="vanished">Cert C++</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
         <source>List of files with md5 checksums</source>
-        <translation>MD5 ს�კ�ნტრ�ლ� ჯ�მების მქ�ნე ფ�ილების სი�</translation>
+        <translation type="vanished">MD5 ს�კ�ნტრ�ლ� ჯ�მების მქ�ნე ფ�ილების სი�</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
-        <translation>შეს�ბ�მის�ბის �ნგ�რიში</translation>
+        <translation type="vanished">შეს�ბ�მის�ბის �ნგ�რიში</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
-        <translation>HTML ფ�ილები (*.html)</translation>
+        <translation type="vanished">HTML ფ�ილები (*.html)</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
         <source>Save compliance report</source>
-        <translation>შეს�ბ�მის�ბის �ნგ�რიშის შენ�ხვ�</translation>
+        <translation type="vanished">შეს�ბ�მის�ბის �ნგ�რიშის შენ�ხვ�</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
         <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation>&apos;%1&apos;-ის (%2) შემ�ტ�ნ� ჩ�ვ�რდ�. შეს�ბ�მის�ბის �ნგ�რიშში ფ�ილებს ვერ ვ�ჩვენებ</translation>
+        <translation type="vanished">&apos;%1&apos;-ის (%2) შემ�ტ�ნ� ჩ�ვ�რდ�. შეს�ბ�მის�ბის �ნგ�რიშში ფ�ილებს ვერ ვ�ჩვენებ</translation>
     </message>
 </context>
 <context>
@@ -180,10 +179,8 @@ Parameters: -l(line) (file)</source>
         <translation>ვერ ვიპ�ვე ფ�ილი: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -195,44 +192,49 @@ Parameters: -l(line) (file)</source>
     <name>HelpDialog</name>
     <message>
         <location filename="helpdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="88"/>
         <source>Cppcheck GUI help</source>
         <translation>Cppcheck-ის გრ�ფიკული ინტერფეისის დ�ხმ�რებ�</translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="89"/>
         <source>Contents</source>
         <translation>შემცველ�ბ�</translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="90"/>
         <source>Index</source>
         <translation>ინდექსი</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation>დ�ხმ�რების ფ�ილი &apos;%1&apos; ვერ ვიპ�ვე</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
     <name>LibraryAddFunctionDialog</name>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="105"/>
         <source>Add function</source>
         <translation>ფუნქციის დ�მ�ტებ�</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="106"/>
         <source>Function name(s)</source>
         <translation>ფუნქციის ს�ხელ(ებ)-ი</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="107"/>
         <source>Number of arguments</source>
         <translation>�რგუმენტების რ��დენ�ბ�</translation>
     </message>
@@ -241,125 +243,139 @@ Parameters: -l(line) (file)</source>
     <name>LibraryDialog</name>
     <message>
         <location filename="librarydialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="275"/>
         <source>Library Editor</source>
         <translation>ბიბლი�თეკის რედ�ქტ�რი</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="22"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="276"/>
         <source>Open</source>
         <translation>გ�ხსნ�</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="29"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="277"/>
         <source>Save</source>
         <translation>შენ�ხვ�</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="36"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="278"/>
         <source>Save as</source>
         <translation>შენ�ხვ�, რ�გ�რც</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="62"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="279"/>
         <source>Functions</source>
         <translation>ფუნქციები</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="280"/>
         <source>Sort</source>
         <translation>დ�ლ�გებ�</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="111"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="281"/>
         <source>Add</source>
         <translation>დ�მ�ტებ�</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="282"/>
         <source>Filter:</source>
         <translation>ფილტრი:</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="164"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="283"/>
         <source>Comments</source>
         <translation>კ�მენტ�რები</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="204"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="284"/>
         <source>noreturn</source>
         <translation>noreturn</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="212"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="285"/>
         <source>False</source>
         <translation>მცდ�რი</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="286"/>
         <source>True</source>
         <translation>სიმ�რთლე</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="222"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="287"/>
         <source>Unknown</source>
         <translation>უცნ�ბი</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="232"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="289"/>
         <source>return value must be used</source>
         <translation>უნდ� გ�მ�იყენ�თ დ�ბრუნებული მნიშვნელ�ბ�</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="239"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="290"/>
         <source>ignore function in leaks checking</source>
         <translation>ფუნქციების გ�მ�ტ�ვებ� გ�ჟ�ნვები შემ�წმების�ს</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="291"/>
         <source>Arguments</source>
         <translation>�რგუმენტები</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="258"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="292"/>
         <source>Edit</source>
         <translation>ჩ�სწ�რებ�</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation>ბიბლი�თეკის ფ�ილები (*.cfg)</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation>ბიბლი�თეკის ფ�ილის გ�ხსნ�</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation>ფ�ილის &apos;%1&apos; გ�ხსნის შეცდ�მ�.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation>%1-ის ჩ�ტვირთვის შეცდ�მ�. %2.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <translation>ფ�ილის შენ�ხვის შეცდ�მ�: %1 .</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation>ბიბლი�თეკის შენ�ხვ�, რ�გ�რც</translation>
     </message>
@@ -368,11 +384,13 @@ Parameters: -l(line) (file)</source>
     <name>LibraryEditArgDialog</name>
     <message>
         <location filename="libraryeditargdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="284"/>
         <source>Edit argument</source>
         <translation>�რგუმენტის ჩ�სწ�რებ�</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="286"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is bool value allowed? For instance result from comparison or from &apos;!&apos; operator.&lt;/p&gt;
 &lt;p&gt;Typically, set this if the argument is a pointer, size, etc.&lt;/p&gt;
@@ -383,11 +401,13 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="28"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="293"/>
         <source>Not bool</source>
         <translation>ლ�გიკური მნ. �რ��</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="35"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is a null parameter value allowed?&lt;/p&gt;
 &lt;p&gt;Typically this should be used on any pointer parameter that does not allow null.&lt;/p&gt;
@@ -398,78 +418,99 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="43"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="302"/>
         <source>Not null</source>
         <translation>ნულ�ვ�ნი �რ��</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="50"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="303"/>
         <source>Not uninit</source>
         <translation>Uninit �რ��</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="57"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="304"/>
         <source>String</source>
         <translation>სტრიქ�ნი</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="70"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="305"/>
         <source>Format string</source>
         <translation>სტრიქ�ნის ფ�რმ�ტი</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="306"/>
         <source>Min size of buffer</source>
         <translation>ბუფერის მინ. ზ�მ�</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="101"/>
         <location filename="libraryeditargdialog.ui" line="203"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="307"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="316"/>
         <source>Type</source>
         <translation>ტიპი</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="109"/>
         <location filename="libraryeditargdialog.ui" line="214"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="308"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="317"/>
         <source>None</source>
         <translation>�რ�ფერი</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="114"/>
         <location filename="libraryeditargdialog.ui" line="219"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="309"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="318"/>
         <source>argvalue</source>
         <translation>argvalue</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="119"/>
         <location filename="libraryeditargdialog.ui" line="224"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="319"/>
         <source>mul</source>
         <translation>mul</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="124"/>
         <location filename="libraryeditargdialog.ui" line="229"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="311"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="320"/>
         <source>strlen</source>
         <translation>strlen</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="132"/>
         <location filename="libraryeditargdialog.ui" line="237"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="313"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="322"/>
         <source>Arg</source>
         <translation>�რგ</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="159"/>
         <location filename="libraryeditargdialog.ui" line="264"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="323"/>
         <source>Arg2</source>
         <translation>Arg2</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="194"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="315"/>
         <source>and</source>
         <translation>დ�</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="324"/>
         <source>Valid values</source>
         <translation>სწ�რი მნიშვნელ�ბები</translation>
     </message>
@@ -477,613 +518,716 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="687"/>
-        <location filename="mainwindow.cpp" line="463"/>
-        <location filename="mainwindow.cpp" line="667"/>
-        <location filename="mainwindow.cpp" line="752"/>
-        <location filename="mainwindow.cpp" line="857"/>
-        <location filename="mainwindow.cpp" line="879"/>
-        <location filename="mainwindow.cpp" line="1466"/>
-        <location filename="mainwindow.cpp" line="1595"/>
-        <location filename="mainwindow.cpp" line="1936"/>
-        <location filename="mainwindow.cpp" line="1944"/>
-        <location filename="mainwindow.cpp" line="1998"/>
-        <location filename="mainwindow.cpp" line="2007"/>
-        <location filename="mainwindow.cpp" line="2079"/>
-        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="209"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="745"/>
         <source>A&amp;nalyze</source>
         <translation>�&amp;ნ�ლიზი</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="266"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="749"/>
         <source>Standard</source>
         <translation>სტ�ნდ�რტული</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="740"/>
         <source>&amp;File</source>
         <translation>&amp;ფ�ილი</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="741"/>
         <source>&amp;View</source>
         <translation>&amp;ხედი</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="742"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;ხელს�წყ�თ� ზ�ლები</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="213"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="746"/>
         <source>C++ standard</source>
         <translation>C++-ის სტ�ნდ�რტი</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="225"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="747"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation>&amp;C-ის სტ�ნდ�რტი</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="748"/>
         <source>&amp;Edit</source>
         <translation>&amp;ჩ�სწ�რებ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="578"/>
         <source>&amp;License...</source>
         <translation>&amp;ლიცენზი�...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="319"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="579"/>
         <source>A&amp;uthors...</source>
         <translation>&amp;�ვტ�რები...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="328"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="580"/>
         <source>&amp;About...</source>
         <translation>&amp;შეს�ხებ...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="333"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="581"/>
         <source>&amp;Files...</source>
         <translation>ფ�ილ&amp;ები...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="336"/>
         <location filename="mainwindow.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="582"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="584"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation>ფ�ილების �ნ�ლიზი</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="342"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="587"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="351"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="589"/>
         <source>&amp;Directory...</source>
         <translation>&amp;ს�ქ�ღ�ლდე....</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="354"/>
         <location filename="mainwindow.ui" line="357"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="590"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="592"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation>ს�ქ�ღ�ლდის �ნ�ლიზი</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="595"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="599"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="602"/>
         <source>&amp;Stop</source>
         <translation>&amp;გ�ჩერებ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="393"/>
         <location filename="mainwindow.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="603"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="605"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation>�ნ�ლიზის გ�ჩერებ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="608"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="610"/>
         <source>&amp;Save results to file...</source>
         <translation>შედეგები&amp;ს შენ�ხვ� ფ�ილში....</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="411"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="612"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="416"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="614"/>
         <source>&amp;Quit</source>
         <translation>გ�მ�სვლ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="428"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="618"/>
         <source>&amp;Clear results</source>
         <translation>შედეგების &amp;გ�სუფთ�ვებ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="619"/>
         <source>&amp;Preferences</source>
         <translation>&amp;გ�მ�რთვ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="470"/>
         <location filename="mainwindow.ui" line="473"/>
-        <location filename="mainwindow.cpp" line="2379"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="626"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="628"/>
+        <location filename="mainwindow.cpp" line="2408"/>
         <source>Show errors</source>
         <translation>შეცდ�მების ჩვენებ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="616"/>
         <location filename="mainwindow.ui" line="619"/>
-        <location filename="mainwindow.cpp" line="2380"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="668"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="670"/>
+        <location filename="mainwindow.cpp" line="2409"/>
         <source>Show warnings</source>
         <translation>გ�ფრთხილების ჩვენებ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="634"/>
         <location filename="mainwindow.ui" line="637"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="673"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="675"/>
         <source>Show performance warnings</source>
         <translation>წ�რმ�დ�ბის გ�ფრთხილებების ჩვენებ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="645"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="677"/>
         <source>Show &amp;hidden</source>
         <translation>დ�მ�ლულის &amp;ჩვენებ�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1015"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Information</source>
         <translation>ინფ�რმ�ცი�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="660"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="680"/>
         <source>Show information messages</source>
         <translation>ინფ�რმ�ციის შეტყ�ბინებების ჩვენებ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="675"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="684"/>
         <source>Show portability warnings</source>
         <translation>გ�დ�ტ�ნ�დ�ბის გ�ფრთხილებების ჩვენებ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="690"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="687"/>
         <source>Show Cppcheck results</source>
         <translation>Cppcheck-ის შედეგები ჩვენებ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="702"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="689"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="705"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="691"/>
         <source>Show Clang results</source>
         <translation>Clang-ის შედეგები ჩვენებ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="713"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="693"/>
         <source>&amp;Filter</source>
         <translation>&amp;ფილტრი</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="716"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="695"/>
         <source>Filter results</source>
         <translation>შედეგების გ�ფილტვრ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="732"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="697"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit ANSI</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="740"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="698"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit Unicode</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="748"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="699"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="756"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="700"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="764"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="701"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="858"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="709"/>
         <source>&amp;Print...</source>
         <translation>&amp;ბეჭდვ�…</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="861"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="711"/>
         <source>Print the Current Report</source>
         <translation>მიმდინ�რე �ნგ�რიშის დ�ბეჭდვ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="866"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="713"/>
         <source>Print Pre&amp;view...</source>
         <translation>ს�ბეჭდის &amp;გ�დ�ხედვ�...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="869"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="715"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation>მიმდინ�რე შედეგების დ�ბეჭდვის მინი�ტურის დი�ლ�გის ჩვენებ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="877"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="719"/>
         <source>Open library editor</source>
         <translation>ბიბლი�თეკის რედ�ქტ�რის გ�ხსნ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="478"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="630"/>
         <source>&amp;Check all</source>
         <translation>&amp;ყველ�ს ჩ�რთვ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="738"/>
         <source>Checking for updates</source>
         <translation>გ�ნ�ხლებების შემ�წმებ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="100"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="739"/>
         <source>Hide</source>
         <translation>დ�მ�ლვ�</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="163"/>
         <location filename="mainwindow.ui" line="979"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="730"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="743"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="303"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="751"/>
         <source>Filter</source>
         <translation>ფილტრი</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="369"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="597"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation>ყველ� შეცვლილი ფ�ილის თ�ვიდ�ნ �ნ�ლი&amp;ზი</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="381"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="601"/>
         <source>Reanal&amp;yze all files</source>
         <translation>&amp;ყველ� ფ�ილის თ�ვიდ�ნ �ნ�ლიზი</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="419"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="616"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="620"/>
         <source>Style war&amp;nings</source>
         <translation>ს&amp;ტილის გ�ფრთხილებები</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="467"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="625"/>
         <source>E&amp;rrors</source>
         <translation>&amp;შეცდ�მები</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="483"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="631"/>
         <source>&amp;Uncheck all</source>
         <translation>ყველ�ს ჩ�მ�ყ&amp;რ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="488"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="632"/>
         <source>Collapse &amp;all</source>
         <translation>ყველ�ს ჩ�კეცვ&amp;�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="493"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="633"/>
         <source>&amp;Expand all</source>
         <translation>&amp;ყველ�ს �მ�კეცვ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="501"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="634"/>
         <source>&amp;Standard</source>
         <translation>&amp;სტ�ნდ�რტული</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="636"/>
         <source>Standard items</source>
         <translation>სტ�ნდ�რტული ელემენტები</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="645"/>
         <source>Toolbar</source>
         <translation>ხელს�წყ�თ� ზ�ლი</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="528"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="646"/>
         <source>&amp;Categories</source>
         <translation>&amp;კ�ტეგ�რიები</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="531"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="648"/>
         <source>Error categories</source>
         <translation>შეცდ�მის კ�ტეგ�რიები</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="536"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="650"/>
         <source>&amp;Open XML...</source>
         <translation>&amp;XML-ის გ�ხსნ�...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="545"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="651"/>
         <source>Open P&amp;roject File...</source>
         <translation>პ&amp;პრ�ექტის ფ�ილის გ�ხსნ�...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="548"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="653"/>
         <source>Ctrl+Shift+O</source>
         <translation>Ctrl+Shift+O</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="655"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>ბლ&amp;�კნ�ტის ჩვენებ�...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="562"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="656"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;�ხ�ლი პრ�ექტის ფ�ილი...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="565"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="658"/>
         <source>Ctrl+Shift+N</source>
         <translation>Ctrl+Shift+N</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="570"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="660"/>
         <source>&amp;Log View</source>
         <translation>ჟურნ�&amp;ლის ხედი</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="573"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="662"/>
         <source>Log View</source>
         <translation>ჟურნ�ლის ხედი</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="581"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="664"/>
         <source>C&amp;lose Project File</source>
         <translation>პრ�ექტის ფ�ი&amp;ლის დ�ხურვ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="589"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="665"/>
         <source>&amp;Edit Project File...</source>
         <translation>პრ�ექტის ფ�ილის ჩ�სწ�რ&amp;ებ�...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="601"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="666"/>
         <source>&amp;Statistics</source>
         <translation>&amp;სტ�ტისტიკ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="613"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="667"/>
         <source>&amp;Warnings</source>
         <translation>&amp;გ�ფრთხილებები</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="631"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="672"/>
         <source>Per&amp;formance warnings</source>
         <translation>წ�რმ�ტების გ�&amp;ფრთხილებები</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="657"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="678"/>
         <source>&amp;Information</source>
         <translation>&amp;ინფ�რმ�ცი�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="672"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="682"/>
         <source>&amp;Portability</source>
         <translation>&amp;გ�დ�ტ�ნ�დ�ბ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="772"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="702"/>
         <source>P&amp;latforms</source>
         <translation>პ&amp;ლ�ტფ�რმები</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="786"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="703"/>
         <source>C++&amp;11</source>
         <translation>C++&amp;11</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="797"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="704"/>
         <source>C&amp;99</source>
         <translation>C&amp;99</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="805"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="705"/>
         <source>&amp;Posix</source>
         <translation>&amp;Posix</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="813"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="706"/>
         <source>C&amp;11</source>
         <translation>C&amp;11</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="845"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="707"/>
         <source>&amp;C89</source>
         <translation>&amp;C89</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="853"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="708"/>
         <source>&amp;C++03</source>
         <translation>&amp;C++03</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="874"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="717"/>
         <source>&amp;Library Editor...</source>
         <translation>ბიბ&amp;ლი�თეკის რედ�ქტ�რი...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="721"/>
         <source>&amp;Auto-detect language</source>
         <translation>ენის &amp;�ვტ�დ�დგენ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="893"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="722"/>
         <source>&amp;Enforce C++</source>
         <translation>ძ&amp;�ლით C++</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="901"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="723"/>
         <source>E&amp;nforce C</source>
         <translation>ძ�&amp;ლით C</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="912"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="724"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="920"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="725"/>
         <source>Reanalyze and check library</source>
         <translation>ბიბლი�თეკის თ�ვიდ�ნ �ნ�ლიზი დ� შემ�წმებ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="928"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="726"/>
         <source>Check configuration (defines, includes)</source>
         <translation>კ�ნფიგურ�ციის შემ�წმებ� (defines, includes)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="936"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="727"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="728"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="729"/>
         <source>Compliance report...</source>
         <translation>შეს�ბ�მის�ბის �ნგ�რიში...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="987"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="731"/>
         <source>Normal</source>
         <translation type="unfinished">ნ�რმ�ლური</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="995"/>
         <source>Misra C</source>
-        <translation type="unfinished">Misra C</translation>
+        <translation type="obsolete">Misra C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1003"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1011"/>
         <source>Cert C</source>
-        <translation type="unfinished">Cert C</translation>
+        <translation type="obsolete">Cert C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1019"/>
         <source>Cert C++</source>
-        <translation type="unfinished">Cert C++</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1027"/>
-        <source>Misra C++ 2023</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Cert C++</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="1035"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="732"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="1040"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="733"/>
         <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="mainwindow.ui" line="1045"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="734"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1048"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="736"/>
+        <source>Show thread details</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="mainwindow.ui" line="509"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="638"/>
         <source>&amp;Contents</source>
         <translation>&amp;შემცველ�ბ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="284"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="750"/>
         <source>Categories</source>
         <translation>კ�ტეგ�რიები</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="452"/>
         <location filename="mainwindow.ui" line="455"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="621"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="623"/>
         <source>Show style warnings</source>
         <translation>სტილის გ�ფრთხილების ჩვენებ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="512"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="640"/>
         <source>Open the help contents</source>
         <translation>დ�ხმ�რების შემცველ�ბის გ�ხსნ�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="515"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="643"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="198"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="744"/>
         <source>&amp;Help</source>
         <translation>&amp;დ�ხმ�რებ�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="155"/>
-        <location filename="mainwindow.cpp" line="1781"/>
+        <location filename="mainwindow.cpp" line="176"/>
+        <location filename="mainwindow.cpp" line="1812"/>
         <source>Quick Filter:</source>
         <translation>სწრ�ფი ფილტრი:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="601"/>
+        <source>None of the selected files is part of the project, nothing to analyze.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select configuration</source>
         <translation>�ირჩიეთ კ�ნფიგურ�ცი�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="858"/>
+        <location filename="mainwindow.cpp" line="890"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1092,61 +1236,61 @@ Do you want to load this project file instead?</source>
 გნებ�ვთ, ს�მ�გიერ�დ, ეს პრ�ექტის ფ�ილი ჩ�ტვირთ�თ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="992"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>File not found</source>
         <translation>ფ�ილი ნ�პ�ვნი �რ��</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="995"/>
+        <location filename="mainwindow.cpp" line="1027"/>
         <source>Bad XML</source>
         <translation>�რ�სწ�რი XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1030"/>
         <source>Missing attribute</source>
         <translation>�კლი� �ტრიბუტი</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1001"/>
+        <location filename="mainwindow.cpp" line="1033"/>
         <source>Bad attribute value</source>
         <translation>�რ�სწ�რი �ტრიბუტის მნიშვნელ�ბ�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1004"/>
+        <location filename="mainwindow.cpp" line="1036"/>
         <source>Unsupported format</source>
         <translation>მხ�რდ�უჭერელი ფ�რმ�ტი</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1013"/>
+        <location filename="mainwindow.cpp" line="1045"/>
         <source>Duplicate define</source>
         <translation>გ�მე�რებული �ღწერ�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation>ჩ�ვ�რდ� ჩ�ტვირთვ� მ�ნიშნული ბიბლი�თეკისთვის &apos;%1&apos;.
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1035"/>
+        <location filename="mainwindow.cpp" line="1064"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation>ფ�ილი ვერ ვიპ�ვე: &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1058"/>
+        <location filename="mainwindow.cpp" line="1087"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation>დ�მ�ტების (%1) ჩ�ტვირთვ�/მ�რგებ� ჩ�ვ�რდ�: %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1120"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
@@ -1155,8 +1299,8 @@ Analysis is aborted.</source>
 �ნ�ლიზი შეწყდ�.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>%1
 
 Analysis is aborted.</source>
@@ -1165,148 +1309,141 @@ Analysis is aborted.</source>
 �ნ�ლიზი შეწყვეტილი�.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1700"/>
         <source>License</source>
         <translation>ლიცენზი�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1654"/>
+        <location filename="mainwindow.cpp" line="1707"/>
         <source>Authors</source>
         <translation>�ვტ�რები</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1674"/>
+        <location filename="mainwindow.cpp" line="1727"/>
         <source>Save the report file</source>
         <translation>�ნგ�რიშის ფ�ილში ჩ�წერ�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1482"/>
-        <location filename="mainwindow.cpp" line="1681"/>
+        <location filename="mainwindow.cpp" line="1539"/>
+        <location filename="mainwindow.cpp" line="1734"/>
         <source>XML files (*.xml)</source>
         <translation>XML ფ�ილები (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="458"/>
+        <location filename="mainwindow.cpp" line="477"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="753"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>�ხ�ლი ფ�ილების �ნ ს�ქ�ღ�ლდეების �რჩევ�მდე პრ�რექტის ფ�ილი უნდ� დ�ხურ�თ!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1015"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>ბიბლი�თეკ� &apos;%1&apos; უცნ�ბ ელემენტებს შეიც�ვს:
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1007"/>
+        <location filename="mainwindow.cpp" line="1039"/>
         <source>Duplicate platform type</source>
         <translation>გ�მე�რებული პლ�ტფ�რმის ტიპი</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1010"/>
+        <location filename="mainwindow.cpp" line="1042"/>
         <source>Platform type redefined</source>
         <translation>პლ�ტფ�რმის ტიპი თ�ვდ�ნ �ღიწერ�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1016"/>
+        <location filename="mainwindow.cpp" line="1048"/>
         <source>Unknown element</source>
         <translation>უცნ�ბი ელემენტი</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1019"/>
-        <source>Unknown issue</source>
-        <translation>უცნ�ბი პრ�ბლემ�</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1080"/>
-        <location filename="mainwindow.cpp" line="1090"/>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1120"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>Error</source>
         <translation>შეცდ�მ�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1484"/>
+        <location filename="mainwindow.cpp" line="1541"/>
         <source>Open the report file</source>
         <translation>�ნგ�რიშის ფ�ილის გ�ხსნ�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1685"/>
+        <location filename="mainwindow.cpp" line="1738"/>
         <source>Text files (*.txt)</source>
         <translation>ტექსტური ფ�ილები (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1689"/>
+        <location filename="mainwindow.cpp" line="1742"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV ფ�ილები (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1819"/>
+        <location filename="mainwindow.cpp" line="1850"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>პრ�ექტის ფ�ილები (*.cppcheck);;ყველ� ფ�ილი(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="1852"/>
         <source>Select Project File</source>
         <translation>�ირჩიეთ პრ�ექტის ფ�ილი</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="239"/>
-        <location filename="mainwindow.cpp" line="1783"/>
-        <location filename="mainwindow.cpp" line="1849"/>
-        <location filename="mainwindow.cpp" line="2047"/>
+        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="1814"/>
+        <location filename="mainwindow.cpp" line="1880"/>
+        <location filename="mainwindow.cpp" line="2062"/>
         <source>Project:</source>
         <translation>პრ�ექტი:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="668"/>
+        <location filename="mainwindow.cpp" line="702"/>
         <source>No suitable files found to analyze!</source>
         <translation>�ნ�ლიზის�თვის შეს�ფერისი ფ�ილები �ღმ�ჩენილი �რ��!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="767"/>
+        <location filename="mainwindow.cpp" line="798"/>
         <source>C/C++ Source</source>
         <translation>C/C++ ს�წყისი კ�დი</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="768"/>
+        <location filename="mainwindow.cpp" line="799"/>
         <source>Compile database</source>
         <translation>მ�ნ�ცემთ� ბ�ზის კ�მპილ�ცი�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="773"/>
+        <location filename="mainwindow.cpp" line="804"/>
         <source>Select files to analyze</source>
         <translation>�ირჩეთ ფ�ილები �ნ�ლიზისთვის</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="819"/>
         <source>Select directory to analyze</source>
         <translation>�ირჩიეთ ს�ქ�ღ�ლდე �ნ�ლიზისთვის</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>�ირჩიეთ კ�ნფიგურ�ცი� �ნ�ლიზისთვის</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="880"/>
+        <location filename="mainwindow.cpp" line="912"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1315,7 +1452,7 @@ Do you want to proceed analysis without using any of these project files?</sourc
 გნებ�ვთ, გ��გრძელ�თ �ნ�ლიზი �მ პრ�ექტის ფ�ილების გ�მ�ყენების გ�რეშე?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1467"/>
+        <location filename="mainwindow.cpp" line="1524"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1326,7 +1463,7 @@ Do you want to proceed?</source>
 გნებ�ვთ, გ��გრძელ�თ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1591"/>
+        <location filename="mainwindow.cpp" line="1644"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1335,47 +1472,46 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 გნებ�ვთ, გ��ჩერ�თ �ნ�ლიზი დ� გ�ხვიდეთ Cppcheck-დ�ნ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1633"/>
+        <location filename="mainwindow.cpp" line="1686"/>
         <source>About</source>
         <translation>შეს�ხებ</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1672"/>
+        <location filename="mainwindow.cpp" line="1725"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML ფ�ილები (*.xml);;ტექსტური ფ�ილები (*.txt);;CSV ფ�ილები (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1712"/>
         <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation>შეს�ბ�მის�ბის �ნგ�რიშის გენერ�ცი� �ხლ� შეუძლებელი�, რ�დგ�ნ ჯერ �ნ�ლიზი წ�რმ�ტებით უნდ� დ�სრულდეს. სც�დეთ, კ�დის �ნ�ლიზი თ�ვიდ�ნ გ�უშვ�თ დ� დ�რწმუნდეთ, რ�მ კრიტიკული შეცდ�მები �რ �რსებ�ბს.</translation>
+        <translation type="vanished">შეს�ბ�მის�ბის �ნგ�რიშის გენერ�ცი� �ხლ� შეუძლებელი�, რ�დგ�ნ ჯერ �ნ�ლიზი წ�რმ�ტებით უნდ� დ�სრულდეს. სც�დეთ, კ�დის �ნ�ლიზი თ�ვიდ�ნ გ�უშვ�თ დ� დ�რწმუნდეთ, რ�მ კრიტიკული შეცდ�მები �რ �რსებ�ბს.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1937"/>
+        <location filename="mainwindow.cpp" line="1951"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>�გების ს�ქ�ღ�ლდე (%1) �რ �რსებ�ბს. შევქმნ�?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1945"/>
+        <location filename="mainwindow.cpp" line="1959"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation>პრ�ექტის დ�მ�ტებებით შეს�მ�წმებლ�დ �გების ს�ქ�ღ�ლდე გჭირდებ�თ.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1977"/>
+        <location filename="mainwindow.cpp" line="1992"/>
         <source>Failed to open file</source>
         <translation>ფ�ილის გ�ხსნის შეცდ�მ�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1995"/>
         <source>Unknown project file format</source>
         <translation>უცნ�ბი პრ�ექტის ფ�ილის ფ�რმ�ტი</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1983"/>
+        <location filename="mainwindow.cpp" line="1998"/>
         <source>Failed to import project file</source>
         <translation>პრ�ექტის ფ�ილის შემ�ტ�ნ� ჩ�ვ�რდ�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1999"/>
+        <location filename="mainwindow.cpp" line="2014"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
@@ -1384,27 +1520,27 @@ Analysis is stopped.</source>
 �ნ�ლიზი შეწყდ�.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2008"/>
+        <location filename="mainwindow.cpp" line="2023"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation>&apos;%1&apos;-ის (%2) შემ�ტ�ნ� ჩ�ვ�რდ�. �ნ�ლიზი შეწყდ�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2032"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project files (*.cppcheck)</source>
         <translation>პრ�ექტის ფ�ილები (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2034"/>
+        <location filename="mainwindow.cpp" line="2049"/>
         <source>Select Project Filename</source>
         <translation>�ირჩიეთ პრ�ექტის ფ�ილის ს�ხელი</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2080"/>
+        <location filename="mainwindow.cpp" line="2095"/>
         <source>No project file loaded</source>
         <translation>პრ�ექტის ფ�ილი ჩ�ტვირთული �რ��</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2148"/>
+        <location filename="mainwindow.cpp" line="2177"/>
         <source>The project file
 
 %1
@@ -1421,67 +1557,67 @@ Do you want to remove the file from the recently used projects -list?</source>
 გნებ�ვთ წ�შ�ლ�თ ეს ფ�ილი �ხლ�ხ�ნ გ�მ�ყენებული პრ�ექტების სიიდ�ნ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2310"/>
+        <location filename="mainwindow.cpp" line="2339"/>
         <source>Install</source>
         <translation>დ�ყენებ�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2314"/>
+        <location filename="mainwindow.cpp" line="2343"/>
         <source>New version available: %1. %2</source>
         <translation>ხელმის�წვდ�მი� �ხ�ლი ვერსი�: %1. %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2352"/>
+        <location filename="mainwindow.cpp" line="2381"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2353"/>
+        <location filename="mainwindow.cpp" line="2382"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2354"/>
+        <location filename="mainwindow.cpp" line="2383"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2355"/>
+        <location filename="mainwindow.cpp" line="2384"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2372"/>
+        <location filename="mainwindow.cpp" line="2401"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2373"/>
+        <location filename="mainwindow.cpp" line="2402"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2374"/>
+        <location filename="mainwindow.cpp" line="2403"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2381"/>
+        <location filename="mainwindow.cpp" line="2410"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2382"/>
+        <location filename="mainwindow.cpp" line="2411"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2383"/>
+        <location filename="mainwindow.cpp" line="2412"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2384"/>
+        <location filename="mainwindow.cpp" line="2413"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1538,26 +1674,31 @@ Options:
     <name>NewSuppressionDialog</name>
     <message>
         <location filename="newsuppressiondialog.ui" line="17"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="114"/>
         <source>New suppression</source>
         <translation>�ხ�ლი ჩ�ხშ�ბ�</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="25"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="115"/>
         <source>Error ID</source>
         <translation>შეცდ�მის ID</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="32"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="116"/>
         <source>File name</source>
         <translation>ფ�ილის ს�ხელი</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="42"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="117"/>
         <source>Line number</source>
         <translation>ხ�ზის ნ�მერი</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="52"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="118"/>
         <source>Symbol name</source>
         <translation>სიმბ�ლ�ს ს�ხელი</translation>
     </message>
@@ -1575,414 +1716,506 @@ Options:
         <translation>ს�კუთ�რი</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit ANSI</translation>
+        <translation type="vanished">Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit Unicode</translation>
+        <translation type="vanished">Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
 </context>
 <context>
     <name>ProjectFile</name>
     <message>
         <location filename="projectfile.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="923"/>
         <source>Project File</source>
         <translation>პრ�ექტის ფ�ილი</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="955"/>
         <source>Paths and Defines</source>
         <translation>ბილიკები დ� �ღწერები</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="30"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="924"/>
         <source>Import Project (Visual studio / compile database/ Borland C++ Builder 6)</source>
         <oldsource>Import Project (Visual studio / compile database)</oldsource>
         <translation>პრ�ექტის შემ�ტ�ნ� (Visual studio / მ�ნ�ცემთ� ბ�ზი კ�მპილ�ცი� / Borland C++ Builder 6)</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="231"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="938"/>
         <source>Defines must be separated by a semicolon. Example: DEF1;DEF2=5;DEF3=int</source>
         <oldsource>Defines must be separated by a semicolon &apos;;&apos;</oldsource>
         <translation>�ღწერები წერტილმძიმით უნდ� იყ�ს გ�მ�ყ�ფილი. მ�გ: DEF1;DEF2=5;DEF3=int</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="958"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation>შენიშვნ�: ჩ�დეთ თქვენი .cfg ფ�ილები იგივე ს�ქ�ღ�ლდეში, ს�დ�ც პრ�ექტის ფ�ილი�. მ�თ ზემ�თ დ�ინ�ხ�ვთ.</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="967"/>
         <source>Clang (experimental)</source>
         <translation>Clang (ექსპერიმენტული)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="974"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="978"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation>თ�ვს�რთის ფ�ილებში �რსებული კ�დის შეწმებ�  (ნ�გულისხმევ�დ, ეს ჩ�რთული�. თუ გნებ�ვთ შეზღუდული სწრ�ფი �ნ�ლიზი, მ�შინ გ�მ�რთეთ ეს)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="981"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="985"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation>ფ�ილის ბილიკები �მ ბილიკის ფ�რდ�ბითი იქნებ�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="989"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation>თუ ჭდეები დ�მ�ტებული�, შეგიძლი�თ, გ�ფრთხილებებზე მ�რჯვენ� ღილ�კით დ��წკ�პუნ�თ დ� დ��ყენ�თ ერთ-ერთი ჭდე. გ�ფრთხილებების კ�ტეგ�რიებ�დ დ�ლ�გებ� ხელით შეგიძლი�თ.</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="991"/>
         <source>Exclude source files</source>
         <translation>კ�დის ფ�ილების �მ�ღებ�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="992"/>
         <source>Exclude folder...</source>
         <translation>ს�ქ�ღ�ლდის �მ�ღებ�...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="993"/>
         <source>Exclude file...</source>
         <translation>ფ�ილის �მ�ღებ�...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="876"/>
+        <location filename="projectfile.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1011"/>
         <source>MISRA rule texts</source>
         <translation>MISRA-ის წესის ტექსტები</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="883"/>
+        <location filename="projectfile.ui" line="892"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1013"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="890"/>
+        <location filename="projectfile.ui" line="899"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1015"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="73"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="928"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You have a choice:&lt;/p&gt;&lt;p&gt; * Analyze all Debug and Release configurations&lt;/p&gt;&lt;p&gt; * Only analyze the first matching Debug configuration&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="926"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="964"/>
         <source>Browse...</source>
         <translation>ნუსხ�...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="930"/>
         <source>Analyze all Visual Studio configurations</source>
         <translation>ყველ� Visual Studio-ის კ�ნფიგურ�ციის �ნ�ლიზი</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="113"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="931"/>
         <source>Selected VS Configurations</source>
         <translation>�რჩეული VS-ის კ�ნფიგურ�ციები</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="147"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="932"/>
         <source>Paths:</source>
         <translation>ბილიკები:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="181"/>
         <location filename="projectfile.ui" line="296"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="933"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="945"/>
         <source>Add...</source>
         <translation>დ�მ�ტებ�...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="934"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="994"/>
         <source>Edit</source>
         <translation>ჩ�სწ�რებ�</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="935"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="995"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="998"/>
         <source>Remove</source>
         <translation>წ�შლ�</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="242"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="940"/>
         <source>Undefines:</source>
         <translation>წ�შლილი მ�კრ��ღწერები:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="252"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="942"/>
         <source>Undefines must be separated by a semicolon. Example: UNDEF1;UNDEF2;UNDEF3</source>
         <translation>წ�შლილი მ�კრ��ღწერები წერტილმძიმით უნდ� იყ�ს გ�მ�ყ�ფილი. მ�გ: UNDEF1;UNDEF2;UNDEF3</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="265"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="944"/>
         <source>Include Paths:</source>
         <translation>ჩ�სმის ბილიკები:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="950"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="952"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="954"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="959"/>
         <source>Types and Functions</source>
         <translation>ტიპები დ� ფუნქციები</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="972"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="982"/>
         <source>Analysis</source>
         <translation>�ნ�ლიზი</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="962"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation>ეს ს�მუშ�� ს�ქ�ღ�ლდე�, რ�მელს�ც Cppcheck სხვ�დ�სხვ� მიზნებისთვის გ�მ�იყენებს.</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="965"/>
         <source>Parser</source>
         <translation>�ნ�ლიზ�ტ�რი</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="966"/>
         <source>Cppcheck (built in)</source>
         <translation>Cppcheck (ჩ�შენებული)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="968"/>
         <source>Check level</source>
         <translation>შემ�წმების დ�ნე</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="969"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="970"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation>ნ�რმ�ლური -- ნიშნ�ვს ნ�რმ�ლურ �ნ�ლიზს CI-ში. �ნ�ლიზი მის�ღებ დრ�ში დ�სრულდებ�.</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="971"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation>�მ�მწურ�ვი -- გ�ნკუთვნილი� ღ�მის �გებებისთვის დ� �.შ. �ნ�ლიზის დრ�, შეიძლებ�, უფრ� მეტიც იყ�ს (კ�მპილ�ცი�ზე 10x მეტი დრ� ჩვეულებრივი �მბ�ვი�).</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="976"/>
         <source>Check that each class has a safe public interface</source>
         <translation>შემ�წმებ�, �ქვს თუ �რ� ყველ� კლ�სს უს�ფრთხ� ს�ჯ�რ� ინტერფეისი</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="977"/>
         <source>Limit analysis</source>
         <translation>�ნ�ლიზის შეზღუდვ�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="979"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="980"/>
         <source>Max CTU depth</source>
         <translation>CTU-ის მ�ქსიმ�ლური სიღრმე</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="999"/>
         <source>Enable inline suppressions</source>
         <translation>შეცდ�მების ხ�ზშივე ჩ�ხშ�ბის ჩ�რთვ�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="851"/>
+        <location filename="projectfile.ui" line="860"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1009"/>
         <source>2025</source>
         <translation type="unfinished">2025</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="901"/>
+        <location filename="projectfile.ui" line="910"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1016"/>
         <source>Misra C++</source>
         <translation>Misra C++</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="918"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1017"/>
         <source>2008</source>
         <translation>2008</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="937"/>
+        <location filename="projectfile.ui" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1020"/>
         <source>Cert C</source>
         <translation>Cert C</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="946"/>
+        <location filename="projectfile.ui" line="955"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1021"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation>CERT-INT35-C:  მთელი რიცხვის სიზუსტე (თუ ზ�მ� სიზუსტეს ემთხვევ�, შეგიძლი�თ, ც�რიელი დ�ტ�ვ�თ)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="965"/>
+        <location filename="projectfile.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1023"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="981"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1024"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1026"/>
         <source>Bug hunting</source>
         <translation>შეცდ�მებზე ნ�დირ�ბ�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="991"/>
+        <location filename="projectfile.ui" line="1007"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1027"/>
         <source>External tools</source>
         <translation>გ�რე ხელს�წყ�ები</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="330"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="948"/>
         <source>Up</source>
         <translation>მ�ღლ�</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="337"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="949"/>
         <source>Down</source>
         <translation>ქვემ�თ</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="956"/>
         <source>Platform</source>
         <translation>პლ�ტფ�რმ�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1000"/>
         <source>Warning options</source>
         <translation>გ�ფრთხილების მ�რგებ�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="983"/>
         <source>Root path:</source>
         <translation>Root ბილიკი:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="987"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>გ�ფრთხილების ჭდეები (წერტილმძიმით გ�მ�ყ�ფილი)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="960"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation>Cppcheck-ის �გების ს�ქ�ღ�ლდე (მთელი პრ�გრ�მის �ნ�ლიზი, ინკრემენტული �ნ�ლიზი, სტ�ტისტიკ� დ� �.შ.)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="957"/>
         <source>Libraries</source>
         <translation>ბიბლი�თეკები</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="996"/>
         <source>Suppressions</source>
         <translation>ჩ�ხშ�ბები</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="997"/>
         <source>Add</source>
         <translation>დ�მ�ტებ�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1001"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1028"/>
         <source>Addons</source>
         <translation>დ�მ�ტებები</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1002"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation>შენიშვნ�: დ�მ�ტებ�ს დ�ყენებული &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; სჭირდებ�.</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1003"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1004"/>
         <source>Thread safety</source>
         <translation>ნ�კ�დების უს�ფრთხ�ებ�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1005"/>
         <source>Coding standards</source>
         <translation>კ�დირების სტ�ნდ�რტები</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1006"/>
         <source>Misra C</source>
         <translation>Misra C</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1007"/>
         <source>2012</source>
         <translation>2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="914"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1008"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1018"/>
         <source>2023</source>
         <translation>2023</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="958"/>
+        <location filename="projectfile.ui" line="967"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1022"/>
         <source>Cert C++</source>
         <translation>Cert C++</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="975"/>
+        <location filename="projectfile.ui" line="991"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1025"/>
         <source>Bug hunting (Premium)</source>
         <translation>შეცდ�მებზე ნ�დირ�ბ� (ფ�სი�ნი)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
-        <translation>Clang-ის �ნ�ლიზ�ტ�რი</translation>
+        <translation type="vanished">Clang-ის �ნ�ლიზ�ტ�რი</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
-        <translation>Clang-tidy</translation>
+        <translation type="vanished">Clang-tidy</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="936"/>
         <source>Defines:</source>
         <translation>მ�კრ��ღწრები:</translation>
     </message>
@@ -1995,77 +2228,86 @@ Options:
         <translation>პრ�ექტის ფ�ილი: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="604"/>
+        <location filename="projectfiledialog.cpp" line="585"/>
         <source>Select Cppcheck build dir</source>
         <translation>�ირჩიეთ Cppcheck-ის �გების ს�ქ�ღ�ლდე</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="865"/>
+        <location filename="projectfiledialog.cpp" line="861"/>
         <source>Select include directory</source>
         <translation>�ირჩიეთ ჩ�ს�სმელი ს�ქ�ღ�ლდე</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="845"/>
+        <location filename="projectfiledialog.cpp" line="841"/>
         <source>Select a directory to check</source>
         <translation>�ირჩიეთ შეს�მ�წმებელი ს�ქ�ღ�ლდე</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="414"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="477"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (ვერ ვიპ�ვე)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="644"/>
+        <location filename="projectfiledialog.cpp" line="625"/>
         <source>Compile database</source>
         <translation>მ�ნ�ცემთ� ბ�ზის კ�მპილ�ცი�</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="646"/>
+        <location filename="projectfiledialog.cpp" line="627"/>
         <source>Import Project</source>
         <translation>პრ�ექტის შემ�ტ�ნ�</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="885"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
+        <source>C/C++ header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="648"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="881"/>
         <source>Select directory to ignore</source>
         <translation>�ირჩიეთ გ�მ�ს�ტ�ვებელი ს�ქ�ღ�ლდე</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="893"/>
+        <location filename="projectfiledialog.cpp" line="889"/>
         <source>Source files</source>
         <translation>კ�დის ფ�ილები</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="894"/>
+        <location filename="projectfiledialog.cpp" line="647"/>
+        <location filename="projectfiledialog.cpp" line="890"/>
         <source>All files</source>
         <translation>ყველ� ფ�ილი</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="895"/>
+        <location filename="projectfiledialog.cpp" line="891"/>
         <source>Exclude file</source>
         <translation>ფ�ილის �მ�ღებ�</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="978"/>
+        <location filename="projectfiledialog.cpp" line="976"/>
         <source>Select MISRA rule texts file</source>
         <translation>�ირჩიეთ MISRA-ის წესების ტექსტის ფ�ილი</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="980"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>MISRA rule texts file (%1)</source>
         <translation>MISRA-ის წესის ტექსტების ფ�ილი (%1)</translation>
     </message>
@@ -2100,7 +2342,7 @@ Options:
         <translation>ხ�ზი %1: �უცილებელი �ტრიბუტი &apos;%2&apos; &apos;%3&apos;-ში �ღმ�ჩენილი �რ��</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="302"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation> (ვერ ვიპ�ვე)</translation>
     </message>
@@ -2150,161 +2392,156 @@ Options:
         <translation>შ�ვი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation>რედ�ქტ�რის წინ� პლ�ნის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation>რედ�ქტ�რის ფ�ნის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation>ფ�ნის ფერის გ��კვეთ�</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation>ხ�ზის ნ�მრის წინ� პლ�ნის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation>ხ�ზის ნ�მრის ფ�ნის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation>ს�კვ�ნძ� სიტყვის წინ� პლ�ნის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation>ს�კვ�ნძ� სიტყვის ფ�ნტის სიმძიმე</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation>კლ�სის წინ� პლ�ნის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation>კლ�სის ფ�ნტის სიმძიმე</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation>ციტ�ტის წინ� პლ�ნის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation>ციტ�ტის ფ�ნტის სიმძიმე</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation>კ�მენტ�რის წინ� პლ�ნს ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation>კ�მენტ�რის ფ�ნტის სიმძიმე</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation>სიმბ�ლ�ს წინ� პლ�ნის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation>სიმბ�ლ�ს ფ�ნის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation>სიმბ�ლ�ს ფ�ნტის სიმძიმე</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="142"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation>ნ�გულისხმევ�დ ღი�ს დ�ყენებ�</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="144"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation>ნ�გულისხმევ�დ მუქის დ�ყენებ�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="114"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">ფ�ილი</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="115"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">ხ�ზი</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="116"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">სიმძიმე</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="117"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="118"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="119"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished">�რ�დ�მ�ჯერებელი</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="120"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">შეჯ�მებ�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="121"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="122"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="123"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="124"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished">თ�რიღიდ�ნ</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="125"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="126"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
@@ -2352,37 +2589,37 @@ Options:
         <translation type="vanished">გ�ურკვეველი ფ�ილი</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="657"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation>კ�პირებ�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="825"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation>ვერ ვიპ�ვე ფ�ილი:</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="829"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation>�ირჩიეთ ს�ქ�ღ�ლდე &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="830"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>�ირჩიეთ ს�ქ�ღ�ლდე &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="832"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation>�ირჩიეთ ს�ქ�ღ�ლდე, ს�დ�ც ფ�ილი� მ�თ�ვსებული.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="367"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>შეცდ�მების მ�ძებნ�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="298"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation>ნ�ტ�</translation>
     </message>
@@ -2395,53 +2632,51 @@ Options:
         <translation type="vanished">დ�მ�ლვ�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="659"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation>დ�მ�ლვ� ყველ�სი id-ით</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="681"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation>მ�ნიშნული id(ებ)-ის ჩ�ხშ�ბ�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="660"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation>შემცველი ს�ქ�ღ�ლდის გ�ხსნ�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="370"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation>შიდ�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="656"/>
+        <location filename="resultstree.cpp" line="667"/>
         <source>Recheck %1 file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="658"/>
+        <location filename="resultstree.cpp" line="669"/>
         <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="701"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation>ი�რლიყი</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="703"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation>ჭდის გ�რეშე</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="733"/>
-        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="734"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2451,7 +2686,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 მიუთითეთ რედ�ქტ�რის �პლიკ�ცი� Cppcheck-სთვის მენიუში მ�რგებ�/�პლიკ�ციები.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="748"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2460,12 +2695,12 @@ Please select the default editor application in preferences/Applications.</sourc
 �ირჩიეთ ნ�გულისხმევი რედ�ქტ�რის �პლიკ�ცი� მენიუში მ�რგებ�/�პლიკ�ციები.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="768"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>ფ�ილი ვერ ვიპ�ვე!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="811"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2474,7 +2709,7 @@ Please check the application path and parameters are correct.</source>
 შე�მ�წმეთ, სწ�რი�, თუ �რ� �პლიკ�ციის ბილიკი დ� მისი პ�რ�მეტრები.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="833"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>�ირჩიეთ ს�ქ�ღ�ლდე</translation>
     </message>
@@ -2491,32 +2726,32 @@ Please check the application path and parameters are correct.</source>
         <translation type="vanished">თ�რიღიდ�ნ</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="349"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>სტილი</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="352"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>შეცდ�მ�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="355"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>გ�ფრთხილებ�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="358"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>წ�რმ�დ�ბ�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="361"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>გ�დ�ტ�ნ�დ�ბ�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="364"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>ინფ�რმ�ცი�</translation>
     </message>
@@ -2524,56 +2759,54 @@ Please check the application path and parameters are correct.</source>
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="255"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>�ნგ�რიშის დ�ბეჭდვ�</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="274"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation>შეცდ�მები ვერ ვიპ�ვე. დ�ს�ბეჭდი �რ�ფერი�.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="326"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (შემ�წმებული� %1 ფ�ილი %2-დ�ნ)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="350"/>
-        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="351"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>შეცდ�მების გ�რეშე.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="358"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>�ღმ�ჩენილი� შეცდ�მები, მ�გრ�მ მითითებული�, რ�მ ისინი დ�იმ�ლ�ს.
 იმის�თვის, რ�მ გ�დ�რთ�თ, რ� ს�ხის შეცდ�მები� ნ�ჩვენები, გ�ხსენით მენიუ &apos;ხედი&apos;.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>�ნგ�რიშის წ�კითხვ� ჩ�ვ�რდ�.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>XML-ის ფ�რმ�ტის პირველი ვერსი� მხ�რდ�ჭერილი �ღ�რ��.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="460"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation>პირველ�დ ჩ�სმული� ფ�ილში</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="465"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
@@ -2582,68 +2815,72 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation type="vanished">შეცდ�მებზე ნ�დირ�ბის �ნ�ლიზი დ�უსრულებელი�</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="539"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Clear Log</source>
         <translation>ჟურნ�ლის გ�სუფთ�ვებ�</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="540"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy this Log entry</source>
         <translation>�მ ჟურნ�ლის ჩ�ნ�წერის კ�პირებ�</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="541"/>
+        <location filename="resultsview.cpp" line="538"/>
         <source>Copy complete Log</source>
         <translation>სრული ჟურნ�ლის კ�პირებ�</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="549"/>
+        <location filename="resultsview.cpp" line="545"/>
         <source>Analysis was stopped</source>
         <translation>�ნ�ლიზი გ�უქმებული�</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="563"/>
+        <location filename="resultsview.cpp" line="559"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation>�ღმ�ჩენილი� კრიტიკული შეცდ�მ� id-ით &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="565"/>
+        <location filename="resultsview.cpp" line="561"/>
         <source>when checking %1</source>
         <translation>%1-ის შემ�წმების�ს</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="567"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>when checking a file</source>
         <translation>ფ�ილის შემ�წმების�ს</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="568"/>
+        <location filename="resultsview.cpp" line="564"/>
         <source>Analysis was aborted.</source>
         <translation>�ნ�ლიზი შეწყვეტილი�.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="237"/>
-        <location filename="resultsview.cpp" line="245"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>�ნგ�რიშის შენ�ხვ� ჩ�ვ�რდ�.</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="26"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="147"/>
         <source>Results</source>
         <translation>შედეგები</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="60"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="148"/>
         <source>Critical errors</source>
         <translation>კრიტიკული შეცდ�მები</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="149"/>
         <source>Analysis Log</source>
         <translation>�ნ�ლიზის ჟურნ�ლი</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="114"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="150"/>
         <source>Warning Details</source>
         <translation>გ�ფრთხილების დეტ�ლები</translation>
     </message>
@@ -2652,26 +2889,31 @@ To toggle what kind of errors are shown, open view menu.</source>
     <name>ScratchPad</name>
     <message>
         <location filename="scratchpad.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="107"/>
         <source>Scratchpad</source>
         <translation>მ�ნ�ხ�ზი</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="108"/>
         <source>Copy or write some C/C++ code here:</source>
         <translation>დ��კ�პირეთ �ნ დ�წერეთ C/C++ კ�დი �ქ:</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="37"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="109"/>
         <source>Optionally enter a filename (mainly for automatic language detection) and click on &quot;Check&quot;:</source>
         <translation>შეიყვ�ნეთ �რ�ს�ვ�ლდებულ� ფ�ილის ს�ხელი (ძირით�დ�დ �ვტ�მ�ტური ენის დ�დგენისთვის) დ� დ��წკ�პუნეთ ღილ�კზე &quot;შემ�წმებ�&quot;:</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="110"/>
         <source>filename</source>
         <translation>ფ�ილის ს�ხელი</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="78"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="111"/>
         <source>Check</source>
         <translation>შემ�წმებ�</translation>
     </message>
@@ -2680,21 +2922,25 @@ To toggle what kind of errors are shown, open view menu.</source>
     <name>Settings</name>
     <message>
         <location filename="settings.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="490"/>
         <source>Preferences</source>
         <translation>მ�რგებ�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="502"/>
         <source>General</source>
         <translation>ზ�გ�დი</translation>
     </message>
     <message>
         <location filename="settings.ui" line="196"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="503"/>
         <source>Add...</source>
         <translation>დ�მ�ტებ�...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="491"/>
         <source>Number of threads: </source>
         <translation>ნ�კ�დების რ��დენ�ბ�: </translation>
     </message>
@@ -2704,57 +2950,68 @@ To toggle what kind of errors are shown, open view menu.</source>
     </message>
     <message>
         <location filename="settings.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="493"/>
         <source>Force checking all #ifdef configurations</source>
         <oldsource>Check all #ifdef configurations</oldsource>
         <translation>ყველ� #ifdef კ�ნფიგურ�ციის ნ�ძ�ლ�დევი შემ�წმებ�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="494"/>
         <source>Show full path of files</source>
         <translation>ფ�ილების სრული ბილიკის ჩვენებ�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="122"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="495"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>&quot;შეცდ�მები ნ�პ�ვნი �რ��&quot; შეტყ�ბინების ჩვენებ�, რ�ც� შეცდ�მები �ღმ�ჩენილი �რ�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="129"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="496"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>სვეტში &quot;Id&quot; შეცდ�მის Id-ის ჩვენებ�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="136"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="497"/>
         <source>Enable inline suppressions</source>
         <translation>შეცდ�მების ხ�ზშივე ჩ�ხშ�ბის ჩ�რთვ�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="143"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="498"/>
         <source>Check for inconclusive errors also</source>
         <translation>�სევე, ნ�ჩვენები იქნებ� ს�კ�მ�თ� შეცდ�მებიც</translation>
     </message>
     <message>
         <location filename="settings.ui" line="150"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="499"/>
         <source>Show statistics on check completion</source>
         <translation>სტ�ტისტიკის ჩვენებ� შემ�წმების დ�სრულების�ს</translation>
     </message>
     <message>
         <location filename="settings.ui" line="157"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="500"/>
         <source>Check for updates</source>
         <translation>გ�ნ�ხლებების შემ�წმებ�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="177"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="501"/>
         <source>Show internal warnings in log</source>
         <translation>ჟურნ�ლში შიდ� გ�ფრთხილებების ჩვენებ�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="521"/>
         <source>Addons</source>
         <translation>დ�მ�ტებები</translation>
     </message>
     <message>
         <location filename="settings.ui" line="294"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="512"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation>ბილიკი python-ის ინტერპრეტ�ტ�რ�მდე. (PATH-ში �რსებული python-ის გ�მ�ს�ყენებლ�დ ც�რიელი დ�ტ�ვეთ)</translation>
     </message>
@@ -2762,117 +3019,143 @@ To toggle what kind of errors are shown, open view menu.</source>
         <location filename="settings.ui" line="305"/>
         <location filename="settings.ui" line="346"/>
         <location filename="settings.ui" line="391"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="513"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="523"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="324"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="515"/>
         <source>MISRA addon</source>
         <translation>MISRA-ის დ�მ�ტებ�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="332"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="516"/>
         <source>MISRA rule texts file</source>
         <translation>MISRA-ის წესის ტექსტების ფ�ილი</translation>
     </message>
     <message>
         <location filename="settings.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="518"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="526"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
         <location filename="settings.ui" line="378"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="522"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation>ბილიკი Clang-ის ინტერპრეტ�ტ�რ�მდე. (PATH-ში �რსებულის გ�მ�ს�ყენებლ�დ ც�რიელი დ�ტ�ვეთ)</translation>
     </message>
     <message>
         <location filename="settings.ui" line="401"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="524"/>
         <source>Visual Studio headers</source>
         <translation>Visual Studio-ის თ�ვს�რთები</translation>
     </message>
     <message>
         <location filename="settings.ui" line="407"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="525"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="533"/>
         <source>Code Editor</source>
         <translation>კ�დის რედ�ქტ�რი</translation>
     </message>
     <message>
         <location filename="settings.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="527"/>
         <source>Code Editor Style</source>
         <translation>კ�დის რედ�ქტ�რის სტილი</translation>
     </message>
     <message>
         <location filename="settings.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="528"/>
         <source>System Style</source>
         <translation>სისტემის მიყ�ლ�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="456"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="529"/>
         <source>Default Light Style</source>
         <translation>ნ�გულისხმევი ღი� სტილი</translation>
     </message>
     <message>
         <location filename="settings.ui" line="463"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="530"/>
         <source>Default Dark Style</source>
         <translation>ნ�გულისხმევი მუქი სტილი</translation>
     </message>
     <message>
         <location filename="settings.ui" line="472"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="531"/>
         <source>Custom</source>
         <translation>მ�მხმ�რებლის</translation>
     </message>
     <message>
         <location filename="settings.ui" line="210"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="505"/>
         <source>Remove</source>
         <translation>წ�შლ�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="79"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="492"/>
         <source>Max count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="185"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="507"/>
         <source>Applications</source>
         <translation>�პლიკ�ციები</translation>
     </message>
     <message>
         <location filename="settings.ui" line="203"/>
         <location filename="settings.ui" line="479"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="532"/>
         <source>Edit...</source>
         <translation>რედ�ქტირებ�...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="506"/>
         <source>Set as default</source>
         <translation>ნ�გულისხმებ�დ დ�ყენებ�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="240"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="510"/>
         <source>Reports</source>
         <translation>�ნგ�რიში</translation>
     </message>
     <message>
         <location filename="settings.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="508"/>
         <source>Save all errors when creating report</source>
         <translation>ყველ� შეცდ�მის შენ�ხვ� �ნგ�რიშის შექმნის�ს</translation>
     </message>
     <message>
         <location filename="settings.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="509"/>
         <source>Save full path to files in reports</source>
         <translation>ფ�ილების სრული ბილიკის ჩვენებ� �ნგ�რიშებში</translation>
     </message>
     <message>
         <location filename="settings.ui" line="274"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="511"/>
         <source>Language</source>
         <translation>ენ�</translation>
     </message>
@@ -2929,221 +3212,245 @@ To toggle what kind of errors are shown, open view menu.</source>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="395"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="415"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>სტ�ტისტიკ�</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="401"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>პრ�ექტი</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="33"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="396"/>
         <source>Project:</source>
         <translation>პრ�ექტი:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="53"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="397"/>
         <source>Paths:</source>
         <translation>ბილიკები:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="85"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="398"/>
         <source>Include paths:</source>
         <translation>თ�ვს�რთის ფ�ილის ბილიკები:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="399"/>
         <source>Defines:</source>
         <translation>მ�კრ��ღწრები:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="400"/>
         <source>Undefines:</source>
         <translation>წ�შლილი მ�კრ��ღწერები:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="407"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>წინ� სკ�ნირებ�</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="171"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="402"/>
         <source>Path Selected:</source>
         <translation>�რჩეული ბილიკი:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="181"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="403"/>
         <source>Number of Files Scanned:</source>
         <translation>დ�სკ�ნერებული� ფ�ილების რ��დენ�ბ�:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="201"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="405"/>
         <source>Scan Duration:</source>
         <translation>სკ�ნირების ხ�ნგრძლივ�ბ�:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="254"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="408"/>
         <source>Errors:</source>
         <translation>შეცდ�მები:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="271"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="409"/>
         <source>Warnings:</source>
         <translation>გ�ფრთხილებები:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="410"/>
         <source>Stylistic warnings:</source>
         <translation>სტილისტური გ�ფრთხილებები:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="305"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="411"/>
         <source>Portability warnings:</source>
         <translation>გ�დ�ტ�ნ�დ�ბის გ�ფრთხილებები:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="322"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="412"/>
         <source>Performance issues:</source>
         <translation>წ�რმ�დ�ბის პრ�ბლემები:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="413"/>
         <source>Information messages:</source>
         <translation>ინფ�რმ�ციის შეტყ�ბინებები:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="356"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="414"/>
         <source>Active checkers:</source>
         <translation>�ქტიური შემმ�წმებლები:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="374"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="416"/>
         <source>Checkers</source>
         <translation>შ�ში</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="418"/>
         <source>History</source>
         <translation>ისტ�რი�</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="405"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="417"/>
         <source>File:</source>
         <translation>ფ�ილი:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="419"/>
         <source>Copy to Clipboard</source>
         <translation>ბუფერში კ�პირებ�</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="420"/>
         <source>Pdf Export</source>
         <translation>PDF-�დ გ�ტ�ნ�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 დღე</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 დღე</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>%1 ს��თი</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 ს��თი</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>%1 წუთი</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 წთ</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 წ�მი</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 წ�მი</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 წ�მი</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="171"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> დ� </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="198"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation>PDF-ში გ�ტ�ნ�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>პრ�ექტის პ�რ�მეტრები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>ბილიკები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>ჩ�სმის ბილიკები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>�ღწერები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation>წ�შლილი მ�კრ��ღწერები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>�რჩეული ბილიკი</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>დ�სკ�ნერებული� ფ�ილების რ��დენ�ბ�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>სკ�ნირების ხ�ნგრძლივ�ბ�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>შედ�მები</translation>
     </message>
@@ -3158,40 +3465,49 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>Cppcheck-ის �გების ს�ქ�ღ�ლდის გ�რეშე</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>გ�ფრთხილებები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>სტილის გ�ფრთხილებები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>გ�დ�ტ�ნ�დ�ბის გ�ფრთხილებები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>წ�რმ�დ�ბის გ�ფრთხილებები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>ს�ინფ�რმ�ცი� შეტყ�ბინებები</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_threaddetails.h" line="47"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="46"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>შემ�წმებული� %1 ფ�ილი %2-დ�ნ</translation>
     </message>
@@ -3212,9 +3528,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 მ�მხმ�რებლის ინტერფეისი ინგლისურზე გ�დ�ირთ�. გ�ხსენით მ�რგების დი�ლ�გი, რ�მ ხელმის�წვდ�მი ენებიდ�ნ ს�სურველი �ირჩი�თ.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_ko.ts b/gui/cppcheck_ko.ts
index 972a54bd889..09f564e6380 100644
--- a/gui/cppcheck_ko.ts
+++ b/gui/cppcheck_ko.ts
@@ -5,21 +5,25 @@
     <name>About</name>
     <message>
         <location filename="about.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="130"/>
         <source>About Cppcheck</source>
         <translation>Cppcheck ì •ë³´</translation>
     </message>
     <message>
         <location filename="about.ui" line="64"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="132"/>
         <source>Version %1</source>
         <translation>버전 %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="133"/>
         <source>Cppcheck - A tool for static C/C++ code analysis.</source>
         <translation>Cppcheck - 정� C/C++ 코드 분� �구.</translation>
     </message>
     <message>
         <location filename="about.ui" line="91"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="135"/>
         <source>This program is licensed under the terms
 of the GNU General Public License version 3</source>
         <translation>� 프로그램� GNU General Public License version 3�
@@ -27,17 +31,20 @@ of the GNU General Public License version 3</source>
     </message>
     <message>
         <location filename="about.ui" line="102"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="137"/>
         <source>Visit Cppcheck homepage at %1</source>
         <translation>Cppcheck 홈페�지(%1)를 방문해보세요</translation>
     </message>
     <message>
         <location filename="about.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;pcre&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;picojson&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tinyxml2&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="about.ui" line="81"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="134"/>
         <source>Copyright © 2007-%1 Cppcheck team.</source>
         <oldsource>Copyright © 2007-2021 Cppcheck team.</oldsource>
         <translation type="unfinished"></translation>
@@ -47,11 +54,13 @@ of the GNU General Public License version 3</source>
     <name>ApplicationDialog</name>
     <message>
         <location filename="applicationdialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="161"/>
         <source>Add an application</source>
         <translation>�용 프로그램 추가</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="162"/>
         <source>Here you can add an application that can open error files. Specify a name for the application, the application executable and command line parameters for the application.
 
 The following texts in parameters are replaced with appropriate values when application is executed:
@@ -77,21 +86,25 @@ Kate로 파�� 열고, 해당 행으로 ��하는 예제:
     </message>
     <message>
         <location filename="applicationdialog.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="173"/>
         <source>&amp;Name:</source>
         <translation>�름(&amp;N):</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="86"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="174"/>
         <source>&amp;Executable:</source>
         <translation>실행 파�(&amp;E):</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="96"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="175"/>
         <source>&amp;Parameters:</source>
         <translation>명령행 ��(&amp;P):</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="138"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="176"/>
         <source>Browse</source>
         <translation>찾기</translation>
     </message>
@@ -106,9 +119,8 @@ Kate로 파�� 열고, 해당 행으로 ��하는 예제:
         <translation>뷰어 프로그램 선�</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -116,70 +128,6 @@ Kate로 파�� 열고, 해당 행으로 ��하는 예제:
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -188,10 +136,8 @@ Kate로 파�� 열고, 해당 행으로 ��하는 예제:
         <translation>파� 찾기 실패: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -203,44 +149,49 @@ Kate로 파�� 열고, 해당 행으로 ��하는 예제:
     <name>HelpDialog</name>
     <message>
         <location filename="helpdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="88"/>
         <source>Cppcheck GUI help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="89"/>
         <source>Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="90"/>
         <source>Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
     <name>LibraryAddFunctionDialog</name>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="105"/>
         <source>Add function</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="106"/>
         <source>Function name(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="107"/>
         <source>Number of arguments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -249,124 +200,138 @@ Kate로 파�� 열고, 해당 행으로 ��하는 예제:
     <name>LibraryDialog</name>
     <message>
         <location filename="librarydialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="275"/>
         <source>Library Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="22"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="276"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="29"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="277"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="62"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="279"/>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="111"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="281"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="204"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="284"/>
         <source>noreturn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="212"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="285"/>
         <source>False</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="286"/>
         <source>True</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="222"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="287"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="232"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="289"/>
         <source>return value must be used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="239"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="290"/>
         <source>ignore function in leaks checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="291"/>
         <source>Arguments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="258"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="292"/>
         <source>Edit</source>
         <translation type="unfinished">편집</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="280"/>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="282"/>
         <source>Filter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="164"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="283"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="36"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="278"/>
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -375,11 +340,13 @@ Kate로 파�� 열고, 해당 행으로 ��하는 예제:
     <name>LibraryEditArgDialog</name>
     <message>
         <location filename="libraryeditargdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="284"/>
         <source>Edit argument</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="286"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is bool value allowed? For instance result from comparison or from &apos;!&apos; operator.&lt;/p&gt;
 &lt;p&gt;Typically, set this if the argument is a pointer, size, etc.&lt;/p&gt;
@@ -390,11 +357,13 @@ Kate로 파�� 열고, 해당 행으로 ��하는 예제:
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="28"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="293"/>
         <source>Not bool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="35"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is a null parameter value allowed?&lt;/p&gt;
 &lt;p&gt;Typically this should be used on any pointer parameter that does not allow null.&lt;/p&gt;
@@ -405,78 +374,99 @@ Kate로 파�� 열고, 해당 행으로 ��하는 예제:
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="43"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="302"/>
         <source>Not null</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="50"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="303"/>
         <source>Not uninit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="57"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="304"/>
         <source>String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="70"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="305"/>
         <source>Format string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="306"/>
         <source>Min size of buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="101"/>
         <location filename="libraryeditargdialog.ui" line="203"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="307"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="316"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="109"/>
         <location filename="libraryeditargdialog.ui" line="214"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="308"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="317"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="114"/>
         <location filename="libraryeditargdialog.ui" line="219"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="309"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="318"/>
         <source>argvalue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="119"/>
         <location filename="libraryeditargdialog.ui" line="224"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="319"/>
         <source>mul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="124"/>
         <location filename="libraryeditargdialog.ui" line="229"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="311"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="320"/>
         <source>strlen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="132"/>
         <location filename="libraryeditargdialog.ui" line="237"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="313"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="322"/>
         <source>Arg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="159"/>
         <location filename="libraryeditargdialog.ui" line="264"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="323"/>
         <source>Arg2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="194"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="315"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="324"/>
         <source>Valid values</source>
         <translation type="unfinished"></translation>
     </message>
@@ -484,390 +474,431 @@ Kate로 파�� 열고, 해당 행으로 ��하는 예제:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="687"/>
-        <location filename="mainwindow.cpp" line="463"/>
-        <location filename="mainwindow.cpp" line="667"/>
-        <location filename="mainwindow.cpp" line="752"/>
-        <location filename="mainwindow.cpp" line="857"/>
-        <location filename="mainwindow.cpp" line="879"/>
-        <location filename="mainwindow.cpp" line="1466"/>
-        <location filename="mainwindow.cpp" line="1595"/>
-        <location filename="mainwindow.cpp" line="1936"/>
-        <location filename="mainwindow.cpp" line="1944"/>
-        <location filename="mainwindow.cpp" line="1998"/>
-        <location filename="mainwindow.cpp" line="2007"/>
-        <location filename="mainwindow.cpp" line="2079"/>
-        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="738"/>
         <source>Checking for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="100"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="739"/>
         <source>Hide</source>
         <translation type="unfinished">숨기기</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="740"/>
         <source>&amp;File</source>
         <translation>파�(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="741"/>
         <source>&amp;View</source>
         <translation>보기(&amp;V)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="742"/>
         <source>&amp;Toolbars</source>
         <translation>�구바(&amp;T)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="163"/>
         <location filename="mainwindow.ui" line="979"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="730"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="743"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="198"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="744"/>
         <source>&amp;Help</source>
         <translation>�움�(&amp;H)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="748"/>
         <source>&amp;Edit</source>
         <translation>편집(&amp;E)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="266"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="749"/>
         <source>Standard</source>
         <translation>표준 �구</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="284"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="750"/>
         <source>Categories</source>
         <translation>분류 �구</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="303"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="751"/>
         <source>Filter</source>
         <translation>필터 �구</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="578"/>
         <source>&amp;License...</source>
         <translation>저작권(&amp;L)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="319"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="579"/>
         <source>A&amp;uthors...</source>
         <translation>제작�(&amp;u)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="328"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="580"/>
         <source>&amp;About...</source>
         <translation>ì •ë³´(&amp;A)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="333"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="581"/>
         <source>&amp;Files...</source>
         <translation>파�(&amp;F)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="342"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="587"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="351"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="589"/>
         <source>&amp;Directory...</source>
         <translation>디렉토리(&amp;D)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="595"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="599"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="602"/>
         <source>&amp;Stop</source>
         <translation>중지(&amp;S)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="608"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="610"/>
         <source>&amp;Save results to file...</source>
         <translation>결과를 파�� 저장(&amp;S)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="411"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="612"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="416"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="614"/>
         <source>&amp;Quit</source>
         <translation>종료(&amp;Q)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="428"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="618"/>
         <source>&amp;Clear results</source>
         <translation>결과 지우기(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="619"/>
         <source>&amp;Preferences</source>
         <translation>설정(&amp;P)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="452"/>
         <location filename="mainwindow.ui" line="455"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="621"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="623"/>
         <source>Show style warnings</source>
         <translation>스타� 경고 표시</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="470"/>
         <location filename="mainwindow.ui" line="473"/>
-        <location filename="mainwindow.cpp" line="2379"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="626"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="628"/>
+        <location filename="mainwindow.cpp" line="2408"/>
         <source>Show errors</source>
         <translation>애러 표시</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="478"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="630"/>
         <source>&amp;Check all</source>
         <translation>전체 선�(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="483"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="631"/>
         <source>&amp;Uncheck all</source>
         <translation>전체 해제(&amp;U)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="488"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="632"/>
         <source>Collapse &amp;all</source>
         <translation>전체 접기(&amp;A)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="493"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="633"/>
         <source>&amp;Expand all</source>
         <translation>전체 펼치기(&amp;E)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="501"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="634"/>
         <source>&amp;Standard</source>
         <translation>표준 �구(&amp;S)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="636"/>
         <source>Standard items</source>
         <translation>표준 아�템</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="509"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="638"/>
         <source>&amp;Contents</source>
         <translation>ë‚´ìš©(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="512"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="640"/>
         <source>Open the help contents</source>
         <translation>�움�� 엽니다</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="515"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="643"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="645"/>
         <source>Toolbar</source>
         <translation>�구바</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="528"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="646"/>
         <source>&amp;Categories</source>
         <translation>분류 �구(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="531"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="648"/>
         <source>Error categories</source>
         <translation>�러 종류</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="536"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="650"/>
         <source>&amp;Open XML...</source>
         <translation>XML 열기(&amp;O)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="545"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="651"/>
         <source>Open P&amp;roject File...</source>
         <translation>프로�트 파� 열기(&amp;R)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="562"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="656"/>
         <source>&amp;New Project File...</source>
         <translation>새 프로�트 파�(&amp;N)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="570"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="660"/>
         <source>&amp;Log View</source>
         <translation>로그 보기(&amp;L)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="573"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="662"/>
         <source>Log View</source>
         <translation>로그 보기</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="581"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="664"/>
         <source>C&amp;lose Project File</source>
         <translation>프로�트 파� 닫기(&amp;L)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="589"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="665"/>
         <source>&amp;Edit Project File...</source>
         <translation>프로�트 파� 편집(&amp;E)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="601"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="666"/>
         <source>&amp;Statistics</source>
         <translation>통계 보기(&amp;S)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="616"/>
         <location filename="mainwindow.ui" line="619"/>
-        <location filename="mainwindow.cpp" line="2380"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="668"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="670"/>
+        <location filename="mainwindow.cpp" line="2409"/>
         <source>Show warnings</source>
         <translation>경고 표시</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="634"/>
         <location filename="mainwindow.ui" line="637"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="673"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="675"/>
         <source>Show performance warnings</source>
         <translation>성능 경고 표시</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="645"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="677"/>
         <source>Show &amp;hidden</source>
         <translation>숨기기 보기(&amp;H)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="729"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="987"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="731"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="995"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1003"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1011"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1019"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="732"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1027"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="733"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1035"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="734"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1040"/>
-        <source>EULA...</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="736"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1015"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Information</source>
         <translation>ì •ë³´</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="660"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="680"/>
         <source>Show information messages</source>
         <translation>정보 표시</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="675"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="684"/>
         <source>Show portability warnings</source>
         <translation>��성 경고 표시</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="713"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="693"/>
         <source>&amp;Filter</source>
         <translation>필터 �구(&amp;F)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="716"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="695"/>
         <source>Filter results</source>
         <translation>필터� 결과</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="732"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="697"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit ANSI</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="740"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="698"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit Unicode</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="748"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="699"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="756"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="700"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="764"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="701"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="155"/>
-        <location filename="mainwindow.cpp" line="1781"/>
+        <location filename="mainwindow.cpp" line="176"/>
+        <location filename="mainwindow.cpp" line="1812"/>
         <source>Quick Filter:</source>
         <translation>빠른 필터:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="458"/>
+        <location filename="mainwindow.cpp" line="477"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -876,12 +907,17 @@ This is probably because the settings were changed between the Cppcheck versions
 Cppcheck 버전간 설정 방법 차�때문� 것으로 보입니다. 편집기 설정� 검사(� 수정)해주세요, 그렇지 않으면 편집기가 제대로 시작하지 않습니다.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="753"/>
+        <location filename="mainwindow.cpp" line="601"/>
+        <source>None of the selected files is part of the project, nothing to analyze.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>새로운 파��나 디렉토리를 선�하기 전� 프로�트 파�� 닫으세요!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="858"/>
+        <location filename="mainwindow.cpp" line="890"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -890,215 +926,210 @@ Do you want to load this project file instead?</source>
 � 프로�트 파�� 불러오겠습니까?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1482"/>
-        <location filename="mainwindow.cpp" line="1681"/>
+        <location filename="mainwindow.cpp" line="1539"/>
+        <location filename="mainwindow.cpp" line="1734"/>
         <source>XML files (*.xml)</source>
         <translation>XML 파� (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1484"/>
+        <location filename="mainwindow.cpp" line="1541"/>
         <source>Open the report file</source>
         <translation>보고서 파� 열기</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1700"/>
         <source>License</source>
         <translation>저작권</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1654"/>
+        <location filename="mainwindow.cpp" line="1707"/>
         <source>Authors</source>
         <translation>제작�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1674"/>
+        <location filename="mainwindow.cpp" line="1727"/>
         <source>Save the report file</source>
         <translation>보고서 파� 저장</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1685"/>
+        <location filename="mainwindow.cpp" line="1738"/>
         <source>Text files (*.txt)</source>
         <translation>�스트 파� (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1689"/>
+        <location filename="mainwindow.cpp" line="1742"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV 파� (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1712"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1819"/>
+        <location filename="mainwindow.cpp" line="1850"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>프로�트 파� (*.cppcheck);;모든 파�(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="1852"/>
         <source>Select Project File</source>
         <translation>프로�트 파� 선�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1977"/>
+        <location filename="mainwindow.cpp" line="1992"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1995"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1983"/>
+        <location filename="mainwindow.cpp" line="1998"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1999"/>
+        <location filename="mainwindow.cpp" line="2014"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2008"/>
+        <location filename="mainwindow.cpp" line="2023"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2310"/>
+        <location filename="mainwindow.cpp" line="2339"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2314"/>
+        <location filename="mainwindow.cpp" line="2343"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2352"/>
+        <location filename="mainwindow.cpp" line="2381"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2353"/>
+        <location filename="mainwindow.cpp" line="2382"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2354"/>
+        <location filename="mainwindow.cpp" line="2383"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2355"/>
+        <location filename="mainwindow.cpp" line="2384"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2372"/>
+        <location filename="mainwindow.cpp" line="2401"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2373"/>
+        <location filename="mainwindow.cpp" line="2402"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2374"/>
+        <location filename="mainwindow.cpp" line="2403"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2381"/>
+        <location filename="mainwindow.cpp" line="2410"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2382"/>
+        <location filename="mainwindow.cpp" line="2411"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2383"/>
+        <location filename="mainwindow.cpp" line="2412"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2384"/>
+        <location filename="mainwindow.cpp" line="2413"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="239"/>
-        <location filename="mainwindow.cpp" line="1783"/>
-        <location filename="mainwindow.cpp" line="1849"/>
-        <location filename="mainwindow.cpp" line="2047"/>
+        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="1814"/>
+        <location filename="mainwindow.cpp" line="1880"/>
+        <location filename="mainwindow.cpp" line="2062"/>
         <source>Project:</source>
         <translation>프로�트:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1013"/>
+        <location filename="mainwindow.cpp" line="1045"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1035"/>
+        <location filename="mainwindow.cpp" line="1064"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1058"/>
+        <location filename="mainwindow.cpp" line="1087"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1120"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1633"/>
+        <location filename="mainwindow.cpp" line="1686"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1945"/>
+        <location filename="mainwindow.cpp" line="1959"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2034"/>
+        <location filename="mainwindow.cpp" line="2049"/>
         <source>Select Project Filename</source>
         <translation>프로�트 파��름 선�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2080"/>
+        <location filename="mainwindow.cpp" line="2095"/>
         <source>No project file loaded</source>
         <translation>프로�트 파� 불러오기 실패</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2148"/>
+        <location filename="mainwindow.cpp" line="2177"/>
         <source>The project file
 
 %1
@@ -1121,101 +1152,102 @@ Do you want to remove the file from the recently used projects -list?</source>
     </message>
     <message>
         <location filename="mainwindow.ui" line="213"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="746"/>
         <source>C++ standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
-        <location filename="mainwindow.cpp" line="1090"/>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1120"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="992"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="995"/>
+        <location filename="mainwindow.cpp" line="1027"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1030"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1001"/>
+        <location filename="mainwindow.cpp" line="1033"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1004"/>
+        <location filename="mainwindow.cpp" line="1036"/>
         <source>Unsupported format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1015"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1007"/>
+        <location filename="mainwindow.cpp" line="1039"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1010"/>
+        <location filename="mainwindow.cpp" line="1042"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="858"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="709"/>
         <source>&amp;Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="861"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="711"/>
         <source>Print the Current Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="866"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="713"/>
         <source>Print Pre&amp;view...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="869"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="715"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="877"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="719"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1016"/>
+        <location filename="mainwindow.cpp" line="1048"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1019"/>
-        <source>Unknown issue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1238,67 +1270,74 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1937"/>
+        <location filename="mainwindow.cpp" line="1951"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="336"/>
         <location filename="mainwindow.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="582"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="584"/>
         <source>Analyze files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="354"/>
         <location filename="mainwindow.ui" line="357"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="590"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="592"/>
         <source>Analyze directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="369"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="597"/>
         <source>&amp;Reanalyze modified files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="393"/>
         <location filename="mainwindow.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="603"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="605"/>
         <source>Stop analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1672"/>
+        <location filename="mainwindow.cpp" line="1725"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="668"/>
+        <location filename="mainwindow.cpp" line="702"/>
         <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="773"/>
+        <location filename="mainwindow.cpp" line="804"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="819"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="880"/>
+        <location filename="mainwindow.cpp" line="912"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1591"/>
+        <location filename="mainwindow.cpp" line="1644"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1306,191 +1345,213 @@ Do you want to stop the analysis and exit Cppcheck?</source>
     </message>
     <message>
         <location filename="mainwindow.ui" line="209"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="745"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="225"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="747"/>
         <source>&amp;C standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="381"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="601"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="419"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="616"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="620"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="467"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="625"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="548"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="653"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="655"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="565"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="658"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="613"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="667"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="631"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="672"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="657"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="678"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="672"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="682"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="690"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="687"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="702"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="689"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="705"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="691"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="772"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="702"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="786"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="703"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="797"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="704"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="805"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="705"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="813"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="706"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="845"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="707"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="853"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="708"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="874"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="717"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="721"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="893"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="722"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="901"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="723"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="912"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="724"/>
         <source>C++14</source>
         <translation type="unfinished">C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2032"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="920"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="725"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="928"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="726"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="936"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="727"/>
         <source>C++17</source>
         <translation type="unfinished">C++17</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="728"/>
         <source>C++20</source>
         <translation type="unfinished">C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="767"/>
+        <location filename="mainwindow.cpp" line="798"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="768"/>
+        <location filename="mainwindow.cpp" line="799"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="769"/>
-        <source>Visual Studio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="770"/>
-        <source>Borland C++ Builder 6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1467"/>
+        <location filename="mainwindow.cpp" line="1524"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1502,26 +1563,31 @@ Do you want to proceed?</source>
     <name>NewSuppressionDialog</name>
     <message>
         <location filename="newsuppressiondialog.ui" line="17"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="114"/>
         <source>New suppression</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="25"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="115"/>
         <source>Error ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="32"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="116"/>
         <source>File name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="42"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="117"/>
         <source>Line number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="52"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="118"/>
         <source>Symbol name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1534,29 +1600,24 @@ Do you want to proceed?</source>
 <context>
     <name>Platforms</name>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit ANSI</translation>
+        <translation type="vanished">Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit Unicode</translation>
+        <translation type="vanished">Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
     <message>
         <location filename="platforms.cpp" line="38"/>
@@ -1568,383 +1629,472 @@ Do you want to proceed?</source>
     <name>ProjectFile</name>
     <message>
         <location filename="projectfile.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="923"/>
         <source>Project File</source>
         <translation>프로�트 파�</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="936"/>
         <source>Defines:</source>
         <translation>Defines:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="147"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="932"/>
         <source>Paths:</source>
         <translation>경로:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="181"/>
         <location filename="projectfile.ui" line="296"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="933"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="945"/>
         <source>Add...</source>
         <translation>추가...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="934"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="994"/>
         <source>Edit</source>
         <translation>편집</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="935"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="995"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="998"/>
         <source>Remove</source>
         <translation>제거</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="330"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="948"/>
         <source>Up</source>
         <translation>위로</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="337"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="949"/>
         <source>Down</source>
         <translation>아래로</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="996"/>
         <source>Suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="997"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="958"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="890"/>
+        <location filename="projectfile.ui" line="899"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1015"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="265"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="944"/>
         <source>Include Paths:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="955"/>
         <source>Paths and Defines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="73"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="928"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You have a choice:&lt;/p&gt;&lt;p&gt; * Analyze all Debug and Release configurations&lt;/p&gt;&lt;p&gt; * Only analyze the first matching Debug configuration&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="930"/>
         <source>Analyze all Visual Studio configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="983"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="987"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="960"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="113"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="931"/>
         <source>Selected VS Configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="950"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="952"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="954"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="959"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="957"/>
         <source>Libraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="965"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="966"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="976"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="977"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1001"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1028"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1002"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1003"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1004"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1005"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="937"/>
+        <location filename="projectfile.ui" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1020"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="946"/>
+        <location filename="projectfile.ui" line="955"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1021"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="965"/>
+        <location filename="projectfile.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1023"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="projectfile.ui" line="981"/>
-        <source>Bug hunting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="1004"/>
-        <source>Clang analyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="projectfile.ui" line="997"/>
-        <source>Clang-tidy</source>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1026"/>
+        <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="926"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="964"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="231"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="938"/>
         <source>Defines must be separated by a semicolon. Example: DEF1;DEF2=5;DEF3=int</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="956"/>
         <source>Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="962"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="967"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="968"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="969"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="970"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="971"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="974"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="978"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="981"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1000"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="985"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="989"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="991"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="992"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="993"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="999"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished">Inline suppression 사용</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1006"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1007"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="914"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1008"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1018"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="851"/>
+        <location filename="projectfile.ui" line="860"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1009"/>
         <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="876"/>
+        <location filename="projectfile.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1011"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="883"/>
+        <location filename="projectfile.ui" line="892"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1013"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="901"/>
+        <location filename="projectfile.ui" line="910"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1016"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="918"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1017"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="958"/>
+        <location filename="projectfile.ui" line="967"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1022"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="975"/>
-        <source>Bug hunting (Premium)</source>
+        <location filename="projectfile.ui" line="981"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1024"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="991"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1025"/>
+        <source>Bug hunting (Premium)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="1007"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1027"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="30"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="924"/>
         <source>Import Project (Visual studio / compile database/ Borland C++ Builder 6)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="242"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="940"/>
         <source>Undefines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="252"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="942"/>
         <source>Undefines must be separated by a semicolon. Example: UNDEF1;UNDEF2;UNDEF3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="972"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="982"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="979"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="980"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1957,78 +2107,79 @@ Do you want to proceed?</source>
         <translation>프로�트 파�: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="865"/>
+        <location filename="projectfiledialog.cpp" line="861"/>
         <source>Select include directory</source>
         <translation>Include 디렉토리 선�</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="845"/>
+        <location filename="projectfiledialog.cpp" line="841"/>
         <source>Select a directory to check</source>
         <translation>검사할 디렉토리 선�</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="885"/>
+        <location filename="projectfiledialog.cpp" line="881"/>
         <source>Select directory to ignore</source>
         <translation>무시할 디렉토리 선�</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="604"/>
+        <location filename="projectfiledialog.cpp" line="585"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="646"/>
+        <location filename="projectfiledialog.cpp" line="627"/>
         <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="477"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="414"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="893"/>
+        <location filename="projectfiledialog.cpp" line="889"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="894"/>
+        <location filename="projectfiledialog.cpp" line="647"/>
+        <location filename="projectfiledialog.cpp" line="890"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="895"/>
-        <source>Exclude file</source>
+        <location filename="projectfiledialog.cpp" line="646"/>
+        <source>C/C++ header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="978"/>
-        <source>Select MISRA rule texts file</source>
+        <location filename="projectfiledialog.cpp" line="648"/>
+        <source>Include file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="980"/>
-        <source>MISRA rule texts file (%1)</source>
+        <location filename="projectfiledialog.cpp" line="891"/>
+        <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="643"/>
-        <source>Visual Studio</source>
+        <location filename="projectfiledialog.cpp" line="976"/>
+        <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="644"/>
-        <source>Compile database</source>
+        <location filename="projectfiledialog.cpp" line="978"/>
+        <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="645"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="projectfiledialog.cpp" line="625"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2060,7 +2211,7 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="302"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2110,160 +2261,155 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="142"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="144"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="114"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">파�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="115"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">í–‰</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="116"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">분류</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="117"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="118"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="119"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="120"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">요약</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="121"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="122"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="123"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="124"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="125"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="126"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
@@ -2311,42 +2457,42 @@ Do you want to proceed?</source>
         <translation type="vanished">미정�� 파�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="349"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>스타�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="352"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>�러</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="355"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>경고</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="358"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>성능</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="361"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>��성</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="364"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>ì •ë³´</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="367"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>디버그</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="370"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2355,13 +2501,11 @@ Do you want to proceed?</source>
         <translation type="vanished">숨기기</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="733"/>
-        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="734"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2370,7 +2514,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 [설정 - �용 프로그램]�서 편집기를 설정하세요.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="748"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2379,12 +2523,12 @@ Please select the default editor application in preferences/Applications.</sourc
 [설정 - �용 프로그램]�서 기본 편집기를 선�하세요.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="768"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>파�� 찾� 수 없습니다!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="811"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2393,72 +2537,72 @@ Please check the application path and parameters are correct.</source>
 경로와 ��가 정확한지 확�하세요.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="833"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>디렉토리 선�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="659"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="660"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="298"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="656"/>
+        <location filename="resultstree.cpp" line="667"/>
         <source>Recheck %1 file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="658"/>
+        <location filename="resultstree.cpp" line="669"/>
         <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="681"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="701"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="703"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="825"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="829"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="830"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="832"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="657"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2467,121 +2611,123 @@ Please check the application path and parameters are correct.</source>
     <name>ResultsView</name>
     <message>
         <location filename="resultsview.ui" line="26"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="147"/>
         <source>Results</source>
         <translation>ê²°ê³¼</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="237"/>
-        <location filename="resultsview.cpp" line="245"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>결과 저장 실패.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="326"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%2 중 %1 파� 검사�)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="350"/>
-        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="351"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>�러가 발견�지 않았습니다.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="358"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>�러가 발견�었지만, �추�� 설정�어 있습니다.
 �러 종류를 표시하�� 설정하려면, 보기 메뉴를 선�하세요.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>결과 불러오기 실패.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="549"/>
+        <location filename="resultsview.cpp" line="545"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="563"/>
+        <location filename="resultsview.cpp" line="559"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="565"/>
+        <location filename="resultsview.cpp" line="561"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="567"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="568"/>
+        <location filename="resultsview.cpp" line="564"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="465"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="255"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="274"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="460"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="60"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="148"/>
         <source>Critical errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="149"/>
         <source>Analysis Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="114"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="150"/>
         <source>Warning Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="539"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="540"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="541"/>
+        <location filename="resultsview.cpp" line="538"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2590,26 +2736,31 @@ To toggle what kind of errors are shown, open view menu.</source>
     <name>ScratchPad</name>
     <message>
         <location filename="scratchpad.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="107"/>
         <source>Scratchpad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="110"/>
         <source>filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="78"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="111"/>
         <source>Check</source>
         <translation type="unfinished">검사</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="108"/>
         <source>Copy or write some C/C++ code here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="37"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="109"/>
         <source>Optionally enter a filename (mainly for automatic language detection) and click on &quot;Check&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2618,16 +2769,19 @@ To toggle what kind of errors are shown, open view menu.</source>
     <name>Settings</name>
     <message>
         <location filename="settings.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="490"/>
         <source>Preferences</source>
         <translation>설정</translation>
     </message>
     <message>
         <location filename="settings.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="502"/>
         <source>General</source>
         <translation>�반</translation>
     </message>
     <message>
         <location filename="settings.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="491"/>
         <source>Number of threads: </source>
         <translation>쓰레드 수: </translation>
     </message>
@@ -2637,107 +2791,129 @@ To toggle what kind of errors are shown, open view menu.</source>
     </message>
     <message>
         <location filename="settings.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="493"/>
         <source>Force checking all #ifdef configurations</source>
         <translation>모든 #ifdef 설정� 강제로 검사</translation>
     </message>
     <message>
         <location filename="settings.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="494"/>
         <source>Show full path of files</source>
         <translation>파�� 전체 경로 표시</translation>
     </message>
     <message>
         <location filename="settings.ui" line="122"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="495"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>�러가 발견�지 않는 경우 &quot;�러가 없습니다.&quot; 메시지 표시</translation>
     </message>
     <message>
         <location filename="settings.ui" line="136"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="497"/>
         <source>Enable inline suppressions</source>
         <translation>Inline suppression 사용</translation>
     </message>
     <message>
         <location filename="settings.ui" line="157"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="500"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="196"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="503"/>
         <source>Add...</source>
         <translation>추가...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="210"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="505"/>
         <source>Remove</source>
         <translation>제거</translation>
     </message>
     <message>
         <location filename="settings.ui" line="185"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="507"/>
         <source>Applications</source>
         <translation>�용 프로그램</translation>
     </message>
     <message>
         <location filename="settings.ui" line="203"/>
         <location filename="settings.ui" line="479"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="532"/>
         <source>Edit...</source>
         <translation>편집...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="506"/>
         <source>Set as default</source>
         <translation>기본으로 지정</translation>
     </message>
     <message>
         <location filename="settings.ui" line="240"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="510"/>
         <source>Reports</source>
         <translation>보고서</translation>
     </message>
     <message>
         <location filename="settings.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="508"/>
         <source>Save all errors when creating report</source>
         <translation>보고서 �성 시 모든 �러 저장</translation>
     </message>
     <message>
         <location filename="settings.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="509"/>
         <source>Save full path to files in reports</source>
         <translation>보고서� 파�� 전체 경로 저장</translation>
     </message>
     <message>
         <location filename="settings.ui" line="274"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="511"/>
         <source>Language</source>
         <translation>언어</translation>
     </message>
     <message>
         <location filename="settings.ui" line="129"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="496"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="143"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="498"/>
         <source>Check for inconclusive errors also</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="177"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="501"/>
         <source>Show internal warnings in log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="150"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="499"/>
         <source>Show statistics on check completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="79"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="492"/>
         <source>Max count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="521"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="294"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="512"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2745,71 +2921,87 @@ To toggle what kind of errors are shown, open view menu.</source>
         <location filename="settings.ui" line="305"/>
         <location filename="settings.ui" line="346"/>
         <location filename="settings.ui" line="391"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="513"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="523"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="526"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="378"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="522"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="401"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="524"/>
         <source>Visual Studio headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="407"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="525"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="324"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="515"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="332"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="516"/>
         <source>MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="518"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="533"/>
         <source>Code Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="527"/>
         <source>Code Editor Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="456"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="529"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="463"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="530"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="472"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="531"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="528"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2866,241 +3058,264 @@ To toggle what kind of errors are shown, open view menu.</source>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="395"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="415"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>통계</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="401"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>프로�트</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="33"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="396"/>
         <source>Project:</source>
         <translation>프로�트:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="53"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="397"/>
         <source>Paths:</source>
         <translation>경로:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="85"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="398"/>
         <source>Include paths:</source>
         <translation>Include 경로:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="399"/>
         <source>Defines:</source>
         <translation>Defines:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="407"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>�전 검사</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="171"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="402"/>
         <source>Path Selected:</source>
         <translation>선�� 경로:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="181"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="403"/>
         <source>Number of Files Scanned:</source>
         <translation>검사� 파� 수:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="201"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="405"/>
         <source>Scan Duration:</source>
         <translation>검사 시간:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="254"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="408"/>
         <source>Errors:</source>
         <translation>�러:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="271"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="409"/>
         <source>Warnings:</source>
         <translation>경고:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="410"/>
         <source>Stylistic warnings:</source>
         <translation>스타� 경고:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="305"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="411"/>
         <source>Portability warnings:</source>
         <translation>��성 경고:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="322"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="412"/>
         <source>Performance issues:</source>
         <translation>성능 경고:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="413"/>
         <source>Information messages:</source>
         <translation>정보 메시지:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="356"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="414"/>
         <source>Active checkers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="374"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="416"/>
         <source>Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="419"/>
         <source>Copy to Clipboard</source>
         <translation>�립보드� 복사</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1시간</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1시간</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1분</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1분</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1ì´ˆ</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1ì´ˆ</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.%1ì´ˆ</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="171"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> ë°� </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>프로�트 설정</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>경로</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>Include 경로</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>Defines</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>선�� 경로</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>검사� 파� 수</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>검사 시간</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>�러</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>경고</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>스타� 경고</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>��성 경고</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>성능 경고</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>정보 메시지</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="420"/>
         <source>Pdf Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="198"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="418"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="405"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="417"/>
         <source>File:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3116,19 +3331,29 @@ To toggle what kind of errors are shown, open view menu.</source>
     </message>
     <message>
         <location filename="statsdialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="400"/>
         <source>Undefines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_threaddetails.h" line="47"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="46"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>%2 중 %1 파� 검사�</translation>
     </message>
@@ -3149,9 +3374,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 언어가 �어로 초기화 �습니다. 설정창� 열어서 설정 가능한 언어를 선�하세요.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_nl.ts b/gui/cppcheck_nl.ts
index 732073d404a..3bab077e6e3 100644
--- a/gui/cppcheck_nl.ts
+++ b/gui/cppcheck_nl.ts
@@ -5,27 +5,32 @@
     <name>About</name>
     <message>
         <location filename="about.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="130"/>
         <source>About Cppcheck</source>
         <translation>Over Cppcheck</translation>
     </message>
     <message>
         <location filename="about.ui" line="64"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="132"/>
         <source>Version %1</source>
         <translation>Versie %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="133"/>
         <source>Cppcheck - A tool for static C/C++ code analysis.</source>
         <translation>Cppcheck - Een tool voor statische C/C++ code analyse.</translation>
     </message>
     <message>
         <location filename="about.ui" line="81"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="134"/>
         <source>Copyright © 2007-%1 Cppcheck team.</source>
         <oldsource>Copyright © 2007-2021 Cppcheck team.</oldsource>
         <translation type="unfinished">Copyright © 2007-2021 het cppcheck team.</translation>
     </message>
     <message>
         <location filename="about.ui" line="91"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="135"/>
         <source>This program is licensed under the terms
 of the GNU General Public License version 3</source>
         <translation>Dit programma is beschikbaar onder te termen
@@ -33,11 +38,13 @@ van de GNU General Public License versie 3</translation>
     </message>
     <message>
         <location filename="about.ui" line="102"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="137"/>
         <source>Visit Cppcheck homepage at %1</source>
         <translation>Bezoek de Cppcheck homepage op %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;pcre&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;picojson&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tinyxml2&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
         <translation type="unfinished"></translation>
@@ -47,11 +54,13 @@ van de GNU General Public License versie 3</translation>
     <name>ApplicationDialog</name>
     <message>
         <location filename="applicationdialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="161"/>
         <source>Add an application</source>
         <translation>Voeg een nieuwe applicatie toe</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="162"/>
         <source>Here you can add an application that can open error files. Specify a name for the application, the application executable and command line parameters for the application.
 
 The following texts in parameters are replaced with appropriate values when application is executed:
@@ -77,21 +86,25 @@ Parameters: -l(lijn) (bestand)</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="173"/>
         <source>&amp;Name:</source>
         <translation>&amp;Naam:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="86"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="174"/>
         <source>&amp;Executable:</source>
         <translation>&amp;Uitvoerbaar:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="96"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="175"/>
         <source>&amp;Parameters:</source>
         <translation></translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="138"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="176"/>
         <source>Browse</source>
         <translation>Bladeren</translation>
     </message>
@@ -106,9 +119,8 @@ Parameters: -l(lijn) (bestand)</translation>
         <translation>Selecteer applicatie</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -116,70 +128,6 @@ Parameters: -l(lijn) (bestand)</translation>
         <translation>Geef een naam op, een pad en eventueel parameters voor de toepassing!</translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -190,10 +138,8 @@ Parameters: -l(lijn) (bestand)</translation>
         <translation>Kon het bestand niet vinden: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -205,44 +151,49 @@ Parameters: -l(lijn) (bestand)</translation>
     <name>HelpDialog</name>
     <message>
         <location filename="helpdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="88"/>
         <source>Cppcheck GUI help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="89"/>
         <source>Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="90"/>
         <source>Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
     <name>LibraryAddFunctionDialog</name>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="105"/>
         <source>Add function</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="106"/>
         <source>Function name(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="107"/>
         <source>Number of arguments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -251,126 +202,140 @@ Parameters: -l(lijn) (bestand)</translation>
     <name>LibraryDialog</name>
     <message>
         <location filename="librarydialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="275"/>
         <source>Library Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="22"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="276"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="29"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="277"/>
         <source>Save</source>
         <translation type="unfinished">Opslaan</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="36"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="278"/>
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="62"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="279"/>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="280"/>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="111"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="281"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="282"/>
         <source>Filter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="164"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="283"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="204"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="284"/>
         <source>noreturn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="212"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="285"/>
         <source>False</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="286"/>
         <source>True</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="222"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="287"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="232"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="289"/>
         <source>return value must be used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="239"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="290"/>
         <source>ignore function in leaks checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="291"/>
         <source>Arguments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="258"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="292"/>
         <source>Edit</source>
         <translation type="unfinished">Bewerk</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation type="unfinished"></translation>
     </message>
@@ -379,11 +344,13 @@ Parameters: -l(lijn) (bestand)</translation>
     <name>LibraryEditArgDialog</name>
     <message>
         <location filename="libraryeditargdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="284"/>
         <source>Edit argument</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="286"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is bool value allowed? For instance result from comparison or from &apos;!&apos; operator.&lt;/p&gt;
 &lt;p&gt;Typically, set this if the argument is a pointer, size, etc.&lt;/p&gt;
@@ -394,11 +361,13 @@ Parameters: -l(lijn) (bestand)</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="28"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="293"/>
         <source>Not bool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="35"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is a null parameter value allowed?&lt;/p&gt;
 &lt;p&gt;Typically this should be used on any pointer parameter that does not allow null.&lt;/p&gt;
@@ -409,78 +378,99 @@ Parameters: -l(lijn) (bestand)</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="43"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="302"/>
         <source>Not null</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="50"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="303"/>
         <source>Not uninit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="57"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="304"/>
         <source>String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="70"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="305"/>
         <source>Format string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="306"/>
         <source>Min size of buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="101"/>
         <location filename="libraryeditargdialog.ui" line="203"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="307"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="316"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="109"/>
         <location filename="libraryeditargdialog.ui" line="214"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="308"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="317"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="114"/>
         <location filename="libraryeditargdialog.ui" line="219"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="309"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="318"/>
         <source>argvalue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="119"/>
         <location filename="libraryeditargdialog.ui" line="224"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="319"/>
         <source>mul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="124"/>
         <location filename="libraryeditargdialog.ui" line="229"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="311"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="320"/>
         <source>strlen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="132"/>
         <location filename="libraryeditargdialog.ui" line="237"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="313"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="322"/>
         <source>Arg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="159"/>
         <location filename="libraryeditargdialog.ui" line="264"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="323"/>
         <source>Arg2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="194"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="315"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="324"/>
         <source>Valid values</source>
         <translation type="unfinished"></translation>
     </message>
@@ -488,613 +478,699 @@ Parameters: -l(lijn) (bestand)</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="687"/>
-        <location filename="mainwindow.cpp" line="463"/>
-        <location filename="mainwindow.cpp" line="667"/>
-        <location filename="mainwindow.cpp" line="752"/>
-        <location filename="mainwindow.cpp" line="857"/>
-        <location filename="mainwindow.cpp" line="879"/>
-        <location filename="mainwindow.cpp" line="1466"/>
-        <location filename="mainwindow.cpp" line="1595"/>
-        <location filename="mainwindow.cpp" line="1936"/>
-        <location filename="mainwindow.cpp" line="1944"/>
-        <location filename="mainwindow.cpp" line="1998"/>
-        <location filename="mainwindow.cpp" line="2007"/>
-        <location filename="mainwindow.cpp" line="2079"/>
-        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="209"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="745"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="266"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="749"/>
         <source>Standard</source>
         <translation>Standaard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="740"/>
         <source>&amp;File</source>
         <translation>&amp;Bestand</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="741"/>
         <source>&amp;View</source>
         <translation>&amp;Weergave</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="742"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Werkbalken</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="213"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="746"/>
         <source>C++ standard</source>
         <translation>C++standaard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="225"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="747"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation type="unfinished">C standaard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="748"/>
         <source>&amp;Edit</source>
         <translation>Be&amp;werken</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="578"/>
         <source>&amp;License...</source>
         <translation>&amp;Licentie...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="319"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="579"/>
         <source>A&amp;uthors...</source>
         <translation>A&amp;uteurs...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="328"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="580"/>
         <source>&amp;About...</source>
         <translation>&amp;Over...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="333"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="581"/>
         <source>&amp;Files...</source>
         <translation>&amp;Bestanden...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="336"/>
         <location filename="mainwindow.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="582"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="584"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation type="unfinished">Controleer bestanden</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="342"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="587"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="351"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="589"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Mappen...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="354"/>
         <location filename="mainwindow.ui" line="357"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="590"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="592"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation type="unfinished">Controleer Map</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="595"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="599"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="602"/>
         <source>&amp;Stop</source>
         <translation>&amp;Stop</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="393"/>
         <location filename="mainwindow.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="603"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="605"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation type="unfinished">Stop controle</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="608"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="610"/>
         <source>&amp;Save results to file...</source>
         <translation>&amp;Resultaten opslaan...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="411"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="612"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="416"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="614"/>
         <source>&amp;Quit</source>
         <translation>&amp;Afsluiten</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="428"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="618"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Resultaten wissen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="619"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Voorkeuren</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="470"/>
         <location filename="mainwindow.ui" line="473"/>
-        <location filename="mainwindow.cpp" line="2379"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="626"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="628"/>
+        <location filename="mainwindow.cpp" line="2408"/>
         <source>Show errors</source>
         <translation>Toon fouten</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="616"/>
         <location filename="mainwindow.ui" line="619"/>
-        <location filename="mainwindow.cpp" line="2380"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="668"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="670"/>
+        <location filename="mainwindow.cpp" line="2409"/>
         <source>Show warnings</source>
         <translation>Toon waarschuwingen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="634"/>
         <location filename="mainwindow.ui" line="637"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="673"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="675"/>
         <source>Show performance warnings</source>
         <translation>Toon presentatie waarschuwingen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="645"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="677"/>
         <source>Show &amp;hidden</source>
         <translation>Toon &amp;verborgen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1015"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="660"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="680"/>
         <source>Show information messages</source>
         <translation>Toon informatie bericht</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="675"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="684"/>
         <source>Show portability warnings</source>
         <translation>Toon portabiliteit waarschuwingen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="690"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="687"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="702"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="689"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="705"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="691"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="713"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="693"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filter</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="716"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="695"/>
         <source>Filter results</source>
         <translation>Filter resultaten</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="732"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="697"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit ANSI</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="740"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="698"/>
         <source>Windows 32-bit Unicode</source>
         <translation></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="748"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="699"/>
         <source>Unix 32-bit</source>
         <translation></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="756"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="700"/>
         <source>Unix 64-bit</source>
         <translation></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="764"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="701"/>
         <source>Windows 64-bit</source>
         <translation></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="858"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="709"/>
         <source>&amp;Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="861"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="711"/>
         <source>Print the Current Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="866"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="713"/>
         <source>Print Pre&amp;view...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="869"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="715"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="877"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="719"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="478"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="630"/>
         <source>&amp;Check all</source>
         <translation>&amp;Controleer alles</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="738"/>
         <source>Checking for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="100"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="739"/>
         <source>Hide</source>
         <translation type="unfinished">Verberg</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="163"/>
         <location filename="mainwindow.ui" line="979"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="730"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="743"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="303"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="751"/>
         <source>Filter</source>
         <translation></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="369"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="597"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="381"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="601"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="419"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="616"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="620"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="467"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="625"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="483"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="631"/>
         <source>&amp;Uncheck all</source>
         <translation>Selecteer &amp;niets</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="488"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="632"/>
         <source>Collapse &amp;all</source>
         <translation>Alles Inkl&amp;appen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="493"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="633"/>
         <source>&amp;Expand all</source>
         <translation>Alles &amp;Uitklappen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="501"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="634"/>
         <source>&amp;Standard</source>
         <translation>&amp;Standaard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="636"/>
         <source>Standard items</source>
         <translation>Standaard items</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="645"/>
         <source>Toolbar</source>
         <translation>Werkbalk</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="528"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="646"/>
         <source>&amp;Categories</source>
         <translation>&amp;Categorieën</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="531"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="648"/>
         <source>Error categories</source>
         <translation>Foute Categorieën</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="536"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="650"/>
         <source>&amp;Open XML...</source>
         <translation></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="545"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="651"/>
         <source>Open P&amp;roject File...</source>
         <translation>Open P&amp;oject bestand...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="548"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="653"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="655"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="562"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="656"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;Nieuw Project Bestand...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="565"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="658"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="570"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="660"/>
         <source>&amp;Log View</source>
         <translation>&amp;Log weergave</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="573"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="662"/>
         <source>Log View</source>
         <translation>Log weergave</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="581"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="664"/>
         <source>C&amp;lose Project File</source>
         <translation>&amp;Sluit Project Bestand</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="589"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="665"/>
         <source>&amp;Edit Project File...</source>
         <translation>&amp;Bewerk Project Bestand...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="601"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="666"/>
         <source>&amp;Statistics</source>
         <translation>&amp;Statistieken</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="613"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="667"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="631"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="672"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="657"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="678"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="672"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="682"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="772"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="702"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="786"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="703"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="797"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="704"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="805"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="705"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="813"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="706"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="845"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="707"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="853"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="708"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="874"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="717"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="721"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="893"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="722"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="901"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="723"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="912"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="724"/>
         <source>C++14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="920"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="725"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="928"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="726"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="936"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="727"/>
         <source>C++17</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="728"/>
         <source>C++20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="729"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="987"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="731"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="995"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1003"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1011"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1019"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="732"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1027"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="733"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1035"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="734"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1040"/>
-        <source>EULA...</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="736"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="509"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="638"/>
         <source>&amp;Contents</source>
         <translation>&amp;Inhoud</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="284"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="750"/>
         <source>Categories</source>
         <translation>Categorieën</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="452"/>
         <location filename="mainwindow.ui" line="455"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="621"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="623"/>
         <source>Show style warnings</source>
         <translation>Toon stijl waarschuwingen</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="512"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="640"/>
         <source>Open the help contents</source>
         <translation>Open de help inhoud</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="515"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="643"/>
         <source>F1</source>
         <translation></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="198"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="744"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="155"/>
-        <location filename="mainwindow.cpp" line="1781"/>
+        <location filename="mainwindow.cpp" line="176"/>
+        <location filename="mainwindow.cpp" line="1812"/>
         <source>Quick Filter:</source>
         <translation>Snel Filter:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="858"/>
+        <location filename="mainwindow.cpp" line="890"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1102,91 +1178,91 @@ Do you want to load this project file instead?</source>
 Wilt u dit project laden in plaats van?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="992"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="995"/>
+        <location filename="mainwindow.cpp" line="1027"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1030"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1001"/>
+        <location filename="mainwindow.cpp" line="1033"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1013"/>
+        <location filename="mainwindow.cpp" line="1045"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1035"/>
+        <location filename="mainwindow.cpp" line="1064"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1058"/>
+        <location filename="mainwindow.cpp" line="1087"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1120"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1700"/>
         <source>License</source>
         <translation>Licentie</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1654"/>
+        <location filename="mainwindow.cpp" line="1707"/>
         <source>Authors</source>
         <translation>Auteurs</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1674"/>
+        <location filename="mainwindow.cpp" line="1727"/>
         <source>Save the report file</source>
         <translation>Rapport opslaan </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1482"/>
-        <location filename="mainwindow.cpp" line="1681"/>
+        <location filename="mainwindow.cpp" line="1539"/>
+        <location filename="mainwindow.cpp" line="1734"/>
         <source>XML files (*.xml)</source>
         <translation>XML bestanden (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="458"/>
+        <location filename="mainwindow.cpp" line="477"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -1195,131 +1271,121 @@ This is probably because the settings were changed between the Cppcheck versions
 Dit is waarschijnlijk omdat de instellingen zijn gewijzigd tussen de versies van cppcheck. Controleer (en maak) de bewerker instellingen, anders zal de bewerker niet correct starten.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="753"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>Je moet project bestanden sluiten voordat je nieuwe bestanden of mappen selekteerd!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1015"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1004"/>
+        <location filename="mainwindow.cpp" line="1036"/>
         <source>Unsupported format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1007"/>
+        <location filename="mainwindow.cpp" line="1039"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1010"/>
+        <location filename="mainwindow.cpp" line="1042"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1016"/>
+        <location filename="mainwindow.cpp" line="1048"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1019"/>
-        <source>Unknown issue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1080"/>
-        <location filename="mainwindow.cpp" line="1090"/>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1120"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1484"/>
+        <location filename="mainwindow.cpp" line="1541"/>
         <source>Open the report file</source>
         <translation>Open het rapport bestand</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1685"/>
+        <location filename="mainwindow.cpp" line="1738"/>
         <source>Text files (*.txt)</source>
         <translation>Tekst bestanden (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1689"/>
+        <location filename="mainwindow.cpp" line="1742"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV bestanden (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1819"/>
+        <location filename="mainwindow.cpp" line="1850"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Project bestanden (*.cppcheck);;Alle bestanden(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="1852"/>
         <source>Select Project File</source>
         <translation>Selecteer project bestand</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="239"/>
-        <location filename="mainwindow.cpp" line="1783"/>
-        <location filename="mainwindow.cpp" line="1849"/>
-        <location filename="mainwindow.cpp" line="2047"/>
+        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="1814"/>
+        <location filename="mainwindow.cpp" line="1880"/>
+        <location filename="mainwindow.cpp" line="2062"/>
         <source>Project:</source>
         <translation>Project:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="668"/>
-        <source>No suitable files found to analyze!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="767"/>
-        <source>C/C++ Source</source>
+        <location filename="mainwindow.cpp" line="601"/>
+        <source>None of the selected files is part of the project, nothing to analyze.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="768"/>
-        <source>Compile database</source>
+        <location filename="mainwindow.cpp" line="702"/>
+        <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="769"/>
-        <source>Visual Studio</source>
+        <location filename="mainwindow.cpp" line="798"/>
+        <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="770"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="mainwindow.cpp" line="799"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="773"/>
+        <location filename="mainwindow.cpp" line="804"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="819"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="880"/>
+        <location filename="mainwindow.cpp" line="912"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1467"/>
+        <location filename="mainwindow.cpp" line="1524"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1327,81 +1393,76 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1591"/>
+        <location filename="mainwindow.cpp" line="1644"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1633"/>
+        <location filename="mainwindow.cpp" line="1686"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1672"/>
+        <location filename="mainwindow.cpp" line="1725"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1712"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1937"/>
+        <location filename="mainwindow.cpp" line="1951"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1945"/>
+        <location filename="mainwindow.cpp" line="1959"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1977"/>
+        <location filename="mainwindow.cpp" line="1992"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1995"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1983"/>
+        <location filename="mainwindow.cpp" line="1998"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1999"/>
+        <location filename="mainwindow.cpp" line="2014"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2008"/>
+        <location filename="mainwindow.cpp" line="2023"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2032"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2034"/>
+        <location filename="mainwindow.cpp" line="2049"/>
         <source>Select Project Filename</source>
         <translation>Selecteer project bestandsnaam</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2080"/>
+        <location filename="mainwindow.cpp" line="2095"/>
         <source>No project file loaded</source>
         <translation>Geen project bestand geladen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2148"/>
+        <location filename="mainwindow.cpp" line="2177"/>
         <source>The project file
 
 %1
@@ -1417,67 +1478,67 @@ Kan niet worden gevonden!
 Wilt u het bestand van de onlangs gebruikte project verwijderen -lijst?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2310"/>
+        <location filename="mainwindow.cpp" line="2339"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2314"/>
+        <location filename="mainwindow.cpp" line="2343"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2352"/>
+        <location filename="mainwindow.cpp" line="2381"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2353"/>
+        <location filename="mainwindow.cpp" line="2382"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2354"/>
+        <location filename="mainwindow.cpp" line="2383"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2355"/>
+        <location filename="mainwindow.cpp" line="2384"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2372"/>
+        <location filename="mainwindow.cpp" line="2401"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2373"/>
+        <location filename="mainwindow.cpp" line="2402"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2374"/>
+        <location filename="mainwindow.cpp" line="2403"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2381"/>
+        <location filename="mainwindow.cpp" line="2410"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2382"/>
+        <location filename="mainwindow.cpp" line="2411"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2383"/>
+        <location filename="mainwindow.cpp" line="2412"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2384"/>
+        <location filename="mainwindow.cpp" line="2413"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1521,26 +1582,31 @@ Options:
     <name>NewSuppressionDialog</name>
     <message>
         <location filename="newsuppressiondialog.ui" line="17"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="114"/>
         <source>New suppression</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="25"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="115"/>
         <source>Error ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="32"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="116"/>
         <source>File name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="42"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="117"/>
         <source>Line number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="52"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="118"/>
         <source>Symbol name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1557,415 +1623,479 @@ Options:
         <source>Native</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="platforms.cpp" line="39"/>
-        <source>Unix 32-bit</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="40"/>
-        <source>Unix 64-bit</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="41"/>
-        <source>Windows 32-bit ANSI</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="42"/>
-        <source>Windows 32-bit Unicode</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="43"/>
-        <source>Windows 64-bit</source>
-        <translation></translation>
-    </message>
 </context>
 <context>
     <name>ProjectFile</name>
     <message>
         <location filename="projectfile.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="923"/>
         <source>Project File</source>
         <translation>Project Bestand</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="955"/>
         <source>Paths and Defines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="30"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="924"/>
         <source>Import Project (Visual studio / compile database/ Borland C++ Builder 6)</source>
         <oldsource>Import Project (Visual studio / compile database)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="231"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="938"/>
         <source>Defines must be separated by a semicolon. Example: DEF1;DEF2=5;DEF3=int</source>
         <oldsource>Defines must be separated by a semicolon &apos;;&apos;</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="958"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="989"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="991"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="992"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="993"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1006"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1007"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="914"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1008"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1018"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="876"/>
+        <location filename="projectfile.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1011"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="883"/>
+        <location filename="projectfile.ui" line="892"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1013"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="890"/>
+        <location filename="projectfile.ui" line="899"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1015"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="73"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="928"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You have a choice:&lt;/p&gt;&lt;p&gt; * Analyze all Debug and Release configurations&lt;/p&gt;&lt;p&gt; * Only analyze the first matching Debug configuration&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="926"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="964"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="930"/>
         <source>Analyze all Visual Studio configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="113"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="931"/>
         <source>Selected VS Configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="147"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="932"/>
         <source>Paths:</source>
         <translation>Paden:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="181"/>
         <location filename="projectfile.ui" line="296"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="933"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="945"/>
         <source>Add...</source>
         <translation>Toevoegen...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="934"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="994"/>
         <source>Edit</source>
         <translation>Bewerk</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="935"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="995"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="998"/>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="242"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="940"/>
         <source>Undefines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="252"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="942"/>
         <source>Undefines must be separated by a semicolon. Example: UNDEF1;UNDEF2;UNDEF3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="265"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="944"/>
         <source>Include Paths:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="950"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="952"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="954"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="959"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="972"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="982"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="962"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="965"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="966"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="968"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="969"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="970"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="971"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="976"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="977"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="979"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="980"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="999"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished">Schakel inline suppressies in</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="851"/>
+        <location filename="projectfile.ui" line="860"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1009"/>
         <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="901"/>
+        <location filename="projectfile.ui" line="910"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1016"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="918"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1017"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="937"/>
+        <location filename="projectfile.ui" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1020"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="946"/>
+        <location filename="projectfile.ui" line="955"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1021"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="965"/>
+        <location filename="projectfile.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1023"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="981"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1024"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1026"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="991"/>
+        <location filename="projectfile.ui" line="1007"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1027"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="330"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="948"/>
         <source>Up</source>
         <translation>Omhoog</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="337"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="949"/>
         <source>Down</source>
         <translation>Omlaag</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="956"/>
         <source>Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="967"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="974"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="978"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="981"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1000"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="983"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="985"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="987"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="960"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="957"/>
         <source>Libraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="996"/>
         <source>Suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="997"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1001"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1028"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1002"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1003"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1004"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1005"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="958"/>
+        <location filename="projectfile.ui" line="967"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1022"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="975"/>
+        <location filename="projectfile.ui" line="991"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1025"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="projectfile.ui" line="1004"/>
-        <source>Clang analyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="997"/>
-        <source>Clang-tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="936"/>
         <source>Defines:</source>
         <translation>Omschrijft:</translation>
     </message>
@@ -1978,77 +2108,78 @@ Options:
         <translation>Project Bestand %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="604"/>
+        <location filename="projectfiledialog.cpp" line="585"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="865"/>
+        <location filename="projectfiledialog.cpp" line="861"/>
         <source>Select include directory</source>
         <translation>Selecteer include map</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="845"/>
+        <location filename="projectfiledialog.cpp" line="841"/>
         <source>Select a directory to check</source>
         <translation>Selecteer een map om te controleren</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="414"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="477"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="643"/>
-        <source>Visual Studio</source>
+        <location filename="projectfiledialog.cpp" line="625"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="644"/>
-        <source>Compile database</source>
+        <location filename="projectfiledialog.cpp" line="627"/>
+        <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="645"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="projectfiledialog.cpp" line="646"/>
+        <source>C/C++ header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="646"/>
-        <source>Import Project</source>
+        <location filename="projectfiledialog.cpp" line="648"/>
+        <source>Include file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="885"/>
+        <location filename="projectfiledialog.cpp" line="881"/>
         <source>Select directory to ignore</source>
         <translation>Selecteer een map om te negeren</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="893"/>
+        <location filename="projectfiledialog.cpp" line="889"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="894"/>
+        <location filename="projectfiledialog.cpp" line="647"/>
+        <location filename="projectfiledialog.cpp" line="890"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="895"/>
+        <location filename="projectfiledialog.cpp" line="891"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="978"/>
+        <location filename="projectfiledialog.cpp" line="976"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="980"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2083,7 +2214,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="302"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2133,161 +2264,156 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="142"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="144"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="114"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">Bestand</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="115"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Regel</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="116"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Ernst</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="117"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="118"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="119"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="120"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">Overzicht</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="121"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="122"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="123"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="124"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="125"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="126"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
@@ -2335,37 +2461,37 @@ Options:
         <translation type="vanished">Niet gedefinieerd bestand</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="657"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="825"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="829"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="830"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="832"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="367"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="298"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2374,53 +2500,51 @@ Options:
         <translation type="vanished">Verberg</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="659"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation>Verberg alles met id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="681"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="660"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="370"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="656"/>
+        <location filename="resultstree.cpp" line="667"/>
         <source>Recheck %1 file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="658"/>
+        <location filename="resultstree.cpp" line="669"/>
         <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="701"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="703"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="733"/>
-        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="734"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2430,7 +2554,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 Configureer de bewerker toepassing voor cppcheck in voorkeuren/Applicaties.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="748"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2438,12 +2562,12 @@ Please select the default editor application in preferences/Applications.</sourc
 Selecteer de standaard bewerker in voorkeuren/Applicaties.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="768"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>Kon het bestand niet vinden!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="811"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2452,7 +2576,7 @@ Please check the application path and parameters are correct.</source>
 Gelieve te controleren of de het pad en de parameters correct zijn.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="833"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>Selecteer map</translation>
     </message>
@@ -2461,32 +2585,32 @@ Gelieve te controleren of de het pad en de parameters correct zijn.</translation
         <translation type="vanished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="349"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>Stijlfouten</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="352"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>Fouten</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="355"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="358"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>Presentatie</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="361"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>Portabiliteit</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="364"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>Informatie</translation>
     </message>
@@ -2494,122 +2618,124 @@ Gelieve te controleren of de het pad en de parameters correct zijn.</translation
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="255"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="274"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="326"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 van %2 bestanden gecontroleerd)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="350"/>
-        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="351"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>Geen fouten gevonden.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="358"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Fouten werden gevonden, maar volgens de configuratie zijn deze verborgen.
 Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>Kon rapport niet lezen.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="460"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="465"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="539"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="540"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="541"/>
+        <location filename="resultsview.cpp" line="538"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="549"/>
+        <location filename="resultsview.cpp" line="545"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="563"/>
+        <location filename="resultsview.cpp" line="559"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="565"/>
+        <location filename="resultsview.cpp" line="561"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="567"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="568"/>
+        <location filename="resultsview.cpp" line="564"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="237"/>
-        <location filename="resultsview.cpp" line="245"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>Kon het rapport niet opslaan.</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="26"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="147"/>
         <source>Results</source>
         <translation>Resultaten</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="60"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="148"/>
         <source>Critical errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="149"/>
         <source>Analysis Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="114"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="150"/>
         <source>Warning Details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2618,26 +2744,31 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
     <name>ScratchPad</name>
     <message>
         <location filename="scratchpad.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="107"/>
         <source>Scratchpad</source>
         <translation>Scratchpad</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="108"/>
         <source>Copy or write some C/C++ code here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="37"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="109"/>
         <source>Optionally enter a filename (mainly for automatic language detection) and click on &quot;Check&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="110"/>
         <source>filename</source>
         <translation>bestandsnaam</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="78"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="111"/>
         <source>Check</source>
         <translation>Controleer</translation>
     </message>
@@ -2646,21 +2777,25 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
     <name>Settings</name>
     <message>
         <location filename="settings.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="490"/>
         <source>Preferences</source>
         <translation>Instellingen</translation>
     </message>
     <message>
         <location filename="settings.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="502"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
         <location filename="settings.ui" line="196"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="503"/>
         <source>Add...</source>
         <translation>Toevoegen...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="491"/>
         <source>Number of threads: </source>
         <translation>Aantal threads: </translation>
     </message>
@@ -2670,57 +2805,68 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
     </message>
     <message>
         <location filename="settings.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="493"/>
         <source>Force checking all #ifdef configurations</source>
         <oldsource>Check all #ifdef configurations</oldsource>
         <translation>Controleer alle #ifdef combinaties</translation>
     </message>
     <message>
         <location filename="settings.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="494"/>
         <source>Show full path of files</source>
         <translation>Toon het volledige pad van bestanden</translation>
     </message>
     <message>
         <location filename="settings.ui" line="122"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="495"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>Toon &quot;Geen fouten gevonden&quot; indien geen fouten gevonden werden</translation>
     </message>
     <message>
         <location filename="settings.ui" line="129"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="496"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>Toon fout ld in kolom &quot;Id&quot;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="136"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="497"/>
         <source>Enable inline suppressions</source>
         <translation>Schakel inline suppressies in</translation>
     </message>
     <message>
         <location filename="settings.ui" line="143"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="498"/>
         <source>Check for inconclusive errors also</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="150"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="499"/>
         <source>Show statistics on check completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="157"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="500"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="177"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="501"/>
         <source>Show internal warnings in log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="521"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="294"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="512"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2728,117 +2874,143 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
         <location filename="settings.ui" line="305"/>
         <location filename="settings.ui" line="346"/>
         <location filename="settings.ui" line="391"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="513"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="523"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="324"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="515"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="332"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="516"/>
         <source>MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="518"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="526"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="378"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="522"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="401"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="524"/>
         <source>Visual Studio headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="407"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="525"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="533"/>
         <source>Code Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="527"/>
         <source>Code Editor Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="528"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="456"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="529"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="463"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="530"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="472"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="531"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="210"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="505"/>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <location filename="settings.ui" line="79"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="492"/>
         <source>Max count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="185"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="507"/>
         <source>Applications</source>
         <translation>Applicaties</translation>
     </message>
     <message>
         <location filename="settings.ui" line="203"/>
         <location filename="settings.ui" line="479"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="532"/>
         <source>Edit...</source>
         <translation>Bewerk...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="506"/>
         <source>Set as default</source>
         <translation>Instellen als standaard</translation>
     </message>
     <message>
         <location filename="settings.ui" line="240"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="510"/>
         <source>Reports</source>
         <translation>Rapporten</translation>
     </message>
     <message>
         <location filename="settings.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="508"/>
         <source>Save all errors when creating report</source>
         <translation>Alle fouten opslaan</translation>
     </message>
     <message>
         <location filename="settings.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="509"/>
         <source>Save full path to files in reports</source>
         <translation>Volledig pad opslaan</translation>
     </message>
     <message>
         <location filename="settings.ui" line="274"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="511"/>
         <source>Language</source>
         <translation>Taal</translation>
     </message>
@@ -2891,221 +3063,245 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="395"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="415"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>Statistieken</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="401"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>Project</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="33"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="396"/>
         <source>Project:</source>
         <translation>Project:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="53"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="397"/>
         <source>Paths:</source>
         <translation>Paden:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="85"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="398"/>
         <source>Include paths:</source>
         <translation>Bevat paden:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="399"/>
         <source>Defines:</source>
         <translation>Omschrijft:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="400"/>
         <source>Undefines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="407"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>Vorige scan</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="171"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="402"/>
         <source>Path Selected:</source>
         <translation>Pad Geselekteerd:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="181"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="403"/>
         <source>Number of Files Scanned:</source>
         <translation>Aantal bestanden gescanned:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="201"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="405"/>
         <source>Scan Duration:</source>
         <translation>Scan tijd:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="254"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="408"/>
         <source>Errors:</source>
         <translation>Fouten:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="271"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="409"/>
         <source>Warnings:</source>
         <translation>Waarschuwingen:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="410"/>
         <source>Stylistic warnings:</source>
         <translation>Stilistisch waarschuwingen:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="305"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="411"/>
         <source>Portability warnings:</source>
         <translation>Portabiliteit waarschuwingen:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="322"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="412"/>
         <source>Performance issues:</source>
         <translation>Presentatie problemen:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="413"/>
         <source>Information messages:</source>
         <translation>Informatie bericht:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="356"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="414"/>
         <source>Active checkers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="374"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="416"/>
         <source>Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="418"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="405"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="417"/>
         <source>File:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="419"/>
         <source>Copy to Clipboard</source>
         <translation>Kopieer naar Clipbord</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="420"/>
         <source>Pdf Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 dag</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 dagen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1 uur</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 uren</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1 minuut</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 minuten</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 seconde</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 secondes</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 secondes</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="171"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> en </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="198"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>Project instellingen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>Paden</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>Bevat paden</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>Omschrijft</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>Pad Geselekteerd</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>Aantal bestanden gescanned</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>Scan tijd</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>Fouten</translation>
     </message>
@@ -3120,40 +3316,49 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>Waarschuwingen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>Stijl waarschuwingen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>Portabiliteit waarschuwingen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>Presentatie waarschuwingen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>Informatie bericht</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_threaddetails.h" line="47"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="46"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 van %2 bestanden gecontroleerd</translation>
     </message>
@@ -3174,9 +3379,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 De gebruikerstaal is gereset naar Engels. Open het dialoogvenster om een van de beschikbare talen te selecteren.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_ru.ts b/gui/cppcheck_ru.ts
index 3256348229a..d9a1a27c0a2 100644
--- a/gui/cppcheck_ru.ts
+++ b/gui/cppcheck_ru.ts
@@ -5,27 +5,32 @@
     <name>About</name>
     <message>
         <location filename="about.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="130"/>
         <source>About Cppcheck</source>
         <translation>О Cppcheck</translation>
     </message>
     <message>
         <location filename="about.ui" line="64"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="132"/>
         <source>Version %1</source>
         <translation>Вер�и� %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="133"/>
         <source>Cppcheck - A tool for static C/C++ code analysis.</source>
         <translation>Cppcheck - программа дл� �татиче�кого анализа кода на �зыках С/С++.</translation>
     </message>
     <message>
         <location filename="about.ui" line="81"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="134"/>
         <source>Copyright © 2007-%1 Cppcheck team.</source>
         <oldsource>Copyright © 2007-2021 Cppcheck team.</oldsource>
         <translation type="unfinished">Copyright © 2007-2021 Cppcheck team.</translation>
     </message>
     <message>
         <location filename="about.ui" line="91"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="135"/>
         <source>This program is licensed under the terms
 of the GNU General Public License version 3</source>
         <translation>Эта программа ра�про�тран�ет�� на
@@ -33,11 +38,13 @@ of the GNU General Public License version 3</source>
     </message>
     <message>
         <location filename="about.ui" line="102"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="137"/>
         <source>Visit Cppcheck homepage at %1</source>
         <translation>По�етите домашнюю �траницу: %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;pcre&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;picojson&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tinyxml2&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
         <translation type="unfinished"></translation>
@@ -47,11 +54,13 @@ of the GNU General Public License version 3</source>
     <name>ApplicationDialog</name>
     <message>
         <location filename="applicationdialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="161"/>
         <source>Add an application</source>
         <translation>Добавление приложени�</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="162"/>
         <source>Here you can add an application that can open error files. Specify a name for the application, the application executable and command line parameters for the application.
 
 The following texts in parameters are replaced with appropriate values when application is executed:
@@ -77,21 +86,25 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="173"/>
         <source>&amp;Name:</source>
         <translation>&amp;�азвание:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="86"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="174"/>
         <source>&amp;Executable:</source>
         <translation>&amp;Программа:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="96"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="175"/>
         <source>&amp;Parameters:</source>
         <translation>&amp;Параметры:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="138"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="176"/>
         <source>Browse</source>
         <translation>Про�мотреть</translation>
     </message>
@@ -106,9 +119,8 @@ Parameters: -l(line) (file)</source>
         <translation>Выберите приложение</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -116,70 +128,6 @@ Parameters: -l(line) (file)</source>
         <translation>Вы должны задать название и путь к приложению!</translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -190,10 +138,8 @@ Parameters: -l(line) (file)</source>
         <translation>�евозможно найти файл: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -205,44 +151,49 @@ Parameters: -l(line) (file)</source>
     <name>HelpDialog</name>
     <message>
         <location filename="helpdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="88"/>
         <source>Cppcheck GUI help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="89"/>
         <source>Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="90"/>
         <source>Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
     <name>LibraryAddFunctionDialog</name>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="105"/>
         <source>Add function</source>
         <translation>Добавить функцию</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="106"/>
         <source>Function name(s)</source>
         <translation>Им�(имена) функции</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="107"/>
         <source>Number of arguments</source>
         <translation>Количе�тво аргументов</translation>
     </message>
@@ -251,126 +202,140 @@ Parameters: -l(line) (file)</source>
     <name>LibraryDialog</name>
     <message>
         <location filename="librarydialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="275"/>
         <source>Library Editor</source>
         <translation>Редактор библиотек</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="22"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="276"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="29"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="277"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="36"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="278"/>
         <source>Save as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="62"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="279"/>
         <source>Functions</source>
         <translation>Функции</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="280"/>
         <source>Sort</source>
         <translation>Сортировать</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="111"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="281"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="282"/>
         <source>Filter:</source>
         <translation>Фильтр:</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="164"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="283"/>
         <source>Comments</source>
         <translation>Комментарии</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="204"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="284"/>
         <source>noreturn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="212"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="285"/>
         <source>False</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="286"/>
         <source>True</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="222"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="287"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="232"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="289"/>
         <source>return value must be used</source>
         <translation>должно быть и�пользовано возвращаемое значение</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="239"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="290"/>
         <source>ignore function in leaks checking</source>
         <translation>пропу�кать функцию при проверке на утечки</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="291"/>
         <source>Arguments</source>
         <translation>�ргументы</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="258"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="292"/>
         <source>Edit</source>
         <translation>Изменить</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation>Файлы библиотек (*.cfg)</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation>Открыть файл библиотеки</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation>�евозможно открыть файл %1.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation>Ошибка загрузки %1. %2.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation>�евозможно �охранить файл %1.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation>Сохранить библиотеку как</translation>
     </message>
@@ -379,11 +344,13 @@ Parameters: -l(line) (file)</source>
     <name>LibraryEditArgDialog</name>
     <message>
         <location filename="libraryeditargdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="284"/>
         <source>Edit argument</source>
         <translation>Редактировать аргумент</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="286"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is bool value allowed? For instance result from comparison or from &apos;!&apos; operator.&lt;/p&gt;
 &lt;p&gt;Typically, set this if the argument is a pointer, size, etc.&lt;/p&gt;
@@ -394,11 +361,13 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="28"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="293"/>
         <source>Not bool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="35"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is a null parameter value allowed?&lt;/p&gt;
 &lt;p&gt;Typically this should be used on any pointer parameter that does not allow null.&lt;/p&gt;
@@ -409,78 +378,99 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="43"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="302"/>
         <source>Not null</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="50"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="303"/>
         <source>Not uninit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="57"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="304"/>
         <source>String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="70"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="305"/>
         <source>Format string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="306"/>
         <source>Min size of buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="101"/>
         <location filename="libraryeditargdialog.ui" line="203"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="307"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="316"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="109"/>
         <location filename="libraryeditargdialog.ui" line="214"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="308"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="317"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="114"/>
         <location filename="libraryeditargdialog.ui" line="219"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="309"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="318"/>
         <source>argvalue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="119"/>
         <location filename="libraryeditargdialog.ui" line="224"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="319"/>
         <source>mul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="124"/>
         <location filename="libraryeditargdialog.ui" line="229"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="311"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="320"/>
         <source>strlen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="132"/>
         <location filename="libraryeditargdialog.ui" line="237"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="313"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="322"/>
         <source>Arg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="159"/>
         <location filename="libraryeditargdialog.ui" line="264"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="323"/>
         <source>Arg2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="194"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="315"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="324"/>
         <source>Valid values</source>
         <translation type="unfinished"></translation>
     </message>
@@ -488,613 +478,704 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="687"/>
-        <location filename="mainwindow.cpp" line="463"/>
-        <location filename="mainwindow.cpp" line="667"/>
-        <location filename="mainwindow.cpp" line="752"/>
-        <location filename="mainwindow.cpp" line="857"/>
-        <location filename="mainwindow.cpp" line="879"/>
-        <location filename="mainwindow.cpp" line="1466"/>
-        <location filename="mainwindow.cpp" line="1595"/>
-        <location filename="mainwindow.cpp" line="1936"/>
-        <location filename="mainwindow.cpp" line="1944"/>
-        <location filename="mainwindow.cpp" line="1998"/>
-        <location filename="mainwindow.cpp" line="2007"/>
-        <location filename="mainwindow.cpp" line="2079"/>
-        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="209"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="745"/>
         <source>A&amp;nalyze</source>
         <translation>�нализ</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="266"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="749"/>
         <source>Standard</source>
         <translation>Стандартные</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="740"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="741"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="742"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Панель ин�трументов</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="213"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="746"/>
         <source>C++ standard</source>
         <translation>Стандарт C++</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="225"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="747"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation>&amp;Стандарт C</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="748"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="578"/>
         <source>&amp;License...</source>
         <translation>&amp;Лицензи�...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="319"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="579"/>
         <source>A&amp;uthors...</source>
         <translation>&amp;�вторы...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="328"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="580"/>
         <source>&amp;About...</source>
         <translation>&amp;О программе...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="333"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="581"/>
         <source>&amp;Files...</source>
         <translation>&amp;Файлы...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="336"/>
         <location filename="mainwindow.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="582"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="584"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation>Проверить файлы</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="342"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="587"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="351"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="589"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Каталог...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="354"/>
         <location filename="mainwindow.ui" line="357"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="590"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="592"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation>Проверка каталога</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="595"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="599"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="602"/>
         <source>&amp;Stop</source>
         <translation>О�тановить</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="393"/>
         <location filename="mainwindow.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="603"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="605"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation>О�тановить проверку</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="608"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="610"/>
         <source>&amp;Save results to file...</source>
         <translation>Сохранить отчёт в файл...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="411"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="612"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="416"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="614"/>
         <source>&amp;Quit</source>
         <translation>Выход</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="428"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="618"/>
         <source>&amp;Clear results</source>
         <translation>Очи�тить отчёт</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="619"/>
         <source>&amp;Preferences</source>
         <translation>Параметры</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="470"/>
         <location filename="mainwindow.ui" line="473"/>
-        <location filename="mainwindow.cpp" line="2379"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="626"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="628"/>
+        <location filename="mainwindow.cpp" line="2408"/>
         <source>Show errors</source>
         <translation>Показать ошибки</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="616"/>
         <location filename="mainwindow.ui" line="619"/>
-        <location filename="mainwindow.cpp" line="2380"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="668"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="670"/>
+        <location filename="mainwindow.cpp" line="2409"/>
         <source>Show warnings</source>
         <translation>Показать предупреждени�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="634"/>
         <location filename="mainwindow.ui" line="637"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="673"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="675"/>
         <source>Show performance warnings</source>
         <translation>Показать предупреждени� производительно�ти</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="645"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="677"/>
         <source>Show &amp;hidden</source>
         <translation>Показать �крытые</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1015"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Information</source>
         <translation>Информационные �ообщени�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="660"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="680"/>
         <source>Show information messages</source>
         <translation>Показать информационные �ообщени�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="675"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="684"/>
         <source>Show portability warnings</source>
         <translation>Показать предупреждени� перено�имо�ти</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="690"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="687"/>
         <source>Show Cppcheck results</source>
         <translation>Про�мотр результатов Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="702"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="689"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="705"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="691"/>
         <source>Show Clang results</source>
         <translation>Про�мотр результатов Clang</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="713"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="693"/>
         <source>&amp;Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="716"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="695"/>
         <source>Filter results</source>
         <translation>Результаты фильтрации</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="732"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="697"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit ANSI</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="740"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="698"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit Unicode</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="748"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="699"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="756"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="700"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="764"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="701"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="858"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="709"/>
         <source>&amp;Print...</source>
         <translation>Печать...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="861"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="711"/>
         <source>Print the Current Report</source>
         <translation>�апечатать текущий отчет</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="866"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="713"/>
         <source>Print Pre&amp;view...</source>
         <translation>Предварительный про�мотр...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="869"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="715"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation>Открыть диалог печати дл� текущих результатов</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="877"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="719"/>
         <source>Open library editor</source>
         <translation>Открыть редактор библиотек</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="478"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="630"/>
         <source>&amp;Check all</source>
         <translation>Отметить в�е</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="738"/>
         <source>Checking for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="100"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="739"/>
         <source>Hide</source>
         <translation type="unfinished">Скрыть</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="163"/>
         <location filename="mainwindow.ui" line="979"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="730"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="743"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="303"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="751"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="369"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="597"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation>Заново проверить измененные файлы</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="381"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="601"/>
         <source>Reanal&amp;yze all files</source>
         <translation>Заново проверить в�е файлы</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="419"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="616"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="620"/>
         <source>Style war&amp;nings</source>
         <translation>Стили�тиче�кие предупреждени�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="467"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="625"/>
         <source>E&amp;rrors</source>
         <translation>Ошибки</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="483"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="631"/>
         <source>&amp;Uncheck all</source>
         <translation>Сбро�ить в�е</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="488"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="632"/>
         <source>Collapse &amp;all</source>
         <translation>Свернуть в�е</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="493"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="633"/>
         <source>&amp;Expand all</source>
         <translation>Развернуть в�е</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="501"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="634"/>
         <source>&amp;Standard</source>
         <translation>Стандартные</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="636"/>
         <source>Standard items</source>
         <translation>Стандартные �лементы</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="645"/>
         <source>Toolbar</source>
         <translation>Панель ин�трументов</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="528"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="646"/>
         <source>&amp;Categories</source>
         <translation>Категории</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="531"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="648"/>
         <source>Error categories</source>
         <translation>Категории ошибок</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="536"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="650"/>
         <source>&amp;Open XML...</source>
         <translation>&amp;Открыть XML...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="545"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="651"/>
         <source>Open P&amp;roject File...</source>
         <translation>Открыть файл &amp;проекта...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="548"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="653"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="655"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>Показать Блокнот</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="562"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="656"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;�овый файл проекта...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="565"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="658"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="570"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="660"/>
         <source>&amp;Log View</source>
         <translation>По�мотреть &amp;лог</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="573"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="662"/>
         <source>Log View</source>
         <translation>По�мотреть лог</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="581"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="664"/>
         <source>C&amp;lose Project File</source>
         <translation>&amp;Закрыть файл проекта</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="589"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="665"/>
         <source>&amp;Edit Project File...</source>
         <translation>&amp;Изменить файл проекта...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="601"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="666"/>
         <source>&amp;Statistics</source>
         <translation>&amp;Стати�тика</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="613"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="667"/>
         <source>&amp;Warnings</source>
         <translation>Предупреждени�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="631"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="672"/>
         <source>Per&amp;formance warnings</source>
         <translation>Предупреждени� производительно�ти</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="657"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="678"/>
         <source>&amp;Information</source>
         <translation>Информационные предупреждени�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="672"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="682"/>
         <source>&amp;Portability</source>
         <translation>Предупреждени� перено�имо�ти</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="772"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="702"/>
         <source>P&amp;latforms</source>
         <translation>Платформы</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="786"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="703"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="797"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="704"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="805"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="705"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="813"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="706"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="845"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="707"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="853"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="708"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="874"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="717"/>
         <source>&amp;Library Editor...</source>
         <translation>Редактор библиотеки</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="721"/>
         <source>&amp;Auto-detect language</source>
         <translation>�втоматиче�кое определение �зыка</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="893"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="722"/>
         <source>&amp;Enforce C++</source>
         <translation>Принудительно C++</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="901"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="723"/>
         <source>E&amp;nforce C</source>
         <translation>Принудительно C</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="912"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="724"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="920"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="725"/>
         <source>Reanalyze and check library</source>
         <translation>Повторный анализ библиотеки</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="928"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="726"/>
         <source>Check configuration (defines, includes)</source>
         <translation>Проверить конфигурацию (defines, includes)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="936"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="727"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="728"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="729"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="987"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="731"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="995"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1003"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1011"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1019"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="732"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1027"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="733"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1035"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="734"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1040"/>
-        <source>EULA...</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="736"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="509"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="638"/>
         <source>&amp;Contents</source>
         <translation>Помощь</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="284"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="750"/>
         <source>Categories</source>
         <translation>Категории</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="452"/>
         <location filename="mainwindow.ui" line="455"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="621"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="623"/>
         <source>Show style warnings</source>
         <translation>Показать �тили�тиче�кие предупреждени�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="512"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="640"/>
         <source>Open the help contents</source>
         <translation>Открыть помощь</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="515"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="643"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="198"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="744"/>
         <source>&amp;Help</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="155"/>
-        <location filename="mainwindow.cpp" line="1781"/>
+        <location filename="mainwindow.cpp" line="176"/>
+        <location filename="mainwindow.cpp" line="1812"/>
         <source>Quick Filter:</source>
         <translation>Бы�трый фильтр:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="601"/>
+        <source>None of the selected files is part of the project, nothing to analyze.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select configuration</source>
         <translation>Выбор конфигурации</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="858"/>
+        <location filename="mainwindow.cpp" line="890"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1103,97 +1184,97 @@ Do you want to load this project file instead?</source>
 Вы хотите загрузить �тот проект?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="992"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>File not found</source>
         <translation>Файл не найден</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="995"/>
+        <location filename="mainwindow.cpp" line="1027"/>
         <source>Bad XML</source>
         <translation>�екорректный XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1030"/>
         <source>Missing attribute</source>
         <translation>Пропущен атрибут</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1001"/>
+        <location filename="mainwindow.cpp" line="1033"/>
         <source>Bad attribute value</source>
         <translation>�екорректное значение атрибута</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1004"/>
+        <location filename="mainwindow.cpp" line="1036"/>
         <source>Unsupported format</source>
         <translation>�еподдерживаемый формат</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1013"/>
+        <location filename="mainwindow.cpp" line="1045"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation>�е удало�ь загрузить выбранную библиотеку &apos;%1&apos;.
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1035"/>
+        <location filename="mainwindow.cpp" line="1064"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1058"/>
+        <location filename="mainwindow.cpp" line="1087"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1120"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1700"/>
         <source>License</source>
         <translation>Лицензи�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1654"/>
+        <location filename="mainwindow.cpp" line="1707"/>
         <source>Authors</source>
         <translation>�вторы</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1674"/>
+        <location filename="mainwindow.cpp" line="1727"/>
         <source>Save the report file</source>
         <translation>Сохранить файл � отчетом</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1482"/>
-        <location filename="mainwindow.cpp" line="1681"/>
+        <location filename="mainwindow.cpp" line="1539"/>
+        <location filename="mainwindow.cpp" line="1734"/>
         <source>XML files (*.xml)</source>
         <translation>XML-файлы (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="458"/>
+        <location filename="mainwindow.cpp" line="477"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -1202,42 +1283,37 @@ This is probably because the settings were changed between the Cppcheck versions
 Возможно, �то �в�зано � изменени�ми в вер�ии программы. Пожалуй�та, проверьте (и и�правьте) на�тройки приложени�.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="753"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>Вы должны закрыть проект перед выбором новых файлов или каталогов!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1015"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>Библиотека &apos;%1&apos; �одержит неизве�тные �лементы:
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1007"/>
+        <location filename="mainwindow.cpp" line="1039"/>
         <source>Duplicate platform type</source>
         <translation>Дубликат типа платформы</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1010"/>
+        <location filename="mainwindow.cpp" line="1042"/>
         <source>Platform type redefined</source>
         <translation>Переобъ�вление типа платформы</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1016"/>
+        <location filename="mainwindow.cpp" line="1048"/>
         <source>Unknown element</source>
         <translation>�еизве�тный �лемент</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1019"/>
-        <source>Unknown issue</source>
-        <translation>�еизве�тна� проблема</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1080"/>
-        <location filename="mainwindow.cpp" line="1090"/>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1120"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
@@ -1246,80 +1322,78 @@ This is probably because the settings were changed between the Cppcheck versions
         <translation type="vanished">�евозможно загрузить %1. Cppcheck у�тановлен некорректно. Вы можете и�пользовать --data-dir=&lt;directory&gt; в командной �троке дл� указани� ра�положени� файлов конфигурации. Обратите внимание, что --data-dir предназначен дл� и�пользовани� �ценари�ми у�тановки. При включении данной опции, графиче�кий интерфей� пользовател� не запу�кает��.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1484"/>
+        <location filename="mainwindow.cpp" line="1541"/>
         <source>Open the report file</source>
         <translation>Открыть файл � отчетом</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1685"/>
+        <location filename="mainwindow.cpp" line="1738"/>
         <source>Text files (*.txt)</source>
         <translation>Тек�товые файлы (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1689"/>
+        <location filename="mainwindow.cpp" line="1742"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV файлы(*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1819"/>
+        <location filename="mainwindow.cpp" line="1850"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Файлы проекта (*.cppcheck);;В�е файлы(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="1852"/>
         <source>Select Project File</source>
         <translation>Выберите файл проекта</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="239"/>
-        <location filename="mainwindow.cpp" line="1783"/>
-        <location filename="mainwindow.cpp" line="1849"/>
-        <location filename="mainwindow.cpp" line="2047"/>
+        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="1814"/>
+        <location filename="mainwindow.cpp" line="1880"/>
+        <location filename="mainwindow.cpp" line="2062"/>
         <source>Project:</source>
         <translation>Проект:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="668"/>
+        <location filename="mainwindow.cpp" line="702"/>
         <source>No suitable files found to analyze!</source>
         <translation>�е найдено подход�щих файлов дл� анализа</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="767"/>
+        <location filename="mainwindow.cpp" line="798"/>
         <source>C/C++ Source</source>
         <translation>И�ходный код C/C++</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="768"/>
+        <location filename="mainwindow.cpp" line="799"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
-        <translation type="unfinished">Visual Studio</translation>
+        <translation type="obsolete">Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
-        <translation type="unfinished">Borland C++ Builder 6</translation>
+        <translation type="obsolete">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="773"/>
+        <location filename="mainwindow.cpp" line="804"/>
         <source>Select files to analyze</source>
         <translation>Выбор файлов дл� анализа</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="819"/>
         <source>Select directory to analyze</source>
         <translation>Выбор каталога дл� анализа</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>Выбор и�пользуемой конфигурации</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="880"/>
+        <location filename="mainwindow.cpp" line="912"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1328,7 +1402,7 @@ Do you want to proceed analysis without using any of these project files?</sourc
 Вы хотите продолжить анализ без и�пользовани� �тих файлов проекта?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1467"/>
+        <location filename="mainwindow.cpp" line="1524"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1339,7 +1413,7 @@ Do you want to proceed?</source>
 Вы хотите продолжить?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1591"/>
+        <location filename="mainwindow.cpp" line="1644"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1348,109 +1422,104 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 Вы хотите о�тановить анализ и выйти из Cppcheck?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1633"/>
+        <location filename="mainwindow.cpp" line="1686"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1672"/>
+        <location filename="mainwindow.cpp" line="1725"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML файлы (*.xml);;Тек�товые файлы (*.txt);;CSV файлы (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1712"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1937"/>
+        <location filename="mainwindow.cpp" line="1951"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>Директори� дл� �борки &apos;%1&apos; не �уще�твует, �оздать?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1945"/>
+        <location filename="mainwindow.cpp" line="1959"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1977"/>
+        <location filename="mainwindow.cpp" line="1992"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1995"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1983"/>
+        <location filename="mainwindow.cpp" line="1998"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1999"/>
+        <location filename="mainwindow.cpp" line="2014"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2008"/>
+        <location filename="mainwindow.cpp" line="2023"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2352"/>
+        <location filename="mainwindow.cpp" line="2381"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2353"/>
+        <location filename="mainwindow.cpp" line="2382"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2354"/>
+        <location filename="mainwindow.cpp" line="2383"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2355"/>
+        <location filename="mainwindow.cpp" line="2384"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2372"/>
+        <location filename="mainwindow.cpp" line="2401"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2373"/>
+        <location filename="mainwindow.cpp" line="2402"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2374"/>
+        <location filename="mainwindow.cpp" line="2403"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2381"/>
+        <location filename="mainwindow.cpp" line="2410"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2382"/>
+        <location filename="mainwindow.cpp" line="2411"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2383"/>
+        <location filename="mainwindow.cpp" line="2412"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2384"/>
+        <location filename="mainwindow.cpp" line="2413"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1459,22 +1528,22 @@ Analysis is stopped.</source>
         <translation type="vanished">�евозможно импортировать &apos;%1&apos;, анализ о�тановлен</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2032"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project files (*.cppcheck)</source>
         <translation>Файлы проекта (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2034"/>
+        <location filename="mainwindow.cpp" line="2049"/>
         <source>Select Project Filename</source>
         <translation>Выберите им� файла дл� проекта</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2080"/>
+        <location filename="mainwindow.cpp" line="2095"/>
         <source>No project file loaded</source>
         <translation>Файл � проектом не загружен</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2148"/>
+        <location filename="mainwindow.cpp" line="2177"/>
         <source>The project file
 
 %1
@@ -1490,12 +1559,12 @@ Do you want to remove the file from the recently used projects -list?</source>
 Хотите удалить его из �пи�ка проектов?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2310"/>
+        <location filename="mainwindow.cpp" line="2339"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2314"/>
+        <location filename="mainwindow.cpp" line="2343"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1552,26 +1621,31 @@ Options:
     <name>NewSuppressionDialog</name>
     <message>
         <location filename="newsuppressiondialog.ui" line="17"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="114"/>
         <source>New suppression</source>
         <translation>�овое подавление</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="25"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="115"/>
         <source>Error ID</source>
         <translation>ID</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="32"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="116"/>
         <source>File name</source>
         <translation>Им� файла</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="42"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="117"/>
         <source>Line number</source>
         <translation>�омер �троки</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="52"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="118"/>
         <source>Symbol name</source>
         <translation>Им� �имвола</translation>
     </message>
@@ -1589,102 +1663,111 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit ANSI</translation>
+        <translation type="vanished">Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit Unicode</translation>
+        <translation type="vanished">Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
 </context>
 <context>
     <name>ProjectFile</name>
     <message>
         <location filename="projectfile.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="923"/>
         <source>Project File</source>
         <translation>Файл проекта</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="955"/>
         <source>Paths and Defines</source>
         <translation>Каталоги и определени�</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="30"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="924"/>
         <source>Import Project (Visual studio / compile database/ Borland C++ Builder 6)</source>
         <oldsource>Import Project (Visual studio / compile database)</oldsource>
         <translation>Импорт проекта (Visual studio / compile database/ Borland C++ Builder 6)</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="231"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="938"/>
         <source>Defines must be separated by a semicolon. Example: DEF1;DEF2=5;DEF3=int</source>
         <oldsource>Defines must be separated by a semicolon &apos;;&apos;</oldsource>
         <translation>Defines должны быть разделены точкой � зап�той &apos;;&apos;</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="958"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation>Положите �вои .cfg-файлы в один каталог � файлом проекта. Вы увидите их �верху.</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="967"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="974"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="978"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="981"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="985"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="989"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="991"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="992"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="993"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1693,314 +1776,389 @@ Options:
         <translation type="vanished">MISRA C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="876"/>
+        <location filename="projectfile.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1011"/>
         <source>MISRA rule texts</source>
         <translation>Файл � тек�тами правил MISRA</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="883"/>
+        <location filename="projectfile.ui" line="892"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1013"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Скопируйте тек�т из Appendix A &amp;quot;Summary of guidelines&amp;quot; из фала правил MISRA C 2012 pdf в тек�товый файл.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="890"/>
+        <location filename="projectfile.ui" line="899"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1015"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="73"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="928"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You have a choice:&lt;/p&gt;&lt;p&gt; * Analyze all Debug and Release configurations&lt;/p&gt;&lt;p&gt; * Only analyze the first matching Debug configuration&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Выберите:&lt;/p&gt;&lt;p&gt; * �нализ в�ех конфигураций Debug и Release&lt;/p&gt;&lt;p&gt; * �нализ только первой подход�щей конфигурации Debug&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="926"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="964"/>
         <source>Browse...</source>
         <translation>Обзор...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="930"/>
         <source>Analyze all Visual Studio configurations</source>
         <translation>�нализировать в�е конфигурации Visual Studio</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="113"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="931"/>
         <source>Selected VS Configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="147"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="932"/>
         <source>Paths:</source>
         <translation>Пути:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="181"/>
         <location filename="projectfile.ui" line="296"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="933"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="945"/>
         <source>Add...</source>
         <translation>Добавить...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="934"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="994"/>
         <source>Edit</source>
         <translation>Изменить</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="935"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="995"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="998"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="242"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="940"/>
         <source>Undefines:</source>
         <translation>Удаленные макроопределени�:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="252"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="942"/>
         <source>Undefines must be separated by a semicolon. Example: UNDEF1;UNDEF2;UNDEF3</source>
         <translation>Удаленные макроопределени� должны быть разделены точкой � зап�той, например: UNDEF1;UNDEF2;UNDEF3</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="265"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="944"/>
         <source>Include Paths:</source>
         <translation>Пути заголовочных файлов:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="950"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="952"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="954"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="959"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="972"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="982"/>
         <source>Analysis</source>
         <translation>�нализ</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="962"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="965"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="966"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="968"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="969"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="970"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="971"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="976"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="977"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="979"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished">Проверить код в неи�пользуемых шаблонах</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="980"/>
         <source>Max CTU depth</source>
         <translation>Мак�имальна� глубина CTU</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="999"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished">Включить inline-подавление ошибок</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="851"/>
+        <location filename="projectfile.ui" line="860"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1009"/>
         <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="901"/>
+        <location filename="projectfile.ui" line="910"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1016"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="918"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1017"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="937"/>
+        <location filename="projectfile.ui" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1020"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="946"/>
+        <location filename="projectfile.ui" line="955"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1021"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="965"/>
+        <location filename="projectfile.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1023"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="981"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1024"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1026"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="991"/>
+        <location filename="projectfile.ui" line="1007"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1027"/>
         <source>External tools</source>
         <translation>Внешние ин�трументы</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="330"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="948"/>
         <source>Up</source>
         <translation>Вверх</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="337"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="949"/>
         <source>Down</source>
         <translation>Вниз</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="956"/>
         <source>Platform</source>
         <translation>Платформа</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1000"/>
         <source>Warning options</source>
         <translation>Опции предупреждений</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="983"/>
         <source>Root path:</source>
         <translation>Корневой каталог:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="987"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>Теги предупреждений (через &apos;;&apos;)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="960"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation>Каталог �борки Cppcheck</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="957"/>
         <source>Libraries</source>
         <translation>Библиотеки</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="996"/>
         <source>Suppressions</source>
         <translation>Подавлени�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="997"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1001"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1028"/>
         <source>Addons</source>
         <translation>Дополнени�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1002"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1003"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1004"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1005"/>
         <source>Coding standards</source>
         <translation>Стандарты кодировани�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1006"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1007"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="914"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1008"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1018"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="958"/>
+        <location filename="projectfile.ui" line="967"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1022"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="975"/>
+        <location filename="projectfile.ui" line="991"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1025"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="projectfile.ui" line="1004"/>
-        <source>Clang analyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="997"/>
-        <source>Clang-tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="936"/>
         <source>Defines:</source>
         <translation>Объ�вленные макроопределени�:</translation>
     </message>
@@ -2013,77 +2171,86 @@ Options:
         <translation>Файл проекта: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="604"/>
+        <location filename="projectfiledialog.cpp" line="585"/>
         <source>Select Cppcheck build dir</source>
         <translation>Выбрать директорию �борки Cppcheck</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="865"/>
+        <location filename="projectfiledialog.cpp" line="861"/>
         <source>Select include directory</source>
         <translation>Выберите директорию дл� пои�ка заголовочных файлов</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="845"/>
+        <location filename="projectfiledialog.cpp" line="841"/>
         <source>Select a directory to check</source>
         <translation>Выберите директорию дл� проверки</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="414"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="477"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (не найден)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="644"/>
+        <location filename="projectfiledialog.cpp" line="625"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="646"/>
+        <location filename="projectfiledialog.cpp" line="627"/>
         <source>Import Project</source>
         <translation>Импорт проекта</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="885"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
+        <source>C/C++ header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="648"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="881"/>
         <source>Select directory to ignore</source>
         <translation>Выберите директорию, которую надо проигнорировать</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="893"/>
+        <location filename="projectfiledialog.cpp" line="889"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="894"/>
+        <location filename="projectfiledialog.cpp" line="647"/>
+        <location filename="projectfiledialog.cpp" line="890"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="895"/>
+        <location filename="projectfiledialog.cpp" line="891"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="978"/>
+        <location filename="projectfiledialog.cpp" line="976"/>
         <source>Select MISRA rule texts file</source>
         <translation>Выбрать файл тек�тов правил MISRA</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="980"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>MISRA rule texts file (%1)</source>
         <translation>Файл тек�тов правил MISRA (%1)</translation>
     </message>
@@ -2118,7 +2285,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="302"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation> (�едо�тупно)</translation>
     </message>
@@ -2168,161 +2335,156 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="142"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="144"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="114"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">Файл</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="115"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Строка</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="116"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Важно�ть</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="117"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="118"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="119"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished">Спорное</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="120"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">Кратко</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="121"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="122"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="123"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="124"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished">�ачина� � даты</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="125"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="126"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
@@ -2370,37 +2532,37 @@ Options:
         <translation type="vanished">�еопределенный файл</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="657"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="825"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation>�евозможно найти файл:</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="829"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation>Выберите каталог &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="830"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>Выбрать каталог &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="832"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation>Укажите каталог � ра�положением файла.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="367"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>отлаживать</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="298"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation>заметка</translation>
     </message>
@@ -2413,53 +2575,51 @@ Options:
         <translation type="vanished">Скрыть</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="659"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation>Скрыть в�е � id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="681"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation>Подавить выбранные id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="660"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation>Открыть �одержащую папку</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="370"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="656"/>
+        <location filename="resultstree.cpp" line="667"/>
         <source>Recheck %1 file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="658"/>
+        <location filename="resultstree.cpp" line="669"/>
         <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="701"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation>Тег</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="703"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation>Тег от�ут�твует</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="733"/>
-        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="734"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2468,7 +2628,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 Сконфигурируйте приложение редактора дл� Cppcheck в предпочтени�х/Приложени�х.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="748"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2476,12 +2636,12 @@ Please select the default editor application in preferences/Applications.</sourc
 Выберите приложение редактора по умолчанию в предпочтени�х/Приложени�х.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="768"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>�е удает�� найти файл!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="811"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2489,7 +2649,7 @@ Please check the application path and parameters are correct.</source>
 Пожалуй�та, проверьте путь приложени�, и верны ли параметры.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="833"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>Выберите директорию</translation>
     </message>
@@ -2506,32 +2666,32 @@ Please check the application path and parameters are correct.</source>
         <translation type="vanished">�ачина� � даты</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="349"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>�тиль</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="352"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>ошибка</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="355"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>предупреждение</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="358"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>производительно�ть</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="361"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>перено�имо�ть</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="364"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>информаци�</translation>
     </message>
@@ -2539,122 +2699,124 @@ Please check the application path and parameters are correct.</source>
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="255"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>Ра�печатать отчет</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="274"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation>Ошибок не найдено, нечего ра�печатывать.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="326"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 из %2 файлов проверено)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="350"/>
-        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="351"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>Ошибок не найдено.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="358"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Были обнаружены ошибки, но они на�троены быть �крыты.
 Дл� переключени� какие ошибки отображают��, откройте меню пред�тавлени�.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>�е удало�ь прочитать отчет.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>XML формат вер�ии 1 больше не поддерживает��.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="460"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation>Только первый включенный</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="465"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="539"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Clear Log</source>
         <translation>Очи�тить лог</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="540"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy this Log entry</source>
         <translation>Скопировать данную запи�ь</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="541"/>
+        <location filename="resultsview.cpp" line="538"/>
         <source>Copy complete Log</source>
         <translation>Скопировать полный лог</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="549"/>
+        <location filename="resultsview.cpp" line="545"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="563"/>
+        <location filename="resultsview.cpp" line="559"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="565"/>
+        <location filename="resultsview.cpp" line="561"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="567"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="568"/>
+        <location filename="resultsview.cpp" line="564"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="237"/>
-        <location filename="resultsview.cpp" line="245"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>�е удало�ь �охранить отчет.</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="26"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="147"/>
         <source>Results</source>
         <translation>Результаты</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="60"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="148"/>
         <source>Critical errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="149"/>
         <source>Analysis Log</source>
         <translation>Лог анализа</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="114"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="150"/>
         <source>Warning Details</source>
         <translation>Детали предупреждени�</translation>
     </message>
@@ -2663,26 +2825,31 @@ To toggle what kind of errors are shown, open view menu.</source>
     <name>ScratchPad</name>
     <message>
         <location filename="scratchpad.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="107"/>
         <source>Scratchpad</source>
         <translation>Блокнот</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="108"/>
         <source>Copy or write some C/C++ code here:</source>
         <translation>И�ходный код C/C++:</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="37"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="109"/>
         <source>Optionally enter a filename (mainly for automatic language detection) and click on &quot;Check&quot;:</source>
         <translation>При необходимо�ти введите им� файла и нажмите &quot;Проверить&quot;:</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="110"/>
         <source>filename</source>
         <translation>им� файла</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="78"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="111"/>
         <source>Check</source>
         <translation>Проверить</translation>
     </message>
@@ -2691,21 +2858,25 @@ To toggle what kind of errors are shown, open view menu.</source>
     <name>Settings</name>
     <message>
         <location filename="settings.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="490"/>
         <source>Preferences</source>
         <translation>Параметры</translation>
     </message>
     <message>
         <location filename="settings.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="502"/>
         <source>General</source>
         <translation>Общие</translation>
     </message>
     <message>
         <location filename="settings.ui" line="196"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="503"/>
         <source>Add...</source>
         <translation>Добавить...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="491"/>
         <source>Number of threads: </source>
         <translation>Количе�тво потоков и�полнени�:</translation>
     </message>
@@ -2715,57 +2886,68 @@ To toggle what kind of errors are shown, open view menu.</source>
     </message>
     <message>
         <location filename="settings.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="493"/>
         <source>Force checking all #ifdef configurations</source>
         <oldsource>Check all #ifdef configurations</oldsource>
         <translation>Провер�ть в�е варианты #ifdef конфигураций</translation>
     </message>
     <message>
         <location filename="settings.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="494"/>
         <source>Show full path of files</source>
         <translation>Показывать полные пути к файлам</translation>
     </message>
     <message>
         <location filename="settings.ui" line="122"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="495"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>Показывать �ообщение, е�ли ошибок не найдено</translation>
     </message>
     <message>
         <location filename="settings.ui" line="129"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="496"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>Отображать номер ошибки в колонке &quot;id&quot;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="136"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="497"/>
         <source>Enable inline suppressions</source>
         <translation>Включить inline-подавление ошибок</translation>
     </message>
     <message>
         <location filename="settings.ui" line="143"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="498"/>
         <source>Check for inconclusive errors also</source>
         <translation>Показывать также �порные ошибки</translation>
     </message>
     <message>
         <location filename="settings.ui" line="150"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="499"/>
         <source>Show statistics on check completion</source>
         <translation>Показывать �тати�тику по�ле завершени� проверки</translation>
     </message>
     <message>
         <location filename="settings.ui" line="157"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="500"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="177"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="501"/>
         <source>Show internal warnings in log</source>
         <translation>Показывать внутренние предупреждени� в логе</translation>
     </message>
     <message>
         <location filename="settings.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="521"/>
         <source>Addons</source>
         <translation>Дополнени�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="294"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="512"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation>Python (о�тавьте пу�тым дл� и�пользовани� python из PATH)</translation>
     </message>
@@ -2773,117 +2955,143 @@ To toggle what kind of errors are shown, open view menu.</source>
         <location filename="settings.ui" line="305"/>
         <location filename="settings.ui" line="346"/>
         <location filename="settings.ui" line="391"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="513"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="523"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="324"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="515"/>
         <source>MISRA addon</source>
         <translation>Дополнение MISRA</translation>
     </message>
     <message>
         <location filename="settings.ui" line="332"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="516"/>
         <source>MISRA rule texts file</source>
         <translation>Файл � тек�тами правил MISRA: </translation>
     </message>
     <message>
         <location filename="settings.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="518"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Скопируйте тек�т из Appendix A &amp;quot;Summary of guidelines&amp;quot; из фала правил MISRA C 2012 pdf в тек�товый файл.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="526"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
         <location filename="settings.ui" line="378"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="522"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation>Clang (о�тавьте пу�тым дл� и�пользовани� clang из PATH)</translation>
     </message>
     <message>
         <location filename="settings.ui" line="401"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="524"/>
         <source>Visual Studio headers</source>
         <translation>Заголовочные файлы Visual Studio</translation>
     </message>
     <message>
         <location filename="settings.ui" line="407"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="525"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Путь до заголовочных файлов Visual Studio headers, разделенных �имволом &apos;;&apos;.&lt;/p&gt;&lt;p&gt;Вы можете открыть командную �троку Visual Studio, вве�ти &amp;quot;SET INCLUDE&amp;quot; и �копировать пути.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="533"/>
         <source>Code Editor</source>
         <translation>Редактор</translation>
     </message>
     <message>
         <location filename="settings.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="527"/>
         <source>Code Editor Style</source>
         <translation>Оформление</translation>
     </message>
     <message>
         <location filename="settings.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="528"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="456"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="529"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="463"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="530"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="472"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="531"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="210"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="505"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <location filename="settings.ui" line="79"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="492"/>
         <source>Max count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="185"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="507"/>
         <source>Applications</source>
         <translation>Приложени�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="203"/>
         <location filename="settings.ui" line="479"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="532"/>
         <source>Edit...</source>
         <translation>Изменить...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="506"/>
         <source>Set as default</source>
         <translation>У�тановить по умолчанию</translation>
     </message>
     <message>
         <location filename="settings.ui" line="240"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="510"/>
         <source>Reports</source>
         <translation>Отчёты</translation>
     </message>
     <message>
         <location filename="settings.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="508"/>
         <source>Save all errors when creating report</source>
         <translation>Сохран�ть в�е ошибки при �оздании отчёта</translation>
     </message>
     <message>
         <location filename="settings.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="509"/>
         <source>Save full path to files in reports</source>
         <translation>Сохран�ть полные пути к файлам в отчётах</translation>
     </message>
     <message>
         <location filename="settings.ui" line="274"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="511"/>
         <source>Language</source>
         <translation>Язык</translation>
     </message>
@@ -2940,221 +3148,245 @@ To toggle what kind of errors are shown, open view menu.</source>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="395"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="415"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>Стати�тика</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="401"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>Проект</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="33"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="396"/>
         <source>Project:</source>
         <translation>Проект:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="53"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="397"/>
         <source>Paths:</source>
         <translation>Пути:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="85"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="398"/>
         <source>Include paths:</source>
         <translation>Включенные пути:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="399"/>
         <source>Defines:</source>
         <translation>Объ�вленные макроопределени�:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="400"/>
         <source>Undefines:</source>
         <translation>Удаленные макроопределени�:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="407"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>По�леднее �канирование</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="171"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="402"/>
         <source>Path Selected:</source>
         <translation>Выбранный путь:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="181"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="403"/>
         <source>Number of Files Scanned:</source>
         <translation>Количе�тво про�канированных файлов:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="201"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="405"/>
         <source>Scan Duration:</source>
         <translation>Продолжительно�ть �канировани�:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="254"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="408"/>
         <source>Errors:</source>
         <translation>Ошибки:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="271"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="409"/>
         <source>Warnings:</source>
         <translation>Предупреждени�:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="410"/>
         <source>Stylistic warnings:</source>
         <translation>Стили�тиче�кие предупреждени�:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="305"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="411"/>
         <source>Portability warnings:</source>
         <translation>Предупреждени� перено�имо�ти:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="322"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="412"/>
         <source>Performance issues:</source>
         <translation>Проблемы � производительно�тью:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="413"/>
         <source>Information messages:</source>
         <translation>Информационные �ообщени�:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="356"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="414"/>
         <source>Active checkers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="374"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="416"/>
         <source>Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="418"/>
         <source>History</source>
         <translation>И�тори�</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="405"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="417"/>
         <source>File:</source>
         <translation>Файл:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="419"/>
         <source>Copy to Clipboard</source>
         <translation>Скопировать в буфер обмена</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="420"/>
         <source>Pdf Export</source>
         <translation>Эк�порт PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 день</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 дней</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1 ча�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 ча�ов</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1 минута</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 минут</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 �екунда</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 �екунд</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.1%1 �екунд</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="171"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation>и</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="198"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation>Эк�порт PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>�а�тройки проекта</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>Пути</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>Включенные пути</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>Объ�вленные макроопределени�:</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation>Удаленные макроопределени�:</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>Выбранные пути</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>Количе�тво про�канированных файлов</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>Продолжительно�ть �канировани�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>Ошибки</translation>
     </message>
@@ -3169,40 +3401,49 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>�е задана директори� �борки</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>Предупреждени�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>Стили�тиче�кие предупреждени�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>Предупреждени� перено�имо�ти</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>Предупреждени� производительно�ти</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>Информационные �ообщени�</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_threaddetails.h" line="47"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="46"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 из %2 файлов проверены</translation>
     </message>
@@ -3223,9 +3464,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 Язык пользователь�кого интерфей�а был �брошен на англий�кий. Откройте �а�тройки-диалог дл� выбора любого из до�тупных �зыков.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_sr.ts b/gui/cppcheck_sr.ts
index 093d6846612..81da0d77edf 100644
--- a/gui/cppcheck_sr.ts
+++ b/gui/cppcheck_sr.ts
@@ -5,27 +5,32 @@
     <name>About</name>
     <message>
         <location filename="about.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="130"/>
         <source>About Cppcheck</source>
         <translation type="unfinished">About Cppcheck</translation>
     </message>
     <message>
         <location filename="about.ui" line="64"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="132"/>
         <source>Version %1</source>
         <translation type="unfinished">Version %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="133"/>
         <source>Cppcheck - A tool for static C/C++ code analysis.</source>
         <translation type="unfinished">Cppcheck - A tool for static C/C++ code analysis.</translation>
     </message>
     <message>
         <location filename="about.ui" line="81"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="134"/>
         <source>Copyright © 2007-%1 Cppcheck team.</source>
         <oldsource>Copyright © 2007-2021 Cppcheck team.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="about.ui" line="91"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="135"/>
         <source>This program is licensed under the terms
 of the GNU General Public License version 3</source>
         <translation type="unfinished">This program is licensed under the terms
@@ -33,11 +38,13 @@ of the GNU General Public License version 3</translation>
     </message>
     <message>
         <location filename="about.ui" line="102"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="137"/>
         <source>Visit Cppcheck homepage at %1</source>
         <translation type="unfinished">Visit Cppcheck homepage at %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;pcre&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;picojson&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tinyxml2&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
         <translation type="unfinished"></translation>
@@ -47,11 +54,13 @@ of the GNU General Public License version 3</translation>
     <name>ApplicationDialog</name>
     <message>
         <location filename="applicationdialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="161"/>
         <source>Add an application</source>
         <translation type="unfinished">Add a new application</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="162"/>
         <source>Here you can add an application that can open error files. Specify a name for the application, the application executable and command line parameters for the application.
 
 The following texts in parameters are replaced with appropriate values when application is executed:
@@ -67,21 +76,25 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="173"/>
         <source>&amp;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="86"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="174"/>
         <source>&amp;Executable:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="96"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="175"/>
         <source>&amp;Parameters:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="138"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="176"/>
         <source>Browse</source>
         <translation type="unfinished">Browse</translation>
     </message>
@@ -96,9 +109,8 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished">Select viewer application</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -106,70 +118,6 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -178,10 +126,8 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished">Could not find the file: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -193,44 +139,49 @@ Parameters: -l(line) (file)</source>
     <name>HelpDialog</name>
     <message>
         <location filename="helpdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="88"/>
         <source>Cppcheck GUI help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="89"/>
         <source>Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="90"/>
         <source>Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
     <name>LibraryAddFunctionDialog</name>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="105"/>
         <source>Add function</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="106"/>
         <source>Function name(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="107"/>
         <source>Number of arguments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -239,126 +190,140 @@ Parameters: -l(line) (file)</source>
     <name>LibraryDialog</name>
     <message>
         <location filename="librarydialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="275"/>
         <source>Library Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="22"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="276"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="29"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="277"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="36"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="278"/>
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="62"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="279"/>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="280"/>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="111"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="281"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="282"/>
         <source>Filter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="164"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="283"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="204"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="284"/>
         <source>noreturn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="212"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="285"/>
         <source>False</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="286"/>
         <source>True</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="222"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="287"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="232"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="289"/>
         <source>return value must be used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="239"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="290"/>
         <source>ignore function in leaks checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="291"/>
         <source>Arguments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="258"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="292"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation type="unfinished"></translation>
     </message>
@@ -367,11 +332,13 @@ Parameters: -l(line) (file)</source>
     <name>LibraryEditArgDialog</name>
     <message>
         <location filename="libraryeditargdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="284"/>
         <source>Edit argument</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="286"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is bool value allowed? For instance result from comparison or from &apos;!&apos; operator.&lt;/p&gt;
 &lt;p&gt;Typically, set this if the argument is a pointer, size, etc.&lt;/p&gt;
@@ -382,11 +349,13 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="28"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="293"/>
         <source>Not bool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="35"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is a null parameter value allowed?&lt;/p&gt;
 &lt;p&gt;Typically this should be used on any pointer parameter that does not allow null.&lt;/p&gt;
@@ -397,78 +366,99 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="43"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="302"/>
         <source>Not null</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="50"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="303"/>
         <source>Not uninit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="57"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="304"/>
         <source>String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="70"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="305"/>
         <source>Format string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="306"/>
         <source>Min size of buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="101"/>
         <location filename="libraryeditargdialog.ui" line="203"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="307"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="316"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="109"/>
         <location filename="libraryeditargdialog.ui" line="214"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="308"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="317"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="114"/>
         <location filename="libraryeditargdialog.ui" line="219"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="309"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="318"/>
         <source>argvalue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="119"/>
         <location filename="libraryeditargdialog.ui" line="224"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="319"/>
         <source>mul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="124"/>
         <location filename="libraryeditargdialog.ui" line="229"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="311"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="320"/>
         <source>strlen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="132"/>
         <location filename="libraryeditargdialog.ui" line="237"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="313"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="322"/>
         <source>Arg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="159"/>
         <location filename="libraryeditargdialog.ui" line="264"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="323"/>
         <source>Arg2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="194"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="315"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="324"/>
         <source>Valid values</source>
         <translation type="unfinished"></translation>
     </message>
@@ -476,835 +466,911 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="687"/>
-        <location filename="mainwindow.cpp" line="463"/>
-        <location filename="mainwindow.cpp" line="667"/>
-        <location filename="mainwindow.cpp" line="752"/>
-        <location filename="mainwindow.cpp" line="857"/>
-        <location filename="mainwindow.cpp" line="879"/>
-        <location filename="mainwindow.cpp" line="1466"/>
-        <location filename="mainwindow.cpp" line="1595"/>
-        <location filename="mainwindow.cpp" line="1936"/>
-        <location filename="mainwindow.cpp" line="1944"/>
-        <location filename="mainwindow.cpp" line="1998"/>
-        <location filename="mainwindow.cpp" line="2007"/>
-        <location filename="mainwindow.cpp" line="2079"/>
-        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="209"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="745"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="266"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="749"/>
         <source>Standard</source>
         <translation type="unfinished">Standard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="740"/>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;File</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="741"/>
         <source>&amp;View</source>
         <translation type="unfinished">&amp;View</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="742"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="213"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="746"/>
         <source>C++ standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="225"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="747"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="748"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Edit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="578"/>
         <source>&amp;License...</source>
         <translation type="unfinished">&amp;License...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="319"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="579"/>
         <source>A&amp;uthors...</source>
         <translation type="unfinished">A&amp;uthors...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="328"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="580"/>
         <source>&amp;About...</source>
         <translation type="unfinished">&amp;About...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="333"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="581"/>
         <source>&amp;Files...</source>
         <translation type="unfinished">&amp;Files...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="336"/>
         <location filename="mainwindow.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="582"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="584"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="342"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="587"/>
         <source>Ctrl+F</source>
         <translation type="unfinished">Ctrl+F</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="351"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="589"/>
         <source>&amp;Directory...</source>
         <translation type="unfinished">&amp;Directory...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="354"/>
         <location filename="mainwindow.ui" line="357"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="590"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="592"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="595"/>
         <source>Ctrl+D</source>
         <translation type="unfinished">Ctrl+D</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="599"/>
         <source>Ctrl+R</source>
         <translation type="unfinished">Ctrl+R</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="602"/>
         <source>&amp;Stop</source>
         <translation type="unfinished">&amp;Stop</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="393"/>
         <location filename="mainwindow.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="603"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="605"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="608"/>
         <source>Esc</source>
         <translation type="unfinished">Esc</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="610"/>
         <source>&amp;Save results to file...</source>
         <translation type="unfinished">&amp;Save results to file...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="411"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="612"/>
         <source>Ctrl+S</source>
         <translation type="unfinished">Ctrl+S</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="416"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="614"/>
         <source>&amp;Quit</source>
         <translation type="unfinished">&amp;Quit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="428"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="618"/>
         <source>&amp;Clear results</source>
         <translation type="unfinished">&amp;Clear results</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="619"/>
         <source>&amp;Preferences</source>
         <translation type="unfinished">&amp;Preferences</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="470"/>
         <location filename="mainwindow.ui" line="473"/>
-        <location filename="mainwindow.cpp" line="2379"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="626"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="628"/>
+        <location filename="mainwindow.cpp" line="2408"/>
         <source>Show errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="616"/>
         <location filename="mainwindow.ui" line="619"/>
-        <location filename="mainwindow.cpp" line="2380"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="668"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="670"/>
+        <location filename="mainwindow.cpp" line="2409"/>
         <source>Show warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="634"/>
         <location filename="mainwindow.ui" line="637"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="673"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="675"/>
         <source>Show performance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="645"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="677"/>
         <source>Show &amp;hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1015"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="660"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="680"/>
         <source>Show information messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="675"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="684"/>
         <source>Show portability warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="690"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="687"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="702"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="689"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="705"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="691"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="713"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="693"/>
         <source>&amp;Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="716"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="695"/>
         <source>Filter results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="732"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="697"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit ANSI</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="740"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="698"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit Unicode</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="748"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="699"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="756"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="700"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="764"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="701"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="858"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="709"/>
         <source>&amp;Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="861"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="711"/>
         <source>Print the Current Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="866"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="713"/>
         <source>Print Pre&amp;view...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="869"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="715"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="877"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="719"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="478"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="630"/>
         <source>&amp;Check all</source>
         <translation type="unfinished">&amp;Check all</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="738"/>
         <source>Checking for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="100"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="739"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="163"/>
         <location filename="mainwindow.ui" line="979"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="730"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="743"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="303"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="751"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="369"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="597"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="381"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="601"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="419"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="616"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="620"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="467"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="625"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="483"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="631"/>
         <source>&amp;Uncheck all</source>
         <translation type="unfinished">&amp;Uncheck all</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="488"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="632"/>
         <source>Collapse &amp;all</source>
         <translation type="unfinished">Collapse &amp;all</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="493"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="633"/>
         <source>&amp;Expand all</source>
         <translation type="unfinished">&amp;Expand all</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="501"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="634"/>
         <source>&amp;Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="636"/>
         <source>Standard items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="645"/>
         <source>Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="528"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="646"/>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="531"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="648"/>
         <source>Error categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="536"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="650"/>
         <source>&amp;Open XML...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="545"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="651"/>
         <source>Open P&amp;roject File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="548"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="653"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="655"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="562"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="656"/>
         <source>&amp;New Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="565"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="658"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="570"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="660"/>
         <source>&amp;Log View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="573"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="662"/>
         <source>Log View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="581"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="664"/>
         <source>C&amp;lose Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="589"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="665"/>
         <source>&amp;Edit Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="601"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="666"/>
         <source>&amp;Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="613"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="667"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="631"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="672"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="657"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="678"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="672"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="682"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="772"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="702"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="786"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="703"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="797"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="704"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="805"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="705"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="813"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="706"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="845"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="707"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="853"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="708"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="874"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="717"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="721"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="893"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="722"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="901"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="723"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="912"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="724"/>
         <source>C++14</source>
         <translation type="unfinished">C++14</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="920"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="725"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="928"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="726"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="936"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="727"/>
         <source>C++17</source>
         <translation type="unfinished">C++17</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="728"/>
         <source>C++20</source>
         <translation type="unfinished">C++20</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="729"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="987"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="731"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="995"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1003"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1011"/>
-        <source>Cert C</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="732"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1019"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="733"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1027"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="734"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1035"/>
-        <source>Autosar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1040"/>
-        <source>EULA...</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="736"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="509"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="638"/>
         <source>&amp;Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="284"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="750"/>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="452"/>
         <location filename="mainwindow.ui" line="455"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="621"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="623"/>
         <source>Show style warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="512"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="640"/>
         <source>Open the help contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="515"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="643"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="198"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="744"/>
         <source>&amp;Help</source>
         <translation type="unfinished">&amp;Help</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="155"/>
-        <location filename="mainwindow.cpp" line="1781"/>
+        <location filename="mainwindow.cpp" line="176"/>
+        <location filename="mainwindow.cpp" line="1812"/>
         <source>Quick Filter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="858"/>
+        <location filename="mainwindow.cpp" line="890"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="992"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="995"/>
+        <location filename="mainwindow.cpp" line="1027"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1030"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1001"/>
+        <location filename="mainwindow.cpp" line="1033"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1013"/>
+        <location filename="mainwindow.cpp" line="1045"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1035"/>
+        <location filename="mainwindow.cpp" line="1064"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1058"/>
+        <location filename="mainwindow.cpp" line="1087"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1120"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1700"/>
         <source>License</source>
         <translation type="unfinished">License</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1654"/>
+        <location filename="mainwindow.cpp" line="1707"/>
         <source>Authors</source>
         <translation type="unfinished">Authors</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1674"/>
+        <location filename="mainwindow.cpp" line="1727"/>
         <source>Save the report file</source>
         <translation type="unfinished">Save the report file</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1482"/>
-        <location filename="mainwindow.cpp" line="1681"/>
+        <location filename="mainwindow.cpp" line="1539"/>
+        <location filename="mainwindow.cpp" line="1734"/>
         <source>XML files (*.xml)</source>
         <translation type="unfinished">XML files (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="458"/>
+        <location filename="mainwindow.cpp" line="477"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="753"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1015"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1004"/>
+        <location filename="mainwindow.cpp" line="1036"/>
         <source>Unsupported format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1007"/>
+        <location filename="mainwindow.cpp" line="1039"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1010"/>
+        <location filename="mainwindow.cpp" line="1042"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1016"/>
+        <location filename="mainwindow.cpp" line="1048"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1019"/>
-        <source>Unknown issue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1080"/>
-        <location filename="mainwindow.cpp" line="1090"/>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1120"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1484"/>
+        <location filename="mainwindow.cpp" line="1541"/>
         <source>Open the report file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1685"/>
+        <location filename="mainwindow.cpp" line="1738"/>
         <source>Text files (*.txt)</source>
         <translation type="unfinished">Text files (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1689"/>
+        <location filename="mainwindow.cpp" line="1742"/>
         <source>CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1819"/>
+        <location filename="mainwindow.cpp" line="1850"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="1852"/>
         <source>Select Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="239"/>
-        <location filename="mainwindow.cpp" line="1783"/>
-        <location filename="mainwindow.cpp" line="1849"/>
-        <location filename="mainwindow.cpp" line="2047"/>
+        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="1814"/>
+        <location filename="mainwindow.cpp" line="1880"/>
+        <location filename="mainwindow.cpp" line="2062"/>
         <source>Project:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="668"/>
-        <source>No suitable files found to analyze!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="767"/>
-        <source>C/C++ Source</source>
+        <location filename="mainwindow.cpp" line="601"/>
+        <source>None of the selected files is part of the project, nothing to analyze.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="768"/>
-        <source>Compile database</source>
+        <location filename="mainwindow.cpp" line="702"/>
+        <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="769"/>
-        <source>Visual Studio</source>
+        <location filename="mainwindow.cpp" line="798"/>
+        <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="770"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="mainwindow.cpp" line="799"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="773"/>
+        <location filename="mainwindow.cpp" line="804"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="819"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="880"/>
+        <location filename="mainwindow.cpp" line="912"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1467"/>
+        <location filename="mainwindow.cpp" line="1524"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1312,81 +1378,76 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1591"/>
+        <location filename="mainwindow.cpp" line="1644"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1633"/>
+        <location filename="mainwindow.cpp" line="1686"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1672"/>
+        <location filename="mainwindow.cpp" line="1725"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1712"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1937"/>
+        <location filename="mainwindow.cpp" line="1951"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1945"/>
+        <location filename="mainwindow.cpp" line="1959"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1977"/>
+        <location filename="mainwindow.cpp" line="1992"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1995"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1983"/>
+        <location filename="mainwindow.cpp" line="1998"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1999"/>
+        <location filename="mainwindow.cpp" line="2014"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2008"/>
+        <location filename="mainwindow.cpp" line="2023"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2032"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2034"/>
+        <location filename="mainwindow.cpp" line="2049"/>
         <source>Select Project Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2080"/>
+        <location filename="mainwindow.cpp" line="2095"/>
         <source>No project file loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2148"/>
+        <location filename="mainwindow.cpp" line="2177"/>
         <source>The project file
 
 %1
@@ -1397,67 +1458,67 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2310"/>
+        <location filename="mainwindow.cpp" line="2339"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2314"/>
+        <location filename="mainwindow.cpp" line="2343"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2352"/>
+        <location filename="mainwindow.cpp" line="2381"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2353"/>
+        <location filename="mainwindow.cpp" line="2382"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2354"/>
+        <location filename="mainwindow.cpp" line="2383"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2355"/>
+        <location filename="mainwindow.cpp" line="2384"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2372"/>
+        <location filename="mainwindow.cpp" line="2401"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2373"/>
+        <location filename="mainwindow.cpp" line="2402"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2374"/>
+        <location filename="mainwindow.cpp" line="2403"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2381"/>
+        <location filename="mainwindow.cpp" line="2410"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2382"/>
+        <location filename="mainwindow.cpp" line="2411"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2383"/>
+        <location filename="mainwindow.cpp" line="2412"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2384"/>
+        <location filename="mainwindow.cpp" line="2413"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1501,26 +1562,31 @@ Options:
     <name>NewSuppressionDialog</name>
     <message>
         <location filename="newsuppressiondialog.ui" line="17"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="114"/>
         <source>New suppression</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="25"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="115"/>
         <source>Error ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="32"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="116"/>
         <source>File name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="42"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="117"/>
         <source>Line number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="52"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="118"/>
         <source>Symbol name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1538,414 +1604,498 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit ANSI</translation>
+        <translation type="vanished">Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit Unicode</translation>
+        <translation type="vanished">Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
 </context>
 <context>
     <name>ProjectFile</name>
     <message>
         <location filename="projectfile.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="923"/>
         <source>Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="955"/>
         <source>Paths and Defines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="30"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="924"/>
         <source>Import Project (Visual studio / compile database/ Borland C++ Builder 6)</source>
         <oldsource>Import Project (Visual studio / compile database)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="231"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="938"/>
         <source>Defines must be separated by a semicolon. Example: DEF1;DEF2=5;DEF3=int</source>
         <oldsource>Defines must be separated by a semicolon &apos;;&apos;</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="958"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="876"/>
+        <location filename="projectfile.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1011"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="883"/>
+        <location filename="projectfile.ui" line="892"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1013"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="890"/>
+        <location filename="projectfile.ui" line="899"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1015"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="73"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="928"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You have a choice:&lt;/p&gt;&lt;p&gt; * Analyze all Debug and Release configurations&lt;/p&gt;&lt;p&gt; * Only analyze the first matching Debug configuration&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="926"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="964"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="930"/>
         <source>Analyze all Visual Studio configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="113"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="931"/>
         <source>Selected VS Configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="147"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="932"/>
         <source>Paths:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="181"/>
         <location filename="projectfile.ui" line="296"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="933"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="945"/>
         <source>Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="934"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="994"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="935"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="995"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="998"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="242"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="940"/>
         <source>Undefines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="252"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="942"/>
         <source>Undefines must be separated by a semicolon. Example: UNDEF1;UNDEF2;UNDEF3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="265"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="944"/>
         <source>Include Paths:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="330"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="948"/>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="337"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="949"/>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="350"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="950"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="952"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="954"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="956"/>
         <source>Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="972"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="982"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="962"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="967"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="968"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="969"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="970"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="971"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="974"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="979"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="980"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="981"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1000"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="983"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="985"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="987"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="999"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="851"/>
+        <location filename="projectfile.ui" line="860"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1009"/>
         <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="901"/>
+        <location filename="projectfile.ui" line="910"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1016"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="918"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1017"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="937"/>
+        <location filename="projectfile.ui" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1020"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="946"/>
+        <location filename="projectfile.ui" line="955"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1021"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="965"/>
+        <location filename="projectfile.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1023"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="981"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1024"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1026"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="991"/>
+        <location filename="projectfile.ui" line="1007"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1027"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="960"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="959"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="957"/>
         <source>Libraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="965"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="966"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="976"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="977"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="978"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="989"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="991"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="992"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="993"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="996"/>
         <source>Suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="997"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1001"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1028"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1002"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1003"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1004"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1005"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1006"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1007"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="914"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1008"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1018"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="958"/>
+        <location filename="projectfile.ui" line="967"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1022"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="975"/>
+        <location filename="projectfile.ui" line="991"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1025"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="projectfile.ui" line="1004"/>
-        <source>Clang analyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="997"/>
-        <source>Clang-tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="936"/>
         <source>Defines:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1958,77 +2108,78 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="604"/>
+        <location filename="projectfiledialog.cpp" line="585"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="865"/>
+        <location filename="projectfiledialog.cpp" line="861"/>
         <source>Select include directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="845"/>
+        <location filename="projectfiledialog.cpp" line="841"/>
         <source>Select a directory to check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="414"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="477"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="643"/>
-        <source>Visual Studio</source>
+        <location filename="projectfiledialog.cpp" line="625"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="644"/>
-        <source>Compile database</source>
+        <location filename="projectfiledialog.cpp" line="627"/>
+        <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="645"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="projectfiledialog.cpp" line="646"/>
+        <source>C/C++ header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="646"/>
-        <source>Import Project</source>
+        <location filename="projectfiledialog.cpp" line="648"/>
+        <source>Include file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="885"/>
+        <location filename="projectfiledialog.cpp" line="881"/>
         <source>Select directory to ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="893"/>
+        <location filename="projectfiledialog.cpp" line="889"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="894"/>
+        <location filename="projectfiledialog.cpp" line="647"/>
+        <location filename="projectfiledialog.cpp" line="890"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="895"/>
+        <location filename="projectfiledialog.cpp" line="891"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="978"/>
+        <location filename="projectfiledialog.cpp" line="976"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="980"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2061,7 +2212,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="302"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2111,161 +2262,156 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="142"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="144"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="114"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">File</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="115"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Line</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="116"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Severity</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="117"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="118"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="119"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="120"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="121"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="122"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="123"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="124"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="125"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="126"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
@@ -2309,107 +2455,105 @@ Options:
         <translation type="obsolete">Undefined file</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="657"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="825"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="829"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="830"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="832"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="367"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="298"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="659"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="681"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="660"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="370"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="656"/>
+        <location filename="resultstree.cpp" line="667"/>
         <source>Recheck %1 file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="658"/>
+        <location filename="resultstree.cpp" line="669"/>
         <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="701"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="703"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="733"/>
-        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="734"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
         <translation type="unfinished">You can open this error by specifying applications in program&apos;s settings.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="748"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="768"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="811"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2418,37 +2562,37 @@ Please check the application path and parameters are correct.</source>
 Please check the application path and parameters are correct.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="833"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="349"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation type="unfinished">Style</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="352"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation type="unfinished">Error</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="355"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="358"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="361"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="364"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2456,122 +2600,124 @@ Please check the application path and parameters are correct.</translation>
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="255"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="274"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="326"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="350"/>
-        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="351"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation type="unfinished">No errors found.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="358"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation type="unfinished">Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="460"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="465"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="539"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="540"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="541"/>
+        <location filename="resultsview.cpp" line="538"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="549"/>
+        <location filename="resultsview.cpp" line="545"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="563"/>
+        <location filename="resultsview.cpp" line="559"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="565"/>
+        <location filename="resultsview.cpp" line="561"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="567"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="568"/>
+        <location filename="resultsview.cpp" line="564"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="237"/>
-        <location filename="resultsview.cpp" line="245"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation type="unfinished">Failed to save the report.</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="26"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="147"/>
         <source>Results</source>
         <translation type="unfinished">Results</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="60"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="148"/>
         <source>Critical errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="149"/>
         <source>Analysis Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="114"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="150"/>
         <source>Warning Details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2580,26 +2726,31 @@ To toggle what kind of errors are shown, open view menu.</translation>
     <name>ScratchPad</name>
     <message>
         <location filename="scratchpad.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="107"/>
         <source>Scratchpad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="108"/>
         <source>Copy or write some C/C++ code here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="37"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="109"/>
         <source>Optionally enter a filename (mainly for automatic language detection) and click on &quot;Check&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="110"/>
         <source>filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="78"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="111"/>
         <source>Check</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2608,76 +2759,91 @@ To toggle what kind of errors are shown, open view menu.</translation>
     <name>Settings</name>
     <message>
         <location filename="settings.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="490"/>
         <source>Preferences</source>
         <translation type="unfinished">Preferences</translation>
     </message>
     <message>
         <location filename="settings.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="502"/>
         <source>General</source>
         <translation type="unfinished">General</translation>
     </message>
     <message>
         <location filename="settings.ui" line="196"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="503"/>
         <source>Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="491"/>
         <source>Number of threads: </source>
         <translation type="unfinished">Number of threads: </translation>
     </message>
     <message>
         <location filename="settings.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="493"/>
         <source>Force checking all #ifdef configurations</source>
         <translation type="unfinished">Check all #ifdef configurations</translation>
     </message>
     <message>
         <location filename="settings.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="494"/>
         <source>Show full path of files</source>
         <translation type="unfinished">Show full path of files</translation>
     </message>
     <message>
         <location filename="settings.ui" line="122"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="495"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation type="unfinished">Show &quot;No errors found&quot; message when no errors found</translation>
     </message>
     <message>
         <location filename="settings.ui" line="129"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="496"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="136"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="497"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="143"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="498"/>
         <source>Check for inconclusive errors also</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="150"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="499"/>
         <source>Show statistics on check completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="157"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="500"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="177"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="501"/>
         <source>Show internal warnings in log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="521"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="294"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="512"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2685,117 +2851,143 @@ To toggle what kind of errors are shown, open view menu.</translation>
         <location filename="settings.ui" line="305"/>
         <location filename="settings.ui" line="346"/>
         <location filename="settings.ui" line="391"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="513"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="523"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="324"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="515"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="332"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="516"/>
         <source>MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="518"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="526"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="378"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="522"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="401"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="524"/>
         <source>Visual Studio headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="407"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="525"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="533"/>
         <source>Code Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="527"/>
         <source>Code Editor Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="528"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="456"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="529"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="463"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="530"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="472"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="531"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="210"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="505"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="79"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="492"/>
         <source>Max count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="185"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="507"/>
         <source>Applications</source>
         <translation type="unfinished">Applications</translation>
     </message>
     <message>
         <location filename="settings.ui" line="203"/>
         <location filename="settings.ui" line="479"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="532"/>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="506"/>
         <source>Set as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="240"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="510"/>
         <source>Reports</source>
         <translation type="unfinished">Reports</translation>
     </message>
     <message>
         <location filename="settings.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="508"/>
         <source>Save all errors when creating report</source>
         <translation type="unfinished">Save all errors when creating report</translation>
     </message>
     <message>
         <location filename="settings.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="509"/>
         <source>Save full path to files in reports</source>
         <translation type="unfinished">Save full path to files in reports</translation>
     </message>
     <message>
         <location filename="settings.ui" line="274"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="511"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2848,221 +3040,245 @@ To toggle what kind of errors are shown, open view menu.</translation>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="395"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="415"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="401"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="33"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="396"/>
         <source>Project:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="53"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="397"/>
         <source>Paths:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="85"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="398"/>
         <source>Include paths:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="399"/>
         <source>Defines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="400"/>
         <source>Undefines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="407"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="171"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="402"/>
         <source>Path Selected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="181"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="403"/>
         <source>Number of Files Scanned:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="201"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="405"/>
         <source>Scan Duration:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="254"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="408"/>
         <source>Errors:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="271"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="409"/>
         <source>Warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="410"/>
         <source>Stylistic warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="305"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="411"/>
         <source>Portability warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="322"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="412"/>
         <source>Performance issues:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="413"/>
         <source>Information messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="356"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="414"/>
         <source>Active checkers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="374"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="416"/>
         <source>Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="418"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="405"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="417"/>
         <source>File:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="419"/>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="420"/>
         <source>Pdf Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="171"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="198"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3077,40 +3293,49 @@ To toggle what kind of errors are shown, open view menu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_threaddetails.h" line="47"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="46"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3127,9 +3352,8 @@ The user interface language has been reset to English. Open the Preferences-dial
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_sv.ts b/gui/cppcheck_sv.ts
index 8070d7ee1ea..80726023e09 100644
--- a/gui/cppcheck_sv.ts
+++ b/gui/cppcheck_sv.ts
@@ -5,27 +5,32 @@
     <name>About</name>
     <message>
         <location filename="about.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="130"/>
         <source>About Cppcheck</source>
         <translation>Om Cppcheck</translation>
     </message>
     <message>
         <location filename="about.ui" line="64"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="132"/>
         <source>Version %1</source>
         <translation>Version %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="133"/>
         <source>Cppcheck - A tool for static C/C++ code analysis.</source>
         <translation>Cppcheck - Ett verktyg för statisk analys av C/C++ kod.</translation>
     </message>
     <message>
         <location filename="about.ui" line="81"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="134"/>
         <source>Copyright © 2007-%1 Cppcheck team.</source>
         <oldsource>Copyright © 2007-2021 Cppcheck team.</oldsource>
         <translation type="unfinished">Copyright © 2007-2021 Cppcheck team.</translation>
     </message>
     <message>
         <location filename="about.ui" line="91"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="135"/>
         <source>This program is licensed under the terms
 of the GNU General Public License version 3</source>
         <translation>This program is licensed under the terms
@@ -33,11 +38,13 @@ of the GNU General Public License version 3</translation>
     </message>
     <message>
         <location filename="about.ui" line="102"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="137"/>
         <source>Visit Cppcheck homepage at %1</source>
         <translation>Hemsida: %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;pcre&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;picojson&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tinyxml2&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
         <translation type="unfinished"></translation>
@@ -47,11 +54,13 @@ of the GNU General Public License version 3</translation>
     <name>ApplicationDialog</name>
     <message>
         <location filename="applicationdialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="161"/>
         <source>Add an application</source>
         <translation>Lägg till program</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="162"/>
         <source>Here you can add an application that can open error files. Specify a name for the application, the application executable and command line parameters for the application.
 
 The following texts in parameters are replaced with appropriate values when application is executed:
@@ -77,21 +86,25 @@ Parametrar: -l(line) (file)</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="173"/>
         <source>&amp;Name:</source>
         <translation>Namn:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="86"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="174"/>
         <source>&amp;Executable:</source>
         <translation>Körbar fil:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="96"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="175"/>
         <source>&amp;Parameters:</source>
         <translation>Parametrar:</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="138"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="176"/>
         <source>Browse</source>
         <translation>Bläddra</translation>
     </message>
@@ -106,9 +119,8 @@ Parametrar: -l(line) (file)</translation>
         <translation>Välj program</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -116,70 +128,6 @@ Parametrar: -l(line) (file)</translation>
         <translation>Du måste ange namn, sökväg samt eventuellt parametrar för applikationen!</translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -190,10 +138,8 @@ Parametrar: -l(line) (file)</translation>
         <translation>Kunde inte hitta filen: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -205,44 +151,49 @@ Parametrar: -l(line) (file)</translation>
     <name>HelpDialog</name>
     <message>
         <location filename="helpdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="88"/>
         <source>Cppcheck GUI help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="89"/>
         <source>Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="90"/>
         <source>Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
     <name>LibraryAddFunctionDialog</name>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="105"/>
         <source>Add function</source>
         <translation>Lägg till funktion</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="106"/>
         <source>Function name(s)</source>
         <translation>Funktion namn</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="107"/>
         <source>Number of arguments</source>
         <translation>Antal argument</translation>
     </message>
@@ -251,126 +202,140 @@ Parametrar: -l(line) (file)</translation>
     <name>LibraryDialog</name>
     <message>
         <location filename="librarydialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="275"/>
         <source>Library Editor</source>
         <translation>Library Editor</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="22"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="276"/>
         <source>Open</source>
         <translation>Öppna</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="29"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="277"/>
         <source>Save</source>
         <translation>Spara</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="36"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="278"/>
         <source>Save as</source>
         <translation>Spara som</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="62"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="279"/>
         <source>Functions</source>
         <translation>Funktioner</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="280"/>
         <source>Sort</source>
         <translation>Sortera</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="111"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="281"/>
         <source>Add</source>
         <translation>Lägg till</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="282"/>
         <source>Filter:</source>
         <translation>Filter:</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="164"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="283"/>
         <source>Comments</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="204"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="284"/>
         <source>noreturn</source>
         <translation>noreturn</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="212"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="285"/>
         <source>False</source>
         <translation>False</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="286"/>
         <source>True</source>
         <translation>True</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="222"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="287"/>
         <source>Unknown</source>
         <translation>Vet ej</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="232"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="289"/>
         <source>return value must be used</source>
         <translation>retur värde måste användas</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="239"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="290"/>
         <source>ignore function in leaks checking</source>
         <translation>Ignorera funktionen när cppcheck letar efter läckor</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="291"/>
         <source>Arguments</source>
         <translation>Argument</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="258"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="292"/>
         <source>Edit</source>
         <translation>Redigera</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation>Library fil (*.cfg)</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation>Öppna Library fil</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation type="unfinished">Kunde ej öppna filen %1.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation type="unfinished">Kunde ej spara filen %1.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation>Spara library som</translation>
     </message>
@@ -379,11 +344,13 @@ Parametrar: -l(line) (file)</translation>
     <name>LibraryEditArgDialog</name>
     <message>
         <location filename="libraryeditargdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="284"/>
         <source>Edit argument</source>
         <translation>Konfigurera argument</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="286"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is bool value allowed? For instance result from comparison or from &apos;!&apos; operator.&lt;/p&gt;
 &lt;p&gt;Typically, set this if the argument is a pointer, size, etc.&lt;/p&gt;
@@ -397,11 +364,13 @@ Exempel:
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="28"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="293"/>
         <source>Not bool</source>
         <translation>Ej bool</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="35"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is a null parameter value allowed?&lt;/p&gt;
 &lt;p&gt;Typically this should be used on any pointer parameter that does not allow null.&lt;/p&gt;
@@ -415,78 +384,99 @@ Exempel:
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="43"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="302"/>
         <source>Not null</source>
         <translation>Ej null</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="50"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="303"/>
         <source>Not uninit</source>
         <translation>Ej uninit</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="57"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="304"/>
         <source>String</source>
         <translation>Sträng</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="70"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="305"/>
         <source>Format string</source>
         <translation>Format sträng</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="306"/>
         <source>Min size of buffer</source>
         <translation>Minsta storlek för buffer</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="101"/>
         <location filename="libraryeditargdialog.ui" line="203"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="307"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="316"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="109"/>
         <location filename="libraryeditargdialog.ui" line="214"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="308"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="317"/>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="114"/>
         <location filename="libraryeditargdialog.ui" line="219"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="309"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="318"/>
         <source>argvalue</source>
         <translation>argvalue</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="119"/>
         <location filename="libraryeditargdialog.ui" line="224"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="319"/>
         <source>mul</source>
         <translation>mul</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="124"/>
         <location filename="libraryeditargdialog.ui" line="229"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="311"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="320"/>
         <source>strlen</source>
         <translation>strlen</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="132"/>
         <location filename="libraryeditargdialog.ui" line="237"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="313"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="322"/>
         <source>Arg</source>
         <translation>Arg</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="159"/>
         <location filename="libraryeditargdialog.ui" line="264"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="323"/>
         <source>Arg2</source>
         <translation>Arg2</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="194"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="315"/>
         <source>and</source>
         <translation>och</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="324"/>
         <source>Valid values</source>
         <translation>Tillåtna värden</translation>
     </message>
@@ -494,614 +484,705 @@ Exempel:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="687"/>
-        <location filename="mainwindow.cpp" line="463"/>
-        <location filename="mainwindow.cpp" line="667"/>
-        <location filename="mainwindow.cpp" line="752"/>
-        <location filename="mainwindow.cpp" line="857"/>
-        <location filename="mainwindow.cpp" line="879"/>
-        <location filename="mainwindow.cpp" line="1466"/>
-        <location filename="mainwindow.cpp" line="1595"/>
-        <location filename="mainwindow.cpp" line="1936"/>
-        <location filename="mainwindow.cpp" line="1944"/>
-        <location filename="mainwindow.cpp" line="1998"/>
-        <location filename="mainwindow.cpp" line="2007"/>
-        <location filename="mainwindow.cpp" line="2079"/>
-        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="209"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="745"/>
         <source>A&amp;nalyze</source>
         <translation>Analysera</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="266"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="749"/>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="740"/>
         <source>&amp;File</source>
         <translation>&amp;Arkiv</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="741"/>
         <source>&amp;View</source>
         <translation>&amp;Visa</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="742"/>
         <source>&amp;Toolbars</source>
         <translation>Verktygsfält</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="213"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="746"/>
         <source>C++ standard</source>
         <translation>C++ standard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="225"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="747"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation>C standard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="748"/>
         <source>&amp;Edit</source>
         <translation>&amp;Redigera</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="578"/>
         <source>&amp;License...</source>
         <translation>&amp;Licens...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="319"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="579"/>
         <source>A&amp;uthors...</source>
         <translation>&amp;Utvecklat av...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="328"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="580"/>
         <source>&amp;About...</source>
         <translation>&amp;Om...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="333"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="581"/>
         <source>&amp;Files...</source>
         <translation>&amp;Filer...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="336"/>
         <location filename="mainwindow.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="582"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="584"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation>Analysera filer</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="342"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="587"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="351"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="589"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Katalog...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="354"/>
         <location filename="mainwindow.ui" line="357"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="590"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="592"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation>Analysera mapp</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="595"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="599"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="602"/>
         <source>&amp;Stop</source>
         <translation>&amp;Stoppa</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="393"/>
         <location filename="mainwindow.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="603"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="605"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation>Stoppa analys</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="608"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="610"/>
         <source>&amp;Save results to file...</source>
         <translation>&amp;Spara resultat till fil...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="411"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="612"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="416"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="614"/>
         <source>&amp;Quit</source>
         <translation>&amp;Avsluta</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="428"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="618"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Töm resultat</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="619"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Inställningar</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="470"/>
         <location filename="mainwindow.ui" line="473"/>
-        <location filename="mainwindow.cpp" line="2379"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="626"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="628"/>
+        <location filename="mainwindow.cpp" line="2408"/>
         <source>Show errors</source>
         <translation>Visa fel</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="616"/>
         <location filename="mainwindow.ui" line="619"/>
-        <location filename="mainwindow.cpp" line="2380"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="668"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="670"/>
+        <location filename="mainwindow.cpp" line="2409"/>
         <source>Show warnings</source>
         <translation>Visa varningar</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="634"/>
         <location filename="mainwindow.ui" line="637"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="673"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="675"/>
         <source>Show performance warnings</source>
         <translation>Visa prestanda varningar</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="645"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="677"/>
         <source>Show &amp;hidden</source>
         <translation>Visa dolda</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1015"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="660"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="680"/>
         <source>Show information messages</source>
         <translation>Visa informations meddelanden</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="675"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="684"/>
         <source>Show portability warnings</source>
         <translation>Visa portabilitets varningar</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="690"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="687"/>
         <source>Show Cppcheck results</source>
         <translation>Visa Cppcheck resultat</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="702"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="689"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="705"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="691"/>
         <source>Show Clang results</source>
         <translation>Visa Clang resultat</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="713"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="693"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filter</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="716"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="695"/>
         <source>Filter results</source>
         <translation>Filtrera resultat</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="732"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="697"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit ANSI</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="740"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="698"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit Unicode</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="748"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="699"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="756"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="700"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="764"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="701"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="858"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="709"/>
         <source>&amp;Print...</source>
         <translation>Skriv ut...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="861"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="711"/>
         <source>Print the Current Report</source>
         <translation>Skriv ut aktuell rapport</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="866"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="713"/>
         <source>Print Pre&amp;view...</source>
         <translation>Förhandsgranska utskrift...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="869"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="715"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation>Öppnar förhandsgranskning för nuvarande resultat</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="877"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="719"/>
         <source>Open library editor</source>
         <translation>Öppna library editor</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="478"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="630"/>
         <source>&amp;Check all</source>
         <translation>&amp;Kryssa alla</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="738"/>
         <source>Checking for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="100"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="739"/>
         <source>Hide</source>
         <translation type="unfinished">Dölj</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="163"/>
         <location filename="mainwindow.ui" line="979"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="730"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="743"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="303"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="751"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="369"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="597"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation>Analysera om ändrade filer</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="381"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="601"/>
         <source>Reanal&amp;yze all files</source>
         <translation>Analysera om alla filer</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="419"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="616"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="620"/>
         <source>Style war&amp;nings</source>
         <translation>Style varningar</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="467"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="625"/>
         <source>E&amp;rrors</source>
         <translation>Fel</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="483"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="631"/>
         <source>&amp;Uncheck all</source>
         <translation>Kryssa &amp;ur alla</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="488"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="632"/>
         <source>Collapse &amp;all</source>
         <translatorcomment>Ingen bra översättning!</translatorcomment>
         <translation>&amp;Fäll ihop alla</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="493"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="633"/>
         <source>&amp;Expand all</source>
         <translation>&amp;Expandera alla</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="501"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="634"/>
         <source>&amp;Standard</source>
         <translation>&amp;Standard</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="636"/>
         <source>Standard items</source>
         <translation>Standard poster</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="645"/>
         <source>Toolbar</source>
         <translation>Verktygsfält</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="528"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="646"/>
         <source>&amp;Categories</source>
         <translation>&amp;Kategorier</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="531"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="648"/>
         <source>Error categories</source>
         <translation>Fel kategorier</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="536"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="650"/>
         <source>&amp;Open XML...</source>
         <translation>&amp;Öppna XML...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="545"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="651"/>
         <source>Open P&amp;roject File...</source>
         <translation>Öppna Projektfil...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="548"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="653"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="655"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>Visa Scratchpad...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="562"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="656"/>
         <source>&amp;New Project File...</source>
         <translation>Ny projektfil...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="565"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="658"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="570"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="660"/>
         <source>&amp;Log View</source>
         <translation></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="573"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="662"/>
         <source>Log View</source>
         <translation>Logg vy</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="581"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="664"/>
         <source>C&amp;lose Project File</source>
         <translation>Stäng projektfil</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="589"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="665"/>
         <source>&amp;Edit Project File...</source>
         <translation>Redigera projektfil...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="601"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="666"/>
         <source>&amp;Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="613"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="667"/>
         <source>&amp;Warnings</source>
         <translation>Varningar</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="631"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="672"/>
         <source>Per&amp;formance warnings</source>
         <translation>Optimerings varningar</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="657"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="678"/>
         <source>&amp;Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="672"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="682"/>
         <source>&amp;Portability</source>
         <translation>Portabilitet</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="772"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="702"/>
         <source>P&amp;latforms</source>
         <translation>Plattformar</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="786"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="703"/>
         <source>C++&amp;11</source>
         <translation>C++11</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="797"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="704"/>
         <source>C&amp;99</source>
         <translation>C99</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="805"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="705"/>
         <source>&amp;Posix</source>
         <translation>Posix</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="813"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="706"/>
         <source>C&amp;11</source>
         <translation>C11</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="845"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="707"/>
         <source>&amp;C89</source>
         <translation>C89</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="853"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="708"/>
         <source>&amp;C++03</source>
         <translation>C++03</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="874"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="717"/>
         <source>&amp;Library Editor...</source>
         <translation>Library Editor...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="721"/>
         <source>&amp;Auto-detect language</source>
         <translation>Detektera språk automatiskt</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="893"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="722"/>
         <source>&amp;Enforce C++</source>
         <translation>Tvinga C++</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="901"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="723"/>
         <source>E&amp;nforce C</source>
         <translation>Tvinga C</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="912"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="724"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="920"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="725"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="928"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="726"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="936"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="727"/>
         <source>C++17</source>
         <translation type="unfinished">C++17</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="728"/>
         <source>C++20</source>
         <translation type="unfinished">C++20</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="729"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="987"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="731"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="995"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1003"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1011"/>
-        <source>Cert C</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="732"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1019"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="733"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1027"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="734"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1035"/>
-        <source>Autosar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1040"/>
-        <source>EULA...</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="736"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="509"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="638"/>
         <source>&amp;Contents</source>
         <translation>&amp;Innehåll</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="284"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="750"/>
         <source>Categories</source>
         <translation>Kategorier</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="452"/>
         <location filename="mainwindow.ui" line="455"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="621"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="623"/>
         <source>Show style warnings</source>
         <translation>Visa stil varningar</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="512"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="640"/>
         <source>Open the help contents</source>
         <translation>Öppna hjälp</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="515"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="643"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="198"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="744"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjälp</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="155"/>
-        <location filename="mainwindow.cpp" line="1781"/>
+        <location filename="mainwindow.cpp" line="176"/>
+        <location filename="mainwindow.cpp" line="1812"/>
         <source>Quick Filter:</source>
         <translation>Snabbfilter:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="601"/>
+        <source>None of the selected files is part of the project, nothing to analyze.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select configuration</source>
         <translation>Välj konfiguration</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="858"/>
+        <location filename="mainwindow.cpp" line="890"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1110,97 +1191,97 @@ Do you want to load this project file instead?</source>
 Vill du ladda denna projektfil istället?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="992"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>File not found</source>
         <translation>Filen hittades ej</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="995"/>
+        <location filename="mainwindow.cpp" line="1027"/>
         <source>Bad XML</source>
         <translation>Ogiltig XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1030"/>
         <source>Missing attribute</source>
         <translation>Attribut finns ej</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1001"/>
+        <location filename="mainwindow.cpp" line="1033"/>
         <source>Bad attribute value</source>
         <translation>Ogiltigt attribut värde</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1004"/>
+        <location filename="mainwindow.cpp" line="1036"/>
         <source>Unsupported format</source>
         <translation>Format stöds ej</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1013"/>
+        <location filename="mainwindow.cpp" line="1045"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation>Misslyckades att ladda valda library &apos;%1&apos;.
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1035"/>
+        <location filename="mainwindow.cpp" line="1064"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1058"/>
+        <location filename="mainwindow.cpp" line="1087"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1120"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1700"/>
         <source>License</source>
         <translation>Licens</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1654"/>
+        <location filename="mainwindow.cpp" line="1707"/>
         <source>Authors</source>
         <translation>Utvecklare</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1674"/>
+        <location filename="mainwindow.cpp" line="1727"/>
         <source>Save the report file</source>
         <translation>Spara rapport</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1482"/>
-        <location filename="mainwindow.cpp" line="1681"/>
+        <location filename="mainwindow.cpp" line="1539"/>
+        <location filename="mainwindow.cpp" line="1734"/>
         <source>XML files (*.xml)</source>
         <translation>XML filer (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="458"/>
+        <location filename="mainwindow.cpp" line="477"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -1209,42 +1290,37 @@ This is probably because the settings were changed between the Cppcheck versions
 En trolig orsak är att inställningarna ändrats för olika Cppcheck versioner. Kontrollera programinställningarna.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="753"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>Du måste stänga projektfilen innan nya filer eller sökvägar kan väljas!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1015"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>Library filen &apos;%1&apos; har element som ej hanteras:
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1007"/>
+        <location filename="mainwindow.cpp" line="1039"/>
         <source>Duplicate platform type</source>
         <translation>Dubbel plattformstyp</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1010"/>
+        <location filename="mainwindow.cpp" line="1042"/>
         <source>Platform type redefined</source>
         <translation>Plattformstyp definieras igen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1016"/>
+        <location filename="mainwindow.cpp" line="1048"/>
         <source>Unknown element</source>
         <translation>Element hanteras ej</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1019"/>
-        <source>Unknown issue</source>
-        <translation>NÃ¥got problem</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1080"/>
-        <location filename="mainwindow.cpp" line="1090"/>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1120"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
@@ -1253,80 +1329,74 @@ En trolig orsak är att inställningarna ändrats för olika Cppcheck versioner.
         <translation type="vanished">Misslyckades att ladda %1. Din Cppcheck installation är ej komplett. Du kan använda --data-dir&lt;directory&gt; på kommandoraden för att specificera var denna fil finns. Det är meningen att --data-dir kommandot skall köras under installationen,så GUIt kommer ej visas när --data-dir används allt som händer är att en inställning görs.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1484"/>
+        <location filename="mainwindow.cpp" line="1541"/>
         <source>Open the report file</source>
         <translation>Öppna rapportfilen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1685"/>
+        <location filename="mainwindow.cpp" line="1738"/>
         <source>Text files (*.txt)</source>
         <translation>Text filer (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1689"/>
+        <location filename="mainwindow.cpp" line="1742"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV filer (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1819"/>
+        <location filename="mainwindow.cpp" line="1850"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Projektfiler (*.cppcheck);;Alla filer(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="1852"/>
         <source>Select Project File</source>
         <translation>Välj projektfil</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="239"/>
-        <location filename="mainwindow.cpp" line="1783"/>
-        <location filename="mainwindow.cpp" line="1849"/>
-        <location filename="mainwindow.cpp" line="2047"/>
+        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="1814"/>
+        <location filename="mainwindow.cpp" line="1880"/>
+        <location filename="mainwindow.cpp" line="2062"/>
         <source>Project:</source>
         <translation>Projekt:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="668"/>
+        <location filename="mainwindow.cpp" line="702"/>
         <source>No suitable files found to analyze!</source>
         <translation>Inga filer hittades att analysera!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="767"/>
+        <location filename="mainwindow.cpp" line="798"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="768"/>
+        <location filename="mainwindow.cpp" line="799"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
-        <translation type="unfinished">Visual Studio</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="770"/>
-        <source>Borland C++ Builder 6</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="773"/>
+        <location filename="mainwindow.cpp" line="804"/>
         <source>Select files to analyze</source>
         <translation>Välj filer att analysera</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="819"/>
         <source>Select directory to analyze</source>
         <translation>Välj mapp att analysera</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>Välj konfiguration som kommer analyseras</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="880"/>
+        <location filename="mainwindow.cpp" line="912"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1335,7 +1405,7 @@ Do you want to proceed analysis without using any of these project files?</sourc
 Vill du fortsätta analysen utan att använda någon av dessa projekt filer?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1467"/>
+        <location filename="mainwindow.cpp" line="1524"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1343,7 +1413,7 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1591"/>
+        <location filename="mainwindow.cpp" line="1644"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1352,109 +1422,104 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 Vill du stoppa analysen och avsluta Cppcheck?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1633"/>
+        <location filename="mainwindow.cpp" line="1686"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1672"/>
+        <location filename="mainwindow.cpp" line="1725"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML filer (*.xml);;Text filer (*.txt);;CSV filer (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1712"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1937"/>
+        <location filename="mainwindow.cpp" line="1951"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>Build dir &apos;%1&apos; existerar ej, skapa den?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1945"/>
+        <location filename="mainwindow.cpp" line="1959"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1977"/>
+        <location filename="mainwindow.cpp" line="1992"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1995"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1983"/>
+        <location filename="mainwindow.cpp" line="1998"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1999"/>
+        <location filename="mainwindow.cpp" line="2014"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2008"/>
+        <location filename="mainwindow.cpp" line="2023"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2352"/>
+        <location filename="mainwindow.cpp" line="2381"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2353"/>
+        <location filename="mainwindow.cpp" line="2382"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2354"/>
+        <location filename="mainwindow.cpp" line="2383"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2355"/>
+        <location filename="mainwindow.cpp" line="2384"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2372"/>
+        <location filename="mainwindow.cpp" line="2401"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2373"/>
+        <location filename="mainwindow.cpp" line="2402"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2374"/>
+        <location filename="mainwindow.cpp" line="2403"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2381"/>
+        <location filename="mainwindow.cpp" line="2410"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2382"/>
+        <location filename="mainwindow.cpp" line="2411"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2383"/>
+        <location filename="mainwindow.cpp" line="2412"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2384"/>
+        <location filename="mainwindow.cpp" line="2413"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1463,22 +1528,22 @@ Analysis is stopped.</source>
         <translation type="vanished">Misslyckades att importera &apos;%1&apos;, analysen stoppas</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2032"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project files (*.cppcheck)</source>
         <translation>Projekt filer (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2034"/>
+        <location filename="mainwindow.cpp" line="2049"/>
         <source>Select Project Filename</source>
         <translation>Välj Projektfil</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2080"/>
+        <location filename="mainwindow.cpp" line="2095"/>
         <source>No project file loaded</source>
         <translation>Inget projekt laddat</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2148"/>
+        <location filename="mainwindow.cpp" line="2177"/>
         <source>The project file
 
 %1
@@ -1495,12 +1560,12 @@ Do you want to remove the file from the recently used projects -list?</source>
 Vill du ta bort filen från &apos;senast använda projekt&apos;-listan?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2310"/>
+        <location filename="mainwindow.cpp" line="2339"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2314"/>
+        <location filename="mainwindow.cpp" line="2343"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1557,26 +1622,31 @@ Options:
     <name>NewSuppressionDialog</name>
     <message>
         <location filename="newsuppressiondialog.ui" line="17"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="114"/>
         <source>New suppression</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="25"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="115"/>
         <source>Error ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="32"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="116"/>
         <source>File name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="42"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="117"/>
         <source>Line number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="52"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="118"/>
         <source>Symbol name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1594,414 +1664,506 @@ Options:
         <translation>Native</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit ANSI</translation>
+        <translation type="vanished">Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit Unicode</translation>
+        <translation type="vanished">Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
 </context>
 <context>
     <name>ProjectFile</name>
     <message>
         <location filename="projectfile.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="923"/>
         <source>Project File</source>
         <translation>Projektfil</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="955"/>
         <source>Paths and Defines</source>
         <translation>Sökvägar och defines</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="30"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="924"/>
         <source>Import Project (Visual studio / compile database/ Borland C++ Builder 6)</source>
         <oldsource>Import Project (Visual studio / compile database)</oldsource>
         <translation type="unfinished">Importera Projekt (Visual Studio / compile database)</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="231"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="938"/>
         <source>Defines must be separated by a semicolon. Example: DEF1;DEF2=5;DEF3=int</source>
         <oldsource>Defines must be separated by a semicolon &apos;;&apos;</oldsource>
         <translation type="unfinished">Defines separeras med semicolon &apos;;&apos;</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="958"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation>Obs: Lägg dina egna .cfg filer i samma folder som projekt filen. De skall isåfall visas ovan.</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="890"/>
+        <location filename="projectfile.ui" line="899"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1015"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="73"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="928"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You have a choice:&lt;/p&gt;&lt;p&gt; * Analyze all Debug and Release configurations&lt;/p&gt;&lt;p&gt; * Only analyze the first matching Debug configuration&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Du har ett val:&lt;/p&gt;&lt;p&gt; * Analysera alla Debug och Release konfigurationer&lt;/p&gt;&lt;p&gt; * Analysera bara den första matchande Debug konfigurationen&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="926"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="964"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="930"/>
         <source>Analyze all Visual Studio configurations</source>
         <translation>Analysera alla Visual Studio konfigurationer</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="113"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="931"/>
         <source>Selected VS Configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="147"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="932"/>
         <source>Paths:</source>
         <translation>Sökvägar:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="181"/>
         <location filename="projectfile.ui" line="296"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="933"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="945"/>
         <source>Add...</source>
         <translation>Lägg till...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="934"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="994"/>
         <source>Edit</source>
         <translation>Redigera</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="935"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="995"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="998"/>
         <source>Remove</source>
         <translation>Ta bort</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="242"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="940"/>
         <source>Undefines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="252"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="942"/>
         <source>Undefines must be separated by a semicolon. Example: UNDEF1;UNDEF2;UNDEF3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="265"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="944"/>
         <source>Include Paths:</source>
         <translation>Include sökvägar:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="350"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="950"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="952"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="954"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="962"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="967"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="968"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="969"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="970"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="971"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="974"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="978"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="981"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="985"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="989"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="991"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="992"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="993"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="999"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished">Använd inline suppressions</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1006"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1007"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="914"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1008"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1018"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="851"/>
+        <location filename="projectfile.ui" line="860"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1009"/>
         <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="876"/>
+        <location filename="projectfile.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1011"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="883"/>
+        <location filename="projectfile.ui" line="892"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1013"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="901"/>
+        <location filename="projectfile.ui" line="910"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1016"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="918"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1017"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="958"/>
+        <location filename="projectfile.ui" line="967"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1022"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="975"/>
-        <source>Bug hunting (Premium)</source>
+        <location filename="projectfile.ui" line="981"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1024"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="991"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1025"/>
+        <source>Bug hunting (Premium)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="1007"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1027"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="330"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="948"/>
         <source>Up</source>
         <translation>Upp</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="337"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="949"/>
         <source>Down</source>
         <translation>Ned</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="956"/>
         <source>Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="972"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="982"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="965"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="966"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="976"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="977"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="979"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="980"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1000"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="983"/>
         <source>Root path:</source>
         <translation>Bas sökväg:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="987"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>Varnings taggar (separerade med semikolon)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="960"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation>Cppcheck build dir (whole program analys, incremental analys, statistik, etc)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="959"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="957"/>
         <source>Libraries</source>
         <translation>Libraries</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="996"/>
         <source>Suppressions</source>
         <translation>Suppressions</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="997"/>
         <source>Add</source>
         <translation>Lägg till</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1001"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1028"/>
         <source>Addons</source>
         <translation>Addons</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1002"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1003"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1004"/>
         <source>Thread safety</source>
         <translation>Tråd säkerhet</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1005"/>
         <source>Coding standards</source>
         <translation>Kodstandarder</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="937"/>
+        <location filename="projectfile.ui" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1020"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="946"/>
+        <location filename="projectfile.ui" line="955"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1021"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="965"/>
+        <location filename="projectfile.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1023"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="981"/>
+        <location filename="projectfile.ui" line="997"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1026"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
-        <translation>Clang analyzer</translation>
+        <translation type="vanished">Clang analyzer</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
-        <translation>Clang-tidy</translation>
+        <translation type="vanished">Clang-tidy</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="936"/>
         <source>Defines:</source>
         <translation>Defines:</translation>
     </message>
@@ -2014,77 +2176,82 @@ Options:
         <translation>Projektfil: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="414"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="477"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="604"/>
+        <location filename="projectfiledialog.cpp" line="585"/>
         <source>Select Cppcheck build dir</source>
         <translation>Välj Cppcheck build dir</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="865"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
+        <source>C/C++ header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="648"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="861"/>
         <source>Select include directory</source>
         <translation>Välj include sökväg</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="893"/>
+        <location filename="projectfiledialog.cpp" line="889"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="894"/>
+        <location filename="projectfiledialog.cpp" line="647"/>
+        <location filename="projectfiledialog.cpp" line="890"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="895"/>
+        <location filename="projectfiledialog.cpp" line="891"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="978"/>
+        <location filename="projectfiledialog.cpp" line="976"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="980"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="845"/>
+        <location filename="projectfiledialog.cpp" line="841"/>
         <source>Select a directory to check</source>
         <translation>Välj mapp att analysera</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
-        <translation type="unfinished">Visual Studio</translation>
+        <translation type="obsolete">Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="644"/>
+        <location filename="projectfiledialog.cpp" line="625"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="645"/>
-        <source>Borland C++ Builder 6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfiledialog.cpp" line="646"/>
+        <location filename="projectfiledialog.cpp" line="627"/>
         <source>Import Project</source>
         <translation>Importera Projekt</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="885"/>
+        <location filename="projectfiledialog.cpp" line="881"/>
         <source>Select directory to ignore</source>
         <translation>Välj sökväg att ignorera</translation>
     </message>
@@ -2119,7 +2286,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="302"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2169,161 +2336,156 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="142"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="144"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="114"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">Fil</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="115"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Rad</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="116"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Typ</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="117"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="118"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="119"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished">Inconclusive</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="120"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">Sammanfattning</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="121"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="122"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="123"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="124"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished">Sedan datum</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="125"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="126"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
@@ -2371,37 +2533,37 @@ Options:
         <translation type="vanished">Odefinierad fil</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="657"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="825"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="829"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="830"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="832"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="367"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>debug</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="298"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation>note</translation>
     </message>
@@ -2414,53 +2576,51 @@ Options:
         <translation type="vanished">Dölj</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="659"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation>Dölj alla med id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="681"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation>Stäng av valda id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="660"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation>Öppna mapp</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="370"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="656"/>
+        <location filename="resultstree.cpp" line="667"/>
         <source>Recheck %1 file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="658"/>
+        <location filename="resultstree.cpp" line="669"/>
         <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="701"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation>Tag</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="703"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation>Ingen tag</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="733"/>
-        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="734"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2470,7 +2630,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 Konfigurera program i inställningar/program.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="748"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2479,12 +2639,12 @@ Please select the default editor application in preferences/Applications.</sourc
 Vänligen välj standard editor i inställningar/Program.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="768"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>Kunde inte hitta filen!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="811"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2493,7 +2653,7 @@ Please check the application path and parameters are correct.</source>
 Kontrollera att sökvägen och parametrarna är korrekta.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="833"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>Välj mapp</translation>
     </message>
@@ -2510,32 +2670,32 @@ Kontrollera att sökvägen och parametrarna är korrekta.</translation>
         <translation type="vanished">Sedan datum</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="349"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>stil</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="352"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>fel</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="355"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>varning</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="358"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>prestanda</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="361"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>portabilitet</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="364"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>information</translation>
     </message>
@@ -2543,122 +2703,124 @@ Kontrollera att sökvägen och parametrarna är korrekta.</translation>
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="255"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>Skriv ut rapport</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="274"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation>Inga fel hittades, inget att skriva ut.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="326"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 av %2 filer analyserade)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="350"/>
-        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="351"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>Inga fel hittades.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="358"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Fel hittades, men de visas ej.
 För att ställa in vilka fel som skall visas använd visa menyn.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>Misslyckades att läsa rapporten.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>XML format version 1 stöds ej längre.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="460"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation>Först inkluderad av</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="465"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="539"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="540"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="541"/>
+        <location filename="resultsview.cpp" line="538"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="549"/>
+        <location filename="resultsview.cpp" line="545"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="563"/>
+        <location filename="resultsview.cpp" line="559"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="565"/>
+        <location filename="resultsview.cpp" line="561"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="567"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="568"/>
+        <location filename="resultsview.cpp" line="564"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="237"/>
-        <location filename="resultsview.cpp" line="245"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>Misslyckades med att spara rapporten.</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="26"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="147"/>
         <source>Results</source>
         <translation>Resultat</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="60"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="148"/>
         <source>Critical errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="149"/>
         <source>Analysis Log</source>
         <translation>Analys Log</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="114"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="150"/>
         <source>Warning Details</source>
         <translation>Varningsdetaljer</translation>
     </message>
@@ -2667,26 +2829,31 @@ För att ställa in vilka fel som skall visas använd visa menyn.</translation>
     <name>ScratchPad</name>
     <message>
         <location filename="scratchpad.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="107"/>
         <source>Scratchpad</source>
         <translation>Scratchpad</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="108"/>
         <source>Copy or write some C/C++ code here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="37"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="109"/>
         <source>Optionally enter a filename (mainly for automatic language detection) and click on &quot;Check&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="110"/>
         <source>filename</source>
         <translation>Filnamn</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="78"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="111"/>
         <source>Check</source>
         <translation>Analysera</translation>
     </message>
@@ -2695,21 +2862,25 @@ För att ställa in vilka fel som skall visas använd visa menyn.</translation>
     <name>Settings</name>
     <message>
         <location filename="settings.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="490"/>
         <source>Preferences</source>
         <translation>Inställningar</translation>
     </message>
     <message>
         <location filename="settings.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="502"/>
         <source>General</source>
         <translation>Allmänt</translation>
     </message>
     <message>
         <location filename="settings.ui" line="196"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="503"/>
         <source>Add...</source>
         <translation>Lägg till...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="491"/>
         <source>Number of threads: </source>
         <translation>Antal trådar:</translation>
     </message>
@@ -2719,57 +2890,68 @@ För att ställa in vilka fel som skall visas använd visa menyn.</translation>
     </message>
     <message>
         <location filename="settings.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="493"/>
         <source>Force checking all #ifdef configurations</source>
         <oldsource>Check all #ifdef configurations</oldsource>
         <translation>Kontrollera alla #ifdef konfigurationer</translation>
     </message>
     <message>
         <location filename="settings.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="494"/>
         <source>Show full path of files</source>
         <translation>Visa den fulla sökvägen för filer</translation>
     </message>
     <message>
         <location filename="settings.ui" line="122"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="495"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>Visa &quot;Inga fel hittades&quot; meddelande när inga fel hittas</translation>
     </message>
     <message>
         <location filename="settings.ui" line="129"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="496"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>Visa meddelande id i kolumn &quot;Id&quot;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="136"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="497"/>
         <source>Enable inline suppressions</source>
         <translation>Använd inline suppressions</translation>
     </message>
     <message>
         <location filename="settings.ui" line="143"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="498"/>
         <source>Check for inconclusive errors also</source>
         <translation>Kör inconclusive analys</translation>
     </message>
     <message>
         <location filename="settings.ui" line="150"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="499"/>
         <source>Show statistics on check completion</source>
         <translation>Visa statistik när analys är klar</translation>
     </message>
     <message>
         <location filename="settings.ui" line="157"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="500"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="177"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="501"/>
         <source>Show internal warnings in log</source>
         <translation>Visa interna fel i loggen</translation>
     </message>
     <message>
         <location filename="settings.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="521"/>
         <source>Addons</source>
         <translation>Addons</translation>
     </message>
     <message>
         <location filename="settings.ui" line="294"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="512"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation>Python binär fil (lämna tom för att använda python i PATH)</translation>
     </message>
@@ -2777,117 +2959,143 @@ För att ställa in vilka fel som skall visas använd visa menyn.</translation>
         <location filename="settings.ui" line="305"/>
         <location filename="settings.ui" line="346"/>
         <location filename="settings.ui" line="391"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="513"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="523"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="324"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="515"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="332"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="516"/>
         <source>MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="518"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="526"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
         <location filename="settings.ui" line="378"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="522"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation>Clang sökväg (lämna tom för att använda PATH)</translation>
     </message>
     <message>
         <location filename="settings.ui" line="401"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="524"/>
         <source>Visual Studio headers</source>
         <translation>Visual Studio headers</translation>
     </message>
     <message>
         <location filename="settings.ui" line="407"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="525"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sökvägar till Visual Studio headers, separerade med semikolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;Du kan öppna en Visual Studio command prompt, och skriva &amp;quot;SET INCLUDE&amp;quot;. Sedan kopiera och klistra in sökvägarna.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="533"/>
         <source>Code Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="527"/>
         <source>Code Editor Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="528"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="456"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="529"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="463"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="530"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="472"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="531"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="210"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="505"/>
         <source>Remove</source>
         <translation>Ta bort</translation>
     </message>
     <message>
         <location filename="settings.ui" line="79"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="492"/>
         <source>Max count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="185"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="507"/>
         <source>Applications</source>
         <translation>Program</translation>
     </message>
     <message>
         <location filename="settings.ui" line="203"/>
         <location filename="settings.ui" line="479"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="532"/>
         <source>Edit...</source>
         <translation>Redigera...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="506"/>
         <source>Set as default</source>
         <translation>Sätt förvald</translation>
     </message>
     <message>
         <location filename="settings.ui" line="240"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="510"/>
         <source>Reports</source>
         <translation>Rapporter</translation>
     </message>
     <message>
         <location filename="settings.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="508"/>
         <source>Save all errors when creating report</source>
         <translation>Spara alla fel</translation>
     </message>
     <message>
         <location filename="settings.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="509"/>
         <source>Save full path to files in reports</source>
         <translation>Spara fulla sökvägar</translation>
     </message>
     <message>
         <location filename="settings.ui" line="274"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="511"/>
         <source>Language</source>
         <translation>Språk</translation>
     </message>
@@ -2944,221 +3152,245 @@ För att ställa in vilka fel som skall visas använd visa menyn.</translation>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="395"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="415"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="401"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="33"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="396"/>
         <source>Project:</source>
         <translation>Projekt:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="53"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="397"/>
         <source>Paths:</source>
         <translation>Sökvägar:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="85"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="398"/>
         <source>Include paths:</source>
         <translation>Include sökvägar:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="399"/>
         <source>Defines:</source>
         <translation>Defines:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="400"/>
         <source>Undefines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="407"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>Föregående analys</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="171"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="402"/>
         <source>Path Selected:</source>
         <translation>Vald sökväg:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="181"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="403"/>
         <source>Number of Files Scanned:</source>
         <translation>Antal analyserade filer:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="201"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="405"/>
         <source>Scan Duration:</source>
         <translation>Analys tid:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="254"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="408"/>
         <source>Errors:</source>
         <translation>Fel:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="271"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="409"/>
         <source>Warnings:</source>
         <translation>Varningar:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="410"/>
         <source>Stylistic warnings:</source>
         <translation>Stil varningar:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="305"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="411"/>
         <source>Portability warnings:</source>
         <translation>Portabilitets varningar:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="322"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="412"/>
         <source>Performance issues:</source>
         <translation>Prestanda varningar:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="413"/>
         <source>Information messages:</source>
         <translation>Informations meddelanden:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="356"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="414"/>
         <source>Active checkers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="374"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="416"/>
         <source>Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="418"/>
         <source>History</source>
         <translation>Historik</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="405"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="417"/>
         <source>File:</source>
         <translation>Fil:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="419"/>
         <source>Copy to Clipboard</source>
         <translation>Kopiera</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="420"/>
         <source>Pdf Export</source>
         <translation>Pdf Export</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 dag</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 dagar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1 timme</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 timmar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1 minut</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 minuter</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 sekund</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 sekunder</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 sekunder</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="171"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> och </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="198"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation>Exportera PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>Projekt inställningar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>Sökvägar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>Include sökvägar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>Definitioner</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>Vald sökväg</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>Antal analyserade filer</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>Fel</translation>
     </message>
@@ -3173,40 +3405,49 @@ För att ställa in vilka fel som skall visas använd visa menyn.</translation>
         <translation>Ingen Cppcheck build dir</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>Varningar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>Stil varningar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>Portabilitetsvarningar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>Prestanda varningar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>Informationsmeddelanden</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_threaddetails.h" line="47"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="46"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 av %2 filer analyserade</translation>
     </message>
@@ -3227,9 +3468,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 Språket har nollställts till Engelska. Öppna Preferences och välj något av de tillgängliga språken.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_zh_CN.ts b/gui/cppcheck_zh_CN.ts
index 5e329d74f3c..3bc2a493818 100644
--- a/gui/cppcheck_zh_CN.ts
+++ b/gui/cppcheck_zh_CN.ts
@@ -5,38 +5,45 @@
     <name>About</name>
     <message>
         <location filename="about.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="130"/>
         <source>About Cppcheck</source>
         <translation>关于 Cppcheck</translation>
     </message>
     <message>
         <location filename="about.ui" line="64"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="132"/>
         <source>Version %1</source>
         <translation>版本 %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="133"/>
         <source>Cppcheck - A tool for static C/C++ code analysis.</source>
         <translation>Cppcheck - C/C++ ��代�分�工具。</translation>
     </message>
     <message>
         <location filename="about.ui" line="81"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="134"/>
         <source>Copyright © 2007-%1 Cppcheck team.</source>
         <oldsource>Copyright © 2007-2021 Cppcheck team.</oldsource>
         <translation>版�所有 © 2007-%1 Cppcheck 团队。</translation>
     </message>
     <message>
         <location filename="about.ui" line="91"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="135"/>
         <source>This program is licensed under the terms
 of the GNU General Public License version 3</source>
         <translation>该程�在 GNU 通用公共授�版本 3 的�款下�布</translation>
     </message>
     <message>
         <location filename="about.ui" line="102"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="137"/>
         <source>Visit Cppcheck homepage at %1</source>
         <translation>访问 Cppcheck 主页: %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;pcre&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;picojson&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tinyxml2&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
         <translation type="unfinished"></translation>
@@ -46,11 +53,13 @@ of the GNU General Public License version 3</source>
     <name>ApplicationDialog</name>
     <message>
         <location filename="applicationdialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="161"/>
         <source>Add an application</source>
         <translation>添加应用程�</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="162"/>
         <source>Here you can add an application that can open error files. Specify a name for the application, the application executable and command line parameters for the application.
 
 The following texts in parameters are replaced with appropriate values when application is executed:
@@ -76,21 +85,25 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="173"/>
         <source>&amp;Name:</source>
         <translation>�称(&amp;N):</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="86"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="174"/>
         <source>&amp;Executable:</source>
         <translation>�执行文件(&amp;E):</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="96"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="175"/>
         <source>&amp;Parameters:</source>
         <translation>�数(&amp;P):</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="138"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="176"/>
         <source>Browse</source>
         <translation>�览</translation>
     </message>
@@ -105,9 +118,8 @@ Parameters: -l(line) (file)</source>
         <translation>选择查看应用程�</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -115,70 +127,6 @@ Parameters: -l(line) (file)</source>
         <translation>你必须为应用程�指定�称�路径以��选�数�</translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -187,10 +135,8 @@ Parameters: -l(line) (file)</source>
         <translation>无法找到文件: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -202,44 +148,49 @@ Parameters: -l(line) (file)</source>
     <name>HelpDialog</name>
     <message>
         <location filename="helpdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="88"/>
         <source>Cppcheck GUI help</source>
         <translation>Cppcheck GUI 帮助</translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="89"/>
         <source>Contents</source>
         <translation>内容</translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="90"/>
         <source>Index</source>
         <translation>索引</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation>帮助文件 &apos;%1&apos; 未找到</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
     <name>LibraryAddFunctionDialog</name>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="105"/>
         <source>Add function</source>
         <translation>添加函数</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="106"/>
         <source>Function name(s)</source>
         <translation>函数�</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="107"/>
         <source>Number of arguments</source>
         <translation>�数个数</translation>
     </message>
@@ -248,126 +199,140 @@ Parameters: -l(line) (file)</source>
     <name>LibraryDialog</name>
     <message>
         <location filename="librarydialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="275"/>
         <source>Library Editor</source>
         <translation>库编辑器</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="22"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="276"/>
         <source>Open</source>
         <translation>打开</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="29"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="277"/>
         <source>Save</source>
         <translation>�存</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="36"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="278"/>
         <source>Save as</source>
         <translation>�存为</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="62"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="279"/>
         <source>Functions</source>
         <translation>函数</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="280"/>
         <source>Sort</source>
         <translation>排�</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="111"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="281"/>
         <source>Add</source>
         <translation>添加</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="282"/>
         <source>Filter:</source>
         <translation>过滤：</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="164"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="283"/>
         <source>Comments</source>
         <translation>注释</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="204"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="284"/>
         <source>noreturn</source>
         <translation>无返回</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="212"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="285"/>
         <source>False</source>
         <translation>�</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="286"/>
         <source>True</source>
         <translation>是</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="222"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="287"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="232"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="289"/>
         <source>return value must be used</source>
         <translation>返回值必须被使用</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="239"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="290"/>
         <source>ignore function in leaks checking</source>
         <translation>在泄�检查中忽略函数</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="291"/>
         <source>Arguments</source>
         <translation>�数</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="258"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="292"/>
         <source>Edit</source>
         <translation>编辑</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation>库文件 (*.cfg)</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation>打开库文件</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation>无法打开文件 %1。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation>加载文件 %1 失败。%2。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation>无法�存文件 %1。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation>库�存为</translation>
     </message>
@@ -376,11 +341,13 @@ Parameters: -l(line) (file)</source>
     <name>LibraryEditArgDialog</name>
     <message>
         <location filename="libraryeditargdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="284"/>
         <source>Edit argument</source>
         <translation>编辑�数</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="286"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is bool value allowed? For instance result from comparison or from &apos;!&apos; operator.&lt;/p&gt;
 &lt;p&gt;Typically, set this if the argument is a pointer, size, etc.&lt;/p&gt;
@@ -396,11 +363,13 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="28"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="293"/>
         <source>Not bool</source>
         <translation>�布尔值</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="35"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is a null parameter value allowed?&lt;/p&gt;
 &lt;p&gt;Typically this should be used on any pointer parameter that does not allow null.&lt;/p&gt;
@@ -416,78 +385,99 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="43"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="302"/>
         <source>Not null</source>
         <translation>�空</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="50"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="303"/>
         <source>Not uninit</source>
         <translation>�未�始化</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="57"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="304"/>
         <source>String</source>
         <translation>字符串</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="70"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="305"/>
         <source>Format string</source>
         <translation>格�化字符串</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="306"/>
         <source>Min size of buffer</source>
         <translation>最�缓冲区大�</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="101"/>
         <location filename="libraryeditargdialog.ui" line="203"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="307"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="316"/>
         <source>Type</source>
         <translation>类型</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="109"/>
         <location filename="libraryeditargdialog.ui" line="214"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="308"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="317"/>
         <source>None</source>
         <translation>æ— </translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="114"/>
         <location filename="libraryeditargdialog.ui" line="219"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="309"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="318"/>
         <source>argvalue</source>
         <translation>argvalue</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="119"/>
         <location filename="libraryeditargdialog.ui" line="224"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="319"/>
         <source>mul</source>
         <translation>mul</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="124"/>
         <location filename="libraryeditargdialog.ui" line="229"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="311"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="320"/>
         <source>strlen</source>
         <translation>strlen</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="132"/>
         <location filename="libraryeditargdialog.ui" line="237"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="313"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="322"/>
         <source>Arg</source>
         <translation>�数1</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="159"/>
         <location filename="libraryeditargdialog.ui" line="264"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="323"/>
         <source>Arg2</source>
         <translation>�数2</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="194"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="315"/>
         <source>and</source>
         <translation>并且</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="324"/>
         <source>Valid values</source>
         <translation>有效值</translation>
     </message>
@@ -495,602 +485,688 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="687"/>
-        <location filename="mainwindow.cpp" line="463"/>
-        <location filename="mainwindow.cpp" line="667"/>
-        <location filename="mainwindow.cpp" line="752"/>
-        <location filename="mainwindow.cpp" line="857"/>
-        <location filename="mainwindow.cpp" line="879"/>
-        <location filename="mainwindow.cpp" line="1466"/>
-        <location filename="mainwindow.cpp" line="1595"/>
-        <location filename="mainwindow.cpp" line="1936"/>
-        <location filename="mainwindow.cpp" line="1944"/>
-        <location filename="mainwindow.cpp" line="1998"/>
-        <location filename="mainwindow.cpp" line="2007"/>
-        <location filename="mainwindow.cpp" line="2079"/>
-        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="740"/>
         <source>&amp;File</source>
         <translation>文件(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="741"/>
         <source>&amp;View</source>
         <translation>查看(&amp;V)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="742"/>
         <source>&amp;Toolbars</source>
         <translation>工具�(&amp;T)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="198"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="744"/>
         <source>&amp;Help</source>
         <translation>帮助(&amp;H)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="213"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="746"/>
         <source>C++ standard</source>
         <translation>C++ 标准</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="225"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="747"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation>&amp;C 标准</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="748"/>
         <source>&amp;Edit</source>
         <translation>编辑(&amp;E)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="266"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="749"/>
         <source>Standard</source>
         <translation>标准</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="284"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="750"/>
         <source>Categories</source>
         <translation>分类</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="578"/>
         <source>&amp;License...</source>
         <translation>许��(&amp;L)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="319"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="579"/>
         <source>A&amp;uthors...</source>
         <translation>作者(&amp;U)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="328"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="580"/>
         <source>&amp;About...</source>
         <translation>关于(&amp;A)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="333"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="581"/>
         <source>&amp;Files...</source>
         <translation>文件(&amp;F)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="336"/>
         <location filename="mainwindow.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="582"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="584"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation>分�文件</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="342"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="587"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="351"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="589"/>
         <source>&amp;Directory...</source>
         <translation>目录(&amp;D)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="354"/>
         <location filename="mainwindow.ui" line="357"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="590"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="592"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation>分�目录</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="595"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="599"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="602"/>
         <source>&amp;Stop</source>
         <translation>�止(&amp;S)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="393"/>
         <location filename="mainwindow.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="603"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="605"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation>�止分�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="608"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="610"/>
         <source>&amp;Save results to file...</source>
         <translation>�存结果到文件(&amp;S)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="411"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="612"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="416"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="614"/>
         <source>&amp;Quit</source>
         <translation>退出(&amp;Q)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="428"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="618"/>
         <source>&amp;Clear results</source>
         <translation>清空结果(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="619"/>
         <source>&amp;Preferences</source>
         <translation>首选项(&amp;P)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="452"/>
         <location filename="mainwindow.ui" line="455"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="621"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="623"/>
         <source>Show style warnings</source>
         <translation>显示风格警告</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="470"/>
         <location filename="mainwindow.ui" line="473"/>
-        <location filename="mainwindow.cpp" line="2379"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="626"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="628"/>
+        <location filename="mainwindow.cpp" line="2408"/>
         <source>Show errors</source>
         <translation>显示错误</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1015"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Information</source>
         <translation>信�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="660"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="680"/>
         <source>Show information messages</source>
         <translation>显示信�消�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="675"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="684"/>
         <source>Show portability warnings</source>
         <translation>显示�移�性警告</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="690"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="687"/>
         <source>Show Cppcheck results</source>
         <translation>显示 Cppcheck 结果</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="702"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="689"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="705"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="691"/>
         <source>Show Clang results</source>
         <translation>显示 Clang 结果</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="713"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="693"/>
         <source>&amp;Filter</source>
         <translation>滤器(&amp;F)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="716"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="695"/>
         <source>Filter results</source>
         <translation>过滤结果</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="732"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="697"/>
         <source>Windows 32-bit ANSI</source>
         <translation></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="740"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="698"/>
         <source>Windows 32-bit Unicode</source>
         <translation></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="748"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="699"/>
         <source>Unix 32-bit</source>
         <translation></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="756"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="700"/>
         <source>Unix 64-bit</source>
         <translation></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="764"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="701"/>
         <source>Windows 64-bit</source>
         <translation></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="858"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="709"/>
         <source>&amp;Print...</source>
         <translation>打�(&amp;P)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="861"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="711"/>
         <source>Print the Current Report</source>
         <translation>打�当�报告</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="866"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="713"/>
         <source>Print Pre&amp;view...</source>
         <translation>打�预览(&amp;v)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="869"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="715"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation>打开当�结果的打�预览窗�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="877"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="719"/>
         <source>Open library editor</source>
         <translation>打开库编辑器</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="581"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="664"/>
         <source>C&amp;lose Project File</source>
         <translation>关闭项目文件(&amp;L)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="589"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="665"/>
         <source>&amp;Edit Project File...</source>
         <translation>编辑项目文件(&amp;E)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="601"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="666"/>
         <source>&amp;Statistics</source>
         <translation>统计(&amp;S)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="616"/>
         <location filename="mainwindow.ui" line="619"/>
-        <location filename="mainwindow.cpp" line="2380"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="668"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="670"/>
+        <location filename="mainwindow.cpp" line="2409"/>
         <source>Show warnings</source>
         <translation>显示警告</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="634"/>
         <location filename="mainwindow.ui" line="637"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="673"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="675"/>
         <source>Show performance warnings</source>
         <translation>显示性能警告</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="645"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="677"/>
         <source>Show &amp;hidden</source>
         <translation>显示��项(&amp;H)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="478"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="630"/>
         <source>&amp;Check all</source>
         <translation>全部选中(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="738"/>
         <source>Checking for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="100"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="739"/>
         <source>Hide</source>
         <translation type="unfinished">��</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="163"/>
         <location filename="mainwindow.ui" line="979"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="730"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="743"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="209"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="745"/>
         <source>A&amp;nalyze</source>
         <translation>分�(&amp;A)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="303"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="751"/>
         <source>Filter</source>
         <translation>滤器</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="369"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="597"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation>�新分�已修改的文件(&amp;R)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="381"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="601"/>
         <source>Reanal&amp;yze all files</source>
         <translation>�新分�全部文件(&amp;y)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="419"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="616"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="620"/>
         <source>Style war&amp;nings</source>
         <translation>风格警告(&amp;n)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="467"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="625"/>
         <source>E&amp;rrors</source>
         <translation>编辑(&amp;r)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="483"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="631"/>
         <source>&amp;Uncheck all</source>
         <translation>全部�消选中(&amp;U)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="488"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="632"/>
         <source>Collapse &amp;all</source>
         <translation>全部折�(&amp;A)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="493"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="633"/>
         <source>&amp;Expand all</source>
         <translation>全部展开(&amp;E)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="501"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="634"/>
         <source>&amp;Standard</source>
         <translation>标准(&amp;S)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="636"/>
         <source>Standard items</source>
         <translation>标准项</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="509"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="638"/>
         <source>&amp;Contents</source>
         <translation>内容(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="512"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="640"/>
         <source>Open the help contents</source>
         <translation>打开帮助内容</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="515"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="643"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="645"/>
         <source>Toolbar</source>
         <translation>工具�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="528"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="646"/>
         <source>&amp;Categories</source>
         <translation>分类(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="531"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="648"/>
         <source>Error categories</source>
         <translation>错误分类</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="536"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="650"/>
         <source>&amp;Open XML...</source>
         <translation>打开 XML (&amp;O)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="545"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="651"/>
         <source>Open P&amp;roject File...</source>
         <translation>打开项目文件(&amp;R)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="548"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="653"/>
         <source>Ctrl+Shift+O</source>
         <translation>Ctrl+Shift+O</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="655"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>显示便�(&amp;o)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="562"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="656"/>
         <source>&amp;New Project File...</source>
         <translation>新建项目文件(&amp;N)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="565"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="658"/>
         <source>Ctrl+Shift+N</source>
         <translation>Ctrl+Shift+N</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="570"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="660"/>
         <source>&amp;Log View</source>
         <translation>日志视图(&amp;L)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="573"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="662"/>
         <source>Log View</source>
         <translation>日志视图</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="613"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="667"/>
         <source>&amp;Warnings</source>
         <translation>警告(&amp;W)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="631"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="672"/>
         <source>Per&amp;formance warnings</source>
         <translation>性能警告(&amp;f)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="657"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="678"/>
         <source>&amp;Information</source>
         <translation>信�(&amp;I)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="672"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="682"/>
         <source>&amp;Portability</source>
         <translation>�移�性(&amp;P)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="772"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="702"/>
         <source>P&amp;latforms</source>
         <translation>平�(&amp;l)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="786"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="703"/>
         <source>C++&amp;11</source>
         <translation>C++&amp;11</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="797"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="704"/>
         <source>C&amp;99</source>
         <translation>C&amp;99</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="805"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="705"/>
         <source>&amp;Posix</source>
         <translation>&amp;Posix</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="813"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="706"/>
         <source>C&amp;11</source>
         <translation>C&amp;11</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="845"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="707"/>
         <source>&amp;C89</source>
         <translation>&amp;C89</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="853"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="708"/>
         <source>&amp;C++03</source>
         <translation>&amp;C++03</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="874"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="717"/>
         <source>&amp;Library Editor...</source>
         <translation>库编辑器(&amp;L)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="721"/>
         <source>&amp;Auto-detect language</source>
         <translation>自动检测语言(&amp;A)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="893"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="722"/>
         <source>&amp;Enforce C++</source>
         <translation>&amp;Enforce C++</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="901"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="723"/>
         <source>E&amp;nforce C</source>
         <translation>E&amp;nforce C</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="912"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="724"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="920"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="725"/>
         <source>Reanalyze and check library</source>
         <translation>�新分�并检查库</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="928"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="726"/>
         <source>Check configuration (defines, includes)</source>
         <translation>检查�置(defines, includes)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="936"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="727"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="728"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="729"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="987"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="731"/>
         <source>Normal</source>
         <translation type="unfinished">常规</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="995"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1003"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1011"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1019"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="732"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1027"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="733"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1035"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="734"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1040"/>
-        <source>EULA...</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="736"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="458"/>
+        <location filename="mainwindow.cpp" line="477"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -1099,23 +1175,28 @@ This is probably because the settings were changed between the Cppcheck versions
 这�能是因为 Cppcheck ��版本间的设置有所��。请检查(并修�)编辑器应用程�设置，�则编辑器程��能�会正确�动。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="753"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>在选择新的文件或目录之�，你必须先关闭此项目文件�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="155"/>
-        <location filename="mainwindow.cpp" line="1781"/>
+        <location filename="mainwindow.cpp" line="176"/>
+        <location filename="mainwindow.cpp" line="1812"/>
         <source>Quick Filter:</source>
         <translation>快速滤器:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="601"/>
+        <source>None of the selected files is part of the project, nothing to analyze.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select configuration</source>
         <translation>选择�置</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="858"/>
+        <location filename="mainwindow.cpp" line="890"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1124,69 +1205,64 @@ Do you want to load this project file instead?</source>
 你是�想加载该项目文件？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1015"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>库 &apos;%1&apos; 包�未知元素：
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="992"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>File not found</source>
         <translation>文件未找到</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="995"/>
+        <location filename="mainwindow.cpp" line="1027"/>
         <source>Bad XML</source>
         <translation>无效的 XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1030"/>
         <source>Missing attribute</source>
         <translation>缺失属性</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1001"/>
+        <location filename="mainwindow.cpp" line="1033"/>
         <source>Bad attribute value</source>
         <translation>无效的属性值</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1004"/>
+        <location filename="mainwindow.cpp" line="1036"/>
         <source>Unsupported format</source>
         <translation>�支�的格�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1007"/>
+        <location filename="mainwindow.cpp" line="1039"/>
         <source>Duplicate platform type</source>
         <translation>��的平�类型</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1010"/>
+        <location filename="mainwindow.cpp" line="1042"/>
         <source>Platform type redefined</source>
         <translation>平�类型�定义</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1016"/>
+        <location filename="mainwindow.cpp" line="1048"/>
         <source>Unknown element</source>
         <translation>�置元素</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1019"/>
-        <source>Unknown issue</source>
-        <translation>未知问题</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation>选择的库 &apos;%1&apos; 加载失败。
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
-        <location filename="mainwindow.cpp" line="1090"/>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1120"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
@@ -1195,143 +1271,136 @@ Do you want to load this project file instead?</source>
         <translation type="vanished">加载 %1 失败。您的 Cppcheck 安装已��。您�以在命令行添加 --data-dir=&lt;目录&gt; �数�指定文件�置。请注�，&apos;--data-dir&apos; �数应当由安装脚本使用，因此，当使用此�数时，GUI�会�动，所�生的一切�是�置了设置。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1482"/>
-        <location filename="mainwindow.cpp" line="1681"/>
+        <location filename="mainwindow.cpp" line="1539"/>
+        <location filename="mainwindow.cpp" line="1734"/>
         <source>XML files (*.xml)</source>
         <translation>XML 文件(*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1484"/>
+        <location filename="mainwindow.cpp" line="1541"/>
         <source>Open the report file</source>
         <translation>打开报告文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1700"/>
         <source>License</source>
         <translation>许��</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1654"/>
+        <location filename="mainwindow.cpp" line="1707"/>
         <source>Authors</source>
         <translation>作者</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1674"/>
+        <location filename="mainwindow.cpp" line="1727"/>
         <source>Save the report file</source>
         <translation>�存报告文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1685"/>
+        <location filename="mainwindow.cpp" line="1738"/>
         <source>Text files (*.txt)</source>
         <translation>文本文件(*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1689"/>
+        <location filename="mainwindow.cpp" line="1742"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV 文件(*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1712"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1819"/>
+        <location filename="mainwindow.cpp" line="1850"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>项目文件(*.cppcheck);;所有文件(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="1852"/>
         <source>Select Project File</source>
         <translation>选择项目文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1977"/>
+        <location filename="mainwindow.cpp" line="1992"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1995"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1983"/>
+        <location filename="mainwindow.cpp" line="1998"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1999"/>
+        <location filename="mainwindow.cpp" line="2014"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2008"/>
+        <location filename="mainwindow.cpp" line="2023"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2310"/>
+        <location filename="mainwindow.cpp" line="2339"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2314"/>
+        <location filename="mainwindow.cpp" line="2343"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="239"/>
-        <location filename="mainwindow.cpp" line="1783"/>
-        <location filename="mainwindow.cpp" line="1849"/>
-        <location filename="mainwindow.cpp" line="2047"/>
+        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="1814"/>
+        <location filename="mainwindow.cpp" line="1880"/>
+        <location filename="mainwindow.cpp" line="2062"/>
         <source>Project:</source>
         <translation>项目:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="668"/>
+        <location filename="mainwindow.cpp" line="702"/>
         <source>No suitable files found to analyze!</source>
         <translation>没有找到�适的文件�分�!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="767"/>
+        <location filename="mainwindow.cpp" line="798"/>
         <source>C/C++ Source</source>
         <translation>C/C++ ��</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="768"/>
+        <location filename="mainwindow.cpp" line="799"/>
         <source>Compile database</source>
         <translation>Compile database</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="773"/>
+        <location filename="mainwindow.cpp" line="804"/>
         <source>Select files to analyze</source>
         <translation>选择�分�的文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="819"/>
         <source>Select directory to analyze</source>
         <translation>选择�分�的目录</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>选择�分�的�置</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="880"/>
+        <location filename="mainwindow.cpp" line="912"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1340,44 +1409,44 @@ Do you want to proceed analysis without using any of these project files?</sourc
 您想在�使用这些项目文件的情况下进行分��？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1013"/>
+        <location filename="mainwindow.cpp" line="1045"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1035"/>
+        <location filename="mainwindow.cpp" line="1064"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1058"/>
+        <location filename="mainwindow.cpp" line="1087"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1120"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1467"/>
+        <location filename="mainwindow.cpp" line="1524"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1388,7 +1457,7 @@ Do you want to proceed?</source>
 你想继续�?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1591"/>
+        <location filename="mainwindow.cpp" line="1644"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1397,77 +1466,77 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 您想�止分�并退出 Cppcheck �？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1633"/>
+        <location filename="mainwindow.cpp" line="1686"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1672"/>
+        <location filename="mainwindow.cpp" line="1725"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML 文件 (*.xml);;文本文件 (*.txt);;CSV 文件 (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1937"/>
+        <location filename="mainwindow.cpp" line="1951"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>构建文件夹 &apos;%1&apos; �能存在，创建它�？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1945"/>
+        <location filename="mainwindow.cpp" line="1959"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation>�使用�件检查项目，您需�一个构建目录。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2352"/>
+        <location filename="mainwindow.cpp" line="2381"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2353"/>
+        <location filename="mainwindow.cpp" line="2382"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2354"/>
+        <location filename="mainwindow.cpp" line="2383"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2355"/>
+        <location filename="mainwindow.cpp" line="2384"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2372"/>
+        <location filename="mainwindow.cpp" line="2401"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2373"/>
+        <location filename="mainwindow.cpp" line="2402"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2374"/>
+        <location filename="mainwindow.cpp" line="2403"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2381"/>
+        <location filename="mainwindow.cpp" line="2410"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2382"/>
+        <location filename="mainwindow.cpp" line="2411"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2383"/>
+        <location filename="mainwindow.cpp" line="2412"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2384"/>
+        <location filename="mainwindow.cpp" line="2413"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1476,22 +1545,22 @@ Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="vanished">导入 &apos;%1&apos; 失败，分�已�止</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2032"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project files (*.cppcheck)</source>
         <translation>项目文件 (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2034"/>
+        <location filename="mainwindow.cpp" line="2049"/>
         <source>Select Project Filename</source>
         <translation>选择项目文件�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2080"/>
+        <location filename="mainwindow.cpp" line="2095"/>
         <source>No project file loaded</source>
         <translation>项目文件未加载</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2148"/>
+        <location filename="mainwindow.cpp" line="2177"/>
         <source>The project file
 
 %1
@@ -1559,26 +1628,31 @@ Options:
     <name>NewSuppressionDialog</name>
     <message>
         <location filename="newsuppressiondialog.ui" line="17"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="114"/>
         <source>New suppression</source>
         <translation>新建抑制</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="25"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="115"/>
         <source>Error ID</source>
         <translation>错误 ID</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="32"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="116"/>
         <source>File name</source>
         <translation>文件�</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="42"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="117"/>
         <source>Line number</source>
         <translation>行�</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="52"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="118"/>
         <source>Symbol name</source>
         <translation>符��</translation>
     </message>
@@ -1595,78 +1669,62 @@ Options:
         <source>Native</source>
         <translation>本地</translation>
     </message>
-    <message>
-        <location filename="platforms.cpp" line="39"/>
-        <source>Unix 32-bit</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="40"/>
-        <source>Unix 64-bit</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="41"/>
-        <source>Windows 32-bit ANSI</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="42"/>
-        <source>Windows 32-bit Unicode</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="43"/>
-        <source>Windows 64-bit</source>
-        <translation></translation>
-    </message>
 </context>
 <context>
     <name>ProjectFile</name>
     <message>
         <location filename="projectfile.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="923"/>
         <source>Project File</source>
         <translation>项目文件</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="955"/>
         <source>Paths and Defines</source>
         <translation>路径和定义</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="30"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="924"/>
         <source>Import Project (Visual studio / compile database/ Borland C++ Builder 6)</source>
         <oldsource>Import Project (Visual studio / compile database)</oldsource>
         <translation>导入项目 (Visual studio / compile database/ Borland C++ Builder 6)</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="231"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="938"/>
         <source>Defines must be separated by a semicolon. Example: DEF1;DEF2=5;DEF3=int</source>
         <oldsource>Defines must be separated by a semicolon &apos;;&apos;</oldsource>
         <translation>定义必须用分�分隔。例如：DEF1;DEF2=5;DEF3=int</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="958"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation>注�：把你自己的 .cfg 文件放在和项目文件相�的文件夹中。你应该在上�看到它们。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="989"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation>如果添加了标记，您将能够�键�击警告并设置其中一个标记。您�以手动对警告进行分类。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="991"/>
         <source>Exclude source files</source>
         <translation>排除�文件</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="992"/>
         <source>Exclude folder...</source>
         <translation>排除文件夹...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="993"/>
         <source>Exclude file...</source>
         <translation>排除文件...</translation>
     </message>
@@ -1675,339 +1733,427 @@ Options:
         <translation type="vanished">MISRA C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="876"/>
+        <location filename="projectfile.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1011"/>
         <source>MISRA rule texts</source>
         <translation>MISRA 规则文本</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="883"/>
+        <location filename="projectfile.ui" line="892"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1013"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;从 MISRA C 2012 PDF 的附录 A &amp;quot;指�摘�&amp;quot; �制/粘贴文本到一个文本文件。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="890"/>
+        <location filename="projectfile.ui" line="899"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1015"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="73"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="928"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You have a choice:&lt;/p&gt;&lt;p&gt; * Analyze all Debug and Release configurations&lt;/p&gt;&lt;p&gt; * Only analyze the first matching Debug configuration&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;您有一个选择：&lt;/p&gt;&lt;p&gt; * 分�所有的 Debug 和 Release �置&lt;/p&gt;&lt;p&gt; * �分�第一个匹�的 Debug �置&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="926"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="964"/>
         <source>Browse...</source>
         <translation>�览...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="930"/>
         <source>Analyze all Visual Studio configurations</source>
         <translation>分�全部 Visual Studio �置</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="113"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="931"/>
         <source>Selected VS Configurations</source>
         <translation>已选择的 VS �置</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="147"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="932"/>
         <source>Paths:</source>
         <translation>路径:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="181"/>
         <location filename="projectfile.ui" line="296"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="933"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="945"/>
         <source>Add...</source>
         <translation>添加...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="934"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="994"/>
         <source>Edit</source>
         <translation>编辑</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="935"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="995"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="998"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="242"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="940"/>
         <source>Undefines:</source>
         <translation>未定义：</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="252"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="942"/>
         <source>Undefines must be separated by a semicolon. Example: UNDEF1;UNDEF2;UNDEF3</source>
         <translation>未定义必须用分�分隔。例如：UNDEF1;UNDEF2;UNDEF3</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="265"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="944"/>
         <source>Include Paths:</source>
         <translation>包�目录：</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="950"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="952"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="954"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="959"/>
         <source>Types and Functions</source>
         <translation>类型和函数</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="972"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="982"/>
         <source>Analysis</source>
         <translation>分�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="962"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation>这是一个 Cppcheck 将用于��目的的工作文件夹。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="965"/>
         <source>Parser</source>
         <translation>解�器</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="966"/>
         <source>Cppcheck (built in)</source>
         <translation>Cppcheck (内建)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="968"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="969"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="970"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="971"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="976"/>
         <source>Check that each class has a safe public interface</source>
         <translation>检查�个类是�有一个安全的公共接�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="977"/>
         <source>Limit analysis</source>
         <translation>��分�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="979"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation>检查未使用模�中的代�（正常情况下应该是打开，但�论上�以忽略未使用模�中的警告）</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="980"/>
         <source>Max CTU depth</source>
         <translation>最大 CTU 深度</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="999"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished">�用内�方案</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="851"/>
+        <location filename="projectfile.ui" line="860"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1009"/>
         <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="901"/>
+        <location filename="projectfile.ui" line="910"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1016"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="918"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1017"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="937"/>
+        <location filename="projectfile.ui" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1020"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="946"/>
+        <location filename="projectfile.ui" line="955"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1021"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="965"/>
+        <location filename="projectfile.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1023"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="981"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1024"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1026"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="991"/>
+        <location filename="projectfile.ui" line="1007"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1027"/>
         <source>External tools</source>
         <translation>外部工具</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="330"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="948"/>
         <source>Up</source>
         <translation>�上</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="337"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="949"/>
         <source>Down</source>
         <translation>�下</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="956"/>
         <source>Platform</source>
         <translation>平�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="967"/>
         <source>Clang (experimental)</source>
         <translation>Clang (实验性的)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="974"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation>如果你想�设计你的类尽�能的�活和�壮，那么公共接�必须�常�壮。Cppcheck 将�设�数�以� *任何* 值。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="978"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation>检查头文件中的代�（通常应该是打开的。如果您想�一个有�的快速分�，那么关掉它)）</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="981"/>
         <source>Max recursion in template instantiation</source>
         <translation>模�实例化中的最大递归</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1000"/>
         <source>Warning options</source>
         <translation>警告选项</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="983"/>
         <source>Root path:</source>
         <translation>根路径：</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="985"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation>警告中的文件路径将相对于此路径</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="987"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>警告标志（用分�隔开）</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="960"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation>Cppcheck 构建目录 (整个程�分��增�分��统计数�等)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="957"/>
         <source>Libraries</source>
         <translation>库</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="996"/>
         <source>Suppressions</source>
         <translation>抑制</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="997"/>
         <source>Add</source>
         <translation>添加</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1001"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1028"/>
         <source>Addons</source>
         <translation>�件</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1002"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation>注�：�件需�安装  &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt;。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1003"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1004"/>
         <source>Thread safety</source>
         <translation>线程安全</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1005"/>
         <source>Coding standards</source>
         <translation>编�标准</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1006"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1007"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="914"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1008"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1018"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="958"/>
+        <location filename="projectfile.ui" line="967"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1022"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="975"/>
+        <location filename="projectfile.ui" line="991"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1025"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
-        <translation>Clang analyzer</translation>
+        <translation type="vanished">Clang analyzer</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
-        <translation>Clang-tidy</translation>
+        <translation type="vanished">Clang-tidy</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="936"/>
         <source>Defines:</source>
         <translation>定义:</translation>
     </message>
@@ -2020,77 +2166,86 @@ Options:
         <translation>项目文件: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="604"/>
+        <location filename="projectfiledialog.cpp" line="585"/>
         <source>Select Cppcheck build dir</source>
         <translation>选择 Cppcheck 构建目录</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="865"/>
+        <location filename="projectfiledialog.cpp" line="861"/>
         <source>Select include directory</source>
         <translation>选择 Include 目录</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="845"/>
+        <location filename="projectfiledialog.cpp" line="841"/>
         <source>Select a directory to check</source>
         <translation>选择一个检查目录</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="414"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="477"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (未找到)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="644"/>
+        <location filename="projectfiledialog.cpp" line="625"/>
         <source>Compile database</source>
         <translation>Compile database</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="646"/>
+        <location filename="projectfiledialog.cpp" line="627"/>
         <source>Import Project</source>
         <translation>导入项目</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="885"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
+        <source>C/C++ header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="648"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="881"/>
         <source>Select directory to ignore</source>
         <translation>选择忽略的目录</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="893"/>
+        <location filename="projectfiledialog.cpp" line="889"/>
         <source>Source files</source>
         <translation>�文件</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="894"/>
+        <location filename="projectfiledialog.cpp" line="647"/>
+        <location filename="projectfiledialog.cpp" line="890"/>
         <source>All files</source>
         <translation>全部文件</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="895"/>
+        <location filename="projectfiledialog.cpp" line="891"/>
         <source>Exclude file</source>
         <translation>排除文件</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="978"/>
+        <location filename="projectfiledialog.cpp" line="976"/>
         <source>Select MISRA rule texts file</source>
         <translation>选择 MISRA 规则文本文件</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="980"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>MISRA rule texts file (%1)</source>
         <translation>MISRA 规则文本文件 (%1)</translation>
     </message>
@@ -2123,7 +2278,7 @@ Options:
         <translation>第%1行：在 &quot;%3&quot; 中缺失的必选属性 &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="302"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation> (未找到)</translation>
     </message>
@@ -2173,161 +2328,156 @@ Options:
         <translation>�粗</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation>编辑器�景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation>编辑器背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation>高亮背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation>行��景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation>行�背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation>关键字�景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation>关键字字体大�</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation>类�景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation>类字体大�</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation>引用�景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation>引用字体大�</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation>注释�景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation>注释字体大�</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation>符��景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation>符�背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation>符�字体大�</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="142"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation>设置为默认亮色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="144"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation>设置为默认暗色</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="114"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">文件</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="115"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">行</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="116"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">严�性</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="117"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="118"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="119"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished">�确定的</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="120"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">概�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="121"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="122"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="123"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="124"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished">日期</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="125"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="126"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
@@ -2375,37 +2525,37 @@ Options:
         <translation type="vanished">未定义文件</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="657"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation>�制</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="825"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation>找�到文件：</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="829"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation>请选择文件夹 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="830"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>选择目录 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="832"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation>请选择文件所在的目录。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="367"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>调试</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="298"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation>注�</translation>
     </message>
@@ -2418,53 +2568,51 @@ Options:
         <translation type="vanished">��</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="659"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation>��全部 ID</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="681"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation>抑制选择的 ID</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="660"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation>打开包�的文件夹</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="370"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="656"/>
+        <location filename="resultstree.cpp" line="667"/>
         <source>Recheck %1 file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="658"/>
+        <location filename="resultstree.cpp" line="669"/>
         <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="701"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation>标记</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="703"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation>�消标记</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="733"/>
-        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="734"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2474,7 +2622,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 在“首先项 / 应用程��中为 Cppcheck �置编辑应用程�。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="748"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2483,12 +2631,12 @@ Please select the default editor application in preferences/Applications.</sourc
 请在“首先项 / 应用程��中选择默认应用程�。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="768"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>找�到文件�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="811"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2497,7 +2645,7 @@ Please check the application path and parameters are correct.</source>
 请检查此应用程�的路径与�数是�正确。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="833"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>选择目录</translation>
     </message>
@@ -2514,32 +2662,32 @@ Please check the application path and parameters are correct.</source>
         <translation type="vanished">日期</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="349"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>风格</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="352"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="355"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="358"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>性能</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="361"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>移��能性</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="364"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>信�</translation>
     </message>
@@ -2548,81 +2696,83 @@ Please check the application path and parameters are correct.</source>
     <name>ResultsView</name>
     <message>
         <location filename="resultsview.ui" line="26"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="147"/>
         <source>Results</source>
         <translation>结果</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="60"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="148"/>
         <source>Critical errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="149"/>
         <source>Analysis Log</source>
         <translation>分�日志</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="114"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="150"/>
         <source>Warning Details</source>
         <translation>警告详情</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="237"/>
-        <location filename="resultsview.cpp" line="245"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>�存报告失败。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="255"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>打�报告</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="274"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation>没有错误�现，没有�打�内容。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="326"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%2 个文件已检查 %1 个)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="350"/>
-        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="351"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>未�现错误。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="358"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>�现错误，但它们被设为��。
 打开“查看���，切�需�显示的错误。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>读�报告失败。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>��支� XML 格�版本 1。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="460"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation>首次包�于</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="465"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
@@ -2631,42 +2781,42 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation type="vanished">错误�寻分�未完�</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="539"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Clear Log</source>
         <translation>清空日志</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="540"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy this Log entry</source>
         <translation>�制此日志�目</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="541"/>
+        <location filename="resultsview.cpp" line="538"/>
         <source>Copy complete Log</source>
         <translation>�制完整日志</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="549"/>
+        <location filename="resultsview.cpp" line="545"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="563"/>
+        <location filename="resultsview.cpp" line="559"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="565"/>
+        <location filename="resultsview.cpp" line="561"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="567"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="568"/>
+        <location filename="resultsview.cpp" line="564"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2675,26 +2825,31 @@ To toggle what kind of errors are shown, open view menu.</source>
     <name>ScratchPad</name>
     <message>
         <location filename="scratchpad.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="107"/>
         <source>Scratchpad</source>
         <translation>便�</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="108"/>
         <source>Copy or write some C/C++ code here:</source>
         <translation>在这里�制或输入一些 C/C++ 代�：</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="37"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="109"/>
         <source>Optionally enter a filename (mainly for automatic language detection) and click on &quot;Check&quot;:</source>
         <translation>�选择输入文件� (主�用�自动语言检测) 然�点击 &quot;检查&quot;：</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="110"/>
         <source>filename</source>
         <translation>文件�</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="78"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="111"/>
         <source>Check</source>
         <translation>检查</translation>
     </message>
@@ -2703,21 +2858,25 @@ To toggle what kind of errors are shown, open view menu.</source>
     <name>Settings</name>
     <message>
         <location filename="settings.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="490"/>
         <source>Preferences</source>
         <translation>首选项</translation>
     </message>
     <message>
         <location filename="settings.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="502"/>
         <source>General</source>
         <translation>常规</translation>
     </message>
     <message>
         <location filename="settings.ui" line="196"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="503"/>
         <source>Add...</source>
         <translation>添加...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="491"/>
         <source>Number of threads: </source>
         <translation>线程个数: </translation>
     </message>
@@ -2727,57 +2886,68 @@ To toggle what kind of errors are shown, open view menu.</source>
     </message>
     <message>
         <location filename="settings.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="493"/>
         <source>Force checking all #ifdef configurations</source>
         <oldsource>Check all #ifdef configurations</oldsource>
         <translation>强制检查所有 #ifdef �置</translation>
     </message>
     <message>
         <location filename="settings.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="494"/>
         <source>Show full path of files</source>
         <translation>显示文件的完整路径</translation>
     </message>
     <message>
         <location filename="settings.ui" line="122"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="495"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>当未找到错误，显示“未�现错误�消�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="129"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="496"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>在列“Id�中显示错误 Id</translation>
     </message>
     <message>
         <location filename="settings.ui" line="136"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="497"/>
         <source>Enable inline suppressions</source>
         <translation>�用内�方案</translation>
     </message>
     <message>
         <location filename="settings.ui" line="143"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="498"/>
         <source>Check for inconclusive errors also</source>
         <translation>检查�确定的错误</translation>
     </message>
     <message>
         <location filename="settings.ui" line="150"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="499"/>
         <source>Show statistics on check completion</source>
         <translation>检查完��显示统计数�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="157"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="500"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="177"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="501"/>
         <source>Show internal warnings in log</source>
         <translation>在日志中显示内建警告</translation>
     </message>
     <message>
         <location filename="settings.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="521"/>
         <source>Addons</source>
         <translation>�件</translation>
     </message>
     <message>
         <location filename="settings.ui" line="294"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="512"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation>Python 二进制 (留空将使用 PATH 路径中的 python)</translation>
     </message>
@@ -2785,117 +2955,143 @@ To toggle what kind of errors are shown, open view menu.</source>
         <location filename="settings.ui" line="305"/>
         <location filename="settings.ui" line="346"/>
         <location filename="settings.ui" line="391"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="513"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="523"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="324"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="515"/>
         <source>MISRA addon</source>
         <translation>MISRA �件</translation>
     </message>
     <message>
         <location filename="settings.ui" line="332"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="516"/>
         <source>MISRA rule texts file</source>
         <translation>MISRA 规则文本文件</translation>
     </message>
     <message>
         <location filename="settings.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="518"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;从 MISRA C 2012 PDF 的附录 A &amp;quot;指�摘�&amp;quot; �制/粘贴文本到一个文本文件。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="526"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
         <location filename="settings.ui" line="378"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="522"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation>Clang 路径 (留空将使用系统 PATH 路径)</translation>
     </message>
     <message>
         <location filename="settings.ui" line="401"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="524"/>
         <source>Visual Studio headers</source>
         <translation>Visual Studio 头文件</translation>
     </message>
     <message>
         <location filename="settings.ui" line="407"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="525"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Visual Studio 头文件路径，用分� &apos;;&apos; 分割。&lt;/p&gt;&lt;p&gt;你�以打开一个 Visual Studio 命令�示符，输入 &amp;quot;SET INCLUDE&amp;quot;。然��制/粘贴路径。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="settings.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="533"/>
         <source>Code Editor</source>
         <translation>代�编辑器</translation>
     </message>
     <message>
         <location filename="settings.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="527"/>
         <source>Code Editor Style</source>
         <translation>代�编辑器风格</translation>
     </message>
     <message>
         <location filename="settings.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="528"/>
         <source>System Style</source>
         <translation>系统风格</translation>
     </message>
     <message>
         <location filename="settings.ui" line="456"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="529"/>
         <source>Default Light Style</source>
         <translation>默认浅色风格</translation>
     </message>
     <message>
         <location filename="settings.ui" line="463"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="530"/>
         <source>Default Dark Style</source>
         <translation>默认深色风格</translation>
     </message>
     <message>
         <location filename="settings.ui" line="472"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="531"/>
         <source>Custom</source>
         <translation>自定义</translation>
     </message>
     <message>
         <location filename="settings.ui" line="210"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="505"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
         <location filename="settings.ui" line="79"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="492"/>
         <source>Max count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="185"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="507"/>
         <source>Applications</source>
         <translation>应用程�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="203"/>
         <location filename="settings.ui" line="479"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="532"/>
         <source>Edit...</source>
         <translation>编辑...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="506"/>
         <source>Set as default</source>
         <translation>设为默认</translation>
     </message>
     <message>
         <location filename="settings.ui" line="240"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="510"/>
         <source>Reports</source>
         <translation>报告</translation>
     </message>
     <message>
         <location filename="settings.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="508"/>
         <source>Save all errors when creating report</source>
         <translation>创建报告时，�存所有错误</translation>
     </message>
     <message>
         <location filename="settings.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="509"/>
         <source>Save full path to files in reports</source>
         <translation>在报告中�存文件的完整路径</translation>
     </message>
     <message>
         <location filename="settings.ui" line="274"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="511"/>
         <source>Language</source>
         <translation>语言</translation>
     </message>
@@ -2952,221 +3148,245 @@ To toggle what kind of errors are shown, open view menu.</source>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="395"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="415"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>统计</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="401"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>项目</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="33"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="396"/>
         <source>Project:</source>
         <translation>项目:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="53"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="397"/>
         <source>Paths:</source>
         <translation>路径:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="85"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="398"/>
         <source>Include paths:</source>
         <translation>包�路径:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="399"/>
         <source>Defines:</source>
         <translation>定义:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="400"/>
         <source>Undefines:</source>
         <translation>未定义：</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="407"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>上一次扫�</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="171"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="402"/>
         <source>Path Selected:</source>
         <translation>选中的路径:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="181"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="403"/>
         <source>Number of Files Scanned:</source>
         <translation>扫�的文件数:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="201"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="405"/>
         <source>Scan Duration:</source>
         <translation>扫�时间:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="254"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="408"/>
         <source>Errors:</source>
         <translation>错误:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="271"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="409"/>
         <source>Warnings:</source>
         <translation>警告:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="410"/>
         <source>Stylistic warnings:</source>
         <translation>Stylistic 警告:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="305"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="411"/>
         <source>Portability warnings:</source>
         <translation>�移�性警告:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="322"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="412"/>
         <source>Performance issues:</source>
         <translation>性能警告:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="413"/>
         <source>Information messages:</source>
         <translation>信�:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="356"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="414"/>
         <source>Active checkers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="374"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="416"/>
         <source>Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="418"/>
         <source>History</source>
         <translation>历�</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="405"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="417"/>
         <source>File:</source>
         <translation>文件：</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="419"/>
         <source>Copy to Clipboard</source>
         <translation>�制到剪贴�</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="420"/>
         <source>Pdf Export</source>
         <translation>导出 PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 天</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 天</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1 �时</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 �时</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1 分钟</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 分钟</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="171"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> 与 </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="198"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation>导出 PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>项目设置</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>路径</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>包�路径</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>定义</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation>未定义</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>选中的路径</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>扫�的文件数</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>扫�时间</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>错误</translation>
     </message>
@@ -3181,40 +3401,49 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>没有 cppcheck 构建目录</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>风格警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>移��能性警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>性能警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>信�</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_threaddetails.h" line="47"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="46"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>%2 个文件已检查 %1 个</translation>
     </message>
@@ -3235,9 +3464,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 用户界�语言已被�置为英语。打开“首选项�对�框，选择任何�用的语言。</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_zh_TW.ts b/gui/cppcheck_zh_TW.ts
index c7c220899e8..b1951e9f29f 100644
--- a/gui/cppcheck_zh_TW.ts
+++ b/gui/cppcheck_zh_TW.ts
@@ -5,26 +5,31 @@
     <name>About</name>
     <message>
         <location filename="about.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="130"/>
         <source>About Cppcheck</source>
         <translation>關於 Cppcheck</translation>
     </message>
     <message>
         <location filename="about.ui" line="64"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="132"/>
         <source>Version %1</source>
         <translation>版本 %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="133"/>
         <source>Cppcheck - A tool for static C/C++ code analysis.</source>
         <translation>Cppcheck - 一款�態 C/C++ 程�碼分�工具。</translation>
     </message>
     <message>
         <location filename="about.ui" line="81"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="134"/>
         <source>Copyright © 2007-%1 Cppcheck team.</source>
         <translation>著作權 © 2007-%1 Cppcheck 團隊。</translation>
     </message>
     <message>
         <location filename="about.ui" line="91"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="135"/>
         <source>This program is licensed under the terms
 of the GNU General Public License version 3</source>
         <translation>該程�是根據 GNU 通用公眾授權�款第 3 版
@@ -32,11 +37,13 @@ of the GNU General Public License version 3</source>
     </message>
     <message>
         <location filename="about.ui" line="102"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="137"/>
         <source>Visit Cppcheck homepage at %1</source>
         <translation>訪� Cppcheck 主�: %1</translation>
     </message>
     <message>
         <location filename="about.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_about.h" line="138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;pcre&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;picojson&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tinyxml2&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
         <translation type="unfinished"></translation>
@@ -46,11 +53,13 @@ of the GNU General Public License version 3</source>
     <name>ApplicationDialog</name>
     <message>
         <location filename="applicationdialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="161"/>
         <source>Add an application</source>
         <translation>新增應用程�</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="162"/>
         <source>Here you can add an application that can open error files. Specify a name for the application, the application executable and command line parameters for the application.
 
 The following texts in parameters are replaced with appropriate values when application is executed:
@@ -66,21 +75,25 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="173"/>
         <source>&amp;Name:</source>
         <translation>�稱(&amp;N):</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="86"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="174"/>
         <source>&amp;Executable:</source>
         <translation>執行檔(&amp;E):</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="96"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="175"/>
         <source>&amp;Parameters:</source>
         <translation>�數(&amp;P):</translation>
     </message>
     <message>
         <location filename="applicationdialog.ui" line="138"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_applicationdialog.h" line="176"/>
         <source>Browse</source>
         <translation>�覽</translation>
     </message>
@@ -95,9 +108,8 @@ Parameters: -l(line) (file)</source>
         <translation>��檢視器應用程�</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -108,65 +120,16 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>ComplianceReportDialog</name>
     <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
-        <translation>專案�稱</translation>
+        <translation type="vanished">專案�稱</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
-        <translation>專案版本</translation>
+        <translation type="vanished">專案版本</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
-        <translation>HTML 檔案 (*.html)</translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">HTML 檔案 (*.html)</translation>
     </message>
 </context>
 <context>
@@ -177,10 +140,8 @@ Parameters: -l(line) (file)</source>
         <translation>無法找到檔案: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -192,44 +153,49 @@ Parameters: -l(line) (file)</source>
     <name>HelpDialog</name>
     <message>
         <location filename="helpdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="88"/>
         <source>Cppcheck GUI help</source>
         <translation>Cppcheck GUI 幫助</translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="89"/>
         <source>Contents</source>
         <translation>內容</translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_helpdialog.h" line="90"/>
         <source>Index</source>
         <translation>索引</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation>找�到幫助檔 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
     <name>LibraryAddFunctionDialog</name>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="23"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="105"/>
         <source>Add function</source>
         <translation>新增函�</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="34"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="106"/>
         <source>Function name(s)</source>
         <translation>函��稱</translation>
     </message>
     <message>
         <location filename="libraryaddfunctiondialog.ui" line="44"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryaddfunctiondialog.h" line="107"/>
         <source>Number of arguments</source>
         <translation>引數數�</translation>
     </message>
@@ -238,124 +204,138 @@ Parameters: -l(line) (file)</source>
     <name>LibraryDialog</name>
     <message>
         <location filename="librarydialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="275"/>
         <source>Library Editor</source>
         <translation>程�庫編輯器</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="22"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="276"/>
         <source>Open</source>
         <translation>é–‹å•Ÿ</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="29"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="277"/>
         <source>Save</source>
         <translation>儲存</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="36"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="278"/>
         <source>Save as</source>
         <translation type="unfinished">�存為</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="62"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="279"/>
         <source>Functions</source>
         <translation>函�</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="280"/>
         <source>Sort</source>
         <translation>排�</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="111"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="281"/>
         <source>Add</source>
         <translation>新增</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="282"/>
         <source>Filter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="164"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="283"/>
         <source>Comments</source>
         <translation>註釋</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="204"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="284"/>
         <source>noreturn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="212"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="285"/>
         <source>False</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="286"/>
         <source>True</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="222"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="287"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="232"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="289"/>
         <source>return value must be used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="239"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="290"/>
         <source>ignore function in leaks checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="291"/>
         <source>Arguments</source>
         <translation>引數</translation>
     </message>
     <message>
         <location filename="librarydialog.ui" line="258"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_librarydialog.h" line="292"/>
         <source>Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation>程�庫檔案 (*.cfg)</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation>開啟程�庫檔案</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <translation>無法開啟檔案 %1。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation>無法載入 %1. %2。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <translation>無法儲存檔案 %1。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation type="unfinished">�存程�庫為</translation>
     </message>
@@ -364,11 +344,13 @@ Parameters: -l(line) (file)</source>
     <name>LibraryEditArgDialog</name>
     <message>
         <location filename="libraryeditargdialog.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="284"/>
         <source>Edit argument</source>
         <translation>編輯引數</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="286"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is bool value allowed? For instance result from comparison or from &apos;!&apos; operator.&lt;/p&gt;
 &lt;p&gt;Typically, set this if the argument is a pointer, size, etc.&lt;/p&gt;
@@ -379,11 +361,13 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="28"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="293"/>
         <source>Not bool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="35"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;Is a null parameter value allowed?&lt;/p&gt;
 &lt;p&gt;Typically this should be used on any pointer parameter that does not allow null.&lt;/p&gt;
@@ -394,78 +378,99 @@ Parameters: -l(line) (file)</source>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="43"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="302"/>
         <source>Not null</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="50"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="303"/>
         <source>Not uninit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="57"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="304"/>
         <source>String</source>
         <translation>字串</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="70"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="305"/>
         <source>Format string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="306"/>
         <source>Min size of buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="101"/>
         <location filename="libraryeditargdialog.ui" line="203"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="307"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="316"/>
         <source>Type</source>
         <translation>型別</translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="109"/>
         <location filename="libraryeditargdialog.ui" line="214"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="308"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="317"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="114"/>
         <location filename="libraryeditargdialog.ui" line="219"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="309"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="318"/>
         <source>argvalue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="119"/>
         <location filename="libraryeditargdialog.ui" line="224"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="319"/>
         <source>mul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="124"/>
         <location filename="libraryeditargdialog.ui" line="229"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="311"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="320"/>
         <source>strlen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="132"/>
         <location filename="libraryeditargdialog.ui" line="237"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="313"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="322"/>
         <source>Arg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="159"/>
         <location filename="libraryeditargdialog.ui" line="264"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="323"/>
         <source>Arg2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="194"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="315"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="libraryeditargdialog.ui" line="310"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_libraryeditargdialog.h" line="324"/>
         <source>Valid values</source>
         <translation>有效值</translation>
     </message>
@@ -473,590 +478,684 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="687"/>
-        <location filename="mainwindow.cpp" line="463"/>
-        <location filename="mainwindow.cpp" line="667"/>
-        <location filename="mainwindow.cpp" line="752"/>
-        <location filename="mainwindow.cpp" line="857"/>
-        <location filename="mainwindow.cpp" line="879"/>
-        <location filename="mainwindow.cpp" line="1466"/>
-        <location filename="mainwindow.cpp" line="1595"/>
-        <location filename="mainwindow.cpp" line="1936"/>
-        <location filename="mainwindow.cpp" line="1944"/>
-        <location filename="mainwindow.cpp" line="1998"/>
-        <location filename="mainwindow.cpp" line="2007"/>
-        <location filename="mainwindow.cpp" line="2079"/>
-        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="738"/>
         <source>Checking for updates</source>
         <translation>檢查更新</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="100"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="739"/>
         <source>Hide</source>
         <translation>隱�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="740"/>
         <source>&amp;File</source>
         <translation>檔案(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="741"/>
         <source>&amp;View</source>
         <translation>檢視(&amp;V)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="742"/>
         <source>&amp;Toolbars</source>
         <translation>工具�(&amp;T)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="163"/>
         <location filename="mainwindow.ui" line="979"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="730"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="743"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="198"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="744"/>
         <source>&amp;Help</source>
         <translation>幫助(&amp;H)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="209"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="745"/>
         <source>A&amp;nalyze</source>
         <translation>分�(&amp;N)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="213"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="746"/>
         <source>C++ standard</source>
         <translation>C++ 標準</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="225"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="747"/>
         <source>&amp;C standard</source>
         <translation>C 標準(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="748"/>
         <source>&amp;Edit</source>
         <translation>編輯(&amp;E)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="266"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="749"/>
         <source>Standard</source>
         <translation>標準</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="284"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="750"/>
         <source>Categories</source>
         <translation>分類</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="303"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="751"/>
         <source>Filter</source>
         <translation>篩�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="314"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="578"/>
         <source>&amp;License...</source>
         <translation>授權(&amp;L)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="319"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="579"/>
         <source>A&amp;uthors...</source>
         <translation>作者(&amp;U)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="328"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="580"/>
         <source>&amp;About...</source>
         <translation>關於(&amp;A)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="333"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="581"/>
         <source>&amp;Files...</source>
         <translation>檔案(&amp;F)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="336"/>
         <location filename="mainwindow.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="582"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="584"/>
         <source>Analyze files</source>
         <translation>分�檔案</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="342"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="587"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="351"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="589"/>
         <source>&amp;Directory...</source>
         <translation>目錄(&amp;D)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="354"/>
         <location filename="mainwindow.ui" line="357"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="590"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="592"/>
         <source>Analyze directory</source>
         <translation>分�目錄</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="595"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="369"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="597"/>
         <source>&amp;Reanalyze modified files</source>
         <translation>�新分�已修改的檔案(&amp;R)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="599"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="381"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="601"/>
         <source>Reanal&amp;yze all files</source>
         <translation>�新分�所有檔案(&amp;Y)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="602"/>
         <source>&amp;Stop</source>
         <translation>�止(&amp;S)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="393"/>
         <location filename="mainwindow.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="603"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="605"/>
         <source>Stop analysis</source>
         <translation>�止分�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="608"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="610"/>
         <source>&amp;Save results to file...</source>
         <translation>儲存�果為檔案(&amp;S)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="411"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="612"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="416"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="614"/>
         <source>&amp;Quit</source>
         <translation>退出(&amp;Q)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="419"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="616"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="428"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="618"/>
         <source>&amp;Clear results</source>
         <translation>清除�果(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="619"/>
         <source>&amp;Preferences</source>
         <translation>�好設定(&amp;P)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="620"/>
         <source>Style war&amp;nings</source>
         <translation>樣�警告(&amp;N)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="452"/>
         <location filename="mainwindow.ui" line="455"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="621"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="623"/>
         <source>Show style warnings</source>
         <translation>顯示樣�警告</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="467"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="625"/>
         <source>E&amp;rrors</source>
         <translation>錯誤(&amp;R)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="470"/>
         <location filename="mainwindow.ui" line="473"/>
-        <location filename="mainwindow.cpp" line="2379"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="626"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="628"/>
+        <location filename="mainwindow.cpp" line="2408"/>
         <source>Show errors</source>
         <translation>顯示錯誤</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="478"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="630"/>
         <source>&amp;Check all</source>
         <translation>全部檢查(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="483"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="631"/>
         <source>&amp;Uncheck all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="488"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="632"/>
         <source>Collapse &amp;all</source>
         <translation>全部摺疊(&amp;A)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="493"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="633"/>
         <source>&amp;Expand all</source>
         <translation>全部展開(&amp;E)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="501"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="634"/>
         <source>&amp;Standard</source>
         <translation>標準(&amp;S)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="636"/>
         <source>Standard items</source>
         <translatorcomment>標準項目</translatorcomment>
         <translation></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="509"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="638"/>
         <source>&amp;Contents</source>
         <translation>內容(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="512"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="640"/>
         <source>Open the help contents</source>
         <translation>開啟幫助內容</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="515"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="643"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="645"/>
         <source>Toolbar</source>
         <translation>工具�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="528"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="646"/>
         <source>&amp;Categories</source>
         <translation>分類(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="531"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="648"/>
         <source>Error categories</source>
         <translation>錯誤分類</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="536"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="650"/>
         <source>&amp;Open XML...</source>
         <translation>é–‹å•Ÿ XML(&amp;O)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="545"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="651"/>
         <source>Open P&amp;roject File...</source>
         <translation>開啟專案檔(&amp;R)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="548"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="653"/>
         <source>Ctrl+Shift+O</source>
         <translation>Ctrl+Shift+O</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="655"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="562"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="656"/>
         <source>&amp;New Project File...</source>
         <translation>新增專案檔(&amp;N)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="565"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="658"/>
         <source>Ctrl+Shift+N</source>
         <translation>Ctrl+Shift+N</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="570"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="660"/>
         <source>&amp;Log View</source>
         <translation>日誌檢視(&amp;L)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="573"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="662"/>
         <source>Log View</source>
         <translation>日誌檢視</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="581"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="664"/>
         <source>C&amp;lose Project File</source>
         <translation>關閉專案檔(&amp;L)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="589"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="665"/>
         <source>&amp;Edit Project File...</source>
         <translation>編輯專案檔(&amp;E)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="601"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="666"/>
         <source>&amp;Statistics</source>
         <translation>統計資料(&amp;S)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="613"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="667"/>
         <source>&amp;Warnings</source>
         <translation>警告(&amp;W)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="616"/>
         <location filename="mainwindow.ui" line="619"/>
-        <location filename="mainwindow.cpp" line="2380"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="668"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="670"/>
+        <location filename="mainwindow.cpp" line="2409"/>
         <source>Show warnings</source>
         <translation>顯示警告</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="631"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="672"/>
         <source>Per&amp;formance warnings</source>
         <translation>效能警告(&amp;F)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="634"/>
         <location filename="mainwindow.ui" line="637"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="673"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="675"/>
         <source>Show performance warnings</source>
         <translation>顯示下效能警告</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="645"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="677"/>
         <source>Show &amp;hidden</source>
         <translation>顯示隱�項目(&amp;H)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="657"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="678"/>
         <source>&amp;Information</source>
         <translation>資訊(&amp;I)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="660"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="680"/>
         <source>Show information messages</source>
         <translation>顯示資訊訊�</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="672"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="682"/>
         <source>&amp;Portability</source>
         <translation>�移�性(&amp;P)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="675"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="684"/>
         <source>Show portability warnings</source>
         <translation>顯示�移�性警告</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="690"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="687"/>
         <source>Show Cppcheck results</source>
         <translation>顯示 Cppcheck �果</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="702"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="689"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="705"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="691"/>
         <source>Show Clang results</source>
         <translation>顯示 Clang �果</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="713"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="693"/>
         <source>&amp;Filter</source>
         <translation>篩�(&amp;F)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="716"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="695"/>
         <source>Filter results</source>
         <translation>篩��果</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="732"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="697"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32 �元 ANSI</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="740"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="698"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32 �元 Unicode</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="748"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="699"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32 �元</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="756"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="700"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64 �元</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="764"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="701"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64 �元</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="772"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="702"/>
         <source>P&amp;latforms</source>
         <translation>平臺(&amp;L)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="786"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="703"/>
         <source>C++&amp;11</source>
         <translation>C++&amp;11</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="797"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="704"/>
         <source>C&amp;99</source>
         <translation>C&amp;99</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="805"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="705"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="813"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="706"/>
         <source>C&amp;11</source>
         <translation>C&amp;11</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="845"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="707"/>
         <source>&amp;C89</source>
         <translation>&amp;C89</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="853"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="708"/>
         <source>&amp;C++03</source>
         <translation>&amp;C++03</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="858"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="709"/>
         <source>&amp;Print...</source>
         <translation>列�(&amp;P)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="861"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="711"/>
         <source>Print the Current Report</source>
         <translation>列�當�報告</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="866"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="713"/>
         <source>Print Pre&amp;view...</source>
         <translation>列��覽(&amp;V)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="869"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="715"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation>開啟當��果的列��覽視窗</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="874"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="717"/>
         <source>&amp;Library Editor...</source>
         <translation>程�庫編輯器(&amp;L)...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="877"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="719"/>
         <source>Open library editor</source>
         <translation>開啟程�庫編輯器</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="721"/>
         <source>&amp;Auto-detect language</source>
         <translation>自動�測語言(&amp;A)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="893"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="722"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="901"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="723"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="912"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="724"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="920"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="725"/>
         <source>Reanalyze and check library</source>
         <translation>�新分�並檢查程�庫</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="928"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="726"/>
         <source>Check configuration (defines, includes)</source>
         <translation>檢查組態 (定義�包�)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="936"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="727"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="728"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="729"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="987"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="731"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="995"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1003"/>
         <source>Misra C++ 2008</source>
-        <translation type="unfinished">Misra C++ 2008</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1011"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1019"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Misra C++ 2008</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1027"/>
         <source>Misra C++ 2023</source>
-        <translation type="unfinished">Misra C++ 2023</translation>
+        <translation type="obsolete">Misra C++ 2023</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="1035"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="732"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="1040"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="733"/>
         <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="mainwindow.ui" line="1045"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="734"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1048"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_mainwindow.h" line="736"/>
+        <source>Show thread details</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
@@ -1081,201 +1180,199 @@ Options:
         <translation>Cppcheck GUI - 命令行�數</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="155"/>
-        <location filename="mainwindow.cpp" line="1781"/>
+        <location filename="mainwindow.cpp" line="176"/>
+        <location filename="mainwindow.cpp" line="1812"/>
         <source>Quick Filter:</source>
         <translation>快速篩�:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="239"/>
-        <location filename="mainwindow.cpp" line="1783"/>
-        <location filename="mainwindow.cpp" line="1849"/>
-        <location filename="mainwindow.cpp" line="2047"/>
+        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="1814"/>
+        <location filename="mainwindow.cpp" line="1880"/>
+        <location filename="mainwindow.cpp" line="2062"/>
         <source>Project:</source>
         <translation>專案:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="458"/>
+        <location filename="mainwindow.cpp" line="477"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="668"/>
+        <location filename="mainwindow.cpp" line="601"/>
+        <source>None of the selected files is part of the project, nothing to analyze.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="702"/>
         <source>No suitable files found to analyze!</source>
         <translation>找�到��的檔案來分��</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="753"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>您必須在��新檔案或目錄之�關閉該專案檔�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="767"/>
+        <location filename="mainwindow.cpp" line="798"/>
         <source>C/C++ Source</source>
         <translation>C/C++ 來�檔</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="768"/>
+        <location filename="mainwindow.cpp" line="799"/>
         <source>Compile database</source>
         <translation>編譯資料庫</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="773"/>
+        <location filename="mainwindow.cpp" line="804"/>
         <source>Select files to analyze</source>
         <translation>���分�的檔案</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="819"/>
         <source>Select directory to analyze</source>
         <translation>���分�的目錄</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select configuration</source>
         <translation>��組態</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="860"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>���分�的組態</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="858"/>
+        <location filename="mainwindow.cpp" line="890"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="880"/>
+        <location filename="mainwindow.cpp" line="912"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1015"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Information</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1015"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="992"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>File not found</source>
         <translation>找�到檔案</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="995"/>
+        <location filename="mainwindow.cpp" line="1027"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1030"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1001"/>
+        <location filename="mainwindow.cpp" line="1033"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1004"/>
+        <location filename="mainwindow.cpp" line="1036"/>
         <source>Unsupported format</source>
         <translation>未支�的格�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1007"/>
+        <location filename="mainwindow.cpp" line="1039"/>
         <source>Duplicate platform type</source>
         <translation>�複的平臺型別</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1010"/>
+        <location filename="mainwindow.cpp" line="1042"/>
         <source>Platform type redefined</source>
         <translation>平臺型別�定義</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1013"/>
+        <location filename="mainwindow.cpp" line="1045"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1016"/>
+        <location filename="mainwindow.cpp" line="1048"/>
         <source>Unknown element</source>
         <translation>未知的元素</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1019"/>
-        <source>Unknown issue</source>
-        <translation>未知的議題</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1053"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation>無法載入��的程�庫 &apos;%1&apos;。
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1035"/>
+        <location filename="mainwindow.cpp" line="1064"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1058"/>
+        <location filename="mainwindow.cpp" line="1087"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
-        <location filename="mainwindow.cpp" line="1090"/>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1120"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1120"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1102"/>
-        <location filename="mainwindow.cpp" line="1197"/>
+        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1226"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1467"/>
+        <location filename="mainwindow.cpp" line="1524"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1283,18 +1380,18 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1482"/>
-        <location filename="mainwindow.cpp" line="1681"/>
+        <location filename="mainwindow.cpp" line="1539"/>
+        <location filename="mainwindow.cpp" line="1734"/>
         <source>XML files (*.xml)</source>
         <translation>XML 檔案 (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1484"/>
+        <location filename="mainwindow.cpp" line="1541"/>
         <source>Open the report file</source>
         <translation>開啟報告檔</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1591"/>
+        <location filename="mainwindow.cpp" line="1644"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1303,82 +1400,77 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 您想�止分�並離開 Cppcheck 嗎？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1633"/>
+        <location filename="mainwindow.cpp" line="1686"/>
         <source>About</source>
         <translation>關於</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1700"/>
         <source>License</source>
         <translation>授權</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1654"/>
+        <location filename="mainwindow.cpp" line="1707"/>
         <source>Authors</source>
         <translation>作者</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1672"/>
+        <location filename="mainwindow.cpp" line="1725"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML 檔案 (*.xml);;文字檔 (*.txt);;CSV 檔案 (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1674"/>
+        <location filename="mainwindow.cpp" line="1727"/>
         <source>Save the report file</source>
         <translation>儲存報告檔</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1685"/>
+        <location filename="mainwindow.cpp" line="1738"/>
         <source>Text files (*.txt)</source>
         <translation>文字檔 (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1689"/>
+        <location filename="mainwindow.cpp" line="1742"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV 檔案 (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1712"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1819"/>
+        <location filename="mainwindow.cpp" line="1850"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>專案檔 (*.cppcheck);;所有檔案 (*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="1852"/>
         <source>Select Project File</source>
         <translation>��專案檔</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1937"/>
+        <location filename="mainwindow.cpp" line="1951"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>建置目錄 &apos;%1&apos; �存在，是�建立它？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1945"/>
+        <location filename="mainwindow.cpp" line="1959"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1977"/>
+        <location filename="mainwindow.cpp" line="1992"/>
         <source>Failed to open file</source>
         <translation>無法開啟檔案</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1995"/>
         <source>Unknown project file format</source>
         <translation>未知的專案檔格�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1983"/>
+        <location filename="mainwindow.cpp" line="1998"/>
         <source>Failed to import project file</source>
         <translation>無法匯入專案檔</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1999"/>
+        <location filename="mainwindow.cpp" line="2014"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
@@ -1387,62 +1479,62 @@ Analysis is stopped.</source>
 �止分�。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2008"/>
+        <location filename="mainwindow.cpp" line="2023"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2352"/>
+        <location filename="mainwindow.cpp" line="2381"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2353"/>
+        <location filename="mainwindow.cpp" line="2382"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2354"/>
+        <location filename="mainwindow.cpp" line="2383"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2355"/>
+        <location filename="mainwindow.cpp" line="2384"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2372"/>
+        <location filename="mainwindow.cpp" line="2401"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2373"/>
+        <location filename="mainwindow.cpp" line="2402"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2374"/>
+        <location filename="mainwindow.cpp" line="2403"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2381"/>
+        <location filename="mainwindow.cpp" line="2410"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2382"/>
+        <location filename="mainwindow.cpp" line="2411"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2383"/>
+        <location filename="mainwindow.cpp" line="2412"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2384"/>
+        <location filename="mainwindow.cpp" line="2413"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1451,22 +1543,22 @@ Analysis is stopped.</source>
         <translation type="vanished">無法匯入 &apos;%1&apos;，�止分�</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2032"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project files (*.cppcheck)</source>
         <translation>專案檔 (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2034"/>
+        <location filename="mainwindow.cpp" line="2049"/>
         <source>Select Project Filename</source>
         <translation>��專案檔案�稱</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2080"/>
+        <location filename="mainwindow.cpp" line="2095"/>
         <source>No project file loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2148"/>
+        <location filename="mainwindow.cpp" line="2177"/>
         <source>The project file
 
 %1
@@ -1483,12 +1575,12 @@ Do you want to remove the file from the recently used projects -list?</source>
 您�從最近使用的專案列表中移除該檔案嗎？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2310"/>
+        <location filename="mainwindow.cpp" line="2339"/>
         <source>Install</source>
         <translation>安章</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2314"/>
+        <location filename="mainwindow.cpp" line="2343"/>
         <source>New version available: %1. %2</source>
         <translation>�用的新版本: %1. %2</translation>
     </message>
@@ -1497,26 +1589,31 @@ Do you want to remove the file from the recently used projects -list?</source>
     <name>NewSuppressionDialog</name>
     <message>
         <location filename="newsuppressiondialog.ui" line="17"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="114"/>
         <source>New suppression</source>
         <translation>新建抑制</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="25"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="115"/>
         <source>Error ID</source>
         <translation>錯誤 ID</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="32"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="116"/>
         <source>File name</source>
         <translation>檔案�稱</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="42"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="117"/>
         <source>Line number</source>
         <translation>行號</translation>
     </message>
     <message>
         <location filename="newsuppressiondialog.ui" line="52"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_newsuppressiondialog.h" line="118"/>
         <source>Symbol name</source>
         <translation>符號�稱</translation>
     </message>
@@ -1534,351 +1631,429 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation>原生</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32 �元</translation>
+        <translation type="vanished">Unix 32 �元</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64 �元</translation>
+        <translation type="vanished">Unix 64 �元</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32 �元 ANSI</translation>
+        <translation type="vanished">Windows 32 �元 ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32 �元 Unicode</translation>
+        <translation type="vanished">Windows 32 �元 Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64 �元</translation>
+        <translation type="vanished">Windows 64 �元</translation>
     </message>
 </context>
 <context>
     <name>ProjectFile</name>
     <message>
         <location filename="projectfile.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="923"/>
         <source>Project File</source>
         <translation>專案檔</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="955"/>
         <source>Paths and Defines</source>
         <translation>路徑與定義</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="30"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="924"/>
         <source>Import Project (Visual studio / compile database/ Borland C++ Builder 6)</source>
         <translation>匯入專案 (Visual Studio / 編譯資料庫 / Borland C++ Builder 6)</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="926"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="964"/>
         <source>Browse...</source>
         <translation>�覽...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="73"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="928"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You have a choice:&lt;/p&gt;&lt;p&gt; * Analyze all Debug and Release configurations&lt;/p&gt;&lt;p&gt; * Only analyze the first matching Debug configuration&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="76"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="930"/>
         <source>Analyze all Visual Studio configurations</source>
         <translation>分�所有 Visual Studio 組態</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="113"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="931"/>
         <source>Selected VS Configurations</source>
         <translation>�� VS 組態</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="147"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="932"/>
         <source>Paths:</source>
         <translation>路徑:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="181"/>
         <location filename="projectfile.ui" line="296"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="933"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="945"/>
         <source>Add...</source>
         <translation>新增...</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="934"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="994"/>
         <source>Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="935"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="947"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="995"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="998"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="936"/>
         <source>Defines:</source>
         <translation>定義:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="231"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="938"/>
         <source>Defines must be separated by a semicolon. Example: DEF1;DEF2=5;DEF3=int</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="242"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="940"/>
         <source>Undefines:</source>
         <translation>未定義:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="252"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="942"/>
         <source>Undefines must be separated by a semicolon. Example: UNDEF1;UNDEF2;UNDEF3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="265"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="944"/>
         <source>Include Paths:</source>
         <translation>包�路徑:</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="330"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="948"/>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="337"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="949"/>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="950"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="952"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="954"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="959"/>
         <source>Types and Functions</source>
         <translation>型別與函�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="956"/>
         <source>Platform</source>
         <translation>平臺</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="957"/>
         <source>Libraries</source>
         <translation>程�庫</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="958"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="972"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="982"/>
         <source>Analysis</source>
         <translation>分�</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="960"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="962"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="965"/>
         <source>Parser</source>
         <translation>剖�器</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="966"/>
         <source>Cppcheck (built in)</source>
         <translation>Cppcheck (內建)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="967"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="968"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="969"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="970"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="971"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="974"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="976"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="977"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="978"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="979"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="980"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="981"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1000"/>
         <source>Warning options</source>
         <translation>警告�項</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="983"/>
         <source>Root path:</source>
         <translation>根路徑:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="985"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="987"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>警告標記 (由分號分隔)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="989"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="991"/>
         <source>Exclude source files</source>
         <translation>排除來�檔</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="992"/>
         <source>Exclude folder...</source>
         <translation>排除資料夾...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="993"/>
         <source>Exclude file...</source>
         <translation>排除檔案...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="996"/>
         <source>Suppressions</source>
         <translation>抑制</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="997"/>
         <source>Add</source>
         <translation>新增</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="999"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1001"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1028"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1002"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1003"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1004"/>
         <source>Thread safety</source>
         <translation>執行緒安全</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1005"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1006"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1007"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="914"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1008"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1018"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="851"/>
+        <location filename="projectfile.ui" line="860"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1009"/>
         <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="901"/>
+        <location filename="projectfile.ui" line="910"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1016"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="918"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1017"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1887,17 +2062,20 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation type="vanished">Misra C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="876"/>
+        <location filename="projectfile.ui" line="885"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1011"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="883"/>
+        <location filename="projectfile.ui" line="892"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1013"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="890"/>
+        <location filename="projectfile.ui" line="899"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1015"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -1906,49 +2084,60 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation type="vanished">Misra C++ 2008</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="937"/>
+        <location filename="projectfile.ui" line="946"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1020"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="946"/>
+        <location filename="projectfile.ui" line="955"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1021"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="958"/>
+        <location filename="projectfile.ui" line="967"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1022"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="965"/>
+        <location filename="projectfile.ui" line="974"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1023"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="975"/>
+        <location filename="projectfile.ui" line="981"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1024"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="991"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1025"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="981"/>
+        <location filename="projectfile.ui" line="997"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1026"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="991"/>
+        <location filename="projectfile.ui" line="1007"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_projectfile.h" line="1027"/>
         <source>External tools</source>
         <translation>外部工具</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
-        <translation>Clang-tidy</translation>
+        <translation type="vanished">Clang-tidy</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
-        <translation>Clang 分�器</translation>
+        <translation type="vanished">Clang 分�器</translation>
     </message>
 </context>
 <context>
@@ -1959,77 +2148,86 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation>專案檔: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="414"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="477"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (找�到)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="604"/>
+        <location filename="projectfiledialog.cpp" line="585"/>
         <source>Select Cppcheck build dir</source>
         <translation>�� Cppcheck 建置目錄</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="644"/>
+        <location filename="projectfiledialog.cpp" line="625"/>
         <source>Compile database</source>
         <translation>編譯資料庫</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="646"/>
+        <location filename="projectfiledialog.cpp" line="627"/>
         <source>Import Project</source>
         <translation>匯入專案</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="845"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
+        <source>C/C++ header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="648"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="841"/>
         <source>Select a directory to check</source>
         <translation>���檢查的目錄</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="865"/>
+        <location filename="projectfiledialog.cpp" line="861"/>
         <source>Select include directory</source>
         <translation>��包�目錄</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="885"/>
+        <location filename="projectfiledialog.cpp" line="881"/>
         <source>Select directory to ignore</source>
         <translation>���忽略的目錄</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="893"/>
+        <location filename="projectfiledialog.cpp" line="889"/>
         <source>Source files</source>
         <translation>來�檔</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="894"/>
+        <location filename="projectfiledialog.cpp" line="647"/>
+        <location filename="projectfiledialog.cpp" line="890"/>
         <source>All files</source>
         <translation>所有檔案</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="895"/>
+        <location filename="projectfiledialog.cpp" line="891"/>
         <source>Exclude file</source>
         <translation>排除檔案</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="978"/>
+        <location filename="projectfiledialog.cpp" line="976"/>
         <source>Select MISRA rule texts file</source>
         <translation>�� MISRA �則文字檔</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="980"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>MISRA rule texts file (%1)</source>
         <translation>MISRA �則文字檔 (%1)</translation>
     </message>
@@ -2082,92 +2280,92 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation>編輯器�景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation>編輯器背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation>標明背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation>行號�景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation>行號背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation>關�字�景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <translation>類別�景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished">類別字型粗細</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation>符號�景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation>符號被景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation>符號字型粗細</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="142"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="144"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2182,7 +2380,7 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="302"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation> (找�到)</translation>
     </message>
@@ -2202,70 +2400,65 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="114"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">檔案</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="115"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">行號</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="116"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">安全性</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="117"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="118"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="119"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="120"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="121"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">識別號</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="122"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="123"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="124"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="125"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="126"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
@@ -2297,52 +2490,52 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation type="vanished">未定義的檔案</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="298"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="349"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>樣�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="352"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="355"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="358"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>效能</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="361"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="364"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="367"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="370"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="657"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
@@ -2351,94 +2544,92 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation type="vanished">隱�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="656"/>
+        <location filename="resultstree.cpp" line="667"/>
         <source>Recheck %1 file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="658"/>
+        <location filename="resultstree.cpp" line="669"/>
         <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="659"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="660"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="681"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="701"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation>標記</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="703"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation>�消標記</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="733"/>
-        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="734"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="748"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="768"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>找�到該檔案�</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="811"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="825"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="829"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation>請��資料夾 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="830"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>��目錄 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="832"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation>請��資料夾所在的目錄。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="833"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>��目錄</translation>
     </message>
@@ -2463,120 +2654,122 @@ Please check the application path and parameters are correct.</source>
     <name>ResultsView</name>
     <message>
         <location filename="resultsview.ui" line="26"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="147"/>
         <source>Results</source>
         <translation>�果</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="60"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="148"/>
         <source>Critical errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="92"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="149"/>
         <source>Analysis Log</source>
         <translation>分�日誌</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="114"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_resultsview.h" line="150"/>
         <source>Warning Details</source>
         <translation>警告詳細資訊</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="237"/>
-        <location filename="resultsview.cpp" line="245"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>無法載入報告。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="255"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>列�報告</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="274"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="326"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="350"/>
-        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="351"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>找�到錯誤。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="358"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>無法讀�報告。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>��支� XML 格�版本 1。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="460"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="465"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>識別號</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="539"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Clear Log</source>
         <translation>清除日誌</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="540"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy this Log entry</source>
         <translation>複製該日誌�目</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="541"/>
+        <location filename="resultsview.cpp" line="538"/>
         <source>Copy complete Log</source>
         <translation>複製完整的日誌</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="549"/>
+        <location filename="resultsview.cpp" line="545"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="563"/>
+        <location filename="resultsview.cpp" line="559"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="565"/>
+        <location filename="resultsview.cpp" line="561"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="567"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="568"/>
+        <location filename="resultsview.cpp" line="564"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2585,26 +2778,31 @@ To toggle what kind of errors are shown, open view menu.</source>
     <name>ScratchPad</name>
     <message>
         <location filename="scratchpad.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="107"/>
         <source>Scratchpad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="20"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="108"/>
         <source>Copy or write some C/C++ code here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="37"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="109"/>
         <source>Optionally enter a filename (mainly for automatic language detection) and click on &quot;Check&quot;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="71"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="110"/>
         <source>filename</source>
         <translation>檔案�稱</translation>
     </message>
     <message>
         <location filename="scratchpad.ui" line="78"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_scratchpad.h" line="111"/>
         <source>Check</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2613,122 +2811,147 @@ To toggle what kind of errors are shown, open view menu.</source>
     <name>Settings</name>
     <message>
         <location filename="settings.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="490"/>
         <source>Preferences</source>
         <translation>�好設定</translation>
     </message>
     <message>
         <location filename="settings.ui" line="24"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="502"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
         <location filename="settings.ui" line="41"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="491"/>
         <source>Number of threads: </source>
         <translation>執行緒數�: </translation>
     </message>
     <message>
         <location filename="settings.ui" line="79"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="492"/>
         <source>Max count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="493"/>
         <source>Force checking all #ifdef configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="115"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="494"/>
         <source>Show full path of files</source>
         <translation>顯示檔案的完整路徑</translation>
     </message>
     <message>
         <location filename="settings.ui" line="122"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="495"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="129"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="496"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="136"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="497"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="143"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="498"/>
         <source>Check for inconclusive errors also</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="150"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="499"/>
         <source>Show statistics on check completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="157"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="500"/>
         <source>Check for updates</source>
         <translation>檢查更新</translation>
     </message>
     <message>
         <location filename="settings.ui" line="177"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="501"/>
         <source>Show internal warnings in log</source>
         <translation>顯示日誌中的內部警告</translation>
     </message>
     <message>
         <location filename="settings.ui" line="185"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="507"/>
         <source>Applications</source>
         <translation>應用程�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="196"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="503"/>
         <source>Add...</source>
         <translation>新增...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="203"/>
         <location filename="settings.ui" line="479"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="504"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="532"/>
         <source>Edit...</source>
         <translation>編輯...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="210"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="505"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
         <location filename="settings.ui" line="217"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="506"/>
         <source>Set as default</source>
         <translation>設定為�設值</translation>
     </message>
     <message>
         <location filename="settings.ui" line="240"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="510"/>
         <source>Reports</source>
         <translation>報告</translation>
     </message>
     <message>
         <location filename="settings.ui" line="246"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="508"/>
         <source>Save all errors when creating report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="253"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="509"/>
         <source>Save full path to files in reports</source>
         <translation>在報告中儲存檔案的完整路徑</translation>
     </message>
     <message>
         <location filename="settings.ui" line="274"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="511"/>
         <source>Language</source>
         <translation>語言</translation>
     </message>
     <message>
         <location filename="settings.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="521"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="294"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="512"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2736,71 +2959,87 @@ To toggle what kind of errors are shown, open view menu.</source>
         <location filename="settings.ui" line="305"/>
         <location filename="settings.ui" line="346"/>
         <location filename="settings.ui" line="391"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="513"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="520"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="523"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="settings.ui" line="324"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="515"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="332"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="516"/>
         <source>MISRA rule texts file</source>
         <translation>MISRA �則文字檔</translation>
     </message>
     <message>
         <location filename="settings.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="518"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="372"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="526"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
         <location filename="settings.ui" line="378"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="522"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="401"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="524"/>
         <source>Visual Studio headers</source>
         <translation>Visual Studio 標頭檔</translation>
     </message>
     <message>
         <location filename="settings.ui" line="407"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="525"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="437"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="533"/>
         <source>Code Editor</source>
         <translation>程�碼編輯器</translation>
     </message>
     <message>
         <location filename="settings.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="527"/>
         <source>Code Editor Style</source>
         <translation>程�碼編輯器樣�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="449"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="528"/>
         <source>System Style</source>
         <translation>系統樣�</translation>
     </message>
     <message>
         <location filename="settings.ui" line="456"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="529"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="463"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="530"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="settings.ui" line="472"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_settings.h" line="531"/>
         <source>Custom</source>
         <translation>自訂</translation>
     </message>
@@ -2853,120 +3092,144 @@ To toggle what kind of errors are shown, open view menu.</source>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="395"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="415"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>統計資料</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="401"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>專案</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="33"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="396"/>
         <source>Project:</source>
         <translation>專案:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="53"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="397"/>
         <source>Paths:</source>
         <translation>路徑:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="85"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="398"/>
         <source>Include paths:</source>
         <translation>包�路徑:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="108"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="399"/>
         <source>Defines:</source>
         <translation>定義:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="131"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="400"/>
         <source>Undefines:</source>
         <translation>未定義:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="407"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>上一次掃�</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="171"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="402"/>
         <source>Path Selected:</source>
         <translation>��的路徑:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="181"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="403"/>
         <source>Number of Files Scanned:</source>
         <translation>已掃�的檔案數�:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="201"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="405"/>
         <source>Scan Duration:</source>
         <translation>掃�時間:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="254"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="408"/>
         <source>Errors:</source>
         <translation>錯誤:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="271"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="409"/>
         <source>Warnings:</source>
         <translation>警告:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="288"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="410"/>
         <source>Stylistic warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="305"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="411"/>
         <source>Portability warnings:</source>
         <translation>�移�性警告:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="322"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="412"/>
         <source>Performance issues:</source>
         <translation>效能議題:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="339"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="413"/>
         <source>Information messages:</source>
         <translation>資訊訊�:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="356"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="414"/>
         <source>Active checkers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="374"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="416"/>
         <source>Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="399"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="418"/>
         <source>History</source>
         <translation>歷�紀錄</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="405"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="417"/>
         <source>File:</source>
         <translation>檔案:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="443"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="419"/>
         <source>Copy to Clipboard</source>
         <translation>複製到剪貼簿</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="450"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_statsdialog.h" line="420"/>
         <source>Pdf Export</source>
         <translation>Pdf 匯出</translation>
     </message>
@@ -2981,141 +3244,150 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>沒有 cppcheck 建置目錄</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 天</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 天</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1 �時</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 �時</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1 分�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 分�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 秒�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 秒�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 秒�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="171"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>樣�警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>�移�性警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>效能警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>資訊訊�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="198"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation>匯出 PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>專案設定</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>路徑</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>包�路徑</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>定義</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation>未定義</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>��的路徑</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>已掃�的檔案數�</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>掃�時間</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <location filename="build/Skrivbord-Felsu00f6k/temp/ui_threaddetails.h" line="47"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="46"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3131,11 +3403,6 @@ To toggle what kind of errors are shown, open view menu.</source>
 The user interface language has been reset to English. Open the Preferences-dialog to select any of the available languages.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="translationhandler.cpp" line="136"/>
-        <source>Cppcheck</source>
-        <translation></translation>
-    </message>
 </context>
 <context>
     <name>TxtReport</name>
diff --git a/gui/cppchecklibrarydata.h b/gui/cppchecklibrarydata.h
index afe39df5050..71d8382ef34 100644
--- a/gui/cppchecklibrarydata.h
+++ b/gui/cppchecklibrarydata.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,8 +19,6 @@
 #ifndef CPPCHECKLIBRARYDATA_H
 #define CPPCHECKLIBRARYDATA_H
 
-#include "config.h"
-
 #include <cstdint>
 #include <utility>
 
@@ -230,7 +228,7 @@ class CppcheckLibraryData {
         entrypoints.clear();
     }
 
-    void swap(CppcheckLibraryData &other) NOEXCEPT {
+    void swap(CppcheckLibraryData &other) noexcept {
         containers.swap(other.containers);
         defines.swap(other.defines);
         undefines.swap(other.undefines);
diff --git a/gui/erroritem.h b/gui/erroritem.h
index 554052ccba9..54c5a32a7f3 100644
--- a/gui/erroritem.h
+++ b/gui/erroritem.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@
 #include "errortypes.h"
 
 #include <QList>
-#include <QMetaType>
 #include <QString>
 
 /// @addtogroup GUI
diff --git a/gui/fileviewdialog.cpp b/gui/fileviewdialog.cpp
index 3f66f008678..033c34130d7 100644
--- a/gui/fileviewdialog.cpp
+++ b/gui/fileviewdialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,7 +54,7 @@ void FileViewDialog::loadTextFile(const QString &filename, QTextEdit *edit)
         msg = msg.arg(filename);
 
         QMessageBox msgbox(QMessageBox::Critical,
-                           tr("Cppcheck"),
+                           "Cppcheck",
                            msg,
                            QMessageBox::Ok,
                            this);
@@ -68,7 +68,7 @@ void FileViewDialog::loadTextFile(const QString &filename, QTextEdit *edit)
         msg = msg.arg(filename);
 
         QMessageBox msgbox(QMessageBox::Critical,
-                           tr("Cppcheck"),
+                           "Cppcheck",
                            msg,
                            QMessageBox::Ok,
                            this);
diff --git a/gui/gui.pro b/gui/gui.pro
index 132f113d270..37c70471b9a 100644
--- a/gui/gui.pro
+++ b/gui/gui.pro
@@ -58,7 +58,6 @@ win32 {
 RESOURCES = gui.qrc
 FORMS = about.ui \
         applicationdialog.ui \
-        compliancereportdialog.ui \
         fileview.ui \
         helpdialog.ui \
         mainwindow.ui \
@@ -70,7 +69,8 @@ FORMS = about.ui \
         librarydialog.ui \
         libraryaddfunctiondialog.ui \
         libraryeditargdialog.ui \
-        newsuppressiondialog.ui
+        newsuppressiondialog.ui \
+        threaddetails.ui
 
 TRANSLATIONS =  cppcheck_de.ts \
                 cppcheck_es.ts \
@@ -137,7 +137,6 @@ HEADERS += aboutdialog.h \
            codeeditstyledialog.h \
            codeeditor.h \
            common.h \
-           compliancereportdialog.h \
            csvreport.h \
            erroritem.h \
            filelist.h \
@@ -156,6 +155,7 @@ HEADERS += aboutdialog.h \
            settingsdialog.h \
            showtypes.h \
            statsdialog.h \
+           threaddetails.h \
            threadhandler.h \
            threadresult.h \
            translationhandler.h \
@@ -179,7 +179,6 @@ SOURCES += aboutdialog.cpp \
            codeeditstyledialog.cpp \
            codeeditor.cpp \
            common.cpp \
-           compliancereportdialog.cpp \
            csvreport.cpp \
            erroritem.cpp \
            filelist.cpp \
@@ -199,6 +198,7 @@ SOURCES += aboutdialog.cpp \
            settingsdialog.cpp \
            showtypes.cpp \
            statsdialog.cpp \
+           threaddetails.cpp \
            threadhandler.cpp \
            threadresult.cpp \
            translationhandler.cpp \
diff --git a/gui/gui.qrc b/gui/gui.qrc
index c40e1ba7a1c..e53ce8ad7d4 100644
--- a/gui/gui.qrc
+++ b/gui/gui.qrc
@@ -2,31 +2,67 @@
     <qresource prefix="/">
         <file>cppcheck-gui.png</file>
         <file>images/dialog-error.png</file>
+        <file>images/dialog-error@2x.png</file>
+        <file>images/dialog-error@3x.png</file>
         <file>images/dialog-information.png</file>
+        <file>images/dialog-information@2x.png</file>
+        <file>images/dialog-information@3x.png</file>
         <file>images/dialog-warning.png</file>
+        <file>images/dialog-warning@2x.png</file>
+        <file>images/dialog-warning@3x.png</file>
         <file>images/edit-clear.png</file>
+        <file>images/edit-clear@2x.png</file>
+        <file>images/edit-clear@3x.png</file>
         <file>images/go-down.png</file>
+        <file>images/go-down@2x.png</file>
+        <file>images/go-down@3x.png</file>
         <file>images/help-browser.png</file>
+        <file>images/help-browser@2x.png</file>
+        <file>images/help-browser@3x.png</file>
         <file>images/media-floppy.png</file>
+        <file>images/media-floppy@2x.png</file>
+        <file>images/media-floppy@3x.png</file>
         <file>images/preferences-system.png</file>
+        <file>images/preferences-system@2x.png</file>
+        <file>images/preferences-system@3x.png</file>
         <file>images/process-stop.png</file>
+        <file>images/process-stop@2x.png</file>
+        <file>images/process-stop@3x.png</file>
         <file>images/text-x-generic.png</file>
+        <file>images/text-x-generic@2x.png</file>
+        <file>images/text-x-generic@3x.png</file>
         <file>images/view-recheck.png</file>
-        <file>images/view-refresh.png</file>
-        <file>images/showerrors.png</file>
-        <file>images/showstylewarnings.png</file>
-        <file>images/openproject.png</file>
-        <file>images/scratchpad.png</file>
-        <file>images/showwarnings.png</file>
-        <file>images/showperformance.png</file>
+        <file>images/view-recheck@2x.png</file>
+        <file>images/view-recheck@3x.png</file>
+        <file>images/refresh-file.png</file>
+        <file>images/refresh-file@2x.png</file>
+        <file>images/refresh-file@3x.png</file>
+        <file>images/folder.png</file>
+        <file>images/folder@2x.png</file>
+        <file>images/folder@3x.png</file>
+        <file>images/accessories-text-editor.png</file>
+        <file>images/accessories-text-editor@2x.png</file>
+        <file>images/accessories-text-editor@3x.png</file>
         <file>images/utilities-system-monitor.png</file>
+        <file>images/utilities-system-monitor@2x.png</file>
+        <file>images/utilities-system-monitor@3x.png</file>
         <file alias="COPYING">../COPYING</file>
         <file alias="AUTHORS">../AUTHORS</file>
         <file>images/go-home.png</file>
+        <file>images/go-home@2x.png</file>
+        <file>images/go-home@3x.png</file>
         <file>images/go-next.png</file>
+        <file>images/go-next@2x.png</file>
+        <file>images/go-next@3x.png</file>
         <file>images/go-previous.png</file>
+        <file>images/go-previous@2x.png</file>
+        <file>images/go-previous@3x.png</file>
         <file>images/applications-development.png</file>
+        <file>images/applications-development@2x.png</file>
+        <file>images/applications-development@3x.png</file>
         <file>images/applications-system.png</file>
+        <file>images/applications-system@2x.png</file>
+        <file>images/applications-system@3x.png</file>
         <file>images/llvm-dragon.png</file>
         <file>images/verify.svg</file>
     </qresource>
diff --git a/gui/help/commandline.html b/gui/help/commandline.html
new file mode 100644
index 00000000000..d66d7fb598b
--- /dev/null
+++ b/gui/help/commandline.html
@@ -0,0 +1,63 @@
+<html>
+<head>
+<title>Command line options</title>
+<link rel="stylesheet" type="text/css" href="style.css">
+</head>
+<body>
+
+<h1>Command line options</h1>
+
+<p>The GUI can be started from a terminal or a shortcut with options:</p>
+
+<pre>cppcheck-gui [OPTIONS] [files or paths]</pre>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Option</th><th>Description</th></tr>
+<tr><td><code>-p &lt;file&gt;</code></td><td>Open the project file and analyze
+    it. If the project has a build dir with earlier results, these are shown
+    instead; click <i>Reanalyze all files</i> to analyze again.</td></tr>
+<tr><td><code>-l &lt;file&gt;</code></td><td>Open a results file in XML
+    format.</td></tr>
+<tr><td><code>-d &lt;directory&gt;</code></td><td>Used with <code>-l</code>:
+    the folder that was analyzed to create the results file. Relative paths in
+    the results file are relative to this folder. It is needed to show the
+    source code of the warnings.</td></tr>
+<tr><td><code>-h</code>, <code>--help</code></td><td>Show a short description
+    of the options.</td></tr>
+<tr><td><code>-v</code>, <code>--version</code></td><td>Show the version of
+    the GUI.</td></tr>
+<tr><td><code>--data-dir=&lt;directory&gt;</code></td><td>Meant for
+    installation scripts. Stores the folder where Cppcheck's data files
+    (translations, library configurations, platforms, addons) are installed.
+    The GUI is not started when this option is used.</td></tr>
+<tr><td><i>files or paths</i></td><td>Analyze these files and folders without
+    a project. If one of the arguments is a project file
+    (<code>*.cppcheck</code>), it is opened as with <code>-p</code>. If one of
+    them is an XML file, it is opened as a results file.</td></tr>
+</table>
+
+<h2>Examples</h2>
+
+<p>Open a project:</p>
+<pre>cppcheck-gui -p myproject.cppcheck</pre>
+<p>or simply:</p>
+<pre>cppcheck-gui myproject.cppcheck</pre>
+
+<p>Look at the results of a CI job. The job ran Cppcheck in the folder
+<code>/home/me/src/myproject</code> and saved the results:</p>
+<pre>cppcheck-gui -l results.xml -d /home/me/src/myproject</pre>
+
+<p>Analyze a folder without a project:</p>
+<pre>cppcheck-gui src/</pre>
+
+<h2>Starting without options</h2>
+
+<p>When the GUI is started without options, it opens the project that was open
+when it was closed last time, and shows the results of the last analysis if
+the project has a build dir.</p>
+
+<p class="nav">Previous: <a href="preferences.html">Preferences</a> |
+Next: <a href="troubleshooting.html">Troubleshooting</a></p>
+
+</body>
+</html>
diff --git a/gui/help/images/add-application.png b/gui/help/images/add-application.png
new file mode 100644
index 00000000000..68e4b422ace
Binary files /dev/null and b/gui/help/images/add-application.png differ
diff --git a/gui/help/images/context-menu-tag.png b/gui/help/images/context-menu-tag.png
new file mode 100644
index 00000000000..69c510f3d48
Binary files /dev/null and b/gui/help/images/context-menu-tag.png differ
diff --git a/gui/help/images/context-menu.png b/gui/help/images/context-menu.png
new file mode 100644
index 00000000000..6afa8f80542
Binary files /dev/null and b/gui/help/images/context-menu.png differ
diff --git a/gui/help/images/index-mainwindow.png b/gui/help/images/index-mainwindow.png
deleted file mode 100644
index aa67a5e836d..00000000000
Binary files a/gui/help/images/index-mainwindow.png and /dev/null differ
diff --git a/gui/help/images/library-editor.png b/gui/help/images/library-editor.png
new file mode 100644
index 00000000000..5bdf7db02ba
Binary files /dev/null and b/gui/help/images/library-editor.png differ
diff --git a/gui/help/images/main-window.png b/gui/help/images/main-window.png
new file mode 100644
index 00000000000..e678199f2e0
Binary files /dev/null and b/gui/help/images/main-window.png differ
diff --git a/gui/help/images/menu-analyze.png b/gui/help/images/menu-analyze.png
new file mode 100644
index 00000000000..6aa110f8dd4
Binary files /dev/null and b/gui/help/images/menu-analyze.png differ
diff --git a/gui/help/images/menu-edit.png b/gui/help/images/menu-edit.png
new file mode 100644
index 00000000000..18b587ceb44
Binary files /dev/null and b/gui/help/images/menu-edit.png differ
diff --git a/gui/help/images/menu-file.png b/gui/help/images/menu-file.png
new file mode 100644
index 00000000000..4b7a3fcfd9f
Binary files /dev/null and b/gui/help/images/menu-file.png differ
diff --git a/gui/help/images/menu-help.png b/gui/help/images/menu-help.png
new file mode 100644
index 00000000000..a76d218063b
Binary files /dev/null and b/gui/help/images/menu-help.png differ
diff --git a/gui/help/images/menu-view-report.png b/gui/help/images/menu-view-report.png
new file mode 100644
index 00000000000..65050ce279c
Binary files /dev/null and b/gui/help/images/menu-view-report.png differ
diff --git a/gui/help/images/menu-view.png b/gui/help/images/menu-view.png
new file mode 100644
index 00000000000..40d66eaf972
Binary files /dev/null and b/gui/help/images/menu-view.png differ
diff --git a/gui/help/images/new-suppression.png b/gui/help/images/new-suppression.png
new file mode 100644
index 00000000000..13c615172e4
Binary files /dev/null and b/gui/help/images/new-suppression.png differ
diff --git a/gui/help/images/preferences-addons.png b/gui/help/images/preferences-addons.png
new file mode 100644
index 00000000000..70eb0642256
Binary files /dev/null and b/gui/help/images/preferences-addons.png differ
diff --git a/gui/help/images/preferences-applications.png b/gui/help/images/preferences-applications.png
new file mode 100644
index 00000000000..41a94dcda32
Binary files /dev/null and b/gui/help/images/preferences-applications.png differ
diff --git a/gui/help/images/preferences-clang.png b/gui/help/images/preferences-clang.png
new file mode 100644
index 00000000000..bb00ea2d31c
Binary files /dev/null and b/gui/help/images/preferences-clang.png differ
diff --git a/gui/help/images/preferences-code-editor.png b/gui/help/images/preferences-code-editor.png
new file mode 100644
index 00000000000..5edb3658d6d
Binary files /dev/null and b/gui/help/images/preferences-code-editor.png differ
diff --git a/gui/help/images/preferences-general.png b/gui/help/images/preferences-general.png
new file mode 100644
index 00000000000..98f56728201
Binary files /dev/null and b/gui/help/images/preferences-general.png differ
diff --git a/gui/help/images/preferences-language.png b/gui/help/images/preferences-language.png
new file mode 100644
index 00000000000..32aa867fcb2
Binary files /dev/null and b/gui/help/images/preferences-language.png differ
diff --git a/gui/help/images/preferences-reports.png b/gui/help/images/preferences-reports.png
new file mode 100644
index 00000000000..d18a150ac5a
Binary files /dev/null and b/gui/help/images/preferences-reports.png differ
diff --git a/gui/help/images/projectfile-addons.png b/gui/help/images/projectfile-addons.png
new file mode 100644
index 00000000000..9aa09829fbb
Binary files /dev/null and b/gui/help/images/projectfile-addons.png differ
diff --git a/gui/help/images/projectfile-analysis.png b/gui/help/images/projectfile-analysis.png
new file mode 100644
index 00000000000..1d846829455
Binary files /dev/null and b/gui/help/images/projectfile-analysis.png differ
diff --git a/gui/help/images/projectfile-import.png b/gui/help/images/projectfile-import.png
new file mode 100644
index 00000000000..ae487d9bf3c
Binary files /dev/null and b/gui/help/images/projectfile-import.png differ
diff --git a/gui/help/images/projectfile-paths-and-defines.png b/gui/help/images/projectfile-paths-and-defines.png
new file mode 100644
index 00000000000..a6ec3a4d2c8
Binary files /dev/null and b/gui/help/images/projectfile-paths-and-defines.png differ
diff --git a/gui/help/images/projectfile-types-and-functions.png b/gui/help/images/projectfile-types-and-functions.png
new file mode 100644
index 00000000000..4b2fb57f435
Binary files /dev/null and b/gui/help/images/projectfile-types-and-functions.png differ
diff --git a/gui/help/images/projectfile-warning-options.png b/gui/help/images/projectfile-warning-options.png
new file mode 100644
index 00000000000..779925309af
Binary files /dev/null and b/gui/help/images/projectfile-warning-options.png differ
diff --git a/gui/help/images/quick-filter.png b/gui/help/images/quick-filter.png
new file mode 100644
index 00000000000..cefbe833e42
Binary files /dev/null and b/gui/help/images/quick-filter.png differ
diff --git a/gui/help/images/report-misra.png b/gui/help/images/report-misra.png
new file mode 100644
index 00000000000..30071346a44
Binary files /dev/null and b/gui/help/images/report-misra.png differ
diff --git a/gui/help/images/scratchpad.png b/gui/help/images/scratchpad.png
new file mode 100644
index 00000000000..ca1dd74ad3d
Binary files /dev/null and b/gui/help/images/scratchpad.png differ
diff --git a/gui/help/images/statistics-previous-scan.png b/gui/help/images/statistics-previous-scan.png
new file mode 100644
index 00000000000..a2ec1c45157
Binary files /dev/null and b/gui/help/images/statistics-previous-scan.png differ
diff --git a/gui/help/images/statistics-project.png b/gui/help/images/statistics-project.png
new file mode 100644
index 00000000000..5e909732bf4
Binary files /dev/null and b/gui/help/images/statistics-project.png differ
diff --git a/gui/help/images/statistics-statistics.png b/gui/help/images/statistics-statistics.png
new file mode 100644
index 00000000000..1bbaddbe18f
Binary files /dev/null and b/gui/help/images/statistics-statistics.png differ
diff --git a/gui/help/images/toolbar.png b/gui/help/images/toolbar.png
new file mode 100644
index 00000000000..41664a4edb2
Binary files /dev/null and b/gui/help/images/toolbar.png differ
diff --git a/gui/help/images/walkthrough-analysis.png b/gui/help/images/walkthrough-analysis.png
deleted file mode 100644
index 94efb2890d8..00000000000
Binary files a/gui/help/images/walkthrough-analysis.png and /dev/null differ
diff --git a/gui/help/images/walkthrough-import-project.png b/gui/help/images/walkthrough-import-project.png
deleted file mode 100644
index 44b18e7f6b2..00000000000
Binary files a/gui/help/images/walkthrough-import-project.png and /dev/null differ
diff --git a/gui/help/images/walkthrough-library.png b/gui/help/images/walkthrough-library.png
deleted file mode 100644
index fbb5ae14d09..00000000000
Binary files a/gui/help/images/walkthrough-library.png and /dev/null differ
diff --git a/gui/help/images/walkthrough-new-project.png b/gui/help/images/walkthrough-new-project.png
deleted file mode 100644
index 55bf7ce2f4f..00000000000
Binary files a/gui/help/images/walkthrough-new-project.png and /dev/null differ
diff --git a/gui/help/images/walkthrough-toolbar-severities.png b/gui/help/images/walkthrough-toolbar-severities.png
deleted file mode 100644
index f06e3aa41cf..00000000000
Binary files a/gui/help/images/walkthrough-toolbar-severities.png and /dev/null differ
diff --git a/gui/help/images/walkthrough-warning-menu.png b/gui/help/images/walkthrough-warning-menu.png
deleted file mode 100644
index 0154b5ccbc9..00000000000
Binary files a/gui/help/images/walkthrough-warning-menu.png and /dev/null differ
diff --git a/gui/help/index.html b/gui/help/index.html
index 4d2cd43f824..6272ec01151 100644
--- a/gui/help/index.html
+++ b/gui/help/index.html
@@ -1,21 +1,103 @@
 <html>
 <head>
 <title>Cppcheck GUI</title>
+<link rel="stylesheet" type="text/css" href="style.css">
 </head>
 <body>
 
 <h1>Cppcheck GUI</h1>
 
-<p>With the Cppcheck GUI you can analyze your code.</p>
+<p>Cppcheck is a static analysis tool for C and C++ code. It looks for bugs
+such as undefined behavior, memory leaks, buffer overruns, null pointer
+dereferences and uninitialized variables, and it points out code that is
+suspicious, slow or hard to maintain. Cppcheck tries hard to avoid false
+positives: when it reports something there is usually a reason to look at
+it.</p>
+
+<p>The Cppcheck GUI is a graphical front end for Cppcheck. With the GUI you
+can:</p>
+<ul>
+<li>create and edit project files that describe what code to analyze and how
+    to analyze it,</li>
+<li>import Visual Studio solutions and projects, compile databases
+    (<code>compile_commands.json</code>) and Borland C++ Builder 6 projects,</li>
+<li>run the analysis in several threads and watch the results come in,</li>
+<li>browse the warnings, read the source code next to them and follow the
+    path that leads to each bug,</li>
+<li>filter, hide, suppress and tag warnings,</li>
+<li>open the code in your favorite editor,</li>
+<li>save results as XML, text or CSV and print them,</li>
+<li>try out small pieces of code in the scratchpad,</li>
+<li>write configuration files for your own libraries.</li>
+</ul>
+
+<p class="figure"><img src="images/main-window.png"></p>
 
 <h2>Contents</h2>
 
-<p>If you want to get started, look at the <a href="walkthrough.html">walk through</a>.</p>
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Page</th><th>What you will find there</th></tr>
+<tr><td><a href="walkthrough.html">Getting started</a></td>
+    <td>A step by step walk through: create a project, run the analysis and
+        look at the first results. Start here if you are new to Cppcheck.</td></tr>
+<tr><td><a href="mainwindow.html">The main window</a></td>
+    <td>All menus, toolbars and panels of the main window.</td></tr>
+<tr><td><a href="standalone-analysis.html">Analyzing without a project</a></td>
+    <td>Quick analysis of files and folders, and the settings in the
+        <i>Analyze</i> menu.</td></tr>
+<tr><td><a href="projectfiledialog.html">Project files</a></td>
+    <td>Every option in the project file dialog explained in detail.</td></tr>
+<tr><td><a href="investigating-warnings.html">Investigating warnings</a></td>
+    <td>How to read the results list, the warning details and the code
+        view, and how to decide if a warning is a real bug.</td></tr>
+<tr><td><a href="severities.html">Severities and report types</a></td>
+    <td>What error, warning, style, performance, portability and information
+        mean, and how the compliance report types classify warnings.</td></tr>
+<tr><td><a href="suppressions.html">Hiding and suppressing warnings</a></td>
+    <td>Temporary hiding, permanent suppressions in the project file, and
+        inline suppressions in the code.</td></tr>
+<tr><td><a href="tagging.html">Tagging warnings</a></td>
+    <td>Categorize warnings with your own tags.</td></tr>
+<tr><td><a href="reports.html">Results files, printing and statistics</a></td>
+    <td>Save and open results, print reports and view statistics.</td></tr>
+<tr><td><a href="tools.html">Scratchpad, library editor and other tools</a></td>
+    <td>Tools for trying out code and for describing your own libraries.</td></tr>
+<tr><td><a href="preferences.html">Preferences</a></td>
+    <td>Every option in the preferences dialog.</td></tr>
+<tr><td><a href="commandline.html">Command line options</a></td>
+    <td>How to start the GUI with a project or a results file.</td></tr>
+<tr><td><a href="troubleshooting.html">Troubleshooting</a></td>
+    <td>Answers to common questions and problems.</td></tr>
+</table>
+
+<h2>Projects or quick analysis?</h2>
+
+<p>There are two ways to use the GUI:</p>
+<ul>
+<li><b>With a project file</b> (recommended). A project file
+    (<code>*.cppcheck</code>) stores where your code is, the include paths,
+    the preprocessor defines, the libraries you use, suppressions, tags and
+    much more. The analysis is more accurate when Cppcheck knows these
+    things, and you only configure them once. See
+    <a href="walkthrough.html">Getting started</a> and
+    <a href="projectfiledialog.html">Project files</a>.</li>
+<li><b>Without a project file</b>. Use <i>Analyze &gt; Files...</i> or
+    <i>Analyze &gt; Directory...</i> to analyze some code quickly. See
+    <a href="standalone-analysis.html">Analyzing without a project</a>.</li>
+</ul>
 
-<h2>Example</h2>
+<h2>More information</h2>
 
-<blockquote><img src="images/index-mainwindow.png"></blockquote>
+<p>The Cppcheck manual describes the analysis itself in more detail, including
+the command line tool, the configuration file format and addons. You can find
+it at <a href="https://cppcheck.sourceforge.io/manual.pdf">https://cppcheck.sourceforge.io/manual.pdf</a>.</p>
+
+<p>The Cppcheck home page is
+<a href="https://cppcheck.sourceforge.io/">https://cppcheck.sourceforge.io/</a>.
+There you can download new versions, read about the checks and report
+problems.</p>
+
+<p class="nav">Next: <a href="walkthrough.html">Getting started</a></p>
 
 </body>
 </html>
-
diff --git a/gui/help/investigating-warnings.html b/gui/help/investigating-warnings.html
index 5eec66bd054..d1275a8ba01 100644
--- a/gui/help/investigating-warnings.html
+++ b/gui/help/investigating-warnings.html
@@ -1,22 +1,183 @@
 <html>
 <head>
 <title>Investigating warnings</title>
+<link rel="stylesheet" type="text/css" href="style.css">
 </head>
 <body>
 
 <h1>Investigating warnings</h1>
 
-<p>When you have run the analysis it is time to look at the results.</p>
+<p>When the analysis is done (or while it is still running) it is time to look
+at the results. This page explains how to read a warning, how to decide if it
+is a real bug, and what you can do with it.</p>
 
-<p>If you click on a warning then the corresponding code will be shown in the
-&quot;Warning details&quot; at the bottom.</p>
+<h2>Reading a warning</h2>
 
-<p>You can right click warnings to get options. The difference of
-&quot;hiding&quot; a warning and &quot;suppressing&quot; a warning is that
-the suppression is permanent and hiding the warning is only temporary. When
-suppressing warning(s), that is saved in the project file.
+<p class="figure"><img src="images/main-window.png"></p>
 
+<p>Click a warning in the results list. The lower part of the window then
+shows:</p>
+<ul>
+<li>the <b>id</b> of the warning, for example <code>arrayIndexOutOfBounds</code>.
+    The id identifies the kind of problem. Search for it in the Cppcheck
+    documentation or on the internet to learn more about it,</li>
+<li>the <b>CWE</b> number, if there is one. CWE (Common Weakness Enumeration)
+    is a standard list of software weaknesses. Look it up at
+    <a href="https://cwe.mitre.org/">cwe.mitre.org</a> for a general
+    description of the problem,</li>
+<li>the full <b>message</b>. It can be longer than the summary in the list,</li>
+<li>the <b>source code</b> with the line of the warning highlighted.</li>
+</ul>
+
+<p>In the example above Cppcheck says that <code>buf[16]</code> is accessed at
+index 16. The array has 16 elements, so the valid indexes are 0 to 15. The loop
+condition <code>i &lt;= BUFFER_SIZE</code> should be
+<code>i &lt; BUFFER_SIZE</code>.</p>
+
+<h3>Notes: the path to the bug</h3>
+
+<p>Many warnings have notes. Click the arrow in front of the warning to see
+them. Notes show the steps that lead to the problem, in order, for
+example:</p>
+<pre>Assuming that condition 'i&lt;=16' is not redundant   (line 9)
+Array index out of bounds                         (line 10)</pre>
+
+<p>Click a note to show its line in the code view. For a bug that depends on
+values, the notes usually tell you where the value comes from, which
+conditions Cppcheck assumes, and where the bad value is used. Follow the notes
+to understand the warning.</p>
+
+<p>A note like <i>Assuming that condition 'x' is not redundant</i> means that
+Cppcheck uses the condition in your code as a hint about possible values. For
+example, if the code checks <code>if (p == NULL)</code> after it has already
+used <code>p</code>, then either the check is not needed or the code can use a
+null pointer. Cppcheck warns because one of them must be wrong.</p>
+
+<h2>Is it a real bug?</h2>
+
+<p>Cppcheck tries to avoid false warnings, but no static analysis tool is
+perfect. To decide if a warning is right:</p>
+<ol>
+<li>Read the message and the notes, and look at the code they point to.</li>
+<li>Think about the values Cppcheck mentions. Can they really happen? Look at
+    the callers of the function if needed.</li>
+<li>Check if Cppcheck may be missing information. Warnings in code that uses
+    macros or types that Cppcheck could not see, because an include path is
+    missing, can be wrong. Look for <i>missingInclude</i> information
+    messages and fix the include paths in the project.</li>
+<li>Check if a library configuration is missing. If your code calls a
+    function that never returns (like a fatal error handler) and Cppcheck
+    does not know that, it may warn about code after the call. Select the
+    library in the project or write a configuration for your own functions.
+    See <a href="projectfiledialog.html#libraries">Libraries</a>.</li>
+</ol>
+
+<p>Even if a warning is not a bug today, it can point to code that is hard to
+understand or easy to break. Many developers prefer to change the code so that
+the warning goes away, instead of suppressing it.</p>
+
+<p>If you are sure Cppcheck is wrong, suppress the warning (see
+<a href="suppressions.html">Hiding and suppressing warnings</a>). It is also
+very helpful if you report the false warning, with a small code example, at
+<a href="https://trac.cppcheck.net/">https://trac.cppcheck.net/</a> or in the
+Cppcheck forum.</p>
+
+<h3>Inconclusive warnings</h3>
+
+<p>Sometimes Cppcheck finds something suspicious but can not be sure that it
+is a bug. These <i>inconclusive</i> warnings are not shown by default. Enable
+<i>Check for inconclusive errors also</i> in the
+<a href="preferences.html">preferences</a> to see them. An extra
+<i>Inconclusive</i> column then marks them. Expect more false warnings among
+them.</p>
+
+<h2>Where to start</h2>
+
+<p>The first analysis of a large project can give many warnings. Some
+tips:</p>
+<ul>
+<li>Start with <b>errors</b>, then <b>warnings</b>. Use the
+    <a href="severities.html">severity</a> buttons in the toolbar to hide the
+    other severities.</li>
+<li>Look at the <b>information</b> messages early. They are not bugs, but they
+    tell you about problems in the configuration, such as headers that can
+    not be found. Fixing them makes the other results better.</li>
+<li>Sort by the <i>Id</i> column to handle one kind of warning at a time. If
+    one kind of warning is wrong everywhere, it may be a configuration
+    problem.</li>
+<li>Use the quick filter to find warnings about a function, a variable or a
+    file.</li>
+<li>With a build dir, sort by <i>Since date</i> to see the newest warnings
+    first. New warnings are the easiest to fix, because the code is fresh in
+    your mind.</li>
+<li>Use <a href="tagging.html">tags</a> to remember what you have looked
+    at.</li>
+</ul>
+
+<h2>Opening the code in an editor</h2>
+
+<p>Double-click a warning, or select it and press Enter, to open the file in
+your default editor at the line of the warning. You can also right-click a
+warning and choose an editor at the top of the context menu.</p>
+
+<p>Editors are configured in the <a href="preferences.html#applications">
+preferences</a> on the <i>Applications</i> tab. On some systems the GUI finds
+installed editors automatically.</p>
+
+<p>If the file is not found, for example because the results were loaded from
+an XML file created on another computer, the GUI asks you to select the
+folder where the file is.</p>
+
+<a name="contextmenu"></a>
+<h2>The context menu</h2>
+
+<p>Right-click one or more selected warnings to get the context menu. Select
+several warnings with Ctrl+click or Shift+click.</p>
+
+<p class="figure"><img src="images/context-menu.png"></p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Command</th><th>Description</th></tr>
+<tr><td>(editors)</td><td>Open the file of the warning in this editor.</td></tr>
+<tr><td>Recheck N file(s)</td><td>Analyze the selected files again. Select
+    file items (the top level items in the list) to enable this. Useful after
+    you have fixed something in a file. Not available while an analysis is
+    running or for results loaded from an XML file.</td></tr>
+<tr><td>Copy</td><td>Copy the selected warnings, notes or file names to the
+    clipboard as text, in the format
+    <code>file:line:column:severity: summary [id]</code>, followed by one line
+    for each note. Paste it in a bug report or a chat.</td></tr>
+<tr><td>Hide N result(s)</td><td>Hide the selected warnings until the next
+    analysis. See <a href="suppressions.html#hide">Hiding warnings</a>.</td></tr>
+<tr><td>Hide all with id</td><td>Hide all warnings with the same id as the
+    selected warning, until the next analysis.</td></tr>
+<tr><td>Suppress selected id(s)</td><td>Suppress all warnings with the ids of
+    the selected warnings, in all files. The suppression is saved in the
+    project file, so the warnings are not reported again. See
+    <a href="suppressions.html">Hiding and suppressing warnings</a>.</td></tr>
+<tr><td>Open containing folder</td><td>Open the folder of the file in your
+    file manager.</td></tr>
+<tr><td>Tag</td><td>Give the selected warnings a tag. Only shown if the
+    project has tags. See <a href="tagging.html">Tagging warnings</a>.</td></tr>
+</table>
+
+<h2>Analyzing again</h2>
+
+<p>After you have changed the code:</p>
+<ul>
+<li>Right-click a file in the results list and choose <i>Recheck</i> to
+    analyze just that file again.</li>
+<li>Use <i>Reanalyze all files</i> in the toolbar to analyze everything again.
+    With a build dir only changed files are analyzed again, so this is
+    fast.</li>
+<li>Use <i>Analyze &gt; Reanalyze modified files</i> (Ctrl+R) to analyze only
+    the files that changed since the last analysis. See
+    <a href="mainwindow.html">The main window</a> for when this is
+    available.</li>
+</ul>
+
+<p class="nav">Previous: <a href="projectfiledialog.html">Project files</a> |
+Next: <a href="severities.html">Severities and report types</a></p>
 
 </body>
 </html>
-
diff --git a/gui/help/mainwindow.html b/gui/help/mainwindow.html
new file mode 100644
index 00000000000..d12fe51c787
--- /dev/null
+++ b/gui/help/mainwindow.html
@@ -0,0 +1,293 @@
+<html>
+<head>
+<title>The main window</title>
+<link rel="stylesheet" type="text/css" href="style.css">
+</head>
+<body>
+
+<h1>The main window</h1>
+
+<p>This page describes the parts of the main window and every command in the
+menus and toolbars.</p>
+
+<p class="figure"><img src="images/main-window.png"></p>
+
+<p>From top to bottom the main window has:</p>
+<ul>
+<li>the <b>menu bar</b>,</li>
+<li>the <b>toolbars</b>: the standard toolbar, the severity toolbar and the
+    quick filter,</li>
+<li>the <b>progress bar</b>, which is shown while an analysis is running,</li>
+<li>the <b>results list</b> with all warnings,</li>
+<li>the <b>lower panel</b> with two tabs: <i>Warning Details</i> (the message
+    and the source code of the selected warning) and <i>Analysis Log</i>.</li>
+</ul>
+
+<p>The title bar shows the name of the project file that is open. You can drag
+the bar between the results list and the lower panel to give more space to
+either of them. The GUI remembers the window size, the column widths and the
+position of the bar.</p>
+
+<h2>The results list</h2>
+
+<p>The results are grouped by file. Each file is a top level item; click the
+arrow to expand it, or use <i>View &gt; Expand all</i>. Each warning in a file
+can have child items called <i>notes</i>, which describe the path through the
+code that leads to the problem.</p>
+
+<p>The columns are:</p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Column</th><th>Meaning</th></tr>
+<tr><td>File</td><td>The file of the warning. By default the path is shown
+    relative to the project (see <i>Show full path of files</i> in the
+    <a href="preferences.html">preferences</a> and <i>Root path</i> in the
+    <a href="projectfiledialog.html#rootpath">project file</a>).</td></tr>
+<tr><td>Line</td><td>The line number.</td></tr>
+<tr><td>Severity</td><td>error, warning, style, performance, portability,
+    information, or note for the notes. See
+    <a href="severities.html">Severities</a>. The icon in the File column
+    shows the severity too.</td></tr>
+<tr><td>Classification, Level, Guideline, Rule</td><td>Only shown when a
+    compliance report type (Misra, Cert, Autosar) is selected in
+    <i>View &gt; Report</i>. See <a href="severities.html#reports">Report
+    types</a>.</td></tr>
+<tr><td>Inconclusive</td><td>Shown when inconclusive warnings are enabled in
+    the preferences. Marks warnings where Cppcheck is not sure.</td></tr>
+<tr><td>Summary</td><td>A short description of the problem.</td></tr>
+<tr><td>Id</td><td>The id of the checker message, for example
+    <code>nullPointer</code>. You need it for suppressions. The column can be
+    turned off in the preferences.</td></tr>
+<tr><td>Since date</td><td>The date the warning was first seen. Only
+    available for projects with a build dir; the date is kept from analysis
+    to analysis as long as the warning is still there. This makes it easy to
+    see which warnings are new.</td></tr>
+<tr><td>Tags</td><td>Your own tag for the warning. See
+    <a href="tagging.html">Tagging</a>.</td></tr>
+<tr><td>CWE</td><td>The <a href="https://cwe.mitre.org/">Common Weakness
+    Enumeration</a> number of the problem, if there is one.</td></tr>
+</table>
+
+<p>Click a column header to sort by that column. Drag the edge of a column
+header to change its width.</p>
+
+<p>Double-click a warning, or select it and press Enter, to open the file in
+your default editor at the line of the warning. You must configure the editor
+first in the <a href="preferences.html#applications">preferences</a>.</p>
+
+<p>Right-click warnings to get a context menu. See
+<a href="investigating-warnings.html#contextmenu">The context menu</a>.</p>
+
+<h2>Warning Details and the code view</h2>
+
+<p>When you select a warning, the <i>Warning Details</i> tab shows the id, the
+CWE number and the full message. Some messages are longer than the summary in
+the list and explain the problem in more detail. If the file was included from
+another file, it also shows which file included it.</p>
+
+<p>Below the message, the code view shows the source file with the line of the
+warning highlighted. Select a note to see the line of the note. The code view
+is read only; use your editor to change the code. The colors of the code view
+can be changed in the <a href="preferences.html#codeeditor">preferences</a>.</p>
+
+<h2>Analysis Log</h2>
+
+<p>The <i>Analysis Log</i> tab shows which files were analyzed and with which
+configuration: the preprocessor defines, undefines, include paths and
+platform. Look here if the results are not what you expected, for example to
+check that the right include paths are used. Right-click the log to clear it
+or copy one or all entries.</p>
+
+<p>If <i>Show internal warnings in log</i> is enabled in the preferences,
+internal debug warnings are shown here too.</p>
+
+<p>If a critical error happens, for example a syntax error that stops the
+analysis of a file, a red message is shown above the results list.</p>
+
+<h2>Toolbars</h2>
+
+<p class="figure"><img src="images/toolbar.png"></p>
+
+<p>The <b>standard toolbar</b> (left) has, from left to right: <i>Open Project
+File</i>, <i>Save results to file</i>, <i>Reanalyze all files</i>,
+<i>Stop</i>, <i>Clear results</i>, <i>Preferences</i> and <i>About</i>. These
+commands are described with the menus below.</p>
+
+<p>The <b>severity toolbar</b> (right) has one toggle button for each
+severity: error, warning, style, portability, performance and information.
+When a button is pressed, warnings with that severity are shown. Release it to
+hide them. The last two buttons show or hide results from Cppcheck itself and
+results from Clang tools (Clang-Tidy). When you select a compliance report
+type, the buttons change to the classifications of that standard, for example
+Mandatory, Required and Advisory for Misra.</p>
+
+<p>The <b>quick filter</b> field shows only warnings that contain the text you
+type. The text is searched (ignoring case) in the summary, the message, the id,
+the classification and the files and texts of the notes. Click the small cross
+in the field to clear the filter.</p>
+
+<p class="figure"><img src="images/quick-filter.png"></p>
+
+<p>The toolbars can be turned on and off with <i>View &gt; Toolbars</i>.</p>
+
+<h2>The File menu</h2>
+
+<p class="figure"><img src="images/menu-file.png"></p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Command</th><th>Description</th></tr>
+<tr><td>Open XML...</td><td>Open a results file in XML format that was saved
+    earlier by the GUI or created with the command line tool
+    (<code>cppcheck --xml ...</code>). The current results are cleared. See
+    <a href="reports.html#open">Opening results</a>.</td></tr>
+<tr><td>New Project File...</td><td>Create a new project file. First you
+    choose the file name, then the <a href="projectfiledialog.html">project
+    file dialog</a> opens. When you click OK the analysis starts.</td></tr>
+<tr><td>Open Project File...</td><td>Open an existing project file
+    (<code>*.cppcheck</code>). If the project has a build dir with results
+    from an earlier analysis, those results are shown. Otherwise the analysis
+    starts.</td></tr>
+<tr><td>Edit Project File...</td><td>Change the settings of the open project.
+    When you click OK, the project file is saved and the code is analyzed
+    again.</td></tr>
+<tr><td>Close Project File</td><td>Close the project and clear the results.
+    You must close the project before you can analyze files or folders
+    without a project.</td></tr>
+<tr><td>(recent projects)</td><td>The project files you opened recently.
+    Click one to open it.</td></tr>
+<tr><td>Save results to file...</td><td>Save the results as XML, text or CSV.
+    See <a href="reports.html#save">Saving results</a>.</td></tr>
+<tr><td>Print Preview... / Print...</td><td>Preview or print the results.
+    See <a href="reports.html#print">Printing</a>.</td></tr>
+<tr><td>Quit</td><td>Close the GUI. If an analysis is running, you are asked
+    if you want to stop it.</td></tr>
+</table>
+
+<h2>The Edit menu</h2>
+
+<p class="figure"><img src="images/menu-edit.png"></p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Command</th><th>Description</th></tr>
+<tr><td>Clear results</td><td>Remove all results from the list. If the
+    project has a build dir, the cached analysis results in the build dir are
+    deleted too, so the next analysis analyzes every file from scratch.</td></tr>
+<tr><td>Preferences</td><td>Open the <a href="preferences.html">preferences
+    dialog</a>.</td></tr>
+</table>
+
+<h2>The View menu</h2>
+
+<p class="figure"><img src="images/menu-view.png"></p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Command</th><th>Description</th></tr>
+<tr><td>Toolbars</td><td>Show or hide the standard toolbar, the severity
+    toolbar (<i>Categories</i>) and the quick filter.</td></tr>
+<tr><td>Report</td><td>Choose how warnings are classified: <i>Normal</i>
+    (Cppcheck severities) or according to a coding standard: Autosar, Cert C,
+    Cert C++, Misra C, Misra C++ 2008 or Misra C++ 2023. See
+    <a href="severities.html#reports">Report types</a>.</td></tr>
+<tr><td>Show errors ... Show information</td><td>The same as the buttons in
+    the severity toolbar.</td></tr>
+<tr><td>Check all / Uncheck all</td><td>Show or hide all severities at
+    once.</td></tr>
+<tr><td>Collapse all / Expand all</td><td>Collapse or expand all files and
+    warnings in the results list.</td></tr>
+<tr><td>Show hidden</td><td>Show the warnings again that you have hidden with
+    the context menu. Only enabled when there are hidden warnings.</td></tr>
+<tr><td>Show Scratchpad...</td><td>Open the <a href="tools.html#scratchpad">
+    scratchpad</a>, where you can type or paste code and analyze it.</td></tr>
+<tr><td>Statistics</td><td>Show <a href="reports.html#statistics">statistics</a>
+    about the project and the last analysis.</td></tr>
+<tr><td>Library Editor...</td><td>Open the <a href="tools.html#libraryeditor">
+    library editor</a> to create or change a library configuration (.cfg)
+    file.</td></tr>
+<tr><td>Thread Details</td><td>Show what each analysis thread is doing right
+    now. See <a href="tools.html#threads">Thread details</a>.</td></tr>
+</table>
+
+<h2>The Analyze menu</h2>
+
+<p class="figure"><img src="images/menu-analyze.png"></p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Command</th><th>Description</th></tr>
+<tr><td>Files...</td><td>Analyze one or more files without a project. You can
+    also select a compile database, a Visual Studio solution or project, or a
+    Borland C++ Builder 6 project here. See
+    <a href="standalone-analysis.html">Analyzing without a project</a>.</td></tr>
+<tr><td>Directory...</td><td>Analyze all source files in a folder and its
+    subfolders, without a project.</td></tr>
+<tr><td>Reanalyze modified files</td><td>Analyze again only the files that
+    changed since the last analysis in this session, including files that
+    include a changed header. This works for files and folders you selected
+    with <i>Files...</i> or <i>Directory...</i> and for projects that list
+    their paths in the project file. For projects that import a compile
+    database or a Visual Studio project, use <i>Reanalyze all files</i>
+    instead.</td></tr>
+<tr><td>Reanalyze all files</td><td>Analyze all files again. For a project with
+    a build dir, unchanged files are not analyzed again; their cached results
+    are used.</td></tr>
+<tr><td>Reanalyze and check library</td><td>Analyze the project again and
+    report functions and types for which Cppcheck has no configuration. Use it
+    to find out what is missing in your library configurations. See
+    <a href="troubleshooting.html#checklibrary">Checking the library
+    configuration</a>.</td></tr>
+<tr><td>Check configuration (defines, includes)</td><td>Analyze the project
+    again and report problems in the configuration, such as include files
+    that can not be found. Use it when you set up a new project.</td></tr>
+<tr><td>Stop</td><td>Stop the running analysis (Esc). Results found so far are
+    kept.</td></tr>
+<tr><td>C standard / C++ standard</td><td>The language standard used for
+    files when the standard is not known in another way (for example from an
+    imported project).</td></tr>
+<tr><td>Auto-detect language / Enforce C++ / Enforce C</td><td>By default the
+    language of each file is chosen from its file extension: <code>.c</code>
+    files are C and <code>.cpp</code>, <code>.cc</code>, <code>.cxx</code> and
+    similar are C++. Choose <i>Enforce C++</i> or <i>Enforce C</i> to analyze
+    all files as that language, for example if your C++ code is in
+    <code>.c</code> files.</td></tr>
+<tr><td>Native ... Windows 64-bit</td><td>The platform to use when the project
+    does not choose a platform, or when you analyze without a project.
+    <i>Native</i> is the platform you run Cppcheck on. See
+    <a href="projectfiledialog.html#platform">Platform</a>.</td></tr>
+</table>
+
+<h2>The Help menu</h2>
+
+<p class="figure"><img src="images/menu-help.png"></p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Command</th><th>Description</th></tr>
+<tr><td>Contents</td><td>Open this help (F1).</td></tr>
+<tr><td>License...</td><td>Show the license of Cppcheck (GNU GPL v3).</td></tr>
+<tr><td>Authors...</td><td>Show the people who have contributed to
+    Cppcheck.</td></tr>
+<tr><td>About...</td><td>Show the version of Cppcheck.</td></tr>
+</table>
+
+<p>Cppcheck Premium also shows <i>EULA...</i> in this menu.</p>
+
+<h2>Keyboard shortcuts</h2>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4">
+<tr><th>Shortcut</th><th>Command</th></tr>
+<tr><td>Ctrl+Shift+N</td><td>New Project File</td></tr>
+<tr><td>Ctrl+Shift+O</td><td>Open Project File</td></tr>
+<tr><td>Ctrl+S</td><td>Save results to file</td></tr>
+<tr><td>Ctrl+P</td><td>Print</td></tr>
+<tr><td>Ctrl+Q</td><td>Quit</td></tr>
+<tr><td>Ctrl+F</td><td>Analyze files</td></tr>
+<tr><td>Ctrl+D</td><td>Analyze directory</td></tr>
+<tr><td>Ctrl+R</td><td>Reanalyze modified files</td></tr>
+<tr><td>Esc</td><td>Stop the analysis</td></tr>
+<tr><td>F1</td><td>Help</td></tr>
+<tr><td>Enter</td><td>Open the selected warning in the default editor</td></tr>
+</table>
+
+<p class="nav">Previous: <a href="walkthrough.html">Getting started</a> |
+Next: <a href="standalone-analysis.html">Analyzing without a project</a></p>
+
+</body>
+</html>
diff --git a/gui/help/manual.html b/gui/help/manual.html
deleted file mode 100644
index a237cb8485b..00000000000
--- a/gui/help/manual.html
+++ /dev/null
@@ -1,947 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Cppcheck 1.46</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"></HEAD
-><BODY
-CLASS="book"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
-><DIV
-CLASS="BOOK"
-><A
-NAME="AEN1"
-></A
-><DIV
-CLASS="TITLEPAGE"
-><H1
-CLASS="title"
-><A
-NAME="AEN2"
->Cppcheck 1.46</A
-></H1
-><HR></DIV
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
->1. <A
-HREF="#AEN5"
->Introduction</A
-></DT
-><DT
->2. <A
-HREF="#AEN19"
->Getting started</A
-></DT
-><DD
-><DL
-><DT
->2.1. <A
-HREF="#AEN21"
->First test</A
-></DT
-><DT
->2.2. <A
-HREF="#AEN30"
->Checking all files in a folder</A
-></DT
-><DT
->2.3. <A
-HREF="#AEN36"
->Excluding a file or folder from checking</A
-></DT
-><DT
->2.4. <A
-HREF="#AEN44"
->Severities</A
-></DT
-><DT
->2.5. <A
-HREF="#AEN65"
->Enable messages</A
-></DT
-><DD
-><DL
-><DT
->2.5.1. <A
-HREF="#AEN70"
->Stylistic issues</A
-></DT
-><DT
->2.5.2. <A
-HREF="#AEN84"
->Unused functions</A
-></DT
-><DT
->2.5.3. <A
-HREF="#AEN88"
->Enable all checks</A
-></DT
-></DL
-></DD
-><DT
->2.6. <A
-HREF="#AEN93"
->Saving results in file</A
-></DT
-><DT
->2.7. <A
-HREF="#AEN97"
->Multithreaded checking</A
-></DT
-></DL
-></DD
-><DT
->3. <A
-HREF="#AEN101"
->Preprocessor configurations</A
-></DT
-><DT
->4. <A
-HREF="#AEN109"
->XML output</A
-></DT
-><DT
->5. <A
-HREF="#AEN143"
->Reformatting the output</A
-></DT
-><DT
->6. <A
-HREF="#AEN159"
->Suppressions</A
-></DT
-><DT
->7. <A
-HREF="#AEN172"
->Leaks</A
-></DT
-><DD
-><DL
-><DT
->7.1. <A
-HREF="#AEN175"
->Userdefined allocation/deallocation functions</A
-></DT
-></DL
-></DD
-><DT
->8. <A
-HREF="#AEN192"
->Exception safety</A
-></DT
-><DT
->9. <A
-HREF="#AEN212"
->Html report</A
-></DT
-><DT
->10. <A
-HREF="#AEN224"
->Graphical user interface</A
-></DT
-><DD
-><DL
-><DT
->10.1. <A
-HREF="#AEN226"
->Introduction</A
-></DT
-><DT
->10.2. <A
-HREF="#AEN230"
->Check source code</A
-></DT
-><DT
->10.3. <A
-HREF="#AEN234"
->Inspecting results</A
-></DT
-><DT
->10.4. <A
-HREF="#AEN242"
->Settings</A
-></DT
-><DT
->10.5. <A
-HREF="#AEN249"
->Project files</A
-></DT
-></DL
-></DD
-></DL
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN5"
-></A
->Chapter 1. Introduction</H1
-><P
->Cppcheck is an analysis tool for C/C++ code. Unlike C/C++ compilers
-    and many other analysis tools, it doesn't detect syntax errors. Cppcheck
-    only detects the types of bugs that the compilers normally fail to detect.
-    The goal is no false positives.</P
-><P
->Supported code and platforms:</P
-><P
-></P
-><UL
-><LI
-><P
->You can check non-standard code that includes various compiler
-        extensions, inline assembly code, etc.</P
-></LI
-><LI
-><P
->Cppcheck should be compilable by any C++ compiler that handles
-        the latest C++ standard.</P
-></LI
-><LI
-><P
->Cppcheck should work on any platform that has sufficient cpu and
-        memory.</P
-></LI
-></UL
-><P
->Accuracy</P
-><P
->Please understand that there are limits of Cppcheck. Cppcheck is
-    rarely wrong about reported errors. But there are many bugs that it
-    doesn't detect.</P
-><P
->You will find more bugs in your software by testing your software
-    carefully, than by using Cppcheck. You will find more bugs in your
-    software by instrumenting your software, than by using Cppcheck. But
-    Cppcheck can still detect some of the bugs that you miss when testing and
-    instrumenting your software.</P
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN19"
-></A
->Chapter 2. Getting started</H1
-><DIV
-CLASS="section"
-><H2
-CLASS="section"
-><A
-NAME="AEN21"
->2.1. First test</A
-></H2
-><P
->Here is a simple code</P
-><PRE
-CLASS="programlisting"
->int main()
-{
-    char a[10];
-    a[10] = 0;
-    return 0;
-}</PRE
-><P
->If you save that into <TT
-CLASS="filename"
->file1.c</TT
-> and
-      execute:</P
-><PRE
-CLASS="programlisting"
->cppcheck file1.c</PRE
-><P
->The output from cppcheck will then be:</P
-><PRE
-CLASS="programlisting"
->Checking file1.c...
-[file1.c:4]: (error) Array 'a[10]' index 10 out of bounds</PRE
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN30"
->2.2. Checking all files in a folder</A
-></H2
-><P
->Normally a program has many sourcefiles. And you want to check
-      them all. Cppcheck can check all sourcefiles in a directory:</P
-><PRE
-CLASS="programlisting"
->cppcheck path</PRE
-><P
->If "path" is a folder then cppcheck will check all sourcefiles in
-      this folder.</P
-><PRE
-CLASS="programlisting"
->Checking path/file1.cpp...
-1/2 files checked 50% done
-Checking path/file2.cpp...
-2/2 files checked 100% done</PRE
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN36"
->2.3. Excluding a file or folder from checking</A
-></H2
-><P
->There is no command to exclude a file or folder from checking. But
-      you can exclude a file or folder by being more careful when including
-      files and folders in the checking.</P
-><P
->Imagine for example that the folder "src" contain the folders "a",
-      "b" and "c". To exclude "c" this command can be used:</P
-><PRE
-CLASS="programlisting"
->cppcheck src/a src/b</PRE
-><P
->All files under "src/a" and "src/b" are then checked.</P
-><P
->The flag <TT
-CLASS="literal"
->--file-list</TT
-> might also be
-      useful.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN44"
->2.4. Severities</A
-></H2
-><P
->The possible severities for messages are:</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><DL
-><DT
->error</DT
-><DD
-><P
->used when bugs are found</P
-></DD
-><DT
->warning</DT
-><DD
-><P
->suggestions about defensive programming to prevent
-            bugs</P
-></DD
-><DT
->style</DT
-><DD
-><P
->stylistic issues related to code cleanup (unused functions,
-            redundant code, constness, and such)</P
-></DD
-><DT
->performance</DT
-><DD
-><P
->suggestions for making the code faster</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN65"
->2.5. Enable messages</A
-></H2
-><P
->By default only <TT
-CLASS="literal"
->error</TT
-> messages are shown.
-      Through the <TT
-CLASS="literal"
->--enable</TT
-> command more checks can be
-      enabled.</P
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN70"
->2.5.1. Stylistic issues</A
-></H3
-><P
->With <TT
-CLASS="literal"
->--enable=style</TT
-> you enable most
-        <TT
-CLASS="literal"
->warning</TT
->, <TT
-CLASS="literal"
->style</TT
-> and
-        <TT
-CLASS="literal"
->performance</TT
-> messages.</P
-><P
->Here is a simple code example:</P
-><PRE
-CLASS="programlisting"
->void f(int x)
-{
-    int i;
-    if (x == 0)
-    {
-        i = 0;
-    }
-}</PRE
-><P
->There are no bugs in that code so Cppcheck won't report anything
-        by default. To enable the stylistic messages, use the --enable=style
-        command:</P
-><PRE
-CLASS="programlisting"
->cppcheck --enable=style file3.c</PRE
-><P
->The output from Cppcheck is now:</P
-><P
-><PRE
-CLASS="programlisting"
->Checking file3.c...
-[file3.c:3]: (style) Variable 'i' is assigned a value that is never used
-[file3.c:3]: (style) The scope of the variable i can be reduced</PRE
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN84"
->2.5.2. Unused functions</A
-></H3
-><P
->This check will try to find unused functions. It is best to use
-        this when the whole program is checked, so that all usages is seen by
-        cppcheck.</P
-><PRE
-CLASS="programlisting"
->cppcheck --enable=unusedFunction path</PRE
-></DIV
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN88"
->2.5.3. Enable all checks</A
-></H3
-><P
->To enable all checks your can use the
-        <TT
-CLASS="literal"
->--enable=all</TT
-> flag:</P
-><PRE
-CLASS="programlisting"
->cppcheck --enable=all path</PRE
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN93"
->2.6. Saving results in file</A
-></H2
-><P
->Many times you will want to save the results in a file. You can
-      use the normal shell redirection for piping error output to a
-      file.</P
-><PRE
-CLASS="programlisting"
->cppcheck file1.c 2&#62; err.txt</PRE
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN97"
->2.7. Multithreaded checking</A
-></H2
-><P
->To use 4 threads to check the files in a folder:</P
-><PRE
-CLASS="programlisting"
->cppcheck -j 4 path</PRE
-></DIV
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN101"
-></A
->Chapter 3. Preprocessor configurations</H1
-><P
->By default Cppcheck will check all preprocessor configurations
-    (except those that have #error in them). This is the recommended
-    behaviour.</P
-><P
->But if you want to manually limit the checking you can do so with
-    <TT
-CLASS="literal"
->-D</TT
->.</P
-><P
->Beware that only the macros, which are given here and the macros
-    defined in source files and known header files are considered. That
-    excludes all the macros defined in some system header files, which are by
-    default not examined by cppcheck.</P
-><P
->The usage: if you, for example, want to limit the checking so the
-    only configuration to check should be "DEBUG=1;__cplusplus" then something
-    like this can be used:</P
-><PRE
-CLASS="programlisting"
->cppcheck -DDEBUG=1 -D__cplusplus path</PRE
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN109"
-></A
->Chapter 4. XML output</H1
-><P
->Cppcheck can generate the output in XML format.</P
-><P
->Use the --xml flag when you execute cppcheck:</P
-><PRE
-CLASS="programlisting"
->cppcheck --xml file1.cpp</PRE
-><P
->The xml format is:</P
-><PRE
-CLASS="programlisting"
->&#60;?xml version="1.0"?&#62;
-&#60;results&#62;
-  &#60;error file="file1.cpp" line="123" id="someError"
-               severity="error" msg="some error text"/&#62;
-&#60;/results&#62;</PRE
-><P
->Attributes:</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><DL
-><DT
->file</DT
-><DD
-><P
->filename. Both relative and absolute paths are possible</P
-></DD
-><DT
->line</DT
-><DD
-><P
->a number</P
-></DD
-><DT
->id</DT
-><DD
-><P
->id of error. These are always valid symbolnames.</P
-></DD
-><DT
->severity</DT
-><DD
-><P
->either <TT
-CLASS="literal"
->error</TT
-> or <TT
-CLASS="literal"
->style</TT
->.
-          <TT
-CLASS="literal"
->warning</TT
-> and <TT
-CLASS="literal"
->performance</TT
-> are
-          saved as <TT
-CLASS="literal"
->style</TT
->.</P
-></DD
-><DT
->msg</DT
-><DD
-><P
->the error message</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN143"
-></A
->Chapter 5. Reformatting the output</H1
-><P
->If you want to reformat the output so it looks different you can use
-    templates.</P
-><P
->To get Visual Studio compatible output you can use "--template
-    vs":</P
-><PRE
-CLASS="programlisting"
->cppcheck --template vs gui/test.cpp</PRE
-><P
->This output will look like this:</P
-><PRE
-CLASS="programlisting"
->Checking gui/test.cpp...
-gui/test.cpp(31): error: Memory leak: b
-gui/test.cpp(16): error: Mismatching allocation and deallocation: k</PRE
-><P
->To get gcc compatible output you can use "--template gcc":</P
-><PRE
-CLASS="programlisting"
->cppcheck --template gcc gui/test.cpp</PRE
-><P
->The output will look like this:</P
-><PRE
-CLASS="programlisting"
->Checking gui/test.cpp...
-gui/test.cpp:31: error: Memory leak: b
-gui/test.cpp:16: error: Mismatching allocation and deallocation: k</PRE
-><P
->You can write your own pattern (for example a comma-separated
-    format):</P
-><PRE
-CLASS="programlisting"
->cppcheck --template "{file},{line},{severity},{id},{message}" gui/test.cpp</PRE
-><P
->The output will look like this:</P
-><PRE
-CLASS="programlisting"
->Checking gui/test.cpp...
-gui/test.cpp,31,error,memleak,Memory leak: b
-gui/test.cpp,16,error,mismatchAllocDealloc,Mismatching allocation and deallocation: k</PRE
-><P
-></P
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN159"
-></A
->Chapter 6. Suppressions</H1
-><P
->If you want to filter out certain errors you can suppress these.
-    First you need to create a suppressions file. The format is:</P
-><PRE
-CLASS="programlisting"
->[error id]:[filename]:[line]
-[error id]:[filename2]
-[error id]</PRE
-><P
->The <TT
-CLASS="literal"
->error id</TT
-> is the id that you want to suppress.
-    The easiest way to get it is to use the <TT
-CLASS="literal"
->--xml</TT
-> command
-    line flag. Copy and paste the <TT
-CLASS="literal"
->id</TT
-> string from the xml
-    output.</P
-><P
->Here is an example:</P
-><PRE
-CLASS="programlisting"
->memleak:file1.cpp
-exceptNew:file1.cpp
-uninitvar</PRE
-><P
->You can then use the suppressions file:</P
-><PRE
-CLASS="programlisting"
->cppcheck --suppressions suppressions.txt src/</PRE
-><P
-></P
-></DIV
->
-<DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN192"
-></A
->Chapter 7. Exception safety</H1
-><P
->Cppcheck has a few checks that ensure that you don't break the basic
-    guarantee of exception safety. It doesn't have any checks for the strong
-    guarantee yet.</P
-><P
->Example:</P
-><PRE
-CLASS="programlisting"
->Fred::Fred() : a(new int[20]), b(new int[20])
-{
-}</PRE
-><P
->By default cppcheck will not detect any problems in that
-    code.</P
-><P
->To enable the exception safety checking you can use
-    <TT
-CLASS="literal"
->--enable</TT
->:</P
-><PRE
-CLASS="programlisting"
->cppcheck --enable=exceptNew --enable=exceptRealloc fred.cpp</PRE
-><P
->The output will be:</P
-><PRE
-CLASS="programlisting"
->[fred.cpp:3]: (style) Upon exception there is memory leak: a</PRE
-><P
->If an exception occurs when <TT
-CLASS="literal"
->b</TT
-> is allocated,
-    <TT
-CLASS="literal"
->a</TT
-> will leak.</P
-><P
->Here is another example:</P
-><PRE
-CLASS="programlisting"
->int *p;
-
-int a(int sz)
-{
-    delete [] p;
-    if (sz &#60;= 0)
-        throw std::runtime_error("size &#60;= 0");
-    p = new int[sz];
-}</PRE
-><P
->Check that with Cppcheck:</P
-><PRE
-CLASS="programlisting"
->cppcheck --enable=exceptNew --enable=exceptRealloc except2.cpp</PRE
-><P
->The output from Cppcheck is:</P
-><PRE
-CLASS="programlisting"
->[except2.cpp:7]: (error) Throwing exception in invalid state, p points at deallocated memory</PRE
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN212"
-></A
->Chapter 8. Html report</H1
-><P
->You can convert the xml output from cppcheck into a html report.
-    You'll need python and the pygments module
-    (<FONT
-COLOR="RED"
->http://pygments.org/</FONT
->) for this to work. In the Cppcheck source
-    tree there is a folder "htmlreport" that contains a script that transforms
-    a Cppcheck xml file into html output.</P
-><P
->This command generates the help screen:</P
-><P
-><PRE
-CLASS="programlisting"
->htmlreport/cppcheck-htmlreport -h</PRE
-></P
-><P
->The output screen says:</P
-><P
-><PRE
-CLASS="programlisting"
->Usage: cppcheck-htmlreport [options]
-
-Options:
-  -h, --help      show this help message and exit
-  --file=FILE     The cppcheck xml output file to read defects from.
-                  Default is reading from stdin.
-  --report-dir=REPORT_DIR
-                  The directory where the html report content is written.
-  --source-dir=SOURCE_DIR
-                  Base directory where source code files can be found.</PRE
-></P
-><P
->An example usage:</P
-><PRE
-CLASS="programlisting"
->./cppcheck gui/test.cpp --xml 2&#62; err.xml
-htmlreport/cppcheck-htmlreport --file=err.xml --report-dir=test1 --source-dir=.</PRE
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN224"
-></A
->Chapter 9. Graphical user interface</H1
-><DIV
-CLASS="section"
-><H2
-CLASS="section"
-><A
-NAME="AEN226"
->9.1. Introduction</A
-></H2
-><P
->A Cppcheck GUI is available.</P
-><P
->The main screen is shown immediately when the GUI is
-      started.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN230"
->9.2. Check source code</A
-></H2
-><P
->Use the <TT
-CLASS="literal"
->Check</TT
-> menu.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN234"
->9.3. Inspecting results</A
-></H2
-><P
->The results are shown in a list.</P
-><P
->You can show/hide certain types of messages through the
-      <TT
-CLASS="literal"
->View</TT
-> menu.</P
-><P
->Results can be saved to an xml file that can later be opened. See
-      <TT
-CLASS="literal"
->Save results to file</TT
-> and <TT
-CLASS="literal"
->Open
-      XML</TT
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN242"
->9.4. Settings</A
-></H2
-><P
->The language can be changed at any time by using the
-      <TT
-CLASS="literal"
->Language</TT
-> menu.</P
-><P
->More settings are available in
-      <TT
-CLASS="literal"
->Edit</TT
->&#62;<TT
-CLASS="literal"
->Preferences</TT
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN249"
->9.5. Project files</A
-></H2
-><P
->The project files are used to store project specific settings.
-      These settings are:</P
-><P
-></P
-><UL
-><LI
-><P
->include folders</P
-></LI
-><LI
-><P
->preprocessor defines</P
-></LI
-></UL
-><P
->It isn't recommended to provide the paths to the standard C/C++
-      headers - Cppcheck has internal knowledge about ANSI C/C++ and it isn't
-      recommended that this known functionality is redefined. But feel free to
-      try it.</P
-><P
->As you can read in chapter 3 in this manual the default is that
-      Cppcheck checks all configurations. So only provide preprocessor defines
-      if you want to limit the checking.</P
-></DIV
-></DIV
-></DIV
-></BODY
-></HTML
->
diff --git a/gui/help/online-help.qhp b/gui/help/online-help.qhp
index 23411d0f3b4..29f73530ca2 100644
--- a/gui/help/online-help.qhp
+++ b/gui/help/online-help.qhp
@@ -5,46 +5,136 @@
     <filterSection>
         <toc>
             <section title="Cppcheck GUI help" ref="index.html">
+                <section title="Getting started" ref="walkthrough.html"/>
+                <section title="The main window" ref="mainwindow.html"/>
+                <section title="Analyzing without a project" ref="standalone-analysis.html"/>
+                <section title="Project files" ref="projectfiledialog.html">
+                    <section title="Paths and Defines" ref="projectfiledialog.html#paths"/>
+                    <section title="Types and Functions" ref="projectfiledialog.html#types"/>
+                    <section title="Analysis" ref="projectfiledialog.html#analysis"/>
+                    <section title="Warning options" ref="projectfiledialog.html#warningoptions"/>
+                    <section title="Addons" ref="projectfiledialog.html#addons"/>
+                </section>
                 <section title="Investigating warnings" ref="investigating-warnings.html"/>
+                <section title="Severities and report types" ref="severities.html"/>
+                <section title="Hiding and suppressing warnings" ref="suppressions.html"/>
+                <section title="Tagging warnings" ref="tagging.html"/>
+                <section title="Results files, printing and statistics" ref="reports.html"/>
+                <section title="Scratchpad, library editor and other tools" ref="tools.html"/>
                 <section title="Preferences" ref="preferences.html"/>
-                <section title="Project file dialog" ref="projectfiledialog.html"/>
-                <section title="Severities" ref="severities.html"/>
-                <section title="Standalone analysis" ref="standalone-analysis.html"/>
-                <section title="Tagging" ref="tagging.html"/>
-                <section title="Quick walk through" ref="walkthrough.html"/>
+                <section title="Command line options" ref="commandline.html"/>
+                <section title="Troubleshooting" ref="troubleshooting.html"/>
             </section>
         </toc>
         <keywords>
+            <keyword name="Addons" ref="projectfiledialog.html#addons"/>
+            <keyword name="Applications" ref="preferences.html#applications"/>
+            <keyword name="Autosar" ref="severities.html#reports"/>
+            <keyword name="Build dir" ref="projectfiledialog.html#builddir"/>
+            <keyword name="Cert" ref="severities.html#reports"/>
+            <keyword name="Check level" ref="projectfiledialog.html#analysis"/>
+            <keyword name="Clang" ref="preferences.html#clang"/>
+            <keyword name="Clang-Tidy" ref="projectfiledialog.html#addons"/>
+            <keyword name="Code editor style" ref="preferences.html#codeeditor"/>
+            <keyword name="Command line" ref="commandline.html"/>
+            <keyword name="Compile database" ref="projectfiledialog.html#import"/>
+            <keyword name="Context menu" ref="investigating-warnings.html#contextmenu"/>
+            <keyword name="CSV" ref="reports.html#save"/>
+            <keyword name="Defines" ref="projectfiledialog.html#defines"/>
+            <keyword name="Editor" ref="preferences.html#applications"/>
             <keyword name="Error" ref="severities.html"/>
+            <keyword name="Exclude" ref="projectfiledialog.html#exclude"/>
+            <keyword name="False positive" ref="troubleshooting.html"/>
+            <keyword name="Filter" ref="mainwindow.html"/>
+            <keyword name="Hide" ref="suppressions.html#hide"/>
+            <keyword name="Import project" ref="projectfiledialog.html#import"/>
+            <keyword name="Include paths" ref="projectfiledialog.html#includepaths"/>
+            <keyword name="Inconclusive" ref="investigating-warnings.html"/>
+            <keyword name="Information" ref="severities.html"/>
+            <keyword name="Inline suppressions" ref="suppressions.html#inline"/>
+            <keyword name="Keyboard shortcuts" ref="mainwindow.html"/>
+            <keyword name="Libraries" ref="projectfiledialog.html#libraries"/>
+            <keyword name="Library editor" ref="tools.html#libraryeditor"/>
+            <keyword name="Misra" ref="severities.html#reports"/>
+            <keyword name="Missing include" ref="troubleshooting.html"/>
+            <keyword name="Notes" ref="investigating-warnings.html"/>
+            <keyword name="Open XML" ref="reports.html#open"/>
             <keyword name="Performance" ref="severities.html"/>
+            <keyword name="Platform" ref="projectfiledialog.html#platform"/>
             <keyword name="Portability" ref="severities.html"/>
+            <keyword name="Preferences" ref="preferences.html"/>
+            <keyword name="Print" ref="reports.html#print"/>
             <keyword name="Project" ref="projectfiledialog.html"/>
+            <keyword name="Python" ref="preferences.html#addons"/>
+            <keyword name="Report types" ref="severities.html#reports"/>
+            <keyword name="Root path" ref="projectfiledialog.html#rootpath"/>
+            <keyword name="Save results" ref="reports.html#save"/>
+            <keyword name="Scratchpad" ref="tools.html#scratchpad"/>
+            <keyword name="Severities" ref="severities.html"/>
+            <keyword name="Statistics" ref="reports.html#statistics"/>
             <keyword name="Style" ref="severities.html"/>
+            <keyword name="Suppressions" ref="suppressions.html"/>
+            <keyword name="Syntax error" ref="troubleshooting.html"/>
             <keyword name="Tag" ref="tagging.html"/>
+            <keyword name="Thread details" ref="tools.html#threads"/>
+            <keyword name="Undefines" ref="projectfiledialog.html#defines"/>
+            <keyword name="Visual Studio" ref="projectfiledialog.html#import"/>
             <keyword name="Warning" ref="severities.html"/>
         </keywords>
         <files>
+          <file>style.css</file>
           <file>index.html</file>
-          <file>images/index-mainwindow.png</file>
-          <file>investigating-warnings.html</file>
-          <file>preferences.html</file>
+          <file>walkthrough.html</file>
+          <file>mainwindow.html</file>
+          <file>standalone-analysis.html</file>
           <file>projectfiledialog.html</file>
+          <file>investigating-warnings.html</file>
           <file>severities.html</file>
+          <file>suppressions.html</file>
+          <file>tagging.html</file>
+          <file>reports.html</file>
+          <file>tools.html</file>
+          <file>preferences.html</file>
+          <file>commandline.html</file>
+          <file>troubleshooting.html</file>
+          <file>images/add-application.png</file>
+          <file>images/context-menu-tag.png</file>
+          <file>images/context-menu.png</file>
+          <file>images/library-editor.png</file>
+          <file>images/main-window.png</file>
+          <file>images/menu-analyze.png</file>
+          <file>images/menu-edit.png</file>
+          <file>images/menu-file.png</file>
+          <file>images/menu-help.png</file>
+          <file>images/menu-view-report.png</file>
+          <file>images/menu-view.png</file>
+          <file>images/new-suppression.png</file>
+          <file>images/preferences-addons.png</file>
+          <file>images/preferences-applications.png</file>
+          <file>images/preferences-clang.png</file>
+          <file>images/preferences-code-editor.png</file>
+          <file>images/preferences-general.png</file>
+          <file>images/preferences-language.png</file>
+          <file>images/preferences-reports.png</file>
+          <file>images/projectfile-addons.png</file>
+          <file>images/projectfile-analysis.png</file>
+          <file>images/projectfile-import.png</file>
+          <file>images/projectfile-paths-and-defines.png</file>
+          <file>images/projectfile-types-and-functions.png</file>
+          <file>images/projectfile-warning-options.png</file>
+          <file>images/quick-filter.png</file>
+          <file>images/report-misra.png</file>
+          <file>images/scratchpad.png</file>
           <file>images/severities-error.png</file>
-          <file>images/severities-warning.png</file>
-          <file>images/severities-style.png</file>
+          <file>images/severities-information.png</file>
           <file>images/severities-performance.png</file>
           <file>images/severities-portability.png</file>
-          <file>images/severities-information.png</file>
-          <file>standalone-analysis.html</file>
-          <file>tagging.html</file>
-          <file>walkthrough.html</file>
-          <file>images/walkthrough-analysis.png</file>
-          <file>images/walkthrough-library.png</file>
-          <file>images/walkthrough-toolbar-severities.png</file>
-          <file>images/walkthrough-import-project.png</file>
-          <file>images/walkthrough-new-project.png</file> 
-          <file>images/walkthrough-warning-menu.png</file>
+          <file>images/severities-style.png</file>
+          <file>images/severities-warning.png</file>
+          <file>images/statistics-previous-scan.png</file>
+          <file>images/statistics-project.png</file>
+          <file>images/statistics-statistics.png</file>
+          <file>images/toolbar.png</file>
         </files>
     </filterSection>
 </QtHelpProject>
diff --git a/gui/help/preferences.html b/gui/help/preferences.html
index 5a591227b3c..4c298e59e14 100644
--- a/gui/help/preferences.html
+++ b/gui/help/preferences.html
@@ -1,74 +1,195 @@
 <html>
 <head>
 <title>Preferences</title>
+<link rel="stylesheet" type="text/css" href="style.css">
 </head>
 <body>
 
 <h1>Preferences</h1>
 
-<p><b>Number of threads</b><br>Number of threads to use in analysis. Each
-thread checks its own source file.</p>
-
-<p><b>Force checking of all #ifdef configurations</b><br>Cppcheck try to check
-all code and will therefore guess different preprocessor configurations. The
-maximum number of configurations that is checked is 14 by default.</p>
-
-<p><b>Show full path of files</b><br>Show the full paths in the results.</p>
-
-<p><b>Show &quot;No errors found&quot; message when no errors found</b><br>
-If you want to get a message box about this.</p>
-
-<p><b>Display error id column &quot;Id&quot;</b><br>Show error id in results</p>
-
-<p><b>Enable inline suppressions</b><br>You can suppress warnings with comments.
-See the Cppcheck manual (https://cppcheck.sourceforge.io/manual.pdf) for more
-information about inline suppressions.</p>
-
-<p><b>Check for inconclusive errors also</b><br>When full analysis of the code
-can not determine if there should be a warning or not, it is inconclusive.
-Normally Cppcheck does not warn then.</p>
-
-<p><b>Show statistics on check completion</b><br>Show statistics in a window
-when analysis finish.</p>
-
-<p><b>Show internal warnings in log</b><br>Internal warnings (for debugging) is
-shown in the <i>Analysis log</i>.</p>
-
-<p><b>Applications</b><br>Configure external editor to open from context menu
-when you right click on a warning.</p>
-
-<p><b>Save all errors when creating report</b><br>If hidden warnings should be
-saved or not.</p>
-
-<p><b>Save full path to files in report</b><br>If you use <i>Root path</i> the
-warnings on the screen will not have the full path.</p>
-
-<p><b>Language</b><br>Configure language to use for GUI.</p>
-
-<p><b>Python binary</b><br>To be able to execute addons, Cppcheck needs to know
-where python is. Unless you configure something, Cppcheck will try to execute
-python in your PATH.</p>
-
-<p><b>MISRA rule texts</b><br>Only needed if you want to use the MISRA addon.
-Cppcheck is not legally allowed to distribute the MISRA rule texts and these
-must be provided by users. The MISRA rule texts are proprietary. An example
-rule text file:
-<blockquote><pre>Appendix A Summary of guidelines
-Rule 1.1
-Text of rule 1.1
-Rule 1.2
-Text of rule 1.2</pre></blockquote>
-</p>
-
-<p><b>Clang path</b><br>The path to <i>clang</i> binary. If no path is provided
-then system PATH is used.</p>
-
-<p><b>Visual studio headers</b><br>If you want to use the Visual Studio headers
-in the analysis you can provide the path(s) here. Hint: Open a visual studio
-command prompt and type <i>SET INCLUDE</i>. Then copy/paste the paths.</p>
-
-<p><b>Code editor style</b><br>The visual theme to use for the code editor that
-is used when you investigate results.</p>
+<p>Open the preferences with <i>Edit &gt; Preferences</i> or the preferences
+button in the toolbar. The preferences are your personal settings; they are
+stored for your user account, not in the project file. Click <i>OK</i> to
+apply the changes.</p>
+
+<p>Some settings exist both here and in the project file, for example
+<i>Enable inline suppressions</i>. When a project is open, the project
+setting is used.</p>
+
+<h2>General</h2>
+
+<p class="figure"><img src="images/preferences-general.png"></p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Option</th><th>Description</th></tr>
+<tr><td>Number of threads</td><td>How many files are analyzed at the same time.
+    Each thread analyzes its own file. <i>Max count</i> shows the number of
+    processor cores of your computer, which is the highest value you can
+    enter. More threads make the analysis faster, but use more memory. A value
+    equal to the number of cores is usually a good choice.</td></tr>
+<tr><td>Force checking all #ifdef configurations</td><td>By default Cppcheck
+    analyzes at most 12 preprocessor configurations of each file. With this
+    option all configurations are analyzed. This finds more bugs in code with
+    many <code>#ifdef</code>s, but can be very slow. See
+    <a href="projectfiledialog.html#defines">Defines</a>.</td></tr>
+<tr><td>Show full path of files</td><td>Show the full path of files in the
+    results list, instead of the path relative to the project.</td></tr>
+<tr><td>Show "No errors found" message when no errors found</td><td>Show a
+    message box when an analysis finishes without warnings.</td></tr>
+<tr><td>Display error Id in column "Id"</td><td>Show the <i>Id</i> column in
+    the results list. The id is needed for suppressions.</td></tr>
+<tr><td>Enable inline suppressions</td><td>Allow comments like
+    <code>// cppcheck-suppress nullPointer</code> in the code to suppress
+    warnings. Only used when no project is open; projects have their own
+    setting. See <a href="suppressions.html#inline">Inline
+    suppressions</a>.</td></tr>
+<tr><td>Check for inconclusive errors also</td><td>Also report warnings where
+    Cppcheck is not sure that there is a problem. These give more findings, but
+    also more false warnings. An <i>Inconclusive</i> column is added to the
+    results list.</td></tr>
+<tr><td>Show statistics on check completion</td><td>Open the
+    <a href="reports.html#statistics">statistics</a> dialog when an analysis
+    finishes.</td></tr>
+<tr><td>Check for updates</td><td>When the GUI starts, check on the Cppcheck
+    web site if there is a newer version. If there is, a message is shown at
+    the top of the main window. This needs an internet connection; nothing
+    else is sent.</td></tr>
+<tr><td>Show internal warnings in log</td><td>Show debug warnings from the
+    analysis in the <i>Analysis Log</i>. Only useful if you develop Cppcheck or
+    investigate a problem with the analysis.</td></tr>
+</table>
+
+<a name="applications"></a>
+<h2>Applications</h2>
+
+<p class="figure"><img src="images/preferences-applications.png"></p>
+
+<p>The editors (or other programs) that you can open a warning in. They are
+shown at the top of the context menu of the results list. The <i>default</i>
+application is used when you double-click a warning or press Enter.</p>
+
+<p>On some systems the GUI finds installed editors automatically and adds them
+to the list.</p>
+
+<ul>
+<li><b>Add...</b>: add an application.</li>
+<li><b>Edit...</b>: change the selected application.</li>
+<li><b>Remove</b>: remove the selected application.</li>
+<li><b>Set as default</b>: make the selected application the default one.</li>
+</ul>
+
+<p class="figure"><img src="images/add-application.png"></p>
+
+<p>For each application you enter a name for the menu, the executable and the
+command line parameters. These texts in the parameters are replaced when the
+application is started:</p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4">
+<tr><th>Text</th><th>Replaced with</th></tr>
+<tr><td><code>(file)</code></td><td>The file name of the warning</td></tr>
+<tr><td><code>(line)</code></td><td>The line number</td></tr>
+<tr><td><code>(message)</code></td><td>The warning message</td></tr>
+<tr><td><code>(severity)</code></td><td>The severity</td></tr>
+</table>
+
+<p>Examples for some common editors:</p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Editor</th><th>Executable</th><th>Parameters</th></tr>
+<tr><td>Visual Studio Code</td><td><code>code</code></td>
+    <td><code>--goto (file):(line)</code></td></tr>
+<tr><td>Kate</td><td><code>kate</code></td>
+    <td><code>-l(line) (file)</code></td></tr>
+<tr><td>Qt Creator</td><td><code>qtcreator</code></td>
+    <td><code>-client (file):(line)</code></td></tr>
+<tr><td>Notepad++</td><td><code>notepad++.exe</code></td>
+    <td><code>-n(line) (file)</code></td></tr>
+<tr><td>Vim (in a terminal)</td><td><code>xterm</code></td>
+    <td><code>-e vim +(line) (file)</code></td></tr>
+<tr><td>Emacs</td><td><code>emacs</code></td>
+    <td><code>+(line) (file)</code></td></tr>
+</table>
+
+<h2>Reports</h2>
+
+<p class="figure"><img src="images/preferences-reports.png"></p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Option</th><th>Description</th></tr>
+<tr><td>Save all errors when creating report</td><td>Also save hidden warnings
+    when you save the results to a file. By default only the visible warnings
+    are saved.</td></tr>
+<tr><td>Save full path to files in reports</td><td>Save the full path of each
+    file. By default the path relative to the project (or the <i>root
+    path</i>) is saved.</td></tr>
+</table>
+
+<p>See <a href="reports.html">Results files, printing and statistics</a>.</p>
+
+<h2>Language</h2>
+
+<p class="figure"><img src="images/preferences-language.png"></p>
+
+<p>The language of the user interface. The GUI is translated to several
+languages; select one and click <i>OK</i>. This help is only available in
+English.</p>
+
+<a name="addons"></a>
+<h2>Addons</h2>
+
+<p class="figure"><img src="images/preferences-addons.png"></p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Option</th><th>Description</th></tr>
+<tr><td>Python binary</td><td>The Python interpreter used to run addons. Leave
+    it empty to use the Python found in the PATH. If the file you enter does
+    not exist, a red warning is shown.</td></tr>
+<tr><td>MISRA rule texts file</td><td>A text file with the MISRA C rule texts,
+    used by the Misra addon to show the rule texts in the warnings. Cppcheck is
+    not allowed to distribute the rule texts, so you must create the file from
+    your copy of the MISRA C document. See
+    <a href="projectfiledialog.html#addons">Addons</a> for the format. This is
+    the same setting as <i>MISRA rule texts</i> in the project dialog.</td></tr>
+</table>
+
+<a name="clang"></a>
+<h2>Clang</h2>
+
+<p class="figure"><img src="images/preferences-clang.png"></p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Option</th><th>Description</th></tr>
+<tr><td>Clang path</td><td>The folder where <code>clang</code> and
+    <code>clang-tidy</code> are installed. Used by the Clang parser and by
+    Clang-Tidy (see <a href="projectfiledialog.html#analysis">Analysis</a> and
+    <a href="projectfiledialog.html#addons">External tools</a> in the project
+    dialog). Leave it empty to search the system PATH. On Windows, Clang is
+    also found in <code>C:\Program Files\LLVM\bin</code>.</td></tr>
+<tr><td>Visual Studio headers</td><td>Paths to the Visual Studio headers,
+    separated by semicolons. Clang needs them to parse code that uses the
+    Visual Studio libraries. To get the paths, open a Visual Studio command
+    prompt, type <code>SET INCLUDE</code> and copy/paste the paths.</td></tr>
+</table>
+
+<a name="codeeditor"></a>
+<h2>Code Editor</h2>
+
+<p class="figure"><img src="images/preferences-code-editor.png"></p>
+
+<p>The colors of the code view in the lower part of the main window.</p>
+<ul>
+<li><b>System Style</b>: use the colors of your desktop theme.</li>
+<li><b>Default Light Style</b>: dark text on a light background.</li>
+<li><b>Default Dark Style</b>: light text on a dark background.</li>
+<li><b>Custom</b>: your own colors. Click <i>Edit...</i> to choose the
+    foreground and background colors of the editor, the highlighted line and
+    the line numbers, and the color and font weight of keywords, class names,
+    strings, comments and symbols. A preview shows the result.</li>
+</ul>
+
+<p class="nav">Previous: <a href="tools.html">Scratchpad, library editor and
+other tools</a> | Next: <a href="commandline.html">Command line
+options</a></p>
 
 </body>
 </html>
diff --git a/gui/help/projectfiledialog.html b/gui/help/projectfiledialog.html
index 52b4eba444f..e357ebbc91d 100644
--- a/gui/help/projectfiledialog.html
+++ b/gui/help/projectfiledialog.html
@@ -1,179 +1,474 @@
 <html>
 <head>
-<title>Project File Dialog</title>
+<title>Project files</title>
+<link rel="stylesheet" type="text/css" href="style.css">
 </head>
 <body>
 
-<h1>Project File Dialog</h1>
+<h1>Project files</h1>
 
-<p>The <i>Project file</i> dialog contains 4 tabs:</p>
-<ul>
-<li>Paths and defines; paths to check and basic preprocessor settings.
-<li>Types and Functions; configuration of platform and 3rd party libraries
-<li>Analysis; analysis options
-<li>Warning options; formatting warnings, suppressing warnings, etc
-<li>Addons; extra analysis with addons
-</ul>
+<p>A project file (<code>*.cppcheck</code>) stores everything Cppcheck needs to
+know to analyze your code: which files to analyze, include paths, defines,
+libraries, platform, analysis options, suppressions, tags and addons. It is
+an XML file, so you can put it in version control and share it with your
+team. Paths in the project file are relative to the folder of the project
+file.</p>
 
-<h2>Paths and defines</h2>
+<p>Create a project with <i>File &gt; New Project File...</i> and change it
+with <i>File &gt; Edit Project File...</i>. Both open the <i>Project file</i>
+dialog described on this page. When you click <i>OK</i> the project file is
+saved and the analysis starts. Click <i>Cancel</i> to close the dialog without
+saving.</p>
 
-<p>It is recommended to import a project file.</p>
+<p>The dialog has five tabs:</p>
+<ul>
+<li><a href="#paths">Paths and Defines</a>: what code to analyze and the
+    preprocessor settings,</li>
+<li><a href="#types">Types and Functions</a>: the platform and the libraries
+    your code uses,</li>
+<li><a href="#analysis">Analysis</a>: the build dir, the parser and options
+    that control how deep the analysis is,</li>
+<li><a href="#warningoptions">Warning options</a>: root path, tags, excluded
+    files and suppressions,</li>
+<li><a href="#addons">Addons</a>: addons, coding standards and external
+    tools.</li>
+</ul>
 
-<h3> Import project</h3>
+<a name="paths"></a>
+<h2>Paths and Defines</h2>
+
+<p class="figure"><img src="images/projectfile-paths-and-defines.png"></p>
+
+<p>On this tab you tell Cppcheck what code to analyze. You can either import a
+project from your build system, or enter the paths, defines and include paths
+yourself. Importing is recommended: you get the exact include paths and
+defines that the compiler uses, and you do not have to update the Cppcheck
+project when the build changes.</p>
+
+<a name="import"></a>
+<h3>Import Project</h3>
+
+<p>Click <i>Browse...</i> to select the project to import. Supported
+formats:</p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Format</th><th>Notes</th></tr>
+<tr><td>Compile database<br><code>compile_commands.json</code></td>
+    <td>Contains the exact compiler command line of every source file. CMake
+    writes it when you configure with
+    <code>-DCMAKE_EXPORT_COMPILE_COMMANDS=ON</code>. Meson and Ninja write it
+    too, and for other build systems (for example make) you can create it
+    with tools such as <i>Bear</i>. When a compile database is imported, each
+    file is analyzed with just the configuration given on its command line.</td></tr>
+<tr><td>Visual Studio<br><code>*.sln</code>, <code>*.slnx</code>,
+    <code>*.vcxproj</code></td>
+    <td>Cppcheck reads the source files, include paths and defines of each
+    configuration (such as <code>Debug|Win32</code> or
+    <code>Release|x64</code>).</td></tr>
+<tr><td>Borland C++ Builder 6<br><code>*.bpr</code></td>
+    <td>&nbsp;</td></tr>
+</table>
+
+<p>Click the brush button next to the field to remove the import.</p>
+
+<p>When a project is imported, the <i>Paths</i>, <i>Include Paths</i> and
+<i>Undefines</i> fields are disabled because the information comes from the
+imported project. <i>Defines</i> and <i>Include file</i> can still be used;
+they are added to what the imported project says.</p>
+
+<p><b>Analyze all Visual Studio configurations</b> and <b>Selected VS
+Configurations</b>: only enabled when a Visual Studio solution or project is
+imported. A Visual Studio project usually has several configurations, and
+analyzing all of them takes time. Check <i>Analyze all Visual Studio
+configurations</i> to analyze every Debug and Release configuration.
+Otherwise check the configurations you want in the list. If you analyze
+several configurations of a file, warnings that are the same in all of them
+are only reported once.</p>
+
+<h3>Paths</h3>
+
+<p>The folders and files to analyze (only when no project is imported).
+Click <i>Add...</i> to add a folder, select a path and click <i>Edit</i> to
+change it, or <i>Remove</i> to remove it. All C and C++ source files in the
+folders and their subfolders are analyzed (<code>.c</code>,
+<code>.cpp</code>, <code>.cxx</code>, <code>.cc</code>, <code>.c++</code>,
+<code>.tpp</code>, <code>.txx</code>, <code>.ipp</code>, <code>.ixx</code>).
+Headers are analyzed when they are included from a source file.</p>
+
+<p>To leave out some files or folders, use <a href="#exclude">Exclude source
+files</a> on the <i>Warning options</i> tab.</p>
+
+<a name="defines"></a>
+<h3>Defines</h3>
+
+<p>Preprocessor macros that are defined for the analysis, like the
+<code>-D</code> option of a compiler. Separate them with semicolons, and give a
+value with <code>=</code>:</p>
+
+<pre>DEBUG;VERSION=5;WORD=int</pre>
+
+<p>To understand when you need defines, you need to know how Cppcheck handles
+preprocessor conditions. A compiler only sees one configuration of your code.
+Cppcheck instead tries to analyze all configurations. Look at this code:</p>
+
+<pre>#ifdef A
+    code1
+#endif
+#ifdef B
+    code2
+#endif</pre>
 
-Project to import. Cppcheck will get:
+<p>Cppcheck automatically analyzes the code both with and without
+<code>A</code> and <code>B</code> defined, so bugs in both <code>code1</code>
+and <code>code2</code> are found. You normally do not have to set defines. Use
+them when:</p>
 <ul>
-<li>What files to check
-<li>Preprocessor defines
-<li>Preprocessor include paths
-<li>Language standard if set
+<li>a macro must always be defined for the code to make sense, for example
+    a macro that your build system always sets,</li>
+<li>a macro has a value that matters, for example
+    <code>BUFFER_SIZE=1024</code>,</li>
+<li>Cppcheck reports a syntax error because a macro it does not know is used
+    in a way that only works when the macro is defined.</li>
 </ul>
 
-<h3>Paths (If you do not import project)</h3>
+<p>By default at most 12 configurations are analyzed for each file. If there
+are more, an <i>information</i> message tells you. Enable <i>Force checking
+all #ifdef configurations</i> in the <a href="preferences.html">preferences</a>
+to analyze all of them, which can take a long time.</p>
 
-<p>What paths to check.</p>
+<h3>Undefines</h3>
 
-<h3>Defines (If you do not import project)</h3>
+<p>Macros that must never be defined, like the <code>-U</code> option of a
+compiler. Separate them with semicolons:</p>
 
-<p>Cppcheck automatically checks the code with different preprocessor
-configurations.</p>
+<pre>A;C</pre>
 
-<blockquote><pre>#ifdef A
-code1
-#endif
-#ifdef B
-code2
-#endif</pre></blockquote>
+<p>In the example above, if <code>A</code> is undefined, Cppcheck does not
+analyze the configuration where <code>A</code> is defined. Use this for
+configurations that are never used, for example code for a platform you do not
+support. It makes the analysis faster and avoids warnings for code you do not
+care about.</p>
 
-<p>Cppcheck will automatically perform analysis both when A is defined and B is
-defined. So any bugs in both code1 and code2 will be detected.</p>
+<a name="includepaths"></a>
+<h3>Include Paths</h3>
 
-<p>If you want to configure that A will always be defined in Cppcheck analysis
-you can do that here.</p>
+<p>The folders where Cppcheck looks for header files that are included with
+<code>#include "..."</code> or <code>#include &lt;...&gt;</code>, like the
+<code>-I</code> option of a compiler. Folders are searched in the order of the
+list; use <i>Up</i> and <i>Down</i> to change the order.</p>
 
-<p>Defines are separated by semicolon. So you can for instance write:</p>
+<p>Add the folders of your own headers and of the headers of 3rd party
+libraries that are part of your project. Cppcheck needs them to know your
+types, macros, functions and classes. Without them, some bugs can not be found
+and you may get false warnings.</p>
 
-<blockquote><pre>A;B=3;C</pre></blockquote>
+<p>Do <b>not</b> add the folders of the standard library and system headers
+(for example <code>/usr/include</code> or the Visual Studio include
+folders). Cppcheck has built-in knowledge of the standard library and of the
+libraries you select on the <i>Types and Functions</i> tab, and analyzing the
+system headers makes the analysis slow and can cause wrong results. That is
+why the <i>missingIncludeSystem</i> information messages say that Cppcheck does
+not need the standard headers.</p>
 
-<h3>Undefines (If you do not import project)</h3>
+<h3>Include file</h3>
 
-<p>Cppcheck automatically checks the code with different preprocessor
-configurations.</p>
+<p>A header file that is included before every source file, like the
+<code>-include</code> option of GCC or <code>/FI</code> of Visual Studio. Use
+it if your build forces a header to be included, for example a configuration
+header with macros that all files need.</p>
 
-<blockquote><pre>#ifdef A
-code1
-#endif
-#ifdef B
-code2
-#endif</pre></blockquote>
+<a name="types"></a>
+<h2>Types and Functions</h2>
 
-<p>Cppcheck will automatically perform analysis both when A is defined and B is
-defined. So any bugs in both code1 and code2 will be detected.</p>
+<p class="figure"><img src="images/projectfile-types-and-functions.png"></p>
 
-<p>If you want to configure that A is never defined in Cppcheck analysis you
-can do that here.</p>
+<a name="platform"></a>
+<h3>Platform</h3>
 
-<p>Undefines are separated by semicolon. So you can for instance write:</p>
+<p>The platform decides the sizes of the basic types (<code>short</code>,
+<code>int</code>, <code>long</code>, <code>long long</code>, pointers,
+<code>size_t</code>, <code>wchar_t</code>) and whether <code>char</code> is
+signed. Cppcheck uses this, for example, to find integer overflows, buffer
+overruns with <code>sizeof</code> and portability problems.</p>
 
-<blockquote><pre>A;C</pre></blockquote>
+<p>Choose one of the built-in platforms:</p>
+<ul>
+<li><b>Native</b>: the computer you run Cppcheck on,</li>
+<li><b>Windows 32-bit ANSI</b>, <b>Windows 32-bit Unicode</b>,
+    <b>Windows 64-bit</b>,</li>
+<li><b>Unix 32-bit</b>, <b>Unix 64-bit</b>.</li>
+</ul>
 
-<h3>Include paths (If you do not import project)</h3>
+<p>For embedded targets and other special platforms, choose one of the
+platform files (<code>*.xml</code>) in the list, for example
+<code>avr8.xml</code>, <code>arm32-wchar_t2.xml</code> or
+<code>pic16.xml</code>. You can write your own platform file and put it in the
+folder of the project file; it then appears in the list. See the Cppcheck
+manual for the format.</p>
 
-<p>Specify include paths.</p>
+<p>If you leave the platform empty, the platform selected in the
+<i>Analyze</i> menu of the main window is used.</p>
 
-<h2>Types and Functions</h2>
+<a name="libraries"></a>
+<h3>Libraries</h3>
 
-<p>Cppcheck uses the <i>Platform</i> setting to determine size of
-short/int/long/pointer/etc.</p>
+<p>Check the libraries that your code uses. Each library has a configuration
+file (<code>.cfg</code>) that describes its functions, types and macros, for
+example:</p>
+<ul>
+<li>which functions allocate and free memory or other resources, so that
+    leaks and double frees can be found,</li>
+<li>which arguments must not be null or uninitialized, and which values are
+    valid,</li>
+<li>which functions never return (like <code>exit()</code>),</li>
+<li>which return values must be used,</li>
+<li>format strings, buffer sizes and so on.</li>
+</ul>
 
-<p>Check the libraries that you use in the <i>Libraries</i> listbox.</p>
+<p>The standard library (<code>std.cfg</code>) is always used. Some
+commonly used libraries are <i>posix</i> (Linux and Unix APIs),
+<i>windows</i> (Windows API), <i>gnu</i>, <i>qt</i>, <i>boost</i>,
+<i>wxwidgets</i>, <i>gtk</i>, <i>sdl</i>, <i>opengl</i>, <i>openssl</i>,
+<i>sqlite3</i> and <i>googletest</i>.</p>
 
+<p>If your code uses a library that is not in the list, or your own library,
+you can write a configuration file for it. Put the <code>.cfg</code> file in
+the same folder as the project file and it appears in the list. You can create
+and edit configuration files with the <a href="tools.html#libraryeditor">library
+editor</a>. Use <i>Analyze &gt; Reanalyze and check library</i> to find
+functions that are not configured.</p>
+
+<a name="analysis"></a>
 <h2>Analysis</h2>
 
+<p class="figure"><img src="images/projectfile-analysis.png"></p>
+
+<a name="builddir"></a>
 <h3>Cppcheck build dir</h3>
 
-<p>This is a work-folder that Cppcheck uses. Each Cppcheck project should have
-a separate build dir. It is used for:</p>
+<p>A work folder for Cppcheck. Each project needs its own build dir; do not
+share one build dir between projects. A new project automatically gets
+<code>&lt;name&gt;-cppcheck-build-dir</code> next to the project file. If the
+folder does not exist when the analysis starts, the GUI asks if it should
+create it.</p>
+
+<p>The build dir is optional, but strongly recommended. It is used for:</p>
 <ul>
-<li>whole program analysis
-<li>debug output
-<li>faster analysis (if a source file has changed check it, if source file is
-   not changed then reuse old results)
-<li>statistics
+<li><b>Incremental analysis</b>. Cppcheck stores the results of each file. When
+    you analyze again, files that have not changed (including the headers they
+    include) are not analyzed again; their stored results are used. This makes
+    the second analysis of a large project much faster.</li>
+<li><b>Whole program analysis</b>. Some checks need information from all
+    files, for example finding functions that are never called
+    (<i>unusedFunction</i>) or bugs where a value is passed from one file to a
+    function in another file. These checks are only run when there is a build
+    dir.</li>
+<li><b>Addons</b>. Addons (Misra, Y2038, Thread safety) and Clang-Tidy need a
+    build dir.</li>
+<li><b>Results history</b>. The results of the last analysis are saved
+    (<code>lastResults.xml</code>) and shown when you open the project. The
+    <i>Since date</i> column shows when each warning was first seen.</li>
+<li><b>Statistics</b> of previous analyses.</li>
 </ul>
 
+<p>Do not put the build dir in version control. <i>Edit &gt; Clear
+results</i> deletes the stored results in the build dir.</p>
+
 <h3>Parser</h3>
 
-<p>It is in general recommended to use Cppcheck parser. However you can choose
-to use Clang parser; Clang will be executed with a command line flag that tells
-it to dump its AST and Cppcheck will read that AST and convert it into a
-corresponding Cppcheck AST and use that.</p>
+<p><b>Cppcheck (built in)</b> is recommended. Cppcheck has its own parser that
+works well even if the code can not be compiled, if headers are missing or if
+the code uses compiler extensions.</p>
 
-<h3>Analysis</h3>
+<p><b>Clang (experimental)</b> uses Clang to parse the code. Clang is run with
+a flag that makes it write its abstract syntax tree (AST); Cppcheck reads this
+AST, converts it and runs its checks on it. Clang must be installed (see
+<a href="preferences.html#clang">Clang path</a> in the preferences), and the
+code must be correct enough for Clang to accept it. This is experimental and
+not all checks work as well as with the built in parser.</p>
 
-<p>Configure what kind of analysis you want.</p>
+<h3>Check level</h3>
 
-<p>The <i>Normal analysis</i> is recommended for most use cases. Especially if
-you use Cppcheck in CI.</p>
+<p>How much time Cppcheck may spend on the analysis. A higher level finds more
+bugs but takes longer.</p>
+<ul>
+<li><b>Reduced</b>: a limited and fast analysis, for when you want results
+    right away, for example while you are writing code.</li>
+<li><b>Normal</b>: the default. Meant for normal analysis in CI; it should
+    finish in reasonable time.</li>
+<li><b>Exhaustive</b>: a deeper analysis of the control flow and of values,
+    for nightly builds and similar. It can take much longer; up to 10 times
+    the compilation time is normal.</li>
+</ul>
 
-<p>The <i>Bug hunting</i> can be used if you really want to find a bug in your
-code and can invest time looking at bad results and providing extra
-configuration.</p>
+<h3>Analysis</h3>
 
-<h3>Limit analysis</h3>
+<p><b>Check that each class has a safe public interface</b>: normally Cppcheck
+only considers the values that are actually passed to a function. With this
+option, Cppcheck assumes that the arguments of public member functions can
+have <i>any</i> value, and warns if a function does not handle some value
+safely, even if no caller passes that value today. Use it if you want your
+classes to be robust against all possible use. It gives more warnings, and you
+must decide for each of them if it matters.</p>
 
-<p>You can turn off checking of headers. That could be interesting if Cppcheck
-is very slow. But normally, you should check the code in headers.</p>
+<h3>Limit analysis</h3>
 
-<p>It is possible to check the code in unused templates. However the Cppcheck
-AST will be incomplete/wrong. The recommendation is that you do not check
-unused templates to avoid wrong warnings. The templates will be checked
-properly when you do use them.</p>
+<p><b>Check code in headers</b>: should normally be on. If you turn it off,
+Cppcheck does not report warnings in the code of header files and skips some
+analysis of it. This can make the analysis much faster for code with large
+headers, but you will miss bugs in headers.</p>
 
-<p>Max CTU depth: How deep should the whole program analysis be. The risk with
-a &quot;too high&quot; value is that Cppcheck will be slow.</p>
+<p><b>Check code in unused templates</b>: should normally be on. If it is off,
+templates that are never instantiated are not analyzed. Cppcheck can not know
+the template arguments in unused templates, so the analysis of them is less
+precise. Templates that are used are always analyzed with the actual template
+arguments.</p>
 
-<p>Max recursion in template instantiation: Max recursion when Cppcheck
-instantiates templates. The risk with a &quot;too high&quot; value is that
-Cppcheck will be slow and can require much memory.</p>
+<p><b>Max CTU depth</b>: how deep the whole program analysis follows function
+calls between files (CTU means "cross translation unit"). A higher value finds
+bugs where values pass through more function calls, but makes the analysis
+slower. The default is 2.</p>
 
+<p><b>Max recursion in template instantiation</b>: how deep recursive templates
+are instantiated. Code that uses template metaprogramming can need a higher
+value. A high value can make the analysis slow and use a lot of memory. The
+default is 100.</p>
 
+<a name="warningoptions"></a>
 <h2>Warning options</h2>
 
+<p class="figure"><img src="images/projectfile-warning-options.png"></p>
+
+<a name="rootpath"></a>
 <h3>Root path</h3>
 
-<p>The root path for warnings. Cppcheck will strip away this part of the path
-from warnings. For instance if there is a warning in
-<pre>../myproject/foo/bar/file.cpp</pre> and the root path is 
-<pre>../myproject/foo</pre> then the path for the warning will be
-<pre>bar/file.cpp</pre>.</p>
+<p>File paths in warnings are shown relative to this path. If it is empty, the
+folder of the project file is used. For example, if a warning is in</p>
+<pre>../myproject/foo/bar/file.cpp</pre>
+<p>and the root path is</p>
+<pre>../myproject/foo</pre>
+<p>then the warning is shown for</p>
+<pre>bar/file.cpp</pre>
 
-<h3>Warning Tags</h3>
+<h3>Warning tags</h3>
 
-<p>Tags allow you to manually categorize warnings.</p>
+<p>Your own names for categories of warnings, separated by semicolons, for
+example <code>todo;false positive;fixed later</code>. When you have entered
+tags, you can right-click warnings and give them a tag. See
+<a href="tagging.html">Tagging warnings</a>. Only letters, digits and spaces
+are allowed in tag names.</p>
 
+<a name="exclude"></a>
 <h3>Exclude source files</h3>
 
-<p>Excluded source files will not be analyzed by Cppcheck.</p>
+<p>Files and folders that should not be analyzed. Use it for generated code,
+3rd party code that you do not maintain, test data and similar. Click
+<i>Exclude folder...</i> or <i>Exclude file...</i> to add entries, <i>Edit</i>
+to change the selected entry and <i>Remove</i> to remove it.</p>
 
+<p>Excluding works for imported projects too. Note that an excluded header is
+still read when it is included from a source file that is analyzed, because
+Cppcheck needs it to understand that source file.</p>
+
+<a name="suppressions"></a>
 <h3>Suppressions</h3>
 
-<p>List of suppressions. These warnings will not be shown.</p>
+<p>Warnings that should not be reported. Click <i>Add</i> to add a
+suppression; double-click a suppression to edit it, and click <i>Remove</i> to
+remove it.</p>
 
-<h2>Addons</h2>
+<p class="figure"><img src="images/new-suppression.png"></p>
+
+<p>A suppression has these fields:</p>
+<ul>
+<li><b>Error ID</b> (required): the id of the warning, for example
+    <code>nullPointer</code>. You can select it from the list or type it. Use
+    <code>*</code> to suppress all warnings (for example for some file).</li>
+<li><b>File name</b> (optional): only suppress the warning in this file. You
+    can use the wildcards <code>*</code> and <code>?</code>, for example
+    <code>src/generated/*</code>.</li>
+<li><b>Line number</b> (optional): only suppress the warning on this line.
+    This is fragile: when the code changes, the line number changes too.
+    Inline suppressions are better for single warnings.</li>
+<li><b>Symbol name</b> (optional): only suppress warnings about this
+    variable, function or other symbol.</li>
+</ul>
+
+<p>You can also add suppressions from the results list with the context menu.
+See <a href="suppressions.html">Hiding and suppressing warnings</a>.</p>
 
-<p><b>Y2038</b><br>32-bit timers that count number of seconds since 1970 will
-overflow in year 2038. Check that the code does not use such timers.</p>
+<h3>Enable inline suppressions</h3>
 
-<p><b>Thread safety</b><br>Check that the code is thread safe</p>
+<p>When this is checked, comments in the code like</p>
+<pre>// cppcheck-suppress nullPointer</pre>
+<p>suppress warnings. See <a href="suppressions.html#inline">Inline
+suppressions</a>.</p>
 
-<p><b>MISRA</b><br>Ensure that the MISRA coding standard is followed. Please
-note you need to have a textfile with the misra rule texts to get proper
-warning messages. Cppcheck is not legally allowed to distribute the misra
-rule texts.</p>
+<a name="addons"></a>
+<h2>Addons</h2>
 
-<p><b>Clang-tidy</b><br>Run Clang-tidy</p>
+<p class="figure"><img src="images/projectfile-addons.png"></p>
+
+<p>Addons are extra checkers, written in Python, that run after the normal
+analysis. Addons need Python to be installed (see <i>Python binary</i> in the
+<a href="preferences.html#addons">preferences</a>) and the project must have a
+<a href="#builddir">build dir</a>. If an addon can not be found, it is shown as
+<i>(Not found)</i> and can not be selected.</p>
+
+<h3>Addons</h3>
+
+<p><b>Y2038</b>: on many 32-bit systems <code>time_t</code> is a signed 32-bit
+integer that counts seconds since 1970. It overflows on 19 January 2038. This
+addon warns about code that uses such 32-bit time values.</p>
+
+<p><b>Thread safety</b>: warns about code that is not safe to use from several
+threads, for example local static variables and calls to functions that are
+not thread safe.</p>
+
+<h3>Coding standards</h3>
+
+<p><b>Misra C</b>: checks the code against the MISRA C guidelines, a coding
+standard for safety critical C code. Open source Cppcheck has a Misra addon
+that does not cover all rules.</p>
+
+<p>The MISRA rule texts are copyrighted and Cppcheck is not allowed to
+distribute them. Without them, Misra warnings only show the rule number. To
+get the rule texts in the warnings, buy the MISRA C document, copy the text of
+Appendix A "Summary of guidelines" to a text file, and select that file in
+<i>MISRA rule texts</i>. The file should look like this:</p>
+<pre>Appendix A Summary of guidelines
+Rule 1.1
+Text of rule 1.1
+Rule 1.2
+Text of rule 1.2</pre>
+<p>The rule text file is a user setting; it is not stored in the project
+file.</p>
+
+<p><b>Misra C++</b>, <b>Cert C</b>, <b>Cert C++</b>, <b>Autosar</b> and
+<b>Safety profiles</b> are only available in Cppcheck Premium. Cppcheck
+Premium also lets you choose the version of Misra C (2012, 2023 or 2025) and
+Misra C++ (2008 or 2023). For Cert C you can give the precision of
+<code>int</code>, which is used for rule INT35-C if the precision is not the
+same as the size.</p>
+
+<h3>Bug hunting (Premium)</h3>
+
+<p>A very deep analysis that tries to find all bugs of some kinds, at the cost
+of more false warnings and a longer analysis. Only available in Cppcheck
+Premium.</p>
+
+<h3>External tools</h3>
+
+<p><b>Clang-Tidy</b>: also run Clang-Tidy on the code and show its warnings
+together with the Cppcheck warnings. Clang-Tidy must be installed. It is
+searched for in the <a href="preferences.html#clang">Clang path</a> from the
+preferences, or in the system PATH. If it is not found, the checkbox shows
+<i>(not found)</i>. Use the <i>Clang</i> button in the severity toolbar to show
+or hide the Clang-Tidy results.</p>
+
+<p class="nav">Previous: <a href="standalone-analysis.html">Analyzing without a
+project</a> | Next: <a href="investigating-warnings.html">Investigating
+warnings</a></p>
 
 </body>
 </html>
-
diff --git a/gui/help/reports.html b/gui/help/reports.html
new file mode 100644
index 00000000000..7f9b0ab6124
--- /dev/null
+++ b/gui/help/reports.html
@@ -0,0 +1,125 @@
+<html>
+<head>
+<title>Results files, printing and statistics</title>
+<link rel="stylesheet" type="text/css" href="style.css">
+</head>
+<body>
+
+<h1>Results files, printing and statistics</h1>
+
+<a name="save"></a>
+<h2>Saving results</h2>
+
+<p>Select <i>File &gt; Save results to file...</i> (Ctrl+S) or click the save
+button in the toolbar. Choose a file name and a format:</p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Format</th><th>Contents</th></tr>
+<tr><td>XML files (*.xml)</td><td>All information about each warning: file,
+    line, column, severity, id, CWE, message, notes, tags and more. This is
+    the same XML format (version 2) as the command line tool writes with
+    <code>--xml</code>. The GUI can open it again, and many other tools, for
+    example CI systems and report generators, can read it. Use this format if
+    you want to keep the results.</td></tr>
+<tr><td>Text files (*.txt)</td><td>One line per warning, in the classic
+    Cppcheck text format:<br>
+    <code>[src/buffer.c:9] -&gt; [src/buffer.c:10]: (error) Array 'buf[16]'
+    accessed at index 16, which is out of bounds.</code><br>
+    The locations of the notes are listed first, connected with
+    <code>-&gt;</code>.</td></tr>
+<tr><td>CSV files (*.csv)</td><td>One line per warning with the columns file,
+    line, severity, id and summary. Open it in a spreadsheet to sort, count
+    and filter warnings.</td></tr>
+</table>
+
+<p>Two preferences on the <a href="preferences.html">Reports tab</a> affect
+what is saved:</p>
+<ul>
+<li><b>Save all errors when creating report</b>: also save warnings that are
+    hidden. By default only the warnings you can see are saved, so you can use
+    the severity buttons, the quick filter and hiding to choose what goes in
+    the report.</li>
+<li><b>Save full path to files in reports</b>: save the full path of each
+    file instead of the path relative to the project.</li>
+</ul>
+
+<a name="open"></a>
+<h2>Opening results</h2>
+
+<p>Select <i>File &gt; Open XML...</i> to open a results file in XML format.
+The current results are cleared first. The file can come from the GUI or from
+the command line tool, for example from a CI job:</p>
+
+<pre>cppcheck --project=compile_commands.json --xml 2&gt; results.xml</pre>
+
+<p>When results are opened from a file, the GUI needs to find the source files
+to show the code. If the paths in the file are relative, the GUI asks for the
+folder they are relative to when you select a warning. You can also give the
+folder on the command line with the <code>-d</code> option; see
+<a href="commandline.html">Command line options</a>.</p>
+
+<p>XML files in the old version 1 format can not be opened. Use
+<code>--xml</code> with a recent Cppcheck version to create files in the
+version 2 format.</p>
+
+<p>For results opened from a file, the code can not be analyzed again with
+<i>Recheck</i>, because the GUI does not know how it was analyzed.</p>
+
+<a name="print"></a>
+<h2>Printing</h2>
+
+<p>Select <i>File &gt; Print...</i> (Ctrl+P) to print the results, or <i>File
+&gt; Print Preview...</i> to see what will be printed first. The printout has
+one line per warning with the file, line, severity and summary. Like saved
+reports, only the warnings you can see are printed. You can print to a PDF
+file if your system has a PDF printer.</p>
+
+<a name="statistics"></a>
+<h2>Statistics</h2>
+
+<p>Select <i>View &gt; Statistics</i> to see statistics about the project and
+the last analysis. Enable <i>Show statistics on check completion</i> in the
+<a href="preferences.html">preferences</a> to show the statistics
+automatically after each analysis.</p>
+
+<p>The statistics dialog has these tabs:</p>
+
+<h3>Project</h3>
+<p>The root path of the project, the paths that are analyzed, the include
+paths, the defines and the undefines.</p>
+<p class="figure"><img src="images/statistics-project.png"></p>
+
+<h3>Previous Scan</h3>
+<p>The path that was analyzed, the number of files and how long the analysis
+took.</p>
+<p class="figure"><img src="images/statistics-previous-scan.png"></p>
+
+<h3>Statistics</h3>
+<p>The number of warnings of each severity, and the number of active
+checkers.</p>
+<p class="figure"><img src="images/statistics-statistics.png"></p>
+
+<h3>Checkers</h3>
+<p>A report of which checkers were active in the analysis and which were not.
+Use it to see what was checked, for example to document the analysis for a
+safety certification.</p>
+
+<h3>History</h3>
+<p>A chart of the number of warnings over time, read from the build dir of the
+project. Only available if the GUI was built with Qt Charts and the project
+has a build dir.</p>
+
+<p>Click <i>Copy to Clipboard</i> to copy the statistics as text and HTML, for
+example to paste them in an e-mail or a document. Click <i>Pdf Export</i> to
+save them as a PDF file.</p>
+
+<p class="note"><b>Note:</b> the statistics count the warnings of the last
+analysis in this session. When you open a project with a build dir, the
+results of the previous session are shown, but they are not counted until you
+analyze again.</p>
+
+<p class="nav">Previous: <a href="tagging.html">Tagging warnings</a> |
+Next: <a href="tools.html">Scratchpad, library editor and other tools</a></p>
+
+</body>
+</html>
diff --git a/gui/help/severities.html b/gui/help/severities.html
index 791c78c68e6..7e9f9e66d5d 100644
--- a/gui/help/severities.html
+++ b/gui/help/severities.html
@@ -1,47 +1,188 @@
 <html>
 <head>
-<title>Severities</title>
+<title>Severities and report types</title>
+<link rel="stylesheet" type="text/css" href="style.css">
 </head>
 <body>
 
-<h1>Severities</h1>
+<h1>Severities and report types</h1>
 
-<h2>error</h2>
+<p>Every warning has a <i>severity</i> that tells you what kind of problem it
+is and how serious it is. The severity is shown in the <i>Severity</i> column
+and as an icon in the results list. Use the buttons in the severity toolbar,
+or the <i>View</i> menu, to show or hide each severity.</p>
 
-<img src="images/severities-error.png"><br>
-<p>when code is executed there is some bad behavior (undefined behavior, leak)</p>
+<h2><img src="images/severities-error.png"> error</h2>
 
-<h2>warning</h2>
+<p>The code has a bug that causes bad behavior when it is executed: undefined
+behavior, a crash, a memory or resource leak, and similar. Errors should
+always be fixed.</p>
 
-<img src="images/severities-warning.png"><br>
-<p>when code is executed there might be undefined behavior</p>
+<p>Examples: array index out of bounds (<code>arrayIndexOutOfBounds</code>),
+null pointer dereference (<code>nullPointer</code>), use of an uninitialized
+variable (<code>uninitvar</code>), memory leak (<code>memleak</code>), resource
+leak (<code>resourceLeak</code>), use after free
+(<code>deallocuse</code>), division by zero (<code>zerodiv</code>),
+mismatching allocation and deallocation (<code>mismatchAllocDealloc</code>).</p>
 
-<h2>style</h2>
+<pre>void f()
+{
+    char buf[10];
+    buf[10] = 0;     // error: arrayIndexOutOfBounds
+}</pre>
 
-<img src="images/severities-style.png"><br>
-<p>point out possible mistakes, and suggest more defensive programming. Examples:
+<h2><img src="images/severities-warning.png"> warning</h2>
+
+<p>The code can cause bad behavior in some situations, or there is code that is
+almost certainly not doing what the programmer wanted. Warnings should be
+looked at carefully; most of them are bugs.</p>
+
+<p>Examples: a null pointer check after the pointer has already been used
+(<code>nullPointerRedundantCheck</code>), not checking the result of
+<code>malloc()</code> (<code>nullPointerOutOfMemory</code>), wrong argument type
+for a printf format (<code>invalidPrintfArgType_sint</code>), assignment in a
+condition where a comparison was meant, a member variable that is not
+initialized in a constructor (<code>uninitMemberVar</code>).</p>
+
+<pre>void f(struct S *s)
+{
+    int x = s-&gt;x;
+    if (!s)          // warning: nullPointerRedundantCheck
+        return;
+}</pre>
+
+<h2><img src="images/severities-style.png"> style</h2>
+
+<p>The code is not wrong, but it can be improved: it is confusing, redundant,
+or not as safe as it could be. Style warnings often point to real bugs, for
+example a condition that is always true can mean that the wrong variable is
+used. They also suggest more defensive programming.</p>
+
+<p>Examples:</p>
+<ul>
+<li>unused variables, functions and code (<code>unusedVariable</code>,
+    <code>unreadVariable</code>, <code>unusedFunction</code>),</li>
+<li>conditions that are always true or false
+    (<code>knownConditionTrueFalse</code>),</li>
+<li>variables, parameters and member functions that can be const
+    (<code>constVariable</code>, <code>constParameterPointer</code>,
+    <code>functionConst</code>),</li>
+<li>the scope of a variable can be reduced (<code>variableScope</code>),</li>
+<li>duplicate code in if/else branches (<code>duplicateBranch</code>),</li>
+<li>suspicious operator precedence (<code>clarifyCalculation</code>).</li>
+</ul>
+
+<pre>int f(int x)
+{
+    if (x &gt; 0 &amp;&amp; x &gt; 10)   // style: the first condition is redundant
+        return 1;
+    return 0;
+}</pre>
+
+<h2><img src="images/severities-performance.png"> performance</h2>
+
+<p>Suggestions to make the code faster. They are based on common knowledge
+about what is slow. It is not certain that you get a measurable speed
+improvement by fixing them; it depends on how often the code runs.</p>
+
+<p>Examples: passing a large object by value instead of by const reference
+(<code>passedByValue</code>), using <code>it++</code> instead of
+<code>++it</code> for iterators (<code>postfixOperator</code>), inefficient use
+of STL containers.</p>
+
+<pre>void print(std::vector&lt;std::string&gt; names);   // performance: passedByValue</pre>
+
+<h2><img src="images/severities-portability.png"> portability</h2>
+
+<p>The code may work on your platform but not on others: implementation
+defined behavior, 64-bit problems, or undefined behavior that happens to work
+"as you want" with your compiler.</p>
+
+<p>Examples: storing a pointer in an <code>int</code>
+(<code>AssignmentAddressToInteger</code>), shifting a negative value, casting
+between incompatible pointer types (<code>invalidPointerCast</code>), assuming
+the size of a type.</p>
+
+<p>Some portability warnings depend on the platform you have selected; see
+<a href="projectfiledialog.html#platform">Platform</a>.</p>
+
+<h2><img src="images/severities-information.png"> information</h2>
+
+<p>Messages about the analysis itself, not about your code. If you get
+information messages, your code may be fine but the Cppcheck configuration can
+be improved. Fixing the configuration usually gives better results.</p>
+
+<p>Examples:</p>
 <ul>
-  <li>unused code/variables/functions
-  <li>conditions that are always true/false
-  <li>constness
-  <li>operator precedence
+<li><code>missingInclude</code>: an include file of your project was not
+    found. Add the folder to the <a href="projectfiledialog.html#includepaths">
+    include paths</a>.</li>
+<li><code>missingIncludeSystem</code>: a standard or system header was not
+    found. This is normal and you do not need to do anything; Cppcheck has
+    built-in knowledge of the standard library. You can hide these with the
+    severity toolbar or suppress the id.</li>
+<li><code>toomanyconfigs</code>: a file has more preprocessor configurations
+    than Cppcheck analyzes by default. See
+    <a href="projectfiledialog.html#defines">Defines</a>.</li>
+<li><code>normalCheckLevelMaxBranches</code>: the analysis of a function was
+    limited. Use the <i>Exhaustive</i> check level to analyze it fully.</li>
+<li>messages from <i>Analyze &gt; Reanalyze and check library</i> about
+    functions that are not configured.</li>
 </ul>
-</p>
 
-<h2>performance</h2>
+<h2>note</h2>
 
-<img src="images/severities-performance.png"><br>
-<p>Suggestions for making the code faster. These suggestions are only based on common knowledge. It is not certain you'll get any measurable difference in speed by fixing these messages.</p>
+<p>Notes are not warnings. They are shown as child items of a warning and
+explain the path through the code that leads to it. See
+<a href="investigating-warnings.html">Investigating warnings</a>.</p>
 
-<h2>portability</h2>
+<a name="reports"></a>
+<h2>Report types</h2>
+
+<p>If you work with a coding standard, you can show the results classified
+according to that standard. Select the standard in <i>View &gt; Report</i>:</p>
+
+<p class="figure"><img src="images/menu-view-report.png"></p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Report</th><th>Classifications</th><th>Extra columns</th></tr>
+<tr><td>Normal</td><td>The Cppcheck severities described above.</td>
+    <td>&nbsp;</td></tr>
+<tr><td>Autosar</td><td>Required, Advisory</td>
+    <td>Classification, Guideline</td></tr>
+<tr><td>Cert C, Cert C++</td><td>L1, L2, L3 (the CERT priority levels; L1 is
+    the most severe)</td><td>Level, Rule</td></tr>
+<tr><td>Misra C, Misra C++ 2023</td><td>Mandatory, Required, Advisory</td>
+    <td>Classification, Guideline</td></tr>
+<tr><td>Misra C++ 2008</td><td>Required, Advisory, Document</td>
+    <td>Classification, Guideline</td></tr>
+</table>
+
+<p>With a compliance report type:</p>
+<ul>
+<li>Each warning is mapped to the guideline or rule of the standard that it
+    relates to. The <i>Guideline</i> or <i>Rule</i> column shows it, and the
+    <i>Classification</i> or <i>Level</i> column shows how strict the
+    guideline is.</li>
+<li>The icons and the buttons in the severity toolbar follow the
+    classification: Mandatory and L1 use the error icon, Required and L2 the
+    warning icon, Advisory and L3 the style icon, and Document the
+    information icon.</li>
+<li>Warnings that are not related to any guideline of the standard are not
+    shown.</li>
+</ul>
 
-<img src="images/severities-portability.png"><br>
-<p>portability warnings. Implementation defined behavior. 64-bit portability. Some undefined behavior that probably works &quot;as you want&quot;. etc.</p>
+<p class="figure"><img src="images/report-misra.png"></p>
 
-<h2>information</h2>
+<p>The report type only changes how results are shown; the analysis is the
+same. To check the code against the rules of a coding standard, enable the
+standard on the <a href="projectfiledialog.html#addons">Addons</a> tab of the
+project. Open source Cppcheck has a Misra C addon; checking the other
+standards needs Cppcheck Premium.</p>
 
-<img src="images/severities-information.png"><br>
-<p>Configuration problems. If you get such output then your code is ok but your cppcheck configuration could be improved.</p>
+<p class="nav">Previous: <a href="investigating-warnings.html">Investigating
+warnings</a> | Next: <a href="suppressions.html">Hiding and suppressing
+warnings</a></p>
 
 </body>
 </html>
diff --git a/gui/help/standalone-analysis.html b/gui/help/standalone-analysis.html
index ad7fae5fe55..bf7cc0096b3 100644
--- a/gui/help/standalone-analysis.html
+++ b/gui/help/standalone-analysis.html
@@ -1,17 +1,125 @@
-
 <html>
 <head>
-<title>Standalone analysis</title>
+<title>Analyzing without a project</title>
+<link rel="stylesheet" type="text/css" href="style.css">
 </head>
 <body>
 
-<h1>Standalone analysis</h1>
+<h1>Analyzing without a project</h1>
+
+<p>You can analyze code quickly without creating a project file. This is
+useful to try Cppcheck, or to look at a few files. For regular use a project
+is better: with a properly configured project Cppcheck knows your include
+paths, defines and libraries, and the analysis is more accurate. You also get
+features that need a project, such as saved suppressions, tags and the build
+dir. See <a href="projectfiledialog.html">Project files</a>.</p>
+
+<p class="note">If a project is open, close it first with <i>File &gt; Close
+Project File</i>. The GUI does not let you analyze files or folders while a
+project is open.</p>
+
+<h2>Analyzing files</h2>
+
+<p>Select <i>Analyze &gt; Files...</i> (Ctrl+F) and select one or more source
+files. The analysis starts at once.</p>
+
+<p>In the same file dialog you can also select a project of your build
+system. Cppcheck then analyzes the files of that project with its include
+paths and defines, just as if you had imported it in a project file:</p>
+<ul>
+<li>a compile database (<code>compile_commands.json</code>),</li>
+<li>a Visual Studio solution (<code>*.sln</code>, <code>*.slnx</code>) or
+    project (<code>*.vcxproj</code>). For a solution, a dialog asks which
+    configuration (for example <code>Debug|x64</code>) to analyze,</li>
+<li>a Borland C++ Builder 6 project (<code>*.bpr</code>).</li>
+</ul>
+
+<h2>Analyzing a directory</h2>
+
+<p>Select <i>Analyze &gt; Directory...</i> (Ctrl+D) and select a folder.
+Cppcheck analyzes all source files in the folder and its subfolders. Files
+with these extensions are analyzed: <code>.c</code>, <code>.cpp</code>,
+<code>.cxx</code>, <code>.cc</code>, <code>.c++</code>, <code>.tpp</code>,
+<code>.txx</code>, <code>.ipp</code> and <code>.ixx</code>.</p>
+
+<p>Header files are not analyzed on their own. The code in a header is
+analyzed when a source file includes it, as long as Cppcheck can find the
+header.</p>
+
+<p>If the folder contains a Cppcheck project file, the GUI asks if you want to
+open that project instead. If there are several project files, it asks if you
+want to continue without them.</p>
+
+<h2>Which settings are used</h2>
+
+<p>Without a project, the analysis uses:</p>
+<ul>
+<li>the <a href="preferences.html">preferences</a>: number of threads,
+    <i>Force checking all #ifdef configurations</i>, <i>Enable inline
+    suppressions</i>, <i>Check for inconclusive errors also</i>,</li>
+<li>the settings in the <i>Analyze</i> menu: the C and C++ standard, the
+    language (auto-detect, enforce C or enforce C++) and the platform.</li>
+</ul>
+
+<p>The <i>Analyze</i> menu settings are remembered when you close the GUI.</p>
+
+<h3>Language standard</h3>
+
+<p><i>Analyze &gt; C standard</i> and <i>Analyze &gt; C++ standard</i> select
+the language version. It affects how some code is parsed and which checks
+apply. For example, some functions are deprecated in newer standards, and
+some library functions only exist in newer standards.</p>
+
+<h3>Language</h3>
+
+<p>With <i>Auto-detect language</i> the file extension decides if a file is C
+or C++. Choose <i>Enforce C</i> or <i>Enforce C++</i> to treat all files as
+one language.</p>
+
+<h3>Platform</h3>
+
+<p>The platform decides the size of the basic types (<code>short</code>,
+<code>int</code>, <code>long</code>, pointers, <code>wchar_t</code> and so on)
+and whether <code>char</code> is signed. Choose the platform the code will run
+on:</p>
+<ul>
+<li><b>Native</b>: the computer you run Cppcheck on.</li>
+<li><b>Unix 32-bit</b> / <b>Unix 64-bit</b>: Linux, BSD, macOS and similar
+    on 32-bit or 64-bit processors.</li>
+<li><b>Windows 32-bit ANSI</b> / <b>Windows 32-bit Unicode</b>: 32-bit
+    Windows. In the ANSI variant the Windows "T" macros and types such as
+    <code>TCHAR</code> and <code>_tcscpy</code> mean the <code>char</code>
+    versions; in the Unicode variant they mean the <code>wchar_t</code>
+    versions.</li>
+<li><b>Windows 64-bit</b>: 64-bit Windows, with Unicode.</li>
+</ul>
+
+<h2>Limitations</h2>
+
+<p>Without a project:</p>
+<ul>
+<li>There are no include paths, so Cppcheck may not find your own headers. You
+    will see <i>information</i> messages about missing includes, and some
+    warnings can be missing because types and macros are unknown.</li>
+<li>Suppressions made with the context menu can not be saved. The warnings
+    disappear from the list but are reported again in the next analysis. Use
+    inline suppressions in the code instead, or create a project. See
+    <a href="suppressions.html">Hiding and suppressing warnings</a>.</li>
+<li>Warnings can not be tagged.</li>
+<li>There is no build dir. Every analysis analyzes all files, the <i>Since
+    date</i> column is not available, and checks that need whole program
+    analysis, such as unused functions, are not run.</li>
+<li>Addons and coding standards (Misra, Cert, ...) can not be used.</li>
+</ul>
+
+<h2>Analyzing again</h2>
 
-<p>It is possible to quickly analyze files. Open the <i>Analyze</i> menu and click on
-either <i>Files...</i> or <i>Directory...</i>.</p>
+<p>After you change the code, use <i>Analyze &gt; Reanalyze modified files</i>
+(Ctrl+R) to analyze the files that changed, or <i>Reanalyze all files</i> to
+analyze everything again.</p>
 
-<p>It is recommended that you create a project for analysis. A properly configured
-project will give you better analysis.</p>
+<p class="nav">Previous: <a href="mainwindow.html">The main window</a> |
+Next: <a href="projectfiledialog.html">Project files</a></p>
 
 </body>
 </html>
diff --git a/gui/help/style.css b/gui/help/style.css
new file mode 100644
index 00000000000..126f42f3fe7
--- /dev/null
+++ b/gui/help/style.css
@@ -0,0 +1,68 @@
+/* Stylesheet for the Cppcheck GUI help. Qt's help browser only supports a
+   subset of CSS, so keep this simple. */
+
+body {
+    font-family: sans-serif;
+    margin: 8px;
+}
+
+h1 {
+    color: #1f4e79;
+    font-size: x-large;
+}
+
+h2 {
+    color: #1f4e79;
+    font-size: large;
+    margin-top: 20px;
+}
+
+h3 {
+    color: #2e75b6;
+    font-size: medium;
+    margin-top: 14px;
+}
+
+pre {
+    background-color: #f3f3f3;
+    font-family: monospace;
+    margin-left: 16px;
+}
+
+code {
+    font-family: monospace;
+}
+
+table.options {
+    border-collapse: collapse;
+    border-color: #c8c8c8;
+    border-style: solid;
+}
+
+table.options th {
+    background-color: #e4ecf5;
+    padding: 4px;
+    text-align: left;
+}
+
+table.options td {
+    padding: 4px;
+    vertical-align: top;
+}
+
+p.note {
+    background-color: #fff8dc;
+}
+
+p.tip {
+    background-color: #eaf5ea;
+}
+
+p.nav {
+    color: #707070;
+    font-size: small;
+}
+
+p.figure {
+    margin-left: 16px;
+}
diff --git a/gui/help/suppressions.html b/gui/help/suppressions.html
new file mode 100644
index 00000000000..2baf18c318b
--- /dev/null
+++ b/gui/help/suppressions.html
@@ -0,0 +1,158 @@
+<html>
+<head>
+<title>Hiding and suppressing warnings</title>
+<link rel="stylesheet" type="text/css" href="style.css">
+</head>
+<body>
+
+<h1>Hiding and suppressing warnings</h1>
+
+<p>There are several ways to get rid of warnings you do not want to see. They
+differ in how long they last and where they are stored:</p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Method</th><th>Lasts</th><th>Stored in</th><th>Best for</th></tr>
+<tr><td><a href="#hide">Hide</a></td><td>Until the next analysis</td>
+    <td>Nowhere</td><td>Getting warnings out of the way while you work</td></tr>
+<tr><td><a href="#severity">Severity buttons and filter</a></td>
+    <td>Until you change them</td><td>GUI settings</td>
+    <td>Concentrating on some kinds of warnings</td></tr>
+<tr><td><a href="#suppress">Suppress from the context menu</a></td>
+    <td>Permanent</td><td>Project file</td>
+    <td>Turning off a kind of warning for the whole project</td></tr>
+<tr><td><a href="#projectsuppressions">Suppressions in the project dialog</a></td>
+    <td>Permanent</td><td>Project file</td>
+    <td>Suppressions for some files, lines or symbols</td></tr>
+<tr><td><a href="#inline">Inline suppressions</a></td><td>Permanent</td>
+    <td>Source code</td><td>A single false warning</td></tr>
+<tr><td><a href="#exclude">Excluding files</a></td><td>Permanent</td>
+    <td>Project file</td><td>Code you do not want to analyze at all</td></tr>
+</table>
+
+<p>The difference between <b>hiding</b> and <b>suppressing</b>: a hidden warning
+comes back the next time you analyze the code. A suppressed warning is not
+reported again until you remove the suppression.</p>
+
+<a name="hide"></a>
+<h2>Hiding warnings</h2>
+
+<p>Select one or more warnings, right-click and choose <i>Hide N
+result(s)</i>. To hide all warnings with the same id as the selected warning,
+choose <i>Hide all with id</i>.</p>
+
+<p class="figure"><img src="images/context-menu.png"></p>
+
+<p>Hidden warnings are not deleted. Use <i>View &gt; Show hidden</i> to show
+them again. They are also shown again after the next analysis.</p>
+
+<p>By default, hidden warnings are not saved when you save the results to a
+file. Enable <i>Save all errors when creating report</i> in the
+<a href="preferences.html">preferences</a> to save them too.</p>
+
+<a name="severity"></a>
+<h2>Severity buttons and the quick filter</h2>
+
+<p>The buttons in the severity toolbar show or hide all warnings of a
+severity, and the quick filter shows only warnings that contain some text. See
+<a href="mainwindow.html">The main window</a>. These do not change the results;
+they only change what you see.</p>
+
+<a name="suppress"></a>
+<h2>Suppressing from the context menu</h2>
+
+<p>Select one or more warnings, right-click and choose <i>Suppress selected
+id(s)</i>. All warnings with the ids of the selected warnings are removed from
+the list, and a suppression for each id is added to the project file. The
+warnings are not reported in future analyses.</p>
+
+<p class="note"><b>Note:</b> this suppresses the id in <b>all files</b> of the
+project, not only the selected warning. If you only want to suppress one
+warning, use an <a href="#inline">inline suppression</a>, or add a suppression
+with a file name or line number in the project dialog.</p>
+
+<p>This only works when a project is open. Without a project the warnings are
+removed from the list, but nothing is saved. Critical errors, such as syntax
+errors, can not be suppressed this way.</p>
+
+<a name="projectsuppressions"></a>
+<h2>Suppressions in the project dialog</h2>
+
+<p>Open <i>File &gt; Edit Project File...</i> and go to the <i>Warning
+options</i> tab. The <i>Suppressions</i> list shows all suppressions of the
+project, including the ones made with the context menu.</p>
+
+<p class="figure"><img src="images/new-suppression.png"></p>
+
+<p>Click <i>Add</i> to add a suppression. You must give the <b>Error ID</b>;
+the other fields make the suppression more specific:</p>
+<ul>
+<li><b>File name</b>: only in files that match. Wildcards <code>*</code> and
+    <code>?</code> can be used, for example <code>src/legacy/*</code>.</li>
+<li><b>Line number</b>: only on this line of the file.</li>
+<li><b>Symbol name</b>: only for warnings about this variable or
+    function.</li>
+</ul>
+
+<p>Some examples:</p>
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Error ID</th><th>File name</th><th>Line</th><th>Effect</th></tr>
+<tr><td><code>unusedFunction</code></td><td>&nbsp;</td><td>&nbsp;</td>
+    <td>No unused function warnings at all, for example for a library whose
+    functions are called by other programs.</td></tr>
+<tr><td><code>*</code></td><td><code>src/generated/*</code></td><td>&nbsp;</td>
+    <td>No warnings in generated code (but the code is still analyzed).</td></tr>
+<tr><td><code>nullPointer</code></td><td><code>src/io.c</code></td>
+    <td>120</td><td>No null pointer warning on line 120 of
+    <code>src/io.c</code>.</td></tr>
+</table>
+
+<p>Double-click a suppression to edit it, or select it and click
+<i>Remove</i> to remove it. After you click <i>OK</i>, the project is analyzed
+again.</p>
+
+<a name="inline"></a>
+<h2>Inline suppressions</h2>
+
+<p>An inline suppression is a comment in the source code, just before the line
+with the warning, or at the end of that line:</p>
+
+<pre>void f()
+{
+    char *p = get_buffer();
+    // cppcheck-suppress nullPointer
+    *p = 0;
+
+    *p = 1; // cppcheck-suppress nullPointer
+}</pre>
+
+<p>You can suppress several ids at once, and add a comment that explains
+why:</p>
+
+<pre>// cppcheck-suppress[nullPointer,uninitvar] get_buffer() never returns NULL</pre>
+
+<p>Inline suppressions are the best way to suppress a single false warning:
+they stay with the code when it is moved, and the next person who reads the
+code sees that the warning was looked at. See the Cppcheck manual for more
+forms, for example suppressing a whole block or file.</p>
+
+<p>Inline suppressions must be enabled:</p>
+<ul>
+<li>for a project, with <i>Enable inline suppressions</i> on the <i>Warning
+    options</i> tab of the project dialog (enabled by default for new
+    projects),</li>
+<li>without a project, with <i>Enable inline suppressions</i> in the
+    <a href="preferences.html">preferences</a>.</li>
+</ul>
+
+<a name="exclude"></a>
+<h2>Excluding files</h2>
+
+<p>To not analyze some files or folders at all, add them to <i>Exclude source
+files</i> on the <i>Warning options</i> tab of the project dialog. See
+<a href="projectfiledialog.html#exclude">Exclude source files</a>.</p>
+
+<p class="nav">Previous: <a href="severities.html">Severities and report
+types</a> | Next: <a href="tagging.html">Tagging warnings</a></p>
+
+</body>
+</html>
diff --git a/gui/help/tagging.html b/gui/help/tagging.html
index 7ac4e7ee8d9..4f0a86452ea 100644
--- a/gui/help/tagging.html
+++ b/gui/help/tagging.html
@@ -1,22 +1,68 @@
 <html>
 <head>
 <title>Tagging warnings</title>
+<link rel="stylesheet" type="text/css" href="style.css">
 </head>
 <body>
 
 <h1>Tagging warnings</h1>
 
-<p>You can manually categorize warnings.</p>
+<p>Tags let you categorize warnings by hand. You choose the names of the tags
+yourself. Some ideas:</p>
+<ul>
+<li>a review status: <code>todo</code>, <code>checked</code>,
+    <code>fixed later</code>,</li>
+<li>your opinion of the warning: <code>bug</code>, <code>false
+    positive</code>, <code>not important</code>,</li>
+<li>who should look at it: <code>frontend</code>, <code>network</code>,
+    <code>team b</code>.</li>
+</ul>
 
-<p>You choose the names of the categories yourself in the project file
-dialog.</p>
+<p>Unlike suppressions, tags do not remove warnings. They are a way to keep
+track of what you have looked at and what you have decided about each
+warning.</p>
 
-<p>If tag names are configured, then you can tag the warnings by
-right-clicking on them and selecting the proper tag in the
-context menu.</p>
+<h2>Defining tags</h2>
 
-<p>Tags are saved in the project file and will be permanent.</p>
+<p>Open <i>File &gt; Edit Project File...</i>, go to the <i>Warning options</i>
+tab and enter the tag names in <i>Warning tags</i>, separated by semicolons:</p>
+
+<pre>todo;false positive;fixed later</pre>
+
+<p class="figure"><img src="images/projectfile-warning-options.png"></p>
+
+<p>Tag names can contain letters, digits and spaces. Tags need a project; there
+are no tags when you analyze without a project.</p>
+
+<h2>Tagging warnings</h2>
+
+<p>Select one or more warnings, right-click, open the <i>Tag</i> submenu and
+choose a tag. Choose <i>No tag</i> to remove the tag. The <i>Tag</i> submenu is
+only shown if the project has tags.</p>
+
+<p class="figure"><img src="images/context-menu-tag.png"></p>
+
+<p>The tag is shown in the <i>Tags</i> column. Click the column header to sort
+the warnings by tag, so that warnings with the same tag are listed
+together.</p>
+
+<h2>Where tags are stored</h2>
+
+<p>The tags you give to warnings are saved in the project file at once. Each
+tagged warning is identified by a hash of the warning and the code of the
+function it is in, so the tag stays with the warning when code elsewhere in
+the file changes or lines are added above the function. If the function itself
+is changed, the warning gets a new hash and the tag is lost. That is
+intended: when the code has changed, the warning should be looked at
+again.</p>
+
+<p>Because the tags are in the project file, everyone who uses the project file
+sees the same tags. Tags are also included when you save the results as
+XML.</p>
+
+<p class="nav">Previous: <a href="suppressions.html">Hiding and suppressing
+warnings</a> | Next: <a href="reports.html">Results files, printing and
+statistics</a></p>
 
 </body>
 </html>
-
diff --git a/gui/help/tools.html b/gui/help/tools.html
new file mode 100644
index 00000000000..6301283bbd0
--- /dev/null
+++ b/gui/help/tools.html
@@ -0,0 +1,146 @@
+<html>
+<head>
+<title>Scratchpad, library editor and other tools</title>
+<link rel="stylesheet" type="text/css" href="style.css">
+</head>
+<body>
+
+<h1>Scratchpad, library editor and other tools</h1>
+
+<a name="scratchpad"></a>
+<h2>Scratchpad</h2>
+
+<p>The scratchpad lets you analyze a piece of code without saving it in a file.
+Use it to try out how Cppcheck handles some code, to reduce a false warning to
+a small example before you report it, or to check a code snippet from a
+review.</p>
+
+<p>Open it with <i>View &gt; Show Scratchpad...</i>.</p>
+
+<p class="figure"><img src="images/scratchpad.png"></p>
+
+<ol>
+<li>Type or paste C or C++ code in the editor.</li>
+<li>Optionally enter a file name. It is mainly used to decide the language:
+    <code>test.c</code> is analyzed as C and <code>test.cpp</code> as C++. If
+    you leave it empty, the code is analyzed as C++.</li>
+<li>Click <i>Check</i>.</li>
+</ol>
+
+<p>The results are shown in the results list of the main window, and they
+replace the results that were shown before. The code is analyzed with the
+settings of the open project, or with the settings of the <i>Analyze</i> menu
+if no project is open. The code can not include your own headers, since it is
+not stored in a file.</p>
+
+<p>The scratchpad keeps its text while the GUI is running, so you can change
+the code and click <i>Check</i> again.</p>
+
+<a name="libraryeditor"></a>
+<h2>Library editor</h2>
+
+<p>A library configuration file (<code>.cfg</code>) tells Cppcheck how the
+functions of a library behave. Cppcheck comes with configurations for many
+libraries (see <a href="projectfiledialog.html#libraries">Libraries</a>). For
+your own libraries, or libraries that have no configuration, you can write one
+yourself. The library editor helps you with the function part of the
+configuration.</p>
+
+<p>Open it with <i>View &gt; Library Editor...</i>.</p>
+
+<p class="figure"><img src="images/library-editor.png"></p>
+
+<h3>Working with files</h3>
+
+<p>Click <i>Open</i> to load an existing <code>.cfg</code> file, <i>Save</i>
+to save your changes and <i>Save as</i> to save to a new file. To start a new
+configuration, add functions and click <i>Save as</i>.</p>
+
+<p>Save your configuration in the folder of your project file. It then
+appears in the <i>Libraries</i> list on the <i>Types and Functions</i> tab of
+the project dialog, where you can select it.</p>
+
+<p>The editor only shows the functions of a configuration. Other parts of the
+file, such as memory and resource allocation functions, defines and types, are
+kept when you save. If a file contains elements that the editor does not know,
+it can not be opened in the editor; use a text editor for such files.</p>
+
+<h3>Functions</h3>
+
+<p>The list on the left shows the functions of the configuration. Type in
+<i>Filter</i> to show only functions whose names contain the text. Click
+<i>Sort</i> to sort the list by name.</p>
+
+<p>Click <i>Add</i> to add a function. Enter the function name and the number
+of arguments. If several functions have the same properties, you can enter
+their names separated by commas; they then share one entry.</p>
+
+<p>Select a function to see and change its properties:</p>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Property</th><th>Meaning</th></tr>
+<tr><td>Comments</td><td>Your notes about the function. They are saved as
+    an XML comment before the function in the file.</td></tr>
+<tr><td>noreturn</td><td><i>True</i> if the function never returns, like
+    <code>exit()</code> or a fatal error handler. Then Cppcheck knows that the
+    code after a call is not reached. <i>False</i> if it always returns.
+    <i>Unknown</i> if it depends.</td></tr>
+<tr><td>return value must be used</td><td>Warn if the return value is ignored,
+    for example for functions that return an error code or a new object.</td></tr>
+<tr><td>ignore function in leaks checking</td><td>The function does not take
+    ownership of a pointer that is passed to it. Without this, Cppcheck may
+    assume that the function frees or stores the memory, and stop tracking a
+    possible leak.</td></tr>
+<tr><td>Arguments</td><td>The properties of each argument. Select an argument
+    and click <i>Edit</i> to change them.</td></tr>
+</table>
+
+<h3>Argument properties</h3>
+
+<table class="options" border="1" cellspacing="0" cellpadding="4" width="100%">
+<tr><th>Property</th><th>Meaning</th></tr>
+<tr><td>Not bool</td><td>A boolean value (for example the result of a
+    comparison) is wrong for this argument. Typical for pointers and
+    sizes.</td></tr>
+<tr><td>Not null</td><td>A null pointer must not be passed.</td></tr>
+<tr><td>Not uninit</td><td>The value must be initialized. For pointers this
+    means the data it points at is read by the function.</td></tr>
+<tr><td>String</td><td>The argument must be a zero terminated string.</td></tr>
+<tr><td>Format string</td><td>The argument is a printf style format string;
+    the following arguments are checked against it.</td></tr>
+<tr><td>Min size of buffer</td><td>The minimum size of the buffer that is
+    passed. <i>argvalue</i>: the value of another argument (for example the
+    size argument of <code>memset</code>); <i>mul</i>: the product of two
+    arguments; <i>strlen</i>: the length of a string argument.</td></tr>
+<tr><td>Valid values</td><td>The values that are allowed, for example
+    <code>0:</code> (zero or more), <code>1:255</code> or
+    <code>0,2:5</code>. Cppcheck warns if another value can be passed.</td></tr>
+</table>
+
+<p>For all features of the configuration format, see the Cppcheck manual and
+the files in the <code>cfg</code> folder of the Cppcheck installation. You can
+edit <code>.cfg</code> files in a text editor too.</p>
+
+<p>To find which functions in your code are not configured yet, use
+<i>Analyze &gt; Reanalyze and check library</i>; see
+<a href="troubleshooting.html#checklibrary">Checking the library
+configuration</a>.</p>
+
+<a name="threads"></a>
+<h2>Thread details</h2>
+
+<p><i>View &gt; Thread Details</i> shows what each analysis thread is doing:
+the file it analyzes, when it started on the file and how far it has come.
+Use it to find files that take a long time to analyze. If one file takes very
+long, you can for example exclude it, reduce the number of configurations with
+<a href="projectfiledialog.html#defines">undefines</a>, or use a lower check
+level.</p>
+
+<p>The number of threads is set in the <a href="preferences.html">
+preferences</a>.</p>
+
+<p class="nav">Previous: <a href="reports.html">Results files, printing and
+statistics</a> | Next: <a href="preferences.html">Preferences</a></p>
+
+</body>
+</html>
diff --git a/gui/help/troubleshooting.html b/gui/help/troubleshooting.html
new file mode 100644
index 00000000000..b9b4cd99ef9
--- /dev/null
+++ b/gui/help/troubleshooting.html
@@ -0,0 +1,190 @@
+<html>
+<head>
+<title>Troubleshooting</title>
+<link rel="stylesheet" type="text/css" href="style.css">
+</head>
+<body>
+
+<h1>Troubleshooting</h1>
+
+<p>Answers to common questions and problems.</p>
+
+<h2>I get many "Include file not found" messages</h2>
+
+<p>There are two kinds:</p>
+<ul>
+<li><b>missingIncludeSystem</b>: a standard or system header, such as
+    <code>&lt;stdio.h&gt;</code> or <code>&lt;vector&gt;</code>, was not found.
+    This is normal. Cppcheck does not need these headers, because it knows the
+    standard library and the libraries you select in the project. Hide the
+    <i>information</i> severity, or suppress the id
+    <code>missingIncludeSystem</code> in the project.</li>
+<li><b>missingInclude</b>: one of your own headers was not found. Fix this:
+    add the folder of the header to the <a href="projectfiledialog.html#includepaths">
+    include paths</a> of the project, or import the project from your build
+    system so that Cppcheck gets the same include paths as the compiler.</li>
+</ul>
+
+<p>Use <i>Analyze &gt; Check configuration (defines, includes)</i> to get a
+list of the configuration problems of the project.</p>
+
+<h2>Cppcheck reports a syntax error or an unknown macro</h2>
+
+<p>Cppcheck does not analyze a file it can not parse. A message like <i>There
+is an unknown macro here somewhere. Configuration is required.</i> means that
+the code uses a macro that Cppcheck does not know, in a place where the code
+can not be parsed without knowing what the macro means. For example:</p>
+
+<pre>DECLARE_HANDLER(foo)    // what is this?
+{
+    ...
+}</pre>
+
+<p>To fix it, do one of these:</p>
+<ul>
+<li>add the include path of the header that defines the macro,</li>
+<li>select the library that the macro belongs to (for example <i>qt</i> for
+    <code>Q_OBJECT</code> and <code>signals</code>, or <i>windows</i> for the
+    Windows API macros),</li>
+<li>give the macro a value in <a href="projectfiledialog.html#defines">
+    Defines</a>, for example <code>DECLARE_HANDLER(x)=void x()</code>, or in a
+    library configuration file.</li>
+</ul>
+
+<p>If the code is correct and compiles, but Cppcheck still reports a syntax
+error, please report it as a Cppcheck bug.</p>
+
+<h2>The analysis is slow</h2>
+
+<ul>
+<li>Use a <a href="projectfiledialog.html#builddir">build dir</a>. Then
+    unchanged files are not analyzed again.</li>
+<li>Increase the <i>Number of threads</i> in the
+    <a href="preferences.html">preferences</a>.</li>
+<li>Use the <i>Reduced</i> or <i>Normal</i> check level instead of
+    <i>Exhaustive</i>.</li>
+<li>Make sure that <i>Force checking all #ifdef configurations</i> is off in
+    the preferences.</li>
+<li>Use <a href="projectfiledialog.html#defines">undefines</a> to skip
+    configurations you do not need, or import a compile database: then each
+    file is analyzed with one configuration only.</li>
+<li>Do not add system include folders (such as <code>/usr/include</code>) to
+    the include paths.</li>
+<li><a href="projectfiledialog.html#exclude">Exclude</a> generated code and
+    3rd party code.</li>
+<li>Use <i>View &gt; Thread Details</i> to find files that take long; see
+    <a href="tools.html#threads">Thread details</a>.</li>
+</ul>
+
+<h2>A warning is wrong (false positive)</h2>
+
+<p>First check the configuration: missing include paths and missing library
+configurations are common causes. For example, if your code calls a function
+that never returns and Cppcheck does not know that, it can report problems in
+code that is never reached. Configure the function as <i>noreturn</i> in a
+library configuration (see <a href="tools.html#libraryeditor">Library
+editor</a>).</p>
+
+<p>If the configuration is right, suppress the warning (see
+<a href="suppressions.html">Hiding and suppressing warnings</a>) and please
+report the false positive to the Cppcheck project with a small code example.
+Use the <a href="tools.html#scratchpad">scratchpad</a> to make the example as
+small as possible.</p>
+
+<h2>A bug that I know of is not found</h2>
+
+<ul>
+<li>Check that the severity of the warning is shown in the severity toolbar,
+    that the quick filter is empty, that no warnings are hidden (<i>View &gt;
+    Show hidden</i>) and that <i>View &gt; Report</i> is <i>Normal</i>.</li>
+<li>Check that the file was analyzed: look in the <i>Analysis Log</i>.</li>
+<li>Check that the code was analyzed with the right configuration. If the
+    code is in an <code>#ifdef</code> block, it may only be analyzed when a
+    macro is defined.</li>
+<li>Select the libraries that the code uses, so that Cppcheck knows how their
+    functions behave.</li>
+<li>Try the <i>Exhaustive</i> check level and enable inconclusive warnings in
+    the preferences.</li>
+<li>Bugs that span several files need a build dir (whole program
+    analysis).</li>
+</ul>
+
+<p>Cppcheck can not find all bugs. If you think the bug should be found,
+create a small example in the scratchpad and report it to the Cppcheck
+project.</p>
+
+<a name="checklibrary"></a>
+<h2>Checking the library configuration</h2>
+
+<p>Select <i>Analyze &gt; Reanalyze and check library</i>. The project is
+analyzed again, and Cppcheck reports <i>information</i> messages for functions
+it has no configuration for, for example:</p>
+<ul>
+<li><code>checkLibraryNoReturn</code>: Cppcheck does not know if the function
+    can return. Configure <i>noreturn</i> for it.</li>
+<li><code>checkLibraryFunction</code>: the function is not configured at all.
+    If it is a library function, configure it so that Cppcheck can check how it
+    is used.</li>
+</ul>
+
+<p>Write the missing configuration in a <code>.cfg</code> file with the
+<a href="tools.html#libraryeditor">library editor</a> or a text editor, put it
+in the folder of the project file and select it on the <i>Types and
+Functions</i> tab of the project.</p>
+
+<h2>Addons do not work</h2>
+
+<ul>
+<li>Addons are Python scripts. Install Python, and if it is not in the PATH,
+    set the <i>Python binary</i> in the <a href="preferences.html#addons">
+    preferences</a>.</li>
+<li>The project needs a <a href="projectfiledialog.html#builddir">build
+    dir</a>. Without it, the analysis is stopped with the message <i>To check
+    the project using addons, you need a build directory</i>.</li>
+<li>If an addon is shown as <i>(Not found)</i> in the project dialog, the
+    Cppcheck installation is incomplete.</li>
+</ul>
+
+<h2>Clang-Tidy is "not found"</h2>
+
+<p>Install Clang-Tidy (it is part of LLVM/Clang). If it is not in the PATH, set
+the <a href="preferences.html#clang">Clang path</a> in the preferences to the
+folder where <code>clang-tidy</code> is.</p>
+
+<h2>Double-clicking a warning does nothing</h2>
+
+<p>No editor is configured, or no default editor is selected. Add your editor
+on the <a href="preferences.html#applications">Applications</a> tab of the
+preferences and click <i>Set as default</i>. If the editor does not start,
+check the executable path and the parameters.</p>
+
+<h2>The results are old</h2>
+
+<p>When you open a project with a build dir, the results of the last analysis
+are shown, not a new analysis. Click <i>Reanalyze all files</i> to analyze the
+current code.</p>
+
+<h2>"Failed to load std.cfg"</h2>
+
+<p>The GUI can not find its data files. The Cppcheck installation is broken;
+reinstall Cppcheck. If you built Cppcheck yourself, make sure the
+<code>cfg</code> folder is installed next to the program, or configure the data
+folder with the <code>--data-dir</code> <a href="commandline.html">command line
+option</a>.</p>
+
+<h2>Where can I get more help?</h2>
+
+<ul>
+<li>The Cppcheck manual:
+    <a href="https://cppcheck.sourceforge.io/manual.pdf">https://cppcheck.sourceforge.io/manual.pdf</a></li>
+<li>The Cppcheck home page:
+    <a href="https://cppcheck.sourceforge.io/">https://cppcheck.sourceforge.io/</a></li>
+<li>The bug tracker:
+    <a href="https://trac.cppcheck.net/">https://trac.cppcheck.net/</a></li>
+</ul>
+
+<p class="nav">Previous: <a href="commandline.html">Command line options</a> |
+Back to <a href="index.html">Contents</a></p>
+
+</body>
+</html>
diff --git a/gui/help/walkthrough.html b/gui/help/walkthrough.html
index 9f27ce05f6c..dbaff99a073 100644
--- a/gui/help/walkthrough.html
+++ b/gui/help/walkthrough.html
@@ -1,69 +1,156 @@
 <html>
 <head>
-<title>Walk through</title>
+<title>Getting started</title>
+<link rel="stylesheet" type="text/css" href="style.css">
 </head>
 <body>
 
-<h1>Quick walk through</h1>
+<h1>Getting started</h1>
 
-This is a quick and short walk through to get you started.
+<p>This page walks you through a first analysis: you create a project file,
+run the analysis and look at the results. It takes a few minutes. The other
+pages in this help explain each step in more detail.</p>
 
-<h2>Step 1: Create a project.</h2>
+<h2>Step 1: Create a project file</h2>
 
-<p>Create a new project:</p>
+<p>Select <i>File &gt; New Project File...</i> (Ctrl+Shift+N). A file dialog
+asks where to save the project file. Save it in the root folder of your code,
+for example next to your <code>CMakeLists.txt</code> or Visual Studio
+solution. Paths in the project file are stored relative to the project file,
+so the project keeps working if you move the whole folder or check it into
+version control.</p>
 
-<blockquote><img src="images/walkthrough-new-project.png"></blockquote>
+<p>When you have chosen a file name, the <i>Project file</i> dialog opens. A
+new project automatically gets a <i>build dir</i> called
+<code>&lt;name&gt;-cppcheck-build-dir</code>. Cppcheck stores its work files
+there; it makes repeated analysis much faster and is required for some
+features. See <a href="projectfiledialog.html#builddir">Cppcheck build dir</a>.</p>
 
-<p>In the <i>Paths and Defines</i> tab, it is recommended that you import your
-project file at the top.</p>
+<h2>Step 2: Tell Cppcheck where the code is</h2>
 
-<blockquote><img src="images/walkthrough-import-project.png"></blockquote>
+<p>Open the <i>Paths and Defines</i> tab. You have two choices.</p>
 
-<p>In the <i>Types and Functions</i> tab, try to activate all 3rd party
-libraries you use (windows, posix, ...).</p>
+<h3>Choice A: Import a project (recommended)</h3>
 
-<blockquote><img src="images/walkthrough-library.png"></blockquote>
+<p>If you build your code with Visual Studio, CMake, Meson, Bear or any other
+tool that can produce a compile database, import it. Click <i>Browse...</i>
+next to <i>Import Project</i> and select one of:</p>
+<ul>
+<li>a Visual Studio solution (<code>*.sln</code>, <code>*.slnx</code>) or
+    project (<code>*.vcxproj</code>),</li>
+<li>a compile database (<code>compile_commands.json</code>). CMake creates it
+    if you configure with <code>-DCMAKE_EXPORT_COMPILE_COMMANDS=ON</code>,</li>
+<li>a Borland C++ Builder 6 project (<code>*.bpr</code>).</li>
+</ul>
 
-<p>In the <i>Analysis</i> tab, leave the default settings to start with.</p>
+<p>Cppcheck then reads the list of source files, the include paths, the
+preprocessor defines and the language standard from the imported file. The
+<i>Paths</i>, <i>Include Paths</i> and <i>Undefines</i> fields are disabled
+because the values come from the imported project.</p>
 
-<p>In the <i>Warnings options</i> tab, leave the default settings to start
-with.</p>
+<p class="figure"><img src="images/projectfile-import.png"></p>
 
-<p>In the <i>Addons</i> tab, leave the default settings to start with.</p>
+<h3>Choice B: Enter the paths yourself</h3>
 
+<p>If you can not import a project, enter the information manually:</p>
+<ul>
+<li><b>Paths</b>: click <i>Add...</i> and select the folders (or files) to
+    analyze. Cppcheck analyzes all C/C++ source files in these folders and
+    their subfolders.</li>
+<li><b>Include Paths</b>: add the folders where your own header files are.
+    Cppcheck needs your headers to understand types, macros and functions.
+    You do not need to add the standard library or system headers; Cppcheck
+    has built-in knowledge about them.</li>
+<li><b>Defines</b>: optionally enter macros, for example
+    <code>DEBUG;VERSION=3</code>.</li>
+</ul>
 
-<h2>Step 2: Analyze code.</h2>
+<p class="figure"><img src="images/projectfile-paths-and-defines.png"></p>
 
-<p>When the project file has been created, the analysis will start
-automatically.</p>
+<h2>Step 3: Select libraries</h2>
 
-<p>While analysis is performed in the background, you can investigate the
-results.</p>
+<p>Open the <i>Types and Functions</i> tab. In the <i>Libraries</i> list,
+check the libraries your code uses, for example <i>posix</i>, <i>windows</i>,
+<i>qt</i>, <i>boost</i>, <i>gtk</i> or <i>sdl</i>. A library configuration tells
+Cppcheck how the functions and types in that library behave: which functions
+allocate memory, which arguments must not be null, which functions never
+return, and so on. This gives you more and better warnings.</p>
 
-<blockquote><img src="images/walkthrough-analysis.png"></blockquote>
+<p>Set the <i>Platform</i> to the target of your code if it differs from the
+computer you run Cppcheck on. This matters for portability and overflow
+checks, since the sizes of <code>int</code>, <code>long</code> and pointers
+differ between platforms.</p>
 
+<p class="figure"><img src="images/projectfile-types-and-functions.png"></p>
 
-<h2>Step 3: Investigate warnings.</h2>
+<h2>Step 4: Leave the rest as it is</h2>
 
-<p>In the toolbar you choose what types of warnings you want to see
-(error/warning/style/performance/portability/information).</p>
+<p>The <i>Analysis</i>, <i>Warning options</i> and <i>Addons</i> tabs have good
+default values. You can come back later and change them; see
+<a href="projectfiledialog.html">Project files</a> for a description of every
+option.</p>
 
-<blockquote><img src="images/walkthrough-toolbar-severities.png"></blockquote>
+<p>Click <i>OK</i>. The project file is saved. If the build dir does not exist
+yet, the GUI asks if it should create it: answer <i>Yes</i>.</p>
 
+<h2>Step 5: Watch the analysis</h2>
 
-<p>All warnings are shown in a list. If you select a warning in the list, then
-details about that warning is shown.</p>
+<p>The analysis starts immediately. A progress bar above the results shows
+how many files have been analyzed. You do not have to wait: warnings appear
+in the list as soon as they are found, and you can start looking at them.
+To stop the analysis, click the <i>Stop</i> button in the toolbar or press
+Esc.</p>
 
-<p>If you right click on warning(s) then you get a context menu.</p>
+<h2>Step 6: Look at the results</h2>
 
-<blockquote><img src="images/walkthrough-warning-menu.png"></blockquote>
+<p>The results list groups the warnings by file. Click the arrow next to a
+file name, or use <i>View &gt; Expand all</i>, to see the warnings. Click a
+warning to show its details and the source code in the lower part of the
+window. The line with the problem is highlighted.</p>
 
-<p>The difference of &quot;Hide&quot; and &quot;Suppress&quot; is that
-suppressions are saved in the project file. The suppressed warnings will not be
-shown again unless you remove the suppression. When you hide a warning then
-they will be temporarily hidden; the next time you analyze your code these
-warnings will be shown again.</p>
+<p class="figure"><img src="images/main-window.png"></p>
+
+<p>Some warnings have an arrow in front of them. Expand them to see
+<i>notes</i>: these show the path through the code that leads to the
+problem, for example where a variable got the value that later causes the
+bug. Click a note to jump to that line.</p>
+
+<p>Use the colored buttons in the toolbar to show or hide warnings by
+severity. Start with errors and warnings; they are the most likely to be
+real bugs. See <a href="severities.html">Severities</a>.</p>
+
+<p class="figure"><img src="images/toolbar.png"></p>
+
+<p>Right-click a warning to get more options: open the file in your editor,
+copy the warning, hide it, suppress it or tag it.</p>
+
+<p class="figure"><img src="images/context-menu.png"></p>
+
+<p>Read <a href="investigating-warnings.html">Investigating warnings</a> to
+learn how to work efficiently with the results.</p>
+
+<h2>Step 7: Fix the code and analyze again</h2>
+
+<p>Fix the bugs in your editor. Then click <i>Reanalyze all files</i> in the
+toolbar. Because the project has a build dir, Cppcheck only does the full
+analysis again for files that changed (or that include a changed header). For
+the other files the results are taken from the build dir, so this is
+fast.</p>
+
+<p>If you do not agree with a warning, you can suppress it so that it is not
+shown again. See <a href="suppressions.html">Hiding and suppressing
+warnings</a>.</p>
+
+<h2>Next time</h2>
+
+<p>The project files you used recently are listed in the <i>File</i> menu.
+When you open a project that has a build dir, the GUI first shows the results
+from the last analysis. Click <i>Reanalyze all files</i> in the toolbar to
+analyze the code again. Thanks to the build dir, files that did not change
+are not analyzed again; their old results are reused.</p>
+
+<p class="nav">Previous: <a href="index.html">Cppcheck GUI</a> |
+Next: <a href="mainwindow.html">The main window</a></p>
 
 </body>
 </html>
-
diff --git a/gui/helpdialog.cpp b/gui/helpdialog.cpp
index db1125339b9..bef304c5471 100644
--- a/gui/helpdialog.cpp
+++ b/gui/helpdialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 #include "helpdialog.h"
 
 #include "common.h"
+#include "utils.h"
 
 #include "ui_helpdialog.h"
 
@@ -65,7 +66,7 @@ static QString getHelpFile()
     paths << (filesdir + "/help")
           << filesdir;
 #endif
-    for (const QString &p: paths) {
+    for (const QString &p: utils::as_const(paths)) {
         QString filename = p + "/online-help.qhc";
         if (QFileInfo::exists(filename))
             return filename;
@@ -83,7 +84,7 @@ HelpDialog::HelpDialog(QWidget *parent) :
     if (helpFile.isEmpty()) {
         const QString msg = tr("Helpfile '%1' was not found").arg("online-help.qhc");
         QMessageBox msgBox(QMessageBox::Warning,
-                           tr("Cppcheck"),
+                           "Cppcheck",
                            msg,
                            QMessageBox::Ok,
                            this);
diff --git a/gui/helpdialog.h b/gui/helpdialog.h
index da80f61ca02..4f592f5c7f6 100644
--- a/gui/helpdialog.h
+++ b/gui/helpdialog.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@
 #include <QDialog>
 #include <QObject>
 #include <QTextBrowser>
-#include <QVariant>
 
 class QHelpEngine;
 class QWidget;
diff --git a/gui/images/accessories-text-editor.png b/gui/images/accessories-text-editor.png
new file mode 100644
index 00000000000..c3d245dece9
Binary files /dev/null and b/gui/images/accessories-text-editor.png differ
diff --git a/gui/images/accessories-text-editor@2x.png b/gui/images/accessories-text-editor@2x.png
new file mode 100644
index 00000000000..4f98e727f4b
Binary files /dev/null and b/gui/images/accessories-text-editor@2x.png differ
diff --git a/gui/images/accessories-text-editor@3x.png b/gui/images/accessories-text-editor@3x.png
new file mode 100644
index 00000000000..a7ac91dbdca
Binary files /dev/null and b/gui/images/accessories-text-editor@3x.png differ
diff --git a/gui/images/applications-development@2x.png b/gui/images/applications-development@2x.png
new file mode 100644
index 00000000000..ffa971cf026
Binary files /dev/null and b/gui/images/applications-development@2x.png differ
diff --git a/gui/images/applications-development@3x.png b/gui/images/applications-development@3x.png
new file mode 100644
index 00000000000..c6af10a8c8c
Binary files /dev/null and b/gui/images/applications-development@3x.png differ
diff --git a/gui/images/applications-system@2x.png b/gui/images/applications-system@2x.png
new file mode 100644
index 00000000000..f4c85d6bf08
Binary files /dev/null and b/gui/images/applications-system@2x.png differ
diff --git a/gui/images/applications-system@3x.png b/gui/images/applications-system@3x.png
new file mode 100644
index 00000000000..d3e4bea5dd1
Binary files /dev/null and b/gui/images/applications-system@3x.png differ
diff --git a/gui/images/dialog-error@2x.png b/gui/images/dialog-error@2x.png
new file mode 100644
index 00000000000..7b35ae62b8f
Binary files /dev/null and b/gui/images/dialog-error@2x.png differ
diff --git a/gui/images/dialog-error@3x.png b/gui/images/dialog-error@3x.png
new file mode 100644
index 00000000000..bd56f682ca0
Binary files /dev/null and b/gui/images/dialog-error@3x.png differ
diff --git a/gui/images/dialog-information@2x.png b/gui/images/dialog-information@2x.png
new file mode 100644
index 00000000000..e5d60dfad0e
Binary files /dev/null and b/gui/images/dialog-information@2x.png differ
diff --git a/gui/images/dialog-information@3x.png b/gui/images/dialog-information@3x.png
new file mode 100644
index 00000000000..bd265a75c58
Binary files /dev/null and b/gui/images/dialog-information@3x.png differ
diff --git a/gui/images/dialog-warning@2x.png b/gui/images/dialog-warning@2x.png
new file mode 100644
index 00000000000..e4060e0d85f
Binary files /dev/null and b/gui/images/dialog-warning@2x.png differ
diff --git a/gui/images/dialog-warning@3x.png b/gui/images/dialog-warning@3x.png
new file mode 100644
index 00000000000..c9fb58eba39
Binary files /dev/null and b/gui/images/dialog-warning@3x.png differ
diff --git a/gui/images/edit-clear@2x.png b/gui/images/edit-clear@2x.png
new file mode 100644
index 00000000000..d3ac583ba79
Binary files /dev/null and b/gui/images/edit-clear@2x.png differ
diff --git a/gui/images/edit-clear@3x.png b/gui/images/edit-clear@3x.png
new file mode 100644
index 00000000000..0d9b8b928ca
Binary files /dev/null and b/gui/images/edit-clear@3x.png differ
diff --git a/gui/images/folder.png b/gui/images/folder.png
new file mode 100644
index 00000000000..01f45b82aa5
Binary files /dev/null and b/gui/images/folder.png differ
diff --git a/gui/images/folder@2x.png b/gui/images/folder@2x.png
new file mode 100644
index 00000000000..dc42da0508f
Binary files /dev/null and b/gui/images/folder@2x.png differ
diff --git a/gui/images/folder@3x.png b/gui/images/folder@3x.png
new file mode 100644
index 00000000000..0145b776055
Binary files /dev/null and b/gui/images/folder@3x.png differ
diff --git a/gui/images/go-down@2x.png b/gui/images/go-down@2x.png
new file mode 100644
index 00000000000..963fec7711e
Binary files /dev/null and b/gui/images/go-down@2x.png differ
diff --git a/gui/images/go-down@3x.png b/gui/images/go-down@3x.png
new file mode 100644
index 00000000000..7423b6ad889
Binary files /dev/null and b/gui/images/go-down@3x.png differ
diff --git a/gui/images/go-home@2x.png b/gui/images/go-home@2x.png
new file mode 100644
index 00000000000..4cb6b5e806d
Binary files /dev/null and b/gui/images/go-home@2x.png differ
diff --git a/gui/images/go-home@3x.png b/gui/images/go-home@3x.png
new file mode 100644
index 00000000000..0a3e9134507
Binary files /dev/null and b/gui/images/go-home@3x.png differ
diff --git a/gui/images/go-next@2x.png b/gui/images/go-next@2x.png
new file mode 100644
index 00000000000..2db28c810f1
Binary files /dev/null and b/gui/images/go-next@2x.png differ
diff --git a/gui/images/go-next@3x.png b/gui/images/go-next@3x.png
new file mode 100644
index 00000000000..5ab9353c318
Binary files /dev/null and b/gui/images/go-next@3x.png differ
diff --git a/gui/images/go-previous@2x.png b/gui/images/go-previous@2x.png
new file mode 100644
index 00000000000..d67aae9cb92
Binary files /dev/null and b/gui/images/go-previous@2x.png differ
diff --git a/gui/images/go-previous@3x.png b/gui/images/go-previous@3x.png
new file mode 100644
index 00000000000..1d2875d11b9
Binary files /dev/null and b/gui/images/go-previous@3x.png differ
diff --git a/gui/images/help-browser@2x.png b/gui/images/help-browser@2x.png
new file mode 100644
index 00000000000..3590ff11252
Binary files /dev/null and b/gui/images/help-browser@2x.png differ
diff --git a/gui/images/help-browser@3x.png b/gui/images/help-browser@3x.png
new file mode 100644
index 00000000000..9fd9898b829
Binary files /dev/null and b/gui/images/help-browser@3x.png differ
diff --git a/gui/images/media-floppy@2x.png b/gui/images/media-floppy@2x.png
new file mode 100644
index 00000000000..5222a17ecff
Binary files /dev/null and b/gui/images/media-floppy@2x.png differ
diff --git a/gui/images/media-floppy@3x.png b/gui/images/media-floppy@3x.png
new file mode 100644
index 00000000000..aaf5e1a03d2
Binary files /dev/null and b/gui/images/media-floppy@3x.png differ
diff --git a/gui/images/openproject.png b/gui/images/openproject.png
deleted file mode 100644
index 63df868d1e4..00000000000
Binary files a/gui/images/openproject.png and /dev/null differ
diff --git a/gui/images/preferences-system@2x.png b/gui/images/preferences-system@2x.png
new file mode 100644
index 00000000000..1903ab50f48
Binary files /dev/null and b/gui/images/preferences-system@2x.png differ
diff --git a/gui/images/preferences-system@3x.png b/gui/images/preferences-system@3x.png
new file mode 100644
index 00000000000..e9aa07dad70
Binary files /dev/null and b/gui/images/preferences-system@3x.png differ
diff --git a/gui/images/process-stop@2x.png b/gui/images/process-stop@2x.png
new file mode 100644
index 00000000000..2548cb73125
Binary files /dev/null and b/gui/images/process-stop@2x.png differ
diff --git a/gui/images/process-stop@3x.png b/gui/images/process-stop@3x.png
new file mode 100644
index 00000000000..9bc59b6af54
Binary files /dev/null and b/gui/images/process-stop@3x.png differ
diff --git a/gui/images/refresh-file.png b/gui/images/refresh-file.png
new file mode 100644
index 00000000000..ea2eae814dd
Binary files /dev/null and b/gui/images/refresh-file.png differ
diff --git a/gui/images/refresh-file@2x.png b/gui/images/refresh-file@2x.png
new file mode 100644
index 00000000000..48438c461e9
Binary files /dev/null and b/gui/images/refresh-file@2x.png differ
diff --git a/gui/images/refresh-file@3x.png b/gui/images/refresh-file@3x.png
new file mode 100644
index 00000000000..eed7540f6ae
Binary files /dev/null and b/gui/images/refresh-file@3x.png differ
diff --git a/gui/images/scratchpad.png b/gui/images/scratchpad.png
deleted file mode 100644
index 7495eca6479..00000000000
Binary files a/gui/images/scratchpad.png and /dev/null differ
diff --git a/gui/images/showerrors.png b/gui/images/showerrors.png
deleted file mode 100644
index 6bad55fbd4a..00000000000
Binary files a/gui/images/showerrors.png and /dev/null differ
diff --git a/gui/images/showperformance.png b/gui/images/showperformance.png
deleted file mode 100644
index ea9a1c8abce..00000000000
Binary files a/gui/images/showperformance.png and /dev/null differ
diff --git a/gui/images/showstylewarnings.png b/gui/images/showstylewarnings.png
deleted file mode 100644
index 70de0695f8c..00000000000
Binary files a/gui/images/showstylewarnings.png and /dev/null differ
diff --git a/gui/images/showwarnings.png b/gui/images/showwarnings.png
deleted file mode 100644
index 196884717cd..00000000000
Binary files a/gui/images/showwarnings.png and /dev/null differ
diff --git a/gui/images/text-x-generic@2x.png b/gui/images/text-x-generic@2x.png
new file mode 100644
index 00000000000..8d0bf4fb9c1
Binary files /dev/null and b/gui/images/text-x-generic@2x.png differ
diff --git a/gui/images/text-x-generic@3x.png b/gui/images/text-x-generic@3x.png
new file mode 100644
index 00000000000..fea2f3cd65b
Binary files /dev/null and b/gui/images/text-x-generic@3x.png differ
diff --git a/gui/images/utilities-system-monitor@2x.png b/gui/images/utilities-system-monitor@2x.png
new file mode 100644
index 00000000000..b0303db204c
Binary files /dev/null and b/gui/images/utilities-system-monitor@2x.png differ
diff --git a/gui/images/utilities-system-monitor@3x.png b/gui/images/utilities-system-monitor@3x.png
new file mode 100644
index 00000000000..bd1c41e011e
Binary files /dev/null and b/gui/images/utilities-system-monitor@3x.png differ
diff --git a/gui/images/view-recheck@2x.png b/gui/images/view-recheck@2x.png
new file mode 100644
index 00000000000..bcb08d91cac
Binary files /dev/null and b/gui/images/view-recheck@2x.png differ
diff --git a/gui/images/view-recheck@3x.png b/gui/images/view-recheck@3x.png
new file mode 100644
index 00000000000..6f1ac358f02
Binary files /dev/null and b/gui/images/view-recheck@3x.png differ
diff --git a/gui/images/view-refresh.png b/gui/images/view-refresh.png
deleted file mode 100644
index 5fadc405f86..00000000000
Binary files a/gui/images/view-refresh.png and /dev/null differ
diff --git a/gui/librarydialog.cpp b/gui/librarydialog.cpp
index 15a2c7f10fe..147363a3a25 100644
--- a/gui/librarydialog.cpp
+++ b/gui/librarydialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@
 #include <QComboBox>
 #include <QFile>
 #include <QFileDialog>
-#include <QFlags>
 #include <QIODevice>
 #include <QLineEdit>
 #include <QList>
@@ -108,7 +107,7 @@ void LibraryDialog::openCfg()
     QFile file(selectedFile);
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
         QMessageBox msg(QMessageBox::Critical,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         tr("Cannot open file %1.").arg(selectedFile),
                         QMessageBox::Ok,
                         this);
@@ -120,7 +119,7 @@ void LibraryDialog::openCfg()
     const QString errmsg = tempdata.open(file);
     if (!errmsg.isNull()) {
         QMessageBox msg(QMessageBox::Critical,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         tr("Failed to load %1. %2.").arg(selectedFile).arg(errmsg),
                         QMessageBox::Ok,
                         this);
@@ -157,7 +156,7 @@ void LibraryDialog::saveCfg()
         mUi->buttonSave->setEnabled(false);
     } else {
         QMessageBox msg(QMessageBox::Critical,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         tr("Cannot save file %1.").arg(mFileName),
                         QMessageBox::Ok,
                         this);
@@ -168,7 +167,7 @@ void LibraryDialog::saveCfg()
 void LibraryDialog::saveCfgAs()
 {
     const QString filter(tr("Library files (*.cfg)"));
-    const QString path = Path::getPathFromFilename(mFileName.toStdString()).c_str();
+    const QString path = QString::fromStdString(Path::getPathFromFilename(mFileName.toStdString()));
     QString selectedFile = QFileDialog::getSaveFileName(this,
                                                         tr("Save the library as"),
                                                         path,
@@ -293,11 +292,11 @@ void LibraryDialog::filterFunctions(const QString& filter)
     QList<QListWidgetItem *> allItems = mUi->functions->findItems(QString(), Qt::MatchContains);
 
     if (filter.isEmpty()) {
-        for (QListWidgetItem *item : allItems) {
+        for (QListWidgetItem *item : utils::as_const(allItems)) {
             item->setHidden(false);
         }
     } else {
-        for (QListWidgetItem *item : allItems) {
+        for (QListWidgetItem *item : utils::as_const(allItems)) {
             item->setHidden(!item->text().startsWith(filter));
         }
     }
diff --git a/gui/librarydialog.h b/gui/librarydialog.h
index 285d36a820a..c8e522b10d4 100644
--- a/gui/librarydialog.h
+++ b/gui/librarydialog.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,10 +47,10 @@ private slots:
     void addFunction();
     void changeFunction();
     void editArg();
-    void editFunctionName(QListWidgetItem* /*item*/);
-    void filterFunctions(const QString& /*filter*/);
+    void editFunctionName(QListWidgetItem* item);
+    void filterFunctions(const QString& filter);
     void selectFunction();
-    void sortFunctions(bool /*sort*/);
+    void sortFunctions(bool sort);
 
 private:
     Ui::LibraryDialog *mUi;
diff --git a/gui/main.cpp b/gui/main.cpp
index 830cb29a72d..c855b2529f6 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -124,7 +124,7 @@ static void ShowUsage()
 
 static void ShowVersion()
 {
-// TODO: should only *not* show a dialog when we are on a commnd-line
+// TODO: should only *not* show a dialog when we are on a command-line
 #if defined(_WIN32)
     AboutDialog *dlg = new AboutDialog(CppCheck::version(), CppCheck::extraVersion(), 0);
     dlg->exec();
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 6926183974b..5ddb790b77b 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,14 +23,12 @@
 #include "aboutdialog.h"
 #include "analyzerinfo.h"
 #include "checkers.h"
-#include "checkstatistics.h"
 #include "checkthread.h"
 #include "common.h"
 #include "cppcheck.h"
 #include "errortypes.h"
 #include "filelist.h"
 #include "filesettings.h"
-#include "compliancereportdialog.h"
 #include "fileviewdialog.h"
 #include "helpdialog.h"
 #include "importproject.h"
@@ -53,6 +51,7 @@
 #include "threadresult.h"
 #include "translationhandler.h"
 #include "utils.h"
+#include "threaddetails.h"
 
 #include "ui_mainwindow.h"
 
@@ -98,10 +97,10 @@
 #include <QtNetwork/QNetworkRequest>
 #include <QPushButton>
 #include <QRegularExpression>
+#include <QSet>
 #include <QSettings>
 #include <QSize>
 #include <QTimer>
-#include <QTemporaryFile>
 #include <QToolBar>
 #include <QUrl>
 #include <QVariant>
@@ -121,6 +120,27 @@ static QString fromNativePath(const QString& p) {
 #endif
 }
 
+// The files selected in the results view are not necessarily spelled the same way as the
+// project or files.txt spells them, compare them as absolute paths
+static QString comparablePath(const QString& path) {
+    return QDir::cleanPath(QFileInfo(path).absoluteFilePath());
+}
+
+static QSet<QString> comparablePaths(const QStringList& paths) {
+    QSet<QString> ret;
+    std::transform(paths.cbegin(), paths.cend(), std::inserter(ret, ret.end()), comparablePath);
+    return ret;
+}
+
+template<typename T = std::vector<std::string>>
+static T toStdStringList(const QStringList& stringList) {
+    T ret;
+    std::transform(stringList.cbegin(), stringList.cend(), std::back_inserter(ret), [](const QString& s) {
+        return s.toStdString();
+    });
+    return ret;
+}
+
 MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
     mSettings(settings),
     mApplications(new ApplicationList(this)),
@@ -183,6 +203,7 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
     connect(mUI->mActionShowHidden, &QAction::triggered, mUI->mResults, &ResultsView::showHiddenResults);
     connect(mUI->mActionViewStats, &QAction::triggered, this, &MainWindow::showStatistics);
     connect(mUI->mActionLibraryEditor, &QAction::triggered, this, &MainWindow::showLibraryEditor);
+    connect(mUI->mActionShowThreadDetails, &QAction::triggered, this, &MainWindow::showThreadDetails);
 
     connect(mUI->mActionReanalyzeModified, &QAction::triggered, this, &MainWindow::reAnalyzeModified);
     connect(mUI->mActionReanalyzeAll, &QAction::triggered, this, &MainWindow::reAnalyzeAll);
@@ -191,7 +212,6 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
 
     connect(mUI->mActionStop, &QAction::triggered, this, &MainWindow::stopAnalysis);
     connect(mUI->mActionSave, &QAction::triggered, this, &MainWindow::save);
-    connect(mUI->mActionComplianceReport, &QAction::triggered, this, &MainWindow::complianceReport);
 
     // About menu
     connect(mUI->mActionAbout, &QAction::triggered, this, &MainWindow::about);
@@ -243,8 +263,6 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
         formatAndSetTitle();
     }
 
-    mUI->mActionComplianceReport->setVisible(isCppcheckPremium());
-
     enableCheckButtons(true);
 
     mUI->mActionPrint->setShortcut(QKeySequence::Print);
@@ -461,7 +479,7 @@ void MainWindow::loadSettings()
                                "Please check (and fix) the editor application settings, otherwise the editor "
                                "program might not start correctly.");
         QMessageBox msgBox(QMessageBox::Warning,
-                           tr("Cppcheck"),
+                           "Cppcheck",
                            msg,
                            QMessageBox::Ok,
                            this);
@@ -564,14 +582,31 @@ void MainWindow::saveSettings() const
     mUI->mResults->saveSettings(mSettings);
 }
 
-void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, const bool checkConfiguration)
+void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLib, const bool checkConfig, const QStringList& selectedFiles, const Recheck recheck)
 {
     Settings checkSettings;
     auto supprs = std::make_shared<Suppressions>();
     if (!getCppcheckSettings(checkSettings, *supprs))
         return;
 
-    clearResults();
+    // Filter the selected files
+    if (recheck == Recheck::Selected) {
+        const QSet<QString> selected = comparablePaths(selectedFiles);
+        p.fileSettings.remove_if([&](const FileSettings& fs) {
+            return !selected.contains(comparablePath(QString::fromStdString(fs.filename())));
+        });
+        if (p.fileSettings.empty()) {
+            QMessageBox msg(QMessageBox::Information,
+                            "Cppcheck",
+                            tr("None of the selected files is part of the project, nothing to analyze."),
+                            QMessageBox::Ok,
+                            this);
+            msg.exec();
+            return;
+        }
+    }
+
+    clearResultsForAnalysis(checkSettings.buildDir, selectedFiles, recheck);
 
     mIsLogfileLoaded = false;
     if (mProjectFile) {
@@ -582,7 +617,7 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
         });
         p.ignorePaths(v);
 
-        if (!mProjectFile->getAnalyzeAllVsConfigs()) {
+        if (checkSettings.platform.type == Platform::Native && !mProjectFile->getAnalyzeAllVsConfigs()) {
             const Platform::Type platform = static_cast<Platform::Type>(mSettings->value(SETTINGS_CHECKED_PLATFORM, 0).toInt());
             std::vector<std::string> configurations;
             const QStringList configs = mProjectFile->getVsConfigurations();
@@ -595,7 +630,6 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
         enableProjectActions(false);
     }
 
-    mUI->mResults->clear(true);
     mUI->mResults->setResultsSource(ResultsTree::ResultsSource::Analysis);
     mThread->clearFiles();
 
@@ -609,8 +643,8 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
 
     mUI->mResults->setCheckDirectory(checkPath);
     checkSettings.force = false;
-    checkSettings.checkLibrary = checkLibrary;
-    checkSettings.checkConfiguration = checkConfiguration;
+    checkSettings.checkLibrary = checkLib;
+    checkSettings.checkConfiguration = checkConfig;
 
     if (mProjectFile)
         qDebug() << "Checking project file" << mProjectFile->getFilename();
@@ -618,7 +652,7 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
     if (!checkSettings.buildDir.empty()) {
         checkSettings.loadSummaries();
         std::list<std::string> sourcefiles;
-        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, checkSettings.userDefines, p.fileSettings);
+        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, p.fileSettings);
     }
 
     //mThread->SetanalyzeProject(true);
@@ -637,7 +671,7 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
     mUI->mResults->setCheckSettings(checkSettings);
 }
 
-void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrary, const bool checkConfiguration)
+void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLib, const bool checkConfig, const QStringList& selectedFiles, const Recheck recheck)
 {
     if (files.isEmpty())
         return;
@@ -647,7 +681,7 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrar
     if (!getCppcheckSettings(checkSettings, *supprs))
         return;
 
-    clearResults();
+    clearResultsForAnalysis(checkSettings.buildDir, selectedFiles, recheck);
 
     mIsLogfileLoaded = false;
     FileList pathList;
@@ -659,13 +693,12 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrar
     }
     QStringList fileNames = pathList.getFileList();
 
-    mUI->mResults->clear(true);
     mUI->mResults->setResultsSource(ResultsTree::ResultsSource::Analysis);
     mThread->clearFiles();
 
     if (fileNames.isEmpty()) {
         QMessageBox msg(QMessageBox::Warning,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         tr("No suitable files found to analyze!"),
                         QMessageBox::Ok,
                         this);
@@ -678,7 +711,7 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrar
     // TODO: lock UI here?
     mUI->mResults->checkingStarted(fdetails.size());
     mThread->setFiles(std::move(fdetails));
-    if (mProjectFile && !checkConfiguration)
+    if (mProjectFile && !checkConfig)
         mThread->setAddonsAndTools(mProjectFile->getAddonsAndTools());
     mThread->setSuppressions(mProjectFile ? mProjectFile->getCheckingSuppressions() : QList<SuppressionList::Suppression>());
     QDir inf(mCurrentDirectory);
@@ -688,19 +721,16 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrar
     checkLockDownUI(); // lock UI while checking
 
     mUI->mResults->setCheckDirectory(checkPath);
-    checkSettings.checkLibrary = checkLibrary;
-    checkSettings.checkConfiguration = checkConfiguration;
+    checkSettings.checkLibrary = checkLib;
+    checkSettings.checkConfiguration = checkConfig;
 
     if (mProjectFile)
         qDebug() << "Checking project file" << mProjectFile->getFilename();
 
     if (!checkSettings.buildDir.empty()) {
         checkSettings.loadSummaries();
-        std::list<std::string> sourcefiles;
-        std::transform(fileNames.cbegin(), fileNames.cend(), std::back_inserter(sourcefiles), [](const QString& s) {
-            return s.toStdString();
-        });
-        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, checkSettings.userDefines, {});
+        const auto& sourcefiles = toStdStringList<std::list<std::string>>(fileNames);
+        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, {});
     }
 
     mThread->setCheckFiles(true);
@@ -728,7 +758,7 @@ void MainWindow::analyzeCode(const QString& code, const QString& filename)
             mUI->mResults, SLOT(debugError(ErrorItem)));
 
     // Create CppCheck instance
-    CppCheck cppcheck(checkSettings, supprs, result, true, nullptr);
+    CppCheck cppcheck(checkSettings, supprs, result, nullptr, true, nullptr);
 
     // Check
     checkLockDownUI();
@@ -750,7 +780,7 @@ QStringList MainWindow::selectFilesToAnalyze(QFileDialog::FileMode mode)
 {
     if (mProjectFile) {
         QMessageBox msgBox(this);
-        msgBox.setWindowTitle(tr("Cppcheck"));
+        msgBox.setWindowTitle("Cppcheck");
         const QString msg(tr("You must close the project file before selecting new files or directories!"));
         msgBox.setText(msg);
         msgBox.setIcon(QMessageBox::Critical);
@@ -767,8 +797,8 @@ QStringList MainWindow::selectFilesToAnalyze(QFileDialog::FileMode mode)
         QMap<QString,QString> filters;
         filters[tr("C/C++ Source")] = FileList::getDefaultFilters().join(" ");
         filters[tr("Compile database")] = compile_commands_json;
-        filters[tr("Visual Studio")] = "*.sln *.vcxproj";
-        filters[tr("Borland C++ Builder 6")] = "*.bpr";
+        filters["Visual Studio"] = "*.sln *.slnx *.vcxproj";
+        filters["Borland C++ Builder 6"] = "*.bpr";
         QString lastFilter = mSettings->value(SETTINGS_LAST_ANALYZE_FILES_FILTER).toString();
         selected = QFileDialog::getOpenFileNames(this,
                                                  tr("Select files to analyze"),
@@ -810,13 +840,14 @@ void MainWindow::analyzeFiles()
 
     const QString file0 = (!selected.empty() ? selected[0].toLower() : QString());
     if (file0.endsWith(".sln")
+        || file0.endsWith(".slnx")
         || file0.endsWith(".vcxproj")
         || file0.endsWith(compile_commands_json)
         || file0.endsWith(".bpr")) {
         ImportProject p;
         p.import(selected[0].toStdString());
 
-        if (file0.endsWith(".sln")) {
+        if (file0.endsWith(".sln") || file0.endsWith(".slnx")) {
             QStringList configs;
             for (auto it = p.fileSettings.cbegin(); it != p.fileSettings.cend(); ++it) {
                 const QString cfg(QString::fromStdString(it->cfg));
@@ -855,7 +886,7 @@ void MainWindow::analyzeDirectory()
         if (projFiles.size() == 1) {
             // If one project file found, suggest loading it
             QMessageBox msgBox(this);
-            msgBox.setWindowTitle(tr("Cppcheck"));
+            msgBox.setWindowTitle("Cppcheck");
             const QString msg(tr("Found project file: %1\n\nDo you want to "
                                  "load this project file instead?").arg(projFiles[0]));
             msgBox.setText(msg);
@@ -877,7 +908,7 @@ void MainWindow::analyzeDirectory()
             // If multiple project files found inform that there are project
             // files also available.
             QMessageBox msgBox(this);
-            msgBox.setWindowTitle(tr("Cppcheck"));
+            msgBox.setWindowTitle("Cppcheck");
             const QString msg(tr("Found project files from the directory.\n\n"
                                  "Do you want to proceed analysis without "
                                  "using any of these project files?"));
@@ -1016,9 +1047,6 @@ bool MainWindow::tryLoadLibrary(Library &library, const QString& filename)
         case Library::ErrorCode::UNKNOWN_ELEMENT:
             errmsg = tr("Unknown element");
             break;
-        default:
-            errmsg = tr("Unknown issue");
-            break;
         }
         if (!error.reason.empty())
             errmsg += " '" + QString::fromStdString(error.reason) + "'";
@@ -1072,6 +1100,7 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
 
     settings.exename = QCoreApplication::applicationFilePath().toStdString();
     settings.templateFormat = "{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]";
+    settings.reportProgress = 10;
 
     // default to --check-level=normal for GUI for now
     settings.setCheckLevel(Settings::CheckLevel::normal);
@@ -1126,6 +1155,8 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
         for (const QString& undefine : undefines)
             settings.userUndefs.insert(undefine.toStdString());
 
+        mProjectFile->setSettingsUserIncludes(settings);
+
         const QStringList libraries = mProjectFile->getLibraries();
         for (const QString& library : libraries) {
             settings.libraries.emplace_back(library.toStdString());
@@ -1153,10 +1184,7 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
 
         const QString platform = mProjectFile->getPlatform();
         if (platform.endsWith(".xml")) {
-            const std::vector<std::string> paths = {
-                Path::getCurrentPath(), // TODO: do we want to look in CWD?
-                QCoreApplication::applicationFilePath().toStdString(),
-            };
+            const std::vector<std::string> paths = toStdStringList(mProjectFile->getSearchPaths("platform"));
             settings.platform.loadFromFile(paths, platform.toStdString());
         } else {
             for (int i = Platform::Type::Native; i <= Platform::Type::Unix64; i++) {
@@ -1374,11 +1402,6 @@ void MainWindow::reAnalyzeSelected(const QStringList& files)
         return;
 
     if (mProjectFile) {
-        // Clear details, statistics and progress
-        mUI->mResults->clear(false);
-        for (int i = 0; i < files.size(); ++i)
-            mUI->mResults->clearRecheckFile(files[i]);
-
         analyzeProject(mProjectFile, files);
         return;
     }
@@ -1388,10 +1411,7 @@ void MainWindow::reAnalyzeSelected(const QStringList& files)
     if (!getCppcheckSettings(checkSettings, *supprs))
         return;
 
-    // Clear details, statistics and progress
-    mUI->mResults->clear(false);
-    for (int i = 0; i < files.size(); ++i)
-        mUI->mResults->clearRecheckFile(files[i]);
+    clearResultsForAnalysis(checkSettings.buildDir, files, Recheck::Selected);
 
     mCurrentDirectory = mUI->mResults->getCheckDirectory();
     FileList pathList;
@@ -1446,7 +1466,7 @@ void MainWindow::reAnalyze(bool all)
 void MainWindow::clearResults()
 {
     if (mProjectFile && !mProjectFile->getBuildDir().isEmpty()) {
-        QDir dir(QFileInfo(mProjectFile->getFilename()).absolutePath() + '/' + mProjectFile->getBuildDir());
+        QDir dir(QDir(QFileInfo(mProjectFile->getFilename()).absolutePath()).filePath(mProjectFile->getBuildDir()));
         for (const QString& f: dir.entryList(QDir::Files)) {
             if (!f.endsWith("files.txt")) {
                 static const QRegularExpression rx("^.*.s[0-9]+$");
@@ -1460,11 +1480,47 @@ void MainWindow::clearResults()
     enableResultsButtons();
 }
 
+void MainWindow::clearResultsForAnalysis(const std::string& buildDir, const QStringList& selectedFiles, const Recheck recheck)
+{
+    switch (recheck) {
+    case Recheck::None:
+        clearResults();
+        break;
+    case Recheck::Selected:
+        // Only the selected files are analyzed, the results of the other files are kept
+        mUI->mResults->clear(false);
+        for (const QString& f : selectedFiles)
+            mUI->mResults->clearRecheckFile(f);
+        enableResultsButtons();
+        break;
+    case Recheck::Cached: {
+        // Every file reports its results again, either analyzed or replayed from the analyzer
+        // information. Remove the analyzer information of the selected files so that they really
+        // are analyzed again, also by the clang tools that keep their results next to it.
+        const QSet<QString> selected = comparablePaths(selectedFiles);
+        QDir dir(QString::fromStdString(buildDir));
+        std::ifstream filesTxt(buildDir + "/files.txt");
+        std::string line;
+        while (std::getline(filesTxt, line)) {
+            AnalyzerInformation::Info info;
+            if (!info.parse(line) || !selected.contains(comparablePath(QString::fromStdString(info.sourceFile))))
+                continue;
+            const QString afile = QString::fromStdString(info.afile);
+            for (const QString& f : dir.entryList({afile, afile + ".*"}, QDir::Files))
+                dir.remove(f);
+        }
+        mUI->mResults->clear(true);
+        enableResultsButtons();
+        break;
+    }
+    }
+}
+
 void MainWindow::openResults()
 {
     if (mUI->mResults->hasResults()) {
         QMessageBox msgBox(this);
-        msgBox.setWindowTitle(tr("Cppcheck"));
+        msgBox.setWindowTitle("Cppcheck");
         const QString msg(tr("Current results will be cleared.\n\n"
                              "Opening a new XML file will clear current results.\n"
                              "Do you want to proceed?"));
@@ -1528,10 +1584,6 @@ void MainWindow::enableCheckButtons(bool enable)
     }
 
     mUI->mActionAnalyzeDirectory->setEnabled(enable);
-
-    if (isCppcheckPremium()) {
-        mUI->mActionComplianceReport->setEnabled(enable && mProjectFile && (mProjectFile->getAddons().contains("misra") || !mProjectFile->getCodingStandards().empty()));
-    }
 }
 
 void MainWindow::enableResultsButtons()
@@ -1593,7 +1645,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
                               "Do you want to stop the analysis and exit Cppcheck?"));
 
         QMessageBox msg(QMessageBox::Warning,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         text,
                         QMessageBox::Yes | QMessageBox::No,
                         this);
@@ -1705,28 +1757,6 @@ void MainWindow::save()
     }
 }
 
-void MainWindow::complianceReport()
-{
-    if (!mUI->mResults->isSuccess()) {
-        QMessageBox m(QMessageBox::Critical,
-                      "Cppcheck",
-                      tr("Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors."),
-                      QMessageBox::Ok,
-                      this);
-        m.exec();
-        return;
-    }
-
-    QTemporaryFile tempResults;
-    (void)tempResults.open(); // TODO: check result
-    tempResults.close();
-
-    mUI->mResults->save(tempResults.fileName(), Report::XMLV2, mCppcheckCfgProductName);
-
-    ComplianceReportDialog dlg(mProjectFile, tempResults.fileName(), mUI->mResults->getStatistics()->getCheckersReport());
-    dlg.exec();
-}
-
 void MainWindow::resultsAdded()
 {
     enableResultsButtons();
@@ -1884,37 +1914,20 @@ bool MainWindow::loadLastResults()
     return true;
 }
 
-void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringList& recheckFiles, const bool checkLibrary, const bool checkConfiguration)
+void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringList& selectedFiles, const bool checkLib, const bool checkConfig)
 {
     Settings::terminate(false);
 
+    // With a build directory the whole project is analyzed: the analyzer information cache skips
+    // the unchanged files, and files.txt stays complete so whole program analysis sees every file.
+    // Without a build directory there is no cache, so only the selected files are analyzed.
+    Recheck recheck = Recheck::None;
+    if (!selectedFiles.isEmpty())
+        recheck = projectFile->getBuildDir().isEmpty() ? Recheck::Selected : Recheck::Cached;
+
     QFileInfo inf(projectFile->getFilename());
     const QString& rootpath = projectFile->getRootPath();
 
-    if (isCppcheckPremium() && !projectFile->getLicenseFile().isEmpty()) {
-        if (rootpath.isEmpty() || rootpath == ".")
-            QDir::setCurrent(inf.absolutePath());
-        else if (QDir(rootpath).isAbsolute())
-            QDir::setCurrent(rootpath);
-        else
-            QDir::setCurrent(inf.absolutePath() + "/" + rootpath);
-
-        QString licenseFile = projectFile->getLicenseFile();
-        if (!QFileInfo(licenseFile).isAbsolute() && !rootpath.isEmpty())
-            licenseFile = inf.absolutePath() + "/" + licenseFile;
-
-#ifdef Q_OS_WIN
-        const QString premiumaddon = QCoreApplication::applicationDirPath() + "/premiumaddon.exe";
-#else
-        const QString premiumaddon = QCoreApplication::applicationDirPath() + "/premiumaddon";
-#endif
-        const std::vector<std::string> args{"--check-loc-license", licenseFile.toStdString()};
-        std::string output;
-        CheckThread::executeCommand(premiumaddon.toStdString(), args, "", output);
-        std::ofstream fout(inf.absolutePath().toStdString() + "/cppcheck-premium-loc");
-        fout << output;
-    }
-
     QDir::setCurrent(inf.absolutePath());
 
     mThread->setAddonsAndTools(projectFile->getAddonsAndTools());
@@ -1934,7 +1947,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
             buildDir = inf.canonicalPath() + '/' + buildDir;
         if (!QDir(buildDir).exists()) {
             QMessageBox msg(QMessageBox::Question,
-                            tr("Cppcheck"),
+                            "Cppcheck",
                             tr("Build dir '%1' does not exist, create it?").arg(buildDir),
                             QMessageBox::Yes | QMessageBox::No,
                             this);
@@ -1942,7 +1955,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
                 QDir().mkpath(buildDir);
             } else if (!projectFile->getAddons().isEmpty()) {
                 QMessageBox m(QMessageBox::Critical,
-                              tr("Cppcheck"),
+                              "Cppcheck",
                               tr("To check the project using addons, you need a build directory."),
                               QMessageBox::Ok,
                               this);
@@ -1969,6 +1982,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
             switch (result) {
             case ImportProject::Type::COMPILE_DB:
             case ImportProject::Type::VS_SLN:
+            case ImportProject::Type::VS_SLNX:
             case ImportProject::Type::VS_VCXPROJ:
             case ImportProject::Type::BORLAND:
             case ImportProject::Type::CPPCHECK_GUI:
@@ -1996,7 +2010,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
 
             if (!errorMessage.isEmpty()) {
                 QMessageBox msg(QMessageBox::Critical,
-                                tr("Cppcheck"),
+                                "Cppcheck",
                                 tr("Failed to import '%1': %2\n\nAnalysis is stopped.").arg(prjfile).arg(errorMessage),
                                 QMessageBox::Ok,
                                 this);
@@ -2005,18 +2019,18 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
             }
         } catch (InternalError &e) {
             QMessageBox msg(QMessageBox::Critical,
-                            tr("Cppcheck"),
+                            "Cppcheck",
                             tr("Failed to import '%1' (%2), analysis is stopped").arg(prjfile).arg(QString::fromStdString(e.errorMessage)),
                             QMessageBox::Ok,
                             this);
             msg.exec();
             return;
         }
-        doAnalyzeProject(p, checkLibrary, checkConfiguration);  // TODO: avoid copy
+        doAnalyzeProject(p, checkLib, checkConfig, selectedFiles, recheck);  // TODO: avoid copy
         return;
     }
 
-    QStringList paths = recheckFiles.isEmpty() ? projectFile->getCheckPaths() : recheckFiles;
+    QStringList paths = recheck == Recheck::Selected ? selectedFiles : projectFile->getCheckPaths();
 
     // If paths not given then check the root path (which may be the project
     // file's location, see above). This is to keep the compatibility with
@@ -2025,7 +2039,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
     if (paths.isEmpty()) {
         paths << mCurrentDirectory;
     }
-    doAnalyzeFiles(paths, checkLibrary, checkConfiguration);
+    doAnalyzeFiles(paths, checkLib, checkConfig, selectedFiles, recheck);
 }
 
 void MainWindow::newProjectFile()
@@ -2077,7 +2091,7 @@ void MainWindow::editProjectFile()
 {
     if (!mProjectFile) {
         QMessageBox msg(QMessageBox::Critical,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         tr("No project file loaded"),
                         QMessageBox::Ok,
                         this);
@@ -2112,6 +2126,20 @@ void MainWindow::showLibraryEditor()
     libraryDialog.exec();
 }
 
+void MainWindow::showThreadDetails()
+{
+    if (ThreadDetails::instance())
+        return;
+    auto* threadDetails = new ThreadDetails(this);
+    connect(mThread, &ThreadHandler::threadDetailsUpdated,
+            threadDetails, &ThreadDetails::threadDetailsUpdated, Qt::QueuedConnection);
+    connect(mThread, &ThreadHandler::progress,
+            threadDetails, &ThreadDetails::progress, Qt::QueuedConnection);
+    threadDetails->setAttribute(Qt::WA_DeleteOnClose);
+    threadDetails->show();
+    mThread->emitThreadDetailsUpdated();
+}
+
 void MainWindow::filterResults()
 {
     mUI->mResults->filterResults(mLineEditFilter->text());
@@ -2151,7 +2179,7 @@ void MainWindow::openRecentProject()
                               "used projects -list?").arg(project));
 
         QMessageBox msg(QMessageBox::Warning,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         text,
                         QMessageBox::Yes | QMessageBox::No,
                         this);
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 76fda4f0de6..a92476a8c20 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 
 #include <cstdint>
 #include <list>
+#include <string>
 
 #include <QFileDialog>
 #include <QMainWindow>
@@ -176,9 +177,6 @@ public slots:
     /** @brief Slot to save results */
     void save();
 
-    /** @brief Slot to generate compliance report */
-    void complianceReport();
-
     /** @brief Slot to create new project file */
     void newProjectFile();
 
@@ -200,6 +198,9 @@ public slots:
     /** @brief Slot for showing the library editor */
     void showLibraryEditor();
 
+    /** @brief Slot for showing the thread details window */
+    void showThreadDetails();
+
 private slots:
 
     /** @brief Slot for checkthread's done signal */
@@ -249,6 +250,19 @@ private slots:
     void changeReportType();
 private:
 
+    /** @brief How an analysis treats the files selected for a recheck */
+    enum class Recheck : std::uint8_t {
+        /** Not a recheck, everything is analyzed from scratch */
+        None,
+        /** Only the selected files are analyzed, the results of the other files are kept */
+        Selected,
+        /**
+         * Everything is analyzed. The analyzer information in the build directory is kept,
+         * except for the selected files, so the unchanged files are not analyzed again.
+         */
+        Cached
+    };
+
     bool isCppcheckPremium() const;
 
     /** Get filename for last results */
@@ -266,11 +280,11 @@ private slots:
     /**
      * @brief Analyze the project.
      * @param projectFile Pointer to the project to analyze.
-     * @param recheckFiles files to recheck, empty => check all files
-     * @param checkLibrary Flag to indicate if the library should be checked.
-     * @param checkConfiguration Flag to indicate if the configuration should be checked.
+     * @param selectedFiles files to recheck, empty => check all files
+     * @param checkLib Flag to indicate if the library should be checked.
+     * @param checkConfig Flag to indicate if the configuration should be checked.
      */
-    void analyzeProject(const ProjectFile *projectFile, const QStringList& recheckFiles, bool checkLibrary = false, bool checkConfiguration = false);
+    void analyzeProject(const ProjectFile *projectFile, const QStringList& selectedFiles, bool checkLib = false, bool checkConfig = false);
 
     /**
      * @brief Set current language
@@ -306,19 +320,31 @@ private slots:
     /**
      * @brief Analyze project
      * @param p imported project
-     * @param checkLibrary Flag to indicate if library should be checked
-     * @param checkConfiguration Flag to indicate if the configuration should be checked.
+     * @param checkLib Flag to indicate if library should be checked
+     * @param checkConfig Flag to indicate if the configuration should be checked.
+     * @param selectedFiles Files selected for a recheck
+     * @param recheck How the selected files are rechecked
      */
-    void doAnalyzeProject(ImportProject p, bool checkLibrary = false, bool checkConfiguration = false);
+    void doAnalyzeProject(ImportProject p, bool checkLib = false, bool checkConfig = false, const QStringList& selectedFiles = QStringList(), Recheck recheck = Recheck::None);
 
     /**
      * @brief Analyze all files specified in parameter files
      *
      * @param files List of files and/or directories to analyze
-     * @param checkLibrary Flag to indicate if library should be checked
-     * @param checkConfiguration Flag to indicate if the configuration should be checked.
+     * @param checkLib Flag to indicate if library should be checked
+     * @param checkConfig Flag to indicate if the configuration should be checked.
+     * @param selectedFiles Files selected for a recheck
+     * @param recheck How the selected files are rechecked
+     */
+    void doAnalyzeFiles(const QStringList &files, bool checkLib = false, bool checkConfig = false, const QStringList& selectedFiles = QStringList(), Recheck recheck = Recheck::None);
+
+    /**
+     * @brief Clear the results that a new analysis replaces
+     * @param buildDir Build directory of the analysis
+     * @param selectedFiles Files selected for a recheck
+     * @param recheck How the selected files are rechecked
      */
-    void doAnalyzeFiles(const QStringList &files, bool checkLibrary = false, bool checkConfiguration = false);
+    void clearResultsForAnalysis(const std::string& buildDir, const QStringList& selectedFiles, Recheck recheck);
 
     /**
      * @brief Get our default cppcheck settings and read project file.
diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui
index a90949344e2..33201f86c78 100644
--- a/gui/mainwindow.ui
+++ b/gui/mainwindow.ui
@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Cppcheck</string>
+   <string notr="true">Cppcheck</string>
   </property>
   <property name="iconSize">
    <size>
@@ -64,7 +64,7 @@
     <item>
      <layout class="QHBoxLayout" name="mLayoutInformation">
       <property name="sizeConstraint">
-       <enum>QLayout::SetDefaultConstraint</enum>
+       <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
       </property>
       <item>
        <widget class="QLabel" name="mLabelInformation">
@@ -84,13 +84,13 @@
          <string>Checking for updates</string>
         </property>
         <property name="textFormat">
-         <enum>Qt::RichText</enum>
+         <enum>Qt::TextFormat::RichText</enum>
         </property>
         <property name="openExternalLinks">
          <bool>true</bool>
         </property>
         <property name="textInteractionFlags">
-         <set>Qt::TextBrowserInteraction</set>
+         <set>Qt::TextInteractionFlag::TextBrowserInteraction</set>
         </property>
        </widget>
       </item>
@@ -104,7 +104,7 @@
       <item>
        <spacer name="horizontalSpacer">
         <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+         <enum>Qt::Orientation::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -124,7 +124,7 @@
      <x>0</x>
      <y>0</y>
      <width>640</width>
-     <height>22</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="mMenuFile">
@@ -140,7 +140,6 @@
     <addaction name="separator"/>
     <addaction name="mActionProjectMRU"/>
     <addaction name="mActionSave"/>
-    <addaction name="mActionComplianceReport"/>
     <addaction name="separator"/>
     <addaction name="mActionPrintPreview"/>
     <addaction name="mActionPrint"/>
@@ -192,6 +191,7 @@
     <addaction name="mActionShowScratchpad"/>
     <addaction name="mActionViewStats"/>
     <addaction name="mActionLibraryEditor"/>
+    <addaction name="mActionShowThreadDetails"/>
    </widget>
    <widget class="QMenu" name="mMenuHelp">
     <property name="title">
@@ -363,7 +363,7 @@
   <action name="mActionReanalyzeModified">
    <property name="icon">
     <iconset resource="gui.qrc">
-     <normaloff>:/images/view-refresh.png</normaloff>:/images/view-refresh.png</iconset>
+     <normaloff>:/images/refresh-file.png</normaloff>:/images/refresh-file.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Reanalyze modified files</string>
@@ -461,7 +461,7 @@
    </property>
    <property name="icon">
     <iconset resource="gui.qrc">
-     <normaloff>:/images/showerrors.png</normaloff>:/images/showerrors.png</iconset>
+     <normaloff>:/images/dialog-error.png</normaloff>:/images/dialog-error.png</iconset>
    </property>
    <property name="text">
     <string>E&amp;rrors</string>
@@ -539,7 +539,7 @@
   <action name="mActionOpenProjectFile">
    <property name="icon">
     <iconset resource="gui.qrc">
-     <normaloff>:/images/openproject.png</normaloff>:/images/openproject.png</iconset>
+     <normaloff>:/images/folder.png</normaloff>:/images/folder.png</iconset>
    </property>
    <property name="text">
     <string>Open P&amp;roject File...</string>
@@ -551,7 +551,7 @@
   <action name="mActionShowScratchpad">
    <property name="icon">
     <iconset resource="gui.qrc">
-     <normaloff>:/images/scratchpad.png</normaloff>:/images/scratchpad.png</iconset>
+     <normaloff>:/images/accessories-text-editor.png</normaloff>:/images/accessories-text-editor.png</iconset>
    </property>
    <property name="text">
     <string>Sh&amp;ow Scratchpad...</string>
@@ -607,7 +607,7 @@
    </property>
    <property name="icon">
     <iconset resource="gui.qrc">
-     <normaloff>:/images/showwarnings.png</normaloff>:/images/showwarnings.png</iconset>
+     <normaloff>:/images/dialog-warning.png</normaloff>:/images/dialog-warning.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Warnings</string>
@@ -625,7 +625,7 @@
    </property>
    <property name="icon">
     <iconset resource="gui.qrc">
-     <normaloff>:/images/showperformance.png</normaloff>:/images/showperformance.png</iconset>
+     <normaloff>:/images/utilities-system-monitor.png</normaloff>:/images/utilities-system-monitor.png</iconset>
    </property>
    <property name="text">
     <string>Per&amp;formance warnings</string>
@@ -684,7 +684,7 @@
      <normaloff>:/cppcheck-gui.png</normaloff>:/cppcheck-gui.png</iconset>
    </property>
    <property name="text">
-    <string>Cppcheck</string>
+    <string notr="true">Cppcheck</string>
    </property>
    <property name="toolTip">
     <string>Show Cppcheck results</string>
@@ -992,7 +992,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Misra C</string>
+    <string notr="true">Misra C</string>
    </property>
   </action>
   <action name="mActionReportMisraCpp2008">
@@ -1000,7 +1000,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Misra C++ 2008</string>
+    <string notr="true">Misra C++ 2008</string>
    </property>
   </action>
   <action name="mActionReportCertC">
@@ -1008,7 +1008,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Cert C</string>
+    <string notr="true">Cert C</string>
    </property>
   </action>
   <action name="mActionReportCertCpp">
@@ -1016,7 +1016,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Cert C++</string>
+    <string notr="true">Cert C++</string>
    </property>
   </action>
   <action name="mActionReportMisraCpp2023">
@@ -1024,7 +1024,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Misra C++ 2023</string>
+    <string notr="true">Misra C++ 2023</string>
    </property>
   </action>
   <action name="mActionReportAutosar">
@@ -1040,6 +1040,14 @@
     <string>EULA...</string>
    </property>
   </action>
+  <action name="mActionShowThreadDetails">
+   <property name="text">
+    <string>Thread Details</string>
+   </property>
+   <property name="toolTip">
+    <string>Show thread details</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/gui/manualtest/docs/handbook.html b/gui/manualtest/docs/handbook.html
new file mode 100644
index 00000000000..1da9f571224
--- /dev/null
+++ b/gui/manualtest/docs/handbook.html
@@ -0,0 +1,453 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>gui-test Handbook</title>
+<style>
+:root {
+  --ink: #1b2330; --ink-2: #4a5568; --muted: #6b7686; --line: #e2e6ec; --line-2: #cfd6df; --paper: #fff; --band: #f5f7fa;
+  --accent: #2456c8; --accent-soft: #e8eefb;
+  --sans: system-ui, -apple-system, "Segoe UI", Ubuntu, Cantarell, Roboto, sans-serif;
+  --mono: ui-monospace, "DejaVu Sans Mono", Menlo, Consolas, monospace;
+  color-scheme: light;
+}
+* { box-sizing: border-box; }
+body { margin: 0; background: var(--paper); color: var(--ink); font: 15px/1.6 var(--sans); }
+.page { display: grid; grid-template-columns: 14rem minmax(0, 1fr); gap: 3rem; max-width: 72rem; margin: 0 auto;
+        padding: 2rem max(16px, 2rem) 4rem; }
+nav { position: sticky; top: 1.5rem; align-self: start; font-size: .88rem; }
+nav .eyebrow { margin-bottom: .5rem; }
+nav ol { list-style: none; margin: 0; padding: 0; display: grid; gap: .15rem; }
+nav a { color: var(--ink-2); text-decoration: none; display: block; padding: .2rem .5rem; border-radius: 5px; }
+nav a:hover { background: var(--band); color: var(--ink); }
+nav ol ol { padding-left: .8rem; font-size: .82rem; }
+main { min-width: 0; max-width: 46rem; }
+h1, h2, h3 { text-wrap: balance; line-height: 1.25; }
+h1 { font-size: 2rem; margin: 0; }
+h2 { font-size: 1.35rem; margin: 2.8rem 0 .6rem; padding-top: 1rem; border-top: 1px solid var(--line); }
+h3 { font-size: 1.05rem; margin: 1.8rem 0 .4rem; }
+p { margin: .6rem 0; }
+.eyebrow { text-transform: uppercase; letter-spacing: .08em; font-size: .72rem; color: var(--muted); font-weight: 600; }
+.lead { font-size: 1.08rem; color: var(--ink-2); margin-top: .8rem; }
+.updated { color: var(--muted); font-size: .85rem; margin-top: .4rem; }
+a { color: var(--accent); }
+code { font-family: var(--mono); font-size: .86em; background: var(--band); border-radius: 4px; padding: .05em .3em; }
+pre { background: var(--band); border: 1px solid var(--line); border-radius: 8px; padding: .8rem 1rem; overflow-x: auto; font-size: .85rem; line-height: 1.5; }
+pre code { background: none; padding: 0; font-size: inherit; }
+ul, ol { padding-left: 1.4rem; }
+li { margin: .25rem 0; }
+.tbl { overflow-x: auto; margin: .8rem 0; }
+table { border-collapse: collapse; width: 100%; font-size: .9rem; }
+th { text-align: left; font-size: .78rem; color: var(--muted); font-weight: 600; padding: .4rem .7rem; border-bottom: 1px solid var(--line-2); }
+td { padding: .5rem .7rem; border-bottom: 1px solid var(--line); vertical-align: top; }
+td:first-child { white-space: nowrap; }
+td.wrap { white-space: normal; }
+figure { margin: 1.2rem 0; }
+figure svg, figure img { display: block; width: 100%; height: auto; }
+figure img { border: 1px solid var(--line); border-radius: 8px; }
+figcaption { color: var(--muted); font-size: .82rem; margin-top: .4rem; }
+@media (max-width: 800px) { .page { grid-template-columns: 1fr; gap: 1rem; } nav { position: static; } }
+</style>
+</head>
+<body>
+<div class="page">
+<nav aria-label="Contents">
+  <div class="eyebrow">Contents</div>
+  <ol>
+    <li><a href="#overview">Overview</a></li>
+    <li><a href="#getting-started">Getting started</a></li>
+    <li><a href="#gherkin">Gherkin</a>
+      <ol><li><a href="#gherkin-keywords">Keywords</a></li><li><a href="#gherkin-tags">Tags</a></li><li><a href="#gherkin-style">Writing good steps</a></li><li><a href="#gherkin-differences">Differences from Cucumber</a></li></ol></li>
+    <li><a href="#writing-tests">Writing tests</a>
+      <ol><li><a href="#test-matrix">Examples (test matrix)</a></li><li><a href="#test-projects">Test projects</a></li></ol></li>
+    <li><a href="#scripts">Scripts</a>
+      <ol><li><a href="#generating">Generating a script</a></li><li><a href="#script-format">The script format</a></li><li><a href="#outdated">Outdated scripts</a></li></ol></li>
+    <li><a href="#running">Running tests</a></li>
+    <li><a href="#report">Reading the report</a></li>
+    <li><a href="#troubleshooting">Troubleshooting</a></li>
+    <li><a href="#reference">Reference</a></li>
+  </ol>
+</nav>
+<main>
+<div class="eyebrow">gui-test</div>
+<h1>gui-test Handbook</h1>
+<p class="lead">The manual tests for cppcheck-gui are written in Gherkin, the plain-language Given/When/Then format. gui-test turns them into automated tests: Claude explores the GUI once and writes a script, and from then on the script is replayed without any AI.</p>
+<p class="updated">Updated 2026-10-24</p>
+
+<h2 id="overview">Overview</h2>
+<p>Working with gui-test has three steps:</p>
+<ol>
+  <li><strong>Write the test</strong> in plain words: what the starting point is, what you do and what you expect to see.</li>
+  <li><strong>Generate the script</strong>, once. Claude does the test in the application and writes down what it did as a script.</li>
+  <li><strong>Run the tests</strong> as often as you like. The scripts are replayed without AI, and you get a report with the results and screenshots.</li>
+</ol>
+<p>All of this is done in the web interface. The application runs on its own virtual screen, so your desktop is not touched while tests run.</p>
+
+<figure>
+<svg viewBox="0 0 760 310" role="img" aria-label="Claude writes the script once, every run replays it without AI" font-family="system-ui, sans-serif" font-size="13">
+  <defs><marker id="arrow" viewBox="0 0 10 10" refX="9" refY="5" markerWidth="6" markerHeight="6" orient="auto-start-reverse"><path d="M0 0L10 5L0 10z" fill="#9aa4b2"/></marker></defs>
+  <text x="24" y="34" font-size="15" font-weight="600" fill="#1b2330">Claude writes the script once, every run replays it without AI</text>
+  <g fill="none" stroke="#9aa4b2" stroke-width="1.25">
+    <path d="M184 130H208" marker-end="url(#arrow)"/>
+    <path d="M372 130H392" marker-end="url(#arrow)"/>
+    <path d="M520 130H552" marker-end="url(#arrow)"/>
+    <path d="M456 90V74H290V102" marker-end="url(#arrow)"/>
+    <path d="M634 158V234" marker-end="url(#arrow)"/>
+    <path d="M552 262H538" marker-end="url(#arrow)"/>
+  </g>
+  <rect x="20" y="102" width="164" height="56" rx="8" fill="none" stroke="#9aa4b2" stroke-width="1.25"/>
+  <text x="102" y="126" text-anchor="middle" font-weight="600" fill="#1b2330">A test in words</text>
+  <text x="102" y="144" text-anchor="middle" font-size="11.5" fill="#4a5568">Gherkin scenarios</text>
+  <rect x="208" y="102" width="164" height="56" rx="8" fill="none" stroke="#9aa4b2" stroke-width="1.25"/>
+  <text x="290" y="126" text-anchor="middle" font-weight="600" fill="#1b2330">gen.py</text>
+  <text x="290" y="144" text-anchor="middle" font-size="11.5" fill="#4a5568">Claude does it once</text>
+  <polygon points="392,130 456,90 520,130 456,170" fill="none" stroke="#9aa4b2" stroke-width="1.25"/>
+  <text x="456" y="134" text-anchor="middle" fill="#1b2330">Replay passes?</text>
+  <rect x="552" y="102" width="164" height="56" rx="8" fill="#e8eefb" stroke="#2456c8" stroke-width="2"/>
+  <text x="634" y="126" text-anchor="middle" font-weight="600" fill="#1b2330">Script saved</text>
+  <text x="634" y="144" text-anchor="middle" font-size="11.5" fill="#4a5568">in FILE.scripts.json</text>
+  <rect x="552" y="234" width="164" height="56" rx="8" fill="none" stroke="#9aa4b2" stroke-width="1.25"/>
+  <text x="634" y="258" text-anchor="middle" font-weight="600" fill="#1b2330">run.py</text>
+  <text x="634" y="276" text-anchor="middle" font-size="11.5" fill="#4a5568">replays it, no AI</text>
+  <rect x="374" y="234" width="164" height="56" rx="8" fill="none" stroke="#9aa4b2" stroke-width="1.25"/>
+  <text x="456" y="258" text-anchor="middle" font-weight="600" fill="#1b2330">report.html</text>
+  <text x="456" y="276" text-anchor="middle" font-size="11.5" fill="#4a5568">and results.json</text>
+  <text x="536" y="122" text-anchor="middle" font-size="11.5" fill="#4a5568">yes</text>
+  <text x="373" y="66" text-anchor="middle" font-size="11.5" fill="#4a5568">no: Claude gets the reason, up to 3 tries</text>
+  <text x="644" y="200" font-size="11.5" fill="#4a5568">every run</text>
+</svg>
+<figcaption>From a test in words to a report: gen.py once, run.py every run.</figcaption>
+</figure>
+
+<p>The tests are kept in <code>tests/</code>, and every run puts its report, logs and screenshots in a new directory under <code>results/</code>.</p>
+
+<h2 id="getting-started">Getting started</h2>
+<p>Start <code>web.py</code> with the cppcheck-gui binaries you want to test, then open <a href="http://127.0.0.1:8080/">http://127.0.0.1:8080/</a> in a browser.</p>
+<pre><code>./web.py --opensource ~/cppcheck/build/bin/cppcheck-gui \
+         --premium ~/premium/build/bin/cppcheck-gui --src ~/cppcheck</code></pre>
+<ul>
+  <li><code>--opensource</code> and <code>--premium</code> each take the binary of that edition. Give one, both or none; without a binary you can edit tests but not generate or run them.</li>
+  <li><code>--src</code> is the git checkout the binaries are built from. It is only used for the git SHA, branch and commit in the report; the default is the directory of the binary.</li>
+  <li><code>--dir</code> (default <code>tests</code>), <code>--out</code> (default <code>results</code>) and <code>--port</code> (default 8080) change where test files and results live and which port is used. The server only listens on 127.0.0.1.</li>
+</ul>
+<p>Some packages must be installed first. On Ubuntu (checked on 26.04):</p>
+<pre><code>sudo apt install xvfb xdotool dbus at-spi2-core python3-gi gir1.2-atspi-2.0 python3-pil tesseract-ocr tesseract-ocr-eng</code></pre>
+<p>The <code>tesseract</code> packages are only needed for <code>ocr</code> checks. To generate scripts the <code>claude</code> command line tool must be installed too.</p>
+
+<h3>The web interface</h3>
+<ul>
+  <li><strong>Header:</strong> Save, Run all (every test in every file), the Edition picker, a status message and a link to this handbook. The Edition picker only shows the editions that <code>web.py</code> got a binary for, and "both" when it got two. Without a binary there is no picker, and tests can be edited but not generated or run.</li>
+  <li><strong>Left column:</strong> three boxes.
+    <ul>
+      <li><strong>Test files</strong>, with <strong>New file</strong>. A file is flagged <code>invalid</code> when a test in it has errors, and <code>regenerate N</code> when N tests have an outdated script.</li>
+      <li><strong>Test projects</strong>, with <strong>New test project</strong>.</li>
+      <li><strong>Results</strong>: <strong>Reports</strong> lists the earlier runs with their date, edition, version, test files and result. Click a date to open the report.</li>
+    </ul></li>
+  <li><strong>Main area:</strong> the open test file with its tests, the open test, or the open test project. Each has an ✕ in the top right corner to close it.</li>
+  <li><strong>Job box:</strong> while a script is generated or tests run, it shows the progress, the results as they come in and a link to the report. <strong>Stop</strong> ends the job. Its ✕ hides the box until the next job.</li>
+</ul>
+
+<h2 id="gherkin">Gherkin</h2>
+<p>The manual tests are written in <a href="https://cucumber.io/docs/gherkin/reference/" target="_blank">Gherkin</a>, the language that Cucumber, behave and other behaviour-driven development tools use. Gherkin describes behaviour in plain words with a small set of keywords, so a test reads the same for a developer, a tester and Claude. Each test file in <code>tests/</code> is a <code>.feature</code> file with one feature, and every scenario in it is one test.</p>
+<pre><code>Feature: Preferences
+
+  Background:
+    Given the application is started with no project loaded
+
+  @id:t28ce8afe @project:embedded @edition:opensource
+  Scenario Outline: Misra rule text file
+    Given Edit &gt; Preferences is open on the Addons tab
+    When I select the rule text file {project:embedded}/&lt;rulefile&gt;
+    And I close the dialog with OK
+    And I open the project file {project:embedded}/embedded.cppcheck
+    And I wait until the analysis is done
+    Then the Misra error for the unused parameter has the rule text from the file
+    And there are no internalError results
+
+    Examples:
+      | rulefile              |
+      | rules.txt             |
+      | rules with spaces.txt |</code></pre>
+
+<h3 id="gherkin-keywords">Keywords</h3>
+<div class="tbl"><table>
+<thead><tr><th>Keyword</th><th>Meaning here</th></tr></thead>
+<tbody>
+<tr><td><code>Feature:</code></td><td>The first line of the file. Its text is the title of the test file, shown in the editor and the report. Lines below it, before the first scenario, are a free description</td></tr>
+<tr><td><code>Background:</code></td><td>Steps that come before every scenario of the file, typically <code>Given the application is started with no project loaded</code>. At most one, before the scenarios</td></tr>
+<tr><td><code>Scenario:</code></td><td>One test. The text after the colon is the name of the test, unique within the file. <code>Example:</code> means the same</td></tr>
+<tr><td><code>Scenario Outline:</code></td><td>A test that is run once for every row of its <code>Examples</code> table. <code>Scenario Template:</code> means the same</td></tr>
+<tr><td><code>Examples:</code></td><td>The table of a scenario outline. The first row is the header with the column names; <code>&lt;column&gt;</code> in a step is replaced by the value of the row. See <a href="#test-matrix">Examples (test matrix)</a></td></tr>
+<tr><td><code>Given</code></td><td>The starting point: the state that the application is in before the test does anything</td></tr>
+<tr><td><code>When</code></td><td>An action of the user: a click, a menu entry, typing, opening a file</td></tr>
+<tr><td><code>Then</code></td><td>The expected result: something that can be seen in the GUI or in a file. Every scenario needs at least one <code>Then</code></td></tr>
+<tr><td><code>And</code>, <code>But</code>, <code>*</code></td><td>Continue the step above with the same meaning, e.g. a second <code>Then</code>. A scenario can not start with <code>And</code> or <code>But</code></td></tr>
+<tr><td><code>&quot;&quot;&quot;</code></td><td>A doc string: lines of text that belong to the step above, e.g. code to type into the scratch pad. It ends with another <code>&quot;&quot;&quot;</code></td></tr>
+<tr><td><code>| a | b |</code></td><td>A data table that belongs to the step above</td></tr>
+<tr><td><code>@tag</code></td><td>Tags on the line above a scenario, see below</td></tr>
+<tr><td><code># text</code></td><td>A comment. Comments are lost when the web interface saves the file</td></tr>
+<tr><td><code>TODO:</code></td><td>Not standard Gherkin: a description line under the scenario name that says why the test can't be automated yet</td></tr>
+</tbody></table></div>
+<p>A scenario can switch between <code>When</code> and <code>Then</code> more than once, when a result has to be checked in the middle of the test:</p>
+<pre><code>  Scenario: Filter the results
+    Given the project file {project:basic-project}/basic.cppcheck is opened from the File menu
+    And the analysis is done
+    When I type "arrayIndex" in the Filter field
+    Then only the arrayIndexOutOfBounds error in b.c is shown
+    When I clear the Filter field
+    Then all errors are shown again</code></pre>
+
+<h3 id="gherkin-tags">Tags</h3>
+<p>Everything about a test that is not a step is a tag on the line above the scenario. Tags can't contain spaces.</p>
+<div class="tbl"><table>
+<thead><tr><th>Tag</th><th>Meaning</th></tr></thead>
+<tbody>
+<tr><td><code>@id:t1a2b3c4d</code></td><td>Identifies the test, also when it is renamed. The script is stored by this id. Added automatically when it is missing; don't change it</td></tr>
+<tr><td><code>@ticket:14893</code></td><td>The ticket of the test, shown as #14893</td></tr>
+<tr><td><code>@project:NAME</code></td><td>A <a href="#test-projects">test project</a> that the test uses, one tag per project</td></tr>
+<tr><td><code>@edition:opensource</code></td><td>An edition that the test is for, one tag per edition. Without the tag the test is for all editions</td></tr>
+<tr><td><code>@disabled</code></td><td>The test is not run</td></tr>
+</tbody></table></div>
+<p>Other tags are kept but have no meaning for gui-test.</p>
+
+<h3 id="gherkin-style">Writing good steps</h3>
+<p>Claude reads the steps as they are when it makes the script, and the <code>Then</code> steps become the checks. A good scenario is one that a new tester could follow without asking:</p>
+<ul>
+  <li>Use the words of the GUI: the menu entries, button texts and dialog titles as they are shown, e.g. <code>When I open File &gt; Edit Project File</code>.</li>
+  <li>Write <code>Given</code> steps as a state (<code>Given the analysis is done</code>), <code>When</code> steps as an action (<code>When I click Recheck</code>) and <code>Then</code> steps as something that can be seen (<code>Then the nullPointer error in a.c is gone</code>).</li>
+  <li>One thing per <code>Then</code> step. <code>Then there are no results for a.c</code> and <code>And there are no results for b.c</code> become two checks, and a failure points at the right one.</li>
+  <li>Be concrete about results: name the file, the error id and the line instead of "the results are correct".</li>
+  <li>Say how to wait: <code>And I wait until the analysis is done</code>.</li>
+  <li>Refer to files with <code>{project:NAME}/path</code>, and to the scratch directory with <code>{work}</code>.</li>
+  <li>Keep the steps that all tests of a file share in the <code>Background</code>.</li>
+</ul>
+<p>Changing the steps, the Background or the Examples makes the script of the test <a href="#outdated">outdated</a>, because the script was made for the old words.</p>
+
+<h3 id="gherkin-differences">Differences from Cucumber</h3>
+<ul>
+  <li>There are no step definitions. In Cucumber every step is matched by a pattern to code that someone writes. Here Claude reads the scenario once and writes a script for it, and the script is replayed. Steps can therefore be free text; they don't have to repeat fixed phrases.</li>
+  <li>The script of a scenario is stored next to the feature file in <code>FILE.scripts.json</code>, by test id.</li>
+  <li><code>Rule:</code>, tags on <code>Examples</code>, and more than one <code>Feature</code> per file are not supported.</li>
+  <li>Placeholders in braces are gui-test variables, not Gherkin: <code>{project:NAME}</code>, <code>{work}</code> and <code>{edition}</code>.</li>
+  <li><code>TODO:</code> description lines are a gui-test convention.</li>
+</ul>
+
+<h2 id="writing-tests">Writing tests</h2>
+<p>A test is a Gherkin scenario, written as if for a person: <code>Given</code> steps say where the test starts, <code>When</code> steps what is done and <code>Then</code> steps the result to expect. Claude reads exactly these words when it makes the script, so be concrete.</p>
+<pre><code>Feature: Results list
+
+  Background:
+    Given the application is started with no project loaded
+
+  @id:t389a5f3a @project:basic-project
+  Scenario: Clear results
+    Given the project file {project:basic-project}/basic.cppcheck is opened from the File menu
+    And the analysis is done
+    When I click Clear results
+    Then the results are cleared: the result tree is empty</code></pre>
+<p>The files can be edited in the web interface or in a text editor. The <a href="#gherkin">Gherkin</a> chapter describes the format; the web interface shows the tags of a scenario (ticket, editions, test projects, enabled) as separate fields.</p>
+<p>Tests live in test files (<code>tests/*.feature</code>), one file per area of the GUI. Click a file in the left column to open it, or <strong>New file</strong> to create one. An open file shows:</p>
+<ul>
+  <li><strong>Title</strong>: the <code>Feature:</code> line, shown in the report.</li>
+  <li><strong>Background</strong>: the steps that are done before every test of the file, e.g. <code>Given the application is started with no project loaded</code>.</li>
+  <li><strong>Tests</strong>: the list of tests. Click one to edit it, <strong>+ New test</strong> to add one. A test is flagged <code>invalid</code> when it has errors and <code>regenerate</code> when its script is outdated.</li>
+  <li><strong>Run tests</strong>: runs all tests in the file.</li>
+</ul>
+<p>Nothing is written to disk until you press <strong>Save</strong>; a dot after the file name means there are unsaved changes. Errors, such as a test without a <code>Then</code> step, are shown under the field and must be fixed before you can save.</p>
+<p>The test editor has these fields. The ↑ and ↓ buttons move the test in the list, and <strong>Delete</strong> removes it.</p>
+<div class="tbl"><table>
+<thead><tr><th>Field</th><th>What to write</th></tr></thead>
+<tbody>
+<tr><td>Name</td><td>Unique within the file. Shown in reports and the history, so a rename starts a new history line</td></tr>
+<tr><td>Ticket</td><td>Optional, e.g. a Trac ticket number</td></tr>
+<tr><td>enabled</td><td>Untick to leave the test out of every run without deleting it</td></tr>
+<tr><td>Editions</td><td>Tick the editions the test runs in; by default all. The script is the same for all editions, <code>{edition}</code> is replaced by the edition's name</td></tr>
+<tr><td>Scenario steps</td><td>One Gherkin step per line, e.g. "When I open File &gt; New Project File". Every <code>Then</code> step becomes at least one check in the script. Use <code>&lt;column&gt;</code> for the values of the Examples</td></tr>
+<tr><td>TODO</td><td>Why a test can't be automated yet, e.g. "cannot be automated". Leave empty otherwise. In the file it is a line <code>TODO: ...</code> below the scenario name</td></tr>
+<tr><td>Test projects</td><td>Tick the projects whose files the test uses, see below</td></tr>
+<tr><td>Script</td><td>The script of the test, with the buttons <strong>Generate script</strong>, <strong>Run test</strong> and, when it is outdated, <strong>Approve the script</strong>. See <a href="#scripts">Scripts</a></td></tr>
+<tr><td>Examples</td><td>A Gherkin table; every row is a separate run and the test becomes a <code>Scenario Outline</code></td></tr>
+</tbody></table></div>
+
+<h3 id="test-matrix">Examples (test matrix)</h3>
+<p>A <code>Scenario Outline</code> is run once for every row of its <code>Examples</code> table:</p>
+<pre><code>    When I select the platform &lt;platform&gt;
+    ...
+    Examples:
+      | platform | lang |
+      | native   | C    |
+      | unix32   | C++  |</code></pre>
+<p>That is 2 runs. A step like "When I select the platform &lt;platform&gt;" gets the value of each run, in the script it is <code>{platform}</code>. The runs are named after the test plus the values, e.g. <code>Relative paths [platform=unix32, lang=C++]</code>, and each one gets its own line in the report. The editor shows how many runs the Examples give.</p>
+
+<h3 id="test-projects">Test projects</h3>
+<p>A test project is a directory of files that tests use: source files, a <code>.cppcheck</code> project file, a <code>.cfg</code> file. They live in <code>tests/projects/NAME</code> and are edited under <strong>Test projects</strong> in the left column. Before every run the project is copied to a new empty directory, so a test always starts with the same files, even if an earlier test changed them. In a script the copy is <code>{project:NAME}</code>, or <code>{project}</code> when the test has only one project.</p>
+<p>Changing a file in a project makes the scripts of the tests that use it outdated, because the script was made for the old files.</p>
+
+<h2 id="scripts">Scripts</h2>
+<p>A test runs only when it has an up-to-date script. Generate it with Claude once, check it, and from then on it is replayed without AI.</p>
+
+<h3 id="generating">Generating a script</h3>
+<p>Open the test and press <strong>Generate script</strong>. <code>gen.py</code> starts the application with the test projects in place, and Claude does the test by hand: it looks at the accessibility tree, clicks and types, and checks the expected result (the <code>Then</code> steps). It then answers with a script. The script is replayed from scratch and saved in <code>FILE.scripts.json</code> only if that replay passes. When the replay fails, Claude is told why and tries again, 3 attempts in all. While a script is generated the editor is locked.</p>
+<ul>
+  <li>A Scenario Outline is explored with the first row of its Examples. The script uses <code>{column}</code> where the values belong.</li>
+  <li>When the application does not do what the expected result says, Claude still writes the script that checks it and marks that one check <code>"observed_fail": true</code>. The script is saved, and the test fails until the bug is fixed. That is a finding, not a broken script.</li>
+  <li>When the test can't be done through the GUI, Claude answers <code>CANNOT: &lt;reason&gt;</code> and no script is saved.</li>
+</ul>
+<p>Read the generated script before you trust it, especially its <code>expect</code> steps: they decide what the test proves.</p>
+
+<h3 id="script-format">The script format</h3>
+<p>A script is a JSON list of steps. Each step has <code>do</code> (an action) or <code>expect</code> (a check), and a <code>label</code> in the words of the test that is shown when it fails. Elements are found by <code>name</code> (part of the accessible name, case-insensitive) and <code>role</code>, and if needed <code>path</code>, <code>nth</code> and <code>exact</code>.</p>
+<pre><code>[
+  {"do": "click", "name": "Help", "role": "menu item", "label": "Open the Help menu"},
+  {"do": "click", "name": "Contents", "role": "menu item", "label": "Choose Help &gt; Contents"},
+  {"expect": "visible", "name": "Cppcheck GUI help", "role": "dialog", "label": "A help window opens"}
+]</code></pre>
+<div class="tbl"><table>
+<thead><tr><th>Step</th><th>What it does</th></tr></thead>
+<tbody>
+<tr><td class="wrap"><code>do</code>: <code>click</code>, <code>rightclick</code>, <code>doubleclick</code>, <code>focus</code>, <code>hover</code></td><td>Act on an element; <code>"mouse": true</code> clicks with the mouse</td></tr>
+<tr><td><code>do</code>: <code>settext</code></td><td>Replace the text of an edit field with <code>value</code></td></tr>
+<tr><td><code>do</code>: <code>type</code>, <code>key</code></td><td>Keyboard input to the focused element; <code>keys</code> uses xdotool names like <code>ctrl+o</code>, <code>Return</code></td></tr>
+<tr><td><code>do</code>: <code>wait</code></td><td>Wait for an element to appear, or with <code>"gone": true</code> to disappear</td></tr>
+<tr><td><code>do</code>: <code>restart</code></td><td>Quit and start the application again; settings are kept</td></tr>
+<tr><td><code>do</code>: <code>sleep</code>, <code>write</code>, <code>copy</code></td><td>Pause, write a file in <code>{work}</code>, or copy a file in a test project</td></tr>
+<tr><td><code>expect</code>: <code>visible</code>, <code>gone</code></td><td>An element is shown, or is not</td></tr>
+<tr><td><code>expect</code>: <code>state</code></td><td>An element is or is not <code>checked</code>, <code>enabled</code>, <code>focused</code>, <code>selected</code>, <code>expanded</code>...</td></tr>
+<tr><td><code>expect</code>: <code>value</code></td><td>The value or text of a field equals something</td></tr>
+<tr><td><code>expect</code>: <code>text</code>, <code>ocr</code></td><td>Text is (not) on the screen; <code>ocr</code> reads pixels with tesseract, for context menus AT-SPI can't see</td></tr>
+<tr><td><code>expect</code>: <code>file</code></td><td>A file contains, does not contain or matches a regex</td></tr>
+<tr><td><code>expect</code>: <code>alive</code>, <code>exited</code></td><td>The application is still running, or has quit by itself with status 0</td></tr>
+<tr><td><code>expect</code>: <code>capture</code></td><td>Search <code>regex</code> in an element and save group 1 <code>as</code> a name; <code>{name}</code> in the later steps is replaced by it, for text that changes such as the version</td></tr>
+</tbody></table></div>
+<p>Checks and actions wait for their element up to <code>timeout</code> seconds, 5 by default. The placeholders <code>{work}</code>, <code>{home}</code>, <code>{project:NAME}</code>, <code>{column}</code> (of the Examples) and <code>{edition}</code> are replaced before the run, captured values when the capture step has passed. The full description is under <strong>How to write a script</strong> below the script in the editor.</p>
+
+<h3 id="outdated">Outdated scripts</h3>
+<p>A script is made for the test's steps, the Background of the file, TODO, Examples and the files of its test projects. When any of those change, the script is <strong>OUTDATED</strong>: it is kept but skipped by every run, and the editor says so in red. You then have three choices:</p>
+<ol>
+  <li><strong>Generate script</strong> again.</li>
+  <li><strong>Approve the script</strong> when the change does not affect it, e.g. a typo fix in a step.</li>
+  <li>Edit the script by hand in the editor; it has to be valid JSON before you can save.</li>
+</ol>
+
+<h2 id="running">Running tests</h2>
+<p>Every test starts a fresh application with an empty HOME and fresh copies of its test projects, so tests never depend on each other.</p>
+
+<h3>From the web interface</h3>
+<p>Pick the edition in the header first: opensource, premium or both. Then:</p>
+<ul>
+  <li><strong>Run test</strong> in an open test runs that test, all the rows of its Examples.</li>
+  <li><strong>Run tests</strong> in an open test file runs every test in that file.</li>
+  <li><strong>Run all</strong> runs every test in every file.</li>
+</ul>
+<p>With "both", the run is done for one edition and then the other, and each edition gets its own report. The job box shows the test and step that is running and the results as they come. <strong>Stop</strong> ends the run at once: the test that was running is SKIP "aborted by user", and the report is written with the tests that are done. Only one job runs at a time.</p>
+
+<h3>From the command line</h3>
+<pre><code>./run.py ~/cppcheck/build/bin/cppcheck-gui tests/application.feature tests/projects.feature --edition opensource</code></pre>
+<div class="tbl"><table>
+<thead><tr><th>Option</th><th>Meaning</th></tr></thead>
+<tbody>
+<tr><td><code>APP</code></td><td>The binary to test</td></tr>
+<tr><td><code>FILE ...</code></td><td>One or more test files</td></tr>
+<tr><td><code>--edition opensource|premium</code></td><td>APP is this edition; only the tests for it run. Without it all tests run and there is no history per edition</td></tr>
+<tr><td><code>--test TEXT</code></td><td>Only tests whose name contains TEXT (case-insensitive)</td></tr>
+<tr><td><code>--id ID</code></td><td>Only the test with this id, all the rows of its Examples</td></tr>
+<tr><td><code>--src DIR</code></td><td>Git checkout for the SHA in the report; default the directory of APP</td></tr>
+<tr><td><code>--out DIR</code></td><td>Where the run directories go; default <code>results</code></td></tr>
+</tbody></table></div>
+<p><code>run.py</code> prints one line per test and the path of the report, and exits with 1 when a test failed, so it can be used in a script or CI job. Scripts are generated the same way with <code>./gen.py APP FILE.feature</code>; it takes <code>--edition</code>, <code>--test</code>, <code>--id</code>, <code>--force</code> (also tests that have a script), <code>--model</code> and <code>--attempts</code>.</p>
+
+<h3>What happens in a run</h3>
+<ol>
+  <li>The tests to run are selected: enabled, for this edition, not filtered out. Tests without a script, or with an outdated one, are SKIP.</li>
+  <li>For each test, the test projects are copied and the application is started on a new virtual screen with an empty HOME.</li>
+  <li>The script is replayed step by step. After every step that acts on the GUI (click, type, key, settext, restart...) a screenshot is saved.</li>
+  <li>At the end, or at the first failing step, the step log, a final screenshot and the application log are saved, and the log is searched for a crash.</li>
+  <li>After the last test, <code>results.json</code> and <code>report.html</code> are written in the run directory.</li>
+</ol>
+
+<h2 id="report">Reading the report</h2>
+<p>Each run writes one self-contained <code>report.html</code>; read it top-down: the verdict first, then what changed, then the details of each failure.</p>
+<figure>
+  <img src="report.png" alt="The top of a report: verdict, run details, number boxes, results per test file, the last runs and the status history" loading="lazy">
+  <figcaption>The top of a report from three runs of two test files.</figcaption>
+</figure>
+<div class="tbl"><table>
+<thead><tr><th>Part</th><th>What it tells you</th></tr></thead>
+<tbody>
+<tr><td>Header</td><td>FAILED or PASSED with the count, and the run details: date, edition, duration, git SHA ("+ uncommitted changes" when the checkout was dirty), branch, commit, application, host, test files</td></tr>
+<tr><td>Number boxes</td><td>Passed, failed (how many crashed the app), skipped, duration, and with history the change against the previous run</td></tr>
+<tr><td>Results per test file</td><td>A bar per file, green/red/amber. Shows whether failures are in one part of the GUI. Only when the run has more than one file</td></tr>
+<tr><td>The last runs</td><td>Pass, fail and skip counts for up to 15 runs of the same edition; the number on a column is its failures</td></tr>
+<tr><td class="wrap">Changed since the previous run</td><td>NEW failures, tests that are fixed, and tests that are STILL FAILING</td></tr>
+<tr><td>Status history</td><td>A row per test that did not pass in every run: "new failure", "failing since 10/22 12:00 (b8b27a)", "fixed since", "flaky: 4 changes", "never ran"</td></tr>
+<tr><td class="wrap">Failed and skipped tests</td><td>A card per test: the reason, the step strip, the screenshots after the last 3 steps and the final screen with a red frame</td></tr>
+<tr><td>All tests</td><td>Every test grouped by file, with its time, links to its files and its step screenshots</td></tr>
+</tbody></table></div>
+
+<h3>The step strip</h3>
+<p>Every test has a strip with a cell per script step: green passed, red failed, grey not run. A failure at step 2 of 14 usually means the test or the application broke early. A failure at the last step usually means one check is wrong, or the bug the check describes. Under the strip it says e.g. "failed at step 9 of 14", "not run" or "did not start".</p>
+
+<h3>Files in a run directory</h3>
+<p>A run directory is <code>results/&lt;date&gt;-&lt;time&gt;-&lt;edition&gt;-&lt;sha&gt;/</code>, e.g. <code>20261022-120317-opensource-b8b27a95/</code>. The files of a test are named after the test (<code>NAME</code> below), with spaces and other special characters replaced by <code>_</code>. They are also linked from the report.</p>
+<div class="tbl"><table>
+<thead><tr><th>File</th><th>Content</th></tr></thead>
+<tbody>
+<tr><td><code>report.html</code></td><td>The report</td></tr>
+<tr><td><code>results.json</code></td><td>The run details and every result. The history is read from these files</td></tr>
+<tr><td><code>NAME.txt</code></td><td>The step log: each step, ok or FAIL, its time and its screenshot</td></tr>
+<tr><td><code>NAME.png</code></td><td>The screen at the end of the test, or when it failed</td></tr>
+<tr><td><code>NAME.stepNN.png</code></td><td>The screen after step NN, for steps that act on the GUI</td></tr>
+<tr><td><code>NAME.app.log</code></td><td>What the application printed</td></tr>
+</tbody></table></div>
+<p>The history compares runs of the same edition in the same results directory. Tests are matched by name.</p>
+
+<h2 id="troubleshooting">Troubleshooting</h2>
+<p>Start with the reason in the report and the final screenshot: together they usually say whether the application, the script or the test is wrong.</p>
+<div class="tbl"><table>
+<thead><tr><th>What you see</th><th>What it means and what to do</th></tr></thead>
+<tbody>
+<tr><td class="wrap">SKIP "no script"</td><td>The test has no script yet. Generate one, or write it by hand</td></tr>
+<tr><td class="wrap">SKIP "OUTDATED SCRIPT"</td><td>The test or one of its test projects changed after the script was made. Generate again, or approve the script if the change doesn't matter to it</td></tr>
+<tr><td class="wrap">FAIL "timeout waiting for element to appear"</td><td>An element with that name and role wasn't found within the timeout. The reason lists the most similar visible elements and the open windows: a renamed button shows up there. Fix the name in the script, or regenerate</td></tr>
+<tr><td class="wrap">FAIL with <code>observed_fail=True</code> in the reason</td><td>Claude saw the application not do what the expected result says when it made the script. It is a known bug, and the test fails until the bug is fixed</td></tr>
+<tr><td class="wrap">FAIL with CRASH</td><td>The application was not running at the end of the test, or its log has a fatal message (SIGSEGV, SIGABRT, an assertion, AddressSanitizer, QFATAL...). A crash fails the test even if every step passed. Read <code>NAME.app.log</code>. A test that quits the application with status 0 is not a crash</td></tr>
+<tr><td class="wrap">FAIL "could not start"</td><td>The session or the application did not start. Check that the packages under <a href="#getting-started">Getting started</a> are installed, and that the binary runs</td></tr>
+<tr><td class="wrap">"flaky" in the status history</td><td>The test changes between PASS and FAIL. Usually timing: give the slow step a longer <code>timeout</code>, or add a <code>wait</code> step before it</td></tr>
+<tr><td class="wrap">A context menu can't be found</td><td>Some menus are not in the accessibility tree. Check them with an <code>ocr</code> step and choose with <code>key</code> Down and Return</td></tr>
+<tr><td class="wrap">"path ... is outside the test directories"</td><td><code>write</code>, <code>copy</code> and <code>file</code> steps may only use <code>{work}</code>, <code>{home}</code> and the test project copies</td></tr>
+<tr><td class="wrap">Generate script or Run test is greyed out</td><td><code>web.py</code> has no binary for the edition picked in the header, or the test is not for that edition. Run test also needs an up-to-date script</td></tr>
+</tbody></table></div>
+
+<h2 id="reference">Reference</h2>
+<p>The commands, with all their options. <code>web.py</code>, <code>run.py</code>, <code>gen.py</code> and <code>guitest.py</code> also print their help with <code>--help</code>.</p>
+<pre><code>web.py [--opensource APP] [--premium APP] [--src DIR] [--dir tests] [--out results] [--port 8080]
+run.py APP FILE.feature... [--edition opensource|premium] [--test TEXT] [--id ID] [--src DIR] [--out results]
+gen.py APP FILE.feature [--edition opensource|premium] [--test TEXT] [--id ID] [--force] [--model M] [--attempts 3]
+testfile.py convert IN.md|IN.json OUT.feature</code></pre>
+
+<h3>guitest.py</h3>
+<p><code>guitest.py</code> is what Claude uses to drive the GUI, and you can use it by hand to look at the GUI the way a script sees it. The session lives in <code>$GUITEST_STATE</code> (default <code>/tmp/guitest-&lt;uid&gt;/state.json</code>).</p>
+<pre><code>guitest.py start ~/cppcheck/build/bin/cppcheck-gui
+guitest.py tree --showing --depth 3
+guitest.py click --name Help --role "menu item"
+guitest.py screenshot /tmp/screen.png
+guitest.py stop</code></pre>
+<div class="tbl"><table>
+<thead><tr><th>Command</th><th>What it does</th></tr></thead>
+<tbody>
+<tr><td><code>start APP [ARGS]</code></td><td>Start Xvfb, D-Bus, AT-SPI and the application. <code>--home DIR</code> (default an empty directory), <code>--size 1280x900</code></td></tr>
+<tr><td><code>stop</code>, <code>restart</code></td><td>Stop everything; quit and start the application again with its settings kept</td></tr>
+<tr><td><code>alive</code>, <code>log</code></td><td>Exit 0 if the application runs; print what it wrote to stdout and stderr</td></tr>
+<tr><td><code>windows</code>, <code>texts</code></td><td>The top level windows and dialogs; every visible text</td></tr>
+<tr><td><code>tree</code></td><td>The accessibility tree. <code>--showing</code> only visible elements, <code>--depth N</code>, <code>--path P</code> one subtree</td></tr>
+<tr><td class="wrap"><code>click</code>, <code>rightclick</code>, <code>doubleclick</code>, <code>focus</code>, <code>hover</code></td><td>Act on an element found with <code>--name</code>, <code>--role</code>, <code>--path</code>, <code>--nth</code>, <code>--exact</code>. <code>--mouse</code> for a real mouse click</td></tr>
+<tr><td class="wrap"><code>settext VALUE</code>, <code>type VALUE</code>, <code>key KEYS</code></td><td>Set a field's text; type into the focused element; press keys (xdotool names)</td></tr>
+<tr><td><code>wait</code></td><td>Wait for an element, <code>--timeout 10</code>, <code>--gone</code> to wait until it disappears</td></tr>
+<tr><td><code>info</code>, <code>suggest</code></td><td>Role, name, text, value and states of one element; the visible elements most like <code>--name</code>/<code>--role</code></td></tr>
+<tr><td><code>ocr</code>, <code>screenshot FILE</code></td><td>Text on the screen read by tesseract; a PNG of the screen</td></tr>
+</tbody></table></div>
+</main>
+</div>
+</body>
+</html>
diff --git a/gui/manualtest/docs/report.png b/gui/manualtest/docs/report.png
new file mode 100644
index 00000000000..2a24756da06
Binary files /dev/null and b/gui/manualtest/docs/report.png differ
diff --git a/gui/manualtest/gen.py b/gui/manualtest/gen.py
new file mode 100755
index 00000000000..0a3360065dd
--- /dev/null
+++ b/gui/manualtest/gen.py
@@ -0,0 +1,234 @@
+#!/usr/bin/env python3
+"""Let Claude write the scripts of the tests. The scripts are replayed by run.py without AI.
+
+  gen.py APP FILE.feature [--edition opensource|premium] [--test SUBSTRING] [--force] [--model M]
+
+For every test without a script (or every test with --force) Claude gets the scenario, drives the
+GUI once with the guitest.py commands and answers with a script, see testfile.SCRIPT_DOC.
+The script is run again from scratch and is saved in FILE.scripts.json only if that replay passes.
+A Scenario Outline is explored with the first row of its Examples, the script uses {column} where
+the values of the row belong. With --edition APP is that edition, tests that are not for it are
+left out; the script is used for all the editions of the test.
+"""
+
+import argparse
+import json
+import os
+import re
+import signal
+import subprocess
+import sys
+import tempfile
+
+import runner
+import testfile
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+GUITEST = os.path.join(HERE, 'guitest.py')
+
+PROMPT = """You are writing an automated GUI test script for a Qt application that has been started for you.
+First do the test by hand, driving the application only with this command line tool (each call is separate,
+the session is already running):
+
+  python3 {guitest} <command>
+
+{help}
+
+Tips:
+- Start with `tree --showing --depth 3`, `windows` and `texts` to see what is on screen.
+- Use `info --name X` to see the roles and states of an element, e.g. the [checked] state.
+- Menu items: click the menu (e.g. --name File --role "menu item"), then click the entry.
+- Keyboard input goes to the focused element: `focus` first, then `type` / `key`.
+- The files of the test are in the test projects, they are already in place, use them as they are:{projects}
+  Do not make copies of them. In the script write {{project:NAME}} instead of the directory, it is another
+  directory every run. Anything else that you need can be created in {work} (use Write), do not touch other places.
+- A menu that is on screen but not in `tree`/`texts` (e.g. a context menu) can be read with `ocr`; check it in the
+  script with {{"expect": "ocr", "contains": "..."}} and use the keyboard (`key Down`, `key Return`) to choose in it.
+- Never read or modify the application source code.
+
+Test name: {name}
+
+The test is written in Gherkin: the Background and the Given steps are the starting point, the When steps are
+what you do and the Then steps are the EXPECTED result.
+
+{body}
+
+When you have done the test and checked the EXPECTED result (the Then steps), answer with a script that does the
+same without you. The script is replayed by a program, so:
+- use the exact roles and names that you saw. Give a name and a role. Use "path" only when nothing else tells
+  the element apart, paths change when the dialogs change (a file dialog's name field is found by its label)
+- a name matches any element that contains it, so always give the role too: a toolbar button
+  "Preferences" and the dialog "Preferences" have the same name, the dialog is role "dialog"
+- give every step a "label" that says what it is for, in the words of the test
+- end with "expect" steps that check the EXPECTED result, at least one for each Then step
+- the files of the test are the test projects, refer to them with {{project:NAME}} paths; files that
+  you made yourself are created by "write" steps (in {{work}}), not by you
+- the application is started fresh before the script, with an empty HOME
+- {matrixnote}
+- {editionnote}
+
+{scriptdoc}
+
+{previous}Check the EXPECTED result honestly. If the application does not do what EXPECTED says that is a finding, not
+a mistake in the script: still write the script that checks EXPECTED (it will fail, that is the point) and put
+the line `OBSERVED: FAIL - <what happens instead>` before the JSON block and add "observed_fail": true to
+the one check that fails. Otherwise put `OBSERVED: PASS`.
+
+Finish with the script as one JSON list in a ```json code block and nothing after it.
+If the test cannot be done through the GUI answer with the single line CANNOT: <reason>.
+"""
+
+
+PREVIOUS = """An earlier attempt gave this script:
+{script}
+
+When it was replayed from scratch by the program it failed:
+{error}
+
+Find out what is wrong (look at the GUI again if needed) and answer with a corrected script.
+
+"""
+
+
+def start_session(app, root, projects):
+    work = tempfile.mkdtemp(prefix='guitest-work-')
+    state = os.path.join(work, 'state.json')
+    env = dict(os.environ, GUITEST_STATE=state)
+    sub = lambda *a, **kw: subprocess.run([sys.executable, GUITEST, *a], env=env, text=True, **kw)
+    variables = testfile.materialize(root, projects, work)
+    r = sub('start', app, capture_output=True)
+    if r.returncode:
+        sys.exit('error: could not start: ' + (r.stdout + r.stderr).strip())
+    with open(state) as f:
+        home = json.load(f)['env']['HOME']
+    return work, home, env, sub, variables
+
+
+def explore(app, root, test, combo, edition, model, background, previous=''):
+    """Claude does the test by hand and returns (script, error); with a script the error is (OBSERVED, reason)."""
+    work, home, env, sub, variables = start_session(app, root, test.get('projects', []))
+    try:
+        note = ('this is a Scenario Outline, you explore it with the Examples row %s. Write {%s} in the script wherever '
+                'that value is used, the script is run once for every row of the Examples' % (
+                    ', '.join('%s=%s' % kv for kv in combo.items()), '}, {'.join(combo))
+                ) if combo else 'there are no Examples, write the values in the script as they are'
+        others = [e for e in testfile.editions(test) if e != edition]
+        if not edition:
+            editionnote = 'there is one edition of the application'
+        elif others:
+            editionnote = ('the application is the %s edition. The same script is also run with the %s edition, '
+                           'write {edition} where the name of the edition is shown' % (edition, ' and '.join(others)))
+        else:
+            editionnote = 'the script is only run with the %s edition' % edition
+        projects = ''.join('\n    {project:%s} = %s, files: %s' % (n, variables['project:' + n],
+                                                                  ', '.join(sorted(testfile.project_files(root, n))))
+                           for n in test.get('projects', [])) or ' none'
+        prompt = PROMPT.format(guitest=GUITEST, help=sub('--help', capture_output=True).stdout, work=work,
+                               name=test['name'], body=testfile.body(test, combo, edition, background), matrixnote=note,
+                               editionnote=editionnote,
+                               scriptdoc=testfile.SCRIPT_DOC, previous=previous, projects=projects)
+        cmd = ['claude', '-p', '--allowedTools', 'Bash(python3 %s:*)' % GUITEST, 'Read', 'Write', '--add-dir', work]
+        if model:
+            cmd += ['--model', model]
+        p = subprocess.run(cmd, input=prompt, env=env, text=True, capture_output=True, cwd=work)
+    finally:
+        sub('stop', capture_output=True)
+    m = re.findall(r'^CANNOT:\s*(.*)$', p.stdout, re.M)
+    if m:
+        return None, 'Claude: cannot be tested through the GUI: ' + m[-1]
+    m = re.findall(r'```json\s*(.*?)```', p.stdout, re.S)
+    if not m:
+        return None, 'no script in the answer of Claude: ' + (p.stdout.strip() or p.stderr.strip())[:300]
+    try:
+        script = json.loads(m[-1])
+    except ValueError as e:
+        return None, 'the script is not valid JSON: %s' % e
+    errors = testfile.validate_script(script)
+    observed = re.findall(r'^OBSERVED:\s*(PASS|FAIL)\s*-?\s*(.*)$', p.stdout, re.M)
+    return (None, '; '.join(errors)) if errors else (script, observed[-1] if observed else ('PASS', ''))
+
+
+def replay(app, root, test, script):
+    work, home, env, sub, variables = start_session(app, root, test.get('projects', []))
+    try:
+        ok, msg, log = runner.run_script(sub, script, work, home, variables)
+    finally:
+        sub('stop', capture_output=True)
+    return ok, msg
+
+
+def store(path, test_id, script, made_for):
+    """Put the script in the file as it is now, the file may have been saved by the web interface meanwhile."""
+    doc = testfile.ensure_ids(testfile.load(path))
+    for t in doc['tests']:
+        if t['id'] == test_id:
+            t['script'], t['script_for'] = script, made_for
+    testfile.save(path, doc)
+
+
+def main():
+    ap = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
+    ap.add_argument('app')
+    ap.add_argument('file')
+    ap.add_argument('--edition', choices=testfile.EDITIONS, help='the edition that APP is, only the tests for it')
+    ap.add_argument('--test', help='only tests whose name contains this')
+    ap.add_argument('--id', help='only the test with this id')
+    ap.add_argument('--force', action='store_true', help='also tests that have a script')
+    ap.add_argument('--model')
+    ap.add_argument('--attempts', type=int, default=3, help='tries per test, a failed replay is told to Claude')
+    args = ap.parse_args()
+    signal.signal(signal.SIGINT, signal.default_int_handler)   # also when started in the background
+    if not args.file.endswith(testfile.EXT):
+        sys.exit('error: FILE must be a %s test file, convert markdown or JSON with testfile.py convert' % testfile.EXT)
+    app = os.path.abspath(args.app)
+    doc = testfile.ensure_ids(testfile.load(args.file))
+    root = os.path.dirname(os.path.abspath(args.file))
+    errors = testfile.validate(doc, root)
+    if errors:
+        sys.exit('error: ' + '; '.join(errors))
+
+    failed = 0
+    for t in doc['tests']:
+        if args.test and args.test.lower() not in t['name'].lower() or args.id and t['id'] != args.id:
+            continue
+        if (t.get('script') and not args.force) or not t.get('enabled', True):
+            continue
+        if args.edition and args.edition not in testfile.editions(t):
+            print('%s: not a test for the %s edition' % (t['name'], args.edition), flush=True)
+            continue
+        combo = testfile.combinations(t)[0]
+        values = dict(combo, edition=args.edition) if args.edition else combo
+        made_for = testfile.definition_hash(t, root, doc.get('background'))   # the test may be edited while Claude works
+        print('%s: exploring...' % t['name'], flush=True)
+        previous, saved = '', False
+        for attempt in range(1, args.attempts + 1):
+            script, err = explore(app, root, t, combo, args.edition, args.model, doc.get('background'), previous)
+            if script is not None:
+                # the replay uses the first combination, as the exploration did
+                observed, why = err
+                ok, err = replay(app, root, t, testfile.subst_deep(script, values))
+                # a test that fails on the check that Claude saw fail by hand is a finding: the script is right
+                m = re.match(r'step (\d+)/', err)
+                finding = (not ok and observed == 'FAIL' and m and script[int(m.group(1)) - 1].get('observed_fail'))
+                if ok or finding:
+                    store(args.file, t['id'], script, made_for)
+                    print('%s: saved a script with %d steps (attempt %d)%s' % (
+                        t['name'], len(script), attempt,
+                        '. It FAILS on a check, as Claude saw: ' + why if finding else ''), flush=True)
+                    saved = True
+                    break
+                err = 'the replay of the script failed:\n' + err
+                previous = PREVIOUS.format(script=json.dumps(script, indent=1), error=err)
+            print('%s: attempt %d failed. %s' % (t['name'], attempt, err), flush=True)
+            if re.search(r'usage limit|rate limit|limit reached|out of credits', str(err), re.I):
+                sys.exit('error: Claude refuses to answer (limit), stopping. Run gen.py again later.')
+            if err.startswith('Claude: cannot'):
+                break
+        if not saved:
+            failed += 1
+            print('%s: no script saved' % t['name'], flush=True)
+    sys.exit(1 if failed else 0)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/gui/manualtest/guitest.py b/gui/manualtest/guitest.py
new file mode 100755
index 00000000000..0b28cd7031d
--- /dev/null
+++ b/gui/manualtest/guitest.py
@@ -0,0 +1,715 @@
+#!/usr/bin/env python3
+"""GUI test helper for Qt applications, driven through AT-SPI.
+
+The application runs in its own Xvfb display with its own D-Bus and
+accessibility bus, so the real desktop is never touched. Each subcommand is a
+separate process; the session state (environment, pids) lives in a JSON file.
+
+  guitest.py start APP [ARGS...]     start the session and the application
+  guitest.py tree                    show the accessibility tree
+  guitest.py click --name Recheck    click an element
+  guitest.py stop                    kill everything
+
+State file: $GUITEST_STATE, default /tmp/guitest-<uid>/state.json
+"""
+
+import argparse
+import contextlib
+import io
+import glob
+import json
+import os
+import re
+import shutil
+import signal
+import subprocess
+import struct
+import sys
+import tempfile
+import threading
+import time
+import warnings
+
+warnings.filterwarnings("ignore")
+
+STATE = os.environ.get('GUITEST_STATE', '/tmp/guitest-%d/state.json' % os.getuid())
+
+
+# ---------------------------------------------------------------- session
+
+def load_state():
+    try:
+        with open(STATE) as f:
+            return json.load(f)
+    except FileNotFoundError:
+        sys.exit('error: no session, run "guitest.py start APP" first')
+
+
+# the shell tells how the application ended in app.log: 139 is SIGSEGV, 134 SIGABRT, 143 killed by us
+WRAPPER = '"$@" & echo $! > "$0"; wait $!; echo "application exited with status $?" >&2'
+
+
+def launch(cmd, env, tmp, log):
+    """Start the application. Returns the shell that waits for it and the pid of the application."""
+    pidfile = os.path.join(tmp, 'app.pid')
+    if os.path.exists(pidfile):
+        os.remove(pidfile)
+    p = subprocess.Popen(['sh', '-c', WRAPPER, pidfile] + cmd, env=env, start_new_session=True,
+                         stdin=subprocess.DEVNULL, stdout=log, stderr=subprocess.STDOUT)
+    for _ in range(100):
+        try:
+            with open(pidfile) as f:
+                return p, int(f.read())
+        except (OSError, ValueError):
+            time.sleep(0.05)
+    sys.exit('error: the application did not start')
+
+
+def exit_info(state):
+    """' (exited with status 139, SIGSEGV)' when the log says how the application ended, else ''."""
+    try:
+        with open(os.path.join(state['tmp'], 'app.log'), errors='replace') as f:
+            m = re.findall(r'application exited with status (\d+)', f.read())
+    except OSError:
+        return ''
+    if not m:
+        return ''
+    code = int(m[-1])
+    sig = ', ' + signal.Signals(code - 128).name if 128 < code < 160 else ''
+    return ' (exited with status %d%s)' % (code, sig)
+
+
+def start(args):
+    if os.path.exists(STATE):
+        sys.exit('error: session already running (%s), run stop first' % STATE)
+    app = os.path.abspath(args.app)
+    if not os.access(app, os.X_OK):
+        sys.exit('error: not executable: ' + app)
+    for tool in ('Xvfb', 'xdotool', 'dbus-daemon', '/usr/libexec/at-spi-bus-launcher'):
+        if not shutil.which(tool) and not os.path.exists(tool):
+            sys.exit('error: missing ' + tool)
+
+    tmp = tempfile.mkdtemp(prefix='guitest-')
+    runtime = os.path.join(tmp, 'run')
+    home = args.home or os.path.join(tmp, 'home')
+    os.makedirs(runtime, mode=0o700)
+    os.makedirs(home, exist_ok=True)
+    # Cppcheck Premium needs its license file in HOME
+    lic = os.path.join('.cppcheckpremium', 'cppcheck-premium.lic')
+    src_lic = os.path.join(os.path.expanduser('~'), lic)
+    dst_lic = os.path.join(home, lic)
+    if os.path.isfile(src_lic) and os.path.realpath(src_lic) != os.path.realpath(dst_lic):
+        os.makedirs(os.path.dirname(dst_lic), exist_ok=True)
+        shutil.copy2(src_lic, dst_lic)
+    pids = []
+
+    def spawn(cmd, env, **kw):
+        kw.setdefault('stdout', subprocess.DEVNULL)
+        kw.setdefault('stderr', subprocess.DEVNULL)
+        p = subprocess.Popen(cmd, env=env, start_new_session=True, stdin=subprocess.DEVNULL, **kw)
+        pids.append(p.pid)
+        return p
+
+    env = dict(os.environ)
+    env.update(XDG_RUNTIME_DIR=runtime, HOME=home)
+    for k in ('XDG_CONFIG_HOME', 'XDG_DATA_HOME', 'XDG_CACHE_HOME', 'XDG_CONFIG_DIRS'):
+        env.pop(k, None)    # QSettings must not find the real preferences
+    env.pop('WAYLAND_DISPLAY', None)
+    env.pop('DBUS_SESSION_BUS_ADDRESS', None)
+
+    # session bus
+    out = subprocess.run(['dbus-daemon', '--session', '--fork', '--print-address', '--print-pid'],
+                         env=env, capture_output=True, text=True, check=True).stdout.split()
+    env['DBUS_SESSION_BUS_ADDRESS'] = out[0]
+    pids.append(int(out[1]))
+
+    # X server
+    r, w = os.pipe()
+    spawn(['Xvfb', '-displayfd', str(w), '-screen', '0', args.size + 'x24', '-fbdir', tmp],
+          env, pass_fds=(w,))
+    os.close(w)
+    env['DISPLAY'] = ':' + os.read(r, 16).decode().strip()
+    os.close(r)
+
+    # accessibility bus
+    spawn(['/usr/libexec/at-spi-bus-launcher', '--launch-immediately'], env)
+    for _ in range(100):
+        if glob.glob(os.path.join(runtime, 'at-spi', 'bus_*')):
+            break
+        time.sleep(0.1)
+    else:
+        kill(pids, tmp)
+        sys.exit('error: accessibility bus did not start')
+
+    env.update(QT_QPA_PLATFORM='xcb', QT_ACCESSIBILITY='1',
+               QT_LINUX_ACCESSIBILITY_ALWAYS_ON='1', QT_NO_XDG_DESKTOP_PORTAL='1',
+               QT_QPA_PLATFORMTHEME='generic',      # not the KDE file dialog, its KIO jobs crash in this session
+               LANG='C', LC_ALL='C')
+    log = open(os.path.join(tmp, 'app.log'), 'w')
+    appproc, app_pid = launch([app] + args.args, env, tmp, log)
+    pids.append(appproc.pid)
+
+    state = dict(env={k: env[k] for k in ('XDG_RUNTIME_DIR', 'HOME', 'DBUS_SESSION_BUS_ADDRESS', 'DISPLAY',
+                                          'QT_QPA_PLATFORM', 'QT_ACCESSIBILITY',
+                                          'QT_LINUX_ACCESSIBILITY_ALWAYS_ON', 'QT_NO_XDG_DESKTOP_PORTAL', 'QT_QPA_PLATFORMTHEME',
+                                          'LANG', 'LC_ALL')},
+                 pids=pids, app_pid=app_pid, app_pgid=appproc.pid, app_cmd=[app] + args.args, tmp=tmp)
+    os.makedirs(os.path.dirname(STATE), exist_ok=True)
+    with open(STATE, 'w') as f:
+        json.dump(state, f)
+
+    # wait for the application to show up on the accessibility bus
+    os.environ.update(state['env'])
+    for _ in range(100):
+        if appproc.poll() is not None:
+            print(open(os.path.join(tmp, 'app.log')).read())
+            kill(pids, tmp)
+            os.remove(STATE)
+            sys.exit('error: application exited with code %s' % appproc.returncode)
+        if find_app(state) is not None:
+            print('started, display %s, app log %s/app.log' % (env['DISPLAY'], tmp))
+            return
+        time.sleep(0.2)
+    sys.exit('error: application did not appear on the accessibility bus (see %s/app.log)' % tmp)
+
+
+def restart(args):
+    """Quit the application and start it again, same HOME so settings are kept."""
+    state = load_state()
+    try:
+        os.killpg(state['app_pgid'], signal.SIGTERM)
+    except ProcessLookupError:
+        pass
+    time.sleep(1)
+    env = dict(os.environ)
+    env.update(state['env'])
+    log = open(os.path.join(state['tmp'], 'app.log'), 'a')
+    p, state['app_pid'] = launch(state['app_cmd'], env, state['tmp'], log)
+    state['app_pgid'] = p.pid
+    state['pids'].append(p.pid)
+    with open(STATE, 'w') as f:
+        json.dump(state, f)
+    for _ in range(100):
+        if find_app(state) is not None:
+            print('restarted')
+            return
+        time.sleep(0.2)
+    sys.exit('error: application did not come back')
+
+
+def kill(pids, tmp):
+    for pid in reversed(pids):
+        try:
+            os.killpg(pid, signal.SIGTERM)
+        except (ProcessLookupError, PermissionError):
+            try:
+                os.kill(pid, signal.SIGTERM)
+            except (ProcessLookupError, PermissionError):
+                pass
+    time.sleep(0.3)
+    shutil.rmtree(tmp, ignore_errors=True)
+
+
+def stop(args):
+    try:
+        state = load_state()
+    except SystemExit:
+        return
+    kill(state['pids'], state['tmp'])
+    os.remove(STATE)
+    print('stopped')
+
+
+# ---------------------------------------------------------------- AT-SPI
+
+_atspi = None
+
+
+def atspi():
+    global _atspi
+    if _atspi is None:
+        os.environ.update(load_state()['env'])
+        import gi
+        gi.require_version('Atspi', '2.0')
+        from gi.repository import Atspi
+        _atspi = Atspi
+    return _atspi
+
+
+def find_app(state):
+    A = atspi()
+    desktop = A.get_desktop(0)
+    for i in range(desktop.get_child_count()):
+        try:
+            app = desktop.get_child_at_index(i)
+            if app is not None and app.get_process_id() == state['app_pid']:
+                return app
+        except Exception:
+            pass
+    return None
+
+
+def app_running(state):
+    """The process is there (a zombie is a crashed application nobody has collected)."""
+    try:
+        with open('/proc/%d/stat' % state['app_pid']) as f:
+            return f.read().rsplit(')', 1)[1].split()[0] != 'Z'
+    except OSError:
+        return False
+
+
+def get_app():
+    state = load_state()
+    for _ in range(25):     # the application does not answer on the accessibility bus while a modal dialog opens
+        app = find_app(state)
+        if app is not None:
+            return app
+        if not app_running(state):
+            break
+        time.sleep(0.2)
+    if app_running(state):
+        sys.exit('error: the application is running but does not answer on the accessibility bus (busy or hung?)')
+    sys.exit('error: the application is not running%s. log: %s/app.log' % (exit_info(state) or ' (crashed?)', state['tmp']))
+
+
+def children(node):
+    try:
+        for i in range(node.get_child_count()):
+            c = node.get_child_at_index(i)
+            if c is not None:
+                yield i, c
+    except Exception:
+        return
+
+
+def states(node):
+    A = atspi()
+    st = node.get_state_set()
+    names = []
+    for label, s in (('showing', A.StateType.SHOWING), ('enabled', A.StateType.ENABLED),
+                     ('focused', A.StateType.FOCUSED), ('checked', A.StateType.CHECKED),
+                     ('selected', A.StateType.SELECTED), ('expanded', A.StateType.EXPANDED),
+                     ('editable', A.StateType.EDITABLE), ('modal', A.StateType.MODAL)):
+        if st.contains(s):
+            names.append(label)
+    return names
+
+
+def walk(node, path=(), depth=0):
+    yield path, node, depth
+    for i, c in children(node):
+        yield from walk(c, path + (i,), depth + 1)
+
+
+def node_text(node):
+    # the interface functions take the accessible as first argument, node.get_text_iface() does not work here
+    A = atspi()
+    try:
+        if 'Text' in A.Accessible.get_interfaces(node):
+            return A.Text.get_text(node, 0, min(A.Text.get_character_count(node), 2000))
+    except Exception:
+        pass
+    return None
+
+
+def node_value(node):
+    A = atspi()
+    try:
+        if 'Value' in A.Accessible.get_interfaces(node):
+            return A.Value.get_current_value(node)
+    except Exception:
+        pass
+    return None
+
+
+def extents(node):
+    A = atspi()
+    try:
+        e = node.get_component_iface().get_extents(A.CoordType.SCREEN)
+        return e.x, e.y, e.width, e.height
+    except Exception:
+        return None
+
+
+def describe(path, node, with_geom=True):
+    name = node.get_name() or ''
+    s = '%s %s %r' % ('.'.join(map(str, path)) or '-', node.get_role_name(), name)
+    text = node_text(node)
+    if text and text != name:
+        s += ' text=%r' % (text if len(text) < 200 else text[:200] + '...')
+    val = node_value(node)
+    if val is not None:
+        s += ' value=%s' % val
+    st = states(node)
+    if st:
+        s += ' [%s]' % ','.join(st)
+    g = extents(node)
+    if with_geom and g and g[2] > 0:
+        s += ' @%d,%d %dx%d' % g
+    return s
+
+
+def cmd_tree(args):
+    app = get_app()
+    root, rootpath = app, ()
+    if args.path:
+        rootpath = tuple(int(x) for x in args.path.split('.'))
+        for i in rootpath:
+            root = root.get_child_at_index(i)
+    for path, node, depth in walk(root, rootpath):
+        d = len(path) - len(rootpath)
+        if d > args.depth:
+            continue
+        if args.showing and 'showing' not in states(node) and d > 0:
+            continue
+        print('  ' * d + describe(path, node))
+
+
+def cmd_windows(args):
+    app = get_app()
+    for i, c in children(app):
+        print(describe((i,), c))
+
+
+def cmd_texts(args):
+    """All visible text on screen, one line per element, for checking EXPECTED."""
+    app = get_app()
+    for path, node, depth in walk(app):
+        if 'showing' not in states(node):
+            continue
+        role = node.get_role_name()
+        name = node.get_name() or ''
+        text = node_text(node)
+        if role in ('label', 'push button', 'check box', 'radio button', 'menu item', 'text', 'entry',
+                    'page tab', 'combo box', 'table cell', 'tree item', 'list item', 'status bar',
+                    'title bar', 'spin button', 'frame', 'dialog', 'alert') or text:
+            line = '%s %s %r' % ('.'.join(map(str, path)), role, name)
+            if text and text != name:
+                line += ' text=%r' % text
+            if 'checked' in states(node):
+                line += ' [checked]'
+            print(line)
+
+
+# ---------------------------------------------------------------- finding
+
+def select(args, need_showing=True):
+    app = get_app()
+    if args.path:
+        node = app
+        for i in (int(x) for x in args.path.split('.')):
+            node = node.get_child_at_index(i)
+            if node is None:
+                sys.exit('error: no such path')
+        return node
+    matches = []
+    for path, node, depth in walk(app):
+        role = node.get_role_name()
+        if args.role and args.role.lower() != role.lower():
+            continue
+        name = node.get_name() or ''
+        text = ''       # found by name only: the text of a panel would match the message of an error
+        if args.name is not None:
+            want = args.name.lower()
+            if args.exact:
+                if name.lower() != want and text.lower() != want:
+                    continue
+            elif want not in name.lower() and want not in text.lower():
+                continue
+        elif not args.role:
+            sys.exit('error: give --name, --role or --path')
+        if need_showing and 'showing' not in states(node):
+            continue
+        matches.append((path, node))
+    if not matches:
+        sys.exit('error: no matching visible element (name=%r role=%r); try "tree --showing"' % (args.name, args.role))
+    if args.nth is None and len(matches) > 1:
+        lines = '\n'.join('  ' + describe(p, n) for p, n in matches[:15])
+        sys.exit('error: %d matches, narrow with --role/--exact or pick with --nth N (0-based):\n%s' % (len(matches), lines))
+    nth = args.nth or 0
+    if nth >= len(matches):
+        sys.exit('error: no matching visible element: only %d match(es) for name=%r role=%r, nth=%d is too high'
+                 % (len(matches), args.name, args.role, nth))
+    return matches[nth][1]
+
+
+def xdo(*a):
+    env = dict(os.environ)
+    env.update(load_state()['env'])
+    subprocess.run(['xdotool'] + [str(x) for x in a], env=env, check=True)
+
+
+def center(node):
+    g = extents(node)
+    if not g or g[2] <= 0:
+        sys.exit('error: element has no geometry')
+    return g[0] + g[2] // 2, g[1] + g[3] // 2
+
+
+def mouse(node, button=1, count=1):
+    x, y = center(node)
+    xdo('mousemove', x, y)
+    time.sleep(0.05)
+    xdo('click', '--repeat', count, '--delay', 80, button)
+
+
+def do_action(node):
+    A = atspi()
+    try:
+        act = node.get_action_iface()
+        if act is None:
+            return False
+        for i in range(act.get_n_actions()):
+            if act.get_action_name(i).lower() in ('click', 'press', 'toggle', 'activate', 'check', 'uncheck'):
+                return act.do_action(i)
+    except Exception:
+        pass
+    return False
+
+
+def cmd_click(args):
+    node = select(args)
+    desc = describe((), node, False)
+    if args.mouse:
+        mouse(node)
+    else:
+        # the action of a button that opens a modal dialog does not return until the dialog is closed
+        done = []
+        t = threading.Thread(target=lambda: done.append(do_action(node)), daemon=True)
+        t.start()
+        t.join(args.settle + 1)
+        if done == [False]:
+            mouse(node)
+        elif not done:
+            time.sleep(args.settle)
+            print('clicked ' + desc, flush=True)
+            os._exit(0)
+    time.sleep(args.settle)
+    print('clicked ' + desc)
+
+
+def cmd_rightclick(args):
+    node = select(args)
+    mouse(node, 3)
+    time.sleep(args.settle)
+    print('right-clicked ' + describe((), node, False))
+
+
+def cmd_doubleclick(args):
+    node = select(args)
+    mouse(node, 1, 2)
+    time.sleep(args.settle)
+    print('double-clicked ' + describe((), node, False))
+
+
+def cmd_focus(args):
+    node = select(args)
+    ok = node.get_component_iface().grab_focus()
+    if not ok:
+        mouse(node)
+    print('focused ' + describe((), node, False))
+
+
+def cmd_settext(args):
+    node = select(args)
+    et = node.get_editable_text_iface()
+    if et is None:
+        sys.exit('error: element is not editable text')
+    et.set_text_contents(args.value)
+    time.sleep(args.settle)
+    print('set text of ' + describe((), node, False))
+
+
+def cmd_type(args):
+    xdo('type', '--delay', 20, '--', args.value)
+    time.sleep(args.settle)
+
+
+def cmd_key(args):
+    xdo('key', *args.keys)
+    time.sleep(args.settle)
+
+
+def cmd_hover(args):
+    x, y = center(select(args))
+    xdo('mousemove', x, y)
+
+
+def cmd_wait(args):
+    deadline = time.time() + args.timeout
+    while True:
+        try:
+            node = select(args)
+            found = describe((), node, False)
+        except SystemExit as e:
+            if 'matches' in str(e):          # ambiguous means it exists
+                found = str(e).split('\n')[0]
+            else:
+                found = None
+        if args.gone != (found is not None):
+            print('gone' if args.gone else 'found ' + found)
+            return
+        if time.time() > deadline:
+            sys.exit('error: timeout waiting for element %s' % ('to disappear' if args.gone else 'to appear'))
+        time.sleep(0.3)
+
+
+def cmd_info(args):
+    """One line about the element: role, name, text, value and [states]."""
+    print(describe((), select(args), False))
+
+
+def cmd_suggest(args):
+    """Visible named elements, the ones most like --name first (for error messages)."""
+    import difflib
+    want = (args.name or '').lower()
+    items = []
+    for path, node, depth in walk(get_app()):
+        name = (node.get_name() or '').strip()
+        if name and 'showing' in states(node):
+            items.append((node.get_role_name(), name))
+    items.sort(key=lambda it: ((it[0].lower() != (args.role or '').lower()) if args.role else 0,
+                               -difflib.SequenceMatcher(None, want, it[1].lower()).ratio()))
+    seen = []
+    for it in items:
+        if it not in seen:
+            seen.append(it)
+            print('%s %r' % it)
+        if len(seen) >= args.limit:
+            break
+
+
+def cmd_screenshot(args):
+    from PIL import Image
+    state = load_state()
+    src = os.path.join(state['tmp'], 'Xvfb_screen0')
+    data = open(src, 'rb').read()
+    (hdr, _ver, _fmt, _depth, w, h, _xoff, _bo, _bu, _bbo, _bp, bpp, bpl, _vc,
+     rm, gm, bm, _bpr, _ncm, ncolors) = struct.unpack('>20I', data[:80])
+    off = hdr + ncolors * 12
+    img = Image.frombuffer('RGB', (w, h), data[off:off + bpl * h], 'raw', 'BGRX', bpl, 1)
+    img.save(args.file)
+    print('saved %s (%dx%d)' % (args.file, w, h))
+
+
+def cmd_ocr(args):
+    """Text on the screen read by tesseract, also what AT-SPI does not show (some context menus)."""
+    import tempfile
+    png = os.path.join(tempfile.mkdtemp(prefix='guitest-ocr-'), 'screen.png')
+    args.file = png
+    with contextlib.redirect_stdout(io.StringIO()):
+        cmd_screenshot(args)
+    from PIL import Image
+    img = Image.open(png)
+    img = img.resize((img.width * 2, img.height * 2), Image.LANCZOS)
+    img.save(png)
+    p = subprocess.run(['tesseract', png, '-', '--psm', '11'], capture_output=True, text=True)
+    if p.returncode:
+        sys.exit('error: tesseract failed: ' + p.stderr.strip())
+    shutil.rmtree(os.path.dirname(png), ignore_errors=True)
+    print(p.stdout)
+
+
+def cmd_log(args):
+    print(open(os.path.join(load_state()['tmp'], 'app.log')).read())
+
+
+def cmd_alive(args):
+    sys.exit(0 if app_running(load_state()) else 'application is not running')
+
+
+# ---------------------------------------------------------------- cli
+
+def selector(p):
+    p.add_argument('--name', help='substring of accessible name or text (case-insensitive)')
+    p.add_argument('--role', help='role, e.g. "push button", "menu item", "tree item", "check box"')
+    p.add_argument('--path', help='path from "tree", e.g. 0.1.2')
+    p.add_argument('--nth', type=int, help='pick the Nth match (0-based)')
+    p.add_argument('--exact', action='store_true', help='--name must match exactly')
+
+
+def main():
+    ap = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
+    sub = ap.add_subparsers(dest='cmd', required=True)
+
+    p = sub.add_parser('start', help='start session and application')
+    p.add_argument('app')
+    p.add_argument('args', nargs='*')
+    p.add_argument('--home', help='HOME for the application (default: empty temporary dir)')
+    p.add_argument('--size', default='1280x900')
+    p.set_defaults(f=start)
+
+    sub.add_parser('stop', help='stop session').set_defaults(f=stop)
+    sub.add_parser('restart', help='quit and start the application again (settings are kept)').set_defaults(f=restart)
+    sub.add_parser('alive', help='exit 0 if the application is running').set_defaults(f=cmd_alive)
+    sub.add_parser('log', help='application stdout/stderr').set_defaults(f=cmd_log)
+    sub.add_parser('windows', help='top level windows and dialogs').set_defaults(f=cmd_windows)
+    sub.add_parser('texts', help='all visible texts').set_defaults(f=cmd_texts)
+
+    p = sub.add_parser('tree', help='accessibility tree')
+    p.add_argument('--depth', type=int, default=99)
+    p.add_argument('--path', help='only this subtree')
+    p.add_argument('--showing', action='store_true', help='only visible elements')
+    p.set_defaults(f=cmd_tree)
+
+    for name, f, h in (('click', cmd_click, 'click (uses the accessibility action when there is one)'),
+                       ('rightclick', cmd_rightclick, 'right click (opens context menu)'),
+                       ('doubleclick', cmd_doubleclick, 'double click'),
+                       ('focus', cmd_focus, 'give keyboard focus'),
+                       ('hover', cmd_hover, 'move the mouse over the element')):
+        p = sub.add_parser(name, help=h)
+        selector(p)
+        p.add_argument('--settle', type=float, default=0.5, help='seconds to wait afterwards')
+        if name == 'click':
+            p.add_argument('--mouse', action='store_true', help='use a real mouse click')
+        p.set_defaults(f=f)
+
+    p = sub.add_parser('settext', help='replace the text of an edit field')
+    selector(p)
+    p.add_argument('value')
+    p.add_argument('--settle', type=float, default=0.3)
+    p.set_defaults(f=cmd_settext)
+
+    p = sub.add_parser('type', help='type text with the keyboard into the focused element')
+    p.add_argument('value')
+    p.add_argument('--settle', type=float, default=0.3)
+    p.set_defaults(f=cmd_type)
+
+    p = sub.add_parser('key', help='press keys, xdotool syntax, e.g. Return ctrl+o Escape')
+    p.add_argument('keys', nargs='+')
+    p.add_argument('--settle', type=float, default=0.3)
+    p.set_defaults(f=cmd_key)
+
+    p = sub.add_parser('wait', help='wait until a (visible) element exists')
+    selector(p)
+    p.add_argument('--timeout', type=float, default=10)
+    p.add_argument('--gone', action='store_true', help='wait until it disappears')
+    p.set_defaults(f=cmd_wait)
+
+    p = sub.add_parser('info', help='role, name, text, value and states of one element')
+    selector(p)
+    p.set_defaults(f=cmd_info)
+
+    p = sub.add_parser('suggest', help='visible elements most similar to --name/--role')
+    p.add_argument('--name')
+    p.add_argument('--role')
+    p.add_argument('--limit', type=int, default=8)
+    p.set_defaults(f=cmd_suggest)
+
+    p = sub.add_parser('ocr', help='print the text on the screen as read by tesseract (for what "texts" does not show)')
+    p.set_defaults(f=cmd_ocr)
+    p = sub.add_parser('screenshot', help='save a PNG of the screen')
+    p.add_argument('file')
+    p.set_defaults(f=cmd_screenshot)
+
+    args = ap.parse_args()
+    try:  # command history next to the state file, so a watcher can see what a test is doing
+        with open(os.path.join(os.path.dirname(STATE), 'commands.log'), 'a') as f:
+            f.write(time.strftime('%H:%M:%S ') + ' '.join(sys.argv[1:]) + '\n')
+    except OSError:
+        pass
+    args.f(args)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/gui/manualtest/mainwindow.md b/gui/manualtest/mainwindow.md
deleted file mode 100644
index 563a538530f..00000000000
--- a/gui/manualtest/mainwindow.md
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# Main window
-
-Some manual testing in the main window interface
-
-
-## Test: Recheck file
-
-1. Load a project with results.
-1. Restart the GUI.
-1. Right click on a file and click on "Recheck".
-
-EXPECTED: Results for that file should be refreshed.
-
-
-## Test: Switch project
-
-1. Open project #1
-1. Open project #2 that has different results
-
-EXPECTED: Results for project #1 should go away, results for project #2 should be shown
diff --git a/gui/manualtest/report.py b/gui/manualtest/report.py
new file mode 100644
index 00000000000..e84df758eb9
--- /dev/null
+++ b/gui/manualtest/report.py
@@ -0,0 +1,408 @@
+"""The HTML report of a run.py run: summary, results per test file, history over the earlier runs,
+the failed tests with their screenshots and all tests. One file, no external resources.
+
+write(path, run, history) where run is what run.py saves as results.json and history is the
+results.json of earlier runs of the same edition, oldest first.
+"""
+
+import html
+import os
+
+STATUSES = ('PASS', 'FAIL', 'SKIP')
+ICON = {'PASS': '✓', 'FAIL': '✗', 'SKIP': '–', None: ''}
+COLOR = {'PASS': 'var(--pass)', 'FAIL': 'var(--fail)', 'SKIP': 'var(--skip)'}
+HISTORY_RUNS = 15      # columns in the history, including this run
+
+CSS = """
+:root {
+  --ink: #1b2330; --ink-2: #4a5568; --muted: #6b7686; --line: #e2e6ec; --line-2: #cfd6df; --paper: #fff; --band: #f7f8fa;
+  --accent: #2456c8; --accent-soft: #e8eefb;
+  --pass: #0ca30c; --pass-bg: #e4f5e4; --pass-ink: #0b5a0b;
+  --fail: #d03b3b; --fail-bg: #fbe6e6; --fail-ink: #9a1d1d;
+  --skip: #fab219; --skip-bg: #fdf2d6; --skip-ink: #6e4b00;
+  --none: #dfe3e9;
+  --sans: system-ui, -apple-system, "Segoe UI", Ubuntu, Cantarell, Roboto, sans-serif;
+  --mono: ui-monospace, "DejaVu Sans Mono", Menlo, Consolas, monospace;
+  color-scheme: light;
+}
+* { box-sizing: border-box; }
+body { margin: 0; background: var(--paper); color: var(--ink); font: 14px/1.5 var(--sans); }
+main { max-width: 72rem; margin: 0 auto; padding: 1.6rem max(16px, 2.2rem) 3rem; }
+h1, h2, h3 { margin: 0; text-wrap: balance; }
+a { color: var(--accent); }
+section { margin-top: 2rem; }
+h2 { font-size: 1.02rem; font-weight: 650; margin-bottom: .2rem; }
+.sub { color: var(--muted); font-size: .85rem; margin: 0 0 .8rem; }
+.rhead { display: flex; gap: 1rem 2rem; align-items: flex-start; justify-content: space-between; flex-wrap: wrap; }
+.rhead h1 { font-size: 1.35rem; font-weight: 650; }
+.eyebrow { text-transform: uppercase; letter-spacing: .08em; font-size: .72rem; color: var(--muted); font-weight: 600; }
+.verdict { border-radius: 8px; padding: .45rem .85rem; font-weight: 650; }
+.verdict.FAIL { background: var(--fail-bg); color: var(--fail-ink); }
+.verdict.PASS { background: var(--pass-bg); color: var(--pass-ink); }
+.meta { display: grid; grid-template-columns: repeat(auto-fill, minmax(13rem, 1fr)); gap: .55rem 1.5rem; margin: 1.1rem 0 0;
+        padding-top: 1rem; border-top: 1px solid var(--line); }
+.meta div { min-width: 0; }
+.meta dt { font-size: .75rem; color: var(--muted); }
+.meta dd { margin: 0; overflow-wrap: anywhere; }
+.meta dd.mono { font-family: var(--mono); font-size: .85rem; }
+.dirty, .aborted { color: var(--fail-ink); }
+.dirty { font-size: .75rem; margin-left: .3rem; }
+.tiles { display: grid; grid-template-columns: repeat(auto-fit, minmax(10rem, 1fr)); gap: .8rem; margin-top: 1.4rem; }
+.tile { border: 1px solid var(--line); border-radius: 8px; padding: .75rem .9rem; }
+.tile .lbl { font-size: .8rem; color: var(--muted); display: flex; align-items: center; gap: .4rem; }
+.tile .val { font-size: 1.7rem; font-weight: 650; line-height: 1.2; font-variant-numeric: tabular-nums; }
+.tile .note { font-size: .78rem; color: var(--muted); }
+.dot { width: .6rem; height: .6rem; border-radius: 50%; display: inline-block; flex: none; }
+.d-PASS { background: var(--pass); } .d-FAIL { background: var(--fail); } .d-SKIP { background: var(--skip); }
+.chip { display: inline-block; border-radius: 5px; padding: 0 .45rem; font-size: .75rem; font-weight: 650; line-height: 1.6; white-space: nowrap; }
+.c-PASS { background: var(--pass-bg); color: var(--pass-ink); }
+.c-FAIL { background: var(--fail-bg); color: var(--fail-ink); }
+.c-SKIP { background: var(--skip-bg); color: var(--skip-ink); }
+.c-CRASH { background: var(--fail-ink); color: #fff; }
+.c-NEW { background: var(--accent-soft); color: var(--accent); }
+.legend { display: flex; gap: 1rem; flex-wrap: wrap; font-size: .8rem; color: var(--ink-2); margin: .2rem 0 .5rem; }
+.legend span { display: inline-flex; align-items: center; gap: .35rem; }
+.chart { overflow-x: auto; }
+.chart svg { display: block; width: 100%; height: auto; min-width: 34rem; }
+.chart text { font-family: var(--sans); fill: var(--ink-2); font-size: 12px; }
+.chart text.m { fill: var(--muted); font-size: 11px; }
+.chart text.b { fill: var(--ink); font-weight: 600; }
+.chart text.sha { font-family: var(--mono); font-size: 9.5px; fill: var(--muted); }
+.chart .grid { stroke: var(--line); stroke-width: 1; }
+.cols { display: grid; grid-template-columns: repeat(auto-fit, minmax(20rem, 1fr)); gap: 1.5rem 2.5rem; }
+.cols > * { min-width: 0; }
+.changes { display: grid; gap: .45rem; }
+.changes div { display: flex; gap: .5rem; align-items: baseline; flex-wrap: wrap; }
+.file { color: var(--muted); font-size: .8rem; }
+.tbl { overflow-x: auto; }
+table.tests { border-collapse: collapse; width: 100%; min-width: 40rem; }
+.tests th { text-align: left; font-size: .75rem; color: var(--muted); font-weight: 600; padding: .35rem .6rem; border-bottom: 1px solid var(--line-2); }
+.tests td { padding: .45rem .6rem; border-bottom: 1px solid var(--line); vertical-align: top; }
+.tests tr.grp td { background: var(--band); font-weight: 600; font-size: .82rem; color: var(--ink-2); padding-top: .55rem; }
+.tests tr.grp span { font-weight: 400; color: var(--muted); }
+.tests td.t { white-space: nowrap; text-align: right; font-variant-numeric: tabular-nums; color: var(--ink-2); }
+.tests td.links { white-space: nowrap; font-size: .82rem; }
+.tests details { margin-top: .3rem; font-size: .82rem; }
+.tests summary { color: var(--muted); cursor: pointer; }
+.reason { font-family: var(--mono); font-size: .8rem; color: var(--ink-2); white-space: pre-wrap; overflow-wrap: anywhere; }
+.strip { display: flex; gap: 2px; width: 11rem; margin-top: .35rem; }
+.strip i { flex: 1; height: .5rem; background: var(--pass); }
+.strip i:first-child { border-radius: 3px 0 0 3px; } .strip i:last-child { border-radius: 0 3px 3px 0; }
+.strip i.f { background: var(--fail); } .strip i.n { background: var(--none); }
+.stripnote { font-size: .75rem; color: var(--muted); }
+.card { border: 1px solid var(--line); border-left: 4px solid var(--fail); border-radius: 8px; padding: .9rem 1rem; display: grid; gap: .5rem; }
+.card + .card { margin-top: .8rem; }
+.card.SKIP { border-left-color: var(--skip); }
+.card-head { display: flex; gap: .5rem; align-items: baseline; flex-wrap: wrap; }
+.card-head h3 { font-size: .98rem; }
+.card-head .links { margin-left: auto; font-size: .82rem; }
+.film { display: flex; gap: .6rem; overflow-x: auto; padding-bottom: .3rem; }
+.shot { flex: none; width: 10.5rem; font-size: .75rem; color: var(--ink-2); text-decoration: none; }
+.shot:hover b { text-decoration: underline; }
+.shot img { display: block; width: 100%; aspect-ratio: 4/3; object-fit: cover; object-position: left top;
+            border: 1px solid var(--line-2); border-radius: 5px; background: var(--band); }
+.shot.bad img { outline: 3px solid var(--fail); outline-offset: -1px; }
+.shot b { color: var(--ink); }
+.film.small .shot { width: 7.5rem; }
+table.hgrid { border-collapse: separate; border-spacing: 3px; }
+.hgrid th.name { text-align: right; padding-right: .6rem; font-size: .82rem; font-weight: 500; white-space: nowrap; }
+.hgrid th.run { font-size: .68rem; color: var(--muted); font-weight: 500; text-align: center; }
+.hgrid th.run.cur { color: var(--ink); font-weight: 700; }
+.hgrid td.cell { width: 1.6rem; height: 1.35rem; border-radius: 3px; text-align: center; font-size: .72rem; font-weight: 700; color: #fff; background: var(--band); }
+.hgrid td.PASS { background: var(--pass); } .hgrid td.FAIL { background: var(--fail); }
+.hgrid td.SKIP { background: var(--skip); color: var(--skip-ink); }
+.hgrid td.cur { box-shadow: 0 0 0 2px var(--paper), 0 0 0 3.5px var(--ink); }
+.hgrid td.note { font-size: .78rem; color: var(--muted); padding-left: .7rem; white-space: nowrap; }
+@media (max-width: 520px) { .card-head .links { margin-left: 0; width: 100%; } }
+"""
+
+e = html.escape
+
+
+def dur(s):
+    s = int(round(s))
+    return '%d min %d s' % (s // 60, s % 60) if s >= 60 else '%d s' % s
+
+
+def chip(status):
+    return '<span class="chip c-%s">%s %s</span>' % (status, ICON[status], status)
+
+
+def crash_chip(r):
+    return ' <span class="chip c-CRASH">CRASH</span>' if r['crash'] else ''
+
+
+def count(results, status):
+    return sum(1 for r in results if r['status'] == status)
+
+
+def short_date(started):
+    return '%d/%d' % (int(started[5:7]), int(started[8:10]))
+
+
+def links(r, outdir):
+    """Links to the files of a test that exist (a skipped test has none)."""
+    out = [(r['slug'] + ext, text) for ext, text in (('.txt', 'steps'), ('.app.log', 'app log'), ('.png', 'screenshot'))
+           if os.path.exists(os.path.join(outdir, r['slug'] + ext))]
+    return ' · '.join('<a href="%s">%s</a>' % (e(f), t) for f, t in out)
+
+
+def strip(r):
+    """One cell per step: green passed, red failed, grey not run."""
+    n, at = r.get('steps', 0), r.get('failed_step', 0)
+    if not n:
+        return ''
+    if r['status'] == 'SKIP':
+        cells, note = ['n'] * n, 'not run'
+    elif r['status'] == 'FAIL' and not at and not r['crash']:
+        cells, note = ['n'] * n, 'did not start'
+    else:
+        cells = ['' if not at or k < at else 'f' if k == at else 'n' for k in range(1, n + 1)]
+        note = 'failed at step %d of %d' % (at, n) if at else '%d of %d steps' % (n, n)
+    return '<div class="strip" title="%s">%s</div><div class="stripnote">%s</div>' % (
+        note, ''.join('<i class="%s"></i>' % c for c in cells), note)
+
+
+def hbar(x, y, w, h, r, fill, tip):
+    """A horizontal bar, rounded at the data end only."""
+    r = min(r, w / 2, h / 2)
+    return ('<path d="M%.1f,%.1fh%.1fa%.1f,%.1f 0 0 1 %.1f,%.1fv%.1fa%.1f,%.1f 0 0 1 -%.1f,%.1fh-%.1fz" fill="%s"><title>%s</title></path>'
+            % (x, y, w - r, r, r, r, r, h - 2 * r, r, r, r, r, w - r, fill, e(tip)))
+
+
+def vbar(x, base, w, h, r, fill, tip, top):
+    """A column segment; the top segment is rounded at the data end."""
+    if not top:
+        return '<rect x="%.1f" y="%.1f" width="%.1f" height="%.1f" fill="%s"><title>%s</title></rect>' % (x, base - h, w, h, fill, e(tip))
+    r = min(r, w / 2, h)
+    return ('<path d="M%.1f,%.1fv-%.1fa%.1f,%.1f 0 0 1 %.1f,-%.1fh%.1fa%.1f,%.1f 0 0 1 %.1f,%.1fv%.1fz" fill="%s"><title>%s</title></path>'
+            % (x, base, h - r, r, r, r, r, w - 2 * r, r, r, r, r, h - r, fill, e(tip)))
+
+
+def legend():
+    return '<div class="legend">%s</div>' % ''.join('<span><i class="dot d-%s"></i>%s</span>' % (k, k) for k in STATUSES)
+
+
+def per_file_chart(run):
+    rows = []
+    for f in run['files']:
+        rs = [r for r in run['results'] if r['file'] == f['file']]
+        if rs:
+            rows.append(dict({k: count(rs, k) for k in STATUSES}, title=f['title'] or f['file'], n=len(rs)))
+    big = max(r['n'] for r in rows)
+    step = 1 if big <= 10 else 5 if big <= 50 else 20
+    top = -(-big // step) * step
+    left, width, rh, h = 210, 900, 30, 18
+    bw = width - left - 70
+    sx = lambda v: v / top * bw
+    s = []
+    for v in range(0, top + 1, step):
+        s.append('<line class="grid" x1="%.1f" x2="%.1f" y1="4" y2="%d"/><text class="m" x="%.1f" y="%d" text-anchor="middle">%d</text>'
+                 % (left + sx(v), left + sx(v), len(rows) * rh + 4, left + sx(v), len(rows) * rh + 20, v))
+    for i, r in enumerate(rows):
+        y = 8 + i * rh
+        title = r['title'] if len(r['title']) <= 30 else r['title'][:29] + '…'
+        s.append('<text x="%d" y="%.1f" text-anchor="end">%s<title>%s</title></text>' % (left - 10, y + h / 2 + 4, e(title), e(r['title'])))
+        x = left
+        segs = [k for k in STATUSES if r[k]]
+        for j, k in enumerate(segs):
+            last = j == len(segs) - 1
+            w = sx(r[k]) - (0 if last else 2)       # a 2px gap between the segments
+            tip = '%s\n%d %s of %d tests' % (r['title'], r[k], k, r['n'])
+            s.append(hbar(x, y, w, h, 4, COLOR[k], tip) if last else
+                     '<rect x="%.1f" y="%d" width="%.1f" height="%d" fill="%s"><title>%s</title></rect>' % (x, y, w, h, COLOR[k], e(tip)))
+            x += sx(r[k])
+        s.append('<text class="b" x="%.1f" y="%.1f">%d/%d</text>' % (x + 8, y + h / 2 + 4, r['PASS'], r['n']))
+    return ('<div class="chart"><svg viewBox="0 0 %d %d" role="img" aria-label="Passed, failed and skipped tests per test file">%s</svg></div>'
+            % (width, len(rows) * rh + 28, ''.join(s)))
+
+
+def trend_chart(runs):
+    width, left, base, top = 900, 34, 190, 14
+    n = len(runs)
+    bw = min(30, (width - left - 30) / n * 0.6)
+    gap = min((width - left - 20 - n * bw) / max(n - 1, 1), 30)
+    big = max(len(r['results']) for r in runs) or 1
+    step = 5 if big <= 25 else 10 if big <= 60 else 50
+    ymax = -(-big // step) * step
+    sy = lambda v: v / ymax * (base - top)
+    s = []
+    for v in range(0, ymax + 1, step):
+        s.append('<line class="grid" x1="%d" x2="%d" y1="%.1f" y2="%.1f"/><text class="m" x="%d" y="%.1f" text-anchor="end">%d</text>'
+                 % (left, width - 10, base - sy(v), base - sy(v), left - 6, base - sy(v) + 4, v))
+    for i, run in enumerate(runs):
+        x, cur = left + 6 + i * (bw + gap), i == n - 1
+        c = {k: count(run['results'], k) for k in STATUSES}
+        tip = 'Run %s · %s%s\n%d pass · %d fail · %d skip' % (run['started'][:16].replace('T', ' '), run['sha'][:8],
+                                                             ' (aborted)' if run.get('aborted') else '', c['PASS'], c['FAIL'], c['SKIP'])
+        y0 = base
+        segs = [k for k in STATUSES if c[k]]
+        for j, k in enumerate(segs):
+            last = j == len(segs) - 1
+            s.append(vbar(x, y0, bw, sy(c[k]) - (0 if last else 2), 4, COLOR[k], tip, last))
+            y0 -= sy(c[k])
+        if c['FAIL']:
+            s.append('<text class="b" x="%.1f" y="%.1f" text-anchor="middle">%d</text>' % (x + bw / 2, y0 - 6, c['FAIL']))
+        s.append('<text class="%s" x="%.1f" y="%d" text-anchor="middle">%s</text>' % ('b' if cur else 'm', x + bw / 2, base + 16, short_date(run['started'])))
+        s.append('<text class="sha" x="%.1f" y="%d" text-anchor="middle">%s</text>' % (x + bw / 2, base + 30, e(run['sha'][:6])))
+        if cur:
+            s.append('<text class="b" x="%.1f" y="%d" text-anchor="middle">this run</text>' % (x + bw / 2, base + 46))
+    return ('<div class="chart"><svg viewBox="0 0 %d %d" role="img" aria-label="Passed, failed and skipped tests in the last runs">%s</svg></div>'
+            % (width, base + 52, ''.join(s)))
+
+
+def describe_history(h, runs):
+    """What a row of the status history says: flaky, failing since, fixed since..."""
+    seen = [x for x in h if x]
+    last = h[-1]
+    changes = sum(1 for a, b in zip(seen, seen[1:]) if a != b)
+    since = len(h) - 1
+    while since > 0 and h[since - 1] == last:
+        since -= 1
+    when = '%s %s (%s)' % (short_date(runs[since]['started']), runs[since]['started'][11:16], runs[since]['sha'][:6])
+    if all(x == 'SKIP' for x in seen):
+        return 'never ran'
+    if changes >= 4:
+        return 'flaky: %d changes' % changes
+    if last == 'FAIL':
+        return 'new failure' if since == len(h) - 1 else 'failing since ' + when
+    if last == 'SKIP':
+        return 'skipped since ' + short_date(runs[since]['started'])
+    return 'fixed since ' + when if last == 'PASS' else ''
+
+
+def history_sections(run, history):
+    runs = history[-(HISTORY_RUNS - 1):] + [run]
+    status = [{r['name']: r['status'] for r in x['results']} for x in runs]
+    prev = status[-2]
+    cur = run['results']
+    new = [r for r in cur if r['status'] == 'FAIL' and prev.get(r['name']) != 'FAIL']
+    fixed = [r for r in cur if r['status'] == 'PASS' and prev.get(r['name']) == 'FAIL']
+    still = [r for r in cur if r['status'] == 'FAIL' and prev.get(r['name']) == 'FAIL']
+    line = lambda r, tag: '<div>%s<b>%s</b><span class="file">%s</span></div>' % (tag, e(r['name']), e(r['file']))
+    changes = ''.join([line(r, '<span class="chip c-NEW">NEW</span> ' + chip('FAIL')) for r in new] +
+                      [line(r, chip('PASS')) for r in fixed] +
+                      [line(r, '<span class="chip c-FAIL">✗ STILL FAILING</span>') for r in still]) or \
+        '<p class="sub">No test changed between PASS and FAIL.</p>'
+    p = runs[-2]
+    out = ['<section><h2>The last %d runs</h2><p class="sub">%s. The number on a column is the failed tests.</p>%s%s</section>'
+           % (len(runs), e(run['edition'] or 'All editions'), legend(), trend_chart(runs)),
+           '<section><h2>Changed since the previous run</h2><p class="sub">Run %s · %s</p><div class="changes">%s</div></section>'
+           % (e(p['started'][:16].replace('T', ' ')), e(p['sha'][:10]), changes)]
+    rows = [r for r in cur if any(s.get(r['name'], 'PASS') != 'PASS' for s in status)]
+    if rows:
+        head = '<tr><th></th>%s<th></th></tr>' % ''.join(
+            '<th class="run%s">%s</th>' % (' cur' if i == len(runs) - 1 else '', short_date(x['started'])) for i, x in enumerate(runs))
+        body = []
+        for r in rows:
+            h = [s.get(r['name']) for s in status]
+            cells = ''.join('<td class="cell %s%s" title="%s">%s</td>' % (
+                x or '', ' cur' if i == len(runs) - 1 else '',
+                e('%s · %s %s: %s' % (r['name'], short_date(runs[i]['started']), runs[i]['sha'][:8], x or 'not in this run')), ICON[x])
+                for i, x in enumerate(h))
+            body.append('<tr><th class="name">%s</th>%s<td class="note">%s</td></tr>' % (e(r['name']), cells, describe_history(h, runs)))
+        out.append('<section><h2>Status history</h2><p class="sub">The tests that did not pass in every run. '
+                   'The framed column is this run.</p><div class="tbl"><table class="hgrid">%s%s</table></div></section>'
+                   % (head, ''.join(body)))
+    return out, len(new) - len(fixed), len(new), len(fixed)
+
+
+def film(r, outdir):
+    """The screenshots after the last steps before the failure, and the final screenshot."""
+    shots = [(s['file'], 'Step %d' % s['step'], s['label'], False) for s in r.get('shots', [])][-3:]
+    if os.path.exists(os.path.join(outdir, r['slug'] + '.png')):
+        at = r.get('failed_step', 0)
+        shots.append((r['slug'] + '.png', 'Step %d · failed here' % at if at else 'At the end', '', True))
+    return '<div class="film">%s</div>' % ''.join(
+        '<a class="shot%s" href="%s"><img src="%s" alt="%s" loading="lazy"><b>%s</b><div>%s</div></a>' % (
+            ' bad' if bad else '', e(f), e(f), e(title), e(title), e(label)) for f, title, label, bad in shots) if shots else ''
+
+
+def problem_cards(run, outdir):
+    rs = [r for r in run['results'] if r['status'] != 'PASS']
+    rs.sort(key=lambda r: r['status'] != 'FAIL')
+    return ''.join('<div class="card %s"><div class="card-head">%s%s<h3>%s</h3><span class="file">%s</span><span class="links">%s</span></div>'
+                   '%s<div class="reason">%s</div>%s</div>' % (
+                       r['status'], chip(r['status']), crash_chip(r), e(r['name']), e(r['file']), links(r, outdir),
+                       strip(r) if r['status'] == 'FAIL' else '', e(r['reason']), film(r, outdir) if r['status'] == 'FAIL' else '')
+                   for r in rs)
+
+
+def all_tests(run, outdir):
+    rows = []
+    for f in run['files']:
+        rs = [r for r in run['results'] if r['file'] == f['file']]
+        if not rs:
+            continue
+        rows.append('<tr class="grp"><td colspan="4">%s <span>· %s · %d of %d passed</span></td></tr>' % (
+            e(f['title'] or f['file']), e(f['file']), count(rs, 'PASS'), len(rs)))
+        for r in rs:
+            shots = r.get('shots', [])
+            more = ('<details><summary>screenshots after the steps (%d)</summary><div class="film small">%s</div></details>' % (
+                len(shots), ''.join('<a class="shot" href="%s"><img src="%s" alt="" loading="lazy"><b>Step %d</b><div>%s</div></a>' % (
+                    e(s['file']), e(s['file']), s['step'], e(s['label'])) for s in shots))) if shots else ''
+            rows.append('<tr><td>%s%s</td><td><div>%s</div>%s%s</td><td class="t">%s</td><td class="links">%s</td></tr>' % (
+                chip(r['status']), crash_chip(r), e(r['name']), strip(r), more,
+                dur(r['seconds']) if r['status'] != 'SKIP' else '–', links(r, outdir)))
+    return ('<div class="tbl"><table class="tests"><thead><tr><th>Result</th><th>Test</th><th style="text-align:right">Time</th>'
+            '<th>Files</th></tr></thead><tbody>%s</tbody></table></div>' % ''.join(rows))
+
+
+def write(path, run, history):
+    outdir = os.path.dirname(path)
+    rs = run['results']
+    c = {k: count(rs, k) for k in STATUSES}
+    ran = c['PASS'] + c['FAIL']
+    total = sum(r['seconds'] for r in rs)
+    crashes = sum(1 for r in rs if r['crash'])
+    verdict = 'FAIL' if c['FAIL'] else 'PASS'
+    sha = run['sha'][:8]
+    text = ('✗ FAILED · %d of %d tests failed' % (c['FAIL'], len(rs)) if c['FAIL'] else
+            '✓ PASSED · all %d tests passed' % ran if not c['SKIP'] else '✓ PASSED · %d passed, %d skipped' % (ran, c['SKIP']))
+    meta = [('Date', e(run['started'][:19].replace('T', ' ')), ''),
+            ('Edition', e(run['edition'] or 'not given, all tests'), ''),
+            ('Duration', dur(total), ''),
+            ('Git SHA', e(run['sha']) + ('<span class="dirty">+ uncommitted changes</span>' if run['dirty'] else ''), 'mono'),
+            ('Branch', e(run['branch']), ''),
+            ('Commit', e(run['subject']), ''),
+            ('Application', e(run['app']), 'mono'),
+            ('Host', e(run['host']), ''),
+            ('Test files', e(', '.join(f['file'] for f in run['files'])), '')]
+    if run.get('aborted'):
+        meta.append(('Aborted', '<span class="aborted">the run was stopped before all tests were done</span>', ''))
+    hist, delta, new, fixed = history_sections(run, history) if history else ([], 0, 0, 0)
+
+    def tile(label, value, note, status=''):
+        return '<div class="tile"><div class="lbl">%s%s</div><div class="val">%s</div><div class="note">%s</div></div>' % (
+            '<span class="dot d-%s"></span>' % status if status else '', label, value, note)
+    tiles = [tile('Passed', c['PASS'], '%d %% of the tests' % round(100 * c['PASS'] / len(rs)) if rs else '', 'PASS'),
+             tile('Failed', c['FAIL'], '%d of them crashed the app' % crashes if crashes else 'no crashes', 'FAIL'),
+             tile('Skipped', c['SKIP'], 'no script or outdated script' if c['SKIP'] else '&nbsp;', 'SKIP'),
+             tile('Duration', dur(total), 'average %d s per test' % round(total / ran) if ran else '&nbsp;')]
+    if history:
+        tiles.append(tile('Compared to the previous run', '%+d' % delta if delta else '±0',
+                          '%d new failure%s, %d fixed' % (new, '' if new == 1 else 's', fixed)))
+
+    out = ['<!DOCTYPE html>', '<html lang="en"><head><meta charset="utf-8">',
+           '<meta name="viewport" content="width=device-width, initial-scale=1">',
+           '<title>GUI test report %s %s</title>' % (e(run['edition'] or ''), e(sha)), '<style>' + CSS + '</style></head><body><main>',
+           '<div class="rhead"><div><div class="eyebrow">GUI test report</div><h1>%s %s · %s</h1></div><span class="verdict %s">%s</span></div>' % (
+               e(os.path.basename(run['app'])), e(run['edition'] or ''), e(sha), verdict, text),
+           '<dl class="meta">%s</dl>' % ''.join('<div><dt>%s</dt><dd class="%s">%s</dd></div>' % (k, cls, v) for k, v, cls in meta),
+           '<div class="tiles">%s</div>' % ''.join(tiles)]
+    if len([f for f in run['files'] if any(r['file'] == f['file'] for r in rs)]) > 1:
+        out.append('<section><h2>Results per test file</h2><p class="sub">Which part of the GUI has problems.</p>%s%s</section>'
+                   % (legend(), per_file_chart(run)))
+    out += hist
+    if c['FAIL'] or c['SKIP']:
+        out.append('<section><h2>Failed and skipped tests</h2><p class="sub">The reason, how far the test got, and the screenshots '
+                   'after the last steps. The red frame is the screen when the test failed.</p>%s</section>' % problem_cards(run, outdir))
+    if rs:
+        out.append('<section><h2>All tests</h2><p class="sub">Grouped by test file. The strip shows the steps: green passed, '
+                   'red failed, grey not run.</p>%s</section>' % all_tests(run, outdir))
+    if not history:
+        out.append('<p class="sub" style="margin-top:2rem">No earlier runs of this edition with results.json were found in %s, '
+                   'the history is shown from the next run.</p>' % e(os.path.dirname(outdir)))
+    out.append('</main></body></html>')
+    with open(path, 'w', encoding='utf-8') as f:
+        f.write('\n'.join(out) + '\n')
diff --git a/gui/manualtest/run.py b/gui/manualtest/run.py
new file mode 100755
index 00000000000..1d7668cda27
--- /dev/null
+++ b/gui/manualtest/run.py
@@ -0,0 +1,230 @@
+#!/usr/bin/env python3
+"""Run the manual tests in a test file by letting Claude drive the GUI.
+
+  run.py APP FILE.feature... [--edition opensource|premium] [--test SUBSTRING] [--id ID] [--src DIR] [--out DIR]
+
+FILE.feature is a Gherkin test file, edited with web.py or by hand, see testfile.py. The scripts
+are in FILE.scripts.json. For each scenario (and each row of its Examples) the application is started
+fresh (empty HOME) and the script of the test is run with guitest.py commands, see runner.py.
+No AI is involved. With --edition APP is that edition and only the tests for it are run.
+Tests without a script are SKIP. A step that fails gives PASS -> FAIL with the
+step, the reason and the elements that are on the screen.
+"""
+
+import argparse
+import os
+import re
+import datetime
+import json
+import platform
+import signal
+import subprocess
+import sys
+import tempfile
+import time
+
+import report
+import runner
+import testfile
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+GUITEST = os.path.join(HERE, 'guitest.py')
+
+def parse(path, edition=None):
+    return [dict(t, file=os.path.basename(path)) for t in testfile.expand(path, edition)]
+
+
+CRASH_RE = re.compile(r'exited with status (?!0\b|143\b)\d+|Segmentation fault|SIGSEGV|SIGABRT|Aborted|core dumped|terminate called|'
+                      r'QFATAL|Fatal error|AddressSanitizer|runtime error:|Assertion .* failed', re.I)
+
+
+def screenshot(sub, path):
+    """Save a screenshot without the empty (black) part of the screen right of and below the windows.
+    The top left corner stays, so positions in the image are screen positions."""
+    if sub('screenshot', path, capture_output=True).returncode:
+        return False
+    try:
+        from PIL import Image
+        img = Image.open(path)
+        box = img.convert('RGB').getbbox()
+        if box and (box[2] < img.width or box[3] < img.height):
+            img.crop((0, 0, box[2], box[3])).save(path)
+    except (ImportError, OSError):
+        pass
+    return True
+
+
+def detect_crash(sub, outdir, slug):
+    """Return a description when the application died or logged a fatal error, else ''."""
+    log = sub('log', capture_output=True).stdout
+    with open(os.path.join(outdir, slug + '.app.log'), 'w') as f:
+        f.write(log)
+    hits = [l.strip() for l in log.splitlines() if CRASH_RE.search(l)]
+    dead = sub('alive', capture_output=True).returncode != 0
+    if dead and re.search(r'application exited with status 0\b', log):
+        dead = False        # the test closed the application (Quit)
+    if not dead and not hits:
+        return ''
+    why = 'application is not running at the end of the test' if dead else 'fatal message in application log'
+    return why + (': ' + hits[0] if hits else '')
+
+
+def emit(kind, **data):
+    """One line of progress for the web interface, with --events."""
+    if EVENTS:
+        print('@' + json.dumps(dict(data, kind=kind)), flush=True)
+
+
+EVENTS = False
+
+
+def run_test(app, test, outdir, on_step=None):
+    """Returns {status, reason, crash, steps, failed_step, shots}. failed_step is 0 when no step failed,
+    shots are the screenshots after the steps: [{step, label, file}]."""
+    slug = re.sub(r'\W+', '_', test['name'])
+    shots, reached = [], [0]
+    result = lambda status, reason, crash='', failed=0: {'status': status, 'reason': reason, 'crash': crash,
+                                                         'steps': len(test['script']), 'failed_step': failed, 'shots': shots}
+    if test.get('stale'):
+        return result('SKIP', 'OUTDATED SCRIPT: the test was changed after the script was made. '
+                              'Generate the script again (gen.py or the web interface) or approve it there.')
+    if not test['script']:
+        return result('SKIP', 'no script, make one with gen.py or in the web interface')
+    work = tempfile.mkdtemp(prefix='guitest-work-')
+    state = os.path.join(work, 'state.json')
+    env = dict(os.environ, GUITEST_STATE=state)
+    sub = lambda *a, **kw: subprocess.run([sys.executable, GUITEST, *a], env=env, text=True, **kw)
+    try:
+        variables = testfile.materialize(test['root'], test['projects'], work)   # same files every run
+    except FileNotFoundError as e:
+        return result('FAIL', str(e))
+    r = sub('start', app, capture_output=True)
+    if r.returncode:
+        return result('FAIL', 'could not start: ' + (r.stdout + r.stderr).strip())
+    try:
+        with open(state) as f:
+            home = json.load(f)['env']['HOME']
+        def shot(i, label):
+            name = '%s.step%02d.png' % (slug, i)
+            if not screenshot(sub, os.path.join(outdir, name)):
+                return None
+            shots.append({'step': i, 'label': label, 'file': name})
+            return name
+        def step(i, n, label):
+            reached[0] = i
+            if on_step:
+                on_step(i, n, label)
+        ok, reason, log = runner.run_script(sub, test['script'], work, home, variables, step, shot)
+        with open(os.path.join(outdir, slug + '.txt'), 'w') as f:
+            f.write(log)
+        screenshot(sub, os.path.join(outdir, slug + '.png'))
+        crash = detect_crash(sub, outdir, slug)
+        status = 'PASS' if ok else 'FAIL'
+        if crash:
+            # a crash is a failure even if all the steps passed
+            status, reason = 'FAIL', 'APPLICATION CRASHED: %s\n%s' % (crash, reason)
+        return result(status, reason, crash, 0 if ok else reached[0])
+    finally:
+        sub('stop', capture_output=True)
+
+
+def git(directory, *a):
+    r = subprocess.run(['git', '-C', directory, *a], text=True, capture_output=True)
+    return r.stdout.strip() if r.returncode == 0 else ''
+
+
+def app_info(app, src):
+    """git info for the tested application, taken from SRC (default: the directory of the binary)."""
+    d = os.path.abspath(src) if src else os.path.dirname(app)
+    sha = git(d, 'rev-parse', 'HEAD')
+    return {
+        'path': app,
+        'sha': sha or 'unknown',
+        'branch': git(d, 'rev-parse', '--abbrev-ref', 'HEAD') or 'unknown',
+        'subject': git(d, 'log', '-1', '--format=%s') if sha else '',
+        'dirty': bool(git(d, 'status', '--porcelain', '--untracked-files=no')) if sha else False,
+    }
+
+
+def load_history(out, edition, current):
+    """results.json of the earlier runs of EDITION in OUT, oldest first."""
+    runs = []
+    for d in sorted(os.listdir(out)):
+        path = os.path.join(out, d, 'results.json')
+        if d == current or not os.path.isfile(path):
+            continue
+        try:
+            with open(path, encoding='utf-8') as f:
+                run = json.load(f)
+        except (OSError, ValueError):
+            continue
+        if run.get('edition') == edition:
+            runs.append(run)
+    return runs[-(report.HISTORY_RUNS - 1):]
+
+
+def main():
+    ap = argparse.ArgumentParser()
+    ap.add_argument('app')
+    ap.add_argument('file', nargs='+', help='one or more .feature test files')
+    ap.add_argument('--edition', choices=testfile.EDITIONS, help='the edition that APP is, only the tests for it')
+    ap.add_argument('--test', help='only tests whose name contains this')
+    ap.add_argument('--id', help='only the test with this id (all the rows of its Examples)')
+    ap.add_argument('--src', help='git checkout of the application (default: the directory of APP)')
+    ap.add_argument('--out', default=os.path.join(HERE, 'results'))
+    ap.add_argument('--events', action='store_true', help='progress lines for the web interface')
+    args = ap.parse_args()
+    global EVENTS
+    EVENTS = args.events
+    signal.signal(signal.SIGINT, signal.default_int_handler)   # also when started in the background
+
+    started = datetime.datetime.now()
+    info = app_info(os.path.abspath(args.app), args.src)
+    # each run gets its own directory: results/<date>[-<edition>]-<sha>/
+    parent = args.out
+    args.out = os.path.join(args.out, '%s%s-%s' % (started.strftime('%Y%m%d-%H%M%S'),
+                                                   '-' + args.edition if args.edition else '', info['sha'][:8]))
+    os.makedirs(args.out, exist_ok=True)
+    failed = 0
+    results = []
+    aborted = False
+    try:
+        selected = [t for f in args.file for t in parse(f, args.edition)
+                    if not (args.test and args.test.lower() not in t['name'].lower() or args.id and t['id'] != args.id)]
+        emit('start', total=len(selected), out=args.out, edition=args.edition)
+        for index, test in enumerate(selected, 1):
+            name = test['name']
+            emit('test', index=index, name=name, file=test['file'], steps=len(test['script']))
+            t0 = time.time()
+            try:
+                res = run_test(os.path.abspath(args.app), test, args.out,
+                               lambda k, n, label: emit('step', step=k, steps=n, label=label))
+            except KeyboardInterrupt:
+                results.append({'name': name, 'file': test['file'], 'status': 'SKIP', 'reason': 'aborted by user', 'crash': '',
+                                'seconds': time.time() - t0, 'slug': re.sub(r'\W+', '_', name), 'steps': 0, 'failed_step': 0, 'shots': []})
+                emit('result', **results[-1])
+                raise
+            results.append(dict(res, name=name, file=test['file'], seconds=time.time() - t0, slug=re.sub(r'\W+', '_', name)))
+            emit('result', **results[-1])
+            print('%-4s %s: %s' % (res['status'], name, res['reason']), flush=True)
+            failed += res['status'] == 'FAIL'
+    except KeyboardInterrupt:
+        # the report is written with what is done, tests not started are left out
+        aborted = True
+        print('aborted')
+    run = {'started': started.isoformat(timespec='seconds'), 'edition': args.edition, 'app': info['path'],
+           'sha': info['sha'], 'dirty': info['dirty'], 'branch': info['branch'], 'subject': info['subject'],
+           'host': '%s, %s' % (platform.node(), platform.platform()), 'aborted': aborted,
+           'files': [{'file': os.path.basename(f), 'title': testfile.load(f).get('title', '')} for f in args.file],
+           'results': results}
+    with open(os.path.join(args.out, 'results.json'), 'w', encoding='utf-8') as f:
+        json.dump(run, f, indent=1)
+    path = os.path.join(args.out, 'report.html')
+    report.write(path, run, load_history(parent, args.edition, os.path.basename(args.out)))
+    print('report: ' + path)
+    emit('done', report=path)
+    sys.exit(1 if failed else 0)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/gui/manualtest/runner.py b/gui/manualtest/runner.py
new file mode 100644
index 00000000000..11634cdb1e4
--- /dev/null
+++ b/gui/manualtest/runner.py
@@ -0,0 +1,232 @@
+"""Executes a test script (see testfile.SCRIPT_DOC) with guitest.py commands, no AI involved.
+
+run_script() gets `sub`, a function that runs one guitest.py command in the session of the test:
+sub(cmd, *args, capture_output=True) -> CompletedProcess with returncode, stdout, stderr.
+"""
+
+import os
+import re
+import shutil
+import time
+
+import testfile
+
+# actions that change the GUI, a screenshot is taken after each of them
+GUI_ACTIONS = ('click', 'rightclick', 'doubleclick', 'focus', 'hover', 'settext', 'type', 'key', 'restart')
+NO_ELEMENT = ('no matching visible element', 'does not answer on the accessibility bus')
+DEFAULT_TIMEOUT = 5
+
+
+def selector_args(step):
+    a = []
+    for k in ('name', 'role', 'path'):
+        if k in step:
+            a += ['--' + k, str(step[k])]
+    if 'nth' in step:
+        a += ['--nth', str(step['nth'])]
+    if step.get('exact'):
+        a.append('--exact')
+    return a
+
+
+def describe(step):
+    return ' '.join('%s=%r' % (k, v) for k, v in step.items() if k != 'label')
+
+
+def message(p):
+    text = (p.stderr.strip() or p.stdout.strip() or 'exit code %d' % p.returncode).removeprefix('error: ')
+    return text.replace('; try "tree --showing"', '')
+
+
+class StepFailed(Exception):
+    pass
+
+
+def check_path(path, allowed):
+    path = os.path.realpath(path)
+    if not any(path == d or path.startswith(d + os.sep) for d in (os.path.realpath(x) for x in allowed)):
+        raise StepFailed('path %s is outside the test directories' % path)
+    return path
+
+
+def gui(sub, cmd, step, extra=()):
+    """Run a command that needs an element. The element may not have appeared yet, so retry."""
+    deadline = time.time() + step.get('timeout', DEFAULT_TIMEOUT)
+    while True:
+        p = sub(cmd, *selector_args(step), *extra, capture_output=True)
+        if p.returncode == 0:
+            return p
+        if not any(m in message(p) for m in NO_ELEMENT) or time.time() > deadline:
+            raise StepFailed(message(p))
+        time.sleep(0.4)
+
+
+def run_step(sub, step, dirs, captured):
+    action = step.get('do') or step['expect']
+    if 'do' in step:
+        if action in ('click', 'rightclick', 'doubleclick', 'focus', 'hover'):
+            gui(sub, action, step, ['--mouse'] if step.get('mouse') else [])
+        elif action == 'settext':
+            gui(sub, 'settext', step, [step['value']])
+        elif action == 'type':
+            ok(sub('type', step['value'], capture_output=True))
+        elif action == 'key':
+            keys = step['keys'].split() if isinstance(step['keys'], str) else step['keys']
+            ok(sub('key', *keys, capture_output=True))
+        elif action == 'wait':
+            ok(sub('wait', *selector_args(step), '--timeout', str(step.get('timeout', 10)),
+                   *(['--gone'] if step.get('gone') else []), capture_output=True))
+        elif action == 'restart':
+            ok(sub('restart', capture_output=True))
+        elif action == 'sleep':
+            time.sleep(float(step['seconds']))
+        elif action == 'copy':
+            src, dst = check_path(step['from'], dirs), check_path(step['to'], dirs)
+            if not os.path.isfile(src):
+                raise StepFailed('file %s does not exist' % src)
+            os.makedirs(os.path.dirname(dst), exist_ok=True)
+            shutil.copyfile(src, dst)
+        elif action == 'write':
+            path = check_path(step['path'], dirs)
+            os.makedirs(os.path.dirname(path), exist_ok=True)
+            with open(path, 'w', encoding='utf-8') as f:
+                f.write(step['content'])
+        return
+    if action == 'visible':
+        ok(sub('wait', *selector_args(step), '--timeout', str(step.get('timeout', DEFAULT_TIMEOUT)),
+               capture_output=True))
+    elif action == 'gone':
+        ok(sub('wait', *selector_args(step), '--gone', '--timeout', str(step.get('timeout', DEFAULT_TIMEOUT)),
+               capture_output=True))
+    elif action == 'state':
+        info = gui(sub, 'info', step).stdout
+        have = set((re.search(r'\[([\w,]*)\]\s*$', info.strip()) or [None, ''])[1].split(','))
+        if 'state' in step and step['state'] not in have:
+            raise StepFailed('element is not %s, its states are [%s]: %s' % (step['state'], ','.join(sorted(have)), info.strip()))
+        if 'not_state' in step and step['not_state'] in have:
+            raise StepFailed('element is %s but should not be: %s' % (step['not_state'], info.strip()))
+    elif action == 'value':
+        info = gui(sub, 'info', step).stdout.strip()
+        found = re.findall(r" value=(\S+)", info) + re.findall(r" text='(.*?)'(?= value=| \[|$)", info)
+        if not any(same(v, step['equals']) for v in found):
+            raise StepFailed('the value is %s, not %r: %s' % (found or 'missing', step['equals'], info))
+    elif action == 'exited':
+        deadline = time.time() + step.get('timeout', DEFAULT_TIMEOUT)
+        while sub('alive', capture_output=True).returncode == 0:
+            if time.time() > deadline:
+                raise StepFailed('the application is still running')
+            time.sleep(0.3)
+        status = re.findall(r'application exited with status (\d+)', sub('log', capture_output=True).stdout)
+        if status and status[-1] != '0':
+            raise StepFailed('the application ended with status %s, not 0' % status[-1])
+    elif action == 'text':
+        deadline = time.time() + step.get('timeout', DEFAULT_TIMEOUT)    # the screen may take a moment to change
+        while True:
+            texts = sub('texts', capture_output=True).stdout
+            problem = None
+            if 'contains' in step and step['contains'] not in texts:
+                problem = 'the text %r is not on the screen' % step['contains']
+            elif 'not_contains' in step and step['not_contains'] in texts:
+                problem = 'the text %r is on the screen but should not be' % step['not_contains']
+            if not problem:
+                break
+            if time.time() > deadline:
+                raise StepFailed(problem)
+            time.sleep(0.4)
+    elif action == 'ocr':
+        deadline = time.time() + step.get('timeout', DEFAULT_TIMEOUT)
+        norm = lambda x: re.sub(r'\s+', ' ', x).lower()
+        while True:
+            p = sub('ocr', capture_output=True)
+            if p.returncode:
+                raise StepFailed(message(p))
+            seen = norm(p.stdout)
+            problem = None
+            if 'contains' in step and norm(step['contains']) not in seen:
+                problem = 'the text %r is not on the screen (OCR)' % step['contains']
+            elif 'not_contains' in step and norm(step['not_contains']) in seen:
+                problem = 'the text %r is on the screen (OCR) but should not be' % step['not_contains']
+            if not problem:
+                break
+            if time.time() > deadline:
+                raise StepFailed(problem + '. OCR read: ' + seen[:300])
+            time.sleep(0.4)
+    elif action == 'file':
+        path = check_path(step['path'], dirs)
+        try:
+            with open(path, encoding='utf-8', errors='replace') as f:
+                text = f.read()
+        except FileNotFoundError:
+            raise StepFailed('file %s does not exist' % path)
+        if 'contains' in step and step['contains'] not in text:
+            raise StepFailed('%s does not contain %r' % (path, step['contains']))
+        if 'not_contains' in step and step['not_contains'] in text:
+            raise StepFailed('%s contains %r but should not' % (path, step['not_contains']))
+        if 'regex' in step and not re.search(step['regex'], text, re.M):
+            raise StepFailed('%s does not match /%s/' % (path, step['regex']))
+    elif action == 'alive':
+        ok(sub('alive', capture_output=True))
+    elif action == 'capture':
+        info = gui(sub, 'info', step).stdout.strip()
+        m = re.search(step['regex'], info)
+        if not m:
+            raise StepFailed('/%s/ does not match: %s' % (step['regex'], info))
+        captured[step['as']] = m.group(1) if m.groups() else m.group(0)
+
+
+def same(a, b):
+    try:
+        return float(a) == float(b)       # a spin box says 1.0
+    except ValueError:
+        return a == b
+
+
+def ok(p):
+    if p.returncode:
+        raise StepFailed(message(p))
+
+
+def context(sub, step):
+    """What the screen looks like when a step failed, to make a renamed button easy to find."""
+    out = []
+    if {'name', 'role', 'path'} & set(step):
+        cmd = ['suggest'] + ['--%s=%s' % (k, step[k]) for k in ('name', 'role') if k in step]
+        s = sub(*cmd, capture_output=True).stdout.strip()
+        if s:
+            out.append('most similar visible elements:\n' + '\n'.join('    ' + l for l in s.splitlines()))
+    w = sub('windows', capture_output=True).stdout.strip()
+    if w:
+        out.append('windows:\n' + '\n'.join('    ' + l.split(' @')[0] for l in w.splitlines()[:6]))
+    return '\n  '.join(out)
+
+
+
+def run_script(sub, script, work, home, variables=None, progress=None, shot=None):
+    """Returns (ok, message, log). On failure the message names the step and what was on screen.
+    shot(i, label) is called after each step i that is one of GUI_ACTIONS and returns the name of the
+    screenshot it saved, or None."""
+    dirs = [work, home]
+    variables = dict(variables or {}, work=work, home=home)
+    captured = {}       # {name} values of the capture steps so far
+    log = []
+    for i, step in enumerate(script, 1):
+        step = testfile.subst_deep(step, dict(variables, **captured))
+        t0 = time.time()
+        label = step.get('label')
+        if progress:
+            progress(i, len(script), label or describe(step))
+        head = 'step %d/%d%s: %s' % (i, len(script), ' "%s"' % label if label else '', describe(step))
+        try:
+            run_step(sub, step, dirs, captured)
+        except StepFailed as e:
+            log.append('FAIL %s (%.1f s)' % (head, time.time() - t0))
+            msg = '%s\n  %s' % (head, e)
+            ctx = context(sub, step)
+            return False, msg + ('\n  ' + ctx if ctx else ''), '\n'.join(log) + '\n' + msg + '\n'
+        log.append('ok   %s (%.1f s)' % (head, time.time() - t0))
+        if shot and step.get('do') in GUI_ACTIONS:
+            time.sleep(0.2)    # let the application paint
+            name = shot(i, label or describe(step))
+            if name:
+                log[-1] += ' screenshot ' + name
+    return True, 'all %d steps passed' % len(script), '\n'.join(log) + '\n'
diff --git a/gui/manualtest/testfile.py b/gui/manualtest/testfile.py
new file mode 100644
index 00000000000..a915e7960fa
--- /dev/null
+++ b/gui/manualtest/testfile.py
@@ -0,0 +1,743 @@
+#!/usr/bin/env python3
+"""Test files for run.py, written in Gherkin (FILE.feature), with the scripts in FILE.scripts.json.
+
+  Feature: Project file dialog
+
+    Background:
+      Given the application is started with no project loaded
+
+    @id:t1a2b3c4d @ticket:14983 @project:relative-paths
+    Scenario: Relative paths
+      TODO: cannot be automated              optional, a description line that starts with TODO:
+      When I open the project dialog
+      And I select the platform <platform>
+      Then relative paths are used in the XML
+
+      Examples:
+        | platform | lang |
+        | native   | C    |
+        | unix32   | C++  |
+
+Feature: is the title of the file. Background: steps are done before every scenario of the file.
+A scenario has steps that start with Given, When, Then, And, But or *, at least one Then (the
+expected result). A step can be followed by a doc string (lines between \"\"\") or a table (| a | b |).
+Lines that start with # are comments, they are not kept when the file is saved by web.py.
+
+Tags of a scenario (all optional):
+  @id:ID              identifies a test when it is renamed, added when it is missing
+  @ticket:NUMBER      the ticket of the test (#NUMBER)
+  @project:NAME       a test project, see below; one tag per project
+  @edition:NAME       an edition that the test is for, one of EDITIONS; one tag per edition, none: all
+  @disabled           the test is not run
+Other tags are kept but not used.
+
+A run is for one edition (run.py --edition, with the binary of that edition), the tests that are
+not for it are left out. The script is the same for all editions, {edition} in the steps and the
+script is the name of the edition of the run.
+
+Examples (Scenario Outline) are the test matrix: the test is run once for every row of the table.
+<column> in the steps and {column} in the script are replaced by the value of the row.
+
+"script" is what run.py executes, see SCRIPT_DOC below. It is written by gen.py (an AI explores
+the GUI once) or by hand, and is then replayed without any AI. The scripts are kept in
+FILE.scripts.json, {"ID": {"script": [...], "script_for": "..."}}, next to the feature file.
+
+@project:NAME are test projects, directories with files and code in DIR/projects/NAME,
+shared by all tests next to them. Before every run they are copied to an empty temporary directory,
+so a test always starts with the same files: {project:NAME} in steps and scripts is the copy of NAME,
+and {project} when the test has exactly one project.
+
+A script is made for the steps (with the Background), todo, examples and test projects (the files in
+them) of a test. "script_for" is a hash of those at the time, when they are changed afterwards the
+script is OUTDATED: it is kept but not run until it is generated again, edited or approved.
+
+In Python a test file is a dict {"title", "background": [lines], "tests": [test]}, a test is
+{"id", "name", "steps": [lines], "todo", "ticket", "enabled", "projects", "editions", "examples":
+[{column: value}], "script", "script_for"}. The lines of the steps are Gherkin without indentation.
+
+  testfile.py convert IN.md|IN.json OUT.feature     import a markdown or an older JSON test file
+"""
+
+import hashlib
+import itertools
+import json
+import os
+import re
+import shutil
+import sys
+
+AXIS_RE = re.compile(r'^\w+$')
+PROJECT_RE = re.compile(r'^[\w-]+$')
+PROJECTS = 'projects'     # test projects: one directory per project, next to the test files
+EDITIONS = ('opensource', 'premium')
+EXT = '.feature'
+SCRIPTS_EXT = '.scripts.json'
+
+SCRIPT_DOC = """A script is a list of steps. Every step is an object with "do" (an action) or "expect" (a check),
+and an optional "label" that says what the step is for (shown when it fails). Elements are found
+with name (substring of the accessible name/text, case-insensitive), role, path, nth, exact, like
+the guitest.py commands. {work} is a temporary directory for files, {home} the HOME of the
+application, {project:NAME} the copy of the test project NAME ({project} when the test has just one),
+use those for the files of a test instead of write steps. {column} values of the Examples row and {edition}
+(opensource or premium, the same script is used for both) are replaced before the run.
+
+actions
+  {"do": "click|rightclick|doubleclick|focus|hover", "name": "...", "role": "...", "mouse": true}
+  {"do": "settext", "name": "...", "value": "..."}      set the text of an edit field
+  {"do": "type", "value": "..."}                         keyboard input to the focused element
+  {"do": "key", "keys": ["ctrl+o", "Return"]}            xdotool key names
+  {"do": "wait", "name": "...", "gone": true, "timeout": 10}
+  {"do": "restart"}                                      quit and start the application again
+  {"do": "sleep", "seconds": 1}
+  {"do": "write", "path": "{work}/a.c", "content": "..."}
+  {"do": "copy", "from": "{project:p}/a_v2.c", "to": "{project:p}/a.c"}   change a file of the project
+checks, the test fails when one is wrong
+  {"expect": "visible", "name": "...", "role": "...", "timeout": 5}
+  {"expect": "gone", "name": "..."}
+  {"expect": "state", "name": "...", "state": "checked"}   or "not_state": "checked"; also
+                                                          showing enabled focused selected expanded
+  {"expect": "value", "name": "...", "equals": "1"}        value or text of a field, a spin box...
+  {"expect": "exited"}                                   the application has ended by itself, status 0 (Quit)
+  {"expect": "text", "contains": "..."}                  or "not_contains": anywhere on screen
+  {"expect": "ocr", "contains": "Recheck"}               text on the screen read by OCR (tesseract), or "not_contains";
+                                                          only for what "text" cannot see, e.g. a context menu that
+                                                          is not in the accessibility tree. Case is ignored.
+  {"expect": "file", "path": "{home}/x.xml", "contains": "...", "not_contains": "...", "regex": "..."}
+  {"expect": "alive"}
+  {"expect": "capture", "name": "...", "role": "frame", "regex": "'Cppcheck (\\d[^']*)'", "as": "version"}
+                                                          the regex is searched in the element's info line
+                                                          (role 'name' text='...' value=...), group 1 (or the
+                                                          whole match) is stored and {version} in the later
+                                                          steps is replaced by it; use it instead of hard coding
+                                                          text that changes, e.g. the version
+A check can have "observed_fail": true when the application was seen not to do what the check says
+(a known failure, only for the check that failed). Text checks wait up to "timeout" seconds (default 5).
+Actions that need an element wait up to "timeout" seconds (default 5) for it to appear."""
+
+SELECTOR = {'name', 'role', 'path', 'nth', 'exact'}
+# step name -> (required keys, allowed optional keys)
+STEPS = {
+    'do': {
+        'click': ((), SELECTOR | {'mouse'}), 'rightclick': ((), SELECTOR), 'doubleclick': ((), SELECTOR),
+        'focus': ((), SELECTOR), 'hover': ((), SELECTOR),
+        'settext': (('value',), SELECTOR), 'type': (('value',), set()), 'key': (('keys',), set()),
+        'wait': ((), SELECTOR | {'gone'}), 'restart': ((), set()),
+        'sleep': (('seconds',), set()), 'write': (('path', 'content'), set()), 'copy': (('from', 'to'), set()),
+    },
+    'expect': {
+        'visible': ((), SELECTOR), 'gone': ((), SELECTOR), 'value': (('equals',), SELECTOR), 'exited': ((), set()),
+        'state': ((), SELECTOR | {'state', 'not_state'}),
+        'text': ((), {'contains', 'not_contains'}), 'file': (('path',), {'contains', 'not_contains', 'regex'}),
+        'alive': ((), set()), 'ocr': ((), {'contains', 'not_contains'}),
+        'capture': (('regex', 'as'), SELECTOR),
+    },
+}
+NEEDS_SELECTOR = {'click', 'rightclick', 'doubleclick', 'focus', 'hover', 'settext', 'wait', 'visible', 'gone', 'state', 'value',
+                  'capture'}
+STATES = {'showing', 'enabled', 'focused', 'selected', 'expanded', 'checked', 'editable', 'modal'}
+
+
+def validate_script(script, where='script'):
+    if not isinstance(script, list):
+        return [where + ': must be a list of steps']
+    errors = []
+    for i, step in enumerate(script, 1):
+        w = '%s step %d' % (where, i)
+        if not isinstance(step, dict):
+            errors.append(w + ': not an object')
+            continue
+        kinds = [k for k in ('do', 'expect') if k in step]
+        if len(kinds) != 1:
+            errors.append(w + ': needs exactly one of "do" or "expect"')
+            continue
+        kind, action = kinds[0], step[kinds[0]]
+        if action not in STEPS[kind]:
+            errors.append('%s: unknown %s "%s", use one of %s' % (w, kind, action, ', '.join(STEPS[kind])))
+            continue
+        required, optional = STEPS[kind][action]
+        allowed = set(required) | optional | {kind, 'label', 'timeout'} | ({'observed_fail'} if kind == 'expect' else set())
+        for k in step:
+            if k not in allowed:
+                errors.append('%s: "%s" is not used by %s %s' % (w, k, kind, action))
+        for k in required:
+            if k not in step:
+                errors.append('%s: %s %s needs "%s"' % (w, kind, action, k))
+        if action in NEEDS_SELECTOR and not (SELECTOR - {'nth', 'exact'}) & set(step):
+            errors.append('%s: %s %s needs name, role or path' % (w, kind, action))
+        if action in ('text', 'ocr') and not {'contains', 'not_contains'} & set(step):
+            errors.append(w + ': expect %s needs contains or not_contains' % action)
+        if action == 'state' and not {'state', 'not_state'} & set(step):
+            errors.append(w + ': expect state needs state or not_state')
+        for k in ('state', 'not_state'):
+            if k in step and step[k] not in STATES:
+                errors.append('%s: unknown state "%s", use one of %s' % (w, step[k], ', '.join(sorted(STATES))))
+        if action == 'capture':
+            try:
+                re.compile(step['regex'])
+            except (re.error, TypeError) as e:
+                errors.append('%s: bad regex: %s' % (w, e))
+            if not re.fullmatch(r'[\w-]+', str(step['as'])):
+                errors.append(w + ': "as" must be a name of letters, digits, _ and -')
+    if script and not any('expect' in s for s in script if isinstance(s, dict)):
+        errors.append(where + ': needs at least one "expect" step, otherwise nothing is tested')
+    return errors
+
+
+STEP_RE = re.compile(r'^(Given|When|Then|And|But|\*)\s+\S')
+SCENARIO_RE = re.compile(r'^(Scenario Outline|Scenario Template|Scenario|Example):\s*(.*)$')
+TAG_RE = re.compile(r'^@[^\s@]+$')
+DOCSTRING = ('"""', '```')
+
+
+class ParseError(ValueError):
+    pass
+
+
+def validate_steps(lines, where, need_then=True):
+    """Errors in the Gherkin lines of a scenario or background."""
+    errors, fence, keyword = [], None, None
+    for n, line in enumerate(lines, 1):
+        s = line.strip()
+        if fence:
+            if s == fence:
+                fence = None
+            continue
+        if s.startswith(DOCSTRING) or s.startswith('|'):
+            if keyword is None:
+                errors.append('%s line %d: a doc string or table must come after a step' % (where, n))
+            if s.startswith(DOCSTRING):
+                fence = s[:3]
+            continue
+        m = STEP_RE.match(s)
+        if not m:
+            errors.append('%s line %d: a step must start with Given, When, Then, And, But or *: %s' % (where, n, s))
+            continue
+        if keyword is None and m.group(1) in ('And', 'But'):
+            errors.append('%s line %d: the first step can not start with %s' % (where, n, m.group(1)))
+        keyword = keyword if m.group(1) in ('And', 'But', '*') else m.group(1)
+    if fence:
+        errors.append(where + ': a doc string is not closed with ' + fence)
+    if need_then and not any(re.match(r'^Then\s', line.strip()) for line in lines):
+        errors.append(where + ': needs a Then step, the expected result')
+    return errors
+
+
+def parse(text):
+    """A .feature file as a test file dict. Raises ParseError."""
+    doc = {'title': '', 'tests': []}
+    tags, section, fence, indent, table = [], None, None, 0, None
+    lines = text.splitlines()
+
+    def fail(n, msg):
+        raise ParseError('line %d: %s' % (n, msg))
+
+    for n, raw in enumerate(lines, 1):
+        s = raw.strip()
+        if fence:                                   # inside a doc string, kept as it is
+            section['steps'].append(raw[indent:] if raw[:indent].strip() == '' else s)
+            if s == fence:
+                section['steps'][-1] = s
+                fence = None
+            continue
+        if not s or s.startswith('#'):
+            continue
+        if s.startswith('@'):
+            for tag in s.split('#')[0].split():
+                if not TAG_RE.match(tag):
+                    fail(n, 'bad tag ' + tag)
+                tags.append(tag[1:])
+            continue
+        table = table if s.startswith('|') else None
+        if s.startswith('Feature:'):
+            if 'feature' in doc:
+                fail(n, 'only one Feature per file')
+            doc['feature'] = True
+            doc['title'] = s[len('Feature:'):].strip()
+            if tags:
+                doc['tags'], tags = tags, []
+            section = doc
+            continue
+        if 'feature' not in doc:
+            fail(n, 'the file must start with Feature:')
+        if s.startswith('Background:'):
+            if doc['tests'] or 'background' in doc:
+                fail(n, 'the Background must come before the scenarios, once')
+            doc['background'] = []
+            section = {'steps': doc['background']}
+            continue
+        m = SCENARIO_RE.match(s)
+        if m:
+            section = scenario(m.group(2).strip(), tags)
+            doc['tests'].append(section)
+            tags = []
+            continue
+        if s.startswith(('Rule:', 'Scenarios:')) or (s.startswith('Examples:') and section is doc):
+            fail(n, s.split(':')[0] + ' is not supported here')
+        if s.startswith('Examples:'):
+            if 'name' not in section:
+                fail(n, 'Examples only belong to a scenario')
+            section['examples'] = section.get('examples', [])
+            table = []
+            continue
+        if table is not None:                       # a row of Examples
+            cells = [c.strip() for c in s.strip('|').split('|')]
+            if not s.endswith('|') or len(s) < 2:
+                fail(n, 'a table row must start and end with |')
+            if not table:
+                table.append(cells)
+                section['_columns'] = cells
+            elif len(cells) != len(table[0]):
+                fail(n, 'the row has %d cells, the header has %d' % (len(cells), len(table[0])))
+            else:
+                section['examples'].append(dict(zip(table[0], cells)))
+            continue
+        if section is doc:
+            doc.setdefault('description', []).append(s)
+            continue
+        if 'examples' in section:
+            fail(n, 'steps must come before the Examples')
+        if not section['steps'] and not STEP_RE.match(s) and 'name' in section:
+            if s.startswith('TODO:'):               # description lines of a scenario
+                section['todo'] = (section.get('todo', '') + '\n' + s[5:].strip()).strip()
+            else:
+                section.setdefault('description', []).append(s)
+            continue
+        section['steps'].append(s)
+        if s.startswith(DOCSTRING):
+            fence, indent = s[:3], len(raw) - len(raw.lstrip())
+    if fence:
+        fail(len(lines), 'the doc string is not closed')
+    if 'feature' not in doc:
+        fail(1, 'no Feature: in the file')
+    del doc['feature']
+    for t in doc['tests']:
+        if 'examples' in t and not t['examples']:
+            raise ParseError('%s: Examples without rows' % t['name'])
+        t.pop('_columns', None)
+    return doc
+
+
+def scenario(name, tags):
+    t = {'name': name, 'steps': []}
+    other = []
+    for tag in tags:
+        key, _, value = tag.partition(':')
+        if key == 'id' and value:
+            t['id'] = value
+        elif key == 'ticket' and value:
+            t['ticket'] = '#' + value if value.isdigit() else value
+        elif key == 'project' and value:
+            t.setdefault('projects', []).append(value)
+        elif key == 'edition' and value:
+            t.setdefault('editions', []).append(value)
+        elif tag == 'disabled':
+            t['enabled'] = False
+        else:
+            other.append(tag)
+    if other:
+        t['tags'] = other
+    return t
+
+
+def write_steps(out, lines, indent):
+    """Doc strings and tables are indented below their step."""
+    fence = None
+    for line in lines:
+        s = line.strip()
+        inner = fence or s.startswith(DOCSTRING) or s.startswith('|')
+        out.append((indent + '  ' * bool(inner) + line) if line else '')
+        if fence and s == fence:
+            fence = None
+        elif not fence and s.startswith(DOCSTRING):
+            fence = s[:3]
+
+
+def table(rows):
+    cols = list(rows[0])
+    width = {c: max(len(c), *(len(r.get(c, '')) for r in rows)) for c in cols}
+    fmt = lambda cells: '| ' + ' | '.join(v.ljust(width[c]) for c, v in zip(cols, cells)) + ' |'
+    return [fmt(cols)] + [fmt([r.get(c, '') for c in cols]) for r in rows]
+
+
+def to_gherkin(doc):
+    out = []
+    if doc.get('tags'):
+        out.append(' '.join('@' + t for t in doc['tags']))
+    out.append('Feature: ' + doc.get('title', ''))
+    for line in doc.get('description', []):
+        out.append('  ' + line)
+    if doc.get('background'):
+        out += ['', '  Background:']
+        write_steps(out, doc['background'], '    ')
+    for t in doc['tests']:
+        tags = ['id:' + t['id']] if t.get('id') else []
+        if t.get('ticket'):
+            tags.append('ticket:' + t['ticket'].lstrip('#'))
+        tags += ['project:' + p for p in t.get('projects', [])]
+        if t.get('editions') and len(t['editions']) < len(EDITIONS):
+            tags += ['edition:' + e for e in t['editions']]
+        if t.get('enabled') is False:
+            tags.append('disabled')
+        tags += t.get('tags', [])
+        out.append('')
+        if tags:
+            out.append('  ' + ' '.join('@' + x for x in tags))
+        out.append('  %s: %s' % ('Scenario Outline' if t.get('examples') else 'Scenario', t['name']))
+        for line in t.get('description', []):
+            out.append('    ' + line)
+        for line in (t.get('todo') or '').splitlines():
+            out.append('    TODO: ' + line.strip())
+        write_steps(out, t.get('steps', []), '    ')
+        if t.get('examples'):
+            out += ['', '    Examples:']
+            out += ['      ' + row for row in table(t['examples'])]
+    return '\n'.join(out) + '\n'
+
+
+def legacy_steps(steps, expected):
+    """Steps and expected result in plain words (markdown and older JSON files) as Gherkin lines."""
+    lines = []
+    for s in steps:
+        if s.startswith(('* ', '- ')) and lines:
+            lines[-1] += ' ' + s[2:]
+        else:
+            lines.append(('Given ' if not lines else 'When ' if len(lines) == 1 else 'And ') + s)
+    if expected:
+        lines.append('Then ' + ' '.join(expected.split()))
+    return lines
+
+
+def from_legacy_json(old):
+    """An older JSON test file: steps, expected and a matrix of axes."""
+    doc = {'title': old.get('title', ''), 'tests': []}
+    for o in old.get('tests', []):
+        t = {k: o[k] for k in ('id', 'name', 'ticket', 'enabled', 'todo', 'projects', 'editions', 'script', 'script_for')
+             if k in o}
+        matrix = o.get('matrix') or {}
+        steps = legacy_steps(o.get('steps', []), o.get('expected', ''))
+        t['steps'] = [re.sub(r'\{(%s)\}' % '|'.join(map(re.escape, matrix)), r'<\1>', s) if matrix else s for s in steps]
+        if matrix:
+            t['examples'] = [dict(zip(matrix, v)) for v in itertools.product(*matrix.values())]
+        doc['tests'].append(t)
+    return doc
+
+
+def from_markdown(text):
+    m = re.search(r'^#\s+(.+)$', text, re.M)
+    doc = {'title': m.group(1).strip() if m else '', 'tests': []}
+    for m in re.finditer(r'^## Test:\s*(.+?)\s*\n(.*?)(?=^## |\Z)', text, re.S | re.M):
+        test = {'name': m.group(1), 'steps': [], 'expected': '', 'todo': ''}
+        field = None
+        for line in m.group(2).splitlines():
+            s = line.strip()
+            if s.startswith('Ticket:'):
+                test['ticket'] = s[len('Ticket:'):].strip()
+                field = None
+            elif s.startswith('EXPECTED:'):
+                test['expected'] = s[len('EXPECTED:'):].strip()
+                field = 'expected'
+            elif s.startswith('TODO:'):
+                test['todo'] = s[len('TODO:'):].strip()
+                field = 'todo'
+            elif not s:
+                field = None
+            elif field:
+                test[field] += '\n' + s
+            else:
+                test['steps'].append(re.sub(r'^\d+\.\s+', '', s))
+        test['steps'] = legacy_steps(test['steps'], test.pop('expected'))
+        if not test['todo']:
+            del test['todo']
+        doc['tests'].append(test)
+    return doc
+
+
+def validate(doc, root=None):
+    """Return a list of error strings, empty when the document is fine. With ROOT (the directory of
+    the test file) the test projects must exist."""
+    errors = []
+    if not isinstance(doc, dict) or not isinstance(doc.get('tests'), list):
+        return ['the document needs a "tests" list']
+    if not isinstance(doc.get('title', ''), str) or '\n' in doc.get('title', ''):
+        errors.append('the title must be one line')
+    background = doc.get('background', [])
+    if not isinstance(background, list) or not all(isinstance(s, str) for s in background):
+        errors.append('the background must be a list of lines')
+    else:
+        errors += validate_steps(background, 'Background', need_then=False)
+    names = set()
+    for i, t in enumerate(doc['tests'], 1):
+        where = 'test %d' % i
+        if not isinstance(t, dict):
+            errors.append(where + ': not an object')
+            continue
+        name = t.get('name')
+        if not isinstance(name, str) or not name.strip():
+            errors.append(where + ': name is missing')
+        elif '\n' in name:
+            errors.append(where + ': the name must be one line')
+        elif name in names:
+            errors.append('%s: duplicate name "%s"' % (where, name))
+        else:
+            names.add(name)
+        steps = t.get('steps', [])
+        if not isinstance(steps, list) or not all(isinstance(s, str) and '\n' not in s for s in steps):
+            errors.append(where + ': steps must be a list of lines')
+        else:
+            errors += validate_steps(steps, where)
+        for k in ('todo', 'ticket', 'id'):
+            if not isinstance(t.get(k, ''), str):
+                errors.append('%s: %s must be a string' % (where, k))
+        if re.search(r'\s', t.get('ticket', '') or '') or re.search(r'\W', t.get('id', '') or ''):
+            errors.append(where + ': the ticket and the id can not have spaces, they are tags')
+        projects = t.get('projects', [])
+        if not isinstance(projects, list) or not all(isinstance(p, str) and PROJECT_RE.match(p) for p in projects):
+            errors.append(where + ': projects must be a list of project names (letters, digits, _ and -)')
+        elif root:
+            errors += ['%s: the test project "%s" does not exist' % (where, p) for p in projects
+                       if not os.path.isdir(os.path.join(root, PROJECTS, p))]
+        editions = t.get('editions', list(EDITIONS))
+        if (not isinstance(editions, list) or not editions or len(set(editions)) != len(editions)
+                or not all(e in EDITIONS for e in editions)):
+            errors.append('%s: editions must be a list of one or more of %s' % (where, ', '.join(EDITIONS)))
+        errors += validate_script(t.get('script', []), where + ' script')
+        examples = t.get('examples', [])
+        if not isinstance(examples, list) or not all(isinstance(r, dict) for r in examples):
+            errors.append(where + ': examples must be a list of rows')
+            continue
+        if examples:
+            cols = list(examples[0])
+            for c in cols:
+                if not AXIS_RE.match(c):
+                    errors.append('%s: Examples column "%s" must be letters, digits and _' % (where, c))
+            if any(list(r) != cols for r in examples):
+                errors.append(where + ': every row of the Examples must have the same columns')
+            if not all(isinstance(v, str) and v and '|' not in v for r in examples for v in r.values()):
+                errors.append(where + ': every cell of the Examples needs a value without |')
+            if len({json.dumps(r, sort_keys=True) for r in examples}) != len(examples):
+                errors.append(where + ': a row of the Examples is there twice')
+    return errors
+
+
+def scripts_path(path):
+    return path[:-len(EXT)] + SCRIPTS_EXT if path.endswith(EXT) else path + SCRIPTS_EXT
+
+
+def load(path):
+    with open(path, encoding='utf-8') as f:
+        text = f.read()
+    if path.endswith('.md'):
+        return from_markdown(text)
+    if path.endswith('.json'):
+        return from_legacy_json(json.loads(text))
+    doc = parse(text)
+    try:
+        with open(scripts_path(path), encoding='utf-8') as f:
+            scripts = json.load(f)
+    except FileNotFoundError:
+        scripts = {}
+    for t in doc['tests']:
+        s = scripts.get(t.get('id')) if t.get('id') else None
+        if isinstance(s, dict) and s.get('script'):
+            t['script'] = s['script']
+            if s.get('script_for'):
+                t['script_for'] = s['script_for']
+    return doc
+
+
+def combinations(test):
+    """The rows of the Examples of a test as a list of {column: value}; [{}] when there are none."""
+    return [dict(r) for r in test.get('examples') or []] or [{}]
+
+
+def editions(test):
+    """The editions that a test is for, all of them when it does not say."""
+    return test.get('editions') or list(EDITIONS)
+
+
+def substitute(text, combo):
+    return re.sub(r'\{([\w:-]+)\}', lambda m: combo.get(m.group(1), m.group(0)), text)
+
+
+def substitute_step(text, combo):
+    """<column> of the Examples and {edition} in a line of the steps."""
+    text = re.sub(r'<(\w+)>', lambda m: combo.get(m.group(1), m.group(0)), text)
+    return substitute(text, {k: v for k, v in combo.items() if k == 'edition'})
+
+
+def body(test, combo, edition=None, background=()):
+    """The test as it is shown to Claude: the scenario in Gherkin, with the values of the run."""
+    parts = []
+    if test.get('ticket'):
+        parts.append('Ticket: ' + test['ticket'])
+    if edition:
+        parts.append('Edition of the application: ' + edition)
+    if combo:
+        parts.append('Examples row for this run: ' + ', '.join('%s=%s' % kv for kv in combo.items()))
+    combo = dict(combo, edition=edition) if edition else combo
+    lines = []
+    if background:
+        lines += ['Background:'] + ['  ' + substitute_step(s, combo) for s in background] + ['']
+    lines += ['Scenario: ' + test['name']] + ['  ' + substitute_step(s, combo) for s in test.get('steps', [])]
+    parts.append('\n'.join(lines))
+    if test.get('todo'):
+        parts.append('TODO: ' + substitute_step(test['todo'], combo))
+    return '\n\n'.join(parts)
+
+
+def project_files(root, name):
+    """{relative path: bytes} of a test project."""
+    base = os.path.join(root, PROJECTS, name)
+    out = {}
+    for dirpath, _, files in os.walk(base):
+        for f in files:
+            p = os.path.join(dirpath, f)
+            with open(p, 'rb') as fh:
+                out[os.path.relpath(p, base)] = fh.read()
+    return out
+
+
+def project_hash(root, name):
+    h = hashlib.sha1()
+    for path, data in sorted(project_files(root, name).items()):
+        h.update(path.encode() + b'\0' + data + b'\0')
+    return h.hexdigest()[:12]
+
+
+def materialize(root, names, work):
+    """Copy the test projects to WORK/projects/NAME. Returns the variables for the script."""
+    variables = {}
+    for name in names:
+        src = os.path.join(root, PROJECTS, name)
+        if not os.path.isdir(src):
+            raise FileNotFoundError('the test project "%s" does not exist' % name)
+        dst = os.path.join(work, PROJECTS, name)
+        shutil.copytree(src, dst)
+        variables['project:' + name] = dst
+    if len(names) == 1:
+        variables['project'] = variables['project:' + names[0]]
+    return variables
+
+
+def definition_hash(test, root=None, background=()):
+    """What a script depends on: changing any of these, the Background of the file or a file of a
+    test project makes the script outdated."""
+    d = {'steps': list(background or []) + list(test.get('steps') or []), 'todo': test.get('todo') or '',
+         'examples': test.get('examples') or []}
+    if test.get('projects'):
+        d['projects'] = {p: project_hash(root, p) if root and os.path.isdir(os.path.join(root, PROJECTS, p)) else 'missing'
+                         for p in test['projects']}
+    return hashlib.sha1(json.dumps(d, sort_keys=True, ensure_ascii=False).encode()).hexdigest()[:12]
+
+
+def ensure_ids(doc):
+    for t in doc.get('tests', []):
+        if not t.get('id'):
+            t['id'] = 't' + hashlib.sha1(str(t.get('name', '')).encode()).hexdigest()[:8]
+    return doc
+
+
+def is_stale(test, root=None, background=()):
+    """A script that was made for another version of the test. No script_for: old file, trusted."""
+    return bool(test.get('script') and test.get('script_for')
+                and test['script_for'] != definition_hash(test, root, background))
+
+
+def stamp_scripts(doc, old, root=None):
+    """Before saving. A new, edited or approved ("_approve") script is current for the test as it is
+    now. An untouched script keeps what it was made for, so editing the test makes it outdated."""
+    ensure_ids(doc)
+    old = ensure_ids(old or {})
+    prev = {t['id']: t for t in old.get('tests', [])}
+    for t in doc['tests']:
+        t.pop('_stale', None)
+        approve = t.pop('_approve', False)
+        if not t.get('script'):
+            t.pop('script_for', None)
+            continue
+        p = prev.get(t['id'])
+        if approve or p is None or p.get('script') != t['script']:
+            t['script_for'] = definition_hash(t, root, doc.get('background'))
+        else:
+            t['script_for'] = p.get('script_for') or definition_hash(p, root, old.get('background'))
+    return doc
+
+
+def subst_deep(obj, combo):
+    if isinstance(obj, str):
+        return substitute(obj, combo)
+    if isinstance(obj, list):
+        return [subst_deep(x, combo) for x in obj]
+    if isinstance(obj, dict):
+        return {k: subst_deep(v, combo) for k, v in obj.items()}
+    return obj
+
+
+def expand(path, edition=None):
+    """One dict {name, id, body, script, stale, combo} per Examples row of every enabled test.
+    With EDITION only the tests for that edition, and {edition} is replaced."""
+    doc = ensure_ids(load(path))
+    root = os.path.dirname(os.path.abspath(path))
+    errors = validate(doc, root)
+    if errors:
+        sys.exit('error: %s: %s' % (path, '; '.join(errors)))
+    background = doc.get('background', [])
+    out = []
+    for t in doc['tests']:
+        if not t.get('enabled', True) or edition and edition not in editions(t):
+            continue
+        for combo in combinations(t):
+            name = t['name'] + (' [%s]' % ', '.join('%s=%s' % kv for kv in combo.items()) if combo else '')
+            values = dict(combo, edition=edition) if edition else combo
+            out.append({'name': name, 'id': t['id'], 'body': body(t, combo, edition, background), 'combo': combo,
+                        'root': root, 'projects': t.get('projects', []), 'stale': is_stale(t, root, background),
+                        'script': subst_deep(t.get('script', []), values)})
+    return out
+
+
+def write_atomic(path, text):
+    tmp = path + '.tmp'
+    with open(tmp, 'w', encoding='utf-8') as f:
+        f.write(text)
+    os.replace(tmp, path)
+
+
+def save(path, doc):
+    """Write FILE.feature and the scripts in FILE.scripts.json."""
+    if not path.endswith(EXT):
+        raise ValueError('a test file is saved as ' + EXT)
+    ensure_ids(doc)
+    scripts = {t['id']: {k: t[k] for k in ('script', 'script_for') if t.get(k)} for t in doc['tests'] if t.get('script')}
+    write_atomic(path, to_gherkin(doc))
+    if scripts:
+        write_atomic(scripts_path(path), json.dumps(scripts, indent=2, ensure_ascii=False) + '\n')
+    elif os.path.exists(scripts_path(path)):
+        os.remove(scripts_path(path))
+
+
+def convert(src, dst):
+    """Import a markdown or an older JSON test file. Scripts that were up to date stay up to date."""
+    root = os.path.dirname(os.path.abspath(src))
+    current = set()
+    if src.endswith('.json'):
+        with open(src, encoding='utf-8') as f:
+            old = json.load(f)
+        for o in old.get('tests', []):
+            d = {k: o.get(k) or ([] if k == 'steps' else {} if k == 'matrix' else '') for k in ('steps', 'expected', 'todo', 'matrix')}
+            if o.get('projects'):
+                d['projects'] = {p: project_hash(root, p) if os.path.isdir(os.path.join(root, PROJECTS, p)) else 'missing'
+                                 for p in o['projects']}
+            h = hashlib.sha1(json.dumps(d, sort_keys=True, ensure_ascii=False).encode()).hexdigest()[:12]
+            if o.get('script') and o.get('script_for') in (None, h):
+                current.add(o.get('id'))
+    doc = ensure_ids(load(src))
+    for t in doc['tests']:
+        if t['id'] in current:
+            t['script_for'] = definition_hash(t, os.path.dirname(os.path.abspath(dst)), doc.get('background'))
+    save(dst, doc)
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 4 or sys.argv[1] != 'convert' or not sys.argv[3].endswith(EXT):
+        sys.exit(__doc__)
+    convert(sys.argv[2], sys.argv[3])
diff --git a/gui/manualtest/tests/analysis.feature b/gui/manualtest/tests/analysis.feature
new file mode 100644
index 00000000000..fc43506dd98
--- /dev/null
+++ b/gui/manualtest/tests/analysis.feature
@@ -0,0 +1,55 @@
+Feature: Analysis and recheck
+
+  Background:
+    Given the application is started with no project loaded
+
+  @id:te65b1fa8 @project:basic-project
+  Scenario: Reanalyze all files
+    Given the project file {project:basic-project}/basic.cppcheck is opened from the File menu
+    And the analysis is done
+    When I change {project:basic-project}/src/a.c and {project:basic-project}/src/b.c so that they only contain ";"
+    And I click Reanalyze all files
+    And I wait until the analysis is done
+    Then there are no results for a.c
+    And there are no results for b.c
+
+  @id:tc707b85b @ticket:14893 @project:recheck
+  Scenario: Recheck a changed file
+    Given the project file {project:recheck}/p.cppcheck is opened
+    And the analysis is done
+    And the results show a nullPointer error in a.c and an arrayIndexOutOfBounds error in b.c
+    When I copy {project:recheck}/a_v2.c over {project:recheck}/a.c (a_v2.c has an uninitvar error instead)
+    And I right click on the file a.c in the results and click Recheck
+    Then the results for a.c are refreshed
+    And the nullPointer error in a.c is gone
+    And the uninitvar error from the changed a.c is shown
+    And the arrayIndexOutOfBounds error in b.c is still shown, unchanged
+
+  @id:tc550387d @project:basic-project
+  Scenario: Recheck a header file
+    Given the project file {project:basic-project}/basic.cppcheck is opened from the File menu
+    And the analysis is done
+    When I right click on the file util.h in the results
+    Then the context menu of util.h has a Recheck entry
+    When I click Recheck
+    And I wait until the analysis is done
+    Then the analysis is run again for the files that include util.h
+    And the nullPointer error in util.h is shown again
+
+  @id:ta6f3b40b @project:syntax-error
+  Scenario Outline: Analyze a broken source file
+    Given the project file {project:syntax-error}/<case>.cppcheck checks <case>.c, a broken or unusual source file, and ok.c, which has a nullPointer error
+    When I open the project file {project:syntax-error}/<case>.cppcheck
+    And I wait until the analysis is done
+    Then the analysis finishes
+    And the application does not crash
+    And the nullPointer error in ok.c is shown
+
+    Examples:
+      | case             |
+      | braces           |
+      | empty            |
+      | binary           |
+      | latin1           |
+      | long_line        |
+      | unclosed_nesting |
diff --git a/gui/manualtest/tests/analysis.scripts.json b/gui/manualtest/tests/analysis.scripts.json
new file mode 100644
index 00000000000..54d89a4c39d
--- /dev/null
+++ b/gui/manualtest/tests/analysis.scripts.json
@@ -0,0 +1,399 @@
+{
+  "te65b1fa8": {
+    "script": [
+      {
+        "label": "Open the File menu",
+        "do": "click",
+        "name": "File",
+        "role": "menu item"
+      },
+      {
+        "label": "Choose Open Project File",
+        "do": "click",
+        "name": "Open Project File",
+        "role": "menu item"
+      },
+      {
+        "label": "Enter the project file path",
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:basic-project}/basic.cppcheck"
+      },
+      {
+        "label": "Confirm the file dialog",
+        "do": "key",
+        "keys": [
+          "Return"
+        ]
+      },
+      {
+        "label": "Wait until the first analysis shows results for a.c",
+        "expect": "visible",
+        "name": "src/a.c",
+        "role": "table cell",
+        "timeout": 30
+      },
+      {
+        "label": "Results for b.c are shown too",
+        "expect": "visible",
+        "name": "src/b.c",
+        "role": "table cell"
+      },
+      {
+        "label": "Edit a.c so it only contains ;",
+        "do": "write",
+        "path": "{project:basic-project}/src/a.c",
+        "content": ";"
+      },
+      {
+        "label": "Edit b.c so it only contains ;",
+        "do": "write",
+        "path": "{project:basic-project}/src/b.c",
+        "content": ";"
+      },
+      {
+        "label": "Click Reanalyze all files",
+        "do": "click",
+        "name": "Reanalyze all files",
+        "role": "button"
+      },
+      {
+        "label": "Wait until the analysis is done (No errors found dialog)",
+        "expect": "visible",
+        "name": "No errors found",
+        "role": "label",
+        "timeout": 30
+      },
+      {
+        "label": "Close the dialog",
+        "do": "click",
+        "name": "OK",
+        "role": "button"
+      },
+      {
+        "label": "No results for a.c",
+        "expect": "gone",
+        "name": "src/a.c",
+        "role": "table cell"
+      },
+      {
+        "label": "No results for b.c",
+        "expect": "gone",
+        "name": "src/b.c",
+        "role": "table cell"
+      }
+    ],
+    "script_for": "c692e526a6cd"
+  },
+  "tc707b85b": {
+    "script": [
+      {
+        "do": "wait",
+        "name": "Cppcheck",
+        "role": "frame",
+        "timeout": 20,
+        "label": "Application started with no project"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File",
+        "role": "button",
+        "label": "Open the project file dialog"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:recheck}/p.cppcheck",
+        "label": "Enter the path of p.cppcheck"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Open the project"
+      },
+      {
+        "expect": "visible",
+        "name": "b.c",
+        "role": "table cell",
+        "timeout": 30,
+        "label": "Analysis done, b.c in the results"
+      },
+      {
+        "expect": "visible",
+        "name": "a.c",
+        "role": "table cell",
+        "timeout": 30,
+        "label": "a.c in the results"
+      },
+      {
+        "do": "sleep",
+        "seconds": 3,
+        "label": "Let the analysis finish"
+      },
+      {
+        "do": "copy",
+        "from": "{project:recheck}/a_v2.c",
+        "to": "{project:recheck}/a.c",
+        "label": "Change a.c by copying a_v2.c over it"
+      },
+      {
+        "do": "rightclick",
+        "name": "a.c",
+        "role": "table cell",
+        "nth": 0,
+        "label": "Right click on a.c in the results"
+      },
+      {
+        "expect": "ocr",
+        "contains": "Recheck",
+        "label": "Context menu shows Recheck"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Down",
+          "Return"
+        ],
+        "label": "Click Recheck"
+      },
+      {
+        "do": "sleep",
+        "seconds": 4,
+        "label": "Wait for the recheck"
+      },
+      {
+        "do": "click",
+        "name": "b.c",
+        "role": "table cell",
+        "nth": 0,
+        "label": "Select the b.c row"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Right",
+          "Down",
+          "Down",
+          "Down",
+          "Right"
+        ],
+        "label": "Expand b.c and a.c to show their results"
+      },
+      {
+        "expect": "text",
+        "contains": "uninitvar",
+        "label": "The uninitvar error of the changed a.c is shown"
+      },
+      {
+        "expect": "text",
+        "not_contains": "nullPointer",
+        "label": "The nullPointer error is gone"
+      },
+      {
+        "expect": "text",
+        "contains": "arrayIndexOutOfBounds",
+        "label": "The arrayIndexOutOfBounds error in b.c is still shown"
+      }
+    ],
+    "script_for": "0c160519508a"
+  },
+  "tc550387d": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File",
+        "role": "menu item",
+        "label": "Choose Open Project File"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:basic-project}/basic.cppcheck",
+        "label": "Enter the project file path"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Confirm the file dialog"
+      },
+      {
+        "expect": "visible",
+        "name": "include/util.h",
+        "role": "table cell",
+        "timeout": 30,
+        "label": "Analysis is done and util.h is in the results"
+      },
+      {
+        "expect": "visible",
+        "name": "src/b.c",
+        "role": "table cell",
+        "timeout": 30,
+        "label": "Analysis finished for all files"
+      },
+      {
+        "do": "rightclick",
+        "name": "include/util.h",
+        "role": "table cell",
+        "label": "Right click on util.h in the results"
+      },
+      {
+        "do": "sleep",
+        "seconds": 1,
+        "label": "Wait for the context menu"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Down",
+          "Return"
+        ],
+        "label": "Click the Recheck entry of the context menu"
+      },
+      {
+        "expect": "text",
+        "contains": "Checking /tmp",
+        "timeout": 30,
+        "label": "The analysis was run again"
+      },
+      {
+        "expect": "text",
+        "contains": "src/a.c ...",
+        "timeout": 30,
+        "label": "The file that includes util.h is checked again"
+      },
+      {
+        "do": "sleep",
+        "seconds": 3,
+        "label": "Wait until the analysis is done"
+      },
+      {
+        "do": "click",
+        "name": "include/util.h",
+        "role": "table cell",
+        "mouse": true,
+        "label": "Select util.h with the mouse so it has focus"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Right"
+        ],
+        "label": "Expand util.h"
+      },
+      {
+        "expect": "visible",
+        "name": "nullPointer",
+        "role": "table cell",
+        "timeout": 10,
+        "label": "The nullPointer error in util.h is shown again"
+      },
+      {
+        "expect": "visible",
+        "name": "Null pointer dereference",
+        "role": "table cell",
+        "timeout": 5,
+        "label": "The nullPointer message is shown"
+      }
+    ],
+    "script_for": "dc8fcd30e236"
+  },
+  "ta6f3b40b": {
+    "script": [
+      {
+        "label": "Start the application with no project loaded",
+        "expect": "visible",
+        "name": "Cppcheck",
+        "role": "frame"
+      },
+      {
+        "label": "Open the project file",
+        "do": "click",
+        "name": "Open Project File",
+        "role": "button"
+      },
+      {
+        "label": "Wait for the Select Project File dialog",
+        "do": "wait",
+        "name": "Select Project File",
+        "timeout": 10
+      },
+      {
+        "label": "Enter the project file {case}.cppcheck",
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:syntax-error}/{case}.cppcheck"
+      },
+      {
+        "label": "Confirm the file dialog",
+        "do": "key",
+        "keys": [
+          "Return"
+        ]
+      },
+      {
+        "label": "The project is loaded",
+        "expect": "visible",
+        "name": "Project: {case}.cppcheck",
+        "role": "frame",
+        "timeout": 15
+      },
+      {
+        "label": "Wait until the analysis is done (ok.c is checked)",
+        "expect": "text",
+        "contains": "Checking ok.c",
+        "timeout": 60
+      },
+      {
+        "label": "Give the analysis time to finish",
+        "do": "sleep",
+        "seconds": 3
+      },
+      {
+        "label": "The analysis finishes: Stop analysis is disabled again",
+        "expect": "state",
+        "name": "Stop analysis",
+        "role": "button",
+        "not_state": "enabled",
+        "timeout": 60
+      },
+      {
+        "label": "The analysis finishes: Reanalyze all files is enabled again",
+        "expect": "state",
+        "name": "Reanalyze all files",
+        "role": "button",
+        "state": "enabled",
+        "timeout": 30
+      },
+      {
+        "label": "The broken source file {case}.c was analyzed",
+        "expect": "text",
+        "contains": "Checking {case}.c"
+      },
+      {
+        "label": "The nullPointer error in ok.c is shown (ok.c has a result row)",
+        "expect": "visible",
+        "name": "ok.c",
+        "role": "table cell"
+      },
+      {
+        "label": "The application does not crash",
+        "expect": "alive"
+      }
+    ],
+    "script_for": "3090dfe1cf47"
+  }
+}
diff --git a/gui/manualtest/tests/application.feature b/gui/manualtest/tests/application.feature
new file mode 100644
index 00000000000..378e1a636cc
--- /dev/null
+++ b/gui/manualtest/tests/application.feature
@@ -0,0 +1,59 @@
+Feature: Application, menus and help
+
+  Background:
+    Given the application is started with no project loaded
+
+  @id:t41f9102b
+  Scenario: All menus open
+    When I open each of the menus File, Edit, View, Analyze and Help in turn
+    And I look at its entries and close it with Escape
+    Then each of the menus File, Edit, View, Analyze and Help opens
+    And each menu shows at least one entry
+
+  @id:t1cc2be0f
+  Scenario: Show and hide toolbars
+    Given all entries of View > Toolbar are checked
+    When I uncheck the entries of View > Toolbar one at a time
+    Then a toolbar that is unchecked is no longer shown in the main window
+    And the toolbars that are still checked are shown
+
+  @id:t5fdeee58 @edition:opensource
+  Scenario: Same version in the title and in About
+    Given the title of the main window is "Cppcheck <version>"
+    When I note the version in the title
+    And I open Help > About
+    Then the About dialog shows the same version as the title of the main window
+
+  @id:t90321d9c
+  Scenario: Help contents
+    When I open Help > Contents
+    Then a help window opens
+    And the help window has contents, it is not empty
+
+  @id:tc059b730
+  Scenario: Other Help menu entries
+    When I open each of the other entries of the Help menu in turn (About and the rest)
+    And I close each window with Escape or its Close button
+    Then every entry opens a dialog or window with text in it
+    And none of them is empty
+
+  @id:t5bf8f6ae @ticket:13982
+  Scenario: Scratch pad
+    When I open View > Scratch Pad
+    And I enter this code, one line each:
+      """
+      int main(void)
+      {
+          int *p = 0;
+          return *p;
+      }
+      """
+    And I click Check
+    Then the code is analysed
+    And a nullPointer error is shown
+    And the application does not crash
+
+  @id:t1a2285d8
+  Scenario: Quit from the File menu
+    When I open File > Quit
+    Then the application closes
diff --git a/gui/manualtest/tests/application.scripts.json b/gui/manualtest/tests/application.scripts.json
new file mode 100644
index 00000000000..98f5b20a42d
--- /dev/null
+++ b/gui/manualtest/tests/application.scripts.json
@@ -0,0 +1,548 @@
+{
+  "t41f9102b": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "expect": "visible",
+        "name": "Open XML...",
+        "role": "menu item",
+        "label": "File menu shows entries"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Escape"
+        ],
+        "label": "Close the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Edit",
+        "role": "menu item",
+        "label": "Open the Edit menu"
+      },
+      {
+        "expect": "visible",
+        "name": "Clear results",
+        "role": "menu item",
+        "label": "Edit menu shows entries"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Escape"
+        ],
+        "label": "Close the Edit menu"
+      },
+      {
+        "do": "click",
+        "name": "View",
+        "role": "menu item",
+        "label": "Open the View menu"
+      },
+      {
+        "expect": "visible",
+        "name": "Toolbars",
+        "role": "menu item",
+        "label": "View menu shows entries"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Escape"
+        ],
+        "label": "Close the View menu"
+      },
+      {
+        "do": "click",
+        "name": "Analyze",
+        "role": "menu item",
+        "label": "Open the Analyze menu"
+      },
+      {
+        "expect": "visible",
+        "name": "Files...",
+        "role": "menu item",
+        "label": "Analyze menu shows entries"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Escape"
+        ],
+        "label": "Close the Analyze menu"
+      },
+      {
+        "do": "click",
+        "name": "Help",
+        "role": "menu item",
+        "label": "Open the Help menu"
+      },
+      {
+        "expect": "visible",
+        "name": "Contents",
+        "role": "menu item",
+        "label": "Help menu shows entries"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Escape"
+        ],
+        "label": "Close the Help menu"
+      }
+    ],
+    "script_for": "06424398d415"
+  },
+  "t1cc2be0f": {
+    "script": [
+      {
+        "do": "click",
+        "name": "View",
+        "role": "menu item",
+        "label": "Open View menu"
+      },
+      {
+        "do": "click",
+        "name": "Toolbars",
+        "role": "menu item",
+        "label": "Open Toolbars submenu"
+      },
+      {
+        "expect": "state",
+        "name": "Standard",
+        "role": "menu item",
+        "state": "checked",
+        "label": "Standard toolbar entry is checked"
+      },
+      {
+        "expect": "state",
+        "name": "Categories",
+        "role": "menu item",
+        "state": "checked",
+        "label": "Categories toolbar entry is checked"
+      },
+      {
+        "expect": "state",
+        "name": "Filter",
+        "role": "menu item",
+        "state": "checked",
+        "label": "Filter toolbar entry is checked"
+      },
+      {
+        "do": "click",
+        "name": "Standard",
+        "role": "menu item",
+        "label": "Uncheck Standard toolbar"
+      },
+      {
+        "expect": "gone",
+        "name": "Standard",
+        "role": "tool bar",
+        "label": "Standard toolbar is no longer shown"
+      },
+      {
+        "expect": "visible",
+        "name": "Categories",
+        "role": "tool bar",
+        "label": "Categories toolbar still shown"
+      },
+      {
+        "expect": "visible",
+        "name": "Filter",
+        "role": "tool bar",
+        "label": "Filter toolbar still shown"
+      },
+      {
+        "do": "click",
+        "name": "Categories",
+        "role": "menu item",
+        "label": "Uncheck Categories toolbar"
+      },
+      {
+        "expect": "gone",
+        "name": "Categories",
+        "role": "tool bar",
+        "label": "Categories toolbar is no longer shown"
+      },
+      {
+        "expect": "visible",
+        "name": "Filter",
+        "role": "tool bar",
+        "label": "Filter toolbar still shown"
+      },
+      {
+        "do": "click",
+        "name": "Filter",
+        "role": "menu item",
+        "label": "Uncheck Filter toolbar"
+      },
+      {
+        "expect": "gone",
+        "name": "Filter",
+        "role": "tool bar",
+        "label": "Filter toolbar is no longer shown"
+      }
+    ],
+    "script_for": "6a99d7841493"
+  },
+  "t5fdeee58": {
+    "script": [
+      {
+        "expect": "capture",
+        "name": "Cppcheck",
+        "role": "frame",
+        "regex": "'Cppcheck (?:Premium )?(\\d[^']*)'",
+        "as": "version",
+        "label": "Note the version in the title of the main window"
+      },
+      {
+        "do": "click",
+        "name": "Help",
+        "role": "menu item",
+        "label": "Open the Help menu"
+      },
+      {
+        "do": "click",
+        "name": "About...",
+        "role": "menu item",
+        "label": "Open Help > About"
+      },
+      {
+        "expect": "visible",
+        "name": "About Cppcheck",
+        "role": "dialog",
+        "label": "About dialog is shown"
+      },
+      {
+        "expect": "visible",
+        "name": "Version {version}",
+        "role": "label",
+        "label": "About dialog shows the same version as the main window title ({version})"
+      }
+    ],
+    "script_for": "5dadee22b5ec"
+  },
+  "t90321d9c": {
+    "script": [
+      {
+        "do": "click",
+        "name": "Help",
+        "role": "menu item",
+        "label": "Open the Help menu"
+      },
+      {
+        "do": "click",
+        "name": "Contents",
+        "role": "menu item",
+        "label": "Choose Help > Contents"
+      },
+      {
+        "expect": "visible",
+        "name": "Cppcheck GUI help",
+        "role": "dialog",
+        "label": "A help window opens",
+        "observed_fail": true
+      },
+      {
+        "expect": "text",
+        "contains": "Contents",
+        "label": "The help window has contents (it is not empty)"
+      },
+      {
+        "expect": "text",
+        "not_contains": "was not found",
+        "label": "No error that the help file was not found"
+      }
+    ],
+    "script_for": "7c97b218aa0f"
+  },
+  "tc059b730": {
+    "script": [
+      {
+        "do": "click",
+        "name": "Help",
+        "role": "menu item",
+        "label": "Open the Help menu"
+      },
+      {
+        "do": "click",
+        "name": "License...",
+        "role": "menu item",
+        "label": "Open License"
+      },
+      {
+        "expect": "visible",
+        "name": "License",
+        "role": "dialog",
+        "label": "License dialog opens"
+      },
+      {
+        "expect": "text",
+        "contains": "GNU GENERAL PUBLIC LICENSE",
+        "label": "License dialog has text"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Escape"
+        ],
+        "label": "Close License with Escape"
+      },
+      {
+        "expect": "gone",
+        "name": "License",
+        "label": "License dialog is closed"
+      },
+      {
+        "do": "click",
+        "name": "Help",
+        "role": "menu item",
+        "label": "Open the Help menu"
+      },
+      {
+        "do": "click",
+        "name": "Authors...",
+        "role": "menu item",
+        "label": "Open Authors"
+      },
+      {
+        "expect": "visible",
+        "name": "Authors",
+        "role": "dialog",
+        "label": "Authors dialog opens"
+      },
+      {
+        "expect": "text",
+        "contains": "The cppcheck team",
+        "label": "Authors dialog has text"
+      },
+      {
+        "do": "click",
+        "name": "Close",
+        "role": "button",
+        "label": "Close Authors with its Close button"
+      },
+      {
+        "expect": "gone",
+        "name": "Authors",
+        "role": "dialog",
+        "label": "Authors dialog is closed"
+      },
+      {
+        "do": "click",
+        "name": "Help",
+        "role": "menu item",
+        "label": "Open the Help menu"
+      },
+      {
+        "do": "click",
+        "name": "About...",
+        "role": "menu item",
+        "label": "Open About"
+      },
+      {
+        "expect": "visible",
+        "name": "About Cppcheck",
+        "role": "dialog",
+        "label": "About dialog opens"
+      },
+      {
+        "expect": "text",
+        "contains": "Cppcheck - A tool for static C/C++ code analysis.",
+        "label": "About dialog has text"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Escape"
+        ],
+        "label": "Close About with Escape"
+      },
+      {
+        "expect": "gone",
+        "name": "About Cppcheck",
+        "role": "dialog",
+        "label": "About dialog is closed"
+      },
+      {
+        "do": "click",
+        "name": "Help",
+        "role": "menu item",
+        "label": "Open the Help menu"
+      },
+      {
+        "do": "click",
+        "name": "Contents",
+        "role": "menu item",
+        "label": "Open Contents"
+      },
+      {
+        "expect": "visible",
+        "name": "Cppcheck",
+        "role": "alert",
+        "label": "Contents shows a message"
+      },
+      {
+        "expect": "text",
+        "contains": "Helpfile",
+        "label": "Message has text"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Escape"
+        ],
+        "label": "Close the message with Escape"
+      },
+      {
+        "expect": "visible",
+        "name": "Cppcheck GUI help",
+        "role": "dialog",
+        "label": "Help window opens"
+      },
+      {
+        "expect": "text",
+        "contains": "Introduction",
+        "observed_fail": true,
+        "label": "Help window has text in it, not empty"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Escape"
+        ],
+        "label": "Close the help window with Escape"
+      }
+    ],
+    "script_for": "97511d2313db"
+  },
+  "t5bf8f6ae": {
+    "script": [
+      {
+        "do": "click",
+        "name": "View",
+        "role": "menu item",
+        "label": "Open the View menu"
+      },
+      {
+        "do": "click",
+        "name": "Show Scratchpad",
+        "role": "menu item",
+        "label": "Open View > Scratch Pad"
+      },
+      {
+        "expect": "visible",
+        "name": "Scratchpad",
+        "role": "dialog",
+        "label": "Scratchpad dialog is shown"
+      },
+      {
+        "do": "focus",
+        "path": "1.1",
+        "label": "Focus the code editor of the scratchpad"
+      },
+      {
+        "do": "type",
+        "value": "int main(void)",
+        "label": "Type line 1"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "New line"
+      },
+      {
+        "do": "type",
+        "value": "{",
+        "label": "Type line 2"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "New line"
+      },
+      {
+        "do": "type",
+        "value": "    int *p = 0;",
+        "label": "Type line 3"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "New line"
+      },
+      {
+        "do": "type",
+        "value": "    return *p;",
+        "label": "Type line 4"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "New line"
+      },
+      {
+        "do": "type",
+        "value": "}",
+        "label": "Type line 5"
+      },
+      {
+        "do": "click",
+        "name": "Check",
+        "role": "button",
+        "label": "Click Check"
+      },
+      {
+        "expect": "text",
+        "contains": "nullPointer",
+        "timeout": 15,
+        "label": "A nullPointer error is shown"
+      },
+      {
+        "expect": "text",
+        "contains": "Null pointer dereference: p",
+        "label": "The null pointer message is shown"
+      },
+      {
+        "expect": "alive",
+        "label": "The application did not crash"
+      }
+    ],
+    "script_for": "30d9d26803fd"
+  },
+  "t1a2285d8": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Quit",
+        "role": "menu item",
+        "label": "Choose File > Quit"
+      },
+      {
+        "expect": "exited",
+        "label": "The application closes"
+      }
+    ],
+    "script_for": "bc31dd4069bf"
+  }
+}
diff --git a/gui/manualtest/tests/preferences.feature b/gui/manualtest/tests/preferences.feature
new file mode 100644
index 00000000000..70d0a82fa47
--- /dev/null
+++ b/gui/manualtest/tests/preferences.feature
@@ -0,0 +1,42 @@
+Feature: Preferences
+
+  Background:
+    Given the application is started with no project loaded
+
+  @id:t232a9783
+  Scenario: Default number of threads
+    When I open Edit > Preferences
+    And I look at the General tab
+    Then the number of threads is 1
+
+  @id:tf5b5a7e1
+  Scenario: Number of threads cannot be 0
+    Given Edit > Preferences is open on the General tab
+    When I type 0 in the number of threads field
+    And I close the dialog with OK
+    And I open Edit > Preferences again
+    Then the field has not accepted 0
+    And the number of threads is at least 1, it is never 0
+
+  @id:t841cca6c @project:basic-project
+  Scenario: Analysis with 100 threads
+    Given the number of threads is set to 100 in Edit > Preferences and the dialog is closed with OK
+    When I open the project file {project:basic-project}/basic.cppcheck from the File menu
+    And I wait until the analysis is done
+    Then the application does not crash
+    And the analysis is done and the results are shown
+
+  @id:t28ce8afe @project:embedded @edition:opensource @disabled
+  Scenario Outline: Misra rule text file
+    Given Edit > Preferences is open on the Addons tab
+    When I select the rule text file {project:embedded}/<rulefile>
+    And I close the dialog with OK
+    And I open the project file {project:embedded}/embedded.cppcheck
+    And I wait until the analysis is done
+    Then the Misra error for the unused parameter has the rule text from the file (TEST RULE TEXT: unused parameters are not allowed)
+    And there are no internalError results
+
+    Examples:
+      | rulefile              |
+      | rules.txt             |
+      | rules with spaces.txt |
diff --git a/gui/manualtest/tests/preferences.scripts.json b/gui/manualtest/tests/preferences.scripts.json
new file mode 100644
index 00000000000..2da801e7e71
--- /dev/null
+++ b/gui/manualtest/tests/preferences.scripts.json
@@ -0,0 +1,306 @@
+{
+  "t232a9783": {
+    "script": [
+      {
+        "do": "click",
+        "name": "Edit",
+        "role": "menu item",
+        "label": "Open the Edit menu"
+      },
+      {
+        "do": "click",
+        "name": "Preferences",
+        "role": "menu item",
+        "label": "Open Edit > Preferences"
+      },
+      {
+        "expect": "visible",
+        "name": "Preferences",
+        "role": "dialog",
+        "label": "Preferences dialog is shown"
+      },
+      {
+        "expect": "state",
+        "name": "General",
+        "role": "page tab",
+        "state": "selected",
+        "label": "General tab is shown"
+      },
+      {
+        "expect": "value",
+        "name": "Number of threads",
+        "role": "text",
+        "equals": "1",
+        "label": "The number of threads is 1"
+      }
+    ],
+    "script_for": "3c6d225d76b6"
+  },
+  "tf5b5a7e1": {
+    "script": [
+      {
+        "do": "click",
+        "name": "Edit",
+        "role": "menu item",
+        "label": "Open the Edit menu"
+      },
+      {
+        "do": "click",
+        "name": "Preferences",
+        "role": "menu item",
+        "label": "Open Edit > Preferences"
+      },
+      {
+        "expect": "visible",
+        "name": "Preferences",
+        "role": "dialog",
+        "label": "Preferences dialog is shown"
+      },
+      {
+        "do": "click",
+        "name": "General",
+        "role": "page tab",
+        "label": "Go to the General tab"
+      },
+      {
+        "do": "settext",
+        "name": "Number of threads",
+        "role": "text",
+        "value": "0",
+        "label": "Type 0 in the number of threads field"
+      },
+      {
+        "do": "click",
+        "name": "OK",
+        "role": "button",
+        "label": "Close the dialog with OK"
+      },
+      {
+        "do": "click",
+        "name": "Edit",
+        "role": "menu item",
+        "label": "Open the Edit menu again"
+      },
+      {
+        "do": "click",
+        "name": "Preferences",
+        "role": "menu item",
+        "label": "Open Edit > Preferences again"
+      },
+      {
+        "expect": "visible",
+        "name": "Preferences",
+        "role": "dialog",
+        "label": "Preferences dialog is shown again"
+      },
+      {
+        "do": "click",
+        "name": "General",
+        "role": "page tab",
+        "label": "Go to the General tab again"
+      },
+      {
+        "expect": "value",
+        "name": "Number of threads",
+        "role": "text",
+        "equals": "1",
+        "label": "The number of threads is at least 1, never 0"
+      }
+    ],
+    "script_for": "6a7660844e11"
+  },
+  "t841cca6c": {
+    "script": [
+      {
+        "do": "click",
+        "name": "Edit",
+        "role": "menu item",
+        "label": "Open the Edit menu"
+      },
+      {
+        "do": "click",
+        "name": "Preferences",
+        "role": "menu item",
+        "label": "Open Preferences from the Edit menu"
+      },
+      {
+        "expect": "visible",
+        "name": "Preferences",
+        "role": "dialog",
+        "label": "Preferences dialog is shown"
+      },
+      {
+        "do": "settext",
+        "name": "Number of threads",
+        "role": "text",
+        "value": "100",
+        "label": "Set the number of threads to 100"
+      },
+      {
+        "expect": "value",
+        "name": "Number of threads",
+        "role": "text",
+        "equals": "100",
+        "label": "Thread count field holds 100"
+      },
+      {
+        "do": "click",
+        "name": "OK",
+        "role": "button",
+        "label": "Close the Preferences dialog with OK"
+      },
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File",
+        "role": "menu item",
+        "label": "Choose Open Project File"
+      },
+      {
+        "expect": "visible",
+        "name": "Select Project File",
+        "role": "dialog",
+        "label": "File dialog is shown"
+      },
+      {
+        "do": "settext",
+        "name": "File name",
+        "role": "text",
+        "value": "{project:basic-project}/basic.cppcheck",
+        "label": "Enter the path of basic.cppcheck"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Open the project file"
+      },
+      {
+        "expect": "visible",
+        "name": "src/b.c",
+        "role": "table cell",
+        "timeout": 60,
+        "label": "Analysis is done and results for src/b.c are shown"
+      },
+      {
+        "expect": "visible",
+        "name": "src/a.c",
+        "role": "table cell",
+        "label": "Results for src/a.c are shown"
+      },
+      {
+        "expect": "text",
+        "contains": "Project: basic.cppcheck",
+        "label": "The project is loaded"
+      },
+      {
+        "expect": "alive",
+        "label": "The application did not crash"
+      }
+    ],
+    "script_for": "3f99ba3a159c"
+  },
+  "t28ce8afe": {
+    "script": [
+      {
+        "do": "click",
+        "name": "Preferences",
+        "role": "button",
+        "label": "Open Preferences"
+      },
+      {
+        "do": "click",
+        "name": "Addons",
+        "role": "page tab",
+        "label": "Go to the Addons tab"
+      },
+      {
+        "do": "settext",
+        "name": "MISRA addon",
+        "role": "text",
+        "value": "{project:embedded}/{rulefile}",
+        "label": "Select the rule text file"
+      },
+      {
+        "do": "click",
+        "name": "OK",
+        "role": "button",
+        "label": "Close the dialog with OK"
+      },
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File...",
+        "role": "menu item",
+        "label": "Choose Open Project File"
+      },
+      {
+        "do": "settext",
+        "name": "File name",
+        "role": "text",
+        "value": "{project:embedded}/embedded.cppcheck",
+        "label": "Enter the project file name"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Open the project file"
+      },
+      {
+        "do": "sleep",
+        "seconds": 8,
+        "label": "Wait until the analysis is done"
+      },
+      {
+        "expect": "visible",
+        "name": "gpio.c",
+        "role": "table cell",
+        "timeout": 20,
+        "label": "Results for gpio.c are shown"
+      },
+      {
+        "do": "doubleclick",
+        "name": "gpio.c",
+        "role": "table cell",
+        "label": "Select the gpio.c result row"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Right"
+        ],
+        "label": "Expand the result row"
+      },
+      {
+        "expect": "text",
+        "contains": "TEST RULE TEXT: unused parameters are not allowed",
+        "timeout": 10,
+        "label": "Misra error has the rule text from the file"
+      },
+      {
+        "expect": "text",
+        "contains": "misra-c2012-2.7",
+        "label": "The unused parameter Misra rule id is shown"
+      },
+      {
+        "expect": "text",
+        "not_contains": "internalError",
+        "label": "There are no internalError results"
+      }
+    ],
+    "script_for": "755194f793e0"
+  }
+}
diff --git a/gui/manualtest/tests/project_dialog.feature b/gui/manualtest/tests/project_dialog.feature
new file mode 100644
index 00000000000..2d28b7dbc0e
--- /dev/null
+++ b/gui/manualtest/tests/project_dialog.feature
@@ -0,0 +1,40 @@
+Feature: Project file dialog
+
+  Background:
+    Given the application is started with no project loaded
+
+  @id:tcf7ddb76 @ticket:14983 @project:relative-paths
+  Scenario: Relative paths in the saved project
+    Given a new project file is created and the project file dialog is open
+    When I import the project {project:relative-paths}/compile_commands.json (Paths and defines, Import project)
+    And I add the include directory {project:relative-paths}/inc
+    And I exclude the file {project:relative-paths}/skip/b.c
+    And I save the project file as {project:relative-paths}/rel.cppcheck
+    Then in the saved rel.cppcheck the import project is written relative to the project file: compile_commands.json
+    And the include directory is written relative to the project file: inc
+    And the excluded file is written relative to the project file: skip/b.c
+    And the XML contains no absolute path to the project folder
+
+  @id:t5afff002 @ticket:14489
+  Scenario: Select the platform pic8.xml
+    Given a new project file is created and the project file dialog is open
+    When I open the Platform drop-down list
+    And I select pic8.xml in the list
+    Then pic8.xml is in the Platform list
+    And pic8.xml is the platform that the dialog shows
+
+  @id:t91490557 @ticket:14672 @project:custom-cfg
+  Scenario: Custom cfg file in the library list
+    Given the folder of {project:custom-cfg}/p.cppcheck also holds aa.cfg, a copy of cfg/avr.cfg
+    When I open the project file {project:custom-cfg}/p.cppcheck
+    And I open the project file dialog (edit the project file)
+    And I look at the library list (Libraries)
+    Then aa is in the library list
+    And aa comes before avr, the list is in alphabetical order
+
+  @id:t0ec0680b @ticket:14488 @project:embedded @edition:opensource
+  Scenario: Misra checkbox of a loaded project
+    When I open the project file {project:embedded}/embedded.cppcheck
+    And I open the project file dialog (edit the project file)
+    And I go to the Addons tab
+    Then the Misra C 2012 checkbox is checked
diff --git a/gui/manualtest/tests/project_dialog.scripts.json b/gui/manualtest/tests/project_dialog.scripts.json
new file mode 100644
index 00000000000..08dfc5965ce
--- /dev/null
+++ b/gui/manualtest/tests/project_dialog.scripts.json
@@ -0,0 +1,371 @@
+{
+  "tcf7ddb76": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "New Project File",
+        "role": "menu item",
+        "label": "Create a new project file"
+      },
+      {
+        "do": "settext",
+        "name": "File name",
+        "role": "text",
+        "value": "{project:relative-paths}/rel.cppcheck",
+        "label": "Enter the project file name"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Confirm the project file name"
+      },
+      {
+        "expect": "visible",
+        "name": "Project file: rel.cppcheck",
+        "role": "dialog",
+        "label": "Project file dialog is open"
+      },
+      {
+        "do": "click",
+        "name": "Add...",
+        "role": "button",
+        "nth": 1,
+        "label": "Add an include directory"
+      },
+      {
+        "do": "settext",
+        "name": "Directory:",
+        "role": "text",
+        "value": "{project:relative-paths}/inc",
+        "label": "Enter the include directory {project:relative-paths}/inc"
+      },
+      {
+        "do": "click",
+        "name": "Choose",
+        "role": "button",
+        "label": "Choose the include directory"
+      },
+      {
+        "do": "click",
+        "name": "Warning options",
+        "role": "page tab",
+        "label": "Open the tab with the excluded files"
+      },
+      {
+        "do": "click",
+        "name": "Exclude file",
+        "role": "button",
+        "label": "Exclude a file"
+      },
+      {
+        "do": "settext",
+        "name": "File name",
+        "role": "text",
+        "value": "{project:relative-paths}/skip/b.c",
+        "label": "Enter the excluded file {project:relative-paths}/skip/b.c"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Confirm the excluded file"
+      },
+      {
+        "expect": "visible",
+        "name": "skip/b.c",
+        "role": "list item",
+        "label": "skip/b.c is in the exclude list"
+      },
+      {
+        "do": "click",
+        "name": "Paths and Defines",
+        "role": "page tab",
+        "label": "Back to Paths and Defines"
+      },
+      {
+        "do": "click",
+        "name": "Browse...",
+        "role": "button",
+        "nth": 0,
+        "label": "Browse for the import project"
+      },
+      {
+        "do": "settext",
+        "name": "File name",
+        "role": "text",
+        "value": "{project:relative-paths}/compile_commands.json",
+        "label": "Enter the import project {project:relative-paths}/compile_commands.json"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Confirm the import project"
+      },
+      {
+        "do": "click",
+        "name": "OK",
+        "role": "button",
+        "label": "Save the project file as rel.cppcheck"
+      },
+      {
+        "do": "sleep",
+        "seconds": 1
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Escape"
+        ],
+        "label": "Dismiss the build dir question"
+      },
+      {
+        "expect": "file",
+        "path": "{project:relative-paths}/rel.cppcheck",
+        "contains": "<importproject>compile_commands.json</importproject>",
+        "label": "Import project is relative"
+      },
+      {
+        "expect": "file",
+        "path": "{project:relative-paths}/rel.cppcheck",
+        "contains": "<dir name=\"inc",
+        "label": "Include directory is relative (inc)"
+      },
+      {
+        "expect": "file",
+        "path": "{project:relative-paths}/rel.cppcheck",
+        "contains": "<path name=\"skip/b.c\"/>",
+        "label": "Excluded file is relative (skip/b.c)"
+      },
+      {
+        "expect": "file",
+        "path": "{project:relative-paths}/rel.cppcheck",
+        "not_contains": "{project:relative-paths}",
+        "label": "No absolute path to the project folder in the XML"
+      }
+    ],
+    "script_for": "edfc96b05beb"
+  },
+  "t5afff002": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "New Project File",
+        "role": "menu item",
+        "label": "Create a new project file"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{work}/t.cppcheck",
+        "label": "Enter the project file name"
+      },
+      {
+        "do": "click",
+        "name": "Save",
+        "role": "button",
+        "exact": true,
+        "label": "Save the new project file; the project file dialog opens"
+      },
+      {
+        "expect": "visible",
+        "name": "Project file",
+        "role": "dialog",
+        "label": "Project file dialog is open"
+      },
+      {
+        "do": "click",
+        "name": "Types and Functions",
+        "role": "page tab",
+        "label": "Go to the tab with the Platform setting"
+      },
+      {
+        "do": "click",
+        "name": "Platform",
+        "role": "combo box",
+        "label": "Open the Platform drop-down list"
+      },
+      {
+        "expect": "visible",
+        "name": "pic8.xml",
+        "role": "list item",
+        "label": "pic8.xml is in the Platform list"
+      },
+      {
+        "do": "click",
+        "name": "pic8.xml",
+        "role": "list item",
+        "exact": true,
+        "mouse": true,
+        "label": "Select pic8.xml in the list"
+      },
+      {
+        "expect": "visible",
+        "name": "pic8.xml",
+        "role": "combo box",
+        "label": "The dialog shows pic8.xml as the platform"
+      }
+    ],
+    "script_for": "619f376b22e1"
+  },
+  "t91490557": {
+    "script": [
+      {
+        "do": "click",
+        "name": "Open Project File",
+        "role": "button",
+        "label": "Open the project file dialog from the toolbar"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:custom-cfg}/p.cppcheck",
+        "label": "Enter the path of p.cppcheck"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Open the project file"
+      },
+      {
+        "expect": "visible",
+        "name": "Cppcheck",
+        "role": "alert",
+        "label": "Analysis finishes and an alert appears"
+      },
+      {
+        "do": "click",
+        "name": "OK",
+        "role": "button",
+        "label": "Dismiss the alert"
+      },
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Edit Project File",
+        "role": "menu item",
+        "label": "Open the project file dialog (edit the project file)"
+      },
+      {
+        "expect": "visible",
+        "name": "Project file: p.cppcheck",
+        "role": "dialog",
+        "label": "The project file dialog is open"
+      },
+      {
+        "expect": "visible",
+        "name": "aa",
+        "role": "list item",
+        "exact": true,
+        "label": "aa is in the Libraries list"
+      },
+      {
+        "expect": "visible",
+        "name": "avr",
+        "role": "list item",
+        "exact": true,
+        "label": "avr is in the Libraries list"
+      }
+    ],
+    "script_for": "b0bf245f7042"
+  },
+  "t0ec0680b": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File...",
+        "role": "menu item",
+        "label": "Choose Open Project File"
+      },
+      {
+        "do": "wait",
+        "name": "Select Project File",
+        "role": "dialog",
+        "label": "File dialog is shown"
+      },
+      {
+        "do": "settext",
+        "name": "File name",
+        "role": "text",
+        "value": "{project:embedded}/embedded.cppcheck",
+        "label": "Enter the project file path"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Open the project file"
+      },
+      {
+        "do": "wait",
+        "name": "Project: embedded.cppcheck",
+        "role": "frame",
+        "label": "Project is loaded"
+      },
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu again"
+      },
+      {
+        "do": "click",
+        "name": "Edit Project File...",
+        "role": "menu item",
+        "label": "Open the project file dialog"
+      },
+      {
+        "do": "wait",
+        "name": "Project file: embedded.cppcheck",
+        "role": "dialog",
+        "label": "Project file dialog is shown"
+      },
+      {
+        "do": "click",
+        "name": "Addons",
+        "role": "page tab",
+        "label": "Go to the Addons tab"
+      },
+      {
+        "expect": "state",
+        "name": "Misra C 2012",
+        "role": "check box",
+        "state": "checked",
+        "label": "The Misra C 2012 checkbox is checked"
+      }
+    ],
+    "script_for": "187bd0d82a72"
+  }
+}
diff --git a/gui/manualtest/tests/projects.feature b/gui/manualtest/tests/projects.feature
new file mode 100644
index 00000000000..a4c2324551e
--- /dev/null
+++ b/gui/manualtest/tests/projects.feature
@@ -0,0 +1,72 @@
+Feature: Open and create projects
+
+  Background:
+    Given the application is started with no project loaded
+
+  @id:tf9fc8bf6 @project:basic-project
+  Scenario: Open a project file
+    When I open the project file {project:basic-project}/basic.cppcheck with the open project file entry in the File menu
+    Then the project opens
+    And the title of the main window names basic.cppcheck
+    And the analysis results are shown: nullPointer errors in a.c and util.h, arrayIndexOutOfBounds in b.c
+
+  @id:t6bb11424 @project:switch-project
+  Scenario: Open a second project
+    TODO: with and without build dir
+    Given the project file {project:switch-project}/one/p1.cppcheck is opened
+    And the analysis is done
+    And the results show a nullPointer error in a.c
+    When I open the project file {project:switch-project}/two/p2.cppcheck
+    And I wait until the analysis is done
+    Then the results of the first project (nullPointer in a.c) are gone
+    And the results of the second project (arrayIndexOutOfBounds in b.c) are shown
+
+  @id:t176fd17f @project:switch-project
+  Scenario: Open a recent project
+    Given the project file {project:switch-project}/one/p1.cppcheck is opened and analysed
+    And the project file {project:switch-project}/two/p2.cppcheck is opened and analysed
+    When I open the File menu
+    And I click p1.cppcheck in the list of recent projects
+    Then the project p1.cppcheck is opened
+    And the title of the main window names p1.cppcheck, not p2.cppcheck or another file
+
+  @id:t1e899c1c @project:basic-project
+  Scenario: New project file
+    When I open File > New Project File
+    And I enter the file name {project:basic-project}/OSgui.cppcheck
+    And I add the folder {project:basic-project}/src as a path to check in the project file dialog
+    And I save the project file without selecting an addon
+    And I wait until the analysis is done
+    Then the project file OSgui.cppcheck is saved without any addon in it
+    And the analysis is run
+    And the results are shown: nullPointer errors in a.c, arrayIndexOutOfBounds in b.c
+    And util.h is not checked, the new project has no include path to it
+
+  @id:t202b9515 @project:basic-project
+  Scenario Outline: New project file with an addon
+    When I open File > New Project File
+    And I enter the file name {project:basic-project}/OSgui.cppcheck
+    And I add the folder {project:basic-project}/src as a path to check in the project file dialog
+    And I tick the checkbox of the addon whose name contains "<addon>" on the Addons tab (Misra C, Y2038 or Thread safety)
+    And I save the project file
+    And I wait until the analysis is done
+    Then the project file OSgui.cppcheck is saved with an addon entry that contains "<addon>" (misra, y2038 or threadsafety)
+    And the analysis is run and results are shown
+    And none of the results is an internalError about the addon
+
+    Examples:
+      | addon  |
+      | misra  |
+      | y2038  |
+      | thread |
+
+  @id:tf6da2cfd @project:basic-project @edition:opensource
+  Scenario: Add the Misra addon to a project
+    Given the project file {project:basic-project}/basic.cppcheck is opened from the File menu
+    And the analysis is done
+    When I open File > Edit Project File
+    And I select MISRA C 2012 on the Addons tab
+    And I save the project file
+    And I wait until the analysis is done
+    Then basic.cppcheck has the addon misra in it
+    And the analysis is run again
diff --git a/gui/manualtest/tests/projects.scripts.json b/gui/manualtest/tests/projects.scripts.json
new file mode 100644
index 00000000000..a78d2f6b793
--- /dev/null
+++ b/gui/manualtest/tests/projects.scripts.json
@@ -0,0 +1,771 @@
+{
+  "tf9fc8bf6": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File...",
+        "role": "menu item",
+        "label": "Choose Open Project File in the File menu"
+      },
+      {
+        "expect": "visible",
+        "name": "Select Project File",
+        "role": "dialog",
+        "label": "The project file dialog is shown"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:basic-project}/basic.cppcheck",
+        "label": "Enter the path of basic.cppcheck"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Confirm the dialog to open the project"
+      },
+      {
+        "expect": "visible",
+        "name": "Project: basic.cppcheck",
+        "role": "frame",
+        "timeout": 15,
+        "label": "The title of the main window names basic.cppcheck"
+      },
+      {
+        "do": "wait",
+        "name": "Select Project File",
+        "gone": true,
+        "label": "The dialog is closed"
+      },
+      {
+        "do": "sleep",
+        "seconds": 4,
+        "label": "Wait for the analysis to finish"
+      },
+      {
+        "do": "focus",
+        "role": "tree",
+        "label": "Focus the results tree"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Home",
+          "Down",
+          "Down",
+          "Right",
+          "Up",
+          "Right",
+          "Up",
+          "Right",
+          "Home"
+        ],
+        "label": "Expand the results of all three files and go to the top"
+      },
+      {
+        "expect": "visible",
+        "name": "nullPointer",
+        "role": "table cell",
+        "timeout": 10,
+        "label": "nullPointer errors are shown for util.h and a.c"
+      },
+      {
+        "expect": "text",
+        "contains": "src/a.c",
+        "label": "Results for a.c are shown"
+      },
+      {
+        "expect": "text",
+        "contains": "include/util.h",
+        "label": "Results for util.h are shown"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "End"
+        ],
+        "label": "Scroll to the results of b.c"
+      },
+      {
+        "expect": "visible",
+        "name": "arrayIndexOutOfBounds",
+        "role": "table cell",
+        "timeout": 10,
+        "label": "arrayIndexOutOfBounds error is shown for b.c"
+      }
+    ],
+    "script_for": "7128457516b3"
+  },
+  "t6bb11424": {
+    "script": [
+      {
+        "do": "click",
+        "name": "Open Project File",
+        "role": "button",
+        "label": "Open the first project"
+      },
+      {
+        "do": "type",
+        "value": "{project:switch-project}/one/p1.cppcheck",
+        "label": "Enter path of p1.cppcheck"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Confirm the file dialog"
+      },
+      {
+        "expect": "visible",
+        "name": "Project: p1.cppcheck",
+        "role": "frame",
+        "timeout": 10,
+        "label": "First project is loaded"
+      },
+      {
+        "expect": "visible",
+        "name": "a.c",
+        "role": "table cell",
+        "timeout": 20,
+        "label": "Results of the first project show a.c"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File",
+        "role": "button",
+        "label": "Open the second project"
+      },
+      {
+        "do": "type",
+        "value": "{project:switch-project}/two/p2.cppcheck",
+        "label": "Enter path of p2.cppcheck"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Confirm the file dialog"
+      },
+      {
+        "expect": "visible",
+        "name": "Project: p2.cppcheck",
+        "role": "frame",
+        "timeout": 10,
+        "label": "Second project is loaded"
+      },
+      {
+        "expect": "visible",
+        "name": "b.c",
+        "role": "table cell",
+        "timeout": 20,
+        "label": "Results of the second project show b.c"
+      },
+      {
+        "expect": "gone",
+        "name": "a.c",
+        "role": "table cell",
+        "label": "Results of the first project are gone"
+      }
+    ],
+    "script_for": "70097c80a6ed"
+  },
+  "t176fd17f": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File...",
+        "role": "menu item",
+        "label": "Choose Open Project File"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:switch-project}/one/p1.cppcheck",
+        "label": "Enter the path of p1.cppcheck"
+      },
+      {
+        "do": "click",
+        "name": "Open",
+        "role": "button",
+        "exact": true,
+        "label": "Open p1.cppcheck"
+      },
+      {
+        "expect": "text",
+        "contains": "Project: p1.cppcheck",
+        "timeout": 10,
+        "label": "Project p1 is open"
+      },
+      {
+        "expect": "visible",
+        "name": "Checking a.c",
+        "timeout": 15,
+        "label": "Analysis of p1 is done"
+      },
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File...",
+        "role": "menu item",
+        "label": "Choose Open Project File"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:switch-project}/two/p2.cppcheck",
+        "label": "Enter the path of p2.cppcheck"
+      },
+      {
+        "do": "click",
+        "name": "Open",
+        "role": "button",
+        "exact": true,
+        "label": "Open p2.cppcheck"
+      },
+      {
+        "expect": "text",
+        "contains": "Project: p2.cppcheck",
+        "timeout": 10,
+        "label": "Project p2 is open"
+      },
+      {
+        "do": "sleep",
+        "seconds": 3,
+        "label": "Wait until the analysis of p2 is done"
+      },
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "p1.cppcheck",
+        "role": "menu item",
+        "label": "Click p1.cppcheck in the recent projects list"
+      },
+      {
+        "expect": "text",
+        "contains": "Project: p1.cppcheck",
+        "timeout": 10,
+        "label": "Main window title names p1.cppcheck"
+      },
+      {
+        "expect": "text",
+        "not_contains": "Project: p2.cppcheck",
+        "label": "Title does not name p2.cppcheck"
+      }
+    ],
+    "script_for": "2ea42621479d"
+  },
+  "t1e899c1c": {
+    "script": [
+      {
+        "label": "Open File menu",
+        "do": "click",
+        "name": "File",
+        "role": "menu item"
+      },
+      {
+        "label": "Open File > New Project File",
+        "do": "click",
+        "name": "New Project File",
+        "role": "menu item"
+      },
+      {
+        "label": "Wait for the file name dialog",
+        "do": "wait",
+        "name": "Select Project Filename",
+        "role": "dialog"
+      },
+      {
+        "label": "Enter the file name OSgui.cppcheck",
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:basic-project}/OSgui.cppcheck"
+      },
+      {
+        "label": "Confirm the file name",
+        "do": "key",
+        "keys": [
+          "Return"
+        ]
+      },
+      {
+        "label": "Project file dialog is shown",
+        "expect": "visible",
+        "name": "Project file: OSgui.cppcheck",
+        "role": "dialog"
+      },
+      {
+        "label": "Add a path to check",
+        "do": "click",
+        "name": "Add...",
+        "role": "button",
+        "nth": 0
+      },
+      {
+        "label": "Wait for the directory dialog",
+        "do": "wait",
+        "name": "Select a directory to check",
+        "role": "dialog"
+      },
+      {
+        "label": "Enter the src folder",
+        "do": "settext",
+        "name": "Directory:",
+        "role": "text",
+        "value": "{project:basic-project}/src"
+      },
+      {
+        "label": "Choose the src folder",
+        "do": "click",
+        "name": "Choose",
+        "role": "button"
+      },
+      {
+        "label": "src is in the paths list",
+        "expect": "visible",
+        "name": "src",
+        "role": "list item"
+      },
+      {
+        "label": "Save the project file without selecting an addon",
+        "do": "click",
+        "name": "OK",
+        "role": "button"
+      },
+      {
+        "label": "Create the build dir when asked",
+        "do": "click",
+        "name": "Yes",
+        "role": "button"
+      },
+      {
+        "label": "Wait until the analysis has checked b.c",
+        "expect": "text",
+        "contains": "Checking src/b.c",
+        "timeout": 30
+      },
+      {
+        "label": "Wait for the results of a.c",
+        "expect": "visible",
+        "name": "src/a.c",
+        "role": "table cell",
+        "timeout": 30
+      },
+      {
+        "label": "Select a.c results",
+        "do": "click",
+        "name": "src/a.c",
+        "role": "table cell",
+        "nth": 0,
+        "mouse": true
+      },
+      {
+        "label": "Collapse a.c results to get a known state",
+        "do": "key",
+        "keys": [
+          "Left"
+        ]
+      },
+      {
+        "label": "Expand a.c results",
+        "do": "key",
+        "keys": [
+          "Right"
+        ]
+      },
+      {
+        "label": "nullPointer is reported in a.c",
+        "expect": "visible",
+        "name": "nullPointer",
+        "role": "table cell",
+        "timeout": 10
+      },
+      {
+        "label": "Select b.c results",
+        "do": "click",
+        "name": "src/b.c",
+        "role": "table cell",
+        "nth": 0,
+        "mouse": true
+      },
+      {
+        "label": "Collapse b.c results to get a known state",
+        "do": "key",
+        "keys": [
+          "Left"
+        ]
+      },
+      {
+        "label": "Expand b.c results",
+        "do": "key",
+        "keys": [
+          "Right"
+        ]
+      },
+      {
+        "label": "arrayIndexOutOfBounds is reported in b.c",
+        "expect": "visible",
+        "name": "arrayIndexOutOfBounds",
+        "role": "table cell",
+        "timeout": 10
+      },
+      {
+        "label": "util.h is not checked",
+        "expect": "text",
+        "not_contains": "Checking include/util.h"
+      },
+      {
+        "label": "Project file contains the src path",
+        "expect": "file",
+        "path": "{project:basic-project}/OSgui.cppcheck",
+        "contains": "<dir name=\"src\"/>"
+      },
+      {
+        "label": "Project file has no addon",
+        "expect": "file",
+        "path": "{project:basic-project}/OSgui.cppcheck",
+        "not_contains": "addon"
+      },
+      {
+        "label": "Project file has no include path",
+        "expect": "file",
+        "path": "{project:basic-project}/OSgui.cppcheck",
+        "not_contains": "include"
+      }
+    ],
+    "script_for": "b3616d866fea"
+  },
+  "t202b9515": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "New Project File...",
+        "role": "menu item",
+        "label": "Open File > New Project File"
+      },
+      {
+        "do": "wait",
+        "name": "Select Project Filename",
+        "role": "dialog",
+        "label": "Wait for the file name dialog"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:basic-project}/OSgui.cppcheck",
+        "label": "Enter the file name OSgui.cppcheck"
+      },
+      {
+        "do": "focus",
+        "name": "File name:",
+        "role": "text",
+        "label": "Focus the file name field"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Confirm the file name"
+      },
+      {
+        "do": "wait",
+        "name": "Project file: OSgui.cppcheck",
+        "role": "dialog",
+        "timeout": 10,
+        "label": "Wait for the project file dialog"
+      },
+      {
+        "do": "click",
+        "name": "Paths and Defines",
+        "role": "page tab",
+        "label": "Go to the Paths and Defines tab"
+      },
+      {
+        "do": "click",
+        "name": "Add...",
+        "role": "button",
+        "nth": 0,
+        "label": "Add a path to check"
+      },
+      {
+        "do": "wait",
+        "name": "Select a directory to check",
+        "role": "dialog",
+        "label": "Wait for the directory dialog"
+      },
+      {
+        "do": "settext",
+        "name": "Directory:",
+        "role": "text",
+        "value": "{project:basic-project}/src",
+        "label": "Enter the folder src"
+      },
+      {
+        "do": "click",
+        "name": "Choose",
+        "role": "button",
+        "label": "Choose the folder src"
+      },
+      {
+        "do": "wait",
+        "name": "Select a directory to check",
+        "role": "dialog",
+        "gone": true,
+        "label": "Directory dialog closes"
+      },
+      {
+        "expect": "visible",
+        "name": "src",
+        "role": "list item",
+        "exact": true,
+        "label": "src is in the paths to check"
+      },
+      {
+        "do": "click",
+        "name": "Addons",
+        "role": "page tab",
+        "label": "Go to the Addons tab"
+      },
+      {
+        "do": "click",
+        "name": "{addon}",
+        "role": "check box",
+        "nth": 0,
+        "label": "Tick the addon checkbox"
+      },
+      {
+        "expect": "state",
+        "name": "{addon}",
+        "role": "check box",
+        "nth": 0,
+        "state": "checked",
+        "label": "The addon checkbox is ticked"
+      },
+      {
+        "do": "click",
+        "name": "OK",
+        "role": "button",
+        "label": "Save the project file"
+      },
+      {
+        "do": "wait",
+        "name": "Yes",
+        "role": "button",
+        "timeout": 10,
+        "label": "Question to create the build dir"
+      },
+      {
+        "do": "click",
+        "name": "Yes",
+        "role": "button",
+        "label": "Create the build dir"
+      },
+      {
+        "do": "wait",
+        "name": "src/b.c",
+        "role": "table cell",
+        "timeout": 120,
+        "label": "Wait for the analysis results"
+      },
+      {
+        "do": "sleep",
+        "seconds": 3
+      },
+      {
+        "expect": "state",
+        "name": "Stop analysis",
+        "role": "button",
+        "not_state": "enabled",
+        "timeout": 120,
+        "label": "The analysis is done"
+      },
+      {
+        "do": "focus",
+        "name": "src/a.c",
+        "role": "table cell",
+        "label": "Select the results of a.c"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "asterisk",
+          "End",
+          "asterisk"
+        ],
+        "label": "Expand the results of all files"
+      },
+      {
+        "do": "sleep",
+        "seconds": 1
+      },
+      {
+        "expect": "file",
+        "path": "{project:basic-project}/OSgui.cppcheck",
+        "contains": "<addon>{addon}",
+        "label": "Project file has the addon entry"
+      },
+      {
+        "expect": "file",
+        "path": "{project:basic-project}/OSgui.cppcheck",
+        "contains": "<dir name=\"src\"/>",
+        "label": "Project file has the path src"
+      },
+      {
+        "expect": "visible",
+        "name": "src/a.c",
+        "role": "table cell",
+        "label": "Analysis results are shown"
+      },
+      {
+        "expect": "text",
+        "not_contains": "internalError",
+        "label": "No internalError about the addon in the results"
+      }
+    ],
+    "script_for": "60cd34c48191"
+  },
+  "tf6da2cfd": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File...",
+        "role": "menu item",
+        "label": "Choose Open Project File"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:basic-project}/basic.cppcheck",
+        "label": "Enter the project file path"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Confirm the file dialog"
+      },
+      {
+        "do": "wait",
+        "name": "Checking src/b.c",
+        "timeout": 20,
+        "label": "Wait for the first analysis to run"
+      },
+      {
+        "do": "sleep",
+        "seconds": 3,
+        "label": "Let the first analysis finish"
+      },
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Edit Project File",
+        "role": "menu item",
+        "label": "Choose Edit Project File"
+      },
+      {
+        "expect": "visible",
+        "name": "Project file: basic.cppcheck",
+        "role": "dialog",
+        "label": "Project file dialog is open"
+      },
+      {
+        "do": "click",
+        "name": "Addons",
+        "role": "page tab",
+        "label": "Go to the Addons tab"
+      },
+      {
+        "do": "click",
+        "name": "Misra C 2012",
+        "role": "check box",
+        "label": "Select MISRA C 2012"
+      },
+      {
+        "expect": "state",
+        "name": "Misra C 2012",
+        "state": "checked",
+        "label": "MISRA C 2012 is checked"
+      },
+      {
+        "do": "click",
+        "name": "OK",
+        "role": "button",
+        "label": "Save the project file"
+      },
+      {
+        "expect": "gone",
+        "name": "Project file: basic.cppcheck",
+        "label": "Project file dialog is closed"
+      },
+      {
+        "do": "sleep",
+        "seconds": 4,
+        "label": "Wait for the second analysis to finish"
+      },
+      {
+        "expect": "file",
+        "path": "{project:basic-project}/basic.cppcheck",
+        "contains": "<addon>misra</addon>",
+        "label": "Project file has the misra addon"
+      },
+      {
+        "expect": "visible",
+        "name": "Checking src/b.c",
+        "role": "list item",
+        "nth": 1,
+        "label": "The analysis was run again"
+      }
+    ],
+    "script_for": "452f351f0fb2"
+  }
+}
diff --git a/gui/manualtest/tests/projects/basic-project/basic.cppcheck b/gui/manualtest/tests/projects/basic-project/basic.cppcheck
new file mode 100644
index 00000000000..c8805a32587
--- /dev/null
+++ b/gui/manualtest/tests/projects/basic-project/basic.cppcheck
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+  <includedir>
+    <dir name="include"/>
+  </includedir>
+  <paths>
+    <dir name="src"/>
+  </paths>
+</project>
diff --git a/gui/manualtest/tests/projects/basic-project/include/util.h b/gui/manualtest/tests/projects/basic-project/include/util.h
new file mode 100644
index 00000000000..48ae2d54a95
--- /dev/null
+++ b/gui/manualtest/tests/projects/basic-project/include/util.h
@@ -0,0 +1,5 @@
+static inline int helper(void)
+{
+    int *r = 0;
+    return *r;
+}
diff --git a/gui/manualtest/tests/projects/basic-project/src/a.c b/gui/manualtest/tests/projects/basic-project/src/a.c
new file mode 100644
index 00000000000..3a84d86a5ff
--- /dev/null
+++ b/gui/manualtest/tests/projects/basic-project/src/a.c
@@ -0,0 +1,18 @@
+#include "util.h"
+
+int first(void)
+{
+    int *p = 0;
+    return *p;
+}
+
+int second(void)
+{
+    int *q = 0;
+    return *q;
+}
+
+int main(void)
+{
+    return first() + second() + helper();
+}
diff --git a/gui/manualtest/tests/projects/basic-project/src/b.c b/gui/manualtest/tests/projects/basic-project/src/b.c
new file mode 100644
index 00000000000..20be2edc145
--- /dev/null
+++ b/gui/manualtest/tests/projects/basic-project/src/b.c
@@ -0,0 +1,5 @@
+void f(void)
+{
+    char a[4];
+    a[10] = 0;
+}
diff --git a/gui/manualtest/tests/projects/custom-cfg/a.c b/gui/manualtest/tests/projects/custom-cfg/a.c
new file mode 100644
index 00000000000..58fe69254d0
--- /dev/null
+++ b/gui/manualtest/tests/projects/custom-cfg/a.c
@@ -0,0 +1,4 @@
+int main(void)
+{
+    return 0;
+}
diff --git a/gui/manualtest/tests/projects/custom-cfg/aa.cfg b/gui/manualtest/tests/projects/custom-cfg/aa.cfg
new file mode 100644
index 00000000000..bb21afac352
--- /dev/null
+++ b/gui/manualtest/tests/projects/custom-cfg/aa.cfg
@@ -0,0 +1,402 @@
+<?xml version="1.0"?>
+<!-- Based on http://www.nongnu.org/avr-libc/user-manual/group__avr__stdint.html -->
+<def format="2">
+  <!-- stdint.h -->
+  <define name="__USING_MINT8" value="0"/>
+  <!-- Integer types capable of holding object pointers -->
+  <podtype name="intptr_t" sign="s" size="2"/>
+  <podtype name="uintptr_t" sign="u" size="2"/>
+  <!-- Minimum-width integer types -->
+  <podtype name="int_least8_t" sign="s" size="1"/>
+  <podtype name="uint_least8_t" sign="u" size="1"/>
+  <podtype name="int_least16_t" sign="s" size="2"/>
+  <podtype name="uint_least16_t" sign="u" size="2"/>
+  <podtype name="int_least32_t" sign="s" size="4"/>
+  <podtype name="uint_least32_t" sign="u" size="4"/>
+  <podtype name="int_least64_t" sign="s" size="8"/>
+  <podtype name="uint_least64_t" sign="u" size="8"/>
+  <!-- Greatest-width integer types -->
+  <podtype name="intmax_t" sign="s" size="8"/>
+  <podtype name="uintmax_t" sign="u" size="8"/>
+  <!-- ctype.h -->
+  <function name="toascii">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <valid>0:255</valid>
+    </arg>
+  </function>
+  <!-- errno.h -->
+  <define name="EDOM" value="33"/>
+  <define name="ERANGE" value="34"/>
+  <!-- inttypes.h -->
+  <podtype name="int_farptr_t" sign="s" size="4"/>
+  <podtype name="uint_farptr_t" sign="u" size="4"/>
+  <define name="INT8_MAX" value="0x7f"/>
+  <define name="INT8_MIN" value="(-INT8_MAX - 1)"/>
+  <define name="UINT8_MAX" value="(__CONCAT(INT8_MAX, U) * 2U + 1U)"/>
+  <define name="INT16_MAX" value="0x7fff"/>
+  <define name="INT16_MIN" value="(-INT16_MAX - 1)"/>
+  <define name="UINT16_MAX" value="(__CONCAT(INT16_MAX, U) * 2U + 1U)"/>
+  <define name="INT32_MAX" value="0x7fffffffL"/>
+  <define name="INT32_MIN" value="(-INT32_MAX - 1L)"/>
+  <define name="UINT32_MAX" value="(__CONCAT(INT32_MAX, U) * 2UL + 1UL)"/>
+  <define name="INT64_MAX" value="0x7fffffffffffffffLL"/>
+  <define name="INT64_MIN" value="(-INT64_MAX - 1LL)"/>
+  <define name="UINT64_MAX" value="(__CONCAT(INT64_MAX, U) * 2ULL + 1ULL)"/>
+  <!-- Limits of minimum-width integer types -->
+  <define name="INT_LEAST8_MAX" value="INT8_MAX"/>
+  <define name="INT_LEAST8_MIN" value="INT8_MIN"/>
+  <define name="UINT_LEAST8_MAX" value="UINT8_MAX"/>
+  <define name="INT_LEAST16_MAX" value="INT16_MAX"/>
+  <define name="INT_LEAST16_MIN" value="INT16_MIN"/>
+  <define name="UINT_LEAST16_MAX" value="UINT16_MAX"/>
+  <define name="INT_LEAST32_MAX" value="INT32_MAX"/>
+  <define name="INT_LEAST32_MIN" value="INT32_MIN"/>
+  <define name="UINT_LEAST32_MAX" value="UINT32_MAX"/>
+  <define name="INT_LEAST64_MAX" value="INT64_MAX"/>
+  <define name="INT_LEAST64_MIN" value="INT64_MIN"/>
+  <define name="UINT_LEAST64_MAX" value="UINT64_MAX"/>
+  <!-- Limits of fastest minimum-width integer types -->
+  <define name="INT_FAST8_MAX" value="INT8_MAX"/>
+  <define name="INT_FAST8_MIN" value="INT8_MIN"/>
+  <define name="UINT_FAST8_MAX" value="UINT8_MAX"/>
+  <define name="INT_FAST16_MAX" value="INT16_MAX"/>
+  <define name="INT_FAST16_MIN" value="INT16_MIN"/>
+  <define name="UINT_FAST16_MAX" value="UINT16_MAX"/>
+  <define name="INT_FAST32_MAX" value="INT32_MAX"/>
+  <define name="INT_FAST32_MIN" value="INT32_MIN"/>
+  <define name="UINT_FAST32_MAX" value="UINT32_MAX"/>
+  <define name="INT_FAST64_MAX" value="INT64_MAX"/>
+  <define name="INT_FAST64_MIN" value="INT64_MIN"/>
+  <define name="UINT_FAST64_MAX" value="UINT64_MAX"/>
+  <!-- Limits of integer types capable of holding object pointers -->
+  <define name="INTPTR_MAX" value="INT16_MAX"/>
+  <define name="INTPTR_MIN" value="INT16_MIN"/>
+  <define name="UINTPTR_MAX" value="UINT16_MAX"/>
+  <!-- Limits of greatest-width integer types -->
+  <define name="INTMAX_MAX" value="INT64_MAX"/>
+  <define name="INTMAX_MIN" value="INT64_MIN"/>
+  <define name="UINTMAX_MAX" value="UINT64_MAX"/>
+  <!-- Limits of other integer types -->
+  <define name="PTRDIFF_MAX" value="INT16_MAX"/>
+  <define name="PTRDIFF_MIN" value="INT16_MIN"/>
+  <define name="SIG_ATOMIC_MAX" value="INT8_MAX"/>
+  <define name="SIG_ATOMIC_MIN" value="INT8_MIN"/>
+  <define name="SIZE_MAX" value="(__CONCAT(INT16_MAX, U))"/>
+  <!-- FIXME: add macros for printf and scanf format specifiers,e.g. PRId8 -->
+  <!-- math.h -->
+  <define name="powf" value="pow"/>
+  <define name="roundf" value="round"/>
+  <define name="signbitf" value="signbit"/>
+  <define name="sinf" value="sin"/>
+  <define name="sinhf" value="sinh"/>
+  <define name="sqrtf" value="sqrt"/>
+  <define name="squaref" value="square"/>
+  <define name="tanf" value="tan"/>
+  <define name="tanhf" value="tanh"/>
+  <define name="truncf" value="trunc"/>
+  <!-- The rest of the trigonometric functions are defined in std.cfg -->
+  <!-- stdio.h -->
+  <define name="fdev_set_udata(stream, u)" value="do { (stream)- &gt; udata = u; } while(0)"/>
+  <define name="fdev_get_udata(stream)" value="((stream)- &gt; udata)"/>
+  <define name="fdev_setup_stream" value="(stream, put, get, rwflag)"/>
+  <define name="_FDEV_SETUP_READ" value="__SRD"/>
+  <define name="_FDEV_SETUP_WRITE" value="__SWR"/>
+  <define name="_FDEV_SETUP_RW" value="(__SRD | __SWR)"/>
+  <define name="_FDEV_ERR" value="(-1)"/>
+  <define name="_FDEV_EOF" value="(-2)"/>
+  <define name="FDEV_SETUP_STREAM" value="(put, get, rwflag)"/>
+  <define name="putc(__c, __stream)" value="fputc(__c, __stream)"/>
+  <define name="putchar(__c)" value="fputc(__c, stdout)"/>
+  <define name="getc(__stream)" value="fgetc(__stream)"/>
+  <define name="getchar()" value="fgetc(stdin)"/>
+  <function name="vfprintf_P">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <formatstr/>
+    <arg nr="2">
+      <formatstr/>
+    </arg>
+    <arg nr="any">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="printf_P">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <formatstr/>
+    <arg nr="1">
+      <formatstr/>
+    </arg>
+    <arg nr="any">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="sprintf_P">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <formatstr/>
+    <arg nr="2">
+      <formatstr/>
+    </arg>
+    <arg nr="any">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="snprintf_P">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <formatstr/>
+    <arg nr="3">
+      <formatstr/>
+    </arg>
+    <arg nr="any">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="vsprintf_P">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <formatstr/>
+    <arg nr="2">
+      <formatstr/>
+    </arg>
+    <arg nr="any">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="vsnprintf_P">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <formatstr/>
+    <arg nr="3">
+      <formatstr/>
+    </arg>
+    <arg nr="any">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="fprintf_P">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <formatstr/>
+    <arg nr="2">
+      <formatstr/>
+    </arg>
+    <arg nr="any">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="fputs_P">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="puts_P">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
+  </function>
+  <function name="scanf_P">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <formatstr scan="true"/>
+    <arg nr="2">
+      <formatstr/>
+    </arg>
+    <arg nr="any">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="fscanf_P">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <formatstr scan="true"/>
+    <arg nr="2">
+      <formatstr/>
+    </arg>
+    <arg nr="any">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="sscanf_P">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <formatstr scan="true"/>
+    <arg nr="2">
+      <formatstr/>
+    </arg>
+  </function>
+  <function name="fdevopen">
+    <noreturn>false</noreturn>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- stdlib.h -->
+  <define name="__ptr_t" value="void *"/>
+  <define name="RAND_MAX" value="0x7FFF"/>
+  <function name="ltoa">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="utoa">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="ultoa">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="random">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+  </function>
+  <function name="random_r">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+    </arg>
+  </function>
+  <function name="srandom">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="dtostre">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
+  </function>
+  <function name="dtostrf">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
+    <arg nr="4">
+      <not-null/>
+    </arg>
+  </function>
+  <define name="RANDOM_MAX" value="0x7FFFFFFF"/>
+  <define name="DTOSTR_ALWAYS_SIGN" value="0x01"/>
+  <define name="DTOSTR_PLUS_SIGN" value="0x02"/>
+  <define name="DTOSTR_UPPERCASE" value="0x04"/>
+  <!-- string.h -->
+  <function name="ffs">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="ffsl">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="ffsll">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="memccpy">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
+    <arg nr="4">
+      <not-uninit/>
+    </arg>
+  </function>
+</def>
diff --git a/gui/manualtest/tests/projects/custom-cfg/p.cppcheck b/gui/manualtest/tests/projects/custom-cfg/p.cppcheck
new file mode 100644
index 00000000000..e8db10582ad
--- /dev/null
+++ b/gui/manualtest/tests/projects/custom-cfg/p.cppcheck
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+  <paths>
+    <dir name="."/>
+  </paths>
+</project>
diff --git a/gui/manualtest/tests/projects/embedded/board.h b/gui/manualtest/tests/projects/embedded/board.h
new file mode 100644
index 00000000000..8a5bddc04a0
--- /dev/null
+++ b/gui/manualtest/tests/projects/embedded/board.h
@@ -0,0 +1,10 @@
+#ifndef BOARD_H
+#define BOARD_H
+
+#define GPIOA_ODR (*(volatile unsigned int *)0x40020014U)
+#define UART_DR   (*(volatile unsigned int *)0x40011004U)
+
+void gpio_set(unsigned int pin, unsigned int mask);
+void uart_putc(char c);
+
+#endif
diff --git a/gui/manualtest/tests/projects/embedded/embedded.cppcheck b/gui/manualtest/tests/projects/embedded/embedded.cppcheck
new file mode 100644
index 00000000000..679b87f6d90
--- /dev/null
+++ b/gui/manualtest/tests/projects/embedded/embedded.cppcheck
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+  <paths>
+    <dir name="."/>
+  </paths>
+  <addons>
+    <addon>misra</addon>
+  </addons>
+</project>
diff --git a/gui/manualtest/tests/projects/embedded/gpio.c b/gui/manualtest/tests/projects/embedded/gpio.c
new file mode 100644
index 00000000000..73968d86135
--- /dev/null
+++ b/gui/manualtest/tests/projects/embedded/gpio.c
@@ -0,0 +1,6 @@
+#include "board.h"
+
+void gpio_set(unsigned int pin, unsigned int mask)
+{
+    GPIOA_ODR |= mask;
+}
diff --git a/gui/manualtest/tests/projects/embedded/main.c b/gui/manualtest/tests/projects/embedded/main.c
new file mode 100644
index 00000000000..6daafe949b4
--- /dev/null
+++ b/gui/manualtest/tests/projects/embedded/main.c
@@ -0,0 +1,10 @@
+#include "board.h"
+
+int main(void)
+{
+    gpio_set(5U, 0x20U);
+    uart_putc('A');
+    for (;;)
+    {
+    }
+}
diff --git a/gui/manualtest/tests/projects/embedded/rules with spaces.txt b/gui/manualtest/tests/projects/embedded/rules with spaces.txt
new file mode 100644
index 00000000000..a707cb8673d
--- /dev/null
+++ b/gui/manualtest/tests/projects/embedded/rules with spaces.txt	
@@ -0,0 +1,7 @@
+Appendix A Summary of guidelines
+
+Rule 2.7
+TEST RULE TEXT: unused parameters are not allowed
+Category Advisory
+Analysis Decidable, Single Translation Unit
+Applies to C90, C99
diff --git a/gui/manualtest/tests/projects/embedded/rules.txt b/gui/manualtest/tests/projects/embedded/rules.txt
new file mode 100644
index 00000000000..a707cb8673d
--- /dev/null
+++ b/gui/manualtest/tests/projects/embedded/rules.txt
@@ -0,0 +1,7 @@
+Appendix A Summary of guidelines
+
+Rule 2.7
+TEST RULE TEXT: unused parameters are not allowed
+Category Advisory
+Analysis Decidable, Single Translation Unit
+Applies to C90, C99
diff --git a/gui/manualtest/tests/projects/embedded/uart.c b/gui/manualtest/tests/projects/embedded/uart.c
new file mode 100644
index 00000000000..3720b2fde22
--- /dev/null
+++ b/gui/manualtest/tests/projects/embedded/uart.c
@@ -0,0 +1,6 @@
+#include "board.h"
+
+void uart_putc(char c)
+{
+    UART_DR = (unsigned int)c;
+}
diff --git a/gui/manualtest/tests/projects/recheck/a.c b/gui/manualtest/tests/projects/recheck/a.c
new file mode 100644
index 00000000000..a4f00f729cb
--- /dev/null
+++ b/gui/manualtest/tests/projects/recheck/a.c
@@ -0,0 +1,5 @@
+int main(void)
+{
+    int *p = 0;
+    return *p;
+}
diff --git a/gui/manualtest/tests/projects/recheck/a_v2.c b/gui/manualtest/tests/projects/recheck/a_v2.c
new file mode 100644
index 00000000000..229abfebb92
--- /dev/null
+++ b/gui/manualtest/tests/projects/recheck/a_v2.c
@@ -0,0 +1,5 @@
+int main(void)
+{
+    int x;
+    return x;
+}
diff --git a/gui/manualtest/tests/projects/recheck/b.c b/gui/manualtest/tests/projects/recheck/b.c
new file mode 100644
index 00000000000..20be2edc145
--- /dev/null
+++ b/gui/manualtest/tests/projects/recheck/b.c
@@ -0,0 +1,5 @@
+void f(void)
+{
+    char a[4];
+    a[10] = 0;
+}
diff --git a/gui/manualtest/tests/projects/recheck/p.cppcheck b/gui/manualtest/tests/projects/recheck/p.cppcheck
new file mode 100644
index 00000000000..760eb8837f8
--- /dev/null
+++ b/gui/manualtest/tests/projects/recheck/p.cppcheck
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+  <paths>
+    <dir name="a.c"/>
+    <dir name="b.c"/>
+  </paths>
+</project>
diff --git a/gui/manualtest/tests/projects/relative-paths/compile_commands.json b/gui/manualtest/tests/projects/relative-paths/compile_commands.json
new file mode 100644
index 00000000000..130de6bca98
--- /dev/null
+++ b/gui/manualtest/tests/projects/relative-paths/compile_commands.json
@@ -0,0 +1,4 @@
+[
+  {"directory": ".", "command": "gcc -c src/a.c", "file": "src/a.c"},
+  {"directory": ".", "command": "gcc -c skip/b.c", "file": "skip/b.c"}
+]
diff --git a/gui/manualtest/tests/projects/relative-paths/inc/util.h b/gui/manualtest/tests/projects/relative-paths/inc/util.h
new file mode 100644
index 00000000000..874a45c458c
--- /dev/null
+++ b/gui/manualtest/tests/projects/relative-paths/inc/util.h
@@ -0,0 +1 @@
+int helper(int x);
diff --git a/gui/manualtest/tests/projects/relative-paths/skip/b.c b/gui/manualtest/tests/projects/relative-paths/skip/b.c
new file mode 100644
index 00000000000..5bb061143c0
--- /dev/null
+++ b/gui/manualtest/tests/projects/relative-paths/skip/b.c
@@ -0,0 +1,4 @@
+int unused(void)
+{
+    return 0;
+}
diff --git a/gui/manualtest/tests/projects/relative-paths/src/a.c b/gui/manualtest/tests/projects/relative-paths/src/a.c
new file mode 100644
index 00000000000..db8654dea9f
--- /dev/null
+++ b/gui/manualtest/tests/projects/relative-paths/src/a.c
@@ -0,0 +1,6 @@
+#include "util.h"
+
+int main(void)
+{
+    return helper(1);
+}
diff --git a/gui/manualtest/tests/projects/switch-project/one/a.c b/gui/manualtest/tests/projects/switch-project/one/a.c
new file mode 100644
index 00000000000..a4f00f729cb
--- /dev/null
+++ b/gui/manualtest/tests/projects/switch-project/one/a.c
@@ -0,0 +1,5 @@
+int main(void)
+{
+    int *p = 0;
+    return *p;
+}
diff --git a/gui/manualtest/tests/projects/switch-project/one/p1.cppcheck b/gui/manualtest/tests/projects/switch-project/one/p1.cppcheck
new file mode 100644
index 00000000000..5eb66587401
--- /dev/null
+++ b/gui/manualtest/tests/projects/switch-project/one/p1.cppcheck
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+  <paths>
+    <dir name="a.c"/>
+  </paths>
+</project>
diff --git a/gui/manualtest/tests/projects/switch-project/two/b.c b/gui/manualtest/tests/projects/switch-project/two/b.c
new file mode 100644
index 00000000000..20be2edc145
--- /dev/null
+++ b/gui/manualtest/tests/projects/switch-project/two/b.c
@@ -0,0 +1,5 @@
+void f(void)
+{
+    char a[4];
+    a[10] = 0;
+}
diff --git a/gui/manualtest/tests/projects/switch-project/two/p2.cppcheck b/gui/manualtest/tests/projects/switch-project/two/p2.cppcheck
new file mode 100644
index 00000000000..a79d287d385
--- /dev/null
+++ b/gui/manualtest/tests/projects/switch-project/two/p2.cppcheck
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+  <paths>
+    <dir name="b.c"/>
+  </paths>
+</project>
diff --git a/gui/manualtest/tests/projects/syntax-error/binary.c b/gui/manualtest/tests/projects/syntax-error/binary.c
new file mode 100644
index 00000000000..c91312c3af0
Binary files /dev/null and b/gui/manualtest/tests/projects/syntax-error/binary.c differ
diff --git a/gui/manualtest/tests/projects/syntax-error/binary.cppcheck b/gui/manualtest/tests/projects/syntax-error/binary.cppcheck
new file mode 100644
index 00000000000..7804897af2d
--- /dev/null
+++ b/gui/manualtest/tests/projects/syntax-error/binary.cppcheck
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+  <paths>
+    <dir name="binary.c"/>
+    <dir name="ok.c"/>
+  </paths>
+</project>
diff --git a/gui/manualtest/tests/projects/syntax-error/braces.c b/gui/manualtest/tests/projects/syntax-error/braces.c
new file mode 100644
index 00000000000..66d81f572c3
--- /dev/null
+++ b/gui/manualtest/tests/projects/syntax-error/braces.c
@@ -0,0 +1,3 @@
+int main( {
+    return 0
+}
diff --git a/gui/manualtest/tests/projects/syntax-error/braces.cppcheck b/gui/manualtest/tests/projects/syntax-error/braces.cppcheck
new file mode 100644
index 00000000000..94d206fd67c
--- /dev/null
+++ b/gui/manualtest/tests/projects/syntax-error/braces.cppcheck
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+  <paths>
+    <dir name="braces.c"/>
+    <dir name="ok.c"/>
+  </paths>
+</project>
diff --git a/gui/manualtest/tests/projects/syntax-error/empty.c b/gui/manualtest/tests/projects/syntax-error/empty.c
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/gui/manualtest/tests/projects/syntax-error/empty.cppcheck b/gui/manualtest/tests/projects/syntax-error/empty.cppcheck
new file mode 100644
index 00000000000..eb36efbe086
--- /dev/null
+++ b/gui/manualtest/tests/projects/syntax-error/empty.cppcheck
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+  <paths>
+    <dir name="empty.c"/>
+    <dir name="ok.c"/>
+  </paths>
+</project>
diff --git a/gui/manualtest/tests/projects/syntax-error/latin1.c b/gui/manualtest/tests/projects/syntax-error/latin1.c
new file mode 100644
index 00000000000..7e730fd3a83
--- /dev/null
+++ b/gui/manualtest/tests/projects/syntax-error/latin1.c
@@ -0,0 +1,6 @@
+/* färg och smör */
+int färg(void)
+{
+    const char *s = "grön";
+    return s[0];
+}
diff --git a/gui/manualtest/tests/projects/syntax-error/latin1.cppcheck b/gui/manualtest/tests/projects/syntax-error/latin1.cppcheck
new file mode 100644
index 00000000000..06ccf58dfd5
--- /dev/null
+++ b/gui/manualtest/tests/projects/syntax-error/latin1.cppcheck
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+  <paths>
+    <dir name="latin1.c"/>
+    <dir name="ok.c"/>
+  </paths>
+</project>
diff --git a/gui/manualtest/tests/projects/syntax-error/long_line.c b/gui/manualtest/tests/projects/syntax-error/long_line.c
new file mode 100644
index 00000000000..14807c9e52b
--- /dev/null
+++ b/gui/manualtest/tests/projects/syntax-error/long_line.c
@@ -0,0 +1 @@
+int x = a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + a + 
diff --git a/gui/manualtest/tests/projects/syntax-error/long_line.cppcheck b/gui/manualtest/tests/projects/syntax-error/long_line.cppcheck
new file mode 100644
index 00000000000..f13ad9aa112
--- /dev/null
+++ b/gui/manualtest/tests/projects/syntax-error/long_line.cppcheck
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+  <paths>
+    <dir name="long_line.c"/>
+    <dir name="ok.c"/>
+  </paths>
+</project>
diff --git a/gui/manualtest/tests/projects/syntax-error/ok.c b/gui/manualtest/tests/projects/syntax-error/ok.c
new file mode 100644
index 00000000000..8e1e58ce827
--- /dev/null
+++ b/gui/manualtest/tests/projects/syntax-error/ok.c
@@ -0,0 +1,5 @@
+int ok(void)
+{
+    int *p = 0;
+    return *p;
+}
diff --git a/gui/manualtest/tests/projects/syntax-error/unclosed_nesting.c b/gui/manualtest/tests/projects/syntax-error/unclosed_nesting.c
new file mode 100644
index 00000000000..7d6ac74625a
--- /dev/null
+++ b/gui/manualtest/tests/projects/syntax-error/unclosed_nesting.c
@@ -0,0 +1,4 @@
+int f(int a)
+{
+    return ((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((a;
+}
diff --git a/gui/manualtest/tests/projects/syntax-error/unclosed_nesting.cppcheck b/gui/manualtest/tests/projects/syntax-error/unclosed_nesting.cppcheck
new file mode 100644
index 00000000000..baeddf3ef2f
--- /dev/null
+++ b/gui/manualtest/tests/projects/syntax-error/unclosed_nesting.cppcheck
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+  <paths>
+    <dir name="unclosed_nesting.c"/>
+    <dir name="ok.c"/>
+  </paths>
+</project>
diff --git a/gui/manualtest/tests/projects/xml-results/a.c b/gui/manualtest/tests/projects/xml-results/a.c
new file mode 100644
index 00000000000..38775adee5f
--- /dev/null
+++ b/gui/manualtest/tests/projects/xml-results/a.c
@@ -0,0 +1,5 @@
+int first(void)
+{
+    int *p = 0;
+    return *p;
+}
diff --git a/gui/manualtest/tests/projects/xml-results/results.xml b/gui/manualtest/tests/projects/xml-results/results.xml
new file mode 100644
index 00000000000..c6f4b14c0c1
--- /dev/null
+++ b/gui/manualtest/tests/projects/xml-results/results.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<results version="2">
+    <cppcheck version="2.18 dev"/>
+    <errors>
+        <error id="nullPointer" severity="error" msg="Null pointer dereference: p" verbose="Null pointer dereference: p" cwe="476">
+            <location file="a.c" line="6" column="12" info="Dereferencing p"/>
+        </error>
+    </errors>
+</results>
diff --git a/gui/manualtest/tests/result_list.feature b/gui/manualtest/tests/result_list.feature
new file mode 100644
index 00000000000..f370d296fb0
--- /dev/null
+++ b/gui/manualtest/tests/result_list.feature
@@ -0,0 +1,91 @@
+Feature: Results list
+
+  Background:
+    Given the application is started with no project loaded
+
+  @id:t852206f1
+  Scenario: Severity buttons toggle
+    When I click each of the toolbar buttons Error, Warning, Style, Portability, Performance, Information, Cppcheck and Clang once
+    Then every button can be clicked and changes between checked and unchecked
+    When I click each of them once more
+    Then all buttons are in the state they had at the start
+
+  @id:td7decf1a @project:basic-project
+  Scenario: Filter the results
+    Given the project file {project:basic-project}/basic.cppcheck is opened from the File menu
+    And the analysis is done
+    When I type "arrayIndex" in the Filter field
+    Then only the arrayIndexOutOfBounds error in b.c is shown
+    When I clear the Filter field
+    Then all errors are shown again
+
+  @id:t2af9d498 @project:basic-project
+  Scenario: Expand all
+    Given the project file {project:basic-project}/basic.cppcheck is opened from the File menu
+    And the analysis is done
+    When I open View > Collapse All
+    And I open View > Expand All
+    Then all files are expanded and show their errors
+    And the errors in a.c, util.h and b.c are visible
+
+  @id:tec898362 @project:basic-project
+  Scenario: Collapse all
+    Given the project file {project:basic-project}/basic.cppcheck is opened from the File menu
+    And the analysis is done
+    When I open View > Expand All
+    And I open View > Collapse All
+    Then all files are collapsed
+    And the file entries are shown and their errors are not
+
+  @id:t4c027507 @project:basic-project
+  Scenario: Context menu of a file entry
+    Given the project file {project:basic-project}/basic.cppcheck is opened from the File menu
+    And the analysis is done
+    When I right click on the file a.c in the results (not on one of its errors)
+    Then the context menu of the file entry has the entries Recheck and Open containing folder
+    But it has none of the entries Hide, Hide all with ID or Suppress selected id, they only apply to a single error
+
+  @id:taacc3841 @project:basic-project
+  Scenario: Hide one error
+    Given the project file {project:basic-project}/basic.cppcheck is opened from the File menu
+    And the analysis is done
+    When I expand a.c in the results
+    And I right click on the first nullPointer error (line 6) and click Hide
+    Then that error is gone
+    And the other errors are still shown, including the second nullPointer error in a.c (line 12)
+
+  @id:t2937b690 @project:basic-project
+  Scenario: Hide all errors with the same ID
+    Given the project file {project:basic-project}/basic.cppcheck is opened from the File menu
+    And the analysis is done
+    When I expand a.c in the results
+    And I right click on a nullPointer error and click Hide all with ID
+    Then all nullPointer errors are gone, in a.c and in util.h
+    And the arrayIndexOutOfBounds error in b.c is still shown
+
+  @id:t313463d3 @project:basic-project
+  Scenario: Show hidden errors again
+    Given the project file {project:basic-project}/basic.cppcheck is opened from the File menu
+    And the analysis is done
+    When I expand a.c in the results
+    And I right click on the first nullPointer error and click Hide all with id
+    Then the a.c results are hidden
+    When I open View > Show Hidden
+    Then the error that was hidden is shown again
+
+  @id:t90bf32e9 @project:basic-project
+  Scenario: Suppress selected ID
+    Given the project file {project:basic-project}/basic.cppcheck is opened from the File menu
+    And the analysis is done
+    When I expand a.c in the results
+    And I right click on a nullPointer error and click Suppress selected id
+    And I open File > Edit Project File and go to Warning options
+    Then no nullPointer error is shown in the results
+    And the id nullPointer is listed under Suppressions in the project file dialog
+
+  @id:t389a5f3a @project:basic-project
+  Scenario: Clear results
+    Given the project file {project:basic-project}/basic.cppcheck is opened from the File menu
+    And the analysis is done
+    When I click Clear results
+    Then the results are cleared: the result tree is empty
diff --git a/gui/manualtest/tests/result_list.scripts.json b/gui/manualtest/tests/result_list.scripts.json
new file mode 100644
index 00000000000..739dd0bd32e
--- /dev/null
+++ b/gui/manualtest/tests/result_list.scripts.json
@@ -0,0 +1,1127 @@
+{
+  "t852206f1": {
+    "script": [
+      {
+        "do": "click",
+        "name": "Show errors",
+        "role": "check box",
+        "label": "Click Error once"
+      },
+      {
+        "do": "click",
+        "name": "Show warnings",
+        "role": "check box",
+        "label": "Click Warning once"
+      },
+      {
+        "do": "click",
+        "name": "Show style warnings",
+        "role": "check box",
+        "label": "Click Style once"
+      },
+      {
+        "do": "click",
+        "name": "Show portability",
+        "role": "check box",
+        "label": "Click Portability once"
+      },
+      {
+        "do": "click",
+        "name": "Show performance warnings",
+        "role": "check box",
+        "label": "Click Performance once"
+      },
+      {
+        "do": "click",
+        "name": "Show information",
+        "role": "check box",
+        "label": "Click Information once"
+      },
+      {
+        "do": "click",
+        "name": "Cppcheck",
+        "role": "check box",
+        "label": "Click Cppcheck once"
+      },
+      {
+        "do": "click",
+        "name": "Clang",
+        "role": "check box",
+        "label": "Click Clang once"
+      },
+      {
+        "expect": "state",
+        "name": "Show errors",
+        "role": "check box",
+        "not_state": "checked",
+        "label": "Error changed to unchecked after first click"
+      },
+      {
+        "expect": "state",
+        "name": "Show warnings",
+        "role": "check box",
+        "not_state": "checked",
+        "label": "Warning changed to unchecked after first click"
+      },
+      {
+        "expect": "state",
+        "name": "Show style warnings",
+        "role": "check box",
+        "not_state": "checked",
+        "label": "Style changed to unchecked after first click"
+      },
+      {
+        "expect": "state",
+        "name": "Show portability",
+        "role": "check box",
+        "not_state": "checked",
+        "label": "Portability changed to unchecked after first click"
+      },
+      {
+        "expect": "state",
+        "name": "Show performance warnings",
+        "role": "check box",
+        "not_state": "checked",
+        "label": "Performance changed to unchecked after first click"
+      },
+      {
+        "expect": "state",
+        "name": "Show information",
+        "role": "check box",
+        "not_state": "checked",
+        "label": "Information changed to unchecked after first click"
+      },
+      {
+        "expect": "state",
+        "name": "Cppcheck",
+        "role": "check box",
+        "not_state": "checked",
+        "label": "Cppcheck changed to unchecked after first click"
+      },
+      {
+        "expect": "state",
+        "name": "Clang",
+        "role": "check box",
+        "not_state": "checked",
+        "label": "Clang changed to unchecked after first click"
+      },
+      {
+        "do": "click",
+        "name": "Show errors",
+        "role": "check box",
+        "label": "Click Error a second time"
+      },
+      {
+        "do": "click",
+        "name": "Show warnings",
+        "role": "check box",
+        "label": "Click Warning a second time"
+      },
+      {
+        "do": "click",
+        "name": "Show style warnings",
+        "role": "check box",
+        "label": "Click Style a second time"
+      },
+      {
+        "do": "click",
+        "name": "Show portability",
+        "role": "check box",
+        "label": "Click Portability a second time"
+      },
+      {
+        "do": "click",
+        "name": "Show performance warnings",
+        "role": "check box",
+        "label": "Click Performance a second time"
+      },
+      {
+        "do": "click",
+        "name": "Show information",
+        "role": "check box",
+        "label": "Click Information a second time"
+      },
+      {
+        "do": "click",
+        "name": "Cppcheck",
+        "role": "check box",
+        "label": "Click Cppcheck a second time"
+      },
+      {
+        "do": "click",
+        "name": "Clang",
+        "role": "check box",
+        "label": "Click Clang a second time"
+      },
+      {
+        "expect": "state",
+        "name": "Show errors",
+        "role": "check box",
+        "state": "checked",
+        "label": "Error is back to its start state (checked)"
+      },
+      {
+        "expect": "state",
+        "name": "Show warnings",
+        "role": "check box",
+        "state": "checked",
+        "label": "Warning is back to its start state (checked)"
+      },
+      {
+        "expect": "state",
+        "name": "Show style warnings",
+        "role": "check box",
+        "state": "checked",
+        "label": "Style is back to its start state (checked)"
+      },
+      {
+        "expect": "state",
+        "name": "Show portability",
+        "role": "check box",
+        "state": "checked",
+        "label": "Portability is back to its start state (checked)"
+      },
+      {
+        "expect": "state",
+        "name": "Show performance warnings",
+        "role": "check box",
+        "state": "checked",
+        "label": "Performance is back to its start state (checked)"
+      },
+      {
+        "expect": "state",
+        "name": "Show information",
+        "role": "check box",
+        "state": "checked",
+        "label": "Information is back to its start state (checked)"
+      },
+      {
+        "expect": "state",
+        "name": "Cppcheck",
+        "role": "check box",
+        "state": "checked",
+        "label": "Cppcheck is back to its start state (checked)"
+      },
+      {
+        "expect": "state",
+        "name": "Clang",
+        "role": "check box",
+        "state": "checked",
+        "label": "Clang is back to its start state (checked)"
+      }
+    ],
+    "script_for": "e5baac140df9"
+  },
+  "td7decf1a": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File...",
+        "role": "menu item",
+        "label": "Choose Open Project File"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:basic-project}/basic.cppcheck",
+        "label": "Enter the project file path"
+      },
+      {
+        "do": "click",
+        "name": "Open",
+        "role": "button",
+        "exact": true,
+        "label": "Confirm the file dialog"
+      },
+      {
+        "expect": "visible",
+        "name": "src/b.c",
+        "role": "table cell",
+        "timeout": 30,
+        "label": "Analysis is done and results are shown"
+      },
+      {
+        "expect": "visible",
+        "name": "src/a.c",
+        "role": "table cell",
+        "label": "All files are listed before filtering"
+      },
+      {
+        "expect": "visible",
+        "name": "include/util.h",
+        "role": "table cell",
+        "label": "util.h is listed before filtering"
+      },
+      {
+        "do": "focus",
+        "path": "0.4.1",
+        "role": "text",
+        "label": "Focus the Filter field"
+      },
+      {
+        "do": "type",
+        "value": "arrayIndex",
+        "label": "Type arrayIndex in the Filter field"
+      },
+      {
+        "expect": "visible",
+        "name": "src/b.c",
+        "role": "table cell",
+        "label": "Only the b.c error remains shown"
+      },
+      {
+        "expect": "gone",
+        "name": "src/a.c",
+        "role": "table cell",
+        "label": "a.c error is filtered out"
+      },
+      {
+        "expect": "gone",
+        "name": "include/util.h",
+        "role": "table cell",
+        "label": "util.h error is filtered out"
+      },
+      {
+        "do": "settext",
+        "path": "0.4.1",
+        "role": "text",
+        "value": "",
+        "label": "Clear the Filter field"
+      },
+      {
+        "expect": "visible",
+        "name": "src/a.c",
+        "role": "table cell",
+        "label": "a.c error is shown again"
+      },
+      {
+        "expect": "visible",
+        "name": "src/b.c",
+        "role": "table cell",
+        "label": "b.c error is shown again"
+      },
+      {
+        "expect": "visible",
+        "name": "include/util.h",
+        "role": "table cell",
+        "label": "util.h error is shown again"
+      }
+    ],
+    "script_for": "f86b9b8205a7"
+  },
+  "t2af9d498": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File...",
+        "role": "menu item",
+        "label": "Choose Open Project File"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:basic-project}/basic.cppcheck",
+        "label": "Enter the project file path"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Confirm the file dialog"
+      },
+      {
+        "do": "wait",
+        "name": "Checking src/b.c",
+        "role": "list item",
+        "timeout": 30,
+        "label": "Wait until the analysis has run"
+      },
+      {
+        "expect": "visible",
+        "name": "src/a.c",
+        "role": "table cell",
+        "timeout": 30,
+        "label": "Results are shown"
+      },
+      {
+        "do": "click",
+        "name": "View",
+        "role": "menu item",
+        "label": "Open the View menu"
+      },
+      {
+        "do": "click",
+        "name": "Collapse all",
+        "role": "menu item",
+        "label": "View > Collapse All"
+      },
+      {
+        "do": "click",
+        "name": "Expand all",
+        "role": "menu item",
+        "label": "View > Expand All (menu is still open)"
+      },
+      {
+        "expect": "visible",
+        "name": "Null pointer dereference: r",
+        "role": "table cell",
+        "label": "The error in util.h is visible"
+      },
+      {
+        "expect": "visible",
+        "name": "Null pointer dereference: p",
+        "role": "table cell",
+        "label": "The error in a.c is visible"
+      },
+      {
+        "expect": "state",
+        "name": "include/util.h",
+        "role": "table cell",
+        "state": "expanded",
+        "nth": 0,
+        "label": "util.h is expanded"
+      },
+      {
+        "expect": "state",
+        "name": "src/a.c",
+        "role": "table cell",
+        "state": "expanded",
+        "nth": 0,
+        "label": "a.c is expanded"
+      }
+    ],
+    "script_for": "3d1da0542440"
+  },
+  "tec898362": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File...",
+        "role": "menu item",
+        "label": "Choose Open Project File"
+      },
+      {
+        "do": "wait",
+        "name": "Select Project File",
+        "role": "dialog",
+        "label": "File dialog appears"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:basic-project}/basic.cppcheck",
+        "label": "Enter the project file path"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Confirm the file dialog"
+      },
+      {
+        "expect": "visible",
+        "name": "src/b.c",
+        "role": "table cell",
+        "timeout": 60,
+        "label": "Analysis is done and the file entries are shown"
+      },
+      {
+        "do": "click",
+        "name": "View",
+        "role": "menu item",
+        "label": "Open the View menu"
+      },
+      {
+        "do": "click",
+        "name": "Expand all",
+        "role": "menu item",
+        "label": "View > Expand All"
+      },
+      {
+        "expect": "visible",
+        "name": "nullPointer",
+        "role": "table cell",
+        "label": "Errors are visible after expanding"
+      },
+      {
+        "do": "hover",
+        "name": "View",
+        "role": "menu item",
+        "label": "Open the View menu again"
+      },
+      {
+        "do": "click",
+        "name": "Collapse all",
+        "role": "menu item",
+        "label": "View > Collapse All"
+      },
+      {
+        "expect": "visible",
+        "name": "include/util.h",
+        "role": "table cell",
+        "label": "File entry util.h is shown"
+      },
+      {
+        "expect": "visible",
+        "name": "src/a.c",
+        "role": "table cell",
+        "label": "File entry a.c is shown"
+      },
+      {
+        "expect": "visible",
+        "name": "src/b.c",
+        "role": "table cell",
+        "label": "File entry b.c is shown"
+      },
+      {
+        "expect": "gone",
+        "name": "nullPointer",
+        "label": "Errors are not shown"
+      },
+      {
+        "expect": "gone",
+        "name": "constVariablePointer",
+        "label": "Style errors are not shown"
+      }
+    ],
+    "script_for": "405a34af72d2"
+  },
+  "t4c027507": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File...",
+        "role": "menu item",
+        "label": "Choose Open Project File from the File menu"
+      },
+      {
+        "do": "wait",
+        "name": "Select Project File",
+        "role": "dialog",
+        "label": "Wait for the file dialog"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:basic-project}/basic.cppcheck",
+        "label": "Enter the path of basic.cppcheck"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Confirm the file dialog"
+      },
+      {
+        "do": "wait",
+        "name": "src/b.c",
+        "role": "table cell",
+        "timeout": 60,
+        "label": "Wait until the analysis is done and results are shown"
+      },
+      {
+        "do": "wait",
+        "name": "Select Project File",
+        "gone": true,
+        "label": "File dialog is closed"
+      },
+      {
+        "do": "rightclick",
+        "name": "src/a.c",
+        "role": "table cell",
+        "label": "Right click on the file a.c in the results"
+      },
+      {
+        "expect": "ocr",
+        "contains": "Recheck",
+        "label": "Context menu has Recheck"
+      },
+      {
+        "expect": "ocr",
+        "contains": "Open containing folder",
+        "label": "Context menu has Open containing folder"
+      },
+      {
+        "expect": "ocr",
+        "not_contains": "Hide",
+        "label": "Context menu has no Hide entries"
+      },
+      {
+        "expect": "ocr",
+        "not_contains": "Suppress selected id",
+        "label": "Context menu has no Suppress selected id"
+      }
+    ],
+    "script_for": "237d77caee36"
+  },
+  "taacc3841": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File",
+        "role": "menu item",
+        "label": "Choose Open Project File"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:basic-project}/basic.cppcheck",
+        "label": "Enter the project file path"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Open the project file"
+      },
+      {
+        "expect": "visible",
+        "name": "src/a.c",
+        "role": "table cell",
+        "timeout": 30,
+        "label": "Analysis is done and results show a.c"
+      },
+      {
+        "do": "focus",
+        "name": "src/a.c",
+        "role": "table cell",
+        "label": "Focus the a.c row"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Right"
+        ],
+        "label": "Expand a.c in the results"
+      },
+      {
+        "expect": "visible",
+        "name": "Null pointer dereference: p",
+        "role": "table cell",
+        "label": "First nullPointer error (line 6) is shown"
+      },
+      {
+        "do": "rightclick",
+        "name": "Null pointer dereference: p",
+        "role": "table cell",
+        "label": "Right click on the first nullPointer error"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Down",
+          "Down",
+          "Down",
+          "Return"
+        ],
+        "label": "Click Hide (Hide 1 result(s)) in the context menu"
+      },
+      {
+        "expect": "gone",
+        "name": "Null pointer dereference: p",
+        "label": "The hidden error is gone"
+      },
+      {
+        "expect": "visible",
+        "name": "Null pointer dereference: q",
+        "role": "table cell",
+        "label": "Second nullPointer error (line 12) is still shown"
+      },
+      {
+        "expect": "visible",
+        "name": "Variable 'p' can be declared as pointer to const",
+        "role": "table cell",
+        "label": "Other errors are still shown (line 5)"
+      },
+      {
+        "expect": "visible",
+        "name": "Variable 'q' can be declared as pointer to const",
+        "role": "table cell",
+        "label": "Other errors are still shown (line 11)"
+      }
+    ],
+    "script_for": "13f9f46bd6a3"
+  },
+  "t2937b690": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File...",
+        "role": "menu item",
+        "label": "Choose Open Project File"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:basic-project}/basic.cppcheck",
+        "label": "Enter the project file path"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Open the project file"
+      },
+      {
+        "expect": "visible",
+        "name": "src/a.c",
+        "role": "table cell",
+        "timeout": 30,
+        "label": "Wait until the analysis is done and results are shown"
+      },
+      {
+        "do": "doubleclick",
+        "name": "src/a.c",
+        "role": "table cell",
+        "label": "Select a.c in the results"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Right"
+        ],
+        "label": "Expand a.c in the results"
+      },
+      {
+        "expect": "visible",
+        "name": "nullPointer",
+        "role": "table cell",
+        "label": "nullPointer errors are listed before hiding"
+      },
+      {
+        "do": "rightclick",
+        "name": "nullPointer",
+        "role": "table cell",
+        "nth": 0,
+        "label": "Right click on a nullPointer error"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Down",
+          "Down",
+          "Down",
+          "Down"
+        ],
+        "label": "Move to Hide all with id in the context menu"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Click Hide all with ID"
+      },
+      {
+        "expect": "gone",
+        "name": "nullPointer",
+        "role": "table cell",
+        "label": "All nullPointer errors are gone from a.c and util.h"
+      },
+      {
+        "expect": "visible",
+        "name": "constVariablePointer",
+        "role": "table cell",
+        "label": "Other errors in a.c are still shown"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "End",
+          "Right"
+        ],
+        "label": "Expand b.c in the results"
+      },
+      {
+        "expect": "visible",
+        "name": "arrayIndexOutOfBounds",
+        "role": "table cell",
+        "label": "The arrayIndexOutOfBounds error in b.c is still shown"
+      }
+    ],
+    "script_for": "0c3a81139be4"
+  },
+  "t313463d3": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Given the project file is opened from the File menu: open File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File...",
+        "role": "menu item",
+        "label": "Given the project file is opened from the File menu: Open Project File"
+      },
+      {
+        "do": "wait",
+        "name": "Select Project File",
+        "role": "dialog",
+        "label": "Project file dialog is shown"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:basic-project}/basic.cppcheck",
+        "label": "Enter the project file basic.cppcheck"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Open the project file"
+      },
+      {
+        "expect": "visible",
+        "name": "Project: basic.cppcheck",
+        "role": "frame",
+        "timeout": 10,
+        "label": "The project is loaded"
+      },
+      {
+        "expect": "visible",
+        "name": "src/a.c",
+        "role": "table cell",
+        "timeout": 30,
+        "label": "And the analysis is done: a.c is in the results"
+      },
+      {
+        "expect": "state",
+        "name": "Stop analysis",
+        "role": "button",
+        "not_state": "enabled",
+        "timeout": 30,
+        "label": "And the analysis is done"
+      },
+      {
+        "do": "focus",
+        "name": "src/a.c",
+        "role": "table cell",
+        "label": "When I expand a.c in the results: select a.c"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Right"
+        ],
+        "label": "When I expand a.c in the results"
+      },
+      {
+        "expect": "visible",
+        "name": "Null pointer dereference: p",
+        "role": "table cell",
+        "label": "The first nullPointer error of a.c is shown"
+      },
+      {
+        "expect": "visible",
+        "name": "Null pointer dereference: q",
+        "role": "table cell",
+        "label": "The second nullPointer error of a.c is shown"
+      },
+      {
+        "do": "rightclick",
+        "name": "Null pointer dereference: p",
+        "role": "table cell",
+        "label": "And I right click on the first nullPointer error"
+      },
+      {
+        "expect": "ocr",
+        "contains": "Hide all with id",
+        "label": "The context menu has Hide all with id"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Up",
+          "Up",
+          "Up"
+        ],
+        "label": "Move to Hide all with id in the context menu"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "And click Hide all with id"
+      },
+      {
+        "expect": "gone",
+        "name": "Null pointer dereference: p",
+        "label": "Then the a.c results are hidden: first nullPointer error"
+      },
+      {
+        "expect": "gone",
+        "name": "Null pointer dereference: q",
+        "label": "Then the a.c results are hidden: second nullPointer error"
+      },
+      {
+        "expect": "visible",
+        "name": "Variable 'p' can be declared as pointer to const",
+        "role": "table cell",
+        "label": "Other a.c results are still shown"
+      },
+      {
+        "do": "click",
+        "name": "View",
+        "role": "menu item",
+        "label": "When I open View menu"
+      },
+      {
+        "do": "click",
+        "name": "Show hidden",
+        "role": "menu item",
+        "label": "When I open View > Show Hidden"
+      },
+      {
+        "expect": "visible",
+        "name": "Null pointer dereference: p",
+        "role": "table cell",
+        "label": "Then the error that was hidden is shown again"
+      },
+      {
+        "expect": "visible",
+        "name": "Null pointer dereference: q",
+        "role": "table cell",
+        "label": "Then the other hidden nullPointer error is shown again"
+      }
+    ],
+    "script_for": "0b1c29212e8d"
+  },
+  "t90bf32e9": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File",
+        "role": "menu item",
+        "label": "Click Open Project File"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:basic-project}/basic.cppcheck",
+        "label": "Enter project file path"
+      },
+      {
+        "do": "click",
+        "name": "Open",
+        "role": "button",
+        "exact": true,
+        "label": "Confirm the file dialog"
+      },
+      {
+        "expect": "visible",
+        "name": "src/a.c",
+        "role": "table cell",
+        "timeout": 60,
+        "label": "Wait until the analysis is done"
+      },
+      {
+        "do": "sleep",
+        "seconds": 3,
+        "label": "Let the analysis finish"
+      },
+      {
+        "do": "focus",
+        "name": "src/a.c",
+        "role": "table cell",
+        "label": "Select a.c in the results"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Right"
+        ],
+        "label": "Expand a.c in the results"
+      },
+      {
+        "expect": "visible",
+        "name": "nullPointer",
+        "role": "table cell",
+        "label": "nullPointer error is shown under a.c"
+      },
+      {
+        "do": "rightclick",
+        "name": "nullPointer",
+        "role": "table cell",
+        "nth": 0,
+        "label": "Right click on a nullPointer error"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Down",
+          "Down",
+          "Down",
+          "Down",
+          "Down",
+          "Return"
+        ],
+        "label": "Click Suppress selected id"
+      },
+      {
+        "expect": "gone",
+        "name": "nullPointer",
+        "role": "table cell",
+        "label": "No nullPointer error is shown in the results"
+      },
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open File menu"
+      },
+      {
+        "do": "click",
+        "name": "Edit Project File",
+        "role": "menu item",
+        "label": "Click Edit Project File"
+      },
+      {
+        "do": "click",
+        "name": "Warning options",
+        "role": "page tab",
+        "label": "Go to Warning options"
+      },
+      {
+        "expect": "visible",
+        "name": "nullPointer",
+        "role": "list item",
+        "label": "The id nullPointer is listed under Suppressions"
+      }
+    ],
+    "script_for": "fb50a62ef505"
+  },
+  "t389a5f3a": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File...",
+        "role": "menu item",
+        "label": "Choose Open Project File"
+      },
+      {
+        "do": "settext",
+        "name": "File name",
+        "role": "text",
+        "value": "{project:basic-project}/basic.cppcheck",
+        "label": "Enter the project file path"
+      },
+      {
+        "do": "click",
+        "name": "Open",
+        "role": "button",
+        "exact": true,
+        "label": "Confirm the file dialog"
+      },
+      {
+        "expect": "visible",
+        "name": "src/b.c",
+        "role": "table cell",
+        "timeout": 30,
+        "label": "Analysis results are shown"
+      },
+      {
+        "do": "sleep",
+        "seconds": 3,
+        "label": "Wait until the analysis is done"
+      },
+      {
+        "expect": "state",
+        "name": "Clear results",
+        "role": "button",
+        "state": "enabled",
+        "label": "Analysis finished, Clear results is available"
+      },
+      {
+        "do": "click",
+        "name": "Clear results",
+        "role": "button",
+        "label": "Click Clear results"
+      },
+      {
+        "expect": "gone",
+        "name": "src/a.c",
+        "role": "table cell",
+        "label": "Result tree has no src/a.c entry"
+      },
+      {
+        "expect": "gone",
+        "name": "src/b.c",
+        "role": "table cell",
+        "label": "Result tree has no src/b.c entry"
+      },
+      {
+        "expect": "gone",
+        "name": "include/util.h",
+        "role": "table cell",
+        "label": "Result tree has no include/util.h entry"
+      }
+    ],
+    "script_for": "96a64734a43b"
+  }
+}
diff --git a/gui/manualtest/tests/xml_results.feature b/gui/manualtest/tests/xml_results.feature
new file mode 100644
index 00000000000..2a7b48c5285
--- /dev/null
+++ b/gui/manualtest/tests/xml_results.feature
@@ -0,0 +1,45 @@
+Feature: XML results
+
+  Background:
+    Given the application is started with no project loaded
+
+  @id:tc1fc409e @project:basic-project
+  Scenario Outline: Save results to a file
+    Given the project file {project:basic-project}/basic.cppcheck is opened from the File menu
+    And the analysis is done
+    When I open File > Save results to file
+    And I choose the file type for <format> files
+    And I save the results as results.<format> in the work directory {work}
+    Then the file results.<format> is saved in the <format> format
+    And it has the nullPointer error in a.c ("Null pointer dereference")
+    And it has the arrayIndexOutOfBounds error in b.c ("out of bounds")
+
+    Examples:
+      | format |
+      | xml    |
+      | txt    |
+      | csv    |
+
+  @id:tcdb051d4 @project:xml-results
+  Scenario: Open XML results
+    When I open File > Open XML
+    And I select {project:xml-results}/results.xml
+    Then the XML results are opened
+    And the nullPointer error in a.c is shown
+
+  @id:t8d9a2076 @ticket:13984 @project:xml-results
+  Scenario: No Recheck in XML results
+    Given the XML results {project:xml-results}/results.xml are opened with File > Open XML
+    When I right click on the file a.c in the results
+    Then the context menu of the file has no Recheck entry and no Open containing folder entry, XML results can not be analysed again
+    And the application does not crash
+
+  @id:t053b7c9c @project:xml-results @project:basic-project
+  Scenario: Reanalyze enabled after XML results
+    Given the XML results {project:xml-results}/results.xml are opened with File > Open XML
+    Then the button Reanalyze all files is disabled
+    And if I rightclick on a.c in the results I get a popup
+    And there is a option "Recheck 1 file(s)" in the popup that is disabled
+    When I open the project file {project:basic-project}/basic.cppcheck
+    And I wait until the analysis is done
+    Then the button Reanalyze all files is enabled and can be clicked
diff --git a/gui/manualtest/tests/xml_results.scripts.json b/gui/manualtest/tests/xml_results.scripts.json
new file mode 100644
index 00000000000..95fa6cebb97
--- /dev/null
+++ b/gui/manualtest/tests/xml_results.scripts.json
@@ -0,0 +1,466 @@
+{
+  "tc1fc409e": {
+    "script": [
+      {
+        "label": "Start the application with no project loaded",
+        "expect": "visible",
+        "name": "Cppcheck",
+        "role": "frame"
+      },
+      {
+        "label": "Open the File menu",
+        "do": "click",
+        "name": "File",
+        "role": "menu item"
+      },
+      {
+        "label": "Choose File > Open Project File",
+        "do": "click",
+        "name": "Open Project File...",
+        "role": "menu item"
+      },
+      {
+        "label": "Wait for the project file dialog",
+        "do": "wait",
+        "name": "Select Project File",
+        "role": "dialog"
+      },
+      {
+        "label": "Enter the project file basic.cppcheck",
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:basic-project}/basic.cppcheck"
+      },
+      {
+        "label": "Open the project file",
+        "do": "key",
+        "keys": [
+          "Return"
+        ]
+      },
+      {
+        "label": "The project is loaded",
+        "expect": "visible",
+        "name": "Project: basic.cppcheck",
+        "role": "frame",
+        "timeout": 10
+      },
+      {
+        "label": "Analysis has produced results for b.c",
+        "expect": "visible",
+        "name": "src/b.c",
+        "role": "table cell",
+        "timeout": 30
+      },
+      {
+        "label": "Wait until the analysis is done",
+        "expect": "state",
+        "name": "Stop analysis",
+        "role": "button",
+        "not_state": "enabled",
+        "timeout": 30
+      },
+      {
+        "label": "Open the File menu",
+        "do": "click",
+        "name": "File",
+        "role": "menu item"
+      },
+      {
+        "label": "Open File > Save results to file",
+        "do": "click",
+        "name": "Save results to file...",
+        "role": "menu item"
+      },
+      {
+        "label": "Wait for the save dialog",
+        "do": "wait",
+        "name": "Save the report file",
+        "role": "dialog"
+      },
+      {
+        "label": "Open the Files of type list",
+        "do": "click",
+        "name": "XML files",
+        "role": "combo box",
+        "mouse": true
+      },
+      {
+        "label": "Choose the file type for {format} files",
+        "do": "click",
+        "name": "(*.{format})",
+        "role": "list item",
+        "mouse": true
+      },
+      {
+        "label": "Enter results.{format} in the work directory as file name",
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{work}/results.{format}"
+      },
+      {
+        "label": "Save the results",
+        "do": "click",
+        "name": "Save",
+        "role": "button",
+        "exact": true
+      },
+      {
+        "label": "The save dialog is closed",
+        "expect": "gone",
+        "name": "Save the report file",
+        "role": "dialog"
+      },
+      {
+        "label": "results.{format} is saved and names a.c",
+        "expect": "file",
+        "path": "{work}/results.{format}",
+        "contains": "src/a.c"
+      },
+      {
+        "label": "results.{format} has the nullPointer error in a.c (Null pointer dereference)",
+        "expect": "file",
+        "path": "{work}/results.{format}",
+        "contains": "Null pointer dereference"
+      },
+      {
+        "label": "results.{format} has the arrayIndexOutOfBounds error in b.c (out of bounds)",
+        "expect": "file",
+        "path": "{work}/results.{format}",
+        "regex": "src/b.c[\\s\\S]*out of bounds|out of bounds[\\s\\S]*src/b.c"
+      }
+    ],
+    "script_for": "dad1485bb95a"
+  },
+  "tcdb051d4": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open XML",
+        "role": "menu item",
+        "label": "Choose File > Open XML"
+      },
+      {
+        "expect": "visible",
+        "name": "Open the report file",
+        "role": "dialog",
+        "label": "The file dialog is shown"
+      },
+      {
+        "do": "settext",
+        "name": "File name",
+        "role": "text",
+        "value": "{project:xml-results}/results.xml",
+        "label": "Select results.xml of the xml-results project"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Confirm the file dialog"
+      },
+      {
+        "do": "wait",
+        "name": "Open the report file",
+        "gone": true,
+        "label": "The file dialog closes"
+      },
+      {
+        "expect": "visible",
+        "name": "a.c",
+        "role": "table cell",
+        "label": "The file a.c is listed in the results"
+      },
+      {
+        "do": "focus",
+        "name": "a.c",
+        "role": "table cell",
+        "label": "Give keyboard focus to the a.c entry"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Right"
+        ],
+        "label": "Expand the a.c entry to see its error"
+      },
+      {
+        "expect": "visible",
+        "name": "nullPointer",
+        "role": "table cell",
+        "label": "The nullPointer error is shown"
+      },
+      {
+        "expect": "visible",
+        "name": "Null pointer dereference: p",
+        "role": "table cell",
+        "label": "The nullPointer summary is shown"
+      },
+      {
+        "expect": "visible",
+        "name": "error",
+        "role": "table cell",
+        "label": "The severity of the error is shown"
+      }
+    ],
+    "script_for": "35589d1420ec"
+  },
+  "t8d9a2076": {
+    "script": [
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open XML",
+        "role": "menu item",
+        "label": "Choose File > Open XML"
+      },
+      {
+        "do": "wait",
+        "name": "Open the report file",
+        "timeout": 10,
+        "label": "Wait for the open dialog"
+      },
+      {
+        "do": "settext",
+        "name": "File name",
+        "role": "text",
+        "value": "{project:xml-results}/results.xml",
+        "label": "Enter the path of results.xml"
+      },
+      {
+        "do": "click",
+        "name": "Open",
+        "role": "button",
+        "nth": 1,
+        "label": "Confirm the file dialog"
+      },
+      {
+        "expect": "visible",
+        "name": "a.c",
+        "role": "table cell",
+        "timeout": 10,
+        "label": "The results show the file a.c"
+      },
+      {
+        "do": "rightclick",
+        "name": "a.c",
+        "role": "table cell",
+        "label": "Right click on the file a.c in the results"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Menu"
+        ],
+        "label": "Make sure the context menu is open"
+      },
+      {
+        "expect": "gone",
+        "name": "Recheck",
+        "label": "The context menu has no Recheck entry"
+      },
+      {
+        "expect": "gone",
+        "name": "Open containing folder",
+        "label": "The context menu has no Open containing folder entry"
+      },
+      {
+        "expect": "alive",
+        "label": "The application does not crash"
+      }
+    ],
+    "script_for": "a23ab5dd15e4"
+  },
+  "t053b7c9c": {
+    "script": [
+      {
+        "expect": "visible",
+        "name": "Cppcheck",
+        "role": "frame",
+        "label": "Given the application is started with no project loaded"
+      },
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "Given the XML results are opened with File > Open XML: open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open XML...",
+        "role": "menu item",
+        "label": "Given the XML results are opened with File > Open XML: choose Open XML"
+      },
+      {
+        "expect": "visible",
+        "name": "Open the report file",
+        "role": "dialog",
+        "label": "The Open XML file dialog is shown"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:xml-results}/results.xml",
+        "label": "Enter the XML results file name"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Open the XML results"
+      },
+      {
+        "do": "wait",
+        "name": "Open the report file",
+        "gone": true,
+        "timeout": 10,
+        "label": "Wait until the file dialog is closed"
+      },
+      {
+        "expect": "visible",
+        "name": "results.xml",
+        "role": "frame",
+        "timeout": 10,
+        "label": "The XML results are loaded"
+      },
+      {
+        "expect": "visible",
+        "name": "a.c",
+        "role": "table cell",
+        "timeout": 10,
+        "label": "a.c is shown in the results"
+      },
+      {
+        "expect": "state",
+        "name": "Reanalyze all files",
+        "role": "button",
+        "not_state": "enabled",
+        "label": "Then the button Reanalyze all files is disabled"
+      },
+      {
+        "do": "rightclick",
+        "name": "a.c",
+        "role": "table cell",
+        "label": "And if I rightclick on a.c in the results"
+      },
+      {
+        "do": "sleep",
+        "seconds": 1
+      },
+      {
+        "expect": "ocr",
+        "contains": "Copy",
+        "label": "I get a popup"
+      },
+      {
+        "expect": "ocr",
+        "not_contains": "Recheck",
+        "label": "There is an option Recheck 1 file(s) in the popup that is disabled (greyed out, not read by OCR)"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Escape"
+        ],
+        "label": "Close the popup"
+      },
+      {
+        "do": "click",
+        "name": "File",
+        "role": "menu item",
+        "label": "When I open the project file: open the File menu"
+      },
+      {
+        "do": "click",
+        "name": "Open Project File...",
+        "role": "menu item",
+        "label": "When I open the project file: choose Open Project File"
+      },
+      {
+        "expect": "visible",
+        "name": "Select Project File",
+        "role": "dialog",
+        "label": "The project file dialog is shown"
+      },
+      {
+        "do": "settext",
+        "name": "File name:",
+        "role": "text",
+        "value": "{project:basic-project}/basic.cppcheck",
+        "label": "Enter the project file name"
+      },
+      {
+        "do": "key",
+        "keys": [
+          "Return"
+        ],
+        "label": "Open the project file"
+      },
+      {
+        "do": "wait",
+        "name": "Select Project File",
+        "gone": true,
+        "timeout": 10,
+        "label": "Wait until the file dialog is closed"
+      },
+      {
+        "expect": "visible",
+        "name": "Project: basic.cppcheck",
+        "role": "frame",
+        "timeout": 10,
+        "label": "The project is loaded"
+      },
+      {
+        "expect": "state",
+        "name": "Stop analysis",
+        "role": "button",
+        "not_state": "enabled",
+        "timeout": 30,
+        "label": "And I wait until the analysis is done"
+      },
+      {
+        "expect": "state",
+        "name": "Reanalyze all files",
+        "role": "button",
+        "state": "enabled",
+        "timeout": 30,
+        "label": "Then the button Reanalyze all files is enabled"
+      },
+      {
+        "do": "click",
+        "name": "Reanalyze all files",
+        "role": "button",
+        "label": "And can be clicked"
+      },
+      {
+        "expect": "alive",
+        "label": "The application still runs after clicking Reanalyze all files"
+      },
+      {
+        "expect": "state",
+        "name": "Reanalyze all files",
+        "role": "button",
+        "state": "enabled",
+        "timeout": 30,
+        "label": "Reanalyze all files is enabled again after the reanalysis"
+      }
+    ],
+    "script_for": "299ae476b3db"
+  }
+}
diff --git a/gui/manualtest/web.py b/gui/manualtest/web.py
new file mode 100644
index 00000000000..e538b00bdb8
--- /dev/null
+++ b/gui/manualtest/web.py
@@ -0,0 +1,464 @@
+#!/usr/bin/env python3
+"""Web interface for editing, generating and running the Gherkin tests.
+
+  web.py [--opensource APP] [--premium APP] [--src DIR] [--dir tests] [--out results] [--port 8080]
+
+Serves on 127.0.0.1 only. Reads and writes DIR/*.feature, with the scripts in DIR/*.scripts.json,
+and starts gen.py and run.py with the application that is tested, one binary per edition. SRC is the git checkout that both are built
+from, for the git sha in the reports. --app is the same as --opensource. Without any APP the
+tests can be edited but not generated or run.
+"""
+
+import argparse
+import json
+import mimetypes
+import os
+import re
+import signal
+import subprocess
+import sys
+import shutil
+import threading
+import time
+from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
+from urllib.parse import parse_qs, quote, unquote, urlparse
+
+import testfile
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+NAME_RE = re.compile(r'^[\w.-]+\.feature$')
+ID_RE = re.compile(r'^\w+$')
+
+
+class Job:
+    """gen.py or run.py in the background, one at a time. The output is shown in the web page.
+    A run of several editions is one run.py after the other, each with its own report."""
+
+    def __init__(self, kind, file, test_id, cmds, out_dir):
+        self.kind, self.file, self.test_id, self.out_dir = kind, file, test_id, out_dir
+        self.editions = [e for e, _ in cmds]
+        self.lines, self.reports, self.rc = [], [], None
+        self.started = time.time()
+        self.progress = {'total': 0, 'index': 0, 'test': '', 'testfile': '', 'step': 0, 'steps': 0, 'label': '', 'base': None,
+                         'edition': None, 'results': []}
+        self.proc, self.stopped, self.lock = None, False, threading.Lock()
+        threading.Thread(target=self.work, args=(cmds,), daemon=True).start()
+
+    def work(self, cmds):
+        rc = 0
+        for edition, cmd in cmds:
+            with self.lock:
+                if self.stopped:
+                    break
+                self.edition = edition
+                self.proc = subprocess.Popen(cmd, cwd=HERE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True,
+                                             env=dict(os.environ, PYTHONUNBUFFERED='1'), start_new_session=True)
+            if len(cmds) > 1:
+                self.lines.append('=== %s ===' % edition)
+            self.read()
+            rc = max(rc, self.proc.wait())
+        self.rc = rc
+
+    def stop(self):
+        with self.lock:
+            self.stopped = True
+            if self.proc and self.proc.poll() is None:
+                self.proc.send_signal(signal.SIGINT)   # run.py writes its report, gen.py cleans up
+
+    def read(self):
+        for line in self.proc.stdout:
+            line = line.rstrip('\n')
+            if line.startswith('@{') and self.event(line[1:]):
+                continue
+            self.lines.append(line)
+            m = re.match(r'report: (.+)$', line)
+            if m:
+                self.reports.append({'edition': self.edition,
+                                     'url': '/results/' + os.path.relpath(m.group(1), self.out_dir)})
+
+    def event(self, text):
+        """A progress line from run.py --events. False when it is not one."""
+        try:
+            e = json.loads(text)
+            kind, p = e['kind'], self.progress
+        except (ValueError, KeyError, TypeError):
+            return False
+        if kind == 'start':
+            p.update(total=e['total'], index=0, test='', testfile='', step=0, steps=0, label='', edition=e.get('edition'),
+                     base='/results/' + os.path.relpath(e['out'], self.out_dir))
+        elif kind == 'test':
+            p.update(index=e['index'], test=e['name'], testfile=e.get('file', ''), step=0, steps=e['steps'], label='')
+        elif kind == 'step':
+            p.update(step=e['step'], steps=e['steps'], label=e['label'])
+        elif kind == 'result':
+            p['results'].append(dict({k: e[k] for k in ('name', 'status', 'reason', 'seconds', 'crash', 'slug')},
+                                     file=e.get('file', ''),
+                                     shots=e.get('shots', []), edition=p['edition'], base=p['base']))
+        return True
+
+    def info(self):
+        return {'kind': self.kind, 'file': self.file, 'id': self.test_id, 'running': self.rc is None,
+                'rc': self.rc, 'output': '\n'.join(self.lines), 'reports': self.reports, 'editions': self.editions,
+                'progress': self.progress, 'started': self.started, 'now': time.time()}
+
+
+class Handler(BaseHTTPRequestHandler):
+    directory = None
+    out_dir = None
+    apps = {}       # edition -> path of the binary
+    src = None
+    job = None
+    lock = threading.Lock()
+
+    def log_message(self, fmt, *args):
+        pass
+
+    def reply(self, code, data, ctype='application/json'):
+        if ctype == 'application/json':
+            data = json.dumps(data, ensure_ascii=False)
+        if isinstance(data, str):
+            data = data.encode()
+        self.send_response(code)
+        self.send_header('Content-Type', ctype + ('; charset=utf-8' if ctype.startswith(('text/', 'application/json')) else ''))
+        self.send_header('Content-Length', str(len(data)))
+        self.send_header('Cache-Control', 'no-store')
+        self.end_headers()
+        self.wfile.write(data)
+
+    def allowed(self):
+        # only localhost names as Host (DNS rebinding) and JSON for writes (cross-site forms)
+        host = self.headers.get('Host', '').rsplit(':', 1)[0]
+        if host not in ('127.0.0.1', 'localhost'):
+            self.reply(403, {'error': 'bad host'})
+            return False
+        if self.command in ('PUT', 'POST') and self.headers.get('Content-Type', '').split(';')[0] != 'application/json':
+            self.reply(415, {'error': 'application/json required'})
+            return False
+        return True
+
+    def path_of(self, query):
+        name = parse_qs(query).get('name', [''])[0]
+        if not NAME_RE.match(name):
+            self.reply(400, {'error': 'bad file name (letters, digits, _ - . and .feature)'})
+            return None
+        return os.path.join(self.directory, name)
+
+    def project_path(self, query):
+        name = parse_qs(query).get('name', [''])[0]
+        if not testfile.PROJECT_RE.match(name):
+            self.reply(400, {'error': 'bad project name (letters, digits, _ and -)'})
+            return None
+        return os.path.join(self.directory, testfile.PROJECTS, name)
+
+    def used_by(self, project):
+        used = []
+        for f in sorted(os.listdir(self.directory)):
+            if NAME_RE.match(f):
+                try:
+                    tests = testfile.load(os.path.join(self.directory, f)).get('tests', [])
+                except (ValueError, OSError):
+                    continue
+                used += ['%s: %s' % (f, t.get('name')) for t in tests if project in t.get('projects', [])]
+        return used
+
+    def reports(self):
+        """The earlier runs in the out directory, newest first."""
+        found = []
+        for d in os.listdir(self.out_dir) if os.path.isdir(self.out_dir) else []:
+            if not os.path.isfile(os.path.join(self.out_dir, d, 'report.html')):
+                continue
+            try:
+                with open(os.path.join(self.out_dir, d, 'results.json'), encoding='utf-8') as f:
+                    run = json.load(f)
+                counts = {}
+                for r in run.get('results', []):
+                    counts[r['status']] = counts.get(r['status'], 0) + 1
+            except (ValueError, OSError, KeyError, TypeError):
+                run, counts = {}, {}
+            found.append({'id': d, 'url': '/results/%s/report.html' % quote(d), 'started': run.get('started', ''),
+                          'edition': run.get('edition'), 'branch': run.get('branch'), 'sha': (run.get('sha') or '')[:8],
+                          'dirty': run.get('dirty'), 'aborted': run.get('aborted'), 'counts': counts,
+                          'files': [f.get('title') or f.get('file') for f in run.get('files', [])]})
+        return sorted(found, key=lambda r: r['id'], reverse=True)
+
+    def annotate(self, doc):
+        """Add _stale (the script is outdated) and _errors (what is wrong with the test or its script)
+        to every test, for the web page. Not saved, see stamp_scripts."""
+        tests = doc.get('tests') if isinstance(doc, dict) else None
+        background = doc.get('background') if isinstance(doc, dict) and isinstance(doc.get('background'), list) else []
+        for t in tests if isinstance(tests, list) else []:
+            if not isinstance(t, dict):
+                continue
+            t['_stale'] = testfile.is_stale(t, self.directory, background)
+            t['_errors'] = testfile.validate({'tests': [t]}, self.directory)
+
+    def file_status(self):
+        """{file: {invalid: n, stale: n}}: tests with errors and tests whose script must be generated again.
+        invalid is 1 for a file that is not valid Gherkin."""
+        out = {}
+        for name in os.listdir(self.directory):
+            if not NAME_RE.match(name):
+                continue
+            try:
+                doc = testfile.ensure_ids(testfile.load(os.path.join(self.directory, name)))
+                self.annotate(doc)
+                tests = [t for t in doc['tests'] if isinstance(t, dict)]
+                bad = sum(1 for t in tests if t['_errors']) + (len(tests) != len(doc['tests'])) + bool(
+                    testfile.validate(dict(doc, tests=[]), self.directory))
+                out[name] = {'invalid': bad, 'stale': sum(1 for t in tests if t['_stale'])}
+            except (ValueError, OSError, KeyError, TypeError, AttributeError):
+                out[name] = {'invalid': 1, 'stale': 0}
+        return out
+
+    def body(self):
+        return json.loads(self.rfile.read(int(self.headers.get('Content-Length', 0))) or b'null')
+
+    def do_GET(self):
+        if not self.allowed():
+            return
+        u = urlparse(self.path)
+        if u.path == '/':
+            with open(os.path.join(HERE, 'web', 'index.html'), 'rb') as f:
+                self.reply(200, f.read(), 'text/html')
+        elif u.path == '/api/files':
+            self.reply(200, sorted(f for f in os.listdir(self.directory) if NAME_RE.match(f)))
+        elif u.path == '/api/file-status':
+            self.reply(200, self.file_status())
+        elif u.path == '/api/script-doc':
+            self.reply(200, testfile.SCRIPT_DOC, 'text/plain')
+        elif u.path == '/api/config':
+            self.reply(200, {'apps': self.apps, 'editions': list(testfile.EDITIONS), 'can_run': bool(self.apps)})
+        elif u.path == '/api/job':
+            self.reply(200, self.job.info() if self.job else None)
+        elif u.path == '/api/projects':
+            base = os.path.join(self.directory, testfile.PROJECTS)
+            names = sorted(n for n in os.listdir(base) if os.path.isdir(os.path.join(base, n))) if os.path.isdir(base) else []
+            self.reply(200, [{'name': n, 'used_by': self.used_by(n)} for n in names])
+        elif u.path == '/api/project':
+            path = self.project_path(u.query)
+            if path:
+                if not os.path.isdir(path):
+                    return self.reply(404, {'error': 'no such project'})
+                files, binary = {}, []
+                for rel, data in sorted(testfile.project_files(self.directory, os.path.basename(path)).items()):
+                    try:
+                        files[rel] = data.decode('utf-8')
+                    except UnicodeDecodeError:
+                        binary.append(rel)
+                self.reply(200, {'files': files, 'binary': binary, 'used_by': self.used_by(os.path.basename(path))})
+        elif u.path == '/api/reports':
+            self.reply(200, self.reports())
+        elif u.path.startswith('/results/'):
+            self.static_file(self.out_dir, unquote(u.path[len('/results/'):]))
+        elif u.path.startswith('/docs/'):
+            self.static_file(os.path.join(HERE, 'docs'), unquote(u.path[len('/docs/'):]))
+        elif u.path == '/api/file':
+            path = self.path_of(u.query)
+            if path:
+                try:
+                    doc = testfile.ensure_ids(testfile.load(path))
+                except FileNotFoundError:
+                    return self.reply(404, {'error': 'no such file'})
+                except ValueError as e:
+                    return self.reply(400, {'error': '%s is not valid Gherkin (fix it in a text editor): %s' % (
+                        os.path.basename(path), e)})
+                self.annotate(doc)
+                self.reply(200, doc)
+        else:
+            self.reply(404, {'error': 'not found'})
+
+    def static_file(self, base, rel):
+        """A file below BASE: the results of the runs or the handbook."""
+        base = os.path.realpath(base)
+        path = os.path.realpath(os.path.join(base, rel))
+        if not path.startswith(base + os.sep) or not os.path.isfile(path):
+            return self.reply(404, {'error': 'not found'})
+        ctype = 'text/plain' if path.endswith('.log') else mimetypes.guess_type(path)[0] or 'text/plain'
+        with open(path, 'rb') as f:
+            self.reply(200, f.read(), ctype)
+
+    def do_PUT(self):
+        if not self.allowed():
+            return
+        u = urlparse(self.path)
+        if u.path == '/api/project':
+            return self.put_project(u.query)
+        path = self.path_of(u.query) if u.path == '/api/file' else None
+        if not path:
+            return
+        try:
+            doc = self.body()
+        except ValueError:
+            return self.reply(400, {'errors': ['not valid JSON']})
+        errors = testfile.validate(doc, self.directory)
+        if errors:
+            return self.reply(400, {'errors': errors})
+        try:
+            old = testfile.load(path)
+        except (FileNotFoundError, ValueError):
+            old = None
+        testfile.save(path, testfile.stamp_scripts(doc, old, self.directory))
+        self.reply(200, {'saved': os.path.basename(path)})
+
+    def put_project(self, query):
+        path = self.project_path(query)
+        if not path:
+            return
+        try:
+            files = self.body()['files']
+            assert isinstance(files, dict) and all(isinstance(v, str) for v in files.values())
+        except (ValueError, KeyError, TypeError, AssertionError):
+            return self.reply(400, {'errors': ['expected {"files": {"path": "content"}}']})
+        clean = {}
+        for rel, content in files.items():
+            norm = os.path.normpath(rel)
+            if (not rel or os.path.isabs(norm) or norm.startswith('..') or '\0' in rel or norm == '.'
+                    or norm.split(os.sep)[0] == '..'):
+                return self.reply(400, {'errors': ['bad file path: %r (relative, inside the project)' % rel]})
+            clean[norm] = content
+        if sum(len(c) for c in clean.values()) > 4_000_000:
+            return self.reply(400, {'errors': ['the project is too big for this editor']})
+        os.makedirs(path, exist_ok=True)
+        # text files that are not in the request were removed in the editor, binary files stay
+        for rel, data in testfile.project_files(self.directory, os.path.basename(path)).items():
+            if rel not in clean:
+                try:
+                    data.decode('utf-8')
+                except UnicodeDecodeError:
+                    continue
+                os.remove(os.path.join(path, rel))
+        for rel, content in clean.items():
+            target = os.path.join(path, rel)
+            os.makedirs(os.path.dirname(target), exist_ok=True)
+            with open(target + '.tmp', 'w', encoding='utf-8', newline='') as f:
+                f.write(content)
+            os.replace(target + '.tmp', target)
+        for dirpath, dirs, fs in os.walk(path, topdown=False):      # directories that became empty
+            if dirpath != path and not os.listdir(dirpath):
+                os.rmdir(dirpath)
+        self.reply(200, {'saved': os.path.basename(path), 'files': len(clean)})
+
+    def do_POST(self):
+        if not self.allowed():
+            return
+        route = urlparse(self.path).path
+        try:
+            data = self.body()
+            if route == '/api/job':
+                self.start_job(data)
+            elif route == '/api/job/stop':
+                if self.job and self.job.rc is None:
+                    self.job.stop()
+                self.reply(200, {'stopping': True})
+            else:
+                self.reply(404, {'error': 'not found'})
+        except (ValueError, KeyError, TypeError):
+            self.reply(400, {'errors': ['bad request']})
+
+    def start_job(self, data):
+        action, name, test_id, edition = data['action'], data['file'], data.get('id'), data.get('edition')
+        if not self.apps:
+            return self.reply(400, {'errors': ['web.py was started without --opensource or --premium']})
+        everything = action == 'run' and name == '*'     # every test file in the directory
+        if action not in ('generate', 'run') or not (everything or NAME_RE.match(name)) or (
+                test_id and not ID_RE.match(test_id)):
+            return self.reply(400, {'errors': ['bad request']})
+        if action == 'generate' and not test_id:
+            return self.reply(400, {'errors': ['generate needs a test id']})
+        if everything:
+            paths = sorted(os.path.join(self.directory, n) for n in os.listdir(self.directory) if NAME_RE.match(n))
+            if not paths or test_id:
+                return self.reply(404, {'errors': ['no test files']})
+        else:
+            paths = [os.path.join(self.directory, name)]
+            if not os.path.isfile(paths[0]):
+                return self.reply(404, {'errors': ['no such file']})
+        path = paths[0]
+        # the editions of the job: the chosen ones that web.py has a binary for and, for one test, that it is for
+        editions = [e for e in testfile.EDITIONS if e in self.apps and edition in (e, 'both')]
+        if test_id:
+            test = next((t for t in testfile.ensure_ids(testfile.load(path)).get('tests', []) if t['id'] == test_id), None)
+            if not test:
+                return self.reply(404, {'errors': ['no such test']})
+            allowed = [e for e in testfile.editions(test) if e in self.apps]
+            if action == 'generate' and not set(editions) & set(allowed):
+                editions = allowed      # the script is the same for all editions, make it with one that we have
+            editions = [e for e in editions if e in allowed]
+        if not editions:
+            return self.reply(400, {'errors': ['the test is not for the edition %s, or web.py has no application for it' % (edition or '')]})
+        if action == 'generate':
+            editions = editions[:1]
+        cmds = []
+        for e in editions:
+            app = self.apps[e]
+            if action == 'generate':
+                cmd = [sys.executable, 'gen.py', app, path, '--force', '--id', test_id, '--edition', e]
+            else:
+                cmd = [sys.executable, 'run.py', app, *paths, '--out', self.out_dir, '--events', '--edition', e]
+                cmd += ['--src', self.src] if self.src else []
+                cmd += ['--id', test_id] if test_id else []
+            cmds.append((e, cmd))
+        with self.lock:
+            if self.job and self.job.rc is None:
+                return self.reply(409, {'errors': ['a job is already running']})
+            Handler.job = Job(action, name, test_id, cmds, self.out_dir)
+        self.reply(200, self.job.info())
+
+    def do_DELETE(self):
+        if not self.allowed():
+            return
+        u = urlparse(self.path)
+        if u.path == '/api/project':
+            path = self.project_path(u.query)
+            if path:
+                used = self.used_by(os.path.basename(path))
+                if used:
+                    return self.reply(409, {'errors': ['the project is used by: ' + '; '.join(used)]})
+                if not os.path.isdir(path):
+                    return self.reply(404, {'error': 'no such project'})
+                shutil.rmtree(path)
+                self.reply(200, {'deleted': os.path.basename(path)})
+            return
+        path = self.path_of(u.query) if u.path == '/api/file' else None
+        if path:
+            try:
+                os.remove(path)
+                if os.path.exists(testfile.scripts_path(path)):
+                    os.remove(testfile.scripts_path(path))
+                self.reply(200, {'deleted': os.path.basename(path)})
+            except FileNotFoundError:
+                self.reply(404, {'error': 'no such file'})
+
+
+def main():
+    ap = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
+    for e in testfile.EDITIONS:
+        ap.add_argument('--' + e, *(['--app'] if e == 'opensource' else []), metavar='APP',
+                        help='the %s edition of the application to test' % e)
+    ap.add_argument('--src', help='git checkout of the application, the same for all editions (default: the directory of APP)')
+    ap.add_argument('--dir', default=os.path.join(HERE, 'tests'))
+    ap.add_argument('--out', default=os.path.join(HERE, 'results'))
+    ap.add_argument('--port', type=int, default=8080)
+    args = ap.parse_args()
+    for e in testfile.EDITIONS:
+        app = getattr(args, e)
+        if app:
+            if not os.access(app, os.X_OK):
+                sys.exit('error: not executable: ' + app)
+            Handler.apps[e] = os.path.abspath(app)
+    Handler.src = os.path.abspath(args.src) if args.src else None
+    Handler.directory = os.path.abspath(args.dir)
+    Handler.out_dir = os.path.realpath(args.out)
+    os.makedirs(Handler.directory, exist_ok=True)
+    os.makedirs(Handler.out_dir, exist_ok=True)
+    Handler.out_dir = os.path.realpath(Handler.out_dir)
+    server = ThreadingHTTPServer(('127.0.0.1', args.port), Handler)
+    print('http://127.0.0.1:%d/  (%s)' % (args.port, Handler.directory), flush=True)
+    try:
+        server.serve_forever()
+    except KeyboardInterrupt:
+        pass
+
+
+if __name__ == '__main__':
+    main()
diff --git a/gui/manualtest/web/index.html b/gui/manualtest/web/index.html
new file mode 100644
index 00000000000..7cccc8e9b23
--- /dev/null
+++ b/gui/manualtest/web/index.html
@@ -0,0 +1,677 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>GUI tester</title>
+<style>
+:root {
+  --bg: #f6f7f9; --panel: #fff; --text: #1d2330; --muted: #667085; --line: #d5d9e0;
+  --accent: #2859c5; --accent-text: #fff; --bad: #b42318; --ok: #1a7f37; --chip: #e8edf8;
+}
+@media (prefers-color-scheme: dark) {
+  :root {
+    --bg: #14171d; --panel: #1d2129; --text: #e6e9ef; --muted: #98a2b3; --line: #343a46;
+    --accent: #6c93f0; --accent-text: #0d1117; --bad: #ff8a80; --ok: #56d364; --chip: #2a3550;
+  }
+}
+* { box-sizing: border-box; }
+body { margin: 0; font: 15px/1.45 system-ui, sans-serif; background: var(--bg); color: var(--text); }
+header { display: flex; gap: .75rem; align-items: center; padding: .6rem 1rem; background: var(--panel);
+         border-bottom: 1px solid var(--line); position: sticky; top: 0; z-index: 2; flex-wrap: wrap; }
+header h1 { font-size: 1.05rem; margin: 0 .5rem 0 0; }
+main { display: grid; grid-template-columns: 14rem 1fr; gap: 1rem; padding: 1rem; max-width: 80rem; margin: 0 auto; }
+@media (max-width: 700px) { main { grid-template-columns: 1fr; } }
+button, select, input, textarea { font: inherit; color: inherit; }
+button { background: var(--panel); border: 1px solid var(--line); border-radius: 6px; padding: .3rem .7rem; cursor: pointer; }
+button.primary { background: var(--accent); color: var(--accent-text); border-color: var(--accent); }
+button:disabled { opacity: .5; cursor: default; }
+button.link { border: 0; background: none; color: var(--accent); padding: .1rem .3rem; }
+input[type=text], textarea { width: 100%; background: var(--bg); border: 1px solid var(--line); border-radius: 6px; padding: .35rem .5rem; }
+textarea { resize: vertical; min-height: 4.5rem; font-family: ui-monospace, monospace; font-size: .9rem; }
+label { display: block; font-size: .8rem; color: var(--muted); margin: .6rem 0 .15rem; }
+ul.files { list-style: none; margin: 0; padding: 0; }
+fieldset.group { background: var(--panel); border: 1px solid var(--line); border-radius: 8px; margin: 0 0 .9rem; padding: .3rem .4rem .5rem; min-width: 0; }
+fieldset.group legend { padding: 0 .35rem; font-size: .8rem; font-weight: 600; color: var(--muted); text-transform: uppercase; letter-spacing: .04em; }
+fieldset.group p { margin: .4rem .2rem 0; }
+ul.files li { padding: .35rem .6rem; border-radius: 6px; cursor: pointer; overflow-wrap: anywhere; }
+ul.files li.sel { background: var(--chip); font-weight: 600; }
+.card { background: var(--panel); border: 1px solid var(--line); border-radius: 8px; padding: .75rem 1rem; margin-bottom: .9rem; }
+.card.off { opacity: .6; }
+ul.tlist { list-style: none; margin: .4rem 0; padding: 0; max-height: 14rem; overflow-y: auto; border: 1px solid var(--line);
+           border-radius: 6px; background: var(--bg); }
+ul.tlist li { padding: .3rem .6rem; cursor: pointer; border-bottom: 1px solid var(--line); overflow-wrap: anywhere; }
+ul.tlist li:last-child { border-bottom: 0; }
+ul.tlist li:hover { background: var(--chip); }
+ul.tlist li.sel { background: var(--accent); color: var(--accent-text); }
+ul.tlist li.off { opacity: .55; font-style: italic; }
+.row { display: flex; gap: .6rem; align-items: end; flex-wrap: wrap; }
+.row > .grow { flex: 1 1 14rem; }
+.chips { display: flex; flex-wrap: wrap; gap: .3rem; margin-top: .4rem; }
+.flag { font-size: .75rem; border-radius: 999px; padding: 0 .45rem; margin-left: .3rem; white-space: nowrap; }
+.flag.invalid { background: var(--bad); color: #fff; }
+.flag.stale { background: #f5eab0; color: #5c4a00; }
+.chip { background: var(--chip); border-radius: 999px; padding: .05rem .6rem; font-size: .8rem; }
+.muted { color: var(--muted); font-size: .85rem; }
+.err { color: var(--bad); font-size: .85rem; }
+#status { font-size: .85rem; }
+#status.ok { color: var(--ok); } #status.bad { color: var(--bad); }
+body.busy #editor, body.busy aside, body.busy #save, body.busy #runall { pointer-events: none; opacity: .55; }
+#jobbox pre { max-height: 18rem; overflow: auto; background: var(--bg); border: 1px solid var(--line); border-radius: 6px;
+              padding: .5rem; margin: .5rem 0 0; font-size: .82rem; white-space: pre-wrap; }
+.st { display: inline-block; min-width: 3.2rem; text-align: center; border-radius: 4px; padding: 0 .4rem; font-weight: 600; font-size: .8rem; }
+.st-PASS { background: #c8f0c8; color: #14532d; } .st-FAIL { background: #f5b5b5; color: #7a1010; } .st-SKIP { background: #f5eab0; color: #5c4a00; }
+.st-CRASH { background: #c00; color: #fff; }
+#reportlist td { border-top: 1px solid var(--line); padding: .3rem .5rem; vertical-align: top; }
+#jobresults table { border-collapse: collapse; width: 100%; margin-top: .4rem; }
+#jobresults td { border-top: 1px solid var(--line); padding: .3rem .5rem; vertical-align: top; }
+#jobresults .shots { display: flex; flex-wrap: wrap; gap: .4rem; margin-top: .3rem; }
+#jobresults .shots a { font-size: .75rem; text-align: center; color: inherit; text-decoration: none; }
+#jobresults .shots img { display: block; width: 7.5rem; border: 1px solid var(--line); border-radius: 3px; }
+#jobresults td.reason { white-space: pre-wrap; font-size: .85rem; overflow-wrap: anywhere; }
+.card.closable { position: relative; padding-right: 2.6rem; }
+button.close { position: absolute; top: .4rem; right: .4rem; border: 0; background: none; color: var(--muted);
+               font-size: 1.2rem; line-height: 1; padding: .2rem .45rem; }
+button.close:hover { color: var(--text); background: var(--chip); }
+.dirty::after { content: " \25CF"; color: var(--accent); }
+</style>
+</head>
+<body>
+<header>
+  <h1>GUI tester</h1>
+  <span id="fname" class="muted">no file selected</span>
+  <button id="save" class="primary" disabled>Save</button>
+  <button id="runall" disabled title="Run all tests in all files">Run all</button>
+  <label id="edbox" style="margin:0 0 0 auto;font-size:.9rem;color:inherit" hidden>Edition
+    <select id="edition"></select></label>
+  <span id="appinfo" class="muted"></span>
+  <span id="status"></span>
+  <a href="/docs/handbook.html" target="_blank" title="How to write, generate and run the tests">Handbook</a>
+</header>
+<main>
+  <aside>
+    <fieldset class="group"><legend>Test files</legend>
+      <ul class="files" id="files"></ul>
+      <p><button id="newfile">New file</button></p>
+    </fieldset>
+    <fieldset class="group"><legend>Test projects</legend>
+      <ul class="files" id="projects"></ul>
+      <p><button id="newproject">New test project</button></p>
+    </fieldset>
+    <fieldset class="group"><legend>Results</legend>
+      <ul class="files"><li id="reportsbtn">Reports</li></ul>
+    </fieldset>
+  </aside>
+  <section><div id="editor"><p class="muted">Select a file on the left or create a new one.</p></div>
+    <div id="jobbox" class="card closable" hidden>
+      <button id="jobclose" class="close" title="Close">&#10005;</button>
+      <div class="row"><strong id="jobtitle"></strong><span id="jobstate" class="muted"></span>
+        <button id="jobstop" hidden>Stop</button> <span id="jobreports"></span></div>
+      <div id="jobprogress" hidden>
+        <progress id="jobbar" max="100" style="width:100%"></progress>
+        <div id="jobtext" class="muted"></div>
+        <div id="jobstep" class="muted"></div>
+      </div>
+      <div id="jobsummary" style="margin-top:.5rem"></div>
+      <div id="jobresults"></div>
+      <details style="margin-top:.5rem"><summary class="muted">Output</summary><pre id="joboutput"></pre></details></div></section>
+</main>
+<script>
+const $ = s => document.querySelector(s);
+const esc = s => String(s).replace(/[&<>"]/g, c => ({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;'}[c]));
+let doc = null, current = null, dirty = false, sel = -1;
+let config = {can_run: false, apps: {}, editions: ['opensource', 'premium']}, timer = null, wasRunning = false;
+let view = 'file', projects = [], proj = null, pdirty = false;
+
+function setStatus(text, cls) { const s = $('#status'); s.textContent = text; s.className = cls || ''; }
+function setDirty(d) {
+  dirty = d;
+  $('#fname').className = d ? 'dirty' : 'muted';
+  $('#save').disabled = !d || !current;
+  updateRunAll();
+}
+async function api(path, opts) {
+  const r = await fetch(path, opts && opts.body ? {...opts, headers: {'Content-Type': 'application/json'}} : opts);
+  const data = await r.json();
+  if (!r.ok) throw new Error((data.errors || [data.error]).join('; '));
+  return data;
+}
+function confirmDiscard() { return !(dirty || pdirty) || confirm('Unsaved changes will be lost. Continue?'); }
+
+// ---- files
+async function listFiles() {
+  const names = await api('/api/files');
+  let status = {};
+  try { status = await api('/api/file-status'); } catch (err) { /* the list works without the flags */ }
+  const flags = n => {
+    const f = status[n] || {};
+    return (f.invalid ? ` <span class="flag invalid" title="${f.invalid} test(s) with errors, or the file is not valid">invalid${f.invalid > 1 ? ' ' + f.invalid : ''}</span>` : '') +
+      (f.stale ? ` <span class="flag stale" title="${f.stale} test(s) with an outdated script, generate again">regenerate ${f.stale}</span>` : '');
+  };
+  $('#files').innerHTML = names.map(n =>
+    `<li data-n="${esc(n)}" class="${n === current ? 'sel' : ''}">${esc(n)}${flags(n)}</li>`).join('') ||
+    '<li class="muted">no files</li>';
+}
+$('#files').onclick = async e => {
+  const li = e.target.closest('li[data-n]');
+  if (!li || !confirmDiscard()) return;
+  try { open(li.dataset.n, await api('/api/file?name=' + encodeURIComponent(li.dataset.n))); }
+  catch (err) { setStatus(err.message, 'bad'); }
+};
+function open(name, d) {
+  current = name; doc = d; sel = -1; view = 'file'; proj = null; pdirty = false; if (!doc.tests) doc.tests = [];
+  $('#fname').textContent = name; setDirty(false); setStatus('');
+  listFiles(); listProjects(); render();
+}
+$('#newfile').onclick = () => {
+  if (!confirmDiscard()) return;
+  let n = prompt('File name (e.g. projects.feature):', 'new.feature');
+  if (!n) return;
+  if (!n.endsWith('.feature')) n += '.feature';
+  open(n, {title: '', background: ['Given the application is started with no project loaded'], tests: []}); setDirty(true);
+};
+async function save() {
+  const errs = problems();
+  if (errs.length) { setStatus(errs[0], 'bad'); return false; }
+  try {
+    await api('/api/file?name=' + encodeURIComponent(current), {method: 'PUT', body: JSON.stringify(clean())});
+    setDirty(false); setStatus('Saved', 'ok'); listFiles();
+    await reloadCurrent();    // the server decides which scripts are outdated
+    return true;
+  } catch (err) { setStatus(err.message, 'bad'); return false; }
+}
+async function reloadCurrent() {
+  doc = await api('/api/file?name=' + encodeURIComponent(current));
+  setDirty(false); if (view === 'file') render();
+}
+$('#save').onclick = save;
+$('#runall').onclick = () => startJob('run', undefined, 'all tests in all files', '*');
+function updateRunAll() {
+  $('#runall').disabled = !config.can_run; listFiles();
+  const rf = $('#runfile'); if (rf) rf.disabled = !config.can_run;
+}
+
+// ---- reports: the earlier runs
+$('#reportsbtn').onclick = async () => {
+  if (!confirmDiscard()) return;
+  try { openReports(await api('/api/reports')); } catch (err) { setStatus(err.message, 'bad'); }
+};
+function openReports(list) {
+  view = 'reports'; current = null; doc = null; proj = null; pdirty = false; setDirty(false);
+  $('#fname').textContent = 'reports'; $('#fname').className = 'muted'; setStatus('');
+  listFiles(); listProjects();
+  const n = (r, k) => r.counts[k] ? `<span class="st st-${k}">${r.counts[k]} ${k}</span> ` : '';
+  $('#editor').innerHTML = `<div class="card"><table id="reportlist" style="border-collapse:collapse;width:100%">
+    <tr class="muted"><td>Started</td><td>Edition</td><td>Version</td><td>Tests</td><td>Result</td></tr>` +
+    (list.map(r => `<tr><td><a href="${esc(r.url)}" target="_blank">${esc(r.started.replace('T', ' ') || r.id)}</a></td>
+      <td>${esc(r.edition || '')}</td>
+      <td>${esc(r.branch || '')} ${esc(r.sha)}${r.dirty ? ' (modified)' : ''}</td>
+      <td class="muted">${esc(r.files.join(', '))}</td>
+      <td>${['PASS', 'FAIL', 'CRASH', 'SKIP'].map(k => n(r, k)).join('')}${r.aborted ? '<span class="muted">aborted</span>' : ''}</td></tr>`).join('')
+      || '<tr><td colspan="5" class="muted">No reports yet.</td></tr>') + '</table></div>';
+}
+
+// ---- test projects: directories of files that tests use
+async function listProjects() {
+  projects = await api('/api/projects');
+  $('#projects').innerHTML = projects.map(p =>
+    `<li data-n="${esc(p.name)}" class="${proj && proj.name === p.name ? 'sel' : ''}">${esc(p.name)}</li>`).join('') ||
+    '<li class="muted">no projects</li>';
+}
+$('#projects').onclick = async e => {
+  const li = e.target.closest('li[data-n]');
+  if (!li || !confirmDiscard()) return;
+  try {
+    const p = await api('/api/project?name=' + encodeURIComponent(li.dataset.n));
+    openProject(li.dataset.n, p);
+  } catch (err) { setStatus(err.message, 'bad'); }
+};
+$('#newproject').onclick = () => {
+  if (!confirmDiscard()) return;
+  const n = prompt('Name of the test project (letters, digits, _ and -):', 'my-project');
+  if (!n) return;
+  if (!/^[\w-]+$/.test(n)) { setStatus('Invalid project name', 'bad'); return; }
+  openProject(n, {files: {}, binary: [], used_by: []}); setPDirty(true);
+};
+function setPDirty(d) { pdirty = d; const b = $('#psave'); if (b) b.disabled = !d; }
+function openProject(name, p) {
+  proj = {name, files: p.files, binary: p.binary || [], used_by: p.used_by || [], sel: Object.keys(p.files)[0] || null};
+  view = 'project'; current = null; doc = null; setDirty(false); pdirty = false;
+  $('#fname').textContent = 'test project ' + name; $('#fname').className = 'muted';
+  setStatus(''); listFiles(); listProjects(); renderProject();
+}
+function renderProject() {
+  const paths = Object.keys(proj.files).sort();
+  $('#editor').innerHTML = `
+    <div class="card closable"><button class="close" id="pclose" title="Close the project">&#10005;</button>
+      <div class="row"><strong>Test project: ${esc(proj.name)}</strong>
+        <span class="muted grow">${proj.used_by.length ? 'Used by: ' + esc(proj.used_by.join('; ')) : 'Not used by any test'}</span>
+        <button id="psave" class="primary" ${pdirty ? '' : 'disabled'}>Save project</button>
+        <button id="pdel">Delete project</button></div>
+      <p class="muted">The files are copied to an empty directory before every run, so the test always starts with the same files.
+        When a file is changed, the scripts of the tests that use the project become outdated.</p>
+      <div class="row" style="align-items:stretch">
+        <div style="flex:0 0 15rem">
+          <ul class="tlist" id="pfiles" style="max-height:24rem">${paths.map(p =>
+            `<li data-p="${esc(p)}" class="${p === proj.sel ? 'sel' : ''}">${esc(p)}</li>`).join('') || '<li class="muted">no files</li>'}</ul>
+          <button id="padd">+ File</button> <button id="prm" ${proj.sel ? '' : 'disabled'}>Delete file</button>
+          ${proj.binary.length ? '<p class="muted">Binary files (not edited here): ' + esc(proj.binary.join(', ')) + '</p>' : ''}
+        </div>
+        <div class="grow" style="min-width:16rem">
+          <label style="margin-top:0">${proj.sel ? esc(proj.sel) : 'No file selected'}</label>
+          <textarea id="pedit" spellcheck="false" style="min-height:24rem" ${proj.sel ? '' : 'disabled'}></textarea>
+        </div>
+      </div>
+    </div>`;
+  const ed = $('#pedit');
+  ed.value = proj.sel ? proj.files[proj.sel] : '';
+  ed.oninput = () => { proj.files[proj.sel] = ed.value; setPDirty(true); };
+  $('#pfiles').onclick = e => {
+    const li = e.target.closest('li[data-p]');
+    if (li) { proj.sel = li.dataset.p; renderProject(); }
+  };
+  $('#padd').onclick = () => {
+    const p = prompt('Path of the file in the project (e.g. src/a.c):', 'src/a.c');
+    if (!p) return;
+    if (p in proj.files) { proj.sel = p; return renderProject(); }
+    proj.files[p] = ''; proj.sel = p; setPDirty(true); renderProject();
+  };
+  $('#prm').onclick = () => {
+    if (!proj.sel || !confirm('Delete ' + proj.sel + '?')) return;
+    delete proj.files[proj.sel]; proj.sel = Object.keys(proj.files).sort()[0] || null; setPDirty(true); renderProject();
+  };
+  $('#psave').onclick = saveProject;
+  $('#pclose').onclick = () => {
+    if (!confirmDiscard()) return;
+    proj = null; pdirty = false; view = 'file'; $('#fname').textContent = 'no file selected'; setStatus('');
+    $('#editor').innerHTML = '<p class="muted">Select a file on the left or create a new one.</p>'; listProjects();
+  };
+  $('#pdel').onclick = async () => {
+    if (!confirm('Delete the whole test project ' + proj.name + '?')) return;
+    try {
+      await api('/api/project?name=' + encodeURIComponent(proj.name), {method: 'DELETE'});
+      proj = null; pdirty = false; view = 'file'; $('#fname').textContent = 'no file selected';
+      $('#editor').innerHTML = '<p class="muted">The project is deleted.</p>'; listProjects();
+    } catch (err) { setStatus(err.message, 'bad'); }
+  };
+}
+async function saveProject() {
+  try {
+    await api('/api/project?name=' + encodeURIComponent(proj.name), {method: 'PUT', body: JSON.stringify({files: proj.files})});
+    setPDirty(false); setStatus('Project saved', 'ok'); await listProjects();
+    if (current && !dirty) await reloadCurrent();    // scripts that use the project may be outdated now
+  } catch (err) { setStatus(err.message, 'bad'); }
+}
+
+// ---- jobs (gen.py and run.py on the server)
+async function startJob(action, id, label, file = current) {
+  if (dirty && !(await save())) return;
+  try {
+    const j = await api('/api/job', {method: 'POST', body: JSON.stringify({action, file, id, edition: $('#edition').value})});
+    wasRunning = true; showJob(j, label); clearInterval(timer); timer = setInterval(tick, 1000);
+  } catch (e) { setStatus(e.message, 'bad'); }
+}
+let jobLabel = '', jobTable = '';
+let jobClosed = null;   // started time of the job whose report was closed
+try { jobClosed = +localStorage.getItem('jobClosed') || null; } catch (e) {}
+function showJob(j, label) {
+  if (label) jobLabel = label;
+  $('#jobbox').hidden = !j || j.started === jobClosed;
+  if (!j) return;
+  $('#jobclose').onclick = () => {
+    jobClosed = j.started; $('#jobbox').hidden = true;
+    try { localStorage.setItem('jobClosed', jobClosed); } catch (e) {}
+  };
+  const p = j.progress, run = j.kind === 'run', elapsed = Math.round((j.now - j.started));
+  const multi = j.editions.length > 1;
+  $('#jobtitle').textContent = (run ? 'Run: ' : 'Generating script: ') + (jobLabel || j.file) + ' (' + j.editions.join(' and ') + ')';
+  $('#jobstate').textContent = j.running ? 'running, ' + elapsed + ' s' : 'finished after ' + elapsed + ' s';
+  $('#jobstop').hidden = !j.running;
+  $('#jobreports').innerHTML = j.reports.map(r =>
+    `<a href="${esc(r.url)}" target="_blank">Open report${multi ? ' ' + esc(r.edition) : ''}</a>`).join(' · ');
+
+  // progress: which test and step for a run, a moving bar while Claude explores
+  $('#jobprogress').hidden = !j.running;
+  const bar = $('#jobbar');
+  if (run && p.total) {
+    bar.max = 100; bar.value = 100 * ((Math.max(p.index, 1) - 1 + (p.steps ? p.step / p.steps : 0)) / p.total);
+    $('#jobtext').textContent = (multi && p.edition ? p.edition + ': ' : '') +
+      (p.index ? 'Test ' + p.index + ' of ' + p.total + ': ' + p.test + (p.testfile ? ' (' + p.testfile + ')' : '') : 'Starting...');
+    $('#jobstep').textContent = p.steps ? 'Step ' + p.step + ' of ' + p.steps + (p.label ? ': ' + p.label : '') : '';
+  } else {
+    bar.removeAttribute('value');
+    const last = j.output.split('\n').filter(Boolean).pop() || '';
+    $('#jobtext').textContent = run ? 'Starting...' : 'Claude explores the GUI and then replays the script. ' + last;
+    $('#jobstep').textContent = '';
+  }
+
+  // results as they come
+  const rs = p.results || [], cnt = k => rs.filter(x => x.status === k).length;
+  $('#jobsummary').innerHTML = rs.length
+    ? `<span class="st st-PASS">${cnt('PASS')} PASS</span> <span class="st st-FAIL">${cnt('FAIL')} FAIL</span> <span class="st st-SKIP">${cnt('SKIP')} SKIP</span>` +
+      (j.running && p.total && !multi ? ` <span class="muted">${rs.length} of ${p.total} tests done</span>` : '')
+    : '';
+  const table = rs.length ? '<table>' + rs.map(x => {
+    const f = ext => x.base + '/' + encodeURIComponent(x.slug) + ext;
+    return `<tr><td><span class="st st-${x.status}">${x.status}</span>${x.crash ? ' <span class="st st-CRASH">CRASH</span>' : ''}</td>
+      <td><strong>${esc(x.name)}</strong>${x.file ? ` <span class="muted">${esc(x.file)}</span>` : ''}${multi ? ` <span class="chip">${esc(x.edition)}</span>` : ''}<div class="muted">${Math.round(x.seconds)} s ·
+        <a href="${f('.txt')}" target="_blank">steps</a> · <a href="${f('.png')}" target="_blank">screenshot</a> ·
+        <a href="${f('.app.log')}" target="_blank">app log</a></div>${(x.shots || []).length ? `
+        <details><summary class="muted">screenshots after the steps (${x.shots.length})</summary><div class="shots">${x.shots.map(s =>
+          `<a href="${x.base}/${encodeURIComponent(s.file)}" target="_blank" title="${esc('step ' + s.step + ': ' + s.label)}"><img src="${x.base}/${encodeURIComponent(s.file)}" alt="" loading="lazy">step ${s.step}</a>`).join('')}</div></details>` : ''}</td>
+      <td class="reason">${esc(x.reason)}</td></tr>`;
+  }).join('') + '</table>' : '';
+  if (table !== jobTable) $('#jobresults').innerHTML = jobTable = table;   // keeps opened screenshot lists open
+
+  const pre = $('#joboutput');
+  if (pre.textContent !== j.output) { pre.textContent = j.output; pre.scrollTop = pre.scrollHeight; }
+}
+async function tick() {
+  const j = await api('/api/job').catch(() => null);
+  showJob(j);
+  const running = !!j && j.running;
+  document.body.classList.toggle('busy', running && j.kind === 'generate');
+  if (!running) {
+    clearInterval(timer); timer = null;
+    if (wasRunning && j && j.kind === 'generate' && j.file === current) { await reloadCurrent(); setDirty(true); }
+  }
+  wasRunning = running;
+}
+$('#jobstop').onclick = () => api('/api/job/stop', {method: 'POST', body: '{}'}).catch(e => setStatus(e.message, 'bad'));
+window.onbeforeunload = e => { if (dirty || pdirty) e.preventDefault(); };
+
+// ---- model helpers. Steps are Gherkin lines, the Examples are edited as a Gherkin table
+const STEP_RE = /^(Given|When|Then|And|But|\*)\s+\S/;
+function toLines(text) {   // lines of the steps; blank lines are dropped, except in doc strings
+  const out = []; let fence = null, indent = 0;   // doc string lines lose the indentation of the opening """
+  for (const raw of text.split('\n')) {
+    const s = raw.trim();
+    if (fence) {
+      const lead = raw.length - raw.trimStart().length;
+      out.push(s === fence ? s : raw.trimEnd().slice(Math.min(lead, indent)));
+      if (s === fence) fence = null;
+      continue;
+    }
+    if (!s) continue;
+    out.push(s);
+    if (s.startsWith('"""') || s.startsWith('```')) { fence = s.slice(0, 3); indent = raw.length - raw.trimStart().length; }
+  }
+  return out;
+}
+function stepErrors(lines, need_then) {
+  const errs = []; let fence = null, first = true;
+  lines.forEach((l, k) => {
+    const s = l.trim();
+    if (fence) { if (s === fence) fence = null; return; }
+    if (s.startsWith('"""') || s.startsWith('```')) { fence = s.slice(0, 3); return; }
+    if (s.startsWith('|')) return;
+    const m = STEP_RE.exec(s);
+    if (!m) errs.push('line ' + (k + 1) + ' must start with Given, When, Then, And, But or *');
+    else if (first && (m[1] === 'And' || m[1] === 'But')) errs.push('the first step can not start with ' + m[1]);
+    first = false;
+  });
+  if (fence) errs.push('a doc string is not closed with ' + fence);
+  if (need_then && !lines.some(l => /^Then\s/.test(l.trim()))) errs.push('needs a Then step, the expected result');
+  return errs;
+}
+function fmtTable(rows) {
+  if (!rows || !rows.length) return '';
+  const cols = Object.keys(rows[0]), w = cols.map(c => Math.max(c.length, ...rows.map(r => (r[c] || '').length)));
+  const line = cells => '| ' + cells.map((v, k) => v.padEnd(w[k])).join(' | ') + ' |';
+  return [line(cols), ...rows.map(r => line(cols.map(c => r[c] || '')))].join('\n');
+}
+function parseTable(text) {   // {rows, err}
+  const lines = text.split('\n').map(s => s.trim()).filter(Boolean);
+  if (!lines.length) return {rows: []};
+  const cells = l => l.replace(/^\|/, '').replace(/\|$/, '').split('|').map(c => c.trim());
+  if (lines.some(l => !l.startsWith('|') || !l.endsWith('|') || l.length < 2)) return {rows: [], err: 'every line of the Examples must start and end with |'};
+  const head = cells(lines[0]);
+  if (lines.length < 2) return {rows: [], err: 'the Examples need a header line and at least one row'};
+  const rows = [];
+  for (const l of lines.slice(1)) {
+    const c = cells(l);
+    if (c.length !== head.length) return {rows: [], err: 'a row of the Examples has ' + c.length + ' cells, the header has ' + head.length};
+    rows.push(Object.fromEntries(head.map((h, k) => [h, c[k]])));
+  }
+  return {rows};
+}
+function examplesText(t) { return t._exText !== undefined ? t._exText : (t._exText = fmtTable(t.examples)); }
+function examplesOf(t) { return parseTable(examplesText(t)); }
+function fmtScript(script) {
+  return script && script.length ? '[\n' + script.map(x => '  ' + JSON.stringify(x)).join(',\n') + '\n]' : '';
+}
+let scriptDoc = '';
+function combos(t) { const r = examplesOf(t).rows; return r.length ? r : [{}]; }
+function editionsOf(t) { return t.editions || config.editions; }
+function canRun(t, generate) {   // a binary for an edition of the test; to run also the chosen edition
+  const ed = $('#edition').value;
+  return editionsOf(t).some(e => config.apps[e] && (generate || ed === 'both' || ed === e));
+}
+function problems() {
+  const errs = [], names = new Set();
+  doc.tests.forEach((t, i) => {
+    const w = 'Test ' + (i + 1) + ': ';
+    if (t.editions && !t.editions.length) errs.push(w + 'select at least one edition');
+    if (!t.name || !t.name.trim()) errs.push(w + 'name is missing');
+    else if (names.has(t.name)) errs.push(w + 'the name "' + t.name + '" is used twice');
+    names.add(t.name);
+    if (t._scriptErr) errs.push(w + 'the script is not valid JSON: ' + t._scriptErr);
+    for (const e of stepErrors(t.steps || [], true)) errs.push(w + 'steps: ' + e);
+    const ex = examplesOf(t);
+    if (ex.err) errs.push(w + ex.err);
+    const cols = ex.rows.length ? Object.keys(ex.rows[0]) : [];
+    for (const c of cols) if (!/^\w+$/.test(c)) errs.push(w + 'the Examples column "' + c + '" must be letters, digits and _');
+    if (new Set(cols).size !== cols.length) errs.push(w + 'an Examples column exists twice');
+    if (ex.rows.some(r => Object.values(r).some(v => !v))) errs.push(w + 'every cell of the Examples needs a value');
+    if (new Set(ex.rows.map(r => JSON.stringify(r))).size !== ex.rows.length) errs.push(w + 'a row of the Examples is there twice');
+  });
+  return errs;
+}
+function clean() {   // what is saved: no editor-only fields, no empty optional fields
+  const head = {title: doc.title || ''};
+  for (const k of ['background', 'description', 'tags']) if (doc[k] && doc[k].length) head[k] = doc[k];
+  return {...head, tests: doc.tests.map(t => {
+    const o = {id: t.id, name: t.name.trim()};
+    if (t.ticket) o.ticket = t.ticket;
+    if (t.enabled === false) o.enabled = false;
+    o.steps = t.steps || [];
+    for (const k of ['description', 'tags']) if (t[k] && t[k].length) o[k] = t[k];
+    if (t.todo) o.todo = t.todo;
+    if (t.script && t.script.length) o.script = t.script;
+    if (t._approve) o._approve = true;
+    if (t.projects && t.projects.length) o.projects = t.projects;
+    if (t.editions && t.editions.length < config.editions.length) o.editions = t.editions;   // default: all
+    const ex = examplesOf(t).rows;
+    if (ex.length) o.examples = ex;
+    return o;
+  })};
+}
+
+// ---- rendering
+function render() {
+  const ed = $('#editor');
+  ed.innerHTML = `
+    <div class="card closable"><button class="close" id="closefile" title="Close the file">&#10005;</button>
+      <label style="margin-top:0">Title</label>
+      <input type="text" id="title" value="${esc(doc.title || '')}">
+      <label>Background (Gherkin steps that are done before every scenario of the file)</label>
+      <textarea id="background" style="min-height:2.5rem" spellcheck="false">${esc((doc.background || []).join('\n'))}</textarea>
+      <div class="err" id="bgerr"></div>
+      <label>Tests</label>
+      <ul class="tlist" id="tlist"></ul>
+      <button id="addtest">+ New test</button>
+      <div style="margin-top:.6rem"><button id="runfile" title="Run all tests in ${esc(current)}"${config.can_run ? '' : ' disabled'}>Run tests</button></div></div>
+    <div id="detail"></div>`;
+  $('#closefile').onclick = () => {
+    if (!confirmDiscard()) return;
+    current = null; doc = null; sel = -1; $('#fname').textContent = 'no file selected'; setDirty(false); setStatus('');
+    $('#editor').innerHTML = '<p class="muted">Select a file on the left or create a new one.</p>';
+  };
+  $('#runfile').onclick = () => startJob('run', undefined, 'all tests in ' + current, current);
+  $('#title').oninput = e => { doc.title = e.target.value; setDirty(true); };
+  const bgerr = () => $('#bgerr').textContent = stepErrors(doc.background || [], false).join('; ');
+  $('#background').oninput = e => { doc.background = toLines(e.target.value); setDirty(true); bgerr(); };
+  bgerr();
+  $('#addtest').onclick = () => {
+    doc.tests.push({id: 'n' + Math.random().toString(36).slice(2, 10), name: 'New test', steps: []});
+    sel = doc.tests.length - 1; setDirty(true); render();
+    $('#detail .name').select();
+  };
+  $('#tlist').onclick = e => {
+    const li = e.target.closest('li[data-i]');
+    if (li) { sel = +li.dataset.i; render(); }
+  };
+  renderList();
+  const box = $('#detail');
+  if (sel >= 0 && sel < doc.tests.length) box.appendChild(card(doc.tests[sel], sel));
+  else box.innerHTML = '<p class="muted">' + (doc.tests.length ? 'Select a test in the list.' : 'The file has no tests yet.') + '</p>';
+}
+
+function renderList() {
+  $('#tlist').innerHTML = doc.tests.map((t, i) =>
+    `<li data-i="${i}" class="${i === sel ? 'sel' : ''}${t.enabled === false ? ' off' : ''}">${esc(t.name || '(unnamed)')}${
+      t.editions && t.editions.length < config.editions.length ? ` <span class="chip">${esc(t.editions.join(', ') || 'no edition')}</span>` : ''}${
+      t._errors && t._errors.length ? ` <span class="flag invalid" title="${esc(t._errors.join('\n'))}">invalid</span>` : ''}${
+      t._stale ? ' <span class="flag stale" title="The test was changed after the script was created. Generate the script again or approve it.">regenerate</span>' : ''}</li>`).join('') ||
+    '<li class="muted">no tests</li>';
+}
+
+function card(t, i) {
+  const d = document.createElement('div');
+  d.className = 'card closable' + (t.enabled === false ? ' off' : '');
+  d.innerHTML = `
+    <button class="close" title="Close the test">&#10005;</button>
+    <div class="row">
+      <div class="grow"><label style="margin-top:0">Name</label><input type="text" class="name" value="${esc(t.name)}"></div>
+      <div><label style="margin-top:0">Ticket</label><input type="text" class="ticket" value="${esc(t.ticket || '')}" size="10"></div>
+      <label style="margin:0 0 .35rem"><input type="checkbox" class="enabled" ${t.enabled === false ? '' : 'checked'}> enabled</label>
+      <span class="edpick" title="The editions the test runs in, the script is the same for all ({edition} is the name of the edition)">${
+        config.editions.map(e => `<label style="display:inline-block;margin:0 .6rem .35rem 0;color:inherit;font-size:.9rem">
+          <input type="checkbox" value="${esc(e)}" ${editionsOf(t).includes(e) ? 'checked' : ''}> ${esc(e)}</label>`).join('')}</span>
+      <div>
+        <button class="up" ${i == 0 ? 'disabled' : ''} title="Move up">↑</button>
+        <button class="down" ${i == doc.tests.length - 1 ? 'disabled' : ''} title="Move down">↓</button>
+        <button class="del" title="Delete the test">Delete</button>
+      </div>
+    </div>
+    <label>Scenario steps in Gherkin, one per line: Given (the starting point), When (what is done), Then (the expected result), And, But. Use &lt;column&gt; for the values of the Examples</label>
+    <textarea class="steps" spellcheck="false" style="min-height:9rem" placeholder="Given the project file {project:basic-project}/basic.cppcheck is opened&#10;When I click Clear results&#10;Then the result tree is empty">${esc((t.steps || []).join('\n'))}</textarea>
+    <div class="err steps-err"></div>
+    <label>TODO (e.g. "cannot be automated", leave empty otherwise)</label>
+    <input type="text" class="todo" value="${esc(t.todo || '')}">
+    <label>Test projects (copied to an empty directory before every run; in the script: {project:NAME})</label>
+    <div class="projpick"></div>
+    <div class="row scriptbar" style="margin-top:.8rem">
+      <span class="script-status grow"></span>
+      <button class="gen">Generate script</button>
+      <button class="runone">Run test</button>
+      <button class="approve">Approve the script</button>
+    </div>
+    <details class="scriptbox" ${(t.script || []).length ? 'open' : ''}>
+      <summary class="muted script-summary"></summary>
+      <textarea class="script" spellcheck="false" style="min-height:8rem" placeholder="No script. Create one with gen.py or write it here."></textarea>
+      <div class="err script-err"></div>
+      <details><summary class="muted">How to write a script</summary><pre class="muted" style="white-space:pre-wrap;font-size:.8rem">${esc(scriptDoc)}</pre></details>
+    </details>
+    <label>Examples (makes it a Scenario Outline: a Gherkin table, every row is a separate run)</label>
+    <textarea class="examples" spellcheck="false" style="min-height:3rem" placeholder="| platform |&#10;| native   |&#10;| unix32   |">${esc(examplesText(t))}</textarea>
+    <div class="preview"></div>`;
+  const on = (sel, ev, f) => d.querySelector(sel).addEventListener(ev, f);
+  const edit = (sel, f) => on(sel, 'input', e => { f(e.target); setDirty(true); preview(); });
+  edit('.name', el => { t.name = el.value; renderList(); });
+  edit('.ticket', el => t.ticket = el.value);
+  const serr = () => d.querySelector('.steps-err').textContent = stepErrors(t.steps || [], true).join('; ');
+  edit('.steps', el => { t.steps = toLines(el.value); serr(); });
+  edit('.examples', el => t._exText = el.value);
+  serr();
+  edit('.todo', el => t.todo = el.value);
+  const pick = d.querySelector('.projpick');
+  const names = [...new Set([...projects.map(p => p.name), ...(t.projects || [])])];
+  pick.innerHTML = names.map(n => `<label style="display:inline-block;margin:0 1rem .2rem 0;color:inherit;font-size:.9rem">
+      <input type="checkbox" value="${esc(n)}" ${(t.projects || []).includes(n) ? 'checked' : ''}> ${esc(n)}${projects.some(p => p.name === n) ? '' : ' (missing)'}</label>`).join('') ||
+    '<span class="muted">No test projects yet. Create one on the left.</span>';
+  pick.onchange = () => { t.projects = [...pick.querySelectorAll('input:checked')].map(i => i.value); setDirty(true); };
+  const edpick = d.querySelector('.edpick');
+  edpick.onchange = () => {
+    t.editions = [...edpick.querySelectorAll('input:checked')].map(i => i.value);
+    setDirty(true); renderList(); bar(); preview();
+  };
+  const ta = d.querySelector('.script');
+  ta.value = fmtScript(t.script);
+  const sum = () => {
+    d.querySelector('.script-summary').textContent =
+      'Script: ' + ((t.script || []).length ? t.script.length + ' steps' : 'none (the test is skipped when run)');
+    d.querySelector('.script-err').textContent = t._scriptErr ? 'Invalid JSON: ' + t._scriptErr : '';
+    bar();
+  };
+  const gen = d.querySelector('.gen'), run = d.querySelector('.runone'), approve = d.querySelector('.approve');
+  function bar() {
+    const n = (t.script || []).length, st = d.querySelector('.script-status'), stale = !!t._stale;
+    st.textContent = !n ? 'Script: none' : stale
+      ? 'Script: OUTDATED, the test was changed after the script was created. It is not run until it is generated again or approved.'
+      : 'Script: up to date, ' + n + ' steps';
+    st.className = 'script-status grow ' + (stale ? 'err' : 'muted');
+    if (t._errors && t._errors.length) st.textContent += ' Invalid: ' + t._errors.join('; ');
+    gen.disabled = !canRun(t, true);
+    run.disabled = !canRun(t) || !n || stale;
+    run.title = canRun(t) ? '' : 'The test does not run in the selected edition, or web.py has no app for it';
+    approve.hidden = !stale;
+  }
+  gen.onclick = () => {
+    if ((t.script || []).length && !confirm('The existing script will be replaced. Continue?')) return;
+    startJob('generate', t.id, t.name);
+  };
+  run.onclick = () => startJob('run', t.id, t.name);
+  approve.onclick = () => { t._approve = true; setDirty(true); save(); };
+  ta.addEventListener('input', () => {
+    try { t.script = ta.value.trim() ? JSON.parse(ta.value) : []; t._scriptErr = ''; }
+    catch (e) { t._scriptErr = e.message; }
+    setDirty(true); sum();
+  });
+  sum();
+  on('.enabled', 'change', e => { t.enabled = e.target.checked; d.classList.toggle('off', !t.enabled); renderList(); setDirty(true); });
+  on('.close', 'click', () => { sel = -1; render(); });
+  on('.up', 'click', () => move(i, -1));
+  on('.down', 'click', () => move(i, 1));
+  on('.del', 'click', () => {
+    if (!confirm('Delete "' + t.name + '"?')) return;
+    doc.tests.splice(i, 1); sel = Math.min(i, doc.tests.length - 1); setDirty(true); render();
+  });
+
+  function preview() {
+    const p = d.querySelector('.preview'), rows = examplesOf(t).rows, cs = combos(t);
+    const label = c => Object.entries(c).map(([k, v]) => k + '=' + v).join(', ');
+    p.innerHTML = !rows.length ? '' : `<div class="muted">${cs.length} run${cs.length == 1 ? '' : 's'}</div>` +
+      `<div class="chips">${cs.slice(0, 40).map(c => `<span class="chip">${esc(label(c))}</span>`).join('')}` +
+      (cs.length > 40 ? `<span class="muted">… +${cs.length - 40}</span>` : '') + '</div>';
+    const bad = problems().filter(e => e.startsWith('Test ' + (i + 1) + ':') && !e.includes(': steps: '));
+    if (bad.length) p.innerHTML += bad.map(e => `<div class="err">${esc(e)}</div>`).join('');
+  }
+  preview();
+  return d;
+}
+function move(i, dir) {
+  const j = i + dir;
+  [doc.tests[i], doc.tests[j]] = [doc.tests[j], doc.tests[i]];
+  sel = j; setDirty(true); render();
+}
+
+api('/api/config').then(c => {
+  config = c; updateRunAll();
+  const have = c.editions.filter(e => c.apps[e]), pick = $('#edition');
+  pick.innerHTML = have.map(e => `<option value="${esc(e)}">${esc(e)}</option>`).join('') +
+    (have.length > 1 ? '<option value="both">both</option>' : '');
+  try { const v = localStorage.getItem('edition'); if (v && [...pick.options].some(o => o.value === v)) pick.value = v; } catch (e) {}
+  pick.onchange = () => { try { localStorage.setItem('edition', pick.value); } catch (e) {} if (doc && view === 'file') render(); };
+  $('#edbox').hidden = !have.length;
+  $('#appinfo').textContent = have.length ? '' : 'No app: start web.py with --opensource and/or --premium to generate and run';
+  $('#edbox').title = have.map(e => e + ': ' + c.apps[e]).join('\n');
+  if (doc) render();
+}).catch(() => {});
+tick().then(() => { if (wasRunning) timer = setInterval(tick, 1000); });
+fetch('/api/script-doc').then(r => r.text()).then(t => scriptDoc = t).catch(() => {});
+listProjects().catch(() => {});
+listFiles().catch(e => setStatus(e.message, 'bad'));
+</script>
+</body>
+</html>
diff --git a/gui/platforms.cpp b/gui/platforms.cpp
index 77683a6ea09..a23b05b1ccd 100644
--- a/gui/platforms.cpp
+++ b/gui/platforms.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,11 +36,11 @@ void Platforms::add(const QString &title, Platform::Type platform)
 void Platforms::init()
 {
     add(tr("Native"), Platform::Type::Native);
-    add(tr("Unix 32-bit"), Platform::Type::Unix32);
-    add(tr("Unix 64-bit"), Platform::Type::Unix64);
-    add(tr("Windows 32-bit ANSI"), Platform::Type::Win32A);
-    add(tr("Windows 32-bit Unicode"), Platform::Type::Win32W);
-    add(tr("Windows 64-bit"), Platform::Type::Win64);
+    add("Unix 32-bit", Platform::Type::Unix32);
+    add("Unix 64-bit", Platform::Type::Unix64);
+    add("Windows 32-bit ANSI", Platform::Type::Win32A);
+    add("Windows 32-bit Unicode", Platform::Type::Win32W);
+    add("Windows 64-bit", Platform::Type::Win64);
 }
 
 int Platforms::getCount() const
diff --git a/gui/projectfile.cpp b/gui/projectfile.cpp
index 3e4e783d7a8..716288d9695 100644
--- a/gui/projectfile.cpp
+++ b/gui/projectfile.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
 
 #include <utility>
 
+#include <QCoreApplication>
 #include <QFile>
 #include <QDir>
 #include <QIODevice>
@@ -62,6 +63,7 @@ void ProjectFile::clear()
     mIncludeDirs.clear();
     mDefines.clear();
     mUndefines.clear();
+    mUserInclude.clear();
     mPaths.clear();
     mExcludedPaths.clear();
     mLibraries.clear();
@@ -86,7 +88,6 @@ void ProjectFile::clear()
     mBughunting = false;
     mCertIntPrecision = 0;
     mCodingStandards.clear();
-    mPremiumLicenseFile.clear();
 }
 
 bool ProjectFile::read(const QString &filename)
@@ -165,6 +166,9 @@ bool ProjectFile::read(const QString &filename)
             if (xmlReader.name() == QString(CppcheckXml::UndefinesElementName))
                 readStringList(mUndefines, xmlReader, CppcheckXml::UndefineName);
 
+            if (xmlReader.name() == QString(CppcheckXml::UserIncludeElementName))
+                mUserInclude = readString(xmlReader);
+
             // Find exclude list from inside project element
             if (xmlReader.name() == QString(CppcheckXml::ExcludeElementName))
                 readExcludes(xmlReader);
@@ -228,8 +232,6 @@ bool ProjectFile::read(const QString &filename)
                 readStringList(mCodingStandards, xmlReader, CppcheckXml::CodingStandardElementName);
             if (xmlReader.name() == QString(CppcheckXml::CertIntPrecisionElementName))
                 mCertIntPrecision = readInt(xmlReader, 0);
-            if (xmlReader.name() == QString(CppcheckXml::LicenseFileElementName))
-                mPremiumLicenseFile = readString(xmlReader);
             if (xmlReader.name() == QString(CppcheckXml::ProjectNameElementName))
                 mProjectName = readString(xmlReader);
 
@@ -346,15 +348,13 @@ bool ProjectFile::readBool(QXmlStreamReader &reader)
 
 int ProjectFile::readInt(QXmlStreamReader &reader, int defaultValue)
 {
-    int ret = defaultValue;
     do {
         const QXmlStreamReader::TokenType type = reader.readNext();
         switch (type) {
         case QXmlStreamReader::Characters:
-            ret = reader.text().toString().toInt();
-            FALLTHROUGH;
+            return reader.text().toString().toInt();
         case QXmlStreamReader::EndElement:
-            return ret;
+            return defaultValue;
         // Not handled
         case QXmlStreamReader::StartElement:
         case QXmlStreamReader::NoToken:
@@ -372,15 +372,13 @@ int ProjectFile::readInt(QXmlStreamReader &reader, int defaultValue)
 
 QString ProjectFile::readString(QXmlStreamReader &reader)
 {
-    QString ret;
     do {
         const QXmlStreamReader::TokenType type = reader.readNext();
         switch (type) {
         case QXmlStreamReader::Characters:
-            ret = reader.text().toString();
-            FALLTHROUGH;
+            return reader.text().toString();
         case QXmlStreamReader::EndElement:
-            return ret;
+            return {};
         // Not handled
         case QXmlStreamReader::StartElement:
         case QXmlStreamReader::NoToken:
@@ -891,7 +889,7 @@ bool ProjectFile::write(const QString &filename)
 
     if (!mIncludeDirs.isEmpty()) {
         xmlWriter.writeStartElement(CppcheckXml::IncludeDirElementName);
-        for (const QString& incdir : mIncludeDirs) {
+        for (const QString& incdir : utils::as_const(mIncludeDirs)) {
             xmlWriter.writeStartElement(CppcheckXml::DirElementName);
             xmlWriter.writeAttribute(CppcheckXml::DirNameAttrib, incdir);
             xmlWriter.writeEndElement();
@@ -901,7 +899,7 @@ bool ProjectFile::write(const QString &filename)
 
     if (!mDefines.isEmpty()) {
         xmlWriter.writeStartElement(CppcheckXml::DefinesElementName);
-        for (const QString& define : mDefines) {
+        for (const QString& define : utils::as_const(mDefines)) {
             xmlWriter.writeStartElement(CppcheckXml::DefineName);
             xmlWriter.writeAttribute(CppcheckXml::DefineNameAttrib, define);
             xmlWriter.writeEndElement();
@@ -909,6 +907,12 @@ bool ProjectFile::write(const QString &filename)
         xmlWriter.writeEndElement();
     }
 
+    if (!mUserInclude.isEmpty()) {
+        xmlWriter.writeStartElement(CppcheckXml::UserIncludeElementName);
+        xmlWriter.writeCharacters(mUserInclude);
+        xmlWriter.writeEndElement();
+    }
+
     if (!mVsConfigurations.isEmpty()) {
         writeStringList(xmlWriter,
                         mVsConfigurations,
@@ -923,7 +927,7 @@ bool ProjectFile::write(const QString &filename)
 
     if (!mPaths.isEmpty()) {
         xmlWriter.writeStartElement(CppcheckXml::PathsElementName);
-        for (const QString& path : mPaths) {
+        for (const QString& path : utils::as_const(mPaths)) {
             xmlWriter.writeStartElement(CppcheckXml::PathName);
             xmlWriter.writeAttribute(CppcheckXml::PathNameAttrib, path);
             xmlWriter.writeEndElement();
@@ -933,7 +937,7 @@ bool ProjectFile::write(const QString &filename)
 
     if (!mExcludedPaths.isEmpty()) {
         xmlWriter.writeStartElement(CppcheckXml::ExcludeElementName);
-        for (const QString& path : mExcludedPaths) {
+        for (const QString& path : utils::as_const(mExcludedPaths)) {
             xmlWriter.writeStartElement(CppcheckXml::ExcludePathName);
             xmlWriter.writeAttribute(CppcheckXml::ExcludePathNameAttrib, path);
             xmlWriter.writeEndElement();
@@ -948,7 +952,7 @@ bool ProjectFile::write(const QString &filename)
 
     if (!mSuppressions.isEmpty()) {
         xmlWriter.writeStartElement(CppcheckXml::SuppressionsElementName);
-        for (const SuppressionList::Suppression &suppression : mSuppressions) {
+        for (const SuppressionList::Suppression &suppression : utils::as_const(mSuppressions)) {
             xmlWriter.writeStartElement(CppcheckXml::SuppressionElementName);
             if (!suppression.fileName.empty())
                 xmlWriter.writeAttribute("fileName", QString::fromStdString(suppression.fileName));
@@ -1046,12 +1050,6 @@ bool ProjectFile::write(const QString &filename)
         xmlWriter.writeEndElement();
     }
 
-    if (!mPremiumLicenseFile.isEmpty()) {
-        xmlWriter.writeStartElement(CppcheckXml::LicenseFileElementName);
-        xmlWriter.writeCharacters(mPremiumLicenseFile);
-        xmlWriter.writeEndElement();
-    }
-
     xmlWriter.writeEndDocument();
     file.close();
     return true;
@@ -1071,6 +1069,12 @@ void ProjectFile::writeStringList(QXmlStreamWriter &xmlWriter, const QStringList
     xmlWriter.writeEndElement();
 }
 
+void ProjectFile::setSettingsUserIncludes(Settings &settings) const
+{
+    if (!mUserInclude.isEmpty())
+        settings.userIncludes.push_back(mUserInclude.toStdString());
+}
+
 QStringList ProjectFile::fromNativeSeparators(const QStringList &paths)
 {
     QStringList ret;
@@ -1168,7 +1172,7 @@ QString ProjectFile::getAddonFilePath(QString filesDir, const QString &addon)
 #endif
     ;
 
-    for (const QString& path : searchPaths) {
+    for (const QString& path : utils::as_const(searchPaths)) {
         QString f = path + addon + ".py";
         if (QFile(f).exists())
             return f;
@@ -1176,3 +1180,32 @@ QString ProjectFile::getAddonFilePath(QString filesDir, const QString &addon)
 
     return QString();
 }
+
+QStringList ProjectFile::getSearchPaths(const QString& projectPath, const QString& appPath, const QString& datadir, const QString& dir) {
+    QStringList ret;
+    ret << appPath << (appPath + "/" + dir) << projectPath;
+#ifdef FILESDIR
+    if (FILESDIR[0])
+        ret << FILESDIR << (FILESDIR "/" + dir);
+#endif
+    if (!datadir.isEmpty())
+        ret << datadir << (datadir + "/" + dir);
+    return ret;
+}
+
+QString ProjectFile::getRelativePath(const QString &absolutePath) const
+{
+    const QDir dir(QFileInfo(mFilename).absolutePath());
+    const QString relativePath(dir.relativeFilePath(absolutePath));
+    if (relativePath.startsWith("../../..") || absolutePath.length() < relativePath.length())
+        return absolutePath;
+    return relativePath;
+}
+
+QStringList ProjectFile::getSearchPaths(const QString& dir) const {
+    const QFileInfo inf(mFilename);
+    const QString applicationFilePath = QCoreApplication::applicationFilePath();
+    const QString appPath = QFileInfo(applicationFilePath).canonicalPath();
+    const QString datadir = getDataDir();
+    return getSearchPaths(inf.canonicalPath(), appPath, datadir, dir);
+}
diff --git a/gui/projectfile.h b/gui/projectfile.h
index 18503e8d6e1..e0b85582c99 100644
--- a/gui/projectfile.h
+++ b/gui/projectfile.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -141,6 +141,14 @@ class ProjectFile : public QObject {
         return mUndefines;
     }
 
+    const QString& getUserInclude() const {
+        return mUserInclude;
+    }
+
+    void setUserInclude(const QString& userInclude) {
+        mUserInclude = userInclude.trimmed();
+    }
+
     /**
      * @brief Get list of paths to check.
      * @return list of paths.
@@ -181,10 +189,6 @@ class ProjectFile : public QObject {
         return mPlatform;
     }
 
-    const QString& getProjectName() const {
-        return mProjectName;
-    }
-
     void setProjectName(QString projectName) {
         mProjectName = std::move(projectName);
     }
@@ -400,14 +404,6 @@ class ProjectFile : public QObject {
         return mCertIntPrecision;
     }
 
-    /** Cppcheck Premium: License file */
-    void setLicenseFile(const QString& licenseFile) {
-        mPremiumLicenseFile = licenseFile;
-    }
-    const QString& getLicenseFile() const {
-        return mPremiumLicenseFile;
-    }
-
     /**
      * @brief Write project file (to disk).
      * @param filename Filename to use.
@@ -446,6 +442,23 @@ class ProjectFile : public QObject {
     /** Use Clang parser */
     bool clangParser;
 
+    /** Get paths where we should glob for certain files (dir="cfg"/"platforms"/etc */
+    QStringList getSearchPaths(const QString& dir) const;
+
+    static QStringList getSearchPaths(const QString& projectPath, const QString& appPath, const QString& datadir, const QString& dir);
+
+    /**
+     * @brief Convert an absolute path to a path relative to this project's directory.
+     * If the relative path would need to walk up more than 2 parent folders
+     * (i.e. "../../...") the absolute path is returned unchanged instead.
+     * @param absolutePath Absolute path to convert.
+     */
+    QString getRelativePath(const QString &absolutePath) const;
+
+    /** Set user includes in settings if non-empty */
+    void setSettingsUserIncludes(Settings &settings) const;
+
+
 protected:
 
     /**
@@ -597,6 +610,9 @@ class ProjectFile : public QObject {
      */
     QStringList mUndefines;
 
+    /** @brief --include file */
+    QString mUserInclude;
+
     /**
      * @brief List of paths to check.
      */
@@ -637,9 +653,6 @@ class ProjectFile : public QObject {
      */
     QStringList mCodingStandards;
 
-    /** @brief Cppcheck Premium: license file */
-    QString mPremiumLicenseFile;
-
     /** @brief Project name, used when generating compliance report */
     QString mProjectName;
 
diff --git a/gui/projectfile.ui b/gui/projectfile.ui
index 3bf02f30631..9f7ad91fa8f 100644
--- a/gui/projectfile.ui
+++ b/gui/projectfile.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>940</width>
-    <height>701</height>
+    <height>741</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -80,7 +80,7 @@
               <item>
                <spacer name="verticalSpacer_11">
                 <property name="orientation">
-                 <enum>Qt::Vertical</enum>
+                 <enum>Qt::Orientation::Vertical</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
@@ -95,7 +95,7 @@
             <item>
              <spacer name="horizontalSpacer_2">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -117,7 +117,7 @@
               <item>
                <spacer name="verticalSpacer_12">
                 <property name="orientation">
-                 <enum>Qt::Vertical</enum>
+                 <enum>Qt::Orientation::Vertical</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
@@ -151,7 +151,7 @@
            <item>
             <spacer name="verticalSpacer_2">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Orientation::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -199,7 +199,7 @@
            <item>
             <spacer name="verticalSpacer_3">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Orientation::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -269,7 +269,7 @@
            <item>
             <spacer name="verticalSpacer_6">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Orientation::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -284,7 +284,7 @@
          <item>
           <widget class="QListWidget" name="mListIncludeDirs">
            <property name="selectionBehavior">
-            <enum>QAbstractItemView::SelectRows</enum>
+            <enum>QAbstractItemView::SelectionBehavior::SelectRows</enum>
            </property>
           </widget>
          </item>
@@ -314,7 +314,7 @@
            <item>
             <spacer name="verticalSpacer">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Orientation::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -342,10 +342,38 @@
          </item>
         </layout>
        </item>
+       <item>
+        <layout class="QHBoxLayout" name="mLayoutDefines_2">
+         <item>
+          <widget class="QLabel" name="mLabelDefines_2">
+           <property name="text">
+            <string>Include file</string>
+           </property>
+           <property name="buddy">
+            <cstring>mEditUserInclude</cstring>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="mEditUserInclude">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:'monospace'; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="mBtnBrowseUserInclude">
+           <property name="text">
+            <string>Browse..</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
        <item>
         <spacer name="verticalSpacer_8">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Orientation::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -552,7 +580,7 @@
             <item>
              <spacer name="horizontalSpacer">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -586,7 +614,7 @@
             <item>
              <spacer name="horizontalSpacer_3">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -601,25 +629,6 @@
          </layout>
         </widget>
        </item>
-       <item>
-        <widget class="QGroupBox" name="premiumLicense">
-         <property name="title">
-          <string>Premium License</string>
-         </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_12">
-          <item>
-           <widget class="QLineEdit" name="mEditLicenseFile"/>
-          </item>
-          <item>
-           <widget class="QPushButton" name="mBtnBrowseLicense">
-            <property name="text">
-             <string>Browse...</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="mTabWarningOptions">
@@ -701,7 +710,7 @@
             <item>
              <spacer name="verticalSpacer_4">
               <property name="orientation">
-               <enum>Qt::Vertical</enum>
+               <enum>Qt::Orientation::Vertical</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -744,7 +753,7 @@
             <item>
              <spacer name="verticalSpacer_10">
               <property name="orientation">
-               <enum>Qt::Vertical</enum>
+               <enum>Qt::Orientation::Vertical</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -769,7 +778,7 @@
        <item>
         <spacer name="verticalSpacer_9">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Orientation::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -856,7 +865,7 @@
             <item>
              <spacer name="horizontalSpacer_4">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -919,7 +928,7 @@
             <item>
              <spacer name="horizontalSpacer_5">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -966,6 +975,13 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QCheckBox" name="mSafetyProfiles">
+            <property name="text">
+             <string>Safety profiles (defined in C++ core guidelines)</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -994,14 +1010,14 @@
           <item>
            <widget class="QCheckBox" name="mToolClangTidy">
             <property name="text">
-             <string>Clang-tidy</string>
+             <string notr="true">Clang-Tidy</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="mToolClangAnalyzer">
             <property name="text">
-             <string>Clang analyzer</string>
+             <string notr="true">Clang Static Analyzer</string>
             </property>
            </widget>
           </item>
@@ -1011,7 +1027,7 @@
        <item>
         <spacer name="verticalSpacer_5">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Orientation::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -1028,10 +1044,10 @@
    <item>
     <widget class="QDialogButtonBox" name="mButtons">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Orientation::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
      </property>
     </widget>
    </item>
diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
index bfa351722ec..abb7b343ec1 100644
--- a/gui/projectfiledialog.cpp
+++ b/gui/projectfiledialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@
 #include "importproject.h"
 #include "library.h"
 #include "newsuppressiondialog.h"
-#include "path.h"
 #include "platform.h"
 #include "platforms.h"
 #include "projectfile.h"
@@ -40,12 +39,10 @@
 #include <QByteArray>
 #include <QCheckBox>
 #include <QComboBox>
-#include <QCoreApplication>
 #include <QDialogButtonBox>
 #include <QDir>
 #include <QFileDialog>
 #include <QFileInfo>
-#include <QFlags>
 #include <QLabel>
 #include <QLineEdit>
 #include <QListWidget>
@@ -69,6 +66,7 @@ const char CODING_STANDARD_MISRA_CPP_2023[] = "misra-cpp-2023";
 const char CODING_STANDARD_CERT_C[] = "cert-c-2016";
 const char CODING_STANDARD_CERT_CPP[] = "cert-cpp-2016";
 const char CODING_STANDARD_AUTOSAR[] = "autosar";
+const char CODING_STANDARD_SAFETY_PROFILES[] = "safety-profiles";
 
 /** Return paths from QListWidget */
 static QStringList getPaths(const QListWidget *list)
@@ -112,7 +110,7 @@ static std::string suppressionAsText(const SuppressionList::Suppression& s)
 
 QStringList ProjectFileDialog::getProjectConfigs(const QString &fileName)
 {
-    if (!fileName.endsWith(".sln") && !fileName.endsWith(".vcxproj"))
+    if (!fileName.endsWith(".sln") && !fileName.endsWith(".slnx") && !fileName.endsWith(".vcxproj"))
         return QStringList();
     QStringList ret;
     ImportProject importer;
@@ -140,24 +138,10 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, bool premium, QWi
     setWindowTitle(title);
     loadSettings();
 
-    mUI->premiumLicense->setVisible(false);
-
-    // Checkboxes for the libraries..
-    const QString applicationFilePath = QCoreApplication::applicationFilePath();
-    const QString appPath = QFileInfo(applicationFilePath).canonicalPath();
-    const QString datadir = getDataDir();
-    QStringList searchPaths;
-    searchPaths << appPath << appPath + "/cfg" << inf.canonicalPath();
-#ifdef FILESDIR
-    if (FILESDIR[0])
-        searchPaths << FILESDIR << FILESDIR "/cfg";
-#endif
-    if (!datadir.isEmpty())
-        searchPaths << datadir << datadir + "/cfg";
     QStringList libs;
     // Search the std.cfg first since other libraries could depend on it
     QString stdLibraryFilename;
-    for (const QString &sp : searchPaths) {
+    for (const QString &sp : projectFile->getSearchPaths("cfg")) {
         QDir dir(sp);
         dir.setSorting(QDir::Name);
         dir.setNameFilters(QStringList("*.cfg"));
@@ -179,7 +163,7 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, bool premium, QWi
             break;
     }
     // Search other libraries
-    for (const QString &sp : searchPaths) {
+    for (const QString &sp : projectFile->getSearchPaths("cfg")) {
         QDir dir(sp);
         dir.setSorting(QDir::Name);
         dir.setNameFilters(QStringList("*.cfg"));
@@ -207,7 +191,7 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, bool premium, QWi
     }
     libs.sort();
     mUI->mLibraries->clear();
-    for (const QString &lib : libs) {
+    for (const QString &lib : utils::as_const(libs)) {
         auto* item = new QListWidgetItem(lib, mUI->mLibraries);
         item->setFlags(item->flags() | Qt::ItemIsUserCheckable); // set checkable flag
         item->setCheckState(Qt::Unchecked); // AND initialize check state
@@ -218,22 +202,15 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, bool premium, QWi
     for (const Platform::Type builtinPlatform : builtinPlatforms)
         mUI->mComboBoxPlatform->addItem(platforms.get(builtinPlatform).mTitle);
     QStringList platformFiles;
-    for (QString sp : searchPaths) {
-        if (sp.endsWith("/cfg"))
-            sp = sp.mid(0,sp.length()-3) + "platforms";
+    for (const QString& sp : projectFile->getSearchPaths("platforms")) {
         QDir dir(sp);
         dir.setSorting(QDir::Name);
         dir.setNameFilters(QStringList("*.xml"));
         dir.setFilter(QDir::Files | QDir::NoDotAndDotDot);
         for (const QFileInfo& item : dir.entryInfoList()) {
             const QString platformFile = item.fileName();
-
-            const std::vector<std::string> paths = {
-                Path::getCurrentPath(), // TODO: do we want to look in CWD?
-                applicationFilePath.toStdString(),
-            };
             Platform plat2;
-            if (!plat2.loadFromFile(paths, platformFile.toStdString()))
+            if (!plat2.loadFromFile({sp.toStdString()}, platformFile.toStdString()))
                 continue;
 
             if (platformFiles.indexOf(platformFile) == -1)
@@ -255,6 +232,7 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, bool premium, QWi
     connect(mUI->mBtnBrowseBuildDir, &QPushButton::clicked, this, &ProjectFileDialog::browseBuildDir);
     connect(mUI->mBtnClearImportProject, &QPushButton::clicked, this, &ProjectFileDialog::clearImportProject);
     connect(mUI->mBtnBrowseImportProject, &QPushButton::clicked, this, &ProjectFileDialog::browseImportProject);
+    connect(mUI->mBtnBrowseUserInclude, &QPushButton::clicked, this, &ProjectFileDialog::browseUserInclude);
     connect(mUI->mBtnAddCheckPath, SIGNAL(clicked()), this, SLOT(addCheckPath()));
     connect(mUI->mBtnEditCheckPath, &QPushButton::clicked, this, &ProjectFileDialog::editCheckPath);
     connect(mUI->mBtnRemoveCheckPath, &QPushButton::clicked, this, &ProjectFileDialog::removeCheckPath);
@@ -323,6 +301,7 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
     setIncludepaths(projectFile->getIncludeDirs());
     setDefines(projectFile->getDefines());
     setUndefines(projectFile->getUndefines());
+    mUI->mEditUserInclude->setText(projectFile->getUserInclude());
     setCheckPaths(projectFile->getCheckPaths());
     setImportProject(projectFile->getImportProject());
     mUI->mChkAllVsConfigs->setChecked(projectFile->getAnalyzeAllVsConfigs());
@@ -414,8 +393,8 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
         mUI->mMisraC->setText("Misra C");
     else {
         mUI->mMisraC->setText("Misra C 2012  " + tr("Note: Open source Cppcheck does not fully implement Misra C 2012"));
-        updateAddonCheckBox(mUI->mMisraC, projectFile, dataDir, ADDON_MISRA);
     }
+    updateAddonCheckBox(mUI->mMisraC, projectFile, dataDir, ADDON_MISRA);
     mUI->mMisraVersion->setEnabled(mUI->mMisraC->isChecked());
     connect(mUI->mMisraC, &QCheckBox::toggled, mUI->mMisraVersion, &QComboBox::setEnabled);
 
@@ -459,6 +438,7 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
     mUI->mCertC2016->setChecked(mPremium && projectFile->getCodingStandards().contains(CODING_STANDARD_CERT_C));
     mUI->mCertCpp2016->setChecked(mPremium && projectFile->getCodingStandards().contains(CODING_STANDARD_CERT_CPP));
     mUI->mAutosar->setChecked(mPremium && projectFile->getCodingStandards().contains(CODING_STANDARD_AUTOSAR));
+    mUI->mSafetyProfiles->setChecked(mPremium && projectFile->getCodingStandards().contains(CODING_STANDARD_SAFETY_PROFILES));
 
     if (projectFile->getCertIntPrecision() <= 0)
         mUI->mEditCertIntPrecision->setText(QString());
@@ -468,6 +448,7 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
     mUI->mCertC2016->setEnabled(mPremium);
     mUI->mCertCpp2016->setEnabled(mPremium);
     mUI->mAutosar->setEnabled(mPremium);
+    mUI->mSafetyProfiles->setEnabled(mPremium);
     mUI->mLabelCertIntPrecision->setVisible(mPremium);
     mUI->mEditCertIntPrecision->setVisible(mPremium);
     mUI->mBughunting->setChecked(mPremium && projectFile->getBughunting());
@@ -480,7 +461,6 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
         mUI->mToolClangTidy->setEnabled(false);
     }
     mUI->mEditTags->setText(projectFile->getTags().join(';'));
-    mUI->mEditLicenseFile->setText(projectFile->getLicenseFile());
     updatePathsAndDefines();
 }
 
@@ -499,6 +479,7 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
     projectFile->setIncludes(getIncludePaths());
     projectFile->setDefines(getDefines());
     projectFile->setUndefines(getUndefines());
+    projectFile->setUserInclude(mUI->mEditUserInclude->text());
     projectFile->setCheckPaths(getCheckPaths());
     projectFile->setExcludedPaths(getExcludedPaths());
     projectFile->setLibraries(getLibraries());
@@ -560,12 +541,13 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
         codingStandards << CODING_STANDARD_MISRA_CPP_2023;
     if (mUI->mAutosar->isChecked())
         codingStandards << CODING_STANDARD_AUTOSAR;
+    if (mUI->mSafetyProfiles->isChecked())
+        codingStandards << CODING_STANDARD_SAFETY_PROFILES;
     projectFile->setCodingStandards(std::move(codingStandards));
     projectFile->setCertIntPrecision(mUI->mEditCertIntPrecision->text().toInt());
     projectFile->setBughunting(mUI->mBughunting->isChecked());
     projectFile->setClangAnalyzer(mUI->mToolClangAnalyzer->isChecked());
     projectFile->setClangTidy(mUI->mToolClangTidy->isChecked());
-    projectFile->setLicenseFile(mUI->mEditLicenseFile->text());
     projectFile->setTags(mUI->mEditTags->text().split(";", Qt::SkipEmptyParts));
 }
 
@@ -589,10 +571,7 @@ QString ProjectFileDialog::getExistingDirectory(const QString &caption, bool tra
 
     // Check if the path is relative to project file's path and if so
     // make it a relative path instead of absolute path.
-    const QDir dir(projectPath);
-    const QString relpath(dir.relativeFilePath(selectedDir));
-    if (!relpath.startsWith("../.."))
-        selectedDir = relpath;
+    selectedDir = mProjectFile->getRelativePath(selectedDir);
 
     // Trailing slash..
     if (trailingSlash && !selectedDir.endsWith('/'))
@@ -612,7 +591,7 @@ void ProjectFileDialog::updatePathsAndDefines()
 {
     const QString &fileName = mUI->mEditImportProject->text();
     const bool importProject = !fileName.isEmpty();
-    const bool hasConfigs = fileName.endsWith(".sln") || fileName.endsWith(".vcxproj");
+    const bool hasConfigs = fileName.endsWith(".sln") || fileName.endsWith(".slnx") || fileName.endsWith(".vcxproj");
     mUI->mBtnClearImportProject->setEnabled(importProject);
     mUI->mListCheckPaths->setEnabled(!importProject);
     mUI->mListIncludeDirs->setEnabled(!importProject);
@@ -642,14 +621,14 @@ void ProjectFileDialog::browseImportProject()
     const QFileInfo inf(mProjectFile->getFilename());
     const QDir &dir = inf.absoluteDir();
     QMap<QString,QString> filters;
-    filters[tr("Visual Studio")] = "*.sln *.vcxproj";
+    filters["Visual Studio"] = "*.sln *.slnx *.vcxproj";
     filters[tr("Compile database")] = "compile_commands.json";
-    filters[tr("Borland C++ Builder 6")] = "*.bpr";
+    filters["Borland C++ Builder 6"] = "*.bpr";
     QString fileName = QFileDialog::getOpenFileName(this, tr("Import Project"),
                                                     dir.canonicalPath(),
                                                     toFilterString(filters));
     if (!fileName.isEmpty()) {
-        mUI->mEditImportProject->setText(dir.relativeFilePath(fileName));
+        mUI->mEditImportProject->setText(mProjectFile->getRelativePath(fileName));
         updatePathsAndDefines();
         setProjectConfigurations(getProjectConfigs(fileName));
         for (int row = 0; row < mUI->mListVsConfigs->count(); ++row) {
@@ -659,6 +638,21 @@ void ProjectFileDialog::browseImportProject()
     }
 }
 
+void ProjectFileDialog::browseUserInclude()
+{
+    const QFileInfo inf(mProjectFile->getFilename());
+    const QDir &dir = inf.absoluteDir();
+    QMap<QString,QString> filters;
+    filters[tr("C/C++ header")] = "*.h";
+    filters[tr("All files")] = "*.*";
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Include file"),
+                                                    dir.canonicalPath(),
+                                                    toFilterString(filters));
+    if (!fileName.isEmpty()) {
+        mUI->mEditUserInclude->setText(mProjectFile->getRelativePath(fileName));
+    }
+}
+
 QStringList ProjectFileDialog::getProjectConfigurations() const
 {
     QStringList configs;
@@ -894,7 +888,9 @@ void ProjectFileDialog::addExcludeFile()
     QMap<QString,QString> filters;
     filters[tr("Source files")] = "*.c *.cpp";
     filters[tr("All files")] = "*.*";
-    addExcludePath(QFileDialog::getOpenFileName(this, tr("Exclude file"), dir.canonicalPath(), toFilterString(filters)));
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Exclude file"), dir.canonicalPath(), toFilterString(filters));
+    if (!fileName.isEmpty())
+        addExcludePath(mProjectFile->getRelativePath(fileName));
 }
 
 void ProjectFileDialog::editExcludePath()
diff --git a/gui/projectfiledialog.h b/gui/projectfiledialog.h
index 68f62ea83e5..a93d12dc2e2 100644
--- a/gui/projectfiledialog.h
+++ b/gui/projectfiledialog.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -201,6 +201,11 @@ private slots:
      */
     void browseImportProject();
 
+    /**
+     * @brief Browse for include file
+     */
+    void browseUserInclude();
+
     /**
      * @brief Add new path to check.
      */
@@ -275,7 +280,7 @@ private slots:
     /**
      * @brief Edit suppression (double clicking on suppression)
      */
-    void editSuppression(const QModelIndex &index);
+    void editSuppression(const QModelIndex& /*index*/);
 
     /**
      * @brief Browse for misra file
diff --git a/gui/readme.txt b/gui/readme.txt
index 2137c6d174d..5983fe3658f 100644
--- a/gui/readme.txt
+++ b/gui/readme.txt
@@ -45,7 +45,11 @@ has several options to select tests etc. You can get the help by running
 Translations
 ------------
 The GUI is translated to several languages. Qt comes with two tools to update
-and compile the translations. lupdate updates translations files from the code
-and lrelease compiles translation files use with the executable.
-
-The translations are automatically updated and compiled within CMake.
\ No newline at end of file
+and compile the translations.
+
+1. lupdate updates translations files from the code.
+   Updating the translation files from the code is a separate step: run
+     "lupdate gui.pro"
+   in the gui directory.
+2. lrelease compiles translation files use with the executable.
+   The translations are automatically compiled within CMake.
diff --git a/gui/resultitem.cpp b/gui/resultitem.cpp
index 4215115be07..4f8c14fa056 100644
--- a/gui/resultitem.cpp
+++ b/gui/resultitem.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/gui/resultitem.h b/gui/resultitem.h
index a7669d2a3b4..9c9b0b82af3 100644
--- a/gui/resultitem.h
+++ b/gui/resultitem.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,9 +41,21 @@ class ResultItem : public QStandardItem
     Type getType() const {
         return mType;
     }
+
+    void setIconFileName(const QString& iconFileName) {
+        mIconFileName = iconFileName;
+        if (!mIconFileName.isEmpty())
+            setIcon(QIcon(iconFileName));
+    }
+
+    // cppcheck-suppress unusedFunction; used in test-resultstree
+    const QString& getIconFileName() const {
+        return mIconFileName;
+    }
 private:
-    const Type mType;
-    const int mErrorPathIndex;
+    Type mType;
+    int mErrorPathIndex;
+    QString mIconFileName;
 };
 
 #endif // RESULTITEM_H
diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
index 78d56929b48..2c99ecf3ed1 100644
--- a/gui/resultstree.cpp
+++ b/gui/resultstree.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,6 +32,7 @@
 #include "showtypes.h"
 #include "suppressions.h"
 #include "threadhandler.h"
+#include "utils.h"
 #include "xmlreportv2.h"
 
 #include <algorithm>
@@ -49,9 +50,7 @@
 #include <QIcon>
 #include <QItemSelectionModel>
 #include <QKeyEvent>
-#include <QList>
 #include <QLocale>
-#include <QMap>
 #include <QMenu>
 #include <QMessageBox>
 #include <QModelIndex>
@@ -123,7 +122,11 @@ static QStringList getLabels() {
         QObject::tr("Rule"),
         QObject::tr("Since date"),
         QObject::tr("Tags"),
-        QObject::tr("CWE")};
+        "CWE"};
+}
+
+static Severity getSeverity(ReportType reportType, const ErrorItem& errorItem) {
+    return reportType == ReportType::normal ? errorItem.severity : getSeverityFromClassification(errorItem.classification);
 }
 
 ResultsTree::ResultsTree(QWidget * parent) :
@@ -160,6 +163,7 @@ void ResultsTree::setReportType(ReportType reportType) {
             QSharedPointer<ErrorItem>& errorItem = dynamic_cast<ResultItem*>(fileItem->child(j,0))->errorItem;
             errorItem->guideline = getGuideline(mReportType, mGuideline, errorItem->errorId, errorItem->severity);
             errorItem->classification = getClassification(mReportType, errorItem->guideline);
+            dynamic_cast<ResultItem*>(fileItem->child(j, COLUMN_FILE))->setIconFileName(severityToIcon(getSeverity(reportType, *errorItem)));
             fileItem->child(j, COLUMN_CERT_LEVEL)->setText(errorItem->classification);
             fileItem->child(j, COLUMN_CERT_RULE)->setText(errorItem->guideline);
             fileItem->child(j, COLUMN_MISRA_CLASSIFICATION)->setText(errorItem->classification);
@@ -242,7 +246,7 @@ bool ResultsTree::addErrorItem(const ErrorItem& errorItem)
     const QString s = errorItem.toString();
     if (mErrorList.contains(s))
         return false;
-    mErrorList.append(s);
+    mErrorList.insert(s);
 
     QSharedPointer<ErrorItem> errorItemPtr{new ErrorItem(errorItem)};
 
@@ -264,7 +268,7 @@ bool ResultsTree::addErrorItem(const ErrorItem& errorItem)
     ResultItem* stditem = addBacktraceFiles(fileItem,
                                             errorItemPtr,
                                             !showItem,
-                                            severityToIcon(errorItemPtr->severity),
+                                            severityToIcon(getSeverity(mReportType, *errorItemPtr)),
                                             ResultItem::Type::message,
                                             errorItemPtr->getMainLocIndex());
 
@@ -317,6 +321,7 @@ ResultItem *ResultsTree::addBacktraceFiles(ResultItem *parent,
     const int numberOfColumns = getLabels().size();
     QList<ResultItem*> columns(numberOfColumns);
     columns[COLUMN_FILE] = createFilenameItem(errorItem, type, errorPathIndex);
+    columns[COLUMN_FILE]->setIconFileName(icon);
     columns[COLUMN_LINE] = createLineNumberItem(loc.line, errorItem, type, errorPathIndex);
     columns[COLUMN_SEVERITY] = createNormalItem(itemSeverity, errorItem, type, errorPathIndex);
     columns[COLUMN_SUMMARY] = createNormalItem(text, errorItem, type, errorPathIndex);
@@ -340,10 +345,6 @@ ResultItem *ResultsTree::addBacktraceFiles(ResultItem *parent,
 
     setRowHidden(parent->rowCount() - 1, parent->index(), hide);
 
-    if (!icon.isEmpty()) {
-        list[COLUMN_FILE]->setIcon(QIcon(icon));
-    }
-
     return columns[COLUMN_FILE];
 }
 
@@ -375,9 +376,10 @@ QString ResultsTree::severityToTranslatedString(Severity severity)
         return tr("internal");
 
     case Severity::none:
-    default:
         return QString();
     }
+
+    cppcheck::unreachable();
 }
 
 ResultItem *ResultsTree::findFileItem(const QString &name) const
@@ -425,8 +427,8 @@ void ResultsTree::clear(const QString &filename)
 
         if (stripped == fileItem->text() ||
             filename == fileItem->errorItem->file0) {
+            removeFileErrorsFromErrorList(fileItem);
             mModel->removeRow(i);
-            mErrorList.removeAll(fileItem->errorItem->toString());
             break;
         }
     }
@@ -443,8 +445,8 @@ void ResultsTree::clearRecheckFile(const QString &filename)
         QString storedfile = fileItem->getErrorPathItem().file;
         storedfile = ((!mCheckPath.isEmpty() && storedfile.startsWith(mCheckPath)) ? storedfile.mid(mCheckPath.length() + 1) : storedfile);
         if (actualfile == storedfile) {
+            removeFileErrorsFromErrorList(fileItem);
             mModel->removeRow(i);
-            mErrorList.removeAll(fileItem->errorItem->toString());
             break;
         }
     }
@@ -711,7 +713,7 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
                 {
                     auto *action = new QAction(tr("No tag"), tagMenu);
                     tagMenu->addAction(action);
-                    connect(action, &QAction::triggered, [=]() {
+                    connect(action, &QAction::triggered, [this]() {
                         tagSelectedItems(QString());
                     });
                 }
@@ -719,7 +721,7 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
                 for (const QString& tagstr : currentProject->getTags()) {
                     auto *action = new QAction(tagstr, tagMenu);
                     tagMenu->addAction(action);
-                    connect(action, &QAction::triggered, [=]() {
+                    connect(action, &QAction::triggered, [tagstr, this]() {
                         tagSelectedItems(tagstr);
                     });
                 }
@@ -739,7 +741,7 @@ void ResultsTree::startApplication(const ResultItem *target, int application)
     //If there are no applications specified, tell the user about it
     if (mApplications->getApplicationCount() == 0) {
         QMessageBox msg(QMessageBox::Critical,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         tr("No editor application configured.\n\n"
                            "Configure the editor application for Cppcheck in preferences/Applications."),
                         QMessageBox::Ok,
@@ -753,7 +755,7 @@ void ResultsTree::startApplication(const ResultItem *target, int application)
 
     if (application == -1) {
         QMessageBox msg(QMessageBox::Critical,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         tr("No default editor application selected.\n\n"
                            "Please select the default editor application in preferences/Applications."),
                         QMessageBox::Ok,
@@ -1130,6 +1132,15 @@ void ResultsTree::saveErrors(Report *report, const ResultItem *fileItem) const
     }
 }
 
+void ResultsTree::removeFileErrorsFromErrorList(const ResultItem *fileItem)
+{
+    for (int i{0}; i < fileItem->rowCount(); ++i) {
+        const auto *errorItem = dynamic_cast<const ResultItem*>(fileItem->child(i, COLUMN_FILE));
+        if (errorItem && errorItem->errorItem)
+            mErrorList.remove(errorItem->errorItem->toString());
+    }
+}
+
 void ResultsTree::updateFromOldReport(const QString &filename)
 {
     showColumn(COLUMN_SINCE_DATE);
@@ -1192,7 +1203,15 @@ void ResultsTree::updateSettings(bool showFullPath,
 
 void ResultsTree::setCheckDirectory(const QString &dir)
 {
+    if (mCheckPath == dir)
+        return;
+
     mCheckPath = dir;
+
+    // A partial recheck keeps results whose displayed paths are relative to the check path, so
+    // they are recalculated. Not without a check path, QDir("") would turn absolute paths into "../..".
+    if (!mCheckPath.isEmpty())
+        refreshFilePaths();
 }
 
 const QString& ResultsTree::getCheckDirectory() const
diff --git a/gui/resultstree.h b/gui/resultstree.h
index efa759cd6d1..c829c21fc6a 100644
--- a/gui/resultstree.h
+++ b/gui/resultstree.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
 #include <string>
 
 #include <QObject>
+#include <QSet>
 #include <QString>
 #include <QStringList>
 #include <QTreeView>
@@ -202,8 +203,6 @@ class ResultsTree : public QTreeView {
      */
     ShowTypes mShowSeverities;
 
-    void keyPressEvent(QKeyEvent *event) override;
-
     void setReportType(ReportType reportType);
 
     /**
@@ -358,6 +357,12 @@ protected slots:
      */
     void saveErrors(Report *report, const ResultItem *fileItem) const;
 
+    /**
+     * @brief Remove all errors of a file item from the duplicate-check list
+     * @param fileItem Item whose errors to remove
+     */
+    void removeFileErrorsFromErrorList(const ResultItem *fileItem);
+
     /**
      * @brief Convert a severity string to a icon filename
      *
@@ -557,6 +562,8 @@ protected slots:
     bool mVisibleErrors{};
 
 private:
+    void keyPressEvent(QKeyEvent *event) override;
+
     /** tag selected items */
     void tagSelectedItems(const QString &tag);
 
@@ -566,8 +573,8 @@ protected slots:
 
     QStringList mHiddenMessageId;
 
-    // List of existing errors so we can avoid duplicates
-    QStringList mErrorList;
+    // Set of existing errors so we can avoid duplicates
+    QSet<QString> mErrorList;
 
     QItemSelectionModel* mSelectionModel{};
     ThreadHandler *mThread{};
diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp
index 8336a697878..d11cae35bc6 100644
--- a/gui/resultsview.cpp
+++ b/gui/resultsview.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -123,6 +123,7 @@ void ResultsView::clear(bool results)
     }
 
     mUI->mDetails->setText(QString());
+    mUI->mCode->clear();
 
     mStatistics->clear();
     delete mCheckSettings;
@@ -134,8 +135,6 @@ void ResultsView::clear(bool results)
     mUI->mProgress->setFormat("%p%");
 
     mUI->mLabelCriticalErrors->setVisible(false);
-
-    mSuccess = false;
 }
 
 void ResultsView::clear(const QString &filename)
@@ -162,7 +161,7 @@ void ResultsView::setResultsSource(ResultsTree::ResultsSource source)
     mUI->mTree->setResultsSource(source);
 }
 
-void ResultsView::progress(int value, const QString& description)
+void ResultsView::filesCheckedProgress(int value, const QString& description)
 {
     mUI->mProgress->setValue(value);
     mUI->mProgress->setFormat(QString("%p% (%1)").arg(description));
@@ -319,7 +318,6 @@ void ResultsView::setCheckSettings(const Settings &settings)
 
 void ResultsView::checkingStarted(int count)
 {
-    mSuccess = true;
     mUI->mProgress->setVisible(true);
     mUI->mProgress->setMaximum(PROGRESS_MAX);
     mUI->mProgress->setValue(0);
@@ -347,7 +345,7 @@ void ResultsView::checkingFinished()
         //Tell user that we found no errors
         if (!hasResults()) {
             QMessageBox msg(QMessageBox::Information,
-                            tr("Cppcheck"),
+                            "Cppcheck",
                             tr("No errors found."),
                             QMessageBox::Ok,
                             this);
@@ -358,7 +356,7 @@ void ResultsView::checkingFinished()
             QString text = tr("Errors were found, but they are configured to be hidden.\n" \
                               "To toggle what kind of errors are shown, open view menu.");
             QMessageBox msg(QMessageBox::Information,
-                            tr("Cppcheck"),
+                            "Cppcheck",
                             text,
                             QMessageBox::Ok,
                             this);
@@ -394,8 +392,6 @@ void ResultsView::translate()
 
 void ResultsView::readErrorsXml(const QString &filename)
 {
-    mSuccess = false; // Don't know if results come from an aborted analysis
-
     const int version = XmlReport::determineVersion(filename);
     if (version == 0) {
         QMessageBox msgBox;
@@ -423,7 +419,7 @@ void ResultsView::readErrorsXml(const QString &filename)
         msgBox.exec();
     }
 
-    for (const ErrorItem& item : errors) {
+    for (const ErrorItem& item : utils::as_const(errors)) {
         handleCriticalError(item);
         mUI->mTree->addErrorItem(item);
     }
@@ -522,6 +518,7 @@ void ResultsView::logCopyComplete()
         const QListWidgetItem * item = mUI->mListLog->item(i);
         if (nullptr != item) {
             logText += item->text();
+            logText += "\n";
         }
     }
     QClipboard *clipboard = QApplication::clipboard();
@@ -545,7 +542,6 @@ void ResultsView::on_mListLog_customContextMenuRequested(const QPoint &pos)
 
 void ResultsView::stopAnalysis()
 {
-    mSuccess = false;
     mUI->mLabelCriticalErrors->setText(tr("Analysis was stopped"));
     mUI->mLabelCriticalErrors->setVisible(true);
 }
@@ -568,10 +564,5 @@ void ResultsView::handleCriticalError(const ErrorItem &item)
         msg += ". " + tr("Analysis was aborted.");
         mUI->mLabelCriticalErrors->setText(msg);
         mUI->mLabelCriticalErrors->setVisible(true);
-        mSuccess = false;
     }
 }
-
-bool ResultsView::isSuccess() const {
-    return mSuccess;
-}
diff --git a/gui/resultsview.h b/gui/resultsview.h
index 770f9c0c3fa..9ef74666395 100644
--- a/gui/resultsview.h
+++ b/gui/resultsview.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -307,7 +307,7 @@ public slots:
      * @param value Current progress value
      * @param description Description to accompany the progress
      */
-    void progress(int value, const QString& description);
+    void filesCheckedProgress(int value, const QString& description);
 
     /**
      * @brief Slot for new error to be displayed
@@ -388,11 +388,6 @@ public slots:
 
     Settings* mCheckSettings = nullptr;
 
-    /**
-     * Set to true when checking finish successfully. Set to false whenever analysis starts.
-     */
-    bool mSuccess = false;
-
     /** Critical error ids */
     QString mCriticalErrors;
 
diff --git a/gui/statsdialog.cpp b/gui/statsdialog.cpp
index f16b6cba3b9..bf46abcb2d4 100644
--- a/gui/statsdialog.cpp
+++ b/gui/statsdialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -113,6 +113,7 @@ void StatsDialog::setProject(const ProjectFile* projectFile)
         if (!statsFile.isEmpty()) {
             QChartView *chartView = createChart(statsFile, "cppcheck");
             mUI->mTabHistory->layout()->addWidget(chartView);
+            // cppcheck-suppress knownConditionTrueFalse - TODO in getClangAnalyzer()
             if (projectFile->getClangAnalyzer()) {
                 chartView = createChart(statsFile, CLANG_ANALYZER);
                 mUI->mTabHistory->layout()->addWidget(chartView);
diff --git a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp
index c747f1b5093..7a91bd332c1 100644
--- a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp
+++ b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2025 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.h b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.h
index 625ad4046a9..31ddbb9eae0 100644
--- a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.h
+++ b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2025 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/gui/test/data/xmlfiles/xmlreport_v2.xml b/gui/test/data/xmlfiles/xmlreport_v2.xml
index 31af1a92cff..e8e03c3adbb 100644
--- a/gui/test/data/xmlfiles/xmlreport_v2.xml
+++ b/gui/test/data/xmlfiles/xmlreport_v2.xml
@@ -2,10 +2,10 @@
 <results version="2">
     <cppcheck version="1.47"/>
     <errors>
-        <error id="unreadVariable" severity="style" msg="Variable &amp;#039;a&amp;#039; is assigned a value that is never used" verbose="Variable &amp;#039;a&amp;#039; is assigned a value that is never used">
+        <error id="unreadVariable" severity="style" msg="Variable 'a' is assigned a value that is never used" verbose="Variable 'a' is assigned a value that is never used">
             <location file="test.cxx" line="11"/>
         </error>
-        <error id="unreadVariable" severity="style" msg="Variable &amp;#039;b&amp;#039; is assigned a value that is never used" verbose="Variable &amp;#039;b&amp;#039; is assigned a value that is never used">
+        <error id="unreadVariable" severity="style" msg="Variable 'b' is assigned a value that is never used" verbose="Variable 'b' is assigned a value that is never used">
             <location file="test.cxx" line="28"/>
         </error>
         <error id="memleak" severity="error" msg="Memory leak: b" verbose="Memory leak: b">
@@ -15,7 +15,7 @@
             <location file="test.cxx" line="32"/>
             <location file="test.cxx" line="16"/>
         </error>
-        <error id="obsoleteFunctionsgets" severity="style" msg="Found obsolescent function &amp;#039;gets&amp;#039;. It is recommended to use the function &amp;#039;fgets&amp;#039; instead" verbose="Found obsolescent function &amp;#039;gets&amp;#039;. With gets you&amp;#039;ll get buffer overruns if the input data too big for the buffer. It is recommended to use the function &amp;#039;fgets&amp;#039; instead.">
+        <error id="obsoleteFunctionsgets" severity="style" msg="Found obsolescent function 'gets'. It is recommended to use the function 'fgets' instead" verbose="Found obsolescent function 'gets'. With gets you'll get buffer overruns if the input data too big for the buffer. It is recommended to use the function 'fgets' instead.">
             <location file="test.cxx" line="31"/>
         </error>
         <error id="postfixOperator" severity="performance" msg="Prefer prefix ++/-- operators for non-primitive types." verbose="Prefix ++/-- operators should be preferred for non-primitive types. Pre-increment/decrement can be more efficient than post-increment/decrement. Post-increment/decrement usually involves keeping a copy of the previous value around and adds a little extra code.">
diff --git a/gui/test/filelist/testfilelist.cpp b/gui/test/filelist/testfilelist.cpp
index d24b766bcc3..003c43c1ba0 100644
--- a/gui/test/filelist/testfilelist.cpp
+++ b/gui/test/filelist/testfilelist.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2023 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/gui/test/filelist/testfilelist.h b/gui/test/filelist/testfilelist.h
index 17a33d86e3e..f8d9e3a5b7b 100644
--- a/gui/test/filelist/testfilelist.h
+++ b/gui/test/filelist/testfilelist.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2024 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/gui/test/projectfile/CMakeLists.txt b/gui/test/projectfile/CMakeLists.txt
index 2d9c254ec5f..f9bab8ba0c7 100644
--- a/gui/test/projectfile/CMakeLists.txt
+++ b/gui/test/projectfile/CMakeLists.txt
@@ -4,6 +4,7 @@ add_dependencies(gui-build-deps build-projectfile-deps)
 add_executable(test-projectfile
         ${test-projectfile_SRC}
         testprojectfile.cpp
+        ${CMAKE_SOURCE_DIR}/gui/common.cpp
         ${CMAKE_SOURCE_DIR}/gui/projectfile.cpp
         )
 target_include_directories(test-projectfile PRIVATE ${CMAKE_SOURCE_DIR}/gui ${CMAKE_SOURCE_DIR}/lib)
diff --git a/gui/test/projectfile/testprojectfile.cpp b/gui/test/projectfile/testprojectfile.cpp
index 988d62e8bce..1a66bd8de23 100644
--- a/gui/test/projectfile/testprojectfile.cpp
+++ b/gui/test/projectfile/testprojectfile.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,12 +18,17 @@
 
 #include "testprojectfile.h"
 
+#include "addoninfo.h"
 #include "library.h"
 #include "platform.h"
 #include "projectfile.h"
 #include "settings.h"
 #include "suppressions.h"
 
+#ifdef HAVE_RULES
+#include "rule.h"
+#endif
+
 #include <QFile>
 #include <QIODevice>
 #include <QList>
@@ -38,6 +43,7 @@ const char Settings::SafeChecks::XmlExternalFunctions[] = "external-functions";
 const char Settings::SafeChecks::XmlInternalFunctions[] = "internal-functions";
 const char Settings::SafeChecks::XmlExternalVariables[] = "external-variables";
 Settings::Settings() : maxCtuDepth(10) {}
+Settings::~Settings() = default;
 Platform::Platform() = default;
 Library::Library() = default;
 Library::~Library() = default;
@@ -136,6 +142,24 @@ void TestProjectFile::getAddonFilePath() const
     QCOMPARE(ProjectFile::getAddonFilePath(tempdir.path(), filepath), filepath);
 }
 
+void TestProjectFile::getSearchPaths() const
+{
+#ifdef FILESDIR
+    const QString f(FILESDIR "\n"        // example: "/usr/local/share/cppcheck\n"
+                    FILESDIR "/dir\n");  // example: "/usr/local/share/cppcheck/dir\n"
+#else
+    const QString f;
+#endif
+
+    QCOMPARE(ProjectFile::getSearchPaths("projectPath", "appPath", "datadir", "dir").join("\n"),
+             "appPath\n"
+             "appPath/dir\n"
+             "projectPath\n" +
+             f +
+             "datadir\n"
+             "datadir/dir");
+}
+
 void TestProjectFile::getInlineSuppressionDefaultValue() const
 {
     ProjectFile projectFile;
@@ -181,5 +205,54 @@ void TestProjectFile::getCheckingSuppressionsStar() const
     QCOMPARE(projectFile.getCheckingSuppressions()[0].fileName, "*.cpp");
 }
 
+void TestProjectFile::emptyUserInclude() const
+{
+    ProjectFile projectFile;
+    Settings settings;
+    projectFile.setUserInclude("   ");
+    projectFile.setSettingsUserIncludes(settings);
+    QCOMPARE(settings.userIncludes.size(), 0);
+}
+
+// Absolute path is made relative when it does not require walking up more than 3 parent folders
+void TestProjectFile::getRelativePathRelative() const
+{
+    ProjectFile projectFile;
+    projectFile.setFilename("/some/path/sub/123.cppcheck");
+    QCOMPARE(projectFile.getRelativePath("/some/path/externals/foo.cpp"), QString("../externals/foo.cpp"));
+}
+
+// Absolute path is made relative even when it requires walking up 2 parent folders
+void TestProjectFile::getRelativePathTwoUp() const
+{
+    ProjectFile projectFile;
+    projectFile.setFilename("/some/path/sub/123.cppcheck");
+    QCOMPARE(projectFile.getRelativePath("/some/externals/foo.cpp"), QString("../../externals/foo.cpp"));
+}
+
+// Absolute path is kept as-is when making it relative would require walking up more than 3 parent folders
+void TestProjectFile::getRelativePathTooFarUp() const
+{
+    ProjectFile projectFile;
+    projectFile.setFilename("/some/path/sub/123.cppcheck");
+    QCOMPARE(projectFile.getRelativePath("/other/deep/foo.cpp"), QString("/other/deep/foo.cpp"));
+}
+
+// Absolute path in a subfolder of the project path is made relative without walking up at all
+void TestProjectFile::getRelativePathSubfolder() const
+{
+    ProjectFile projectFile;
+    projectFile.setFilename("/some/path/sub/123.cppcheck");
+    QCOMPARE(projectFile.getRelativePath("/some/path/sub/src/file1.c"), QString("src/file1.c"));
+}
+
+// Absolute path is kept as-is when it is shorter than the relative path, even if it does not require walking up 3 or more parent folders
+void TestProjectFile::getRelativePathAbsoluteShorter() const
+{
+    ProjectFile projectFile;
+    projectFile.setFilename("/ab/path/sub/123.cppcheck");
+    QCOMPARE(projectFile.getRelativePath("/ab/foo.cpp"), QString("/ab/foo.cpp"));
+}
+
 QTEST_MAIN(TestProjectFile)
 
diff --git a/gui/test/projectfile/testprojectfile.h b/gui/test/projectfile/testprojectfile.h
index 8f3e54c3008..7203980eb7c 100644
--- a/gui/test/projectfile/testprojectfile.h
+++ b/gui/test/projectfile/testprojectfile.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@ private slots:
     void loadSimpleNoroot() const;
 
     void getAddonFilePath() const;
+    void getSearchPaths() const;
 
     void getInlineSuppressionDefaultValue() const;
     void getInlineSuppression() const;
@@ -35,4 +36,12 @@ private slots:
     void getCheckingSuppressionsRelative() const;
     void getCheckingSuppressionsAbsolute() const;
     void getCheckingSuppressionsStar() const;
+
+    void emptyUserInclude() const;
+
+    void getRelativePathRelative() const;
+    void getRelativePathTwoUp() const;
+    void getRelativePathTooFarUp() const;
+    void getRelativePathSubfolder() const;
+    void getRelativePathAbsoluteShorter() const;
 };
diff --git a/gui/test/resultstree/CMakeLists.txt b/gui/test/resultstree/CMakeLists.txt
index 1bf8a02ffb1..a48b137e349 100644
--- a/gui/test/resultstree/CMakeLists.txt
+++ b/gui/test/resultstree/CMakeLists.txt
@@ -3,6 +3,7 @@ qt_wrap_cpp(test-resultstree_SRC
         ${CMAKE_SOURCE_DIR}/gui/resultstree.h
         ${CMAKE_SOURCE_DIR}/gui/resultitem.h
         ${CMAKE_SOURCE_DIR}/gui/applicationlist.h
+        ${CMAKE_SOURCE_DIR}/gui/common.h
         ${CMAKE_SOURCE_DIR}/gui/projectfile.h
         ${CMAKE_SOURCE_DIR}/gui/threadhandler.h
         ${CMAKE_SOURCE_DIR}/gui/threadresult.h
@@ -14,6 +15,7 @@ add_executable(test-resultstree
         testresultstree.cpp
         ${CMAKE_SOURCE_DIR}/gui/resultstree.cpp
         ${CMAKE_SOURCE_DIR}/gui/resultitem.cpp
+        ${CMAKE_SOURCE_DIR}/gui/common.cpp
         ${CMAKE_SOURCE_DIR}/gui/erroritem.cpp
         ${CMAKE_SOURCE_DIR}/gui/showtypes.cpp
         ${CMAKE_SOURCE_DIR}/gui/report.cpp
diff --git a/gui/test/resultstree/testresultstree.cpp b/gui/test/resultstree/testresultstree.cpp
index 0873314a41c..c4a7d3080c0 100644
--- a/gui/test/resultstree/testresultstree.cpp
+++ b/gui/test/resultstree/testresultstree.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@
 
 // headers that declare mocked functions/variables
 #include "applicationlist.h"
-#include "common.h"
 #include "filesettings.h"
 #include "projectfile.h"
 #include "threadhandler.h"
@@ -93,24 +92,23 @@ void ThreadHandler::stop() {
 void ThreadHandler::threadDone() {
     throw 1;
 }
+// NOLINTBEGIN(performance-unnecessary-value-param)
+void ThreadHandler::startCheck(CheckThread::Details /*unused*/) {
+    throw 1;
+}
+void ThreadHandler::finishCheck(CheckThread::Details /*unused*/) {
+    throw 1;
+}
+// NOLINTEND(performance-unnecessary-value-param)
 Application& ApplicationList::getApplication(const int /*unused*/) {
     throw 1;
 }
 const Application& ApplicationList::getApplication(const int index) const {
     return mApplications.at(index);
 }
-QString getPath(const QString &type) {
-    return "/" + type;
-}
-void setPath(const QString & /*unused*/, const QString & /*unused*/) {}
-QString XmlReport::quoteMessage(const QString &message) {
-    return message;
-}
-QString XmlReport::unquoteMessage(const QString &message) {
-    return message;
-}
 XmlReport::XmlReport(const QString& filename) : Report(filename) {}
-void ThreadResult::fileChecked(const QString & /*unused*/) {
+// NOLINTNEXTLINE(performance-unnecessary-value-param)
+void ThreadResult::finishCheck(CheckThread::Details /*unused*/) {
     throw 1;
 }
 void ThreadResult::reportOut(const std::string & /*unused*/, Color /*unused*/) {
@@ -119,6 +117,9 @@ void ThreadResult::reportOut(const std::string & /*unused*/, Color /*unused*/) {
 void ThreadResult::reportErr(const ErrorMessage & /*unused*/) {
     throw 1;
 }
+void ThreadResult::reportProgress(const std::string &/*filename*/, const char /*stage*/[], const std::size_t /*value*/) {
+    throw 1;
+}
 
 // Test...
 
@@ -258,6 +259,31 @@ void TestResultsTree::resultsInSameFile() const
     }
 }
 
+void TestResultsTree::clearRecheckFile() const
+{
+    // #14893 - rechecking a file removes its results, the results of the other files are kept
+    ResultsTree tree(nullptr);
+    QVERIFY(tree.addErrorItem(createErrorItem("file1.c", 10, Severity::style, "test", "bugId")));
+    QVERIFY(tree.addErrorItem(createErrorItem("file1.c", 20, Severity::style, "test", "bugId")));
+    QVERIFY(tree.addErrorItem(createErrorItem("file2.c", 10, Severity::style, "test", "bugId")));
+
+    const auto* model = dynamic_cast<QStandardItemModel*>(tree.model());
+    QVERIFY(model != nullptr);
+    QCOMPARE(model->rowCount(), 2);
+
+    tree.clearRecheckFile("file1.c");
+    QCOMPARE(model->rowCount(), 1);
+    QCOMPARE(model->item(0,0)->text(), "file2.c");
+
+    // the recheck reports the results of the rechecked file again, they must not be treated as duplicates
+    QVERIFY(tree.addErrorItem(createErrorItem("file1.c", 10, Severity::style, "test", "bugId")));
+    QVERIFY(tree.addErrorItem(createErrorItem("file1.c", 20, Severity::style, "test", "bugId")));
+    QCOMPARE(model->rowCount(), 2);
+
+    // the results of the other files are still known
+    QVERIFY(!tree.addErrorItem(createErrorItem("file2.c", 10, Severity::style, "test", "bugId")));
+}
+
 void TestResultsTree::testReportType() const
 {
     TestReport report("{id},{classification},{guideline}");
@@ -294,6 +320,35 @@ void TestResultsTree::testReportType() const
              "missingReturn,Mandatory,17.4");
 }
 
+void TestResultsTree::testReportTypeIcon() const {
+    ResultsTree tree(nullptr);
+    tree.setReportType(ReportType::misraC2012);
+    tree.addErrorItem(createErrorItem("file1.c", 10, Severity::style, "some rule text", "premium-misra-c-2012-1.1")); // Required
+    tree.addErrorItem(createErrorItem("file1.c", 20, Severity::style, "some rule text", "premium-misra-c-2012-1.2")); // Advisory
+    tree.addErrorItem(createErrorItem("file1.c", 30, Severity::style, "some rule text", "premium-misra-c-2012-9.1")); // Mandatory
+
+    const auto* model = dynamic_cast<QStandardItemModel*>(tree.model());
+    QVERIFY(model != nullptr);
+    const ResultItem* fileItem = dynamic_cast<ResultItem*>(model->item(0,0));
+
+    const ResultItem* err1 = dynamic_cast<ResultItem*>(fileItem->child(0,0));
+    const ResultItem* err2 = dynamic_cast<ResultItem*>(fileItem->child(1,0));
+    const ResultItem* err3 = dynamic_cast<ResultItem*>(fileItem->child(2,0));
+
+    QCOMPARE(err1->getIconFileName(), ":images/dialog-warning.png");
+    QCOMPARE(err2->getIconFileName(), ":images/applications-development.png");
+    QCOMPARE(err3->getIconFileName(), ":images/dialog-error.png");
+
+    tree.setReportType(ReportType::normal);
+    QCOMPARE(err1->getIconFileName(), ":images/applications-development.png");
+    QCOMPARE(err2->getIconFileName(), ":images/applications-development.png");
+    QCOMPARE(err3->getIconFileName(), ":images/applications-development.png");
+
+    tree.setReportType(ReportType::misraC2012);
+    QCOMPARE(err1->getIconFileName(), ":images/dialog-warning.png");
+    QCOMPARE(err2->getIconFileName(), ":images/applications-development.png");
+    QCOMPARE(err3->getIconFileName(), ":images/dialog-error.png");
+}
 
 void TestResultsTree::testGetGuidelineError() const
 {
diff --git a/gui/test/resultstree/testresultstree.h b/gui/test/resultstree/testresultstree.h
index 108ed098eb5..dcce568b4ba 100644
--- a/gui/test/resultstree/testresultstree.h
+++ b/gui/test/resultstree/testresultstree.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,9 @@ private slots:
     void duplicateResults() const;
     void multiLineResult() const;
     void resultsInSameFile() const;
+    void clearRecheckFile() const;
     void testReportType() const;
+    void testReportTypeIcon() const;
     void testGetGuidelineError() const;
     void misraCReportShowClassifications() const;
 };
diff --git a/gui/test/translationhandler/testtranslationhandler.cpp b/gui/test/translationhandler/testtranslationhandler.cpp
index 7c093e3edfd..c827ad47b0c 100644
--- a/gui/test/translationhandler/testtranslationhandler.cpp
+++ b/gui/test/translationhandler/testtranslationhandler.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2025 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/gui/test/translationhandler/testtranslationhandler.h b/gui/test/translationhandler/testtranslationhandler.h
index 249bbaa5ddd..bdbf3c522e8 100644
--- a/gui/test/translationhandler/testtranslationhandler.h
+++ b/gui/test/translationhandler/testtranslationhandler.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2024 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/gui/test/xmlreportv2/testxmlreportv2.cpp b/gui/test/xmlreportv2/testxmlreportv2.cpp
index cede5842de0..d157a4bef6d 100644
--- a/gui/test/xmlreportv2/testxmlreportv2.cpp
+++ b/gui/test/xmlreportv2/testxmlreportv2.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2024 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,9 @@
 #include "erroritem.h"
 #include "xmlreportv2.h"
 
+#include <QFile>
 #include <QList>
+#include <QTemporaryDir>
 #include <QtTest>
 
 void TestXmlReportV2::readXml() const
@@ -53,4 +55,39 @@ void TestXmlReportV2::readXml() const
     QCOMPARE(item2.message, QString("Mismatching allocation and deallocation: k"));
 }
 
+void TestXmlReportV2::writeXmlEscaping() const
+{
+    QTemporaryDir dir;
+    const QString path = dir.path() + "/results.xml";
+
+    ErrorItem item;
+    item.errorId = "id";
+    item.severity = Severity::style;
+    item.summary = "\"x\" & <y> &quot;";
+    item.message = item.summary;
+    QErrorPathItem loc;
+    loc.file = "a&b.cpp";
+    loc.line = 1;
+    item.errorPath << loc;
+    {
+        XmlReportV2 report(path, QString());
+        QVERIFY(report.create());
+        report.writeHeader();
+        report.writeError(item);
+        report.writeFooter();
+    }
+
+    QFile file(path);
+    QVERIFY(file.open(QIODevice::ReadOnly));
+    QVERIFY(file.readAll().contains("msg=\"&quot;x&quot; &amp; &lt;y&gt; &amp;quot;\""));
+
+    XmlReportV2 report(path, QString());
+    QVERIFY(report.open());
+    const QList<ErrorItem> errors = report.read();
+    QCOMPARE(errors.size(), 1);
+    QCOMPARE(errors[0].summary, item.summary);
+    QCOMPARE(errors[0].message, item.message);
+    QCOMPARE(errors[0].errorPath[0].file, loc.file);
+}
+
 QTEST_MAIN(TestXmlReportV2)
diff --git a/gui/test/xmlreportv2/testxmlreportv2.h b/gui/test/xmlreportv2/testxmlreportv2.h
index f4de863bff0..9662bd00b27 100644
--- a/gui/test/xmlreportv2/testxmlreportv2.h
+++ b/gui/test/xmlreportv2/testxmlreportv2.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2024 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,4 +23,5 @@ class TestXmlReportV2 : public QObject {
 
 private slots:
     void readXml() const;
+    void writeXmlEscaping() const;
 };
diff --git a/gui/threaddetails.cpp b/gui/threaddetails.cpp
new file mode 100644
index 00000000000..1fcb97772ef
--- /dev/null
+++ b/gui/threaddetails.cpp
@@ -0,0 +1,56 @@
+#include "threaddetails.h"
+#include "utils.h"
+
+#include "ui_threaddetails.h"
+
+#include <QMutexLocker>
+
+ThreadDetails* ThreadDetails::mInstance;
+
+ThreadDetails::ThreadDetails(QWidget *parent)
+    : QWidget(parent)
+    , mUi(new Ui::ThreadDetails)
+{
+    mInstance = this;
+    setWindowFlags(Qt::Window);
+    mUi->setupUi(this);
+    connect(&mTimer, &QTimer::timeout, this, &ThreadDetails::updateUI);
+    mTimer.start(1000);
+}
+
+ThreadDetails::~ThreadDetails()
+{
+    mInstance = nullptr;
+    delete mUi;
+}
+
+// NOLINTNEXTLINE(performance-unnecessary-value-param) - false positive
+void ThreadDetails::threadDetailsUpdated(QMap<int, CheckThread::Details> threadDetails)
+{
+    QMutexLocker locker(&mMutex);
+    mThreadDetails = threadDetails;
+    if (threadDetails.empty()) {
+        mProgress.clear();
+    }
+}
+
+// cppcheck-suppress passedByValue
+// NOLINTNEXTLINE(performance-unnecessary-value-param) - false positive
+void ThreadDetails::progress(QString filename, QString stage, std::size_t value) {
+    QMutexLocker locker(&mMutex);
+    mProgress[filename] = {QString(), stage + QString(value > 0 ? ": %1%" : "").arg(value)};
+}
+
+void ThreadDetails::updateUI() {
+    QString text("Thread\tStart time\tFile/Progress\n");
+    {
+        QMutexLocker locker(&mMutex);
+        for (const auto& td: utils::as_const(mThreadDetails)) {
+            auto& timeProgress = mProgress[td.file];
+            if (timeProgress.first.isEmpty() && !timeProgress.second.isEmpty())
+                timeProgress.first = QTime::currentTime().toString(Qt::TextDate);
+            text += QString("%1\t%2\t%3\n\t%4\t%5\n").arg(td.threadIndex).arg(td.startTime.toString(Qt::TextDate)).arg(td.file).arg(timeProgress.first).arg(timeProgress.second);
+        }
+    }
+    mUi->plainTextEdit->setPlainText(text);
+}
diff --git a/gui/threaddetails.h b/gui/threaddetails.h
new file mode 100644
index 00000000000..253b53d5407
--- /dev/null
+++ b/gui/threaddetails.h
@@ -0,0 +1,44 @@
+#ifndef THREADDETAILS_H
+#define THREADDETAILS_H
+
+#include <QWidget>
+#include <QMap>
+#include <QMutex>
+#include <QTimer>
+#include "checkthread.h"
+
+namespace Ui {
+    class ThreadDetails;
+}
+
+class ThreadDetails : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ThreadDetails(QWidget *parent = nullptr);
+    ~ThreadDetails() override;
+
+    static ThreadDetails* instance() {
+        return mInstance;
+    }
+
+public slots:
+    void threadDetailsUpdated(QMap<int, CheckThread::Details> threadDetails);
+    void progress(QString filename, QString stage, std::size_t value);
+
+private slots:
+    void updateUI();
+
+private:
+    static ThreadDetails* mInstance;
+    Ui::ThreadDetails *mUi;
+    QMap<QString, QPair<QString,QString>> mProgress;
+    QMap<int, CheckThread::Details> mThreadDetails;
+    QTimer mTimer;
+
+    /** accessing mProgress and mThreadDetails in slots that are triggered from different threads */
+    QMutex mMutex;
+};
+
+#endif // THREADDETAILS_H
diff --git a/gui/threaddetails.ui b/gui/threaddetails.ui
new file mode 100644
index 00000000000..420340cf77d
--- /dev/null
+++ b/gui/threaddetails.ui
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ThreadDetails</class>
+ <widget class="QWidget" name="ThreadDetails">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>640</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Thread Details</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QPlainTextEdit" name="plainTextEdit">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/gui/threadhandler.cpp b/gui/threadhandler.cpp
index ad4d0e2a61d..577dcdc3375 100644
--- a/gui/threadhandler.cpp
+++ b/gui/threadhandler.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,8 +21,10 @@
 #include "checkthread.h"
 #include "common.h"
 #include "filesettings.h"
+#include "importproject.h"
 #include "resultsview.h"
 #include "settings.h"
+#include "utils.h"
 
 #include <algorithm>
 #include <string>
@@ -52,6 +54,7 @@ ThreadHandler::~ThreadHandler()
 void ThreadHandler::clearFiles()
 {
     mLastFiles.clear();
+    mLastFileSettings.clear();
     mResults.clearFiles();
     mAnalyseWholeProgram = false;
     mCtuInfo.clear();
@@ -62,6 +65,7 @@ void ThreadHandler::clearFiles()
 void ThreadHandler::setFiles(std::list<FileWithDetails> files)
 {
     mLastFiles = files;
+    mLastFileSettings.clear();
     mResults.setFiles(std::move(files));
 }
 
@@ -69,6 +73,7 @@ void ThreadHandler::setProject(const ImportProject &prj)
 {
     mResults.setProject(prj);
     mLastFiles.clear();
+    mLastFileSettings = prj.fileSettings;
 }
 
 void ThreadHandler::setCheckFiles(bool all)
@@ -146,26 +151,34 @@ void ThreadHandler::createThreads(const int count)
     removeThreads();
     //Create new threads
     for (int i = mThreads.size(); i < count; i++) {
-        mThreads << new CheckThread(mResults);
+        mThreads << new CheckThread(mResults, i + 1);
         connect(mThreads.last(), &CheckThread::done,
                 this, &ThreadHandler::threadDone, Qt::QueuedConnection);
-        connect(mThreads.last(), &CheckThread::fileChecked,
-                &mResults, &ThreadResult::fileChecked, Qt::QueuedConnection);
+        connect(mThreads.last(), &CheckThread::finishCheck,
+                &mResults, &ThreadResult::finishCheck, Qt::QueuedConnection);
+        connect(mThreads.last(), &CheckThread::startCheck,
+                this, &ThreadHandler::startCheck, Qt::QueuedConnection);
+        connect(mThreads.last(), &CheckThread::finishCheck,
+                this, &ThreadHandler::finishCheck, Qt::QueuedConnection);
     }
 }
 
 
 void ThreadHandler::removeThreads()
 {
-    for (CheckThread* thread : mThreads) {
+    for (CheckThread* thread : utils::as_const(mThreads)) {
         if (thread->isRunning()) {
             thread->stop();
             thread->wait();
         }
         disconnect(thread, &CheckThread::done,
                    this, &ThreadHandler::threadDone);
-        disconnect(thread, &CheckThread::fileChecked,
-                   &mResults, &ThreadResult::fileChecked);
+        disconnect(thread, &CheckThread::finishCheck,
+                   &mResults, &ThreadResult::finishCheck);
+        disconnect(mThreads.last(), &CheckThread::startCheck,
+                   this, &ThreadHandler::startCheck);
+        disconnect(mThreads.last(), &CheckThread::finishCheck,
+                   this, &ThreadHandler::finishCheck);
         delete thread;
     }
 
@@ -181,7 +194,7 @@ void ThreadHandler::threadDone()
         createThreads(1);
         mRunningThreadCount = 1;
         setupCheckThread(*mThreads[0]);
-        mThreads[0]->analyseWholeProgram(mLastFiles, mCtuInfo);
+        mThreads[0]->analyseWholeProgram(mLastFiles, mLastFileSettings, mCtuInfo);
         mAnalyseWholeProgram = false;
         mCtuInfo.clear();
         return;
@@ -208,15 +221,15 @@ void ThreadHandler::stop()
     mCheckStartTime = QDateTime();
     mAnalyseWholeProgram = false;
     mCtuInfo.clear();
-    for (CheckThread* thread : mThreads) {
+    for (CheckThread* thread : utils::as_const(mThreads)) {
         thread->stop();
     }
 }
 
 void ThreadHandler::initialize(const ResultsView *view)
 {
-    connect(&mResults, &ThreadResult::progress,
-            view, &ResultsView::progress);
+    connect(&mResults, &ThreadResult::filesCheckedProgress,
+            view, &ResultsView::filesCheckedProgress);
 
     connect(&mResults, &ThreadResult::error,
             view, &ResultsView::error);
@@ -226,6 +239,9 @@ void ThreadHandler::initialize(const ResultsView *view)
 
     connect(&mResults, &ThreadResult::debugError,
             this, &ThreadHandler::debugError);
+
+    connect(&mResults, &ThreadResult::progress,
+            this, &ThreadHandler::progress);
 }
 
 void ThreadHandler::loadSettings(const QSettings &settings)
@@ -317,3 +333,24 @@ void ThreadHandler::setCheckStartTime(QDateTime checkStartTime)
 {
     mCheckStartTime = std::move(checkStartTime);
 }
+
+// cppcheck-suppress passedByValueCallback
+// NOLINTNEXTLINE(performance-unnecessary-value-param)
+void ThreadHandler::startCheck(CheckThread::Details details)
+{
+    mThreadDetails[details.threadIndex] = details;
+    emitThreadDetailsUpdated();
+}
+
+// cppcheck-suppress passedByValueCallback
+// NOLINTNEXTLINE(performance-unnecessary-value-param)
+void ThreadHandler::finishCheck(CheckThread::Details details)
+{
+    mThreadDetails.remove(details.threadIndex);
+    emitThreadDetailsUpdated();
+}
+
+void ThreadHandler::emitThreadDetailsUpdated()
+{
+    emit threadDetailsUpdated(mThreadDetails);
+}
diff --git a/gui/threadhandler.h b/gui/threadhandler.h
index cc578bd5643..879da0db8da 100644
--- a/gui/threadhandler.h
+++ b/gui/threadhandler.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,10 +20,12 @@
 #ifndef THREADHANDLER_H
 #define THREADHANDLER_H
 
+#include "filesettings.h"
 #include "settings.h"
 #include "suppressions.h"
 #include "threadresult.h"
 
+#include <cstddef>
 #include <list>
 #include <memory>
 #include <set>
@@ -178,6 +180,11 @@ class ThreadHandler : public QObject {
      */
     void setCheckStartTime(QDateTime checkStartTime);
 
+    /**
+     * @brief Emit the threadDetailsUpdated signal
+     */
+    void emitThreadDetailsUpdated();
+
 signals:
     /**
      * @brief Signal that all threads are done
@@ -191,6 +198,11 @@ class ThreadHandler : public QObject {
     // NOLINTNEXTLINE(readability-inconsistent-declaration-parameter-name) - caused by generated MOC code
     void debugError(const ErrorItem &item);
 
+    /**
+     * @brief Emitted when thread details are updated.
+     */
+    void threadDetailsUpdated(QMap<int, CheckThread::Details> threadDetails);
+
 public slots:
 
     /**
@@ -198,6 +210,22 @@ public slots:
      *
      */
     void stop();
+
+    /**
+     * @brief Slot threads use to signal this class that it started checking a file
+     * @param details Details about what file is being checked and by what thread
+     */
+    void startCheck(CheckThread::Details details);
+
+    /**
+     * @brief Slot threads use to signal this class that it finish checking a file
+     * @param details Details about what file finished being checked and by what thread
+     */
+    void finishCheck(CheckThread::Details details);
+
+signals:
+    void progress(QString filename, QString stage, std::size_t value);
+
 protected slots:
     /**
      * @brief Slot that a single thread is done
@@ -211,6 +239,12 @@ protected slots:
      */
     std::list<FileWithDetails> mLastFiles;
 
+    /**
+     * @brief Files of the project checked last time (used by the whole program analysis)
+     *
+     */
+    std::list<FileSettings> mLastFileSettings;
+
     /** @brief date and time when current checking started */
     QDateTime mCheckStartTime;
 
@@ -285,6 +319,12 @@ protected slots:
     Settings mCheckSettings;
     std::shared_ptr<Suppressions> mCheckSuppressions;
     /// @}
+
+    /**
+     * @brief Details about currently running threads
+     */
+    QMap<int, CheckThread::Details> mThreadDetails;
+
 private:
 
     /**
diff --git a/gui/threadresult.cpp b/gui/threadresult.cpp
index ea858c92e4a..a3929da7cca 100644
--- a/gui/threadresult.cpp
+++ b/gui/threadresult.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,18 +34,19 @@ void ThreadResult::reportOut(const std::string &outmsg, Color /*c*/)
     emit log(QString::fromStdString(outmsg));
 }
 
-void ThreadResult::fileChecked(const QString &file)
+// NOLINTNEXTLINE(performance-unnecessary-value-param)
+void ThreadResult::finishCheck(CheckThread::Details details)
 {
     std::lock_guard<std::mutex> locker(mutex);
 
-    mProgress += QFile(file).size();
+    mCheckedFileSize += QFile(details.file).size();
     mFilesChecked++;
 
-    if (mMaxProgress > 0) {
-        const int value = static_cast<int>(PROGRESS_MAX * mProgress / mMaxProgress);
+    if (mTotalFileSize > 0) {
+        const int value = static_cast<int>(PROGRESS_MAX * mCheckedFileSize / mTotalFileSize);
         const QString description = tr("%1 of %2 files checked").arg(mFilesChecked).arg(mTotalFiles);
 
-        emit progress(value, description);
+        emit filesCheckedProgress(value, description);
     }
 }
 
@@ -59,6 +60,11 @@ void ThreadResult::reportErr(const ErrorMessage &msg)
         emit debugError(item);
 }
 
+// NOLINTNEXTLINE(readability-avoid-const-params-in-decls) - false positive this is an overload
+void ThreadResult::reportProgress(const std::string &filename, const char stage[], const std::size_t value) {
+    emit progress(QString::fromStdString(filename), stage, value);
+}
+
 void ThreadResult::getNextFile(const FileWithDetails*& file)
 {
     std::lock_guard<std::mutex> locker(mutex);
@@ -87,7 +93,7 @@ void ThreadResult::setFiles(std::list<FileWithDetails> files)
     mTotalFiles = files.size();
     mFiles = std::move(files);
     mItNextFile = mFiles.cbegin();
-    mProgress = 0;
+    mCheckedFileSize = 0;
     mFilesChecked = 0;
 
     // Determine the total size of all of the files to check, so that we can
@@ -95,7 +101,7 @@ void ThreadResult::setFiles(std::list<FileWithDetails> files)
     quint64 sizeOfFiles = std::accumulate(mFiles.cbegin(), mFiles.cend(), 0, [](quint64 total, const FileWithDetails& file) {
         return total + file.size();
     });
-    mMaxProgress = sizeOfFiles;
+    mTotalFileSize = sizeOfFiles;
 }
 
 void ThreadResult::setProject(const ImportProject &prj)
@@ -105,13 +111,13 @@ void ThreadResult::setProject(const ImportProject &prj)
     mItNextFile = mFiles.cbegin();
     mFileSettings = prj.fileSettings;
     mItNextFileSettings = mFileSettings.cbegin();
-    mProgress = 0;
+    mCheckedFileSize = 0;
     mFilesChecked = 0;
     mTotalFiles = prj.fileSettings.size();
 
     // Determine the total size of all of the files to check, so that we can
     // show an accurate progress estimate
-    mMaxProgress = std::accumulate(prj.fileSettings.begin(), prj.fileSettings.end(), quint64{ 0 }, [](quint64 v, const FileSettings& fs) {
+    mTotalFileSize = std::accumulate(prj.fileSettings.begin(), prj.fileSettings.end(), quint64{ 0 }, [](quint64 v, const FileSettings& fs) {
         return v + QFile(QString::fromStdString(fs.filename())).size();
     });
 }
diff --git a/gui/threadresult.h b/gui/threadresult.h
index dc7b5c0372a..87560e87d78 100644
--- a/gui/threadresult.h
+++ b/gui/threadresult.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,9 @@
 #include "color.h"
 #include "errorlogger.h"
 #include "filesettings.h"
+#include "checkthread.h"
 
+#include <cstddef>
 #include <list>
 #include <mutex>
 #include <string>
@@ -77,28 +79,31 @@ class ThreadResult : public QObject, public ErrorLogger {
     /**
      * ErrorLogger methods
      */
-    void reportOut(const std::string &outmsg, Color c = Color::Reset) override;
+    void reportOut(const std::string &outmsg, Color /*c*/ = Color::Reset) override;
     void reportErr(const ErrorMessage &msg) override;
     void reportMetric(const std::string &metric) override
     {
         (void) metric;
     }
+    // NOLINTNEXTLINE(readability-avoid-const-params-in-decls) - false positive this is an overload
+    void reportProgress(const std::string &filename, const char stage[], const std::size_t value) final;
 
 public slots:
 
     /**
-     * @brief Slot threads use to signal this class that a specific file is checked
-     * @param file File that is checked
+     * @brief Slot threads use to signal this class that it finish checking a file
+     * @param details Details about what file finished being checked and by what thread
      */
-    void fileChecked(const QString &file);
+    void finishCheck(CheckThread::Details details);
+
 signals:
     /**
-     * @brief Progress signal
-     * @param value Current progress
-     * @param description Description of the current stage
+     * @brief Files checked progress
+     * @param value Current progress (0 - PROGRESS_MAX)
+     * @param description Description of the current stage (example: "13/45 files checked")
      */
     // NOLINTNEXTLINE(readability-inconsistent-declaration-parameter-name) - caused by generated MOC code
-    void progress(int value, const QString& description);
+    void filesCheckedProgress(int value, const QString& description);
 
     /**
      * @brief Signal of a new error
@@ -124,6 +129,8 @@ public slots:
     // NOLINTNEXTLINE(readability-inconsistent-declaration-parameter-name) - caused by generated MOC code
     void debugError(const ErrorItem &item);
 
+    void progress(QString filename, QString stage, std::size_t value);
+
 protected:
 
     /**
@@ -142,17 +149,11 @@ public slots:
     std::list<FileSettings> mFileSettings;
     std::list<FileSettings>::const_iterator mItNextFileSettings{mFileSettings.cbegin()};
 
-    /**
-     * @brief Max progress
-     *
-     */
-    quint64 mMaxProgress{};
+    /** @brief Total file size */
+    quint64 mTotalFileSize{};
 
-    /**
-     * @brief Current progress
-     *
-     */
-    quint64 mProgress{};
+    /** @brief File size of checked files */
+    quint64 mCheckedFileSize{};
 
     /**
      * @brief Current number of files checked
diff --git a/gui/translationhandler.cpp b/gui/translationhandler.cpp
index d8160525856..29713c7c065 100644
--- a/gui/translationhandler.cpp
+++ b/gui/translationhandler.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -133,7 +133,7 @@ bool TranslationHandler::setLanguage(const QString &code)
                              "the Preferences-dialog to select any of the available "
                              "languages.").arg(error));
         QMessageBox msgBox(QMessageBox::Warning,
-                           tr("Cppcheck"),
+                           "Cppcheck",
                            msg,
                            QMessageBox::Ok);
         msgBox.exec();
diff --git a/gui/translationhandler.h b/gui/translationhandler.h
index 0b2988f583e..4cea7d4ce80 100644
--- a/gui/translationhandler.h
+++ b/gui/translationhandler.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,7 +59,7 @@ struct TranslationInfo {
  * track which translation is the currently active translation.
  *
  */
-class TranslationHandler : QObject {
+class TranslationHandler : public QObject {
     Q_OBJECT
 public:
     explicit TranslationHandler(QObject *parent = nullptr);
diff --git a/gui/xmlreport.cpp b/gui/xmlreport.cpp
index c5f00fc5bb7..8d184ca6658 100644
--- a/gui/xmlreport.cpp
+++ b/gui/xmlreport.cpp
@@ -32,28 +32,6 @@ XmlReport::XmlReport(const QString &filename) :
     Report(filename)
 {}
 
-QString XmlReport::quoteMessage(const QString &message)
-{
-    QString quotedMessage(message);
-    quotedMessage.replace("&", "&amp;");
-    quotedMessage.replace("\"", "&quot;");
-    quotedMessage.replace("'", "&#039;");
-    quotedMessage.replace("<", "&lt;");
-    quotedMessage.replace(">", "&gt;");
-    return quotedMessage;
-}
-
-QString XmlReport::unquoteMessage(const QString &message)
-{
-    QString quotedMessage(message);
-    quotedMessage.replace("&amp;", "&");
-    quotedMessage.replace("&quot;", "\"");
-    quotedMessage.replace("&#039;", "'");
-    quotedMessage.replace("&lt;", "<");
-    quotedMessage.replace("&gt;", ">");
-    return quotedMessage;
-}
-
 int XmlReport::determineVersion(const QString &filename)
 {
     QFile file;
diff --git a/gui/xmlreport.h b/gui/xmlreport.h
index 2483b1b7471..83c222291ab 100644
--- a/gui/xmlreport.h
+++ b/gui/xmlreport.h
@@ -42,20 +42,6 @@ class XmlReport : public Report {
      */
     virtual QList<ErrorItem> read() = 0;
 
-    /**
-     * @brief Quote the message.
-     * @param message Message to quote.
-     * @return quoted message.
-     */
-    static QString quoteMessage(const QString &message);
-
-    /**
-     * @brief Unquote the message.
-     * @param message Message to quote.
-     * @return quoted message.
-     */
-    static QString unquoteMessage(const QString &message);
-
     /**
      * @brief Get the XML report format version from the file.
      * @param filename Filename of the report file.
diff --git a/gui/xmlreportv2.cpp b/gui/xmlreportv2.cpp
index abf6aa361ba..b707b6d44dd 100644
--- a/gui/xmlreportv2.cpp
+++ b/gui/xmlreportv2.cpp
@@ -132,10 +132,8 @@ void XmlReportV2::writeError(const ErrorItem &error)
 
     // Don't localize severity so we can read these files
     mXmlWriter->writeAttribute(SeverityAttribute, GuiSeverity::toString(error.severity));
-    const QString summary = XmlReport::quoteMessage(error.summary);
-    mXmlWriter->writeAttribute(MsgAttribute, summary);
-    const QString message = XmlReport::quoteMessage(error.message);
-    mXmlWriter->writeAttribute(VerboseAttribute, message);
+    mXmlWriter->writeAttribute(MsgAttribute, error.summary);
+    mXmlWriter->writeAttribute(VerboseAttribute, error.message);
     if (error.inconclusive)
         mXmlWriter->writeAttribute(InconclusiveAttribute, "true");
     if (!error.remark.isEmpty())
@@ -145,7 +143,7 @@ void XmlReportV2::writeError(const ErrorItem &error)
     if (error.hash > 0)
         mXmlWriter->writeAttribute(HashAttribute, QString::number(error.hash));
     if (!error.file0.isEmpty())
-        mXmlWriter->writeAttribute(IncludedFromFilenameAttribute, quoteMessage(error.file0));
+        mXmlWriter->writeAttribute(IncludedFromFilenameAttribute, error.file0);
     if (!error.sinceDate.isEmpty())
         mXmlWriter->writeAttribute(SinceDateAttribute, error.sinceDate);
     if (!error.tags.isEmpty())
@@ -155,12 +153,12 @@ void XmlReportV2::writeError(const ErrorItem &error)
         mXmlWriter->writeStartElement(LocationElementName);
 
         QString file = QDir::toNativeSeparators(error.errorPath[i].file);
-        mXmlWriter->writeAttribute(FilenameAttribute, XmlReport::quoteMessage(file));
+        mXmlWriter->writeAttribute(FilenameAttribute, file);
         mXmlWriter->writeAttribute(LineAttribute, QString::number(error.errorPath[i].line));
         if (error.errorPath[i].column > 0)
             mXmlWriter->writeAttribute(ColumnAttribute, QString::number(error.errorPath[i].column));
         if (error.errorPath.count() > 1)
-            mXmlWriter->writeAttribute(InfoAttribute, XmlReport::quoteMessage(error.errorPath[i].info));
+            mXmlWriter->writeAttribute(InfoAttribute, error.errorPath[i].info);
 
         mXmlWriter->writeEndElement();
     }
@@ -228,10 +226,8 @@ ErrorItem XmlReportV2::readError(const QXmlStreamReader *reader)
         QXmlStreamAttributes attribs = reader->attributes();
         item.errorId = attribs.value(QString(), IdAttribute).toString();
         item.severity = GuiSeverity::fromString(attribs.value(QString(), SeverityAttribute).toString());
-        const QString summary = attribs.value(QString(), MsgAttribute).toString();
-        item.summary = XmlReport::unquoteMessage(summary);
-        const QString message = attribs.value(QString(), VerboseAttribute).toString();
-        item.message = XmlReport::unquoteMessage(message);
+        item.summary = attribs.value(QString(), MsgAttribute).toString();
+        item.message = attribs.value(QString(), VerboseAttribute).toString();
         if (attribs.hasAttribute(QString(), InconclusiveAttribute))
             item.inconclusive = true;
         if (attribs.hasAttribute(QString(), RemarkAttribute))
@@ -258,14 +254,14 @@ ErrorItem XmlReportV2::readError(const QXmlStreamReader *reader)
                 QXmlStreamAttributes attribs = mXmlReader->attributes();
                 QString file0 = attribs.value(QString(), IncludedFromFilenameAttribute).toString();
                 if (!file0.isEmpty())
-                    item.file0 = XmlReport::unquoteMessage(file0);
+                    item.file0 = file0;
                 QErrorPathItem loc;
-                loc.file = XmlReport::unquoteMessage(attribs.value(QString(), FilenameAttribute).toString());
+                loc.file = attribs.value(QString(), FilenameAttribute).toString();
                 loc.line = attribs.value(QString(), LineAttribute).toString().toUInt();
                 if (attribs.hasAttribute(QString(), ColumnAttribute))
                     loc.column = attribs.value(QString(), ColumnAttribute).toString().toInt();
                 if (attribs.hasAttribute(QString(), InfoAttribute))
-                    loc.info = XmlReport::unquoteMessage(attribs.value(QString(), InfoAttribute).toString());
+                    loc.info = attribs.value(QString(), InfoAttribute).toString();
                 item.errorPath.push_front(loc);
             }
             break;
diff --git a/gui/xmlreportv2.h b/gui/xmlreportv2.h
index 6f5834b3417..58d368c4bc2 100644
--- a/gui/xmlreportv2.h
+++ b/gui/xmlreportv2.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@
 #include "erroritem.h"
 #include "xmlreport.h"
 
-#include <QList>
 #include <QString>
 
 class QXmlStreamReader;
diff --git a/htmlreport/cppcheck-htmlreport b/htmlreport/cppcheck-htmlreport
index 5044443a0a9..4de692ce3e9 100755
--- a/htmlreport/cppcheck-htmlreport
+++ b/htmlreport/cppcheck-htmlreport
@@ -278,7 +278,7 @@ HTML_HEAD = """
 
         updateFileRows();
       }
-      
+
       function toggleClassification(cb) {
         cb.parentElement.classList.toggle("unchecked", !cb.checked);
         var elements = document.querySelectorAll(".class_" + cb.id);
@@ -289,7 +289,7 @@ HTML_HEAD = """
 
         updateFileRows();
       }
-    
+
       function toggleTool(cb) {
         cb.parentElement.classList.toggle("unchecked", !cb.checked);
 
@@ -469,9 +469,9 @@ def filter_button(enabled_filters, id, function):
 def filter_bar(enabled):
     severity_bar = ''.join([filter_button(enabled, severity, 'toggleSeverity') for severity in ['error', 'warning', 'portability', 'performance', 'style', 'information']]) + '\n        | '
     classification_bar = ''.join([filter_button(enabled, _class, 'toggleClassification') for _class in ['Mandatory', 'Required', 'Advisory', 'Document', 'Disapplied', 'L1','L2','L3','']]) + '\n        | '
-    if "checked/>" not in severity_bar:
+    if "checked>" not in severity_bar:
         severity_bar = ''
-    if "checked/>" not in classification_bar:
+    if "checked>" not in classification_bar:
         classification_bar = ''
     return ''.join([
      '      <div id="filters">\n'
@@ -620,15 +620,15 @@ class AnnotateCodeFormatter(HtmlFormatter):
                                 # from actual message
                                 if error.get('verbose') and (error['verbose'] != error['msg']):
                                     index = t.rfind('\n')
-                                    t = t[:index] + HTML_EXPANDABLE_INCONCLUSIVE % (error['msg'], html_escape(error['verbose'].replace("\\012", '\n'))) + t[index + 1:]
+                                    t = t[:index] + HTML_EXPANDABLE_INCONCLUSIVE % (html_escape(error['msg']), html_escape(error['verbose'].replace("\\012", '\n'))) + t[index + 1:]
                                 else:
-                                    t = t.replace('\n', HTML_INCONCLUSIVE % error['msg'])
+                                    t = t.replace('\n', HTML_INCONCLUSIVE % html_escape(error['msg']))
                         except KeyError:
                             if error.get('verbose') and (error['verbose'] != error['msg']):
                                 index = t.rfind('\n')
-                                t = t[:index] + HTML_EXPANDABLE_ERROR % (error['msg'], html_escape(error['verbose'].replace("\\012", '\n'))) + t[index + 1:]
+                                t = t[:index] + HTML_EXPANDABLE_ERROR % (html_escape(error['msg']), html_escape(error['verbose'].replace("\\012", '\n'))) + t[index + 1:]
                             else:
-                                t = t.replace('\n', HTML_ERROR % error['msg'])
+                                t = t.replace('\n', HTML_ERROR % html_escape(error['msg']))
 
                 line_no = line_no + 1
             yield i, t
@@ -709,6 +709,9 @@ class CppCheckHandler(XmlContentHandler):
             error = self.errors[-1]
             locations = error['locations']
             file = attributes['file']
+            # Cppcheck Premium reports license messages with this pseudo file name
+            if file == 'Cppcheck Premium':
+                file = ''
             line = int(attributes['line'])
             if not locations:
                 error['file'] = file
@@ -824,7 +827,7 @@ def main() -> None:
             if is_remote:
                 # Construct remote URL for GitHub/GitLab
                 # tr_str() will use the actual line number, so we can just start with line 1
-                remote_url = source_dir.rstrip('/') + '/' + filename + '#L1'
+                remote_url = source_dir.rstrip('/') + '/' + html_escape(filename) + '#L1'
                 files[filename] = {'errors': [], 'htmlfile': remote_url}
             else:
                 files[filename] = {'errors': [], 'htmlfile': str(file_no) + '.html'}
@@ -900,10 +903,10 @@ def main() -> None:
                               (options.title,
                                htmlFormatter.get_style_defs('.highlight'),
                                options.title,
-                               ': ' + filename))
+                               ': ' + html_escape(filename)))
             output_file.write(HTML_HEAD_END)
 
-            output_file.write(HTML_MENU % (filename.split('/')[-1]))
+            output_file.write(HTML_MENU % (html_escape(filename.split('/')[-1])))
             for error in sorted(errors, key=lambda k: k['line']):
                 output_file.write("<a href=\"%s#line-%d\"> %s %s</a>" % (data['htmlfile'], error['line'], error['id'], error['line']))
             output_file.write(HTML_MENU_END)
@@ -1006,7 +1009,7 @@ def main() -> None:
         for filename, data in sorted(files.items()):
             file_error = filename in decode_errors or filename.endswith('*')
             is_file = filename != '' and not file_error
-            row_content = filename if file_error else "<a href=\"%s\">%s</a>" % (data['htmlfile'], filename)
+            row_content = html_escape(filename) if file_error else "<a href=\"%s\">%s</a>" % (data['htmlfile'], html_escape(filename))
             htmlfile = data.get('htmlfile') if is_file else None
 
             output_file.write("\n      <tbody class=\"fileEntry\">")
@@ -1122,7 +1125,7 @@ def main() -> None:
                 if it == 0:
                     LENGTH = len(str(i[1]))  # <- length of longest number, now get the difference and try to  make other numbers align to it
 
-                stats_file.write("&#160;" * 3 + str(i[1]) + "&#160;" * (1 + LENGTH - len(str(i[1]))) + "<a href=\"" + files[i[0]]['htmlfile'] + "\">  " + i[0] + "</a><br>\n")
+                stats_file.write("&#160;" * 3 + str(i[1]) + "&#160;" * (1 + LENGTH - len(str(i[1]))) + "<a href=\"" + files[i[0]]['htmlfile'] + "\">  " + html_escape(i[0]) + "</a><br>\n")
                 it += 1
                 if it == 10:  # print only the top 10
                     break
diff --git a/htmlreport/setup.py b/htmlreport/setup.py
index 3e049181ce6..9f85000a090 100755
--- a/htmlreport/setup.py
+++ b/htmlreport/setup.py
@@ -16,7 +16,7 @@
     ),
     long_description=readme,
     author="Cppcheck Team",
-    url="https://github.com/danmar/cppcheck",
+    url="https://github.com/cppcheck-opensource/cppcheck",
     license="GPL",
     packages=find_packages(exclude=("tests", "docs")),
     use_scm_version={"root": ".."},
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index d7a94de352e..b826bc0b265 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -12,6 +12,8 @@ function(build_src output filename)
     set(${output} ${${output}} ${outfile} PARENT_SCOPE)
     if (USE_MATCHCOMPILER_OPT STREQUAL "Verify")
         set(verify_option "--verify")
+    else()
+        set(verify_option "")
     endif()
     add_custom_command(
         OUTPUT ${outfile}
@@ -28,6 +30,7 @@ function(build_src output filename)
 endfunction()
 
 if (NOT USE_MATCHCOMPILER_OPT STREQUAL "Off")
+    set(srcs_build "")
     foreach(file ${srcs})
         build_src(srcs_build ${file})
     endforeach()
diff --git a/lib/addoninfo.cpp b/lib/addoninfo.cpp
index a2426d91999..388484916ea 100644
--- a/lib/addoninfo.cpp
+++ b/lib/addoninfo.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,24 +39,36 @@ static std::string getFullPath(const std::string &fileName, const std::string &e
         return "";
 
     const std::string exepath = Path::getPathFromFilename(exename);
-    if (debug)
-        std::cout << "looking for addon '" << (exepath + fileName) << "'" << std::endl;
-    if (Path::isFile(exepath + fileName))
-        return exepath + fileName;
-    if (debug)
-        std::cout << "looking for addon '" << (exepath + "addons/" + fileName) << "'" << std::endl;
-    if (Path::isFile(exepath + "addons/" + fileName))
-        return exepath + "addons/" + fileName;
+    {
+        std::string p = Path::join(exepath, fileName);
+        if (debug)
+            std::cout << "looking for addon '" << p << "'" << std::endl;
+        if (Path::isFile(p))
+            return p;
+    }
+    {
+        std::string p = Path::join(exepath, "addons", fileName);
+        if (debug)
+            std::cout << "looking for addon '" << p << "'" << std::endl;
+        if (Path::isFile(p))
+            return p;
+    }
 
 #ifdef FILESDIR
-    if (debug)
-        std::cout << "looking for addon '" << (FILESDIR + ("/" + fileName)) << "'" << std::endl;
-    if (Path::isFile(FILESDIR + ("/" + fileName)))
-        return FILESDIR + ("/" + fileName);
-    if (debug)
-        std::cout << "looking for addon '" << (FILESDIR + ("/addons/" + fileName)) << "'" << std::endl;
-    if (Path::isFile(FILESDIR + ("/addons/" + fileName)))
-        return FILESDIR + ("/addons/" + fileName);
+    {
+        std::string p = Path::join(FILESDIR, fileName);
+        if (debug)
+            std::cout << "looking for addon '" << p << "'" << std::endl;
+        if (Path::isFile(p))
+            return p;
+    }
+    {
+        std::string p = Path::join(FILESDIR, "addons", fileName);
+        if (debug)
+            std::cout << "looking for addon '" << p << "'" << std::endl;
+        if (Path::isFile(p))
+            return p;
+    }
 #endif
     return "";
 }
@@ -114,6 +126,28 @@ static std::string parseAddonInfo(AddonInfo& addoninfo, const picojson::value &j
         }
     }
 
+    {
+        const auto it = obj.find("checkers");
+        if (it != obj.cend()) {
+            const auto& val = it->second;
+            if (!val.is<picojson::array>())
+                return "Loading " + fileName + " failed. 'checkers' must be an array.";
+            for (const picojson::value &v : val.get<picojson::array>()) {
+                if (!v.is<picojson::object>())
+                    return "Loading " + fileName + " failed. 'checkers' entry is not an object.";
+
+                const picojson::object& checkerObj = v.get<picojson::object>();
+                if (checkerObj.size() == 1) {
+                    const std::string c = checkerObj.begin()->first;
+                    if (!checkerObj.begin()->second.is<std::string>())
+                        return "Loading " + fileName + " failed. 'checkers' entry requirement is not a string.";
+                    const std::string req = checkerObj.begin()->second.get<std::string>();
+                    addoninfo.checkers.emplace(c, req);
+                }
+            }
+        }
+    }
+
     {
         const auto it = obj.find("executable");
         if (it != obj.cend()) {
diff --git a/lib/addoninfo.h b/lib/addoninfo.h
index 592833c2162..902a26c2e12 100644
--- a/lib/addoninfo.h
+++ b/lib/addoninfo.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include <string>
+#include <map>
 
 struct CPPCHECKLIB AddonInfo {
     std::string name;
@@ -31,6 +32,7 @@ struct CPPCHECKLIB AddonInfo {
     std::string python;     // script interpreter
     bool ctu = false;
     std::string runScript;
+    std::map<std::string, std::string> checkers; // checker name and its requirement
 
     std::string getAddonInfo(const std::string &fileName, const std::string &exename, bool debug = false);
 };
diff --git a/lib/analyzer.h b/lib/analyzer.h
index a4546eb7dc4..f2b7460d7cb 100644
--- a/lib/analyzer.h
+++ b/lib/analyzer.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -153,9 +153,13 @@ struct Analyzer {
     struct Assume {
         enum Flags : std::uint8_t {
             None = 0,
-            Quiet = (1 << 0),
-            Absolute = (1 << 1),
-            ContainerEmpty = (1 << 2),
+            Quiet = (1u << 0),
+            Absolute = (1u << 1),
+            ContainerEmpty = (1u << 2),
+            // The branch this condition guards is not traversed yet (a separate path walks it), so
+            // the assume must not record the program state at the branch boundaries - they would be
+            // premature. When unset, the branch has been traversed and control is leaving it.
+            Pending = (1u << 3),
         };
     };
 
diff --git a/lib/analyzerinfo.cpp b/lib/analyzerinfo.cpp
index 9477f2e290d..3bdc6875e63 100644
--- a/lib/analyzerinfo.cpp
+++ b/lib/analyzerinfo.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,12 +21,14 @@
 #include "errorlogger.h"
 #include "filesettings.h"
 #include "path.h"
-#include "utils.h"
 
+#include <array>
 #include <cstring>
 #include <exception>
+#include <iostream>
 #include <map>
 #include <sstream>
+#include <stdexcept>
 #include <utility>
 
 #include "xml.h"
@@ -48,14 +50,76 @@ static std::string getFilename(const std::string &fullpath)
     return fullpath.substr(pos1,pos2);
 }
 
-void AnalyzerInformation::writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::string &userDefines, const std::list<FileSettings> &fileSettings)
+void AnalyzerInformation::writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings)
 {
     const std::string filesTxt(buildDir + "/files.txt");
     std::ofstream fout(filesTxt);
-    fout << getFilesTxt(sourcefiles, userDefines, fileSettings);
+    fout << getFilesTxt(sourcefiles, fileSettings);
 }
 
-std::string AnalyzerInformation::getFilesTxt(const std::list<std::string> &sourcefiles, const std::string &userDefines, const std::list<FileSettings> &fileSettings) {
+void AnalyzerInformation::writeIncludes(const std::set<std::string> &files)
+{
+    if (!files.empty() && mOutputStream.is_open()) {
+        mOutputStream << "  <includes>\n";
+        for (const std::string &file : files) {
+            mOutputStream << "    <filename>" << file << "</filename>\n";
+        }
+        mOutputStream << "  </includes>\n";
+    }
+}
+
+std::set<std::string> AnalyzerInformation::getIncludes(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId) const
+{
+    if (mOutputStream.is_open())
+        throw std::runtime_error("analyzer information file is already open");
+
+    std::set<std::string> files;
+
+    if (buildDir.empty() || sourcefile.empty())
+        return files;
+
+    const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(buildDir, sourcefile, cfg, fsFileId);
+
+    tinyxml2::XMLDocument analyzerInfoDoc;
+    if (analyzerInfoDoc.LoadFile(analyzerInfoFile.c_str()) != tinyxml2::XML_SUCCESS)
+        return files;
+
+    const tinyxml2::XMLElement *const rootNode = analyzerInfoDoc.FirstChildElement();
+    if (rootNode == nullptr)
+        return files;
+
+    if (strcmp(rootNode->Name(), "analyzerinfo") != 0)
+        return files;
+
+    const tinyxml2::XMLElement *includesNode = nullptr;
+    for (const tinyxml2::XMLElement *e = rootNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
+        if (strcmp(e->Name(), "includes") == 0) {
+            includesNode = e;
+            break;
+        }
+    }
+
+    if (includesNode == nullptr)
+        return files;
+
+    for (const tinyxml2::XMLElement *e = includesNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
+        if (strcmp(e->Name(), "filename") != 0)
+            continue;
+
+        files.insert(e->GetText());
+    }
+
+    return files;
+}
+
+void AnalyzerInformation::writeHash(std::size_t hash)
+{
+    if (mOutputStream.is_open()) {
+        mOutputStream << "  <hash>" << hash << "</hash>\n";
+    }
+}
+
+std::string AnalyzerInformation::getFilesTxt(const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings) {
     std::ostringstream ret;
 
     std::map<std::string, unsigned int> fileCount;
@@ -63,13 +127,11 @@ std::string AnalyzerInformation::getFilesTxt(const std::list<std::string> &sourc
     for (const std::string &f : sourcefiles) {
         const std::string afile = getFilename(f);
         ret << afile << ".a" << (++fileCount[afile]) << sep << sep << sep << Path::simplifyPath(f) << '\n';
-        if (!userDefines.empty())
-            ret << afile << ".a" << (++fileCount[afile]) << sep << userDefines << sep << sep << Path::simplifyPath(f) << '\n';
     }
 
     for (const FileSettings &fs : fileSettings) {
         const std::string afile = getFilename(fs.filename());
-        const std::string id = fs.fileIndex > 0 ? std::to_string(fs.fileIndex) : "";
+        const std::string id = fs.file.fsFileId() > 0 ? std::to_string(fs.file.fsFileId()) : "";
         ret << afile << ".a" << (++fileCount[afile]) << sep << fs.cfg << sep << id << sep << Path::simplifyPath(fs.filename()) << std::endl;
     }
 
@@ -78,61 +140,79 @@ std::string AnalyzerInformation::getFilesTxt(const std::list<std::string> &sourc
 
 void AnalyzerInformation::close()
 {
-    mAnalyzerInfoFile.clear();
     if (mOutputStream.is_open()) {
         mOutputStream << "</analyzerinfo>\n";
         mOutputStream.close();
     }
 }
 
-bool AnalyzerInformation::skipAnalysis(const tinyxml2::XMLDocument &analyzerInfoDoc, std::size_t hash, std::list<ErrorMessage> &errors)
+std::string AnalyzerInformation::skipAnalysis(const tinyxml2::XMLDocument &analyzerInfoDoc, std::size_t hash, std::list<ErrorMessage> &errors)
 {
     const tinyxml2::XMLElement * const rootNode = analyzerInfoDoc.FirstChildElement();
     if (rootNode == nullptr)
-        return false;
+        return "no root node found";
 
-    const char *attr = rootNode->Attribute("hash");
-    if (!attr || attr != std::to_string(hash))
-        return false;
+    if (strcmp(rootNode->Name(), "analyzerinfo") != 0)
+        return "unexpected root node";
 
-    // Check for invalid license error or internal error, in which case we should retry analysis
+    const tinyxml2::XMLElement *hashNode = nullptr;
     for (const tinyxml2::XMLElement *e = rootNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
-        if (std::strcmp(e->Name(), "error") == 0 &&
-            (e->Attribute("id", "premium-invalidLicense") ||
-             e->Attribute("id", "premium-internalError") ||
-             e->Attribute("id", "internalError")
-            ))
-            return false;
+        if (strcmp(e->Name(), "hash") == 0) {
+            hashNode = e;
+            break;
+        }
     }
 
+    if (!hashNode)
+        return "no 'hash' node found";
+    if (hashNode->GetText() != std::to_string(hash))
+        return "hash mismatch";
+
     for (const tinyxml2::XMLElement *e = rootNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
-        if (std::strcmp(e->Name(), "error") == 0)
-            errors.emplace_back(e);
+        if (std::strcmp(e->Name(), "error") != 0)
+            continue;
+
+        // TODO: discarding results on internalError doesn't make sense since that won't fix itself
+        // Check for invalid license error or internal error, in which case we should retry analysis
+        static const std::array<const char*, 3> s_ids{
+            "premium-invalidLicense",
+            "premium-internalError",
+            "internalError"
+        };
+        for (const auto* id : s_ids)
+        {
+            // cppcheck-suppress useStlAlgorithm
+            if (e->Attribute("id", id)) {
+                errors.clear();
+                return std::string("'") + id + "' encountered";
+            }
+        }
+
+        errors.emplace_back(e);
     }
 
-    return true;
+    return "";
 }
 
-std::string AnalyzerInformation::getAnalyzerInfoFileFromFilesTxt(std::istream& filesTxt, const std::string &sourcefile, const std::string &cfg, int fileIndex)
+std::string AnalyzerInformation::getAnalyzerInfoFileFromFilesTxt(std::istream& filesTxt, const std::string &sourcefile, const std::string &cfg, size_t fsFileId)
 {
-    const std::string id = (fileIndex > 0) ? std::to_string(fileIndex) : "";
+    const std::string simplifiedSourcefile = Path::simplifyPath(sourcefile);
     std::string line;
-    const std::string end(sep + cfg + sep + id + sep + Path::simplifyPath(sourcefile));
     while (std::getline(filesTxt,line)) {
-        if (line.size() <= end.size() + 2U)
-            continue;
-        if (!endsWith(line, end.c_str(), end.size()))
-            continue;
-        return line.substr(0,line.find(sep));
+        AnalyzerInformation::Info filesTxtInfo;
+        if (!filesTxtInfo.parse(line))
+            continue; // TODO: report error?
+        if (filesTxtInfo.sourceFile == simplifiedSourcefile && filesTxtInfo.cfg == cfg && filesTxtInfo.fsFileId == fsFileId)
+            return filesTxtInfo.afile;
     }
     return "";
 }
 
-std::string AnalyzerInformation::getAnalyzerInfoFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, int fileIndex)
+std::string AnalyzerInformation::getAnalyzerInfoFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId)
 {
     std::ifstream fin(Path::join(buildDir, "files.txt"));
     if (fin.is_open()) {
-        const std::string& ret = getAnalyzerInfoFileFromFilesTxt(fin, sourcefile, cfg, fileIndex);
+        const std::string& ret = getAnalyzerInfoFileFromFilesTxt(fin, sourcefile, cfg, fsFileId);
         if (!ret.empty())
             return Path::join(buildDir, ret);
     }
@@ -143,30 +223,48 @@ std::string AnalyzerInformation::getAnalyzerInfoFile(const std::string &buildDir
         filename = sourcefile;
     else
         filename = sourcefile.substr(pos + 1);
+    // TODO: is this correct? the above code will return files ending in '.aN'. Also does not consider the ID
     return Path::join(buildDir, std::move(filename)) + ".analyzerinfo";
 }
 
-bool AnalyzerInformation::analyzeFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, int fileIndex, std::size_t hash, std::list<ErrorMessage> &errors)
+bool AnalyzerInformation::analyzeFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId, std::size_t hash, std::list<ErrorMessage> &errors, bool debug)
 {
+    if (mOutputStream.is_open())
+        throw std::runtime_error("analyzer information file is already open");
+
     if (buildDir.empty() || sourcefile.empty())
         return true;
-    close();
-
-    mAnalyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(buildDir,sourcefile,cfg,fileIndex);
-
-    tinyxml2::XMLDocument analyzerInfoDoc;
-    const tinyxml2::XMLError xmlError = analyzerInfoDoc.LoadFile(mAnalyzerInfoFile.c_str());
-    if (xmlError == tinyxml2::XML_SUCCESS && skipAnalysis(analyzerInfoDoc, hash, errors))
-        return false;
 
-    mOutputStream.open(mAnalyzerInfoFile);
-    if (mOutputStream.is_open()) {
-        mOutputStream << "<?xml version=\"1.0\"?>\n";
-        mOutputStream << "<analyzerinfo hash=\"" << hash << "\">\n";
-    } else {
-        mAnalyzerInfoFile.clear();
+    const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(buildDir,sourcefile,cfg,fsFileId);
+
+    {
+        tinyxml2::XMLDocument analyzerInfoDoc;
+        const tinyxml2::XMLError xmlError = analyzerInfoDoc.LoadFile(analyzerInfoFile.c_str());
+        if (xmlError == tinyxml2::XML_SUCCESS) {
+            const std::string err = skipAnalysis(analyzerInfoDoc, hash, errors);
+            if (err.empty()) {
+                if (debug)
+                    std::cout << "skipping analysis - loaded " << errors.size() << " cached finding(s) from '" << analyzerInfoFile << "' for '" << sourcefile <<  "'" << std::endl;
+                return false;
+            }
+            if (debug) {
+                std::cout << "discarding cached result from '" << analyzerInfoFile << "' for '" << sourcefile << "' - " << err << std::endl;
+            }
+        }
+        else if (xmlError != tinyxml2::XML_ERROR_FILE_NOT_FOUND) {
+            if (debug)
+                std::cout << "discarding cached result - failed to load '" << analyzerInfoFile << "' for '" << sourcefile << "' (" << tinyxml2::XMLDocument::ErrorIDToName(xmlError) << ")" << std::endl;
+        }
+        else if (debug)
+            std::cout << "no cached result '" << analyzerInfoFile << "' for '" << sourcefile << "' found" << std::endl;
     }
 
+    mOutputStream.open(analyzerInfoFile);
+    if (!mOutputStream.is_open())
+        throw std::runtime_error("failed to open '" + analyzerInfoFile + "'");
+    mOutputStream << "<?xml version=\"1.0\"?>\n";
+    mOutputStream << "<analyzerinfo>\n";
+
     return true;
 }
 
@@ -182,6 +280,7 @@ void AnalyzerInformation::setFileInfo(const std::string &check, const std::strin
         mOutputStream << "  <FileInfo check=\"" << check << "\">\n" << fileInfo << "  </FileInfo>\n";
 }
 
+// TODO: report detailed errors?
 bool AnalyzerInformation::Info::parse(const std::string& filesTxtLine) {
     const std::string::size_type sep1 = filesTxtLine.find(sep);
     if (sep1 == std::string::npos)
@@ -194,10 +293,10 @@ bool AnalyzerInformation::Info::parse(const std::string& filesTxtLine) {
         return false;
 
     if (sep3 == sep2 + 1)
-        fileIndex = 0;
+        fsFileId = 0;
     else {
         try {
-            fileIndex = std::stoi(filesTxtLine.substr(sep2+1, sep3-sep2-1));
+            fsFileId = std::stoi(filesTxtLine.substr(sep2+1, sep3-sep2-1));
         } catch (const std::exception&) {
             return false;
         }
@@ -209,3 +308,78 @@ bool AnalyzerInformation::Info::parse(const std::string& filesTxtLine) {
     return true;
 }
 
+std::string AnalyzerInformation::processFilesTxt(const std::string& buildDir, const std::function<void(const char* checkattr, const tinyxml2::XMLElement* e, const Info& filesTxtInfo)>& handler, bool debug)
+{
+    const std::string filesTxt(buildDir + "/files.txt");
+    std::ifstream fin(filesTxt.c_str());
+    std::string filesTxtLine;
+    while (std::getline(fin, filesTxtLine)) {
+        AnalyzerInformation::Info filesTxtInfo;
+        if (!filesTxtInfo.parse(filesTxtLine))
+            return "failed to parse '" + filesTxtLine + "' from '" + filesTxt + "'";
+
+        if (filesTxtInfo.afile.empty())
+            return "empty afile from '" + filesTxt + "'";
+
+        const std::string xmlfile = buildDir + '/' + filesTxtInfo.afile;
+
+        tinyxml2::XMLDocument doc;
+        const tinyxml2::XMLError error = doc.LoadFile(xmlfile.c_str());
+        if (error == tinyxml2::XML_ERROR_FILE_NOT_FOUND) {
+            /* FIXME: this can currently not be reported as an error because:
+             * - --clang does not generate any analyzer information - see #14456
+             * - markup files might not generate analyzer information
+             * - files with preprocessor errors might not generate analyzer information
+             */
+            if (debug)
+                std::cout << "'" + xmlfile + "' from '" + filesTxt + "' not found";
+            continue;
+        }
+
+        if (error != tinyxml2::XML_SUCCESS)
+            return "failed to load '" + xmlfile + "' from '" + filesTxt + "'";
+
+        const tinyxml2::XMLElement * const rootNode = doc.FirstChildElement();
+        if (rootNode == nullptr)
+            return "no root node found in '" + xmlfile + "' from '" + filesTxt + "'";
+
+        if (strcmp(rootNode->Name(), "analyzerinfo") != 0)
+            return "unexpected root node in '" + xmlfile + "' from '" + filesTxt + "'";
+
+        for (const tinyxml2::XMLElement *e = rootNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
+            if (std::strcmp(e->Name(), "FileInfo") != 0)
+                continue;
+            const char *checkattr = e->Attribute("check");
+            if (checkattr == nullptr) {
+                if (debug)
+                    std::cout << "'check' attribute missing in 'FileInfo' in '" << xmlfile << "' from '" << filesTxt + "'";
+                continue;
+            }
+            handler(checkattr, e, filesTxtInfo);
+        }
+    }
+
+    // TODO: error on empty file?
+    return "";
+}
+
+void AnalyzerInformation::reopen(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId)
+{
+    if (buildDir.empty() || sourcefile.empty())
+        return;
+
+    const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(buildDir,sourcefile,cfg,fsFileId);
+    std::ifstream ifs(analyzerInfoFile);
+    if (!ifs.is_open())
+        return;
+
+    std::ostringstream iss;
+    iss << ifs.rdbuf();
+    ifs.close();
+
+    std::string content = iss.str();
+    content.resize(content.find("</analyzerinfo>"));
+
+    mOutputStream.open(analyzerInfoFile, std::ios::trunc);
+    mOutputStream << content;
+}
diff --git a/lib/analyzerinfo.h b/lib/analyzerinfo.h
index 732587e0a71..75ff519db84 100644
--- a/lib/analyzerinfo.h
+++ b/lib/analyzerinfo.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,9 @@
 
 #include <cstddef>
 #include <fstream>
+#include <functional>
 #include <list>
+#include <set>
 #include <string>
 
 class ErrorMessage;
@@ -33,7 +35,8 @@ struct FileSettings;
 
 namespace tinyxml2 {
     class XMLDocument;
-};
+    class XMLElement;
+}
 
 /// @addtogroup Core
 /// @{
@@ -55,14 +58,22 @@ class CPPCHECKLIB AnalyzerInformation {
 public:
     ~AnalyzerInformation();
 
-    static void writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::string &userDefines, const std::list<FileSettings> &fileSettings);
+    static void writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings);
 
     /** Close current TU.analyzerinfo file */
     void close();
-    bool analyzeFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, int fileIndex, std::size_t hash, std::list<ErrorMessage> &errors);
+    /**
+     * @throws std::runtime_error thrown if the output file is already open or the output file cannot be opened
+     */
+    bool analyzeFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId, std::size_t hash, std::list<ErrorMessage> &errors, bool debug = false);
     void reportErr(const ErrorMessage &msg);
     void setFileInfo(const std::string &check, const std::string &fileInfo);
-    static std::string getAnalyzerInfoFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, int fileIndex);
+    void writeIncludes(const std::set<std::string> &files);
+    std::set<std::string> getIncludes(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId) const;
+    void writeHash(std::size_t hash);
+    static std::string getAnalyzerInfoFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId);
+
+    void reopen(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId);
 
     static const char sep = ':';
 
@@ -71,20 +82,21 @@ class CPPCHECKLIB AnalyzerInformation {
         bool parse(const std::string& filesTxtLine);
         std::string afile;
         std::string cfg;
-        int fileIndex = 0;
+        std::size_t fsFileId = 0;
         std::string sourceFile;
     };
 
+    static std::string processFilesTxt(const std::string& buildDir, const std::function<void(const char* checkattr, const tinyxml2::XMLElement* e, const Info& filesTxtInfo)>& handler, bool debug = false);
+
 protected:
-    static std::string getFilesTxt(const std::list<std::string> &sourcefiles, const std::string &userDefines, const std::list<FileSettings> &fileSettings);
+    static std::string getFilesTxt(const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings);
 
-    static std::string getAnalyzerInfoFileFromFilesTxt(std::istream& filesTxt, const std::string &sourcefile, const std::string &cfg, int fileIndex);
+    static std::string getAnalyzerInfoFileFromFilesTxt(std::istream& filesTxt, const std::string &sourcefile, const std::string &cfg, size_t fsFileId);
 
-    static bool skipAnalysis(const tinyxml2::XMLDocument &analyzerInfoDoc, std::size_t hash, std::list<ErrorMessage> &errors);
+    static std::string skipAnalysis(const tinyxml2::XMLDocument &analyzerInfoDoc, std::size_t hash, std::list<ErrorMessage> &errors);
 
 private:
     std::ofstream mOutputStream;
-    std::string mAnalyzerInfoFile;
 };
 
 /// @}
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
index c91f41d9651..e2e19b6bd91 100644
--- a/lib/astutils.cpp
+++ b/lib/astutils.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
 #include "infer.h"
 #include "library.h"
 #include "mathlib.h"
+#include "refthunk.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
@@ -320,12 +321,12 @@ Library::Container::Yield astContainerYield(const Token* tok, const Library& lib
     return ftokCont.second->getYield(ftokCont.first->str());
 }
 
-Library::Container::Yield astFunctionYield(const Token* tok, const Settings& settings, const Token** ftok)
+Library::Container::Yield astFunctionYield(const Token* tok, const Library& library, const Token** ftok)
 {
     if (!tok)
         return Library::Container::Yield::NO_YIELD;
 
-    const auto* function = settings.library.getFunction(tok);
+    const auto* function = library.getFunction(tok);
     if (!function)
         return Library::Container::Yield::NO_YIELD;
 
@@ -400,6 +401,8 @@ const Token * astIsVariableComparison(const Token *tok, const std::string &comp,
     }
     while (ret && ret->str() == ".")
         ret = ret->astOperand2();
+    while (ret && ret->isCast())
+        ret = ret->astOperand2() ? ret->astOperand2() : ret->astOperand1();
     if (ret && ret->str() == "=" && ret->astOperand1() && ret->astOperand1()->varId())
         ret = ret->astOperand1();
     else if (ret && ret->varId() == 0U)
@@ -461,7 +464,7 @@ bool isTemporary(const Token* tok, const Library* library, bool unknown)
             return false;
         return !branchTok->astOperand1()->valueType()->isTypeEqual(branchTok->astOperand2()->valueType());
     }
-    if (Token::simpleMatch(tok, "(") && tok->astOperand1() &&
+    if (Token::Match(tok, "(|{") && tok->astOperand1() &&
         (tok->astOperand2() || Token::simpleMatch(tok->next(), ")"))) {
         if (Token::simpleMatch(tok->astOperand1(), "typeid"))
             return false;
@@ -493,14 +496,9 @@ bool isTemporary(const Token* tok, const Library* library, bool unknown)
         }
         return unknown;
     }
-    if (tok->isCast())
-        return false;
     // Currying a function is unknown in cppcheck
     if (Token::simpleMatch(tok, "(") && Token::simpleMatch(tok->astOperand1(), "("))
         return unknown;
-    if (Token::simpleMatch(tok, "{") && Token::simpleMatch(tok->astParent(), "return") && tok->astOperand1() &&
-        !tok->astOperand2())
-        return isTemporary(tok->astOperand1(), library);
     return true;
 }
 
@@ -1072,6 +1070,17 @@ bool isAliasOf(const Token *tok, nonneg int varid, bool* inconclusive)
     return false;
 }
 
+bool isIteratorOf(const Token* tok, nonneg int exprId)
+{
+    if (!astIsIterator(tok))
+        return false;
+    // An iterator into a subcontainer (e.g. c[0].begin()) aliases the container but iterates
+    // an unrelated range, so require an iterator value recording the container itself
+    return std::any_of(tok->values().cbegin(), tok->values().cend(), [&](const ValueFlow::Value& v) {
+        return v.isIteratorValue() && v.container && v.container->exprId() == exprId;
+    });
+}
+
 bool isAliasOf(const Token* tok, const Token* expr, nonneg int* indirect)
 {
     if (indirect)
@@ -1084,7 +1093,7 @@ bool isAliasOf(const Token* tok, const Token* expr, nonneg int* indirect)
         r = findAstNode(expr, [&](const Token* childTok) {
             if (childTok->exprId() == 0)
                 return false;
-            if (ref.token != tok && expr->exprId() == childTok->exprId()) {
+            if (ref.token != tok && expr->exprId() == childTok->exprId() && ref.token->isUnaryOp("*") && expr->exprId() == ref.token->astOperand1()->exprId()) {
                 if (indirect)
                     *indirect = 0;
                 return true;
@@ -1151,6 +1160,8 @@ bool exprDependsOnThis(const Token* expr, bool onVar, nonneg int depth)
         }
         if (expr->isOperatorKeyword() && !Token::simpleMatch(expr->next()->astParent(), "."))
             return true;
+        if (expr->variable() && expr->variable()->isArgument() && !expr->variable()->type() && expr->variable()->scope()->function && expr->variable()->scope()->function->templateDef)
+            return true;
     }
     if (onVar && expr->variable()) {
         const Variable* var = expr->variable();
@@ -1544,10 +1555,8 @@ bool isUsedAsBool(const Token* const tok, const Settings& settings)
         return true;
     if (parent->isCast())
         return !Token::simpleMatch(parent->astOperand1(), "dynamic_cast") && isUsedAsBool(parent, settings);
-    if (parent->isUnaryOp("*"))
-        return isUsedAsBool(parent, settings);
-    if (Token::Match(parent, "==|!=") && (tok->astSibling()->isNumber() || tok->astSibling()->isKeyword()) && tok->astSibling()->hasKnownIntValue() &&
-        tok->astSibling()->getKnownIntValue() == 0)
+    if (Token::Match(parent, "==|!=") && ((tok->valueType() && tok->valueType()->pointer) || tok->function()) &&
+        tok->astSibling()->hasKnownIntValue() && tok->astSibling()->getKnownIntValue() == 0)
         return true;
     if (parent->str() == "(" && astIsRHS(tok) && Token::Match(parent->astOperand1(), "if|while"))
         return true;
@@ -1705,7 +1714,7 @@ bool isSameExpression(bool macro, const Token *tok1, const Token *tok2, const Se
                     compare = true;
                 }
             }
-            if (compare && astIsBoolLike(varTok1, settings) && astIsBoolLike(varTok2, settings))
+            if (compare && varTok1 != varTok2 && astIsBoolLike(varTok1, settings) && astIsBoolLike(varTok2, settings))
                 return isSameExpression(macro, varTok1, varTok2, settings, pure, followVar, errors);
 
         }
@@ -1810,21 +1819,31 @@ bool isSameExpression(bool macro, const Token *tok1, const Token *tok2, const Se
     return commutativeEquals;
 }
 
-static bool isZeroBoundCond(const Token * const cond)
+static bool isZeroBoundCond(const Token * const cond, bool reverse)
 {
-    if (cond == nullptr)
+    if (cond == nullptr || !cond->isBinaryOp())
         return false;
+
+    const Token* op = reverse ? cond->astOperand1() : cond->astOperand2();
+    if (!op->hasKnownIntValue())
+        return true;
+
     // Assume unsigned
-    // TODO: Handle reverse conditions
-    const bool isZero = cond->astOperand2()->getValue(0);
-    if (cond->str() == "==" || cond->str() == ">=")
+    const bool isZero = op->getKnownIntValue() == 0;
+    std::string cmp = cond->str();
+    if (reverse) {
+        if (cmp[0] == '>')
+            cmp[0] = '<';
+        else if (cmp[0] == '<')
+            cmp[0] = '>';
+    }
+
+    if (cmp == "==" || cmp == ">=")
         return isZero;
-    if (cond->str() == "<=")
+    if (cmp == "<=")
         return true;
-    if (cond->str() == "<")
+    if (cmp == "<")
         return !isZero;
-    if (cond->str() == ">")
-        return false;
     return false;
 }
 
@@ -1888,7 +1907,7 @@ bool isOppositeCond(bool isNot, const Token * const cond1, const Token * const c
             if (isSameExpression(true, cond1->astOperand2(), cond2->astOperand2(), settings, pure, followVar, errors))
                 return isDifferentKnownValues(cond1->astOperand1(), cond2->astOperand1());
         }
-        // TODO: Handle reverse conditions
+
         if (Library::isContainerYield(cond1, Library::Container::Yield::EMPTY, "empty") &&
             Library::isContainerYield(cond2->astOperand1(), Library::Container::Yield::SIZE, "size") &&
             isSameExpression(true,
@@ -1898,7 +1917,19 @@ bool isOppositeCond(bool isNot, const Token * const cond1, const Token * const c
                              pure,
                              followVar,
                              errors)) {
-            return !isZeroBoundCond(cond2);
+            return !isZeroBoundCond(cond2, false);
+        }
+
+        if (Library::isContainerYield(cond1, Library::Container::Yield::EMPTY, "empty") &&
+            Library::isContainerYield(cond2->astOperand2(), Library::Container::Yield::SIZE, "size") &&
+            isSameExpression(true,
+                             cond1->astOperand1()->astOperand1(),
+                             cond2->astOperand2()->astOperand1()->astOperand1(),
+                             settings,
+                             pure,
+                             followVar,
+                             errors)) {
+            return !isZeroBoundCond(cond2, true);
         }
 
         if (Library::isContainerYield(cond2, Library::Container::Yield::EMPTY, "empty") &&
@@ -1910,7 +1941,19 @@ bool isOppositeCond(bool isNot, const Token * const cond1, const Token * const c
                              pure,
                              followVar,
                              errors)) {
-            return !isZeroBoundCond(cond1);
+            return !isZeroBoundCond(cond1, false);
+        }
+
+        if (Library::isContainerYield(cond2, Library::Container::Yield::EMPTY, "empty") &&
+            Library::isContainerYield(cond1->astOperand2(), Library::Container::Yield::SIZE, "size") &&
+            isSameExpression(true,
+                             cond2->astOperand1()->astOperand1(),
+                             cond1->astOperand2()->astOperand1()->astOperand1(),
+                             settings,
+                             pure,
+                             followVar,
+                             errors)) {
+            return !isZeroBoundCond(cond1, true);
         }
     }
 
@@ -2006,9 +2049,7 @@ bool isOppositeExpression(const Token * const tok1, const Token * const tok2, co
 static bool functionModifiesArguments(const Function* f)
 {
     return std::any_of(f->argumentList.cbegin(), f->argumentList.cend(), [](const Variable& var) {
-        if (var.isReference() || var.isPointer())
-            return !var.isConst();
-        return true;
+        return var.isReference() && !var.isConst();
     });
 }
 
@@ -2089,7 +2130,7 @@ bool isConstFunctionCall(const Token* ftok, const Library& library)
             return false;
         });
     }
-    return true;
+    return false;
 }
 
 bool isConstExpression(const Token *tok, const Library& library)
@@ -2125,7 +2166,8 @@ bool isWithoutSideEffects(const Token* tok, bool checkArrayAccess, bool checkRef
         tok = tok->astOperand2();
     if (tok && tok->varId()) {
         const Variable* var = tok->variable();
-        return var && ((!var->isClass() && (checkReference || !var->isReference())) || var->isPointer() || (checkArrayAccess ? var->isStlType() && !var->isStlType(CheckClass::stl_containers_not_const) : var->isStlType()));
+        return var && ((!var->isClass() && (checkReference || !var->isReference())) || var->isPointer() ||
+                       (checkArrayAccess ? var->isArray() || (var->isStlType() && !var->isStlType(CheckClassImpl::stl_containers_not_const)) : var->isStlType()));
     }
     return true;
 }
@@ -2198,21 +2240,18 @@ static bool isEscapedOrJump(const Token* tok, bool functionsScope, const Library
     return Token::Match(tok, "return|goto|throw|continue|break");
 }
 
+static bool isNoreturnFunction(const Token* ftok, const Library& library)
+{
+    if (const Function* function = ftok->function())
+        return function->isEscapeFunction() || function->isAttributeNoreturn();
+    return library.isnoreturn(ftok);
+}
+
 bool isEscapeFunction(const Token* ftok, const Library& library)
 {
     if (!Token::Match(ftok, "%name% ("))
         return false;
-    const Function* function = ftok->function();
-    if (function) {
-        if (function->isEscapeFunction())
-            return true;
-        if (function->isAttributeNoreturn())
-            return true;
-    } else {
-        if (library.isnoreturn(ftok))
-            return true;
-    }
-    return false;
+    return isNoreturnFunction(ftok, library);
 }
 
 static bool hasNoreturnFunction(const Token* tok, const Library& library, const Token** unknownFunc)
@@ -2223,18 +2262,9 @@ static bool hasNoreturnFunction(const Token* tok, const Library& library, const
     while (Token::simpleMatch(ftok, "("))
         ftok = ftok->astOperand1();
     if (ftok) {
-        const Function * function = ftok->function();
-        if (function) {
-            if (function->isEscapeFunction())
-                return true;
-            if (function->isAttributeNoreturn())
-                return true;
-        } else if (library.isnoreturn(ftok)) {
-            return true;
-        } else if (Token::Match(ftok, "exit|abort")) {
+        if (isNoreturnFunction(ftok, library))
             return true;
-        }
-        if (unknownFunc && !function && library.functions().count(library.getFunctionName(ftok)) == 0)
+        if (unknownFunc && !ftok->function() && library.functions().count(library.getFunctionName(ftok)) == 0)
             *unknownFunc = ftok;
         return false;
     }
@@ -2306,14 +2336,14 @@ bool isWithinScope(const Token* tok, const Variable* var, ScopeType type)
     return false;
 }
 
-bool isVariableChangedByFunctionCall(const Token *tok, int indirect, nonneg int varid, const Settings &settings, bool *inconclusive)
+bool isVariableChangedByFunctionCall(const Token *tok, int indirect, nonneg int varid, const Library &library, bool *inconclusive)
 {
     if (!tok)
         return false;
     if (tok->varId() == varid)
-        return isVariableChangedByFunctionCall(tok, indirect, settings, inconclusive);
-    return isVariableChangedByFunctionCall(tok->astOperand1(), indirect, varid, settings, inconclusive) ||
-           isVariableChangedByFunctionCall(tok->astOperand2(), indirect, varid, settings, inconclusive);
+        return isVariableChangedByFunctionCall(tok, indirect, library, inconclusive);
+    return isVariableChangedByFunctionCall(tok->astOperand1(), indirect, varid, library, inconclusive) ||
+           isVariableChangedByFunctionCall(tok->astOperand2(), indirect, varid, library, inconclusive);
 }
 
 bool isScopeBracket(const Token* tok)
@@ -2471,24 +2501,6 @@ static bool isTrivialConstructor(const Token* tok)
     return false;
 }
 
-static bool isArray(const Token* tok)
-{
-    if (!tok)
-        return false;
-    if (tok->variable())
-        return tok->variable()->isArray();
-    if (Token::simpleMatch(tok, "."))
-        return isArray(tok->astOperand2());
-    return false;
-}
-
-static inline
-// limit it to CLang as compiling with GCC might fail with
-// error: inlining failed in call to always_inline 'bool isMutableExpression(const Token*)': function not considered for inlining
-// error: inlining failed in call to ‘always_inline’ ‘bool isMutableExpression(const Token*)’: recursive inlining
-#if defined(__clang__)
-__attribute__((always_inline))
-#endif
 bool isMutableExpression(const Token* tok)
 {
     if (!tok)
@@ -2506,15 +2518,13 @@ bool isMutableExpression(const Token* tok)
     if (tok->astOperand1() && Token::simpleMatch(tok, "["))
         return isMutableExpression(tok->astOperand1());
     if (const Variable* var = tok->variable()) {
-        if (var->nameToken() == tok)
-            return false;
-        if (!var->isPointer() && var->isConst())
+        if (var->isConst() && !var->isPointer() && (!var->isArray() || !var->isArgument()))
             return false;
     }
     return true;
 }
 
-bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Settings &settings, bool *inconclusive)
+bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Library &library, bool *inconclusive)
 {
     if (!tok)
         return false;
@@ -2554,20 +2564,13 @@ bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Setti
 
     if (!tok->function() && !tok->variable() && tok->isName()) {
         // Check if direction (in, out, inout) is specified in the library configuration and use that
-        const Library::ArgumentChecks::Direction argDirection = settings.library.getArgDirection(tok, 1 + argnr, indirect);
+        const Library::ArgumentChecks::Direction argDirection = library.getArgDirection(tok, 1 + argnr, indirect);
         if (argDirection == Library::ArgumentChecks::Direction::DIR_IN)
             return false;
+        if (argDirection == Library::ArgumentChecks::Direction::DIR_OUT || argDirection == Library::ArgumentChecks::Direction::DIR_INOUT)
+            return true;
 
-        const bool requireNonNull = settings.library.isnullargbad(tok, 1 + argnr);
-        if (argDirection == Library::ArgumentChecks::Direction::DIR_OUT ||
-            argDirection == Library::ArgumentChecks::Direction::DIR_INOUT) {
-            if (indirect == 0 && isArray(tok1))
-                return true;
-            const bool requireInit = settings.library.isuninitargbad(tok, 1 + argnr);
-            // Assume that if the variable must be initialized then the indirection is 1
-            if (indirect > 0 && requireInit && requireNonNull)
-                return true;
-        }
+        const bool requireNonNull = library.isnullargbad(tok, 1 + argnr);
         if (Token::simpleMatch(tok->tokAt(-2), "std :: tie"))
             return true;
         // if the library says 0 is invalid
@@ -2587,6 +2590,8 @@ bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Setti
     if (const Variable* var = tok->variable()) {
         if (tok == var->nameToken() && (!var->isReference() || (var->isConst() && var->type() == tok1->type())) && (!var->isClass() || (var->valueType() && var->valueType()->container))) // const ref or passed to (copy) ctor
             return false;
+        if (var->isArray() && var->valueType() && var->valueType()->pointer == 0 && var->valueType()->isPrimitive())
+            return false;
     }
 
     std::vector<const Variable*> args = getArgumentVars(tok, argnr);
@@ -2632,10 +2637,12 @@ static bool hasOverloadedMemberAccess(const Token* tok)
 
 bool isVariableChanged(const Token *tok, int indirect, const Settings &settings, int depth)
 {
-    if (!isMutableExpression(tok))
+    if (!tok)
+        return false;
+    if (!tok->isMutableExpr())
         return false;
 
-    if (indirect == 0 && isConstVarExpression(tok))
+    if (isConstVarExpression(tok))
         return false;
 
     const Token *tok2 = tok;
@@ -2643,7 +2650,8 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings &settings,
     while ((tok2->astParent() && tok2->astParent()->isUnaryOp("*")) ||
            (Token::simpleMatch(tok2->astParent(), ".") && !Token::Match(tok2->astParent()->astParent(), "[(,]")) ||
            (tok2->astParent() && tok2->astParent()->isUnaryOp("&") && Token::simpleMatch(tok2->astParent()->astParent(), ".") && tok2->astParent()->astParent()->originalName()=="->") ||
-           (Token::simpleMatch(tok2->astParent(), "[") && tok2 == tok2->astParent()->astOperand1())) {
+           (Token::simpleMatch(tok2->astParent(), "[") && tok2 == tok2->astParent()->astOperand1()) ||
+           (Token::simpleMatch(tok2->astParent(), "(") && tok2->astParent()->isCast())) {
         if (tok2->astParent() && (tok2->astParent()->isUnaryOp("*") || (astIsLHS(tok2) && tok2->astParent()->originalName() == "->" && !hasOverloadedMemberAccess(tok2))))
             derefs++;
         if (derefs > indirect)
@@ -2699,7 +2707,7 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings &settings,
         if (isVariableChanged(tok2->astParent(), indirect + 1, settings, depth - 1))
             return true;
     } else {
-        // If its already const then it cant be modified
+        // If its already const then it can't be modified
         if (vt && vt->isConst(indirect))
             return false;
     }
@@ -2784,13 +2792,13 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings &settings,
         if (ftok->str() == "(" && Token::simpleMatch(ftok->astOperand1(), "[")) // operator() on array element, bail out
             return true;
         const Token * ptok = tok2;
-        while (Token::Match(ptok->astParent(), ".|::|["))
+        while (Token::Match(ptok->astParent(), ".|::"))
             ptok = ptok->astParent();
         int pindirect = indirect;
         if (indirect == 0 && astIsLHS(tok2) && Token::Match(ptok, ". %var%") && astIsPointer(ptok->next()))
             pindirect = 1;
         bool inconclusive = false;
-        bool isChanged = isVariableChangedByFunctionCall(ptok, pindirect, settings, &inconclusive);
+        bool isChanged = isVariableChangedByFunctionCall(ptok, pindirect, settings.library, &inconclusive);
         isChanged |= inconclusive;
         if (isChanged)
             return true;
@@ -2924,7 +2932,9 @@ static bool isExpressionChangedAt(const F& getExprTok,
 {
     if (depth < 0)
         return true;
-    if (!isMutableExpression(tok))
+    if (!tok)
+        return false;
+    if (!tok->isMutableExpr())
         return false;
     if (tok->exprId() != exprid || (!tok->varId() && !tok->isName())) {
         if (globalvar && Token::Match(tok, "%name% (") &&
@@ -3005,7 +3015,7 @@ bool isVariableChanged(const Variable * var, const Settings &settings, int depth
     const Token * start = var->declEndToken();
     if (!start)
         return false;
-    if (Token::Match(start, "; %varid% =", var->declarationId()))
+    if (start->isSplittedVarDeclEq() && Token::Match(start, "; %varid% =", var->declarationId()))
         start = start->tokAt(2);
     if (Token::simpleMatch(start, "=")) {
         const Token* next = nextAfterAstRightmostLeafGeneric(start);
@@ -3091,10 +3101,7 @@ static const Token* findExpressionChangedImpl(const Token* expr,
         }
         bool global = false;
         if (tok->variable()) {
-            if (tok->variable()->isConst())
-                return false;
-            global = !tok->variable()->isLocal() && !tok->variable()->isArgument() &&
-                     !(tok->variable()->isMember() && !tok->variable()->isStatic());
+            global = !tok->variable()->isLocal() && !tok->variable()->isArgument();
         } else if (tok->isIncompleteVar() && !tok->isIncompleteConstant()) {
             global = true;
         }
@@ -3107,6 +3114,8 @@ static const Token* findExpressionChangedImpl(const Token* expr,
                     if (vt->type == ValueType::ITERATOR)
                         ++indirect;
                 }
+                if (indirect == 0 && tok2->astParent() && tok2->astParent()->isUnaryOp("*"))
+                    ++indirect;
                 for (int i = 0; i <= indirect; ++i) {
                     if (isExpressionChangedAt(tok, tok2, i, global, settings, depth))
                         return true;
@@ -3133,7 +3142,7 @@ namespace {
     };
 
     struct ExpressionChangedSkipDeadCode {
-        const Library& library;
+        RefThunk<const Library> library;
         const std::function<std::vector<MathLib::bigint>(const Token* tok)>* evaluate;
         ExpressionChangedSkipDeadCode(const Library& library,
                                       const std::function<std::vector<MathLib::bigint>(const Token* tok)>& evaluate)
@@ -3298,12 +3307,12 @@ static T* findLambdaEndTokenGeneric(T* first)
         return nullptr;
     if (!maybeLambda(first->previous()))
         return nullptr;
-    if (!Token::Match(first->link(), "] (|{|<"))
+    if (!Token::Match(first->link(), "] [({<.]"))
         return nullptr;
     const Token* roundOrCurly = first->link()->next();
     if (roundOrCurly->link() && roundOrCurly->str() == "<")
         roundOrCurly = roundOrCurly->link()->next();
-    if (first->astOperand1() != roundOrCurly)
+    if (first->astOperand1() != roundOrCurly && roundOrCurly->str() != ".")
         return nullptr;
     T * tok = first;
 
@@ -3376,7 +3385,7 @@ bool isConstVarExpression(const Token *tok, const std::function<bool(const Token
     if (!tok)
         return false;
     if (tok->str() == "?" && tok->astOperand2() && tok->astOperand2()->str() == ":") // ternary operator
-        return isConstVarExpression(tok->astOperand2()->astOperand1()) && isConstVarExpression(tok->astOperand2()->astOperand2()); // left and right of ":"
+        return isConstVarExpression(tok->astOperand2()->astOperand1()) || isConstVarExpression(tok->astOperand2()->astOperand2()); // left and right of ":"
     if (skipPredicate && skipPredicate(tok))
         return false;
     if (Token::simpleMatch(tok->previous(), "sizeof ("))
@@ -3414,7 +3423,7 @@ bool isConstVarExpression(const Token *tok, const std::function<bool(const Token
     return false;
 }
 
-static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Settings& settings)
+static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Library& library)
 {
     const bool addressOf = tok->astParent() && tok->astParent()->isUnaryOp("&");
 
@@ -3426,13 +3435,19 @@ static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Settings
     // variable init/constructor call?
     if (!func && ftok->variable() && ftok == ftok->variable()->nameToken()) {
         // STL types or containers don't initialize external variables
-        if (ftok->variable()->isStlType() || (ftok->variable()->valueType() && ftok->variable()->valueType()->container))
+        if (indirect == 0 && (ftok->variable()->isStlType() || (ftok->variable()->valueType() && ftok->variable()->valueType()->container)))
             return ExprUsage::Used;
         // TODO: resolve multiple constructors
         if (ftok->variable()->type() && ftok->variable()->type()->classScope) {
             const int nCtor = ftok->variable()->type()->classScope->numConstructors;
-            if (nCtor == 0)
+            if (nCtor == 0) {
+                if (indirect > 0) {
+                    const std::vector<const Variable*> argvar = getArgumentVars(ftok->astParent(), argnr);
+                    if (argvar.size() == 1 && argvar[0]->valueType() && argvar[0]->valueType()->pointer == indirect)
+                        return ExprUsage::NotUsed;
+                }
                 return ExprUsage::Used;
+            }
             if (nCtor == 1) {
                 const Scope* scope = ftok->variable()->type()->classScope;
                 auto it = std::find_if(scope->functionList.begin(), scope->functionList.end(), [](const Function& f) {
@@ -3470,13 +3485,18 @@ static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Settings
     } else if (ftok->str() == "{") {
         return indirect == 0 ? ExprUsage::Used : ExprUsage::Inconclusive;
     } else {
-        const bool isnullbad = settings.library.isnullargbad(ftok, argnr + 1);
+        const bool isnullbad = library.isnullargbad(ftok, argnr + 1);
         if (indirect == 0 && astIsPointer(tok) && !addressOf && isnullbad)
             return ExprUsage::Used;
         bool hasIndirect = false;
-        const bool isuninitbad = settings.library.isuninitargbad(ftok, argnr + 1, indirect, &hasIndirect);
+        const bool isuninitbad = library.isuninitargbad(ftok, argnr + 1, indirect, &hasIndirect);
         if (isuninitbad && (!addressOf || isnullbad))
             return ExprUsage::Used;
+        const Library::ArgumentChecks::Direction argDirection = library.getArgDirection(ftok, argnr + 1, indirect);
+        if (argDirection == Library::ArgumentChecks::Direction::DIR_IN) // TODO: DIR_INOUT?
+            return ExprUsage::Used;
+        if (argDirection == Library::ArgumentChecks::Direction::DIR_OUT)
+            return ExprUsage::NotUsed;
     }
     return ExprUsage::Inconclusive;
 }
@@ -3542,7 +3562,7 @@ ExprUsage getExprUsage(const Token* tok, int indirect, const Settings& settings)
             (astIsLHS(tok) || Token::simpleMatch(parent, "( )")))
             return ExprUsage::Used;
     }
-    return getFunctionUsage(tok, indirect, settings);
+    return getFunctionUsage(tok, indirect, settings.library);
 }
 
 static void getLHSVariablesRecursive(std::vector<const Variable*>& vars, const Token* tok)
@@ -3677,21 +3697,27 @@ bool isGlobalData(const Token *expr)
             globalData = true;
             return ChildrenToVisit::none;
         }
-        if (Token::Match(tok, "[*[]") && tok->astOperand1() && tok->astOperand1()->variable()) {
+        if (Token::Match(tok, "[*[]") && tok->astOperand1()) {
             // TODO check if pointer points at local data
-            const Variable *lhsvar = tok->astOperand1()->variable();
-            const ValueType *lhstype = tok->astOperand1()->valueType();
-            if (lhsvar->isPointer() || !lhstype || lhstype->type == ValueType::Type::ITERATOR) {
-                globalData = true;
-                return ChildrenToVisit::none;
-            }
-            if (lhsvar->isArgument() && lhsvar->isArray()) {
-                globalData = true;
-                return ChildrenToVisit::none;
+            const Token *lhs = tok->astOperand1();
+            if (lhs->isCast()) {
+                lhs = lhs->astOperand2() ? lhs->astOperand2() : lhs->astOperand1();
             }
-            if (lhsvar->isArgument() && lhstype->type <= ValueType::Type::VOID && !lhstype->container) {
-                globalData = true;
-                return ChildrenToVisit::none;
+            if (lhs && lhs->variable()) {
+                const Variable *lhsvar = lhs->variable();
+                const ValueType *lhstype = lhs->valueType();
+                if (lhsvar->isPointer() || !lhstype || lhstype->type == ValueType::Type::ITERATOR) {
+                    globalData = true;
+                    return ChildrenToVisit::none;
+                }
+                if (lhsvar->isArgument() && lhsvar->isArray()) {
+                    globalData = true;
+                    return ChildrenToVisit::none;
+                }
+                if (lhsvar->isArgument() && lhstype->type <= ValueType::Type::VOID && !lhstype->container) {
+                    globalData = true;
+                    return ChildrenToVisit::none;
+                }
             }
         }
         if (tok->varId() == 0 && tok->isName() && tok->strAt(-1) != ".") {
@@ -3906,3 +3932,23 @@ const Token *skipUnreachableBranch(const Token *tok)
 
     return tok;
 }
+
+bool isEscapeKeyword(const Token *tok, const Settings &settings)
+{
+    if (!tok)
+        return false;
+
+    if (tok->str() == "return")
+        return true;
+
+    if (!tok->isCpp())
+        return false;
+
+    if (tok->str() == "throw")
+        return true;
+
+    if (settings.standards.cpp < Standards::CPP20)
+        return false;
+
+    return tok->str() == "co_return";
+}
diff --git a/lib/astutils.h b/lib/astutils.h
index 06f01acab11..578763124ac 100644
--- a/lib/astutils.h
+++ b/lib/astutils.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -166,7 +166,7 @@ bool astIsContainerString(const Token* tok);
 Library::Container::Action astContainerAction(const Token* tok, const Library& library, const Token** ftok = nullptr);
 Library::Container::Yield astContainerYield(const Token* tok, const Library& library, const Token** ftok = nullptr);
 
-Library::Container::Yield astFunctionYield(const Token* tok, const Settings& settings, const Token** ftok = nullptr);
+Library::Container::Yield astFunctionYield(const Token* tok, const Library& library, const Token** ftok = nullptr);
 
 /** Is given token a range-declaration in a range-based for loop */
 bool astIsRangeBasedForDecl(const Token* tok);
@@ -319,26 +319,28 @@ Token* getTokenArgumentFunction(Token* tok, int& argn);
 
 std::vector<const Variable*> getArgumentVars(const Token* tok, int argnr);
 
+bool isMutableExpression(const Token* tok);
+
 /** Is variable changed by function call?
  * In case the answer of the question is inconclusive, e.g. because the function declaration is not known
  * the return value is false and the output parameter inconclusive is set to true
  *
  * @param tok           ast tree
  * @param varid         Variable Id
- * @param settings      program settings
+ * @param library       library configurations
  * @param inconclusive  pointer to output variable which indicates that the answer of the question is inconclusive
  */
-bool isVariableChangedByFunctionCall(const Token *tok, int indirect, nonneg int varid, const Settings &settings, bool *inconclusive);
+bool isVariableChangedByFunctionCall(const Token *tok, int indirect, nonneg int varid, const Library &library, bool *inconclusive);
 
 /** Is variable changed by function call?
  * In case the answer of the question is inconclusive, e.g. because the function declaration is not known
  * the return value is false and the output parameter inconclusive is set to true
  *
- * @param tok           token of variable in function call
- * @param settings      program settings
+ * @param tok          token of variable in function call
+ * @param library      library configurations
  * @param inconclusive pointer to output variable which indicates that the answer of the question is inconclusive
  */
-CPPCHECKLIB bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Settings &settings, bool *inconclusive);
+CPPCHECKLIB bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Library &library, bool *inconclusive);
 
 /** Is variable changed in block of code? */
 CPPCHECKLIB bool isVariableChanged(const Token *start, const Token *end, nonneg int exprid, bool globalvar, const Settings &settings, int depth = 20);
@@ -384,6 +386,9 @@ bool isAliasOf(const Token *tok, nonneg int varid, bool* inconclusive = nullptr)
 
 bool isAliasOf(const Token* tok, const Token* expr, nonneg int* indirect = nullptr);
 
+/// If token is an iterator into the container expression with the given expression id
+bool isIteratorOf(const Token* tok, nonneg int exprId);
+
 const Token* getArgumentStart(const Token* ftok);
 
 /** Determines the number of arguments - if token is a function call or macro
@@ -461,4 +466,6 @@ bool isUnreachableOperand(const Token *tok);
 
 const Token *skipUnreachableBranch(const Token *tok);
 
+bool isEscapeKeyword(const Token *tok, const Settings &settings);
+
 #endif // astutilsH
diff --git a/lib/check.cpp b/lib/check.cpp
deleted file mode 100644
index 58b8dbfe0e1..00000000000
--- a/lib/check.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-//---------------------------------------------------------------------------
-
-#include "check.h"
-
-#include "errorlogger.h"
-#include "settings.h"
-#include "token.h"
-#include "tokenize.h"
-#include "vfvalue.h"
-
-#include <algorithm>
-#include <cctype>
-#include <iostream>
-#include <stdexcept>
-#include <utility>
-
-//---------------------------------------------------------------------------
-
-Check::Check(const std::string &aname)
-    : mName(aname)
-{
-    {
-        const auto it = std::find_if(instances().begin(), instances().end(), [&](const Check *i) {
-            return i->name() == aname;
-        });
-        if (it != instances().end())
-            throw std::runtime_error("'" + aname + "' instance already exists");
-    }
-
-    // make sure the instances are sorted
-    const auto it = std::find_if(instances().begin(), instances().end(), [&](const Check* i) {
-        return i->name() > aname;
-    });
-    if (it == instances().end())
-        instances().push_back(this);
-    else
-        instances().insert(it, this);
-}
-
-void Check::writeToErrorList(const ErrorMessage &errmsg)
-{
-    std::cout << errmsg.toXML() << std::endl;
-}
-
-
-void Check::reportError(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe, Certainty certainty)
-{
-    // TODO: report debug warning when error is for a disabled severity
-    const ErrorMessage errmsg(callstack, mTokenizer ? &mTokenizer->list : nullptr, severity, id, msg, cwe, certainty);
-    if (mErrorLogger)
-        mErrorLogger->reportErr(errmsg);
-    else
-        writeToErrorList(errmsg);
-}
-
-void Check::reportError(ErrorPath errorPath, Severity severity, const char id[], const std::string &msg, const CWE &cwe, Certainty certainty)
-{
-    // TODO: report debug warning when error is for a disabled severity
-    const ErrorMessage errmsg(std::move(errorPath), mTokenizer ? &mTokenizer->list : nullptr, severity, id, msg, cwe, certainty);
-    if (mErrorLogger)
-        mErrorLogger->reportErr(errmsg);
-    else
-        writeToErrorList(errmsg);
-}
-
-bool Check::wrongData(const Token *tok, const char *str)
-{
-    if (mSettings->daca)
-        reportError(tok, Severity::debug, "DacaWrongData", "Wrong data detected by condition " + std::string(str));
-    return true;
-}
-
-std::list<Check *> &Check::instances()
-{
-#ifdef __SVR4
-    // Under Solaris, destructors are called in wrong order which causes a segmentation fault.
-    // This fix ensures pointer remains valid and reachable until program terminates.
-    static std::list<Check *> *_instances= new std::list<Check *>;
-    return *_instances;
-#else
-    static std::list<Check *> _instances;
-    return _instances;
-#endif
-}
-
-std::string Check::getMessageId(const ValueFlow::Value &value, const char id[])
-{
-    if (value.condition != nullptr)
-        return id + std::string("Cond");
-    if (value.safe)
-        return std::string("safe") + static_cast<char>(std::toupper(id[0])) + (id + 1);
-    return id;
-}
-
-ErrorPath Check::getErrorPath(const Token* errtok, const ValueFlow::Value* value, std::string bug) const
-{
-    ErrorPath errorPath;
-    if (!value) {
-        errorPath.emplace_back(errtok, std::move(bug));
-    } else if (mSettings->verbose || mSettings->outputFormat == Settings::OutputFormat::xml || !mSettings->templateLocation.empty()) {
-        errorPath = value->errorPath;
-        errorPath.emplace_back(errtok, std::move(bug));
-    } else {
-        if (value->condition)
-            errorPath.emplace_back(value->condition, "condition '" + value->condition->expressionString() + "'");
-        //else if (!value->isKnown() || value->defaultArg)
-        //    errorPath = value->callstack;
-        errorPath.emplace_back(errtok, std::move(bug));
-    }
-    return errorPath;
-}
-
-void Check::logChecker(const char id[])
-{
-    reportError(nullptr, Severity::internal, "logChecker", id);
-}
-
diff --git a/lib/check.h b/lib/check.h
index 4e3c5b9a4e3..7adde886f7f 100644
--- a/lib/check.h
+++ b/lib/check.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
-#include "errortypes.h"
 
 #include <list>
 #include <string>
@@ -36,19 +35,10 @@ namespace CTU {
     class FileInfo;
 }
 
-namespace ValueFlow {
-    class Value;
-}
-
 class Settings;
-class Token;
 class ErrorLogger;
-class ErrorMessage;
 class Tokenizer;
 
-/** Use WRONG_DATA in checkers to mark conditions that check that data is correct */
-#define WRONG_DATA(COND, TOK)  ((COND) && wrongData((TOK), #COND))
-
 /// @addtogroup Core
 /// @{
 
@@ -57,32 +47,22 @@ class Tokenizer;
  * All checking classes must inherit from this class
  */
 class CPPCHECKLIB Check {
-public:
-    /** This constructor is used when registering the CheckClass */
-    explicit Check(const std::string &aname);
-
 protected:
-    /** This constructor is used when running checks. */
-    Check(std::string aname, const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : mTokenizer(tokenizer), mSettings(settings), mErrorLogger(errorLogger), mName(std::move(aname)) {}
+    /** This constructor is used when registering the check */
+    explicit Check(std::string aname)
+        : mName(std::move(aname))
+    {}
+    virtual ~Check() = default;
 
 public:
-    virtual ~Check() {
-        if (!mTokenizer)
-            instances().remove(this);
-    }
-
     Check(const Check &) = delete;
     Check& operator=(const Check &) = delete;
 
-    /** List of registered check classes. This is used by Cppcheck to run checks and generate documentation */
-    static std::list<Check *> &instances();
-
     /** run checks, the token list is not simplified */
-    virtual void runChecks(const Tokenizer &, ErrorLogger *) = 0;
+    virtual void runChecks(const Tokenizer &, ErrorLogger&) = 0;
 
     /** get error messages */
-    virtual void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const = 0;
+    virtual void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const = 0;
 
     /** class name, used to generate documentation */
     const std::string& name() const {
@@ -92,72 +72,30 @@ class CPPCHECKLIB Check {
     /** get information about this class, used to generate documentation */
     virtual std::string classInfo() const = 0;
 
-    /**
-     * Write given error to stdout in xml format.
-     * This is for for printout out the error list with --errorlist
-     * @param errmsg Error message to write
-     */
-    static void writeToErrorList(const ErrorMessage &errmsg);
-
     /** Base class used for whole-program analysis */
     class CPPCHECKLIB FileInfo {
     public:
-        explicit FileInfo(std::string f0 = {}) : file0(std::move(f0)) {}
+        explicit FileInfo(std::string f0) : file0(std::move(f0)) {}
         virtual ~FileInfo() = default;
-        virtual std::string toString() const {
-            return std::string();
-        }
+        virtual std::string toString() const = 0;
         std::string file0;
     };
 
-    virtual FileInfo * getFileInfo(const Tokenizer& /*tokenizer*/, const Settings& /*settings*/, const std::string& /*currentConfig*/) const {
+    virtual const FileInfo * getFileInfo(const Tokenizer& /*tokenizer*/, const Settings& /*settings*/, const std::string& /*currentConfig*/) const {
         return nullptr;
     }
 
-    virtual FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const {
+    virtual const FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const {
         (void)xmlElement;
+        (void)file0;
         return nullptr;
     }
 
     // Return true if an error is reported.
-    virtual bool analyseWholeProgram(const CTU::FileInfo& /*ctu*/, const std::list<FileInfo*>& /*fileInfo*/, const Settings& /*settings*/, ErrorLogger & /*errorLogger*/) {
+    virtual bool analyseWholeProgram(const CTU::FileInfo& /*ctu*/, const std::list<const FileInfo*>& /*fileInfo*/, const Settings& /*settings*/, ErrorLogger & /*errorLogger*/) {
         return false;
     }
 
-protected:
-    static std::string getMessageId(const ValueFlow::Value &value, const char id[]);
-
-    const Tokenizer* const mTokenizer{};
-    const Settings* const mSettings{};
-    ErrorLogger* const mErrorLogger{};
-
-    /** report an error */
-    void reportError(const Token *tok, const Severity severity, const std::string &id, const std::string &msg) {
-        reportError(tok, severity, id, msg, CWE(0U), Certainty::normal);
-    }
-
-    /** report an error */
-    void reportError(const Token *tok, const Severity severity, const std::string &id, const std::string &msg, const CWE &cwe, Certainty certainty) {
-        const std::list<const Token *> callstack(1, tok);
-        reportError(callstack, severity, id, msg, cwe, certainty);
-    }
-
-    /** report an error */
-    void reportError(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe, Certainty certainty);
-
-    void reportError(ErrorPath errorPath, Severity severity, const char id[], const std::string &msg, const CWE &cwe, Certainty certainty);
-
-    /** log checker */
-    void logChecker(const char id[]);
-
-    ErrorPath getErrorPath(const Token* errtok, const ValueFlow::Value* value, std::string bug) const;
-
-    /**
-     * Use WRONG_DATA in checkers when you check for wrong data. That
-     * will call this method
-     */
-    bool wrongData(const Token *tok, const char *str);
-
 private:
     const std::string mName;
 };
diff --git a/lib/check64bit.cpp b/lib/check64bit.cpp
index a106b0afe5f..174237eef5a 100644
--- a/lib/check64bit.cpp
+++ b/lib/check64bit.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,17 +36,12 @@
 // CWE ids used
 static const CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    Check64BitPortability instance;
-}
-
-static bool is32BitIntegerReturn(const Function* func, const Settings* settings)
+static bool is32BitIntegerReturn(const Function* func, const Settings& settings)
 {
-    if (settings->platform.sizeof_pointer != 8)
+    if (settings.platform.sizeof_pointer != 8)
         return false;
     const ValueType* vt = func->arg->valueType();
-    return vt && vt->pointer == 0 && vt->isIntegral() && vt->getSizeOf(*settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer) == 4;
+    return vt && vt->pointer == 0 && vt->isIntegral() && vt->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer) == 4;
 }
 
 static bool isFunctionPointer(const Token* tok)
@@ -56,9 +51,9 @@ static bool isFunctionPointer(const Token* tok)
     return Tokenizer::isFunctionPointer(tok->variable()->nameToken());
 }
 
-void Check64BitPortability::pointerassignment()
+void Check64BitPortabilityImpl::pointerassignment()
 {
-    if (!mSettings->severity.isEnabled(Severity::portability))
+    if (!mSettings.severity.isEnabled(Severity::portability))
         return;
 
     logChecker("Check64BitPortability::pointerassignment"); // portability
@@ -95,11 +90,11 @@ void Check64BitPortability::pointerassignment()
             if (!returnType)
                 continue;
 
-            if (retPointer && !returnType->typeScope && returnType->pointer == 0U)
+            if (retPointer && !returnType->typeScope && returnType->pointer == 0)
                 returnIntegerError(tok);
 
             if (!retPointer) {
-                bool warn = returnType->pointer >= 1U;
+                bool warn = returnType->pointer >= 1;
                 if (!warn) {
                     const Token* tok2 = tok->astOperand1();
                     while (tok2 && tok2->isCast())
@@ -124,17 +119,17 @@ void Check64BitPortability::pointerassignment()
                 continue;
 
             // Assign integer to pointer..
-            if (lhstype->pointer >= 1U &&
+            if (lhstype->pointer >= 1 &&
                 !tok->astOperand2()->isNumber() &&
-                rhstype->pointer == 0U &&
+                rhstype->pointer == 0 &&
                 rhstype->originalTypeName.empty() &&
                 rhstype->type == ValueType::Type::INT &&
                 !isFunctionPointer(tok->astOperand1()))
                 assignmentIntegerToAddressError(tok);
 
             // Assign pointer to integer..
-            if (rhstype->pointer >= 1U &&
-                lhstype->pointer == 0U &&
+            if (rhstype->pointer >= 1 &&
+                lhstype->pointer == 0 &&
                 lhstype->originalTypeName.empty() &&
                 lhstype->isIntegral() &&
                 lhstype->type >= ValueType::Type::CHAR &&
@@ -144,7 +139,7 @@ void Check64BitPortability::pointerassignment()
     }
 }
 
-void Check64BitPortability::assignmentAddressToIntegerError(const Token *tok)
+void Check64BitPortabilityImpl::assignmentAddressToIntegerError(const Token *tok)
 {
     reportError(tok, Severity::portability,
                 "AssignmentAddressToInteger",
@@ -155,7 +150,7 @@ void Check64BitPortability::assignmentAddressToIntegerError(const Token *tok)
                 "way is to store addresses only in pointer types (or typedefs like uintptr_t).", CWE758, Certainty::normal);
 }
 
-void Check64BitPortability::assignmentIntegerToAddressError(const Token *tok)
+void Check64BitPortabilityImpl::assignmentIntegerToAddressError(const Token *tok)
 {
     reportError(tok, Severity::portability,
                 "AssignmentIntegerToAddress",
@@ -166,7 +161,7 @@ void Check64BitPortability::assignmentIntegerToAddressError(const Token *tok)
                 "way is to store addresses only in pointer types (or typedefs like uintptr_t).", CWE758, Certainty::normal);
 }
 
-void Check64BitPortability::returnPointerError(const Token *tok)
+void Check64BitPortabilityImpl::returnPointerError(const Token *tok)
 {
     reportError(tok, Severity::portability,
                 "CastAddressToIntegerAtReturn",
@@ -177,7 +172,7 @@ void Check64BitPortability::returnPointerError(const Token *tok)
                 "to 32-bit integer. The safe way is to return a type such as intptr_t.", CWE758, Certainty::normal);
 }
 
-void Check64BitPortability::returnIntegerError(const Token *tok)
+void Check64BitPortabilityImpl::returnIntegerError(const Token *tok)
 {
     reportError(tok, Severity::portability,
                 "CastIntegerToAddressAtReturn",
@@ -188,15 +183,15 @@ void Check64BitPortability::returnIntegerError(const Token *tok)
                 "The safe way is to always return a pointer.", CWE758, Certainty::normal);
 }
 
-void Check64BitPortability::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void Check64BitPortability::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    Check64BitPortability check64BitPortability(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    Check64BitPortabilityImpl check64BitPortability(&tokenizer, tokenizer.getSettings(), errorLogger);
     check64BitPortability.pointerassignment();
 }
 
-void Check64BitPortability::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void Check64BitPortability::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    Check64BitPortability c(nullptr, settings, errorLogger);
+    Check64BitPortabilityImpl c(nullptr, settings, errorLogger);
     c.assignmentAddressToIntegerError(nullptr);
     c.assignmentIntegerToAddressError(nullptr);
     c.returnIntegerError(nullptr);
diff --git a/lib/check64bit.h b/lib/check64bit.h
index 79397e98e5f..cab82cf1148 100644
--- a/lib/check64bit.h
+++ b/lib/check64bit.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -40,19 +41,28 @@ class Tokenizer;
  */
 
 class CPPCHECKLIB Check64BitPortability : public Check {
-    friend class Test64BitPortability;
-
 public:
     /** This constructor is used when registering the Check64BitPortability */
-    Check64BitPortability() : Check(myName()) {}
+    Check64BitPortability() : Check("64-bit portability") {}
 
 private:
-    /** This constructor is used when running checks. */
-    Check64BitPortability(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Check if there is 64-bit portability issues:\n"
+               "- assign address to/from int/long\n"
+               "- casting address from/to integer when returning from function\n";
+    }
+};
+
+class CPPCHECKLIB Check64BitPortabilityImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    Check64BitPortabilityImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** Check for pointer assignment */
     void pointerassignment();
@@ -61,18 +71,6 @@ class CPPCHECKLIB Check64BitPortability : public Check {
     void assignmentIntegerToAddressError(const Token *tok);
     void returnIntegerError(const Token *tok);
     void returnPointerError(const Token *tok);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "64-bit portability";
-    }
-
-    std::string classInfo() const override {
-        return "Check if there is 64-bit portability issues:\n"
-               "- assign address to/from int/long\n"
-               "- casting address from/to integer when returning from function\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkassert.cpp b/lib/checkassert.cpp
index 3ab55967ede..00bb95e319a 100644
--- a/lib/checkassert.cpp
+++ b/lib/checkassert.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,14 +39,9 @@
 // CWE ids used
 static const CWE CWE398(398U);   // Indicator of Poor Code Quality
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckAssert instance;
-}
-
-void CheckAssert::assertWithSideEffects()
+void CheckAssertImpl::assertWithSideEffects()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckAssert::assertWithSideEffects"); // warning
@@ -63,7 +58,7 @@ void CheckAssert::assertWithSideEffects()
             checkVariableAssignment(tmp, tok->scope());
 
             if (tmp->tokType() != Token::eFunction) {
-                if (const Library::Function* f = mSettings->library.getFunction(tmp)) {
+                if (const Library::Function* f = mSettings.library.getFunction(tmp)) {
                     if (f->isconst || f->ispure)
                         continue;
                     if (Library::getContainerYield(tmp->next()) != Library::Container::Yield::NO_YIELD) // bailout, assume read access
@@ -78,17 +73,22 @@ void CheckAssert::assertWithSideEffects()
                         f->containerYield == Library::Container::Yield::END_ITERATOR ||
                         f->containerYield == Library::Container::Yield::ITERATOR)
                         continue;
-                    sideEffectInAssertError(tmp, mSettings->library.getFunctionName(tmp));
+                    sideEffectInAssertError(tmp, mSettings.library.getFunctionName(tmp));
                 }
                 continue;
             }
 
+            const Token* parent = tmp->astParent();
+            while (Token::Match(parent, ".|::"))
+                parent = parent->astParent();
+            if (!Token::simpleMatch(parent, "("))
+                continue;
             const Function* f = tmp->function();
             const Scope* scope = f->functionScope;
             if (!scope) {
                 // guess that const method doesn't have side effects
                 if (f->nestedIn->isClassOrStruct() && !f->isConst() && !f->isStatic())
-                    sideEffectInAssertError(tmp, f->name()); // Non-const member function called, assume it has side effects
+                    sideEffectInAssertError(tmp, f->name(), " If there are no side effects, consider declaring the method const."); // Non-const member function called, assume it has side effects
                 continue;
             }
 
@@ -122,19 +122,19 @@ void CheckAssert::assertWithSideEffects()
 //---------------------------------------------------------------------------
 
 
-void CheckAssert::sideEffectInAssertError(const Token *tok, const std::string& functionName)
+void CheckAssertImpl::sideEffectInAssertError(const Token *tok, const std::string& functionName, const std::string &extra)
 {
     reportError(tok, Severity::warning,
                 "assertWithSideEffect",
                 "$symbol:" + functionName + "\n"
-                "Assert statement calls a function which may have desired side effects: '$symbol'.\n"
+                "Assert statement calls a function which may have desired side effects: '$symbol'." + extra + "\n"
                 "Non-pure function: '$symbol' is called inside assert statement. "
                 "Assert statements are removed from release builds so the code inside "
                 "assert statement is not executed. If the code is needed also in release "
                 "builds, this is a bug.", CWE398, Certainty::normal);
 }
 
-void CheckAssert::assignmentInAssertError(const Token *tok, const std::string& varname)
+void CheckAssertImpl::assignmentInAssertError(const Token *tok, const std::string& varname)
 {
     reportError(tok, Severity::warning,
                 "assignmentInAssert",
@@ -147,7 +147,7 @@ void CheckAssert::assignmentInAssertError(const Token *tok, const std::string& v
 }
 
 // checks if side effects happen on the variable prior to tmp
-void CheckAssert::checkVariableAssignment(const Token* assignTok, const Scope *assertionScope)
+void CheckAssertImpl::checkVariableAssignment(const Token* assignTok, const Scope *assertionScope)
 {
     if (!assignTok->isAssignmentOp() && assignTok->tokType() != Token::eIncDecOp)
         return;
@@ -177,21 +177,21 @@ void CheckAssert::checkVariableAssignment(const Token* assignTok, const Scope *a
     // TODO: function calls on var
 }
 
-bool CheckAssert::inSameScope(const Token* returnTok, const Token* assignTok)
+bool CheckAssertImpl::inSameScope(const Token* returnTok, const Token* assignTok)
 {
     // TODO: even if a return is in the same scope, the assignment might not affect it.
     return returnTok->scope() == assignTok->scope();
 }
 
-void CheckAssert::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckAssert::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckAssert checkAssert(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckAssertImpl checkAssert(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkAssert.assertWithSideEffects();
 }
 
-void CheckAssert::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckAssert::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckAssert c(nullptr, settings, errorLogger);
+    CheckAssertImpl c(nullptr, settings, errorLogger);
     c.sideEffectInAssertError(nullptr, "function");
     c.assignmentInAssertError(nullptr, "var");
 }
diff --git a/lib/checkassert.h b/lib/checkassert.h
index b01831a5eec..15f97fb1746 100644
--- a/lib/checkassert.h
+++ b/lib/checkassert.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -42,32 +43,30 @@ class Tokenizer;
 
 class CPPCHECKLIB CheckAssert : public Check {
 public:
-    CheckAssert() : Check(myName()) {}
+    CheckAssert() : Check("Assert") {}
 
 private:
-    CheckAssert(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** run checks, the token list is not simplified */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Warn if there are side effects in assert statements (since this cause different behaviour in debug/release builds).\n";
+    }
+};
+
+class CPPCHECKLIB CheckAssertImpl : public CheckImpl {
+public:
+    CheckAssertImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     void assertWithSideEffects();
 
     void checkVariableAssignment(const Token* assignTok, const Scope *assertionScope);
     static bool inSameScope(const Token* returnTok, const Token* assignTok);
 
-    void sideEffectInAssertError(const Token *tok, const std::string& functionName);
+    void sideEffectInAssertError(const Token *tok, const std::string& functionName, const std::string &extra = "");
     void assignmentInAssertError(const Token *tok, const std::string &varname);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Assert";
-    }
-
-    std::string classInfo() const override {
-        return "Warn if there are side effects in assert statements (since this cause different behaviour in debug/release builds).\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkautovariables.cpp b/lib/checkautovariables.cpp
index ab0ad0505b0..de70772a279 100644
--- a/lib/checkautovariables.cpp
+++ b/lib/checkautovariables.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,12 +39,6 @@
 
 //---------------------------------------------------------------------------
 
-
-// Register this check class into cppcheck by creating a static instance of it..
-namespace {
-    CheckAutoVariables instance;
-}
-
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
 static const CWE CWE562(562U);  // Return of Stack Variable Address
 static const CWE CWE590(590U);  // Free of Memory not on the Heap
@@ -145,14 +139,14 @@ static bool isAutoVarArray(const Token *tok)
     return false;
 }
 
-static bool isLocalContainerBuffer(const Token* tok, const Settings& settings)
+static bool isLocalContainerBuffer(const Token* tok, const Library& library)
 {
     if (!tok)
         return false;
 
     // x+y
     if (tok->str() == "+")
-        return isLocalContainerBuffer(tok->astOperand1(), settings) || isLocalContainerBuffer(tok->astOperand2(), settings);
+        return isLocalContainerBuffer(tok->astOperand1(), library) || isLocalContainerBuffer(tok->astOperand2(), library);
 
     if (tok->str() != "(" || !Token::simpleMatch(tok->astOperand1(), "."))
         return false;
@@ -163,7 +157,7 @@ static bool isLocalContainerBuffer(const Token* tok, const Settings& settings)
     if (!var || !var->isLocal() || var->isStatic())
         return false;
 
-    const Library::Container::Yield yield = astContainerYield(tok, settings.library);
+    const Library::Container::Yield yield = astContainerYield(tok, library);
 
     return yield == Library::Container::Yield::BUFFER || yield == Library::Container::Yield::BUFFER_NT;
 }
@@ -208,11 +202,11 @@ static bool variableIsUsedInScope(const Token* start, nonneg int varId, const Sc
     return false;
 }
 
-void CheckAutoVariables::assignFunctionArg()
+void CheckAutoVariablesImpl::assignFunctionArg()
 {
-    const bool printStyle = mSettings->severity.isEnabled(Severity::style);
-    const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
-    if (!printStyle && !printWarning && !mSettings->isPremiumEnabled("uselessAssignmentPtrArg"))
+    const bool printStyle = mSettings.severity.isEnabled(Severity::style);
+    const bool printWarning = mSettings.severity.isEnabled(Severity::warning);
+    if (!printStyle && !printWarning && !mSettings.isPremiumEnabled("uselessAssignmentPtrArg"))
         return;
 
     logChecker("CheckAutoVariables::assignFunctionArg"); // style,warning
@@ -239,8 +233,8 @@ void CheckAutoVariables::assignFunctionArg()
     }
 }
 
-static bool isAutoVariableRHS(const Token* tok, const Settings& settings) {
-    return isAddressOfLocalVariable(tok) || isAutoVarArray(tok) || isLocalContainerBuffer(tok, settings);
+static bool isAutoVariableRHS(const Token* tok, const Library& library) {
+    return isAddressOfLocalVariable(tok) || isAutoVarArray(tok) || isLocalContainerBuffer(tok, library);
 }
 
 static bool hasOverloadedAssignment(const Token* tok, bool& inconclusive)
@@ -263,11 +257,34 @@ static bool hasOverloadedAssignment(const Token* tok, bool& inconclusive)
     return true;
 }
 
-void CheckAutoVariables::autoVariables()
+static bool isMemberAssignment(const Token* tok, const Token*& rhs, const Library& library)
+{
+    const Token *endBracket = nullptr;
+    if (!Token::Match(tok, "[;{}] %var% . %var%")) {
+        if (!Token::Match(tok, "[;{}] %var% ["))
+            return false;
+        endBracket = tok->linkAt(2);
+        if (!Token::Match(endBracket, "] . %var%"))
+            return false;
+    }
+    if (!isPtrArg(tok->next()))
+        return false;
+    const Token* assign = (endBracket ? endBracket->next() : tok->tokAt(2))->astParent();
+    while (Token::simpleMatch(assign, "["))
+        assign = assign->astParent();
+    if (!Token::simpleMatch(assign, "="))
+        return false;
+    if (!isAutoVariableRHS(assign->astOperand2(), library))
+        return false;
+    rhs = assign->astOperand2();
+    return true;
+}
+
+void CheckAutoVariablesImpl::autoVariables()
 {
     logChecker("CheckAutoVariables::autoVariables");
 
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token *tok = scope->bodyStart; tok && tok != scope->bodyEnd; tok = tok->next()) {
@@ -277,27 +294,28 @@ void CheckAutoVariables::autoVariables()
                 continue;
             }
             // Critical assignment
-            if (Token::Match(tok, "[;{}] %var% =") && isRefPtrArg(tok->next()) && isAutoVariableRHS(tok->tokAt(2)->astOperand2(), *mSettings)) {
+            const Token* rhs{};
+            if (Token::Match(tok, "[;{}] %var% =") && isRefPtrArg(tok->next()) && isAutoVariableRHS(tok->tokAt(2)->astOperand2(), mSettings.library)) {
                 checkAutoVariableAssignment(tok->next(), false);
-            } else if (Token::Match(tok, "[;{}] * %var% =") && isPtrArg(tok->tokAt(2)) && isAutoVariableRHS(tok->tokAt(3)->astOperand2(), *mSettings)) {
+            } else if (Token::Match(tok, "[;{}] * %var% =") && isPtrArg(tok->tokAt(2)) && isAutoVariableRHS(tok->tokAt(3)->astOperand2(), mSettings.library)) {
                 const Token* lhs = tok->tokAt(2);
                 bool inconclusive = false;
                 if (!hasOverloadedAssignment(lhs, inconclusive) || (printInconclusive && inconclusive))
                     checkAutoVariableAssignment(tok->next(), inconclusive);
                 tok = tok->tokAt(4);
-            } else if (Token::Match(tok, "[;{}] %var% . %var% =") && isPtrArg(tok->next()) && isAutoVariableRHS(tok->tokAt(4)->astOperand2(), *mSettings)) {
+            } else if (isMemberAssignment(tok, rhs, mSettings.library)) {
                 const Token* lhs = tok->tokAt(3);
                 bool inconclusive = false;
                 if (!hasOverloadedAssignment(lhs, inconclusive) || (printInconclusive && inconclusive))
                     checkAutoVariableAssignment(tok->next(), inconclusive);
-                tok = tok->tokAt(5);
+                tok = rhs;
             } else if (Token::Match(tok, "[;{}] %var% [") && Token::simpleMatch(tok->linkAt(2), "] =") &&
-                       (isPtrArg(tok->next()) || isArrayArg(tok->next(), *mSettings)) &&
-                       isAutoVariableRHS(tok->linkAt(2)->next()->astOperand2(), *mSettings)) {
+                       (isPtrArg(tok->next()) || isArrayArg(tok->next(), mSettings)) &&
+                       isAutoVariableRHS(tok->linkAt(2)->next()->astOperand2(), mSettings.library)) {
                 errorAutoVariableAssignment(tok->next(), false);
             }
             // Invalid pointer deallocation
-            else if ((Token::Match(tok, "%name% ( %var%|%str% ) ;") && mSettings->library.getDeallocFuncInfo(tok)) ||
+            else if ((Token::Match(tok, "%name% ( %var%|%str% ) ;") && mSettings.library.getDeallocFuncInfo(tok)) ||
                      (tok->isCpp() && Token::Match(tok, "delete [| ]| (| %var%|%str% !!["))) {
                 tok = Token::findmatch(tok->next(), "%var%|%str%");
                 if (Token::simpleMatch(tok->astParent(), "."))
@@ -308,14 +326,14 @@ void CheckAutoVariables::autoVariables()
                     for (const ValueFlow::Value &v : tok->values()) {
                         if (v.isImpossible())
                             continue;
-                        if ((v.isTokValue() && (isArrayVar(v.tokvalue) || ((v.tokvalue->tokType() == Token::eString)))) ||
+                        if ((v.isTokValue() && (isArrayVar(v.tokvalue) || (v.tokvalue->tokType() == Token::eString))) ||
                             (v.isLocalLifetimeValue() && v.lifetimeKind == ValueFlow::Value::LifetimeKind::Address && !Token::simpleMatch(v.tokvalue, "("))) {
                             errorInvalidDeallocation(tok, &v);
                             break;
                         }
                     }
                 }
-            } else if ((Token::Match(tok, "%name% ( & %var% ) ;") && mSettings->library.getDeallocFuncInfo(tok)) ||
+            } else if ((Token::Match(tok, "%name% ( & %var% ) ;") && mSettings.library.getDeallocFuncInfo(tok)) ||
                        (tok->isCpp() && Token::Match(tok, "delete [| ]| (| & %var% !!["))) {
                 tok = Token::findmatch(tok->next(), "%var%");
                 if (isAutoVar(tok))
@@ -325,13 +343,15 @@ void CheckAutoVariables::autoVariables()
     }
 }
 
-bool CheckAutoVariables::checkAutoVariableAssignment(const Token *expr, bool inconclusive, const Token *startToken)
+bool CheckAutoVariablesImpl::checkAutoVariableAssignment(const Token *expr, bool inconclusive, const Token *startToken)
 {
     if (!startToken)
         startToken = Token::findsimplematch(expr, "=")->next();
     for (const Token *tok = startToken; tok; tok = tok->next()) {
-        if (tok->str() == "}" && tok->scope()->type == ScopeType::eFunction)
+        if (tok->str() == "}" && tok->scope()->type == ScopeType::eFunction) {
             errorAutoVariableAssignment(expr, inconclusive);
+            return true;
+        }
 
         if (Token::Match(tok, "return|throw|break|continue")) {
             errorAutoVariableAssignment(expr, inconclusive);
@@ -366,8 +386,10 @@ bool CheckAutoVariables::checkAutoVariableAssignment(const Token *expr, bool inc
 
 //---------------------------------------------------------------------------
 
-void CheckAutoVariables::errorAutoVariableAssignment(const Token *tok, bool inconclusive)
+void CheckAutoVariablesImpl::errorAutoVariableAssignment(const Token *tok, bool inconclusive)
 {
+    diag(tok);
+
     if (!inconclusive) {
         reportError(tok, Severity::error, "autoVariables",
                     "Address of local auto-variable assigned to a function parameter.\n"
@@ -387,7 +409,7 @@ void CheckAutoVariables::errorAutoVariableAssignment(const Token *tok, bool inco
     }
 }
 
-void CheckAutoVariables::errorUselessAssignmentArg(const Token *tok)
+void CheckAutoVariablesImpl::errorUselessAssignmentArg(const Token *tok)
 {
     reportError(tok,
                 Severity::style,
@@ -395,7 +417,7 @@ void CheckAutoVariables::errorUselessAssignmentArg(const Token *tok)
                 "Assignment of function parameter has no effect outside the function.", CWE398, Certainty::normal);
 }
 
-void CheckAutoVariables::errorUselessAssignmentPtrArg(const Token *tok)
+void CheckAutoVariablesImpl::errorUselessAssignmentPtrArg(const Token *tok)
 {
     reportError(tok,
                 Severity::warning,
@@ -403,7 +425,7 @@ void CheckAutoVariables::errorUselessAssignmentPtrArg(const Token *tok)
                 "Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?", CWE398, Certainty::normal);
 }
 
-bool CheckAutoVariables::diag(const Token* tokvalue)
+bool CheckAutoVariablesImpl::diag(const Token* tokvalue)
 {
     if (!tokvalue)
         return true;
@@ -540,9 +562,9 @@ static bool isAssignedToNonLocal(const Token* tok)
     return !var->isLocal() || var->isStatic();
 }
 
-void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token * end)
+void CheckAutoVariablesImpl::checkVarLifetimeScope(const Token * start, const Token * end)
 {
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
     if (!start)
         return;
     const Scope * scope = start->scope();
@@ -555,7 +577,7 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
     for (const Token *tok = start; tok && tok != end; tok = tok->next()) {
         // Return reference from function
         if (returnRef && Token::simpleMatch(tok->astParent(), "return")) {
-            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(tok, *mSettings, true)) {
+            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(tok, mSettings, true)) {
                 if (!printInconclusive && lt.inconclusive)
                     continue;
                 const Variable* var = lt.token->variable();
@@ -564,7 +586,7 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
                     errorReturnReference(tok, lt.errorPath, lt.inconclusive);
                     break;
                 }
-                if (isDeadTemporary(lt.token, nullptr, mSettings->library)) {
+                if (isDeadTemporary(lt.token, nullptr, mSettings.library)) {
                     errorReturnTempReference(tok, lt.errorPath, lt.inconclusive);
                     break;
                 }
@@ -575,56 +597,60 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
                    tok->variable()->declarationId() == tok->varId() && tok->variable()->isStatic() &&
                    !tok->variable()->isArgument()) {
             ErrorPath errorPath;
-            const Variable *var = ValueFlow::getLifetimeVariable(tok, errorPath, *mSettings);
+            const Variable *var = ValueFlow::getLifetimeVariable(tok, errorPath, mSettings);
             if (var && isInScope(var->nameToken(), tok->scope())) {
                 errorDanglingReference(tok, var, std::move(errorPath));
                 continue;
             }
             // Reference to temporary
         } else if (tok->variable() && (tok->variable()->isReference() || tok->variable()->isRValueReference())) {
-            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(getParentLifetime(tok), *mSettings)) {
+            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(getParentLifetime(tok), mSettings)) {
                 if (!printInconclusive && lt.inconclusive)
                     continue;
                 const Token * tokvalue = lt.token;
-                if (isDeadTemporary(tokvalue, tok, mSettings->library)) {
+                if (isDeadTemporary(tokvalue, tok, mSettings.library)) {
                     errorDanglingTempReference(tok, lt.errorPath, lt.inconclusive);
                     break;
                 }
             }
         }
-        const bool escape = Token::simpleMatch(tok->astParent(), "throw") ||
-                            (Token::simpleMatch(tok->astParent(), "return") && !Function::returnsStandardType(scope->function));
+        const Token* retThrow = tok->astParent();
+        if (Token::simpleMatch(retThrow, "new"))
+            retThrow = retThrow->astParent();
+        const bool escape = Token::simpleMatch(retThrow, "throw") ||
+                            (Token::simpleMatch(retThrow, "return") && !Function::returnsStandardType(scope->function));
         std::unordered_set<const Token*> exprs;
         for (const ValueFlow::Value& val:tok->values()) {
             if (!val.isLocalLifetimeValue() && !val.isSubFunctionLifetimeValue())
                 continue;
             if (!printInconclusive && val.isInconclusive())
                 continue;
-            const Token* parent = getParentLifetime(val.tokvalue, mSettings->library);
+            const Token* parent = getParentLifetime(val.tokvalue, mSettings.library);
             if (!exprs.insert(parent).second)
                 continue;
-            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(parent, *mSettings, escape || isAssignedToNonLocal(tok))) {
+            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(parent, mSettings, escape || isAssignedToNonLocal(tok))) {
                 const Token * tokvalue = lt.token;
                 if (val.isLocalLifetimeValue()) {
                     if (escape) {
                         if (getPointerDepth(tok) < getPointerDepth(tokvalue))
                             continue;
-                        if (!ValueFlow::isLifetimeBorrowed(tok, *mSettings))
+                        if (!ValueFlow::isLifetimeBorrowed(tok, mSettings))
                             continue;
                         if (tokvalue->exprId() == tok->exprId() && !(tok->variable() && tok->variable()->isArray()) &&
                             !astIsContainerView(tok->astParent()))
                             continue;
                         if ((tokvalue->variable() && !isEscapedReference(tokvalue->variable()) &&
                              isInScope(tokvalue->variable()->nameToken(), scope)) ||
-                            isDeadTemporary(tokvalue, nullptr, mSettings->library)) {
-                            errorReturnDanglingLifetime(tok, &val);
+                            isDeadTemporary(tokvalue, nullptr, mSettings.library)) {
+                            if (!diag(tokvalue))
+                                errorReturnDanglingLifetime(tok, &val);
                             break;
                         }
                     } else if (tokvalue->variable() && isDeadScope(tokvalue->variable()->nameToken(), tok->scope())) {
                         errorInvalidLifetime(tok, &val);
                         break;
                     } else if (!tokvalue->variable() &&
-                               isDeadTemporary(tokvalue, tok, mSettings->library)) {
+                               isDeadTemporary(tokvalue, tok, mSettings.library)) {
                         if (!diag(tokvalue))
                             errorDanglingTemporaryLifetime(tok, &val, tokvalue);
                         break;
@@ -642,19 +668,21 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
                     } else if (tok->variable() && tok->variable()->declarationId() == tok->varId()) {
                         var = tok->variable();
                     }
-                    if (!ValueFlow::isLifetimeBorrowed(tok, *mSettings))
+                    if (!ValueFlow::isLifetimeBorrowed(tok, mSettings))
                         continue;
                     const Token* nextTok = nextAfterAstRightmostLeaf(tok->astTop());
                     if (!nextTok)
                         nextTok = tok->next();
-                    if (var && (!var->isLocal() || var->isStatic()) && !var->isArgument() && !(val.tokvalue && val.tokvalue->variable() && val.tokvalue->variable()->isStatic()) &&
+                    if (var && (!var->isLocal() || var->isStatic()) && (!var->isArgument() || (var->isReference() && isInScope(val.tokvalue, var->scope()))) &&
+                        !(val.tokvalue && val.tokvalue->variable() && val.tokvalue->variable()->isStatic()) &&
                         !isVariableChanged(nextTok,
                                            tok->scope()->bodyEnd,
                                            var->valueType() ? var->valueType()->pointer : 0,
                                            var->declarationId(),
                                            var->isGlobal(),
-                                           *mSettings)) {
-                        errorDanglngLifetime(tok2, &val, var->isLocal());
+                                           mSettings)) {
+                        if (!diag(tok2))
+                            errorDanglngLifetime(tok2, &val, var->isLocal());
                         break;
                     }
                 }
@@ -680,7 +708,7 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
     }
 }
 
-void CheckAutoVariables::checkVarLifetime()
+void CheckAutoVariablesImpl::checkVarLifetime()
 {
     logChecker("CheckAutoVariables::checkVarLifetime");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -691,7 +719,7 @@ void CheckAutoVariables::checkVarLifetime()
     }
 }
 
-void CheckAutoVariables::errorReturnDanglingLifetime(const Token *tok, const ValueFlow::Value *val)
+void CheckAutoVariablesImpl::errorReturnDanglingLifetime(const Token *tok, const ValueFlow::Value *val)
 {
     const bool inconclusive = val ? val->isInconclusive() : false;
     ErrorPath errorPath = val ? val->errorPath : ErrorPath();
@@ -700,7 +728,7 @@ void CheckAutoVariables::errorReturnDanglingLifetime(const Token *tok, const Val
     reportError(std::move(errorPath), Severity::error, "returnDanglingLifetime", msg + " that will be invalid when returning.", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckAutoVariables::errorInvalidLifetime(const Token *tok, const ValueFlow::Value* val)
+void CheckAutoVariablesImpl::errorInvalidLifetime(const Token *tok, const ValueFlow::Value* val)
 {
     const bool inconclusive = val ? val->isInconclusive() : false;
     ErrorPath errorPath = val ? val->errorPath : ErrorPath();
@@ -709,7 +737,7 @@ void CheckAutoVariables::errorInvalidLifetime(const Token *tok, const ValueFlow:
     reportError(std::move(errorPath), Severity::error, "invalidLifetime", msg + " that is out of scope.", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckAutoVariables::errorDanglingTemporaryLifetime(const Token* tok, const ValueFlow::Value* val, const Token* tempTok)
+void CheckAutoVariablesImpl::errorDanglingTemporaryLifetime(const Token* tok, const ValueFlow::Value* val, const Token* tempTok)
 {
     const bool inconclusive = val ? val->isInconclusive() : false;
     ErrorPath errorPath = val ? val->errorPath : ErrorPath();
@@ -724,7 +752,7 @@ void CheckAutoVariables::errorDanglingTemporaryLifetime(const Token* tok, const
                 inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckAutoVariables::errorDanglngLifetime(const Token *tok, const ValueFlow::Value *val, bool isStatic)
+void CheckAutoVariablesImpl::errorDanglngLifetime(const Token *tok, const ValueFlow::Value *val, bool isStatic)
 {
     const bool inconclusive = val ? val->isInconclusive() : false;
     ErrorPath errorPath = val ? val->errorPath : ErrorPath();
@@ -735,21 +763,21 @@ void CheckAutoVariables::errorDanglngLifetime(const Token *tok, const ValueFlow:
     reportError(std::move(errorPath), Severity::error, "danglingLifetime", msg + ".", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckAutoVariables::errorDanglingTempReference(const Token* tok, ErrorPath errorPath, bool inconclusive)
+void CheckAutoVariablesImpl::errorDanglingTempReference(const Token* tok, ErrorPath errorPath, bool inconclusive)
 {
     errorPath.emplace_back(tok, "");
     reportError(
         std::move(errorPath), Severity::error, "danglingTempReference", "Using reference to dangling temporary.", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckAutoVariables::errorReturnReference(const Token* tok, ErrorPath errorPath, bool inconclusive)
+void CheckAutoVariablesImpl::errorReturnReference(const Token* tok, ErrorPath errorPath, bool inconclusive)
 {
     errorPath.emplace_back(tok, "");
     reportError(
         std::move(errorPath), Severity::error, "returnReference", "Reference to local variable returned.", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckAutoVariables::errorDanglingReference(const Token *tok, const Variable *var, ErrorPath errorPath)
+void CheckAutoVariablesImpl::errorDanglingReference(const Token *tok, const Variable *var, ErrorPath errorPath)
 {
     std::string tokName = tok ? tok->str() : "x";
     std::string varName = var ? var->name() : "y";
@@ -758,14 +786,14 @@ void CheckAutoVariables::errorDanglingReference(const Token *tok, const Variable
     reportError(std::move(errorPath), Severity::error, "danglingReference", msg, CWE562, Certainty::normal);
 }
 
-void CheckAutoVariables::errorReturnTempReference(const Token* tok, ErrorPath errorPath, bool inconclusive)
+void CheckAutoVariablesImpl::errorReturnTempReference(const Token* tok, ErrorPath errorPath, bool inconclusive)
 {
     errorPath.emplace_back(tok, "");
     reportError(
         std::move(errorPath), Severity::error, "returnTempReference", "Reference to temporary returned.", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckAutoVariables::errorInvalidDeallocation(const Token *tok, const ValueFlow::Value *val)
+void CheckAutoVariablesImpl::errorInvalidDeallocation(const Token *tok, const ValueFlow::Value *val)
 {
     const Variable *var = val ? val->tokvalue->variable() : (tok ? tok->variable() : nullptr);
 
@@ -792,17 +820,17 @@ void CheckAutoVariables::errorInvalidDeallocation(const Token *tok, const ValueF
                 "that has been allocated dynamically.", CWE590, Certainty::normal);
 }
 
-void CheckAutoVariables::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckAutoVariables::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckAutoVariables checkAutoVariables(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckAutoVariablesImpl checkAutoVariables(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkAutoVariables.assignFunctionArg();
-    checkAutoVariables.checkVarLifetime();
     checkAutoVariables.autoVariables();
+    checkAutoVariables.checkVarLifetime();
 }
 
-void CheckAutoVariables::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckAutoVariables::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckAutoVariables c(nullptr,settings,errorLogger);
+    CheckAutoVariablesImpl c(nullptr,settings,errorLogger);
     c.errorAutoVariableAssignment(nullptr, false);
     c.errorReturnReference(nullptr, ErrorPath{}, false);
     c.errorDanglingReference(nullptr, nullptr, ErrorPath{});
diff --git a/lib/checkautovariables.h b/lib/checkautovariables.h
index d94f254508f..23d7a55a488 100644
--- a/lib/checkautovariables.h
+++ b/lib/checkautovariables.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 #include "errortypes.h"
 
@@ -47,15 +48,32 @@ namespace ValueFlow {
 class CPPCHECKLIB CheckAutoVariables : public Check {
 public:
     /** This constructor is used when registering the CheckClass */
-    CheckAutoVariables() : Check(myName()) {}
+    CheckAutoVariables() : Check("Auto Variables") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckAutoVariables(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "A pointer to a variable is only valid as long as the variable is in scope.\n"
+               "Check:\n"
+               "- returning a pointer to auto or temporary variable\n"
+               "- assigning address of an variable to an effective parameter of a function\n"
+               "- returning reference to local/temporary variable\n"
+               "- returning address of function parameter\n"
+               "- suspicious assignment of pointer argument\n"
+               "- useless assignment of function argument\n";
+    }
+};
+
+class CPPCHECKLIB CheckAutoVariablesImpl : public CheckImpl
+{
+public:
+    /** This constructor is used when running checks. */
+    CheckAutoVariablesImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** assign function argument */
     void assignFunctionArg();
@@ -69,7 +87,6 @@ class CPPCHECKLIB CheckAutoVariables : public Check {
     bool checkAutoVariableAssignment(const Token *expr, bool inconclusive, const Token *startToken = nullptr);
 
     void checkVarLifetime();
-
     void checkVarLifetimeScope(const Token * start, const Token * end);
 
     void errorAutoVariableAssignment(const Token *tok, bool inconclusive);
@@ -85,24 +102,8 @@ class CPPCHECKLIB CheckAutoVariables : public Check {
     void errorUselessAssignmentArg(const Token *tok);
     void errorUselessAssignmentPtrArg(const Token *tok);
 
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Auto Variables";
-    }
-
-    std::string classInfo() const override {
-        return "A pointer to a variable is only valid as long as the variable is in scope.\n"
-               "Check:\n"
-               "- returning a pointer to auto or temporary variable\n"
-               "- assigning address of an variable to an effective parameter of a function\n"
-               "- returning reference to local/temporary variable\n"
-               "- returning address of function parameter\n"
-               "- suspicious assignment of pointer argument\n"
-               "- useless assignment of function argument\n";
-    }
-
     /** returns true if tokvalue has already been diagnosed */
+private:
     bool diag(const Token* tokvalue);
 
     std::set<const Token*> mDiagDanglingTemp;
diff --git a/lib/checkbool.cpp b/lib/checkbool.cpp
index 93e501416aa..3d36c9936a1 100644
--- a/lib/checkbool.cpp
+++ b/lib/checkbool.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,11 +32,6 @@
 #include <vector>
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckBool instance;
-}
-
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
 static const CWE CWE571(571U);  // Expression is Always True
 static const CWE CWE587(587U);  // Assignment of a Fixed Address to a Pointer
@@ -48,9 +43,9 @@ static bool isBool(const Variable* var)
 }
 
 //---------------------------------------------------------------------------
-void CheckBool::checkIncrementBoolean()
+void CheckBoolImpl::checkIncrementBoolean()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("incrementboolean"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("incrementboolean"))
         return;
 
     logChecker("CheckBool::checkIncrementBoolean"); // style
@@ -65,7 +60,7 @@ void CheckBool::checkIncrementBoolean()
     }
 }
 
-void CheckBool::incrementBooleanError(const Token *tok)
+void CheckBoolImpl::incrementBooleanError(const Token *tok)
 {
     reportError(
         tok,
@@ -88,13 +83,13 @@ static bool isConvertedToBool(const Token* tok)
 // if (bool & bool) -> if (bool && bool)
 // if (bool | bool) -> if (bool || bool)
 //---------------------------------------------------------------------------
-void CheckBool::checkBitwiseOnBoolean()
+void CheckBoolImpl::checkBitwiseOnBoolean()
 {
-    if (!mSettings->isPremiumEnabled("bitwiseOnBoolean") &&
-        !mSettings->severity.isEnabled(Severity::style) &&
+    if (!mSettings.isPremiumEnabled("bitwiseOnBoolean") &&
+        !mSettings.severity.isEnabled(Severity::style) &&
         // danmar: this is inconclusive because I don't like that there are
         //         warnings for calculations. Example: set_flag(a & b);
-        !mSettings->certainty.isEnabled(Certainty::inconclusive))
+        !mSettings.certainty.isEnabled(Certainty::inconclusive))
         return;
 
     logChecker("CheckBool::checkBitwiseOnBoolean"); // style,inconclusive
@@ -121,7 +116,7 @@ void CheckBool::checkBitwiseOnBoolean()
                 if (tok->str() == "|" && !isConvertedToBool(tok) && !(isBoolOp1 && isBoolOp2))
                     continue;
                 // first operand will always be evaluated
-                if (!isConstExpression(tok->astOperand2(), mSettings->library))
+                if (!isConstExpression(tok->astOperand2(), mSettings.library))
                     continue;
                 if (tok->astOperand2()->variable() && tok->astOperand2()->variable()->nameToken() == tok->astOperand2())
                     continue;
@@ -132,7 +127,7 @@ void CheckBool::checkBitwiseOnBoolean()
     }
 }
 
-void CheckBool::bitwiseOnBooleanError(const Token* tok, const std::string& expression, const std::string& op, bool isCompound)
+void CheckBoolImpl::bitwiseOnBooleanError(const Token* tok, const std::string& expression, const std::string& op, bool isCompound)
 {
     std::string msg = "Boolean expression '" + expression + "' is used in bitwise operation.";
     if (!isCompound)
@@ -149,9 +144,9 @@ void CheckBool::bitwiseOnBooleanError(const Token* tok, const std::string& expre
 //    if (!x==3) <- Probably meant to be "x!=3"
 //---------------------------------------------------------------------------
 
-void CheckBool::checkComparisonOfBoolWithInt()
+void CheckBoolImpl::checkComparisonOfBoolWithInt()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) || !mTokenizer->isCPP())
+    if (!mSettings.severity.isEnabled(Severity::warning) || !mTokenizer->isCPP())
         return;
 
     logChecker("CheckBool::checkComparisonOfBoolWithInt"); // warning,c++
@@ -176,7 +171,7 @@ void CheckBool::checkComparisonOfBoolWithInt()
     }
 }
 
-void CheckBool::comparisonOfBoolWithInvalidComparator(const Token *tok, const std::string &expression)
+void CheckBoolImpl::comparisonOfBoolWithInvalidComparator(const Token *tok, const std::string &expression)
 {
     reportError(tok, Severity::warning, "comparisonOfBoolWithInvalidComparator",
                 "Comparison of a boolean value using relational operator (<, >, <= or >=).\n"
@@ -200,9 +195,9 @@ static bool tokenIsFunctionReturningBool(const Token* tok)
     return false;
 }
 
-void CheckBool::checkComparisonOfFuncReturningBool()
+void CheckBoolImpl::checkComparisonOfFuncReturningBool()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings.severity.isEnabled(Severity::style))
         return;
 
     if (!mTokenizer->isCPP())
@@ -244,7 +239,7 @@ void CheckBool::checkComparisonOfFuncReturningBool()
     }
 }
 
-void CheckBool::comparisonOfFuncReturningBoolError(const Token *tok, const std::string &expression)
+void CheckBoolImpl::comparisonOfFuncReturningBoolError(const Token *tok, const std::string &expression)
 {
     reportError(tok, Severity::style, "comparisonOfFuncReturningBoolError",
                 "Comparison of a function returning boolean value using relational (<, >, <= or >=) operator.\n"
@@ -253,7 +248,7 @@ void CheckBool::comparisonOfFuncReturningBoolError(const Token *tok, const std::
                 " operator could cause unexpected results.", CWE398, Certainty::normal);
 }
 
-void CheckBool::comparisonOfTwoFuncsReturningBoolError(const Token *tok, const std::string &expression1, const std::string &expression2)
+void CheckBoolImpl::comparisonOfTwoFuncsReturningBoolError(const Token *tok, const std::string &expression1, const std::string &expression2)
 {
     reportError(tok, Severity::style, "comparisonOfTwoFuncsReturningBoolError",
                 "Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator.\n"
@@ -266,9 +261,9 @@ void CheckBool::comparisonOfTwoFuncsReturningBoolError(const Token *tok, const s
 // Comparison of bool with bool
 //-------------------------------------------------------------------------------
 
-void CheckBool::checkComparisonOfBoolWithBool()
+void CheckBoolImpl::checkComparisonOfBoolWithBool()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings.severity.isEnabled(Severity::style))
         return;
 
     if (!mTokenizer->isCPP())
@@ -307,7 +302,7 @@ void CheckBool::checkComparisonOfBoolWithBool()
     }
 }
 
-void CheckBool::comparisonOfBoolWithBoolError(const Token *tok, const std::string &expression)
+void CheckBoolImpl::comparisonOfBoolWithBoolError(const Token *tok, const std::string &expression)
 {
     reportError(tok, Severity::style, "comparisonOfBoolWithBoolError",
                 "Comparison of a variable having boolean value using relational (<, >, <= or >=) operator.\n"
@@ -317,7 +312,7 @@ void CheckBool::comparisonOfBoolWithBoolError(const Token *tok, const std::strin
 }
 
 //-----------------------------------------------------------------------------
-void CheckBool::checkAssignBoolToPointer()
+void CheckBoolImpl::checkAssignBoolToPointer()
 {
     logChecker("CheckBool::checkAssignBoolToPointer");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -330,7 +325,7 @@ void CheckBool::checkAssignBoolToPointer()
     }
 }
 
-void CheckBool::assignBoolToPointerError(const Token *tok)
+void CheckBoolImpl::assignBoolToPointerError(const Token *tok)
 {
     reportError(tok, Severity::error, "assignBoolToPointer",
                 "Boolean value assigned to pointer.", CWE587, Certainty::normal);
@@ -338,9 +333,9 @@ void CheckBool::assignBoolToPointerError(const Token *tok)
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-void CheckBool::checkComparisonOfBoolExpressionWithInt()
+void CheckBoolImpl::checkComparisonOfBoolExpressionWithInt()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("compareBoolExpressionWithInt"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("compareBoolExpressionWithInt"))
         return;
 
     logChecker("CheckBool::checkComparisonOfBoolExpressionWithInt"); // warning
@@ -378,13 +373,13 @@ void CheckBool::checkComparisonOfBoolExpressionWithInt()
             if (astIsBool(numTok))
                 continue;
 
-            const ValueFlow::Value *minval = numTok->getValueLE(0, *mSettings);
+            const ValueFlow::Value *minval = numTok->getValueLE(0, mSettings);
             if (minval && minval->intvalue == 0 &&
                 (numInRhs ? Token::Match(tok, ">|==|!=")
                  : Token::Match(tok, "<|==|!=")))
                 minval = nullptr;
 
-            const ValueFlow::Value *maxval = numTok->getValueGE(1, *mSettings);
+            const ValueFlow::Value *maxval = numTok->getValueGE(1, mSettings);
             if (maxval && maxval->intvalue == 1 &&
                 (numInRhs ? Token::Match(tok, "<|==|!=")
                  : Token::Match(tok, ">|==|!=")))
@@ -398,7 +393,7 @@ void CheckBool::checkComparisonOfBoolExpressionWithInt()
     }
 }
 
-void CheckBool::comparisonOfBoolExpressionWithIntError(const Token *tok, bool not0or1)
+void CheckBoolImpl::comparisonOfBoolExpressionWithIntError(const Token *tok, bool not0or1)
 {
     if (not0or1)
         reportError(tok, Severity::warning, "compareBoolExpressionWithInt",
@@ -409,7 +404,7 @@ void CheckBool::comparisonOfBoolExpressionWithIntError(const Token *tok, bool no
 }
 
 
-void CheckBool::pointerArithBool()
+void CheckBoolImpl::pointerArithBool()
 {
     logChecker("CheckBool::pointerArithBool");
 
@@ -432,7 +427,7 @@ void CheckBool::pointerArithBool()
     }
 }
 
-void CheckBool::pointerArithBoolCond(const Token *tok)
+void CheckBoolImpl::pointerArithBoolCond(const Token *tok)
 {
     if (!tok)
         return;
@@ -452,7 +447,7 @@ void CheckBool::pointerArithBoolCond(const Token *tok)
         pointerArithBoolError(tok);
 }
 
-void CheckBool::pointerArithBoolError(const Token *tok)
+void CheckBoolImpl::pointerArithBoolError(const Token *tok)
 {
     reportError(tok,
                 Severity::error,
@@ -461,11 +456,11 @@ void CheckBool::pointerArithBoolError(const Token *tok)
                 "Converting pointer arithmetic result to bool. The boolean result is always true unless there is pointer arithmetic overflow, and overflow is undefined behaviour. Probably a dereference is forgotten.", CWE571, Certainty::normal);
 }
 
-void CheckBool::checkAssignBoolToFloat()
+void CheckBoolImpl::checkAssignBoolToFloat()
 {
     if (!mTokenizer->isCPP())
         return;
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings.severity.isEnabled(Severity::style))
         return;
     logChecker("CheckBool::checkAssignBoolToFloat"); // style,c++
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -478,15 +473,15 @@ void CheckBool::checkAssignBoolToFloat()
     }
 }
 
-void CheckBool::assignBoolToFloatError(const Token *tok)
+void CheckBoolImpl::assignBoolToFloatError(const Token *tok)
 {
     reportError(tok, Severity::style, "assignBoolToFloat",
                 "Boolean value assigned to floating point variable.", CWE704, Certainty::normal);
 }
 
-void CheckBool::returnValueOfFunctionReturningBool()
+void CheckBoolImpl::returnValueOfFunctionReturningBool()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings.severity.isEnabled(Severity::style))
         return;
 
     logChecker("CheckBool::returnValueOfFunctionReturningBool"); // style
@@ -505,21 +500,21 @@ void CheckBool::returnValueOfFunctionReturningBool()
             else if (tok->scope() && tok->scope()->isClassOrStruct())
                 tok = tok->scope()->bodyEnd;
             else if (Token::simpleMatch(tok, "return") && tok->astOperand1() &&
-                     (tok->astOperand1()->getValueGE(2, *mSettings) || tok->astOperand1()->getValueLE(-1, *mSettings)) &&
+                     (tok->astOperand1()->getValueGE(2, mSettings) || tok->astOperand1()->getValueLE(-1, mSettings)) &&
                      !(tok->astOperand1()->astOperand1() && Token::Match(tok->astOperand1(), "&|%or%")))
                 returnValueBoolError(tok);
         }
     }
 }
 
-void CheckBool::returnValueBoolError(const Token *tok)
+void CheckBoolImpl::returnValueBoolError(const Token *tok)
 {
     reportError(tok, Severity::style, "returnNonBoolInBooleanFunction", "Non-boolean value returned from function returning bool");
 }
 
-void CheckBool::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckBool::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckBool checkBool(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckBoolImpl checkBool(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     // Checks
     checkBool.checkComparisonOfBoolExpressionWithInt();
@@ -534,9 +529,9 @@ void CheckBool::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
     checkBool.checkBitwiseOnBoolean();
 }
 
-void CheckBool::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckBool::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckBool c(nullptr, settings, errorLogger);
+    CheckBoolImpl c(nullptr, settings, errorLogger);
     c.assignBoolToPointerError(nullptr);
     c.assignBoolToFloatError(nullptr);
     c.comparisonOfFuncReturningBoolError(nullptr, "func_name");
diff --git a/lib/checkbool.h b/lib/checkbool.h
index 65e5d0254ea..53cc19c2486 100644
--- a/lib/checkbool.h
+++ b/lib/checkbool.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -41,15 +42,33 @@ class Tokenizer;
 class CPPCHECKLIB CheckBool : public Check {
 public:
     /** @brief This constructor is used when registering the CheckClass */
-    CheckBool() : Check(myName()) {}
+    CheckBool() : Check("Boolean") {}
 
 private:
-    /** @brief This constructor is used when running checks. */
-    CheckBool(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Boolean type checks\n"
+               "- using increment on boolean\n"
+               "- comparison of a boolean expression with an integer other than 0 or 1\n"
+               "- comparison of a function returning boolean value using relational operator\n"
+               "- comparison of a boolean value with boolean value using relational operator\n"
+               "- using bool in bitwise expression\n"
+               "- pointer addition in condition (either dereference is forgot or pointer overflow is required to make the condition false)\n"
+               "- Assigning bool value to pointer or float\n"
+               "- Returning an integer other than 0 or 1 from a function with boolean return value\n";
+    }
+};
+
+class CPPCHECKLIB CheckBoolImpl : public CheckImpl
+{
+public:
+    /** @brief This constructor is used when running checks. */
+    CheckBoolImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** @brief %Check for comparison of function returning bool*/
     void checkComparisonOfFuncReturningBool();
@@ -94,24 +113,6 @@ class CPPCHECKLIB CheckBool : public Check {
     void comparisonOfBoolExpressionWithIntError(const Token *tok, bool not0or1);
     void pointerArithBoolError(const Token *tok);
     void returnValueBoolError(const Token *tok);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Boolean";
-    }
-
-    std::string classInfo() const override {
-        return "Boolean type checks\n"
-               "- using increment on boolean\n"
-               "- comparison of a boolean expression with an integer other than 0 or 1\n"
-               "- comparison of a function returning boolean value using relational operator\n"
-               "- comparison of a boolean value with boolean value using relational operator\n"
-               "- using bool in bitwise expression\n"
-               "- pointer addition in condition (either dereference is forgot or pointer overflow is required to make the condition false)\n"
-               "- Assigning bool value to pointer or float\n"
-               "- Returning an integer other than 0 or 1 from a function with boolean return value\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
index 57c46492bc0..a9c85802374 100644
--- a/lib/checkbufferoverrun.cpp
+++ b/lib/checkbufferoverrun.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,11 +36,13 @@
 #include "utils.h"
 #include "valueflow.h"
 #include "vfvalue.h"
+#include "vf_common.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <functional>
 #include <iterator>
+#include <limits>
 #include <numeric> // std::accumulate
 #include <sstream>
 #include <utility>
@@ -49,13 +51,6 @@
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckBufferOverrun instance;
-}
-
-//---------------------------------------------------------------------------
-
 // CWE ids used:
 static const CWE CWE131(131U);  // Incorrect Calculation of Buffer Size
 static const CWE CWE170(170U);  // Improper Null Termination
@@ -71,7 +66,12 @@ static const CWE CWE_BUFFER_OVERRUN(788U);   // Access of Memory Location After
 static const ValueFlow::Value *getBufferSizeValue(const Token *tok)
 {
     const std::list<ValueFlow::Value> &tokenValues = tok->values();
-    const auto it = std::find_if(tokenValues.cbegin(), tokenValues.cend(), std::mem_fn(&ValueFlow::Value::isBufferSizeValue));
+    auto it = std::find_if(tokenValues.cbegin(), tokenValues.cend(), std::mem_fn(&ValueFlow::Value::isBufferSizeValue));
+    if (it != tokenValues.cend())
+        return &*it;
+    it = std::find_if(tokenValues.cbegin(), tokenValues.cend(), [](const ValueFlow::Value& v) {
+        return v.isContainerSizeValue() && !v.isImpossible();
+    });
     return it == tokenValues.cend() ? nullptr : &*it;
 }
 
@@ -83,7 +83,16 @@ static const Token* getRealBufferTok(const Token* tok) {
     return (op->valueType() && op->valueType()->pointer) ? op : tok;
 }
 
-static int getMinFormatStringOutputLength(const std::vector<const Token*> &parameters, nonneg int formatStringArgNr)
+// Field width or precision of a format specifier. Values that do not fit in an int are clamped to INT_MAX.
+static int getFormatDigits(const std::string &digits)
+{
+    const long long value = std::strtoll(digits.c_str(), nullptr, 10);
+    if (value < -std::numeric_limits<int>::max() || value > std::numeric_limits<int>::max())
+        return std::numeric_limits<int>::max();
+    return std::abs(static_cast<int>(value));
+}
+
+static MathLib::bigint getMinFormatStringOutputLength(const std::vector<const Token*> &parameters, nonneg int formatStringArgNr, const Settings& settings)
 {
     if (formatStringArgNr <= 0 || formatStringArgNr > parameters.size())
         return 0;
@@ -91,7 +100,7 @@ static int getMinFormatStringOutputLength(const std::vector<const Token*> &param
         return 0;
     const std::string &formatString = parameters[formatStringArgNr - 1]->str();
     bool percentCharFound = false;
-    int outputStringSize = 0;
+    MathLib::bigint outputStringSize = 0;
     bool handleNextParameter = false;
     std::string digits_string;
     bool i_d_x_f_found = false;
@@ -138,8 +147,8 @@ static int getMinFormatStringOutputLength(const std::vector<const Token*> &param
                 break;
             case 's':
                 parameterLength = 0;
-                if (inputArgNr < parameters.size() && parameters[inputArgNr]->tokType() == Token::eString)
-                    parameterLength = Token::getStrLength(parameters[inputArgNr]);
+                if (inputArgNr < parameters.size())
+                    parameterLength = ValueFlow::valueFlowGetStrLength(parameters[inputArgNr], settings.library);
 
                 handleNextParameter = true;
                 break;
@@ -156,15 +165,13 @@ static int getMinFormatStringOutputLength(const std::vector<const Token*> &param
             outputStringSize++;
 
         if (handleNextParameter) {
-            // NOLINTNEXTLINE(cert-err34-c) - intentional use
-            int tempDigits = std::abs(std::atoi(digits_string.c_str()));
+            int tempDigits = getFormatDigits(digits_string);
             if (i_d_x_f_found)
                 tempDigits = std::max(tempDigits, 1);
 
             if (digits_string.find('.') != std::string::npos) {
                 const std::string endStr = digits_string.substr(digits_string.find('.') + 1);
-                // NOLINTNEXTLINE(cert-err34-c) - intentional use
-                const int maxLen = std::max(std::abs(std::atoi(endStr.c_str())), 1);
+                const int maxLen = std::max(getFormatDigits(endStr), 1);
 
                 if (formatString[i] == 's') {
                     // For strings, the length after the dot "%.2s" will limit
@@ -233,7 +240,8 @@ static bool getDimensionsEtc(const Token * const arrayToken, const Settings &set
         const size_t typeSize = array->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, sizeOf);
         if (typeSize == 0)
             return false;
-        dim.num = value->intvalue / typeSize;
+        // a container size counts elements, a buffer size counts bytes
+        dim.num = value->isContainerSizeValue() ? value->intvalue : value->intvalue / typeSize;
         dimensions.emplace_back(dim);
     }
     return !dimensions.empty();
@@ -290,7 +298,7 @@ static std::vector<ValueFlow::Value> getOverrunIndexValues(const Token* tok,
     return {};
 }
 
-void CheckBufferOverrun::arrayIndex()
+void CheckBufferOverrunImpl::arrayIndex()
 {
     logChecker("CheckBufferOverrun::arrayIndex");
 
@@ -329,7 +337,7 @@ void CheckBufferOverrun::arrayIndex()
         ErrorPath errorPath;
         bool mightBeLarger = false;
         MathLib::bigint path = 0;
-        if (!getDimensionsEtc(tok->astOperand1(), *mSettings, dimensions, errorPath, mightBeLarger, path))
+        if (!getDimensionsEtc(tok->astOperand1(), mSettings, dimensions, errorPath, mightBeLarger, path))
             continue;
 
         const Variable* const var = array->variable();
@@ -337,7 +345,7 @@ void CheckBufferOverrun::arrayIndex()
             const Token* changeTok = var->scope()->bodyStart;
             bool isChanged = false;
             while ((changeTok = findVariableChanged(changeTok->next(), var->scope()->bodyEnd, /*indirect*/ 0, var->declarationId(),
-                                                    /*globalvar*/ false, *mSettings))) {
+                                                    /*globalvar*/ false, mSettings))) {
                 if (!Token::simpleMatch(changeTok->astParent(), "[")) {
                     isChanged = true;
                     break;
@@ -359,7 +367,7 @@ void CheckBufferOverrun::arrayIndex()
         bool neg = false;
         std::vector<ValueFlow::Value> negativeIndexes;
         for (const Token * indexToken : indexTokens) {
-            const ValueFlow::Value *negativeValue = indexToken->getValueLE(-1, *mSettings);
+            const ValueFlow::Value *negativeValue = indexToken->getValueLE(-1, mSettings);
             if (negativeValue) {
                 negativeIndexes.emplace_back(*negativeValue);
                 neg = true;
@@ -411,9 +419,9 @@ static std::string arrayIndexMessage(const Token* tok,
     return errmsg.str();
 }
 
-void CheckBufferOverrun::arrayIndexError(const Token* tok,
-                                         const std::vector<Dimension>& dimensions,
-                                         const std::vector<ValueFlow::Value>& indexes)
+void CheckBufferOverrunImpl::arrayIndexError(const Token* tok,
+                                             const std::vector<Dimension>& dimensions,
+                                             const std::vector<ValueFlow::Value>& indexes)
 {
     if (!tok) {
         reportError(tok, Severity::error, "arrayIndexOutOfBounds", "Array 'arr[16]' accessed at index 16, which is out of bounds.", CWE_BUFFER_OVERRUN, Certainty::normal);
@@ -424,7 +432,7 @@ void CheckBufferOverrun::arrayIndexError(const Token* tok,
     const Token *condition = nullptr;
     const ValueFlow::Value *index = nullptr;
     for (const ValueFlow::Value& indexValue : indexes) {
-        if (!indexValue.errorSeverity() && !mSettings->severity.isEnabled(Severity::warning))
+        if (!indexValue.errorSeverity() && !mSettings.severity.isEnabled(Severity::warning))
             return;
         if (indexValue.condition)
             condition = indexValue.condition;
@@ -440,9 +448,9 @@ void CheckBufferOverrun::arrayIndexError(const Token* tok,
                 index->isInconclusive() ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckBufferOverrun::negativeIndexError(const Token* tok,
-                                            const std::vector<Dimension>& dimensions,
-                                            const std::vector<ValueFlow::Value>& indexes)
+void CheckBufferOverrunImpl::negativeIndexError(const Token* tok,
+                                                const std::vector<Dimension>& dimensions,
+                                                const std::vector<ValueFlow::Value>& indexes)
 {
     if (!tok) {
         reportError(tok, Severity::error, "negativeIndex", "Negative array index", CWE_BUFFER_UNDERRUN, Certainty::normal);
@@ -452,7 +460,7 @@ void CheckBufferOverrun::negativeIndexError(const Token* tok,
     const Token *condition = nullptr;
     const ValueFlow::Value *negativeValue = nullptr;
     for (const ValueFlow::Value& indexValue : indexes) {
-        if (!indexValue.errorSeverity() && !mSettings->severity.isEnabled(Severity::warning))
+        if (!indexValue.errorSeverity() && !mSettings.severity.isEnabled(Severity::warning))
             return;
         if (indexValue.condition)
             condition = indexValue.condition;
@@ -461,7 +469,7 @@ void CheckBufferOverrun::negativeIndexError(const Token* tok,
     }
 
     reportError(getErrorPath(tok, negativeValue, "Negative array index"),
-                negativeValue->errorSeverity() ? Severity::error : Severity::warning,
+                (negativeValue->errorSeverity() && !negativeValue->conditional) ? Severity::error : Severity::warning,
                 "negativeIndex",
                 arrayIndexMessage(tok, dimensions, indexes, condition),
                 CWE_BUFFER_UNDERRUN,
@@ -470,9 +478,9 @@ void CheckBufferOverrun::negativeIndexError(const Token* tok,
 
 //---------------------------------------------------------------------------
 
-void CheckBufferOverrun::pointerArithmetic()
+void CheckBufferOverrunImpl::pointerArithmetic()
 {
-    if (!mSettings->severity.isEnabled(Severity::portability) && !mSettings->isPremiumEnabled("pointerOutOfBounds"))
+    if (!mSettings.severity.isEnabled(Severity::portability) && !mSettings.isPremiumEnabled("pointerOutOfBounds"))
         return;
 
     logChecker("CheckBufferOverrun::pointerArithmetic"); // portability
@@ -503,7 +511,7 @@ void CheckBufferOverrun::pointerArithmetic()
         ErrorPath errorPath;
         bool mightBeLarger = false;
         MathLib::bigint path = 0;
-        if (!getDimensionsEtc(arrayToken, *mSettings, dimensions, errorPath, mightBeLarger, path))
+        if (!getDimensionsEtc(arrayToken, mSettings, dimensions, errorPath, mightBeLarger, path))
             continue;
 
         if (tok->str() == "+") {
@@ -516,7 +524,7 @@ void CheckBufferOverrun::pointerArithmetic()
                     pointerArithmeticError(tok, indexToken, &indexValues.front());
             }
 
-            if (const ValueFlow::Value *neg = indexToken->getValueLE(-1, *mSettings))
+            if (const ValueFlow::Value *neg = indexToken->getValueLE(-1, mSettings))
                 pointerArithmeticError(tok, indexToken, neg);
         } else if (tok->str() == "-") {
             if (arrayToken->variable() && arrayToken->variable()->isArgument())
@@ -526,7 +534,7 @@ void CheckBufferOverrun::pointerArithmetic()
             while (Token::Match(array, ".|::"))
                 array = array->astOperand2();
             if (array->variable() && array->variable()->isArray()) {
-                const ValueFlow::Value *v = indexToken->getValueGE(1, *mSettings);
+                const ValueFlow::Value *v = indexToken->getValueGE(1, mSettings);
                 if (v)
                     pointerArithmeticError(tok, indexToken, v);
             }
@@ -534,7 +542,7 @@ void CheckBufferOverrun::pointerArithmetic()
     }
 }
 
-void CheckBufferOverrun::pointerArithmeticError(const Token *tok, const Token *indexToken, const ValueFlow::Value *indexValue)
+void CheckBufferOverrunImpl::pointerArithmeticError(const Token *tok, const Token *indexToken, const ValueFlow::Value *indexValue)
 {
     if (!tok) {
         reportError(tok, Severity::portability, "pointerOutOfBounds", "Pointer arithmetic overflow.", CWE_POINTER_ARITHMETIC_OVERFLOW, Certainty::normal);
@@ -558,21 +566,65 @@ void CheckBufferOverrun::pointerArithmeticError(const Token *tok, const Token *i
 
 //---------------------------------------------------------------------------
 
-ValueFlow::Value CheckBufferOverrun::getBufferSize(const Token *bufTok) const
+ValueFlow::Value CheckBufferOverrunImpl::getBufferSize(const Token *bufTok, const Settings& settings, bool checkStringLiteral) const
 {
     if (!bufTok->valueType())
         return ValueFlow::Value(-1);
-    if (bufTok->isUnaryOp("&"))
+
+    MathLib::bigint index = 0;
+    if (bufTok->isUnaryOp("&")) {
         bufTok = bufTok->astOperand1();
+        if (Token::simpleMatch(bufTok, "[")) {
+            if (const Token* indexTok = bufTok->astOperand2()) {
+                if (indexTok->hasKnownIntValue())
+                    index = indexTok->getKnownIntValue();
+                else if (const ValueFlow::Value* maxValue = indexTok->getMaxValue(false))
+                    index = maxValue->intvalue;
+                else
+                    return ValueFlow::Value(-1);
+            }
+            bufTok = bufTok->astOperand1();
+        }
+    }
     const Variable *var = bufTok->variable();
 
     if (!var || var->dimensions().empty()) {
-        const ValueFlow::Value *value = getBufferSizeValue(bufTok);
-        if (value)
-            return *value;
+        if (const ValueFlow::Value *value = getBufferSizeValue(bufTok)) {
+            if (value->isBufferSizeValue())
+                return *value;
+            if (value->isContainerSizeValue() && bufTok->valueType()) {
+                size_t elementSize = 0;
+                if (bufTok->valueType()->containerTypeToken) {
+                    const ValueType vtElement = ValueType::parseDecl(bufTok->valueType()->containerTypeToken, settings);
+                    elementSize =
+                        vtElement.getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
+                } else if (bufTok->valueType()->pointer == 1) {
+                    elementSize = bufTok->valueType()->getSizeOf(settings,
+                                                                 ValueType::Accuracy::ExactOrZero,
+                                                                 ValueType::SizeOf::Pointee);
+                }
+                if (elementSize > 0) {
+                    ValueFlow::Value bufSizeVal;
+                    bufSizeVal.valueType = ValueFlow::Value::ValueType::BUFFER_SIZE;
+                    bufSizeVal.intvalue = value->intvalue * elementSize;
+                    bufSizeVal.valueKind = value->valueKind;
+                    bufSizeVal.errorPath = value->errorPath;
+                    return bufSizeVal;
+                }
+            }
+        } else if (checkStringLiteral && bufTok->tokType() == Token::Type::eString && bufTok->valueType()) {
+            const size_t charSize = bufTok->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointee);
+            if (charSize > 0) {
+                ValueFlow::Value strSizeVal;
+                strSizeVal.setKnown();
+                strSizeVal.valueType = ValueFlow::Value::ValueType::BUFFER_SIZE;
+                strSizeVal.intvalue = (Token::getStrArraySize(bufTok) - index) * charSize;
+                return strSizeVal;
+            }
+        }
     }
 
-    if (!var || var->isPointer())
+    if (!var || var->isPointer() || (astIsContainer(bufTok) && var->getTypeName() != "std::array"))
         return ValueFlow::Value(-1);
 
     const MathLib::bigint dim = std::accumulate(var->dimensions().cbegin(), var->dimensions().cend(), MathLib::bigint(1), [](MathLib::bigint i1, const Dimension &dim) {
@@ -584,17 +636,29 @@ ValueFlow::Value CheckBufferOverrun::getBufferSize(const Token *bufTok) const
     v.valueType = ValueFlow::Value::ValueType::BUFFER_SIZE;
 
     if (var->isPointerArray())
-        v.intvalue = dim * mSettings->platform.sizeof_pointer;
+        v.intvalue = (dim - index) * mSettings.platform.sizeof_pointer;
     else {
-        const size_t typeSize = bufTok->valueType()->getSizeOf(*mSettings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointee);
-        v.intvalue = dim * typeSize;
+        const size_t typeSize = bufTok->valueType()->getSizeOf(mSettings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointee);
+        v.intvalue = (dim - index) * typeSize;
     }
 
     return v;
 }
 //---------------------------------------------------------------------------
 
-static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::MinSize &minsize, const std::vector<const Token *> &args, const MathLib::bigint bufferSize, const Settings &settings, const Tokenizer* tokenizer)
+// Return true if a * b does not fit in a MathLib::bigint
+static bool mulOverflows(MathLib::bigint a, MathLib::bigint b)
+{
+    const MathLib::bigint maxValue = std::numeric_limits<MathLib::bigint>::max();
+    const MathLib::bigint minValue = std::numeric_limits<MathLib::bigint>::min();
+    if (a > 0)
+        return b > 0 ? a > maxValue / b : b < minValue / a;
+    if (a < 0)
+        return b > 0 ? a < minValue / b : (b < 0 && a < maxValue / b);
+    return false;
+}
+
+static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::MinSize &minsize, const std::vector<const Token *> &args, ValueFlow::Value& bufferSize, const Settings &settings, const Tokenizer* tokenizer)
 {
     const Token * const arg = (minsize.arg > 0 && minsize.arg - 1 < args.size()) ? args[minsize.arg - 1] : nullptr;
     const Token * const arg2 = (minsize.arg2 > 0 && minsize.arg2 - 1 < args.size()) ? args[minsize.arg2 - 1] : nullptr;
@@ -602,20 +666,32 @@ static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::Mi
     switch (minsize.type) {
     case Library::ArgumentChecks::MinSize::Type::STRLEN:
         if (settings.library.isargformatstr(ftok, minsize.arg)) {
-            return getMinFormatStringOutputLength(args, minsize.arg) < bufferSize;
+            return getMinFormatStringOutputLength(args, minsize.arg, settings) < bufferSize.intvalue;
         } else if (arg) {
             const Token *strtoken = arg->getValueTokenMaxStrLength();
             if (strtoken)
-                return Token::getStrLength(strtoken) < bufferSize;
+                return Token::getStrLength(strtoken) < bufferSize.intvalue;
         }
         break;
     case Library::ArgumentChecks::MinSize::Type::ARGVALUE: {
-        if (arg && arg->hasKnownIntValue()) {
-            MathLib::bigint myMinsize = arg->getKnownIntValue();
+        if (arg) {
+            const ValueFlow::Value* argVal = arg->hasKnownIntValue() ?
+                                             arg->getKnownValue(ValueFlow::Value::ValueType::INT) :
+                                             arg->getMaxValue(/*condition*/ true);
+            if (!argVal)
+                break;
+            MathLib::bigint myMinsize = argVal->intvalue;
             const int baseSize = tokenizer->sizeOfType(minsize.baseType);
-            if (baseSize != 0)
+            const bool overflow = baseSize != 0 && mulOverflows(myMinsize, baseSize);
+            if (baseSize != 0 && !overflow)
                 myMinsize *= baseSize;
-            return myMinsize <= bufferSize;
+            const bool ok = !overflow && myMinsize <= bufferSize.intvalue;
+            if (!ok) {
+                bufferSize.errorPath.insert(bufferSize.errorPath.end(), argVal->errorPath.begin(), argVal->errorPath.end());
+                if (!bufferSize.condition)
+                    bufferSize.condition = argVal->condition;
+            }
+            return ok;
         }
         break;
     }
@@ -623,15 +699,21 @@ static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::Mi
         // TODO
         break;
     case Library::ArgumentChecks::MinSize::Type::MUL:
-        if (arg && arg2 && arg->hasKnownIntValue() && arg2->hasKnownIntValue())
-            return (arg->getKnownIntValue() * arg2->getKnownIntValue()) <= bufferSize;
+        if (arg && arg2 && arg->hasKnownIntValue() && arg2->hasKnownIntValue()) {
+            if (mulOverflows(arg->getKnownIntValue(), arg2->getKnownIntValue()))
+                return false;
+            return (arg->getKnownIntValue() * arg2->getKnownIntValue()) <= bufferSize.intvalue;
+        }
         break;
     case Library::ArgumentChecks::MinSize::Type::VALUE: {
         MathLib::bigint myMinsize = minsize.value;
         const int baseSize = tokenizer->sizeOfType(minsize.baseType);
-        if (baseSize != 0)
+        if (baseSize != 0) {
+            if (mulOverflows(myMinsize, baseSize))
+                return false;
             myMinsize *= baseSize;
-        return myMinsize <= bufferSize;
+        }
+        return myMinsize <= bufferSize.intvalue;
     }
     case Library::ArgumentChecks::MinSize::Type::NONE:
         break;
@@ -640,7 +722,7 @@ static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::Mi
 }
 
 
-void CheckBufferOverrun::bufferOverflow()
+void CheckBufferOverrunImpl::bufferOverflow()
 {
     logChecker("CheckBufferOverrun::bufferOverflow");
 
@@ -649,13 +731,13 @@ void CheckBufferOverrun::bufferOverflow()
         for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
             if (!Token::Match(tok, "%name% (") || Token::simpleMatch(tok, ") {"))
                 continue;
-            if (!mSettings->library.hasminsize(tok))
+            if (!mSettings.library.hasminsize(tok))
                 continue;
             const std::vector<const Token *> args = getArguments(tok);
-            for (int argnr = 0; argnr < args.size(); ++argnr) {
+            for (size_t argnr = 0; argnr < args.size(); ++argnr) {
                 if (!args[argnr]->valueType() || args[argnr]->valueType()->pointer == 0)
                     continue;
-                const std::vector<Library::ArgumentChecks::MinSize> *minsizes = mSettings->library.argminsizes(tok, argnr + 1);
+                const std::vector<Library::ArgumentChecks::MinSize> *minsizes = mSettings.library.argminsizes(tok, argnr + 1);
                 if (!minsizes || minsizes->empty())
                     continue;
                 // Get buffer size..
@@ -669,7 +751,8 @@ void CheckBufferOverrun::bufferOverflow()
                 if (argtok->valueType() && argtok->valueType()->pointer == 0)
                     continue;
                 // TODO: strcpy(buf+10, "hello");
-                const ValueFlow::Value bufferSize = getBufferSize(argtok);
+                const bool strz = mSettings.library.isargstrz(tok, argnr + 1);
+                ValueFlow::Value bufferSize = getBufferSize(argtok, mSettings, !strz);
                 if (bufferSize.intvalue <= 0)
                     continue;
                 // buffer size == 1 => do not warn for dynamic memory
@@ -688,7 +771,7 @@ void CheckBufferOverrun::bufferOverflow()
                     }
                 }
                 const bool error = std::none_of(minsizes->begin(), minsizes->end(), [&](const Library::ArgumentChecks::MinSize &minsize) {
-                    return checkBufferSize(tok, minsize, args, bufferSize.intvalue, *mSettings, mTokenizer);
+                    return checkBufferSize(tok, minsize, args, bufferSize, mSettings, mTokenizer);
                 });
                 if (error)
                     bufferOverflowError(args[argnr], &bufferSize, Certainty::normal);
@@ -697,19 +780,22 @@ void CheckBufferOverrun::bufferOverflow()
     }
 }
 
-void CheckBufferOverrun::bufferOverflowError(const Token *tok, const ValueFlow::Value *value, Certainty certainty)
+void CheckBufferOverrunImpl::bufferOverflowError(const Token *tok, const ValueFlow::Value *value, Certainty certainty)
 {
-    reportError(getErrorPath(tok, value, "Buffer overrun"), Severity::error, "bufferAccessOutOfBounds", "Buffer is accessed out of bounds: " + (tok ? getRealBufferTok(tok)->expressionString() : "buf"), CWE_BUFFER_OVERRUN, certainty);
+    const auto errorPath = getErrorPath(tok, value, "Buffer overrun");
+    const auto severity = !value || (value->isKnown() && !value->condition) ? Severity::error : Severity::warning;
+    const std::string msg = "Buffer is accessed out of bounds: " + (tok ? getRealBufferTok(tok)->expressionString() : "buf");
+    reportError(errorPath, severity, "bufferAccessOutOfBounds", msg, CWE_BUFFER_OVERRUN, certainty);
 }
 
 //---------------------------------------------------------------------------
 
-void CheckBufferOverrun::arrayIndexThenCheck()
+void CheckBufferOverrunImpl::arrayIndexThenCheck()
 {
-    if (!mSettings->severity.isEnabled(Severity::portability))
+    if (!mSettings.severity.isEnabled(Severity::style))
         return;
 
-    logChecker("CheckBufferOverrun::arrayIndexThenCheck");
+    logChecker("CheckBufferOverrun::arrayIndexThenCheck"); // style
 
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * const scope : symbolDatabase->functionScopes) {
@@ -748,7 +834,7 @@ void CheckBufferOverrun::arrayIndexThenCheck()
     }
 }
 
-void CheckBufferOverrun::arrayIndexThenCheckError(const Token *tok, const std::string &indexName)
+void CheckBufferOverrunImpl::arrayIndexThenCheckError(const Token *tok, const std::string &indexName)
 {
     reportError(tok, Severity::style, "arrayIndexThenCheck",
                 "$symbol:" + indexName + "\n"
@@ -761,10 +847,10 @@ void CheckBufferOverrun::arrayIndexThenCheckError(const Token *tok, const std::s
 
 //---------------------------------------------------------------------------
 
-void CheckBufferOverrun::stringNotZeroTerminated()
+void CheckBufferOverrunImpl::stringNotZeroTerminated()
 {
     // this is currently 'inconclusive'. See TestBufferOverrun::terminateStrncpy3
-    if (!mSettings->severity.isEnabled(Severity::warning) || !mSettings->certainty.isEnabled(Certainty::inconclusive))
+    if (!mSettings.severity.isEnabled(Severity::warning) || !mSettings.certainty.isEnabled(Certainty::inconclusive))
         return;
 
     logChecker("CheckBufferOverrun::stringNotZeroTerminated"); // warning,inconclusive
@@ -780,7 +866,7 @@ void CheckBufferOverrun::stringNotZeroTerminated()
             const Token *sizeToken = args[2];
             if (!sizeToken->hasKnownIntValue())
                 continue;
-            const ValueFlow::Value &bufferSize = getBufferSize(args[0]);
+            const ValueFlow::Value &bufferSize = getBufferSize(args[0], mSettings);
             if (bufferSize.intvalue < 0 || sizeToken->getKnownIntValue() < bufferSize.intvalue)
                 continue;
             if (Token::simpleMatch(args[1], "(") && Token::simpleMatch(args[1]->astOperand1(), ". c_str") && args[1]->astOperand1()->astOperand1()) {
@@ -803,7 +889,7 @@ void CheckBufferOverrun::stringNotZeroTerminated()
                 const Token *rhs = tok2->next()->astOperand2();
                 if (!rhs || !rhs->hasKnownIntValue() || rhs->getKnownIntValue() != 0)
                     continue;
-                if (isSameExpression(false, args[0], tok2->link()->astOperand1(), *mSettings, false, false))
+                if (isSameExpression(false, args[0], tok2->link()->astOperand1(), mSettings, false, false))
                     isZeroTerminated = true;
             }
             if (isZeroTerminated)
@@ -814,7 +900,7 @@ void CheckBufferOverrun::stringNotZeroTerminated()
     }
 }
 
-void CheckBufferOverrun::terminateStrncpyError(const Token *tok, const std::string &varname)
+void CheckBufferOverrunImpl::terminateStrncpyError(const Token *tok, const std::string &varname)
 {
     const std::string shortMessage = "The buffer '$symbol' may not be null-terminated after the call to strncpy().";
     reportError(tok, Severity::warning, "terminateStrncpy",
@@ -827,10 +913,10 @@ void CheckBufferOverrun::terminateStrncpyError(const Token *tok, const std::stri
 }
 //---------------------------------------------------------------------------
 
-void CheckBufferOverrun::argumentSize()
+void CheckBufferOverrunImpl::argumentSize()
 {
     // Check '%type% x[10]' arguments
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("argumentSize"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("argumentSize"))
         return;
 
     logChecker("CheckBufferOverrun::argumentSize"); // warning
@@ -844,7 +930,7 @@ void CheckBufferOverrun::argumentSize()
             // If argument is '%type% a[num]' then check bounds against num
             const Function *callfunc = tok->function();
             const std::vector<const Token *> callargs = getArguments(tok);
-            for (nonneg int paramIndex = 0; paramIndex < callargs.size() && paramIndex < callfunc->argCount(); ++paramIndex) {
+            for (size_t paramIndex = 0; paramIndex < callargs.size() && paramIndex < callfunc->argCount(); ++paramIndex) {
                 const Variable* const argument = callfunc->getArgumentVar(paramIndex);
                 if (!argument || !argument->nameToken() || !argument->isArray())
                     continue;
@@ -875,7 +961,7 @@ void CheckBufferOverrun::argumentSize()
     }
 }
 
-void CheckBufferOverrun::argumentSizeError(const Token *tok, const std::string &functionName, nonneg int paramIndex, const std::string &paramExpression, const Variable *paramVar, const Variable *functionArg)
+void CheckBufferOverrunImpl::argumentSizeError(const Token *tok, const std::string &functionName, nonneg int paramIndex, const std::string &paramExpression, const Variable *paramVar, const Variable *functionArg)
 {
     const std::string strParamNum = std::to_string(paramIndex + 1) + getOrdinalText(paramIndex + 1);
     ErrorPath errorPath;
@@ -906,6 +992,8 @@ namespace
     /** data for multifile checking */
     class MyFileInfo : public Check::FileInfo {
     public:
+        explicit MyFileInfo(std::string f0) : Check::FileInfo(std::move(f0)) {}
+
         using Check::FileInfo::FileInfo;
         /** unsafe array index usage */
         std::list<CTU::FileInfo::UnsafeUsage> unsafeArrayIndex;
@@ -926,7 +1014,7 @@ namespace
     };
 }
 
-bool CheckBufferOverrun::isCtuUnsafeBufferUsage(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *offset, int type)
+bool CheckBufferOverrunImpl::isCtuUnsafeBufferUsage(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *offset, int type)
 {
     if (!offset)
         return false;
@@ -947,21 +1035,21 @@ bool CheckBufferOverrun::isCtuUnsafeBufferUsage(const Settings &settings, const
     return true;
 }
 
-bool CheckBufferOverrun::isCtuUnsafeArrayIndex(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *offset)
+bool CheckBufferOverrunImpl::isCtuUnsafeArrayIndex(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *offset)
 {
     return isCtuUnsafeBufferUsage(settings, argtok, offset, 1);
 }
 
-bool CheckBufferOverrun::isCtuUnsafePointerArith(const Settings &settings, const Token *argtok, CTU::FileInfo::Value* offset)
+bool CheckBufferOverrunImpl::isCtuUnsafePointerArith(const Settings &settings, const Token *argtok, CTU::FileInfo::Value* offset)
 {
     return isCtuUnsafeBufferUsage(settings, argtok, offset, 2);
 }
 
 /** @brief Parse current TU and extract file info */
-Check::FileInfo *CheckBufferOverrun::getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) const
+const Check::FileInfo *CheckBufferOverrun::getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) const
 {
-    const std::list<CTU::FileInfo::UnsafeUsage> &unsafeArrayIndex = CTU::getUnsafeUsage(tokenizer, settings, isCtuUnsafeArrayIndex);
-    const std::list<CTU::FileInfo::UnsafeUsage> &unsafePointerArith = CTU::getUnsafeUsage(tokenizer, settings, isCtuUnsafePointerArith);
+    const std::list<CTU::FileInfo::UnsafeUsage> &unsafeArrayIndex = CTU::getUnsafeUsage(tokenizer, settings, CheckBufferOverrunImpl::isCtuUnsafeArrayIndex);
+    const std::list<CTU::FileInfo::UnsafeUsage> &unsafePointerArith = CTU::getUnsafeUsage(tokenizer, settings, CheckBufferOverrunImpl::isCtuUnsafePointerArith);
     if (unsafeArrayIndex.empty() && unsafePointerArith.empty()) {
         return nullptr;
     }
@@ -971,13 +1059,12 @@ Check::FileInfo *CheckBufferOverrun::getFileInfo(const Tokenizer &tokenizer, con
     return fileInfo;
 }
 
-Check::FileInfo * CheckBufferOverrun::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const
+const Check::FileInfo * CheckBufferOverrun::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const
 {
-    // cppcheck-suppress shadowFunction - TODO: fix this
     const std::string arrayIndex("array-index");
     const std::string pointerArith("pointer-arith");
 
-    auto *fileInfo = new MyFileInfo;
+    auto *fileInfo = new MyFileInfo(file0);
     for (const tinyxml2::XMLElement *e = xmlElement->FirstChildElement(); e; e = e->NextSiblingElement()) {
         const char* name = e->Name();
         if (name == arrayIndex)
@@ -995,9 +1082,9 @@ Check::FileInfo * CheckBufferOverrun::loadFileInfoFromXml(const tinyxml2::XMLEle
 }
 
 /** @brief Analyse all file infos for all TU */
-bool CheckBufferOverrun::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
+bool CheckBufferOverrun::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<const Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
 {
-    CheckBufferOverrun dummy(nullptr, &settings, &errorLogger);
+    CheckBufferOverrunImpl dummy(nullptr, settings, errorLogger);
     dummy.
     logChecker("CheckBufferOverrun::analyseWholeProgram");
 
@@ -1064,7 +1151,7 @@ bool CheckBufferOverrun::analyseWholeProgram1(const std::map<std::string, std::l
     return true;
 }
 
-void CheckBufferOverrun::objectIndex()
+void CheckBufferOverrunImpl::objectIndex()
 {
     logChecker("CheckBufferOverrun::objectIndex");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -1083,9 +1170,15 @@ void CheckBufferOverrun::objectIndex()
 
             std::vector<ValueFlow::Value> values = ValueFlow::getLifetimeObjValues(obj, false, -1);
             for (const ValueFlow::Value& v:values) {
-                if (v.lifetimeKind != ValueFlow::Value::LifetimeKind::Address)
+                if (v.lifetimeKind != ValueFlow::Value::LifetimeKind::Address && v.lifetimeKind != ValueFlow::Value::LifetimeKind::Object)
                     continue;
-                const Variable *var = v.tokvalue->variable();
+                const Token* varTok = v.tokvalue;
+                if (Token::simpleMatch(varTok->astParent(), ".")) {
+                    varTok = varTok->astParent();
+                    while (Token::simpleMatch(varTok, "."))
+                        varTok = varTok->astOperand2();
+                }
+                const Variable *var = varTok ? varTok->variable() : nullptr;
                 if (!var)
                     continue;
                 if (var->isReference())
@@ -1103,7 +1196,7 @@ void CheckBufferOverrun::objectIndex()
                         continue;
                 }
                 if (obj->valueType() && var->valueType() && (obj->isCast() || (obj->isCpp() && isCPPCast(obj)) || obj->valueType()->pointer)) { // allow cast to a different type
-                    const auto varSize = var->valueType()->getSizeOf(*mSettings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointee);
+                    const auto varSize = var->valueType()->getSizeOf(mSettings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointee);
                     if (varSize == 0)
                         continue;
                     if (obj->valueType()->type != var->valueType()->type) {
@@ -1136,7 +1229,7 @@ void CheckBufferOverrun::objectIndex()
     }
 }
 
-void CheckBufferOverrun::objectIndexError(const Token *tok, const ValueFlow::Value *v, bool known)
+void CheckBufferOverrunImpl::objectIndexError(const Token *tok, const ValueFlow::Value *v, bool known)
 {
     ErrorPath errorPath;
     std::string name;
@@ -1173,7 +1266,7 @@ static bool isVLAIndex(const Token* tok)
     return isVLAIndex(tok->astOperand1()) || isVLAIndex(tok->astOperand2());
 }
 
-void CheckBufferOverrun::negativeArraySize()
+void CheckBufferOverrunImpl::negativeArraySize()
 {
     logChecker("CheckBufferOverrun::negativeArraySize");
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -1183,7 +1276,7 @@ void CheckBufferOverrun::negativeArraySize()
         const Token* const nameToken = var->nameToken();
         if (!Token::Match(nameToken, "%var% [") || !nameToken->next()->astOperand2())
             continue;
-        const ValueFlow::Value* sz = nameToken->next()->astOperand2()->getValueLE(-1, *mSettings);
+        const ValueFlow::Value* sz = nameToken->next()->astOperand2()->getValueLE(-1, mSettings);
         // don't warn about constant negative index because that is a compiler error
         if (sz && isVLAIndex(nameToken->next()->astOperand2()))
             negativeArraySizeError(nameToken);
@@ -1196,14 +1289,14 @@ void CheckBufferOverrun::negativeArraySize()
             const Token* valOperand = tok->astOperand1()->astOperand2();
             if (!valOperand)
                 continue;
-            const ValueFlow::Value* sz = valOperand->getValueLE(-1, *mSettings);
+            const ValueFlow::Value* sz = valOperand->getValueLE(-1, mSettings);
             if (sz)
                 negativeMemoryAllocationSizeError(tok, sz);
         }
     }
 }
 
-void CheckBufferOverrun::negativeArraySizeError(const Token* tok)
+void CheckBufferOverrunImpl::negativeArraySizeError(const Token* tok)
 {
     const std::string arrayName = tok ? tok->expressionString() : std::string();
     const std::string line1 = arrayName.empty() ? std::string() : ("$symbol:" + arrayName + '\n');
@@ -1212,7 +1305,7 @@ void CheckBufferOverrun::negativeArraySizeError(const Token* tok)
                 "Declaration of array '" + arrayName + "' with negative size is undefined behaviour", CWE758, Certainty::normal);
 }
 
-void CheckBufferOverrun::negativeMemoryAllocationSizeError(const Token* tok, const ValueFlow::Value* value)
+void CheckBufferOverrunImpl::negativeMemoryAllocationSizeError(const Token* tok, const ValueFlow::Value* value)
 {
     const std::string msg = "Memory allocation size is negative.";
     ErrorPath errorPath = getErrorPath(tok, value, msg);
@@ -1221,9 +1314,9 @@ void CheckBufferOverrun::negativeMemoryAllocationSizeError(const Token* tok, con
                 msg, CWE131, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckBufferOverrun::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckBufferOverrun::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckBufferOverrun checkBufferOverrun(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckBufferOverrunImpl checkBufferOverrun(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkBufferOverrun.arrayIndex();
     checkBufferOverrun.pointerArithmetic();
     checkBufferOverrun.bufferOverflow();
@@ -1234,9 +1327,9 @@ void CheckBufferOverrun::runChecks(const Tokenizer &tokenizer, ErrorLogger *erro
     checkBufferOverrun.negativeArraySize();
 }
 
-void CheckBufferOverrun::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckBufferOverrun::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckBufferOverrun c(nullptr, settings, errorLogger);
+    CheckBufferOverrunImpl c(nullptr, settings, errorLogger);
     c.arrayIndexError(nullptr, std::vector<Dimension>(), std::vector<ValueFlow::Value>());
     c.pointerArithmeticError(nullptr, nullptr, nullptr);
     c.negativeIndexError(nullptr, std::vector<Dimension>(), std::vector<ValueFlow::Value>());
diff --git a/lib/checkbufferoverrun.h b/lib/checkbufferoverrun.h
index 9c6e1f0386d..afac19d796c 100644
--- a/lib/checkbufferoverrun.h
+++ b/lib/checkbufferoverrun.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 #include "ctu.h"
 
@@ -60,22 +61,43 @@ namespace ValueFlow
 class CPPCHECKLIB CheckBufferOverrun : public Check {
 public:
     /** This constructor is used when registering the CheckClass */
-    CheckBufferOverrun() : Check(myName()) {}
+    CheckBufferOverrun() : Check("Bounds checking") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckBufferOverrun(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
 
     /** @brief Parse current TU and extract file info */
-    Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) const override;
+    const Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) const override;
 
     /** @brief Analyse all file infos for all TU */
-    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
+    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<const Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    const Check::FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const override;
+
+    std::string classInfo() const override {
+        return "Out of bounds checking:\n"
+               "- Array index out of bounds\n"
+               "- Pointer arithmetic overflow\n"
+               "- Buffer overflow\n"
+               "- Dangerous usage of strncat()\n"
+               "- Using array index before checking it\n"
+               "- Partial string write that leads to buffer that is not zero terminated.\n"
+               "- Check for large enough arrays being passed to functions\n"
+               "- Allocating memory with a negative size\n";
+    }
+
+    static bool analyseWholeProgram1(const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> &callsMap, const CTU::FileInfo::UnsafeUsage &unsafeUsage,
+                                     int type, ErrorLogger &errorLogger, int maxCtuDepth, const std::string& file0);
+};
+
+class CPPCHECKLIB CheckBufferOverrunImpl : public CheckImpl
+{
+public:
+    /** This constructor is used when running checks. */
+    CheckBufferOverrunImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     void arrayIndex();
     void arrayIndexError(const Token* tok,
@@ -107,33 +129,12 @@ class CPPCHECKLIB CheckBufferOverrun : public Check {
     void objectIndex();
     void objectIndexError(const Token *tok, const ValueFlow::Value *v, bool known);
 
-    ValueFlow::Value getBufferSize(const Token *bufTok) const;
+    ValueFlow::Value getBufferSize(const Token *bufTok, const Settings& settings, bool checkStringLiteral = false) const;
 
     // CTU
     static bool isCtuUnsafeBufferUsage(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *offset, int type);
     static bool isCtuUnsafeArrayIndex(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *offset);
     static bool isCtuUnsafePointerArith(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *offset);
-
-    Check::FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const override;
-    static bool analyseWholeProgram1(const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> &callsMap, const CTU::FileInfo::UnsafeUsage &unsafeUsage,
-                                     int type, ErrorLogger &errorLogger, int maxCtuDepth, const std::string& file0);
-
-
-    static std::string myName() {
-        return "Bounds checking";
-    }
-
-    std::string classInfo() const override {
-        return "Out of bounds checking:\n"
-               "- Array index out of bounds\n"
-               "- Pointer arithmetic overflow\n"
-               "- Buffer overflow\n"
-               "- Dangerous usage of strncat()\n"
-               "- Using array index before checking it\n"
-               "- Partial string write that leads to buffer that is not zero terminated.\n"
-               "- Check for large enough arrays being passed to functions\n"
-               "- Allocating memory with a negative size\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
index 2949d3c57a7..a6fb1aecac4 100644
--- a/lib/checkclass.cpp
+++ b/lib/checkclass.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,11 +43,6 @@
 
 //---------------------------------------------------------------------------
 
-// Register CheckClass..
-namespace {
-    CheckClass instance;
-}
-
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
 static const CWE CWE404(404U);  // Improper Resource Shutdown or Release
 static const CWE CWE665(665U);  // Improper Initialization
@@ -111,27 +106,177 @@ static bool isVclTypeInit(const Type *type)
 }
 //---------------------------------------------------------------------------
 
-CheckClass::CheckClass(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-    : Check(myName(), tokenizer, settings, errorLogger),
+CheckClassImpl::CheckClassImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+    : CheckImpl(tokenizer, settings, errorLogger),
     mSymbolDatabase(tokenizer?tokenizer->getSymbolDatabase():nullptr)
 {}
 
+CheckClassImpl::Initialization CheckClassImpl::checkInitialization(const Usage& usage, FunctionType funcType, bool noConstructor) const
+{
+    const Variable& var = *usage.var;
+
+    if (usage.assign || usage.init || var.isStatic())
+        return Initialization::Initialized;
+
+    if (!var.nameToken() || var.nameToken()->isAnonymous())
+        return Initialization::None;
+
+    if (var.valueType() && var.valueType()->pointer == 0 && var.type() && var.type()->needInitialization == Type::NeedInitialization::False && var.type()->derivedFrom.empty())
+        return Initialization::Initialized;
+
+    if (var.isConst() && (funcType == FunctionType::eOperatorEqual || // We can't set const members in assignment operator
+                          (funcType == FunctionType::eConstructor && noConstructor))) // a const member of class type is default constructed or makes the class not default constructible
+        return Initialization::None;
+
+    if (funcType == FunctionType::eConstructor && noConstructor && var.nameToken()->isBitfield() && mSettings.standards.cpp < Standards::CPP20)
+        return Initialization::None;
+
+    if (var.isArray() && ((var.dimensionKnown(0) && var.dimensions()[0].num == 0) || Token::simpleMatch(var.nameToken()->next(), "[ ]"))) // HACK for unreliable dimensions
+        return Initialization::None;
+
+    // Check if this is a class constructor
+    if (!var.isPointer() && !var.isPointerArray() && var.isClass() && funcType == FunctionType::eConstructor) {
+        // Unknown type so assume it is initialized
+        if (!var.type()) {
+            if (var.isStlType() && var.valueType() && var.valueType()->containerTypeToken) {
+                if (var.valueType()->type == ValueType::Type::ITERATOR)
+                {
+                    // needs initialization
+                }
+                else if (var.getTypeName() == "std::array") {
+                    const Token* ctt = var.valueType()->containerTypeToken;
+                    if (!ctt->isStandardType() &&
+                        (!ctt->type() || ctt->type()->needInitialization != Type::NeedInitialization::True) &&
+                        !mSettings.library.podtype(ctt->str())) // TODO: handle complex type expression
+                        return Initialization::Initialized;
+                }
+                else
+                    return Initialization::Initialized;
+            }
+            else
+                return Initialization::Initialized;
+        }
+
+        // Known type that doesn't need initialization or
+        // known type that has member variables of an unknown type
+        else if (var.type()->needInitialization != Type::NeedInitialization::True)
+            return Initialization::Initialized;
+    }
+
+    // Check if type can't be copied
+    if (!var.isPointer() && !var.isPointerArray() && var.typeScope()) {
+        if (funcType == FunctionType::eMoveConstructor) {
+            if (canNotMove(var.typeScope()))
+                return Initialization::None;
+        }
+        else {
+            if (canNotCopy(var.typeScope()))
+                return Initialization::None;
+        }
+    }
+    return Initialization::Missing;
+}
+
+void CheckClassImpl::handleUnionMembers(std::vector<Usage>& usageList)
+{
+    // Assign 1 union member => assign all union members
+    for (const Usage& usage : usageList) {
+        const Variable& var = *usage.var;
+        if (!usage.assign && !usage.init)
+            continue;
+        const Scope* varScope1 = var.nameToken()->scope();
+        while (varScope1->type == ScopeType::eStruct)
+            varScope1 = varScope1->nestedIn;
+        if (varScope1->type == ScopeType::eUnion) {
+            for (Usage& usage2 : usageList) {
+                const Variable& var2 = *usage2.var;
+                if (usage2.assign || usage2.init || var2.isStatic())
+                    continue;
+                const Scope* varScope2 = var2.nameToken()->scope();
+                while (varScope2->type == ScopeType::eStruct)
+                    varScope2 = varScope2->nestedIn;
+                if (varScope1 == varScope2)
+                    usage2.assign = true;
+            }
+        }
+    }
+}
+
+static std::vector<const Token *> getInheritedConstructors(const Scope *scope)
+{
+    std::vector<const Token *> result;
+
+    if (!scope || !scope->bodyStart || !scope->definedType)
+        return result;
+
+    const auto isInherited = [](const Function &baseCtor, const Scope *scope) {
+        if (baseCtor.type != FunctionType::eConstructor || baseCtor.argCount() == 0)
+            return false;
+        if (baseCtor.isDelete() || baseCtor.access == AccessControl::Private)
+            return false;
+        return std::none_of(scope->functionList.cbegin(), scope->functionList.cend(), [&](const Function &func) {
+            return func.isConstructor() && func.argCount() == baseCtor.argCount() &&
+                   func.argsMatch(baseCtor.nestedIn, baseCtor.argDef, func.argDef, "", 0);
+        });
+    };
+
+    const std::vector<Type::BaseInfo> &bases = scope->definedType->derivedFrom;
+    const Token *baseName = nullptr;
+    const std::list<Function> *baseFuncs = nullptr;
+    for (const Token *tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
+        if (Token::Match(tok, "using %name%")) {
+            const auto base = std::find_if(
+                bases.cbegin(),
+                bases.cend(),
+                [&tok](const Type::BaseInfo &info) {
+                return info.name == tok->strAt(1);
+            }
+                );
+            if (base != bases.cend() && base->type && base->type->classScope) {
+                baseName = tok->next();
+                baseFuncs = &base->type->classScope->functionList;
+            }
+            continue;
+        }
+
+        if (tok->str() == ";") {
+            baseName = nullptr;
+            continue;
+        }
+
+        if (tok->str() == "{") {
+            baseName = nullptr;
+            tok = tok->link();
+            continue;
+        }
+
+        if (baseName && Token::Match(tok, "%name% :: %name% ;") &&
+            tok->str() == baseName->str() && tok->strAt(2) == baseName->str() &&
+            std::any_of(baseFuncs->cbegin(), baseFuncs->cend(), [&](const Function &func) {
+            return isInherited(func, scope);
+        }))
+            result.push_back(tok->tokAt(2));
+    }
+
+    return result;
+}
+
 //---------------------------------------------------------------------------
 // ClassCheck: Check that all class constructors are ok.
 //---------------------------------------------------------------------------
 
-void CheckClass::constructors()
+void CheckClassImpl::constructors()
 {
-    const bool printStyle = mSettings->severity.isEnabled(Severity::style);
-    const bool printWarnings = mSettings->severity.isEnabled(Severity::warning);
-    if (!printStyle && !printWarnings && !mSettings->isPremiumEnabled("uninitMemberVar"))
+    const bool printStyle = mSettings.severity.isEnabled(Severity::style);
+    const bool printWarnings = mSettings.severity.isEnabled(Severity::warning);
+    if (!printStyle && !printWarnings && !mSettings.isPremiumEnabled("uninitMemberVar"))
         return;
 
     logChecker("CheckClass::checkConstructors"); // style,warning
 
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
     for (const Scope * scope : mSymbolDatabase->classAndStructScopes) {
-        if (mSettings->hasLib("vcl") && isVclTypeInit(scope->definedType))
+        if (mSettings.hasLib("vcl") && isVclTypeInit(scope->definedType))
             continue;
 
         const bool unusedTemplate = Token::simpleMatch(scope->classDef->previous(), ">");
@@ -144,8 +289,11 @@ void CheckClass::constructors()
             });
         });
 
+        const std::vector<const Token *> inheritedCtors = getInheritedConstructors(scope);
+
         // There are no constructors.
-        if (scope->numConstructors == 0 && printStyle && !usedInUnion) {
+        std::set<const Variable*> diagVars;
+        if (scope->numConstructors == 0 && inheritedCtors.empty() && printStyle && !usedInUnion) {
             // If there is a private variable, there should be a constructor..
             int needInit = 0, haveInit = 0;
             std::vector<const Variable*> uninitVars;
@@ -163,8 +311,10 @@ void CheckClass::constructors()
                 if (haveInit == 0)
                     noConstructorError(scope->classDef, scope->className, scope->classDef->str() == "struct");
                 else
-                    for (const Variable* uv : uninitVars)
+                    for (const Variable* uv : uninitVars) {
                         uninitVarError(uv->typeStartToken(), uv->scope()->className, uv->name());
+                        diagVars.emplace(uv);
+                    }
             }
         }
 
@@ -201,85 +351,15 @@ void CheckClass::constructors()
             std::list<const Function *> callstack;
             initializeVarList(func, callstack, scope, usageList);
 
-            // Assign 1 union member => assign all union members
-            for (const Usage &usage : usageList) {
-                const Variable& var = *usage.var;
-                if (!usage.assign && !usage.init)
-                    continue;
-                const Scope* varScope1 = var.nameToken()->scope();
-                while (varScope1->type == ScopeType::eStruct)
-                    varScope1 = varScope1->nestedIn;
-                if (varScope1->type == ScopeType::eUnion) {
-                    for (Usage &usage2 : usageList) {
-                        const Variable& var2 = *usage2.var;
-                        if (usage2.assign || usage2.init || var2.isStatic())
-                            continue;
-                        const Scope* varScope2 = var2.nameToken()->scope();
-                        while (varScope2->type == ScopeType::eStruct)
-                            varScope2 = varScope2->nestedIn;
-                        if (varScope1 == varScope2)
-                            usage2.assign = true;
-                    }
-                }
-            }
+            handleUnionMembers(usageList);
 
             // Check if any variables are uninitialized
             for (const Usage &usage : usageList) {
-                const Variable& var = *usage.var;
-
-                if (usage.assign || usage.init || var.isStatic())
-                    continue;
-
-                if (!var.nameToken() || var.nameToken()->isAnonymous())
+                if (checkInitialization(usage, func.type) != Initialization::Missing)
                     continue;
 
-                if (var.valueType() && var.valueType()->pointer == 0 && var.type() && var.type()->needInitialization == Type::NeedInitialization::False && var.type()->derivedFrom.empty())
-                    continue;
-
-                if (var.isConst() && func.isOperator()) // We can't set const members in assignment operator
-                    continue;
-
-                // Check if this is a class constructor
-                if (!var.isPointer() && !var.isPointerArray() && var.isClass() && func.type == FunctionType::eConstructor) {
-                    // Unknown type so assume it is initialized
-                    if (!var.type()) {
-                        if (var.isStlType() && var.valueType() && var.valueType()->containerTypeToken) {
-                            if (var.valueType()->type == ValueType::Type::ITERATOR)
-                            {
-                                // needs initialization
-                            }
-                            else if (var.getTypeName() == "std::array") {
-                                const Token* ctt = var.valueType()->containerTypeToken;
-                                if (!ctt->isStandardType() &&
-                                    (!ctt->type() || ctt->type()->needInitialization != Type::NeedInitialization::True) &&
-                                    !mSettings->library.podtype(ctt->str())) // TODO: handle complex type expression
-                                    continue;
-                            }
-                            else
-                                continue;
-                        }
-                        else
-                            continue;
-                    }
-
-                    // Known type that doesn't need initialization or
-                    // known type that has member variables of an unknown type
-                    else if (var.type()->needInitialization != Type::NeedInitialization::True)
-                        continue;
-                }
-
-                // Check if type can't be copied
-                if (!var.isPointer() && !var.isPointerArray() && var.typeScope()) {
-                    if (func.type == FunctionType::eMoveConstructor) {
-                        if (canNotMove(var.typeScope()))
-                            continue;
-                    } else {
-                        if (canNotCopy(var.typeScope()))
-                            continue;
-                    }
-                }
-
                 // Is there missing member copy in copy/move constructor or assignment operator?
+                const Variable& var = *usage.var;
                 bool missingCopy = false;
 
                 // Don't warn about unknown types in copy constructors since we
@@ -303,9 +383,9 @@ void CheckClass::constructors()
                         }
                     }
 
-                    if (classNameUsed && mSettings->library.getTypeCheck("operatorEqVarError", var.getTypeName()) != Library::TypeCheck::suppress)
+                    if (classNameUsed && mSettings.library.getTypeCheck("operatorEqVarError", var.getTypeName()) != Library::TypeCheck::suppress)
                         operatorEqVarError(func.token, scope->className, var.name(), missingCopy);
-                } else if (func.access != AccessControl::Private || mSettings->standards.cpp >= Standards::CPP11) {
+                } else if (func.access != AccessControl::Private || mSettings.standards.cpp >= Standards::CPP11) {
                     // If constructor is not in scope then we maybe using a constructor from a different template specialization
                     if (!precedes(scope->bodyStart, func.tokenDef))
                         continue;
@@ -326,6 +406,72 @@ void CheckClass::constructors()
                 }
             }
         }
+
+        if (!inheritedCtors.empty()) {
+            clearAllVar(usageList);
+
+            for (Usage &usage : usageList) {
+                if (usage.var->hasDefault())
+                    usage.init = true;
+            }
+
+            handleUnionMembers(usageList);
+
+            // Inherited constructors don't initialize members of the derived class
+            for (const Token *baseCtorTok : inheritedCtors) {
+                for (const Usage &usage : usageList) {
+                    if (checkInitialization(usage, FunctionType::eConstructor) != Initialization::Missing)
+                        continue;
+                    const Variable& var = *usage.var;
+                    if (var.typeScope() && var.typeScope()->numConstructors > 0)
+                        continue;
+                    uninitVarError(baseCtorTok, false, FunctionType::eConstructor, var.scope()->className, var.name(), scope != var.scope(), false, false, true);
+                    diagVars.emplace(&var);
+                }
+            }
+        }
+
+        if (scope->numConstructors == 0) {
+
+            // Mark all variables not used
+            clearAllVar(usageList);
+
+            // Variables with default initializers
+            bool hasAnyDefaultInit = false;
+            bool hasAnySelfInit = false;
+            bool isDefaultConstructible = true;
+            const bool cpp14OrLater = mSettings.standards.cpp >= Standards::CPP14;
+            for (Usage& usage : usageList) {
+                const Variable& var = *usage.var;
+                // check for C++11 initializer
+                if (var.hasDefault()) {
+                    usage.init = true;
+                    hasAnyDefaultInit = true;
+                } else if (!var.isStatic() && (var.isReference() || (var.isConst() && !var.isClass()))) {
+                    // the default constructor is deleted, so all members are initialized by every instance
+                    isDefaultConstructible = false;
+                } else if (cpp14OrLater && !hasAnySelfInit && checkInitialization(usage, FunctionType::eConstructor) == Initialization::Initialized) {
+                    hasAnySelfInit = true;
+                }
+            }
+            if (!isDefaultConstructible || (!hasAnyDefaultInit && !hasAnySelfInit))
+                continue;
+
+            handleUnionMembers(usageList);
+
+            // Check if any variables are uninitialized
+            for (const Usage& usage : usageList) {
+                if (checkInitialization(usage, FunctionType::eConstructor, /*noConstructor*/ true) != Initialization::Missing)
+                    continue;
+
+                const Variable& var = *usage.var;
+                if (var.typeScope() && var.typeScope()->numConstructors > 0)
+                    continue;
+
+                if (diagVars.count(&var) == 0)
+                    uninitVarError(var.nameToken(), false, FunctionType::eConstructor, var.scope()->className, var.name(), false, false, true);
+            }
+        }
     }
 }
 
@@ -334,9 +480,9 @@ static bool isPermissibleConversion(const std::string& type)
     return type == "std::initializer_list" || type == "std::nullptr_t";
 }
 
-void CheckClass::checkExplicitConstructors()
+void CheckClassImpl::checkExplicitConstructors()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("noExplicitConstructor"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("noExplicitConstructor"))
         return;
 
     logChecker("CheckClass::checkExplicitConstructors"); // style
@@ -354,7 +500,7 @@ void CheckClass::checkExplicitConstructors()
 
         // Abstract classes can't be instantiated. But if there is C++11
         // "misuse" by derived classes then these constructors must be explicit.
-        if (isAbstractClass && mSettings->standards.cpp >= Standards::CPP11)
+        if (isAbstractClass && mSettings.standards.cpp >= Standards::CPP11)
             continue;
 
         for (const Function &func : scope->functionList) {
@@ -403,9 +549,9 @@ static bool hasNonCopyableBase(const Scope *scope, bool *unknown)
     return false;
 }
 
-void CheckClass::copyconstructors()
+void CheckClassImpl::copyconstructors()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckClass::checkCopyConstructors"); // warning
@@ -420,17 +566,17 @@ void CheckClass::copyconstructors()
                 const Token* tok = func.token->linkAt(1);
                 for (const Token* const end = func.functionScope->bodyStart; tok != end; tok = tok->next()) {
                     if (Token::Match(tok, "%var% ( new") ||
-                        (Token::Match(tok, "%var% ( %name% (") && mSettings->library.getAllocFuncInfo(tok->tokAt(2)))) {
+                        (Token::Match(tok, "%var% ( %name% (") && mSettings.library.getAllocFuncInfo(tok->tokAt(2)))) {
                         const Variable* var = tok->variable();
-                        if (var && var->isPointer() && var->scope() == scope)
+                        if (var && var->scope() == scope && var->valueType() && var->valueType()->type != ValueType::SMART_POINTER)
                             allocatedVars[tok->varId()] = tok;
                     }
                 }
                 for (const Token* const end = func.functionScope->bodyEnd; tok != end; tok = tok->next()) {
                     if (Token::Match(tok, "%var% = new") ||
-                        (Token::Match(tok, "%var% = %name% (") && mSettings->library.getAllocFuncInfo(tok->tokAt(2)))) {
+                        (Token::Match(tok, "%var% = %name% (") && mSettings.library.getAllocFuncInfo(tok->tokAt(2)))) {
                         const Variable* var = tok->variable();
-                        if (var && var->isPointer() && var->scope() == scope && !var->isStatic())
+                        if (var && var->scope() == scope && !var->isStatic() && var->valueType() && var->valueType()->type != ValueType::SMART_POINTER)
                             allocatedVars[tok->varId()] = tok;
                     }
                 }
@@ -439,10 +585,13 @@ void CheckClass::copyconstructors()
                 const Token* tok = func.functionScope->bodyStart;
                 for (const Token* const end = func.functionScope->bodyEnd; tok != end; tok = tok->next()) {
                     if (Token::Match(tok, "delete %var%") ||
-                        (Token::Match(tok, "%name% ( %var%") && mSettings->library.getDeallocFuncInfo(tok))) {
+                        (Token::Match(tok, "%name% ( %var%") && mSettings.library.getDeallocFuncInfo(tok))) {
                         const Token *vartok = tok->str() == "delete" ? tok->next() : tok->tokAt(2);
                         const Variable* var = vartok->variable();
-                        if (var && var->isPointer() && var->scope() == scope && !var->isStatic())
+                        if (var && var->scope() == scope && !var->isStatic() &&
+                            var->valueType() && ((var->valueType()->type != ValueType::CONTAINER &&
+                                                  var->valueType()->type != ValueType::RECORD &&
+                                                  var->valueType()->type != ValueType::UNKNOWN_TYPE) || var->valueType()->pointer))
                             deallocatedVars[vartok->varId()] = vartok;
                     }
                 }
@@ -529,7 +678,7 @@ void CheckClass::copyconstructors()
             }
             for (tok = func.functionScope->bodyStart; tok != func.functionScope->bodyEnd; tok = tok->next()) {
                 if ((tok->isCpp() && Token::Match(tok, "%var% = new")) ||
-                    (Token::Match(tok, "%var% = %name% (") && (mSettings->library.getAllocFuncInfo(tok->tokAt(2)) || mSettings->library.getReallocFuncInfo(tok->tokAt(2))))) {
+                    (Token::Match(tok, "%var% = %name% (") && (mSettings.library.getAllocFuncInfo(tok->tokAt(2)) || mSettings.library.getReallocFuncInfo(tok->tokAt(2))))) {
                     allocatedVars.erase(tok->varId());
                 } else if (Token::Match(tok, "%var% = %name% . %name% ;") && allocatedVars.find(tok->varId()) != allocatedVars.end()) {
                     copiedVars.insert(tok);
@@ -560,7 +709,7 @@ void CheckClass::copyconstructors()
    }
  */
 
-void CheckClass::copyConstructorShallowCopyError(const Token *tok, const std::string& varname)
+void CheckClassImpl::copyConstructorShallowCopyError(const Token *tok, const std::string& varname)
 {
     reportError(tok, Severity::warning, "copyCtorPointerCopying",
                 "$symbol:" + varname + "\nValue of pointer '$symbol', which points to allocated memory, is copied in copy constructor instead of allocating new memory.", CWE398, Certainty::normal);
@@ -586,22 +735,22 @@ static std::string noMemberErrorMessage(const Scope *scope, const char function[
     return errmsg;
 }
 
-void CheckClass::noCopyConstructorError(const Scope *scope, bool isdefault, const Token *alloc, bool inconclusive)
+void CheckClassImpl::noCopyConstructorError(const Scope *scope, bool isdefault, const Token *alloc, bool inconclusive)
 {
     reportError(alloc, Severity::warning, "noCopyConstructor", noMemberErrorMessage(scope, "copy constructor", isdefault), CWE398, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckClass::noOperatorEqError(const Scope *scope, bool isdefault, const Token *alloc, bool inconclusive)
+void CheckClassImpl::noOperatorEqError(const Scope *scope, bool isdefault, const Token *alloc, bool inconclusive)
 {
     reportError(alloc, Severity::warning, "noOperatorEq", noMemberErrorMessage(scope, "operator=", isdefault), CWE398, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckClass::noDestructorError(const Scope *scope, bool isdefault, const Token *alloc)
+void CheckClassImpl::noDestructorError(const Scope *scope, bool isdefault, const Token *alloc)
 {
     reportError(alloc, Severity::warning, "noDestructor", noMemberErrorMessage(scope, "destructor", isdefault), CWE398, Certainty::normal);
 }
 
-bool CheckClass::canNotCopy(const Scope *scope)
+bool CheckClassImpl::canNotCopy(const Scope *scope)
 {
     bool constructor = false;
     bool publicAssign = false;
@@ -625,7 +774,7 @@ bool CheckClass::canNotCopy(const Scope *scope)
     return constructor && !(publicAssign || publicCopy);
 }
 
-bool CheckClass::canNotMove(const Scope *scope)
+bool CheckClassImpl::canNotMove(const Scope *scope)
 {
     bool constructor = false;
     bool publicAssign = false;
@@ -670,7 +819,7 @@ static void getAllVariableMembers(const Scope *scope, std::vector<const Variable
     }
 }
 
-std::vector<CheckClass::Usage> CheckClass::createUsageList(const Scope *scope)
+std::vector<CheckClassImpl::Usage> CheckClassImpl::createUsageList(const Scope *scope)
 {
     std::vector<Usage> ret;
     std::vector<const Variable *> varlist;
@@ -682,7 +831,7 @@ std::vector<CheckClass::Usage> CheckClass::createUsageList(const Scope *scope)
     return ret;
 }
 
-void CheckClass::assignVar(std::vector<Usage> &usageList, nonneg int varid)
+void CheckClassImpl::assignVar(std::vector<Usage> &usageList, nonneg int varid)
 {
     auto it = std::find_if(usageList.begin(), usageList.end(), [varid](const Usage& usage) {
         return usage.var->declarationId() == varid;
@@ -691,7 +840,7 @@ void CheckClass::assignVar(std::vector<Usage> &usageList, nonneg int varid)
         it->assign = true;
 }
 
-void CheckClass::assignVar(std::vector<Usage> &usageList, const Token* vartok)
+void CheckClassImpl::assignVar(std::vector<Usage> &usageList, const Token* vartok)
 {
     if (vartok->varId() > 0) {
         assignVar(usageList, vartok->varId());
@@ -705,7 +854,7 @@ void CheckClass::assignVar(std::vector<Usage> &usageList, const Token* vartok)
         it->assign = true;
 }
 
-void CheckClass::initVar(std::vector<Usage> &usageList, nonneg int varid)
+void CheckClassImpl::initVar(std::vector<Usage> &usageList, nonneg int varid)
 {
     auto it = std::find_if(usageList.begin(), usageList.end(), [varid](const Usage& usage) {
         return usage.var->declarationId() == varid;
@@ -714,13 +863,13 @@ void CheckClass::initVar(std::vector<Usage> &usageList, nonneg int varid)
         it->init = true;
 }
 
-void CheckClass::assignAllVar(std::vector<Usage> &usageList)
+void CheckClassImpl::assignAllVar(std::vector<Usage> &usageList)
 {
     for (Usage & i : usageList)
         i.assign = true;
 }
 
-void CheckClass::assignAllVarsVisibleFromScope(std::vector<Usage>& usageList, const Scope* scope)
+void CheckClassImpl::assignAllVarsVisibleFromScope(std::vector<Usage>& usageList, const Scope* scope)
 {
     for (Usage& usage : usageList) {
         if (usage.var->scope() == scope)
@@ -736,7 +885,7 @@ void CheckClass::assignAllVarsVisibleFromScope(std::vector<Usage>& usageList, co
     }
 }
 
-void CheckClass::clearAllVar(std::vector<Usage> &usageList)
+void CheckClassImpl::clearAllVar(std::vector<Usage> &usageList)
 {
     for (Usage & i : usageList) {
         i.assign = false;
@@ -744,7 +893,7 @@ void CheckClass::clearAllVar(std::vector<Usage> &usageList)
     }
 }
 
-bool CheckClass::isBaseClassMutableMemberFunc(const Token *tok, const Scope *scope)
+bool CheckClassImpl::isBaseClassMutableMemberFunc(const Token *tok, const Scope *scope)
 {
     // Iterate through each base class...
     for (const Type::BaseInfo & i : scope->definedType->derivedFrom) {
@@ -771,7 +920,7 @@ bool CheckClass::isBaseClassMutableMemberFunc(const Token *tok, const Scope *sco
     return false;
 }
 
-void CheckClass::initializeVarList(const Function &func, std::list<const Function *> &callstack, const Scope *scope, std::vector<Usage> &usage) const
+void CheckClassImpl::initializeVarList(const Function &func, std::list<const Function *> &callstack, const Scope *scope, std::vector<Usage> &usage) const
 {
     if (!func.functionScope)
         return;
@@ -1008,7 +1157,7 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
                             tok2 = tok2->next();
                             if (tok2->str() == "&")
                                 tok2 = tok2->next();
-                            if (isVariableChangedByFunctionCall(tok2, tok2->strAt(-1) == "&", tok2->varId(), *mSettings, nullptr))
+                            if (isVariableChangedByFunctionCall(tok2, tok2->strAt(-1) == "&", tok2->varId(), mSettings.library, nullptr))
                                 assignVar(usage, tok2->varId());
                         }
                     }
@@ -1103,7 +1252,7 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
     }
 }
 
-void CheckClass::noConstructorError(const Token *tok, const std::string &classname, bool isStruct)
+void CheckClassImpl::noConstructorError(const Token *tok, const std::string &classname, bool isStruct)
 {
     // For performance reasons the constructor might be intentionally missing. Therefore this is not a "warning"
     const std::string message {"The " + std::string(isStruct ? "struct" : "class") + " '$symbol' does not declare a constructor although it has private member variables which likely require initialization."};
@@ -1111,29 +1260,37 @@ void CheckClass::noConstructorError(const Token *tok, const std::string &classna
     reportError(tok, Severity::style, "noConstructor", "$symbol:" + classname + '\n' + message + '\n' + verbose, CWE398, Certainty::normal);
 }
 
-void CheckClass::noExplicitConstructorError(const Token *tok, const std::string &classname, bool isStruct)
+void CheckClassImpl::noExplicitConstructorError(const Token *tok, const std::string &classname, bool isStruct)
 {
     const std::string message(std::string(isStruct ? "Struct" : "Class") + " '$symbol' has a constructor with 1 argument that is not explicit.");
     const std::string verbose(message + " Such, so called \"Converting constructors\", should in general be explicit for type safety reasons as that prevents unintended implicit conversions.");
     reportError(tok, Severity::style, "noExplicitConstructor", "$symbol:" + classname + '\n' + message + '\n' + verbose, CWE398, Certainty::normal);
 }
 
-void CheckClass::uninitVarError(const Token *tok, bool isprivate, FunctionType functionType, const std::string &classname, const std::string &varname, bool derived, bool inconclusive)
+void CheckClassImpl::uninitVarError(const Token *tok, bool isprivate, FunctionType functionType, const std::string &classname, const std::string &varname, bool derived, bool inconclusive, bool noCtor, bool inheritedCtor)
 {
-    std::string ctor;
-    if (functionType == FunctionType::eCopyConstructor)
-        ctor = "copy ";
-    else if (functionType == FunctionType::eMoveConstructor)
-        ctor = "move ";
-    std::string message("Member variable '$symbol' is not initialized in the " + ctor + "constructor.");
+    std::string message("Member variable '$symbol' ");
+    if (noCtor)
+        message += "has no initializer.";
+    else if (inheritedCtor) {
+        message += tok ? "is not initialized in the constructor inherited from '" + tok->str() + "'." :
+                   "is not initialized in the inherited constructor.";
+    } else {
+        message += "is not initialized in the ";
+        if (functionType == FunctionType::eCopyConstructor)
+            message += "copy ";
+        else if (functionType == FunctionType::eMoveConstructor)
+            message += "move ";
+        message += "constructor.";
+    }
     if (derived)
         message += " Maybe it should be initialized directly in the class " + classname + "?";
-    std::string id = std::string("uninit") + (derived ? "Derived" : "") + "MemberVar" + (isprivate ? "Private" : "");
+    std::string id = std::string("uninit") + (derived ? "Derived" : "") + "MemberVar" + (isprivate ? "Private" : "") + (noCtor ? "NoCtor" : "");
     const std::string verbose {message + " Member variables of native types, pointers, or references are left uninitialized when the class is instantiated. That may cause bugs or undefined behavior."};
     reportError(tok, Severity::warning, id, "$symbol:" + classname + "::" + varname + '\n' + message + '\n' + verbose, CWE398, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckClass::uninitVarError(const Token *tok, const std::string &classname, const std::string &varname)
+void CheckClassImpl::uninitVarError(const Token *tok, const std::string &classname, const std::string &varname)
 {
     const std::string message("Member variable '$symbol' is not initialized."); // report missing in-class initializer
     const std::string verbose {message + " Member variables of native types, pointers, or references are left uninitialized when the class is instantiated. That may cause bugs or undefined behavior."};
@@ -1141,7 +1298,7 @@ void CheckClass::uninitVarError(const Token *tok, const std::string &classname,
     reportError(tok, Severity::warning, id, "$symbol:" + classname + "::" + varname + '\n' + message + '\n' + verbose, CWE398, Certainty::normal);
 }
 
-void CheckClass::missingMemberCopyError(const Token *tok, FunctionType functionType, const std::string& classname, const std::string& varname)
+void CheckClassImpl::missingMemberCopyError(const Token *tok, FunctionType functionType, const std::string& classname, const std::string& varname)
 {
     const std::string ctor(functionType == FunctionType::eCopyConstructor ? "copy" : "move");
     const std::string action(functionType == FunctionType::eCopyConstructor ? "copied?" : "moved?");
@@ -1151,7 +1308,7 @@ void CheckClass::missingMemberCopyError(const Token *tok, FunctionType functionT
     reportError(tok, Severity::warning, "missingMemberCopy", message, CWE398, Certainty::inconclusive);
 }
 
-void CheckClass::operatorEqVarError(const Token *tok, const std::string &classname, const std::string &varname, bool inconclusive)
+void CheckClassImpl::operatorEqVarError(const Token *tok, const std::string &classname, const std::string &varname, bool inconclusive)
 {
     reportError(tok, Severity::warning, "operatorEqVarError", "$symbol:" + classname + "::" + varname + "\nMember variable '$symbol' is not assigned a value in '" + classname + "::operator='.", CWE398, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
@@ -1160,9 +1317,9 @@ void CheckClass::operatorEqVarError(const Token *tok, const std::string &classna
 // ClassCheck: Use initialization list instead of assignment
 //---------------------------------------------------------------------------
 
-void CheckClass::initializationListUsage()
+void CheckClassImpl::initializationListUsage()
 {
-    if (!mSettings->severity.isEnabled(Severity::performance))
+    if (!mSettings.severity.isEnabled(Severity::performance))
         return;
 
     logChecker("CheckClass::initializationListUsage"); // performance
@@ -1192,7 +1349,7 @@ void CheckClass::initializationListUsage()
                 continue;
             if (var->isPointer() || var->isReference() || var->isEnumType())
                 continue;
-            if (!WRONG_DATA(!var->valueType(), tok) && var->valueType()->type > ValueType::Type::ITERATOR)
+            if (!var->valueType() || var->valueType()->type > ValueType::Type::ITERATOR)
                 continue;
 
             // bailout: multi line lambda in rhs => do not warn
@@ -1223,7 +1380,7 @@ void CheckClass::initializationListUsage()
                         allowed = false;
                         return ChildrenToVisit::done;
                     }
-                    if (var2->isLocal() && isVariableChanged(var2->nameToken(), previousBeforeAstLeftmostLeaf(tok), var2->declarationId(), /*globalvar*/ false, *mSettings)) {
+                    if (var2->isLocal() && isVariableChanged(var2->nameToken(), previousBeforeAstLeftmostLeaf(tok), var2->declarationId(), /*globalvar*/ false, mSettings)) {
                         allowed = false;
                         return ChildrenToVisit::done;
                     }
@@ -1244,7 +1401,7 @@ void CheckClass::initializationListUsage()
     }
 }
 
-void CheckClass::suggestInitializationList(const Token* tok, const std::string& varname)
+void CheckClassImpl::suggestInitializationList(const Token* tok, const std::string& varname)
 {
     reportError(tok, Severity::performance, "useInitializationList", "$symbol:" + varname + "\nVariable '$symbol' is assigned in constructor body. Consider performing initialization in initialization list.\n"
                 "When an object of a class is created, the constructors of all member variables are called consecutively "
@@ -1306,9 +1463,9 @@ static bool checkFunctionUsage(const Function *privfunc, const Scope* scope)
     return false; // Unused in this scope
 }
 
-void CheckClass::privateFunctions()
+void CheckClassImpl::privateFunctions()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedPrivateFunction"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unusedPrivateFunction"))
         return;
 
     logChecker("CheckClass::privateFunctions"); // style
@@ -1366,11 +1523,11 @@ void CheckClass::privateFunctions()
     }
 }
 
-void CheckClass::unusedPrivateFunctionError(const Token* tok1, const Token *tok2, const std::string &classname, const std::string &funcname)
+void CheckClassImpl::unusedPrivateFunctionError(const Token* tokImpl, const Token *tokDef, const std::string &classname, const std::string &funcname)
 {
-    std::list<const Token *> toks{ tok1 };
-    if (tok2)
-        toks.push_front(tok2);
+    std::list<const Token *> toks{ tokDef };
+    if (tokDef != tokImpl)
+        toks.push_back(tokImpl);
     reportError(toks, Severity::style, "unusedPrivateFunction", "$symbol:" + classname + "::" + funcname + "\nUnused private function: '$symbol'", CWE398, Certainty::normal);
 }
 
@@ -1388,10 +1545,10 @@ static const Scope* findFunctionOf(const Scope* scope)
     return nullptr;
 }
 
-void CheckClass::checkMemset()
+void CheckClassImpl::checkMemset()
 {
     logChecker("CheckClass::checkMemset");
-    const bool printWarnings = mSettings->severity.isEnabled(Severity::warning);
+    const bool printWarnings = mSettings.severity.isEnabled(Severity::warning);
     for (const Scope *scope : mSymbolDatabase->functionScopes) {
         for (const Token *tok = scope->bodyStart; tok && tok != scope->bodyEnd; tok = tok->next()) {
             if (Token::Match(tok, "memset|memcpy|memmove (")) {
@@ -1449,7 +1606,7 @@ void CheckClass::checkMemset()
                             type = var->typeScope();
 
                         if (!type && !var->isPointer() && !Token::simpleMatch(var->typeStartToken(), "std :: array") &&
-                            mSettings->library.detectContainerOrIterator(var->typeStartToken())) {
+                            mSettings.library.detectContainerOrIterator(var->typeStartToken())) {
                             memsetError(tok, tok->str(), var->getTypeName(), {}, /*isContainer*/ true);
                         }
                     }
@@ -1469,9 +1626,9 @@ void CheckClass::checkMemset()
                     checkMemsetType(scope, tok, type, false, {});
                 }
             } else if (tok->variable() && tok->variable()->isPointer() && tok->variable()->typeScope() && Token::Match(tok, "%var% = %name% (")) {
-                const Library::AllocFunc* alloc = mSettings->library.getAllocFuncInfo(tok->tokAt(2));
+                const Library::AllocFunc* alloc = mSettings.library.getAllocFuncInfo(tok->tokAt(2));
                 if (!alloc)
-                    alloc = mSettings->library.getReallocFuncInfo(tok->tokAt(2));
+                    alloc = mSettings.library.getReallocFuncInfo(tok->tokAt(2));
                 if (!alloc || alloc->bufferSize == Library::AllocFunc::BufferSize::none)
                     continue;
                 std::set<const Scope *> parsedTypes;
@@ -1484,14 +1641,14 @@ void CheckClass::checkMemset()
     }
 }
 
-void CheckClass::checkMemsetType(const Scope *start, const Token *tok, const Scope *type, bool allocation, std::set<const Scope *> parsedTypes)
+void CheckClassImpl::checkMemsetType(const Scope *start, const Token *tok, const Scope *type, bool allocation, std::set<const Scope *> parsedTypes)
 {
     // If type has been checked there is no need to check it again
     if (parsedTypes.find(type) != parsedTypes.end())
         return;
     parsedTypes.insert(type);
 
-    const bool printPortability = mSettings->severity.isEnabled(Severity::portability);
+    const bool printPortability = mSettings.severity.isEnabled(Severity::portability);
 
     // recursively check all parent classes
     for (const Type::BaseInfo & i : type->definedType->derivedFrom) {
@@ -1518,21 +1675,12 @@ void CheckClass::checkMemsetType(const Scope *start, const Token *tok, const Sco
         }
         // don't warn if variable static or const, pointer or array of pointers
         if (!var.isStatic() && !var.isConst() && !var.isPointer() && (!var.isArray() || var.typeEndToken()->str() != "*")) {
-            const Token *tok1 = var.typeStartToken();
             const Scope *typeScope = var.typeScope();
 
-            std::string typeName;
-            if (Token::Match(tok1, "%type% ::")) {
-                const Token *typeTok = tok1;
-                while (Token::Match(typeTok, "%type% ::")) {
-                    typeName += typeTok->str() + "::";
-                    typeTok = typeTok->tokAt(2);
-                }
-                typeName += typeTok->str();
-            }
+            const std::string typeName = var.getTypeName();
 
             // check for std:: type
-            if (var.isStlType() && typeName != "std::array" && !mSettings->library.podtype(typeName)) {
+            if (var.isStlType() && typeName != "std::array" && !mSettings.library.podtype(typeName)) {
                 if (allocation)
                     mallocOnClassError(tok, tok->str(), type->classDef, "'" + typeName + "'");
                 else
@@ -1550,7 +1698,7 @@ void CheckClass::checkMemsetType(const Scope *start, const Token *tok, const Sco
     }
 }
 
-void CheckClass::mallocOnClassWarning(const Token* tok, const std::string &memfunc, const Token* classTok)
+void CheckClassImpl::mallocOnClassWarning(const Token* tok, const std::string &memfunc, const Token* classTok)
 {
     std::list<const Token *> toks = { tok, classTok };
     reportError(toks, Severity::warning, "mallocOnClassWarning",
@@ -1560,7 +1708,7 @@ void CheckClass::mallocOnClassWarning(const Token* tok, const std::string &memfu
                 "since no constructor is called and class members remain uninitialized. Consider using 'new' instead.", CWE762, Certainty::normal);
 }
 
-void CheckClass::mallocOnClassError(const Token* tok, const std::string &memfunc, const Token* classTok, const std::string &classname)
+void CheckClassImpl::mallocOnClassError(const Token* tok, const std::string &memfunc, const Token* classTok, const std::string &classname)
 {
     std::list<const Token *> toks = { tok, classTok };
     reportError(toks, Severity::error, "mallocOnClassError",
@@ -1571,7 +1719,7 @@ void CheckClass::mallocOnClassError(const Token* tok, const std::string &memfunc
                 "since no constructor is called and class members remain uninitialized. Consider using 'new' instead.", CWE665, Certainty::normal);
 }
 
-void CheckClass::memsetError(const Token *tok, const std::string &memfunc, const std::string &classname, const std::string &type, bool isContainer)
+void CheckClassImpl::memsetError(const Token *tok, const std::string &memfunc, const std::string &classname, const std::string &type, bool isContainer)
 {
     const std::string typeStr = isContainer ? std::string() : (type + " that contains a ");
     const std::string msg = "$symbol:" + memfunc + "\n"
@@ -1583,14 +1731,14 @@ void CheckClass::memsetError(const Token *tok, const std::string &memfunc, const
     reportError(tok, Severity::error, "memsetClass", msg, CWE762, Certainty::normal);
 }
 
-void CheckClass::memsetErrorReference(const Token *tok, const std::string &memfunc, const std::string &type)
+void CheckClassImpl::memsetErrorReference(const Token *tok, const std::string &memfunc, const std::string &type)
 {
     reportError(tok, Severity::error, "memsetClassReference",
                 "$symbol:" + memfunc +"\n"
                 "Using '" + memfunc + "' on " + type + " that contains a reference.", CWE665, Certainty::normal);
 }
 
-void CheckClass::memsetErrorFloat(const Token *tok, const std::string &type)
+void CheckClassImpl::memsetErrorFloat(const Token *tok, const std::string &type)
 {
     reportError(tok, Severity::portability, "memsetClassFloat", "Using memset() on " + type + " which contains a floating point number.\n"
                 "Using memset() on " + type + " which contains a floating point number."
@@ -1605,9 +1753,9 @@ void CheckClass::memsetErrorFloat(const Token *tok, const std::string &type)
 // operator= should return a reference to *this
 //---------------------------------------------------------------------------
 
-void CheckClass::operatorEqRetRefThis()
+void CheckClassImpl::operatorEqRetRefThis()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("operatorEqRetRefThis"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("operatorEqRetRefThis"))
         return;
 
     logChecker("CheckClass::operatorEqRetRefThis"); // style
@@ -1624,13 +1772,13 @@ void CheckClass::operatorEqRetRefThis()
     }
 }
 
-void CheckClass::checkReturnPtrThis(const Scope *scope, const Function *func, const Token *tok, const Token *last)
+void CheckClassImpl::checkReturnPtrThis(const Scope *scope, const Function *func, const Token *tok, const Token *last)
 {
     std::set<const Function*> analyzedFunctions;
     checkReturnPtrThis(scope, func, tok, last, analyzedFunctions);
 }
 
-void CheckClass::checkReturnPtrThis(const Scope *scope, const Function *func, const Token *tok, const Token *last, std::set<const Function*>& analyzedFunctions)
+void CheckClassImpl::checkReturnPtrThis(const Scope *scope, const Function *func, const Token *tok, const Token *last, std::set<const Function*>& analyzedFunctions)
 {
     bool foundReturn = false;
 
@@ -1706,7 +1854,7 @@ void CheckClass::checkReturnPtrThis(const Scope *scope, const Function *func, co
         }
         return;
     }
-    if (mSettings->library.isScopeNoReturn(last, nullptr)) {
+    if (mSettings.library.isScopeNoReturn(last, nullptr)) {
         // Typical wrong way to prohibit default assignment operator
         // by always throwing an exception or calling a noreturn function
         operatorEqShouldBeLeftUnimplementedError(func->token);
@@ -1716,17 +1864,17 @@ void CheckClass::checkReturnPtrThis(const Scope *scope, const Function *func, co
     operatorEqMissingReturnStatementError(func->token, func->access == AccessControl::Public);
 }
 
-void CheckClass::operatorEqRetRefThisError(const Token *tok)
+void CheckClassImpl::operatorEqRetRefThisError(const Token *tok)
 {
     reportError(tok, Severity::style, "operatorEqRetRefThis", "'operator=' should return reference to 'this' instance.", CWE398, Certainty::normal);
 }
 
-void CheckClass::operatorEqShouldBeLeftUnimplementedError(const Token *tok)
+void CheckClassImpl::operatorEqShouldBeLeftUnimplementedError(const Token *tok)
 {
     reportError(tok, Severity::style, "operatorEqShouldBeLeftUnimplemented", "'operator=' should either return reference to 'this' instance or be declared private and left unimplemented.", CWE398, Certainty::normal);
 }
 
-void CheckClass::operatorEqMissingReturnStatementError(const Token *tok, bool error)
+void CheckClassImpl::operatorEqMissingReturnStatementError(const Token *tok, bool error)
 {
     if (error) {
         reportError(tok, Severity::error, "operatorEqMissingReturnStatement", "No 'return' statement in non-void function causes undefined behavior.", CWE398, Certainty::normal);
@@ -1749,9 +1897,9 @@ void CheckClass::operatorEqMissingReturnStatementError(const Token *tok, bool er
 // assignment to self.
 //---------------------------------------------------------------------------
 
-void CheckClass::operatorEqToSelf()
+void CheckClassImpl::operatorEqToSelf()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("operatorEqToSelf"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("operatorEqToSelf"))
         return;
 
     logChecker("CheckClass::operatorEqToSelf"); // warning
@@ -1767,7 +1915,7 @@ void CheckClass::operatorEqToSelf()
                 if (func.argumentList.empty())
                     continue;
                 const Token* typeTok = func.argumentList.front().typeEndToken();
-                while (typeTok->str() == "const" || typeTok->str() == "&" || typeTok->str() == "*")
+                while (typeTok->str() == "const" || typeTok->str() == "&" || typeTok->str() == "&&" || typeTok->str() == "*")
                     typeTok = typeTok->previous();
                 if (typeTok->str() != scope->className)
                     continue;
@@ -1790,7 +1938,7 @@ void CheckClass::operatorEqToSelf()
     }
 }
 
-bool CheckClass::hasAllocationInIfScope(const Function *func, const Scope* scope, const Token *ifStatementScopeStart) const
+bool CheckClassImpl::hasAllocationInIfScope(const Function *func, const Scope* scope, const Token *ifStatementScopeStart) const
 {
     const Token *end;
     if (ifStatementScopeStart->str() == "{")
@@ -1800,24 +1948,24 @@ bool CheckClass::hasAllocationInIfScope(const Function *func, const Scope* scope
     return hasAllocation(func, scope, ifStatementScopeStart, end);
 }
 
-bool CheckClass::hasAllocation(const Function *func, const Scope* scope) const
+bool CheckClassImpl::hasAllocation(const Function *func, const Scope* scope) const
 {
     return hasAllocation(func, scope, func->functionScope->bodyStart, func->functionScope->bodyEnd);
 }
 
-bool CheckClass::hasAllocation(const Function *func, const Scope* scope, const Token *start, const Token *end) const
+bool CheckClassImpl::hasAllocation(const Function *func, const Scope* scope, const Token *start, const Token *end) const
 {
     if (!end)
         end = func->functionScope->bodyEnd;
     for (const Token *tok = start; tok && (tok != end); tok = tok->next()) {
         if (((tok->isCpp() && Token::Match(tok, "%var% = new")) ||
-             (Token::Match(tok, "%var% = %name% (") && mSettings->library.getAllocFuncInfo(tok->tokAt(2)))) &&
+             (Token::Match(tok, "%var% = %name% (") && mSettings.library.getAllocFuncInfo(tok->tokAt(2)))) &&
             isMemberVar(scope, tok))
             return true;
 
         // check for deallocating memory
         const Token *var;
-        if (Token::Match(tok, "%name% ( %var%") && mSettings->library.getDeallocFuncInfo(tok))
+        if (Token::Match(tok, "%name% ( %var%") && mSettings.library.getDeallocFuncInfo(tok))
             var = tok->tokAt(2);
         else if (tok->isCpp() && Token::Match(tok, "delete [ ] %var%"))
             var = tok->tokAt(3);
@@ -1851,7 +1999,7 @@ static bool isFalseKeyword(const Token* tok)
  * Checks if self-assignment test is inverse
  * For example 'if (this == &rhs)'
  */
-CheckClass::Bool CheckClass::isInverted(const Token *tok, const Token *rhs)
+CheckClassImpl::Bool CheckClassImpl::isInverted(const Token *tok, const Token *rhs)
 {
     bool res = true;
     for (const Token *itr = tok; itr && itr->str()!="("; itr=itr->astParent()) {
@@ -1872,31 +2020,31 @@ CheckClass::Bool CheckClass::isInverted(const Token *tok, const Token *rhs)
                                                      || (Token::simpleMatch(itr->astOperand2(), "this") && Token::simpleMatch(itr->astOperand1(), "&") && Token::simpleMatch(itr->astOperand1()->next(), rhs->str().c_str(), rhs->str().size())))) {
             //Do nothing
         } else {
-            return Bool::BAILOUT;
+            return Bool::Bailout;
         }
     }
     if (res)
-        return Bool::TRUE;
-    return Bool::FALSE;
+        return Bool::True;
+    return Bool::False;
 }
 
-const Token * CheckClass::getIfStmtBodyStart(const Token *tok, const Token *rhs)
+const Token * CheckClassImpl::getIfStmtBodyStart(const Token *tok, const Token *rhs)
 {
     const Token *top = tok->astTop();
     if (Token::simpleMatch(top->link(), ") {")) {
         switch (isInverted(tok->astParent(), rhs)) {
-        case Bool::BAILOUT:
+        case Bool::Bailout:
             return nullptr;
-        case Bool::TRUE:
+        case Bool::True:
             return top->link()->next();
-        case Bool::FALSE:
+        case Bool::False:
             return top->link()->linkAt(1);
         }
     }
     return nullptr;
 }
 
-bool CheckClass::hasAssignSelf(const Function *func, const Token *rhs, const Token *&out_ifStatementScopeStart)
+bool CheckClassImpl::hasAssignSelf(const Function *func, const Token *rhs, const Token *&out_ifStatementScopeStart)
 {
     if (!rhs)
         return false;
@@ -1930,7 +2078,7 @@ bool CheckClass::hasAssignSelf(const Function *func, const Token *rhs, const Tok
     return false;
 }
 
-void CheckClass::operatorEqToSelfError(const Token *tok)
+void CheckClassImpl::operatorEqToSelfError(const Token *tok)
 {
     reportError(tok, Severity::warning, "operatorEqToSelf",
                 "'operator=' should check for assignment to self to avoid problems with dynamic memory.\n"
@@ -1942,7 +2090,7 @@ void CheckClass::operatorEqToSelfError(const Token *tok)
 // A destructor in a base class should be virtual
 //---------------------------------------------------------------------------
 
-void CheckClass::virtualDestructor()
+void CheckClassImpl::virtualDestructor()
 {
     // This error should only be given if:
     // * base class doesn't have virtual destructor
@@ -1950,12 +2098,39 @@ void CheckClass::virtualDestructor()
     // * base class is deleted
     // unless inconclusive in which case:
     // * A class with any virtual functions should have a destructor that is either public and virtual or protected
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
 
     std::list<const Function *> inconclusiveErrors;
 
     logChecker("CheckClass::virtualDestructor");
 
+    // pointer variables of type 'Base *', for each type 'Base'
+    std::unordered_map<const Type *, std::vector<int>> pointersByType;
+
+    // for each pointer variable, the classes 'Derived' of a "ptr = new Derived" that is followed by a "delete ptr;"
+    std::unordered_map<int, std::set<std::string>> deletedAfterNew;
+
+    for (const Variable* var : mSymbolDatabase->variableList()) {
+        if (var && var->isPointer() && var->type() && var->nameToken())
+            pointersByType[var->type()].push_back(var->declarationId());
+    }
+
+    {
+        // the classes 'Derived' of the "ptr = new Derived" seen so far
+        std::unordered_map<int, std::set<std::string>> newClasses;
+
+        for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
+            if (Token::Match(tok, "[;{}] %var% = new %name%"))
+                newClasses[tok->next()->varId()].insert(tok->strAt(4));
+
+            else if (Token::Match(tok, "delete %var% ;")) {
+                const auto it = newClasses.find(tok->next()->varId());
+                if (it != newClasses.end())
+                    deletedAfterNew[it->first].insert(it->second.cbegin(), it->second.cend());
+            }
+        }
+    }
+
     for (const Scope * scope : mSymbolDatabase->classAndStructScopes) {
 
         // Skip base classes (unless inconclusive)
@@ -1973,7 +2148,7 @@ void CheckClass::virtualDestructor()
         }
 
         // Check if destructor is empty and non-empty ..
-        if (mSettings->standards.cpp <= Standards::CPP03) {
+        if (mSettings.standards.cpp <= Standards::CPP03) {
             // Find the destructor
             const Function *destructor = scope->getDestructor();
 
@@ -2005,39 +2180,15 @@ void CheckClass::virtualDestructor()
                 // If this pattern is not seen then bailout the checking of these base/derived classes
                 {
                     // pointer variables of type 'Base *'
-                    std::set<int> baseClassPointers;
-
-                    for (const Variable* var : mSymbolDatabase->variableList()) {
-                        if (var && var->isPointer() && var->type() == derivedFrom)
-                            baseClassPointers.insert(var->declarationId());
-                    }
-
-                    // pointer variables of type 'Base *' that should not be deleted
-                    std::set<int> dontDelete;
-
-                    // No deletion of derived class instance through base class pointer found => the code is ok
-                    bool ok = true;
-
-                    for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
-                        if (Token::Match(tok, "[;{}] %var% =") &&
-                            baseClassPointers.find(tok->next()->varId()) != baseClassPointers.end()) {
-                            // new derived class..
-                            const std::string tmp("new " + derivedClass->str());
-                            if (Token::simpleMatch(tok->tokAt(3), tmp.c_str(), tmp.size())) {
-                                dontDelete.insert(tok->next()->varId());
-                            }
-                        }
-
-                        // Delete base class pointer that might point at derived class
-                        else if (Token::Match(tok, "delete %var% ;") &&
-                                 dontDelete.find(tok->next()->varId()) != dontDelete.end()) {
-                            ok = false;
-                            break;
-                        }
-                    }
+                    const auto pointers = pointersByType.find(derivedFrom);
+                    if (pointers == pointersByType.end())
+                        continue;
 
                     // No base class pointer that points at a derived class is deleted
-                    if (ok)
+                    if (std::none_of(pointers->second.cbegin(), pointers->second.cend(), [&](int varId) {
+                        const auto deleted = deletedAfterNew.find(varId);
+                        return deleted != deletedAfterNew.end() && deleted->second.count(derivedClass->str()) > 0;
+                    }))
                         continue;
                 }
 
@@ -2077,10 +2228,10 @@ void CheckClass::virtualDestructor()
         virtualDestructorError(func->tokenDef, func->name(), "", true);
 }
 
-void CheckClass::virtualDestructorError(const Token *tok, const std::string &Base, const std::string &Derived, bool inconclusive)
+void CheckClassImpl::virtualDestructorError(const Token *tok, const std::string &Base, const std::string &Derived, bool inconclusive)
 {
     if (inconclusive) {
-        if (mSettings->severity.isEnabled(Severity::warning))
+        if (mSettings.severity.isEnabled(Severity::warning))
             reportError(tok, Severity::warning, "virtualDestructor", "$symbol:" + Base + "\nClass '$symbol' which has virtual members does not have a virtual destructor.", CWE404, Certainty::inconclusive);
     } else {
         reportError(tok, Severity::error, "virtualDestructor",
@@ -2098,9 +2249,9 @@ void CheckClass::virtualDestructorError(const Token *tok, const std::string &Bas
 // warn for "this-x". The indented code may be "this->x"
 //---------------------------------------------------------------------------
 
-void CheckClass::thisSubtraction()
+void CheckClassImpl::thisSubtraction()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckClass::thisSubtraction"); // warning
@@ -2118,7 +2269,7 @@ void CheckClass::thisSubtraction()
     }
 }
 
-void CheckClass::thisSubtractionError(const Token *tok)
+void CheckClassImpl::thisSubtractionError(const Token *tok)
 {
     reportError(tok, Severity::warning, "thisSubtraction", "Suspicious pointer subtraction. Did you intend to write '->'?", CWE398, Certainty::normal);
 }
@@ -2127,11 +2278,11 @@ void CheckClass::thisSubtractionError(const Token *tok)
 // can member function be const?
 //---------------------------------------------------------------------------
 
-void CheckClass::checkConst()
+void CheckClassImpl::checkConst()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) &&
-        !mSettings->isPremiumEnabled("functionConst") &&
-        !mSettings->isPremiumEnabled("functionStatic"))
+    if (!mSettings.severity.isEnabled(Severity::style) &&
+        !mSettings.isPremiumEnabled("functionConst") &&
+        !mSettings.isPremiumEnabled("functionStatic"))
         return;
 
     logChecker("CheckClass::checkConst"); // style,inconclusive
@@ -2192,7 +2343,7 @@ void CheckClass::checkConst()
                 const std::string& opName = func.tokenDef->str();
                 if (opName.compare(8, 5, "const") != 0 && (endsWith(opName,'&') || endsWith(opName,'*')))
                     continue;
-            } else if (mSettings->library.isSmartPointer(func.retDef)) {
+            } else if (mSettings.library.isSmartPointer(func.retDef)) {
                 // Don't warn if a std::shared_ptr etc is returned
                 continue;
             } else {
@@ -2215,7 +2366,7 @@ void CheckClass::checkConst()
             const bool suggestStatic = memberAccessed != MemberAccess::MEMBER && !func.isOperator();
             if ((returnsPtrOrRef || func.isConst() || func.hasLvalRefQualifier()) && !suggestStatic)
                 continue;
-            if (!suggestStatic && !mSettings->certainty.isEnabled(Certainty::inconclusive))
+            if (!suggestStatic && !mSettings.certainty.isEnabled(Certainty::inconclusive))
                 // functionConst is inconclusive. False positives: #3322.
                 continue;
             if (suggestStatic && func.isConst()) {
@@ -2263,7 +2414,7 @@ static const Token* getFuncTokFromThis(const Token* tok) {
     return Token::Match(tok, "%name% (") ? tok : nullptr;
 }
 
-bool CheckClass::isMemberVar(const Scope *scope, const Token *tok) const
+bool CheckClassImpl::isMemberVar(const Scope *scope, const Token *tok) const
 {
     bool again = false;
 
@@ -2287,11 +2438,18 @@ bool CheckClass::isMemberVar(const Scope *scope, const Token *tok) const
         } else if (tok->str() == "]") {
             tok = tok->link()->previous();
             again = true;
+        } else if (Token::Match(tok, "%name% ::")) {
+            tok = tok->tokAt(2);
+            again = true;
         }
     } while (again);
 
     if (tok->isKeyword() || tok->isStandardType())
         return false;
+    if (tok->variable() && (tok->variable()->isArgument() || tok->variable()->isLocal()))
+        return false;
+    if (tok->function() || tok->type() || tok->enumerator())
+        return false;
 
     for (const Variable& var : scope->varlist) {
         if (var.name() == tok->str()) {
@@ -2343,13 +2501,15 @@ bool CheckClass::isMemberVar(const Scope *scope, const Token *tok) const
     return false;
 }
 
-bool CheckClass::isMemberFunc(const Scope *scope, const Token *tok)
+bool CheckClassImpl::isMemberFunc(const Scope *scope, const Token *tok)
 {
     if (!tok->function()) {
+        if (Token::simpleMatch(tok->astParent(), ".") && Token::simpleMatch(tok->astParent()->astOperand1(), "this"))
+            return true;
         for (const Function &func : scope->functionList) {
             if (func.name() == tok->str()) {
                 const Token* tok2 = tok->tokAt(2);
-                int argsPassed = tok2->str() == ")" ? 0 : 1;
+                size_t argsPassed = tok2->str() == ")" ? 0 : 1;
                 for (;;) {
                     tok2 = tok2->nextArgument();
                     if (tok2)
@@ -2384,7 +2544,7 @@ bool CheckClass::isMemberFunc(const Scope *scope, const Token *tok)
     return false;
 }
 
-bool CheckClass::isConstMemberFunc(const Scope *scope, const Token *tok)
+bool CheckClassImpl::isConstMemberFunc(const Scope *scope, const Token *tok)
 {
     if (!tok->function())
         return false;
@@ -2409,7 +2569,7 @@ bool CheckClass::isConstMemberFunc(const Scope *scope, const Token *tok)
     return false;
 }
 
-const std::set<std::string> CheckClass::stl_containers_not_const = { "map", "unordered_map", "std :: map|unordered_map <" }; // start pattern
+const std::set<std::string> CheckClassImpl::stl_containers_not_const = { "map", "unordered_map", "std :: map|unordered_map <" }; // start pattern
 
 static bool isNonConstPtrCast(const Token* tok)
 {
@@ -2419,7 +2579,7 @@ static bool isNonConstPtrCast(const Token* tok)
     return !vt || (vt->pointer > 0 && !vt->isConst(vt->pointer));
 }
 
-bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, MemberAccess& memberAccessed) const
+bool CheckClassImpl::checkConstFunc(const Scope *scope, const Function *func, MemberAccess& memberAccessed) const
 {
     if (mTokenizer->hasIfdef(func->functionScope->bodyStart, func->functionScope->bodyEnd))
         return false;
@@ -2446,9 +2606,9 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
 
         if (const Function* f = funcTok->function()) { // check known function
             const std::vector<const Token*> args = getArguments(funcTok);
-            const auto argMax = std::min<nonneg int>(args.size(), f->argCount());
+            const auto argMax = std::min<size_t>(args.size(), f->argCount());
 
-            for (nonneg int argIndex = 0; argIndex < argMax; ++argIndex) {
+            for (size_t argIndex = 0; argIndex < argMax; ++argIndex) {
                 const Variable* const argVar = f->getArgumentVar(argIndex);
                 if (!argVar || ((argVar->isArrayOrPointer() || argVar->isReference()) &&
                                 !(argVar->valueType() && argVar->valueType()->isConst(argVar->valueType()->pointer)))) { // argument might be modified
@@ -2470,7 +2630,7 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
             return true;
         }
 
-        if (const Library::Function* fLib = mSettings->library.getFunction(funcTok))
+        if (const Library::Function* fLib = mSettings.library.getFunction(funcTok))
             if (fLib->isconst || fLib->ispure)
                 return true;
 
@@ -2504,7 +2664,7 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
                     return false;
                 if (Token::Match(tok1->previous(), "( this . * %var% )")) // call using ptr to member function TODO: check constness
                     return false;
-                if (Token::simpleMatch(tok1->astParent(), "*") && tok1->astParent()->astParent() && tok1->astParent()->astParent()->isIncDecOp())
+                if (Token::simpleMatch(tok1->astParent(), "*"))
                     return false;
             }
 
@@ -2536,14 +2696,19 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
                     }
                 }
             } else if (lhs->str() == ":" && lhs->astParent() && lhs->astParent()->str() == "(") { // range-based for-loop (C++11)
-                // TODO: We could additionally check what is done with the elements to avoid false negatives. Here we just rely on "const" keyword being used.
-                if (lhs->astParent()->strAt(1) != "const")
+                const Variable* loopVar = lhs->astOperand1()->variable();
+                if (!loopVar || !loopVar->valueType())
+                    return false;
+                if (!loopVar->valueType()->isConst(loopVar->valueType()->pointer))
                     return false;
             } else {
                 if (lhs->isAssignmentOp()) {
-                    const Variable* lhsVar = lhs->previous()->variable();
-                    if (lhsVar && !lhsVar->isConst() && lhsVar->isReference() && lhs == lhsVar->nameToken()->next())
-                        return false;
+                    if (const Variable* lhsVar = lhs->previous()->variable()) {
+                        if (!lhsVar->isConst() && lhsVar->isReference() && lhs == lhsVar->nameToken()->next())
+                            return false;
+                        if (lhsVar->isPointer() && v && v->isArray() && !(lhsVar->valueType() && lhsVar->valueType()->isConst(/*indirect*/ 1)))
+                            return false;
+                    }
                 }
             }
 
@@ -2629,12 +2794,12 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
                 }
                 else if (var->smartPointerType() && var->smartPointerType()->classScope && isConstMemberFunc(var->smartPointerType()->classScope, end)) {
                     // empty body
-                } else if (var->isSmartPointer() && Token::simpleMatch(tok1->next(), ".") && tok1->next()->originalName().empty() && mSettings->library.isFunctionConst(end)) {
+                } else if (var->isSmartPointer() && Token::simpleMatch(tok1->next(), ".") && tok1->next()->originalName().empty() && mSettings.library.isFunctionConst(end)) {
                     // empty body
                 } else if (hasOverloadedMemberAccess(end, var->typeScope())) {
                     // empty body
                 } else if (!var->typeScope() || (end->function() != func && !isConstMemberFunc(var->typeScope(), end))) {
-                    if (!mSettings->library.isFunctionConst(end))
+                    if (!mSettings.library.isFunctionConst(end))
                         return false;
                 }
             }
@@ -2691,12 +2856,12 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
     return true;
 }
 
-void CheckClass::checkConstError(const Token *tok, const std::string &classname, const std::string &funcname, bool suggestStatic, bool foundAllBaseClasses)
+void CheckClassImpl::checkConstError(const Token *tok, const std::string &classname, const std::string &funcname, bool suggestStatic, bool foundAllBaseClasses)
 {
     checkConstError2(tok, nullptr, classname, funcname, suggestStatic, foundAllBaseClasses);
 }
 
-void CheckClass::checkConstError2(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &funcname, bool suggestStatic, bool foundAllBaseClasses)
+void CheckClassImpl::checkConstError2(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &funcname, bool suggestStatic, bool foundAllBaseClasses)
 {
     std::list<const Token *> toks{ tok1 };
     if (tok2)
@@ -2737,17 +2902,19 @@ namespace { // avoid one-definition-rule violation
     };
 }
 
-void CheckClass::initializerListOrder()
+void CheckClassImpl::initializerListOrder()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("initializerList"))
-        return;
+    if (!mSettings.isPremiumEnabled("initializerList")) {
+        if (!mSettings.severity.isEnabled(Severity::style))
+            return;
 
-    // This check is not inconclusive.  However it only determines if the initialization
-    // order is incorrect.  It does not determine if being out of order causes
-    // a real error.  Out of order is not necessarily an error but you can never
-    // have an error if the list is in order so this enforces defensive programming.
-    if (!mSettings->certainty.isEnabled(Certainty::inconclusive))
-        return;
+        // This check is not inconclusive.  However it only determines if the initialization
+        // order is incorrect.  It does not determine if being out of order causes
+        // a real error.  Out of order is not necessarily an error but you can never
+        // have an error if the list is in order so this enforces defensive programming.
+        if (!mSettings.certainty.isEnabled(Certainty::inconclusive))
+            return;
+    }
 
     logChecker("CheckClass::initializerListOrder"); // style,inconclusive
 
@@ -2814,7 +2981,7 @@ void CheckClass::initializerListOrder()
     }
 }
 
-void CheckClass::initializerListError(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &varname, const std::string& argname)
+void CheckClassImpl::initializerListError(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &varname, const std::string& argname)
 {
     std::list<const Token *> toks = { tok1, tok2 };
     const std::string msg = argname.empty() ?
@@ -2835,7 +3002,7 @@ void CheckClass::initializerListError(const Token *tok1, const Token *tok2, cons
 // Check for self initialization in initialization list
 //---------------------------------------------------------------------------
 
-void CheckClass::checkSelfInitialization()
+void CheckClassImpl::checkSelfInitialization()
 {
     logChecker("CheckClass::checkSelfInitialization");
 
@@ -2864,7 +3031,7 @@ void CheckClass::checkSelfInitialization()
     }
 }
 
-void CheckClass::selfInitializationError(const Token* tok, const std::string& varname)
+void CheckClassImpl::selfInitializationError(const Token* tok, const std::string& varname)
 {
     reportError(tok, Severity::error, "selfInitialization", "$symbol:" + varname + "\nMember variable '$symbol' is initialized by itself.", CWE665, Certainty::normal);
 }
@@ -2874,9 +3041,9 @@ void CheckClass::selfInitializationError(const Token* tok, const std::string& va
 // Check for virtual function calls in constructor/destructor
 //---------------------------------------------------------------------------
 
-void CheckClass::checkVirtualFunctionCallInConstructor()
+void CheckClassImpl::checkVirtualFunctionCallInConstructor()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
     logChecker("CheckClass::checkVirtualFunctionCallInConstructor"); // warning
     std::map<const Function *, std::list<const Token *>> virtualFunctionCallsMap;
@@ -2904,8 +3071,8 @@ void CheckClass::checkVirtualFunctionCallInConstructor()
     }
 }
 
-const std::list<const Token *> & CheckClass::getVirtualFunctionCalls(const Function & function,
-                                                                     std::map<const Function *, std::list<const Token *>> & virtualFunctionCallsMap)
+const std::list<const Token *> & CheckClassImpl::getVirtualFunctionCalls(const Function & function,
+                                                                         std::map<const Function *, std::list<const Token *>> & virtualFunctionCallsMap)
 {
     const auto found = utils::as_const(virtualFunctionCallsMap).find(&function);
     if (found != virtualFunctionCallsMap.end())
@@ -2943,8 +3110,8 @@ const std::list<const Token *> & CheckClass::getVirtualFunctionCalls(const Funct
             tok->strAt(-1) == "(") {
             const Token * prev = tok->previous();
             if (prev->previous() &&
-                (mSettings->library.ignorefunction(tok->str())
-                 || mSettings->library.ignorefunction(prev->strAt(-1))))
+                (mSettings.library.ignorefunction(tok->str())
+                 || mSettings.library.ignorefunction(prev->strAt(-1))))
                 continue;
         }
 
@@ -2962,7 +3129,7 @@ const std::list<const Token *> & CheckClass::getVirtualFunctionCalls(const Funct
     return virtualFunctionCalls;
 }
 
-void CheckClass::getFirstVirtualFunctionCallStack(
+void CheckClassImpl::getFirstVirtualFunctionCallStack(
     std::map<const Function *, std::list<const Token *>> & virtualFunctionCallsMap,
     const Token * callToken,
     std::list<const Token *> & pureFuncStack)
@@ -2982,12 +3149,12 @@ void CheckClass::getFirstVirtualFunctionCallStack(
     getFirstVirtualFunctionCallStack(virtualFunctionCallsMap, firstCall, pureFuncStack);
 }
 
-void CheckClass::virtualFunctionCallInConstructorError(
+void CheckClassImpl::virtualFunctionCallInConstructorError(
     const Function * scopeFunction,
     const std::list<const Token *> & tokStack,
     const std::string &funcname)
 {
-    if (scopeFunction && !mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("virtualCallInConstructor"))
+    if (scopeFunction && !mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("virtualCallInConstructor"))
         return;
 
     const char * scopeFunctionTypeName = scopeFunction ? getFunctionTypeName(scopeFunction->type) : "constructor";
@@ -3020,7 +3187,7 @@ void CheckClass::virtualFunctionCallInConstructorError(
                 "Virtual function '" + funcname + "' is called from " + scopeFunctionTypeName + " '" + constructorName + "' at line " + std::to_string(lineNumber) + ". Dynamic binding is not used.", CWE(0U), Certainty::normal);
 }
 
-void CheckClass::pureVirtualFunctionCallInConstructorError(
+void CheckClassImpl::pureVirtualFunctionCallInConstructorError(
     const Function * scopeFunction,
     const std::list<const Token *> & tokStack,
     const std::string &purefuncname)
@@ -3045,9 +3212,9 @@ void CheckClass::pureVirtualFunctionCallInConstructorError(
 // Check for members hiding inherited members with the same name
 //---------------------------------------------------------------------------
 
-void CheckClass::checkDuplInheritedMembers()
+void CheckClassImpl::checkDuplInheritedMembers()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("duplInheritedMember"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("duplInheritedMember"))
         return;
 
     logChecker("CheckClass::checkDuplInheritedMembers"); // warning
@@ -3114,6 +3281,8 @@ static std::vector<DuplMemberFuncInfo> getDuplInheritedMemberFunctionsRecursive(
                 continue;
             if (classFuncIt.tokenDef->isExpandedMacro())
                 continue;
+            if (classFuncIt.templateDef)
+                continue;
             for (const Function& parentClassFuncIt : parentClassIt.type->classScope->functionList) {
                 if (classFuncIt.name() == parentClassFuncIt.name() &&
                     (parentClassFuncIt.access != AccessControl::Private || !skipPrivate) &&
@@ -3132,7 +3301,7 @@ static std::vector<DuplMemberFuncInfo> getDuplInheritedMemberFunctionsRecursive(
     return results;
 }
 
-void CheckClass::checkDuplInheritedMembersRecursive(const Type* typeCurrent, const Type* typeBase)
+void CheckClassImpl::checkDuplInheritedMembersRecursive(const Type* typeCurrent, const Type* typeBase)
 {
     const auto resultsVar = getDuplInheritedMembersRecursive(typeCurrent, typeBase);
     for (const auto& r : resultsVar) {
@@ -3151,9 +3320,9 @@ void CheckClass::checkDuplInheritedMembersRecursive(const Type* typeCurrent, con
     }
 }
 
-void CheckClass::duplInheritedMembersError(const Token *tok1, const Token* tok2,
-                                           const std::string &derivedName, const std::string &baseName,
-                                           const std::string &memberName, bool derivedIsStruct, bool baseIsStruct, bool isFunction)
+void CheckClassImpl::duplInheritedMembersError(const Token *tok1, const Token* tok2,
+                                               const std::string &derivedName, const std::string &baseName,
+                                               const std::string &memberName, bool derivedIsStruct, bool baseIsStruct, bool isFunction)
 {
     ErrorPath errorPath;
     const std::string member = isFunction ? "function" : "variable";
@@ -3179,11 +3348,11 @@ enum class CtorType : std::uint8_t {
     WITH_BODY
 };
 
-void CheckClass::checkCopyCtorAndEqOperator()
+void CheckClassImpl::checkCopyCtorAndEqOperator()
 {
-    // This is disabled because of #8388
+    // TODO: This is disabled because of #8388
     // The message must be clarified. How is the behaviour different?
-    if ((true) || !mSettings->severity.isEnabled(Severity::warning)) // NOLINT(readability-simplify-boolean-expr)
+    if ((true) || !mSettings.severity.isEnabled(Severity::warning)) // NOLINT(readability-simplify-boolean-expr,readability-redundant-parentheses)
         return;
 
     // logChecker
@@ -3231,7 +3400,7 @@ void CheckClass::checkCopyCtorAndEqOperator()
     }
 }
 
-void CheckClass::copyCtorAndEqOperatorError(const Token *tok, const std::string &classname, bool isStruct, bool hasCopyCtor)
+void CheckClassImpl::copyCtorAndEqOperatorError(const Token *tok, const std::string &classname, bool isStruct, bool hasCopyCtor)
 {
     const std::string message = "$symbol:" + classname + "\n"
                                 "The " + std::string(isStruct ? "struct" : "class") + " '$symbol' has '" +
@@ -3241,11 +3410,11 @@ void CheckClass::copyCtorAndEqOperatorError(const Token *tok, const std::string
     reportError(tok, Severity::warning, "copyCtorAndEqOperator", message);
 }
 
-void CheckClass::checkOverride()
+void CheckClassImpl::checkOverride()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("missingOverride"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("missingOverride"))
         return;
-    if (mSettings->standards.cpp < Standards::CPP11)
+    if (mSettings.standards.cpp < Standards::CPP11)
         return;
     logChecker("CheckClass::checkMissingOverride"); // style,c++03
     for (const Scope * classScope : mSymbolDatabase->classAndStructScopes) {
@@ -3256,6 +3425,8 @@ void CheckClass::checkOverride()
                 continue;
             if (func.tokenDef->isExpandedMacro())
                 continue;
+            if (func.templateDef)
+                continue;
             const Function *baseFunc = func.getOverriddenFunction();
             if (baseFunc)
                 overrideError(baseFunc, &func);
@@ -3263,7 +3434,7 @@ void CheckClass::checkOverride()
     }
 }
 
-void CheckClass::overrideError(const Function *funcInBase, const Function *funcInDerived)
+void CheckClassImpl::overrideError(const Function *funcInBase, const Function *funcInDerived)
 {
     const std::string functionName = funcInDerived ? ((funcInDerived->isDestructor() ? "~" : "") + funcInDerived->name()) : "";
     const std::string funcType = (funcInDerived && funcInDerived->isDestructor()) ? "destructor" : "function";
@@ -3281,7 +3452,7 @@ void CheckClass::overrideError(const Function *funcInBase, const Function *funcI
                 Certainty::normal);
 }
 
-void CheckClass::uselessOverrideError(const Function *funcInBase, const Function *funcInDerived, bool isSameCode)
+void CheckClassImpl::uselessOverrideError(const Function *funcInBase, const Function *funcInDerived, bool isSameCode)
 {
     const std::string functionName = funcInDerived ? ((funcInDerived->isDestructor() ? "~" : "") + funcInDerived->name()) : "";
     const std::string funcType = (funcInDerived && funcInDerived->isDestructor()) ? "destructor" : "function";
@@ -3345,9 +3516,9 @@ static bool compareTokenRanges(const Token* start1, const Token* end1, const Tok
     return isEqual;
 }
 
-void CheckClass::checkUselessOverride()
+void CheckClassImpl::checkUselessOverride()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("uselessOverride"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("uselessOverride"))
         return;
 
     logChecker("CheckClass::checkUselessOverride"); // style
@@ -3379,9 +3550,14 @@ void CheckClass::checkUselessOverride()
 
                     if (isSameCode) {
                         // bailout for shadowed members
-                        if (!classScope->definedType ||
-                            !getDuplInheritedMembersRecursive(classScope->definedType, classScope->definedType, /*skipPrivate*/ false).empty() ||
-                            !getDuplInheritedMemberFunctionsRecursive(classScope->definedType, classScope->definedType, /*skipPrivate*/ false).empty())
+                        if (!getDuplInheritedMembersRecursive(classScope->definedType,
+                                                              classScope->definedType,
+                                                              /*skipPrivate*/ false)
+                            .empty() ||
+                            !getDuplInheritedMemberFunctionsRecursive(classScope->definedType,
+                                                                      classScope->definedType,
+                                                                      /*skipPrivate*/ false)
+                            .empty())
                             continue;
                         uselessOverrideError(baseFunc, &func, true);
                         continue;
@@ -3426,9 +3602,9 @@ static const Variable* getSingleReturnVar(const Scope* scope) {
     return tok->variable();
 }
 
-void CheckClass::checkReturnByReference()
+void CheckClassImpl::checkReturnByReference()
 {
-    if (!mSettings->severity.isEnabled(Severity::performance) && !mSettings->isPremiumEnabled("returnByReference"))
+    if (!mSettings.severity.isEnabled(Severity::performance) && !mSettings.isPremiumEnabled("returnByReference"))
         return;
 
     logChecker("CheckClass::checkReturnByReference"); // performance
@@ -3443,7 +3619,7 @@ void CheckClass::checkReturnByReference()
                 continue;
             if (func.functionPointerUsage)
                 continue;
-            if (const Library::Container* container = mSettings->library.detectContainer(func.retDef))
+            if (const Library::Container* container = mSettings.library.detectContainer(func.retDef))
                 if (container->view)
                     continue;
             if (!func.isConst() && func.hasRvalRefQualifier())
@@ -3458,8 +3634,8 @@ void CheckClass::checkReturnByReference()
                 const bool isView = isContainer && var->valueType()->container->view;
                 bool warn = isContainer && !isView;
                 if (!warn && !isView) {
-                    const std::size_t size = var->valueType()->getSizeOf(*mSettings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer);
-                    if (size > 2 * mSettings->platform.sizeof_pointer)
+                    const std::size_t size = var->valueType()->getSizeOf(mSettings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer);
+                    if (size > 2 * mSettings.platform.sizeof_pointer)
                         warn = true;
                 }
                 if (warn)
@@ -3469,16 +3645,16 @@ void CheckClass::checkReturnByReference()
     }
 }
 
-void CheckClass::returnByReferenceError(const Function* func, const Variable* var)
+void CheckClassImpl::returnByReferenceError(const Function* func, const Variable* var)
 {
     const Token* tok = func ? func->tokenDef : nullptr;
     const std::string message = "Function '" + (func ? func->name() : "func") + "()' should return member '" + (var ? var->name() : "var") + "' by const reference.";
     reportError(tok, Severity::performance, "returnByReference", message);
 }
 
-void CheckClass::checkThisUseAfterFree()
+void CheckClassImpl::checkThisUseAfterFree()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckClass::checkThisUseAfterFree"); // warning
@@ -3488,7 +3664,7 @@ void CheckClass::checkThisUseAfterFree()
         for (const Variable &var : classScope->varlist) {
             // Find possible "self pointer".. pointer/smartpointer member variable of "self" type.
             if (var.valueType() && var.valueType()->smartPointerType != classScope->definedType && var.valueType()->typeScope != classScope) {
-                const ValueType valueType = ValueType::parseDecl(var.typeStartToken(), *mSettings);
+                const ValueType valueType = ValueType::parseDecl(var.typeStartToken(), mSettings);
                 if (valueType.smartPointerType != classScope->definedType)
                     continue;
             }
@@ -3525,7 +3701,7 @@ void CheckClass::checkThisUseAfterFree()
     }
 }
 
-bool CheckClass::checkThisUseAfterFreeRecursive(const Scope *classScope, const Function *func, const Variable *selfPointer, std::set<const Function *> callstack, const Token *&freeToken)
+bool CheckClassImpl::checkThisUseAfterFreeRecursive(const Scope *classScope, const Function *func, const Variable *selfPointer, std::set<const Function *> callstack, const Token *&freeToken)
 {
     if (!func || !func->functionScope)
         return false;
@@ -3564,7 +3740,7 @@ bool CheckClass::checkThisUseAfterFreeRecursive(const Scope *classScope, const F
     return false;
 }
 
-void CheckClass::thisUseAfterFree(const Token *self, const Token *free, const Token *use)
+void CheckClassImpl::thisUseAfterFree(const Token *self, const Token *free, const Token *use)
 {
     std::string selfPointer = self ? self->str() : "ptr";
     ErrorPath errorPath = { ErrorPathItem(self, "Assuming '" + selfPointer + "' is used as 'this'"), ErrorPathItem(free, "Delete '" + selfPointer + "', invalidating 'this'"), ErrorPathItem(use, "Call method when 'this' is invalid") };
@@ -3576,9 +3752,9 @@ void CheckClass::thisUseAfterFree(const Token *self, const Token *free, const To
                 CWE(0), Certainty::normal);
 }
 
-void CheckClass::checkUnsafeClassRefMember()
+void CheckClassImpl::checkUnsafeClassRefMember()
 {
-    if (!mSettings->safeChecks.classes || !mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.safeChecks.classes || !mSettings.severity.isEnabled(Severity::warning))
         return;
     logChecker("CheckClass::checkUnsafeClassRefMember"); // warning,safeChecks
     for (const Scope * classScope : mSymbolDatabase->classAndStructScopes) {
@@ -3600,7 +3776,7 @@ void CheckClass::checkUnsafeClassRefMember()
     }
 }
 
-void CheckClass::unsafeClassRefMemberError(const Token *tok, const std::string &varname)
+void CheckClassImpl::unsafeClassRefMemberError(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::warning, "unsafeClassRefMember",
                 "$symbol:" + varname + "\n"
@@ -3620,6 +3796,8 @@ namespace
     /* multifile checking; one definition rule violations */
     class MyFileInfo : public Check::FileInfo {
     public:
+        explicit MyFileInfo(std::string f0) : Check::FileInfo(std::move(f0)) {}
+
         using Check::FileInfo::FileInfo;
         struct NameLoc {
             std::string className;
@@ -3655,7 +3833,7 @@ namespace
     };
 }
 
-Check::FileInfo *CheckClass::getFileInfo(const Tokenizer &tokenizer, const Settings& /*settings*/, const std::string& currentConfig) const
+const Check::FileInfo *CheckClass::getFileInfo(const Tokenizer &tokenizer, const Settings& /*settings*/, const std::string& currentConfig) const
 {
     if (!tokenizer.isCPP())
         return nullptr;
@@ -3725,9 +3903,9 @@ Check::FileInfo *CheckClass::getFileInfo(const Tokenizer &tokenizer, const Setti
     return fileInfo;
 }
 
-Check::FileInfo * CheckClass::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const
+const Check::FileInfo * CheckClass::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const
 {
-    auto *fileInfo = new MyFileInfo;
+    auto *fileInfo = new MyFileInfo(file0);
     for (const tinyxml2::XMLElement *e = xmlElement->FirstChildElement(); e; e = e->NextSiblingElement()) {
         if (std::strcmp(e->Name(), "class") != 0)
             continue;
@@ -3755,14 +3933,26 @@ Check::FileInfo * CheckClass::loadFileInfoFromXml(const tinyxml2::XMLElement *xm
     return fileInfo;
 }
 
-bool CheckClass::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
+static ErrorMessage oneDefinitionRuleViolationErrorMessage(std::list<ErrorMessage::FileLocation> locationList, const std::string &file0, const std::string &symbolName)
+{
+    return ErrorMessage(std::move(locationList),
+                        file0,
+                        Severity::error,
+                        "$symbol:" + symbolName +
+                        "\nThe one definition rule is violated, different classes/structs have the same name '$symbol'",
+                        "ctuOneDefinitionRuleViolation",
+                        CWE_ONE_DEFINITION_RULE,
+                        Certainty::normal);
+}
+
+bool CheckClass::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<const Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
 {
     (void)ctu;
     (void)settings;
 
-    CheckClass dummy(nullptr, &settings, &errorLogger);
+    CheckClassImpl dummy(nullptr, settings, errorLogger);
     dummy.
-    logChecker("CheckClass::analyseWholeProgram");
+    logChecker("CheckClass::checkCtuOneDefinitionRule");
 
     if (fileInfo.empty())
         return false;
@@ -3793,15 +3983,7 @@ bool CheckClass::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<C
             locationList.emplace_back(nameLoc.fileName, nameLoc.lineNumber, nameLoc.column);
             locationList.emplace_back(it->second.fileName, it->second.lineNumber, it->second.column);
 
-            const ErrorMessage errmsg(std::move(locationList),
-                                      fi->file0,
-                                      Severity::error,
-                                      "$symbol:" + nameLoc.className +
-                                      "\nThe one definition rule is violated, different classes/structs have the same name '$symbol'",
-                                      "ctuOneDefinitionRuleViolation",
-                                      CWE_ONE_DEFINITION_RULE,
-                                      Certainty::normal);
-            errorLogger.reportErr(errmsg);
+            errorLogger.reportErr(oneDefinitionRuleViolationErrorMessage(std::move(locationList), fi->file0, nameLoc.className));
 
             foundErrors = true;
         }
@@ -3809,12 +3991,12 @@ bool CheckClass::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<C
     return foundErrors;
 }
 
-void CheckClass::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckClass::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
     if (tokenizer.isC())
         return;
 
-    CheckClass checkClass(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckClassImpl checkClass(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     // can't be a simplified check .. the 'sizeof' is used.
     checkClass.checkMemset();
@@ -3840,9 +4022,9 @@ void CheckClass::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
     checkClass.checkUnsafeClassRefMember();
 }
 
-void CheckClass::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckClass::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckClass c(nullptr, settings, errorLogger);
+    CheckClassImpl c(nullptr, settings, errorLogger);
     c.noConstructorError(nullptr, "classname", false);
     c.noExplicitConstructorError(nullptr, "classname", false);
     //c.copyConstructorMallocError(nullptr, 0, "var");
@@ -3882,5 +4064,5 @@ void CheckClass::getErrorMessages(ErrorLogger *errorLogger, const Settings *sett
     c.virtualFunctionCallInConstructorError(nullptr, std::list<const Token *>(), "f");
     c.thisUseAfterFree(nullptr, nullptr, nullptr);
     c.unsafeClassRefMemberError(nullptr, "UnsafeClass::var");
-    // TODO: ctuOneDefinitionRuleViolation
+    errorLogger.reportErr(oneDefinitionRuleViolationErrorMessage({}, "", "classname"));
 }
diff --git a/lib/checkclass.h b/lib/checkclass.h
index 130f6ffd781..376953ab6fd 100644
--- a/lib/checkclass.h
+++ b/lib/checkclass.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <cstdint>
@@ -48,23 +49,57 @@ enum class FunctionType : std::uint8_t;
 
 /** @brief %Check classes. Uninitialized member variables, non-conforming operators, missing virtual destructor, etc */
 class CPPCHECKLIB CheckClass : public Check {
-    friend class TestClass;
-    friend class TestConstructors;
-    friend class TestUnusedPrivateFunction;
-
 public:
     /** @brief This constructor is used when registering the CheckClass */
-    CheckClass() : Check(myName()) {}
+    CheckClass() : Check("Class") {}
 
-    /** @brief Set of the STL types whose operator[] is not const */
-    static const std::set<std::string> stl_containers_not_const;
+    /** @brief Run checks on the normal token list */
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    /** @brief Parse current TU and extract file info */
+    const Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings& /*settings*/, const std::string& currentConfig) const override;
 
-private:
-    /** @brief This constructor is used when running checks. */
-    CheckClass(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger);
+    const Check::FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const override;
 
-    /** @brief Run checks on the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    /** @brief Analyse all file infos for all TU */
+    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<const Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Check the code for each class.\n"
+               "- Missing constructors and copy constructors\n"
+               //"- Missing allocation of memory in copy constructor\n"
+               "- Constructors which should be explicit\n"
+               "- Are all variables initialized by the constructors?\n"
+               "- Are all variables assigned by 'operator='?\n"
+               "- Warn if memset, memcpy etc are used on a class\n"
+               "- Warn if memory for classes is allocated with malloc()\n"
+               "- If it's a base class, check that the destructor is virtual\n"
+               "- Are there unused private functions?\n"
+               "- 'operator=' should check for assignment to self\n"
+               "- Constness for member functions\n"
+               "- Order of initializations\n"
+               "- Suggest usage of initialization list\n"
+               "- Initialization of a member with itself\n"
+               "- Suspicious subtraction from 'this'\n"
+               "- Call of pure virtual function in constructor/destructor\n"
+               "- Duplicated inherited data members\n"
+               // disabled for now "- If 'copy constructor' defined, 'operator=' also should be defined and vice versa\n"
+               "- Check that arbitrary usage of public interface does not result in division by zero\n"
+               "- Delete \"self pointer\" and then access 'this'\n"
+               "- Check that the 'override' keyword is used when overriding virtual functions\n"
+               "- Check that the 'one definition rule' is not violated\n";
+    }
+};
+
+class CPPCHECKLIB CheckClassImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    CheckClassImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger);
+
+    /** @brief Set of the STL types whose operator[] is not const */
+    static const std::set<std::string> stl_containers_not_const;
 
     /** @brief %Check that all class constructors are ok */
     void constructors();
@@ -125,7 +160,7 @@ class CPPCHECKLIB CheckClass : public Check {
     /** @brief Check that the override keyword is used when overriding virtual functions */
     void checkOverride();
 
-    /** @brief Check that the overriden function is not identical to the base function */
+    /** @brief Check that the overridden function is not identical to the base function */
     void checkUselessOverride();
 
     /** @brief Check that large members are returned by reference from getter function */
@@ -137,14 +172,6 @@ class CPPCHECKLIB CheckClass : public Check {
     /** @brief Unsafe class check - const reference member */
     void checkUnsafeClassRefMember();
 
-    /** @brief Parse current TU and extract file info */
-    Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& currentConfig) const override;
-
-    Check::FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const override;
-
-    /** @brief Analyse all file infos for all TU */
-    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
-
     const SymbolDatabase* mSymbolDatabase{};
 
     // Reporting errors..
@@ -155,11 +182,11 @@ class CPPCHECKLIB CheckClass : public Check {
     void noCopyConstructorError(const Scope *scope, bool isdefault, const Token *alloc, bool inconclusive);
     void noOperatorEqError(const Scope *scope, bool isdefault, const Token *alloc, bool inconclusive);
     void noDestructorError(const Scope *scope, bool isdefault, const Token *alloc);
-    void uninitVarError(const Token *tok, bool isprivate, FunctionType functionType, const std::string &classname, const std::string &varname, bool derived, bool inconclusive);
+    void uninitVarError(const Token *tok, bool isprivate, FunctionType functionType, const std::string &classname, const std::string &varname, bool derived, bool inconclusive, bool noCtor = false, bool inheritedCtor = false);
     void uninitVarError(const Token *tok, const std::string &classname, const std::string &varname);
     void missingMemberCopyError(const Token *tok, FunctionType functionType, const std::string& classname, const std::string& varname);
     void operatorEqVarError(const Token *tok, const std::string &classname, const std::string &varname, bool inconclusive);
-    void unusedPrivateFunctionError(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &funcname);
+    void unusedPrivateFunctionError(const Token *tokImpl, const Token *tokDef, const std::string &classname, const std::string &funcname);
     void memsetError(const Token *tok, const std::string &memfunc, const std::string &classname, const std::string &type, bool isContainer = false);
     void memsetErrorReference(const Token *tok, const std::string &memfunc, const std::string &type);
     void memsetErrorFloat(const Token *tok, const std::string &type);
@@ -187,38 +214,6 @@ class CPPCHECKLIB CheckClass : public Check {
     void unsafeClassRefMemberError(const Token *tok, const std::string &varname);
     void checkDuplInheritedMembersRecursive(const Type* typeCurrent, const Type* typeBase);
 
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Class";
-    }
-
-    std::string classInfo() const override {
-        return "Check the code for each class.\n"
-               "- Missing constructors and copy constructors\n"
-               //"- Missing allocation of memory in copy constructor\n"
-               "- Constructors which should be explicit\n"
-               "- Are all variables initialized by the constructors?\n"
-               "- Are all variables assigned by 'operator='?\n"
-               "- Warn if memset, memcpy etc are used on a class\n"
-               "- Warn if memory for classes is allocated with malloc()\n"
-               "- If it's a base class, check that the destructor is virtual\n"
-               "- Are there unused private functions?\n"
-               "- 'operator=' should check for assignment to self\n"
-               "- Constness for member functions\n"
-               "- Order of initializations\n"
-               "- Suggest usage of initialization list\n"
-               "- Initialization of a member with itself\n"
-               "- Suspicious subtraction from 'this'\n"
-               "- Call of pure virtual function in constructor/destructor\n"
-               "- Duplicated inherited data members\n"
-               // disabled for now "- If 'copy constructor' defined, 'operator=' also should be defined and vice versa\n"
-               "- Check that arbitrary usage of public interface does not result in division by zero\n"
-               "- Delete \"self pointer\" and then access 'this'\n"
-               "- Check that the 'override' keyword is used when overriding virtual functions\n"
-               "- Check that the 'one definition rule' is not violated\n";
-    }
-
     // operatorEqRetRefThis helper functions
     void checkReturnPtrThis(const Scope *scope, const Function *func, const Token *tok, const Token *last);
     void checkReturnPtrThis(const Scope *scope, const Function *func, const Token *tok, const Token *last, std::set<const Function*>& analyzedFunctions);
@@ -228,7 +223,7 @@ class CPPCHECKLIB CheckClass : public Check {
     bool hasAllocation(const Function *func, const Scope* scope, const Token *start, const Token *end) const;
     bool hasAllocationInIfScope(const Function *func, const Scope* scope, const Token *ifStatementScopeStart) const;
     static bool hasAssignSelf(const Function *func, const Token *rhs, const Token *&out_ifStatementScopeStart);
-    enum class Bool : std::uint8_t { TRUE, FALSE, BAILOUT };
+    enum class Bool : std::uint8_t { True, False, Bailout };
     static Bool isInverted(const Token *tok, const Token *rhs);
     static const Token * getIfStmtBodyStart(const Token *tok, const Token *rhs);
 
@@ -254,6 +249,15 @@ class CPPCHECKLIB CheckClass : public Check {
         bool init{};
     };
 
+    static void handleUnionMembers(std::vector<Usage>& usageList);
+
+    enum class Initialization : std::uint8_t {
+        Missing, // a member that is missing initialization
+        Initialized, // a member that has a constructor or an explicit initializer
+        None // a member that cannot be initialized (does not trigger a warning for other uninitialized members)
+    };
+    Initialization checkInitialization(const Usage& usage, FunctionType funcType, bool noConstructor = false) const;
+
     static bool isBaseClassMutableMemberFunc(const Token *tok, const Scope *scope);
 
     /**
diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
index 5f35f443cbf..ad547cf543e 100644
--- a/lib/checkcondition.cpp
+++ b/lib/checkcondition.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,12 +52,7 @@ static const CWE CWE571(571U);   // Expression is Always True
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckCondition instance;
-}
-
-bool CheckCondition::diag(const Token* tok, bool insert)
+bool CheckConditionImpl::diag(const Token* tok, bool insert)
 {
     if (!tok)
         return false;
@@ -78,14 +73,14 @@ bool CheckCondition::diag(const Token* tok, bool insert)
     return true;
 }
 
-bool CheckCondition::diag(const Token* tok1, const Token* tok2)
+bool CheckConditionImpl::diag(const Token* tok1, const Token* tok2)
 {
     const bool b1 = diag(tok1);
     const bool b2 = diag(tok2);
     return b1 && b2;
 }
 
-bool CheckCondition::isAliased(const std::set<int> &vars) const
+bool CheckConditionImpl::isAliased(const std::set<int> &vars) const
 {
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (Token::Match(tok, "= & %var% ;") && vars.find(tok->tokAt(2)->varId()) != vars.end())
@@ -94,9 +89,9 @@ bool CheckCondition::isAliased(const std::set<int> &vars) const
     return false;
 }
 
-void CheckCondition::assignIf()
+void CheckConditionImpl::assignIf()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("assignIfError"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("assignIfError"))
         return;
 
     logChecker("CheckCondition::assignIf"); // style
@@ -167,12 +162,12 @@ static bool isParameterChanged(const Token *partok)
 }
 
 /** parse scopes recursively */
-bool CheckCondition::assignIfParseScope(const Token * const assignTok,
-                                        const Token * const startTok,
-                                        const nonneg int varid,
-                                        const bool islocal,
-                                        const char bitop,
-                                        const MathLib::bigint num)
+bool CheckConditionImpl::assignIfParseScope(const Token * const assignTok,
+                                            const Token * const startTok,
+                                            const nonneg int varid,
+                                            const bool islocal,
+                                            const char bitop,
+                                            const MathLib::bigint num)
 {
     bool ret = false;
 
@@ -209,7 +204,7 @@ bool CheckCondition::assignIfParseScope(const Token * const assignTok,
                 // is variable changed in loop?
                 const Token *bodyStart = tok2->linkAt(1)->next();
                 const Token *bodyEnd   = bodyStart ? bodyStart->link() : nullptr;
-                if (!bodyEnd || bodyEnd->str() != "}" || isVariableChanged(bodyStart, bodyEnd, varid, !islocal, *mSettings))
+                if (!bodyEnd || bodyEnd->str() != "}" || isVariableChanged(bodyStart, bodyEnd, varid, !islocal, mSettings))
                     continue;
             }
 
@@ -245,7 +240,7 @@ bool CheckCondition::assignIfParseScope(const Token * const assignTok,
     return false;
 }
 
-void CheckCondition::assignIfError(const Token *tok1, const Token *tok2, const std::string &condition, bool result)
+void CheckConditionImpl::assignIfError(const Token *tok1, const Token *tok2, const std::string &condition, bool result)
 {
     if (tok2 && diag(tok2->tokAt(2)))
         return;
@@ -257,7 +252,7 @@ void CheckCondition::assignIfError(const Token *tok1, const Token *tok2, const s
 }
 
 
-void CheckCondition::mismatchingBitAndError(const Token *tok1, const MathLib::bigint num1, const Token *tok2, const MathLib::bigint num2)
+void CheckConditionImpl::mismatchingBitAndError(const Token *tok1, const MathLib::bigint num1, const Token *tok2, const MathLib::bigint num2)
 {
     std::list<const Token *> locations = { tok1, tok2 };
 
@@ -313,9 +308,9 @@ static bool isOperandExpanded(const Token *tok)
     return false;
 }
 
-void CheckCondition::checkBadBitmaskCheck()
+void CheckConditionImpl::checkBadBitmaskCheck()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("badBitmaskCheck"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("badBitmaskCheck"))
         return;
 
     logChecker("CheckCondition::checkBadBitmaskCheck"); // style
@@ -353,7 +348,7 @@ void CheckCondition::checkBadBitmaskCheck()
     }
 }
 
-void CheckCondition::badBitmaskCheckError(const Token *tok, bool isNoOp)
+void CheckConditionImpl::badBitmaskCheckError(const Token *tok, bool isNoOp)
 {
     if (isNoOp)
         reportError(tok, Severity::style, "badBitmaskCheck", "Operator '|' with one operand equal to zero is redundant.", CWE571, Certainty::normal);
@@ -361,9 +356,9 @@ void CheckCondition::badBitmaskCheckError(const Token *tok, bool isNoOp)
         reportError(tok, Severity::warning, "badBitmaskCheck", "Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'?", CWE571, Certainty::normal);
 }
 
-void CheckCondition::comparison()
+void CheckConditionImpl::comparison()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("comparisonError"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("comparisonError"))
         return;
 
     logChecker("CheckCondition::comparison"); // style
@@ -426,7 +421,7 @@ void CheckCondition::comparison()
     }
 }
 
-void CheckCondition::comparisonError(const Token *tok, const std::string &bitop, MathLib::bigint value1, const std::string &op, MathLib::bigint value2, bool result)
+void CheckConditionImpl::comparisonError(const Token *tok, const std::string &bitop, MathLib::bigint value1, const std::string &op, MathLib::bigint value2, bool result)
 {
     std::ostringstream expression;
     expression << std::hex << "(X " << bitop << " 0x" << value1 << ") " << op << " 0x" << value2;
@@ -440,13 +435,13 @@ void CheckCondition::comparisonError(const Token *tok, const std::string &bitop,
     reportError(tok, Severity::style, "comparisonError", errmsg, CWE398, Certainty::normal);
 }
 
-bool CheckCondition::isOverlappingCond(const Token * const cond1, const Token * const cond2, bool pure) const
+bool CheckConditionImpl::isOverlappingCond(const Token * const cond1, const Token * const cond2, bool pure) const
 {
     if (!cond1 || !cond2)
         return false;
 
     // same expressions
-    if (isSameExpression(true, cond1, cond2, *mSettings, pure, false))
+    if (isSameExpression(true, cond1, cond2, mSettings, pure, false))
         return true;
 
     // bitwise overlap for example 'x&7' and 'x==1'
@@ -460,7 +455,7 @@ bool CheckCondition::isOverlappingCond(const Token * const cond1, const Token *
         if (!num1->isNumber() || MathLib::isNegative(num1->str()))
             return false;
 
-        if (!Token::Match(cond2, "&|==") || !cond2->astOperand1() || !cond2->astOperand2())
+        if (!Token::Match(cond2, "&|==") || !cond2->astOperand1())
             return false;
         const Token *expr2 = cond2->astOperand1();
         const Token *num2  = cond2->astOperand2();
@@ -469,7 +464,7 @@ bool CheckCondition::isOverlappingCond(const Token * const cond1, const Token *
         if (!num2->isNumber() || MathLib::isNegative(num2->str()))
             return false;
 
-        if (!isSameExpression(true, expr1, expr2, *mSettings, pure, false))
+        if (!isSameExpression(true, expr1, expr2, mSettings, pure, false))
             return false;
 
         const MathLib::bigint value1 = MathLib::toBigNumber(num1);
@@ -481,9 +476,9 @@ bool CheckCondition::isOverlappingCond(const Token * const cond1, const Token *
     return false;
 }
 
-void CheckCondition::duplicateCondition()
+void CheckConditionImpl::duplicateCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("duplicateCondition"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("duplicateCondition"))
         return;
 
     logChecker("CheckCondition::duplicateCondition"); // style
@@ -514,13 +509,13 @@ void CheckCondition::duplicateCondition()
             continue;
 
         ErrorPath errorPath;
-        if (!findExpressionChanged(cond1, scope.classDef->next(), cond2, *mSettings) &&
-            isSameExpression(true, cond1, cond2, *mSettings, true, true, &errorPath))
+        if (!findExpressionChanged(cond1, scope.classDef->next(), cond2, mSettings) &&
+            isSameExpression(true, cond1, cond2, mSettings, true, true, &errorPath))
             duplicateConditionError(cond1, cond2, std::move(errorPath));
     }
 }
 
-void CheckCondition::duplicateConditionError(const Token *tok1, const Token *tok2, ErrorPath errorPath)
+void CheckConditionImpl::duplicateConditionError(const Token *tok1, const Token *tok2, ErrorPath errorPath)
 {
     if (diag(tok1, tok2))
         return;
@@ -532,9 +527,9 @@ void CheckCondition::duplicateConditionError(const Token *tok1, const Token *tok
     reportError(std::move(errorPath), Severity::style, "duplicateCondition", msg, CWE398, Certainty::normal);
 }
 
-void CheckCondition::multiCondition()
+void CheckConditionImpl::multiCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("multiCondition"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("multiCondition"))
         return;
 
     logChecker("CheckCondition::multiCondition"); // style
@@ -564,18 +559,18 @@ void CheckCondition::multiCondition()
             if (tok2->astOperand2()) {
                 ErrorPath errorPath;
                 if (isOverlappingCond(cond1, tok2->astOperand2(), true) &&
-                    !findExpressionChanged(cond1, cond1, tok2->astOperand2(), *mSettings))
+                    !findExpressionChanged(cond1, cond1, tok2->astOperand2(), mSettings))
                     overlappingElseIfConditionError(tok2->astOperand2(), cond1->linenr());
                 else if (isOppositeCond(
-                             true, cond1, tok2->astOperand2(), *mSettings, true, true, &errorPath) &&
-                         !findExpressionChanged(cond1, cond1, tok2->astOperand2(), *mSettings))
+                             true, cond1, tok2->astOperand2(), mSettings, true, true, &errorPath) &&
+                         !findExpressionChanged(cond1, cond1, tok2->astOperand2(), mSettings))
                     oppositeElseIfConditionError(cond1, tok2->astOperand2(), std::move(errorPath));
             }
         }
     }
 }
 
-void CheckCondition::overlappingElseIfConditionError(const Token *tok, nonneg int line1)
+void CheckConditionImpl::overlappingElseIfConditionError(const Token *tok, nonneg int line1)
 {
     if (diag(tok))
         return;
@@ -586,7 +581,7 @@ void CheckCondition::overlappingElseIfConditionError(const Token *tok, nonneg in
     reportError(tok, Severity::style, "multiCondition", errmsg.str(), CWE398, Certainty::normal);
 }
 
-void CheckCondition::oppositeElseIfConditionError(const Token *ifCond, const Token *elseIfCond, ErrorPath errorPath)
+void CheckConditionImpl::oppositeElseIfConditionError(const Token *ifCond, const Token *elseIfCond, ErrorPath errorPath)
 {
     if (diag(ifCond, elseIfCond))
         return;
@@ -602,7 +597,7 @@ void CheckCondition::oppositeElseIfConditionError(const Token *ifCond, const Tok
 
 //---------------------------------------------------------------------------
 // - Opposite inner conditions => always false
-// - (TODO) Same/Overlapping inner condition => always true
+// - Same/Overlapping inner condition => always true
 // - same condition after early exit => always false
 //---------------------------------------------------------------------------
 
@@ -619,6 +614,8 @@ static bool isNonConstFunctionCall(const Token *ftok, const Library &library)
         return false;
     if (ftok->function() && ftok->function()->isConst())
         return false;
+    if (ftok->isControlFlowKeyword())
+        return false;
     return true;
 }
 
@@ -632,11 +629,11 @@ static bool isNestedInLambda(const Scope* inner, const Scope* outer)
     return false;
 }
 
-void CheckCondition::multiCondition2()
+void CheckConditionImpl::multiCondition2()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) &&
-        !mSettings->isPremiumEnabled("identicalConditionAfterEarlyExit") &&
-        !mSettings->isPremiumEnabled("identicalInnerCondition"))
+    if (!mSettings.severity.isEnabled(Severity::warning) &&
+        !mSettings.isPremiumEnabled("identicalConditionAfterEarlyExit") &&
+        !mSettings.isPremiumEnabled("identicalInnerCondition"))
         return;
 
     logChecker("CheckCondition::multiCondition2"); // warning
@@ -671,7 +668,7 @@ void CheckCondition::multiCondition2()
                       [&](const Token *cond) {
             if (Token::Match(cond, "%name% (")) {
                 functionCall = true;
-                nonConstFunctionCall = isNonConstFunctionCall(cond, mSettings->library);
+                nonConstFunctionCall = isNonConstFunctionCall(cond, mSettings.library);
                 if (nonConstFunctionCall)
                     return ChildrenToVisit::done;
             }
@@ -682,7 +679,7 @@ void CheckCondition::multiCondition2()
                 if (!nonlocal && var) {
                     if (!(var->isLocal() || var->isArgument()))
                         nonlocal = true;
-                    else if ((var->isPointer() || var->isReference()) && !Token::Match(cond->astParent(), "%oror%|&&|!"))
+                    else if ((var->isPointer() || var->isReference() || var->isArray()) && !Token::Match(cond->astParent(), "%oror%|&&|!"))
                         // TODO: if var is pointer check what it points at
                         nonlocal = true;
                 }
@@ -728,18 +725,18 @@ void CheckCondition::multiCondition2()
             for (; tok && tok != endToken; tok = tok->next()) {
                 if (isNestedInLambda(tok->scope(), cond1->scope()))
                     continue;
-                if (isExpressionChangedAt(cond1, tok, 0, false, *mSettings))
+                if (isExpressionChangedAt(cond1, tok, 0, false, mSettings))
                     break;
                 if (Token::Match(tok, "if|return")) {
                     const Token * condStartToken = tok->str() == "if" ? tok->next() : tok;
                     const Token * condEndToken = tok->str() == "if" ? condStartToken->link() : Token::findsimplematch(condStartToken, ";");
                     // Does condition modify tracked variables?
-                    if (findExpressionChanged(cond1, condStartToken, condEndToken, *mSettings))
+                    if (findExpressionChanged(cond1, condStartToken, condEndToken, mSettings))
                         break;
 
                     // Condition..
                     const Token *cond2 = tok->str() == "if" ? condStartToken->astOperand2() : condStartToken->astOperand1();
-                    const bool isReturnVar = (tok->str() == "return" && (!Token::Match(cond2, "%cop%") || (cond2 && cond2->isUnaryOp("!"))));
+                    const bool isReturnVar = (tok->str() == "return" && (!Token::Match(cond2, "%cop%") || cond2->isUnaryOp("!") || cond2->isUnaryOp("*")));
 
                     ErrorPath errorPath;
 
@@ -748,15 +745,17 @@ void CheckCondition::multiCondition2()
                             if (!firstCondition)
                                 return ChildrenToVisit::none;
                             if (firstCondition->str() == "&&") {
-                                if (!isOppositeCond(false, firstCondition, cond2, *mSettings, true, true))
+                                if (!isOppositeCond(false, firstCondition, cond2, mSettings, true, true))
                                     return ChildrenToVisit::op1_and_op2;
                             }
                             if (!firstCondition->hasKnownIntValue()) {
-                                if (!isReturnVar && isOppositeCond(false, firstCondition, cond2, *mSettings, true, true, &errorPath)) {
+                                if (!isReturnVar && isOppositeCond(false, firstCondition, cond2, mSettings, true, true, &errorPath)) {
                                     if (!isAliased(vars))
                                         oppositeInnerConditionError(firstCondition, cond2, errorPath);
-                                } else if (!isReturnVar && isSameExpression(true, firstCondition, cond2, *mSettings, true, true, &errorPath)) {
+                                } else if (!isReturnVar && isSameExpression(true, firstCondition, cond2, mSettings, true, true, &errorPath)) {
                                     identicalInnerConditionError(firstCondition, cond2, errorPath);
+                                } else if (!isReturnVar && isOverlappingCond(cond2, firstCondition, true)) {
+                                    overlappingInnerConditionError(firstCondition, cond2, errorPath);
                                 }
                             }
                             return ChildrenToVisit::none;
@@ -767,7 +766,7 @@ void CheckCondition::multiCondition2()
                                 return ChildrenToVisit::op1_and_op2;
 
                             if ((!cond1->hasKnownIntValue() || !secondCondition->hasKnownIntValue()) &&
-                                isSameExpression(true, cond1, secondCondition, *mSettings, true, true, &errorPath)) {
+                                isSameExpression(true, cond1, secondCondition, mSettings, true, true, &errorPath)) {
                                 if (!isAliased(vars) && !mTokenizer->hasIfdef(cond1, secondCondition)) {
                                     identicalConditionAfterEarlyExitError(cond1, secondCondition, errorPath);
                                     return ChildrenToVisit::done;
@@ -778,10 +777,10 @@ void CheckCondition::multiCondition2()
                     }
                 }
                 if (Token::Match(tok, "%name% (") &&
-                    isVariablesChanged(tok, tok->linkAt(1), 0, varsInCond, *mSettings)) {
+                    isVariablesChanged(tok, tok->linkAt(1), 0, varsInCond, mSettings)) {
                     break;
                 }
-                if (Token::Match(tok, "%type% (") && nonlocal && isNonConstFunctionCall(tok, mSettings->library)) // non const function call -> bailout if there are nonlocal variables
+                if (Token::Match(tok, "%type% (") && nonlocal && isNonConstFunctionCall(tok, mSettings.library)) // non const function call -> bailout if there are nonlocal variables
                     break;
                 if (Token::Match(tok, "case|break|continue|return|throw") && tok->scope() == endToken->scope())
                     break;
@@ -807,7 +806,7 @@ void CheckCondition::multiCondition2()
                         break;
                     }
                     const bool changed = std::any_of(vars.cbegin(), vars.cend(), [&](int varid) {
-                        return isVariableChanged(tok1, tok2, varid, nonlocal, *mSettings);
+                        return isVariableChanged(tok1, tok2, varid, nonlocal, mSettings);
                     });
                     if (changed)
                         break;
@@ -862,7 +861,7 @@ static std::string innerSmtString(const Token * tok)
     return top->str();
 }
 
-void CheckCondition::oppositeInnerConditionError(const Token *tok1, const Token* tok2, ErrorPath errorPath)
+void CheckConditionImpl::oppositeInnerConditionError(const Token *tok1, const Token* tok2, ErrorPath errorPath)
 {
     if (diag(tok1, tok2))
         return;
@@ -877,7 +876,22 @@ void CheckCondition::oppositeInnerConditionError(const Token *tok1, const Token*
     reportError(std::move(errorPath), Severity::warning, "oppositeInnerCondition", msg, CWE398, Certainty::normal);
 }
 
-void CheckCondition::identicalInnerConditionError(const Token *tok1, const Token* tok2, ErrorPath errorPath)
+void CheckConditionImpl::overlappingInnerConditionError(const Token *tok1,  const Token* tok2, ErrorPath errorPath)
+{
+    if (diag(tok1, tok2))
+        return;
+    const std::string s1(tok1 ? tok1->expressionString() : "x");
+    const std::string s2(tok2 ? tok2->expressionString() : "x");
+    const std::string innerSmt = innerSmtString(tok2);
+    errorPath.emplace_back(tok1, "outer condition: " + s1);
+    errorPath.emplace_back(tok2, "overlapping inner condition: " + s2);
+
+    const std::string msg("Overlapping inner '" + innerSmt + "' condition is always true.\n"
+                          "Overlapping inner '" + innerSmt + "' condition is always true (outer condition is '" + s1 + "' and inner condition is '" + s2 + "').");
+    reportError(std::move(errorPath), Severity::warning, "overlappingInnerCondition", msg, CWE398, Certainty::normal);
+}
+
+void CheckConditionImpl::identicalInnerConditionError(const Token *tok1, const Token* tok2, ErrorPath errorPath)
 {
     if (diag(tok1, tok2))
         return;
@@ -892,7 +906,7 @@ void CheckCondition::identicalInnerConditionError(const Token *tok1, const Token
     reportError(std::move(errorPath), Severity::warning, "identicalInnerCondition", msg, CWE398, Certainty::normal);
 }
 
-void CheckCondition::identicalConditionAfterEarlyExitError(const Token *cond1, const Token* cond2, ErrorPath errorPath)
+void CheckConditionImpl::identicalConditionAfterEarlyExitError(const Token *cond1, const Token* cond2, ErrorPath errorPath)
 {
     if (diag(cond1, cond2))
         return;
@@ -1059,7 +1073,7 @@ static bool parseComparison(const Token *comp, bool &not1, std::string &op, std:
 {
     not1 = false;
     while (comp && comp->str() == "!") {
-        not1 = !(not1);
+        not1 = !not1;
         comp = comp->astOperand1();
     }
 
@@ -1096,7 +1110,7 @@ static bool parseComparison(const Token *comp, bool &not1, std::string &op, std:
         expr = comp;
     }
 
-    inconclusive = inconclusive || ((value)[0] == '\'' && !(op == "!=" || op == "=="));
+    inconclusive = inconclusive || (value[0] == '\'' && !(op == "!=" || op == "=="));
 
     // Only float and int values are currently handled
     return MathLib::isInt(value) || MathLib::isFloat(value) || (value[0] == '\'');
@@ -1142,13 +1156,13 @@ static bool isIfConstexpr(const Token* tok) {
     return Token::simpleMatch(top->astOperand1(), "if") && top->astOperand1()->isConstexpr();
 }
 
-void CheckCondition::checkIncorrectLogicOperator()
+void CheckConditionImpl::checkIncorrectLogicOperator()
 {
-    const bool printStyle = mSettings->severity.isEnabled(Severity::style);
-    const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
-    if (!printWarning && !printStyle && !mSettings->isPremiumEnabled("incorrectLogicOperator"))
+    const bool printStyle = mSettings.severity.isEnabled(Severity::style);
+    const bool printWarning = mSettings.severity.isEnabled(Severity::warning);
+    if (!printWarning && !printStyle && !mSettings.isPremiumEnabled("incorrectLogicOperator"))
         return;
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
 
     logChecker("CheckCondition::checkIncorrectLogicOperator"); // style,warning
 
@@ -1168,7 +1182,7 @@ void CheckCondition::checkIncorrectLogicOperator()
                 ((tok->str() == "||" && tok->astOperand2()->str() == "&&") ||
                  (tok->str() == "&&" && tok->astOperand2()->str() == "||"))) {
                 const Token* tok2 = tok->astOperand2()->astOperand1();
-                if (isOppositeCond(true, tok->astOperand1(), tok2, *mSettings, true, false)) {
+                if (isOppositeCond(true, tok->astOperand1(), tok2, mSettings, true, false)) {
                     std::string expr1(tok->astOperand1()->expressionString());
                     std::string expr2(tok->astOperand2()->astOperand1()->expressionString());
                     std::string expr3(tok->astOperand2()->astOperand2()->expressionString());
@@ -1200,7 +1214,7 @@ void CheckCondition::checkIncorrectLogicOperator()
                     redundantConditionError(tok, msg, false);
                     continue;
                 }
-                if (isSameExpression(false, tok->astOperand1(), tok2, *mSettings, true, true)) {
+                if (isSameExpression(false, tok->astOperand1(), tok2, mSettings, true, true)) {
                     std::string expr1(tok->astOperand1()->expressionString());
                     std::string expr2(tok->astOperand2()->astOperand1()->expressionString());
                     std::string expr3(tok->astOperand2()->astOperand2()->expressionString());
@@ -1265,7 +1279,7 @@ void CheckCondition::checkIncorrectLogicOperator()
 
             // Opposite comparisons around || or && => always true or always false
             const bool isLogicalOr(tok->str() == "||");
-            if (!isfloat && isOppositeCond(isLogicalOr, tok->astOperand1(), tok->astOperand2(), *mSettings, true, true, &errorPath)) {
+            if (!isfloat && isOppositeCond(isLogicalOr, tok->astOperand1(), tok->astOperand2(), mSettings, true, true, &errorPath)) {
                 if (!isIfConstexpr(tok)) {
                     const bool alwaysTrue(isLogicalOr);
                     incorrectLogicOperatorError(tok, conditionString(tok), alwaysTrue, inconclusive, std::move(errorPath));
@@ -1276,9 +1290,9 @@ void CheckCondition::checkIncorrectLogicOperator()
             if (!parseable)
                 continue;
 
-            if (isSameExpression(true, comp1, comp2, *mSettings, true, true))
+            if (isSameExpression(true, comp1, comp2, mSettings, true, true))
                 continue; // same expressions => only report that there are same expressions
-            if (!isSameExpression(true, expr1, expr2, *mSettings, true, true))
+            if (!isSameExpression(true, expr1, expr2, mSettings, true, true))
                 continue;
 
 
@@ -1287,14 +1301,18 @@ void CheckCondition::checkIncorrectLogicOperator()
             if (isfloat && (op1 == "==" || op1 == "!=" || op2 == "==" || op2 == "!="))
                 continue;
 
+            // no double value to compare (1e400L would become infinity)
+            if (isfloat && (MathLib::isLongDoubleOutOfDoubleRange(value1) || MathLib::isLongDoubleOutOfDoubleRange(value2)))
+                continue;
+
             // the expr are not the token of the value but they provide better context
-            const double d1 = (isfloat) ? MathLib::toDoubleNumber(value1) : 0;
-            const double d2 = (isfloat) ? MathLib::toDoubleNumber(value2) : 0;
-            const MathLib::bigint i1 = (isfloat) ? 0 : MathLib::toBigNumber(value1, expr1);
-            const MathLib::bigint i2 = (isfloat) ? 0 : MathLib::toBigNumber(value2, expr2);
+            const double d1 = isfloat ? MathLib::toDoubleNumber(value1) : 0;
+            const double d2 = isfloat ? MathLib::toDoubleNumber(value2) : 0;
+            const MathLib::bigint i1 = isfloat ? 0 : MathLib::toBigNumber(value1, expr1);
+            const MathLib::bigint i2 = isfloat ? 0 : MathLib::toBigNumber(value2, expr2);
             const bool useUnsignedInt = (std::numeric_limits<MathLib::bigint>::max()==i1) || (std::numeric_limits<MathLib::bigint>::max()==i2);
-            const MathLib::biguint u1 = (useUnsignedInt) ? MathLib::toBigUNumber(value1, expr1) : 0;
-            const MathLib::biguint u2 = (useUnsignedInt) ? MathLib::toBigUNumber(value2, expr2) : 0;
+            const MathLib::biguint u1 = useUnsignedInt ? MathLib::toBigUNumber(value1, expr1) : 0;
+            const MathLib::biguint u2 = useUnsignedInt ? MathLib::toBigUNumber(value2, expr2) : 0;
             // evaluate if expression is always true/false
             bool alwaysTrue = true, alwaysFalse = true;
             bool firstTrue = true, secondTrue = true;
@@ -1353,7 +1371,7 @@ void CheckCondition::checkIncorrectLogicOperator()
     }
 }
 
-void CheckCondition::incorrectLogicOperatorError(const Token *tok, const std::string &condition, bool always, bool inconclusive, ErrorPath errors)
+void CheckConditionImpl::incorrectLogicOperatorError(const Token *tok, const std::string &condition, bool always, bool inconclusive, ErrorPath errors)
 {
     if (diag(tok))
         return;
@@ -1370,7 +1388,7 @@ void CheckCondition::incorrectLogicOperatorError(const Token *tok, const std::st
                     "Are these conditions necessary? Did you intend to use || instead? Are the numbers correct? Are you comparing the correct variables?", CWE570, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckCondition::redundantConditionError(const Token *tok, const std::string &text, bool inconclusive)
+void CheckConditionImpl::redundantConditionError(const Token *tok, const std::string &text, bool inconclusive)
 {
     if (diag(tok))
         return;
@@ -1380,9 +1398,9 @@ void CheckCondition::redundantConditionError(const Token *tok, const std::string
 //-----------------------------------------------------------------------------
 // Detect "(var % val1) > val2" where val2 is >= val1.
 //-----------------------------------------------------------------------------
-void CheckCondition::checkModuloAlwaysTrueFalse()
+void CheckConditionImpl::checkModuloAlwaysTrueFalse()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckCondition::checkModuloAlwaysTrueFalse"); // warning
@@ -1410,7 +1428,7 @@ void CheckCondition::checkModuloAlwaysTrueFalse()
     }
 }
 
-void CheckCondition::moduloAlwaysTrueFalseError(const Token* tok, const std::string& maxVal)
+void CheckConditionImpl::moduloAlwaysTrueFalseError(const Token* tok, const std::string& maxVal)
 {
     if (diag(tok))
         return;
@@ -1436,9 +1454,9 @@ static int countPar(const Token *tok1, const Token *tok2)
 // Clarify condition '(x = a < 0)' into '((x = a) < 0)' or '(x = (a < 0))'
 // Clarify condition '(a & b == c)' into '((a & b) == c)' or '(a & (b == c))'
 //---------------------------------------------------------------------------
-void CheckCondition::clarifyCondition()
+void CheckConditionImpl::clarifyCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("clarifyCondition"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("clarifyCondition"))
         return;
 
     logChecker("CheckCondition::clarifyCondition"); // style
@@ -1477,7 +1495,7 @@ void CheckCondition::clarifyCondition()
     }
 }
 
-void CheckCondition::clarifyConditionError(const Token *tok, bool assign, bool boolop)
+void CheckConditionImpl::clarifyConditionError(const Token *tok, bool assign, bool boolop)
 {
     std::string errmsg;
 
@@ -1500,12 +1518,11 @@ void CheckCondition::clarifyConditionError(const Token *tok, bool assign, bool b
                 errmsg, CWE398, Certainty::normal);
 }
 
-void CheckCondition::alwaysTrueFalse()
+void CheckConditionImpl::alwaysTrueFalse()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) &&
-        !mSettings->isPremiumEnabled("alwaysTrue") &&
-        !mSettings->isPremiumEnabled("alwaysFalse") &&
-        !mSettings->isPremiumEnabled("knownConditionTrueFalse"))
+    const bool pedantic = mSettings.isPremiumEnabled("knownConditionTrueFalse");
+
+    if (!pedantic && !mSettings.severity.isEnabled(Severity::style))
         return;
 
     logChecker("CheckCondition::alwaysTrueFalse"); // style
@@ -1519,50 +1536,58 @@ void CheckCondition::alwaysTrueFalse()
                 tok = tok->link();
                 continue;
             }
-            if (!tok->hasKnownIntValue())
+            if (!tok->hasKnownIntValue() || !isConstExpression(tok, mSettings.library))
                 continue;
-            if (Token::Match(tok->previous(), "%name% (") && tok->previous()->function()) {
-                const Function* f = tok->previous()->function();
-                if (f->functionScope && Token::Match(f->functionScope->bodyStart, "{ return true|false ;"))
-                    continue;
-            }
             const Token* condition = nullptr;
             {
                 // is this a condition..
                 const Token *parent = tok->astParent();
-                while (Token::Match(parent, "%oror%|&&"))
+                bool hasComp = false;
+                while (Token::Match(parent, "%oror%|&&")) {
+                    hasComp = true;
                     parent = parent->astParent();
+                }
                 if (!parent)
                     continue;
                 if (parent->str() == "?" && precedes(tok, parent))
                     condition = parent;
                 else if (Token::Match(parent->previous(), "if|while ("))
                     condition = parent->previous();
-                else if (Token::simpleMatch(parent, "return"))
-                    condition = parent;
                 else if (parent->str() == ";" && parent->astParent() && parent->astParent()->astParent() &&
                          Token::simpleMatch(parent->astParent()->astParent()->previous(), "for ("))
                     condition = parent->astParent()->astParent()->previous();
-                else if (Token::Match(tok, "%comp%"))
+                else if ((Token::Match(tok, "%comp%|!") || isConstFunctionCall(tok->previous(), mSettings.library)) && Token::Match(tok->astParent(), "%oror%|&&"))
+                    condition = tok;
+                else if (hasComp && Token::Match(tok, "!|%var%") && astIsBool(parent) && Token::Match(parent, "%assign%"))
                     condition = tok;
                 else
                     continue;
+
             }
             // Skip already diagnosed values
             if (diag(tok, false))
                 continue;
             if (condition->isConstexpr())
                 continue;
-            if (!isUsedAsBool(tok, *mSettings))
+            if (!isUsedAsBool(tok, mSettings))
                 continue;
             if (Token::simpleMatch(condition, "return") && Token::Match(tok, "%assign%"))
                 continue;
             if (Token::simpleMatch(tok->astParent(), "return") && Token::Match(tok, ".|%var%"))
                 continue;
-            if (Token::Match(tok, "%num%|%bool%|%char%"))
-                continue;
-            if (Token::Match(tok, "! %num%|%bool%|%char%"))
-                continue;
+            bool warnForNumber = false;
+            if (Token::Match(tok, "%num%|%bool%|%char%")) {
+                const bool isZeroOrOne = (tok->getKnownIntValue() >> 1) == 0;
+                warnForNumber = !isZeroOrOne && tok->tokType() == Token::eNumber && tok->astParent() == condition->astParent();
+                if (!warnForNumber)
+                    continue;
+            }
+            if (Token::Match(tok, "! %num%|%bool%|%char%")) {
+                const bool isZeroOrOne = tok->next()->hasKnownIntValue() && (tok->next()->getKnownIntValue() >> 1) == 0;
+                warnForNumber = !isZeroOrOne && tok->next()->tokType() == Token::eNumber && tok->astParent() == condition->astParent();
+                if (!warnForNumber)
+                    continue;
+            }
             if (Token::Match(tok, "%oror%|&&")) {
                 bool bail = false;
                 for (const Token* op : { tok->astOperand1(), tok->astOperand2() }) {
@@ -1582,11 +1607,12 @@ void CheckCondition::alwaysTrueFalse()
                 isSameExpression(true,
                                  tok->astOperand1(),
                                  tok->astOperand2(),
-                                 *mSettings,
+                                 mSettings,
                                  true,
                                  true))
                 continue;
-            if (isConstVarExpression(tok, [](const Token* tok) {
+
+            if (!pedantic && !warnForNumber && isConstVarExpression(tok, [](const Token* tok) {
                 return Token::Match(tok, "[|(|&|+|-|*|/|%|^|>>|<<") && !Token::simpleMatch(tok, "( )");
             }))
                 continue;
@@ -1596,8 +1622,8 @@ void CheckCondition::alwaysTrueFalse()
             {
                 const ValueFlow::Value *zeroValue = nullptr;
                 const Token *nonZeroExpr = nullptr;
-                if (CheckOther::comparisonNonZeroExpressionLessThanZero(tok, zeroValue, nonZeroExpr, /*suppress*/ true) ||
-                    CheckOther::testIfNonZeroExpressionIsPositive(tok, zeroValue, nonZeroExpr))
+                if (CheckOtherImpl::comparisonNonZeroExpressionLessThanZero(tok, zeroValue, nonZeroExpr, /*suppress*/ true) ||
+                    CheckOtherImpl::testIfNonZeroExpressionIsPositive(tok, zeroValue, nonZeroExpr))
                     continue;
             }
 
@@ -1647,11 +1673,20 @@ void CheckCondition::alwaysTrueFalse()
     }
 }
 
-void CheckCondition::alwaysTrueFalseError(const Token* tok, const Token* condition, const ValueFlow::Value* value)
+static std::string getConditionString(const Token* condition)
+{
+    if (Token::simpleMatch(condition, "return"))
+        return "Return value";
+    if (Token::simpleMatch(condition, "(") && Token::Match(condition->astParent(), "%assign%"))
+        return "Assigned value";
+    return "Condition";
+}
+
+void CheckConditionImpl::alwaysTrueFalseError(const Token* tok, const Token* condition, const ValueFlow::Value* value)
 {
     const bool alwaysTrue = value && (value->intvalue != 0 || value->isImpossible());
     const std::string expr = tok ? tok->expressionString() : std::string("x");
-    const std::string conditionStr = (Token::simpleMatch(condition, "return") ? "Return value" : "Condition");
+    const std::string conditionStr = getConditionString(condition);
     const std::string errmsg = conditionStr + " '" + expr + "' is always " + bool_to_string(alwaysTrue);
     ErrorPath errorPath = getErrorPath(tok, value, errmsg);
     reportError(std::move(errorPath),
@@ -1661,7 +1696,7 @@ void CheckCondition::alwaysTrueFalseError(const Token* tok, const Token* conditi
                 (alwaysTrue ? CWE571 : CWE570), Certainty::normal);
 }
 
-void CheckCondition::checkInvalidTestForOverflow()
+void CheckConditionImpl::checkInvalidTestForOverflow()
 {
     // Interesting blogs:
     // https://www.airs.com/blog/archives/120
@@ -1676,7 +1711,7 @@ void CheckCondition::checkInvalidTestForOverflow()
     // x + y < x       ->   y < 0
 
 
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckCondition::checkInvalidTestForOverflow"); // warning
@@ -1710,7 +1745,7 @@ void CheckCondition::checkInvalidTestForOverflow()
                 if (!isSameExpression(true,
                                       expr,
                                       lhs->astSibling(),
-                                      *mSettings,
+                                      mSettings,
                                       true,
                                       false))
                     continue;
@@ -1749,7 +1784,7 @@ void CheckCondition::checkInvalidTestForOverflow()
     }
 }
 
-void CheckCondition::invalidTestForOverflow(const Token* tok, const ValueType *valueType, const std::string &replace)
+void CheckConditionImpl::invalidTestForOverflow(const Token* tok, const ValueType *valueType, const std::string &replace)
 {
     const std::string expr = (tok ? tok->expressionString() : std::string("x + c < x"));
     const std::string overflow = (valueType && valueType->pointer) ? "pointer overflow" : "signed integer overflow";
@@ -1764,9 +1799,9 @@ void CheckCondition::invalidTestForOverflow(const Token* tok, const ValueType *v
 }
 
 
-void CheckCondition::checkPointerAdditionResultNotNull()
+void CheckConditionImpl::checkPointerAdditionResultNotNull()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckCondition::checkPointerAdditionResultNotNull"); // warning
@@ -1805,15 +1840,51 @@ void CheckCondition::checkPointerAdditionResultNotNull()
     }
 }
 
-void CheckCondition::pointerAdditionResultNotNullError(const Token *tok, const Token *calc)
+void CheckConditionImpl::pointerAdditionResultNotNullError(const Token *tok, const Token *calc)
 {
     const std::string s = calc ? calc->expressionString() : "ptr+1";
     reportError(tok, Severity::warning, "pointerAdditionResultNotNull", "Comparison is wrong. Result of '" + s + "' can't be 0 unless there is pointer overflow, and pointer overflow is undefined behaviour.");
 }
 
-void CheckCondition::checkDuplicateConditionalAssign()
+static bool checkBoolConditionalAssign(const Token* condTok, const Token* assignTok, bool& isRedundant)
+{
+    bool isNegation = false;
+    const Token* varTok = condTok;
+    if (condTok->isUnaryOp("!")) {
+        isNegation = true;
+        varTok = varTok->astOperand1();
+    } else if (condTok->isBinaryOp()) {
+        varTok = condTok->astOperand1();
+        if (varTok->hasKnownIntValue())
+            varTok = condTok->astOperand2();
+    }
+
+    const ValueType* vt = varTok->variable() ? varTok->variable()->valueType() : nullptr;
+    if (!(vt && vt->type == ValueType::Type::BOOL && !vt->pointer))
+        return false;
+
+    if (!(assignTok->astOperand1() && assignTok->astOperand1()->varId() == varTok->varId()))
+        return false;
+    if (!(assignTok->astOperand2() && assignTok->astOperand2()->hasKnownIntValue()))
+        return false;
+    const MathLib::bigint val = assignTok->astOperand2()->getKnownIntValue();
+    if (val < 0 || val > 1)
+        return false;
+    if (condTok->isBinaryOp()) {
+        if (!varTok->astSibling()->hasKnownIntValue())
+            return false;
+        const MathLib::bigint compVal = varTok->astSibling()->getKnownIntValue();
+        if (compVal < 0 || compVal > 1)
+            return false;
+        isNegation = (condTok->str() == "!=") == (compVal == 1);
+    }
+    isRedundant = (isNegation && val == 0) || (!isNegation && val == 1);
+    return true;
+}
+
+void CheckConditionImpl::checkDuplicateConditionalAssign()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("duplicateConditionalAssign"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("duplicateConditionalAssign"))
         return;
 
     logChecker("CheckCondition::checkDuplicateConditionalAssign"); // style
@@ -1827,7 +1898,7 @@ void CheckCondition::checkDuplicateConditionalAssign()
                 continue;
             const Token *blockTok = tok->linkAt(1)->next();
             const Token *condTok = tok->next()->astOperand2();
-            const bool isBoolVar = Token::Match(condTok, "!| %var%");
+            bool isBoolVar = Token::Match(condTok, "!| %var%");
             if (!isBoolVar && !Token::Match(condTok, "==|!="))
                 continue;
             if ((isBoolVar || condTok->str() == "!=") && Token::simpleMatch(blockTok->link(), "} else {"))
@@ -1840,40 +1911,27 @@ void CheckCondition::checkDuplicateConditionalAssign()
             if (nextAfterAstRightmostLeaf(assignTok) != blockTok->link()->previous())
                 continue;
             bool isRedundant = false;
-            if (isBoolVar) {
-                const bool isNegation = condTok->str() == "!";
-                const Token* const varTok = isNegation ? condTok->next() : condTok;
-                const ValueType* vt = varTok->variable() ? varTok->variable()->valueType() : nullptr;
-                if (!(vt && vt->type == ValueType::Type::BOOL && !vt->pointer))
-                    continue;
-
-                if (!(assignTok->astOperand1() && assignTok->astOperand1()->varId() == varTok->varId()))
-                    continue;
-                if (!(assignTok->astOperand2() && assignTok->astOperand2()->hasKnownIntValue()))
-                    continue;
-                const MathLib::bigint val = assignTok->astOperand2()->getKnownIntValue();
-                if (val < 0 || val > 1)
-                    continue;
-                isRedundant = (isNegation && val == 0) || (!isNegation && val == 1);
+            if (checkBoolConditionalAssign(condTok, assignTok, isRedundant)) {
+                isBoolVar = true;
             } else { // comparison
                 if (!isSameExpression(
-                        true, condTok->astOperand1(), assignTok->astOperand1(), *mSettings, true, true))
+                        true, condTok->astOperand1(), assignTok->astOperand1(), mSettings, true, true))
                     continue;
                 if (!isSameExpression(
-                        true, condTok->astOperand2(), assignTok->astOperand2(), *mSettings, true, true))
+                        true, condTok->astOperand2(), assignTok->astOperand2(), mSettings, true, true))
                     continue;
             }
-            duplicateConditionalAssignError(condTok, assignTok, isRedundant);
+            duplicateConditionalAssignError(condTok, assignTok, isRedundant, isBoolVar);
         }
     }
 }
 
-void CheckCondition::duplicateConditionalAssignError(const Token *condTok, const Token* assignTok, bool isRedundant)
+void CheckConditionImpl::duplicateConditionalAssignError(const Token *condTok, const Token* assignTok, bool isRedundant, bool isBoolVar)
 {
     ErrorPath errors;
     std::string msg = "Duplicate expression for the condition and assignment.";
     if (condTok && assignTok) {
-        if (condTok->str() == "==") {
+        if (condTok->str() == "==" && !isBoolVar) {
             msg = "Assignment '" + assignTok->expressionString() + "' is redundant with condition '" + condTok->expressionString() + "'.";
             errors.emplace_back(condTok, "Condition '" + condTok->expressionString() + "'");
             errors.emplace_back(assignTok, "Assignment '" + assignTok->expressionString() + "' is redundant");
@@ -1889,10 +1947,9 @@ void CheckCondition::duplicateConditionalAssignError(const Token *condTok, const
         std::move(errors), Severity::style, "duplicateConditionalAssign", msg, CWE398, Certainty::normal);
 }
 
-
-void CheckCondition::checkAssignmentInCondition()
+void CheckConditionImpl::checkAssignmentInCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("assignmentInCondition"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("assignmentInCondition"))
         return;
 
     logChecker("CheckCondition::checkAssignmentInCondition"); // style
@@ -1924,7 +1981,7 @@ void CheckCondition::checkAssignmentInCondition()
     }
 }
 
-void CheckCondition::assignmentInCondition(const Token *eq)
+void CheckConditionImpl::assignmentInCondition(const Token *eq)
 {
     std::string expr = eq ? eq->expressionString() : "x=y";
 
@@ -1937,12 +1994,12 @@ void CheckCondition::assignmentInCondition(const Token *eq)
         Certainty::normal);
 }
 
-void CheckCondition::checkCompareValueOutOfTypeRange()
+void CheckConditionImpl::checkCompareValueOutOfTypeRange()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("compareValueOutOfTypeRangeError"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("compareValueOutOfTypeRangeError"))
         return;
 
-    if (mSettings->platform.type == Platform::Type::Unspecified)
+    if (mSettings.platform.type == Platform::Type::Unspecified)
         return;
 
     logChecker("CheckCondition::checkCompareValueOutOfTypeRange"); // style,platform
@@ -1956,31 +2013,32 @@ void CheckCondition::checkCompareValueOutOfTypeRange()
             for (int i = 0; i < 2; ++i) {
                 const Token * const valueTok = (i == 0) ? tok->astOperand1() : tok->astOperand2();
                 const Token * const typeTok = valueTok->astSibling();
-                if (!valueTok->hasKnownIntValue() || !typeTok->valueType() || typeTok->valueType()->pointer)
+                const ValueType* const typeVt = typeTok->valueType();
+                if (!valueTok->hasKnownIntValue() || !typeVt || typeVt->pointer)
                     continue;
                 if (valueTok->getKnownIntValue() < 0 && valueTok->valueType() && valueTok->valueType()->sign != ValueType::Sign::SIGNED)
                     continue;
-                if (valueTok->valueType() && valueTok->valueType()->isTypeEqual(typeTok->valueType()))
+                if (typeTok->isLiteral())
                     continue;
                 std::uint8_t bits = 0;
-                switch (typeTok->valueType()->type) {
+                switch (typeVt->type) {
                 case ValueType::Type::BOOL:
                     bits = 1;
                     break;
                 case ValueType::Type::CHAR:
-                    bits = mSettings->platform.char_bit;
+                    bits = mSettings.platform.char_bit;
                     break;
                 case ValueType::Type::SHORT:
-                    bits = mSettings->platform.short_bit;
+                    bits = mSettings.platform.short_bit;
                     break;
                 case ValueType::Type::INT:
-                    bits = mSettings->platform.int_bit;
+                    bits = mSettings.platform.int_bit;
                     break;
                 case ValueType::Type::LONG:
-                    bits = mSettings->platform.long_bit;
+                    bits = mSettings.platform.long_bit;
                     break;
                 case ValueType::Type::LONGLONG:
-                    bits = mSettings->platform.long_long_bit;
+                    bits = mSettings.platform.long_long_bit;
                     break;
                 default:
                     break;
@@ -1988,18 +2046,20 @@ void CheckCondition::checkCompareValueOutOfTypeRange()
                 if (bits == 0 || bits >= 63)
                     continue;
 
-                const auto typeMinValue = (typeTok->valueType()->sign == ValueType::Sign::UNSIGNED) ? 0 : (-(1LL << (bits-1)));
+                const auto typeMinValue = (typeVt->sign == ValueType::Sign::UNSIGNED) ? 0 : (-(1LL << (bits-1)));
                 const auto unsignedTypeMaxValue = (1LL << bits) - 1LL;
                 long long typeMaxValue;
-                if (typeTok->valueType()->sign != ValueType::Sign::SIGNED)
+                if (typeVt->sign != ValueType::Sign::SIGNED && !(typeVt->sign == ValueType::Sign::UNKNOWN_SIGN && typeVt->type == ValueType::Type::CHAR && mSettings.platform.defaultSign == 's'))
                     typeMaxValue = unsignedTypeMaxValue;
-                else if (bits >= mSettings->platform.int_bit && (!valueTok->valueType() || valueTok->valueType()->sign != ValueType::Sign::SIGNED))
+                else if (bits >= mSettings.platform.int_bit && (!valueTok->valueType() || valueTok->valueType()->sign != ValueType::Sign::SIGNED))
                     typeMaxValue = unsignedTypeMaxValue;
                 else
                     typeMaxValue = unsignedTypeMaxValue / 2;
 
                 bool result{};
                 const auto kiv = valueTok->getKnownIntValue();
+                if (kiv == 0)
+                    continue; // prevent overlap with TestOther::unsignedPositive/unsignedLessThanZero
                 if (tok->str() == "==")
                     result = false;
                 else if (tok->str() == "!=")
@@ -2050,16 +2110,16 @@ void CheckCondition::checkCompareValueOutOfTypeRange()
                 }
                 if (!error || diag(tok))
                     continue;
-                compareValueOutOfTypeRangeError(valueTok, typeTok->valueType()->str(), kiv, result);
+                compareValueOutOfTypeRangeError(valueTok, typeVt->str(), kiv, result);
             }
         }
     }
 }
 
-void CheckCondition::compareValueOutOfTypeRangeError(const Token *comparison, const std::string &type, MathLib::bigint value, bool result)
+void CheckConditionImpl::compareValueOutOfTypeRangeError(const Token *comparisonTok, const std::string &type, MathLib::bigint value, bool result)
 {
     reportError(
-        comparison,
+        comparisonTok,
         Severity::style,
         "compareValueOutOfTypeRangeError",
         "Comparing expression of type '" + type + "' against value " + MathLib::toString(value) + ". Condition is always " + bool_to_string(result) + ".",
@@ -2067,9 +2127,9 @@ void CheckCondition::compareValueOutOfTypeRangeError(const Token *comparison, co
         Certainty::normal);
 }
 
-void CheckCondition::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckCondition::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckCondition checkCondition(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckConditionImpl checkCondition(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkCondition.multiCondition();
     checkCondition.clarifyCondition();   // not simplified because ifAssign
     checkCondition.multiCondition2();
@@ -2087,15 +2147,16 @@ void CheckCondition::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLog
     checkCondition.alwaysTrueFalse();
 }
 
-void CheckCondition::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckCondition::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckCondition c(nullptr, settings, errorLogger);
+    CheckConditionImpl c(nullptr, settings, errorLogger);
 
     c.assignIfError(nullptr, nullptr, "", false);
     c.badBitmaskCheckError(nullptr);
     c.comparisonError(nullptr, "&", 6, "==", 1, false);
     c.duplicateConditionError(nullptr, nullptr, ErrorPath{});
     c.overlappingElseIfConditionError(nullptr, 1);
+    c.overlappingInnerConditionError(nullptr, nullptr, ErrorPath());
     c.mismatchingBitAndError(nullptr, 0xf0, nullptr, 1);
     c.oppositeInnerConditionError(nullptr, nullptr, ErrorPath{});
     c.identicalInnerConditionError(nullptr, nullptr, ErrorPath{});
diff --git a/lib/checkcondition.h b/lib/checkcondition.h
index dac3ba8d0de..4a4e1f22db1 100644
--- a/lib/checkcondition.h
+++ b/lib/checkcondition.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 #include "mathlib.h"
 #include "errortypes.h"
@@ -50,14 +51,38 @@ namespace ValueFlow {
 class CPPCHECKLIB CheckCondition : public Check {
 public:
     /** This constructor is used when registering the CheckAssignIf */
-    CheckCondition() : Check(myName()) {}
+    CheckCondition() : Check("Condition") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckCondition(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
 
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Match conditions with assignments and other conditions:\n"
+               "- Mismatching assignment and comparison => comparison is always true/false\n"
+               "- Mismatching lhs and rhs in comparison => comparison is always true/false\n"
+               "- Detect usage of | where & should be used\n"
+               "- Duplicate condition and assignment\n"
+               "- Detect matching 'if' and 'else if' conditions\n"
+               "- Mismatching bitand (a &= 0xf0; a &= 1; => a = 0)\n"
+               "- Opposite inner condition is always false\n"
+               "- Identical condition after early exit is always false\n"
+               "- Condition that is always true/false\n"
+               "- Mutual exclusion over || always evaluating to true\n"
+               "- Comparisons of modulo results that are always true/false.\n"
+               "- Known variable values => condition is always true/false\n"
+               "- Invalid test for overflow. Some mainstream compilers remove such overflow tests when optimising code.\n"
+               "- Suspicious assignment of container/iterator in condition => condition is always true.\n";
+    }
+};
+
+
+class CPPCHECKLIB CheckConditionImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    CheckConditionImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** mismatching assignment / comparison */
     void assignIf();
@@ -84,7 +109,7 @@ class CPPCHECKLIB CheckCondition : public Check {
     /**
      * multiconditions #2
      * - Opposite inner conditions => always false
-     * - (TODO) Same/Overlapping inner condition => always true
+     * - Same/Overlapping inner condition => always true
      * - same condition after early exit => always false
      **/
     void multiCondition2();
@@ -130,6 +155,7 @@ class CPPCHECKLIB CheckCondition : public Check {
                          bool result);
     void duplicateConditionError(const Token *tok1, const Token *tok2, ErrorPath errorPath);
     void overlappingElseIfConditionError(const Token *tok, nonneg int line1);
+    void overlappingInnerConditionError(const Token *tok1, const Token *tok2, ErrorPath errorPath);
     void oppositeElseIfConditionError(const Token *ifCond, const Token *elseIfCond, ErrorPath errorPath);
 
     void oppositeInnerConditionError(const Token *tok1, const Token* tok2, ErrorPath errorPath);
@@ -150,36 +176,12 @@ class CPPCHECKLIB CheckCondition : public Check {
     void invalidTestForOverflow(const Token* tok, const ValueType *valueType, const std::string &replace);
     void pointerAdditionResultNotNullError(const Token *tok, const Token *calc);
 
-    void duplicateConditionalAssignError(const Token *condTok, const Token* assignTok, bool isRedundant = false);
+    void duplicateConditionalAssignError(const Token *condTok, const Token* assignTok, bool isRedundant = false, bool isBoolVar = false);
 
     void assignmentInCondition(const Token *eq);
 
     void checkCompareValueOutOfTypeRange();
-    void compareValueOutOfTypeRangeError(const Token *comparison, const std::string &type, MathLib::bigint value, bool result);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Condition";
-    }
-
-    std::string classInfo() const override {
-        return "Match conditions with assignments and other conditions:\n"
-               "- Mismatching assignment and comparison => comparison is always true/false\n"
-               "- Mismatching lhs and rhs in comparison => comparison is always true/false\n"
-               "- Detect usage of | where & should be used\n"
-               "- Duplicate condition and assignment\n"
-               "- Detect matching 'if' and 'else if' conditions\n"
-               "- Mismatching bitand (a &= 0xf0; a &= 1; => a = 0)\n"
-               "- Opposite inner condition is always false\n"
-               "- Identical condition after early exit is always false\n"
-               "- Condition that is always true/false\n"
-               "- Mutual exclusion over || always evaluating to true\n"
-               "- Comparisons of modulo results that are always true/false.\n"
-               "- Known variable values => condition is always true/false\n"
-               "- Invalid test for overflow. Some mainstream compilers remove such overflow tests when optimising code.\n"
-               "- Suspicious assignment of container/iterator in condition => condition is always true.\n";
-    }
+    void compareValueOutOfTypeRangeError(const Token *comparisonTok, const std::string &type, MathLib::bigint value, bool result);
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkers.cpp b/lib/checkers.cpp
index a84da1bc986..fef33042472 100644
--- a/lib/checkers.cpp
+++ b/lib/checkers.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,16 +41,16 @@ namespace checkers {
         {"CheckBufferOverrun::analyseWholeProgram",""},
         {"CheckBufferOverrun::argumentSize","warning"},
         {"CheckBufferOverrun::arrayIndex",""},
-        {"CheckBufferOverrun::arrayIndexThenCheck",""},
+        {"CheckBufferOverrun::arrayIndexThenCheck","style"},
         {"CheckBufferOverrun::bufferOverflow",""},
         {"CheckBufferOverrun::negativeArraySize",""},
         {"CheckBufferOverrun::objectIndex",""},
         {"CheckBufferOverrun::pointerArithmetic","portability"},
         {"CheckBufferOverrun::stringNotZeroTerminated","warning,inconclusive"},
-        {"CheckClass::analyseWholeProgram",""},
         {"CheckClass::checkConst","style,inconclusive"},
         {"CheckClass::checkConstructors","style,warning"},
         {"CheckClass::checkCopyConstructors","warning"},
+        {"CheckClass::checkCtuOneDefinitionRule",""},
         {"CheckClass::checkDuplInheritedMembers","warning"},
         {"CheckClass::checkExplicitConstructors","style"},
         {"CheckClass::checkMemset",""},
@@ -102,6 +102,7 @@ namespace checkers {
         {"CheckIO::checkCoutCerrMisusage","c"},
         {"CheckIO::checkFileUsage",""},
         {"CheckIO::checkWrongPrintfScanfArguments",""},
+        {"CheckIO::checkWrongfeofUsage",""},
         {"CheckIO::invalidScanf",""},
         {"CheckLeakAutoVar::check","notclang"},
         {"CheckMemoryLeakInClass::check",""},
@@ -109,7 +110,7 @@ namespace checkers {
         {"CheckMemoryLeakNoVar::check",""},
         {"CheckMemoryLeakNoVar::checkForUnsafeArgAlloc",""},
         {"CheckMemoryLeakStructMember::check",""},
-        {"CheckNullPointer::analyseWholeProgram","unusedfunctions"},
+        {"CheckNullPointer::analyseWholeProgram",""},
         {"CheckNullPointer::arithmetic",""},
         {"CheckNullPointer::nullConstantDereference",""},
         {"CheckNullPointer::nullPointer",""},
@@ -145,6 +146,7 @@ namespace checkers {
         {"CheckOther::checkSuspiciousSemicolon","warning,inconclusive"},
         {"CheckOther::checkUnionZeroInit","portability"},
         {"CheckOther::checkUnreachableCode","style"},
+        {"CheckOther::checkUnreachableSwitchCase","style"},
         {"CheckOther::checkUnusedLabel","style,warning"},
         {"CheckOther::checkVarFuncNullUB","portability"},
         {"CheckOther::checkVariableScope","style,notclang"},
@@ -166,6 +168,7 @@ namespace checkers {
         {"CheckSizeof::sizeofVoid","portability"},
         {"CheckSizeof::sizeofsizeof","warning"},
         {"CheckSizeof::suspiciousSizeofCalculation","warning,inconclusive"},
+        {"CheckStl::algorithmOutOfBounds",""},
         {"CheckStl::checkDereferenceInvalidIterator","warning"},
         {"CheckStl::checkDereferenceInvalidIterator2",""},
         {"CheckStl::checkFindInsert","performance"},
@@ -211,797 +214,6 @@ namespace checkers {
         {"CheckVaarg::va_start_argument",""},
     };
 
-    const std::map<std::string, std::string> premiumCheckers{
-        {"Autosar: A0-1-3",""},
-        {"Autosar: A0-1-4",""},
-        {"Autosar: A0-1-5",""},
-        {"Autosar: A0-1-6",""},
-        {"Autosar: A0-4-2",""},
-        {"Autosar: A0-4-4",""},
-        {"Autosar: A10-1-1",""},
-        {"Autosar: A11-0-2",""},
-        {"Autosar: A11-3-1",""},
-        {"Autosar: A13-2-1",""},
-        {"Autosar: A13-2-3",""},
-        {"Autosar: A13-5-2",""},
-        {"Autosar: A13-5-5",""},
-        {"Autosar: A15-1-2",""},
-        {"Autosar: A15-3-5",""},
-        {"Autosar: A16-6-1",""},
-        {"Autosar: A16-7-1",""},
-        {"Autosar: A18-0-3",""},
-        {"Autosar: A18-1-1",""},
-        {"Autosar: A18-1-2",""},
-        {"Autosar: A18-1-3",""},
-        {"Autosar: A18-5-1",""},
-        {"Autosar: A18-9-1",""},
-        {"Autosar: A2-11-1",""},
-        {"Autosar: A2-13-1",""},
-        {"Autosar: A2-13-3",""},
-        {"Autosar: A2-13-5",""},
-        {"Autosar: A2-5-2",""},
-        {"Autosar: A2-7-1",""},
-        {"Autosar: A20-8-2","warning"},
-        {"Autosar: A20-8-3","warning"},
-        {"Autosar: A20-8-4",""},
-        {"Autosar: A20-8-5",""},
-        {"Autosar: A20-8-6",""},
-        {"Autosar: A21-8-1","warning"},
-        {"Autosar: A23-0-1",""},
-        {"Autosar: A25-1-1","warning"},
-        {"Autosar: A25-4-1","warning"},
-        {"Autosar: A26-5-1",""},
-        {"Autosar: A26-5-2",""},
-        {"Autosar: A27-0-1","warning"},
-        {"Autosar: A27-0-2",""},
-        {"Autosar: A27-0-4",""},
-        {"Autosar: A3-1-3",""},
-        {"Autosar: A3-1-4",""},
-        {"Autosar: A3-3-1",""},
-        {"Autosar: A3-9-1",""},
-        {"Autosar: A4-10-1",""},
-        {"Autosar: A4-7-1",""},
-        {"Autosar: A5-0-2",""},
-        {"Autosar: A5-0-3",""},
-        {"Autosar: A5-0-4",""},
-        {"Autosar: A5-1-1",""},
-        {"Autosar: A5-1-2",""},
-        {"Autosar: A5-1-3",""},
-        {"Autosar: A5-1-6",""},
-        {"Autosar: A5-1-7",""},
-        {"Autosar: A5-16-1",""},
-        {"Autosar: A5-2-1",""},
-        {"Autosar: A5-2-3",""},
-        {"Autosar: A5-2-4",""},
-        {"Autosar: A5-3-3",""},
-        {"Autosar: A6-5-3",""},
-        {"Autosar: A7-1-4",""},
-        {"Autosar: A7-1-6",""},
-        {"Autosar: A7-1-7",""},
-        {"Autosar: A7-2-1",""},
-        {"Autosar: A7-2-2",""},
-        {"Autosar: A7-6-1",""},
-        {"Autosar: A8-4-1",""},
-        {"Autosar: A8-5-3",""},
-        {"Autosar: A9-3-1",""},
-        {"Cert C++: CON50-CPP",""},
-        {"Cert C++: CON51-CPP",""},
-        {"Cert C++: CON52-CPP",""},
-        {"Cert C++: CON53-CPP",""},
-        {"Cert C++: CON54-CPP",""},
-        {"Cert C++: CON55-CPP",""},
-        {"Cert C++: CON56-CPP",""},
-        {"Cert C++: CTR50-CPP",""},
-        {"Cert C++: CTR52-CPP",""},
-        {"Cert C++: CTR53-CPP",""},
-        {"Cert C++: CTR56-CPP",""},
-        {"Cert C++: CTR57-CPP","warning"},
-        {"Cert C++: CTR58-CPP","warning"},
-        {"Cert C++: DCL50-CPP",""},
-        {"Cert C++: DCL51-CPP",""},
-        {"Cert C++: DCL52-CPP",""},
-        {"Cert C++: DCL53-CPP",""},
-        {"Cert C++: DCL54-CPP",""},
-        {"Cert C++: DCL56-CPP",""},
-        {"Cert C++: DCL58-CPP",""},
-        {"Cert C++: DCL59-CPP",""},
-        {"Cert C++: ERR50-CPP",""},
-        {"Cert C++: ERR51-CPP",""},
-        {"Cert C++: ERR52-CPP",""},
-        {"Cert C++: ERR53-CPP",""},
-        {"Cert C++: ERR54-CPP",""},
-        {"Cert C++: ERR55-CPP",""},
-        {"Cert C++: ERR56-CPP",""},
-        {"Cert C++: ERR58-CPP",""},
-        {"Cert C++: ERR59-CPP","warning"},
-        {"Cert C++: ERR60-CPP","warning"},
-        {"Cert C++: ERR61-CPP",""},
-        {"Cert C++: ERR62-CPP",""},
-        {"Cert C++: EXP50-CPP",""},
-        {"Cert C++: EXP51-CPP",""},
-        {"Cert C++: EXP54-CPP",""},
-        {"Cert C++: EXP55-CPP",""},
-        {"Cert C++: EXP56-CPP",""},
-        {"Cert C++: EXP57-CPP",""},
-        {"Cert C++: EXP58-CPP",""},
-        {"Cert C++: EXP59-CPP",""},
-        {"Cert C++: EXP60-CPP",""},
-        {"Cert C++: FIO51-CPP",""},
-        {"Cert C++: INT50-CPP",""},
-        {"Cert C++: MEM51-CPP",""},
-        {"Cert C++: MEM52-CPP",""},
-        {"Cert C++: MEM53-CPP",""},
-        {"Cert C++: MEM54-CPP",""},
-        {"Cert C++: MEM55-CPP",""},
-        {"Cert C++: MEM57-CPP",""},
-        {"Cert C++: MSC50-CPP",""},
-        {"Cert C++: MSC51-CPP",""},
-        {"Cert C++: MSC53-CPP",""},
-        {"Cert C++: MSC54-CPP",""},
-        {"Cert C++: OOP51-CPP",""},
-        {"Cert C++: OOP55-CPP",""},
-        {"Cert C++: OOP56-CPP",""},
-        {"Cert C++: OOP57-CPP",""},
-        {"Cert C++: OOP58-CPP",""},
-        {"Cert C++: STR50-CPP",""},
-        {"Cert C++: STR53-CPP",""},
-        {"Cert C: ARR30-C",""},
-        {"Cert C: ARR32-C",""},
-        {"Cert C: ARR37-C",""},
-        {"Cert C: ARR38-C",""},
-        {"Cert C: ARR39-C",""},
-        {"Cert C: CON30-C",""},
-        {"Cert C: CON31-C",""},
-        {"Cert C: CON32-C",""},
-        {"Cert C: CON33-C",""},
-        {"Cert C: CON34-C",""},
-        {"Cert C: CON35-C",""},
-        {"Cert C: CON36-C",""},
-        {"Cert C: CON37-C",""},
-        {"Cert C: CON38-C",""},
-        {"Cert C: CON39-C",""},
-        {"Cert C: CON40-C",""},
-        {"Cert C: CON41-C",""},
-        {"Cert C: DCL03-C",""},
-        {"Cert C: DCL04-C",""},
-        {"Cert C: DCL05-C",""},
-        {"Cert C: DCL06-C",""},
-        {"Cert C: DCL20-C",""},
-        {"Cert C: DCL31-C",""},
-        {"Cert C: DCL36-C",""},
-        {"Cert C: DCL37-C",""},
-        {"Cert C: DCL38-C",""},
-        {"Cert C: DCL39-C",""},
-        {"Cert C: DCL40-C",""},
-        {"Cert C: DCL41-C",""},
-        {"Cert C: ENV30-C",""},
-        {"Cert C: ENV31-C",""},
-        {"Cert C: ENV32-C",""},
-        {"Cert C: ENV33-C",""},
-        {"Cert C: ENV34-C",""},
-        {"Cert C: ERR30-C",""},
-        {"Cert C: ERR32-C",""},
-        {"Cert C: ERR33-C",""},
-        {"Cert C: ERR34-C",""},
-        {"Cert C: EXP03-C",""},
-        {"Cert C: EXP05-C",""},
-        {"Cert C: EXP09-C",""},
-        {"Cert C: EXP13-C",""},
-        {"Cert C: EXP15-C",""},
-        {"Cert C: EXP19-C",""},
-        {"Cert C: EXP20-C",""},
-        {"Cert C: EXP30-C",""},
-        {"Cert C: EXP32-C",""},
-        {"Cert C: EXP34-C",""},
-        {"Cert C: EXP35-C",""},
-        {"Cert C: EXP36-C",""},
-        {"Cert C: EXP37-C",""},
-        {"Cert C: EXP39-C",""},
-        {"Cert C: EXP40-C",""},
-        {"Cert C: EXP42-C",""},
-        {"Cert C: EXP43-C",""},
-        {"Cert C: EXP44-C",""},
-        {"Cert C: EXP45-C",""},
-        {"Cert C: FIO30-C",""},
-        {"Cert C: FIO32-C",""},
-        {"Cert C: FIO34-C",""},
-        {"Cert C: FIO37-C",""},
-        {"Cert C: FIO38-C",""},
-        {"Cert C: FIO40-C",""},
-        {"Cert C: FIO41-C",""},
-        {"Cert C: FIO44-C",""},
-        {"Cert C: FIO45-C",""},
-        {"Cert C: FLP30-C",""},
-        {"Cert C: FLP36-C","portability"},
-        {"Cert C: FLP37-C",""},
-        {"Cert C: INT17-C",""},
-        {"Cert C: INT30-C",""},
-        {"Cert C: INT31-C",""},
-        {"Cert C: INT32-C",""},
-        {"Cert C: INT33-C",""},
-        {"Cert C: INT34-C",""},
-        {"Cert C: INT35-C",""},
-        {"Cert C: INT36-C",""},
-        {"Cert C: MEM33-C",""},
-        {"Cert C: MEM35-C",""},
-        {"Cert C: MEM36-C",""},
-        {"Cert C: MSC30-C",""},
-        {"Cert C: MSC32-C",""},
-        {"Cert C: MSC33-C",""},
-        {"Cert C: MSC38-C",""},
-        {"Cert C: MSC39-C",""},
-        {"Cert C: MSC40-C",""},
-        {"Cert C: MSC41-C",""},
-        {"Cert C: PRE00-C",""},
-        {"Cert C: PRE01-C",""},
-        {"Cert C: PRE02-C",""},
-        {"Cert C: PRE04-C",""},
-        {"Cert C: PRE05-C",""},
-        {"Cert C: PRE06-C",""},
-        {"Cert C: PRE07-C",""},
-        {"Cert C: PRE08-C",""},
-        {"Cert C: PRE09-C",""},
-        {"Cert C: PRE10-C",""},
-        {"Cert C: PRE11-C",""},
-        {"Cert C: PRE12-C",""},
-        {"Cert C: PRE31-C",""},
-        {"Cert C: SIG30-C",""},
-        {"Cert C: SIG31-C",""},
-        {"Cert C: SIG34-C",""},
-        {"Cert C: SIG35-C",""},
-        {"Cert C: STR30-C",""},
-        {"Cert C: STR31-C",""},
-        {"Cert C: STR32-C",""},
-        {"Cert C: STR34-C",""},
-        {"Cert C: STR38-C",""},
-        {"Misra C++ 2008: 3-2-3",""},
-        {"Misra C++ 2008: 3-2-4",""},
-        {"Misra C++ 2008: 7-5-4",""},
-        {"Misra C++ 2008: M0-1-11",""},
-        {"Misra C++ 2008: M0-1-12",""},
-        {"Misra C++ 2008: M0-1-4",""},
-        {"Misra C++ 2008: M0-1-5",""},
-        {"Misra C++ 2008: M0-1-7",""},
-        {"Misra C++ 2008: M0-1-8",""},
-        {"Misra C++ 2008: M0-3-2",""},
-        {"Misra C++ 2008: M1-0-1","portability"},
-        {"Misra C++ 2008: M10-1-1",""},
-        {"Misra C++ 2008: M10-1-2",""},
-        {"Misra C++ 2008: M10-1-3",""},
-        {"Misra C++ 2008: M10-2-1",""},
-        {"Misra C++ 2008: M10-3-1",""},
-        {"Misra C++ 2008: M10-3-2",""},
-        {"Misra C++ 2008: M10-3-3",""},
-        {"Misra C++ 2008: M11-0-1",""},
-        {"Misra C++ 2008: M12-1-2",""},
-        {"Misra C++ 2008: M12-8-1",""},
-        {"Misra C++ 2008: M12-8-2",""},
-        {"Misra C++ 2008: M14-5-1","warning"},
-        {"Misra C++ 2008: M14-5-2","warning"},
-        {"Misra C++ 2008: M14-5-3","warning"},
-        {"Misra C++ 2008: M14-6-1","warning"},
-        {"Misra C++ 2008: M14-6-2","warning"},
-        {"Misra C++ 2008: M14-7-1",""},
-        {"Misra C++ 2008: M14-7-2",""},
-        {"Misra C++ 2008: M14-7-3",""},
-        {"Misra C++ 2008: M14-8-1",""},
-        {"Misra C++ 2008: M14-8-2",""},
-        {"Misra C++ 2008: M15-0-3",""},
-        {"Misra C++ 2008: M15-1-1",""},
-        {"Misra C++ 2008: M15-1-2",""},
-        {"Misra C++ 2008: M15-1-3",""},
-        {"Misra C++ 2008: M15-3-2","warning"},
-        {"Misra C++ 2008: M15-3-3",""},
-        {"Misra C++ 2008: M15-3-4",""},
-        {"Misra C++ 2008: M15-3-6",""},
-        {"Misra C++ 2008: M15-3-7",""},
-        {"Misra C++ 2008: M15-4-1",""},
-        {"Misra C++ 2008: M15-5-2",""},
-        {"Misra C++ 2008: M16-0-1",""},
-        {"Misra C++ 2008: M16-0-2",""},
-        {"Misra C++ 2008: M16-0-3",""},
-        {"Misra C++ 2008: M16-0-4",""},
-        {"Misra C++ 2008: M16-0-6",""},
-        {"Misra C++ 2008: M16-0-7",""},
-        {"Misra C++ 2008: M16-0-8",""},
-        {"Misra C++ 2008: M16-1-1",""},
-        {"Misra C++ 2008: M16-1-2",""},
-        {"Misra C++ 2008: M16-2-1",""},
-        {"Misra C++ 2008: M16-2-2",""},
-        {"Misra C++ 2008: M16-2-3",""},
-        {"Misra C++ 2008: M16-2-4",""},
-        {"Misra C++ 2008: M16-2-5",""},
-        {"Misra C++ 2008: M16-2-6",""},
-        {"Misra C++ 2008: M16-3-1",""},
-        {"Misra C++ 2008: M16-3-2",""},
-        {"Misra C++ 2008: M17-0-1",""},
-        {"Misra C++ 2008: M17-0-2",""},
-        {"Misra C++ 2008: M17-0-3",""},
-        {"Misra C++ 2008: M17-0-5",""},
-        {"Misra C++ 2008: M18-0-1",""},
-        {"Misra C++ 2008: M18-0-2",""},
-        {"Misra C++ 2008: M18-0-3",""},
-        {"Misra C++ 2008: M18-0-4",""},
-        {"Misra C++ 2008: M18-0-5",""},
-        {"Misra C++ 2008: M18-2-1",""},
-        {"Misra C++ 2008: M18-4-1",""},
-        {"Misra C++ 2008: M18-7-1",""},
-        {"Misra C++ 2008: M19-3-1",""},
-        {"Misra C++ 2008: M2-10-1",""},
-        {"Misra C++ 2008: M2-10-3",""},
-        {"Misra C++ 2008: M2-10-4",""},
-        {"Misra C++ 2008: M2-10-5",""},
-        {"Misra C++ 2008: M2-10-6",""},
-        {"Misra C++ 2008: M2-13-2",""},
-        {"Misra C++ 2008: M2-13-3",""},
-        {"Misra C++ 2008: M2-13-4",""},
-        {"Misra C++ 2008: M2-13-5",""},
-        {"Misra C++ 2008: M2-3-1",""},
-        {"Misra C++ 2008: M2-7-1",""},
-        {"Misra C++ 2008: M2-7-2",""},
-        {"Misra C++ 2008: M2-7-3",""},
-        {"Misra C++ 2008: M27-0-1",""},
-        {"Misra C++ 2008: M3-1-1",""},
-        {"Misra C++ 2008: M3-1-2",""},
-        {"Misra C++ 2008: M3-1-3",""},
-        {"Misra C++ 2008: M3-2-1",""},
-        {"Misra C++ 2008: M3-3-1",""},
-        {"Misra C++ 2008: M3-3-2",""},
-        {"Misra C++ 2008: M3-9-1",""},
-        {"Misra C++ 2008: M3-9-2",""},
-        {"Misra C++ 2008: M3-9-3",""},
-        {"Misra C++ 2008: M4-10-1",""},
-        {"Misra C++ 2008: M4-10-2",""},
-        {"Misra C++ 2008: M4-5-1",""},
-        {"Misra C++ 2008: M4-5-2",""},
-        {"Misra C++ 2008: M4-5-3",""},
-        {"Misra C++ 2008: M5-0-10",""},
-        {"Misra C++ 2008: M5-0-11",""},
-        {"Misra C++ 2008: M5-0-12",""},
-        {"Misra C++ 2008: M5-0-14",""},
-        {"Misra C++ 2008: M5-0-15",""},
-        {"Misra C++ 2008: M5-0-2",""},
-        {"Misra C++ 2008: M5-0-20",""},
-        {"Misra C++ 2008: M5-0-21",""},
-        {"Misra C++ 2008: M5-0-3",""},
-        {"Misra C++ 2008: M5-0-4",""},
-        {"Misra C++ 2008: M5-0-5",""},
-        {"Misra C++ 2008: M5-0-6",""},
-        {"Misra C++ 2008: M5-0-7",""},
-        {"Misra C++ 2008: M5-0-8",""},
-        {"Misra C++ 2008: M5-0-9",""},
-        {"Misra C++ 2008: M5-14-1",""},
-        {"Misra C++ 2008: M5-17-1",""},
-        {"Misra C++ 2008: M5-18-1",""},
-        {"Misra C++ 2008: M5-19-1",""},
-        {"Misra C++ 2008: M5-2-1",""},
-        {"Misra C++ 2008: M5-2-10",""},
-        {"Misra C++ 2008: M5-2-11",""},
-        {"Misra C++ 2008: M5-2-12",""},
-        {"Misra C++ 2008: M5-2-2",""},
-        {"Misra C++ 2008: M5-2-3",""},
-        {"Misra C++ 2008: M5-2-5",""},
-        {"Misra C++ 2008: M5-2-6",""},
-        {"Misra C++ 2008: M5-2-7",""},
-        {"Misra C++ 2008: M5-2-8",""},
-        {"Misra C++ 2008: M5-2-9",""},
-        {"Misra C++ 2008: M5-3-1",""},
-        {"Misra C++ 2008: M5-3-2",""},
-        {"Misra C++ 2008: M5-3-3",""},
-        {"Misra C++ 2008: M6-2-1",""},
-        {"Misra C++ 2008: M6-2-2",""},
-        {"Misra C++ 2008: M6-2-3",""},
-        {"Misra C++ 2008: M6-3-1",""},
-        {"Misra C++ 2008: M6-4-1",""},
-        {"Misra C++ 2008: M6-4-2",""},
-        {"Misra C++ 2008: M6-4-3",""},
-        {"Misra C++ 2008: M6-4-4",""},
-        {"Misra C++ 2008: M6-4-5",""},
-        {"Misra C++ 2008: M6-4-6",""},
-        {"Misra C++ 2008: M6-4-7",""},
-        {"Misra C++ 2008: M6-4-8",""},
-        {"Misra C++ 2008: M6-5-1",""},
-        {"Misra C++ 2008: M6-5-2",""},
-        {"Misra C++ 2008: M6-5-3",""},
-        {"Misra C++ 2008: M6-5-4",""},
-        {"Misra C++ 2008: M6-5-5",""},
-        {"Misra C++ 2008: M6-5-6",""},
-        {"Misra C++ 2008: M6-6-1",""},
-        {"Misra C++ 2008: M6-6-2",""},
-        {"Misra C++ 2008: M6-6-3",""},
-        {"Misra C++ 2008: M6-6-4",""},
-        {"Misra C++ 2008: M6-6-5",""},
-        {"Misra C++ 2008: M7-2-1",""},
-        {"Misra C++ 2008: M7-3-1",""},
-        {"Misra C++ 2008: M7-3-2",""},
-        {"Misra C++ 2008: M7-3-3",""},
-        {"Misra C++ 2008: M7-3-4",""},
-        {"Misra C++ 2008: M7-3-5",""},
-        {"Misra C++ 2008: M7-3-6",""},
-        {"Misra C++ 2008: M7-4-2",""},
-        {"Misra C++ 2008: M7-4-3",""},
-        {"Misra C++ 2008: M7-5-3",""},
-        {"Misra C++ 2008: M8-0-1",""},
-        {"Misra C++ 2008: M8-3-1",""},
-        {"Misra C++ 2008: M8-4-4",""},
-        {"Misra C++ 2008: M8-5-2",""},
-        {"Misra C++ 2008: M8-5-3",""},
-        {"Misra C++ 2008: M9-3-1",""},
-        {"Misra C++ 2008: M9-5-1",""},
-        {"Misra C++ 2008: M9-6-2",""},
-        {"Misra C++ 2008: M9-6-3",""},
-        {"Misra C++ 2008: M9-6-4",""},
-        {"Misra C++ 2023: 0.1.2",""},
-        {"Misra C++ 2023: 0.2.1",""},
-        {"Misra C++ 2023: 0.2.2",""},
-        {"Misra C++ 2023: 0.2.3",""},
-        {"Misra C++ 2023: 0.2.4",""},
-        {"Misra C++ 2023: 10.0.1",""},
-        {"Misra C++ 2023: 10.1.2",""},
-        {"Misra C++ 2023: 10.2.1",""},
-        {"Misra C++ 2023: 10.2.2",""},
-        {"Misra C++ 2023: 10.2.3",""},
-        {"Misra C++ 2023: 10.3.1",""},
-        {"Misra C++ 2023: 10.4.1",""},
-        {"Misra C++ 2023: 11.3.1",""},
-        {"Misra C++ 2023: 11.3.2",""},
-        {"Misra C++ 2023: 11.6.1",""},
-        {"Misra C++ 2023: 11.6.3",""},
-        {"Misra C++ 2023: 12.2.1",""},
-        {"Misra C++ 2023: 12.2.2",""},
-        {"Misra C++ 2023: 12.2.3",""},
-        {"Misra C++ 2023: 12.3.1",""},
-        {"Misra C++ 2023: 13.1.1",""},
-        {"Misra C++ 2023: 13.1.2",""},
-        {"Misra C++ 2023: 13.3.1",""},
-        {"Misra C++ 2023: 13.3.2",""},
-        {"Misra C++ 2023: 13.3.3",""},
-        {"Misra C++ 2023: 13.3.4",""},
-        {"Misra C++ 2023: 14.1.1",""},
-        {"Misra C++ 2023: 15.0.1",""},
-        {"Misra C++ 2023: 15.0.2",""},
-        {"Misra C++ 2023: 15.1.2",""},
-        {"Misra C++ 2023: 15.1.3",""},
-        {"Misra C++ 2023: 15.1.5",""},
-        {"Misra C++ 2023: 16.5.1",""},
-        {"Misra C++ 2023: 16.5.2",""},
-        {"Misra C++ 2023: 16.6.1",""},
-        {"Misra C++ 2023: 17.8.1",""},
-        {"Misra C++ 2023: 18.1.1",""},
-        {"Misra C++ 2023: 18.1.2",""},
-        {"Misra C++ 2023: 18.3.1",""},
-        {"Misra C++ 2023: 18.3.2",""},
-        {"Misra C++ 2023: 18.3.3",""},
-        {"Misra C++ 2023: 18.4.1",""},
-        {"Misra C++ 2023: 18.5.1",""},
-        {"Misra C++ 2023: 18.5.2",""},
-        {"Misra C++ 2023: 19.0.1",""},
-        {"Misra C++ 2023: 19.0.2",""},
-        {"Misra C++ 2023: 19.0.3",""},
-        {"Misra C++ 2023: 19.0.4",""},
-        {"Misra C++ 2023: 19.1.1",""},
-        {"Misra C++ 2023: 19.1.2",""},
-        {"Misra C++ 2023: 19.1.3",""},
-        {"Misra C++ 2023: 19.2.1",""},
-        {"Misra C++ 2023: 19.2.2",""},
-        {"Misra C++ 2023: 19.2.3",""},
-        {"Misra C++ 2023: 19.3.1",""},
-        {"Misra C++ 2023: 19.3.2",""},
-        {"Misra C++ 2023: 19.3.3",""},
-        {"Misra C++ 2023: 19.3.4",""},
-        {"Misra C++ 2023: 19.6.1",""},
-        {"Misra C++ 2023: 21.10.1",""},
-        {"Misra C++ 2023: 21.10.2",""},
-        {"Misra C++ 2023: 21.10.3",""},
-        {"Misra C++ 2023: 21.2.1",""},
-        {"Misra C++ 2023: 21.2.2",""},
-        {"Misra C++ 2023: 21.2.3",""},
-        {"Misra C++ 2023: 21.2.4",""},
-        {"Misra C++ 2023: 21.6.1",""},
-        {"Misra C++ 2023: 21.6.2",""},
-        {"Misra C++ 2023: 21.6.3",""},
-        {"Misra C++ 2023: 21.6.4",""},
-        {"Misra C++ 2023: 21.6.5",""},
-        {"Misra C++ 2023: 22.3.1",""},
-        {"Misra C++ 2023: 22.4.1",""},
-        {"Misra C++ 2023: 23.11.1",""},
-        {"Misra C++ 2023: 24.5.1",""},
-        {"Misra C++ 2023: 24.5.2",""},
-        {"Misra C++ 2023: 25.5.1",""},
-        {"Misra C++ 2023: 25.5.2",""},
-        {"Misra C++ 2023: 25.5.3",""},
-        {"Misra C++ 2023: 26.3.1",""},
-        {"Misra C++ 2023: 28.3.1",""},
-        {"Misra C++ 2023: 28.6.1",""},
-        {"Misra C++ 2023: 28.6.2",""},
-        {"Misra C++ 2023: 30.0.1",""},
-        {"Misra C++ 2023: 30.0.2",""},
-        {"Misra C++ 2023: 4.1.1",""},
-        {"Misra C++ 2023: 4.1.2",""},
-        {"Misra C++ 2023: 5.0.1",""},
-        {"Misra C++ 2023: 5.10.1",""},
-        {"Misra C++ 2023: 5.13.1",""},
-        {"Misra C++ 2023: 5.13.2",""},
-        {"Misra C++ 2023: 5.13.3",""},
-        {"Misra C++ 2023: 5.13.4",""},
-        {"Misra C++ 2023: 5.13.5",""},
-        {"Misra C++ 2023: 5.13.6",""},
-        {"Misra C++ 2023: 5.13.7",""},
-        {"Misra C++ 2023: 5.7.1",""},
-        {"Misra C++ 2023: 5.7.2",""},
-        {"Misra C++ 2023: 5.7.3",""},
-        {"Misra C++ 2023: 6.0.1",""},
-        {"Misra C++ 2023: 6.0.2",""},
-        {"Misra C++ 2023: 6.0.3",""},
-        {"Misra C++ 2023: 6.0.4",""},
-        {"Misra C++ 2023: 6.2.2",""},
-        {"Misra C++ 2023: 6.2.3",""},
-        {"Misra C++ 2023: 6.2.4",""},
-        {"Misra C++ 2023: 6.4.2",""},
-        {"Misra C++ 2023: 6.4.3",""},
-        {"Misra C++ 2023: 6.5.1",""},
-        {"Misra C++ 2023: 6.5.2",""},
-        {"Misra C++ 2023: 6.7.1",""},
-        {"Misra C++ 2023: 6.7.2",""},
-        {"Misra C++ 2023: 6.8.3",""},
-        {"Misra C++ 2023: 6.8.4",""},
-        {"Misra C++ 2023: 6.9.1",""},
-        {"Misra C++ 2023: 6.9.2",""},
-        {"Misra C++ 2023: 7.0.1",""},
-        {"Misra C++ 2023: 7.0.2",""},
-        {"Misra C++ 2023: 7.0.3",""},
-        {"Misra C++ 2023: 7.0.4",""},
-        {"Misra C++ 2023: 7.0.5",""},
-        {"Misra C++ 2023: 7.0.6",""},
-        {"Misra C++ 2023: 7.11.1",""},
-        {"Misra C++ 2023: 7.11.2",""},
-        {"Misra C++ 2023: 7.11.3",""},
-        {"Misra C++ 2023: 8.0.1",""},
-        {"Misra C++ 2023: 8.1.1",""},
-        {"Misra C++ 2023: 8.1.2",""},
-        {"Misra C++ 2023: 8.14.1",""},
-        {"Misra C++ 2023: 8.18.2",""},
-        {"Misra C++ 2023: 8.19.1",""},
-        {"Misra C++ 2023: 8.2.1",""},
-        {"Misra C++ 2023: 8.2.10",""},
-        {"Misra C++ 2023: 8.2.11",""},
-        {"Misra C++ 2023: 8.2.2",""},
-        {"Misra C++ 2023: 8.2.3",""},
-        {"Misra C++ 2023: 8.2.4",""},
-        {"Misra C++ 2023: 8.2.5",""},
-        {"Misra C++ 2023: 8.2.6",""},
-        {"Misra C++ 2023: 8.2.7",""},
-        {"Misra C++ 2023: 8.2.8",""},
-        {"Misra C++ 2023: 8.2.9",""},
-        {"Misra C++ 2023: 8.20.1",""},
-        {"Misra C++ 2023: 8.3.1",""},
-        {"Misra C++ 2023: 8.3.2",""},
-        {"Misra C++ 2023: 9.2.1",""},
-        {"Misra C++ 2023: 9.3.1",""},
-        {"Misra C++ 2023: 9.4.1",""},
-        {"Misra C++ 2023: 9.4.2",""},
-        {"Misra C++ 2023: 9.5.1",""},
-        {"Misra C++ 2023: 9.5.2",""},
-        {"Misra C++ 2023: 9.6.1",""},
-        {"Misra C++ 2023: 9.6.2",""},
-        {"Misra C++ 2023: 9.6.3",""},
-        {"Misra C++ 2023: 9.6.4",""},
-        {"Misra C: 1.2",""},
-        {"Misra C: 1.4",""},
-        {"Misra C: 1.5",""},
-        {"Misra C: 10.1",""},
-        {"Misra C: 10.2",""},
-        {"Misra C: 10.3",""},
-        {"Misra C: 10.4",""},
-        {"Misra C: 10.5",""},
-        {"Misra C: 10.6",""},
-        {"Misra C: 10.7",""},
-        {"Misra C: 10.8",""},
-        {"Misra C: 11.1",""},
-        {"Misra C: 11.10",""},
-        {"Misra C: 11.11",""},
-        {"Misra C: 11.2",""},
-        {"Misra C: 11.3",""},
-        {"Misra C: 11.4",""},
-        {"Misra C: 11.5",""},
-        {"Misra C: 11.6",""},
-        {"Misra C: 11.7",""},
-        {"Misra C: 11.8",""},
-        {"Misra C: 11.9",""},
-        {"Misra C: 12.1",""},
-        {"Misra C: 12.2",""},
-        {"Misra C: 12.3",""},
-        {"Misra C: 12.4",""},
-        {"Misra C: 12.6",""},
-        {"Misra C: 13.1",""},
-        {"Misra C: 13.2",""},
-        {"Misra C: 13.3",""},
-        {"Misra C: 13.4",""},
-        {"Misra C: 13.5",""},
-        {"Misra C: 13.6",""},
-        {"Misra C: 14.1",""},
-        {"Misra C: 14.2",""},
-        {"Misra C: 14.4",""},
-        {"Misra C: 15.1",""},
-        {"Misra C: 15.2",""},
-        {"Misra C: 15.3",""},
-        {"Misra C: 15.4",""},
-        {"Misra C: 15.5",""},
-        {"Misra C: 15.6",""},
-        {"Misra C: 15.7",""},
-        {"Misra C: 16.1",""},
-        {"Misra C: 16.2",""},
-        {"Misra C: 16.3",""},
-        {"Misra C: 16.4",""},
-        {"Misra C: 16.5",""},
-        {"Misra C: 16.6",""},
-        {"Misra C: 16.7",""},
-        {"Misra C: 17.1",""},
-        {"Misra C: 17.10",""},
-        {"Misra C: 17.11",""},
-        {"Misra C: 17.12",""},
-        {"Misra C: 17.13",""},
-        {"Misra C: 17.2",""},
-        {"Misra C: 17.3",""},
-        {"Misra C: 17.4",""},
-        {"Misra C: 17.6",""},
-        {"Misra C: 17.7",""},
-        {"Misra C: 17.8",""},
-        {"Misra C: 17.9",""},
-        {"Misra C: 18.10",""},
-        {"Misra C: 18.4",""},
-        {"Misra C: 18.5",""},
-        {"Misra C: 18.7",""},
-        {"Misra C: 18.8",""},
-        {"Misra C: 18.9",""},
-        {"Misra C: 19.2",""},
-        {"Misra C: 19.3",""},
-        {"Misra C: 2.2",""},
-        {"Misra C: 2.7",""},
-        {"Misra C: 20.1",""},
-        {"Misra C: 20.10",""},
-        {"Misra C: 20.11",""},
-        {"Misra C: 20.12",""},
-        {"Misra C: 20.13",""},
-        {"Misra C: 20.14",""},
-        {"Misra C: 20.15",""},
-        {"Misra C: 20.2",""},
-        {"Misra C: 20.3",""},
-        {"Misra C: 20.4",""},
-        {"Misra C: 20.5",""},
-        {"Misra C: 20.7",""},
-        {"Misra C: 20.8",""},
-        {"Misra C: 20.9",""},
-        {"Misra C: 21.1",""},
-        {"Misra C: 21.10",""},
-        {"Misra C: 21.11",""},
-        {"Misra C: 21.12",""},
-        {"Misra C: 21.14",""},
-        {"Misra C: 21.15",""},
-        {"Misra C: 21.16",""},
-        {"Misra C: 21.18",""},
-        {"Misra C: 21.19",""},
-        {"Misra C: 21.2",""},
-        {"Misra C: 21.20",""},
-        {"Misra C: 21.21",""},
-        {"Misra C: 21.22",""},
-        {"Misra C: 21.23",""},
-        {"Misra C: 21.24",""},
-        {"Misra C: 21.25","warning"},
-        {"Misra C: 21.26","warning"},
-        {"Misra C: 21.3",""},
-        {"Misra C: 21.4",""},
-        {"Misra C: 21.5",""},
-        {"Misra C: 21.6",""},
-        {"Misra C: 21.7",""},
-        {"Misra C: 21.8",""},
-        {"Misra C: 21.9",""},
-        {"Misra C: 22.10",""},
-        {"Misra C: 22.11",""},
-        {"Misra C: 22.12",""},
-        {"Misra C: 22.13",""},
-        {"Misra C: 22.14",""},
-        {"Misra C: 22.15",""},
-        {"Misra C: 22.16","warning"},
-        {"Misra C: 22.17","warning"},
-        {"Misra C: 22.18","warning"},
-        {"Misra C: 22.19","warning"},
-        {"Misra C: 22.20",""},
-        {"Misra C: 22.5",""},
-        {"Misra C: 22.7",""},
-        {"Misra C: 22.8",""},
-        {"Misra C: 22.9",""},
-        {"Misra C: 23.1",""},
-        {"Misra C: 23.2",""},
-        {"Misra C: 23.3",""},
-        {"Misra C: 23.4",""},
-        {"Misra C: 23.5",""},
-        {"Misra C: 23.6",""},
-        {"Misra C: 23.7",""},
-        {"Misra C: 23.8",""},
-        {"Misra C: 3.1",""},
-        {"Misra C: 3.2",""},
-        {"Misra C: 4.1",""},
-        {"Misra C: 4.2",""},
-        {"Misra C: 5.1",""},
-        {"Misra C: 5.10",""},
-        {"Misra C: 5.2",""},
-        {"Misra C: 5.3",""},
-        {"Misra C: 5.4",""},
-        {"Misra C: 5.5",""},
-        {"Misra C: 5.6",""},
-        {"Misra C: 5.7",""},
-        {"Misra C: 6.1",""},
-        {"Misra C: 6.2",""},
-        {"Misra C: 6.3",""},
-        {"Misra C: 7.1",""},
-        {"Misra C: 7.2",""},
-        {"Misra C: 7.3",""},
-        {"Misra C: 7.4","style"},
-        {"Misra C: 7.5",""},
-        {"Misra C: 7.6",""},
-        {"Misra C: 8.1",""},
-        {"Misra C: 8.10",""},
-        {"Misra C: 8.11",""},
-        {"Misra C: 8.12",""},
-        {"Misra C: 8.14",""},
-        {"Misra C: 8.15",""},
-        {"Misra C: 8.16",""},
-        {"Misra C: 8.17",""},
-        {"Misra C: 8.18",""},
-        {"Misra C: 8.19",""},
-        {"Misra C: 8.2",""},
-        {"Misra C: 8.3",""},
-        {"Misra C: 8.4",""},
-        {"Misra C: 8.5",""},
-        {"Misra C: 8.6",""},
-        {"Misra C: 8.7",""},
-        {"Misra C: 8.8",""},
-        {"Misra C: 8.9",""},
-        {"Misra C: 9.2",""},
-        {"Misra C: 9.3",""},
-        {"Misra C: 9.4",""},
-        {"Misra C: 9.5",""},
-        {"Misra C: 9.6",""},
-        {"Misra C: 9.7",""},
-        {"Misra C: Dir 1.2",""},
-        {"Misra C: Dir 4.12",""},
-        {"Misra C: Dir 4.3",""},
-        {"Misra C: Dir 4.4",""},
-        {"Misra C: Dir 4.5",""},
-        {"Misra C: Dir 4.6",""},
-        {"Misra C: Dir 4.7",""},
-        {"Misra C: Dir 4.9",""},
-        {"PremiumCheckBufferOverrun::addressOfPointerArithmetic","warning"},
-        {"PremiumCheckBufferOverrun::negativeBufferSizeCheckedNonZero","warning"},
-        {"PremiumCheckHang::infiniteLoop",""},
-        {"PremiumCheckHang::infiniteLoopContinue",""},
-        {"PremiumCheckOther::arrayPointerComparison","style"},
-        {"PremiumCheckOther::invalidPointerLiteral",""},
-        {"PremiumCheckOther::knownResult","style"},
-        {"PremiumCheckOther::lossOfPrecision","style"},
-        {"PremiumCheckOther::pointerCast","style"},
-        {"PremiumCheckOther::reassignInLoop","style"},
-        {"PremiumCheckOther::unreachableCode","style"},
-        {"PremiumCheckOther::useAfterFree",""},
-        {"PremiumCheckStrictAlias::strictAliasCondition","warning"},
-        {"PremiumCheckUninitVar::uninitmember",""},
-        {"PremiumCheckUninitVar::uninitvar",""},
-        {"PremiumCheckUnusedVar::unreadVariable","style"},
-        {"PremiumCheckUnusedVar::unusedPrivateMember","style"},
-        {"PremiumMetrics::HIS::Call",""},
-        {"PremiumMetrics::HIS::Calling",""},
-        {"PremiumMetrics::HIS::Comment",""},
-        {"PremiumMetrics::HIS::Goto",""},
-        {"PremiumMetrics::HIS::Level",""},
-        {"PremiumMetrics::HIS::Param",""},
-        {"PremiumMetrics::HIS::Path",""},
-        {"PremiumMetrics::HIS::Stmt",""},
-        {"PremiumMetrics::HIS::StmtFile",""},
-        {"PremiumMetrics::HIS::VOCF",""},
-        {"PremiumMetrics::HIS::return",""},
-        {"PremiumMetrics::cyclomaticComplexity",""},
-    };
 
     const char Req[] = "Required";
     const char Adv[] = "Advisory";
@@ -1825,6 +1037,8 @@ namespace checkers {
         {7,5,2,Req},
         {7,5,3,Req},
         {7,5,4,Adv},
+        {8,0,1,Req},
+        {8,3,1,Req},
         {8,4,1,Req},
         {8,4,2,Req},
         {8,4,3,Req},
@@ -1862,9 +1076,9 @@ namespace checkers {
         {14,7,2,Req},
         {14,7,3,Req},
         {14,8,1,Req},
-        {14,8,2,Req},
-        {15,0,1,Req},
-        {15,0,2,Req},
+        {14,8,2,Adv},
+        {15,0,1,Doc},
+        {15,0,2,Adv},
         {15,0,3,Req},
         {15,1,1,Req},
         {15,1,2,Req},
@@ -2007,8 +1221,8 @@ namespace checkers {
         {9,3,1,Req},
         {9,4,1,Req},
         {9,4,2,Req},
-        {9,5,2,Adv},
-        {9,5,3,Req},
+        {9,5,1,Adv},
+        {9,5,2,Req},
         {9,6,1,Adv},
         {9,6,2,Req},
         {9,6,3,Req},
@@ -2045,6 +1259,7 @@ namespace checkers {
         {15,1,3,Req},
         {15,1,4,Adv},
         {15,1,5,Req},
+        {16,5,1,Req},
         {16,5,2,Req},
         {16,6,1,Adv},
         {17,8,1,Req},
@@ -2468,9 +1683,25 @@ std::vector<checkers::Info> checkers::autosarInfo{
 };
 
 std::vector<checkers::Info> checkers::certCInfo{
-    {"PRE30-C", "L3"},
-    {"PRE31-C", "L3"},
-    {"PRE32-C", "L3"},
+    {"ARR30-C", "L2"},
+    {"ARR32-C", "L2"},
+    {"ARR36-C", "L3"},
+    {"ARR37-C", "L2"},
+    {"ARR38-C", "L2"},
+    {"ARR39-C", "L2"},
+    {"CON30-C", "L3"},
+    {"CON31-C", "L3"},
+    {"CON32-C", "L3"},
+    {"CON33-C", "L3"},
+    {"CON34-C", "L3"},
+    {"CON35-C", "L3"},
+    {"CON36-C", "L3"},
+    {"CON37-C", "L3"},
+    {"CON38-C", "L3"},
+    {"CON39-C", "L3"},
+    {"CON40-C", "L2"},
+    {"CON41-C", "L3"},
+    {"CON43-C", "L3"},
     {"DCL30-C", "L2"},
     {"DCL31-C", "L3"},
     {"DCL36-C", "L2"},
@@ -2479,6 +1710,16 @@ std::vector<checkers::Info> checkers::certCInfo{
     {"DCL39-C", "L3"},
     {"DCL40-C", "L3"},
     {"DCL41-C", "L2"},
+    {"DCL42-C", "L3"},
+    {"ENV30-C", "L3"},
+    {"ENV31-C", "L3"},
+    {"ENV32-C", "L1"},
+    {"ENV33-C", "L1"},
+    {"ENV34-C", "L3"},
+    {"ERR30-C", "L1"},
+    {"ERR32-C", "L3"},
+    {"ERR33-C", "L1"},
+    {"ERR34-C", "L2"},
     {"EXP30-C", "L2"},
     {"EXP32-C", "L2"},
     {"EXP33-C", "L1"},
@@ -2486,7 +1727,7 @@ std::vector<checkers::Info> checkers::certCInfo{
     {"EXP35-C", "L2"},
     {"EXP36-C", "L3"},
     {"EXP37-C", "L3"},
-    {"EXP39-C", "L2"},
+    {"EXP39-C", "L3"},
     {"EXP40-C", "L3"},
     {"EXP42-C", "L1"},
     {"EXP43-C", "L3"},
@@ -2494,36 +1735,6 @@ std::vector<checkers::Info> checkers::certCInfo{
     {"EXP45-C", "L2"},
     {"EXP46-C", "L2"},
     {"EXP47-C", "L2"},
-    {"INT30-C", "L2"},
-    {"INT31-C", "L1"},
-    {"INT32-C", "L1"},
-    {"INT33-C", "L2"},
-    {"INT34-C", "L3"},
-    {"INT35-C", "L3"},
-    {"INT36-C", "L3"},
-    {"FLP30-C", "L2"},
-    {"FLP32-C", "L1"},
-    {"FLP34-C", "L3"},
-    {"FLP36-C", "L3"},
-    {"FLP37-C", "L3"},
-    {"ARR30-C", "L2"},
-    {"ARR32-C", "L2"},
-    {"ARR36-C", "L3"},
-    {"ARR37-C", "L2"},
-    {"ARR38-C", "L2"},
-    {"ARR39-C", "L2"},
-    {"STR30-C", "L2"},
-    {"STR31-C", "L2"},
-    {"STR32-C", "L1"},
-    {"STR34-C", "L2"},
-    {"STR37-C", "L3"},
-    {"STR38-C", "L1"},
-    {"MEM30-C", "L2"},
-    {"MEM31-C", "L3"},
-    {"MEM33-C", "L3"},
-    {"MEM34-C", "L2"},
-    {"MEM35-C", "L2"},
-    {"MEM36-C", "L3"},
     {"FIO30-C", "L1"},
     {"FIO32-C", "L3"},
     {"FIO34-C", "L1"},
@@ -2537,32 +1748,25 @@ std::vector<checkers::Info> checkers::certCInfo{
     {"FIO45-C", "L2"},
     {"FIO46-C", "L3"},
     {"FIO47-C", "L2"},
-    {"ENV30-C", "L3"},
-    {"ENV31-C", "L3"},
-    {"ENV32-C", "L1"},
-    {"ENV33-C", "L1"},
-    {"ENV34-C", "L3"},
-    {"SIG30-C", "L1"},
-    {"SIG31-C", "L1"},
-    {"SIG34-C", "L3"},
-    {"SIG35-C", "L3"},
-    {"ERR30-C", "L1"},
-    {"ERR32-C", "L3"},
-    {"ERR33-C", "L1"},
-    {"ERR34-C", "L2"},
-    {"CON30-C", "L3"},
-    {"CON31-C", "L3"},
-    {"CON32-C", "L3"},
-    {"CON33-C", "L3"},
-    {"CON34-C", "L3"},
-    {"CON35-C", "L3"},
-    {"CON36-C", "L3"},
-    {"CON37-C", "L3"},
-    {"CON38-C", "L3"},
-    {"CON39-C", "L3"},
-    {"CON40-C", "L2"},
-    {"CON41-C", "L3"},
-    {"CON43-C", "L3"},
+    {"FLP30-C", "L2"},
+    {"FLP32-C", "L1"},
+    {"FLP34-C", "L3"},
+    {"FLP36-C", "L3"},
+    {"FLP37-C", "L3"},
+    {"FLP38-C", "L3"},
+    {"INT30-C", "L2"},
+    {"INT31-C", "L1"},
+    {"INT32-C", "L1"},
+    {"INT33-C", "L2"},
+    {"INT34-C", "L3"},
+    {"INT35-C", "L3"},
+    {"INT36-C", "L3"},
+    {"MEM30-C", "L2"},
+    {"MEM31-C", "L3"},
+    {"MEM33-C", "L3"},
+    {"MEM34-C", "L2"},
+    {"MEM35-C", "L2"},
+    {"MEM36-C", "L3"},
     {"MSC30-C", "L3"},
     {"MSC32-C", "L1"},
     {"MSC33-C", "L2"},
@@ -2587,21 +1791,42 @@ std::vector<checkers::Info> checkers::certCInfo{
     {"POS52-C", "L3"},
     {"POS53-C", "L2"},
     {"POS54-C", "L1"},
+    {"PRE30-C", "L3"},
+    {"PRE31-C", "L3"},
+    {"PRE32-C", "L3"},
+    {"SIG30-C", "L1"},
+    {"SIG31-C", "L1"},
+    {"SIG34-C", "L3"},
+    {"SIG35-C", "L3"},
+    {"STR30-C", "L2"},
+    {"STR31-C", "L2"},
+    {"STR32-C", "L1"},
+    {"STR34-C", "L2"},
+    {"STR37-C", "L3"},
+    {"STR38-C", "L1"},
     {"WIN30-C", "L3"},
     // Recommendations
-    {"PRE00-C", "L3"},
-    {"PRE01-C", "L1"},
-    {"PRE02-C", "L1"},
-    {"PRE04-C", "L3"},
-    {"PRE05-C", "L3"},
-    {"PRE06-C", "L3"},
-    {"PRE07-C", "L3"},
-    {"PRE08-C", "L3"},
-    {"PRE09-C", "L1"},
-    {"PRE10-C", "L1"},
-    {"PRE11-C", "L2"},
-    {"PRE12-C", "L3"},
-    {"PRE13-C", "L3"},
+    {"API00-C", "L3"},
+    {"API01-C", "L1"},
+    {"API02-C", "L1"},
+    {"API03-C", "L3"},
+    {"API04-C", "L3"},
+    {"API05-C", "L1"},
+    {"API07-C", "L3"},
+    {"API09-C", "L3"},
+    {"API10-C", "L3"},
+    {"ARR00-C", "L2"},
+    {"ARR01-C", "L1"},
+    {"ARR02-C", "L2"},
+    {"CON01-C", "L3"},
+    {"CON02-C", "L3"},
+    {"CON03-C", "L3"},
+    {"CON04-C", "L3"},
+    {"CON05-C", "L3"},
+    {"CON06-C", "L3"},
+    {"CON07-C", "L2"},
+    {"CON08-C", "L3"},
+    {"CON09-C", "L3"},
     {"DCL00-C", "L3"},
     {"DCL01-C", "L3"},
     {"DCL02-C", "L3"},
@@ -2625,6 +1850,16 @@ std::vector<checkers::Info> checkers::certCInfo{
     {"DCL21-C", "L3"},
     {"DCL22-C", "L3"},
     {"DCL23-C", "L2"},
+    {"ENV01-C", "L2"},
+    {"ENV02-C", "L3"},
+    {"ENV03-C", "L2"},
+    {"ERR00-C", "L3"},
+    {"ERR01-C", "L2"},
+    {"ERR02-C", "L3"},
+    {"ERR04-C", "L3"},
+    {"ERR05-C", "L2"},
+    {"ERR06-C", "L3"},
+    {"ERR07-C", "L1"},
     {"EXP00-C", "L2"},
     {"EXP02-C", "L3"},
     {"EXP03-C", "L3"},
@@ -2641,44 +1876,6 @@ std::vector<checkers::Info> checkers::certCInfo{
     {"EXP16-C", "L2"},
     {"EXP19-C", "L1"},
     {"EXP20-C", "L1"},
-    {"INT00-C", "L3"},
-    {"INT01-C", "L2"},
-    {"INT02-C", "L3"},
-    {"INT04-C", "L1"},
-    {"INT05-C", "L2"},
-    {"INT07-C", "L1"},
-    {"INT08-C", "L3"},
-    {"INT09-C", "L3"},
-    {"INT10-C", "L3"},
-    {"INT12-C", "L3"},
-    {"INT13-C", "L2"},
-    {"INT14-C", "L3"},
-    {"INT15-C", "L2"},
-    {"INT16-C", "L3"},
-    {"INT17-C", "L3"},
-    {"INT18-C", "L1"},
-    {"FLP00-C", "L3"},
-    {"FLP01-C", "L3"},
-    {"FLP02-C", "L3"},
-    {"FLP03-C", "L3"},
-    {"FLP04-C", "L3"},
-    {"FLP05-C", "L3"},
-    {"FLP06-C", "L3"},
-    {"FLP07-C", "L3"},
-    {"ARR00-C", "L2"},
-    {"ARR01-C", "L1"},
-    {"ARR02-C", "L2"},
-    {"STR00-C", "L3"},
-    {"STR01-C", "L3"},
-    {"STR02-C", "L2"},
-    {"STR03-C", "L3"},
-    {"STR04-C", "L3"},
-    {"STR05-C", "L3"},
-    {"STR06-C", "L2"},
-    {"STR08-C", "L2"},
-    {"STR09-C", "L3"},
-    {"STR10-C", "L3"},
-    {"STR11-C", "L2"},
     {"FIO01-C", "L1"},
     {"FIO02-C", "L3"},
     {"FIO03-C", "L3"},
@@ -2699,36 +1896,41 @@ std::vector<checkers::Info> checkers::certCInfo{
     {"FIO22-C", "L3"},
     {"FIO23-C", "L3"},
     {"FIO24-C", "L3"},
-    {"ENV01-C", "L2"},
-    {"ENV02-C", "L3"},
-    {"ENV03-C", "L2"},
-    {"SIG00-C", "L2"},
-    {"SIG01-C", "L3"},
-    {"SIG02-C", "L2"},
-    {"ERR00-C", "L3"},
-    {"ERR01-C", "L2"},
-    {"ERR02-C", "L3"},
-    {"ERR04-C", "L3"},
-    {"ERR05-C", "L2"},
-    {"ERR06-C", "L3"},
-    {"ERR07-C", "L1"},
-    {"API00-C", "L3"},
-    {"API01-C", "L1"},
-    {"API02-C", "L1"},
-    {"API03-C", "L3"},
-    {"API04-C", "L3"},
-    {"API05-C", "L1"},
-    {"API07-C", "L3"},
-    {"API09-C", "L3"},
-    {"API10-C", "L3"},
-    {"CON01-C", "L3"},
-    {"CON02-C", "L3"},
-    {"CON04-C", "L3"},
-    {"CON05-C", "L3"},
-    {"CON06-C", "L3"},
-    {"CON07-C", "L2"},
-    {"CON08-C", "L3"},
-    {"CON09-C", "L3"},
+    {"FLP00-C", "L3"},
+    {"FLP01-C", "L3"},
+    {"FLP02-C", "L3"},
+    {"FLP03-C", "L3"},
+    {"FLP04-C", "L3"},
+    {"FLP05-C", "L3"},
+    {"FLP06-C", "L3"},
+    {"FLP07-C", "L3"},
+    {"INT00-C", "L3"},
+    {"INT01-C", "L2"},
+    {"INT02-C", "L3"},
+    {"INT04-C", "L1"},
+    {"INT05-C", "L2"},
+    {"INT07-C", "L1"},
+    {"INT08-C", "L3"},
+    {"INT09-C", "L3"},
+    {"INT10-C", "L3"},
+    {"INT12-C", "L3"},
+    {"INT13-C", "L2"},
+    {"INT14-C", "L3"},
+    {"INT15-C", "L2"},
+    {"INT16-C", "L3"},
+    {"INT17-C", "L3"},
+    {"INT18-C", "L1"},
+    {"MEM00-C", "L1"},
+    {"MEM01-C", "L2"},
+    {"MEM02-C", "L3"},
+    {"MEM03-C", "L3"},
+    {"MEM04-C", "L2"},
+    {"MEM05-C", "L2"},
+    {"MEM06-C", "L3"},
+    {"MEM07-C", "L2"},
+    {"MEM10-C", "L3"},
+    {"MEM11-C", "L3"},
+    {"MEM12-C", "L3"},
     {"MSC00-C", "L3"},
     {"MSC01-C", "L3"},
     {"MSC04-C", "L3"},
@@ -2755,6 +1957,32 @@ std::vector<checkers::Info> checkers::certCInfo{
     {"POS02-C", "L2"},
     {"POS04-C", "L3"},
     {"POS05-C", "L3"},
+    {"PRE00-C", "L3"},
+    {"PRE01-C", "L1"},
+    {"PRE02-C", "L1"},
+    {"PRE04-C", "L3"},
+    {"PRE05-C", "L3"},
+    {"PRE06-C", "L3"},
+    {"PRE07-C", "L3"},
+    {"PRE08-C", "L3"},
+    {"PRE09-C", "L1"},
+    {"PRE10-C", "L1"},
+    {"PRE11-C", "L2"},
+    {"PRE12-C", "L3"},
+    {"PRE13-C", "L3"},
+    {"SIG00-C", "L2"},
+    {"SIG01-C", "L3"},
+    {"SIG02-C", "L2"},
+    {"STR00-C", "L3"},
+    {"STR01-C", "L3"},
+    {"STR02-C", "L2"},
+    {"STR03-C", "L3"},
+    {"STR04-C", "L3"},
+    {"STR05-C", "L3"},
+    {"STR06-C", "L2"},
+    {"STR09-C", "L3"},
+    {"STR10-C", "L3"},
+    {"STR11-C", "L2"},
     {"WIN00-C", "L2"},
     {"WIN01-C", "L1"},
     {"WIN02-C", "L1"},
@@ -2763,6 +1991,22 @@ std::vector<checkers::Info> checkers::certCInfo{
 };
 
 std::vector<checkers::Info> checkers::certCppInfo{
+    {"CON50-CPP", "L3"},
+    {"CON51-CPP", "L2"},
+    {"CON52-CPP", "L3"},
+    {"CON53-CPP", "L3"},
+    {"CON54-CPP", "L3"},
+    {"CON55-CPP", "L3"},
+    {"CON56-CPP", "L3"},
+    {"CTR50-CPP", "L2"},
+    {"CTR51-CPP", "L2"},
+    {"CTR52-CPP", "L2"},
+    {"CTR53-CPP", "L2"},
+    {"CTR54-CPP", "L3"},
+    {"CTR55-CPP", "L2"},
+    {"CTR56-CPP", "L2"},
+    {"CTR57-CPP", "L3"},
+    {"CTR58-CPP", "L2"},
     {"DCL50-CPP", "L1"},
     {"DCL51-CPP", "L3"},
     {"DCL52-CPP", "L3"},
@@ -2774,6 +2018,19 @@ std::vector<checkers::Info> checkers::certCppInfo{
     {"DCL58-CPP", "L2"},
     {"DCL59-CPP", "L3"},
     {"DCL60-CPP", "L2"},
+    {"ERR50-CPP", "L3"},
+    {"ERR51-CPP", "L2"},
+    {"ERR52-CPP", "L3"},
+    {"ERR53-CPP", "L3"},
+    {"ERR54-CPP", "L1"},
+    {"ERR55-CPP", "L2"},
+    {"ERR56-CPP", "L2"},
+    {"ERR57-CPP", "L3"},
+    {"ERR58-CPP", "L2"},
+    {"ERR59-CPP", "L2"},
+    {"ERR60-CPP", "L3"},
+    {"ERR61-CPP", "L3"},
+    {"ERR62-CPP", "L3"},
     {"EXP50-CPP", "L2"},
     {"EXP51-CPP", "L3"},
     {"EXP52-CPP", "L3"},
@@ -2788,20 +2045,9 @@ std::vector<checkers::Info> checkers::certCppInfo{
     {"EXP61-CPP", "L2"},
     {"EXP62-CPP", "L1"},
     {"EXP63-CPP", "L2"},
+    {"FIO50-CPP", "L2"},
+    {"FIO51-CPP", "L3"},
     {"INT50-CPP", "L3"},
-    {"CTR50-CPP", "L2"},
-    {"CTR51-CPP", "L2"},
-    {"CTR52-CPP", "L2"},
-    {"CTR53-CPP", "L2"},
-    {"CTR54-CPP", "L3"},
-    {"CTR55-CPP", "L2"},
-    {"CTR56-CPP", "L2"},
-    {"CTR57-CPP", "L3"},
-    {"CTR58-CPP", "L2"},
-    {"STR50-CPP", "L2"},
-    {"STR51-CPP", "L1"},
-    {"STR52-CPP", "L2"},
-    {"STR53-CPP", "L3"},
     {"MEM50-CPP", "L2"},
     {"MEM51-CPP", "L2"},
     {"MEM52-CPP", "L1"},
@@ -2810,21 +2056,11 @@ std::vector<checkers::Info> checkers::certCppInfo{
     {"MEM55-CPP", "L2"},
     {"MEM56-CPP", "L2"},
     {"MEM57-CPP", "L3"},
-    {"FIO50-CPP", "L2"},
-    {"FIO51-CPP", "L3"},
-    {"ERR50-CPP", "L3"},
-    {"ERR51-CPP", "L2"},
-    {"ERR52-CPP", "L3"},
-    {"ERR53-CPP", "L3"},
-    {"ERR54-CPP", "L1"},
-    {"ERR55-CPP", "L2"},
-    {"ERR56-CPP", "L2"},
-    {"ERR57-CPP", "L3"},
-    {"ERR58-CPP", "L2"},
-    {"ERR59-CPP", "L2"},
-    {"ERR60-CPP", "L3"},
-    {"ERR61-CPP", "L3"},
-    {"ERR62-CPP", "L3"},
+    {"MSC50-CPP", "L3"},
+    {"MSC51-CPP", "L1"},
+    {"MSC52-CPP", "L2"},
+    {"MSC53-CPP", "L3"},
+    {"MSC54-CPP", "L2"},
     {"OOP50-CPP", "L3"},
     {"OOP51-CPP", "L3"},
     {"OOP52-CPP", "L3"},
@@ -2834,17 +2070,9 @@ std::vector<checkers::Info> checkers::certCppInfo{
     {"OOP56-CPP", "L3"},
     {"OOP57-CPP", "L1"},
     {"OOP58-CPP", "L2"},
-    {"CON50-CPP", "L3"},
-    {"CON51-CPP", "L2"},
-    {"CON52-CPP", "L3"},
-    {"CON53-CPP", "L3"},
-    {"CON54-CPP", "L3"},
-    {"CON55-CPP", "L3"},
-    {"CON56-CPP", "L3"},
-    {"MSC50-CPP", "L3"},
-    {"MSC51-CPP", "L1"},
-    {"MSC52-CPP", "L2"},
-    {"MSC53-CPP", "L3"},
-    {"MSC54-CPP", "L2"},
+    {"STR50-CPP", "L2"},
+    {"STR51-CPP", "L1"},
+    {"STR52-CPP", "L2"},
+    {"STR53-CPP", "L3"},
 };
 
diff --git a/lib/checkers.h b/lib/checkers.h
index a9329d6c08f..bda4a0320f5 100644
--- a/lib/checkers.h
+++ b/lib/checkers.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +40,6 @@ enum class ReportType : std::uint8_t {
 
 namespace checkers {
     extern CPPCHECKLIB const std::map<std::string, std::string> allCheckers;
-    extern CPPCHECKLIB const std::map<std::string, std::string> premiumCheckers;
 
     struct CPPCHECKLIB MisraInfo {
         int a;
diff --git a/lib/checkersidmapping.cpp b/lib/checkersidmapping.cpp
index 5b0e6705c4c..7021a5c12ce 100644
--- a/lib/checkersidmapping.cpp
+++ b/lib/checkersidmapping.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,9 +22,9 @@
 
 std::vector<checkers::IdMapping> checkers::idMappingAutosar{
     {"m0-1-1", "unreachableCode,duplicateBreak"},
-    {"m0-1-2", "unsignedLessThanZero"},
+    {"m0-1-2", "unsignedLessThanZero,compareValueOutOfTypeRangeError"},
     {"m0-1-3", "unusedVariable,unusedStructMember"},
-    {"a0-1-1", "unreadVariable,unusedValue,redundantAssignment"},
+    {"a0-1-1", "unreadVariable,redundantAssignment"},
     {"m0-1-9", "redundantAssignment,redundantInitialization"},
     {"m0-1-10", "unusedFunction"},
     {"m0-2-1", "overlappingWriteUnion,overlappingWriteFunction"},
@@ -41,7 +41,6 @@ std::vector<checkers::IdMapping> checkers::idMappingAutosar{
     {"m5-0-17", "comparePointers"},
     {"m5-0-18", "comparePointers"},
     {"a5-1-4", "returnDanglingLifetime"},
-    {"a5-2-2", "cstyleCast"},
     {"a5-2-5", "arrayIndexOutOfBounds,arrayIndexOutOfBoundsCond,pointerOutOfBounds,pointerOutOfBoundsCond,negativeIndex,arrayIndexThenCheck,bufferAccessOutOfBounds,objectIndex,argumentSize"},
     {"m5-3-4", "sizeofFunctionCall"},
     {"a5-3-2", "nullPointer,nullPointerRedundantCheck,nullPointerArithmetic,nullPointerArithmeticRedundantCheck,nullPointerDefaultArg"},
@@ -96,17 +95,19 @@ std::vector<checkers::IdMapping> checkers::idMappingCertC{
 };
 
 std::vector<checkers::IdMapping> checkers::idMappingCertCpp{
+    {"STR52", "invalidContainer"},
+    {"STR51", "nullPointer"},
     {"CTR51", "eraseDereference"},
     {"CTR54", "comparePointers"},
     {"CTR55", "containerOutOfBounds"},
-    {"DCL57", "deallocThrow,exceptThrowInDestructor"},
+    {"DCL57", "exceptDeallocThrow,exceptThrowInDestructor"},
     {"DCL60", "ctuOneDefinitionRuleViolation"},
     {"ERR57", "memleak"},
     {"EXP52", "sizeofCalculation"},
     {"EXP53", "uninitvar,uninitdata,uninitStructMember"},
     {"EXP54", "uninitvar,danglingLifetime,danglingReference,danglingTemporaryLifetime,danglingTempReference,returnDanglingLifetime"},
-    {"EXP61", "danglingLifetime,danglingReference,danglingTemporaryLifetime,danglingTempReference,returnDanglingLifetime"},
-    {"EXP63", "accessMoved"},
+    {"EXP61", "danglingLifetime,danglingReference,danglingTemporaryLifetime,danglingTempReference,deallocuse,deallocret,returnDanglingLifetime"},
+    {"EXP63", "accessMoved,uselessCallsRemove"},
     {"FIO50", "IOWithoutPositioning"},
     {"MEM50", "deallocuse"},
     {"MEM51", "mismatchAllocDealloc"},
@@ -116,35 +117,34 @@ std::vector<checkers::IdMapping> checkers::idMappingCertCpp{
     {"OOP52", "virtualDestructor"},
     {"OOP53", "initializerList"},
     {"OOP54", "operatorEqToSelf"},
-    {"STR51", "nullPointer"},
-    {"STR52", "invalidContainer"},
 };
 
 std::vector<checkers::IdMapping> checkers::idMappingMisraC{
     {"1.1", "syntaxError"},
     {"1.3", "error"},
     {"2.1", "duplicateBreak,unreachableCode"},
-    {"2.2", "constStatement,redundantCondition,redundantAssignment,redundantAssignInSwitch,unreadVariable"},
+    {"2.2", "constStatement,redundantCondition,redundantAssignment,redundantAssignInSwitch,unreadVariable,unusedFunction"},
     {"2.6", "unusedLabel"},
     {"2.8", "unusedVariable"},
     {"5.3", "shadowVariable"},
     {"8.3", "funcArgNamesDifferent"},
-    {"8.13", "constParameterPointer"},
-    {"9.1", "uninitvar"},
+    {"8.13", "constParameter,constParameterPointer,constVariablePointer,constParameterCallback"},
+    {"9.1", "uninitvar,legacyUninitvar"},
+    {"12.2", "shiftNegative"},
     {"12.5", "sizeofwithsilentarraypointer"},
     {"13.2", "unknownEvaluationOrder"},
     {"13.6", "sizeofCalculation"},
-    {"14.3", "compareValueOutOfTypeRangeError,knownConditionTrueFalse"},
+    {"14.3", "compareValueOutOfTypeRangeError,knownConditionTrueFalse,incorrectLogicOperator"},
     {"17.4", "missingReturn"},
     {"17.5", "argumentSize"},
-    {"18.1", "pointerOutOfBounds"},
+    {"18.1", "arrayIndexOutOfBounds,arrayIndexOutOfBoundsCond,pointerOutOfBounds,negativeIndex"},
     {"18.2", "comparePointers"},
     {"18.3", "comparePointers"},
-    {"18.6", "danglingLifetime,danglingTemporaryLifetime,returnDanglingLifetime"},
+    {"18.6", "autoVariables,danglingLifetime,danglingTemporaryLifetime,returnDanglingLifetime"},
     {"19.1", "overlappingWriteUnion,overlappingWriteFunction"},
-    {"20.6", "preprocessorErrorDirective"},
+    {"20.6", "directiveAsMacroParameter"},
     {"21.13", "invalidFunctionArg"},
-    {"21.17", "bufferAccessOutOfBounds"},
+    {"21.17", "invalidFunctionArgStr"},
     {"21.18", "bufferAccessOutOfBounds"},
     {"22.1", "memleak,resourceLeak,memleakOnRealloc,leakReturnValNotUsed,leakNoVarFunctionCall"},
     {"22.2", "autovarInvalidDeallocation"},
@@ -155,7 +155,7 @@ std::vector<checkers::IdMapping> checkers::idMappingMisraC{
 
 std::vector<checkers::IdMapping> checkers::idMappingMisraCpp2008{
     {"0-1-1", "unreachableCode,duplicateBreak"},
-    {"0-1-2", "unsignedLessThanZero"},
+    {"0-1-2", "unsignedLessThanZero,compareValueOutOfTypeRangeError"},
     {"0-1-3", "unusedVariable,unusedStructMember"},
     {"0-1-6", "redundantAssignment,unreadVariable,variableScope"},
     {"0-1-9", "redundantAssignment,redundantInitialization"},
@@ -168,7 +168,7 @@ std::vector<checkers::IdMapping> checkers::idMappingMisraCpp2008{
     {"5-0-16", "pointerOutOfBounds"},
     {"5-0-17", "comparePointers"},
     {"5-0-18", "comparePointers"},
-    {"5-2-4", "cstyleCast"},
+    {"5-2-4", "cstyleCast,dangerousTypeCast"},
     {"5-3-4", "sizeofFunctionCall"},
     {"5-8-1", "shiftTooManyBits"},
     {"6-6-5", "missingReturn"},
diff --git a/lib/checkersreport.cpp b/lib/checkersreport.cpp
index c2b91c84ecb..9779bdd93c6 100644
--- a/lib/checkersreport.cpp
+++ b/lib/checkersreport.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,8 +20,8 @@
 
 #include "addoninfo.h"
 #include "checkers.h"
-#include "errortypes.h"
 #include "settings.h"
+#include "utils.h"
 
 #include <algorithm>
 #include <cstddef>
@@ -30,10 +30,6 @@
 #include <unordered_set>
 #include <vector>
 
-static bool isCppcheckPremium(const Settings& settings) {
-    return (settings.cppcheckCfgProductName.compare(0, 16, "Cppcheck Premium") == 0);
-}
-
 static int getMisraCVersion(const Settings& settings) {
     if (settings.premiumArgs.find("misra-c-2025") != std::string::npos)
         return 2025;
@@ -133,16 +129,19 @@ void CheckersReport::countCheckers()
     mActiveCheckersCount = mAllCheckersCount = 0;
 
     for (const auto& checkReq: checkers::allCheckers) {
-        if (mActiveCheckers.count(checkReq.first) > 0)
+        if (mActiveCheckers().count(checkReq.first) > 0)
             ++mActiveCheckersCount;
         ++mAllCheckersCount;
     }
-    for (const auto& checkReq: checkers::premiumCheckers) {
-        if (mActiveCheckers.count(checkReq.first) > 0)
-            ++mActiveCheckersCount;
-        ++mAllCheckersCount;
+    for (const auto& addonInfo: mSettings().addonInfos) {
+        for (const auto& checkReq: addonInfo.checkers) {
+            if (mActiveCheckers().count(checkReq.first) > 0)
+                ++mActiveCheckersCount;
+            ++mAllCheckersCount;
+        }
     }
-    if (mSettings.premiumArgs.find("misra-c-") != std::string::npos || mSettings.addons.count("misra")) {
+
+    if (mSettings().addons.count("misra")) {
         const bool doUnusedFunctionOnly = Settings::unusedFunctionOnly();
         for (const checkers::MisraInfo& info: checkers::misraC2012Rules) {
             const std::string rule = std::to_string(info.a) + "." + std::to_string(info.b);
@@ -171,7 +170,7 @@ std::string CheckersReport::getReport(const std::string& criticalErrors) const
         // TODO: mention "information" and "debug" as source for indications of bailouts
         // TODO: still rephrase this - this message does not provides confidence in the results
         // TODO: document what a bailout is and why it is done - mention it in the upcoming security/tuning guide
-        // TODO: make bailouts a seperate group - need to differentiate between user bailouts (missing data like configuration/includes) and internal bailouts (e.g. limitations of ValueFlow)
+        // TODO: make bailouts a separate group - need to differentiate between user bailouts (missing data like configuration/includes) and internal bailouts (e.g. limitations of ValueFlow)
         fout << "Note: There might still have been non-critical bailouts which might lead to false negatives." << std::endl;
     }
 
@@ -186,7 +185,7 @@ std::string CheckersReport::getReport(const std::string& criticalErrors) const
     }
     for (const auto& checkReq: checkers::allCheckers) {
         const std::string& checker = checkReq.first;
-        const bool active = mActiveCheckers.count(checkReq.first) > 0;
+        const bool active = mActiveCheckers().count(checkReq.first) > 0;
         const std::string& req = checkReq.second;
         fout << (active ? "Yes  " : "No   ") << checker;
         if (!active && !req.empty())
@@ -194,106 +193,39 @@ std::string CheckersReport::getReport(const std::string& criticalErrors) const
         fout << std::endl;
     }
 
-    const bool cppcheckPremium = isCppcheckPremium(mSettings);
-
-    auto reportSection = [&fout, cppcheckPremium]
-                         (const std::string& title,
-                          const Settings& settings,
-                          const std::set<std::string>& activeCheckers,
-                          const std::map<std::string, std::string>& premiumCheckers,
-                          const std::string& substring) {
+    for (const auto& addonInfo: mSettings().addonInfos) {
+        if (addonInfo.checkers.empty())
+            continue;
         fout << std::endl << std::endl;
+        std::string title;
+        if (mSettings().premium && addonInfo.name == "premiumaddon.json")
+            title = "Cppcheck Premium";
+        else {
+            title = addonInfo.name;
+            if (endsWith(title, ".json"))
+                title.erase(title.rfind('.'));
+        }
+        title += " checkers";
         fout << title << std::endl;
         fout << std::string(title.size(), '-') << std::endl;
-        if (!cppcheckPremium) {
-            fout << "Not available, Cppcheck Premium is not used" << std::endl;
-            return;
-        }
-        int maxCheckerSize = 0;
-        for (const auto& checkReq: premiumCheckers) {
+
+        maxCheckerSize = 0;
+        for (const auto& checkReq: addonInfo.checkers) {
             const std::string& checker = checkReq.first;
-            if (checker.find(substring) != std::string::npos && checker.size() > maxCheckerSize)
-                maxCheckerSize = checker.size();
+            maxCheckerSize = std::max(checker.size(), maxCheckerSize);
         }
-        for (const auto& checkReq: premiumCheckers) {
+
+        for (const auto& checkReq: addonInfo.checkers) {
             const std::string& checker = checkReq.first;
-            if (checker.find(substring) == std::string::npos)
-                continue;
-            std::string req = checkReq.second;
-            bool active = cppcheckPremium && activeCheckers.count(checker) > 0;
-            if (substring == "::") {
-                if (req == "warning")
-                    active &= settings.severity.isEnabled(Severity::warning);
-                else if (req == "style")
-                    active &= settings.severity.isEnabled(Severity::style);
-                else if (req == "portability")
-                    active &= settings.severity.isEnabled(Severity::portability);
-                else if (!req.empty())
-                    active = false; // FIXME: handle req
-            }
+            const bool active = mActiveCheckers().count(checkReq.first) > 0;
+            const std::string& req = checkReq.second;
             fout << (active ? "Yes  " : "No   ") << checker;
-            if (!cppcheckPremium) {
-                if (!req.empty())
-                    req = "premium," + req;
-                else
-                    req = "premium";
-            }
-            if (!req.empty())
-                req = "require:" + req;
-            if (!active)
-                fout << std::string(maxCheckerSize + 4 - checker.size(), ' ') << req;
+            if (!active && !req.empty())
+                fout << std::string(maxCheckerSize + 4 - checker.size(), ' ') << "require:" << req;
             fout << std::endl;
         }
-    };
-
-    reportSection("Premium checkers", mSettings, mActiveCheckers, checkers::premiumCheckers, "::");
-    reportSection("Autosar", mSettings, mActiveCheckers, checkers::premiumCheckers, "Autosar: ");
-    reportSection("Cert C", mSettings, mActiveCheckers, checkers::premiumCheckers, "Cert C: ");
-    reportSection("Cert C++", mSettings, mActiveCheckers, checkers::premiumCheckers, "Cert C++: ");
-
-    const int misraCVersion = getMisraCVersion(mSettings);
-
-    if (misraCVersion == 0) {
-        fout << std::endl << std::endl;
-        fout << "Misra C" << std::endl;
-        fout << "-------" << std::endl;
-        fout << "Misra is not enabled" << std::endl;
-    } else {
-        fout << std::endl << std::endl;
-        fout << "Misra C " << misraCVersion << std::endl;
-        fout << "------------" << std::endl;
-        for (const checkers::MisraInfo& info: checkers::misraC2012Directives) {
-            const std::string directive = "Dir " + std::to_string(info.a) + "." + std::to_string(info.b);
-            const bool active = isMisraRuleActive(mActiveCheckers, directive);
-            fout << (active ? "Yes  " : "No   ") << "Misra C " << misraCVersion << ": " << directive;
-            std::string extra;
-            if (misraCVersion == 2012 && info.amendment >= 1)
-                extra = " amendment:" + std::to_string(info.amendment);
-            if (!extra.empty())
-                fout << std::string(10 - directive.size(), ' ') << extra;
-            fout << '\n';
-        }
-        for (const checkers::MisraInfo& info: checkers::misraC2012Rules) {
-            const std::string rule = std::to_string(info.a) + "." + std::to_string(info.b);
-            const bool active = isMisraRuleActive(mActiveCheckers, rule);
-            fout << (active ? "Yes  " : "No   ") << "Misra C " << misraCVersion << ": " << rule;
-            std::string extra;
-            if (misraCVersion == 2012 && info.amendment >= 1)
-                extra = " amendment:" + std::to_string(info.amendment);
-            std::string reqs;
-            if (info.amendment >= 3)
-                reqs += ",premium";
-            if (!active && !reqs.empty())
-                extra += " require:" + reqs.substr(1);
-            if (!extra.empty())
-                fout << std::string(10 - rule.size(), ' ') << extra;
-            fout << '\n';
-        }
     }
 
-    reportSection("Misra C++ 2008", mSettings, mActiveCheckers, checkers::premiumCheckers, "Misra C++ 2008: ");
-    reportSection("Misra C++ 2023", mSettings, mActiveCheckers, checkers::premiumCheckers, "Misra C++ 2023: ");
-
     return fout.str();
 }
 
@@ -306,7 +238,7 @@ std::string CheckersReport::getXmlReport(const std::string& criticalErrors) cons
         ret += "    <critical-errors/>\n";
     ret += "    <checkers-report>\n";
     const int misraCVersion = getMisraCVersion(mSettings);
-    for (std::string checker: mActiveCheckers) {
+    for (std::string checker: mActiveCheckers()) {
         if (checker.compare(0,8,"Misra C:") == 0)
             checker = "Misra C " + std::to_string(misraCVersion) + ":" + checker.substr(8);
         ret += "        <checker id=\"" + checker + "\"/>\n";
diff --git a/lib/checkersreport.h b/lib/checkersreport.h
index b189a7f1ebd..179653d3d51 100644
--- a/lib/checkersreport.h
+++ b/lib/checkersreport.h
@@ -20,6 +20,7 @@
 #define checkersReportH
 
 #include "config.h"
+#include "refthunk.h"
 
 #include <set>
 #include <string>
@@ -37,8 +38,8 @@ class CPPCHECKLIB CheckersReport {
     std::string getXmlReport(const std::string& criticalErrors) const;
 
 private:
-    const Settings& mSettings;
-    const std::set<std::string>& mActiveCheckers;
+    RefThunk<const Settings> mSettings;
+    RefThunk<const std::set<std::string>> mActiveCheckers;
 
     void countCheckers();
 
diff --git a/lib/checkexceptionsafety.cpp b/lib/checkexceptionsafety.cpp
index 36cec717d90..29342fb4dbc 100644
--- a/lib/checkexceptionsafety.cpp
+++ b/lib/checkexceptionsafety.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,20 +34,15 @@
 
 //---------------------------------------------------------------------------
 
-// Register CheckExceptionSafety..
-namespace {
-    CheckExceptionSafety instance;
-}
-
 static const CWE CWE398(398U);   // Indicator of Poor Code Quality
 static const CWE CWE703(703U);   // Improper Check or Handling of Exceptional Conditions
 static const CWE CWE480(480U);   // Use of Incorrect Operator
 
 //---------------------------------------------------------------------------
 
-void CheckExceptionSafety::destructors()
+void CheckExceptionSafetyImpl::destructors()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckExceptionSafety::destructors"); // warning
@@ -83,7 +78,7 @@ void CheckExceptionSafety::destructors()
     }
 }
 
-void CheckExceptionSafety::destructorsError(const Token * const tok, const std::string &className)
+void CheckExceptionSafetyImpl::destructorsError(const Token * const tok, const std::string &className)
 {
     reportError(tok, Severity::warning, "exceptThrowInDestructor",
                 "Class " + className + " is not safe, destructor throws exception\n"
@@ -93,14 +88,14 @@ void CheckExceptionSafety::destructorsError(const Token * const tok, const std::
 }
 
 
-void CheckExceptionSafety::deallocThrow()
+void CheckExceptionSafetyImpl::deallocThrow()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("exceptDeallocThrow"))
         return;
 
     logChecker("CheckExceptionSafety::deallocThrow"); // warning
 
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
 
     // Deallocate a global/member pointer and then throw exception
@@ -156,7 +151,7 @@ void CheckExceptionSafety::deallocThrow()
     }
 }
 
-void CheckExceptionSafety::deallocThrowError(const Token * const tok, const std::string &varname)
+void CheckExceptionSafetyImpl::deallocThrowError(const Token * const tok, const std::string &varname)
 {
     reportError(tok, Severity::warning, "exceptDeallocThrow", "Exception thrown in invalid state, '" +
                 varname + "' points at deallocated memory.", CWE398, Certainty::normal);
@@ -168,9 +163,9 @@ void CheckExceptionSafety::deallocThrowError(const Token * const tok, const std:
 //         throw err;            // <- should be just "throw;"
 //      }
 //---------------------------------------------------------------------------
-void CheckExceptionSafety::checkRethrowCopy()
+void CheckExceptionSafetyImpl::checkRethrowCopy()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("exceptRethrowCopy"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("exceptRethrowCopy"))
         return;
 
     logChecker("CheckExceptionSafety::checkRethrowCopy"); // style
@@ -201,7 +196,7 @@ void CheckExceptionSafety::checkRethrowCopy()
     }
 }
 
-void CheckExceptionSafety::rethrowCopyError(const Token * const tok, const std::string &varname)
+void CheckExceptionSafetyImpl::rethrowCopyError(const Token * const tok, const std::string &varname)
 {
     reportError(tok, Severity::style, "exceptRethrowCopy",
                 "Throwing a copy of the caught exception instead of rethrowing the original exception.\n"
@@ -212,9 +207,9 @@ void CheckExceptionSafety::rethrowCopyError(const Token * const tok, const std::
 //---------------------------------------------------------------------------
 //    try {} catch (std::exception err) {} <- Should be "std::exception& err"
 //---------------------------------------------------------------------------
-void CheckExceptionSafety::checkCatchExceptionByValue()
+void CheckExceptionSafetyImpl::checkCatchExceptionByValue()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("catchExceptionByValue"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("catchExceptionByValue"))
         return;
 
     logChecker("CheckExceptionSafety::checkCatchExceptionByValue"); // style
@@ -233,7 +228,7 @@ void CheckExceptionSafety::checkCatchExceptionByValue()
     }
 }
 
-void CheckExceptionSafety::catchExceptionByValueError(const Token *tok)
+void CheckExceptionSafetyImpl::catchExceptionByValueError(const Token *tok)
 {
     reportError(tok, Severity::style,
                 "catchExceptionByValue", "Exception should be caught by reference.\n"
@@ -257,7 +252,8 @@ static const Token * functionThrowsRecursive(const Function * function, std::set
             tok = tok->linkAt(1);  // skip till start of catch clauses
         if (tok->str() == "throw")
             return tok;
-        if (tok->function() && Token::simpleMatch(tok->astParent(), "(")) {
+        if (tok->function() && (Token::simpleMatch(tok->astParent(), "(") ||
+                                (Token::simpleMatch(tok->astParent(), ".") && Token::simpleMatch(tok->astParent()->astParent(), "(")))) {
             const Function * called = tok->function();
             // check if called function has an exception specification
             if (called->isThrow() && called->throwArg)
@@ -285,7 +281,7 @@ static const Token * functionThrows(const Function * function)
 //    void func() throw() { throw x; }
 //    void func() __attribute__((nothrow)); void func() { throw x; }
 //--------------------------------------------------------------------------
-void CheckExceptionSafety::nothrowThrows()
+void CheckExceptionSafetyImpl::nothrowThrows()
 {
     logChecker("CheckExceptionSafety::nothrowThrows");
 
@@ -302,7 +298,7 @@ void CheckExceptionSafety::nothrowThrows()
             function->isAttributeNothrow()) { // __attribute__((nothrow)) or __declspec(nothrow) functions
             isNoExcept = true;
         }
-        else if (mSettings->library.isentrypoint(function->name())) {
+        else if (mSettings.library.isentrypoint(function->name())) {
             isEntryPoint = true;
         }
         if (!isNoExcept && !isEntryPoint)
@@ -317,12 +313,12 @@ void CheckExceptionSafety::nothrowThrows()
     }
 }
 
-void CheckExceptionSafety::noexceptThrowError(const Token * const tok)
+void CheckExceptionSafetyImpl::noexceptThrowError(const Token * const tok)
 {
     reportError(tok, Severity::error, "throwInNoexceptFunction", "Unhandled exception thrown in function declared not to throw exceptions.", CWE398, Certainty::normal);
 }
 
-void CheckExceptionSafety::entryPointThrowError(const Token * const tok)
+void CheckExceptionSafetyImpl::entryPointThrowError(const Token * const tok)
 {
     reportError(tok, Severity::error, "throwInEntryPoint", "Unhandled exception thrown in function that is an entry point.", CWE398, Certainty::normal);
 }
@@ -330,10 +326,10 @@ void CheckExceptionSafety::entryPointThrowError(const Token * const tok)
 //--------------------------------------------------------------------------
 //    void func() { functionWithExceptionSpecification(); }
 //--------------------------------------------------------------------------
-void CheckExceptionSafety::unhandledExceptionSpecification()
+void CheckExceptionSafetyImpl::unhandledExceptionSpecification()
 {
-    if ((!mSettings->severity.isEnabled(Severity::style) || !mSettings->certainty.isEnabled(Certainty::inconclusive)) &&
-        !mSettings->isPremiumEnabled("unhandledExceptionSpecification"))
+    if ((!mSettings.severity.isEnabled(Severity::style) || !mSettings.certainty.isEnabled(Certainty::inconclusive)) &&
+        !mSettings.isPremiumEnabled("unhandledExceptionSpecification"))
         return;
 
     logChecker("CheckExceptionSafety::unhandledExceptionSpecification"); // style,inconclusive
@@ -342,7 +338,7 @@ void CheckExceptionSafety::unhandledExceptionSpecification()
 
     for (const Scope * scope : symbolDatabase->functionScopes) {
         // only check functions without exception specification
-        if (scope->function && !scope->function->isThrow() && !mSettings->library.isentrypoint(scope->className)) {
+        if (scope->function && !scope->function->isThrow() && !mSettings.library.isentrypoint(scope->className)) {
             for (const Token *tok = scope->function->functionScope->bodyStart->next();
                  tok != scope->function->functionScope->bodyEnd; tok = tok->next()) {
                 if (tok->str() == "try")
@@ -360,7 +356,7 @@ void CheckExceptionSafety::unhandledExceptionSpecification()
     }
 }
 
-void CheckExceptionSafety::unhandledExceptionSpecificationError(const Token * const tok1, const Token * const tok2, const std::string & funcname)
+void CheckExceptionSafetyImpl::unhandledExceptionSpecificationError(const Token * const tok1, const Token * const tok2, const std::string & funcname)
 {
     const std::string str1(tok1 ? tok1->str() : "foo");
     const std::list<const Token*> locationList = { tok1, tok2 };
@@ -373,7 +369,7 @@ void CheckExceptionSafety::unhandledExceptionSpecificationError(const Token * co
 //--------------------------------------------------------------------------
 // 7.6.18.4 If no exception is presently being handled, evaluating a throw-expression with no operand calls std​::​​terminate().
 //--------------------------------------------------------------------------
-void CheckExceptionSafety::rethrowNoCurrentException()
+void CheckExceptionSafetyImpl::rethrowNoCurrentException()
 {
     logChecker("CheckExceptionSafety::rethrowNoCurrentException");
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -404,7 +400,7 @@ void CheckExceptionSafety::rethrowNoCurrentException()
     }
 }
 
-void CheckExceptionSafety::rethrowNoCurrentExceptionError(const Token *tok)
+void CheckExceptionSafetyImpl::rethrowNoCurrentExceptionError(const Token *tok)
 {
     reportError(tok, Severity::error, "rethrowNoCurrentException",
                 "Rethrowing current exception with 'throw;', it seems there is no current exception to rethrow."
@@ -413,12 +409,12 @@ void CheckExceptionSafety::rethrowNoCurrentExceptionError(const Token *tok)
                 CWE480, Certainty::normal);
 }
 
-void CheckExceptionSafety::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckExceptionSafety::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
     if (tokenizer.isC())
         return;
 
-    CheckExceptionSafety checkExceptionSafety(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckExceptionSafetyImpl checkExceptionSafety(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkExceptionSafety.destructors();
     checkExceptionSafety.deallocThrow();
     checkExceptionSafety.checkRethrowCopy();
@@ -428,9 +424,9 @@ void CheckExceptionSafety::runChecks(const Tokenizer &tokenizer, ErrorLogger *er
     checkExceptionSafety.rethrowNoCurrentException();
 }
 
-void CheckExceptionSafety::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckExceptionSafety::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckExceptionSafety c(nullptr, settings, errorLogger);
+    CheckExceptionSafetyImpl c(nullptr, settings, errorLogger);
     c.destructorsError(nullptr, "Class");
     c.deallocThrowError(nullptr, "p");
     c.rethrowCopyError(nullptr, "varname");
diff --git a/lib/checkexceptionsafety.h b/lib/checkexceptionsafety.h
index 7c5a52b5605..8b52d773a93 100644
--- a/lib/checkexceptionsafety.h
+++ b/lib/checkexceptionsafety.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -46,14 +47,32 @@ class Tokenizer;
 class CPPCHECKLIB CheckExceptionSafety : public Check {
 public:
     /** This constructor is used when registering the CheckClass */
-    CheckExceptionSafety() : Check(myName()) {}
+    CheckExceptionSafety() : Check("Exception Safety") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckExceptionSafety(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    /** Generate all possible errors (for --errorlist) */
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
 
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    /** wiki formatted description of the class (for --doc) */
+    std::string classInfo() const override {
+        return "Checking exception safety\n"
+               "- Throwing exceptions in destructors\n"
+               "- Throwing exception during invalid state\n"
+               "- Throwing a copy of a caught exception instead of rethrowing the original exception\n"
+               "- Exception caught by value instead of by reference\n"
+               "- Throwing exception in noexcept, nothrow(), __attribute__((nothrow)) or __declspec(nothrow) function\n"
+               "- Unhandled exception specification when calling function foo()\n"
+               "- Rethrow without currently handled exception\n";
+    }
+};
+
+class CPPCHECKLIB CheckExceptionSafetyImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    CheckExceptionSafetyImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** Don't throw exceptions in destructors */
     void destructors();
@@ -87,26 +106,6 @@ class CPPCHECKLIB CheckExceptionSafety : public Check {
     void unhandledExceptionSpecificationError(const Token * tok1, const Token * tok2, const std::string & funcname);
     /** Rethrow without currently handled exception */
     void rethrowNoCurrentExceptionError(const Token *tok);
-
-    /** Generate all possible errors (for --errorlist) */
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    /** Short description of class (for --doc) */
-    static std::string myName() {
-        return "Exception Safety";
-    }
-
-    /** wiki formatted description of the class (for --doc) */
-    std::string classInfo() const override {
-        return "Checking exception safety\n"
-               "- Throwing exceptions in destructors\n"
-               "- Throwing exception during invalid state\n"
-               "- Throwing a copy of a caught exception instead of rethrowing the original exception\n"
-               "- Exception caught by value instead of by reference\n"
-               "- Throwing exception in noexcept, nothrow(), __attribute__((nothrow)) or __declspec(nothrow) function\n"
-               "- Unhandled exception specification when calling function foo()\n"
-               "- Rethrow without currently handled exception\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkfunctions.cpp b/lib/checkfunctions.cpp
index 8884a03fc48..89094b6bf4c 100644
--- a/lib/checkfunctions.cpp
+++ b/lib/checkfunctions.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,12 +44,6 @@
 
 //---------------------------------------------------------------------------
 
-
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckFunctions instance;
-}
-
 static const CWE CWE252(252U);  // Unchecked Return Value
 static const CWE CWE477(477U);  // Use of Obsolete Functions
 static const CWE CWE758(758U);  // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
@@ -58,9 +52,9 @@ static const CWE CWE686(686U);  // Function Call With Incorrect Argument Type
 static const CWE CWE687(687U);  // Function Call With Incorrectly Specified Argument Value
 static const CWE CWE688(688U);  // Function Call With Incorrect Variable or Reference as Argument
 
-void CheckFunctions::checkProhibitedFunctions()
+void CheckFunctionsImpl::checkProhibitedFunctions()
 {
-    const bool checkAlloca = mSettings->severity.isEnabled(Severity::warning) && ((mTokenizer->isC() && mSettings->standards.c >= Standards::C99) || mSettings->standards.cpp >= Standards::CPP11);
+    const bool checkAlloca = mSettings.severity.isEnabled(Severity::warning) && ((mTokenizer->isC() && mSettings.standards.c >= Standards::C99) || mSettings.standards.cpp >= Standards::CPP11);
 
     logChecker("CheckFunctions::checkProhibitedFunctions");
 
@@ -72,7 +66,7 @@ void CheckFunctions::checkProhibitedFunctions()
             // alloca() is special as it depends on the code being C or C++, so it is not in Library
             if (checkAlloca && Token::simpleMatch(tok, "alloca (") && (!tok->function() || tok->function()->nestedIn->type == ScopeType::eGlobal)) {
                 if (tok->isC()) {
-                    if (mSettings->standards.c > Standards::C89)
+                    if (mSettings.standards.c > Standards::C89)
                         reportError(tok, Severity::warning, "allocaCalled",
                                     "$symbol:alloca\n"
                                     "Obsolete function 'alloca' called. In C99 and later it is recommended to use a variable length array instead.\n"
@@ -90,11 +84,12 @@ void CheckFunctions::checkProhibitedFunctions()
                 if (tok->function() && tok->function()->hasBody())
                     continue;
 
-                const Library::WarnInfo* wi = mSettings->library.getWarnInfo(tok);
+                const Library::WarnInfo* wi = mSettings.library.getWarnInfo(tok);
                 if (wi) {
-                    if (mSettings->severity.isEnabled(wi->severity) && ((tok->isC() && mSettings->standards.c >= wi->standards.c) || (tok->isCpp() && mSettings->standards.cpp >= wi->standards.cpp))) {
-                        const std::string daca = mSettings->daca ? "prohibited" : "";
-                        reportError(tok, wi->severity, daca + tok->str() + "Called", wi->message, CWE477, Certainty::normal);
+                    if (mSettings.severity.isEnabled(wi->severity) && ((tok->isC() && mSettings.standards.c >= wi->standards.c) || (tok->isCpp() && mSettings.standards.cpp >= wi->standards.cpp))) {
+                        const std::string daca = mSettings.daca ? "prohibited" : "";
+                        const std::string prefix = daca + tok->str();
+                        functionCalledError(tok, wi->severity, prefix, wi->message);
                     }
                 }
             }
@@ -102,10 +97,27 @@ void CheckFunctions::checkProhibitedFunctions()
     }
 }
 
+void CheckFunctionsImpl::functionCalledError(const Token* tok, Severity severity, const std::string& prefix, const std::string& msg)
+{
+    reportError(tok, severity, prefix + "Called", msg, CWE477, Certainty::normal);
+}
+
+static bool hasArgMinReadSize(const Token *ftok, int argnr, const Library &library)
+{
+    if (library.getArgDirection(ftok, argnr) == Library::ArgumentChecks::Direction::DIR_IN) {
+        if (const std::vector<Library::ArgumentChecks::MinSize> *minsizes = library.argminsizes(ftok, argnr)) {
+            return std::any_of(minsizes->begin(), minsizes->end(), [](const Library::ArgumentChecks::MinSize &ms) {
+                return ms.type == Library::ArgumentChecks::MinSize::Type::ARGVALUE;
+            });
+        }
+    }
+    return false;
+}
+
 //---------------------------------------------------------------------------
 // Check <valid>, <strz> and <not-bool>
 //---------------------------------------------------------------------------
-void CheckFunctions::invalidFunctionUsage()
+void CheckFunctionsImpl::invalidFunctionUsage()
 {
     logChecker("CheckFunctions::invalidFunctionUsage");
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -116,28 +128,28 @@ void CheckFunctions::invalidFunctionUsage()
                 continue;
             const Token * const functionToken = tok;
             const std::vector<const Token *> arguments = getArguments(tok);
-            for (int argnr = 1; argnr <= arguments.size(); ++argnr) {
+            for (size_t argnr = 1; argnr <= arguments.size(); ++argnr) {
                 const Token * const argtok = arguments[argnr-1];
 
                 // check <valid>...</valid>
-                const ValueFlow::Value *invalidValue = argtok->getInvalidValue(functionToken,argnr,*mSettings);
+                const ValueFlow::Value *invalidValue = argtok->getInvalidValue(functionToken,argnr,mSettings);
                 if (invalidValue) {
-                    invalidFunctionArgError(argtok, functionToken->next()->astOperand1()->expressionString(), argnr, invalidValue, mSettings->library.validarg(functionToken, argnr));
+                    invalidFunctionArgError(argtok, functionToken->next()->astOperand1()->expressionString(), argnr, invalidValue, mSettings.library.validarg(functionToken, argnr));
                 }
 
                 if (astIsBool(argtok)) {
                     // check <not-bool>
-                    if (mSettings->library.isboolargbad(functionToken, argnr))
+                    if (mSettings.library.isboolargbad(functionToken, argnr))
                         invalidFunctionArgBoolError(argtok, functionToken->str(), argnr);
 
                     // Are the values 0 and 1 valid?
-                    else if (!mSettings->library.isIntArgValid(functionToken, argnr, 0, *mSettings))
-                        invalidFunctionArgError(argtok, functionToken->str(), argnr, nullptr, mSettings->library.validarg(functionToken, argnr));
-                    else if (!mSettings->library.isIntArgValid(functionToken, argnr, 1, *mSettings))
-                        invalidFunctionArgError(argtok, functionToken->str(), argnr, nullptr, mSettings->library.validarg(functionToken, argnr));
+                    else if (!mSettings.library.isIntArgValid(functionToken, argnr, 0, mSettings))
+                        invalidFunctionArgError(argtok, functionToken->str(), argnr, nullptr, mSettings.library.validarg(functionToken, argnr));
+                    else if (!mSettings.library.isIntArgValid(functionToken, argnr, 1, mSettings))
+                        invalidFunctionArgError(argtok, functionToken->str(), argnr, nullptr, mSettings.library.validarg(functionToken, argnr));
                 }
                 // check <strz>
-                if (mSettings->library.isargstrz(functionToken, argnr)) {
+                if (mSettings.library.isargstrz(functionToken, argnr) && !hasArgMinReadSize(functionToken, argnr, mSettings.library)) {
                     if (Token::Match(argtok, "& %var% !![") && argtok->next() && argtok->next()->valueType()) {
                         const ValueType * valueType = argtok->next()->valueType();
                         const Variable * variable = argtok->next()->variable();
@@ -153,7 +165,7 @@ void CheckFunctions::invalidFunctionUsage()
                     // Is non-null terminated local variable of type char (e.g. char buf[] = {'x'};) ?
                     if (variable && variable->isLocal()
                         && valueType && (valueType->type == ValueType::Type::CHAR || valueType->type == ValueType::Type::WCHAR_T)
-                        && !isVariablesChanged(variable->declEndToken(), functionToken, 0 /*indirect*/, { variable }, *mSettings)) {
+                        && !isVariablesChanged(variable->declEndToken(), functionToken, valueType->pointer, { variable }, mSettings)) {
                         const Token* varTok = variable->declEndToken();
                         MathLib::bigint count = -1; // Find out explicitly set count, e.g.: char buf[3] = {...}. Variable 'count' is set to 3 then.
                         if (varTok && Token::simpleMatch(varTok->astOperand1(), "["))
@@ -183,7 +195,7 @@ void CheckFunctions::invalidFunctionUsage()
                                 invalidFunctionArgStrError(argtok, functionToken->str(), argnr);
                             }
                         } else if (count > -1 && Token::Match(varTok, "= %str%")) {
-                            const Token* strTok = varTok->getValueTokenMinStrSize(*mSettings);
+                            const Token* strTok = varTok->getValueTokenMinStrSize(mSettings);
                             if (strTok) {
                                 const int strSize = Token::getStrArraySize(strTok);
                                 if (strSize > count && strTok->str().find('\0') == std::string::npos)
@@ -197,7 +209,7 @@ void CheckFunctions::invalidFunctionUsage()
     }
 }
 
-void CheckFunctions::invalidFunctionArgError(const Token *tok, const std::string &functionName, int argnr, const ValueFlow::Value *invalidValue, const std::string &validstr)
+void CheckFunctionsImpl::invalidFunctionArgError(const Token *tok, const std::string &functionName, int argnr, const ValueFlow::Value *invalidValue, const std::string &validstr)
 {
     std::ostringstream errmsg;
     errmsg << "$symbol:" << functionName << '\n';
@@ -210,14 +222,15 @@ void CheckFunctions::invalidFunctionArgError(const Token *tok, const std::string
         errmsg << " The value is " << std::setprecision(10) << (invalidValue->isIntValue() ? invalidValue->intvalue : invalidValue->floatValue) << " but the valid values are '" << validstr << "'.";
     else
         errmsg << " The value is 0 or 1 (boolean) but the valid values are '" << validstr << "'.";
-    if (invalidValue)
+    if (invalidValue) {
+        const auto severity = invalidValue->errorSeverity() && invalidValue->isKnown() && !invalidValue->conditional ? Severity::error : Severity::warning;
         reportError(getErrorPath(tok, invalidValue, "Invalid argument"),
-                    invalidValue->errorSeverity() && invalidValue->isKnown() ? Severity::error : Severity::warning,
+                    severity,
                     "invalidFunctionArg",
                     errmsg.str(),
                     CWE628,
                     invalidValue->isInconclusive() ? Certainty::inconclusive : Certainty::normal);
-    else
+    } else
         reportError(tok,
                     Severity::error,
                     "invalidFunctionArg",
@@ -226,7 +239,7 @@ void CheckFunctions::invalidFunctionArgError(const Token *tok, const std::string
                     Certainty::normal);
 }
 
-void CheckFunctions::invalidFunctionArgBoolError(const Token *tok, const std::string &functionName, int argnr)
+void CheckFunctionsImpl::invalidFunctionArgBoolError(const Token *tok, const std::string &functionName, int argnr)
 {
     std::ostringstream errmsg;
     errmsg << "$symbol:" << functionName << '\n';
@@ -234,7 +247,7 @@ void CheckFunctions::invalidFunctionArgBoolError(const Token *tok, const std::st
     reportError(tok, Severity::error, "invalidFunctionArgBool", errmsg.str(), CWE628, Certainty::normal);
 }
 
-void CheckFunctions::invalidFunctionArgStrError(const Token *tok, const std::string &functionName, nonneg int argnr)
+void CheckFunctionsImpl::invalidFunctionArgStrError(const Token *tok, const std::string &functionName, nonneg int argnr)
 {
     std::ostringstream errmsg;
     errmsg << "$symbol:" << functionName << '\n';
@@ -245,11 +258,11 @@ void CheckFunctions::invalidFunctionArgStrError(const Token *tok, const std::str
 //---------------------------------------------------------------------------
 // Check for ignored return values.
 //---------------------------------------------------------------------------
-void CheckFunctions::checkIgnoredReturnValue()
+void CheckFunctionsImpl::checkIgnoredReturnValue()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) &&
-        !mSettings->severity.isEnabled(Severity::style) &&
-        !mSettings->isPremiumEnabled("ignoredReturnValue"))
+    if (!mSettings.severity.isEnabled(Severity::warning) &&
+        !mSettings.severity.isEnabled(Severity::style) &&
+        !mSettings.isPremiumEnabled("ignoredReturnValue"))
         return;
 
     logChecker("CheckFunctions::checkIgnoredReturnValue"); // style,warning
@@ -282,13 +295,13 @@ void CheckFunctions::checkIgnoredReturnValue()
 
             if ((!tok->function() || !Token::Match(tok->function()->retDef, "void %name%")) &&
                 tok->next()->astOperand1()) {
-                const Library::UseRetValType retvalTy = mSettings->library.getUseRetValType(tok);
+                const Library::UseRetValType retvalTy = mSettings.library.getUseRetValType(tok);
                 const bool warn = (tok->function() && (tok->function()->isAttributeNodiscard() || tok->function()->isAttributePure() || tok->function()->isAttributeConst())) ||
                                   // avoid duplicate warnings for resource-allocating functions
-                                  (retvalTy == Library::UseRetValType::DEFAULT && mSettings->library.getAllocFuncInfo(tok) == nullptr);
-                if (mSettings->severity.isEnabled(Severity::warning) && warn)
+                                  (retvalTy == Library::UseRetValType::DEFAULT && mSettings.library.getAllocFuncInfo(tok) == nullptr);
+                if (mSettings.severity.isEnabled(Severity::warning) && warn)
                     ignoredReturnValueError(tok, tok->next()->astOperand1()->expressionString());
-                else if (mSettings->severity.isEnabled(Severity::style) &&
+                else if (mSettings.severity.isEnabled(Severity::style) &&
                          retvalTy == Library::UseRetValType::ERROR_CODE)
                     ignoredReturnErrorCode(tok, tok->next()->astOperand1()->expressionString());
             }
@@ -296,13 +309,13 @@ void CheckFunctions::checkIgnoredReturnValue()
     }
 }
 
-void CheckFunctions::ignoredReturnValueError(const Token* tok, const std::string& function)
+void CheckFunctionsImpl::ignoredReturnValueError(const Token* tok, const std::string& function)
 {
     reportError(tok, Severity::warning, "ignoredReturnValue",
                 "$symbol:" + function + "\nReturn value of function $symbol() is not used.", CWE252, Certainty::normal);
 }
 
-void CheckFunctions::ignoredReturnErrorCode(const Token* tok, const std::string& function)
+void CheckFunctionsImpl::ignoredReturnErrorCode(const Token* tok, const std::string& function)
 {
     reportError(tok, Severity::style, "ignoredReturnErrorCode",
                 "$symbol:" + function + "\nError code from the return value of function $symbol() is not used.", CWE252, Certainty::normal);
@@ -313,7 +326,7 @@ void CheckFunctions::ignoredReturnErrorCode(const Token* tok, const std::string&
 //---------------------------------------------------------------------------
 static const Token *checkMissingReturnScope(const Token *tok, const Library &library);
 
-void CheckFunctions::checkMissingReturn()
+void CheckFunctionsImpl::checkMissingReturn()
 {
     logChecker("CheckFunctions::checkMissingReturn");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -321,7 +334,7 @@ void CheckFunctions::checkMissingReturn()
         const Function *function = scope->function;
         if (!function || !function->hasBody())
             continue;
-        if (function->name() == "main" && !(mTokenizer->isC() && mSettings->standards.c < Standards::C99))
+        if (function->name() == "main" && !(mTokenizer->isC() && mSettings.standards.c < Standards::C99))
             continue;
         if (function->type != FunctionType::eFunction && function->type != FunctionType::eOperatorEqual)
             continue;
@@ -329,7 +342,9 @@ void CheckFunctions::checkMissingReturn()
             continue;
         if (Function::returnsVoid(function, true))
             continue;
-        const Token *errorToken = checkMissingReturnScope(scope->bodyEnd, mSettings->library);
+        if (Function::isCoroutine(function, mSettings.standards, *mTokenizer))
+            continue;
+        const Token *errorToken = checkMissingReturnScope(scope->bodyEnd, mSettings.library);
         if (errorToken)
             missingReturnError(errorToken);
     }
@@ -384,7 +399,12 @@ static const Token *checkMissingReturnScope(const Token *tok, const Library &lib
                 if (!isExhaustiveSwitch(tok->link()))
                     return tok->link();
             } else if (tok->scope()->type == ScopeType::eIf) {
-                const Token *condition = tok->scope()->classDef->next()->astOperand2();
+                const Token *paren = tok->link()->linkAt(-1);
+                if (!paren || !Token::simpleMatch(paren->astOperand1(), "if")) {
+                    tok = tok->link();
+                    continue;
+                }
+                const Token *condition = paren->astOperand2();
                 if (condition && condition->hasKnownIntValue() && condition->getKnownIntValue() == 1)
                     return checkMissingReturnScope(tok, library);
                 return tok;
@@ -396,6 +416,19 @@ static const Token *checkMissingReturnScope(const Token *tok, const Library &lib
                 if (Token::simpleMatch(tok->tokAt(-2), "} else {"))
                     return checkMissingReturnScope(tok->tokAt(-2), library);
                 return tok;
+            } else if (tok->scope()->type == ScopeType::eCatch) {
+                while (tok->str() == "}") {
+                    const Token *errorToken = checkMissingReturnScope(tok, library);
+                    if (errorToken || tok->scope()->type == ScopeType::eTry)
+                        return errorToken;
+                    tok = tok->link();
+                    if (Token::simpleMatch(tok->previous(), ") {") && Token::simpleMatch(tok->linkAt(-1)->tokAt(-2), "} catch ("))
+                        tok = tok->linkAt(-1)->tokAt(-2);
+                    else
+                        break;
+                }
+                // FIXME this should not be reached
+                return nullptr;
             }
             // FIXME
             return nullptr;
@@ -418,7 +451,7 @@ static const Token *checkMissingReturnScope(const Token *tok, const Library &lib
     return nullptr;
 }
 
-void CheckFunctions::missingReturnError(const Token* tok)
+void CheckFunctionsImpl::missingReturnError(const Token* tok)
 {
     reportError(tok, Severity::error, "missingReturn",
                 "Found an exit path from function with non-void return type that has missing return statement", CWE758, Certainty::normal);
@@ -426,12 +459,12 @@ void CheckFunctions::missingReturnError(const Token* tok)
 //---------------------------------------------------------------------------
 // Detect passing wrong values to <cmath> functions like atan(0, x);
 //---------------------------------------------------------------------------
-void CheckFunctions::checkMathFunctions()
+void CheckFunctionsImpl::checkMathFunctions()
 {
-    const bool styleC99 = mSettings->severity.isEnabled(Severity::style) && ((mTokenizer->isC() && mSettings->standards.c != Standards::C89) || (mTokenizer->isCPP() && mSettings->standards.cpp != Standards::CPP03));
-    const bool printWarnings = mSettings->severity.isEnabled(Severity::warning);
+    const bool styleC99 = mSettings.severity.isEnabled(Severity::style) && ((mTokenizer->isC() && mSettings.standards.c != Standards::C89) || (mTokenizer->isCPP() && mSettings.standards.cpp != Standards::CPP03));
+    const bool printWarnings = mSettings.severity.isEnabled(Severity::warning);
 
-    if (!styleC99 && !printWarnings && !mSettings->isPremiumEnabled("wrongmathcall"))
+    if (!styleC99 && !printWarnings && !mSettings.isPremiumEnabled("wrongmathcall"))
         return;
 
     logChecker("CheckFunctions::checkMathFunctions"); // style,warning,c99,c++11
@@ -487,7 +520,7 @@ void CheckFunctions::checkMathFunctions()
     }
 }
 
-void CheckFunctions::mathfunctionCallWarning(const Token *tok, const nonneg int numParam)
+void CheckFunctionsImpl::mathfunctionCallWarning(const Token *tok, const nonneg int numParam)
 {
     if (tok) {
         if (numParam == 1)
@@ -498,7 +531,7 @@ void CheckFunctions::mathfunctionCallWarning(const Token *tok, const nonneg int
         reportError(tok, Severity::warning, "wrongmathcall", "Passing value '#' to #() leads to implementation-defined result.", CWE758, Certainty::normal);
 }
 
-void CheckFunctions::mathfunctionCallWarning(const Token *tok, const std::string& oldexp, const std::string& newexp)
+void CheckFunctionsImpl::mathfunctionCallWarning(const Token *tok, const std::string& oldexp, const std::string& newexp)
 {
     reportError(tok, Severity::style, "unpreciseMathCall", "Expression '" + oldexp + "' can be replaced by '" + newexp + "' to avoid loss of precision.", CWE758, Certainty::normal);
 }
@@ -506,7 +539,7 @@ void CheckFunctions::mathfunctionCallWarning(const Token *tok, const std::string
 //---------------------------------------------------------------------------
 // memset(p, y, 0 /* bytes to fill */) <- 2nd and 3rd arguments inverted
 //---------------------------------------------------------------------------
-void CheckFunctions::memsetZeroBytes()
+void CheckFunctionsImpl::memsetZeroBytes()
 {
 // FIXME:
 //  Replace this with library configuration.
@@ -515,7 +548,7 @@ void CheckFunctions::memsetZeroBytes()
 //       <warn knownIntValue="0" severity="warning" msg="..."/>
 //     </arg>
 
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckFunctions::memsetZeroBytes"); // warning
@@ -523,9 +556,9 @@ void CheckFunctions::memsetZeroBytes()
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
-            if (Token::Match(tok, "memset|wmemset (") && (numberOfArguments(tok)==3)) {
+            if (Token::Match(tok, "memset|wmemset (")) {
                 const std::vector<const Token *> &arguments = getArguments(tok);
-                if (WRONG_DATA(arguments.size() != 3U, tok))
+                if (arguments.size() != 3U)
                     continue;
                 const Token* lastParamTok = arguments[2];
                 if (MathLib::isNullValue(lastParamTok->str()))
@@ -535,7 +568,7 @@ void CheckFunctions::memsetZeroBytes()
     }
 }
 
-void CheckFunctions::memsetZeroBytesError(const Token *tok)
+void CheckFunctionsImpl::memsetZeroBytesError(const Token *tok)
 {
     const std::string summary("memset() called to fill 0 bytes.");
     const std::string verbose(summary + " The second and third arguments might be inverted."
@@ -544,7 +577,7 @@ void CheckFunctions::memsetZeroBytesError(const Token *tok)
     reportError(tok, Severity::warning, "memsetZeroBytes", summary + "\n" + verbose, CWE687, Certainty::normal);
 }
 
-void CheckFunctions::memsetInvalid2ndParam()
+void CheckFunctionsImpl::memsetInvalid2ndParam()
 {
 // FIXME:
 //  Replace this with library configuration.
@@ -554,8 +587,8 @@ void CheckFunctions::memsetInvalid2ndParam()
 //       <warn possibleIntValue=":-129,256:" severity="warning" msg="..."/>
 //     </arg>
 
-    const bool printPortability = mSettings->severity.isEnabled(Severity::portability);
-    const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
+    const bool printPortability = mSettings.severity.isEnabled(Severity::portability);
+    const bool printWarning = mSettings.severity.isEnabled(Severity::warning);
     if (!printWarning && !printPortability)
         return;
 
@@ -583,8 +616,8 @@ void CheckFunctions::memsetInvalid2ndParam()
 
             if (printWarning && secondParamTok->isNumber()) { // Check if the second parameter is a literal and is out of range
                 const MathLib::bigint value = MathLib::toBigNumber(secondParamTok);
-                const long long sCharMin = mSettings->platform.signedCharMin();
-                const long long uCharMax = mSettings->platform.unsignedCharMax();
+                const long long sCharMin = mSettings.platform.signedCharMin();
+                const long long uCharMax = mSettings.platform.unsignedCharMax();
                 if (value < sCharMin || value > uCharMax)
                     memsetValueOutOfRangeError(secondParamTok, secondParamTok->str());
             }
@@ -592,7 +625,7 @@ void CheckFunctions::memsetInvalid2ndParam()
     }
 }
 
-void CheckFunctions::memsetFloatError(const Token *tok, const std::string &var_value)
+void CheckFunctionsImpl::memsetFloatError(const Token *tok, const std::string &var_value)
 {
     const std::string message("The 2nd memset() argument '" + var_value +
                               "' is a float, its representation is implementation defined.");
@@ -601,7 +634,7 @@ void CheckFunctions::memsetFloatError(const Token *tok, const std::string &var_v
     reportError(tok, Severity::portability, "memsetFloat", message + "\n" + verbose, CWE688, Certainty::normal);
 }
 
-void CheckFunctions::memsetValueOutOfRangeError(const Token *tok, const std::string &value)
+void CheckFunctionsImpl::memsetValueOutOfRangeError(const Token *tok, const std::string &value)
 {
     const std::string message("The 2nd memset() argument '" + value + "' doesn't fit into an 'unsigned char'.");
     const std::string verbose(message + " The 2nd parameter is passed as an 'int', but the function fills the block of memory using the 'unsigned char' conversion of this value.");
@@ -612,9 +645,9 @@ void CheckFunctions::memsetValueOutOfRangeError(const Token *tok, const std::str
 // --check-library => warn for unconfigured functions
 //---------------------------------------------------------------------------
 
-void CheckFunctions::checkLibraryMatchFunctions()
+void CheckFunctionsImpl::checkLibraryMatchFunctions()
 {
-    if (!mSettings->checkLibrary)
+    if (!mSettings.checkLibrary)
         return;
 
     bool insideNew = false;
@@ -622,6 +655,12 @@ void CheckFunctions::checkLibraryMatchFunctions()
         if (!tok->scope() || !tok->scope()->isExecutable())
             continue;
 
+        // skip uninstantiated templates
+        if (tok == tok->scope()->bodyStart && tok->scope()->function && tok->scope()->function->templateDef) {
+            tok = tok->link();
+            continue;
+        }
+
         if (tok->str() == "new")
             insideNew = true;
         else if (tok->str() == ";")
@@ -646,32 +685,32 @@ void CheckFunctions::checkLibraryMatchFunctions()
 
         if (Token::simpleMatch(tok->astParent(), ".")) {
             const Token* contTok = tok->astParent()->astOperand1();
-            if (astContainerAction(contTok, mSettings->library) != Library::Container::Action::NO_ACTION)
+            if (astContainerAction(contTok, mSettings.library) != Library::Container::Action::NO_ACTION)
                 continue;
-            if (astContainerYield(contTok, mSettings->library) != Library::Container::Yield::NO_YIELD)
+            if (astContainerYield(contTok, mSettings.library) != Library::Container::Yield::NO_YIELD)
                 continue;
         }
 
-        if (!mSettings->library.isNotLibraryFunction(tok))
+        if (!mSettings.library.isNotLibraryFunction(tok))
             continue;
 
-        const std::string &functionName = mSettings->library.getFunctionName(tok);
+        const std::string &functionName = mSettings.library.getFunctionName(tok);
         if (functionName.empty())
             continue;
 
-        if (mSettings->library.functions().find(functionName) != mSettings->library.functions().end())
+        if (mSettings.library.functions().find(functionName) != mSettings.library.functions().end())
             continue;
 
-        if (mSettings->library.podtype(tok->expressionString()))
+        if (mSettings.library.podtype(tok->expressionString()))
             continue;
 
-        if (mSettings->library.getTypeCheck("unusedvar", functionName) != Library::TypeCheck::def)
+        if (mSettings.library.getTypeCheck("unusedvar", functionName) != Library::TypeCheck::def)
             continue;
 
         const Token* start = tok;
         while (Token::Match(start->tokAt(-2), "%name% ::") && !start->tokAt(-2)->isKeyword())
             start = start->tokAt(-2);
-        if (mSettings->library.detectContainerOrIterator(start))
+        if (mSettings.library.detectContainerOrIterator(start))
             continue;
 
         reportError(tok,
@@ -684,12 +723,12 @@ void CheckFunctions::checkLibraryMatchFunctions()
 // Check for problems to compiler apply (Named) Return Value Optimization for local variable
 // Technically we have different guarantees between standard versions
 // details: https://en.cppreference.com/w/cpp/language/copy_elision
-void CheckFunctions::returnLocalStdMove()
+void CheckFunctionsImpl::returnLocalStdMove()
 {
-    if (!mTokenizer->isCPP() || mSettings->standards.cpp < Standards::CPP11)
+    if (!mTokenizer->isCPP() || mSettings.standards.cpp < Standards::CPP11)
         return;
 
-    if (!mSettings->severity.isEnabled(Severity::performance))
+    if (!mSettings.severity.isEnabled(Severity::performance))
         return;
 
     logChecker("CheckFunctions::returnLocalStdMove"); // performance,c++11
@@ -714,7 +753,7 @@ void CheckFunctions::returnLocalStdMove()
     }
 }
 
-void CheckFunctions::copyElisionError(const Token *tok)
+void CheckFunctionsImpl::copyElisionError(const Token *tok)
 {
     reportError(tok,
                 Severity::performance,
@@ -723,9 +762,9 @@ void CheckFunctions::copyElisionError(const Token *tok)
                 " More: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rf-return-move-local");
 }
 
-void CheckFunctions::useStandardLibrary()
+void CheckFunctionsImpl::useStandardLibrary()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings.severity.isEnabled(Severity::style))
         return;
 
     logChecker("CheckFunctions::useStandardLibrary"); // style
@@ -761,10 +800,10 @@ void CheckFunctions::useStandardLibrary()
 
         const auto& secondOp = condToken->str();
         const bool isLess = "<" == secondOp &&
-                            isConstExpression(condToken->astOperand2(), mSettings->library) &&
+                            isConstExpression(condToken->astOperand2(), mSettings.library) &&
                             condToken->astOperand1()->varId() == idxVarId;
         const bool isMore = ">" == secondOp &&
-                            isConstExpression(condToken->astOperand1(), mSettings->library) &&
+                            isConstExpression(condToken->astOperand1(), mSettings.library) &&
                             condToken->astOperand2()->varId() == idxVarId;
 
         if (!(isLess || isMore))
@@ -827,16 +866,16 @@ void CheckFunctions::useStandardLibrary()
     }
 }
 
-void CheckFunctions::useStandardLibraryError(const Token *tok, const std::string& expected)
+void CheckFunctionsImpl::useStandardLibraryError(const Token *tok, const std::string& expected)
 {
     reportError(tok, Severity::style,
                 "useStandardLibrary",
                 "Consider using " + expected + " instead of loop.");
 }
 
-void CheckFunctions::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckFunctions::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckFunctions checkFunctions(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckFunctionsImpl checkFunctions(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     checkFunctions.checkIgnoredReturnValue();
     checkFunctions.checkMissingReturn();  // Missing "return" in exit path
@@ -853,12 +892,12 @@ void CheckFunctions::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLog
     checkFunctions.useStandardLibrary();
 }
 
-void CheckFunctions::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckFunctions::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckFunctions c(nullptr, settings, errorLogger);
+    CheckFunctionsImpl c(nullptr, settings, errorLogger);
 
-    for (auto i = settings->library.functionwarn().cbegin(); i != settings->library.functionwarn().cend(); ++i) {
-        c.reportError(nullptr, Severity::style, i->first+"Called", i->second.message);
+    for (auto i = settings.library.functionwarn().cbegin(); i != settings.library.functionwarn().cend(); ++i) {
+        c.functionCalledError(nullptr, Severity::style, i->first, i->second.message);
     }
 
     c.invalidFunctionArgError(nullptr, "func_name", 1, nullptr,"1:4");
diff --git a/lib/checkfunctions.h b/lib/checkfunctions.h
index f5954d14043..ea7278bf0c8 100644
--- a/lib/checkfunctions.h
+++ b/lib/checkfunctions.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -47,15 +48,33 @@ namespace ValueFlow {
 class CPPCHECKLIB CheckFunctions : public Check {
 public:
     /** This constructor is used when registering the CheckFunctions */
-    CheckFunctions() : Check(myName()) {}
+    CheckFunctions() : Check("Check function usage") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckFunctions(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Check function usage:\n"
+               "- missing 'return' in non-void function\n"
+               "- return value of certain functions not used\n"
+               "- invalid input values for functions\n"
+               "- Warn if a function is called whose usage is discouraged\n"
+               "- memset() third argument is zero\n"
+               "- memset() with a value out of range as the 2nd parameter\n"
+               "- memset() with a float as the 2nd parameter\n"
+               "- copy elision optimization for returning value affected by std::move\n"
+               "- use memcpy()/memset() instead of for loop\n";
+    }
+};
+
+class CPPCHECKLIB CheckFunctionsImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    CheckFunctionsImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** Check for functions that should not be used */
     void checkProhibitedFunctions();
@@ -106,25 +125,7 @@ class CPPCHECKLIB CheckFunctions : public Check {
     void missingReturnError(const Token *tok);
     void copyElisionError(const Token *tok);
     void useStandardLibraryError(const Token *tok, const std::string& expected);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Check function usage";
-    }
-
-    std::string classInfo() const override {
-        return "Check function usage:\n"
-               "- missing 'return' in non-void function\n"
-               "- return value of certain functions not used\n"
-               "- invalid input values for functions\n"
-               "- Warn if a function is called whose usage is discouraged\n"
-               "- memset() third argument is zero\n"
-               "- memset() with a value out of range as the 2nd parameter\n"
-               "- memset() with a float as the 2nd parameter\n"
-               "- copy elision optimization for returning value affected by std::move\n"
-               "- use memcpy()/memset() instead of for loop\n";
-    }
+    void functionCalledError(const Token* tok, Severity severity, const std::string& prefix, const std::string& msg);
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkimpl.cpp b/lib/checkimpl.cpp
new file mode 100644
index 00000000000..99954315d26
--- /dev/null
+++ b/lib/checkimpl.cpp
@@ -0,0 +1,65 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 Cppcheck team.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "checkimpl.h"
+
+#include "errorlogger.h"
+#include "settings.h"
+#include "token.h"
+#include "tokenize.h"
+#include "vfvalue.h"
+
+#include <utility>
+
+void CheckImpl::reportError(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe, Certainty certainty)
+{
+    // TODO: report debug warning when error is for a disabled severity
+    const ErrorMessage errmsg(callstack, mTokenizer ? &mTokenizer->list : nullptr, severity, id, msg, cwe, certainty);
+    mErrorLogger.reportErr(errmsg);
+}
+
+void CheckImpl::reportError(ErrorPath errorPath, Severity severity, const char id[], const std::string &msg, const CWE &cwe, Certainty certainty)
+{
+    // TODO: report debug warning when error is for a disabled severity
+    const ErrorMessage errmsg(std::move(errorPath), mTokenizer ? &mTokenizer->list : nullptr, severity, id, msg, cwe, certainty);
+    mErrorLogger.reportErr(errmsg);
+}
+
+ErrorPath CheckImpl::getErrorPath(const Token* errtok, const ValueFlow::Value* value, std::string bug) const
+{
+    ErrorPath errorPath;
+    if (!value) {
+        errorPath.emplace_back(errtok, std::move(bug));
+    } else if (mSettings.verbose || mSettings.outputFormat == Settings::OutputFormat::xml || !mSettings.templateLocation.empty()) {
+        errorPath = value->errorPath;
+        errorPath.emplace_back(errtok, std::move(bug));
+    } else {
+        if (value->condition)
+            errorPath.emplace_back(value->condition, "condition '" + value->condition->expressionString() + "'");
+        //else if (!value->isKnown() || value->defaultArg)
+        //    errorPath = value->callstack;
+        errorPath.emplace_back(errtok, std::move(bug));
+    }
+    return errorPath;
+}
+
+void CheckImpl::logChecker(const char id[])
+{
+    if (!mSettings.buildDir.empty() || mSettings.collectLogCheckers())
+        reportError(nullptr, Severity::internal, "logChecker", id);
+}
diff --git a/lib/checkimpl.h b/lib/checkimpl.h
new file mode 100644
index 00000000000..aeff9bfca21
--- /dev/null
+++ b/lib/checkimpl.h
@@ -0,0 +1,79 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 Cppcheck team.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef checkimplH
+#define checkimplH
+
+#include "config.h"
+#include "errortypes.h"
+
+#include <list>
+#include <string>
+
+class Settings;
+class ErrorLogger;
+class Tokenizer;
+class Token;
+namespace ValueFlow {
+    class Value;
+}
+
+class CPPCHECKLIB CheckImpl
+{
+protected:
+    /** This constructor is used when running checks. */
+    CheckImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : mTokenizer(tokenizer), mSettings(settings), mErrorLogger(errorLogger) {}
+
+public:
+    CheckImpl(const CheckImpl &) = delete;
+    CheckImpl& operator=(const CheckImpl &) = delete;
+
+protected:
+    const Tokenizer* const mTokenizer{};
+    const Settings& mSettings;
+    ErrorLogger& mErrorLogger;
+
+    /** report an error */
+    void reportError(const Token *tok, const Severity severity, const std::string &id, const std::string &msg) {
+        reportError(tok, severity, id, msg, CWE(0U), Certainty::normal);
+    }
+
+    /** report an error */
+    void reportError(const Token *tok, const Severity severity, const std::string &id, const std::string &msg, const CWE &cwe, Certainty certainty) {
+        const std::list<const Token *> callstack(1, tok);
+        reportError(callstack, severity, id, msg, cwe, certainty);
+    }
+
+    /** report an error */
+    void reportError(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg) {
+        reportError(callstack, severity, id, msg, CWE(0U), Certainty::normal);
+    }
+
+    /** report an error */
+    void reportError(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe, Certainty certainty);
+
+    void reportError(ErrorPath errorPath, Severity severity, const char id[], const std::string &msg, const CWE &cwe, Certainty certainty);
+
+    ErrorPath getErrorPath(const Token* errtok, const ValueFlow::Value* value, std::string bug) const;
+
+public: // TODO: should be protected
+    void logChecker(const char id[]);
+};
+
+#endif // checkimplH
diff --git a/lib/checkinternal.cpp b/lib/checkinternal.cpp
index f289044b102..93b10210404 100644
--- a/lib/checkinternal.cpp
+++ b/lib/checkinternal.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,13 +31,7 @@
 #include <set>
 #include <vector>
 
-// Register this check class (by creating a static instance of it).
-// Disabled in release builds
-namespace {
-    CheckInternal instance;
-}
-
-void CheckInternal::checkTokenMatchPatterns()
+void CheckInternalImpl::checkTokenMatchPatterns()
 {
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *scope : symbolDatabase->functionScopes) {
@@ -88,7 +82,7 @@ void CheckInternal::checkTokenMatchPatterns()
     }
 }
 
-void CheckInternal::checkRedundantTokCheck()
+void CheckInternalImpl::checkRedundantTokCheck()
 {
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (Token::Match(tok, "&& Token :: simpleMatch|Match|findsimplematch|findmatch (")) {
@@ -123,13 +117,13 @@ void CheckInternal::checkRedundantTokCheck()
 }
 
 
-void CheckInternal::checkRedundantTokCheckError(const Token* tok)
+void CheckInternalImpl::checkRedundantTokCheckError(const Token* tok)
 {
     reportError(tok, Severity::style, "redundantTokCheck",
                 "Unnecessary check of \"" + (tok? tok->expressionString(): "") + "\", match-function already checks if it is null.");
 }
 
-void CheckInternal::checkTokenSimpleMatchPatterns()
+void CheckInternalImpl::checkTokenSimpleMatchPatterns()
 {
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope* scope : symbolDatabase->functionScopes) {
@@ -213,7 +207,7 @@ namespace {
     };
 }
 
-void CheckInternal::checkMissingPercentCharacter()
+void CheckInternalImpl::checkMissingPercentCharacter()
 {
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope* scope : symbolDatabase->functionScopes) {
@@ -254,7 +248,7 @@ void CheckInternal::checkMissingPercentCharacter()
     }
 }
 
-void CheckInternal::checkUnknownPattern()
+void CheckInternalImpl::checkUnknownPattern()
 {
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope* scope : symbolDatabase->functionScopes) {
@@ -288,7 +282,7 @@ void CheckInternal::checkUnknownPattern()
     }
 }
 
-void CheckInternal::checkRedundantNextPrevious()
+void CheckInternalImpl::checkRedundantNextPrevious()
 {
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope* scope : symbolDatabase->functionScopes) {
@@ -311,7 +305,7 @@ void CheckInternal::checkRedundantNextPrevious()
     }
 }
 
-void CheckInternal::checkExtraWhitespace()
+void CheckInternalImpl::checkExtraWhitespace()
 {
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope* scope : symbolDatabase->functionScopes) {
@@ -337,58 +331,58 @@ void CheckInternal::checkExtraWhitespace()
     }
 }
 
-void CheckInternal::simplePatternError(const Token* tok, const std::string& pattern, const std::string &funcname)
+void CheckInternalImpl::simplePatternError(const Token* tok, const std::string& pattern, const std::string &funcname)
 {
     reportError(tok, Severity::warning, "simplePatternError",
                 "Found simple pattern inside Token::" + funcname + "() call: \"" + pattern + "\""
                 );
 }
 
-void CheckInternal::complexPatternError(const Token* tok, const std::string& pattern, const std::string &funcname)
+void CheckInternalImpl::complexPatternError(const Token* tok, const std::string& pattern, const std::string &funcname)
 {
     reportError(tok, Severity::error, "complexPatternError",
                 "Found complex pattern inside Token::" + funcname + "() call: \"" + pattern + "\""
                 );
 }
 
-void CheckInternal::missingPercentCharacterError(const Token* tok, const std::string& pattern, const std::string& funcname)
+void CheckInternalImpl::missingPercentCharacterError(const Token* tok, const std::string& pattern, const std::string& funcname)
 {
     reportError(tok, Severity::error, "missingPercentCharacter",
                 "Missing percent end character in Token::" + funcname + "() pattern: \"" + pattern + "\""
                 );
 }
 
-void CheckInternal::unknownPatternError(const Token* tok, const std::string& pattern)
+void CheckInternalImpl::unknownPatternError(const Token* tok, const std::string& pattern)
 {
     reportError(tok, Severity::error, "unknownPattern",
                 "Unknown pattern used: \"" + pattern + "\"");
 }
 
-void CheckInternal::redundantNextPreviousError(const Token* tok, const std::string& func1, const std::string& func2)
+void CheckInternalImpl::redundantNextPreviousError(const Token* tok, const std::string& func1, const std::string& func2)
 {
     reportError(tok, Severity::style, "redundantNextPrevious",
                 "Call to 'Token::" + func1 + "()' followed by 'Token::" + func2 + "()' can be simplified.");
 }
 
-void CheckInternal::orInComplexPattern(const Token* tok, const std::string& pattern, const std::string &funcname)
+void CheckInternalImpl::orInComplexPattern(const Token* tok, const std::string& pattern, const std::string &funcname)
 {
     reportError(tok, Severity::error, "orInComplexPattern",
                 "Token::" + funcname + "() pattern \"" + pattern + "\" contains \"||\" or \"|\". Replace it by \"%oror%\" or \"%or%\".");
 }
 
-void CheckInternal::extraWhitespaceError(const Token* tok, const std::string& pattern, const std::string &funcname)
+void CheckInternalImpl::extraWhitespaceError(const Token* tok, const std::string& pattern, const std::string &funcname)
 {
     reportError(tok, Severity::warning, "extraWhitespaceError",
                 "Found extra whitespace inside Token::" + funcname + "() call: \"" + pattern + "\""
                 );
 }
 
-void CheckInternal::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckInternal::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
     if (!tokenizer.getSettings().checks.isEnabled(Checks::internalCheck))
         return;
 
-    CheckInternal checkInternal(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckInternalImpl checkInternal(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     checkInternal.checkTokenMatchPatterns();
     checkInternal.checkTokenSimpleMatchPatterns();
@@ -399,9 +393,9 @@ void CheckInternal::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogg
     checkInternal.checkRedundantTokCheck();
 }
 
-void CheckInternal::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckInternal::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckInternal c(nullptr, settings, errorLogger);
+    CheckInternalImpl c(nullptr, settings, errorLogger);
     c.simplePatternError(nullptr, "class {", "Match");
     c.complexPatternError(nullptr, "%type% ( )", "Match");
     c.missingPercentCharacterError(nullptr, "%num", "Match");
diff --git a/lib/checkinternal.h b/lib/checkinternal.h
index 1fc97bcb247..18a1535a73f 100644
--- a/lib/checkinternal.h
+++ b/lib/checkinternal.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,10 @@
 #define checkinternalH
 //---------------------------------------------------------------------------
 
+#ifdef CHECK_INTERNAL
+
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -40,14 +43,25 @@ class Settings;
 class CPPCHECKLIB CheckInternal : public Check {
 public:
     /** This constructor is used when registering the CheckClass */
-    CheckInternal() : Check(myName()) {}
+    CheckInternal() : Check("cppcheck internal API usage") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckInternal(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        // Don't include these checks on the WIKI where people can read what
+        // checks there are. These checks are not intended for users.
+        return "";
+    }
+};
 
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+class CPPCHECKLIB CheckInternalImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    CheckInternalImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** @brief %Check if a simple pattern is used inside Token::Match or Token::findmatch */
     void checkTokenMatchPatterns();
@@ -78,19 +92,10 @@ class CPPCHECKLIB CheckInternal : public Check {
     void orInComplexPattern(const Token *tok, const std::string &pattern, const std::string &funcname);
     void extraWhitespaceError(const Token *tok, const std::string &pattern, const std::string &funcname);
     void checkRedundantTokCheckError(const Token *tok);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "cppcheck internal API usage";
-    }
-
-    std::string classInfo() const override {
-        // Don't include these checks on the WIKI where people can read what
-        // checks there are. These checks are not intended for users.
-        return "";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
+
+#endif // CHECK_INTERNAL
+
 #endif // checkinternalH
diff --git a/lib/checkio.cpp b/lib/checkio.cpp
index 3662adfda8f..4fff7d46282 100644
--- a/lib/checkio.cpp
+++ b/lib/checkio.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,14 +45,10 @@
 
 //---------------------------------------------------------------------------
 
-// Register CheckIO..
-namespace {
-    CheckIO instance;
-}
-
 // CVE ID used:
 static const CWE CWE119(119U);  // Improper Restriction of Operations within the Bounds of a Memory Buffer
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
+static const CWE CWE474(474U);  // Use of Function with Inconsistent Implementations
 static const CWE CWE664(664U);  // Improper Control of a Resource Through its Lifetime
 static const CWE CWE685(685U);  // Function Call With Incorrect Number of Arguments
 static const CWE CWE686(686U);  // Function Call With Incorrect Argument Type
@@ -63,7 +59,7 @@ static const CWE CWE910(910U);  // Use of Expired File Descriptor
 //---------------------------------------------------------------------------
 //    std::cout << std::cout;
 //---------------------------------------------------------------------------
-void CheckIO::checkCoutCerrMisusage()
+void CheckIOImpl::checkCoutCerrMisusage()
 {
     if (mTokenizer->isC())
         return;
@@ -85,7 +81,7 @@ void CheckIO::checkCoutCerrMisusage()
     }
 }
 
-void CheckIO::coutCerrMisusageError(const Token* tok, const std::string& streamName)
+void CheckIOImpl::coutCerrMisusageError(const Token* tok, const std::string& streamName)
 {
     reportError(tok, Severity::error, "coutCerrMisusage", "Invalid usage of output stream: '<< std::" + streamName + "'.", CWE398, Certainty::normal);
 }
@@ -116,6 +112,8 @@ namespace {
         nonneg int op_indent{};
         enum class AppendMode : std::uint8_t { UNKNOWN_AM, APPEND, APPEND_EX };
         AppendMode append_mode = AppendMode::UNKNOWN_AM;
+        enum class ReadMode : std::uint8_t { READ_TEXT, READ_BIN };
+        ReadMode read_mode = ReadMode::READ_BIN;
         std::string filename;
         explicit Filepointer(OpenMode mode_ = OpenMode::UNKNOWN_OM)
             : mode(mode_) {}
@@ -124,11 +122,11 @@ namespace {
     const std::unordered_set<std::string> whitelist = { "clearerr", "feof", "ferror", "fgetpos", "ftell", "setbuf", "setvbuf", "ungetc", "ungetwc" };
 }
 
-void CheckIO::checkFileUsage()
+void CheckIOImpl::checkFileUsage()
 {
-    const bool windows = mSettings->platform.isWindows();
-    const bool printPortability = mSettings->severity.isEnabled(Severity::portability);
-    const bool printWarnings = mSettings->severity.isEnabled(Severity::warning);
+    const bool windows = mSettings.platform.isWindows();
+    const bool printPortability = mSettings.severity.isEnabled(Severity::portability);
+    const bool printWarnings = mSettings.severity.isEnabled(Severity::warning);
 
     std::map<int, Filepointer> filepointers;
 
@@ -157,6 +155,8 @@ void CheckIO::checkFileUsage()
                 tok = tok->linkAt(1);
                 continue;
             }
+            if (tok->function() && tok->function()->nestedIn)
+                continue;
             if (tok->str() == "{")
                 indent++;
             else if (tok->str() == "}") {
@@ -171,7 +171,7 @@ void CheckIO::checkFileUsage()
                         filepointer.second.lastOperation = Filepointer::Operation::UNKNOWN_OP;
                     }
                 }
-            } else if (tok->str() == "return" || tok->str() == "continue" || tok->str() == "break" || mSettings->library.isnoreturn(tok)) { // Reset upon return, continue or break
+            } else if (tok->str() == "return" || tok->str() == "continue" || tok->str() == "break" || mSettings.library.isnoreturn(tok)) { // Reset upon return, continue or break
                 for (std::pair<const int, Filepointer>& filepointer : filepointers) {
                     filepointer.second.mode_indent = 0;
                     filepointer.second.mode = OpenMode::UNKNOWN_OM;
@@ -188,6 +188,7 @@ void CheckIO::checkFileUsage()
                 }
             } else if (Token::Match(tok, "%name% (") && tok->previous() && (!tok->previous()->isName() || Token::Match(tok->previous(), "return|throw"))) {
                 std::string mode;
+                bool isftell = false;
                 const Token* fileTok = nullptr;
                 const Token* fileNameTok = nullptr;
                 Filepointer::Operation operation = Filepointer::Operation::NONE;
@@ -245,12 +246,37 @@ void CheckIO::checkFileUsage()
                 } else if (tok->str() == "fclose") {
                     fileTok = tok->tokAt(2);
                     operation = Filepointer::Operation::CLOSE;
+
+                    // #1473 Check if fclose is in a while loop condition
+                    if (fileTok && fileTok->isVariable()) {
+                        const Token* loopTok = tok->astTop()->previous();
+
+                        if (loopTok && loopTok->str() == "while") {
+                            const Token* bodyEnd = nullptr;
+                            const Token* bodyStart = nullptr;
+
+                            if (Token::simpleMatch(loopTok->previous(), "}") && loopTok->previous()->scope()->type == ScopeType::eDo) { // Handle do-while loops
+                                bodyEnd = loopTok->previous();
+                                bodyStart = bodyEnd->link();
+                            } else {
+                                bodyStart = loopTok->linkAt(1)->next();
+                                bodyEnd = bodyStart->link();
+                            }
+
+                            // Do not trigger a warning if the loop always exits or if the file is opened again in the loop.
+                            if (!isReturnScope(bodyEnd, mSettings.library) && Token::findmatch(bodyStart, "%var% =", bodyEnd, fileTok->varId()) == nullptr)
+                                fcloseInLoopConditionError(tok, fileTok->str());
+                        }
+                    }
                 } else if (whitelist.find(tok->str()) != whitelist.end()) {
                     fileTok = tok->tokAt(2);
                     if ((tok->str() == "ungetc" || tok->str() == "ungetwc") && fileTok)
                         fileTok = fileTok->nextArgument();
+                    else if (tok->str() == "ftell") {
+                        isftell = true;
+                    }
                     operation = Filepointer::Operation::UNIMPORTANT;
-                } else if (!Token::Match(tok, "if|for|while|catch|switch") && !mSettings->library.isFunctionConst(tok->str(), true)) {
+                } else if (!Token::Match(tok, "if|for|while|catch|switch") && !mSettings.library.isFunctionConst(tok->str(), true)) {
                     const Token* const end2 = tok->linkAt(1);
                     if (scope->functionOf && scope->functionOf->isClassOrStruct() && !scope->function->isStatic() && ((tok->strAt(-1) != "::" && tok->strAt(-1) != ".") || tok->strAt(-2) == "this")) {
                         if (!tok->function() || (tok->function()->nestedIn && tok->function()->nestedIn->isClassOrStruct())) {
@@ -304,10 +330,15 @@ void CheckIO::checkFileUsage()
                             f.append_mode = Filepointer::AppendMode::APPEND_EX;
                         else
                             f.append_mode = Filepointer::AppendMode::APPEND;
+                    }
+                    else if (mode.find('r') != std::string::npos &&
+                             mode.find('t') != std::string::npos) {
+                        f.read_mode = Filepointer::ReadMode::READ_TEXT;
                     } else
                         f.append_mode = Filepointer::AppendMode::UNKNOWN_AM;
                     f.mode_indent = indent;
                     break;
+
                 case Filepointer::Operation::POSITIONING:
                     if (f.mode == OpenMode::CLOSED)
                         useClosedFileError(tok);
@@ -340,6 +371,8 @@ void CheckIO::checkFileUsage()
                 case Filepointer::Operation::UNIMPORTANT:
                     if (f.mode == OpenMode::CLOSED)
                         useClosedFileError(tok);
+                    if (isftell && f.read_mode == Filepointer::ReadMode::READ_TEXT && printPortability)
+                        ftellFileError(tok);
                     break;
                 case Filepointer::Operation::UNKNOWN_OP:
                     f.mode = OpenMode::UNKNOWN_OM;
@@ -362,43 +395,58 @@ void CheckIO::checkFileUsage()
     }
 }
 
-void CheckIO::fflushOnInputStreamError(const Token *tok, const std::string &varname)
+void CheckIOImpl::fflushOnInputStreamError(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::portability,
                 "fflushOnInputStream", "fflush() called on input stream '" + varname + "' may result in undefined behaviour on non-linux systems.", CWE398, Certainty::normal);
 }
 
-void CheckIO::ioWithoutPositioningError(const Token *tok)
+void CheckIOImpl::ioWithoutPositioningError(const Token *tok)
 {
     reportError(tok, Severity::error,
                 "IOWithoutPositioning", "Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour.", CWE664, Certainty::normal);
 }
 
-void CheckIO::readWriteOnlyFileError(const Token *tok)
+void CheckIOImpl::readWriteOnlyFileError(const Token *tok)
 {
     reportError(tok, Severity::error,
                 "readWriteOnlyFile", "Read operation on a file that was opened only for writing.", CWE664, Certainty::normal);
 }
 
-void CheckIO::writeReadOnlyFileError(const Token *tok)
+void CheckIOImpl::writeReadOnlyFileError(const Token *tok)
 {
     reportError(tok, Severity::error,
                 "writeReadOnlyFile", "Write operation on a file that was opened only for reading.", CWE664, Certainty::normal);
 }
 
-void CheckIO::useClosedFileError(const Token *tok)
+void CheckIOImpl::useClosedFileError(const Token *tok)
 {
     reportError(tok, Severity::error,
                 "useClosedFile", "Used file that is not opened.", CWE910, Certainty::normal);
 }
 
-void CheckIO::seekOnAppendedFileError(const Token *tok)
+void CheckIOImpl::fcloseInLoopConditionError(const Token *tok, const std::string &varname)
+{
+    reportError(tok, Severity::warning,
+                "fcloseInLoopCondition",
+                "fclose() used as loop condition may skip loop body or double-close file handle.\n"
+                "fclose() closes '" + varname + "' each time it is evaluated. On success the loop body might never execute, on failure fclose() might be called again on the already-closed file handle.",
+                CWE910, Certainty::normal);
+}
+
+void CheckIOImpl::seekOnAppendedFileError(const Token *tok)
 {
     reportError(tok, Severity::warning,
                 "seekOnAppendedFile", "Repositioning operation performed on a file opened in append mode has no effect.", CWE398, Certainty::normal);
 }
 
-void CheckIO::incompatibleFileOpenError(const Token *tok, const std::string &filename)
+void CheckIOImpl::ftellFileError(const Token *tok)
+{
+    reportError(tok, Severity::portability,
+                "ftellTextModeFile", "ftell() result is unspecified when file is opened in mode \"t\"", CWE474, Certainty::normal);
+}
+
+void CheckIOImpl::incompatibleFileOpenError(const Token *tok, const std::string &filename)
 {
     reportError(tok, Severity::warning,
                 "incompatibleFileOpen", "The file '" + filename + "' is opened for read and write access at the same time on different streams", CWE664, Certainty::normal);
@@ -408,9 +456,9 @@ void CheckIO::incompatibleFileOpenError(const Token *tok, const std::string &fil
 //---------------------------------------------------------------------------
 // scanf without field width limits can crash with huge input data
 //---------------------------------------------------------------------------
-void CheckIO::invalidScanf()
+void CheckIOImpl::invalidScanf()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("invalidscanf"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("invalidscanf"))
         return;
 
     logChecker("CheckIO::invalidScanf");
@@ -455,7 +503,7 @@ void CheckIO::invalidScanf()
     }
 }
 
-void CheckIO::invalidScanfError(const Token *tok)
+void CheckIOImpl::invalidScanfError(const Token *tok)
 {
     const std::string fname = (tok ? tok->str() : std::string("scanf"));
     reportError(tok, Severity::warning,
@@ -481,22 +529,157 @@ void CheckIO::invalidScanfError(const Token *tok)
                 CWE119, Certainty::normal);
 }
 
+static const Token* findFileReadCall(const Token *start, const Token *end, int varid)
+{
+    const Token* found = Token::findmatch(start, "fgets|fgetc|getc|fread|fscanf (", end);
+    while (found) {
+        const std::vector<const Token*> args = getArguments(found);
+        if (!args.empty()) {
+            const bool match = (found->str() == "fscanf")
+                               ? args.front()->varId() == varid
+                               : args.back()->varId() == varid;
+            if (match)
+                return found;
+        }
+        found = Token::findmatch(found->next(), "fgets|fgetc|getc|fread|fscanf (", end);
+    }
+    return nullptr;
+}
+
+void CheckIOImpl::checkWrongfeofUsage()
+{
+    const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
+
+    logChecker("CheckIO::checkWrongfeofUsage");
+
+    for (const Scope * scope : symbolDatabase->functionScopes) {
+        for (const Token *tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
+            // TODO: Handle for loops
+            if (!Token::Match(tok, "while ( ! feof ( %var% )"))
+                continue;
+
+            // Bail out if we cannot identify file pointer
+            const int fpVarId = tok->tokAt(5)->varId();
+            if (fpVarId == 0)
+                continue;
+
+            const Token *endCond = tok->linkAt(1);
+            const Token *bodyStart;
+            const Token *bodyEnd;
+
+            if (Token::simpleMatch(tok->previous(), "}") && tok->previous()->scope()->type == ScopeType::eDo) {
+                bodyEnd = tok->previous();
+                bodyStart = bodyEnd->link();
+            } else {
+                if (!Token::simpleMatch(endCond, ") {"))
+                    continue;
+                bodyEnd = endCond->linkAt(1);
+                bodyStart = endCond->next();
+            }
+
+            // Bail out if the loop contains control flow (too complex to analyze)
+            if (Token::findmatch(bodyStart, "return|break|goto|continue|throw", bodyEnd))
+                continue;
+
+            // Bail out if fp is used outside of known file I/O functions.
+            // If it is passed to an unknown function, reads may occur there.
+            bool fpUsedElsewhere = false;
+            for (const Token *t = bodyStart->next(); t && t != bodyEnd; t = t->next()) {
+                if (t->varId() != fpVarId)
+                    continue;
+                const Token *p = t->astParent();
+                while (p && p->str() == ",")
+                    p = p->astParent();
+                if (!p || !Token::Match(p->astOperand1(), "fgets|fgetc|getc|fread|fscanf|fprintf|fwrite|fputs|fputc|putc")) {
+                    fpUsedElsewhere = true;
+                    break;
+                }
+            }
+            if (fpUsedElsewhere)
+                continue;
+
+            // No file read call in the loop: feof can never become true inside it
+            const Token *loopFileReadCallTok = findFileReadCall(bodyStart, bodyEnd, fpVarId);
+            if (!loopFileReadCallTok) {
+                // TODO: Warn about infinite loop
+                continue;
+            }
+
+            // Find last file read
+            const Token *lastLoopFileReadCallTok = loopFileReadCallTok;
+            while (loopFileReadCallTok) {
+                lastLoopFileReadCallTok = loopFileReadCallTok;
+                loopFileReadCallTok = findFileReadCall(lastLoopFileReadCallTok->next(), bodyEnd, fpVarId);
+            }
+
+            // Warn if the destination of the last file read is used after the call before bodyEnd.
+            // If it is not, the stale buffer is never accessed on the extra iteration at EOF.
+
+            if (lastLoopFileReadCallTok->str() == "fgetc" || lastLoopFileReadCallTok->str() == "getc") {
+                // Warn if the return value feeds into an expression (astParent of the call node)
+                if (lastLoopFileReadCallTok->astParent() && lastLoopFileReadCallTok->astParent()->astParent())
+                    wrongfeofUsage(getCondTok(tok));
+            } else {
+                const std::vector<const Token*> args = getArguments(lastLoopFileReadCallTok);
+                // Collect destination varIds
+                std::vector<nonneg int> destVarIds;
+                if (lastLoopFileReadCallTok->str() == "fscanf") {
+                    // args[0]=fp, args[1]=format, args[2+]=destinations (typically &var)
+                    for (std::size_t i = 2; i < args.size(); ++i) {
+                        const Token *destTok = Token::Match(args[i], "& %var%") ? args[i]->next() : args[i];
+                        if (destTok->varId() != 0)
+                            destVarIds.push_back(destTok->varId());
+                    }
+                } else {
+                    // Handle fgets, fread
+                    // First argument is the destination buffer
+                    if (!args.empty() && args.front()->varId() != 0)
+                        destVarIds.push_back(args.front()->varId());
+                }
+
+                // Search for any destination use between this call's ';' and endBody
+                const Token *semiColonTok = lastLoopFileReadCallTok->linkAt(1)->next();
+                for (const Token *t = semiColonTok; t && t != bodyEnd; t = t->next()) {
+                    if (std::find(destVarIds.begin(), destVarIds.end(), t->varId()) != destVarIds.end()) {
+                        wrongfeofUsage(getCondTok(tok));
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}
+
+void CheckIOImpl::wrongfeofUsage(const Token * tok)
+{
+    reportError(tok, Severity::warning,
+                "wrongfeofUsage",
+                "Using feof() as a loop condition causes the last line to be processed twice.\n"
+                "feof() returns true only after a read has failed due to end-of-file, so the loop "
+                "body executes once more after the last successful read. Check the return value of "
+                "the read function instead (e.g. fgets, fread, fscanf).");
+}
+
 //---------------------------------------------------------------------------
 //    printf("%u", "xyz"); // Wrong argument type
 //    printf("%u%s", 1); // Too few arguments
 //    printf("", 1); // Too much arguments
 //---------------------------------------------------------------------------
 
-static bool findFormat(nonneg int arg, const Token *firstArg,
+static bool findFormat(nonneg int arg, nonneg int argc, const Token *firstArg,
                        const Token *&formatStringTok, const Token *&formatArgTok)
 {
+    formatArgTok = firstArg;
+
+    for (int i = 0; i < argc && formatArgTok; ++i)
+        formatArgTok = formatArgTok->nextArgument();
+
     const Token* argTok = firstArg;
 
     for (int i = 0; i < arg && argTok; ++i)
         argTok = argTok->nextArgument();
 
     if (Token::Match(argTok, "%str% [,)]")) {
-        formatArgTok = argTok->nextArgument();
         formatStringTok = argTok;
         return true;
     }
@@ -507,7 +690,6 @@ static bool findFormat(nonneg int arg, const Token *firstArg,
          (argTok->variable()->dimensions().size() == 1 &&
           argTok->variable()->dimensionKnown(0) &&
           argTok->variable()->dimension(0) != 0))) {
-        formatArgTok = argTok->nextArgument();
         if (!argTok->values().empty()) {
             const auto value = std::find_if(
                 argTok->values().cbegin(), argTok->values().cend(), std::mem_fn(&ValueFlow::Value::isTokValue));
@@ -527,10 +709,21 @@ static inline bool typesMatch(const std::string& iToTest, const std::string& iTy
     return (iToTest == iTypename) || (iToTest == iOptionalPrefix + iTypename);
 }
 
-void CheckIO::checkWrongPrintfScanfArguments()
+static int getMaxArgNo(const Library::Function *func)
+{
+    const auto &checks = func->argumentChecks;
+    return std::max_element(checks.cbegin(), checks.cend(),
+                            [](const std::pair<int, Library::ArgumentChecks> &lhs,
+                               const std::pair<int, Library::ArgumentChecks> &rhs) {
+        return lhs.first < rhs.first;
+    }
+                            )->first;
+}
+
+void CheckIOImpl::checkWrongPrintfScanfArguments()
 {
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
-    const bool isWindows = mSettings->platform.isWindows();
+    const bool isWindows = mSettings.platform.isWindows();
 
     logChecker("CheckIO::checkWrongPrintfScanfArguments");
 
@@ -544,46 +737,48 @@ void CheckIO::checkWrongPrintfScanfArguments()
             bool scan = false;
             bool scanf_s = false;
             int formatStringArgNo = -1;
+            int argc = -1;
 
-            if (tok->strAt(1) == "(" && mSettings->library.formatstr_function(tok)) {
-                formatStringArgNo = mSettings->library.formatstr_argno(tok);
-                scan = mSettings->library.formatstr_scan(tok);
-                scanf_s = mSettings->library.formatstr_secure(tok);
+            if (tok->strAt(1) == "(" && mSettings.library.formatstr_function(tok)) {
+                argc = getMaxArgNo(mSettings.library.getFunction(tok));
+                formatStringArgNo = mSettings.library.formatstr_argno(tok);
+                scan = mSettings.library.formatstr_scan(tok);
+                scanf_s = mSettings.library.formatstr_secure(tok);
             }
 
             if (formatStringArgNo >= 0) {
                 // formatstring found in library. Find format string and first argument belonging to format string.
-                if (!findFormat(formatStringArgNo, tok->tokAt(2), formatStringTok, argListTok))
+                if (!findFormat(formatStringArgNo, argc, tok->tokAt(2), formatStringTok, argListTok))
                     continue;
             } else if (Token::simpleMatch(tok, "swprintf (")) {
                 if (Token::Match(tok->tokAt(2)->nextArgument(), "%str%")) {
                     // Find third parameter and format string
-                    if (!findFormat(1, tok->tokAt(2), formatStringTok, argListTok))
+                    if (!findFormat(1, 2, tok->tokAt(2), formatStringTok, argListTok))
                         continue;
                 } else {
                     // Find fourth parameter and format string
-                    if (!findFormat(2, tok->tokAt(2), formatStringTok, argListTok))
+                    if (!findFormat(2, 3, tok->tokAt(2), formatStringTok, argListTok))
                         continue;
                 }
             } else if (isWindows && Token::Match(tok, "sprintf_s|swprintf_s (")) {
                 // template <size_t size> int sprintf_s(char (&buffer)[size], const char *format, ...);
-                if (findFormat(1, tok->tokAt(2), formatStringTok, argListTok)) {
+                if (findFormat(1, 2, tok->tokAt(2), formatStringTok, argListTok)) {
                     if (!formatStringTok)
                         continue;
                 }
                 // int sprintf_s(char *buffer, size_t sizeOfBuffer, const char *format, ...);
-                else if (findFormat(2, tok->tokAt(2), formatStringTok, argListTok)) {
+                else if (findFormat(2, 3, tok->tokAt(2), formatStringTok, argListTok)) {
                     if (!formatStringTok)
                         continue;
                 }
             } else if (isWindows && Token::Match(tok, "_snprintf_s|_snwprintf_s (")) {
                 // template <size_t size> int _snprintf_s(char (&buffer)[size], size_t count, const char *format, ...);
-                if (findFormat(2, tok->tokAt(2), formatStringTok, argListTok)) {
+                if (findFormat(2, 3, tok->tokAt(2), formatStringTok, argListTok)) {
                     if (!formatStringTok)
                         continue;
                 }
                 // int _snprintf_s(char *buffer, size_t sizeOfBuffer, size_t count, const char *format, ...);
-                else if (findFormat(3, tok->tokAt(2), formatStringTok, argListTok)) {
+                else if (findFormat(3, 4, tok->tokAt(2), formatStringTok, argListTok)) {
                     if (!formatStringTok)
                         continue;
                 }
@@ -599,14 +794,14 @@ void CheckIO::checkWrongPrintfScanfArguments()
     }
 }
 
-void CheckIO::checkFormatString(const Token * const tok,
-                                const Token * const formatStringTok,
-                                const Token *       argListTok,
-                                const bool scan,
-                                const bool scanf_s)
+void CheckIOImpl::checkFormatString(const Token * const tok,
+                                    const Token * const formatStringTok,
+                                    const Token *       argListTok,
+                                    const bool scan,
+                                    const bool scanf_s)
 {
-    const bool isWindows = mSettings->platform.isWindows();
-    const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
+    const bool isWindows = mSettings.platform.isWindows();
+    const bool printWarning = mSettings.severity.isEnabled(Severity::warning);
     const std::string &formatString = formatStringTok->str();
 
     // Count format string parameters..
@@ -664,6 +859,8 @@ void CheckIO::checkFormatString(const Token * const tok,
                 }
                 ++i;
             }
+            while (!width.empty() && width[0] == '0')
+                width = width.substr(1);
             auto bracketBeg = formatString.cend();
             if (i != formatString.cend() && *i == '[') {
                 bracketBeg = i;
@@ -674,7 +871,6 @@ void CheckIO::checkFormatString(const Token * const tok,
                     ++i;
                 }
                 if (scanf_s && !skip) {
-                    numSecure++;
                     if (argListTok) {
                         argListTok = argListTok->nextArgument();
                     }
@@ -697,9 +893,9 @@ void CheckIO::checkFormatString(const Token * const tok,
                 }
 
                 // Perform type checks
-                ArgumentInfo argInfo(argListTok, *mSettings, mTokenizer->isCPP());
+                ArgumentInfo argInfo(argListTok, mSettings, mTokenizer->isCPP());
 
-                if ((argInfo.typeToken && !argInfo.isLibraryType(*mSettings)) || *i == ']') {
+                if ((argInfo.typeToken && !argInfo.isLibraryType(mSettings.library)) || *i == ']') {
                     if (scan) {
                         std::string specifier;
                         bool done = false;
@@ -719,10 +915,10 @@ void CheckIO::checkFormatString(const Token * const tok,
                                     argInfo.isKnownType() && argInfo.isArrayOrPointer() &&
                                     (!Token::Match(argInfo.typeToken, "char|wchar_t") ||
                                      argInfo.typeToken->strAt(-1) == "const")) {
-                                    if (!(argInfo.isArrayOrPointer() && argInfo.element && !argInfo.typeToken->isStandardType()))
+                                    if (!argInfo.element || argInfo.typeToken->isStandardType())
                                         invalidScanfArgTypeError_s(tok, numFormat, specifier, &argInfo);
                                 }
-                                if (scanf_s && argInfo.typeToken) {
+                                if (scanf_s) {
                                     numSecure++;
                                     if (argListTok) {
                                         argListTok = argListTok->nextArgument();
@@ -1343,7 +1539,7 @@ void CheckIO::checkFormatString(const Token * const tok,
 // We currently only support string literals, variables, and functions.
 /// @todo add non-string literals, and generic expressions
 
-CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &settings, bool _isCPP)
+CheckIOImpl::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &settings, bool _isCPP)
     : isCPP(_isCPP)
 {
     if (!arg)
@@ -1540,9 +1736,10 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &settings,
                 if (element && isStdVectorOrString()) { // isStdVectorOrString sets type token if true
                     element = false;    // not really an array element
                 } else if (variableInfo->isEnumType()) {
-                    if (variableInfo->type() && variableInfo->type()->classScope && variableInfo->type()->classScope->enumType)
+                    const bool hasEnumType = variableInfo->type() && variableInfo->type()->classScope && variableInfo->type()->classScope->enumType;
+                    if (hasEnumType && variableInfo->type()->classScope->enumType->isStandardType())
                         typeToken = variableInfo->type()->classScope->enumType;
-                    else {
+                    else if (!hasEnumType) {
                         tempToken = new Token(tok1);
                         tempToken->str("int");
                         typeToken = tempToken;
@@ -1556,7 +1753,7 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &settings,
     }
 }
 
-CheckIO::ArgumentInfo::~ArgumentInfo()
+CheckIOImpl::ArgumentInfo::~ArgumentInfo()
 {
     if (tempToken) {
         while (tempToken->next())
@@ -1571,7 +1768,7 @@ namespace {
     const std::set<std::string> stl_string = { "string", "u16string", "u32string", "wstring" };
 }
 
-bool CheckIO::ArgumentInfo::isStdVectorOrString()
+bool CheckIOImpl::ArgumentInfo::isStdVectorOrString()
 {
     if (!isCPP)
         return false;
@@ -1633,7 +1830,7 @@ static const std::set<std::string> stl_container = {
     "unordered_map", "unordered_multimap", "unordered_multiset", "unordered_set", "vector"
 };
 
-bool CheckIO::ArgumentInfo::isStdContainer(const Token *tok)
+bool CheckIOImpl::ArgumentInfo::isStdContainer(const Token *tok)
 {
     if (!isCPP)
         return false;
@@ -1665,7 +1862,7 @@ bool CheckIO::ArgumentInfo::isStdContainer(const Token *tok)
     return false;
 }
 
-bool CheckIO::ArgumentInfo::isArrayOrPointer() const
+bool CheckIOImpl::ArgumentInfo::isArrayOrPointer() const
 {
     if (address)
         return true;
@@ -1678,10 +1875,10 @@ bool CheckIO::ArgumentInfo::isArrayOrPointer() const
     return tok && tok->strAt(1) == "*";
 }
 
-bool CheckIO::ArgumentInfo::isComplexType() const
+bool CheckIOImpl::ArgumentInfo::isComplexType() const
 {
     if (variableInfo->type())
-        return (true);
+        return true;
 
     const Token* varTypeTok = typeToken;
     if (varTypeTok->str() == "std")
@@ -1690,7 +1887,7 @@ bool CheckIO::ArgumentInfo::isComplexType() const
     return ((variableInfo->isStlStringType() || (varTypeTok->strAt(1) == "<" && varTypeTok->linkAt(1) && varTypeTok->linkAt(1)->strAt(1) != "::")) && !variableInfo->isArrayOrPointer());
 }
 
-bool CheckIO::ArgumentInfo::isKnownType() const
+bool CheckIOImpl::ArgumentInfo::isKnownType() const
 {
     if (variableInfo)
         return (typeToken->isStandardType() || typeToken->next()->isStandardType() || isComplexType());
@@ -1700,18 +1897,18 @@ bool CheckIO::ArgumentInfo::isKnownType() const
     return typeToken->isStandardType() || Token::Match(typeToken, "std :: string|wstring");
 }
 
-bool CheckIO::ArgumentInfo::isLibraryType(const Settings &settings) const
+bool CheckIOImpl::ArgumentInfo::isLibraryType(const Library &library) const
 {
-    return typeToken && typeToken->isStandardType() && settings.library.podtype(typeToken->str());
+    return typeToken && typeToken->isStandardType() && library.podtype(typeToken->str());
 }
 
-void CheckIO::wrongPrintfScanfArgumentsError(const Token* tok,
-                                             const std::string &functionName,
-                                             nonneg int numFormat,
-                                             nonneg int numFunction)
+void CheckIOImpl::wrongPrintfScanfArgumentsError(const Token* tok,
+                                                 const std::string &functionName,
+                                                 nonneg int numFormat,
+                                                 nonneg int numFunction)
 {
     const Severity severity = numFormat > numFunction ? Severity::error : Severity::warning;
-    if (severity != Severity::error && !mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("wrongPrintfScanfArgNum"))
+    if (severity != Severity::error && !mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("wrongPrintfScanfArgNum"))
         return;
 
     std::ostringstream errmsg;
@@ -1727,10 +1924,10 @@ void CheckIO::wrongPrintfScanfArgumentsError(const Token* tok,
     reportError(tok, severity, "wrongPrintfScanfArgNum", errmsg.str(), CWE685, Certainty::normal);
 }
 
-void CheckIO::wrongPrintfScanfPosixParameterPositionError(const Token* tok, const std::string& functionName,
-                                                          nonneg int index, nonneg int numFunction)
+void CheckIOImpl::wrongPrintfScanfPosixParameterPositionError(const Token* tok, const std::string& functionName,
+                                                              nonneg int index, nonneg int numFunction)
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("wrongPrintfScanfParameterPositionError"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("wrongPrintfScanfParameterPositionError"))
         return;
     std::ostringstream errmsg;
     errmsg << functionName << ": ";
@@ -1742,10 +1939,10 @@ void CheckIO::wrongPrintfScanfPosixParameterPositionError(const Token* tok, cons
     reportError(tok, Severity::warning, "wrongPrintfScanfParameterPositionError", errmsg.str(), CWE685, Certainty::normal);
 }
 
-void CheckIO::invalidScanfArgTypeError_s(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
+void CheckIOImpl::invalidScanfArgTypeError_s(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%" << specifier << " in format string (no. " << numFormat << ") requires a \'";
@@ -1758,10 +1955,10 @@ void CheckIO::invalidScanfArgTypeError_s(const Token* tok, nonneg int numFormat,
     errmsg << ".";
     reportError(tok, severity, "invalidScanfArgType_s", errmsg.str(), CWE686, Certainty::normal);
 }
-void CheckIO::invalidScanfArgTypeError_int(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo, bool isUnsigned)
+void CheckIOImpl::invalidScanfArgTypeError_int(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo, bool isUnsigned)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%" << specifier << " in format string (no. " << numFormat << ") requires \'";
@@ -1803,10 +2000,10 @@ void CheckIO::invalidScanfArgTypeError_int(const Token* tok, nonneg int numForma
     errmsg << ".";
     reportError(tok, severity, "invalidScanfArgType_int", errmsg.str(), CWE686, Certainty::normal);
 }
-void CheckIO::invalidScanfArgTypeError_float(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
+void CheckIOImpl::invalidScanfArgTypeError_float(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%" << specifier << " in format string (no. " << numFormat << ") requires \'";
@@ -1822,10 +2019,10 @@ void CheckIO::invalidScanfArgTypeError_float(const Token* tok, nonneg int numFor
     reportError(tok, severity, "invalidScanfArgType_float", errmsg.str(), CWE686, Certainty::normal);
 }
 
-void CheckIO::invalidPrintfArgTypeError_s(const Token* tok, nonneg int numFormat, const ArgumentInfo* argInfo)
+void CheckIOImpl::invalidPrintfArgTypeError_s(const Token* tok, nonneg int numFormat, const ArgumentInfo* argInfo)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%s in format string (no. " << numFormat << ") requires \'char *\' but the argument type is ";
@@ -1833,10 +2030,10 @@ void CheckIO::invalidPrintfArgTypeError_s(const Token* tok, nonneg int numFormat
     errmsg << ".";
     reportError(tok, severity, "invalidPrintfArgType_s", errmsg.str(), CWE686, Certainty::normal);
 }
-void CheckIO::invalidPrintfArgTypeError_n(const Token* tok, nonneg int numFormat, const ArgumentInfo* argInfo)
+void CheckIOImpl::invalidPrintfArgTypeError_n(const Token* tok, nonneg int numFormat, const ArgumentInfo* argInfo)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%n in format string (no. " << numFormat << ") requires \'int *\' but the argument type is ";
@@ -1844,10 +2041,10 @@ void CheckIO::invalidPrintfArgTypeError_n(const Token* tok, nonneg int numFormat
     errmsg << ".";
     reportError(tok, severity, "invalidPrintfArgType_n", errmsg.str(), CWE686, Certainty::normal);
 }
-void CheckIO::invalidPrintfArgTypeError_p(const Token* tok, nonneg int numFormat, const ArgumentInfo* argInfo)
+void CheckIOImpl::invalidPrintfArgTypeError_p(const Token* tok, nonneg int numFormat, const ArgumentInfo* argInfo)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%p in format string (no. " << numFormat << ") requires an address but the argument type is ";
@@ -1894,10 +2091,10 @@ static void printfFormatType(std::ostream& os, const std::string& specifier, boo
     os << "\'";
 }
 
-void CheckIO::invalidPrintfArgTypeError_uint(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
+void CheckIOImpl::invalidPrintfArgTypeError_uint(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%" << specifier << " in format string (no. " << numFormat << ") requires ";
@@ -1908,10 +2105,10 @@ void CheckIO::invalidPrintfArgTypeError_uint(const Token* tok, nonneg int numFor
     reportError(tok, severity, "invalidPrintfArgType_uint", errmsg.str(), CWE686, Certainty::normal);
 }
 
-void CheckIO::invalidPrintfArgTypeError_sint(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
+void CheckIOImpl::invalidPrintfArgTypeError_sint(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%" << specifier << " in format string (no. " << numFormat << ") requires ";
@@ -1921,10 +2118,10 @@ void CheckIO::invalidPrintfArgTypeError_sint(const Token* tok, nonneg int numFor
     errmsg << ".";
     reportError(tok, severity, "invalidPrintfArgType_sint", errmsg.str(), CWE686, Certainty::normal);
 }
-void CheckIO::invalidPrintfArgTypeError_float(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
+void CheckIOImpl::invalidPrintfArgTypeError_float(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%" << specifier << " in format string (no. " << numFormat << ") requires \'";
@@ -1936,12 +2133,12 @@ void CheckIO::invalidPrintfArgTypeError_float(const Token* tok, nonneg int numFo
     reportError(tok, severity, "invalidPrintfArgType_float", errmsg.str(), CWE686, Certainty::normal);
 }
 
-Severity CheckIO::getSeverity(const CheckIO::ArgumentInfo *argInfo)
+Severity CheckIOImpl::getSeverity(const ArgumentInfo *argInfo)
 {
     return (argInfo && argInfo->typeToken && !argInfo->typeToken->originalName().empty()) ? Severity::portability : Severity::warning;
 }
 
-void CheckIO::argumentType(std::ostream& os, const ArgumentInfo * argInfo)
+void CheckIOImpl::argumentType(std::ostream& os, const ArgumentInfo * argInfo)
 {
     if (argInfo) {
         os << "\'";
@@ -1991,16 +2188,16 @@ void CheckIO::argumentType(std::ostream& os, const ArgumentInfo * argInfo)
         os << "Unknown";
 }
 
-void CheckIO::invalidLengthModifierError(const Token* tok, nonneg int numFormat, const std::string& modifier)
+void CheckIOImpl::invalidLengthModifierError(const Token* tok, nonneg int numFormat, const std::string& modifier)
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("invalidLengthModifierError"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("invalidLengthModifierError"))
         return;
     std::ostringstream errmsg;
     errmsg << "'" << modifier << "' in format string (no. " << numFormat << ") is a length modifier and cannot be used without a conversion specifier.";
     reportError(tok, Severity::warning, "invalidLengthModifierError", errmsg.str(), CWE704, Certainty::normal);
 }
 
-void CheckIO::invalidScanfFormatWidthError(const Token* tok, nonneg int numFormat, int width, const Variable *var, const std::string& specifier)
+void CheckIOImpl::invalidScanfFormatWidthError(const Token* tok, nonneg int numFormat, int width, const Variable *var, const std::string& specifier)
 {
     MathLib::bigint arrlen = 0;
     std::string varname;
@@ -2012,7 +2209,7 @@ void CheckIO::invalidScanfFormatWidthError(const Token* tok, nonneg int numForma
 
     std::ostringstream errmsg;
     if (arrlen > width) {
-        if (tok != nullptr && (!mSettings->certainty.isEnabled(Certainty::inconclusive) || !mSettings->severity.isEnabled(Severity::warning)))
+        if (tok != nullptr && (!mSettings.certainty.isEnabled(Certainty::inconclusive) || !mSettings.severity.isEnabled(Severity::warning)))
             return;
         errmsg << "Width " << width << " given in format string (no. " << numFormat << ") is smaller than destination buffer"
                << " '" << varname << "[" << arrlen << "]'.";
@@ -2024,27 +2221,30 @@ void CheckIO::invalidScanfFormatWidthError(const Token* tok, nonneg int numForma
     }
 }
 
-void CheckIO::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckIO::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckIO checkIO(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckIOImpl checkIO(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     checkIO.checkWrongPrintfScanfArguments();
     checkIO.checkCoutCerrMisusage();
     checkIO.checkFileUsage();
+    checkIO.checkWrongfeofUsage();
     checkIO.invalidScanf();
 }
 
-void CheckIO::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckIO::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckIO c(nullptr, settings, errorLogger);
+    CheckIOImpl c(nullptr, settings, errorLogger);
     c.coutCerrMisusageError(nullptr,  "cout");
     c.fflushOnInputStreamError(nullptr,  "stdin");
     c.ioWithoutPositioningError(nullptr);
     c.readWriteOnlyFileError(nullptr);
     c.writeReadOnlyFileError(nullptr);
     c.useClosedFileError(nullptr);
+    c.fcloseInLoopConditionError(nullptr, "fp");
     c.seekOnAppendedFileError(nullptr);
     c.incompatibleFileOpenError(nullptr, "tmp");
+    c.wrongfeofUsage(nullptr);
     c.invalidScanfError(nullptr);
     c.wrongPrintfScanfArgumentsError(nullptr, "printf",3,2);
     c.invalidScanfArgTypeError_s(nullptr,  1, "s", nullptr);
diff --git a/lib/checkio.h b/lib/checkio.h
index e37a942770b..06c6d8d973b 100644
--- a/lib/checkio.h
+++ b/lib/checkio.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <cstdint>
@@ -34,6 +35,7 @@ class Token;
 class Variable;
 class ErrorLogger;
 class Tokenizer;
+class Library;
 enum class Severity : std::uint8_t;
 
 /// @addtogroup Checks
@@ -41,19 +43,36 @@ enum class Severity : std::uint8_t;
 
 /** @brief %Check input output operations. */
 class CPPCHECKLIB CheckIO : public Check {
-    friend class TestIO;
-
 public:
     /** @brief This constructor is used when registering CheckIO */
-    CheckIO() : Check(myName()) {}
+    CheckIO() : Check("IO using format string") {}
 
 private:
-    /** @brief This constructor is used when running checks. */
-    CheckIO(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks on the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Check format string input/output operations.\n"
+               "- Bad usage of the function 'sprintf' (overlapping data)\n"
+               "- Missing or wrong width specifiers in 'scanf' format string\n"
+               "- Use a file that has been closed\n"
+               "- File input/output without positioning results in undefined behaviour\n"
+               "- Read to a file that has only been opened for writing (or vice versa)\n"
+               "- Repositioning operation on a file opened in append mode\n"
+               "- The same file can't be open for read and write at the same time on different streams\n"
+               "- Using fflush() on an input stream\n"
+               "- Invalid usage of output stream. For example: 'std::cout << std::cout;'\n"
+               "- Wrong number of arguments given to 'printf' or 'scanf;'\n";
+    }
+};
+
+class CPPCHECKLIB CheckIOImpl : public CheckImpl {
+public:
+    /** @brief This constructor is used when running checks. */
+    CheckIOImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** @brief %Check for missusage of std::cout */
     void checkCoutCerrMisusage();
@@ -64,6 +83,9 @@ class CPPCHECKLIB CheckIO : public Check {
     /** @brief scanf can crash if width specifiers are not used */
     void invalidScanf();
 
+    /** @brief %Check wrong usage of feof */
+    void checkWrongfeofUsage();
+
     /** @brief %Checks type and number of arguments given to functions like printf or scanf*/
     void checkWrongPrintfScanfArguments();
 
@@ -80,7 +102,7 @@ class CPPCHECKLIB CheckIO : public Check {
         bool isKnownType() const;
         bool isStdVectorOrString();
         bool isStdContainer(const Token *tok);
-        bool isLibraryType(const Settings &settings) const;
+        bool isLibraryType(const Library &library) const;
 
         const Variable* variableInfo{};
         const Token* typeToken{};
@@ -105,9 +127,12 @@ class CPPCHECKLIB CheckIO : public Check {
     void readWriteOnlyFileError(const Token *tok);
     void writeReadOnlyFileError(const Token *tok);
     void useClosedFileError(const Token *tok);
+    void fcloseInLoopConditionError(const Token *tok, const std::string &varname);
     void seekOnAppendedFileError(const Token *tok);
+    void ftellFileError(const Token *tok);
     void incompatibleFileOpenError(const Token *tok, const std::string &filename);
     void invalidScanfError(const Token *tok);
+    void wrongfeofUsage(const Token *tok);
     void wrongPrintfScanfArgumentsError(const Token* tok,
                                         const std::string &functionName,
                                         nonneg int numFormat,
@@ -127,26 +152,6 @@ class CPPCHECKLIB CheckIO : public Check {
     void invalidScanfFormatWidthError(const Token* tok, nonneg int numFormat, int width, const Variable *var, const std::string& specifier);
     static void argumentType(std::ostream & os, const ArgumentInfo * argInfo);
     static Severity getSeverity(const ArgumentInfo *argInfo);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "IO using format string";
-    }
-
-    std::string classInfo() const override {
-        return "Check format string input/output operations.\n"
-               "- Bad usage of the function 'sprintf' (overlapping data)\n"
-               "- Missing or wrong width specifiers in 'scanf' format string\n"
-               "- Use a file that has been closed\n"
-               "- File input/output without positioning results in undefined behaviour\n"
-               "- Read to a file that has only been opened for writing (or vice versa)\n"
-               "- Repositioning operation on a file opened in append mode\n"
-               "- The same file can't be open for read and write at the same time on different streams\n"
-               "- Using fflush() on an input stream\n"
-               "- Invalid usage of output stream. For example: 'std::cout << std::cout;'\n"
-               "- Wrong number of arguments given to 'printf' or 'scanf;'\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
index 83f7227091c..6dc760618c8 100644
--- a/lib/checkleakautovar.cpp
+++ b/lib/checkleakautovar.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,20 +34,17 @@
 #include "tokenize.h"
 #include "tokenlist.h"
 #include "utils.h"
+#include "vfvalue.h"
 
 #include <algorithm>
 #include <array>
 #include <cstddef>
+#include <deque>
 #include <list>
 #include <vector>
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckLeakAutoVar instance;
-}
-
 static const CWE CWE672(672U);
 static const CWE CWE415(415U);
 
@@ -110,39 +107,40 @@ void VarInfo::possibleUsageAll(const std::pair<const Token*, Usage>& functionUsa
 }
 
 
-void CheckLeakAutoVar::leakError(const Token *tok, const std::string &varname, int type) const
+void CheckLeakAutoVarImpl::leakError(const Token *tok, const std::string &varname, int type) const
 {
-    const CheckMemoryLeak checkmemleak(mTokenizer, mErrorLogger, mSettings);
+    const CheckMemoryLeakImpl checkmemleak(mTokenizer, mSettings, mErrorLogger);
     if (Library::isresource(type))
         checkmemleak.resourceLeakError(tok, varname);
     else
         checkmemleak.memleakError(tok, varname);
 }
 
-void CheckLeakAutoVar::mismatchError(const Token *deallocTok, const Token *allocTok, const std::string &varname) const
+void CheckLeakAutoVarImpl::mismatchError(const Token *deallocTok, const Token *allocTok, const std::string &varname) const
 {
-    const CheckMemoryLeak c(mTokenizer, mErrorLogger, mSettings);
+    const CheckMemoryLeakImpl c(mTokenizer, mSettings, mErrorLogger);
     const std::list<const Token *> callstack = { allocTok, deallocTok };
     c.mismatchAllocDealloc(callstack, varname);
 }
 
-void CheckLeakAutoVar::deallocUseError(const Token *tok, const std::string &varname) const
+void CheckLeakAutoVarImpl::deallocUseError(const Token *tok, const std::string &varname) const
 {
-    const CheckMemoryLeak c(mTokenizer, mErrorLogger, mSettings);
+    const CheckMemoryLeakImpl c(mTokenizer, mSettings, mErrorLogger);
     c.deallocuseError(tok, varname);
 }
 
-void CheckLeakAutoVar::deallocReturnError(const Token *tok, const Token *deallocTok, const std::string &varname)
+void CheckLeakAutoVarImpl::deallocReturnError(const Token *tok, const Token *deallocTok, const std::string &varname)
 {
     const std::list<const Token *> locations = { deallocTok, tok };
     reportError(locations, Severity::error, "deallocret", "$symbol:" + varname + "\nReturning/dereferencing '$symbol' after it is deallocated / released", CWE672, Certainty::normal);
 }
 
-void CheckLeakAutoVar::configurationInfo(const Token* tok, const std::pair<const Token*, VarInfo::Usage>& functionUsage)
+void CheckLeakAutoVarImpl::configurationInfo(const Token* tok, const std::pair<const Token*, VarInfo::Usage>& functionUsage)
 {
-    if (mSettings->checkLibrary && functionUsage.second == VarInfo::USED &&
-        (!functionUsage.first || !functionUsage.first->function() || !functionUsage.first->function()->hasBody())) {
-        std::string funcStr = functionUsage.first ? mSettings->library.getFunctionName(functionUsage.first) : "f";
+    if (mSettings.checkLibrary && functionUsage.second == VarInfo::USED &&
+        (!functionUsage.first || !functionUsage.first->function() || !functionUsage.first->function()->hasBody()) &&
+        !(functionUsage.first && mSettings.library.isUse(mSettings.library.getFunctionName(functionUsage.first)))) {
+        std::string funcStr = functionUsage.first ? mSettings.library.getFunctionName(functionUsage.first) : "f";
         if (funcStr.empty())
             funcStr = "unknown::" + functionUsage.first->str();
         reportError(tok,
@@ -152,7 +150,7 @@ void CheckLeakAutoVar::configurationInfo(const Token* tok, const std::pair<const
     }
 }
 
-void CheckLeakAutoVar::doubleFreeError(const Token *tok, const Token *prevFreeTok, const std::string &varname, int type)
+void CheckLeakAutoVarImpl::doubleFreeError(const Token *tok, const Token *prevFreeTok, const std::string &varname, int type)
 {
     const std::list<const Token *> locations = { prevFreeTok, tok };
 
@@ -163,9 +161,9 @@ void CheckLeakAutoVar::doubleFreeError(const Token *tok, const Token *prevFreeTo
 }
 
 
-void CheckLeakAutoVar::check()
+void CheckLeakAutoVarImpl::check()
 {
-    if (mSettings->clang)
+    if (mSettings.clang)
         return;
 
     logChecker("CheckLeakAutoVar::check"); // notclang
@@ -191,11 +189,20 @@ static bool isVarUsedInTree(const Token *tok, nonneg int varid)
 {
     if (!tok)
         return false;
-    if (tok->varId() == varid)
-        return true;
-    if (tok->str() == "(" && Token::simpleMatch(tok->astOperand1(), "sizeof"))
-        return false;
-    return isVarUsedInTree(tok->astOperand1(), varid) || isVarUsedInTree(tok->astOperand2(), varid);
+    std::deque<const Token*> nodes{ tok };
+    while (!nodes.empty()) {
+        const Token* node = nodes.front();
+        if (node->varId() == varid)
+            return true;
+        if (node->str() != "(" || !Token::simpleMatch(node->astOperand1(), "sizeof")) {
+            if (node->astOperand1())
+                nodes.emplace_back(node->astOperand1());
+            if (node->astOperand2())
+                nodes.emplace_back(node->astOperand2());
+        }
+        nodes.pop_front();
+    }
+    return false;
 }
 
 static bool isPointerReleased(const Token *startToken, const Token *endToken, nonneg int varid)
@@ -261,7 +268,7 @@ static const Token * isFunctionCall(const Token * nameToken)
     return nullptr;
 }
 
-static const Token* getOutparamAllocation(const Token* tok, const Settings& settings)
+static const Token* getOutparamAllocation(const Token* tok, const Library& library)
 {
     if (!tok)
         return nullptr;
@@ -269,26 +276,38 @@ static const Token* getOutparamAllocation(const Token* tok, const Settings& sett
     const Token* ftok = getTokenArgumentFunction(tok, argn);
     if (!ftok)
         return nullptr;
-    if (const Library::AllocFunc* allocFunc = settings.library.getAllocFuncInfo(ftok)) {
+    if (const Library::AllocFunc* allocFunc = library.getAllocFuncInfo(ftok)) {
         if (allocFunc->arg == argn + 1)
             return ftok;
     }
     return nullptr;
 }
 
-static const Token* getReturnValueFromOutparamAlloc(const Token* alloc, const Settings& settings)
+static const Token* getReturnValueFromOutparamAlloc(const Token* alloc, const Library& library)
 {
-    if (const Token* ftok = getOutparamAllocation(alloc, settings)) {
+    if (const Token* ftok = getOutparamAllocation(alloc, library)) {
         if (Token::simpleMatch(ftok->astParent()->astParent(), "="))
             return ftok->next()->astParent()->astOperand1();
     }
     return nullptr;
 }
 
-bool CheckLeakAutoVar::checkScope(const Token * const startToken,
-                                  VarInfo &varInfo,
-                                  std::set<int> notzero,
-                                  nonneg int recursiveCount)
+static std::vector<const Token*> getComparisonTokens(const Token* tok)
+{
+    std::vector<const Token*> result{ tok };
+    if (tok->hasKnownValue(ValueFlow::Value::ValueType::SYMBOLIC))
+        result.push_back(tok->getKnownValue(ValueFlow::Value::ValueType::SYMBOLIC)->tokvalue);
+    for (const Token* op : { tok->astOperand1(), tok->astOperand2() }) {
+        if (op && op->hasKnownValue(ValueFlow::Value::ValueType::SYMBOLIC))
+            result.push_back(op->getKnownValue(ValueFlow::Value::ValueType::SYMBOLIC)->tokvalue);
+    }
+    return result;
+}
+
+bool CheckLeakAutoVarImpl::checkScope(const Token * const startToken,
+                                      VarInfo &varInfo,
+                                      std::set<int> notzero,
+                                      nonneg int recursiveCount)
 {
 #if ASAN
     static const nonneg int recursiveLimit = 300;
@@ -324,6 +343,8 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
             }
         }
 
+        if (tok == tok->scope()->bodyEnd && tok->scope()->type == ScopeType::eUnconditional)
+            ret(tok, varInfo, /*isEndOfScope*/ true);
 
         // look for end of statement
         const bool isInit = Token::Match(tok->tokAt(-1), "%var% {|(") && tok->tokAt(-1)->variable() && tok->tokAt(-1) == tok->tokAt(-1)->variable()->nameToken();
@@ -363,7 +384,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
             ftok = ftok->tokAt(2);
 
         // bailout for variable passed to library function with out parameter
-        if (const Library::Function *libFunc = mSettings->library.getFunction(ftok)) {
+        if (const Library::Function *libFunc = mSettings.library.getFunction(ftok)) {
             using ArgumentChecks = Library::ArgumentChecks;
             using Direction = ArgumentChecks::Direction;
             const std::vector<const Token *> args = getArguments(ftok);
@@ -374,7 +395,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                 });
             });
             if (hasOutParam) {
-                for (int i = 0; i < args.size(); i++) {
+                for (size_t i = 0; i < args.size(); i++) {
                     if (!argChecks.count(i + 1))
                         continue;
                     const ArgumentChecks argCheck = argChecks.at(i + 1);
@@ -434,7 +455,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                         if (tok2->str() == ";") {
                             break;
                         }
-                        if (tok2->varId()) {
+                        if (tok2->varId() && !Token::Match(tok2->astParent(), "%comp%|!")) {
                             varInfo.erase(tok2->varId());
                         }
                     }
@@ -461,7 +482,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
             // allocation?
             const Token *const fTok = tokRightAstOperand ? tokRightAstOperand->previous() : nullptr;
             if (Token::Match(fTok, "%type% (")) {
-                const Library::AllocFunc* f = mSettings->library.getAllocFuncInfo(fTok);
+                const Library::AllocFunc* f = mSettings.library.getAllocFuncInfo(fTok);
                 if (f && f->arg == -1) {
                     VarInfo::AllocInfo& varAlloc = alloctype[varTok->varId()];
                     varAlloc.type = f->groupId;
@@ -527,7 +548,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                         tokRightAstOperand = tokRightAstOperand->astOperand2() ? tokRightAstOperand->astOperand2() : tokRightAstOperand->astOperand1();
                     if (tokRightAstOperand && Token::Match(tokRightAstOperand->previous(), "%type% (")) {
                         const Token * fTok = tokRightAstOperand->previous();
-                        const Library::AllocFunc* f = mSettings->library.getAllocFuncInfo(fTok);
+                        const Library::AllocFunc* f = mSettings.library.getAllocFuncInfo(fTok);
                         if (f && f->arg == -1) {
                             VarInfo::AllocInfo& varAlloc = alloctype[innerTok->varId()];
                             varAlloc.type = f->groupId;
@@ -550,7 +571,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
 
                 // check for function call
                 if (openingPar) {
-                    const Library::AllocFunc* allocFunc = mSettings->library.getDeallocFuncInfo(innerTok);
+                    const Library::AllocFunc* allocFunc = mSettings.library.getDeallocFuncInfo(innerTok);
                     // innerTok is a function name
                     const VarInfo::AllocInfo allocation(0, VarInfo::NOALLOC);
                     functionCall(innerTok, openingPar, varInfo, allocation, allocFunc);
@@ -568,53 +589,56 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                     astOperand2AfterCommas = astOperand2AfterCommas->astOperand2();
 
                 // Recursively scan variable comparisons in condition
-                visitAstNodes(astOperand2AfterCommas, [&](const Token *tok3) {
-                    if (!tok3)
-                        return ChildrenToVisit::none;
-                    if (tok3->str() == "&&" || tok3->str() == "||") {
-                        // FIXME: handle && ! || better
-                        return ChildrenToVisit::op1_and_op2;
-                    }
-                    if (tok3->str() == "(" && Token::Match(tok3->astOperand1(), "UNLIKELY|LIKELY")) {
-                        return ChildrenToVisit::op2;
-                    }
-                    if (tok3->str() == "(" && tok3->previous()->isName()) {
-                        const std::vector<const Token *> params = getArguments(tok3->previous());
-                        for (const Token *par : params) {
-                            if (!par->isComparisonOp())
-                                continue;
-                            const Token *vartok = nullptr;
-                            if (isVarTokComparison(par, &vartok, alloc_success_conds) ||
-                                (isVarTokComparison(par, &vartok, alloc_failed_conds))) {
-                                varInfo1.erase(vartok->varId());
-                                varInfo2.erase(vartok->varId());
+                for (const Token* compTok : getComparisonTokens(astOperand2AfterCommas)) {
+                    visitAstNodes(compTok, [&](const Token* tok3) {
+                        if (!tok3)
+                            return ChildrenToVisit::none;
+                        if (tok3->str() == "&&" || tok3->str() == "||") {
+                            // FIXME: handle && ! || better
+                            return ChildrenToVisit::op1_and_op2;
+                        }
+                        if (tok3->str() == "(" && Token::Match(tok3->astOperand1(), "UNLIKELY|LIKELY")) {
+                            return ChildrenToVisit::op2;
+                        }
+                        if (tok3->str() == "(" && tok3->previous()->isName()) {
+                            const std::vector<const Token*> params = getArguments(tok3->previous());
+                            for (const Token* par : params) {
+                                if (!par->isComparisonOp())
+                                    continue;
+                                const Token* vartok = nullptr;
+                                if (isVarTokComparison(par, &vartok, alloc_success_conds) ||
+                                    (isVarTokComparison(par, &vartok, alloc_failed_conds))) {
+                                    varInfo1.erase(vartok->varId());
+                                    varInfo2.erase(vartok->varId());
+                                }
                             }
+                            return ChildrenToVisit::none;
                         }
-                        return ChildrenToVisit::none;
-                    }
 
-                    const Token *vartok = nullptr;
-                    if (isVarTokComparison(tok3, &vartok, alloc_success_conds)) {
-                        varInfo2.reallocToAlloc(vartok->varId());
-                        varInfo2.erase(vartok->varId());
-                        if (astIsVariableComparison(tok3, "!=", "0", &vartok) &&
-                            (notzero.find(vartok->varId()) != notzero.end()))
-                            varInfo2.clear();
-
-                        if (std::any_of(varInfo1.alloctype.begin(), varInfo1.alloctype.end(), [&](const std::pair<int, VarInfo::AllocInfo>& info) {
-                            if (info.second.status != VarInfo::ALLOC)
-                                return false;
-                            const Token* ret = getReturnValueFromOutparamAlloc(info.second.allocTok, *mSettings);
-                            return ret && vartok && ret->varId() && ret->varId() == vartok->varId();
-                        })) {
-                            varInfo1.clear();
+                        const Token* vartok = nullptr;
+                        if (isVarTokComparison(tok3, &vartok, alloc_success_conds)) {
+                            varInfo2.reallocToAlloc(vartok->varId());
+                            varInfo2.erase(vartok->varId());
+                            if (astIsVariableComparison(tok3, "!=", "0", &vartok) &&
+                                (notzero.find(vartok->varId()) != notzero.end()))
+                                varInfo2.clear();
+
+                            if (std::any_of(varInfo1.alloctype.begin(), varInfo1.alloctype.end(), [&](const std::pair<int, VarInfo::AllocInfo>& info) {
+                                if (info.second.status != VarInfo::ALLOC)
+                                    return false;
+                                const Token* ret = getReturnValueFromOutparamAlloc(info.second.allocTok, mSettings.library);
+                                return ret && vartok && ret->varId() && ret->varId() == vartok->varId();
+                            })) {
+                                varInfo1.clear();
+                            }
                         }
-                    } else if (isVarTokComparison(tok3, &vartok, alloc_failed_conds)) {
-                        varInfo1.reallocToAlloc(vartok->varId());
-                        varInfo1.erase(vartok->varId());
-                    }
-                    return ChildrenToVisit::none;
-                });
+                        else if (isVarTokComparison(tok3, &vartok, alloc_failed_conds)) {
+                            varInfo1.reallocToAlloc(vartok->varId());
+                            varInfo1.erase(vartok->varId());
+                        }
+                        return ChildrenToVisit::none;
+                    });
+                }
 
                 if (!skipIfBlock && !checkScope(closingParenthesis->next(), varInfo1, notzero, recursiveCount)) {
                     varInfo.clear();
@@ -734,7 +758,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
 
         // Function call..
         else if (const Token* openingPar = isFunctionCall(ftok)) {
-            const Library::AllocFunc* af = mSettings->library.getDeallocFuncInfo(ftok);
+            const Library::AllocFunc* af = mSettings.library.getDeallocFuncInfo(ftok);
             VarInfo::AllocInfo allocation(af ? af->groupId : 0, VarInfo::DEALLOC, ftok);
             if (allocation.type == 0)
                 allocation.status = VarInfo::NOALLOC;
@@ -755,8 +779,8 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                         if (ftok->function() && !ftok->function()->isAttributeNoreturn() &&
                             !(ftok->function()->functionScope && mTokenizer->isScopeNoReturn(ftok->function()->functionScope->bodyEnd))) // check function scope
                             continue;
-                        const std::string functionName(mSettings->library.getFunctionName(ftok));
-                        if (!mSettings->library.isLeakIgnore(functionName) && !mSettings->library.isUse(functionName)) {
+                        const std::string functionName(mSettings.library.getFunctionName(ftok));
+                        if (!mSettings.library.isLeakIgnore(functionName) && !mSettings.library.isUse(functionName)) {
                             const VarInfo::Usage usage = Token::simpleMatch(openingPar, "( )") ? VarInfo::NORET : VarInfo::USED; // TODO: check parameters passed to function
                             varInfo.possibleUsageAll({ ftok, usage });
                         }
@@ -779,7 +803,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
         }
 
         // Check smart pointer
-        else if (Token::Match(ftok, "%name% <") && mSettings->library.isSmartPointer(tok)) {
+        else if (Token::Match(ftok, "%name% <") && mSettings.library.isSmartPointer(tok)) {
             const Token * typeEndTok = ftok->linkAt(1);
             if (!Token::Match(typeEndTok, "> %var% {|( %var% ,|)|}"))
                 continue;
@@ -814,7 +838,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                 const Token * dtok = Token::findmatch(deleterToken, "& %name%", endDeleterToken);
                 if (dtok) {
                     dtok = dtok->next();
-                    af = mSettings->library.getDeallocFuncInfo(dtok);
+                    af = mSettings.library.getDeallocFuncInfo(dtok);
                 }
                 if (!dtok || !af) {
                     const Token * tscopeStart = nullptr;
@@ -844,7 +868,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
 
                     if (tscopeStart && tscopeEnd) {
                         for (const Token *tok2 = tscopeStart; tok2 != tscopeEnd; tok2 = tok2->next()) {
-                            af = mSettings->library.getDeallocFuncInfo(tok2);
+                            af = mSettings.library.getDeallocFuncInfo(tok2);
                             if (af)
                                 break;
                         }
@@ -866,7 +890,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
 }
 
 
-const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const tok, VarInfo &varInfo, bool inFuncCall)
+const Token * CheckLeakAutoVarImpl::checkTokenInsideExpression(const Token * const tok, VarInfo &varInfo, bool inFuncCall)
 {
     // Deallocation and then dereferencing pointer..
     if (tok->varId() > 0) {
@@ -875,7 +899,7 @@ const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const t
         if (var != varInfo.alloctype.end()) {
             bool unknown = false;
             if (var->second.status == VarInfo::DEALLOC && tok->valueType() && tok->valueType()->pointer &&
-                CheckNullPointer::isPointerDeRef(tok, unknown, *mSettings, /*checkNullArg*/ false) && !unknown) {
+                CheckNullPointerImpl::isPointerDeRef(tok, unknown, mSettings.library, /*checkNullArg*/ false) && !unknown) {
                 deallocUseError(tok, tok->str());
             } else if (Token::simpleMatch(tok->tokAt(-2), "= &")) {
                 varInfo.erase(tok->varId());
@@ -896,9 +920,9 @@ const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const t
                 if ((rhs->str() == "." || rhs->varId() == tok->varId()) && isAssignment) {
                     // simple assignment
                     varInfo.erase(tok->varId());
-                } else if (rhs->astParent() && rhs->str() == "(" && !mSettings->library.returnValue(rhs->astOperand1()).empty()) {
+                } else if (rhs->astParent() && rhs->str() == "(" && !mSettings.library.returnValue(rhs->astOperand1()).empty()) {
                     // #9298, assignment through return value of a function
-                    const std::string &returnValue = mSettings->library.returnValue(rhs->astOperand1());
+                    const std::string &returnValue = mSettings.library.returnValue(rhs->astOperand1());
                     if (startsWith(returnValue, "arg")) {
                         int argn;
                         const Token *func = getTokenArgumentFunction(tok, argn);
@@ -919,12 +943,12 @@ const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const t
     // check for function call
     const Token * const openingPar = inFuncCall ? nullptr : isFunctionCall(tok);
     if (openingPar) {
-        const Library::AllocFunc* allocFunc = mSettings->library.getDeallocFuncInfo(tok);
+        const Library::AllocFunc* allocFunc = mSettings.library.getDeallocFuncInfo(tok);
         VarInfo::AllocInfo alloc(allocFunc ? allocFunc->groupId : 0, VarInfo::DEALLOC, tok);
         if (alloc.type == 0)
             alloc.status = VarInfo::NOALLOC;
         functionCall(tok, openingPar, varInfo, alloc, nullptr);
-        const std::string &returnValue = mSettings->library.returnValue(tok);
+        const std::string &returnValue = mSettings.library.returnValue(tok);
         if (startsWith(returnValue, "arg"))
             // the function returns one of its argument, we need to process a potential assignment
             return openingPar;
@@ -935,9 +959,9 @@ const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const t
 }
 
 
-void CheckLeakAutoVar::changeAllocStatusIfRealloc(std::map<int, VarInfo::AllocInfo> &alloctype, const Token *fTok, const Token *retTok) const
+void CheckLeakAutoVarImpl::changeAllocStatusIfRealloc(std::map<int, VarInfo::AllocInfo> &alloctype, const Token *fTok, const Token *retTok) const
 {
-    const Library::AllocFunc* f = mSettings->library.getReallocFuncInfo(fTok);
+    const Library::AllocFunc* f = mSettings.library.getReallocFuncInfo(fTok);
     if (f && f->arg == -1 && f->reallocArg > 0 && f->reallocArg <= numberOfArguments(fTok)) {
         const Token* argTok = getArguments(fTok).at(f->reallocArg - 1);
         if (alloctype.find(argTok->varId()) != alloctype.end()) {
@@ -956,14 +980,14 @@ void CheckLeakAutoVar::changeAllocStatusIfRealloc(std::map<int, VarInfo::AllocIn
 }
 
 
-void CheckLeakAutoVar::changeAllocStatus(VarInfo &varInfo, const VarInfo::AllocInfo& allocation, const Token* tok, const Token* arg)
+void CheckLeakAutoVarImpl::changeAllocStatus(VarInfo &varInfo, const VarInfo::AllocInfo& allocation, const Token* tok, const Token* arg)
 {
     std::map<int, VarInfo::AllocInfo> &alloctype = varInfo.alloctype;
     const auto var = alloctype.find(arg->varId());
     if (var != alloctype.end()) {
         // bailout if function is also allocating, since the argument might be moved
         // to the return value, such as in fdopen
-        if (allocation.allocTok && mSettings->library.getAllocFuncInfo(allocation.allocTok)) {
+        if (allocation.allocTok && mSettings.library.getAllocFuncInfo(allocation.allocTok)) {
             varInfo.erase(arg->varId());
             return;
         }
@@ -993,11 +1017,11 @@ void CheckLeakAutoVar::changeAllocStatus(VarInfo &varInfo, const VarInfo::AllocI
     }
 }
 
-void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpeningPar, VarInfo &varInfo, const VarInfo::AllocInfo& allocation, const Library::AllocFunc* af)
+void CheckLeakAutoVarImpl::functionCall(const Token *tokName, const Token *tokOpeningPar, VarInfo &varInfo, const VarInfo::AllocInfo& allocation, const Library::AllocFunc* af)
 {
     // Ignore function call?
-    const bool isLeakIgnore = mSettings->library.isLeakIgnore(mSettings->library.getFunctionName(tokName));
-    if (mSettings->library.getReallocFuncInfo(tokName))
+    const bool isLeakIgnore = mSettings.library.isLeakIgnore(mSettings.library.getFunctionName(tokName));
+    if (mSettings.library.getReallocFuncInfo(tokName))
         return;
     if (tokName->next()->valueType() && tokName->next()->valueType()->container && tokName->next()->valueType()->container->stdStringLike)
         return;
@@ -1048,10 +1072,10 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
 
             // Is variable allocated?
             if (!isnull && (!af || af->arg == argNr)) {
-                const Library::AllocFunc* deallocFunc = mSettings->library.getDeallocFuncInfo(tokName);
+                const Library::AllocFunc* deallocFunc = mSettings.library.getDeallocFuncInfo(tokName);
                 VarInfo::AllocInfo dealloc(deallocFunc ? deallocFunc->groupId : 0, VarInfo::DEALLOC, tokName);
-                if (const Library::AllocFunc* allocFunc = mSettings->library.getAllocFuncInfo(tokName)) {
-                    if (mSettings->library.getDeallocFuncInfo(tokName)) {
+                if (const Library::AllocFunc* allocFunc = mSettings.library.getAllocFuncInfo(tokName)) {
+                    if (mSettings.library.getDeallocFuncInfo(tokName)) {
                         changeAllocStatus(varInfo, dealloc.type == 0 ? allocation : dealloc, tokName, arg);
                     }
                     if (allocFunc->arg == argNr &&
@@ -1071,7 +1095,7 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
             }
         }
         // Check smart pointer
-        else if (Token::Match(arg, "%name% < %type%") && mSettings->library.isSmartPointer(argTypeStartTok)) {
+        else if (Token::Match(arg, "%name% < %type%") && mSettings.library.isSmartPointer(argTypeStartTok)) {
             const Token * typeEndTok = arg->linkAt(1);
             const Token * allocTok = nullptr;
             if (!Token::Match(typeEndTok, "> {|( %var% ,|)|}"))
@@ -1096,14 +1120,14 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
                 // Check if its a pointer to a function
                 const Token * dtok = Token::findmatch(deleterToken, "& %name%", endDeleterToken);
                 if (dtok) {
-                    sp_af = mSettings->library.getDeallocFuncInfo(dtok->tokAt(1));
+                    sp_af = mSettings.library.getDeallocFuncInfo(dtok->tokAt(1));
                 } else {
                     // If the deleter is a class, check if class calls the dealloc function
                     dtok = Token::findmatch(deleterToken, "%type%", endDeleterToken);
                     if (dtok && dtok->type()) {
                         const Scope * tscope = dtok->type()->classScope;
                         for (const Token *tok2 = tscope->bodyStart; tok2 != tscope->bodyEnd; tok2 = tok2->next()) {
-                            sp_af = mSettings->library.getDeallocFuncInfo(tok2);
+                            sp_af = mSettings.library.getDeallocFuncInfo(tok2);
                             if (sp_af) {
                                 allocTok = tok2;
                                 break;
@@ -1132,13 +1156,13 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
 }
 
 
-void CheckLeakAutoVar::leakIfAllocated(const Token *vartok,
-                                       const VarInfo &varInfo)
+void CheckLeakAutoVarImpl::leakIfAllocated(const Token *vartok,
+                                           const VarInfo &varInfo)
 {
     const std::map<int, VarInfo::AllocInfo> &alloctype = varInfo.alloctype;
     const auto& possibleUsage = varInfo.possibleUsage;
 
-    const auto var = utils::as_const(alloctype).find(vartok->varId());
+    const auto var = alloctype.find(vartok->varId());
     if (var != alloctype.cend() && var->second.status == VarInfo::ALLOC) {
         const auto use = possibleUsage.find(vartok->varId());
         if (use == possibleUsage.end()) {
@@ -1155,7 +1179,7 @@ static bool isSafeCast(const ValueType* vt, const Settings& settings)
     return sizeOf == 0 || sizeOf >= settings.platform.sizeof_pointer;
 }
 
-void CheckLeakAutoVar::ret(const Token *tok, VarInfo &varInfo, const bool isEndOfScope)
+void CheckLeakAutoVarImpl::ret(const Token *tok, VarInfo &varInfo, const bool isEndOfScope)
 {
     const std::map<int, VarInfo::AllocInfo> &alloctype = varInfo.alloctype;
     const auto& possibleUsage = varInfo.possibleUsage;
@@ -1188,7 +1212,7 @@ void CheckLeakAutoVar::ret(const Token *tok, VarInfo &varInfo, const bool isEndO
                 while (tok3 && tok3->isCast() &&
                        (!tok3->valueType() ||
                         tok3->valueType()->pointer ||
-                        isSafeCast(tok3->valueType(), *mSettings)))
+                        isSafeCast(tok3->valueType(), mSettings)))
                     tok3 = tok3->astOperand2() ? tok3->astOperand2() : tok3->astOperand1();
                 if (tok3 && tok3->varId() == varid)
                     tok2 = tok3->next();
@@ -1211,7 +1235,7 @@ void CheckLeakAutoVar::ret(const Token *tok, VarInfo &varInfo, const bool isEndO
             // don't warn when returning after checking return value of outparam allocation
             const Token* outparamFunc{};
             if ((tok->scope()->type == ScopeType::eIf || tok->scope()->type== ScopeType::eElse) &&
-                (outparamFunc = getOutparamAllocation(it->second.allocTok, *mSettings))) {
+                (outparamFunc = getOutparamAllocation(it->second.allocTok, mSettings.library))) {
                 const Scope* scope = tok->scope();
                 if (scope->type == ScopeType::eElse) {
                     scope = scope->bodyStart->tokAt(-2)->scope();
@@ -1257,15 +1281,15 @@ void CheckLeakAutoVar::ret(const Token *tok, VarInfo &varInfo, const bool isEndO
         varInfo.erase(varId);
 }
 
-void CheckLeakAutoVar::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckLeakAutoVar::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckLeakAutoVar checkLeakAutoVar(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckLeakAutoVarImpl checkLeakAutoVar(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkLeakAutoVar.check();
 }
 
-void CheckLeakAutoVar::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckLeakAutoVar::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckLeakAutoVar c(nullptr, settings, errorLogger);
+    CheckLeakAutoVarImpl c(nullptr, settings, errorLogger);
     c.deallocReturnError(nullptr, nullptr, "p");
     c.configurationInfo(nullptr, { nullptr, VarInfo::USED });  // user configuration is needed to complete analysis
     c.doubleFreeError(nullptr, nullptr, "varname", 0);
diff --git a/lib/checkleakautovar.h b/lib/checkleakautovar.h
index b7f57d0bd5e..b613b357119 100644
--- a/lib/checkleakautovar.h
+++ b/lib/checkleakautovar.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 #include "library.h"
 
@@ -75,7 +76,7 @@ class CPPCHECKLIB VarInfo {
         referenced.erase(varid);
     }
 
-    void swap(VarInfo &other) NOEXCEPT {
+    void swap(VarInfo &other) noexcept {
         alloctype.swap(other.alloctype);
         possibleUsage.swap(other.possibleUsage);
         conditionalAlloc.swap(other.conditionalAlloc);
@@ -107,14 +108,23 @@ class CPPCHECKLIB VarInfo {
 class CPPCHECKLIB CheckLeakAutoVar : public Check {
 public:
     /** This constructor is used when registering the CheckLeakAutoVar */
-    CheckLeakAutoVar() : Check(myName()) {}
+    CheckLeakAutoVar() : Check("Leaks (auto variables)") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckLeakAutoVar(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Detect when a auto variable is allocated but not deallocated or deallocated twice.\n";
+    }
+};
 
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+class CPPCHECKLIB CheckLeakAutoVarImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    CheckLeakAutoVarImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** check for leaks in all scopes */
     void check();
@@ -157,16 +167,6 @@ class CPPCHECKLIB CheckLeakAutoVar : public Check {
 
     /** message: user configuration is needed to complete analysis */
     void configurationInfo(const Token* tok, const std::pair<const Token*, VarInfo::Usage>& functionUsage);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Leaks (auto variables)";
-    }
-
-    std::string classInfo() const override {
-        return "Detect when a auto variable is allocated but not deallocated or deallocated twice.\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index bd9d1bc892f..398240b06ab 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
+#include "utils.h"
 
 #include <algorithm>
 #include <cstddef>
@@ -36,14 +37,6 @@
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckMemoryLeakInFunction instance1;
-    CheckMemoryLeakInClass instance2;
-    CheckMemoryLeakStructMember instance3;
-    CheckMemoryLeakNoVar instance4;
-}
-
 // CWE ID used:
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
 static const CWE CWE401(401U);  // Improper Release of Memory Before Removing Last Reference ('Memory Leak')
@@ -52,10 +45,12 @@ static const CWE CWE772(772U);  // Missing Release of Resource after Effective L
 
 //---------------------------------------------------------------------------
 
-CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2, nonneg int varid, std::list<const Function*> *callstack) const
+
+CheckMemoryLeakImpl::AllocType CheckMemoryLeakImpl::getAllocationType(const Token *tok2, nonneg int varid, std::list<const Function*> *callstack) const
 {
     // What we may have...
     //     * var = (char *)malloc(10);
+    //     * var = static_cast<char *>(malloc(10));
     //     * var = new char[10];
     //     * var = strdup("hello");
     //     * var = strndup("hello", 3);
@@ -63,6 +58,8 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
         tok2 = tok2->link();
         tok2 = tok2 ? tok2->next() : nullptr;
     }
+    if (tok2 && tok2->isCpp() && tok2->isKeyword() && endsWith(tok2->str(), "_cast"))
+        tok2 = tok2->astParent()->next();
     if (!tok2)
         return No;
     if (tok2->str() == "::")
@@ -97,7 +94,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
             return New;
         }
 
-        if (mSettings_->hasLib("posix")) {
+        if (mSettings.hasLib("posix")) {
             if (Token::Match(tok2, "open|openat|creat|mkstemp|mkostemp|socket (")) {
                 // simple sanity check of function parameters..
                 // TODO: Make such check for all these functions
@@ -116,11 +113,11 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
         }
 
         // Does tok2 point on a Library allocation function?
-        const int alloctype = mSettings_->library.getAllocId(tok2, -1);
+        const int alloctype = mSettings.library.getAllocId(tok2, -1);
         if (alloctype > 0) {
-            if (alloctype == mSettings_->library.deallocId("free"))
+            if (alloctype == mSettings.library.deallocId("free"))
                 return Malloc;
-            if (alloctype == mSettings_->library.deallocId("fclose"))
+            if (alloctype == mSettings.library.deallocId("fclose"))
                 return File;
             return Library::ismemory(alloctype) ? OtherMem : OtherRes;
         }
@@ -147,7 +144,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
 }
 
 
-CheckMemoryLeak::AllocType CheckMemoryLeak::getReallocationType(const Token *tok2, nonneg int varid) const
+CheckMemoryLeakImpl::AllocType CheckMemoryLeakImpl::getReallocationType(const Token *tok2, nonneg int varid) const
 {
     // What we may have...
     //     * var = (char *)realloc(..;
@@ -161,7 +158,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getReallocationType(const Token *tok
     if (!Token::Match(tok2, "%name% ("))
         return No;
 
-    const Library::AllocFunc *f = mSettings_->library.getReallocFuncInfo(tok2);
+    const Library::AllocFunc *f = mSettings.library.getReallocFuncInfo(tok2);
     if (!(f && f->reallocArg > 0 && f->reallocArg <= numberOfArguments(tok2)))
         return No;
     const auto args = getArguments(tok2);
@@ -175,11 +172,11 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getReallocationType(const Token *tok
     if (varid > 0 && !Token::Match(arg, "%varid% [,)]", varid))
         return No;
 
-    const int realloctype = mSettings_->library.getReallocId(tok2, -1);
+    const int realloctype = mSettings.library.getReallocId(tok2, -1);
     if (realloctype > 0) {
-        if (realloctype == mSettings_->library.deallocId("free"))
+        if (realloctype == mSettings.library.deallocId("free"))
             return Malloc;
-        if (realloctype == mSettings_->library.deallocId("fclose"))
+        if (realloctype == mSettings.library.deallocId("fclose"))
             return File;
         return Library::ismemory(realloctype) ? OtherMem : OtherRes;
     }
@@ -187,7 +184,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getReallocationType(const Token *tok
 }
 
 
-CheckMemoryLeak::AllocType CheckMemoryLeak::getDeallocationType(const Token *tok, nonneg int varid) const
+CheckMemoryLeakImpl::AllocType CheckMemoryLeakImpl::getDeallocationType(const Token *tok, nonneg int varid) const
 {
     if (tok->isCpp() && tok->str() == "delete" && tok->astOperand1()) {
         const Token* vartok = tok->astOperand1();
@@ -218,7 +215,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getDeallocationType(const Token *tok
                 if (tok->str() == "realloc" && Token::simpleMatch(vartok->next(), ", 0 )"))
                     return Malloc;
 
-                if (mSettings_->hasLib("posix")) {
+                if (mSettings.hasLib("posix")) {
                     if (tok->str() == "close")
                         return Fd;
                     if (tok->str() == "pclose")
@@ -226,11 +223,11 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getDeallocationType(const Token *tok
                 }
 
                 // Does tok point on a Library deallocation function?
-                const int dealloctype = mSettings_->library.getDeallocId(tok, argNr);
+                const int dealloctype = mSettings.library.getDeallocId(tok, argNr);
                 if (dealloctype > 0) {
-                    if (dealloctype == mSettings_->library.deallocId("free"))
+                    if (dealloctype == mSettings.library.deallocId("free"))
                         return Malloc;
-                    if (dealloctype == mSettings_->library.deallocId("fclose"))
+                    if (dealloctype == mSettings.library.deallocId("fclose"))
                         return File;
                     return Library::ismemory(dealloctype) ? OtherMem : OtherRes;
                 }
@@ -242,10 +239,10 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getDeallocationType(const Token *tok
     return No;
 }
 
-bool CheckMemoryLeak::isReopenStandardStream(const Token *tok) const
+bool CheckMemoryLeakImpl::isReopenStandardStream(const Token *tok) const
 {
     if (getReallocationType(tok, 0) == File) {
-        const Library::AllocFunc *f = mSettings_->library.getReallocFuncInfo(tok);
+        const Library::AllocFunc *f = mSettings.library.getReallocFuncInfo(tok);
         if (f && f->reallocArg > 0 && f->reallocArg <= numberOfArguments(tok)) {
             const Token* arg = getArguments(tok).at(f->reallocArg - 1);
             if (Token::Match(arg, "stdin|stdout|stderr"))
@@ -255,9 +252,9 @@ bool CheckMemoryLeak::isReopenStandardStream(const Token *tok) const
     return false;
 }
 
-bool CheckMemoryLeak::isOpenDevNull(const Token *tok) const
+bool CheckMemoryLeakImpl::isOpenDevNull(const Token *tok) const
 {
-    if (mSettings_->hasLib("posix") && tok->str() == "open" && numberOfArguments(tok) == 2) {
+    if (mSettings.hasLib("posix") && tok->str() == "open" && numberOfArguments(tok) == 2) {
         const Token* arg = getArguments(tok).at(0);
         if (Token::simpleMatch(arg, "\"/dev/null\""))
             return true;
@@ -265,24 +262,18 @@ bool CheckMemoryLeak::isOpenDevNull(const Token *tok) const
     return false;
 }
 
-//--------------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------------
-
-void CheckMemoryLeak::memoryLeak(const Token *tok, const std::string &varname, AllocType alloctype) const
+void CheckMemoryLeakImpl::memoryLeak(const Token *tok, const std::string &varname, AllocType alloctype) const
 {
-    if (alloctype == CheckMemoryLeak::File ||
-        alloctype == CheckMemoryLeak::Pipe ||
-        alloctype == CheckMemoryLeak::Fd ||
-        alloctype == CheckMemoryLeak::OtherRes)
+    if (alloctype == File ||
+        alloctype == Pipe ||
+        alloctype == Fd ||
+        alloctype == OtherRes)
         resourceLeakError(tok, varname);
     else
         memleakError(tok, varname);
 }
-//---------------------------------------------------------------------------
 
-void CheckMemoryLeak::reportErr(const Token *tok, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe) const
+void CheckMemoryLeakImpl::reportErr(const Token *tok, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe) const
 {
     std::list<const Token *> callstack;
 
@@ -292,26 +283,23 @@ void CheckMemoryLeak::reportErr(const Token *tok, Severity severity, const std::
     reportErr(callstack, severity, id, msg, cwe);
 }
 
-void CheckMemoryLeak::reportErr(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe) const
+void CheckMemoryLeakImpl::reportErr(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe) const
 {
-    const ErrorMessage errmsg(callstack, mTokenizer_ ? &mTokenizer_->list : nullptr, severity, id, msg, cwe, Certainty::normal);
-    if (mErrorLogger_)
-        mErrorLogger_->reportErr(errmsg);
-    else
-        Check::writeToErrorList(errmsg);
+    const ErrorMessage errmsg(callstack, mTokenizer ? &mTokenizer->list : nullptr, severity, id, msg, cwe, Certainty::normal);
+    mErrorLogger.reportErr(errmsg);
 }
 
-void CheckMemoryLeak::memleakError(const Token *tok, const std::string &varname) const
+void CheckMemoryLeakImpl::memleakError(const Token *tok, const std::string &varname) const
 {
     reportErr(tok, Severity::error, "memleak", "$symbol:" + varname + "\nMemory leak: $symbol", CWE(401U));
 }
 
-void CheckMemoryLeak::memleakUponReallocFailureError(const Token *tok, const std::string &reallocfunction, const std::string &varname) const
+void CheckMemoryLeakImpl::memleakUponReallocFailureError(const Token *tok, const std::string &reallocfunction, const std::string &varname) const
 {
     reportErr(tok, Severity::error, "memleakOnRealloc", "$symbol:" + varname + "\nCommon " + reallocfunction + " mistake: \'$symbol\' nulled but not freed upon failure", CWE(401U));
 }
 
-void CheckMemoryLeak::resourceLeakError(const Token *tok, const std::string &varname) const
+void CheckMemoryLeakImpl::resourceLeakError(const Token *tok, const std::string &varname) const
 {
     std::string errmsg("Resource leak");
     if (!varname.empty())
@@ -319,17 +307,17 @@ void CheckMemoryLeak::resourceLeakError(const Token *tok, const std::string &var
     reportErr(tok, Severity::error, "resourceLeak", errmsg, CWE(775U));
 }
 
-void CheckMemoryLeak::deallocuseError(const Token *tok, const std::string &varname) const
+void CheckMemoryLeakImpl::deallocuseError(const Token *tok, const std::string &varname) const
 {
     reportErr(tok, Severity::error, "deallocuse", "$symbol:" + varname + "\nDereferencing '$symbol' after it is deallocated / released", CWE(416U));
 }
 
-void CheckMemoryLeak::mismatchAllocDealloc(const std::list<const Token *> &callstack, const std::string &varname) const
+void CheckMemoryLeakImpl::mismatchAllocDealloc(const std::list<const Token *> &callstack, const std::string &varname) const
 {
     reportErr(callstack, Severity::error, "mismatchAllocDealloc", "$symbol:" + varname + "\nMismatching allocation and deallocation: $symbol", CWE(762U));
 }
 
-CheckMemoryLeak::AllocType CheckMemoryLeak::functionReturnType(const Function* func, std::list<const Function*> *callstack) const
+CheckMemoryLeakImpl::AllocType CheckMemoryLeakImpl::functionReturnType(const Function* func, std::list<const Function*> *callstack) const
 {
     if (!func || !func->hasBody() || !func->functionScope)
         return No;
@@ -427,7 +415,7 @@ static bool ifvar(const Token *tok, nonneg int varid, const std::string &comp, c
 //     a = malloc(10); a = realloc(a, 100);
 //---------------------------------------------------------------------------
 
-void CheckMemoryLeakInFunction::checkReallocUsage()
+void CheckMemoryLeakInFunctionImpl::checkReallocUsage()
 {
     logChecker("CheckMemoryLeakInFunction::checkReallocUsage");
 
@@ -449,12 +437,12 @@ void CheckMemoryLeakInFunction::checkReallocUsage()
                 const Token *const reallocTok = parTok->astOperand1();
                 if (!reallocTok)
                     continue;
-                const Library::AllocFunc* f = mSettings->library.getReallocFuncInfo(reallocTok);
-                if (!(f && f->arg == -1 && mSettings->library.isnotnoreturn(reallocTok)))
+                const Library::AllocFunc* f = mSettings.library.getReallocFuncInfo(reallocTok);
+                if (!(f && f->arg == -1 && mSettings.library.isnotnoreturn(reallocTok)))
                     continue;
 
                 const AllocType allocType = getReallocationType(reallocTok, tok->varId());
-                if (!((allocType == Malloc || allocType == OtherMem)))
+                if (!(allocType == Malloc || allocType == OtherMem))
                     continue;
                 const Token* arg = getArguments(reallocTok).at(f->reallocArg - 1);
                 while (arg && arg->isCast())
@@ -473,8 +461,11 @@ void CheckMemoryLeakInFunction::checkReallocUsage()
 
                 // Check that another copy of the pointer wasn't saved earlier in the function
                 if (Token::findmatch(scope->bodyStart, "%name% = %varid% ;", tok, tok->varId()) ||
-                    Token::findmatch(scope->bodyStart, "[{};] %varid% = *| %var% .| %var%| [;=]", tok, tok->varId()))
+                    Token::findmatch(scope->bodyStart, "[{};] %varid% = *| %var%", tok, tok->varId()))
                     continue;
+                if (const Token* storeTok = Token::findmatch(scope->bodyStart, "[{};] %varid% = %name% (", tok, tok->varId()))
+                    if (storeTok->tokAt(3) != reallocTok && !mSettings.library.getAllocFuncInfo(storeTok->tokAt(3)))
+                        continue;
 
                 // Check if the argument is known to be null, which means it is not a memory leak
                 if (arg->hasKnownIntValue() && arg->getKnownIntValue() == 0) {
@@ -495,17 +486,16 @@ void CheckMemoryLeakInFunction::checkReallocUsage()
         }
     }
 }
-//---------------------------------------------------------------------------
 
-void CheckMemoryLeakInFunction::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckMemoryLeakInFunction::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckMemoryLeakInFunction checkMemoryLeak(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckMemoryLeakInFunctionImpl checkMemoryLeak(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkMemoryLeak.checkReallocUsage();
 }
 
-void CheckMemoryLeakInFunction::getErrorMessages(ErrorLogger *e, const Settings *settings) const
+void CheckMemoryLeakInFunction::getErrorMessages(ErrorLogger& e, const Settings &settings) const
 {
-    CheckMemoryLeakInFunction c(nullptr, settings, e);
+    CheckMemoryLeakInFunctionImpl c(nullptr, settings, e);
     c.memleakError(nullptr, "varname");
     c.resourceLeakError(nullptr, "varname");
     c.deallocuseError(nullptr, "varname");
@@ -518,8 +508,7 @@ void CheckMemoryLeakInFunction::getErrorMessages(ErrorLogger *e, const Settings
 // Checks for memory leaks in classes..
 //---------------------------------------------------------------------------
 
-
-void CheckMemoryLeakInClass::check()
+void CheckMemoryLeakInClassImpl::check()
 {
     logChecker("CheckMemoryLeakInClass::check");
 
@@ -528,7 +517,7 @@ void CheckMemoryLeakInClass::check()
     // only check classes and structures
     for (const Scope * scope : symbolDatabase->classAndStructScopes) {
         for (const Variable &var : scope->varlist) {
-            if (!var.isStatic() && (var.isPointer() || var.isPointerArray())) {
+            if (!var.isStatic()) {
                 // allocation but no deallocation of private variables in public function..
                 const Token *tok = var.typeStartToken();
                 // Either it is of standard type or a non-derived type
@@ -544,15 +533,15 @@ void CheckMemoryLeakInClass::check()
 }
 
 
-void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarname)
+void CheckMemoryLeakInClassImpl::variable(const Scope *scope, const Token *tokVarname)
 {
     const std::string& varname = tokVarname->str();
     const int varid = tokVarname->varId();
     const std::string& classname = scope->className;
 
     // Check if member variable has been allocated and deallocated..
-    CheckMemoryLeak::AllocType memberAlloc = CheckMemoryLeak::No;
-    CheckMemoryLeak::AllocType memberDealloc = CheckMemoryLeak::No;
+    AllocType memberAlloc = AllocType::No;
+    AllocType memberDealloc = AllocType::No;
 
     bool allocInConstructor = false;
     bool deallocInDestructor = false;
@@ -564,7 +553,7 @@ void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarnam
         if (!func.hasBody()) {
             if (destructor && !func.isDefault()) { // implementation for destructor is not seen and not defaulted => assume it deallocates all variables properly
                 deallocInDestructor = true;
-                memberDealloc = CheckMemoryLeak::Many;
+                memberDealloc = AllocType::Many;
             }
             continue;
         }
@@ -597,14 +586,14 @@ void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarnam
                         allocTok = tok->astParent()->astParent()->astOperand2();
 
                     AllocType alloc = getAllocationType(allocTok, 0);
-                    if (alloc != CheckMemoryLeak::No) {
+                    if (alloc != AllocType::No) {
                         if (constructor)
                             allocInConstructor = true;
 
-                        if (memberAlloc != No && memberAlloc != alloc)
-                            alloc = CheckMemoryLeak::Many;
+                        if (memberAlloc != AllocType::No && memberAlloc != alloc)
+                            alloc = AllocType::Many;
 
-                        if (alloc != CheckMemoryLeak::Many && memberDealloc != CheckMemoryLeak::No && memberDealloc != CheckMemoryLeak::Many && memberDealloc != alloc) {
+                        if (alloc != AllocType::Many && memberDealloc != AllocType::No && memberDealloc != AllocType::Many && memberDealloc != alloc) {
                             mismatchAllocDealloc({tok}, classname + "::" + varname);
                         }
 
@@ -620,24 +609,24 @@ void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarnam
                 // some usage in the destructor => assume it's related
                 // to deallocation
                 if (destructor && tok->str() == varname)
-                    dealloc = CheckMemoryLeak::Many;
-                if (dealloc != CheckMemoryLeak::No) {
+                    dealloc = AllocType::Many;
+                if (dealloc != AllocType::No) {
                     if (destructor)
                         deallocInDestructor = true;
 
-                    if (dealloc != CheckMemoryLeak::Many && memberAlloc != CheckMemoryLeak::No && memberAlloc != Many && memberAlloc != dealloc) {
+                    if (dealloc != AllocType::Many && memberAlloc != AllocType::No && memberAlloc != Many && memberAlloc != dealloc) {
                         mismatchAllocDealloc({tok}, classname + "::" + varname);
                     }
 
                     // several types of allocation/deallocation?
-                    if (memberDealloc != CheckMemoryLeak::No && memberDealloc != dealloc)
-                        dealloc = CheckMemoryLeak::Many;
+                    if (memberDealloc != AllocType::No && memberDealloc != dealloc)
+                        dealloc = AllocType::Many;
 
                     memberDealloc = dealloc;
                 }
 
                 // Function call .. possible deallocation
-                else if (Token::Match(tok->previous(), "[{};] %name% (") && !tok->isKeyword() && !mSettings->library.isLeakIgnore(tok->str())) {
+                else if (Token::Match(tok->previous(), "[{};] %name% (") && !tok->isKeyword() && !mSettings.library.isLeakIgnore(tok->str())) {
                     return;
                 }
             }
@@ -646,14 +635,14 @@ void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarnam
 
     if (allocInConstructor && !deallocInDestructor) {
         unsafeClassError(tokVarname, classname, classname + "::" + varname /*, memberAlloc*/);
-    } else if (memberAlloc != CheckMemoryLeak::No && memberDealloc == CheckMemoryLeak::No) {
+    } else if (memberAlloc != AllocType::No && memberDealloc == AllocType::No) {
         unsafeClassError(tokVarname, classname, classname + "::" + varname /*, memberAlloc*/);
     }
 }
 
-void CheckMemoryLeakInClass::unsafeClassError(const Token *tok, const std::string &classname, const std::string &varname)
+void CheckMemoryLeakInClassImpl::unsafeClassError(const Token *tok, const std::string &classname, const std::string &varname)
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unsafeClassCanLeak"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unsafeClassCanLeak"))
         return;
 
     reportError(tok, Severity::style, "unsafeClassCanLeak",
@@ -664,12 +653,12 @@ void CheckMemoryLeakInClass::unsafeClassError(const Token *tok, const std::strin
 }
 
 
-void CheckMemoryLeakInClass::checkPublicFunctions(const Scope *scope, const Token *classtok)
+void CheckMemoryLeakInClassImpl::checkPublicFunctions(const Scope *scope, const Token *classtok)
 {
     // Check that public functions deallocate the pointers that they allocate.
     // There is no checking how these functions are used and therefore it
     // isn't established if there is real leaks or not.
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     const int varid = classtok->varId();
@@ -681,44 +670,43 @@ void CheckMemoryLeakInClass::checkPublicFunctions(const Scope *scope, const Toke
             func.access == AccessControl::Public && func.hasBody()) {
             const Token *tok2 = func.functionScope->bodyStart->next();
             if (Token::Match(tok2, "%varid% =", varid)) {
-                const CheckMemoryLeak::AllocType alloc = getAllocationType(tok2->tokAt(2), varid);
-                if (alloc != CheckMemoryLeak::No)
+                const AllocType alloc = getAllocationType(tok2->tokAt(2), varid);
+                if (alloc != AllocType::No)
                     publicAllocationError(tok2, tok2->str());
             } else if (Token::Match(tok2, "%type% :: %varid% =", varid) &&
                        tok2->str() == scope->className) {
-                const CheckMemoryLeak::AllocType alloc = getAllocationType(tok2->tokAt(4), varid);
-                if (alloc != CheckMemoryLeak::No)
+                const AllocType alloc = getAllocationType(tok2->tokAt(4), varid);
+                if (alloc != AllocType::No)
                     publicAllocationError(tok2, tok2->strAt(2));
             }
         }
     }
 }
 
-void CheckMemoryLeakInClass::publicAllocationError(const Token *tok, const std::string &varname)
+void CheckMemoryLeakInClassImpl::publicAllocationError(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::warning, "publicAllocationError", "$symbol:" + varname + "\nPossible leak in public function. The pointer '$symbol' is not deallocated before it is allocated.", CWE398, Certainty::normal);
 }
 
-void CheckMemoryLeakInClass::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckMemoryLeakInClass::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
     if (!tokenizer.isCPP())
         return;
 
-    CheckMemoryLeakInClass checkMemoryLeak(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckMemoryLeakInClassImpl checkMemoryLeak(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkMemoryLeak.check();
 }
 
-void CheckMemoryLeakInClass::getErrorMessages(ErrorLogger *e, const Settings *settings) const
+void CheckMemoryLeakInClass::getErrorMessages(ErrorLogger& e, const Settings &settings) const
 {
-    CheckMemoryLeakInClass c(nullptr, settings, e);
+    CheckMemoryLeakInClassImpl c(nullptr, settings, e);
     c.publicAllocationError(nullptr, "varname");
     c.unsafeClassError(nullptr, "class", "class::varname");
 }
 
-
-void CheckMemoryLeakStructMember::check()
+void CheckMemoryLeakStructMemberImpl::check()
 {
-    if (mSettings->clang)
+    if (mSettings.clang)
         return;
 
     logChecker("CheckMemoryLeakStructMember::check");
@@ -735,7 +723,7 @@ void CheckMemoryLeakStructMember::check()
     }
 }
 
-bool CheckMemoryLeakStructMember::isMalloc(const Variable *variable) const
+bool CheckMemoryLeakStructMemberImpl::isMalloc(const Variable *variable) const
 {
     if (!variable)
         return false;
@@ -748,7 +736,7 @@ bool CheckMemoryLeakStructMember::isMalloc(const Variable *variable) const
             const Token* tok3 = tok2->tokAt(1)->astOperand2();
             while (tok3 && tok3->isCast())
                 tok3 = tok3->astOperand2() ? tok3->astOperand2() : tok3->astOperand1();
-            if ((tok3 && Token::Match(tok3->tokAt(-1), "%name% (") && mSettings->library.getAllocFuncInfo(tok3->tokAt(-1))) ||
+            if ((tok3 && Token::Match(tok3->tokAt(-1), "%name% (") && mSettings.library.getAllocFuncInfo(tok3->tokAt(-1))) ||
                 (Token::simpleMatch(tok3, "new") && tok3->isCpp())) {
                 alloc = true;
             }
@@ -757,7 +745,7 @@ bool CheckMemoryLeakStructMember::isMalloc(const Variable *variable) const
     return alloc;
 }
 
-void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const variable) const
+void CheckMemoryLeakStructMemberImpl::checkStructVariable(const Variable* const variable) const
 {
     if (!variable)
         return;
@@ -776,14 +764,14 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
 
     auto deallocInFunction = [this](const Token* tok, int structid) -> bool {
         // Calling non-function / function that doesn't deallocate?
-        if (tok->isKeyword() || mSettings->library.isLeakIgnore(tok->str()))
+        if (tok->isKeyword() || mSettings.library.isLeakIgnore(tok->str()))
             return false;
 
         // Check if the struct is used..
         bool deallocated = false;
         const Token* const end = tok->linkAt(1);
         for (const Token* tok2 = tok; tok2 != end; tok2 = tok2->next()) {
-            if (Token::Match(tok2, "[(,] &| %varid% [,)]", structid)) {
+            if (Token::Match(tok2, "%varid%", structid)) {
                 /** @todo check if the function deallocates the memory */
                 deallocated = true;
                 break;
@@ -898,7 +886,7 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
                 }
 
                 // Deallocating the struct..
-                else if (Token::Match(tok3, "%name% ( %varid% )", structid) && mSettings->library.getDeallocFuncInfo(tok3)) {
+                else if (Token::Match(tok3, "%name% ( %varid% )", structid) && mSettings.library.getDeallocFuncInfo(tok3)) {
                     if (indentlevel2 == 0)
                         memoryLeak(tok3, variable->name() + "." + tok2->strAt(2), allocType);
                     break;
@@ -932,7 +920,7 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
                             --indentlevel4;
                             if (indentlevel4 == 0)
                                 break;
-                        } else if (Token::Match(tok4, "%name% ( %var% . %varid% )", structmemberid) && mSettings->library.getDeallocFuncInfo(tok4)) {
+                        } else if (Token::Match(tok4, "%name% ( %var% . %varid% )", structmemberid) && mSettings.library.getDeallocFuncInfo(tok4)) {
                             break;
                         }
                     }
@@ -943,7 +931,7 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
                 }
 
                 // Returning from function..
-                else if ((tok3->scope()->type != ScopeType::eLambda || tok3->scope() == variable->scope()) && tok3->str() == "return") {
+                else if (((!isWithinScope(tok3, variable, ScopeType::eLambda) && !isWithinScope(tok3, variable, ScopeType::eSwitch)) || tok3->scope() == variable->scope()) && tok3->str() == "return") {
                     // Returning from function without deallocating struct member?
                     if (!Token::Match(tok3, "return %varid% ;", structid) &&
                         !Token::Match(tok3, "return & %varid%", structid) &&
@@ -975,17 +963,19 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
     }
 }
 
-void CheckMemoryLeakStructMember::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckMemoryLeakStructMember::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckMemoryLeakStructMember checkMemoryLeak(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckMemoryLeakStructMemberImpl checkMemoryLeak(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkMemoryLeak.check();
 }
 
-void CheckMemoryLeakStructMember::getErrorMessages(ErrorLogger * /*errorLogger*/, const Settings * /*settings*/) const
-{}
-
+void CheckMemoryLeakStructMember::getErrorMessages(ErrorLogger& errorLogger, const Settings & settings) const
+{
+    (void)&errorLogger;
+    (void)settings;
+}
 
-void CheckMemoryLeakNoVar::check()
+void CheckMemoryLeakNoVarImpl::check()
 {
     logChecker("CheckMemoryLeakNoVar::check");
 
@@ -1011,7 +1001,7 @@ void CheckMemoryLeakNoVar::check()
 // Checks if an input argument to a function is the return value of an allocation function
 // like malloc(), and the function does not release it.
 //---------------------------------------------------------------------------
-void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)
+void CheckMemoryLeakNoVarImpl::checkForUnreleasedInputArgument(const Scope *scope)
 {
     // parse the executable scope until tok is reached...
     for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
@@ -1023,10 +1013,8 @@ void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)
         const Token* tok2 = tok->next()->astParent();
         while (tok2 && (tok2->isCast() || Token::Match(tok2, "?|:")))
             tok2 = tok2->astParent();
-        if (Token::Match(tok2, "%assign%")) // TODO: check if function returns allocated resource
-            continue;
-        if (Token::simpleMatch(tok->astTop(), "return"))
-            continue;
+        const bool hasAssign = Token::Match(tok2, "%assign%");
+        const bool hasReturn = Token::simpleMatch(tok->astTop(), "return");
 
         const std::string& functionName = tok->str();
         if ((tok->isCpp() && functionName == "delete") ||
@@ -1035,9 +1023,15 @@ void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)
 
         if (Token::simpleMatch(tok->next()->astParent(), "(")) // passed to another function
             continue;
-        if (!tok->isKeyword() && !tok->function() && !mSettings->library.isLeakIgnore(functionName))
+        if (!tok->isKeyword() && !tok->function() && !mSettings.library.isLeakIgnore(functionName))
             continue;
 
+        if ((hasAssign || hasReturn) && !tok->function()) {
+            const std::string& ret = mSettings.library.returnValueType(tok);
+            if (ret.empty() || endsWith(ret, "*"))
+                continue;
+        }
+
         const std::vector<const Token *> args = getArguments(tok);
         int argnr = -1;
         for (const Token* arg : args) {
@@ -1055,8 +1049,11 @@ void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)
             if (alloc == New || alloc == NewArray) {
                 const Token* typeTok = arg->next();
                 bool bail = !typeTok->isStandardType() &&
-                            !mSettings->library.detectContainerOrIterator(typeTok) &&
-                            !mSettings->library.podtype(typeTok->expressionString());
+                            (!typeTok->valueType() ||
+                             (typeTok->valueType()->type < ValueType::Type::SMART_POINTER &&
+                              typeTok->valueType()->type != ValueType::Type::POD)) &&
+                            !mSettings.library.detectContainerOrIterator(typeTok) &&
+                            !mSettings.library.podtype(typeTok->expressionString());
                 if (bail && typeTok->type() && typeTok->type()->classScope &&
                     typeTok->type()->classScope->numConstructors == 0 &&
                     typeTok->type()->classScope->getDestructor() == nullptr) {
@@ -1071,8 +1068,8 @@ void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)
                 const Variable* argvar = tok->function()->getArgumentVar(argnr);
                 if (!argvar || !argvar->valueType())
                     continue;
-                const size_t argSize = argvar->valueType()->getSizeOf(*mSettings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
-                if (argSize == 0 || argSize >= mSettings->platform.sizeof_pointer)
+                const size_t argSize = argvar->valueType()->getSizeOf(mSettings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
+                if (argSize == 0 || argSize >= mSettings.platform.sizeof_pointer)
                     continue;
             }
             functionCallLeak(arg, arg->str(), functionName);
@@ -1084,7 +1081,7 @@ void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)
 //---------------------------------------------------------------------------
 // Checks if a call to an allocation function like malloc() is made and its return value is not assigned.
 //---------------------------------------------------------------------------
-void CheckMemoryLeakNoVar::checkForUnusedReturnValue(const Scope *scope)
+void CheckMemoryLeakNoVarImpl::checkForUnusedReturnValue(const Scope *scope)
 {
     for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
         const bool isNew = tok->isCpp() && tok->str() == "new";
@@ -1098,7 +1095,10 @@ void CheckMemoryLeakNoVar::checkForUnusedReturnValue(const Scope *scope)
         if (allocType == No)
             continue;
 
-        if (tok != tok->next()->astOperand1() && !isNew)
+        const Token* ftok = tok->next()->astOperand1();
+        while (Token::simpleMatch(ftok, "::"))
+            ftok = ftok->astOperand2() ? ftok->astOperand2() : ftok->astOperand1();
+        if (tok != ftok && !isNew)
             continue;
 
         if (isReopenStandardStream(tok))
@@ -1114,7 +1114,7 @@ void CheckMemoryLeakNoVar::checkForUnusedReturnValue(const Scope *scope)
         bool warn = true;
         if (isNew) {
             const Token* typeTok = tok->next();
-            warn = typeTok && (typeTok->isStandardType() || mSettings->library.detectContainer(typeTok));
+            warn = typeTok && (typeTok->isStandardType() || mSettings.library.detectContainer(typeTok));
         }
 
         if (!parent && warn) {
@@ -1148,13 +1148,13 @@ void CheckMemoryLeakNoVar::checkForUnusedReturnValue(const Scope *scope)
 //    f(shared_ptr<int>(new int(42)), g());
 // }
 //---------------------------------------------------------------------------
-void CheckMemoryLeakNoVar::checkForUnsafeArgAlloc(const Scope *scope)
+void CheckMemoryLeakNoVarImpl::checkForUnsafeArgAlloc(const Scope *scope)
 {
     // This test only applies to C++ source
     if (!mTokenizer->isCPP())
         return;
 
-    if (!mSettings->isPremiumEnabled("leakUnsafeArgAlloc") && (!mSettings->certainty.isEnabled(Certainty::inconclusive) || !mSettings->severity.isEnabled(Severity::warning)))
+    if (!mSettings.isPremiumEnabled("leakUnsafeArgAlloc") && (!mSettings.certainty.isEnabled(Certainty::inconclusive) || !mSettings.severity.isEnabled(Severity::warning)))
         return;
 
     logChecker("CheckMemoryLeakNoVar::checkForUnsafeArgAlloc");
@@ -1198,17 +1198,17 @@ void CheckMemoryLeakNoVar::checkForUnsafeArgAlloc(const Scope *scope)
     }
 }
 
-void CheckMemoryLeakNoVar::functionCallLeak(const Token *loc, const std::string &alloc, const std::string &functionCall)
+void CheckMemoryLeakNoVarImpl::functionCallLeak(const Token *loc, const std::string &alloc, const std::string &functionCall)
 {
     reportError(loc, Severity::error, "leakNoVarFunctionCall", "Allocation with " + alloc + ", " + functionCall + " doesn't release it.", CWE772, Certainty::normal);
 }
 
-void CheckMemoryLeakNoVar::returnValueNotUsedError(const Token *tok, const std::string &alloc)
+void CheckMemoryLeakNoVarImpl::returnValueNotUsedError(const Token *tok, const std::string &alloc)
 {
     reportError(tok, Severity::error, "leakReturnValNotUsed", "$symbol:" + alloc + "\nReturn value of allocation function '$symbol' is not stored.", CWE771, Certainty::normal);
 }
 
-void CheckMemoryLeakNoVar::unsafeArgAllocError(const Token *tok, const std::string &funcName, const std::string &ptrType, const std::string& objType)
+void CheckMemoryLeakNoVarImpl::unsafeArgAllocError(const Token *tok, const std::string &funcName, const std::string &ptrType, const std::string& objType)
 {
     const std::string factoryFunc = ptrType == "shared_ptr" ? "make_shared" : "make_unique";
     reportError(tok, Severity::warning, "leakUnsafeArgAlloc",
@@ -1218,15 +1218,15 @@ void CheckMemoryLeakNoVar::unsafeArgAllocError(const Token *tok, const std::stri
                 Certainty::inconclusive); // Inconclusive because funcName may never throw
 }
 
-void CheckMemoryLeakNoVar::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckMemoryLeakNoVar::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckMemoryLeakNoVar checkMemoryLeak(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckMemoryLeakNoVarImpl checkMemoryLeak(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkMemoryLeak.check();
 }
 
-void CheckMemoryLeakNoVar::getErrorMessages(ErrorLogger *e, const Settings *settings) const
+void CheckMemoryLeakNoVar::getErrorMessages(ErrorLogger& e, const Settings &settings) const
 {
-    CheckMemoryLeakNoVar c(nullptr, settings, e);
+    CheckMemoryLeakNoVarImpl c(nullptr, settings, e);
     c.functionCallLeak(nullptr, "funcName", "funcName");
     c.returnValueNotUsedError(nullptr, "funcName");
     c.unsafeArgAllocError(nullptr, "funcName", "shared_ptr", "int");
diff --git a/lib/checkmemoryleak.h b/lib/checkmemoryleak.h
index cf8cc4c11a2..fdb7748f9ed 100644
--- a/lib/checkmemoryleak.h
+++ b/lib/checkmemoryleak.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@
  */
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <cstdint>
@@ -52,18 +53,95 @@ enum class Severity : std::uint8_t;
 /// @addtogroup Core
 /// @{
 
-/** @brief Base class for memory leaks checking */
-class CPPCHECKLIB CheckMemoryLeak {
+
+/**
+ * @brief %CheckMemoryLeakInFunction detects when a function variable is allocated but not deallocated properly.
+ *
+ * The checking is done by looking at each function variable separately. By repeating these 4 steps over and over:
+ * -# locate a function variable
+ * -# create a simple token list that describes the usage of the function variable.
+ * -# simplify the token list.
+ * -# finally, check if the simplified token list contain any leaks.
+ */
+
+class CPPCHECKLIB CheckMemoryLeakInFunction : public Check {
+public:
+    /** @brief This constructor is used when registering this class */
+    CheckMemoryLeakInFunction() : Check("Memory leaks (function variables)") {}
+
+private:
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    /** Report all possible errors (for the --errorlist) */
+    void getErrorMessages(ErrorLogger& e, const Settings &settings) const override;
+
+    /**
+     * Get class information (--doc)
+     * @return Wiki formatted information about this class
+     */
+    std::string classInfo() const override {
+        return "Is there any allocated memory when a function goes out of scope\n";
+    }
+};
+
+
+/**
+ * @brief %Check class variables, variables that are allocated in the constructor should be deallocated in the destructor
+ */
+
+class CPPCHECKLIB CheckMemoryLeakInClass : public Check {
+public:
+    CheckMemoryLeakInClass() : Check("Memory leaks (class variables)") {}
+
+private:
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& e, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "If the constructor allocate memory then the destructor must deallocate it.\n";
+    }
+};
+
+
+
+/** @brief detect simple memory leaks for struct members */
+
+class CPPCHECKLIB CheckMemoryLeakStructMember : public Check {
+public:
+    CheckMemoryLeakStructMember() : Check("Memory leaks (struct members)") {}
+
+private:
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings & settings) const override;
+
+    std::string classInfo() const override {
+        return "Don't forget to deallocate struct members\n";
+    }
+};
+
+
+
+/** @brief detect simple memory leaks (address not taken) */
+
+class CPPCHECKLIB CheckMemoryLeakNoVar : public Check {
+public:
+    CheckMemoryLeakNoVar() : Check("Memory leaks (address not taken)") {}
+
 private:
-    /** For access to the tokens */
-    const Tokenizer * const mTokenizer_;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
 
-    /** ErrorLogger used to report errors */
-    ErrorLogger * const mErrorLogger_;
+    void getErrorMessages(ErrorLogger& e, const Settings &settings) const override;
 
-    /** Enabled standards */
-    const Settings * const mSettings_;
+    std::string classInfo() const override {
+        return "Not taking the address to allocated memory\n";
+    }
+};
 
+/** @brief Base class for memory leaks checking */
+class CPPCHECKLIB CheckMemoryLeakImpl : public CheckImpl {
+private:
     /**
      * Report error. Similar with the function Check::reportError
      * @param tok the token where the error occurs
@@ -85,12 +163,12 @@ class CPPCHECKLIB CheckMemoryLeak {
     void reportErr(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe) const;
 
 public:
-    CheckMemoryLeak() = delete;
-    CheckMemoryLeak(const CheckMemoryLeak &) = delete;
-    CheckMemoryLeak& operator=(const CheckMemoryLeak &) = delete;
+    CheckMemoryLeakImpl() = delete;
+    CheckMemoryLeakImpl(const CheckMemoryLeakImpl &) = delete;
+    CheckMemoryLeakImpl& operator=(const CheckMemoryLeakImpl &) = delete;
 
-    CheckMemoryLeak(const Tokenizer *t, ErrorLogger *e, const Settings *s)
-        : mTokenizer_(t), mErrorLogger_(e), mSettings_(s) {}
+    CheckMemoryLeakImpl(const Tokenizer *t, const Settings &s, ErrorLogger &e)
+        : CheckImpl(t, s, e) {}
 
     /** @brief What type of allocation are used.. the "Many" means that several types of allocation and deallocation are used */
     enum AllocType : std::uint8_t { No, Malloc, New, NewArray, File, Fd, Pipe, OtherMem, OtherRes, Many };
@@ -165,43 +243,16 @@ class CPPCHECKLIB CheckMemoryLeak {
  * -# finally, check if the simplified token list contain any leaks.
  */
 
-class CPPCHECKLIB CheckMemoryLeakInFunction : public Check, public CheckMemoryLeak {
-    friend class TestMemleakInFunction;
-
+class CPPCHECKLIB CheckMemoryLeakInFunctionImpl : public CheckMemoryLeakImpl {
 public:
-    /** @brief This constructor is used when registering this class */
-    CheckMemoryLeakInFunction() : Check(myName()), CheckMemoryLeak(nullptr, nullptr, nullptr) {}
-
-private:
     /** @brief This constructor is used when running checks */
-    CheckMemoryLeakInFunction(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger, settings) {}
-
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    CheckMemoryLeakInFunctionImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckMemoryLeakImpl(tokenizer, settings, errorLogger) {}
 
     /**
      * Checking for a memory leak caused by improper realloc usage.
      */
     void checkReallocUsage();
-
-    /** Report all possible errors (for the --errorlist) */
-    void getErrorMessages(ErrorLogger *e, const Settings *settings) const override;
-
-    /**
-     * Get name of class (--doc)
-     * @return name of class
-     */
-    static std::string myName() {
-        return "Memory leaks (function variables)";
-    }
-
-    /**
-     * Get class information (--doc)
-     * @return Wiki formatted information about this class
-     */
-    std::string classInfo() const override {
-        return "Is there any allocated memory when a function goes out of scope\n";
-    }
 };
 
 
@@ -210,17 +261,10 @@ class CPPCHECKLIB CheckMemoryLeakInFunction : public Check, public CheckMemoryLe
  * @brief %Check class variables, variables that are allocated in the constructor should be deallocated in the destructor
  */
 
-class CPPCHECKLIB CheckMemoryLeakInClass : public Check, private CheckMemoryLeak {
-    friend class TestMemleakInClass;
-
+class CPPCHECKLIB CheckMemoryLeakInClassImpl : private CheckMemoryLeakImpl {
 public:
-    CheckMemoryLeakInClass() : Check(myName()), CheckMemoryLeak(nullptr, nullptr, nullptr) {}
-
-private:
-    CheckMemoryLeakInClass(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger, settings) {}
-
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    CheckMemoryLeakInClassImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckMemoryLeakImpl(tokenizer, settings, errorLogger) {}
 
     void check();
 
@@ -231,33 +275,17 @@ class CPPCHECKLIB CheckMemoryLeakInClass : public Check, private CheckMemoryLeak
     void publicAllocationError(const Token *tok, const std::string &varname);
 
     void unsafeClassError(const Token *tok, const std::string &classname, const std::string &varname);
-
-    void getErrorMessages(ErrorLogger *e, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Memory leaks (class variables)";
-    }
-
-    std::string classInfo() const override {
-        return "If the constructor allocate memory then the destructor must deallocate it.\n";
-    }
 };
 
 
 
 /** @brief detect simple memory leaks for struct members */
 
-class CPPCHECKLIB CheckMemoryLeakStructMember : public Check, private CheckMemoryLeak {
-    friend class TestMemleakStructMember;
-
+class CPPCHECKLIB CheckMemoryLeakStructMemberImpl : private CheckMemoryLeakImpl {
 public:
-    CheckMemoryLeakStructMember() : Check(myName()), CheckMemoryLeak(nullptr, nullptr, nullptr) {}
-
-private:
-    CheckMemoryLeakStructMember(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger, settings) {}
 
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    CheckMemoryLeakStructMemberImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckMemoryLeakImpl(tokenizer, settings, errorLogger) {}
 
     void check();
 
@@ -265,33 +293,16 @@ class CPPCHECKLIB CheckMemoryLeakStructMember : public Check, private CheckMemor
     bool isMalloc(const Variable *variable) const;
 
     void checkStructVariable(const Variable*  variable) const;
-
-    void getErrorMessages(ErrorLogger * errorLogger, const Settings * settings) const override;
-
-    static std::string myName() {
-        return "Memory leaks (struct members)";
-    }
-
-    std::string classInfo() const override {
-        return "Don't forget to deallocate struct members\n";
-    }
 };
 
 
 
 /** @brief detect simple memory leaks (address not taken) */
 
-class CPPCHECKLIB CheckMemoryLeakNoVar : public Check, private CheckMemoryLeak {
-    friend class TestMemleakNoVar;
-
+class CPPCHECKLIB CheckMemoryLeakNoVarImpl : private CheckMemoryLeakImpl {
 public:
-    CheckMemoryLeakNoVar() : Check(myName()), CheckMemoryLeak(nullptr, nullptr, nullptr) {}
-
-private:
-    CheckMemoryLeakNoVar(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger, settings) {}
-
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    CheckMemoryLeakNoVarImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckMemoryLeakImpl(tokenizer, settings, errorLogger) {}
 
     void check();
 
@@ -317,16 +328,6 @@ class CPPCHECKLIB CheckMemoryLeakNoVar : public Check, private CheckMemoryLeak {
     void functionCallLeak(const Token *loc, const std::string &alloc, const std::string &functionCall);
     void returnValueNotUsedError(const Token* tok, const std::string &alloc);
     void unsafeArgAllocError(const Token *tok, const std::string &funcName, const std::string &ptrType, const std::string &objType);
-
-    void getErrorMessages(ErrorLogger *e, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Memory leaks (address not taken)";
-    }
-
-    std::string classInfo() const override {
-        return "Not taking the address to allocated memory\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checknullpointer.cpp b/lib/checknullpointer.cpp
index 0214eceedd1..5c2e64e9a6c 100644
--- a/lib/checknullpointer.cpp
+++ b/lib/checknullpointer.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,33 +47,21 @@
 static const CWE CWE_NULL_POINTER_DEREFERENCE(476U);
 static const CWE CWE_INCORRECT_CALCULATION(682U);
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckNullPointer instance;
-}
-
 //---------------------------------------------------------------------------
 
-static bool checkNullpointerFunctionCallPlausibility(const Function* func, unsigned int arg)
+static bool checkNullpointerFunctionCallPlausibility(const Function* func, size_t arg)
 {
     return !func || (func->argCount() >= arg && func->getArgumentVar(arg - 1) && func->getArgumentVar(arg - 1)->isPointer());
 }
 
-/**
- * @brief parse a function call and extract information about variable usage
- * @param tok first token
- * @param var variables that the function read / write.
- * @param library --library files data
- * @param checkNullArg perform isnullargbad check for each argument?
- */
-void CheckNullPointer::parseFunctionCall(const Token &tok, std::list<const Token *> &var, const Library &library, bool checkNullArg)
+std::list<const Token*> CheckNullPointerImpl::parseFunctionCall(const Token &tok, const Library &library, bool checkNullArg)
 {
     if (Token::Match(&tok, "%name% ( )") || !tok.tokAt(2))
-        return;
+        return {};
 
     const std::vector<const Token *> args = getArguments(&tok);
-
-    for (int argnr = 1; argnr <= args.size(); ++argnr) {
+    std::list<const Token*> var;
+    for (size_t argnr = 1; argnr <= args.size(); ++argnr) {
         const Token *param = args[argnr - 1];
         if ((!checkNullArg || library.isnullargbad(&tok, argnr)) && checkNullpointerFunctionCallPlausibility(tok.function(), argnr))
             var.push_back(param);
@@ -87,14 +75,14 @@ void CheckNullPointer::parseFunctionCall(const Token &tok, std::list<const Token
     if (library.formatstr_function(&tok)) {
         const int formatStringArgNr = library.formatstr_argno(&tok);
         if (formatStringArgNr < 0 || formatStringArgNr >= args.size())
-            return;
+            return var;
 
         // 1st parameter..
         if (Token::Match(&tok, "snprintf|vsnprintf|fnprintf|vfnprintf") && args.size() > 1 && !(args[1] && args[1]->hasKnownIntValue() && args[1]->getKnownIntValue() == 0)) // Only if length (second parameter) is not zero
             var.push_back(args[0]);
 
         if (args[formatStringArgNr]->tokType() != Token::eString)
-            return;
+            return var;
         const std::string &formatString = args[formatStringArgNr]->strValue();
         int argnr = formatStringArgNr + 1;
         const bool scan = library.formatstr_scan(&tok);
@@ -116,7 +104,7 @@ void CheckNullPointer::parseFunctionCall(const Token &tok, std::list<const Token
                     }
                     ++i;
                     if (i == formatString.end())
-                        return;
+                        return var;
                 }
                 if (_continue)
                     continue;
@@ -129,6 +117,7 @@ void CheckNullPointer::parseFunctionCall(const Token &tok, std::list<const Token
             }
         }
     }
+    return var;
 }
 
 namespace {
@@ -139,21 +128,12 @@ namespace {
     };
 }
 
-/**
- * Is there a pointer dereference? Everything that should result in
- * a nullpointer dereference error message will result in a true
- * return value. If it's unknown if the pointer is dereferenced false
- * is returned.
- * @param tok token for the pointer
- * @param unknown it is not known if there is a pointer dereference (could be reported as a debug message)
- * @return true => there is a dereference
- */
-bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown) const
+bool CheckNullPointerImpl::isPointerDeRef(const Token *tok, bool &unknown) const
 {
-    return isPointerDeRef(tok, unknown, *mSettings);
+    return isPointerDeRef(tok, unknown, mSettings.library);
 }
 
-bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown, const Settings &settings, bool checkNullArg)
+bool CheckNullPointerImpl::isPointerDeRef(const Token *tok, bool &unknown, const Library &library, bool checkNullArg)
 {
     unknown = false;
 
@@ -166,8 +146,7 @@ bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown, const Set
             ftok = ftok->previous();
         }
         if (ftok && ftok->previous()) {
-            std::list<const Token *> varlist;
-            parseFunctionCall(*ftok->previous(), varlist, settings.library, checkNullArg);
+            const std::list<const Token *> varlist = CheckNullPointerImpl::parseFunctionCall(*ftok->previous(), library, checkNullArg);
             if (std::find(varlist.cbegin(), varlist.cend(), tok) != varlist.cend()) {
                 return true;
             }
@@ -182,7 +161,7 @@ bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown, const Set
         return false;
     const bool addressOf = parent->astParent() && parent->astParent()->str() == "&";
     if (parent->str() == "." && astIsRHS(tok))
-        return isPointerDeRef(parent, unknown, settings);
+        return isPointerDeRef(parent, unknown, library);
     const bool firstOperand = parent->astOperand1() == tok;
     parent = astParentSkipParens(tok);
     if (!parent)
@@ -194,6 +173,8 @@ bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown, const Set
         // declaration of function pointer
         if (tok->variable() && tok->variable()->nameToken() == tok)
             return false;
+        if ((tok->valueType() && tok->valueType()->pointer == 0) && !astIsIterator(tok) && !astIsSmartPointer(tok))
+            return false;
         if (!addressOf)
             return true;
     }
@@ -223,10 +204,10 @@ bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown, const Set
         return true;
 
     // std::string dereferences nullpointers
-    if (Token::Match(parent->tokAt(-3), "std :: string|wstring (|{ %name% )|}"))
+    if (Token::Match(parent->tokAt(-3), "std :: string|wstring (|{"))
         return true;
-    if (Token::Match(parent->previous(), "%name% (|{ %name% )|}")) {
-        const Variable* var = tok->tokAt(-2)->variable();
+    if (Token::Match(parent->previous(), "%name% (|{")) {
+        const Variable* var = parent->previous()->variable();
         if (var && !var->isPointer() && !var->isArray() && var->isStlStringType())
             return true;
     }
@@ -283,9 +264,9 @@ static bool isNullablePointer(const Token* tok)
     return false;
 }
 
-void CheckNullPointer::nullPointerByDeRefAndCheck()
+void CheckNullPointerImpl::nullPointerByDeRefAndCheck()
 {
-    const bool printInconclusive = (mSettings->certainty.isEnabled(Certainty::inconclusive));
+    const bool printInconclusive = (mSettings.certainty.isEnabled(Certainty::inconclusive));
 
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -310,13 +291,14 @@ void CheckNullPointer::nullPointerByDeRefAndCheck()
 
             return true;
         };
-        std::vector<const Token *> tokens = findTokensSkipDeadAndUnevaluatedCode(mSettings->library, scope->bodyStart, scope->bodyEnd, pred);
+        const Token* const start = (scope->function && scope->function->isConstructor()) ? scope->function->token : scope->bodyStart; // Check initialization list
+        std::vector<const Token *> tokens = findTokensSkipDeadAndUnevaluatedCode(mSettings.library, start, scope->bodyEnd, pred);
         for (const Token *tok : tokens) {
             const ValueFlow::Value *value = tok->getValue(0);
 
             // Pointer dereference.
             bool unknown = false;
-            if (!isPointerDeRef(tok, unknown)) {
+            if (!CheckNullPointerImpl::isPointerDeRef(tok, unknown, mSettings.library)) {
                 if (unknown)
                     nullPointerError(tok, tok->expressionString(), value, true);
                 continue;
@@ -327,7 +309,7 @@ void CheckNullPointer::nullPointerByDeRefAndCheck()
     }
 }
 
-void CheckNullPointer::nullPointer()
+void CheckNullPointerImpl::nullPointer()
 {
     logChecker("CheckNullPointer::nullPointer");
     nullPointerByDeRefAndCheck();
@@ -341,7 +323,7 @@ namespace {
 }
 
 /** Dereferencing null constant (simplified token list) */
-void CheckNullPointer::nullConstantDereference()
+void CheckNullPointerImpl::nullConstantDereference()
 {
     logChecker("CheckNullPointer::nullConstantDereference");
 
@@ -375,8 +357,7 @@ void CheckNullPointer::nullConstantDereference()
                     if (var && !var->isPointer() && !var->isArray() && var->isStlStringType())
                         nullPointerError(tok);
                 } else { // function call
-                    std::list<const Token *> var;
-                    parseFunctionCall(*tok, var, mSettings->library);
+                    const std::list<const Token *> var = parseFunctionCall(*tok, mSettings.library);
 
                     // is one of the var items a NULL pointer?
                     for (const Token *vartok : var) {
@@ -389,13 +370,13 @@ void CheckNullPointer::nullConstantDereference()
 
             else if (Token::Match(tok->previous(), "::|. %name% (")) {
                 const std::vector<const Token *> &args = getArguments(tok);
-                for (int argnr = 0; argnr < args.size(); ++argnr) {
+                for (size_t argnr = 0; argnr < args.size(); ++argnr) {
                     const Token *argtok = args[argnr];
                     if (!argtok->hasKnownIntValue())
                         continue;
                     if (argtok->getKnownIntValue() != 0)
                         continue;
-                    if (mSettings->library.isnullargbad(tok, argnr+1))
+                    if (mSettings.library.isnullargbad(tok, argnr+1))
                         nullPointerError(argtok);
                 }
             }
@@ -435,14 +416,14 @@ void CheckNullPointer::nullConstantDereference()
     }
 }
 
-void CheckNullPointer::nullPointerError(const Token *tok)
+void CheckNullPointerImpl::nullPointerError(const Token *tok)
 {
     ValueFlow::Value v(0);
     v.setKnown();
     nullPointerError(tok, "", &v, false);
 }
 
-void CheckNullPointer::nullPointerError(const Token *tok, const std::string &varname, const ValueFlow::Value *value, bool inconclusive)
+void CheckNullPointerImpl::nullPointerError(const Token *tok, const std::string &varname, const ValueFlow::Value *value, bool inconclusive)
 {
     const std::string errmsgcond("$symbol:" + varname + '\n' + ValueFlow::eitherTheConditionIsRedundant(value ? value->condition : nullptr) + " or there is possible null pointer dereference: $symbol.");
     const std::string errmsgdefarg("$symbol:" + varname + "\nPossible null pointer dereference if the default parameter value is used: $symbol");
@@ -455,13 +436,15 @@ void CheckNullPointer::nullPointerError(const Token *tok, const std::string &var
         reportError(tok, Severity::warning, "nullPointerOutOfResources", "Null pointer dereference", CWE_NULL_POINTER_DEREFERENCE, Certainty::normal);
         return;
     }
+    if (diag(tok))
+        return;
 
     if (!value) {
         reportError(tok, Severity::error, "nullPointer", "Null pointer dereference", CWE_NULL_POINTER_DEREFERENCE, inconclusive ? Certainty::inconclusive : Certainty::normal);
         return;
     }
 
-    if (!mSettings->isEnabled(value, inconclusive) && !mSettings->isPremiumEnabled("nullPointer"))
+    if (!mSettings.isEnabled(value, inconclusive) && !mSettings.isPremiumEnabled("nullPointer"))
         return;
 
     ErrorPath errorPath = getErrorPath(tok, value, "Null pointer dereference");
@@ -494,7 +477,7 @@ void CheckNullPointer::nullPointerError(const Token *tok, const std::string &var
     }
 }
 
-void CheckNullPointer::arithmetic()
+void CheckNullPointerImpl::arithmetic()
 {
     logChecker("CheckNullPointer::arithmetic");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -520,9 +503,9 @@ void CheckNullPointer::arithmetic()
             const ValueFlow::Value* value = pointerOperand->getValue(0);
             if (!value)
                 continue;
-            if (!mSettings->certainty.isEnabled(Certainty::inconclusive) && value->isInconclusive())
+            if (!mSettings.certainty.isEnabled(Certainty::inconclusive) && value->isInconclusive())
                 continue;
-            if (value->condition && !mSettings->severity.isEnabled(Severity::warning))
+            if (value->condition && !mSettings.severity.isEnabled(Severity::warning))
                 continue;
             if (value->condition)
                 redundantConditionWarning(tok, value, value->condition, value->isInconclusive());
@@ -541,7 +524,7 @@ static std::string arithmeticTypeString(const Token *tok)
     return "arithmetic";
 }
 
-void CheckNullPointer::pointerArithmeticError(const Token* tok, const ValueFlow::Value *value, bool inconclusive)
+void CheckNullPointerImpl::pointerArithmeticError(const Token* tok, const ValueFlow::Value *value, bool inconclusive)
 {
     // cppcheck-suppress shadowFunction - TODO: fix this
     std::string arithmetic = arithmeticTypeString(tok);
@@ -571,7 +554,7 @@ void CheckNullPointer::pointerArithmeticError(const Token* tok, const ValueFlow:
                 inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckNullPointer::redundantConditionWarning(const Token* tok, const ValueFlow::Value *value, const Token *condition, bool inconclusive)
+void CheckNullPointerImpl::redundantConditionWarning(const Token* tok, const ValueFlow::Value *value, const Token *condition, bool inconclusive)
 {
     // cppcheck-suppress shadowFunction - TODO: fix this
     std::string arithmetic = arithmeticTypeString(tok);
@@ -595,7 +578,7 @@ static bool isUnsafeUsage(const Settings &settings, const Token *vartok, CTU::Fi
 {
     (void)value;
     bool unknown = false;
-    return CheckNullPointer::isPointerDeRef(vartok, unknown, settings);
+    return CheckNullPointerImpl::isPointerDeRef(vartok, unknown, settings.library);
 }
 
 // a Clang-built executable will crash when using the anonymous MyFileInfo later on - so put it in a unique namespace for now
@@ -621,9 +604,11 @@ namespace
     };
 }
 
-Check::FileInfo *CheckNullPointer::getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) const
+const Check::FileInfo *CheckNullPointer::getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& currentConfig) const
 {
-    const std::list<CTU::FileInfo::UnsafeUsage> &unsafeUsage = CTU::getUnsafeUsage(tokenizer, settings, isUnsafeUsage);
+    (void)currentConfig;
+
+    const std::list<CTU::FileInfo::UnsafeUsage> &unsafeUsage = CTU::getUnsafeUsage(tokenizer, settings, ::isUnsafeUsage);
     if (unsafeUsage.empty())
         return nullptr;
 
@@ -632,24 +617,24 @@ Check::FileInfo *CheckNullPointer::getFileInfo(const Tokenizer &tokenizer, const
     return fileInfo;
 }
 
-Check::FileInfo * CheckNullPointer::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const
+const Check::FileInfo * CheckNullPointer::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const
 {
     const std::list<CTU::FileInfo::UnsafeUsage> &unsafeUsage = CTU::loadUnsafeUsageListFromXml(xmlElement);
     if (unsafeUsage.empty())
         return nullptr;
 
-    auto *fileInfo = new MyFileInfo;
+    auto *fileInfo = new MyFileInfo(file0);
     fileInfo->unsafeUsage = unsafeUsage;
     return fileInfo;
 }
 
-bool CheckNullPointer::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
+bool CheckNullPointer::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<const Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
 {
     (void)settings;
 
-    CheckNullPointer dummy(nullptr, &settings, &errorLogger);
+    CheckNullPointerImpl dummy(nullptr, settings, errorLogger);
     dummy.
-    logChecker("CheckNullPointer::analyseWholeProgram"); // unusedfunctions
+    logChecker("CheckNullPointer::analyseWholeProgram");
 
     if (fileInfo.empty())
         return false;
@@ -707,17 +692,17 @@ bool CheckNullPointer::analyseWholeProgram(const CTU::FileInfo &ctu, const std::
     return foundErrors;
 }
 
-void CheckNullPointer::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckNullPointer::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckNullPointer checkNullPointer(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckNullPointerImpl checkNullPointer(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkNullPointer.nullPointer();
     checkNullPointer.arithmetic();
     checkNullPointer.nullConstantDereference();
 }
 
-void CheckNullPointer::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckNullPointer::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckNullPointer c(nullptr, settings, errorLogger);
+    CheckNullPointerImpl c(nullptr, settings, errorLogger);
     c.nullPointerError(nullptr, "pointer", nullptr, false);
     c.pointerArithmeticError(nullptr, nullptr, false);
     // TODO: nullPointerArithmeticOutOfMemory
diff --git a/lib/checknullpointer.h b/lib/checknullpointer.h
index d28927d19e9..ed6a617d81a 100644
--- a/lib/checknullpointer.h
+++ b/lib/checknullpointer.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,9 +23,11 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <list>
+#include <set>
 #include <string>
 
 class ErrorLogger;
@@ -46,11 +48,38 @@ namespace ValueFlow
 /** @brief check for null pointer dereferencing */
 
 class CPPCHECKLIB CheckNullPointer : public Check {
-    friend class TestNullPointer;
-
 public:
     /** @brief This constructor is used when registering the CheckNullPointer */
-    CheckNullPointer() : Check(myName()) {}
+    CheckNullPointer() : Check("Null pointer") {}
+
+private:
+    /** @brief Run checks against the normal token list */
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    /** @brief Parse current TU and extract file info */
+    const Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& currentConfig) const override;
+
+    const Check::FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const override;
+
+    /** @brief Analyse all file infos for all TU */
+    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<const Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
+
+    /** Get error messages. Used by --errorlist */
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    /** class info in WIKI format. Used by --doc */
+    std::string classInfo() const override {
+        return "Null pointers\n"
+               "- null pointer dereferencing\n"
+               "- undefined null pointer arithmetic\n";
+    }
+};
+
+class CPPCHECKLIB CheckNullPointerImpl : public CheckImpl {
+public:
+    /** @brief This constructor is used when running checks. */
+    CheckNullPointerImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /**
      * Is there a pointer dereference? Everything that should result in
@@ -63,25 +92,16 @@ class CPPCHECKLIB CheckNullPointer : public Check {
      */
     bool isPointerDeRef(const Token *tok, bool &unknown) const;
 
-    static bool isPointerDeRef(const Token *tok, bool &unknown, const Settings &settings, bool checkNullArg = true);
+    static bool isPointerDeRef(const Token *tok, bool &unknown, const Library &library, bool checkNullArg = true);
 
-private:
     /**
      * @brief parse a function call and extract information about variable usage
      * @param tok first token
-     * @param var variables that the function read / write.
      * @param library --library files data
+     * @param checkNullArg perform isnullargbad check for each argument?
+     * @return list of variables that the function reads / writes.
      */
-    static void parseFunctionCall(const Token &tok,
-                                  std::list<const Token *> &var,
-                                  const Library &library, bool checkNullArg = true);
-
-    /** @brief This constructor is used when running checks. */
-    CheckNullPointer(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
-    /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    static std::list<const Token*> parseFunctionCall(const Token &tok, const Library &library, bool checkNullArg = true);
 
     /** @brief possible null pointer dereference */
     void nullPointer();
@@ -92,29 +112,6 @@ class CPPCHECKLIB CheckNullPointer : public Check {
     void nullPointerError(const Token *tok);
     void nullPointerError(const Token *tok, const std::string &varname, const ValueFlow::Value* value, bool inconclusive);
 
-    /** @brief Parse current TU and extract file info */
-    Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) const override;
-
-    Check::FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const override;
-
-    /** @brief Analyse all file infos for all TU */
-    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
-
-    /** Get error messages. Used by --errorlist */
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    /** Name of check */
-    static std::string myName() {
-        return "Null pointer";
-    }
-
-    /** class info in WIKI format. Used by --doc */
-    std::string classInfo() const override {
-        return "Null pointers\n"
-               "- null pointer dereferencing\n"
-               "- undefined null pointer arithmetic\n";
-    }
-
     /**
      * @brief Does one part of the check for nullPointer().
      * Dereferencing a pointer and then checking if it's NULL..
@@ -125,6 +122,12 @@ class CPPCHECKLIB CheckNullPointer : public Check {
     void arithmetic();
     void pointerArithmeticError(const Token* tok, const ValueFlow::Value *value, bool inconclusive);
     void redundantConditionWarning(const Token* tok, const ValueFlow::Value *value, const Token *condition, bool inconclusive);
+
+    bool diag(const Token* tok) {
+        return !mDiag.emplace(tok).second;
+    }
+
+    std::set<const Token*> mDiag;
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index 53257591273..79697a2e6d7 100644
--- a/lib/checkother.cpp
+++ b/lib/checkother.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 #include "fwdanalysis.h"
 #include "library.h"
 #include "mathlib.h"
+#include "refthunk.h"
 #include "platform.h"
 #include "settings.h"
 #include "standards.h"
@@ -49,11 +50,6 @@
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckOther instance;
-}
-
 static const CWE CWE128(128U);   // Wrap-around Error
 static const CWE CWE131(131U);   // Incorrect Calculation of Buffer Size
 static const CWE CWE197(197U);   // Numeric Truncation Error
@@ -85,9 +81,9 @@ static const CWE CWE783(783U);   // Operator Precedence Logic Error
 // - http://www.cplusplus.com/reference/cstdio/getchar/
 // - http://www.cplusplus.com/reference/cstdio/ungetc/ ...
 //----------------------------------------------------------------------------------
-void CheckOther::checkCastIntToCharAndBack()
+void CheckOtherImpl::checkCastIntToCharAndBack()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckOther::checkCastIntToCharAndBack"); // warning
@@ -135,7 +131,7 @@ void CheckOther::checkCastIntToCharAndBack()
     }
 }
 
-void CheckOther::checkCastIntToCharAndBackError(const Token *tok, const std::string &strFunctionName)
+void CheckOtherImpl::checkCastIntToCharAndBackError(const Token *tok, const std::string &strFunctionName)
 {
     reportError(
         tok,
@@ -155,9 +151,9 @@ void CheckOther::checkCastIntToCharAndBackError(const Token *tok, const std::str
 //---------------------------------------------------------------------------
 // Clarify calculation precedence for ternary operators.
 //---------------------------------------------------------------------------
-void CheckOther::clarifyCalculation()
+void CheckOtherImpl::clarifyCalculation()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("clarifyCalculation"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("clarifyCalculation"))
         return;
 
     logChecker("CheckOther::clarifyCalculation"); // style
@@ -204,7 +200,7 @@ void CheckOther::clarifyCalculation()
     }
 }
 
-void CheckOther::clarifyCalculationError(const Token *tok, const std::string &op)
+void CheckOtherImpl::clarifyCalculationError(const Token *tok, const std::string &op)
 {
     // suspicious calculation
     const std::string calc("'a" + op + "b?c:d'");
@@ -226,9 +222,9 @@ void CheckOther::clarifyCalculationError(const Token *tok, const std::string &op
 //---------------------------------------------------------------------------
 // Clarify (meaningless) statements like *foo++; with parentheses.
 //---------------------------------------------------------------------------
-void CheckOther::clarifyStatement()
+void CheckOtherImpl::clarifyStatement()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckOther::clarifyStatement"); // warning
@@ -252,7 +248,7 @@ void CheckOther::clarifyStatement()
     }
 }
 
-void CheckOther::clarifyStatementError(const Token *tok)
+void CheckOtherImpl::clarifyStatementError(const Token *tok)
 {
     reportError(tok, Severity::warning, "clarifyStatement", "In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'?\n"
                 "A statement like '*A++;' might not do what you intended. Postfix 'operator++' is executed before 'operator*'. "
@@ -262,9 +258,9 @@ void CheckOther::clarifyStatementError(const Token *tok)
 //---------------------------------------------------------------------------
 // Check for suspicious occurrences of 'if(); {}'.
 //---------------------------------------------------------------------------
-void CheckOther::checkSuspiciousSemicolon()
+void CheckOtherImpl::checkSuspiciousSemicolon()
 {
-    if (!mSettings->certainty.isEnabled(Certainty::inconclusive) || !mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.certainty.isEnabled(Certainty::inconclusive) || !mSettings.severity.isEnabled(Severity::warning))
         return;
 
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -286,7 +282,7 @@ void CheckOther::checkSuspiciousSemicolon()
     }
 }
 
-void CheckOther::suspiciousSemicolonError(const Token* tok)
+void CheckOtherImpl::suspiciousSemicolonError(const Token* tok)
 {
     reportError(tok, Severity::warning, "suspiciousSemicolon",
                 "Suspicious use of ; at the end of '" + (tok ? tok->str() : std::string()) + "' statement.", CWE398, Certainty::normal);
@@ -334,13 +330,13 @@ static bool isDangerousTypeConversion(const Token* const tok)
 //---------------------------------------------------------------------------
 // For C++ code, warn if C-style casts are used on pointer types
 //---------------------------------------------------------------------------
-void CheckOther::warningOldStylePointerCast()
+void CheckOtherImpl::warningOldStylePointerCast()
 {
     // Only valid on C++ code
     if (!mTokenizer->isCPP())
         return;
 
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("cstyleCast"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("cstyleCast"))
         return;
 
     logChecker("CheckOther::warningOldStylePointerCast"); // style,c++
@@ -399,7 +395,7 @@ void CheckOther::warningOldStylePointerCast()
     }
 }
 
-void CheckOther::cstyleCastError(const Token *tok, bool isPtr)
+void CheckOtherImpl::cstyleCastError(const Token *tok, bool isPtr)
 {
     const std::string type = isPtr ? "pointer" : "reference";
     reportError(tok, Severity::style, "cstyleCast",
@@ -410,12 +406,12 @@ void CheckOther::cstyleCastError(const Token *tok, bool isPtr)
                 "which kind of cast is expected.", CWE398, Certainty::normal);
 }
 
-void CheckOther::warningDangerousTypeCast()
+void CheckOtherImpl::warningDangerousTypeCast()
 {
     // Only valid on C++ code
     if (!mTokenizer->isCPP())
         return;
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("cstyleCast"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("dangerousTypeCast"))
         return;
 
     logChecker("CheckOther::warningDangerousTypeCast"); // warning,c++
@@ -438,7 +434,7 @@ void CheckOther::warningDangerousTypeCast()
     }
 }
 
-void CheckOther::dangerousTypeCastError(const Token *tok, bool isPtr)
+void CheckOtherImpl::dangerousTypeCastError(const Token *tok, bool isPtr)
 {
     //const std::string type = isPtr ? "pointer" : "reference";
     (void)isPtr;
@@ -447,9 +443,9 @@ void CheckOther::dangerousTypeCastError(const Token *tok, bool isPtr)
                 CWE398, Certainty::normal);
 }
 
-void CheckOther::warningIntToPointerCast()
+void CheckOtherImpl::warningIntToPointerCast()
 {
-    if (!mSettings->severity.isEnabled(Severity::portability) && !mSettings->isPremiumEnabled("cstyleCast"))
+    if (!mSettings.severity.isEnabled(Severity::portability) && !mSettings.isPremiumEnabled("cstyleCast"))
         return;
 
     logChecker("CheckOther::warningIntToPointerCast"); // portability
@@ -469,6 +465,8 @@ void CheckOther::warningIntToPointerCast()
                 format = "decimal";
             else if (MathLib::isOct(from->str()))
                 format = "octal";
+            else if (MathLib::isBin(from->str()))
+                format = "binary";
             else
                 continue;
             intToPointerCastError(tok, format);
@@ -476,16 +474,16 @@ void CheckOther::warningIntToPointerCast()
     }
 }
 
-void CheckOther::intToPointerCastError(const Token *tok, const std::string& format)
+void CheckOtherImpl::intToPointerCastError(const Token *tok, const std::string& format)
 {
     reportError(tok, Severity::portability, "intToPointerCast",
                 "Casting non-zero " + format + " integer literal to pointer.",
                 CWE398, Certainty::normal);
 }
 
-void CheckOther::suspiciousFloatingPointCast()
+void CheckOtherImpl::suspiciousFloatingPointCast()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("suspiciousFloatingPointCast"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("suspiciousFloatingPointCast"))
         return;
 
     logChecker("CheckOther::suspiciousFloatingPointCast"); // style
@@ -533,7 +531,7 @@ void CheckOther::suspiciousFloatingPointCast()
     }
 }
 
-void CheckOther::suspiciousFloatingPointCastError(const Token* tok)
+void CheckOtherImpl::suspiciousFloatingPointCastError(const Token* tok)
 {
     reportError(tok, Severity::style, "suspiciousFloatingPointCast",
                 "Floating-point cast causes loss of precision.\n"
@@ -544,14 +542,14 @@ void CheckOther::suspiciousFloatingPointCastError(const Token* tok)
 // float* f; double* d = (double*)f; <-- Pointer cast to a type with an incompatible binary data representation
 //---------------------------------------------------------------------------
 
-void CheckOther::invalidPointerCast()
+void CheckOtherImpl::invalidPointerCast()
 {
-    if (!mSettings->severity.isEnabled(Severity::portability))
+    if (!mSettings.severity.isEnabled(Severity::portability))
         return;
 
     logChecker("CheckOther::invalidPointerCast"); // portability
 
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -584,7 +582,7 @@ void CheckOther::invalidPointerCast()
 }
 
 
-void CheckOther::invalidPointerCastError(const Token* tok, const std::string& from, const std::string& to, bool inconclusive, bool toIsInt)
+void CheckOtherImpl::invalidPointerCastError(const Token* tok, const std::string& from, const std::string& to, bool inconclusive, bool toIsInt)
 {
     if (toIsInt) { // If we cast something to int*, this can be useful to play with its binary data representation
         reportError(tok, Severity::portability, "invalidPointerCast", "Casting from " + from + " to " + to + " is not portable due to different binary data representations on different platforms.", CWE704, inconclusive ? Certainty::inconclusive : Certainty::normal);
@@ -597,11 +595,19 @@ void CheckOther::invalidPointerCastError(const Token* tok, const std::string& fr
 // Detect redundant assignments: x = 0; x = 4;
 //---------------------------------------------------------------------------
 
-void CheckOther::checkRedundantAssignment()
+static bool isAssignmentOrInit(const Token* tok) {
+    if (tok->astParent() || !tok->astOperand1())
+        return false;
+    if (tok->isAssignmentOp() || tok->tokType() == Token::eIncDecOp)
+        return true;
+    return Token::Match(tok, "[{(]") && tok->astOperand1()->variable() && tok->astOperand1() == tok->astOperand1()->variable()->nameToken();
+}
+
+void CheckOtherImpl::checkRedundantAssignment()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) &&
-        !mSettings->isPremiumEnabled("redundantAssignment") &&
-        !mSettings->isPremiumEnabled("redundantAssignInSwitch"))
+    if (!mSettings.severity.isEnabled(Severity::style) &&
+        !mSettings.isPremiumEnabled("redundantAssignment") &&
+        !mSettings.isPremiumEnabled("redundantAssignInSwitch"))
         return;
 
     logChecker("CheckOther::checkRedundantAssignment"); // style
@@ -617,75 +623,80 @@ void CheckOther::checkRedundantAssignment()
             if (Token::simpleMatch(tok, "try {"))
                 // todo: check try blocks
                 tok = tok->linkAt(1);
-            if ((tok->isAssignmentOp() || tok->tokType() == Token::eIncDecOp) && tok->astOperand1()) {
-                if (tok->astParent())
-                    continue;
-
-                // Do not warn about redundant initialization when rhs is trivial
-                // TODO : do not simplify the variable declarations
-                bool isInitialization = false;
-                if (Token::Match(tok->tokAt(-2), "; %var% =") && tok->tokAt(-2)->isSplittedVarDeclEq()) {
-                    isInitialization = true;
-                    bool trivial = true;
-                    visitAstNodes(tok->astOperand2(),
-                                  [&](const Token *rhs) {
-                        if (Token::simpleMatch(rhs, "{ 0 }"))
-                            return ChildrenToVisit::none;
-                        if (Token::Match(rhs, "%str%|%num%|%name%") && !rhs->varId())
-                            return ChildrenToVisit::none;
-                        if (Token::Match(rhs, ":: %name%") && rhs->hasKnownIntValue())
-                            return ChildrenToVisit::none;
-                        if (rhs->isCast())
-                            return ChildrenToVisit::op2;
-                        trivial = false;
-                        return ChildrenToVisit::done;
-                    });
-                    if (trivial)
-                        continue;
-                }
+            if (!isAssignmentOrInit(tok))
+                continue;
 
-                const Token* rhs = tok->astOperand2();
-                // Do not warn about assignment with 0 / NULL
-                if ((rhs && MathLib::isNullValue(rhs->str())) || isNullOperand(rhs))
+            // Do not warn about redundant initialization when rhs is trivial
+            // TODO : do not simplify the variable declarations
+            bool isInitialization = false;
+            if ((Token::Match(tok->tokAt(-2), "; %var% =") && tok->tokAt(-2)->isSplittedVarDeclEq()) || Token::Match(tok, "[{(]")) {
+                isInitialization = true;
+                bool trivial = true;
+                visitAstNodes(tok->astOperand2(),
+                              [&](const Token *rhs) {
+                    if (Token::simpleMatch(rhs, "{ 0 }"))
+                        return ChildrenToVisit::none;
+                    if (Token::Match(rhs, "%num%|%name%") && !rhs->varId())
+                        return ChildrenToVisit::none;
+                    if (Token::Match(rhs, ":: %name%") && rhs->hasKnownIntValue())
+                        return ChildrenToVisit::none;
+                    if (rhs->isCast())
+                        return rhs->astOperand2() ? ChildrenToVisit::op2 : ChildrenToVisit::op1;
+                    trivial = false;
+                    return ChildrenToVisit::done;
+                });
+                if (trivial)
                     continue;
+            }
 
-                if (tok->astOperand1()->variable() && tok->astOperand1()->variable()->isReference())
-                    // todo: check references
-                    continue;
+            const Token* rhs = tok->astOperand2();
+            // Do not warn about assignment with 0 / NULL
+            if ((rhs && MathLib::isNullValue(rhs->str())) || isNullOperand(rhs))
+                continue;
 
-                if (tok->astOperand1()->variable() && tok->astOperand1()->variable()->isStatic())
-                    // todo: check static variables
-                    continue;
+            if (tok->astOperand1()->variable() && tok->astOperand1()->variable()->isReference())
+                // todo: check references
+                continue;
 
-                bool inconclusive = false;
-                if (tok->isCpp() && tok->astOperand1()->valueType()) {
-                    // If there is a custom assignment operator => this is inconclusive
-                    if (tok->astOperand1()->valueType()->typeScope) {
-                        const std::string op = "operator" + tok->str();
-                        const std::list<Function>& fList = tok->astOperand1()->valueType()->typeScope->functionList;
-                        inconclusive = std::any_of(fList.cbegin(), fList.cend(), [&](const Function& f) {
-                            return f.name() == op;
-                        });
-                    }
-                    // assigning a smart pointer has side effects
-                    if (tok->astOperand1()->valueType()->type == ValueType::SMART_POINTER)
-                        break;
+            if (tok->astOperand1()->variable() && tok->astOperand1()->variable()->isStatic())
+                // todo: check static variables
+                continue;
+
+            bool inconclusive = false;
+            if (tok->isCpp() && tok->astOperand1()->valueType()) {
+                // If there is a custom assignment operator => this is inconclusive
+                if (tok->astOperand1()->valueType()->typeScope) {
+                    const std::string op = "operator" + tok->str();
+                    const std::list<Function>& fList = tok->astOperand1()->valueType()->typeScope->functionList;
+                    inconclusive = std::any_of(fList.cbegin(), fList.cend(), [&](const Function& f) {
+                        return f.name() == op;
+                    });
                 }
-                if (inconclusive && !mSettings->certainty.isEnabled(Certainty::inconclusive))
-                    continue;
+                // assigning a smart pointer has side effects
+                if (tok->astOperand1()->valueType()->type == ValueType::SMART_POINTER)
+                    break;
+            }
+            if (inconclusive && !mSettings.certainty.isEnabled(Certainty::inconclusive))
+                continue;
 
-                FwdAnalysis fwdAnalysis(*mSettings);
-                if (fwdAnalysis.hasOperand(tok->astOperand2(), tok->astOperand1()))
-                    continue;
+            FwdAnalysis fwdAnalysis(mSettings);
+            if (fwdAnalysis.hasOperand(tok->astOperand2(), tok->astOperand1()))
+                continue;
 
-                // Is there a redundant assignment?
-                const Token *start;
-                if (tok->isAssignmentOp())
-                    start = tok->astOperand2();
-                else
-                    start = tok->findExpressionStartEndTokens().second->next();
+            // Is there a redundant assignment?
+            const Token *start;
+            if (tok->isAssignmentOp())
+                start = tok->astOperand2();
+            else
+                start = tok->findExpressionStartEndTokens().second->next();
+
+            std::vector<const Token*> tokensToCheck{ tok->astOperand1() };
+            if (Token::simpleMatch(tok->astOperand1(), "[") && Token::simpleMatch(tok->astOperand1()->astOperand1(), "auto")) { // structured binding
+                tokensToCheck = astFlatten(tok->astOperand1()->astOperand2(), ",");
+                isInitialization = true;
+            }
 
-                const Token * tokenToCheck = tok->astOperand1();
+            for (const Token* tokenToCheck : tokensToCheck) {
 
                 // Check if we are working with union
                 for (const Token* tempToken = tokenToCheck; Token::simpleMatch(tempToken, ".");) {
@@ -701,17 +712,22 @@ void CheckOther::checkRedundantAssignment()
                 }
 
                 // Get next assignment..
-                const Token *nextAssign = fwdAnalysis.reassign(tokenToCheck, start, scope->bodyEnd);
+                const Token* nextAssign = fwdAnalysis.reassign(tokenToCheck, start, scope->bodyEnd);
                 // extra check for union
-                if (nextAssign && tokenToCheck != tok->astOperand1())
+                const bool isUnion = tokenToCheck != tok->astOperand1() && !isStructuredBindingVariable(tokenToCheck->variable());
+                if (nextAssign && isUnion) {
                     nextAssign = fwdAnalysis.reassign(tok->astOperand1(), start, scope->bodyEnd);
+                    // reading another member of the same union in the rhs is a use through aliasing
+                    if (nextAssign && fwdAnalysis.hasOperand(nextAssign->astOperand2(), tokenToCheck))
+                        nextAssign = nullptr;
+                }
 
                 if (!nextAssign)
                     continue;
 
                 // there is redundant assignment. Is there a case between the assignments?
                 bool hasCase = false;
-                for (const Token *tok2 = tok; tok2 != nextAssign; tok2 = tok2->next()) {
+                for (const Token* tok2 = tok; tok2 != nextAssign; tok2 = tok2->next()) {
                     if (tok2->str() == "break" || tok2->str() == "return")
                         break;
                     if (tok2->str() == "case") {
@@ -721,20 +737,21 @@ void CheckOther::checkRedundantAssignment()
                 }
 
                 // warn
+                const Token* exprTok = isUnion ? tok->astOperand1() : tokenToCheck;
                 if (hasCase)
-                    redundantAssignmentInSwitchError(tok, nextAssign, tok->astOperand1()->expressionString());
+                    redundantAssignmentInSwitchError(tok, nextAssign, exprTok->expressionString());
                 else if (isInitialization)
-                    redundantInitializationError(tok, nextAssign, tok->astOperand1()->expressionString(), inconclusive);
+                    redundantInitializationError(tok, nextAssign, exprTok->expressionString(), inconclusive);
                 else {
                     diag(nextAssign);
-                    redundantAssignmentError(tok, nextAssign, tok->astOperand1()->expressionString(), inconclusive);
+                    redundantAssignmentError(tok, nextAssign, exprTok->expressionString(), inconclusive);
                 }
             }
         }
     }
 }
 
-void CheckOther::redundantCopyError(const Token *tok1, const Token* tok2, const std::string& var)
+void CheckOtherImpl::redundantCopyError(const Token *tok1, const Token* tok2, const std::string& var)
 {
     const std::list<const Token *> callstack = { tok1, tok2 };
     reportError(callstack, Severity::performance, "redundantCopy",
@@ -742,7 +759,7 @@ void CheckOther::redundantCopyError(const Token *tok1, const Token* tok2, const
                 "Buffer '$symbol' is being written before its old content has been used.", CWE563, Certainty::normal);
 }
 
-void CheckOther::redundantAssignmentError(const Token *tok1, const Token* tok2, const std::string& var, bool inconclusive)
+void CheckOtherImpl::redundantAssignmentError(const Token *tok1, const Token* tok2, const std::string& var, bool inconclusive)
 {
     ErrorPath errorPath = { ErrorPathItem(tok1, var + " is assigned"), ErrorPathItem(tok2, var + " is overwritten") };
     if (inconclusive)
@@ -756,7 +773,7 @@ void CheckOther::redundantAssignmentError(const Token *tok1, const Token* tok2,
                     "Variable '$symbol' is reassigned a value before the old one has been used.", CWE563, Certainty::normal);
 }
 
-void CheckOther::redundantInitializationError(const Token *tok1, const Token* tok2, const std::string& var, bool inconclusive)
+void CheckOtherImpl::redundantInitializationError(const Token *tok1, const Token* tok2, const std::string& var, bool inconclusive)
 {
     ErrorPath errorPath = { ErrorPathItem(tok1, var + " is initialized"), ErrorPathItem(tok2, var + " is overwritten") };
     reportError(std::move(errorPath), Severity::style, "redundantInitialization",
@@ -765,7 +782,7 @@ void CheckOther::redundantInitializationError(const Token *tok1, const Token* to
                 inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckOther::redundantAssignmentInSwitchError(const Token *tok1, const Token* tok2, const std::string &var)
+void CheckOtherImpl::redundantAssignmentInSwitchError(const Token *tok1, const Token* tok2, const std::string &var)
 {
     ErrorPath errorPath = { ErrorPathItem(tok1, "$symbol is assigned"), ErrorPathItem(tok2, "$symbol is overwritten") };
     reportError(std::move(errorPath), Severity::style, "redundantAssignInSwitch",
@@ -773,7 +790,7 @@ void CheckOther::redundantAssignmentInSwitchError(const Token *tok1, const Token
                 "Variable '$symbol' is reassigned a value before the old one has been used. 'break;' missing?", CWE563, Certainty::normal);
 }
 
-void CheckOther::redundantAssignmentSameValueError(const Token *tok, const ValueFlow::Value* val, const std::string &var)
+void CheckOtherImpl::redundantAssignmentSameValueError(const Token *tok, const ValueFlow::Value* val, const std::string &var)
 {
     auto errorPath = val->errorPath;
     errorPath.emplace_back(tok, "");
@@ -794,12 +811,12 @@ void CheckOther::redundantAssignmentSameValueError(const Token *tok, const Value
 //---------------------------------------------------------------------------
 static inline bool isFunctionOrBreakPattern(const Token *tok)
 {
-    return Token::Match(tok, "%name% (") || Token::Match(tok, "break|continue|return|exit|goto|throw");
+    return Token::Match(tok, "%name% (") || (tok->isKeyword() && Token::Match(tok, "break|continue|return|goto|throw"));
 }
 
-void CheckOther::redundantBitwiseOperationInSwitchError()
+void CheckOtherImpl::redundantBitwiseOperationInSwitchError()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckOther::redundantBitwiseOperationInSwitch"); // warning
@@ -914,7 +931,7 @@ void CheckOther::redundantBitwiseOperationInSwitchError()
     }
 }
 
-void CheckOther::redundantBitwiseOperationInSwitchError(const Token *tok, const std::string &varname)
+void CheckOtherImpl::redundantBitwiseOperationInSwitchError(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::style,
                 "redundantBitwiseOperationInSwitch",
@@ -926,9 +943,9 @@ void CheckOther::redundantBitwiseOperationInSwitchError(const Token *tok, const
 //---------------------------------------------------------------------------
 // Check for statements like case A||B: in switch()
 //---------------------------------------------------------------------------
-void CheckOther::checkSuspiciousCaseInSwitch()
+void CheckOtherImpl::checkSuspiciousCaseInSwitch()
 {
-    if (!mSettings->certainty.isEnabled(Certainty::inconclusive) || !mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.certainty.isEnabled(Certainty::inconclusive) || !mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckOther::checkSuspiciousCaseInSwitch"); // warning,inconclusive
@@ -960,13 +977,73 @@ void CheckOther::checkSuspiciousCaseInSwitch()
     }
 }
 
-void CheckOther::suspiciousCaseInSwitchError(const Token* tok, const std::string& operatorString)
+void CheckOtherImpl::suspiciousCaseInSwitchError(const Token* tok, const std::string& operatorString)
 {
     reportError(tok, Severity::warning, "suspiciousCase",
                 "Found suspicious case label in switch(). Operator '" + operatorString + "' probably doesn't work as intended.\n"
                 "Using an operator like '" + operatorString + "' in a case label is suspicious. Did you intend to use a bitwise operator, multiple case labels or if/else instead?", CWE398, Certainty::inconclusive);
 }
 
+void CheckOtherImpl::checkUnreachableSwitchCase()
+{
+    if (!mSettings.severity.isEnabled(Severity::style))
+        return;
+
+    logChecker("CheckOther::checkUnreachableSwitchCase"); // style
+
+    const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
+
+    for (const Scope& scope : symbolDatabase->scopeList) {
+        if (scope.type != ScopeType::eSwitch || !scope.bodyStart)
+            continue;
+        const Token* rpar = scope.bodyStart->previous();
+        if (!Token::simpleMatch(rpar, ")"))
+            continue;
+        const Token* lpar = rpar->link();
+        if (!lpar)
+            continue;
+        const Token* condition = lpar->astOperand2();
+        if (!condition)
+            continue;
+        const ValueFlow::Value* switchValue =
+            condition->getKnownValue(ValueFlow::Value::ValueType::INT);
+        if (!switchValue)
+            continue;
+
+        for (const Token* tok = scope.bodyStart->next();
+             tok && tok != scope.bodyEnd;
+             tok = tok->next()) {
+
+            // Do not inspect cases belonging to a nested switch.
+            if (Token::simpleMatch(tok, "{") &&
+                tok->scope()->type == ScopeType::eSwitch) {
+                tok = tok->link();
+                continue;
+            }
+            if (!Token::simpleMatch(tok, "case"))
+                continue;
+            const Token* caseExpression = tok->astOperand1();
+            if (!caseExpression)
+                continue;
+            const ValueFlow::Value* caseValue =
+                caseExpression->getKnownValue(ValueFlow::Value::ValueType::INT);
+            if (!caseValue)
+                continue;
+            if (switchValue->intvalue == caseValue->intvalue)
+                continue;
+            unreachableSwitchCaseError(tok, caseExpression->expressionString(), MathLib::toString(switchValue->intvalue));
+        }
+    }
+}
+
+void CheckOtherImpl::unreachableSwitchCaseError(const Token* tok, const std::string& caseExpression, const std::string& switchValue)
+{
+    reportError(tok, Severity::style, "unreachableSwitchCase",
+                "Switch case '" + caseExpression +
+                "' can never be selected because the switch condition is known to be " + switchValue + ".",
+                CWE561, Certainty::normal);
+}
+
 static bool isNestedInSwitch(const Scope* scope)
 {
     while (scope) {
@@ -1010,18 +1087,18 @@ static bool isVardeclInSwitch(const Token* tok)
 //    Detect dead code, that follows such a statement. e.g.:
 //        return(0); foo();
 //---------------------------------------------------------------------------
-void CheckOther::checkUnreachableCode()
+void CheckOtherImpl::checkUnreachableCode()
 {
     // misra-c-2012-2.1
     // misra-c-2023-2.1
     // misra-cpp-2008-0-1-1
     // autosar
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("duplicateBreak") && !mSettings->isPremiumEnabled("unreachableCode"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("duplicateBreak") && !mSettings.isPremiumEnabled("unreachableCode"))
         return;
 
     logChecker("CheckOther::checkUnreachableCode"); // style
 
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         if (scope->hasInlineOrLambdaFunction(nullptr, /*onlyInline*/ true))
@@ -1048,7 +1125,7 @@ void CheckOther::checkUnreachableCode()
             } else if (Token::Match(tok, "goto %any% ;")) {
                 secondBreak = tok->tokAt(3);
                 labelName = tok->next();
-            } else if (Token::Match(tok, "%name% (") && mSettings->library.isnoreturn(tok) && !Token::Match(tok->next()->astParent(), "?|:")) {
+            } else if (Token::Match(tok, "%name% (") && mSettings.library.isnoreturn(tok) && !Token::Match(tok->next()->astParent(), "?|:")) {
                 if ((!tok->function() || (tok->function()->token != tok && tok->function()->tokenDef != tok)) && tok->linkAt(1)->strAt(1) != "{")
                     secondBreak = tok->linkAt(1)->tokAt(2);
                 if (Token::simpleMatch(secondBreak, "return")) {
@@ -1130,7 +1207,7 @@ void CheckOther::checkUnreachableCode()
     }
 }
 
-void CheckOther::duplicateBreakError(const Token *tok, bool inconclusive)
+void CheckOtherImpl::duplicateBreakError(const Token *tok, bool inconclusive)
 {
     reportError(tok, Severity::style, "duplicateBreak",
                 "Consecutive return, break, continue, goto or throw statements are unnecessary.\n"
@@ -1138,10 +1215,10 @@ void CheckOther::duplicateBreakError(const Token *tok, bool inconclusive)
                 "The second statement can never be executed, and so should be removed.", CWE561, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckOther::unreachableCodeError(const Token *tok, const Token* noreturn, bool inconclusive)
+void CheckOtherImpl::unreachableCodeError(const Token *tok, const Token* noreturn, bool inconclusive)
 {
     std::string msg = "Statements following ";
-    if (noreturn && (noreturn->function() || mSettings->library.isnoreturn(noreturn)))
+    if (noreturn && (noreturn->function() || mSettings.library.isnoreturn(noreturn)))
         msg += "noreturn function '" + noreturn->str() + "()'";
     else if (noreturn && noreturn->isKeyword())
         msg += "'" + noreturn->str() + "'";
@@ -1152,7 +1229,7 @@ void CheckOther::unreachableCodeError(const Token *tok, const Token* noreturn, b
                 msg, CWE561, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckOther::redundantContinueError(const Token *tok)
+void CheckOtherImpl::redundantContinueError(const Token *tok)
 {
     reportError(tok, Severity::style, "redundantContinue",
                 "'continue' is redundant since it is the last statement in a loop.", CWE561, Certainty::normal);
@@ -1163,6 +1240,8 @@ static bool isSimpleExpr(const Token* tok, const Variable* var, const Settings&
         return false;
     if (tok->isNumber() || tok->tokType() == Token::eString || tok->tokType() == Token::eChar || tok->isBoolean())
         return true;
+    if (isNullOperand(tok))
+        return true;
     bool needsCheck = tok->varId() > 0;
     if (!needsCheck) {
         if (tok->isArithmeticalOp())
@@ -1186,19 +1265,19 @@ static bool isSimpleExpr(const Token* tok, const Variable* var, const Settings&
 //---------------------------------------------------------------------------
 // Check scope of variables..
 //---------------------------------------------------------------------------
-void CheckOther::checkVariableScope()
+void CheckOtherImpl::checkVariableScope()
 {
-    if (mSettings->clang)
+    if (mSettings.clang)
         return;
 
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("variableScope"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("variableScope"))
         return;
 
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     // In C it is common practice to declare local variables at the
     // start of functions.
-    if (mSettings->daca && mTokenizer->isC())
+    if (mSettings.daca && mTokenizer->isC())
         return;
 
     logChecker("CheckOther::checkVariableScope"); // style,notclang
@@ -1247,7 +1326,7 @@ void CheckOther::checkVariableScope()
         bool isConstructor = false;
         if (Token::Match(tok, "; %varid% =", var->declarationId())) { // bailout for assignment
             tok = tok->tokAt(2)->astOperand2();
-            if (!isSimpleExpr(tok, var, *mSettings))
+            if (!isSimpleExpr(tok, var, mSettings))
                 continue;
         }
         else if (Token::Match(tok, "{|(")) { // bailout for constructor
@@ -1256,11 +1335,11 @@ void CheckOther::checkVariableScope()
             bool bail = false;
             while (argTok) {
                 if (Token::simpleMatch(argTok, ",")) {
-                    if (!isSimpleExpr(argTok->astOperand2(), var, *mSettings)) {
+                    if (!isSimpleExpr(argTok->astOperand2(), var, mSettings)) {
                         bail = true;
                         break;
                     }
-                } else if (argTok->str() != "." && !isSimpleExpr(argTok, var, *mSettings)) {
+                } else if (argTok->str() != "." && !isSimpleExpr(argTok, var, mSettings)) {
                     bail = true;
                     break;
                 }
@@ -1290,7 +1369,7 @@ void CheckOther::checkVariableScope()
                 tok = tok->link();
 
                 // parse else if blocks..
-            } else if (Token::simpleMatch(tok, "else { if (") && Token::simpleMatch(tok->linkAt(3), ") {")) {
+            } else if (Token::simpleMatch(tok, "else { if (") && tok->next()->isInsertedBrace() && Token::simpleMatch(tok->linkAt(3), ") {")) {
                 tok = tok->next();
             } else if (tok->varId() == var->declarationId() || tok->str() == "goto") {
                 reduce = false;
@@ -1329,7 +1408,16 @@ static bool mayDependOn(const ValueType *other, const ValueType *original)
     return otherPtr > originalPtr;
 }
 
-bool CheckOther::checkInnerScope(const Token *tok, const Variable* var, bool& used) const
+static bool isOnlyUsedInCurrentScope(const Variable* var, const Token *tok, const Scope* scope)
+{
+    if (tok->scope() == scope)
+        return true;
+    if (tok->scope()->type == ScopeType::eSwitch)
+        return false;
+    return !Token::findmatch(tok->scope()->bodyEnd, "%varid%", var->scope()->bodyEnd, var->declarationId());
+}
+
+bool CheckOtherImpl::checkInnerScope(const Token *tok, const Variable* var, bool& used) const
 {
     const Scope* scope = tok->next()->scope();
     bool loopVariable = scope->isLoopScope();
@@ -1368,7 +1456,8 @@ bool CheckOther::checkInnerScope(const Token *tok, const Variable* var, bool& us
         if (tok == forHeadEnd)
             forHeadEnd = nullptr;
 
-        if (loopVariable && noContinue && tok->scope() == scope && !forHeadEnd && scope->type != ScopeType::eSwitch && Token::Match(tok, "%varid% =", var->declarationId())) { // Assigned in outer scope.
+        if (loopVariable && noContinue && !forHeadEnd && scope->type != ScopeType::eSwitch && Token::Match(tok, "%varid% =", var->declarationId()) &&
+            isOnlyUsedInCurrentScope(var, tok, scope)) { // Assigned in outer scope.
             loopVariable = false;
             std::pair<const Token*, const Token*> range = tok->next()->findExpressionStartEndTokens();
             if (range.first)
@@ -1406,7 +1495,7 @@ bool CheckOther::checkInnerScope(const Token *tok, const Variable* var, bool& us
                 if (scope->type == ScopeType::eSwitch)
                     return false; // Used in outer switch scope - unsafe or impossible to reduce scope
 
-                if (scope->bodyStart && scope->bodyStart->isSimplifiedScope())
+                if (scope->bodyStart && scope->bodyStart->isSimplifiedIfInitStmt())
                     return false; // simplified if/for/switch init statement
             }
             if (var->isArrayOrPointer()) {
@@ -1415,7 +1504,7 @@ bool CheckOther::checkInnerScope(const Token *tok, const Variable* var, bool& us
                     if (ftok->next()->astParent()) { // return value used?
                         if (ftok->function() && Function::returnsPointer(ftok->function()))
                             return false;
-                        const std::string ret = mSettings->library.returnValueType(ftok); // assume that var is returned
+                        const std::string ret = mSettings.library.returnValueType(ftok); // assume that var is returned
                         if (!ret.empty() && ret.back() == '*')
                             return false;
                     }
@@ -1430,7 +1519,7 @@ bool CheckOther::checkInnerScope(const Token *tok, const Variable* var, bool& us
                     }
                 }
             }
-            const auto yield = astContainerYield(tok, mSettings->library);
+            const auto yield = astContainerYield(tok, mSettings.library);
             if (yield == Library::Container::Yield::BUFFER || yield == Library::Container::Yield::BUFFER_NT)
                 return false;
         }
@@ -1439,7 +1528,7 @@ bool CheckOther::checkInnerScope(const Token *tok, const Variable* var, bool& us
     return true;
 }
 
-void CheckOther::variableScopeError(const Token *tok, const std::string &varname)
+void CheckOtherImpl::variableScopeError(const Token *tok, const std::string &varname)
 {
     reportError(tok,
                 Severity::style,
@@ -1466,10 +1555,10 @@ void CheckOther::variableScopeError(const Token *tok, const std::string &varname
 //---------------------------------------------------------------------------
 // Comma in return statement: return a+1, b++;. (experimental)
 //---------------------------------------------------------------------------
-void CheckOther::checkCommaSeparatedReturn()
+void CheckOtherImpl::checkCommaSeparatedReturn()
 {
-    // This is experimental for now. See #5076
-    if ((true) || !mSettings->severity.isEnabled(Severity::style)) // NOLINT(readability-simplify-boolean-expr)
+    // TODO: This is experimental for now. See #5076
+    if ((true) || !mSettings.severity.isEnabled(Severity::style)) // NOLINT(readability-simplify-boolean-expr,readability-redundant-parentheses)
         return;
 
     // logChecker
@@ -1493,7 +1582,7 @@ void CheckOther::checkCommaSeparatedReturn()
     }
 }
 
-void CheckOther::commaSeparatedReturnError(const Token *tok)
+void CheckOtherImpl::commaSeparatedReturnError(const Token *tok)
 {
     reportError(tok,
                 Severity::style,
@@ -1506,7 +1595,7 @@ void CheckOther::commaSeparatedReturnError(const Token *tok)
                 "    if (x)\n"
                 "        return a + 1,\n"
                 "    b++;\n"
-                "However it can be useful to use comma in macros. Cppcheck does not warn when such a "
+                "However it can be useful to use comma in macros. No warning is reported when such a "
                 "macro is then used in a return statement, it is less likely such code is misunderstood.", CWE398, Certainty::normal);
 }
 
@@ -1531,9 +1620,9 @@ static bool isLargeContainer(const Variable* var, const Settings& settings)
     return arraySize > maxByValueSize;
 }
 
-void CheckOther::checkPassByReference()
+void CheckOtherImpl::checkPassByReference()
 {
-    if (!mSettings->severity.isEnabled(Severity::performance) || mTokenizer->isC())
+    if (!mSettings.severity.isEnabled(Severity::performance) || mTokenizer->isC())
         return;
 
     logChecker("CheckOther::checkPassByReference"); // performance,c++
@@ -1559,26 +1648,41 @@ void CheckOther::checkPassByReference()
         bool inconclusive = false;
 
         const bool isContainer = var->valueType() && var->valueType()->type == ValueType::Type::CONTAINER && var->valueType()->container && !var->valueType()->container->view;
-        if (isContainer && !isLargeContainer(var, *mSettings))
+        if (isContainer && !isLargeContainer(var, mSettings))
             continue;
         if (!isContainer) {
             if (var->type() && !var->type()->isEnumType()) { // Check if type is a struct or class.
                 // Ensure that it is a large object.
                 if (!var->type()->classScope)
                     inconclusive = true;
-                else if (!var->valueType() || var->valueType()->getSizeOf(*mSettings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer) <= 2 * mSettings->platform.sizeof_pointer)
+                else if (!var->valueType() || var->valueType()->getSizeOf(mSettings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer) <= 2 * mSettings.platform.sizeof_pointer)
                     continue;
             }
             else
                 continue;
         }
 
-        if (inconclusive && !mSettings->certainty.isEnabled(Certainty::inconclusive))
+        if (inconclusive && !mSettings.certainty.isEnabled(Certainty::inconclusive))
             continue;
 
         if (var->isArray() && (!var->isStlType() || Token::simpleMatch(var->nameToken()->next(), "[")))
             continue;
 
+        if (var->isArgument()) {
+            const Token *tok = var->typeStartToken();
+            for (; tok; tok = tok->next()) {
+                if (Token::simpleMatch(tok, "(")) {
+                    tok = tok->link();
+                    continue;
+                }
+                if (Token::simpleMatch(tok, ")"))
+                    break;
+            }
+
+            if (Token::simpleMatch(tok, ") ;"))
+                continue;
+        }
+
         const bool isConst = var->isConst();
         if (isConst) {
             passedByValueError(var, inconclusive, isRangeBasedFor);
@@ -1589,13 +1693,13 @@ void CheckOther::checkPassByReference()
         if (!isRangeBasedFor && (!var->scope() || var->scope()->function->isImplicitlyVirtual()))
             continue;
 
-        if (!isVariableChanged(var, *mSettings)) {
+        if (!isVariableChanged(var, mSettings)) {
             passedByValueError(var, inconclusive, isRangeBasedFor);
         }
     }
 }
 
-void CheckOther::passedByValueError(const Variable* var, bool inconclusive, bool isRangeBasedFor)
+void CheckOtherImpl::passedByValueError(const Variable* var, bool inconclusive, bool isRangeBasedFor)
 {
     std::string id = isRangeBasedFor ? "iterateByValue" : "passedByValue";
     const std::string action = isRangeBasedFor ? "declared as": "passed by";
@@ -1660,9 +1764,9 @@ static bool isCastToVoid(const Variable* var)
     return false;
 }
 
-void CheckOther::checkConstVariable()
+void CheckOtherImpl::checkConstVariable()
 {
-    if ((!mSettings->severity.isEnabled(Severity::style) || mTokenizer->isC()) && !mSettings->isPremiumEnabled("constVariable"))
+    if ((!mSettings.severity.isEnabled(Severity::style) || mTokenizer->isC()) && !mSettings.isPremiumEnabled("constVariable") && !mSettings.isPremiumEnabled("constParameterReference"))
         return;
 
     logChecker("CheckOther::checkConstVariable"); // style,c++
@@ -1680,6 +1784,8 @@ void CheckOther::checkConstVariable()
             continue;
         if (var->isConst())
             continue;
+        if (Tokenizer::isFunctionPointer(var->nameToken())) // reference to function
+            continue;
         const Scope* scope = var->scope();
         if (!scope)
             continue;
@@ -1710,7 +1816,7 @@ void CheckOther::checkConstVariable()
             continue;
         if (isCastToVoid(var))
             continue;
-        if (isVariableChanged(var, *mSettings))
+        if (isVariableChanged(var, mSettings))
             continue;
         const bool hasFunction = function != nullptr;
         if (!hasFunction) {
@@ -1722,18 +1828,31 @@ void CheckOther::checkConstVariable()
         if (function && (Function::returnsReference(function) || Function::returnsPointer(function)) && !Function::returnsConst(function)) {
             std::vector<const Token*> returns = Function::findReturns(function);
             if (std::any_of(returns.cbegin(), returns.cend(), [&](const Token* retTok) {
-                if (retTok->varId() == var->declarationId())
-                    return true;
-                while (retTok && retTok->isCast())
-                    retTok = retTok->astOperand2() ? retTok->astOperand2() : retTok->astOperand1();
-                while (Token::simpleMatch(retTok, "."))
-                    retTok = retTok->astOperand2();
-                if (Token::simpleMatch(retTok, "&"))
-                    retTok = retTok->astOperand1();
-                ValueFlow::Value ltVal = ValueFlow::getLifetimeObjValue(retTok);
-                if (ltVal.isLifetimeValue() && ltVal.tokvalue->varId() == var->declarationId())
-                    return true;
-                return ValueFlow::hasLifetimeToken(getParentLifetime(retTok), var->nameToken(), *mSettings);
+                bool result = false;
+                visitAstNodes(retTok, [&result, &var, this](const Token* tok) {
+                    if (tok->varId() == var->declarationId()) {
+                        result = true;
+                        return ChildrenToVisit::done;
+                    }
+                    ValueFlow::Value ltVal = ValueFlow::getLifetimeObjValue(tok);
+                    if ((ltVal.isLifetimeValue() && ltVal.tokvalue->varId() == var->declarationId()) ||
+                        ValueFlow::hasLifetimeToken(getParentLifetime(tok), var->nameToken(), mSettings)) {
+                        result = true;
+                        return ChildrenToVisit::done;
+                    }
+                    if (tok->isCast())
+                        return tok->astOperand2() ? ChildrenToVisit::op2 : ChildrenToVisit::op1;
+                    if (tok->str() == ".")
+                        return ChildrenToVisit::op2;
+                    if (tok->str() == "&")
+                        return ChildrenToVisit::op1;
+                    if (tok->str() == "?")
+                        return ChildrenToVisit::op2;
+                    if (tok->str() == ":")
+                        return ChildrenToVisit::op1_and_op2;
+                    return ChildrenToVisit::none;
+                });
+                return result;
             }))
                 continue;
         }
@@ -1742,9 +1861,13 @@ void CheckOther::checkConstVariable()
             //Is it the right side of an initialization of a non-const reference
             bool usedInAssignment = false;
             for (const Token* tok = var->nameToken(); tok != scope->bodyEnd && tok != nullptr; tok = tok->next()) {
-                if (Token::Match(tok, "& %var% = %varid%", var->declarationId())) {
-                    const Variable* refvar = tok->next()->variable();
-                    if (refvar && !refvar->isConst() && refvar->nameToken() == tok->next()) {
+                if (Token::Match(tok, "%name% = %varid%", var->declarationId())) {
+                    const Variable* refvar = tok->variable();
+                    if (tok->strAt(-1) == "&" && refvar && !refvar->isConst() && refvar->nameToken() == tok) {
+                        usedInAssignment = true;
+                        break;
+                    }
+                    if (!tok->valueType() || tok->valueType()->type == ValueType::Type::RECORD) {
                         usedInAssignment = true;
                         break;
                     }
@@ -1765,7 +1888,7 @@ void CheckOther::checkConstVariable()
                             continue;
                     } else if (const Token* ftok = getTokenArgumentFunction(tok, argn)) {
                         bool inconclusive{};
-                        if (var->valueType() && !isVariableChangedByFunctionCall(ftok, var->valueType()->pointer, var->declarationId(), *mSettings, &inconclusive) && !inconclusive)
+                        if (var->valueType() && !isVariableChangedByFunctionCall(ftok, var->valueType()->pointer, var->declarationId(), mSettings.library, &inconclusive) && !inconclusive)
                             continue;
                     }
                     usedInAssignment = true;
@@ -1838,13 +1961,24 @@ static bool isCastToInteger(const Token* tok)
     return tok && tok->isCast() && tok->valueType() && tok->valueType()->isIntegral() && tok->valueType()->pointer == 0;
 }
 
-void CheckOther::checkConstPointer()
+static const Function* getEnclosingFunction(const Variable* var)
+{
+    if (var->isArgument())
+        return var->scope()->function;
+    const Scope* scope = var->scope();
+    while (scope && scope->type != ScopeType::eFunction) {
+        scope = scope->nestedIn;
+    }
+    return scope ? scope->function : nullptr;
+}
+
+void CheckOtherImpl::checkConstPointer()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) &&
-        !mSettings->isPremiumEnabled("constParameter") &&
-        !mSettings->isPremiumEnabled("constParameterPointer") &&
-        !mSettings->isPremiumEnabled("constParameterReference") &&
-        !mSettings->isPremiumEnabled("constVariablePointer"))
+    if (!mSettings.severity.isEnabled(Severity::style) &&
+        !mSettings.isPremiumEnabled("constParameter") &&
+        !mSettings.isPremiumEnabled("constParameterPointer") &&
+        !mSettings.isPremiumEnabled("constParameterReference") &&
+        !mSettings.isPremiumEnabled("constVariablePointer"))
         return;
 
     logChecker("CheckOther::checkConstPointer"); // style
@@ -1856,11 +1990,16 @@ void CheckOther::checkConstPointer()
             continue;
         if (!var->isLocal() && !var->isArgument())
             continue;
+        if (var->isArgument() && var->scope() && var->scope()->type == ScopeType::eLambda && !Token::simpleMatch(var->scope()->bodyEnd, "} ("))
+            continue;
         const Token* const nameTok = var->nameToken();
-        if (tok == nameTok) {
+        if (tok == nameTok && var->isLocal() && !astIsRangeBasedForDecl(nameTok)) {
+            if (var->isReference() && var->isPointer()) {
+                nonConstPointers.emplace(var);
+                continue;
+            }
             // declarations of (static) pointers are (not) split up, array declarations are never split up
-            if (var->isLocal() && (!var->isStatic() || Token::simpleMatch(nameTok->next(), "[")) &&
-                !astIsRangeBasedForDecl(nameTok))
+            if ((!var->isStatic() || Token::simpleMatch(nameTok->next(), "[")))
                 continue;
         }
         // Skip function pointers
@@ -1894,16 +2033,25 @@ void CheckOther::checkConstPointer()
             continue;
         if (deref != NONE) {
             const Token* gparent = parent->astParent();
-            while (Token::simpleMatch(gparent, "[") && parent != gparent->astOperand2() && parent->str() == gparent->str())
+            while (Token::simpleMatch(gparent, "[") && parent != gparent->astOperand2())
+                gparent = gparent->astParent();
+            while (Token::Match(gparent, "[?:]"))
                 gparent = gparent->astParent();
             if (deref == MEMBER) {
                 if (!gparent)
                     continue;
-                if (parent->astOperand2()) {
-                    if (parent->astOperand2()->function() && parent->astOperand2()->function()->isConst())
+                const Token* funcParent = parent;
+                while (Token::simpleMatch(funcParent->astParent(), "."))
+                    funcParent = funcParent->astParent();
+                if (funcParent->astOperand2()) {
+                    if (funcParent->astOperand2()->function() && funcParent->astOperand2()->function()->isConst())
                         continue;
-                    if (mSettings->library.isFunctionConst(parent->astOperand2()))
+                    if (mSettings.library.isFunctionConst(funcParent->astOperand2()))
                         continue;
+                    if (funcParent->astOperand2()->varId()) {
+                        if (gparent->str() == "?" && astIsLHS(funcParent))
+                            continue;
+                    }
                 }
             }
             if (hasIncDecPlus) {
@@ -1914,7 +2062,7 @@ void CheckOther::checkConstPointer()
                 continue;
             int argn = -1;
             if (Token::simpleMatch(gparent, "return")) {
-                const Function* function = gparent->scope()->function;
+                const Function* function = getEnclosingFunction(var);
                 if (function && (!Function::returnsReference(function) || Function::returnsConst(function)))
                     continue;
             }
@@ -1936,7 +2084,7 @@ void CheckOther::checkConstPointer()
                 continue;
             else if (const Token* ftok = getTokenArgumentFunction(parent, argn)) {
                 bool inconclusive{};
-                if (!isVariableChangedByFunctionCall(ftok->next(), vt->pointer, var->declarationId(), *mSettings, &inconclusive) && !inconclusive)
+                if (!isVariableChangedByFunctionCall(ftok->next(), vt->pointer, var->declarationId(), mSettings.library, &inconclusive) && !inconclusive)
                     continue;
             }
         } else {
@@ -1961,12 +2109,12 @@ void CheckOther::checkConstPointer()
                         const Variable* argVar = ftok->function()->getArgumentVar(argn);
                         if (argVar && argVar->valueType() && argVar->valueType()->isConst(vt->pointer)) {
                             bool inconclusive{};
-                            if (!isVariableChangedByFunctionCall(ftok, vt->pointer, var->declarationId(), *mSettings, &inconclusive) && !inconclusive)
+                            if (!isVariableChangedByFunctionCall(ftok, vt->pointer, var->declarationId(), mSettings.library, &inconclusive) && !inconclusive)
                                 continue;
                         }
                     }
                 } else {
-                    const auto dir = mSettings->library.getArgDirection(ftok, argn + 1);
+                    const auto dir = mSettings.library.getArgDirection(ftok, argn + 1);
                     if (dir == Library::ArgumentChecks::Direction::DIR_IN)
                         continue;
                 }
@@ -1980,8 +2128,11 @@ void CheckOther::checkConstPointer()
             nonConstPointers.emplace(var);
     }
     for (const Variable *p: pointers) {
+        bool foundAllBaseClasses = true;
         if (p->isArgument()) {
-            if (!p->scope() || !p->scope()->function || p->scope()->function->isImplicitlyVirtual(true) || p->scope()->function->hasVirtualSpecifier())
+            if (!p->scope() || !p->scope()->function || p->scope()->function->hasVirtualSpecifier())
+                continue;
+            if (p->scope()->function->isImplicitlyVirtual(true, &foundAllBaseClasses) && foundAllBaseClasses)
                 continue;
             if (p->isMaybeUnused())
                 continue;
@@ -1994,16 +2145,16 @@ void CheckOther::checkConstPointer()
             // const int indirect = p->isArray() ? p->dimensions().size() : 1;
             // if (isVariableChanged(start, p->scope()->bodyEnd, indirect, p->declarationId(), false, *mSettings))
             //     continue;
-            if (!isConstPointerVariable(p, *mSettings))
+            if (!isConstPointerVariable(p, mSettings))
                 continue;
-            if (p->typeStartToken() && p->typeStartToken()->isSimplifiedTypedef() && !(Token::simpleMatch(p->typeEndToken(), "*") && !p->typeEndToken()->isSimplifiedTypedef()))
+            if (p->typeStartToken() && p->typeStartToken()->isSimplifiedTypedef() && Token::simpleMatch(p->typeEndToken(), "*") && p->typeEndToken()->isSimplifiedTypedef())
                 continue;
-            constVariableError(p, p->isArgument() ? p->scope()->function : nullptr);
+            constVariableError(p, p->isArgument() ? p->scope()->function : nullptr, foundAllBaseClasses);
         }
     }
 }
 
-void CheckOther::constVariableError(const Variable *var, const Function *function)
+void CheckOtherImpl::constVariableError(const Variable *var, const Function *function, bool foundAllBaseClasses)
 {
     if (!var) {
         reportError(nullptr, Severity::style, "constParameter", "Parameter 'x' can be declared with const");
@@ -2016,13 +2167,18 @@ void CheckOther::constVariableError(const Variable *var, const Function *functio
         return;
     }
 
-    const std::string vartype(var->isArgument() ? "Parameter" : "Variable");
+    std::string vartype(var->isArgument() ? "Parameter" : "Variable");
     const std::string& varname(var->name());
     const std::string ptrRefArray = var->isArray() ? "const array" : (var->isPointer() ? "pointer to const" : "reference to const");
 
     ErrorPath errorPath;
     std::string id = "const" + vartype;
-    std::string message = "$symbol:" + varname + "\n" + vartype + " '$symbol' can be declared as " + ptrRefArray;
+    std::string message = "$symbol:" + varname + "\n";
+    if (!foundAllBaseClasses) {
+        message += "Either there is a missing override/final keyword, or the ";
+        vartype[0] = std::tolower(vartype[0]);
+    }
+    message += vartype + " '$symbol' can be declared as " + ptrRefArray;
     errorPath.emplace_back(var->nameToken(), message);
     if (var->isArgument() && function && function->functionPointerUsage) {
         errorPath.emplace_front(function->functionPointerUsage, "You might need to cast the function pointer here");
@@ -2041,10 +2197,10 @@ void CheckOther::constVariableError(const Variable *var, const Function *functio
 // Check usage of char variables..
 //---------------------------------------------------------------------------
 
-void CheckOther::checkCharVariable()
+void CheckOtherImpl::checkCharVariable()
 {
-    const bool warning = mSettings->severity.isEnabled(Severity::warning);
-    const bool portability = mSettings->severity.isEnabled(Severity::portability);
+    const bool warning = mSettings.severity.isEnabled(Severity::warning);
+    const bool portability = mSettings.severity.isEnabled(Severity::portability);
     if (!warning && !portability)
         return;
 
@@ -2059,24 +2215,24 @@ void CheckOther::checkCharVariable()
                 if (!tok->variable()->isArray() && !tok->variable()->isPointer())
                     continue;
                 const Token *index = tok->next()->astOperand2();
-                if (warning && tok->variable()->isArray() && astIsSignedChar(index) && index->getValueGE(0x80, *mSettings))
+                if (warning && tok->variable()->isArray() && astIsSignedChar(index) && index->getValueGE(0x80, mSettings))
                     signedCharArrayIndexError(tok);
-                if (portability && astIsUnknownSignChar(index) && index->getValueGE(0x80, *mSettings))
+                if (portability && astIsUnknownSignChar(index) && index->getValueGE(0x80, mSettings))
                     unknownSignCharArrayIndexError(tok);
             } else if (warning && Token::Match(tok, "[&|^]") && tok->isBinaryOp()) {
                 bool warn = false;
                 if (astIsSignedChar(tok->astOperand1())) {
-                    const ValueFlow::Value *v1 = tok->astOperand1()->getValueLE(-1, *mSettings);
+                    const ValueFlow::Value *v1 = tok->astOperand1()->getValueLE(-1, mSettings);
                     const ValueFlow::Value *v2 = tok->astOperand2()->getMaxValue(false);
                     if (!v1)
-                        v1 = tok->astOperand1()->getValueGE(0x80, *mSettings);
+                        v1 = tok->astOperand1()->getValueGE(0x80, mSettings);
                     if (v1 && !(tok->str() == "&" && v2 && v2->isKnown() && v2->intvalue >= 0 && v2->intvalue < 0x100))
                         warn = true;
                 } else if (astIsSignedChar(tok->astOperand2())) {
-                    const ValueFlow::Value *v1 = tok->astOperand2()->getValueLE(-1, *mSettings);
+                    const ValueFlow::Value *v1 = tok->astOperand2()->getValueLE(-1, mSettings);
                     const ValueFlow::Value *v2 = tok->astOperand1()->getMaxValue(false);
                     if (!v1)
-                        v1 = tok->astOperand2()->getValueGE(0x80, *mSettings);
+                        v1 = tok->astOperand2()->getValueGE(0x80, mSettings);
                     if (v1 && !(tok->str() == "&" && v2 && v2->isKnown() && v2->intvalue >= 0 && v2->intvalue < 0x100))
                         warn = true;
                 }
@@ -2092,7 +2248,7 @@ void CheckOther::checkCharVariable()
     }
 }
 
-void CheckOther::signedCharArrayIndexError(const Token *tok)
+void CheckOtherImpl::signedCharArrayIndexError(const Token *tok)
 {
     reportError(tok,
                 Severity::warning,
@@ -2103,7 +2259,7 @@ void CheckOther::signedCharArrayIndexError(const Token *tok)
                 "because of sign extension.", CWE128, Certainty::normal);
 }
 
-void CheckOther::unknownSignCharArrayIndexError(const Token *tok)
+void CheckOtherImpl::unknownSignCharArrayIndexError(const Token *tok)
 {
     reportError(tok,
                 Severity::portability,
@@ -2113,7 +2269,7 @@ void CheckOther::unknownSignCharArrayIndexError(const Token *tok)
                 "treated depending on whether 'char' is signed or unsigned on target platform.", CWE758, Certainty::normal);
 }
 
-void CheckOther::charBitOpError(const Token *tok)
+void CheckOtherImpl::charBitOpError(const Token *tok)
 {
     reportError(tok,
                 Severity::warning,
@@ -2262,18 +2418,12 @@ static bool isConstStatement(const Token *tok, const Library& library, bool plat
 
 static bool isVoidStmt(const Token *tok)
 {
-    if (Token::simpleMatch(tok, "( void"))
+    if (Token::simpleMatch(tok, "( void") && !(tok->astOperand1() && (tok->astOperand1()->isLiteral() || isNullOperand(tok->astOperand1()))))
         return true;
-    if (isCPPCast(tok) && tok->astOperand1() && Token::Match(tok->astOperand1()->next(), "< void *| >"))
+    if (isCPPCast(tok) && tok->astOperand1() && Token::Match(tok->astOperand1()->next(), "< void *| >") &&
+        !(tok->astOperand2() && (tok->astOperand2()->isLiteral() || isNullOperand(tok->astOperand2()))))
         return true;
-    const Token *tok2 = tok;
-    while (tok2->astOperand1())
-        tok2 = tok2->astOperand1();
-    if (Token::simpleMatch(tok2->previous(), ")") && Token::simpleMatch(tok2->linkAt(-1), "( void"))
-        return true;
-    if (Token::simpleMatch(tok2, "( void"))
-        return true;
-    return Token::Match(tok2->previous(), "delete|throw|return");
+    return false;
 }
 
 static bool isConstTop(const Token *tok)
@@ -2300,10 +2450,10 @@ static bool isConstTop(const Token *tok)
     return false;
 }
 
-void CheckOther::checkIncompleteStatement()
+void CheckOtherImpl::checkIncompleteStatement()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) &&
-        !mSettings->isPremiumEnabled("constStatement"))
+    if (!mSettings.severity.isEnabled(Severity::warning) &&
+        !mSettings.isPremiumEnabled("constStatement"))
         return;
 
     logChecker("CheckOther::checkIncompleteStatement"); // warning
@@ -2347,27 +2497,23 @@ void CheckOther::checkIncompleteStatement()
             !(tok->str() == "," && tok->astParent() && tok->astParent()->isAssignmentOp()))
             continue;
         // Skip statement expressions
-        if (Token::simpleMatch(rtok, "; } )"))
+        if (Token::simpleMatch(rtok, "; } )") || Token::simpleMatch(tok->next(), "; } )"))
             continue;
-        if (!isConstStatement(tok, mSettings->library, false))
+        if (!isConstStatement(tok, mSettings.library, false))
             continue;
         if (isVoidStmt(tok))
             continue;
         if (tok->isCpp() && tok->str() == "&" && !(tok->astOperand1() && tok->astOperand1()->valueType() && tok->astOperand1()->valueType()->isIntegral()))
             // Possible archive
             continue;
-        const bool inconclusive = tok->isConstOp() && !mSettings->isPremiumEnabled("constStatement");
-        if (mSettings->certainty.isEnabled(Certainty::inconclusive) || !inconclusive)
+        const bool inconclusive = tok->isConstOp() && !mSettings.isPremiumEnabled("constStatement");
+        if (mSettings.certainty.isEnabled(Certainty::inconclusive) || !inconclusive)
             constStatementError(tok, tok->isNumber() ? "numeric" : "string", inconclusive);
     }
 }
 
-void CheckOther::constStatementError(const Token *tok, const std::string &type, bool inconclusive)
+void CheckOtherImpl::constStatementError(const Token *tok, const std::string &type, bool inconclusive)
 {
-    const Token *valueTok = tok;
-    while (valueTok && valueTok->isCast())
-        valueTok = valueTok->astOperand2() ? valueTok->astOperand2() : valueTok->astOperand1();
-
     std::string msg;
     if (Token::simpleMatch(tok, "=="))
         msg = "Found suspicious equality comparison. Did you intend to assign a value instead?";
@@ -2375,26 +2521,24 @@ void CheckOther::constStatementError(const Token *tok, const std::string &type,
         msg = "Found suspicious operator '" + tok->str() + "', result is not used.";
     else if (Token::Match(tok, "%var%"))
         msg = "Unused variable value '" + tok->str() + "'";
-    else if (isConstant(valueTok)) {
+    else if (isConstant(tok)) {
         std::string typeStr("string");
-        if (valueTok->isNumber())
+        if (tok->isNumber())
             typeStr = "numeric";
-        else if (valueTok->isBoolean())
+        else if (tok->isBoolean())
             typeStr = "bool";
-        else if (valueTok->tokType() == Token::eChar)
+        else if (tok->tokType() == Token::eChar)
             typeStr = "character";
-        else if (isNullOperand(valueTok))
-            typeStr = "NULL";
-        else if (valueTok->isEnumerator())
+        else if (isNullOperand(tok))
+            typeStr = "null";
+        else if (tok->isEnumerator())
             typeStr = "enumerator";
         msg = "Redundant code: Found a statement that begins with " + typeStr + " constant.";
     }
     else if (!tok)
         msg = "Redundant code: Found a statement that begins with " + type + " constant.";
-    else if (tok->isCast() && tok->tokType() == Token::Type::eExtendedOp) {
-        msg = "Redundant code: Found unused cast ";
-        msg += valueTok ? "of expression '" + valueTok->expressionString() + "'." : "expression.";
-    }
+    else if (tok->isCast() && tok->tokType() == Token::Type::eExtendedOp)
+        msg = "Redundant code: Found unused cast in expression '" + tok->expressionString() + "'.";
     else if (tok->str() == "?" && tok->tokType() == Token::Type::eExtendedOp)
         msg = "Redundant code: Found unused result of ternary operator.";
     else if (tok->str() == "." && tok->tokType() == Token::Type::eOther)
@@ -2407,7 +2551,7 @@ void CheckOther::constStatementError(const Token *tok, const std::string &type,
         msg = "Redundant code: Found unused function.";
     else if (Token::Match(tok->previous(), "%name% ("))
         msg = "Redundant code: Found unused '" + tok->strAt(-1) + "' expression.";
-    else if (mSettings->debugwarnings) {
+    else if (mSettings.debugwarnings) {
         reportError(tok, Severity::debug, "debug", "constStatementError not handled.");
         return;
     }
@@ -2417,7 +2561,7 @@ void CheckOther::constStatementError(const Token *tok, const std::string &type,
 //---------------------------------------------------------------------------
 // Detect division by zero.
 //---------------------------------------------------------------------------
-void CheckOther::checkZeroDivision()
+void CheckOtherImpl::checkZeroDivision()
 {
     logChecker("CheckOther::checkZeroDivision");
 
@@ -2433,12 +2577,12 @@ void CheckOther::checkZeroDivision()
 
         // Value flow..
         const ValueFlow::Value *value = tok->astOperand2()->getValue(0LL);
-        if (value && mSettings->isEnabled(value, false))
+        if (value && mSettings.isEnabled(value, false))
             zerodivError(tok, value);
     }
 }
 
-void CheckOther::zerodivError(const Token *tok, const ValueFlow::Value *value)
+void CheckOtherImpl::zerodivError(const Token *tok, const ValueFlow::Value *value)
 {
     if (!tok && !value) {
         reportError(tok, Severity::error, "zerodiv", "Division by zero.", CWE369, Certainty::normal);
@@ -2457,8 +2601,8 @@ void CheckOther::zerodivError(const Token *tok, const ValueFlow::Value *value)
         errmsg << "Division by zero.";
 
     reportError(std::move(errorPath),
-                value->errorSeverity() ? Severity::error : Severity::warning,
-                value->condition ? "zerodivcond" : "zerodiv",
+                (value->errorSeverity() && !value->conditional) ? Severity::error : Severity::warning,
+                (value->condition || value->conditional) ? "zerodivcond" : "zerodiv",
                 errmsg.str(), CWE369, value->isInconclusive() ? Certainty::inconclusive : Certainty::normal);
 }
 
@@ -2467,9 +2611,9 @@ void CheckOther::zerodivError(const Token *tok, const ValueFlow::Value *value)
 // double d = 1.0 / 0.0 + 100.0;
 //---------------------------------------------------------------------------
 
-void CheckOther::checkNanInArithmeticExpression()
+void CheckOtherImpl::checkNanInArithmeticExpression()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("nanInArithmeticExpression"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("nanInArithmeticExpression"))
         return;
     logChecker("CheckOther::checkNanInArithmeticExpression"); // style
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
@@ -2482,7 +2626,7 @@ void CheckOther::checkNanInArithmeticExpression()
     }
 }
 
-void CheckOther::nanInArithmeticExpressionError(const Token *tok)
+void CheckOtherImpl::nanInArithmeticExpressionError(const Token *tok)
 {
     reportError(tok, Severity::style, "nanInArithmeticExpression",
                 "Using NaN/Inf in a computation.\n"
@@ -2493,13 +2637,13 @@ void CheckOther::nanInArithmeticExpressionError(const Token *tok)
 //---------------------------------------------------------------------------
 // Creating instance of classes which are destroyed immediately
 //---------------------------------------------------------------------------
-void CheckOther::checkMisusedScopedObject()
+void CheckOtherImpl::checkMisusedScopedObject()
 {
     // Skip this check for .c files
     if (mTokenizer->isC())
         return;
 
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedScopedObject"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unusedScopedObject"))
         return;
 
     logChecker("CheckOther::checkMisusedScopedObject"); // style,c++
@@ -2526,10 +2670,10 @@ void CheckOther::checkMisusedScopedObject()
     };
 
     auto isLibraryConstructor = [&](const Token* tok, const std::string& typeStr) -> bool {
-        const Library::TypeCheck typeCheck = mSettings->library.getTypeCheck("unusedvar", typeStr);
+        const Library::TypeCheck typeCheck = mSettings.library.getTypeCheck("unusedvar", typeStr);
         if (typeCheck == Library::TypeCheck::check || typeCheck == Library::TypeCheck::checkFiniteLifetime)
             return true;
-        return mSettings->library.detectContainerOrIterator(tok);
+        return mSettings.library.detectContainerOrIterator(tok);
     };
 
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -2544,7 +2688,7 @@ void CheckOther::checkMisusedScopedObject()
                 if (Token::simpleMatch(parTok, "<") && parTok->link())
                     parTok = parTok->link()->next();
                 if (const Token* arg = parTok->astOperand2()) {
-                    if (!isConstStatement(arg, mSettings->library, false))
+                    if (!isConstStatement(arg, mSettings.library, false))
                         continue;
                     if (parTok->str() == "(") {
                         if (arg->varId() && !(arg->variable() && arg->variable()->nameToken() != arg))
@@ -2568,7 +2712,7 @@ void CheckOther::checkMisusedScopedObject()
     }
 }
 
-void CheckOther::misusedScopeObjectError(const Token *tok, const std::string& varname, bool isAssignment)
+void CheckOtherImpl::misusedScopeObjectError(const Token *tok, const std::string& varname, bool isAssignment)
 {
     std::string msg = "Instance of '$symbol' object is destroyed immediately";
     msg += isAssignment ? ", assignment has no effect." : ".";
@@ -2593,7 +2737,7 @@ static const Token * getSingleExpressionInBlock(const Token * tok)
 // check for duplicate code in if and else branches
 // if (a) { b = true; } else { b = true; }
 //-----------------------------------------------------------------------------
-void CheckOther::checkDuplicateBranch()
+void CheckOtherImpl::checkDuplicateBranch()
 {
     // This is inconclusive since in practice most warnings are noise:
     // * There can be unfixed low-priority todos. The code is fine as it
@@ -2603,7 +2747,7 @@ void CheckOther::checkDuplicateBranch()
     //   and their conditional code is a duplicate of the condition that
     //   is always true just in case it would be false. See for instance
     //   abiword.
-    if (!mSettings->severity.isEnabled(Severity::style) || !mSettings->certainty.isEnabled(Certainty::inconclusive))
+    if (!mSettings.severity.isEnabled(Severity::style) || !mSettings.certainty.isEnabled(Certainty::inconclusive))
         return;
 
     logChecker("CheckOther::checkDuplicateBranch"); // style,inconclusive
@@ -2649,7 +2793,7 @@ void CheckOther::checkDuplicateBranch()
                 const std::string branch2 = tokElse->stringifyList(scope.bodyEnd->linkAt(2));
 
                 // check for duplicates
-                if (branch1 == branch2) {
+                if (branch1 == branch2 && branch1 != ";") {
                     duplicateBranchError(scope.classDef, scope.bodyEnd->next(), ErrorPath{});
                     continue;
                 }
@@ -2665,14 +2809,14 @@ void CheckOther::checkDuplicateBranch()
             if (branchTop1->str() != branchTop2->str())
                 continue;
             ErrorPath errorPath;
-            if (isSameExpression(false, branchTop1->astOperand1(), branchTop2->astOperand1(), *mSettings, true, true, &errorPath) &&
-                isSameExpression(false, branchTop1->astOperand2(), branchTop2->astOperand2(), *mSettings, true, true, &errorPath))
+            if (isSameExpression(false, branchTop1->astOperand1(), branchTop2->astOperand1(), mSettings, true, true, &errorPath) &&
+                isSameExpression(false, branchTop1->astOperand2(), branchTop2->astOperand2(), mSettings, true, true, &errorPath))
                 duplicateBranchError(scope.classDef, scope.bodyEnd->next(), std::move(errorPath));
         }
     }
 }
 
-void CheckOther::duplicateBranchError(const Token *tok1, const Token *tok2, ErrorPath errors)
+void CheckOtherImpl::duplicateBranchError(const Token *tok1, const Token *tok2, ErrorPath errors)
 {
     errors.emplace_back(tok2, "");
     errors.emplace_back(tok1, "");
@@ -2689,21 +2833,21 @@ void CheckOther::duplicateBranchError(const Token *tok1, const Token *tok2, Erro
 // char* p = malloc(100);
 // free(p + 10);
 //-----------------------------------------------------------------------------
-void CheckOther::checkInvalidFree()
+void CheckOtherImpl::checkInvalidFree()
 {
     std::map<int, bool> inconclusive;
     std::map<int, std::string> allocation;
 
     logChecker("CheckOther::checkInvalidFree");
 
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok && tok != scope->bodyEnd; tok = tok->next()) {
 
             // Keep track of which variables were assigned addresses to newly-allocated memory
             if ((tok->isCpp() && Token::Match(tok, "%var% = new")) ||
-                (Token::Match(tok, "%var% = %name% (") && mSettings->library.getAllocFuncInfo(tok->tokAt(2)))) {
+                (Token::Match(tok, "%var% = %name% (") && mSettings.library.getAllocFuncInfo(tok->tokAt(2)))) {
                 allocation.emplace(tok->varId(), tok->strAt(2));
                 inconclusive.emplace(tok->varId(), false);
             }
@@ -2731,7 +2875,7 @@ void CheckOther::checkInvalidFree()
 
             // If a variable that was previously assigned a newly-allocated memory location is
             // added or subtracted from when used to free the memory, report an error.
-            else if ((Token::Match(tok, "%name% ( %any% +|-") && mSettings->library.getDeallocFuncInfo(tok)) ||
+            else if ((Token::Match(tok, "%name% ( %any% +|-") && mSettings.library.getDeallocFuncInfo(tok)) ||
                      Token::Match(tok, "delete [ ] ( %any% +|-") ||
                      Token::Match(tok, "delete %any% +|- %any%")) {
 
@@ -2751,7 +2895,7 @@ void CheckOther::checkInvalidFree()
             // If the previously-allocated variable is passed in to another function
             // as a parameter, it might be modified, so we shouldn't report an error
             // if it is later used to free memory
-            else if (Token::Match(tok, "%name% (") && !mSettings->library.isFunctionConst(tok->str(), true)) {
+            else if (Token::Match(tok, "%name% (") && !mSettings.library.isFunctionConst(tok->str(), true)) {
                 const Token* tok2 = Token::findmatch(tok->next(), "%var%", tok->linkAt(1));
                 while (tok2 != nullptr) {
                     allocation.erase(tok->varId());
@@ -2763,7 +2907,7 @@ void CheckOther::checkInvalidFree()
     }
 }
 
-void CheckOther::invalidFreeError(const Token *tok, const std::string &allocation, bool inconclusive)
+void CheckOtherImpl::invalidFreeError(const Token *tok, const std::string &allocation, bool inconclusive)
 {
     std::string alloc = allocation;
     if (alloc != "new")
@@ -2814,25 +2958,27 @@ isStaticAssert(const Settings &settings, const Token *tok)
         return true;
     }
 
-    if (tok->isC() && settings.standards.c >= Standards::C11 &&
-        Token::simpleMatch(tok, "_Static_assert")) {
-        return true;
+    if (tok->isC()) {
+        if (settings.standards.c >= Standards::C11 && Token::simpleMatch(tok, "_Static_assert"))
+            return true;
+        if (settings.standards.c >= Standards::C23 && Token::simpleMatch(tok, "static_assert"))
+            return true;
     }
 
     return false;
 }
 
-void CheckOther::checkDuplicateExpression()
+void CheckOtherImpl::checkDuplicateExpression()
 {
     {
-        const bool styleEnabled = mSettings->severity.isEnabled(Severity::style);
-        const bool premiumEnabled = mSettings->isPremiumEnabled("oppositeExpression") ||
-                                    mSettings->isPremiumEnabled("duplicateExpression") ||
-                                    mSettings->isPremiumEnabled("duplicateAssignExpression") ||
-                                    mSettings->isPremiumEnabled("duplicateExpressionTernary") ||
-                                    mSettings->isPremiumEnabled("duplicateValueTernary") ||
-                                    mSettings->isPremiumEnabled("selfAssignment") ||
-                                    mSettings->isPremiumEnabled("knownConditionTrueFalse");
+        const bool styleEnabled = mSettings.severity.isEnabled(Severity::style);
+        const bool premiumEnabled = mSettings.isPremiumEnabled("oppositeExpression") ||
+                                    mSettings.isPremiumEnabled("duplicateExpression") ||
+                                    mSettings.isPremiumEnabled("duplicateAssignExpression") ||
+                                    mSettings.isPremiumEnabled("duplicateExpressionTernary") ||
+                                    mSettings.isPremiumEnabled("duplicateValueTernary") ||
+                                    mSettings.isPremiumEnabled("selfAssignment") ||
+                                    mSettings.isPremiumEnabled("knownConditionTrueFalse");
 
         if (!styleEnabled && !premiumEnabled)
             return;
@@ -2870,8 +3016,8 @@ void CheckOther::checkDuplicateExpression()
                             Token::Match(tok->astOperand2()->previous(), "%name% (")
                             ) &&
                         tok->next()->tokType() != Token::eType &&
-                        isSameExpression(true, tok->next(), nextAssign->next(), *mSettings, true, false) &&
-                        isSameExpression(true, tok->astOperand2(), nextAssign->astOperand2(), *mSettings, true, false) &&
+                        isSameExpression(true, tok->next(), nextAssign->next(), mSettings, true, false) &&
+                        isSameExpression(true, tok->astOperand2(), nextAssign->astOperand2(), mSettings, true, false) &&
                         tok->astOperand2()->expressionString() == nextAssign->astOperand2()->expressionString()) {
                         bool differentDomain = false;
                         const Scope * varScope = var1->scope() ? var1->scope() : scope;
@@ -2889,7 +3035,7 @@ void CheckOther::checkDuplicateExpression()
                                 !isSameExpression(true,
                                                   tok->astOperand2(),
                                                   assignTok->astOperand1(),
-                                                  *mSettings,
+                                                  mSettings,
                                                   true,
                                                   true))
                                 continue;
@@ -2898,7 +3044,7 @@ void CheckOther::checkDuplicateExpression()
                                 !isSameExpression(true,
                                                   tok->astOperand2(),
                                                   assignTok->astOperand2(),
-                                                  *mSettings,
+                                                  mSettings,
                                                   true,
                                                   true))
                                 continue;
@@ -2907,7 +3053,7 @@ void CheckOther::checkDuplicateExpression()
                         }
                         if (!differentDomain && !isUniqueExpression(tok->astOperand2()))
                             duplicateAssignExpressionError(var1, var2, false);
-                        else if (mSettings->certainty.isEnabled(Certainty::inconclusive)) {
+                        else if (mSettings.certainty.isEnabled(Certainty::inconclusive)) {
                             diag(assignTok);
                             duplicateAssignExpressionError(var1, var2, true);
                         }
@@ -2924,20 +3070,23 @@ void CheckOther::checkDuplicateExpression()
             if (tok->isOp() && tok->astOperand1() && !Token::Match(tok, "+|*|<<|>>|+=|*=|<<=|>>=") && !isInsideLambdaCaptureList(tok)) {
                 if (Token::Match(tok, "==|!=|-") && astIsFloat(tok->astOperand1(), true))
                     continue;
+                if (tok->isArithmeticalOp() &&
+                    (tok->astOperand1()->isEnumerator() || (tok->astOperand2() && tok->astOperand2()->isEnumerator())))
+                    continue;
                 const bool pointerDereference = (tok->astOperand1() && tok->astOperand1()->isUnaryOp("*")) ||
                                                 (tok->astOperand2() && tok->astOperand2()->isUnaryOp("*"));
                 const bool followVar = (!isConstVarExpression(tok) || Token::Match(tok, "%comp%|%oror%|&&")) && !pointerDereference;
                 if (isSameExpression(true,
                                      tok->astOperand1(),
                                      tok->astOperand2(),
-                                     *mSettings,
+                                     mSettings,
                                      true,
                                      followVar,
                                      &errorPath)) {
                     if (isWithoutSideEffects(tok->astOperand1())) {
                         const Token* loopTok = isInLoopCondition(tok);
                         if (!loopTok ||
-                            !findExpressionChanged(tok, tok, loopTok->link()->linkAt(1), *mSettings)) {
+                            !findExpressionChanged(tok, tok, loopTok->link()->linkAt(1), mSettings)) {
                             const bool isEnum = tok->scope()->type == ScopeType::eEnum;
                             const bool assignment = !isEnum && tok->str() == "=";
                             if (assignment)
@@ -2949,7 +3098,7 @@ void CheckOther::checkDuplicateExpression()
                                         parent = parent->astParent();
                                     }
                                     if (parent && parent->previous() &&
-                                        (isStaticAssert(*mSettings, parent->previous()) ||
+                                        (isStaticAssert(mSettings, parent->previous()) ||
                                          Token::simpleMatch(parent->previous(), "assert"))) {
                                         continue;
                                     }
@@ -2962,7 +3111,7 @@ void CheckOther::checkDuplicateExpression()
                            isSameExpression(false,
                                             tok->astOperand1(),
                                             tok->astOperand2()->astOperand1(),
-                                            *mSettings,
+                                            mSettings,
                                             true,
                                             false)) {
                     if (isWithoutSideEffects(tok->astOperand1())) {
@@ -2970,7 +3119,7 @@ void CheckOther::checkDuplicateExpression()
                     }
                 } else if (isOppositeExpression(tok->astOperand1(),
                                                 tok->astOperand2(),
-                                                *mSettings,
+                                                mSettings,
                                                 false,
                                                 true,
                                                 &errorPath) &&
@@ -2982,15 +3131,15 @@ void CheckOther::checkDuplicateExpression()
                         isSameExpression(true,
                                          tok->astOperand2(),
                                          tok->astOperand1()->astOperand2(),
-                                         *mSettings,
+                                         mSettings,
                                          true,
                                          followVar,
                                          &errorPath) &&
                         isWithoutSideEffects(tok->astOperand2()))
                         duplicateExpressionError(tok->astOperand2(), tok->astOperand1()->astOperand2(), tok, std::move(errorPath));
-                    else if (tok->astOperand2() && isConstExpression(tok->astOperand1(), mSettings->library)) {
+                    else if (tok->astOperand2() && isConstExpression(tok->astOperand1(), mSettings.library)) {
                         auto checkDuplicate = [&](const Token* exp1, const Token* exp2, const Token* ast1) {
-                            if (isSameExpression(true, exp1, exp2, *mSettings, true, true, &errorPath) &&
+                            if (isSameExpression(true, exp1, exp2, mSettings, true, true, &errorPath) &&
                                 isWithoutSideEffects(exp1) &&
                                 isWithoutSideEffects(ast1->astOperand2()))
                                 duplicateExpressionError(exp1, exp2, tok, errorPath, /*hasMultipleExpr*/ true);
@@ -3002,22 +3151,32 @@ void CheckOther::checkDuplicateExpression()
                                 checkDuplicate(ast1->astOperand1(), tok->astOperand2(), ast1);
                             ast1 = ast1->astOperand1();
                         }
+                        if (tok->str() != "=") {
+                            const Token* par = tok->astParent();
+                            while (par && tok->str() == par->str() && precedes(par->astOperand1(), tok)) { // chain of identical operators with parentheses
+                                checkDuplicate(par->astOperand1(), tok->astOperand1(), par);
+                                checkDuplicate(par->astOperand1(), tok->astOperand2(), par);
+                                checkDuplicate(par->astOperand2(), tok->astOperand1(), par);
+                                checkDuplicate(par->astOperand2(), tok->astOperand2(), par);
+                                par = par->astParent();
+                            }
+                        }
                     }
                 }
             } else if (tok->astOperand1() && tok->astOperand2() && tok->str() == ":" && tok->astParent() && tok->astParent()->str() == "?") {
-                if (isSameExpression(true, tok->astOperand1(), tok->astOperand2(), *mSettings, false, true, &errorPath))
+                if (isSameExpression(true, tok->astOperand1(), tok->astOperand2(), mSettings, false, true, &errorPath))
                     duplicateExpressionTernaryError(tok, std::move(errorPath));
 
                 else if (!tok->astOperand1()->values().empty() && !tok->astOperand2()->values().empty() && isEqualKnownValue(tok->astOperand1(), tok->astOperand2()) &&
-                         !isVariableChanged(tok->astParent(), /*indirect*/ 0, *mSettings) &&
-                         isConstStatement(tok->astOperand1(), mSettings->library, true) && isConstStatement(tok->astOperand2(), mSettings->library, true))
+                         !isVariableChanged(tok->astParent(), /*indirect*/ 0, mSettings) &&
+                         isConstStatement(tok->astOperand1(), mSettings.library, true) && isConstStatement(tok->astOperand2(), mSettings.library, true))
                     duplicateValueTernaryError(tok);
             }
         }
     }
 }
 
-void CheckOther::oppositeExpressionError(const Token *opTok, ErrorPath errors)
+void CheckOtherImpl::oppositeExpressionError(const Token *opTok, ErrorPath errors)
 {
     errors.emplace_back(opTok, "");
 
@@ -3029,7 +3188,7 @@ void CheckOther::oppositeExpressionError(const Token *opTok, ErrorPath errors)
                 "determine if it is correct.", CWE398, Certainty::normal);
 }
 
-void CheckOther::duplicateExpressionError(const Token *tok1, const Token *tok2, const Token *opTok, ErrorPath errors, bool hasMultipleExpr)
+void CheckOtherImpl::duplicateExpressionError(const Token *tok1, const Token *tok2, const Token *opTok, ErrorPath errors, bool hasMultipleExpr)
 {
     errors.emplace_back(opTok, "");
 
@@ -3057,7 +3216,7 @@ void CheckOther::duplicateExpressionError(const Token *tok1, const Token *tok2,
                 "determine if it is correct.", CWE398, Certainty::normal);
 }
 
-void CheckOther::duplicateAssignExpressionError(const Token *tok1, const Token *tok2, bool inconclusive)
+void CheckOtherImpl::duplicateAssignExpressionError(const Token *tok1, const Token *tok2, bool inconclusive)
 {
     const std::list<const Token *> toks = { tok2, tok1 };
 
@@ -3071,7 +3230,7 @@ void CheckOther::duplicateAssignExpressionError(const Token *tok1, const Token *
                 "determine if it is correct.", CWE398, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckOther::duplicateExpressionTernaryError(const Token *tok, ErrorPath errors)
+void CheckOtherImpl::duplicateExpressionTernaryError(const Token *tok, ErrorPath errors)
 {
     errors.emplace_back(tok, "");
     reportError(std::move(errors), Severity::style, "duplicateExpressionTernary", "Same expression in both branches of ternary operator.\n"
@@ -3079,14 +3238,14 @@ void CheckOther::duplicateExpressionTernaryError(const Token *tok, ErrorPath err
                 "the same code is executed regardless of the condition.", CWE398, Certainty::normal);
 }
 
-void CheckOther::duplicateValueTernaryError(const Token *tok)
+void CheckOtherImpl::duplicateValueTernaryError(const Token *tok)
 {
     reportError(tok, Severity::style, "duplicateValueTernary", "Same value in both branches of ternary operator.\n"
                 "Finding the same value in both branches of ternary operator is suspicious as "
                 "the same code is executed regardless of the condition.", CWE398, Certainty::normal);
 }
 
-void CheckOther::selfAssignmentError(const Token *tok, const std::string &varname)
+void CheckOtherImpl::selfAssignmentError(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::style,
                 "selfAssignment",
@@ -3103,9 +3262,9 @@ void CheckOther::selfAssignmentError(const Token *tok, const std::string &varnam
 // Reference:
 // - http://www.cplusplus.com/reference/cmath/
 //-----------------------------------------------------------------------------
-void CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalse()
+void CheckOtherImpl::checkComparisonFunctionIsAlwaysTrueOrFalse()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalse"); // warning
@@ -3133,7 +3292,7 @@ void CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalse()
         }
     }
 }
-void CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalseError(const Token* tok, const std::string &functionName, const std::string &varName, const bool result)
+void CheckOtherImpl::checkComparisonFunctionIsAlwaysTrueOrFalseError(const Token* tok, const std::string &functionName, const std::string &varName, const bool result)
 {
     const std::string strResult = bool_to_string(result);
     const CWE cweResult = result ? CWE571 : CWE570;
@@ -3148,9 +3307,9 @@ void CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalseError(const Token* to
 //---------------------------------------------------------------------------
 // Check testing sign of unsigned variables and pointers.
 //---------------------------------------------------------------------------
-void CheckOther::checkSignOfUnsignedVariable()
+void CheckOtherImpl::checkSignOfUnsignedVariable()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unsignedLessThanZero"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unsignedLessThanZero"))
         return;
 
     logChecker("CheckOther::checkSignOfUnsignedVariable"); // style
@@ -3179,7 +3338,7 @@ void CheckOther::checkSignOfUnsignedVariable()
     }
 }
 
-bool CheckOther::comparisonNonZeroExpressionLessThanZero(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr, bool suppress)
+bool CheckOtherImpl::comparisonNonZeroExpressionLessThanZero(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr, bool suppress)
 {
     if (!tok->isComparisonOp() || !tok->astOperand1() || !tok->astOperand2())
         return false;
@@ -3205,7 +3364,7 @@ bool CheckOther::comparisonNonZeroExpressionLessThanZero(const Token *tok, const
     return vt && (vt->pointer || vt->sign == ValueType::UNSIGNED);
 }
 
-bool CheckOther::testIfNonZeroExpressionIsPositive(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr)
+bool CheckOtherImpl::testIfNonZeroExpressionIsPositive(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr)
 {
     if (!tok->isComparisonOp() || !tok->astOperand1() || !tok->astOperand2())
         return false;
@@ -3227,7 +3386,7 @@ bool CheckOther::testIfNonZeroExpressionIsPositive(const Token *tok, const Value
     return vt && (vt->pointer || vt->sign == ValueType::UNSIGNED);
 }
 
-void CheckOther::unsignedLessThanZeroError(const Token *tok, const ValueFlow::Value * v, const std::string &varname)
+void CheckOtherImpl::unsignedLessThanZeroError(const Token *tok, const ValueFlow::Value * v, const std::string &varname)
 {
     reportError(getErrorPath(tok, v, "Unsigned less than zero"), Severity::style, "unsignedLessThanZero",
                 "$symbol:" + varname + "\n"
@@ -3236,20 +3395,20 @@ void CheckOther::unsignedLessThanZeroError(const Token *tok, const ValueFlow::Va
                 "is either pointless or an error to check if it is.", CWE570, Certainty::normal);
 }
 
-void CheckOther::pointerLessThanZeroError(const Token *tok, const ValueFlow::Value *v)
+void CheckOtherImpl::pointerLessThanZeroError(const Token *tok, const ValueFlow::Value *v)
 {
     reportError(getErrorPath(tok, v, "Pointer less than zero"), Severity::style, "pointerLessThanZero",
                 "A pointer can not be negative so it is either pointless or an error to check if it is.", CWE570, Certainty::normal);
 }
 
-void CheckOther::unsignedPositiveError(const Token *tok, const ValueFlow::Value * v, const std::string &varname)
+void CheckOtherImpl::unsignedPositiveError(const Token *tok, const ValueFlow::Value * v, const std::string &varname)
 {
     reportError(getErrorPath(tok, v, "Unsigned positive"), Severity::style, "unsignedPositive",
                 "$symbol:" + varname + "\n"
                 "Unsigned expression '$symbol' can't be negative so it is unnecessary to test it.", CWE570, Certainty::normal);
 }
 
-void CheckOther::pointerPositiveError(const Token *tok, const ValueFlow::Value * v)
+void CheckOtherImpl::pointerPositiveError(const Token *tok, const ValueFlow::Value * v)
 {
     reportError(getErrorPath(tok, v, "Pointer positive"), Severity::style, "pointerPositive",
                 "A pointer can not be negative so it is either pointless or an error to check if it is not.", CWE570, Certainty::normal);
@@ -3260,7 +3419,7 @@ static bool constructorTakesReference(const Scope * const classScope)
 {
     return std::any_of(classScope->functionList.begin(), classScope->functionList.end(), [&](const Function& constructor) {
         if (constructor.isConstructor()) {
-            for (int argnr = 0U; argnr < constructor.argCount(); argnr++) {
+            for (size_t argnr = 0U; argnr < constructor.argCount(); argnr++) {
                 const Variable * const argVar = constructor.getArgumentVar(argnr);
                 if (argVar && argVar->isReference()) {
                     return true;
@@ -3271,13 +3430,70 @@ static bool constructorTakesReference(const Scope * const classScope)
     });
 }
 
+static bool isLargeObject(const Variable* var, const Settings& settings)
+{
+    if (!var || var->isGlobal() || !var->valueType())
+        return false;
+    ValueType vt = *var->valueType();
+    vt.reference = Reference::None;
+    return vt.getSizeOf(settings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer) > 2 * settings.platform.sizeof_pointer;
+}
+
 //---------------------------------------------------------------------------
 // This check rule works for checking the "const A a = getA()" usage when getA() returns "const A &" or "A &".
 // In most scenarios, "const A & a = getA()" will be more efficient.
 //---------------------------------------------------------------------------
-void CheckOther::checkRedundantCopy()
+static bool checkFunctionReturnsRef(const Token* tok, const Settings& settings)
 {
-    if (!mSettings->severity.isEnabled(Severity::performance) || mTokenizer->isC() || !mSettings->certainty.isEnabled(Certainty::inconclusive))
+    if (!Token::Match(tok->previous(), "%name% ("))
+        return false;
+    if (!Token::Match(tok->link(), ") )|}| ;")) // bailout for usage like "const A a = getA()+3"
+        return false;
+    const Token* dot = tok->astOperand1();
+    if (Token::simpleMatch(dot, ".")) {
+        const Token* varTok = dot->astOperand1();
+        const int indirect = varTok->valueType() ? varTok->valueType()->pointer : 0;
+        if (isVariableChanged(tok, tok->scope()->bodyEnd, indirect, varTok->varId(), /*globalvar*/ true, settings))
+            return false;
+        if (isTemporary(dot, &settings.library, /*unknown*/ true))
+            return false;
+    }
+    if (exprDependsOnThis(tok->previous()))
+        return false;
+    const Function* func = tok->previous()->function();
+    if (func && func->tokenDef->strAt(-1) == "&") {
+        const Scope* fScope = func->functionScope;
+        if (fScope && fScope->bodyEnd && Token::Match(fScope->bodyEnd->tokAt(-3), "return %var% ;")) {
+            const Token* varTok = fScope->bodyEnd->tokAt(-2);
+            if (isLargeObject(varTok->variable(), settings))
+                return true;
+        }
+    }
+    return false;
+}
+
+static bool checkVariableAssignment(const Token* tok, const ValueType* vtLhs, const Settings& settings)
+{
+    if (!Token::Match(tok, "%var% ;"))
+        return false;
+    const Variable* var = tok->variable();
+    if (!var || !isLargeObject(var, settings))
+        return false;
+    if (!vtLhs || !vtLhs->isTypeEqual(var->valueType()))
+        return false;
+    if (findVariableChanged(tok->tokAt(2), tok->scope()->bodyEnd, /*indirect*/ 0, var->declarationId(), /*globalvar*/ false, settings))
+        return false;
+    if (var->isLocal() || (var->isArgument() && !var->isReference()))
+        return true;
+    const Scope* scope = tok->scope();
+    while (scope && scope->type != ScopeType::eFunction)
+        scope = scope->nestedIn;
+    return scope && scope->function && (!scope->functionOf || scope->function->isConst() || scope->function->isStatic());
+}
+
+void CheckOtherImpl::checkRedundantCopy()
+{
+    if (!mSettings.severity.isEnabled(Severity::performance) || mTokenizer->isC() || !mSettings.certainty.isEnabled(Certainty::inconclusive))
         return;
 
     logChecker("CheckOther::checkRedundantCopy"); // c++,performance,inconclusive
@@ -3287,7 +3503,7 @@ void CheckOther::checkRedundantCopy()
     for (const Variable* var : symbolDatabase->variableList()) {
         if (!var || var->isReference() || var->isPointer() ||
             (!var->type() && !var->isStlType() && !(var->valueType() && var->valueType()->container)) || // bailout if var is of standard type, if it is a pointer or non-const
-            (!var->isConst() && isVariableChanged(var, *mSettings)))
+            (!var->isConst() && isVariableChanged(var, mSettings)))
             continue;
 
         const Token* startTok = var->nameToken();
@@ -3307,39 +3523,13 @@ void CheckOther::checkRedundantCopy()
         const Token* tok = startTok->next()->astOperand2();
         if (!tok)
             continue;
-        if (!Token::Match(tok->previous(), "%name% ("))
-            continue;
-        if (!Token::Match(tok->link(), ") )|}| ;")) // bailout for usage like "const A a = getA()+3"
+        if (!checkFunctionReturnsRef(tok, mSettings) && !checkVariableAssignment(tok, var->valueType(), mSettings))
             continue;
-
-        const Token* dot = tok->astOperand1();
-        if (Token::simpleMatch(dot, ".")) {
-            const Token* varTok = dot->astOperand1();
-            const int indirect = varTok->valueType() ? varTok->valueType()->pointer : 0;
-            if (isVariableChanged(tok, tok->scope()->bodyEnd, indirect, varTok->varId(), /*globalvar*/ true, *mSettings))
-                continue;
-            if (isTemporary(dot, &mSettings->library, /*unknown*/ true))
-                continue;
-        }
-        if (exprDependsOnThis(tok->previous()))
-            continue;
-
-        const Function* func = tok->previous()->function();
-        if (func && func->tokenDef->strAt(-1) == "&") {
-            const Scope* fScope = func->functionScope;
-            if (fScope && fScope->bodyEnd && Token::Match(fScope->bodyEnd->tokAt(-3), "return %var% ;")) {
-                const Token* varTok = fScope->bodyEnd->tokAt(-2);
-                if (varTok->variable() && !varTok->variable()->isGlobal() &&
-                    (!varTok->variable()->type() || !varTok->variable()->type()->classScope ||
-                     (varTok->variable()->valueType() &&
-                      varTok->variable()->valueType()->getSizeOf(*mSettings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer) > 2 * mSettings->platform.sizeof_pointer)))
-                    redundantCopyError(startTok, startTok->str());
-            }
-        }
+        redundantCopyError(startTok, startTok->str());
     }
 }
 
-void CheckOther::redundantCopyError(const Token *tok,const std::string& varname)
+void CheckOtherImpl::redundantCopyError(const Token *tok,const std::string& varname)
 {
     reportError(tok, Severity::performance, "redundantCopyLocalConst",
                 "$symbol:" + varname + "\n"
@@ -3354,14 +3544,16 @@ void CheckOther::redundantCopyError(const Token *tok,const std::string& varname)
 // Checking for shift by negative values
 //---------------------------------------------------------------------------
 
-static bool isNegative(const Token *tok, const Settings &settings)
+static const ValueFlow::Value* isNegative(const Token *tok, const Settings &settings)
 {
-    return tok->valueType() && tok->valueType()->sign == ValueType::SIGNED && tok->getValueLE(-1LL, settings);
+    if (!tok->valueType() || tok->valueType()->sign != ValueType::SIGNED)
+        return nullptr;
+    return tok->getValueLE(-1LL, settings);
 }
 
-void CheckOther::checkNegativeBitwiseShift()
+void CheckOtherImpl::checkNegativeBitwiseShift()
 {
-    const bool portability = mSettings->severity.isEnabled(Severity::portability);
+    const bool portability = mSettings.severity.isEnabled(Severity::portability);
 
     logChecker("CheckOther::checkNegativeBitwiseShift");
 
@@ -3392,35 +3584,39 @@ void CheckOther::checkNegativeBitwiseShift()
         if (ternary)
             continue;
 
-        // Get negative rhs value. preferably a value which doesn't have 'condition'.
-        if (portability && isNegative(tok->astOperand1(), *mSettings))
-            negativeBitwiseShiftError(tok, 1);
-        else if (isNegative(tok->astOperand2(), *mSettings))
-            negativeBitwiseShiftError(tok, 2);
+        const ValueFlow::Value* value = isNegative(tok->astOperand1(), mSettings); // lhs
+        if (portability && value)
+            negativeBitwiseShiftError(tok, true, value);
+        else {
+            value = isNegative(tok->astOperand2(), mSettings); // rhs
+            if (value)
+                negativeBitwiseShiftError(tok, false, value);
+        }
     }
 }
 
 
-void CheckOther::negativeBitwiseShiftError(const Token *tok, int op)
+void CheckOtherImpl::negativeBitwiseShiftError(const Token *tok, bool isLHS, const ValueFlow::Value* v)
 {
-    if (op == 1)
-        // LHS - this is used by intention in various software, if it
-        // is used often in a project and works as expected then this is
-        // a portability issue
-        reportError(tok, Severity::portability, "shiftNegativeLHS", "Shifting a negative value is technically undefined behaviour", CWE758, Certainty::normal);
-    else // RHS
-        reportError(tok, Severity::error, "shiftNegative", "Shifting by a negative value is undefined behaviour", CWE758, Certainty::normal);
+    // LHS - this is used by intention in various software, if it
+    // is used often in a project and works as expected then this is
+    // a portability issue
+    const char* id = isLHS ? "shiftNegativeLHS" : "shiftNegative";
+    const std::string msg = isLHS ? "Shifting a negative value is technically undefined behaviour" : "Shifting by a negative value is undefined behaviour";
+    const Severity severity = isLHS ? Severity::portability : (v && v->errorSeverity() && !v->conditional ? Severity::error : Severity::warning);
+    const ErrorPath errorPath = getErrorPath(tok, v, msg);
+    reportError(errorPath, severity, id, msg, CWE758, Certainty::normal);
 }
 
 //---------------------------------------------------------------------------
 // Check for incompletely filled buffers.
 //---------------------------------------------------------------------------
-void CheckOther::checkIncompleteArrayFill()
+void CheckOtherImpl::checkIncompleteArrayFill()
 {
-    if (!mSettings->certainty.isEnabled(Certainty::inconclusive))
+    if (!mSettings.certainty.isEnabled(Certainty::inconclusive))
         return;
-    const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
-    const bool printPortability = mSettings->severity.isEnabled(Severity::portability);
+    const bool printWarning = mSettings.severity.isEnabled(Severity::warning);
+    const bool printPortability = mSettings.severity.isEnabled(Severity::portability);
     if (!printPortability && !printWarning)
         return;
 
@@ -3450,9 +3646,9 @@ void CheckOther::checkIncompleteArrayFill()
                     continue;
                 int size = mTokenizer->sizeOfType(var->typeStartToken());
                 if (size == 0 && var->valueType()->pointer)
-                    size = mSettings->platform.sizeof_pointer;
+                    size = mSettings.platform.sizeof_pointer;
                 else if (size == 0 && var->valueType())
-                    size = var->valueType()->getSizeOf(*mSettings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer);
+                    size = var->valueType()->getSizeOf(mSettings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer);
                 const Token* tok3 = tok->next()->astOperand2()->astOperand1()->astOperand1();
                 if ((size != 1 && size != 100 && size != 0) || var->isPointer()) {
                     if (printWarning)
@@ -3464,7 +3660,7 @@ void CheckOther::checkIncompleteArrayFill()
     }
 }
 
-void CheckOther::incompleteArrayFillError(const Token* tok, const std::string& buffer, const std::string& function, bool boolean)
+void CheckOtherImpl::incompleteArrayFillError(const Token* tok, const std::string& buffer, const std::string& function, bool boolean)
 {
     if (boolean)
         reportError(tok, Severity::portability, "incompleteArrayFill",
@@ -3484,9 +3680,9 @@ void CheckOther::incompleteArrayFillError(const Token* tok, const std::string& b
 // Detect NULL being passed to variadic function.
 //---------------------------------------------------------------------------
 
-void CheckOther::checkVarFuncNullUB()
+void CheckOtherImpl::checkVarFuncNullUB()
 {
-    if (!mSettings->severity.isEnabled(Severity::portability))
+    if (!mSettings.severity.isEnabled(Severity::portability))
         return;
 
     logChecker("CheckOther::checkVarFuncNullUB"); // portability
@@ -3495,7 +3691,7 @@ void CheckOther::checkVarFuncNullUB()
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
             // Is NULL passed to a function?
-            if (Token::Match(tok,"[(,] NULL [,)]")) {
+            if (Token::Match(tok,"[(,] NULL )")) {
                 // Locate function name in this function call.
                 const Token *ftok = tok;
                 int argnr = 1;
@@ -3522,7 +3718,7 @@ void CheckOther::checkVarFuncNullUB()
     }
 }
 
-void CheckOther::varFuncNullUBError(const Token *tok)
+void CheckOtherImpl::varFuncNullUBError(const Token *tok)
 {
     reportError(tok,
                 Severity::portability,
@@ -3569,9 +3765,9 @@ void CheckOther::varFuncNullUBError(const Token *tok)
                 "}", CWE475, Certainty::normal);
 }
 
-void CheckOther::checkRedundantPointerOp()
+void CheckOtherImpl::checkRedundantPointerOp()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("redundantPointerOp"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("redundantPointerOp"))
         return;
 
     logChecker("CheckOther::checkRedundantPointerOp"); // style
@@ -3608,16 +3804,16 @@ void CheckOther::checkRedundantPointerOp()
     }
 }
 
-void CheckOther::redundantPointerOpError(const Token* tok, const std::string &varname, bool inconclusive, bool addressOfDeref)
+void CheckOtherImpl::redundantPointerOpError(const Token* tok, const std::string &varname, bool inconclusive, bool addressOfDeref)
 {
     std::string msg = "$symbol:" + varname + "\nRedundant pointer operation on '$symbol' - it's already a ";
     msg += addressOfDeref ? "pointer." : "variable.";
     reportError(tok, Severity::style, "redundantPointerOp", msg, CWE398, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckOther::checkInterlockedDecrement()
+void CheckOtherImpl::checkInterlockedDecrement()
 {
-    if (!mSettings->platform.isWindows()) {
+    if (!mSettings.platform.isWindows()) {
         return;
     }
 
@@ -3655,15 +3851,15 @@ void CheckOther::checkInterlockedDecrement()
     }
 }
 
-void CheckOther::raceAfterInterlockedDecrementError(const Token* tok)
+void CheckOtherImpl::raceAfterInterlockedDecrementError(const Token* tok)
 {
     reportError(tok, Severity::error, "raceAfterInterlockedDecrement",
                 "Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.", CWE362, Certainty::normal);
 }
 
-void CheckOther::checkUnusedLabel()
+void CheckOtherImpl::checkUnusedLabel()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("unusedLabel"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("unusedLabel"))
         return;
 
     logChecker("CheckOther::checkUnusedLabel"); // style,warning
@@ -3684,9 +3880,9 @@ void CheckOther::checkUnusedLabel()
     }
 }
 
-void CheckOther::unusedLabelError(const Token* tok, bool inSwitch, bool hasIfdef)
+void CheckOtherImpl::unusedLabelError(const Token* tok, bool inSwitch, bool hasIfdef)
 {
-    if (tok && !mSettings->severity.isEnabled(inSwitch ? Severity::warning : Severity::style))
+    if (tok && !mSettings.severity.isEnabled(inSwitch ? Severity::warning : Severity::style) && !mSettings.isPremiumEnabled("unusedLabel"))
         return;
 
     std::string id = "unusedLabel";
@@ -3778,7 +3974,7 @@ static bool checkEvaluationOrderCpp17(const Token * tok, const Token * tok2, con
     return foundUndefined || foundUnspecified;
 }
 
-void CheckOther::checkEvaluationOrder()
+void CheckOtherImpl::checkEvaluationOrder()
 {
     logChecker("CheckOther::checkEvaluationOrder");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -3788,6 +3984,8 @@ void CheckOther::checkEvaluationOrder()
                 continue;
             if (!tok->astOperand1())
                 continue;
+            if (isDesignatedInitializer(tok->astOperand1()))
+                continue;
             for (const Token *tok2 = tok;; tok2 = tok2->astParent()) {
                 // If ast parent is a sequence point then break
                 const Token * const parent = tok2->astParent();
@@ -3816,14 +4014,14 @@ void CheckOther::checkEvaluationOrder()
                     break;
 
                 bool foundError{false}, foundUnspecified{false}, bSelfAssignmentError{false};
-                if (mTokenizer->isCPP() && mSettings->standards.cpp >= Standards::CPP11) {
-                    if (mSettings->standards.cpp >= Standards::CPP17)
-                        foundError = checkEvaluationOrderCpp17(tok, tok2, parent, *mSettings, foundUnspecified);
+                if (mTokenizer->isCPP() && mSettings.standards.cpp >= Standards::CPP11) {
+                    if (mSettings.standards.cpp >= Standards::CPP17)
+                        foundError = checkEvaluationOrderCpp17(tok, tok2, parent, mSettings, foundUnspecified);
                     else
-                        foundError = checkEvaluationOrderCpp11(tok, tok2, parent, *mSettings);
+                        foundError = checkEvaluationOrderCpp11(tok, tok2, parent, mSettings);
                 }
                 else
-                    foundError = checkEvaluationOrderC(tok, tok2, parent, *mSettings, bSelfAssignmentError);
+                    foundError = checkEvaluationOrderC(tok, tok2, parent, mSettings, bSelfAssignmentError);
 
                 if (foundError) {
                     unknownEvaluationOrder(parent, foundUnspecified);
@@ -3838,7 +4036,7 @@ void CheckOther::checkEvaluationOrder()
     }
 }
 
-void CheckOther::unknownEvaluationOrder(const Token* tok, bool isUnspecifiedBehavior)
+void CheckOtherImpl::unknownEvaluationOrder(const Token* tok, bool isUnspecifiedBehavior)
 {
     isUnspecifiedBehavior ?
     reportError(tok, Severity::portability, "unknownEvaluationOrder",
@@ -3847,14 +4045,14 @@ void CheckOther::unknownEvaluationOrder(const Token* tok, bool isUnspecifiedBeha
                     "Expression '" + (tok ? tok->expressionString() : std::string("x = x++;")) + "' depends on order of evaluation of side effects", CWE768, Certainty::normal);
 }
 
-void CheckOther::checkAccessOfMovedVariable()
+void CheckOtherImpl::checkAccessOfMovedVariable()
 {
-    if (!mTokenizer->isCPP() || mSettings->standards.cpp < Standards::CPP11)
+    if (!mTokenizer->isCPP() || mSettings.standards.cpp < Standards::CPP11)
         return;
-    if (!mSettings->isPremiumEnabled("accessMoved") && !mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.isPremiumEnabled("accessMoved") && !mSettings.severity.isEnabled(Severity::warning))
         return;
     logChecker("CheckOther::checkAccessOfMovedVariable"); // c++11,warning
-    const bool reportInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool reportInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         const Token * scopeStart = scope->bodyStart;
@@ -3880,11 +4078,11 @@ void CheckOther::checkAccessOfMovedVariable()
                 else
                     inconclusive = true;
             } else {
-                const ExprUsage usage = getExprUsage(tok, 0, *mSettings);
+                const ExprUsage usage = getExprUsage(tok, 0, mSettings);
                 if (usage == ExprUsage::Used)
                     accessOfMoved = true;
                 if (usage == ExprUsage::PassedByReference)
-                    accessOfMoved = !isVariableChangedByFunctionCall(tok, 0, *mSettings, &inconclusive);
+                    accessOfMoved = !isVariableChangedByFunctionCall(tok, 0, mSettings.library, &inconclusive);
                 else if (usage == ExprUsage::Inconclusive)
                     inconclusive = true;
             }
@@ -3894,7 +4092,7 @@ void CheckOther::checkAccessOfMovedVariable()
     }
 }
 
-void CheckOther::accessMovedError(const Token *tok, const std::string &varname, const ValueFlow::Value *value, bool inconclusive)
+void CheckOtherImpl::accessMovedError(const Token *tok, const std::string &varname, const ValueFlow::Value *value, bool inconclusive)
 {
     if (!tok) {
         reportError(tok, Severity::warning, "accessMoved", "Access of moved variable 'v'.", CWE672, Certainty::normal);
@@ -3923,13 +4121,13 @@ void CheckOther::accessMovedError(const Token *tok, const std::string &varname,
 
 
 
-void CheckOther::checkFuncArgNamesDifferent()
+void CheckOtherImpl::checkFuncArgNamesDifferent()
 {
-    const bool style = mSettings->severity.isEnabled(Severity::style);
-    const bool inconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
-    const bool warning = mSettings->severity.isEnabled(Severity::warning);
+    const bool style = mSettings.severity.isEnabled(Severity::style);
+    const bool inconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
+    const bool warning = mSettings.severity.isEnabled(Severity::warning);
 
-    if (!(warning || (style && inconclusive)) && !mSettings->isPremiumEnabled("funcArgNamesDifferent"))
+    if (!(warning || (style && inconclusive)) && !mSettings.isPremiumEnabled("funcArgNamesDifferent"))
         return;
 
     logChecker("CheckOther::checkFuncArgNamesDifferent"); // style,warning,inconclusive
@@ -3950,16 +4148,14 @@ void CheckOther::checkFuncArgNamesDifferent()
         std::vector<const Token *>  declarations(function->argCount());
         std::vector<const Token *>  definitions(function->argCount());
         const Token * decl = function->argDef->next();
-        for (int j = 0; j < function->argCount(); ++j) {
-            declarations[j] = nullptr;
-            definitions[j] = nullptr;
+        for (size_t j = 0; j < function->argCount(); ++j) {
             // get the definition
             const Variable * variable = function->getArgumentVar(j);
             if (variable) {
                 definitions[j] = variable->nameToken();
             }
             // get the declaration (search for first token with varId)
-            while (decl && !Token::Match(decl, ",|)|;")) {
+            while (decl && !Token::Match(decl, "[,;]")) {
                 // skip everything after the assignment because
                 // it could also have a varId or be the first
                 // token with a varId if there is no name token
@@ -3967,8 +4163,8 @@ void CheckOther::checkFuncArgNamesDifferent()
                     decl = decl->nextArgument();
                     break;
                 }
-                // skip over template
-                if (decl->link())
+                // skip over templates and arrays
+                if (decl->link() && precedes(decl, decl->link()) && !Token::Match(decl, "( [*&]"))
                     decl = decl->link();
                 else if (decl->varId())
                     declarations[j] = decl;
@@ -3980,11 +4176,11 @@ void CheckOther::checkFuncArgNamesDifferent()
         // check for different argument order
         if (warning) {
             bool order_different = false;
-            for (int j = 0; j < function->argCount(); ++j) {
+            for (size_t j = 0; j < function->argCount(); ++j) {
                 if (!declarations[j] || !definitions[j] || declarations[j]->str() == definitions[j]->str())
                     continue;
 
-                for (int k = 0; k < function->argCount(); ++k) {
+                for (size_t k = 0; k < function->argCount(); ++k) {
                     if (j != k && definitions[k] && declarations[j]->str() == definitions[k]->str()) {
                         order_different = true;
                         break;
@@ -3998,29 +4194,32 @@ void CheckOther::checkFuncArgNamesDifferent()
         }
         // check for different argument names
         if (style && inconclusive) {
-            for (int j = 0; j < function->argCount(); ++j) {
-                if (declarations[j] && definitions[j] && declarations[j]->str() != definitions[j]->str())
+            for (size_t j = 0; j < function->argCount(); ++j) {
+                const bool warn = (declarations[j] != nullptr) != (definitions[j] != nullptr) ||
+                                  (declarations[j] && definitions[j] && declarations[j]->str() != definitions[j]->str());
+                if (warn)
                     funcArgNamesDifferent(function->name(), j, declarations[j], definitions[j]);
             }
         }
     }
 }
 
-void CheckOther::funcArgNamesDifferent(const std::string & functionName, nonneg int index,
-                                       const Token* declaration, const Token* definition)
+void CheckOtherImpl::funcArgNamesDifferent(const std::string & functionName, size_t index,
+                                           const Token* declaration, const Token* definition)
 {
     std::list<const Token *> tokens = { declaration,definition };
-    reportError(tokens, Severity::style, "funcArgNamesDifferent",
+    const std::string id = (declaration != nullptr) == (definition != nullptr) ? "funcArgNamesDifferent" : "funcArgNamesDifferentUnnamed";
+    reportError(tokens, Severity::style, id,
                 "$symbol:" + functionName + "\n"
                 "Function '$symbol' argument " + std::to_string(index + 1) + " names different: declaration '" +
-                (declaration ? declaration->str() : std::string("A")) + "' definition '" +
-                (definition ? definition->str() : std::string("B")) + "'.", CWE628, Certainty::inconclusive);
+                (declaration ? declaration->str() : "<unnamed>") + "' definition '" +
+                (definition ? definition->str() : "<unnamed>") + "'.", CWE628, Certainty::inconclusive);
 }
 
-void CheckOther::funcArgOrderDifferent(const std::string & functionName,
-                                       const Token* declaration, const Token* definition,
-                                       const std::vector<const Token *> & declarations,
-                                       const std::vector<const Token *> & definitions)
+void CheckOtherImpl::funcArgOrderDifferent(const std::string & functionName,
+                                           const Token* declaration, const Token* definition,
+                                           const std::vector<const Token *> & declarations,
+                                           const std::vector<const Token *> & definitions)
 {
     std::list<const Token *> tokens = {
         !declarations.empty() ? declarations[0] ? declarations[0] : declaration : nullptr,
@@ -4044,33 +4243,34 @@ void CheckOther::funcArgOrderDifferent(const std::string & functionName,
     reportError(tokens, Severity::warning, "funcArgOrderDifferent", msg, CWE683, Certainty::normal);
 }
 
-static const Token *findShadowed(const Scope *scope, const Variable& var, int linenr)
+static const Token *findShadowed(const Scope *scope, const Variable& var)
 {
     if (!scope)
         return nullptr;
     for (const Variable &v : scope->varlist) {
-        if (scope->isExecutable() && v.nameToken()->linenr() > linenr)
+        if ((scope->isExecutable() || scope->type == ScopeType::eGlobal) && succeeds(v.nameToken(), var.nameToken()))
             continue;
         if (v.name() == var.name())
             return v.nameToken();
     }
     auto it = std::find_if(scope->functionList.cbegin(), scope->functionList.cend(), [&](const Function& f) {
-        return f.type == FunctionType::eFunction && f.name() == var.name() && precedes(f.tokenDef, var.nameToken());
+        return f.type == FunctionType::eFunction && f.name() == var.name()
+               && (scope->isClassOrStructOrUnion() || precedes(f.tokenDef, var.nameToken()));
     });
     if (it != scope->functionList.end())
         return it->tokenDef;
 
     if (scope->type == ScopeType::eLambda)
         return nullptr;
-    const Token* shadowed = findShadowed(scope->nestedIn, var, linenr);
+    const Token* shadowed = findShadowed(scope->nestedIn, var);
     if (!shadowed)
-        shadowed = findShadowed(scope->functionOf, var, linenr);
+        shadowed = findShadowed(scope->functionOf, var);
     return shadowed;
 }
 
-void CheckOther::checkShadowVariables()
+void CheckOtherImpl::checkShadowVariables()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("shadowVariable"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("shadowVariable"))
         return;
     logChecker("CheckOther::checkShadowVariables"); // style
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -4080,46 +4280,69 @@ void CheckOther::checkShadowVariables()
         const Scope *functionScope = &scope;
         while (functionScope && functionScope->type != ScopeType::eFunction && functionScope->type != ScopeType::eLambda)
             functionScope = functionScope->nestedIn;
-        for (const Variable &var : scope.varlist) {
-            if (var.nameToken() && var.nameToken()->isExpandedMacro()) // #8903
-                continue;
+        const auto checkVar = [&](const Variable &var) {
+            if (!var.nameToken())
+                return;
 
-            if (functionScope && functionScope->type == ScopeType::eFunction && functionScope->function) {
+            if (var.nameToken()->isExpandedMacro()) // #8903
+                return;
+
+            if (!var.isArgument() && functionScope && functionScope->type == ScopeType::eFunction && functionScope->function) {
                 const auto & argList = functionScope->function->argumentList;
                 auto it = std::find_if(argList.cbegin(), argList.cend(), [&](const Variable& arg) {
                     return arg.nameToken() && var.name() == arg.name();
                 });
                 if (it != argList.end()) {
-                    shadowError(var.nameToken(), it->nameToken(), "argument");
-                    continue;
+                    shadowError(var.nameToken(), "local variable", it->nameToken(), "argument");
+                    return;
                 }
             }
 
-            const Token *shadowed = findShadowed(scope.nestedIn, var, var.nameToken()->linenr());
+            const Token *shadowed = findShadowed(scope.nestedIn, var);
             if (!shadowed)
-                shadowed = findShadowed(scope.functionOf, var, var.nameToken()->linenr());
+                shadowed = findShadowed(scope.functionOf, var);
             if (!shadowed)
-                continue;
+                return;
             if (scope.type == ScopeType::eFunction && scope.className == var.name())
-                continue;
+                return;
             if (functionScope->functionOf && functionScope->functionOf->isClassOrStructOrUnion() && functionScope->function &&
                 (functionScope->function->isStatic() || functionScope->function->isFriend()) &&
                 shadowed->variable() && !shadowed->variable()->isLocal())
-                continue;
-            shadowError(var.nameToken(), shadowed, (shadowed->varId() != 0) ? "variable" : "function");
-        }
+                return;
+            if (functionScope->functionOf && functionScope->functionOf->isClassOrStructOrUnion() && functionScope->function &&
+                functionScope->function->isStatic() && shadowed->function() && !shadowed->function()->isStatic())
+                return;
+            if (var.scope() && var.scope()->function && var.scope()->function->isConstructor()) {
+                if (shadowed->variable() && shadowed->variable()->isMember())
+                    return;
+                if (shadowed->function() && shadowed->function()->nestedIn &&
+                    shadowed->function()->nestedIn->isClassOrStruct())
+                    return;
+            }
+            shadowError(var.nameToken(), var.isArgument() ? "argument" : "local variable",
+                        shadowed, (shadowed->varId() != 0) ?
+                        (shadowed->variable()->isMember() ? "member" : "variable") : "function");
+        };
+        for (const Variable &var : scope.varlist)
+            checkVar(var);
+        if (functionScope && functionScope->type == ScopeType::eFunction && functionScope->function)
+            for (const Variable &arg: functionScope->function->argumentList)
+                checkVar(arg);
     }
 }
 
-void CheckOther::shadowError(const Token *var, const Token *shadowed, const std::string& type)
+void CheckOtherImpl::shadowError(const Token *shadows, const std::string &shadowsType,
+                                 const Token *shadowed, const std::string &shadowedType)
 {
-    ErrorPath errorPath;
-    errorPath.emplace_back(shadowed, "Shadowed declaration");
-    errorPath.emplace_back(var, "Shadow variable");
-    const std::string &varname = var ? var->str() : type;
-    const std::string Type = char(std::toupper(type[0])) + type.substr(1);
-    const std::string id = "shadow" + Type;
-    const std::string message = "$symbol:" + varname + "\nLocal variable \'$symbol\' shadows outer " + type;
+    ErrorPath errorPath{
+        {shadowed, "Shadowed " + shadowedType},
+        {shadows, "Shadow " + shadowsType}
+    };
+    const std::string &varname = shadows ? shadows->str() : shadowsType;
+    const std::string ShadowsType = char(std::toupper(shadowsType[0])) + shadowsType.substr(1);
+    const std::string ShadowedType = char(std::toupper(shadowedType[0])) + shadowedType.substr(1);
+    const std::string id = "shadow" + ShadowedType;
+    const std::string message = "$symbol:" + varname + "\n" + ShadowsType + " \'$symbol\' shadows outer " + shadowedType;
     reportError(std::move(errorPath), Severity::style, id.c_str(), message, CWE398, Certainty::normal);
 }
 
@@ -4150,9 +4373,9 @@ static bool isVariableExprHidden(const Token* tok)
     return false;
 }
 
-void CheckOther::checkKnownArgument()
+void CheckOtherImpl::checkKnownArgument()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("knownArgument"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("knownArgument"))
         return;
     logChecker("CheckOther::checkKnownArgument"); // style
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -4187,7 +4410,7 @@ void CheckOther::checkKnownArgument()
                 continue;
             if (tok->isComparisonOp() &&
                 isSameExpression(
-                    true, tok->astOperand1(), tok->astOperand2(), *mSettings, true, true))
+                    true, tok->astOperand1(), tok->astOperand2(), mSettings, true, true))
                 continue;
             // ensure that there is a integer variable in expression with unknown value
             const Token* vartok = nullptr;
@@ -4219,7 +4442,7 @@ void CheckOther::checkKnownArgument()
     }
 }
 
-void CheckOther::knownArgumentError(const Token *tok, const Token *ftok, const ValueFlow::Value *value, const std::string &varexpr, bool isVariableExpressionHidden)
+void CheckOtherImpl::knownArgumentError(const Token *tok, const Token *ftok, const ValueFlow::Value *value, const std::string &varexpr, bool isVariableExpressionHidden)
 {
     if (!tok) {
         reportError(tok, Severity::style, "knownArgument", "Argument 'x-x' to function 'func' is always 0. It does not matter what value 'x' has.");
@@ -4251,9 +4474,9 @@ void CheckOther::knownArgumentError(const Token *tok, const Token *ftok, const V
     reportError(std::move(errorPath), Severity::style, id, errmsg, CWE570, Certainty::normal);
 }
 
-void CheckOther::checkKnownPointerToBool()
+void CheckOtherImpl::checkKnownPointerToBool()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("knownPointerToBool"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("knownPointerToBool"))
         return;
     logChecker("CheckOther::checkKnownPointerToBool"); // style
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -4261,7 +4484,7 @@ void CheckOther::checkKnownPointerToBool()
         for (const Token* tok = functionScope->bodyStart; tok != functionScope->bodyEnd; tok = tok->next()) {
             if (!tok->hasKnownIntValue())
                 continue;
-            if (!astIsPointer(tok))
+            if (!astIsPointer(tok) && !tok->function())
                 continue;
             if (Token::Match(tok->astParent(), "?|!|&&|%oror%|%comp%"))
                 continue;
@@ -4273,7 +4496,7 @@ void CheckOther::checkKnownPointerToBool()
                 return parent->isExpandedMacro();
             }))
                 continue;
-            if (!isUsedAsBool(tok, *mSettings))
+            if (!isUsedAsBool(tok, mSettings))
                 continue;
             const ValueFlow::Value& value = tok->values().front();
             knownPointerToBoolError(tok, &value);
@@ -4281,7 +4504,7 @@ void CheckOther::checkKnownPointerToBool()
     }
 }
 
-void CheckOther::knownPointerToBoolError(const Token* tok, const ValueFlow::Value* value)
+void CheckOtherImpl::knownPointerToBoolError(const Token* tok, const ValueFlow::Value* value)
 {
     if (!tok) {
         reportError(tok, Severity::style, "knownPointerToBool", "Pointer expression 'p' converted to bool is always true.");
@@ -4294,7 +4517,7 @@ void CheckOther::knownPointerToBoolError(const Token* tok, const ValueFlow::Valu
     reportError(std::move(errorPath), Severity::style, "knownPointerToBool", errmsg, CWE570, Certainty::normal);
 }
 
-void CheckOther::checkComparePointers()
+void CheckOtherImpl::checkComparePointers()
 {
     logChecker("CheckOther::checkComparePointers");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -4324,24 +4547,22 @@ void CheckOther::checkComparePointers()
                 continue;
             if (var1->isRValueReference() || var2->isRValueReference())
                 continue;
-            if (const Token* parent2 = getParentLifetime(v2.tokvalue, mSettings->library))
+            if (const Token* parent2 = getParentLifetime(v2.tokvalue, mSettings.library))
                 if (var1 == parent2->variable())
                     continue;
-            if (const Token* parent1 = getParentLifetime(v1.tokvalue, mSettings->library))
+            if (const Token* parent1 = getParentLifetime(v1.tokvalue, mSettings.library))
                 if (var2 == parent1->variable())
                     continue;
-            comparePointersError(tok, &v1, &v2);
+            comparePointersError(tok, &v1, &v2, Token::simpleMatch(tok, "-"));
         }
     }
 }
 
-void CheckOther::comparePointersError(const Token *tok, const ValueFlow::Value *v1, const ValueFlow::Value *v2)
+void CheckOtherImpl::comparePointersError(const Token *tok, const ValueFlow::Value *v1, const ValueFlow::Value *v2, bool subtract)
 {
     ErrorPath errorPath;
-    std::string verb = "Comparing";
-    if (Token::simpleMatch(tok, "-"))
-        verb = "Subtracting";
-    const char * const id = (verb[0] == 'C') ? "comparePointers" : "subtractPointers";
+    const std::string verb = subtract ? "Subtracting" : "Comparing";
+    const char * const id = subtract ? "subtractPointers" : "comparePointers";
     if (v1) {
         errorPath.emplace_back(v1->tokvalue->variable()->nameToken(), "Variable declared here.");
         errorPath.insert(errorPath.end(), v1->errorPath.cbegin(), v1->errorPath.cend());
@@ -4355,9 +4576,9 @@ void CheckOther::comparePointersError(const Token *tok, const ValueFlow::Value *
         std::move(errorPath), Severity::error, id, verb + " pointers that point to different objects", CWE758, Certainty::normal);
 }
 
-void CheckOther::checkModuloOfOne()
+void CheckOtherImpl::checkModuloOfOne()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("moduloofone"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("moduloofone"))
         return;
 
     logChecker("CheckOther::checkModuloOfOne"); // style
@@ -4365,7 +4586,7 @@ void CheckOther::checkModuloOfOne()
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (!tok->astOperand2() || !tok->astOperand1())
             continue;
-        if (tok->str() != "%")
+        if (tok->str() != "%" && tok->str() != "%=")
             continue;
         if (!tok->valueType() || !tok->valueType()->isIntegral())
             continue;
@@ -4377,7 +4598,7 @@ void CheckOther::checkModuloOfOne()
     }
 }
 
-void CheckOther::checkModuloOfOneError(const Token *tok)
+void CheckOtherImpl::checkModuloOfOneError(const Token *tok)
 {
     reportError(tok, Severity::style, "moduloofone", "Modulo of one is always equal to zero");
 }
@@ -4393,7 +4614,7 @@ struct UnionMember {
         : name(name)
         , size(size) {}
 
-    const std::string &name;
+    RefThunk<const std::string> name;
     size_t size;
 };
 
@@ -4403,7 +4624,7 @@ struct Union {
         , name(scope.className) {}
 
     const Scope *scope;
-    const std::string &name;
+    RefThunk<const std::string> name;
     std::vector<UnionMember> members;
 
     const UnionMember *largestMember() const {
@@ -4465,9 +4686,9 @@ static bool isZeroInitializer(const Token *tok)
 }
 
 
-void CheckOther::checkUnionZeroInit()
+void CheckOtherImpl::checkUnionZeroInit()
 {
-    if (!mSettings->severity.isEnabled(Severity::portability))
+    if (!mSettings.severity.isEnabled(Severity::portability))
         return;
 
     logChecker("CheckOther::checkUnionZeroInit"); // portability
@@ -4475,8 +4696,9 @@ void CheckOther::checkUnionZeroInit()
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     std::unordered_map<const Scope *, Union> unionsByScopeId;
-    const std::vector<Union> unions = parseUnions(*symbolDatabase, *mSettings);
+    const std::vector<Union> unions = parseUnions(*symbolDatabase, mSettings);
     for (const Union &u : unions) {
+        // cppcheck-suppress useStlAlgorithm - std::transform is cumbersome
         unionsByScopeId.emplace(u.scope, u);
     }
 
@@ -4503,15 +4725,15 @@ void CheckOther::checkUnionZeroInit()
     }
 }
 
-void CheckOther::unionZeroInitError(const Token *tok,
-                                    const UnionMember& largestMember)
+void CheckOtherImpl::unionZeroInitError(const Token *tok,
+                                        const UnionMember& largestMember)
 {
     reportError(tok, Severity::portability, "UnionZeroInit",
                 (tok != nullptr ? "$symbol:" + tok->str() + "\n" : "") +
                 "Zero initializing union '$symbol' does not guarantee " +
                 "its complete storage to be zero initialized as its largest member " +
                 "is not declared as the first member. Consider making " +
-                largestMember.name + " the first member or favor memset().");
+                largestMember.name() + " the first member or favor memset().");
 }
 
 //-----------------------------------------------------------------------------
@@ -4575,7 +4797,7 @@ static bool getBufAndOffset(const Token *expr, const Token *&buf, MathLib::bigin
     return true;
 }
 
-void CheckOther::checkOverlappingWrite()
+void CheckOtherImpl::checkOverlappingWrite()
 {
     logChecker("CheckOther::checkOverlappingWrite");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -4614,7 +4836,7 @@ void CheckOther::checkOverlappingWrite()
                 if (errorToken)
                     overlappingWriteUnion(tok);
             } else if (Token::Match(tok, "%name% (")) {
-                const Library::NonOverlappingData *nonOverlappingData = mSettings->library.getNonOverlappingData(tok);
+                const Library::NonOverlappingData *nonOverlappingData = mSettings.library.getNonOverlappingData(tok);
                 if (!nonOverlappingData)
                     continue;
                 const std::vector<const Token *> args = getArguments(tok);
@@ -4639,7 +4861,7 @@ void CheckOther::checkOverlappingWrite()
                         constexpr bool macro = true;
                         constexpr bool pure = true;
                         constexpr bool follow = true;
-                        if (!isSameExpression(macro, ptr1, ptr2, *mSettings, pure, follow, &errorPath))
+                        if (!isSameExpression(macro, ptr1, ptr2, mSettings, pure, follow, &errorPath))
                             continue;
                         overlappingWriteFunction(tok, tok->str());
                     }
@@ -4651,9 +4873,9 @@ void CheckOther::checkOverlappingWrite()
                 MathLib::bigint sizeValue = args[sizeArg-1]->getKnownIntValue();
                 const Token *buf1, *buf2;
                 MathLib::bigint offset1, offset2;
-                if (!getBufAndOffset(ptr1, buf1, &offset1, *mSettings, isCountArg ? &sizeValue : nullptr))
+                if (!getBufAndOffset(ptr1, buf1, &offset1, mSettings, isCountArg ? &sizeValue : nullptr))
                     continue;
-                if (!getBufAndOffset(ptr2, buf2, &offset2, *mSettings))
+                if (!getBufAndOffset(ptr2, buf2, &offset2, mSettings))
                     continue;
 
                 if (offset1 < offset2 && offset1 + sizeValue <= offset2)
@@ -4665,7 +4887,7 @@ void CheckOther::checkOverlappingWrite()
                 constexpr bool macro = true;
                 constexpr bool pure = true;
                 constexpr bool follow = true;
-                if (!isSameExpression(macro, buf1, buf2, *mSettings, pure, follow, &errorPath))
+                if (!isSameExpression(macro, buf1, buf2, mSettings, pure, follow, &errorPath))
                     continue;
                 overlappingWriteFunction(tok, tok->str());
             }
@@ -4673,19 +4895,19 @@ void CheckOther::checkOverlappingWrite()
     }
 }
 
-void CheckOther::overlappingWriteUnion(const Token *tok)
+void CheckOtherImpl::overlappingWriteUnion(const Token *tok)
 {
     reportError(tok, Severity::error, "overlappingWriteUnion", "Overlapping read/write of union is undefined behavior");
 }
 
-void CheckOther::overlappingWriteFunction(const Token *tok, const std::string& funcname)
+void CheckOtherImpl::overlappingWriteFunction(const Token *tok, const std::string& funcname)
 {
     reportError(tok, Severity::error, "overlappingWriteFunction", "Overlapping read/write in " + funcname + "() is undefined behavior");
 }
 
-void CheckOther::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckOther::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckOther checkOther(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckOtherImpl checkOther(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     // Checks
     checkOther.warningOldStylePointerCast();
@@ -4696,6 +4918,7 @@ void CheckOther::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
     checkOther.checkCharVariable();
     checkOther.redundantBitwiseOperationInSwitchError();
     checkOther.checkSuspiciousCaseInSwitch();
+    checkOther.checkUnreachableSwitchCase();
     checkOther.checkDuplicateBranch();
     checkOther.checkDuplicateExpression();
     checkOther.checkRedundantAssignment();
@@ -4735,16 +4958,16 @@ void CheckOther::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
     checkOther.checkUnionZeroInit();
 }
 
-void CheckOther::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckOther::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckOther c(nullptr, settings, errorLogger);
+    CheckOtherImpl c(nullptr, settings, errorLogger);
 
     // error
     c.zerodivError(nullptr, nullptr);
     c.misusedScopeObjectError(nullptr, "varname");
     c.invalidPointerCastError(nullptr,  "float *", "double *", false, false);
-    c.negativeBitwiseShiftError(nullptr, 1);
-    c.negativeBitwiseShiftError(nullptr, 2);
+    c.negativeBitwiseShiftError(nullptr, true);
+    c.negativeBitwiseShiftError(nullptr, false);
     c.raceAfterInterlockedDecrementError(nullptr);
     c.invalidFreeError(nullptr, "malloc", false);
     c.overlappingWriteUnion(nullptr);
@@ -4783,6 +5006,7 @@ void CheckOther::getErrorMessages(ErrorLogger *errorLogger, const Settings *sett
     c.duplicateExpressionTernaryError(nullptr, ErrorPath{});
     c.duplicateBreakError(nullptr,  false);
     c.unreachableCodeError(nullptr, nullptr,  false);
+    c.unreachableSwitchCaseError(nullptr, "case", "0");
     c.unsignedLessThanZeroError(nullptr, nullptr, "varname");
     c.unsignedPositiveError(nullptr, nullptr, "varname");
     c.pointerLessThanZeroError(nullptr, nullptr);
@@ -4801,13 +5025,14 @@ void CheckOther::getErrorMessages(ErrorLogger *errorLogger, const Settings *sett
     c.accessMovedError(nullptr, "v", nullptr, false);
     c.funcArgNamesDifferent("function", 1, nullptr, nullptr);
     c.redundantBitwiseOperationInSwitchError(nullptr, "varname");
-    c.shadowError(nullptr, nullptr, "variable");
-    c.shadowError(nullptr, nullptr, "function");
-    c.shadowError(nullptr, nullptr, "argument");
+    c.shadowError(nullptr, "local variable", nullptr, "variable");
+    c.shadowError(nullptr, "local variable", nullptr, "argument");
+    c.shadowError(nullptr, "local variable", nullptr, "function");
+    c.shadowError(nullptr, "local variable", nullptr, "member");
     c.knownArgumentError(nullptr, nullptr, nullptr, "x", false);
     c.knownPointerToBoolError(nullptr, nullptr);
-    c.comparePointersError(nullptr, nullptr, nullptr);
-    // TODO: subtractPointers
+    c.comparePointersError(nullptr, nullptr, nullptr, false);
+    c.comparePointersError(nullptr, nullptr, nullptr, true);
     c.redundantAssignmentError(nullptr, nullptr, "var", false);
     c.redundantInitializationError(nullptr, nullptr, "var", false);
     c.redundantContinueError(nullptr);
diff --git a/lib/checkother.h b/lib/checkother.h
index 28ee25cfa76..61a865e9ab6 100644
--- a/lib/checkother.h
+++ b/lib/checkother.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 #include "errortypes.h"
 
@@ -49,28 +50,87 @@ struct UnionMember;
 /** @brief Various small checks */
 
 class CPPCHECKLIB CheckOther : public Check {
-    friend class TestCharVar;
-    friend class TestIncompleteStatement;
-    friend class TestOther;
-
 public:
     /** @brief This constructor is used when registering the CheckClass */
-    CheckOther() : Check(myName()) {}
+    CheckOther() : Check("Other") {}
 
-    /** Is expression a comparison that checks if a nonzero (unsigned/pointer) expression is less than zero? */
-    static bool comparisonNonZeroExpressionLessThanZero(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr, bool suppress = false);
+private:
+    /** @brief Run checks against the normal token list */
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
 
-    /** Is expression a comparison that checks if a nonzero (unsigned/pointer) expression is positive? */
-    static bool testIfNonZeroExpressionIsPositive(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr);
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
 
-private:
+    std::string classInfo() const override {
+        return "Other checks\n"
+
+               // error
+               "- division with zero\n"
+               "- scoped object destroyed immediately after construction\n"
+               "- assignment in an assert statement\n"
+               "- free() or delete of an invalid memory location\n"
+               "- bitwise operation with negative right operand\n"
+               "- cast the return values of getc(),fgetc() and getchar() to character and compare it to EOF\n"
+               "- race condition with non-interlocked access after InterlockedDecrement() call\n"
+               "- expression 'x = x++;' depends on order of evaluation of side effects\n"
+               "- overlapping write of union\n"
+
+               // warning
+               "- either division by zero or useless condition\n"
+               "- access of moved or forwarded variable.\n"
+
+               // performance
+               "- redundant data copying for const variable\n"
+               "- subsequent assignment or copying to a variable or buffer\n"
+               "- passing parameter by value\n"
+
+               // portability
+               "- Passing NULL pointer to function with variable number of arguments leads to UB.\n"
+
+               // style
+               "- C-style pointer cast in C++ code\n"
+               "- casting between incompatible pointer types\n"
+               "- [Incomplete statement](IncompleteStatement)\n"
+               "- [check how signed char variables are used](CharVar)\n"
+               "- variable scope can be limited\n"
+               "- unusual pointer arithmetic. For example: \"abc\" + 'd'\n"
+               "- redundant assignment, increment, or bitwise operation in a switch statement\n"
+               "- redundant strcpy in a switch statement\n"
+               "- Suspicious case labels in switch()\n"
+               "- assignment of a variable to itself\n"
+               "- Comparison of values leading always to true or false\n"
+               "- Clarify calculation with parentheses\n"
+               "- suspicious comparison of '\\0' with a char\\* variable\n"
+               "- duplicate break statement\n"
+               "- unreachable code\n"
+               "- testing if unsigned variable is negative/positive\n"
+               "- Suspicious use of ; at the end of 'if/for/while' statement.\n"
+               "- Array filled incompletely using memset/memcpy/memmove.\n"
+               "- NaN (not a number) value used in arithmetic expression.\n"
+               "- comma in return statement (the comma can easily be misread as a semicolon).\n"
+               "- prefer erfc, expm1 or log1p to avoid loss of precision.\n"
+               "- identical code in both branches of if/else or ternary operator.\n"
+               "- redundant pointer operation on pointer like &\\*some_ptr.\n"
+               "- find unused 'goto' labels.\n"
+               "- function declaration and definition argument names different.\n"
+               "- function declaration and definition argument order different.\n"
+               "- shadow variable.\n"
+               "- variable can be declared const.\n"
+               "- calculating modulo of one.\n"
+               "- known function argument, suspicious calculation.\n";
+    }
+};
+
+class CPPCHECKLIB CheckOtherImpl : public CheckImpl {
+public:
     /** @brief This constructor is used when running checks. */
-    CheckOther(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    CheckOtherImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
+    /** Is expression a comparison that checks if a nonzero (unsigned/pointer) expression is less than zero? */
+    static bool comparisonNonZeroExpressionLessThanZero(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr, bool suppress = false);
 
-    /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    /** Is expression a comparison that checks if a nonzero (unsigned/pointer) expression is positive? */
+    static bool testIfNonZeroExpressionIsPositive(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr);
 
     /** @brief Clarify calculation for ".. a * b ? .." */
     void clarifyCalculation();
@@ -126,6 +186,9 @@ class CPPCHECKLIB CheckOther : public Check {
     /** @brief %Check for code like 'case A||B:'*/
     void checkSuspiciousCaseInSwitch();
 
+    /** @brief %Check for case labels that cannot be selected */
+    void checkUnreachableSwitchCase();
+
     /** @brief %Check for objects that are destroyed immediately */
     void checkMisusedScopedObject();
 
@@ -215,7 +278,7 @@ class CPPCHECKLIB CheckOther : public Check {
     void suspiciousFloatingPointCastError(const Token *tok);
     void invalidPointerCastError(const Token* tok, const std::string& from, const std::string& to, bool inconclusive, bool toIsInt);
     void passedByValueError(const Variable* var, bool inconclusive, bool isRangeBasedFor = false);
-    void constVariableError(const Variable *var, const Function *function);
+    void constVariableError(const Variable *var, const Function *function, bool foundAllBaseClasses = true);
     void constStatementError(const Token *tok, const std::string &type, bool inconclusive);
     void signedCharArrayIndexError(const Token *tok);
     void unknownSignCharArrayIndexError(const Token *tok);
@@ -230,6 +293,7 @@ class CPPCHECKLIB CheckOther : public Check {
     void redundantCopyError(const Token *tok1, const Token* tok2, const std::string& var);
     void redundantBitwiseOperationInSwitchError(const Token *tok, const std::string &varname);
     void suspiciousCaseInSwitchError(const Token* tok, const std::string& operatorString);
+    void unreachableSwitchCaseError(const Token* tok, const std::string& caseExpression, const std::string& switchValue);
     void selfAssignmentError(const Token *tok, const std::string &varname);
     void misusedScopeObjectError(const Token *tok, const std::string &varname, bool isAssignment = false);
     void duplicateBranchError(const Token *tok1, const Token *tok2, ErrorPath errors);
@@ -246,7 +310,7 @@ class CPPCHECKLIB CheckOther : public Check {
     void unsignedPositiveError(const Token *tok, const ValueFlow::Value *v, const std::string &varname);
     void pointerPositiveError(const Token *tok, const ValueFlow::Value *v);
     void suspiciousSemicolonError(const Token *tok);
-    void negativeBitwiseShiftError(const Token *tok, int op);
+    void negativeBitwiseShiftError(const Token *tok, bool isLHS, const ValueFlow::Value *v = nullptr);
     void redundantCopyError(const Token *tok, const std::string &varname);
     void incompleteArrayFillError(const Token* tok, const std::string& buffer, const std::string& function, bool boolean);
     void varFuncNullUBError(const Token *tok);
@@ -256,83 +320,15 @@ class CPPCHECKLIB CheckOther : public Check {
     void unusedLabelError(const Token* tok, bool inSwitch, bool hasIfdef);
     void unknownEvaluationOrder(const Token* tok, bool isUnspecifiedBehavior = false);
     void accessMovedError(const Token *tok, const std::string &varname, const ValueFlow::Value *value, bool inconclusive);
-    void funcArgNamesDifferent(const std::string & functionName, nonneg int index, const Token* declaration, const Token* definition);
+    void funcArgNamesDifferent(const std::string & functionName, size_t index, const Token* declaration, const Token* definition);
     void funcArgOrderDifferent(const std::string & functionName, const Token * declaration, const Token * definition, const std::vector<const Token*> & declarations, const std::vector<const Token*> & definitions);
-    void shadowError(const Token *var, const Token *shadowed, const std::string& type);
+    void shadowError(const Token *shadows, const std::string &shadowsType, const Token *shadowed, const std::string &shadowedType);
     void knownArgumentError(const Token *tok, const Token *ftok, const ValueFlow::Value *value, const std::string &varexpr, bool isVariableExpressionHidden);
     void knownPointerToBoolError(const Token* tok, const ValueFlow::Value* value);
-    void comparePointersError(const Token *tok, const ValueFlow::Value *v1, const ValueFlow::Value *v2);
+    void comparePointersError(const Token *tok, const ValueFlow::Value *v1, const ValueFlow::Value *v2, bool subtract);
     void checkModuloOfOneError(const Token *tok);
     void unionZeroInitError(const Token *tok, const UnionMember& largestMember);
 
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Other";
-    }
-
-    std::string classInfo() const override {
-        return "Other checks\n"
-
-               // error
-               "- division with zero\n"
-               "- scoped object destroyed immediately after construction\n"
-               "- assignment in an assert statement\n"
-               "- free() or delete of an invalid memory location\n"
-               "- bitwise operation with negative right operand\n"
-               "- cast the return values of getc(),fgetc() and getchar() to character and compare it to EOF\n"
-               "- race condition with non-interlocked access after InterlockedDecrement() call\n"
-               "- expression 'x = x++;' depends on order of evaluation of side effects\n"
-               "- overlapping write of union\n"
-
-               // warning
-               "- either division by zero or useless condition\n"
-               "- access of moved or forwarded variable.\n"
-               "- potentially dangerous C style type cast of pointer/reference to object.\n"
-
-               // performance
-               "- redundant data copying for const variable\n"
-               "- subsequent assignment or copying to a variable or buffer\n"
-               "- passing parameter by value\n"
-
-               // portability
-               "- Passing NULL pointer to function with variable number of arguments leads to UB.\n"
-               "- Casting non-zero integer literal in decimal or octal format to pointer.\n"
-               "- Incorrect zero initialization of unions can lead to access of uninitialized memory.\n"
-
-               // style
-               "- C-style pointer cast in C++ code\n"
-               "- casting between incompatible pointer types\n"
-               "- [Incomplete statement](IncompleteStatement)\n"
-               "- [check how signed char variables are used](CharVar)\n"
-               "- variable scope can be limited\n"
-               "- unusual pointer arithmetic. For example: \"abc\" + 'd'\n"
-               "- redundant assignment, increment, or bitwise operation in a switch statement\n"
-               "- redundant strcpy in a switch statement\n"
-               "- Suspicious case labels in switch()\n"
-               "- assignment of a variable to itself\n"
-               "- Comparison of values leading always to true or false\n"
-               "- Clarify calculation with parentheses\n"
-               "- suspicious comparison of '\\0' with a char\\* variable\n"
-               "- duplicate break statement\n"
-               "- unreachable code\n"
-               "- testing if unsigned variable is negative/positive\n"
-               "- Suspicious use of ; at the end of 'if/for/while' statement.\n"
-               "- Array filled incompletely using memset/memcpy/memmove.\n"
-               "- NaN (not a number) value used in arithmetic expression.\n"
-               "- comma in return statement (the comma can easily be misread as a semicolon).\n"
-               "- prefer erfc, expm1 or log1p to avoid loss of precision.\n"
-               "- identical code in both branches of if/else or ternary operator.\n"
-               "- redundant pointer operation on pointer like &\\*some_ptr.\n"
-               "- find unused 'goto' labels.\n"
-               "- function declaration and definition argument names different.\n"
-               "- function declaration and definition argument order different.\n"
-               "- shadow variable.\n"
-               "- variable can be declared const.\n"
-               "- calculating modulo of one.\n"
-               "- known function argument, suspicious calculation.\n";
-    }
-
     bool diag(const Token* tok) {
         return !mRedundantAssignmentDiag.emplace(tok).second;
     }
diff --git a/lib/checkpostfixoperator.cpp b/lib/checkpostfixoperator.cpp
index c6c9ccba77b..f15fa293c49 100644
--- a/lib/checkpostfixoperator.cpp
+++ b/lib/checkpostfixoperator.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,19 +34,12 @@
 //---------------------------------------------------------------------------
 
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckPostfixOperator instance;
-}
-
-
 // CWE ids used
 static const CWE CWE398(398U);   // Indicator of Poor Code Quality
 
-
-void CheckPostfixOperator::postfixOperator()
+void CheckPostfixOperatorImpl::postfixOperator()
 {
-    if (!mSettings->severity.isEnabled(Severity::performance))
+    if (!mSettings.severity.isEnabled(Severity::performance))
         return;
 
     logChecker("CheckPostfixOperator::postfixOperator"); // performance
@@ -90,7 +83,7 @@ void CheckPostfixOperator::postfixOperator()
 //---------------------------------------------------------------------------
 
 
-void CheckPostfixOperator::postfixOperatorError(const Token *tok)
+void CheckPostfixOperatorImpl::postfixOperatorError(const Token *tok)
 {
     reportError(tok, Severity::performance, "postfixOperator",
                 "Prefer prefix ++/-- operators for non-primitive types.\n"
@@ -101,17 +94,17 @@ void CheckPostfixOperator::postfixOperatorError(const Token *tok)
                 "adds a little extra code.", CWE398, Certainty::normal);
 }
 
-void CheckPostfixOperator::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckPostfixOperator::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
     if (tokenizer.isC())
         return;
 
-    CheckPostfixOperator checkPostfixOperator(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckPostfixOperatorImpl checkPostfixOperator(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkPostfixOperator.postfixOperator();
 }
 
-void CheckPostfixOperator::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckPostfixOperator::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckPostfixOperator c(nullptr, settings, errorLogger);
+    CheckPostfixOperatorImpl c(nullptr, settings, errorLogger);
     c.postfixOperatorError(nullptr);
 }
diff --git a/lib/checkpostfixoperator.h b/lib/checkpostfixoperator.h
index c9f58a7e143..5898cefcc3c 100644
--- a/lib/checkpostfixoperator.h
+++ b/lib/checkpostfixoperator.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -40,34 +41,30 @@ class Tokenizer;
  */
 
 class CPPCHECKLIB CheckPostfixOperator : public Check {
-    friend class TestPostfixOperator;
-
 public:
     /** This constructor is used when registering the CheckPostfixOperator */
-    CheckPostfixOperator() : Check(myName()) {}
+    CheckPostfixOperator() : Check("Using postfix operators") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckPostfixOperator(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+    std::string classInfo() const override {
+        return "Warn if using postfix operators ++ or -- rather than prefix operator\n";
+    }
+};
 
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+class CPPCHECKLIB CheckPostfixOperatorImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    CheckPostfixOperatorImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** Check postfix operators */
     void postfixOperator();
 
     /** Report Error */
     void postfixOperatorError(const Token *tok);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Using postfix operators";
-    }
-
-    std::string classInfo() const override {
-        return "Warn if using postfix operators ++ or -- rather than prefix operator\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checks.cpp b/lib/checks.cpp
new file mode 100644
index 00000000000..ef4b9fef3da
--- /dev/null
+++ b/lib/checks.cpp
@@ -0,0 +1,125 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 Cppcheck team.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "checks.h"
+
+#include "check64bit.h"
+#include "checkassert.h"
+#include "checkautovariables.h"
+#include "checkbool.h"
+#include "checkbufferoverrun.h"
+#include "checkclass.h"
+#include "checkcondition.h"
+#include "checkexceptionsafety.h"
+#include "checkfunctions.h"
+#include "checkinternal.h"
+#include "checkio.h"
+#include "checkleakautovar.h"
+#include "checkmemoryleak.h"
+#include "checknullpointer.h"
+#include "checkother.h"
+#include "checkpostfixoperator.h"
+#include "checksizeof.h"
+#include "checkstl.h"
+#include "checkstring.h"
+#include "checktype.h"
+#include "checkuninitvar.h"
+#include "checkunusedvar.h"
+#include "checkvaarg.h"
+
+#include <memory>
+
+class CheckInstancesImpl
+{
+private:
+/* *INDENT-OFF* */
+#define UPI(c) std::unique_ptr<c> m##c{new c}
+/* *INDENT-ON* */
+    UPI(Check64BitPortability);
+    UPI(CheckAssert);
+    UPI(CheckAutoVariables);
+    UPI(CheckBool);
+    UPI(CheckBufferOverrun);
+    UPI(CheckClass);
+    UPI(CheckCondition);
+    UPI(CheckExceptionSafety);
+    UPI(CheckFunctions);
+#ifdef CHECK_INTERNAL
+    UPI(CheckInternal);
+#endif
+    UPI(CheckIO);
+    UPI(CheckLeakAutoVar);
+    UPI(CheckMemoryLeakInFunction);
+    UPI(CheckMemoryLeakInClass);
+    UPI(CheckMemoryLeakStructMember);
+    UPI(CheckMemoryLeakNoVar);
+    UPI(CheckNullPointer);
+    UPI(CheckOther);
+    UPI(CheckPostfixOperator);
+    UPI(CheckSizeof);
+    UPI(CheckStl);
+    UPI(CheckString);
+    UPI(CheckType);
+    UPI(CheckUninitVar);
+    UPI(CheckUnusedVar);
+    UPI(CheckVaarg);
+#undef UPI
+
+public:
+    const std::list<Check *>& get() const
+    {
+        static std::list<Check*> s_checks{
+            mCheck64BitPortability.get(),
+            mCheckAssert.get(),
+            mCheckAutoVariables.get(),
+            mCheckBool.get(),
+            mCheckBufferOverrun.get(),
+            mCheckClass.get(),
+            mCheckCondition.get(),
+            mCheckExceptionSafety.get(),
+            mCheckFunctions.get(),
+    #ifdef CHECK_INTERNAL
+            mCheckInternal.get(),
+    #endif
+            mCheckIO.get(),
+            mCheckLeakAutoVar.get(),
+            mCheckMemoryLeakInFunction.get(),
+            mCheckMemoryLeakInClass.get(),
+            mCheckMemoryLeakStructMember.get(),
+            mCheckMemoryLeakNoVar.get(),
+            mCheckNullPointer.get(),
+            mCheckOther.get(),
+            mCheckPostfixOperator.get(),
+            mCheckSizeof.get(),
+            mCheckStl.get(),
+            mCheckString.get(),
+            mCheckType.get(),
+            mCheckUninitVar.get(),
+            mCheckUnusedVar.get(),
+            mCheckVaarg.get()
+        };
+
+        return s_checks;
+    }
+};
+
+const std::list<Check*>& CheckInstances::get()
+{
+    static const CheckInstancesImpl s_impl;
+    return s_impl.get();
+}
diff --git a/lib/checks.h b/lib/checks.h
new file mode 100644
index 00000000000..9c053b81405
--- /dev/null
+++ b/lib/checks.h
@@ -0,0 +1,34 @@
+/* -*- C++ -*-
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 Cppcheck team.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef checksH
+#define checksH
+
+#include "config.h"
+
+#include <list>
+
+class Check;
+
+namespace CheckInstances
+{
+    /** List of registered check classes. This is used by Cppcheck to run checks and generate documentation */
+    CPPCHECKLIB const std::list<Check *>& get();
+}
+
+#endif // checksH
diff --git a/lib/checksizeof.cpp b/lib/checksizeof.cpp
index 15a1caf1a8e..2d9012078a6 100644
--- a/lib/checksizeof.cpp
+++ b/lib/checksizeof.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,19 +34,14 @@
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckSizeof instance;
-}
-
 // CWE IDs used:
 static const CWE CWE467(467U);   // Use of sizeof() on a Pointer Type
 static const CWE CWE682(682U);   // Incorrect Calculation
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
-void CheckSizeof::checkSizeofForNumericParameter()
+void CheckSizeofImpl::checkSizeofForNumericParameter()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckSizeof::checkSizeofForNumericParameter"); // warning
@@ -62,7 +57,7 @@ void CheckSizeof::checkSizeofForNumericParameter()
     }
 }
 
-void CheckSizeof::sizeofForNumericParameterError(const Token *tok)
+void CheckSizeofImpl::sizeofForNumericParameterError(const Token *tok)
 {
     reportError(tok, Severity::warning,
                 "sizeofwithnumericparameter", "Suspicious usage of 'sizeof' with a numeric constant as parameter.\n"
@@ -74,9 +69,9 @@ void CheckSizeof::sizeofForNumericParameterError(const Token *tok)
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
-void CheckSizeof::checkSizeofForArrayParameter()
+void CheckSizeofImpl::checkSizeofForArrayParameter()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckSizeof::checkSizeofForArrayParameter"); // warning
@@ -92,14 +87,14 @@ void CheckSizeof::checkSizeofForArrayParameter()
                 }
 
                 const Variable *var = varTok->variable();
-                if (var && var->isArray() && var->isArgument() && !var->isReference())
+                if (var && var->isArray() && var->isArgument() && !var->isReference() && !(var->isStlType() && var->getTypeName() == "std::array"))
                     sizeofForArrayParameterError(tok);
             }
         }
     }
 }
 
-void CheckSizeof::sizeofForArrayParameterError(const Token *tok)
+void CheckSizeofImpl::sizeofForArrayParameterError(const Token *tok)
 {
     reportError(tok, Severity::warning,
                 "sizeofwithsilentarraypointer", "Using 'sizeof' on array given as function argument "
@@ -115,9 +110,9 @@ void CheckSizeof::sizeofForArrayParameterError(const Token *tok)
                 );
 }
 
-void CheckSizeof::checkSizeofForPointerSize()
+void CheckSizeofImpl::checkSizeofForPointerSize()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckSizeof::checkSizeofForPointerSize"); // warning
@@ -134,12 +129,12 @@ void CheckSizeof::checkSizeofForPointerSize()
             // Once leaving those tests, it is mandatory to have:
             // - variable matching the used pointer
             // - tokVar pointing on the argument where sizeof may be used
-            if (Token::Match(tok->tokAt(2), "%name% (") && mSettings->library.getAllocFuncInfo(tok->tokAt(2))) {
+            if (Token::Match(tok->tokAt(2), "%name% (") && mSettings.library.getAllocFuncInfo(tok->tokAt(2))) {
                 if (Token::Match(tok, "%var% ="))
                     variable = tok;
                 else if (tok->strAt(1) == ")" && Token::Match(tok->linkAt(1)->tokAt(-2), "%var% ="))
                     variable = tok->linkAt(1)->tokAt(-2);
-                else if (tok->link() && Token::Match(tok, "> ( %name% (") && mSettings->library.getAllocFuncInfo(tok->tokAt(2)) && Token::Match(tok->link()->tokAt(-3), "%var% ="))
+                else if (tok->link() && Token::Match(tok, "> ( %name% (") && Token::Match(tok->link()->tokAt(-3), "%var% ="))
                     variable = tok->link()->tokAt(-3);
                 tokSize = tok->tokAt(4);
                 tokFunc = tok->tokAt(2);
@@ -238,7 +233,8 @@ void CheckSizeof::checkSizeofForPointerSize()
             // Now check for the sizeof usage: Does the level of pointer indirection match?
             const Token * const tokLink = tokSize->linkAt(1);
             if (tokLink && tokLink->strAt(-1) == "*") {
-                if (variable && variable->valueType() && variable->valueType()->pointer == 1 && variable->valueType()->type != ValueType::VOID)
+                if (variable && variable->valueType() && variable->valueType()->pointer == 1 && variable->valueType()->type != ValueType::VOID &&
+                    variable->valueType()->isTypeEqual(tokSize->next()->astOperand2()->valueType()))
                     sizeofForPointerError(variable, variable->str());
                 else if (variable2 && variable2->valueType() && variable2->valueType()->pointer == 1 && variable2->valueType()->type != ValueType::VOID)
                     sizeofForPointerError(variable2, variable2->str());
@@ -267,7 +263,7 @@ void CheckSizeof::checkSizeofForPointerSize()
     }
 }
 
-void CheckSizeof::sizeofForPointerError(const Token *tok, const std::string &varname)
+void CheckSizeofImpl::sizeofForPointerError(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::warning, "pointerSize",
                 "Size of pointer '" + varname + "' used instead of size of its data.\n"
@@ -276,7 +272,7 @@ void CheckSizeof::sizeofForPointerError(const Token *tok, const std::string &var
                 "write 'sizeof(*" + varname + ")'.", CWE467, Certainty::normal);
 }
 
-void CheckSizeof::divideBySizeofError(const Token *tok, const std::string &memfunc)
+void CheckSizeofImpl::divideBySizeofError(const Token *tok, const std::string &memfunc)
 {
     reportError(tok, Severity::warning, "sizeofDivisionMemfunc",
                 "Division by result of sizeof(). " + memfunc + "() expects a size in bytes, did you intend to multiply instead?", CWE682, Certainty::normal);
@@ -284,9 +280,9 @@ void CheckSizeof::divideBySizeofError(const Token *tok, const std::string &memfu
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-void CheckSizeof::sizeofsizeof()
+void CheckSizeofImpl::sizeofsizeof()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckSizeof::sizeofsizeof"); // warning
@@ -299,7 +295,7 @@ void CheckSizeof::sizeofsizeof()
     }
 }
 
-void CheckSizeof::sizeofsizeofError(const Token *tok)
+void CheckSizeofImpl::sizeofsizeofError(const Token *tok)
 {
     reportError(tok, Severity::warning,
                 "sizeofsizeof", "Calling 'sizeof' on 'sizeof'.\n"
@@ -310,14 +306,14 @@ void CheckSizeof::sizeofsizeofError(const Token *tok)
 
 //-----------------------------------------------------------------------------
 
-void CheckSizeof::sizeofCalculation()
+void CheckSizeofImpl::sizeofCalculation()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckSizeof::sizeofCalculation"); // warning
 
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
 
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (!Token::simpleMatch(tok, "sizeof ("))
@@ -348,7 +344,7 @@ void CheckSizeof::sizeofCalculation()
     }
 }
 
-void CheckSizeof::sizeofCalculationError(const Token *tok, bool inconclusive)
+void CheckSizeofImpl::sizeofCalculationError(const Token *tok, bool inconclusive)
 {
     reportError(tok, Severity::warning,
                 "sizeofCalculation", "Found calculation inside sizeof().", CWE682, inconclusive ? Certainty::inconclusive : Certainty::normal);
@@ -356,9 +352,9 @@ void CheckSizeof::sizeofCalculationError(const Token *tok, bool inconclusive)
 
 //-----------------------------------------------------------------------------
 
-void CheckSizeof::sizeofFunction()
+void CheckSizeofImpl::sizeofFunction()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("sizeofFunctionCall"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("sizeofFunctionCall"))
         return;
 
     logChecker("CheckSizeof::sizeofFunction"); // warning
@@ -390,7 +386,7 @@ void CheckSizeof::sizeofFunction()
     }
 }
 
-void CheckSizeof::sizeofFunctionError(const Token *tok)
+void CheckSizeofImpl::sizeofFunctionError(const Token *tok)
 {
     reportError(tok, Severity::warning,
                 "sizeofFunctionCall", "Found function call inside sizeof().", CWE682, Certainty::normal);
@@ -399,9 +395,9 @@ void CheckSizeof::sizeofFunctionError(const Token *tok)
 //-----------------------------------------------------------------------------
 // Check for code like sizeof()*sizeof() or sizeof(ptr)/value
 //-----------------------------------------------------------------------------
-void CheckSizeof::suspiciousSizeofCalculation()
+void CheckSizeofImpl::suspiciousSizeofCalculation()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) || !mSettings->certainty.isEnabled(Certainty::inconclusive))
+    if (!mSettings.severity.isEnabled(Severity::warning) || !mSettings.certainty.isEnabled(Certainty::inconclusive))
         return;
 
     logChecker("CheckSizeof::suspiciousSizeofCalculation"); // warning,inconclusive
@@ -429,13 +425,13 @@ void CheckSizeof::suspiciousSizeofCalculation()
     }
 }
 
-void CheckSizeof::multiplySizeofError(const Token *tok)
+void CheckSizeofImpl::multiplySizeofError(const Token *tok)
 {
     reportError(tok, Severity::warning,
                 "multiplySizeof", "Multiplying sizeof() with sizeof() indicates a logic error.", CWE682, Certainty::inconclusive);
 }
 
-void CheckSizeof::divideSizeofError(const Token *tok)
+void CheckSizeofImpl::divideSizeofError(const Token *tok)
 {
     reportError(tok, Severity::warning,
                 "divideSizeof", "Division of result of sizeof() on pointer type.\n"
@@ -443,9 +439,9 @@ void CheckSizeof::divideSizeofError(const Token *tok)
                 "not the size of the memory area it points to.", CWE682, Certainty::inconclusive);
 }
 
-void CheckSizeof::sizeofVoid()
+void CheckSizeofImpl::sizeofVoid()
 {
-    if (!mSettings->severity.isEnabled(Severity::portability))
+    if (!mSettings.severity.isEnabled(Severity::portability))
         return;
 
     logChecker("CheckSizeof::sizeofVoid"); // portability
@@ -481,30 +477,30 @@ void CheckSizeof::sizeofVoid()
     }
 }
 
-void CheckSizeof::sizeofVoidError(const Token *tok)
+void CheckSizeofImpl::sizeofVoidError(const Token *tok)
 {
     const std::string message = "Behaviour of 'sizeof(void)' is not covered by the ISO C standard.";
     const std::string verbose = message + " A value for 'sizeof(void)' is defined only as part of a GNU C extension, which defines 'sizeof(void)' to be 1.";
     reportError(tok, Severity::portability, "sizeofVoid", message + "\n" + verbose, CWE682, Certainty::normal);
 }
 
-void CheckSizeof::sizeofDereferencedVoidPointerError(const Token *tok, const std::string &varname)
+void CheckSizeofImpl::sizeofDereferencedVoidPointerError(const Token *tok, const std::string &varname)
 {
     const std::string message = "'*" + varname + "' is of type 'void', the behaviour of 'sizeof(void)' is not covered by the ISO C standard.";
     const std::string verbose = message + " A value for 'sizeof(void)' is defined only as part of a GNU C extension, which defines 'sizeof(void)' to be 1.";
     reportError(tok, Severity::portability, "sizeofDereferencedVoidPointer", message + "\n" + verbose, CWE682, Certainty::normal);
 }
 
-void CheckSizeof::arithOperationsOnVoidPointerError(const Token* tok, const std::string &varname, const std::string &vartype)
+void CheckSizeofImpl::arithOperationsOnVoidPointerError(const Token* tok, const std::string &varname, const std::string &vartype)
 {
     const std::string message = "'$symbol' is of type '" + vartype + "'. When using void pointers in calculations, the behaviour is undefined.";
     const std::string verbose = message + " Arithmetic operations on 'void *' is a GNU C extension, which defines the 'sizeof(void)' to be 1.";
     reportError(tok, Severity::portability, "arithOperationsOnVoidPointer", "$symbol:" + varname + '\n' + message + '\n' + verbose, CWE467, Certainty::normal);
 }
 
-void CheckSizeof::runChecks(const Tokenizer& tokenizer, ErrorLogger* errorLogger)
+void CheckSizeof::runChecks(const Tokenizer& tokenizer, ErrorLogger& errorLogger)
 {
-    CheckSizeof checkSizeof(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckSizeofImpl checkSizeof(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     // Checks
     checkSizeof.sizeofsizeof();
@@ -517,9 +513,9 @@ void CheckSizeof::runChecks(const Tokenizer& tokenizer, ErrorLogger* errorLogger
     checkSizeof.sizeofVoid();
 }
 
-void CheckSizeof::getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const
+void CheckSizeof::getErrorMessages(ErrorLogger& errorLogger, const Settings& settings) const
 {
-    CheckSizeof c(nullptr, settings, errorLogger);
+    CheckSizeofImpl c(nullptr, settings, errorLogger);
     c.sizeofForArrayParameterError(nullptr);
     c.sizeofForPointerError(nullptr, "varname");
     c.divideBySizeofError(nullptr, "memset");
diff --git a/lib/checksizeof.h b/lib/checksizeof.h
index 4c10ca88dac..7540fe6785d 100644
--- a/lib/checksizeof.h
+++ b/lib/checksizeof.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -41,15 +42,32 @@ class Tokenizer;
 class CPPCHECKLIB CheckSizeof : public Check {
 public:
     /** @brief This constructor is used when registering the CheckClass */
-    CheckSizeof() : Check(myName()) {}
+    CheckSizeof() : Check("Sizeof") {}
 
 private:
-    /** @brief This constructor is used when running checks. */
-    CheckSizeof(const Tokenizer* tokenizer, const Settings* settings, ErrorLogger* errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer& tokenizer, ErrorLogger* errorLogger) override;
+    void runChecks(const Tokenizer& tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings& settings) const override;
+
+    std::string classInfo() const override {
+        return "sizeof() usage checks\n"
+               "- sizeof for array given as function argument\n"
+               "- sizeof for numeric given as function argument\n"
+               "- using sizeof(pointer) instead of the size of pointed data\n"
+               "- look for 'sizeof sizeof ..'\n"
+               "- look for calculations inside sizeof()\n"
+               "- look for function calls inside sizeof()\n"
+               "- look for suspicious calculations with sizeof()\n"
+               "- using 'sizeof(void)' which is undefined\n";
+    }
+};
+
+class CPPCHECKLIB CheckSizeofImpl : public CheckImpl {
+public:
+    /** @brief This constructor is used when running checks. */
+    CheckSizeofImpl(const Tokenizer* tokenizer, const Settings& settings, ErrorLogger& errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** @brief %Check for 'sizeof sizeof ..' */
     void sizeofsizeof();
@@ -88,24 +106,6 @@ class CPPCHECKLIB CheckSizeof : public Check {
     void sizeofVoidError(const Token *tok);
     void sizeofDereferencedVoidPointerError(const Token *tok, const std::string &varname);
     void arithOperationsOnVoidPointerError(const Token* tok, const std::string &varname, const std::string &vartype);
-
-    void getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const override;
-
-    static std::string myName() {
-        return "Sizeof";
-    }
-
-    std::string classInfo() const override {
-        return "sizeof() usage checks\n"
-               "- sizeof for array given as function argument\n"
-               "- sizeof for numeric given as function argument\n"
-               "- using sizeof(pointer) instead of the size of pointed data\n"
-               "- look for 'sizeof sizeof ..'\n"
-               "- look for calculations inside sizeof()\n"
-               "- look for function calls inside sizeof()\n"
-               "- look for suspicious calculations with sizeof()\n"
-               "- using 'sizeof(void)' which is undefined\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
index c4827157988..0b3bd405c3d 100644
--- a/lib/checkstl.cpp
+++ b/lib/checkstl.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,10 +19,12 @@
 #include "checkstl.h"
 
 #include "astutils.h"
+#include "calculate.h"
 #include "errortypes.h"
 #include "library.h"
 #include "mathlib.h"
 #include "pathanalysis.h"
+#include "refthunk.h"
 #include "settings.h"
 #include "standards.h"
 #include "symboldatabase.h"
@@ -35,6 +37,7 @@
 #include "checknullpointer.h"
 
 #include <algorithm>
+#include <functional>
 #include <initializer_list>
 #include <iterator>
 #include <list>
@@ -46,11 +49,6 @@
 #include <utility>
 #include <vector>
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckStl instance;
-}
-
 // CWE IDs used:
 static const CWE CWE398(398U);   // Indicator of Poor Code Quality
 static const CWE CWE597(597U);   // Use of Wrong Operator in String Comparison
@@ -132,7 +130,17 @@ static const Token* getContainerFromSize(const Library::Container* container, co
     return nullptr;
 }
 
-void CheckStl::outOfBounds()
+// A value that out of bounds analysis can use: not impossible, and inconclusive only when enabled
+static bool isUsableValue(const ValueFlow::Value& value, const Settings& settings)
+{
+    if (value.isImpossible())
+        return false;
+    if (value.isInconclusive() && !settings.certainty.isEnabled(Certainty::inconclusive))
+        return false;
+    return true;
+}
+
+void CheckStlImpl::outOfBounds()
 {
     logChecker("CheckStl::outOfBounds");
 
@@ -153,11 +161,9 @@ void CheckStl::outOfBounds()
             for (const ValueFlow::Value &value : tok->values()) {
                 if (!value.isContainerSizeValue())
                     continue;
-                if (value.isImpossible())
+                if (!isUsableValue(value, mSettings))
                     continue;
-                if (value.isInconclusive() && !mSettings->certainty.isEnabled(Certainty::inconclusive))
-                    continue;
-                if (!value.errorSeverity() && !mSettings->severity.isEnabled(Severity::warning))
+                if (!value.errorSeverity() && !mSettings.severity.isEnabled(Severity::warning))
                     continue;
                 if (value.intvalue == 0 && (indexTok ||
                                             (containerYieldsElement(container, parent) && !containerAppendsElement(container, parent)) ||
@@ -170,7 +176,7 @@ void CheckStl::outOfBounds()
                 }
                 if (indexTok) {
                     std::vector<ValueFlow::Value> indexValues =
-                        ValueFlow::isOutOfBounds(value, indexTok, mSettings->severity.isEnabled(Severity::warning));
+                        ValueFlow::isOutOfBounds(value, indexTok, mSettings.severity.isEnabled(Severity::warning));
                     if (!indexValues.empty()) {
                         outOfBoundsError(
                             accessTok, tok->expressionString(), &value, indexTok->expressionString(), &indexValues.front());
@@ -180,7 +186,7 @@ void CheckStl::outOfBounds()
             }
             if (indexTok && !indexTok->hasKnownIntValue()) {
                 const ValueFlow::Value* value =
-                    ValueFlow::findValue(indexTok->values(), *mSettings, [&](const ValueFlow::Value& v) {
+                    ValueFlow::findValue(indexTok->values(), mSettings, [&](const ValueFlow::Value& v) {
                     if (!v.isSymbolicValue())
                         return false;
                     if (v.isImpossible())
@@ -220,7 +226,7 @@ static std::string indexValueString(const ValueFlow::Value& indexValue, const st
     return indexString;
 }
 
-void CheckStl::outOfBoundsError(const Token *tok, const std::string &containerName, const ValueFlow::Value *containerSize, const std::string &index, const ValueFlow::Value *indexValue)
+void CheckStlImpl::outOfBoundsError(const Token *tok, const std::string &containerName, const ValueFlow::Value *containerSize, const std::string &index, const ValueFlow::Value *indexValue)
 {
     // Do not warn if both the container size and index value are possible
     if (containerSize && indexValue && containerSize->isPossible() && indexValue->isPossible())
@@ -255,42 +261,34 @@ void CheckStl::outOfBoundsError(const Token *tok, const std::string &containerNa
         return;
     }
 
-    ErrorPath errorPath;
-    if (!indexValue)
-        errorPath = getErrorPath(tok, containerSize, "Access out of bounds");
-    else {
-        ErrorPath errorPath1 = getErrorPath(tok, containerSize, "Access out of bounds");
-        ErrorPath errorPath2 = getErrorPath(tok, indexValue, "Access out of bounds");
-        if (errorPath1.size() <= 1)
-            errorPath = std::move(errorPath2);
-        else if (errorPath2.size() <= 1)
-            errorPath = std::move(errorPath1);
-        else {
-            errorPath = std::move(errorPath1);
-            errorPath.splice(errorPath.end(), errorPath2);
-        }
+    ErrorPath errorPath = getErrorPath(tok, containerSize, "Access out of bounds");
+    if (indexValue) {
+        ErrorPath errorPathIdx = getErrorPath(tok, indexValue, "Access out of bounds");
+        if (errorPathIdx.size() >= errorPath.size())
+            errorPath = std::move(errorPathIdx);
     }
 
     reportError(std::move(errorPath),
-                (containerSize && !containerSize->errorSeverity()) || (indexValue && !indexValue->errorSeverity()) ? Severity::warning : Severity::error,
+                (containerSize && (!containerSize->errorSeverity() || containerSize->conditional)) ||
+                (indexValue && (!indexValue->errorSeverity() || indexValue->conditional)) ? Severity::warning : Severity::error,
                 "containerOutOfBounds",
                 "$symbol:" + containerName +"\n" + errmsg,
                 CWE398,
                 (containerSize && containerSize->isInconclusive()) || (indexValue && indexValue->isInconclusive()) ? Certainty::inconclusive : Certainty::normal);
 }
 
-bool CheckStl::isContainerSize(const Token *containerToken, const Token *expr) const
+bool CheckStlImpl::isContainerSize(const Token *containerToken, const Token *expr) const
 {
     if (!Token::simpleMatch(expr, "( )"))
         return false;
     if (!Token::Match(expr->astOperand1(), ". %name% ("))
         return false;
-    if (!isSameExpression(false, containerToken, expr->astOperand1()->astOperand1(), *mSettings, false, false))
+    if (!isSameExpression(false, containerToken, expr->astOperand1()->astOperand1(), mSettings, false, false))
         return false;
     return containerToken->valueType()->container->getYield(expr->strAt(-1)) == Library::Container::Yield::SIZE;
 }
 
-bool CheckStl::isContainerSizeGE(const Token * containerToken, const Token *expr) const
+bool CheckStlImpl::isContainerSizeGE(const Token * containerToken, const Token *expr) const
 {
     if (!expr)
         return false;
@@ -314,12 +312,12 @@ bool CheckStl::isContainerSizeGE(const Token * containerToken, const Token *expr
             op = expr->astOperand1();
         else
             return false;
-        return op && op->getValueGE(0, *mSettings);
+        return op && op->getValueGE(0, mSettings);
     }
     return false;
 }
 
-void CheckStl::outOfBoundsIndexExpression()
+void CheckStlImpl::outOfBoundsIndexExpression()
 {
     logChecker("CheckStl::outOfBoundsIndexExpression");
     for (const Scope *function : mTokenizer->getSymbolDatabase()->functionScopes) {
@@ -339,7 +337,7 @@ void CheckStl::outOfBoundsIndexExpression()
     }
 }
 
-void CheckStl::outOfBoundsIndexExpressionError(const Token *tok, const Token *index)
+void CheckStlImpl::outOfBoundsIndexExpressionError(const Token *tok, const Token *index)
 {
     const std::string varname = tok ? tok->str() : std::string("var");
     const std::string i = index ? index->expressionString() : (varname + ".size()");
@@ -357,12 +355,12 @@ void CheckStl::outOfBoundsIndexExpressionError(const Token *tok, const Token *in
 
 
 // Error message for bad iterator usage..
-void CheckStl::invalidIteratorError(const Token *tok, const std::string &iteratorName)
+void CheckStlImpl::invalidIteratorError(const Token *tok, const std::string &iteratorName)
 {
     reportError(tok, Severity::error, "invalidIterator1", "$symbol:"+iteratorName+"\nInvalid iterator: $symbol", CWE664, Certainty::normal);
 }
 
-void CheckStl::iteratorsError(const Token* tok, const std::string& containerName1, const std::string& containerName2)
+void CheckStlImpl::iteratorsError(const Token* tok, const std::string& containerName1, const std::string& containerName2)
 {
     reportError(tok, Severity::error, "iterators1",
                 "$symbol:" + containerName1 + "\n"
@@ -370,7 +368,7 @@ void CheckStl::iteratorsError(const Token* tok, const std::string& containerName
                 "Same iterator is used with different containers '" + containerName1 + "' and '" + containerName2 + "'.", CWE664, Certainty::normal);
 }
 
-void CheckStl::iteratorsError(const Token* tok, const Token* containerTok, const std::string& containerName)
+void CheckStlImpl::iteratorsError(const Token* tok, const Token* containerTok, const std::string& containerName)
 {
     std::list<const Token*> callstack = { tok, containerTok };
     reportError(callstack,
@@ -384,7 +382,7 @@ void CheckStl::iteratorsError(const Token* tok, const Token* containerTok, const
 }
 
 // Error message used when dereferencing an iterator that has been erased..
-void CheckStl::dereferenceErasedError(const Token *erased, const Token* deref, const std::string &itername, bool inconclusive)
+void CheckStlImpl::dereferenceErasedError(const Token *erased, const Token* deref, const std::string &itername, bool inconclusive)
 {
     if (erased) {
         std::list<const Token*> callstack = { deref, erased };
@@ -454,7 +452,7 @@ static bool isVector(const Token* tok)
     return Token::simpleMatch(decltok, "std :: vector");
 }
 
-void CheckStl::iterators()
+void CheckStlImpl::iterators()
 {
     logChecker("CheckStl::iterators");
 
@@ -475,7 +473,7 @@ void CheckStl::iterators()
         bool inconclusiveType=false;
         if (!isIterator(var, inconclusiveType))
             continue;
-        if (inconclusiveType && !mSettings->certainty.isEnabled(Certainty::inconclusive))
+        if (inconclusiveType && !mSettings.certainty.isEnabled(Certainty::inconclusive))
             continue;
 
         const int iteratorId = var->declarationId();
@@ -554,7 +552,7 @@ void CheckStl::iterators()
                     }
 
                     // Not different containers if a reference is used..
-                    if (containerToken && containerToken->variable() && containerToken->variable()->isReference()) {
+                    if (containerToken->variable() && containerToken->variable()->isReference()) {
                         const Token *nameToken = containerToken->variable()->nameToken();
                         if (Token::Match(nameToken, "%name% =")) {
                             const Token *name1 = nameToken->tokAt(2);
@@ -639,33 +637,37 @@ void CheckStl::iterators()
     }
 }
 
-void CheckStl::mismatchingContainerIteratorError(const Token* containerTok, const Token* iterTok, const Token* containerTok2)
+void CheckStlImpl::mismatchingContainerIteratorError(const Token* containerTok, const Token* iterTok, const Token* containerTok2)
 {
     const std::string container(containerTok ? containerTok->expressionString() : std::string("v1"));
+    const std::string containerTemp(isTemporary(containerTok, &mSettings.library) ? " temporary " : " ");
     const std::string container2(containerTok2 ? containerTok2->expressionString() : std::string("v2"));
+    const std::string containerTemp2(isTemporary(containerTok2, &mSettings.library) ? " temporary " : " ");
     const std::string iter(iterTok ? iterTok->expressionString() : std::string("it"));
     reportError(containerTok,
                 Severity::error,
                 "mismatchingContainerIterator",
-                "Iterator '" + iter + "' referring to container '" + container2 + "' is used with container '" + container + "'.",
+                "Iterator '" + iter + "' referring to" + containerTemp2 + "container '" + container2 + "' is used with" + containerTemp + "container '" + container + "'.",
                 CWE664,
                 Certainty::normal);
 }
 
 // Error message for bad iterator usage..
-void CheckStl::mismatchingContainersError(const Token* tok1, const Token* tok2)
+void CheckStlImpl::mismatchingContainersError(const Token* tok1, const Token* tok2, ValueFlow::Value::LifetimeKind ltk)
 {
     const std::string expr1(tok1 ? tok1->expressionString() : std::string("v1"));
     const std::string expr2(tok2 ? tok2->expressionString() : std::string("v2"));
+    const std::string dataStr = (ltk == ValueFlow::Value::LifetimeKind::Iterator) ? "Iterators" : (ltk == ValueFlow::Value::LifetimeKind::Address ? "Addresses" : "Pointers");
+    const std::string objectStr = (ltk == ValueFlow::Value::LifetimeKind::Iterator || ltk == ValueFlow::Value::LifetimeKind::Object) ? "containers '" : "objects '";
     reportError(tok1,
                 Severity::error,
                 "mismatchingContainers",
-                "Iterators of different containers '" + expr1 + "' and '" + expr2 + "' are used together.",
+                dataStr + " of different " + objectStr + expr1 + "' and '" + expr2 + "' are used together.",
                 CWE664,
                 Certainty::normal);
 }
 
-void CheckStl::mismatchingContainerExpressionError(const Token *tok1, const Token *tok2)
+void CheckStlImpl::mismatchingContainerExpressionError(const Token *tok1, const Token *tok2)
 {
     const std::string expr1(tok1 ? tok1->expressionString() : std::string("v1"));
     const std::string expr2(tok2 ? tok2->expressionString() : std::string("v2"));
@@ -674,7 +676,7 @@ void CheckStl::mismatchingContainerExpressionError(const Token *tok1, const Toke
                 expr1 + "' and '" + expr2 + "' are used together.", CWE664, Certainty::normal);
 }
 
-void CheckStl::sameIteratorExpressionError(const Token *tok)
+void CheckStlImpl::sameIteratorExpressionError(const Token *tok)
 {
     reportError(tok, Severity::style, "sameIteratorExpression", "Same iterators expression are used for algorithm.", CWE664, Certainty::normal);
 }
@@ -759,7 +761,17 @@ static ValueFlow::Value getLifetimeIteratorValue(const Token* tok, MathLib::bigi
     return ValueFlow::Value{};
 }
 
-bool CheckStl::checkIteratorPair(const Token* tok1, const Token* tok2)
+// Whether a container size value found on an iterator token belongs to the range of the given
+// iterator value. Both values record the container they belong to when it is known.
+static bool sizeValueAppliesToIterator(const ValueFlow::Value& sizeValue, const ValueFlow::Value& iterValue)
+{
+    if (!sizeValue.container || !iterValue.container)
+        return true; // the container of the size or of the iterator is not known
+    return iterValue.container == sizeValue.container ||
+           (iterValue.container->exprId() != 0 && iterValue.container->exprId() == sizeValue.container->exprId());
+}
+
+bool CheckStlImpl::checkIteratorPair(const Token* tok1, const Token* tok2)
 {
     if (!tok1)
         return false;
@@ -777,12 +789,12 @@ bool CheckStl::checkIteratorPair(const Token* tok1, const Token* tok2)
                 (!astIsContainer(val1.tokvalue) || !astIsContainer(val2.tokvalue)))
                 return false;
         }
-        if (isSameIteratorContainerExpression(val1.tokvalue, val2.tokvalue, *mSettings, val1.lifetimeKind))
+        if (isSameIteratorContainerExpression(val1.tokvalue, val2.tokvalue, mSettings, val1.lifetimeKind))
             return false;
         if (val1.tokvalue->expressionString() == val2.tokvalue->expressionString())
             iteratorsError(tok1, val1.tokvalue, val1.tokvalue->expressionString());
         else
-            mismatchingContainersError(val1.tokvalue, val2.tokvalue);
+            mismatchingContainersError(val1.tokvalue, val2.tokvalue, val1.lifetimeKind);
         return true;
     }
 
@@ -797,7 +809,7 @@ bool CheckStl::checkIteratorPair(const Token* tok1, const Token* tok2)
     const Token* iter2 = getIteratorExpression(tok2);
     if (!iter2)
         return false;
-    if (!isSameIteratorContainerExpression(iter1, iter2, *mSettings)) {
+    if (!isSameIteratorContainerExpression(iter1, iter2, mSettings)) {
         mismatchingContainerExpressionError(iter1, iter2);
         return true;
     }
@@ -811,7 +823,7 @@ namespace {
     };
 }
 
-void CheckStl::mismatchingContainers()
+void CheckStlImpl::mismatchingContainers()
 {
     logChecker("CheckStl::misMatchingContainers");
 
@@ -833,8 +845,8 @@ void CheckStl::mismatchingContainers()
 
             // Group args together by container
             std::map<int, std::vector<ArgIteratorInfo>> containers;
-            for (int argnr = 1; argnr <= args.size(); ++argnr) {
-                const Library::ArgumentChecks::IteratorInfo *i = mSettings->library.getArgIteratorInfo(ftok, argnr);
+            for (size_t argnr = 1; argnr <= args.size(); ++argnr) {
+                const Library::ArgumentChecks::IteratorInfo *i = mSettings.library.getArgIteratorInfo(ftok, argnr);
                 if (!i)
                     continue;
                 const Token * const argTok = args[argnr - 1];
@@ -851,7 +863,7 @@ void CheckStl::mismatchingContainers()
                             if (iter1.tok == iter2.tok)
                                 continue;
                             if (iter1.info->first && iter2.info->last &&
-                                isSameExpression(false, iter1.tok, iter2.tok, *mSettings, false, false))
+                                isSameExpression(false, iter1.tok, iter2.tok, mSettings, false, false))
                                 sameIteratorExpressionError(iter1.tok);
                             if (checkIteratorPair(iter1.tok, iter2.tok))
                                 return;
@@ -871,7 +883,7 @@ void CheckStl::mismatchingContainers()
     }
 }
 
-void CheckStl::mismatchingContainerIterator()
+void CheckStlImpl::mismatchingContainerIterator()
 {
     logChecker("CheckStl::misMatchingContainerIterator");
 
@@ -889,7 +901,7 @@ void CheckStl::mismatchingContainerIterator()
             const std::vector<const Token *> args = getArguments(ftok);
 
             const Library::Container * c = tok->valueType()->container;
-            const Library::Container::Action action = c->getAction(tok->strAt(2));
+            const Library::Container::Action action = c->getAction(ftok->str());
             const Token* iterTok = nullptr;
             if (action == Library::Container::Action::INSERT && args.size() == 2) {
                 // Skip if iterator pair
@@ -915,7 +927,7 @@ void CheckStl::mismatchingContainerIterator()
                 continue;
             if (iterTok->str() == "*" && iterTok->astOperand1()->valueType() && iterTok->astOperand1()->valueType()->type == ValueType::ITERATOR)
                 continue;
-            if (isSameIteratorContainerExpression(tok, val.tokvalue, *mSettings))
+            if (isSameIteratorContainerExpression(tok, val.tokvalue, mSettings))
                 continue;
             mismatchingContainerIteratorError(tok, iterTok, val.tokvalue);
         }
@@ -1123,7 +1135,7 @@ static const Token* endOfExpression(const Token* tok)
     return endToken;
 }
 
-void CheckStl::invalidContainer()
+void CheckStlImpl::invalidContainer()
 {
     logChecker("CheckStl::invalidContainer");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -1148,7 +1160,7 @@ void CheckStl::invalidContainer()
                         const Scope* s = tok2->scope();
                         if (!s)
                             continue;
-                        if (isReturnScope(s->bodyEnd, mSettings->library))
+                        if (isReturnScope(s->bodyEnd, mSettings.library))
                             continue;
                         invalidContainerLoopError(r.ftok, tok, r.errorPath);
                         bail = true;
@@ -1193,14 +1205,13 @@ void CheckStl::invalidContainer()
                         if (info.tok->variable()->isReference() && !isVariableDecl(info.tok) &&
                             reaches(info.tok->variable()->nameToken(), tok, nullptr)) {
 
-                            if ((assignExpr && Token::Match(assignExpr->astOperand1(), "& %varid%", info.tok->varId())) || // TODO: fix AST
-                                Token::Match(assignExpr, "& %varid% {|(", info.tok->varId())) {
+                            if ((assignExpr && Token::Match(assignExpr->astOperand1()->previous(), "& %varid%", info.tok->varId()))) {
                                 return false;
                             }
 
                             ErrorPath ep;
                             bool addressOf = false;
-                            const Variable* var = ValueFlow::getLifetimeVariable(info.tok, ep, *mSettings, &addressOf);
+                            const Variable* var = ValueFlow::getLifetimeVariable(info.tok, ep, mSettings, &addressOf);
                             // Check the reference is created before the change
                             if (var && var->declarationId() == r.tok->varId() && !addressOf) {
                                 // An argument always reaches
@@ -1227,7 +1238,7 @@ void CheckStl::invalidContainer()
                     errorPath.insert(errorPath.end(), info.errorPath.cbegin(), info.errorPath.cend());
                     errorPath.insert(errorPath.end(), r.errorPath.cbegin(), r.errorPath.cend());
                     if (v) {
-                        invalidContainerError(info.tok, r.tok, v, std::move(errorPath));
+                        invalidContainerError(info.tok, v, std::move(errorPath));
                     } else {
                         invalidContainerReferenceError(info.tok, r.tok, std::move(errorPath));
                     }
@@ -1237,7 +1248,7 @@ void CheckStl::invalidContainer()
     }
 }
 
-void CheckStl::invalidContainerLoopError(const Token* tok, const Token* loopTok, ErrorPath errorPath)
+void CheckStlImpl::invalidContainerLoopError(const Token* tok, const Token* loopTok, ErrorPath errorPath)
 {
     const std::string method = tok ? tok->str() : "erase";
     errorPath.emplace_back(loopTok, "Iterating container here.");
@@ -1252,7 +1263,7 @@ void CheckStl::invalidContainerLoopError(const Token* tok, const Token* loopTok,
     reportError(std::move(errorPath), Severity::error, "invalidContainerLoop", msg, CWE664, Certainty::normal);
 }
 
-void CheckStl::invalidContainerError(const Token *tok, const Token * /*contTok*/, const ValueFlow::Value *val, ErrorPath errorPath)
+void CheckStlImpl::invalidContainerError(const Token *tok, const ValueFlow::Value *val, ErrorPath errorPath)
 {
     const bool inconclusive = val ? val->isInconclusive() : false;
     if (val)
@@ -1262,7 +1273,7 @@ void CheckStl::invalidContainerError(const Token *tok, const Token * /*contTok*/
     reportError(std::move(errorPath), Severity::error, "invalidContainer", msg + " that may be invalid.", CWE664, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckStl::invalidContainerReferenceError(const Token* tok, const Token* contTok, ErrorPath errorPath)
+void CheckStlImpl::invalidContainerReferenceError(const Token* tok, const Token* contTok, ErrorPath errorPath)
 {
     std::string name = contTok ? contTok->expressionString() : "x";
     std::string msg = "Reference to " + name;
@@ -1270,7 +1281,7 @@ void CheckStl::invalidContainerReferenceError(const Token* tok, const Token* con
     reportError(std::move(errorPath), Severity::error, "invalidContainerReference", msg + " that may be invalid.", CWE664, Certainty::normal);
 }
 
-void CheckStl::stlOutOfBounds()
+void CheckStlImpl::stlOutOfBounds()
 {
     logChecker("CheckStl::stlOutOfBounds");
 
@@ -1356,7 +1367,7 @@ void CheckStl::stlOutOfBounds()
     }
 }
 
-void CheckStl::stlOutOfBoundsError(const Token *tok, const std::string &num, const std::string &var, bool at)
+void CheckStlImpl::stlOutOfBoundsError(const Token *tok, const std::string &num, const std::string &var, bool at)
 {
     if (at)
         reportError(tok, Severity::error, "stlOutOfBounds", "$symbol:" + var + "\nWhen " + num + "==$symbol.size(), $symbol.at(" + num + ") is out of bounds.", CWE788, Certainty::normal);
@@ -1364,7 +1375,7 @@ void CheckStl::stlOutOfBoundsError(const Token *tok, const std::string &num, con
         reportError(tok, Severity::error, "stlOutOfBounds", "$symbol:" + var + "\nWhen " + num + "==$symbol.size(), $symbol[" + num + "] is out of bounds.", CWE788, Certainty::normal);
 }
 
-void CheckStl::negativeIndex()
+void CheckStlImpl::negativeIndex()
 {
     logChecker("CheckStl::negativeIndex");
 
@@ -1377,10 +1388,10 @@ void CheckStl::negativeIndex()
             const Variable * const var = tok->variable();
             if (!var || tok == var->nameToken())
                 continue;
-            const Library::Container * const container = mSettings->library.detectContainer(var->typeStartToken());
+            const Library::Container * const container = mSettings.library.detectContainer(var->typeStartToken());
             if (!container || !container->arrayLike_indexOp)
                 continue;
-            const ValueFlow::Value *index = tok->next()->astOperand2()->getValueLE(-1, *mSettings);
+            const ValueFlow::Value *index = tok->next()->astOperand2()->getValueLE(-1, mSettings);
             if (!index)
                 continue;
             negativeIndexError(tok, *index);
@@ -1388,7 +1399,7 @@ void CheckStl::negativeIndex()
     }
 }
 
-void CheckStl::negativeIndexError(const Token *tok, const ValueFlow::Value &index)
+void CheckStlImpl::negativeIndexError(const Token *tok, const ValueFlow::Value &index)
 {
     ErrorPath errorPath = getErrorPath(tok, &index, "Negative array index");
     std::ostringstream errmsg;
@@ -1402,7 +1413,7 @@ void CheckStl::negativeIndexError(const Token *tok, const ValueFlow::Value &inde
     reportError(std::move(errorPath), severity, "negativeContainerIndex", errmsg.str(), CWE786, certainty);
 }
 
-void CheckStl::erase()
+void CheckStlImpl::erase()
 {
     logChecker("CheckStl::erase");
 
@@ -1423,7 +1434,7 @@ void CheckStl::erase()
     }
 }
 
-void CheckStl::eraseCheckLoopVar(const Scope &scope, const Variable *var)
+void CheckStlImpl::eraseCheckLoopVar(const Scope &scope, const Variable *var)
 {
     bool inconclusiveType=false;
     if (!isIterator(var, inconclusiveType))
@@ -1439,7 +1450,7 @@ void CheckStl::eraseCheckLoopVar(const Scope &scope, const Variable *var)
         if (Token::Match(tok->astParent(), "=|return"))
             continue;
         // Iterator is invalid..
-        int indentlevel = 0U;
+        int indentlevel = 0;
         const Token *tok2 = tok->link();
         for (; tok2 != scope.bodyEnd; tok2 = tok2->next()) {
             if (tok2->str() == "{") {
@@ -1447,7 +1458,7 @@ void CheckStl::eraseCheckLoopVar(const Scope &scope, const Variable *var)
                 continue;
             }
             if (tok2->str() == "}") {
-                if (indentlevel > 0U)
+                if (indentlevel > 0)
                     --indentlevel;
                 else if (Token::simpleMatch(tok2, "} else {"))
                     tok2 = tok2->linkAt(2);
@@ -1467,7 +1478,7 @@ void CheckStl::eraseCheckLoopVar(const Scope &scope, const Variable *var)
     }
 }
 
-void CheckStl::stlBoundaries()
+void CheckStlImpl::stlBoundaries()
 {
     logChecker("CheckStl::stlBoundaries");
 
@@ -1476,7 +1487,7 @@ void CheckStl::stlBoundaries()
         if (!var || !var->scope() || !var->scope()->isExecutable())
             continue;
 
-        const Library::Container* container = mSettings->library.detectIterator(var->typeStartToken());
+        const Library::Container* container = mSettings.library.detectIterator(var->typeStartToken());
         if (!container || container->opLessAllowed)
             continue;
 
@@ -1492,7 +1503,7 @@ void CheckStl::stlBoundaries()
 }
 
 // Error message for bad boundary usage..
-void CheckStl::stlBoundariesError(const Token *tok)
+void CheckStlImpl::stlBoundariesError(const Token *tok)
 {
     reportError(tok, Severity::error, "stlBoundaries",
                 "Dangerous comparison using operator< on iterator.\n"
@@ -1521,10 +1532,10 @@ static bool if_findCompare(const Token * const tokBack, bool stdStringLike)
     return false;
 }
 
-void CheckStl::if_find()
+void CheckStlImpl::if_find()
 {
-    const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
-    const bool printPerformance = mSettings->severity.isEnabled(Severity::performance);
+    const bool printWarning = mSettings.severity.isEnabled(Severity::warning);
+    const bool printPerformance = mSettings.severity.isEnabled(Severity::performance);
     if (!printWarning && !printPerformance)
         return;
 
@@ -1548,7 +1559,7 @@ void CheckStl::if_find()
                 tok = tok->linkAt(1);
 
             else if (tok->variable() && Token::Match(tok, "%var% . %name% (")) {
-                container = mSettings->library.detectContainer(tok->variable()->typeStartToken());
+                container = mSettings.library.detectContainer(tok->variable()->typeStartToken());
                 funcTok = tok->tokAt(2);
             }
 
@@ -1562,16 +1573,16 @@ void CheckStl::if_find()
                 funcTok = tok2->astParent()->next();
 
                 if (tok->variable()->isArrayOrPointer())
-                    container = mSettings->library.detectContainer(tok->variable()->typeStartToken());
+                    container = mSettings.library.detectContainer(tok->variable()->typeStartToken());
                 else { // Container of container - find the inner container
-                    container = mSettings->library.detectContainer(tok->variable()->typeStartToken()); // outer container
+                    container = mSettings.library.detectContainer(tok->variable()->typeStartToken()); // outer container
                     tok2 = Token::findsimplematch(tok->variable()->typeStartToken(), "<", tok->variable()->typeEndToken());
                     if (container && container->type_templateArgNo >= 0 && tok2) {
                         tok2 = tok2->next();
                         for (int j = 0; j < container->type_templateArgNo; j++)
                             tok2 = tok2->nextTemplateArgument();
 
-                        container = mSettings->library.detectContainer(tok2); // inner container
+                        container = mSettings.library.detectContainer(tok2); // inner container
                     } else
                         container = nullptr;
                 }
@@ -1598,9 +1609,9 @@ void CheckStl::if_find()
 }
 
 
-void CheckStl::if_findError(const Token *tok, bool str)
+void CheckStlImpl::if_findError(const Token *tok, bool str)
 {
-    if (str && mSettings->standards.cpp >= Standards::CPP20)
+    if (str && mSettings.standards.cpp >= Standards::CPP20)
         reportError(tok, Severity::performance, "stlIfStrFind",
                     "Inefficient usage of string::find() in condition; string::starts_with() could be faster.\n"
                     "Either inefficient or wrong usage of string::find(). string::starts_with() will be faster if "
@@ -1689,9 +1700,9 @@ static const Token *findInsertValue(const Token *tok, const Token *containerTok,
     return nullptr;
 }
 
-void CheckStl::checkFindInsert()
+void CheckStlImpl::checkFindInsert()
 {
-    if (!mSettings->severity.isEnabled(Severity::performance))
+    if (!mSettings.severity.isEnabled(Severity::performance))
         return;
 
     logChecker("CheckStl::checkFindInsert"); // performance
@@ -1712,48 +1723,91 @@ void CheckStl::checkFindInsert()
             if (!containerTok)
                 continue;
             // In < C++17 we only warn for small simple types
-            if (mSettings->standards.cpp < Standards::CPP17 && !(keyTok && keyTok->valueType() && (keyTok->valueType()->isIntegral() || keyTok->valueType()->pointer > 0)))
+            if (mSettings.standards.cpp < Standards::CPP17 && !(keyTok && keyTok->valueType() && (keyTok->valueType()->isIntegral() || keyTok->valueType()->pointer > 0)))
                 continue;
 
             const Token *thenTok = tok->linkAt(1)->next();
-            const Token *valueTok = findInsertValue(thenTok, containerTok, keyTok, *mSettings);
+            const Token *valueTok = findInsertValue(thenTok, containerTok, keyTok, mSettings);
             if (!valueTok)
                 continue;
 
             if (Token::simpleMatch(thenTok->link(), "} else {")) {
                 const Token *valueTok2 =
-                    findInsertValue(thenTok->link()->tokAt(2), containerTok, keyTok, *mSettings);
+                    findInsertValue(thenTok->link()->tokAt(2), containerTok, keyTok, mSettings);
                 if (!valueTok2)
                     continue;
-                if (isSameExpression(true, valueTok, valueTok2, *mSettings, true, true)) {
-                    checkFindInsertError(valueTok);
+                if (isSameExpression(true, valueTok, valueTok2, mSettings, true, true)) {
+                    // Both branches set the same value; the replacement depends on both branches, so no suggestion
+                    checkFindInsertError(valueTok, nullptr);
                 }
             } else {
-                checkFindInsertError(valueTok);
+                checkFindInsertError(valueTok, condTok);
             }
         }
     }
 }
 
-void CheckStl::checkFindInsertError(const Token *tok)
-{
-    std::string replaceExpr;
-    if (tok && Token::simpleMatch(tok->astParent(), "=") && tok == tok->astParent()->astOperand2() && Token::simpleMatch(tok->astParent()->astOperand1(), "[")) {
-        if (mSettings->standards.cpp < Standards::CPP11)
-            // We will recommend using emplace/try_emplace instead
-            return;
-        const std::string f = (mSettings->standards.cpp < Standards::CPP17) ? "emplace" : "try_emplace";
-        replaceExpr = " Instead of '" + tok->astParent()->expressionString() + "' consider using '" +
-                      tok->astParent()->astOperand1()->astOperand1()->expressionString() +
-                      "." + f + "(" +
-                      tok->astParent()->astOperand1()->astOperand2()->expressionString() +
-                      ", " +
-                      tok->expressionString() +
-                      ");'.";
+/** When is the condition of the 'if' statement checked by checkFindInsert() true? */
+enum class FindInsertCond : std::uint8_t { UNKNOWN, FOUND, NOT_FOUND };
+
+static FindInsertCond getFindInsertCond(const Token* condTok)
+{
+    const Token* rhs = condTok->astOperand2();
+    if (!rhs)
+        return FindInsertCond::UNKNOWN;
+    if (Token::simpleMatch(condTok->astOperand1()->astOperand1(), ". find (")) {
+        // c.find(k) == c.end() / c.find(k) != c.end()
+        if (!Token::simpleMatch(rhs, "(") || !Token::Match(rhs->astOperand1(), ". end|cend ("))
+            return FindInsertCond::UNKNOWN;
+        if (condTok->str() == "==")
+            return FindInsertCond::NOT_FOUND;
+        if (condTok->str() == "!=")
+            return FindInsertCond::FOUND;
+        return FindInsertCond::UNKNOWN;
+    }
+    // c.count(k) == 0, c.count(k) > 0, ...: count() yields 0 or 1
+    if (!rhs->hasKnownIntValue())
+        return FindInsertCond::UNKNOWN;
+    const MathLib::bigint n = rhs->getKnownIntValue();
+    const bool found = calculate<MathLib::bigint, MathLib::bigint>(condTok->str(), 1, n) != 0;
+    const bool notFound = calculate<MathLib::bigint, MathLib::bigint>(condTok->str(), 0, n) != 0;
+    if (found == notFound)
+        return FindInsertCond::UNKNOWN;
+    return found ? FindInsertCond::FOUND : FindInsertCond::NOT_FOUND;
+}
+
+void CheckStlImpl::checkFindInsertError(const Token* tok, const Token* condTok)
+{
+    std::string suggestion;
+    std::string method = "insertion";
+    if (tok && condTok && Token::simpleMatch(tok->astParent(), "=") && tok == tok->astParent()->astOperand2() &&
+        Token::simpleMatch(tok->astParent()->astOperand1(), "[")) {
+        const std::string containerExpr = tok->astParent()->astOperand1()->astOperand1()->expressionString();
+        const std::string keyExpr = tok->astParent()->astOperand1()->astOperand2()->expressionString();
+        switch (getFindInsertCond(condTok)) {
+        case FindInsertCond::NOT_FOUND: {
+            if (mSettings.standards.cpp < Standards::CPP11)
+                // We will recommend using emplace/try_emplace instead
+                return;
+            const std::string f = (mSettings.standards.cpp < Standards::CPP17) ? "emplace" : "try_emplace";
+            suggestion = " Instead of '" + tok->astParent()->expressionString() + "' consider using '" + containerExpr +
+                         "." + f + "(" + keyExpr + ", " + tok->expressionString() + ");'.";
+            break;
+        }
+        case FindInsertCond::FOUND:
+            // The key is present, so the element is modified rather than inserted; try_emplace() would not do that
+            method = "modification";
+            suggestion = " Instead of '" + tok->astParent()->expressionString() +
+                         "' consider assigning the value through the iterator returned by '" + containerExpr +
+                         ".find(" + keyExpr + ")'.";
+            break;
+        case FindInsertCond::UNKNOWN:
+            break;
+        }
     }
+    std::string msg = "Searching before " + method + " is not necessary." + suggestion;
 
-    reportError(
-        tok, Severity::performance, "stlFindInsert", "Searching before insertion is not necessary." + replaceExpr, CWE398, Certainty::normal);
+    reportError(tok, Severity::performance, "stlFindInsert", msg, CWE398, Certainty::normal);
 }
 
 /**
@@ -1767,12 +1821,12 @@ static bool isCpp03ContainerSizeSlow(const Token *tok)
     return var && var->isStlType("list");
 }
 
-void CheckStl::size()
+void CheckStlImpl::size()
 {
-    if (!mSettings->severity.isEnabled(Severity::performance))
+    if (!mSettings.severity.isEnabled(Severity::performance))
         return;
 
-    if (mSettings->standards.cpp >= Standards::CPP11)
+    if (mSettings.standards.cpp >= Standards::CPP11)
         return;
 
     logChecker("CheckStl::size"); // performance,c++03
@@ -1816,7 +1870,7 @@ void CheckStl::size()
     }
 }
 
-void CheckStl::sizeError(const Token *tok)
+void CheckStlImpl::sizeError(const Token *tok)
 {
     const std::string varname = tok ? tok->str() : std::string("list");
     reportError(tok, Severity::performance, "stlSize",
@@ -1828,9 +1882,9 @@ void CheckStl::sizeError(const Token *tok)
                 "guaranteed to take constant time.", CWE398, Certainty::normal);
 }
 
-void CheckStl::redundantCondition()
+void CheckStlImpl::redundantCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("redundantIfRemove"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("redundantIfRemove"))
         return;
 
     logChecker("CheckStl::redundantCondition"); // style
@@ -1852,6 +1906,9 @@ void CheckStl::redundantCondition()
         const Token *var3 = var2->tokAt(7);
         const Token *any2 = var3->tokAt(4);
 
+        if (any2->tokAt(3) != scope.bodyEnd)
+            continue;
+
         // Check if all the "%name%" fields are the same and if all the "%any%" are the same..
         if (var1->str() == var2->str() &&
             var2->str() == var3->str() &&
@@ -1861,7 +1918,7 @@ void CheckStl::redundantCondition()
     }
 }
 
-void CheckStl::redundantIfRemoveError(const Token *tok)
+void CheckStlImpl::redundantIfRemoveError(const Token *tok)
 {
     reportError(tok, Severity::style, "redundantIfRemove",
                 "Redundant checking of STL container element existence before removing it.\n"
@@ -1869,9 +1926,9 @@ void CheckStl::redundantIfRemoveError(const Token *tok)
                 "It is safe to call the remove method on a non-existing element.", CWE398, Certainty::normal);
 }
 
-void CheckStl::missingComparison()
+void CheckStlImpl::missingComparison()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckStl::missingComparison"); // warning
@@ -1933,7 +1990,7 @@ void CheckStl::missingComparison()
     }
 }
 
-void CheckStl::missingComparisonError(const Token *incrementToken1, const Token *incrementToken2)
+void CheckStlImpl::missingComparisonError(const Token *incrementToken1, const Token *incrementToken2)
 {
     std::list<const Token*> callstack = { incrementToken1,incrementToken2 };
 
@@ -1959,16 +2016,82 @@ static bool isLocal(const Token *tok)
     return var && !var->isStatic() && var->isLocal();
 }
 
+static bool isc_strCall(const Token* tok, const Library::Container* container)
+{
+    if (!Token::simpleMatch(tok, "("))
+        return false;
+    const Token* dot = tok->astOperand1();
+    if (!Token::simpleMatch(dot, "."))
+        return false;
+    const Token* obj = dot->astOperand1();
+    if (!obj || !obj->valueType())
+        return false;
+    const Library::Container* objContainer = obj->valueType()->container;
+    if (!objContainer || !container || !objContainer->stdStringLike || (objContainer != container && !container->view))
+        return false;
+    return Token::Match(dot->astOperand2(), "c_str|data ( )");
+}
+
+static bool isc_strConcat(const Token* tok)
+{
+    if (!tok->isBinaryOp() || !Token::Match(tok, "+|+="))
+        return false;
+    for (const Token* op : { tok->astOperand1(), tok->astOperand2() }) { // NOLINT(readability-use-anyofallof)
+        if (tok->isAssignmentOp() && astIsLHS(op))
+            continue;
+        const Token* sibling = op->astSibling();
+        if (!sibling->valueType())
+            continue;
+        if (isc_strCall(op, sibling->valueType()->container))
+            return true;
+    }
+    return false;
+}
+
+static bool isc_strInPlusChain(const Token* tok, const Library::Container* container)
+{
+    if (!tok || !tok->valueType() || !tok->valueType()->pointer)
+        return false;
+    bool result = false;
+    visitAstNodes(tok, [&](const Token* tok2) {
+        if (Token::simpleMatch(tok2, "+"))
+            return ChildrenToVisit::op1_and_op2;
+        if (isc_strCall(tok2, container)) {
+            result = true;
+            return ChildrenToVisit::done;
+        }
+        return ChildrenToVisit::none;
+    });
+    return result;
+}
+
+static bool isc_strAssignment(const Token* tok)
+{
+    if (!Token::simpleMatch(tok, "="))
+        return false;
+    const Token* strTok = tok->astOperand1();
+    if (!strTok || !strTok->valueType())
+        return false;
+    return isc_strCall(tok->astOperand2(), strTok->valueType()->container);
+}
+
+static bool isc_strConstructor(const Token* tok)
+{
+    if (!tok->valueType() || !Token::Match(tok, "%var% (|{"))
+        return false;
+    return isc_strInPlusChain(tok->tokAt(1)->astOperand2(), tok->valueType()->container);
+}
+
 namespace {
     const std::set<std::string> stl_string_stream = {
         "istringstream", "ostringstream", "stringstream", "wstringstream"
     };
 }
 
-void CheckStl::string_c_str()
+void CheckStlImpl::string_c_str()
 {
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
-    const bool printPerformance = mSettings->severity.isEnabled(Severity::performance);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
+    const bool printPerformance = mSettings.severity.isEnabled(Severity::performance);
 
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
 
@@ -2027,16 +2150,14 @@ void CheckStl::string_c_str()
                     const Variable* var2 = tok->tokAt(2)->variable();
                     if (var->isPointer() && var2 && var2->isStlType(stl_string_stream))
                         string_c_strError(tok);
+                } else if (printPerformance && isc_strAssignment(tok->tokAt(1))) {
+                    string_c_strAssignment(tok, tok->variable()->getTypeName());
                 } else if (Token::Match(tok->tokAt(2), "%name% (") &&
                            Token::Match(tok->linkAt(3), ") . c_str|data ( ) ;") &&
                            tok->tokAt(2)->function() && Token::Match(tok->tokAt(2)->function()->retDef, "std :: string|wstring %name%")) {
                     const Variable* var = tok->variable();
                     if (var->isPointer())
                         string_c_strError(tok);
-                } else if (printPerformance && tok->tokAt(1)->astOperand2() && Token::Match(tok->tokAt(1)->astOperand2()->tokAt(-3), "%var% . c_str|data ( ) ;")) {
-                    const Token* vartok = tok->tokAt(1)->astOperand2()->tokAt(-3);
-                    if ((tok->variable()->isStlStringType() || tok->variable()->isStlStringViewType()) && vartok->variable() && vartok->variable()->isStlStringType())
-                        string_c_strAssignment(tok, tok->variable()->getTypeName());
                 }
             } else if (printPerformance && tok->function() && Token::Match(tok, "%name% ( !!)") && tok->str() != scope.className) {
                 const auto range = c_strFuncParam.equal_range(tok->function());
@@ -2068,13 +2189,9 @@ void CheckStl::string_c_str()
                         }
                     }
                 }
-            } else if (printPerformance && Token::Match(tok, "%var% (|{ %var% . c_str|data ( ) !!,") &&
-                       tok->variable() && (tok->variable()->isStlStringType() || tok->variable()->isStlStringViewType()) &&
-                       tok->tokAt(2)->variable() && tok->tokAt(2)->variable()->isStlStringType()) {
+            } else if (printPerformance && isc_strConstructor(tok)) {
                 string_c_strConstructor(tok, tok->variable()->getTypeName());
-            } else if (printPerformance && tok->next() && tok->next()->variable() && tok->next()->variable()->isStlStringType() && tok->valueType() && tok->valueType()->type == ValueType::CONTAINER &&
-                       ((Token::Match(tok->previous(), "%var% + %var% . c_str|data ( )") && tok->previous()->variable() && tok->previous()->variable()->isStlStringType()) ||
-                        (Token::Match(tok->tokAt(-5), "%var% . c_str|data ( ) + %var%") && tok->tokAt(-5)->variable() && tok->tokAt(-5)->variable()->isStlStringType()))) {
+            } else if (printPerformance && isc_strConcat(tok)) {
                 string_c_strConcat(tok);
             } else if (printPerformance && Token::simpleMatch(tok, "<<") && tok->astOperand2() && Token::Match(tok->astOperand2()->astOperand1(), ". c_str|data ( )")) {
                 const Token* str = tok->astOperand2()->astOperand1()->astOperand1();
@@ -2167,25 +2284,25 @@ void CheckStl::string_c_str()
     }
 }
 
-void CheckStl::string_c_strThrowError(const Token* tok)
+void CheckStlImpl::string_c_strThrowError(const Token* tok)
 {
     reportError(tok, Severity::error, "stlcstrthrow", "Dangerous usage of c_str(). The value returned by c_str() is invalid after throwing exception.\n"
                 "Dangerous usage of c_str(). The string is destroyed after the c_str() call so the thrown pointer is invalid.");
 }
 
-void CheckStl::string_c_strError(const Token* tok)
+void CheckStlImpl::string_c_strError(const Token* tok)
 {
     reportError(tok, Severity::error, "stlcstr", "Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.\n"
                 "Dangerous usage of c_str(). The c_str() return value is only valid until its string is deleted.", CWE664, Certainty::normal);
 }
 
-void CheckStl::string_c_strReturn(const Token* tok)
+void CheckStlImpl::string_c_strReturn(const Token* tok)
 {
     reportError(tok, Severity::performance, "stlcstrReturn", "Returning the result of c_str() in a function that returns std::string is slow and redundant.\n"
                 "The conversion from const char* as returned by c_str() to std::string creates an unnecessary string copy. Solve that by directly returning the string.", CWE704, Certainty::normal);
 }
 
-void CheckStl::string_c_strParam(const Token* tok, nonneg int number, const std::string& argtype)
+void CheckStlImpl::string_c_strParam(const Token* tok, nonneg int number, const std::string& argtype)
 {
     std::ostringstream oss;
     oss << "Passing the result of c_str() to a function that takes " << argtype << " as argument no. " << number << " is slow and redundant.\n"
@@ -2193,28 +2310,28 @@ void CheckStl::string_c_strParam(const Token* tok, nonneg int number, const std:
     reportError(tok, Severity::performance, "stlcstrParam", oss.str(), CWE704, Certainty::normal);
 }
 
-void CheckStl::string_c_strConstructor(const Token* tok, const std::string& argtype)
+void CheckStlImpl::string_c_strConstructor(const Token* tok, const std::string& argtype)
 {
     std::string msg = "Constructing a " + argtype + " from the result of c_str() is slow and redundant.\n"
                       "Constructing a " + argtype + " from const char* requires a call to strlen(). Solve that by directly passing the string.";
     reportError(tok, Severity::performance, "stlcstrConstructor", msg, CWE704, Certainty::normal);
 }
 
-void CheckStl::string_c_strAssignment(const Token* tok, const std::string& argtype)
+void CheckStlImpl::string_c_strAssignment(const Token* tok, const std::string& argtype)
 {
     std::string msg = "Assigning the result of c_str() to a " + argtype + " is slow and redundant.\n"
                       "Assigning a const char* to a " + argtype + " requires a call to strlen(). Solve that by directly assigning the string.";
     reportError(tok, Severity::performance, "stlcstrAssignment", msg, CWE704, Certainty::normal);
 }
 
-void CheckStl::string_c_strConcat(const Token* tok)
+void CheckStlImpl::string_c_strConcat(const Token* tok)
 {
     std::string msg = "Concatenating the result of c_str() and a std::string is slow and redundant.\n"
                       "Concatenating a const char* with a std::string requires a call to strlen(). Solve that by directly concatenating the strings.";
     reportError(tok, Severity::performance, "stlcstrConcat", msg, CWE704, Certainty::normal);
 }
 
-void CheckStl::string_c_strStream(const Token* tok)
+void CheckStlImpl::string_c_strStream(const Token* tok)
 {
     std::string msg = "Passing the result of c_str() to a stream is slow and redundant.\n"
                       "Passing a const char* to a stream requires a call to strlen(). Solve that by directly passing the string.";
@@ -2235,10 +2352,10 @@ namespace {
 
 }
 
-void CheckStl::uselessCalls()
+void CheckStlImpl::uselessCalls()
 {
-    const bool printPerformance = mSettings->severity.isEnabled(Severity::performance);
-    const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
+    const bool printPerformance = mSettings.severity.isEnabled(Severity::performance);
+    const bool printWarning = mSettings.severity.isEnabled(Severity::warning);
     if (!printPerformance && !printWarning)
         return;
 
@@ -2275,7 +2392,7 @@ void CheckStl::uselessCalls()
                        !tok->tokAt(4)->astParent() &&
                        tok->next()->variable() && tok->next()->variable()->isStlType(stl_containers_with_empty_and_clear))
                 uselessCallsEmptyError(tok->next());
-            else if (Token::Match(tok, "[{};] std :: remove|remove_if|unique (") && tok->tokAt(5)->nextArgument())
+            else if (Token::Match(tok, "[{};] std :: remove|remove_if|unique (") && tok->tokAt(5)->nextArgument() && !tok->tokAt(4)->astParent())
                 uselessCallsRemoveError(tok->next(), tok->strAt(3));
             else if (printPerformance && tok->valueType() && tok->valueType()->type == ValueType::CONTAINER) {
                 if (Token::Match(tok, "%var% = { %var% . begin ( ) ,") && tok->varId() == tok->tokAt(3)->varId())
@@ -2296,7 +2413,7 @@ void CheckStl::uselessCalls()
 }
 
 
-void CheckStl::uselessCallsReturnValueError(const Token *tok, const std::string &varname, const std::string &function)
+void CheckStlImpl::uselessCallsReturnValueError(const Token *tok, const std::string &varname, const std::string &function)
 {
     std::ostringstream errmsg;
     errmsg << "$symbol:" << varname << '\n';
@@ -2309,7 +2426,7 @@ void CheckStl::uselessCallsReturnValueError(const Token *tok, const std::string
     reportError(tok, Severity::warning, "uselessCallsCompare", errmsg.str(), CWE628, Certainty::normal);
 }
 
-void CheckStl::uselessCallsSwapError(const Token *tok, const std::string &varname)
+void CheckStlImpl::uselessCallsSwapError(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::performance, "uselessCallsSwap",
                 "$symbol:" + varname + "\n"
@@ -2319,7 +2436,7 @@ void CheckStl::uselessCallsSwapError(const Token *tok, const std::string &varnam
                 "code is inefficient. Is the object or the parameter wrong here?", CWE628, Certainty::normal);
 }
 
-void CheckStl::uselessCallsSubstrError(const Token *tok, SubstrErrorType type)
+void CheckStlImpl::uselessCallsSubstrError(const Token *tok, SubstrErrorType type)
 {
     std::string msg = "Ineffective call of function 'substr' because ";
     switch (type) {
@@ -2339,19 +2456,19 @@ void CheckStl::uselessCallsSubstrError(const Token *tok, SubstrErrorType type)
     reportError(tok, Severity::performance, "uselessCallsSubstr", msg, CWE398, Certainty::normal);
 }
 
-void CheckStl::uselessCallsConstructorError(const Token *tok)
+void CheckStlImpl::uselessCallsConstructorError(const Token *tok)
 {
     const std::string container = tok ? tok->str() : "";
     const std::string msg = "Inefficient constructor call: container '" + container + "' is assigned a partial copy of itself. Use erase() or resize() instead.";
     reportError(tok, Severity::performance, "uselessCallsConstructor", msg, CWE398, Certainty::normal);
 }
 
-void CheckStl::uselessCallsEmptyError(const Token *tok)
+void CheckStlImpl::uselessCallsEmptyError(const Token *tok)
 {
     reportError(tok, Severity::warning, "uselessCallsEmpty", "Ineffective call of function 'empty()'. Did you intend to call 'clear()' instead?", CWE398, Certainty::normal);
 }
 
-void CheckStl::uselessCallsRemoveError(const Token *tok, const std::string& function)
+void CheckStlImpl::uselessCallsRemoveError(const Token *tok, const std::string& function)
 {
     reportError(tok, Severity::warning, "uselessCallsRemove",
                 "$symbol:" + function + "\n"
@@ -2362,9 +2479,9 @@ void CheckStl::uselessCallsRemoveError(const Token *tok, const std::string& func
 
 // Check for iterators being dereferenced before being checked for validity.
 // E.g.  if (*i && i != str.end()) { }
-void CheckStl::checkDereferenceInvalidIterator()
+void CheckStlImpl::checkDereferenceInvalidIterator()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckStl::checkDereferenceInvalidIterator"); // warning
@@ -2426,10 +2543,8 @@ void CheckStl::checkDereferenceInvalidIterator()
 }
 
 
-void CheckStl::checkDereferenceInvalidIterator2()
+void CheckStlImpl::checkDereferenceInvalidIterator2()
 {
-    const bool printInconclusive = (mSettings->certainty.isEnabled(Certainty::inconclusive));
-
     logChecker("CheckStl::checkDereferenceInvalidIterator2");
 
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
@@ -2442,20 +2557,16 @@ void CheckStl::checkDereferenceInvalidIterator2()
             continue;
 
         std::vector<ValueFlow::Value> contValues;
-        std::copy_if(tok->values().cbegin(), tok->values().cend(), std::back_inserter(contValues), [&](const ValueFlow::Value& value) {
-            if (value.isImpossible())
-                return false;
-            if (!printInconclusive && value.isInconclusive())
-                return false;
-            return value.isContainerSizeValue();
+        std::copy_if(tok->values().cbegin(),
+                     tok->values().cend(),
+                     std::back_inserter(contValues),
+                     [&](const ValueFlow::Value& value) {
+            return isUsableValue(value, mSettings) && value.isContainerSizeValue();
         });
 
-
         // Can iterator point to END or before START?
         for (const ValueFlow::Value& value:tok->values()) {
-            if (value.isImpossible())
-                continue;
-            if (!printInconclusive && value.isInconclusive())
+            if (!isUsableValue(value, mSettings))
                 continue;
             if (!value.isIteratorValue())
                 continue;
@@ -2469,6 +2580,8 @@ void CheckStl::checkDereferenceInvalidIterator2()
                 auto it = std::find_if(contValues.cbegin(), contValues.cend(), [&](const ValueFlow::Value& c) {
                     if (value.path != c.path)
                         return false;
+                    if (!sizeValueAppliesToIterator(c, value))
+                        return false;
                     if (value.isIteratorStartValue() && value.intvalue >= c.intvalue)
                         return true;
                     if (value.isIteratorEndValue() && -value.intvalue > c.intvalue)
@@ -2498,7 +2611,7 @@ void CheckStl::checkDereferenceInvalidIterator2()
                     emptyAdvance = tok->astParent();
                 }
             }
-            if (!CheckNullPointer::isPointerDeRef(tok, unknown, *mSettings) && !isInvalidIterator && !emptyAdvance) {
+            if (!CheckNullPointerImpl::isPointerDeRef(tok, unknown, mSettings.library) && !isInvalidIterator && !emptyAdvance) {
                 if (!unknown)
                     continue;
                 inconclusive = true;
@@ -2522,7 +2635,7 @@ void CheckStl::checkDereferenceInvalidIterator2()
     }
 }
 
-void CheckStl::dereferenceInvalidIteratorError(const Token* tok, const ValueFlow::Value *value, bool inconclusive)
+void CheckStlImpl::dereferenceInvalidIteratorError(const Token* tok, const ValueFlow::Value *value, bool inconclusive)
 {
     const std::string& varname = tok ? tok->expressionString() : "var";
     const std::string errmsgcond("$symbol:" + varname + '\n' + ValueFlow::eitherTheConditionIsRedundant(value ? value->condition : nullptr) + " or there is possible dereference of an invalid iterator: $symbol.");
@@ -2531,7 +2644,7 @@ void CheckStl::dereferenceInvalidIteratorError(const Token* tok, const ValueFlow
         reportError(tok, Severity::warning, "derefInvalidIteratorRedundantCheck", errmsgcond, CWE825, Certainty::normal);
         return;
     }
-    if (!mSettings->isEnabled(value, inconclusive))
+    if (!mSettings.isEnabled(value, inconclusive))
         return;
 
     ErrorPath errorPath = getErrorPath(tok, value, "Dereference of an invalid iterator");
@@ -2551,7 +2664,7 @@ void CheckStl::dereferenceInvalidIteratorError(const Token* tok, const ValueFlow
     }
 }
 
-void CheckStl::dereferenceInvalidIteratorError(const Token* deref, const std::string &iterName)
+void CheckStlImpl::dereferenceInvalidIteratorError(const Token* deref, const std::string &iterName)
 {
     reportError(deref, Severity::warning,
                 "derefInvalidIterator",
@@ -2560,7 +2673,7 @@ void CheckStl::dereferenceInvalidIteratorError(const Token* deref, const std::st
                 "Possible dereference of an invalid iterator: $symbol. Make sure to check that the iterator is valid before dereferencing it - not after.", CWE825, Certainty::normal);
 }
 
-void CheckStl::useStlAlgorithmError(const Token *tok, const std::string &algoName)
+void CheckStlImpl::useStlAlgorithmError(const Token *tok, const std::string &algoName)
 {
     reportError(tok, Severity::style, "useStlAlgorithm",
                 "Consider using " + algoName + " algorithm instead of a raw loop.", CWE398, Certainty::normal);
@@ -2815,26 +2928,25 @@ static bool isTernaryAssignment(const Token* assignTok, nonneg int loopVarId, no
 
 namespace {
     struct LoopAnalyzer {
-        const Token* bodyTok = nullptr;
-        const Token* loopVar = nullptr;
-        const Settings* settings = nullptr;
-        std::set<nonneg int> varsChanged;
-
-        explicit LoopAnalyzer(const Token* tok, const Settings* psettings)
-            : bodyTok(tok->linkAt(1)->next()), settings(psettings)
+    private:
+        const Token* mBodyTok;
+        const Token* mLoopVar{};
+        RefThunk<const Settings> mSettings;
+        std::set<nonneg int> mVarsChanged;
+
+    public:
+        explicit LoopAnalyzer(const Token* tok, const Settings& settings)
+            : mBodyTok(tok->linkAt(1)->next()), mSettings(settings)
         {
             const Token* splitTok = tok->next()->astOperand2();
             if (Token::simpleMatch(splitTok, ":") && splitTok->previous()->varId() != 0) {
-                loopVar = splitTok->previous();
+                mLoopVar = splitTok->previous();
             }
             if (valid()) {
                 findChangedVariables();
             }
         }
-        bool isLoopVarChanged() const {
-            return varsChanged.count(loopVar->varId()) > 0;
-        }
-
+    private:
         bool isModified(const Token* tok) const
         {
             if (tok->variable() && tok->variable()->isConst())
@@ -2842,11 +2954,11 @@ namespace {
             int n = 1 + (astIsPointer(tok) ? 1 : 0);
             for (int i = 0; i < n; i++) {
                 bool inconclusive = false;
-                if (isVariableChangedByFunctionCall(tok, i, *settings, &inconclusive))
+                if (isVariableChangedByFunctionCall(tok, i, mSettings().library, &inconclusive))
                     return true;
                 if (inconclusive)
                     return true;
-                if (isVariableChanged(tok, i, *settings))
+                if (isVariableChanged(tok, i, mSettings))
                     return true;
             }
             return false;
@@ -2855,7 +2967,7 @@ namespace {
         template<class Predicate, class F>
         void findTokens(Predicate pred, F f) const
         {
-            for (const Token* tok = bodyTok; precedes(tok, bodyTok->link()); tok = tok->next()) {
+            for (const Token* tok = mBodyTok; precedes(tok, mBodyTok->link()); tok = tok->next()) {
                 if (pred(tok))
                     f(tok);
             }
@@ -2864,7 +2976,7 @@ namespace {
         template<class Predicate>
         const Token* findToken(Predicate pred) const
         {
-            for (const Token* tok = bodyTok; precedes(tok, bodyTok->link()); tok = tok->next()) {
+            for (const Token* tok = mBodyTok; precedes(tok, mBodyTok->link()); tok = tok->next()) {
                 if (pred(tok))
                     return tok;
             }
@@ -2879,58 +2991,56 @@ namespace {
         }
 
         bool valid() const {
-            return bodyTok && loopVar;
+            return mBodyTok && mLoopVar;
         }
 
+    public:
         std::string findAlgo() const
         {
             if (!valid())
                 return "";
-            bool loopVarChanged = isLoopVarChanged();
-            if (!loopVarChanged && varsChanged.empty()) {
-                if (hasGotoOrBreak())
-                    return "";
-                bool alwaysTrue = true;
-                bool alwaysFalse = true;
-                auto hasReturn = [](const Token* tok) {
-                    return Token::simpleMatch(tok, "return");
-                };
-                findTokens(hasReturn, [&](const Token* tok) {
-                    const Token* returnTok = tok->astOperand1();
-                    if (!returnTok || !returnTok->hasKnownIntValue() || !astIsBool(returnTok)) {
-                        alwaysTrue = false;
-                        alwaysFalse = false;
-                        return;
-                    }
-                    (returnTok->getKnownIntValue() ? alwaysTrue : alwaysFalse) &= true;
-                    (returnTok->getKnownIntValue() ? alwaysFalse : alwaysTrue) &= false;
-                });
-                if (alwaysTrue == alwaysFalse)
-                    return "";
-                if (alwaysTrue)
-                    return "std::any_of";
-                return "std::all_of or std::none_of";
-            }
-            return "";
+            if (!mVarsChanged.empty())
+                return "";
+            if (hasGotoOrBreak())
+                return "";
+            bool alwaysTrue = true;
+            bool alwaysFalse = true;
+            const auto hasReturn = [](const Token* tok) {
+                return Token::simpleMatch(tok, "return");
+            };
+            findTokens(hasReturn, [&](const Token* tok) {
+                const Token* returnTok = tok->astOperand1();
+                if (!returnTok || !returnTok->hasKnownIntValue() || !astIsBool(returnTok)) {
+                    alwaysTrue = false;
+                    alwaysFalse = false;
+                    return;
+                }
+                (returnTok->getKnownIntValue() ? alwaysTrue : alwaysFalse) &= true;
+                (returnTok->getKnownIntValue() ? alwaysFalse : alwaysTrue) &= false;
+            });
+            if (alwaysTrue == alwaysFalse)
+                return "";
+            if (alwaysTrue)
+                return "std::any_of";
+            return "std::all_of or std::none_of";
         }
-
+    private:
         bool isLocalVar(const Variable* var) const
         {
             if (!var)
                 return false;
             if (var->isPointer() || var->isReference())
                 return false;
-            if (var->declarationId() == loopVar->varId())
+            if (var->declarationId() == mLoopVar->varId())
                 return false;
             const Scope* scope = var->scope();
-            return scope && scope->isNestedIn(bodyTok->scope());
+            return scope && scope->isNestedIn(mBodyTok->scope());
         }
 
-    private:
         void findChangedVariables()
         {
             std::set<nonneg int> vars;
-            for (const Token* tok = bodyTok; precedes(tok, bodyTok->link()); tok = tok->next()) {
+            for (const Token* tok = mBodyTok; precedes(tok, mBodyTok->link()); tok = tok->next()) {
                 if (tok->varId() == 0)
                     continue;
                 if (vars.count(tok->varId()) > 0)
@@ -2941,16 +3051,16 @@ namespace {
                 }
                 if (!isModified(tok))
                     continue;
-                varsChanged.insert(tok->varId());
+                mVarsChanged.insert(tok->varId());
                 vars.insert(tok->varId());
             }
         }
     };
 } // namespace
 
-void CheckStl::useStlAlgorithm()
+void CheckStlImpl::useStlAlgorithm()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("useStlAlgorithm"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("useStlAlgorithm"))
         return;
 
     logChecker("CheckStl::useStlAlgorithm"); // style
@@ -2966,7 +3076,7 @@ void CheckStl::useStlAlgorithm()
         if (!Token::simpleMatch(tok, "{") || !Token::simpleMatch(tok->previous(), ")"))
             return false;
         const Token* condTok = tok->linkAt(-1)->astOperand2();
-        if (isConstExpression(condTok, mSettings->library)) {
+        if (isConstExpression(condTok, mSettings.library)) {
             if (condTok->str() == "<")
                 type = ConditionOpType::MIN;
             else if (condTok->str() == ">")
@@ -3030,7 +3140,7 @@ void CheckStl::useStlAlgorithm()
 
             // Check for single assignment
             bool useLoopVarInAssign{}, hasBreak{};
-            const Token *assignTok = singleAssignInScope(bodyTok, loopVar->varId(), useLoopVarInAssign, hasBreak, loopType, *mSettings);
+            const Token *assignTok = singleAssignInScope(bodyTok, loopVar->varId(), useLoopVarInAssign, hasBreak, loopType, mSettings);
             if (assignTok) {
                 if (!checkAssignee(assignTok->astOperand1()))
                     continue;
@@ -3062,21 +3172,20 @@ void CheckStl::useStlAlgorithm()
             }
             // Check for container calls
             bool useLoopVarInMemCall;
-            const Token *memberAccessTok = singleMemberCallInScope(bodyTok, loopVar->varId(), useLoopVarInMemCall, *mSettings);
+            const Token *memberAccessTok = singleMemberCallInScope(bodyTok, loopVar->varId(), useLoopVarInMemCall, mSettings);
             if (memberAccessTok && loopType == LoopType::RANGE) {
-                const Token *memberCallTok = memberAccessTok->astOperand2();
                 const int contVarId = memberAccessTok->astOperand1()->varId();
                 if (contVarId == loopVar->varId())
                     continue;
-                if (memberCallTok->str() == "push_back" ||
-                    memberCallTok->str() == "push_front" ||
-                    memberCallTok->str() == "emplace_back") {
+                using Action = Library::Container::Action;
+                const auto action = astContainerAction(memberAccessTok->astOperand1(), mSettings.library);
+                if (contains({Action::PUSH, Action::INSERT}, action)) {
                     std::string algo;
                     if (useLoopVarInMemCall)
                         algo = "std::copy";
                     else
                         algo = "std::transform";
-                    useStlAlgorithmError(memberCallTok, algo);
+                    useStlAlgorithmError(memberAccessTok->astOperand2(), algo);
                 }
                 continue;
             }
@@ -3095,10 +3204,10 @@ void CheckStl::useStlAlgorithm()
             }
 
             // Check for conditionals
-            const Token *condBodyTok = singleConditionalInScope(bodyTok, loopVar->varId(), loopType, *mSettings);
+            const Token *condBodyTok = singleConditionalInScope(bodyTok, loopVar->varId(), loopType, mSettings);
             if (condBodyTok) {
                 // Check for single assign
-                assignTok = singleAssignInScope(condBodyTok, loopVar->varId(), useLoopVarInAssign, hasBreak, loopType, *mSettings);
+                assignTok = singleAssignInScope(condBodyTok, loopVar->varId(), useLoopVarInAssign, hasBreak, loopType, mSettings);
                 if (assignTok) {
                     if (!checkAssignee(assignTok->astOperand1()))
                         continue;
@@ -3139,7 +3248,7 @@ void CheckStl::useStlAlgorithm()
                 }
 
                 // Check for container call
-                memberAccessTok = singleMemberCallInScope(condBodyTok, loopVar->varId(), useLoopVarInMemCall, *mSettings);
+                memberAccessTok = singleMemberCallInScope(condBodyTok, loopVar->varId(), useLoopVarInMemCall, mSettings);
                 if (memberAccessTok) {
                     const Token *memberCallTok = memberAccessTok->astOperand2();
                     const int contVarId = memberAccessTok->astOperand1()->varId();
@@ -3184,7 +3293,7 @@ void CheckStl::useStlAlgorithm()
     }
 }
 
-void CheckStl::knownEmptyContainerError(const Token *tok, const std::string& algo)
+void CheckStlImpl::knownEmptyContainerError(const Token *tok, const std::string& algo)
 {
     const std::string var = tok ? tok->expressionString() : std::string("var");
 
@@ -3215,9 +3324,9 @@ static bool isKnownEmptyContainer(const Token* tok)
     });
 }
 
-void CheckStl::knownEmptyContainer()
+void CheckStlImpl::knownEmptyContainer()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("knownEmptyContainer"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("knownEmptyContainer"))
         return;
     logChecker("CheckStl::knownEmptyContainer"); // style
     for (const Scope *function : mTokenizer->getSymbolDatabase()->functionScopes) {
@@ -3242,8 +3351,8 @@ void CheckStl::knownEmptyContainer()
                 if (args.empty())
                     continue;
 
-                for (int argnr = 1; argnr <= args.size(); ++argnr) {
-                    const Library::ArgumentChecks::IteratorInfo *i = mSettings->library.getArgIteratorInfo(tok, argnr);
+                for (size_t argnr = 1; argnr <= args.size(); ++argnr) {
+                    const Library::ArgumentChecks::IteratorInfo *i = mSettings.library.getArgIteratorInfo(tok, argnr);
                     if (!i)
                         continue;
                     const Token * const argTok = args[argnr - 1];
@@ -3258,7 +3367,7 @@ void CheckStl::knownEmptyContainer()
     }
 }
 
-void CheckStl::eraseIteratorOutOfBoundsError(const Token *ftok, const Token* itertok, const ValueFlow::Value* val)
+void CheckStlImpl::eraseIteratorOutOfBoundsError(const Token *ftok, const Token* itertok, const ValueFlow::Value* val)
 {
     if (!ftok || !itertok || !val) {
         reportError(ftok, Severity::error, "eraseIteratorOutOfBounds",
@@ -3279,8 +3388,8 @@ void CheckStl::eraseIteratorOutOfBoundsError(const Token *ftok, const Token* ite
     }
 
     const Severity severity = isConditional ? Severity::warning : Severity::error;
-    const std::string id = isConditional ? "eraseIteratorOutOfBoundsCond" : "eraseIteratorOutOfBounds";
-    reportError(ftok, severity,
+    const char* id = isConditional ? "eraseIteratorOutOfBoundsCond" : "eraseIteratorOutOfBounds";
+    reportError(getErrorPath(ftok, val, msg), severity,
                 id,
                 msg, CWE628, Certainty::normal);
 }
@@ -3303,7 +3412,7 @@ static const ValueFlow::Value* getOOBIterValue(const Token* tok, const ValueFlow
     return it != tok->values().end() ? &*it : nullptr;
 }
 
-void CheckStl::eraseIteratorOutOfBounds()
+void CheckStlImpl::eraseIteratorOutOfBounds()
 {
     logChecker("CheckStl::eraseIteratorOutOfBounds");
     for (const Scope *function : mTokenizer->getSymbolDatabase()->functionScopes) {
@@ -3329,6 +3438,383 @@ void CheckStl::eraseIteratorOutOfBounds()
     }
 }
 
+namespace {
+// An iterator position described by the ValueFlow values attached to the iterator expression
+    struct IteratorPosition {
+        const ValueFlow::Value* value = nullptr; // ITERATOR_START or ITERATOR_END value
+        const ValueFlow::Value* sizeValue = nullptr; // container size value with the same path, if available
+        bool fromEnd() const {
+            return value->isIteratorEndValue();
+        }
+        explicit operator bool() const {
+            return value != nullptr;
+        }
+    };
+
+// A number of elements together with the ValueFlow values it was derived from
+    struct ElementCount {
+        MathLib::bigint count = 0;
+        std::vector<const ValueFlow::Value*> values;
+        explicit operator bool() const {
+            return !values.empty();
+        }
+    };
+
+// The best candidate proving an out of bounds access, preferring proofs without possible values
+    struct BestCandidate {
+        ElementCount best;
+        bool certain = false;
+        void consider(const ElementCount& candidate)
+        {
+            const bool candidateCertain =
+                std::none_of(candidate.values.cbegin(), candidate.values.cend(), std::mem_fn(&ValueFlow::Value::isPossible));
+            if (best && (certain || !candidateCertain))
+                return;
+            best = candidate;
+            certain = candidateCertain;
+        }
+    };
+} // namespace
+
+// Get the first ValueFlow value of a token matching the predicate, preferring known values
+template<class Predicate>
+static const ValueFlow::Value* selectPreferredValue(const Token* tok, const Predicate& pred)
+{
+    const ValueFlow::Value* result = nullptr;
+    for (const ValueFlow::Value& value : tok->values()) {
+        if (!pred(value))
+            continue;
+        if (result && !(value.isKnown() && !result->isKnown()))
+            continue;
+        result = &value;
+    }
+    return result;
+}
+
+// Get the iterator value of an iterator expression together with the container size value that
+// ValueFlow has added to the iterator
+static IteratorPosition getIteratorPosition(const Token* tok, const Settings& settings)
+{
+    IteratorPosition position;
+    if (!tok)
+        return position;
+    position.value = selectPreferredValue(tok, [&](const ValueFlow::Value& value) {
+        return isUsableValue(value, settings) && value.isIteratorValue();
+    });
+    if (!position.value)
+        return position;
+    position.sizeValue = selectPreferredValue(tok, [&](const ValueFlow::Value& value) {
+        return isUsableValue(value, settings) && value.isContainerSizeValue() && value.path == position.value->path &&
+               sizeValueAppliesToIterator(value, *position.value);
+    });
+    return position;
+}
+
+// Compute the distance last-first between two iterators into the same container
+static ElementCount getIteratorDistance(const IteratorPosition& first, const IteratorPosition& last)
+{
+    ElementCount distance;
+    if (first.value->path != last.value->path)
+        return distance;
+    // bounded values could make the distance an overestimate
+    if (first.value->bound != ValueFlow::Value::Bound::Point || last.value->bound != ValueFlow::Value::Bound::Point)
+        return distance;
+    if (first.fromEnd() == last.fromEnd()) { // the container size cancels out
+        distance.count = last.value->intvalue - first.value->intvalue;
+        distance.values = {first.value, last.value};
+        return distance;
+    }
+    const IteratorPosition& endPosition = first.fromEnd() ? first : last;
+    if (!endPosition.sizeValue || endPosition.sizeValue->bound != ValueFlow::Value::Bound::Point)
+        return distance;
+    const MathLib::bigint endIndex = endPosition.sizeValue->intvalue + endPosition.value->intvalue;
+    distance.count = last.fromEnd() ? endIndex - first.value->intvalue : last.value->intvalue - endIndex;
+    distance.values = {first.value, last.value, endPosition.sizeValue};
+    return distance;
+}
+
+// Compute the number of elements available in the container behind the iterator position
+static ElementCount getAvailableSpace(const IteratorPosition& position)
+{
+    ElementCount available;
+    // the position could be smaller, which would make more elements available
+    if (position.value->bound == ValueFlow::Value::Bound::Upper)
+        return available;
+    if (position.fromEnd()) { // the container size cancels out
+        available.count = -position.value->intvalue;
+        available.values = {position.value};
+        return available;
+    }
+    // the container size could be larger, which would make more elements available
+    if (!position.sizeValue || position.sizeValue->bound == ValueFlow::Value::Bound::Lower)
+        return available;
+    available.count = position.sizeValue->intvalue - position.value->intvalue;
+    available.values = {position.value, position.sizeValue};
+    return available;
+}
+
+// Find iterator values and paired container sizes of the iterator that prove accessing <accessed>
+// elements to be out of bounds, preferring a proof that does not rely on possible values
+static ElementCount findInsufficientSpace(const Token* tok,
+                                          MathLib::bigint accessed,
+                                          MathLib::bigint sourcePath,
+                                          const Settings& settings)
+{
+    BestCandidate insufficient;
+    if (!tok)
+        return insufficient.best;
+    const auto consider = [&](const ElementCount& candidate) {
+        if (!candidate)
+            return;
+        if (candidate.count < 0 || accessed <= candidate.count)
+            return; // the space is sufficient
+        insufficient.consider(candidate);
+    };
+    for (const ValueFlow::Value& value : tok->values()) {
+        if (!isUsableValue(value, settings) || !value.isIteratorValue())
+            continue;
+        if (value.path != 0 && sourcePath != 0 && value.path != sourcePath)
+            continue;
+        IteratorPosition position;
+        position.value = &value;
+        if (position.fromEnd()) { // the available space does not depend on the container size
+            consider(getAvailableSpace(position));
+            continue;
+        }
+        for (const ValueFlow::Value& sizeValue : tok->values()) {
+            if (!isUsableValue(sizeValue, settings) || !sizeValue.isContainerSizeValue() || sizeValue.path != value.path)
+                continue;
+            if (!sizeValueAppliesToIterator(sizeValue, value))
+                continue;
+            position.sizeValue = &sizeValue;
+            consider(getAvailableSpace(position));
+        }
+    }
+    return insufficient.best;
+}
+
+// Find iterator values and paired container sizes of the source range that prove more than
+// <available> elements to be accessed, preferring a proof that does not rely on possible values
+static ElementCount findExcessiveDistance(const Token* firstTok,
+                                          const Token* lastTok,
+                                          MathLib::bigint available,
+                                          MathLib::bigint destPath,
+                                          const Settings& settings)
+{
+    BestCandidate excessive;
+    const auto consider = [&](const ElementCount& candidate) {
+        if (!candidate)
+            return;
+        if (candidate.count <= available)
+            return; // the access is within bounds
+        excessive.consider(candidate);
+    };
+    for (const ValueFlow::Value& firstValue : firstTok->values()) {
+        if (!isUsableValue(firstValue, settings) || !firstValue.isIteratorValue())
+            continue;
+        if (firstValue.path != 0 && destPath != 0 && firstValue.path != destPath)
+            continue;
+        for (const ValueFlow::Value& lastValue : lastTok->values()) {
+            if (!isUsableValue(lastValue, settings) || !lastValue.isIteratorValue())
+                continue;
+            IteratorPosition first, last;
+            first.value = &firstValue;
+            last.value = &lastValue;
+            if (first.fromEnd() == last.fromEnd()) { // the distance does not depend on the container size
+                consider(getIteratorDistance(first, last));
+                continue;
+            }
+            IteratorPosition& endPosition = first.fromEnd() ? first : last;
+            const Token* const endTok = first.fromEnd() ? firstTok : lastTok;
+            for (const ValueFlow::Value& sizeValue : endTok->values()) {
+                if (!isUsableValue(sizeValue, settings) || !sizeValue.isContainerSizeValue() ||
+                    sizeValue.path != endPosition.value->path)
+                    continue;
+                if (!sizeValueAppliesToIterator(sizeValue, *endPosition.value))
+                    continue;
+                endPosition.sizeValue = &sizeValue;
+                consider(getIteratorDistance(first, last));
+            }
+        }
+    }
+    return excessive.best;
+}
+
+// Find count values of a count-based algorithm that prove more than <available> elements to be accessed
+static ElementCount findExcessiveCount(const Token* tok,
+                                       MathLib::bigint available,
+                                       MathLib::bigint destPath,
+                                       const Settings& settings)
+{
+    BestCandidate excessive;
+    if (!tok)
+        return excessive.best;
+    for (const ValueFlow::Value& value : tok->values()) {
+        if (!isUsableValue(value, settings) || !value.isIntValue())
+            continue;
+        // a count with an upper bound could be smaller, which would make fewer elements accessed
+        if (value.bound == ValueFlow::Value::Bound::Upper)
+            continue;
+        if (value.path != 0 && destPath != 0 && value.path != destPath)
+            continue;
+        if (value.intvalue <= available)
+            continue; // the access is within bounds
+        ElementCount candidate;
+        candidate.count = value.intvalue;
+        candidate.values.push_back(&value);
+        excessive.consider(candidate);
+    }
+    return excessive.best;
+}
+
+// Do not warn when the proof relies on possible values on both sides
+static bool bothSidesPossible(const ElementCount& accessed, const ElementCount& available)
+{
+    const auto isPossible = std::mem_fn(&ValueFlow::Value::isPossible);
+    return std::any_of(accessed.values.cbegin(), accessed.values.cend(), isPossible) &&
+           std::any_of(available.values.cbegin(), available.values.cend(), isPossible);
+}
+
+// Get the number of accessed elements of a count-based algorithm such as std::fill_n
+static const ValueFlow::Value* getCountValue(const Token* tok, const Settings& settings)
+{
+    if (!tok)
+        return nullptr;
+    return selectPreferredValue(tok, [&](const ValueFlow::Value& value) {
+        // a count with an upper bound could be smaller, which would make fewer elements accessed
+        return isUsableValue(value, settings) && value.isIntValue() && value.bound != ValueFlow::Value::Bound::Upper;
+    });
+}
+
+void CheckStlImpl::algorithmOutOfBounds()
+{
+    logChecker("CheckStl::algorithmOutOfBounds");
+    for (const Scope* function : mTokenizer->getSymbolDatabase()->functionScopes) {
+        for (const Token* tok = function->bodyStart; tok != function->bodyEnd; tok = tok->next()) {
+            if (!Token::Match(tok, "std :: %name% ("))
+                continue;
+            const Token* const nameTok = tok->tokAt(2);
+            // algorithms accessing the range denoted by the third argument exactly last1-first1 times..
+            const bool exact = Token::Match(
+                nameTok,
+                "copy|move|swap_ranges|transform|replace_copy|replace_copy_if|reverse_copy|equal|mismatch|is_permutation|partial_sum|adjacent_difference|inner_product (");
+            // ..or at most last1-first1 times, depending on the values in the input range..
+            const bool atMost = !exact && Token::Match(nameTok, "copy_if|remove_copy|remove_copy_if|unique_copy (");
+            // ..or accessing their iterator arguments as many times as the count argument says
+            const bool countBased = !exact && !atMost && Token::Match(nameTok, "copy_n|fill_n|generate_n (");
+            if (!exact && !atMost && !countBased)
+                continue;
+            if (atMost && !mSettings.certainty.isEnabled(Certainty::inconclusive))
+                continue;
+            const std::vector<const Token*> args = getArguments(nameTok);
+            if (args.size() < 3)
+                continue;
+            ElementCount accessed; // source access count using the preferred values
+            std::vector<const Token*> iterArgs;
+            if (countBased) {
+                if (const ValueFlow::Value* countValue = getCountValue(args[1], mSettings)) {
+                    accessed.count = countValue->intvalue;
+                    accessed.values.push_back(countValue);
+                }
+                iterArgs.push_back(args[0]);
+                if (Token::simpleMatch(nameTok, "copy_n"))
+                    iterArgs.push_back(args[2]); // copy_n also writes through the third argument
+            } else {
+                // two-range overloads taking a last2 iterator do not access the second range out of bounds
+                if (Token::Match(nameTok, "equal|mismatch|is_permutation") && args.size() >= 4 && astIsIterator(args[3]))
+                    continue;
+                // both iterators must refer to the same container
+                const ValueFlow::Value firstLifetime = getLifetimeIteratorValue(args[0]);
+                const ValueFlow::Value lastLifetime = getLifetimeIteratorValue(args[1]);
+                if (!firstLifetime.tokvalue || !lastLifetime.tokvalue)
+                    continue;
+                if (!isSameIteratorContainerExpression(firstLifetime.tokvalue,
+                                                       lastLifetime.tokvalue,
+                                                       mSettings,
+                                                       firstLifetime.lifetimeKind))
+                    continue;
+                const IteratorPosition first = getIteratorPosition(args[0], mSettings);
+                const IteratorPosition last = getIteratorPosition(args[1], mSettings);
+                if (first && last)
+                    accessed = getIteratorDistance(first, last);
+                iterArgs.push_back(args[2]);
+                if (Token::simpleMatch(nameTok, "transform") && args.size() == 5)
+                    iterArgs.push_back(args[3]); // binary transform also writes through the fourth argument
+            }
+            if (accessed.count <= 0)
+                accessed = ElementCount();       // there is no preferred source access count
+            for (const Token* const iterArg : iterArgs) {
+                // check the preferred source access count against all destination values..
+                ElementCount sourceCount = accessed;
+                ElementCount available;
+                if (sourceCount)
+                    available =
+                        findInsufficientSpace(iterArg, sourceCount.count, sourceCount.values.front()->path, mSettings);
+                if (!available || bothSidesPossible(sourceCount, available)) {
+                    // ..or all source access counts against the preferred destination values
+                    const IteratorPosition dest = getIteratorPosition(iterArg, mSettings);
+                    if (!dest)
+                        continue;
+                    available = getAvailableSpace(dest);
+                    if (!available || available.count < 0)
+                        continue;
+                    sourceCount =
+                        countBased
+                            ? findExcessiveCount(args[1], available.count, dest.value->path, mSettings)
+                            : findExcessiveDistance(args[0], args[1], available.count, dest.value->path, mSettings);
+                    if (!sourceCount || bothSidesPossible(sourceCount, available))
+                        continue;
+                }
+                const ValueFlow::Value* conditionValue = nullptr;
+                bool inconclusiveValues = false;
+                std::vector<const ValueFlow::Value*> usedValues = sourceCount.values;
+                usedValues.insert(usedValues.end(), available.values.cbegin(), available.values.cend());
+                for (const ValueFlow::Value* value : usedValues) {
+                    if (!conditionValue && value->condition)
+                        conditionValue = value;
+                    inconclusiveValues |= value->isInconclusive();
+                }
+                if (conditionValue && !mSettings.severity.isEnabled(Severity::warning))
+                    continue;
+                const ValueFlow::Value* pathValue = conditionValue ? conditionValue : available.values.back();
+                algorithmOutOfBoundsError(iterArg,
+                                          "std::" + nameTok->str(),
+                                          sourceCount.count,
+                                          available.count,
+                                          pathValue,
+                                          atMost,
+                                          atMost || inconclusiveValues);
+            }
+        }
+    }
+}
+
+void CheckStlImpl::algorithmOutOfBoundsError(const Token* tok,
+                                             const std::string& algoName,
+                                             MathLib::bigint accessed,
+                                             MathLib::bigint available,
+                                             const ValueFlow::Value* value,
+                                             bool mayAccessFewer,
+                                             bool inconclusive)
+{
+    const Token* const condition = value ? value->condition : nullptr;
+    const std::string iterExpr = tok ? tok->expressionString() : "it";
+    const std::string accessedStr = MathLib::toString(accessed) + (accessed == 1 ? " element" : " elements");
+    const std::string availableStr = MathLib::toString(available) + (available == 1 ? " element is" : " elements are");
+    const std::string body = "algorithm '" + algoName + "' " + (mayAccessFewer ? "may access up to " : "accesses ") +
+                             accessedStr + " through the iterator '" + iterExpr + "' but only " + availableStr +
+                             " available.";
+    const std::string msg =
+        condition ? (ValueFlow::eitherTheConditionIsRedundant(condition) + " or the " + body) : ("The " + body);
+    ErrorPath errorPath = getErrorPath(tok, value, "Access out of bounds");
+    reportError(std::move(errorPath),
+                (condition || mayAccessFewer) ? Severity::warning : Severity::error,
+                "algorithmOutOfBounds",
+                msg,
+                CWE788,
+                inconclusive ? Certainty::inconclusive : Certainty::normal);
+}
+
 static bool isMutex(const Variable* var)
 {
     const Token* tok = Token::typeDecl(var->nameToken()).first;
@@ -3350,23 +3836,23 @@ static bool isLocalMutex(const Variable* var, const Scope* scope)
     return !var->isReference() && !var->isRValueReference() && !var->isStatic() && var->scope() == scope;
 }
 
-void CheckStl::globalLockGuardError(const Token* tok)
+void CheckStlImpl::globalLockGuardError(const Token* tok)
 {
     reportError(tok, Severity::warning,
                 "globalLockGuard",
                 "Lock guard is defined globally. Lock guards are intended to be local. A global lock guard could lead to a deadlock since it won't unlock until the end of the program.", CWE833, Certainty::normal);
 }
 
-void CheckStl::localMutexError(const Token* tok)
+void CheckStlImpl::localMutexError(const Token* tok)
 {
     reportError(tok, Severity::warning,
                 "localMutex",
                 "The lock is ineffective because the mutex is locked at the same scope as the mutex itself.", CWE667, Certainty::normal);
 }
 
-void CheckStl::checkMutexes()
+void CheckStlImpl::checkMutexes()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
     logChecker("CheckStl::checkMutexes"); // warning
     for (const Scope *function : mTokenizer->getSymbolDatabase()->functionScopes) {
@@ -3401,13 +3887,13 @@ void CheckStl::checkMutexes()
     }
 }
 
-void CheckStl::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckStl::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
     if (!tokenizer.isCPP()) {
         return;
     }
 
-    CheckStl checkStl(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckStlImpl checkStl(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkStl.erase();
     checkStl.if_find();
     checkStl.checkFindInsert();
@@ -3428,6 +3914,7 @@ void CheckStl::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
     checkStl.mismatchingContainerIterator();
     checkStl.knownEmptyContainer();
     checkStl.eraseIteratorOutOfBounds();
+    checkStl.algorithmOutOfBounds();
 
     checkStl.stlBoundaries();
     checkStl.checkDereferenceInvalidIterator();
@@ -3438,15 +3925,15 @@ void CheckStl::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
     checkStl.size();
 }
 
-void CheckStl::getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const
+void CheckStl::getErrorMessages(ErrorLogger& errorLogger, const Settings& settings) const
 {
-    CheckStl c(nullptr, settings, errorLogger);
+    CheckStlImpl c(nullptr, settings, errorLogger);
     c.outOfBoundsError(nullptr, "container", nullptr, "x", nullptr);
     c.invalidIteratorError(nullptr, "iterator");
     c.iteratorsError(nullptr, "container1", "container2");
     c.iteratorsError(nullptr, nullptr, "container");
     c.invalidContainerLoopError(nullptr, nullptr, ErrorPath{});
-    c.invalidContainerError(nullptr, nullptr, nullptr, ErrorPath{});
+    c.invalidContainerError(nullptr, nullptr, ErrorPath{});
     c.invalidContainerReferenceError(nullptr, nullptr, ErrorPath{});
     c.mismatchingContainerIteratorError(nullptr, nullptr, nullptr);
     c.mismatchingContainersError(nullptr, nullptr);
@@ -3458,7 +3945,7 @@ void CheckStl::getErrorMessages(ErrorLogger* errorLogger, const Settings* settin
     c.stlBoundariesError(nullptr);
     c.if_findError(nullptr, false);
     c.if_findError(nullptr, true);
-    c.checkFindInsertError(nullptr);
+    c.checkFindInsertError(nullptr, nullptr);
     c.string_c_strError(nullptr);
     c.string_c_strReturn(nullptr);
     c.string_c_strParam(nullptr, 0);
@@ -3472,13 +3959,14 @@ void CheckStl::getErrorMessages(ErrorLogger* errorLogger, const Settings* settin
     c.redundantIfRemoveError(nullptr);
     c.uselessCallsReturnValueError(nullptr, "str", "find");
     c.uselessCallsSwapError(nullptr, "str");
-    c.uselessCallsSubstrError(nullptr, SubstrErrorType::COPY);
+    c.uselessCallsSubstrError(nullptr, CheckStlImpl::SubstrErrorType::COPY);
     c.uselessCallsConstructorError(nullptr);
     c.uselessCallsEmptyError(nullptr);
     c.uselessCallsRemoveError(nullptr, "remove");
     c.dereferenceInvalidIteratorError(nullptr, "i");
     // TODO: derefInvalidIteratorRedundantCheck
     c.eraseIteratorOutOfBoundsError(nullptr, nullptr);
+    c.algorithmOutOfBoundsError(nullptr, "std::copy", 10, 6, nullptr, false, false);
     c.useStlAlgorithmError(nullptr, "");
     c.knownEmptyContainerError(nullptr, "");
     c.globalLockGuardError(nullptr);
diff --git a/lib/checkstl.h b/lib/checkstl.h
index 60b9d4c7000..e62b66831b9 100644
--- a/lib/checkstl.h
+++ b/lib/checkstl.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,8 +23,11 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 #include "errortypes.h"
+#include "mathlib.h"
+#include "vfvalue.h"
 
 #include <cstdint>
 #include <string>
@@ -35,10 +38,6 @@ class Token;
 class Variable;
 class ErrorLogger;
 class Tokenizer;
-namespace ValueFlow
-{
-    class Value;
-}
 
 /// @addtogroup Checks
 /// @{
@@ -48,15 +47,43 @@ namespace ValueFlow
 class CPPCHECKLIB CheckStl : public Check {
 public:
     /** This constructor is used when registering the CheckClass */
-    CheckStl() : Check(myName()) {}
+    CheckStl() : Check("STL usage") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckStl(const Tokenizer* tokenizer, const Settings* settings, ErrorLogger* errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** run checks, the token list is not simplified */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings& settings) const override;
+
+    std::string classInfo() const override {
+        return "Check for invalid usage of STL:\n"
+               "- out of bounds errors\n"
+               "- misuse of iterators when iterating through a container\n"
+               "- mismatching containers in calls\n"
+               "- same iterators in calls\n"
+               "- dereferencing an erased iterator\n"
+               "- for vectors: using iterator/pointer after push_back has been used\n"
+               "- optimisation: use empty() instead of size() to guarantee fast code\n"
+               "- suspicious condition when using find\n"
+               "- unnecessary searching in associative containers\n"
+               "- redundant condition\n"
+               "- common mistakes when using string::c_str()\n"
+               "- useless calls of string and STL functions\n"
+               "- dereferencing an invalid iterator\n"
+               "- erasing an iterator that is out of bounds\n"
+               "- out of bounds access of an iterator passed to an STL algorithm\n"
+               "- reading from empty STL container\n"
+               "- iterating over an empty STL container\n"
+               "- consider using an STL algorithm instead of raw loop\n"
+               "- incorrect locking with mutex\n";
+    }
+};
+
+class CPPCHECKLIB CheckStlImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    CheckStlImpl(const Tokenizer* tokenizer, const Settings& settings, ErrorLogger& errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** Accessing container out of bounds using ValueFlow */
     void outOfBounds();
@@ -155,6 +182,12 @@ class CPPCHECKLIB CheckStl : public Check {
 
     void eraseIteratorOutOfBounds();
 
+    /**
+     * Check that the iterator given to an STL algorithm is not accessed
+     * out of bounds: std::equal(in.begin(), in.end(), out.begin())
+     */
+    void algorithmOutOfBounds();
+
     void checkMutexes();
 
     bool isContainerSize(const Token *containerToken, const Token *expr) const;
@@ -178,16 +211,17 @@ class CPPCHECKLIB CheckStl : public Check {
     void iteratorsError(const Token* tok, const std::string& containerName1, const std::string& containerName2);
     void iteratorsError(const Token* tok, const Token* containerTok, const std::string& containerName);
     void mismatchingContainerIteratorError(const Token* containerTok, const Token* iterTok, const Token* containerTok2);
-    void mismatchingContainersError(const Token* tok1, const Token* tok2);
+    void mismatchingContainersError(const Token* tok1, const Token* tok2, ValueFlow::Value::LifetimeKind ltk = ValueFlow::Value::LifetimeKind::Iterator);
     void mismatchingContainerExpressionError(const Token *tok1, const Token *tok2);
     void sameIteratorExpressionError(const Token *tok);
     void stlBoundariesError(const Token* tok);
     void if_findError(const Token* tok, bool str);
-    void checkFindInsertError(const Token *tok);
+    /** @param condTok the comparison in the if condition, nullptr => no specific suggestion */
+    void checkFindInsertError(const Token* tok, const Token* condTok);
     void sizeError(const Token* tok);
     void redundantIfRemoveError(const Token* tok);
     void invalidContainerLoopError(const Token* tok, const Token* loopTok, ErrorPath errorPath);
-    void invalidContainerError(const Token *tok, const Token * contTok, const ValueFlow::Value *val, ErrorPath errorPath);
+    void invalidContainerError(const Token *tok, const ValueFlow::Value *val, ErrorPath errorPath);
     void invalidContainerReferenceError(const Token* tok, const Token* contTok, ErrorPath errorPath);
 
     void uselessCallsReturnValueError(const Token* tok, const std::string& varname, const std::string& function);
@@ -207,36 +241,16 @@ class CPPCHECKLIB CheckStl : public Check {
 
     void eraseIteratorOutOfBoundsError(const Token* ftok, const Token* itertok, const ValueFlow::Value* val = nullptr);
 
+    void algorithmOutOfBoundsError(const Token* tok,
+                                   const std::string& algoName,
+                                   MathLib::bigint accessed,
+                                   MathLib::bigint available,
+                                   const ValueFlow::Value* value,
+                                   bool mayAccessFewer,
+                                   bool inconclusive);
+
     void globalLockGuardError(const Token *tok);
     void localMutexError(const Token *tok);
-
-    void getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const override;
-
-    static std::string myName() {
-        return "STL usage";
-    }
-
-    std::string classInfo() const override {
-        return "Check for invalid usage of STL:\n"
-               "- out of bounds errors\n"
-               "- misuse of iterators when iterating through a container\n"
-               "- mismatching containers in calls\n"
-               "- same iterators in calls\n"
-               "- dereferencing an erased iterator\n"
-               "- for vectors: using iterator/pointer after push_back has been used\n"
-               "- optimisation: use empty() instead of size() to guarantee fast code\n"
-               "- suspicious condition when using find\n"
-               "- unnecessary searching in associative containers\n"
-               "- redundant condition\n"
-               "- common mistakes when using string::c_str()\n"
-               "- useless calls of string and STL functions\n"
-               "- dereferencing an invalid iterator\n"
-               "- erasing an iterator that is out of bounds\n"
-               "- reading from empty STL container\n"
-               "- iterating over an empty STL container\n"
-               "- consider using an STL algorithm instead of raw loop\n"
-               "- incorrect locking with mutex\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkstring.cpp b/lib/checkstring.cpp
index 64b575df72d..1d391895c3e 100644
--- a/lib/checkstring.cpp
+++ b/lib/checkstring.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,11 +36,6 @@
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckString instance;
-}
-
 // CWE ids used:
 static const CWE CWE570(570U);   // Expression is Always False
 static const CWE CWE571(571U);   // Expression is Always True
@@ -52,7 +47,7 @@ static const CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Imple
 //---------------------------------------------------------------------------
 // Writing string literal is UB
 //---------------------------------------------------------------------------
-void CheckString::stringLiteralWrite()
+void CheckStringImpl::stringLiteralWrite()
 {
     logChecker("CheckString::stringLiteralWrite");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -60,7 +55,7 @@ void CheckString::stringLiteralWrite()
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
             if (!tok->variable() || !tok->variable()->isPointer())
                 continue;
-            const Token *str = tok->getValueTokenMinStrSize(*mSettings);
+            const Token *str = tok->getValueTokenMinStrSize(mSettings);
             if (!str)
                 continue;
             if (Token::Match(tok, "%var% [") && Token::simpleMatch(tok->linkAt(1), "] ="))
@@ -71,7 +66,7 @@ void CheckString::stringLiteralWrite()
     }
 }
 
-void CheckString::stringLiteralWriteError(const Token *tok, const Token *strValue)
+void CheckStringImpl::stringLiteralWriteError(const Token *tok, const Token *strValue)
 {
     std::list<const Token*> callstack{ tok };
     if (strValue)
@@ -94,9 +89,9 @@ void CheckString::stringLiteralWriteError(const Token *tok, const Token *strValu
 // Check for string comparison involving two static strings.
 // if(strcmp("00FF00","00FF00")==0) // <- statement is always true
 //---------------------------------------------------------------------------
-void CheckString::checkAlwaysTrueOrFalseStringCompare()
+void CheckStringImpl::checkAlwaysTrueOrFalseStringCompare()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckString::checkAlwaysTrueOrFalseStringCompare"); // warning
@@ -138,7 +133,7 @@ void CheckString::checkAlwaysTrueOrFalseStringCompare()
     }
 }
 
-void CheckString::alwaysTrueFalseStringCompareError(const Token *tok, const std::string& str1, const std::string& str2)
+void CheckStringImpl::alwaysTrueFalseStringCompareError(const Token *tok, const std::string& str1, const std::string& str2)
 {
     constexpr std::size_t stringLen = 10;
     const std::string string1 = (str1.size() < stringLen) ? str1 : (str1.substr(0, stringLen-2) + "..");
@@ -150,7 +145,7 @@ void CheckString::alwaysTrueFalseStringCompareError(const Token *tok, const std:
                 "Therefore the comparison is unnecessary and looks suspicious.", (str1==str2)?CWE571:CWE570, Certainty::normal);
 }
 
-void CheckString::alwaysTrueStringVariableCompareError(const Token *tok, const std::string& str1, const std::string& str2)
+void CheckStringImpl::alwaysTrueStringVariableCompareError(const Token *tok, const std::string& str1, const std::string& str2)
 {
     reportError(tok, Severity::warning, "stringCompare",
                 "Comparison of identical string variables.\n"
@@ -163,9 +158,9 @@ void CheckString::alwaysTrueStringVariableCompareError(const Token *tok, const s
 // Detect "str == '\0'" where "*str == '\0'" is correct.
 // Comparing char* with each other instead of using strcmp()
 //-----------------------------------------------------------------------------
-void CheckString::checkSuspiciousStringCompare()
+void CheckStringImpl::checkSuspiciousStringCompare()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckString::checkSuspiciousStringCompare"); // warning
@@ -202,14 +197,14 @@ void CheckString::checkSuspiciousStringCompare()
     }
 }
 
-void CheckString::suspiciousStringCompareError(const Token* tok, const std::string& var, bool isLong)
+void CheckStringImpl::suspiciousStringCompareError(const Token* tok, const std::string& var, bool isLong)
 {
     const std::string cmpFunc = isLong ? "wcscmp" : "strcmp";
     reportError(tok, Severity::warning, "literalWithCharPtrCompare",
                 "$symbol:" + var + "\nString literal compared with variable '$symbol'. Did you intend to use " + cmpFunc + "() instead?", CWE595, Certainty::normal);
 }
 
-void CheckString::suspiciousStringCompareError_char(const Token* tok, const std::string& var)
+void CheckStringImpl::suspiciousStringCompareError_char(const Token* tok, const std::string& var)
 {
     reportError(tok, Severity::warning, "charLiteralWithCharPtrCompare",
                 "$symbol:" + var + "\nChar literal compared with pointer '$symbol'. Did you intend to dereference it?", CWE595, Certainty::normal);
@@ -225,7 +220,7 @@ static bool isChar(const Variable* var)
     return (var && !var->isPointer() && !var->isArray() && (var->typeStartToken()->str() == "char" || var->typeStartToken()->str() == "wchar_t"));
 }
 
-void CheckString::strPlusChar()
+void CheckStringImpl::strPlusChar()
 {
     logChecker("CheckString::strPlusChar");
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -241,7 +236,7 @@ void CheckString::strPlusChar()
     }
 }
 
-void CheckString::strPlusCharError(const Token *tok)
+void CheckStringImpl::strPlusCharError(const Token *tok)
 {
     std::string charType = "char";
     if (tok && tok->astOperand2() && tok->astOperand2()->variable())
@@ -277,9 +272,9 @@ static bool isMacroUsage(const Token* tok)
 // Implicit casts of string literals to bool
 // Comparing string literal with strlen() with wrong length
 //---------------------------------------------------------------------------
-void CheckString::checkIncorrectStringCompare()
+void CheckStringImpl::checkIncorrectStringCompare()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckString::checkIncorrectStringCompare"); // warning
@@ -319,19 +314,19 @@ void CheckString::checkIncorrectStringCompare()
                 }
             } else if (Token::Match(tok, "%str%|%char%") &&
                        !Token::Match(tok->next(), "%name%") &&
-                       isUsedAsBool(tok, *mSettings) &&
+                       isUsedAsBool(tok, mSettings) &&
                        !isMacroUsage(tok))
                 incorrectStringBooleanError(tok, tok->str());
         }
     }
 }
 
-void CheckString::incorrectStringCompareError(const Token *tok, const std::string& func, const std::string &string)
+void CheckStringImpl::incorrectStringCompareError(const Token *tok, const std::string& func, const std::string &string)
 {
     reportError(tok, Severity::warning, "incorrectStringCompare", "$symbol:" + func + "\nString literal " + string + " doesn't match length argument for $symbol().", CWE570, Certainty::normal);
 }
 
-void CheckString::incorrectStringBooleanError(const Token *tok, const std::string& string)
+void CheckStringImpl::incorrectStringBooleanError(const Token *tok, const std::string& string)
 {
     const bool charLiteral = isCharLiteral(string);
     const std::string literalType = charLiteral ? "char" : "string";
@@ -346,9 +341,9 @@ void CheckString::incorrectStringBooleanError(const Token *tok, const std::strin
 // always true: strcmp(str,"a")==0 || strcmp(str,"b")
 // TODO: Library configuration for string comparison functions
 //---------------------------------------------------------------------------
-void CheckString::overlappingStrcmp()
+void CheckStringImpl::overlappingStrcmp()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckString::overlappingStrcmp"); // warning
@@ -400,7 +395,7 @@ void CheckString::overlappingStrcmp()
                     if (args1[1]->isLiteral() &&
                         args2[1]->isLiteral() &&
                         args1[1]->str() != args2[1]->str() &&
-                        isSameExpression(true, args1[0], args2[0], *mSettings, true, false))
+                        isSameExpression(true, args1[0], args2[0], mSettings, true, false))
                         overlappingStrcmpError(eq0, ne0);
                 }
             }
@@ -408,7 +403,7 @@ void CheckString::overlappingStrcmp()
     }
 }
 
-void CheckString::overlappingStrcmpError(const Token *eq0, const Token *ne0)
+void CheckStringImpl::overlappingStrcmpError(const Token *eq0, const Token *ne0)
 {
     std::string eq0Expr(eq0 ? eq0->expressionString() : std::string("strcmp(x,\"abc\")"));
     if (eq0 && eq0->astParent()->str() == "!")
@@ -425,7 +420,7 @@ void CheckString::overlappingStrcmpError(const Token *eq0, const Token *ne0)
 // Overlapping source and destination passed to sprintf().
 // TODO: Library configuration for overlapping arguments
 //---------------------------------------------------------------------------
-void CheckString::sprintfOverlappingData()
+void CheckStringImpl::sprintfOverlappingData()
 {
     logChecker("CheckString::sprintfOverlappingData");
 
@@ -451,7 +446,7 @@ void CheckString::sprintfOverlappingData()
                 const bool same = isSameExpression(false,
                                                    dest,
                                                    arg,
-                                                   *mSettings,
+                                                   mSettings,
                                                    true,
                                                    false);
                 if (same) {
@@ -462,7 +457,7 @@ void CheckString::sprintfOverlappingData()
     }
 }
 
-void CheckString::sprintfOverlappingDataError(const Token *funcTok, const Token *tok, const std::string &varname)
+void CheckStringImpl::sprintfOverlappingDataError(const Token *funcTok, const Token *tok, const std::string &varname)
 {
     const std::string func = funcTok ? funcTok->str() : "s[n]printf";
 
@@ -476,9 +471,9 @@ void CheckString::sprintfOverlappingDataError(const Token *funcTok, const Token
                 "to sprintf() or snprintf(), the results are undefined.\"", CWE628, Certainty::normal);
 }
 
-void CheckString::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckString::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckString checkString(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckStringImpl checkString(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     // Checks
     checkString.strPlusChar();
@@ -490,9 +485,9 @@ void CheckString::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger
     checkString.checkAlwaysTrueOrFalseStringCompare();
 }
 
-void CheckString::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckString::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckString c(nullptr, settings, errorLogger);
+    CheckStringImpl c(nullptr, settings, errorLogger);
     c.stringLiteralWriteError(nullptr, nullptr);
     c.sprintfOverlappingDataError(nullptr, nullptr, "varname");
     c.strPlusCharError(nullptr);
diff --git a/lib/checkstring.h b/lib/checkstring.h
index 76002f8ed3d..1614e4dc7d3 100644
--- a/lib/checkstring.h
+++ b/lib/checkstring.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -41,15 +42,31 @@ class Tokenizer;
 class CPPCHECKLIB CheckString : public Check {
 public:
     /** @brief This constructor is used when registering the CheckClass */
-    CheckString() : Check(myName()) {}
+    CheckString() : Check("String") {}
 
 private:
-    /** @brief This constructor is used when running checks. */
-    CheckString(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Detect misusage of C-style strings:\n"
+               "- overlapping buffers passed to sprintf as source and destination\n"
+               "- incorrect length arguments for 'substr' and 'strncmp'\n"
+               "- suspicious condition (runtime comparison of string literals)\n"
+               "- suspicious condition (string/char literals as boolean)\n"
+               "- suspicious comparison of a string literal with a char\\* variable\n"
+               "- suspicious comparison of '\\0' with a char\\* variable\n"
+               "- overlapping strcmp() expression\n";
+    }
+};
+
+class CPPCHECKLIB CheckStringImpl : public CheckImpl {
+public:
+    /** @brief This constructor is used when running checks. */
+    CheckStringImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** @brief undefined behaviour, writing string literal */
     void stringLiteralWrite();
@@ -82,23 +99,6 @@ class CPPCHECKLIB CheckString : public Check {
     void suspiciousStringCompareError(const Token* tok, const std::string& var, bool isLong);
     void suspiciousStringCompareError_char(const Token* tok, const std::string& var);
     void overlappingStrcmpError(const Token* eq0, const Token *ne0);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "String";
-    }
-
-    std::string classInfo() const override {
-        return "Detect misusage of C-style strings:\n"
-               "- overlapping buffers passed to sprintf as source and destination\n"
-               "- incorrect length arguments for 'substr' and 'strncmp'\n"
-               "- suspicious condition (runtime comparison of string literals)\n"
-               "- suspicious condition (string/char literals as boolean)\n"
-               "- suspicious comparison of a string literal with a char\\* variable\n"
-               "- suspicious comparison of '\\0' with a char\\* variable\n"
-               "- overlapping strcmp() expression\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checktype.cpp b/lib/checktype.cpp
index 68b6580d270..447a8924360 100644
--- a/lib/checktype.cpp
+++ b/lib/checktype.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,11 +44,6 @@
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckType instance;
-}
-
 //---------------------------------------------------------------------------
 // Checking for shift by too many bits
 //---------------------------------------------------------------------------
@@ -61,10 +56,10 @@ static const CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Imple
 static const CWE CWE190(190U);   // Integer Overflow or Wraparound
 
 
-void CheckType::checkTooBigBitwiseShift()
+void CheckTypeImpl::checkTooBigBitwiseShift()
 {
     // unknown sizeof(int) => can't run this checker
-    if (mSettings->platform.type == Platform::Type::Unspecified)
+    if (mSettings.platform.type == Platform::Type::Unspecified)
         return;
 
     logChecker("CheckType::checkTooBigBitwiseShift"); // platform
@@ -95,27 +90,27 @@ void CheckType::checkTooBigBitwiseShift()
             (lhstype->type == ValueType::Type::WCHAR_T) ||
             (lhstype->type == ValueType::Type::BOOL) ||
             (lhstype->type == ValueType::Type::INT))
-            lhsbits = mSettings->platform.int_bit;
+            lhsbits = mSettings.platform.int_bit;
         else if (lhstype->type == ValueType::Type::LONG)
-            lhsbits = mSettings->platform.long_bit;
+            lhsbits = mSettings.platform.long_bit;
         else if (lhstype->type == ValueType::Type::LONGLONG)
-            lhsbits = mSettings->platform.long_long_bit;
+            lhsbits = mSettings.platform.long_long_bit;
         else
             continue;
 
         // Get biggest rhs value. preferably a value which doesn't have 'condition'.
-        const ValueFlow::Value * value = tok->astOperand2()->getValueGE(lhsbits, *mSettings);
-        if (value && mSettings->isEnabled(value, false))
+        const ValueFlow::Value * value = tok->astOperand2()->getValueGE(lhsbits, mSettings);
+        if (value && mSettings.isEnabled(value, false))
             tooBigBitwiseShiftError(tok, lhsbits, *value);
         else if (lhstype->sign == ValueType::Sign::SIGNED) {
-            value = tok->astOperand2()->getValueGE(lhsbits-1, *mSettings);
-            if (value && mSettings->isEnabled(value, false))
+            value = tok->astOperand2()->getValueGE(lhsbits-1, mSettings);
+            if (value && mSettings.isEnabled(value, false))
                 tooBigSignedBitwiseShiftError(tok, lhsbits, *value);
         }
     }
 }
 
-void CheckType::tooBigBitwiseShiftError(const Token *tok, int lhsbits, const ValueFlow::Value &rhsbits)
+void CheckTypeImpl::tooBigBitwiseShiftError(const Token *tok, int lhsbits, const ValueFlow::Value &rhsbits)
 {
     constexpr char id[] = "shiftTooManyBits";
 
@@ -134,11 +129,11 @@ void CheckType::tooBigBitwiseShiftError(const Token *tok, int lhsbits, const Val
     reportError(std::move(errorPath), rhsbits.errorSeverity() ? Severity::error : Severity::warning, id, errmsg.str(), CWE758, rhsbits.isInconclusive() ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckType::tooBigSignedBitwiseShiftError(const Token *tok, int lhsbits, const ValueFlow::Value &rhsbits)
+void CheckTypeImpl::tooBigSignedBitwiseShiftError(const Token *tok, int lhsbits, const ValueFlow::Value &rhsbits)
 {
     constexpr char id[] = "shiftTooManyBitsSigned";
 
-    const bool cpp14 = ((tok && tok->isCpp()) || (mTokenizer && mTokenizer->isCPP())) && (mSettings->standards.cpp >= Standards::CPP14);
+    const bool cpp14 = ((tok && tok->isCpp()) || (mTokenizer && mTokenizer->isCPP())) && (mSettings.standards.cpp >= Standards::CPP14);
 
     std::string behaviour = "undefined";
     if (cpp14)
@@ -153,7 +148,7 @@ void CheckType::tooBigSignedBitwiseShiftError(const Token *tok, int lhsbits, con
     if (cpp14)
         severity = Severity::portability;
 
-    if ((severity == Severity::portability) && !mSettings->severity.isEnabled(Severity::portability))
+    if ((severity == Severity::portability) && !mSettings.severity.isEnabled(Severity::portability))
         return;
     ErrorPath errorPath = getErrorPath(tok, &rhsbits, "Shift");
 
@@ -169,10 +164,10 @@ void CheckType::tooBigSignedBitwiseShiftError(const Token *tok, int lhsbits, con
 // Checking for integer overflow
 //---------------------------------------------------------------------------
 
-void CheckType::checkIntegerOverflow()
+void CheckTypeImpl::checkIntegerOverflow()
 {
     // unknown sizeof(int) => can't run this checker
-    if (mSettings->platform.type == Platform::Type::Unspecified || mSettings->platform.int_bit >= MathLib::bigint_bits)
+    if (mSettings.platform.type == Platform::Type::Unspecified || mSettings.platform.int_bit >= MathLib::bigint_bits)
         return;
 
     logChecker("CheckType::checkIntegerOverflow"); // platform
@@ -188,11 +183,11 @@ void CheckType::checkIntegerOverflow()
 
         unsigned int bits;
         if (vt->type == ValueType::Type::INT)
-            bits = mSettings->platform.int_bit;
+            bits = mSettings.platform.int_bit;
         else if (vt->type == ValueType::Type::LONG)
-            bits = mSettings->platform.long_bit;
+            bits = mSettings.platform.long_bit;
         else if (vt->type == ValueType::Type::LONGLONG)
-            bits = mSettings->platform.long_long_bit;
+            bits = mSettings.platform.long_long_bit;
         else
             continue;
 
@@ -204,12 +199,12 @@ void CheckType::checkIntegerOverflow()
 
         // is there a overflow result value
         bool isOverflow = true;
-        const ValueFlow::Value *value = tok->getValueGE(maxvalue + 1, *mSettings);
+        const ValueFlow::Value *value = tok->getValueGE(maxvalue + 1, mSettings);
         if (!value) {
-            value = tok->getValueLE(-maxvalue - 2, *mSettings);
+            value = tok->getValueLE(-maxvalue - 2, mSettings);
             isOverflow = false;
         }
-        if (!value || !mSettings->isEnabled(value,false))
+        if (!value || !mSettings.isEnabled(value,false))
             continue;
 
         // For left shift, it's common practice to shift into the sign bit
@@ -220,7 +215,16 @@ void CheckType::checkIntegerOverflow()
     }
 }
 
-void CheckType::integerOverflowError(const Token *tok, const ValueFlow::Value &value, bool isOverflow)
+static std::string getMessageId(const ValueFlow::Value &value, const char id[])
+{
+    if (value.condition != nullptr)
+        return id + std::string("Cond");
+    if (value.safe)
+        return std::string("safe") + static_cast<char>(std::toupper(id[0])) + (id + 1);
+    return id;
+}
+
+void CheckTypeImpl::integerOverflowError(const Token *tok, const ValueFlow::Value &value, bool isOverflow)
 {
     const std::string expr(tok ? tok->expressionString() : "");
     const std::string type = isOverflow ? "overflow" : "underflow";
@@ -247,9 +251,9 @@ void CheckType::integerOverflowError(const Token *tok, const ValueFlow::Value &v
 // Checking for sign conversion when operand can be negative
 //---------------------------------------------------------------------------
 
-void CheckType::checkSignConversion()
+void CheckTypeImpl::checkSignConversion()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckType::checkSignConversion"); // warning
@@ -268,7 +272,7 @@ void CheckType::checkSignConversion()
             if (!tok1)
                 continue;
             const ValueFlow::Value* negativeValue =
-                ValueFlow::findValue(tok1->values(), *mSettings, [&](const ValueFlow::Value& v) {
+                ValueFlow::findValue(tok1->values(), mSettings, [&](const ValueFlow::Value& v) {
                 return !v.isImpossible() && v.isIntValue() && (v.intvalue <= -1 || v.wideintvalue <= -1);
             });
             if (!negativeValue)
@@ -279,7 +283,7 @@ void CheckType::checkSignConversion()
     }
 }
 
-void CheckType::signConversionError(const Token *tok, const ValueFlow::Value *negativeValue, const bool constvalue)
+void CheckTypeImpl::signConversionError(const Token *tok, const ValueFlow::Value *negativeValue, const bool constvalue)
 {
     const std::string expr(tok ? tok->expressionString() : "var");
 
@@ -297,7 +301,7 @@ void CheckType::signConversionError(const Token *tok, const ValueFlow::Value *ne
         ErrorPath errorPath = getErrorPath(tok,negativeValue,"Negative value is converted to an unsigned value");
         reportError(std::move(errorPath),
                     Severity::warning,
-                    Check::getMessageId(*negativeValue, "signConversion").c_str(),
+                    getMessageId(*negativeValue, "signConversion").c_str(),
                     msg.str(),
                     CWE195,
                     negativeValue->isInconclusive() ? Certainty::inconclusive : Certainty::normal);
@@ -332,9 +336,9 @@ static bool checkTypeCombination(ValueType src, ValueType tgt, const Settings& s
     });
 }
 
-void CheckType::checkLongCast()
+void CheckTypeImpl::checkLongCast()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("truncLongCastAssignment"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("truncLongCastAssignment"))
         return;
 
     logChecker("CheckType::checkLongCast"); // style
@@ -345,7 +349,7 @@ void CheckType::checkLongCast()
             continue;
 
         if (const ValueFlow::Value* v = tok->astOperand2()->getKnownValue(ValueFlow::Value::ValueType::INT)) {
-            if (mSettings->platform.isIntValue(v->intvalue))
+            if (mSettings.platform.isIntValue(v->intvalue))
                 continue;
         }
 
@@ -354,7 +358,7 @@ void CheckType::checkLongCast()
 
         if (!lhstype || !rhstype)
             continue;
-        if (!checkTypeCombination(*rhstype, *lhstype, *mSettings))
+        if (!checkTypeCombination(*rhstype, *lhstype, mSettings))
             continue;
 
         // assign int result to long/longlong const nonpointer?
@@ -381,10 +385,14 @@ void CheckType::checkLongCast()
             if (tok->str() == "return") {
                 if (Token::Match(tok->astOperand1(), "<<|*")) {
                     const ValueType *type = tok->astOperand1()->valueType();
-                    if (type && checkTypeCombination(*type, *retVt, *mSettings) &&
+                    if (type && checkTypeCombination(*type, *retVt, mSettings) &&
                         type->pointer == 0U &&
-                        type->originalTypeName.empty())
-                        ret = tok;
+                        type->originalTypeName.empty()) {
+                        if (!tok->astOperand1()->hasKnownIntValue()) {
+                            ret = tok;
+                        } else if (!mSettings.platform.isIntValue(tok->astOperand1()->getKnownIntValue()))
+                            ret = tok;
+                    }
                 }
                 // All return statements must have problem otherwise no warning
                 if (ret != tok) {
@@ -406,7 +414,7 @@ static void makeBaseTypeString(std::string& typeStr)
         typeStr.erase(typeStr.begin(), typeStr.begin() + pos + 6 + 1);
 }
 
-void CheckType::longCastAssignError(const Token *tok, const ValueType* src, const ValueType* tgt)
+void CheckTypeImpl::longCastAssignError(const Token *tok, const ValueType* src, const ValueType* tgt)
 {
     std::string srcStr = src ? src->str() : "int";
     makeBaseTypeString(srcStr);
@@ -419,7 +427,7 @@ void CheckType::longCastAssignError(const Token *tok, const ValueType* src, cons
                 srcStr + " result is assigned to " + tgtStr + " variable. If the variable is " + tgtStr + " to avoid loss of information, then there is loss of information. To avoid loss of information you must cast a calculation operand to " + tgtStr + ", for example 'l = a * b;' => 'l = (" + tgtStr + ")a * b;'.", CWE197, Certainty::normal);
 }
 
-void CheckType::longCastReturnError(const Token *tok, const ValueType* src, const ValueType* tgt)
+void CheckTypeImpl::longCastReturnError(const Token *tok, const ValueType* src, const ValueType* tgt)
 {
     std::string srcStr = src ? src->str() : "int";
     makeBaseTypeString(srcStr);
@@ -436,7 +444,7 @@ void CheckType::longCastReturnError(const Token *tok, const ValueType* src, cons
 // Checking for float to integer overflow
 //---------------------------------------------------------------------------
 
-void CheckType::checkFloatToIntegerOverflow()
+void CheckTypeImpl::checkFloatToIntegerOverflow()
 {
     logChecker("CheckType::checkFloatToIntegerOverflow");
 
@@ -468,7 +476,7 @@ void CheckType::checkFloatToIntegerOverflow()
             while (scope && scope->type != ScopeType::eLambda && scope->type != ScopeType::eFunction)
                 scope = scope->nestedIn;
             if (scope && scope->type == ScopeType::eFunction && scope->function && scope->function->retDef) {
-                const ValueType &valueType = ValueType::parseDecl(scope->function->retDef, *mSettings);
+                const ValueType &valueType = ValueType::parseDecl(scope->function->retDef, mSettings);
                 vtfloat = tok->astOperand1()->valueType();
                 checkFloatToIntegerOverflow(tok, &valueType, vtfloat, tok->astOperand1()->values());
             }
@@ -476,7 +484,7 @@ void CheckType::checkFloatToIntegerOverflow()
     }
 }
 
-void CheckType::checkFloatToIntegerOverflow(const Token *tok, const ValueType *vtint, const ValueType *vtfloat, const std::list<ValueFlow::Value> &floatValues)
+void CheckTypeImpl::checkFloatToIntegerOverflow(const Token *tok, const ValueType *vtint, const ValueType *vtfloat, const std::list<ValueFlow::Value> &floatValues)
 {
     // Conversion of float to integer?
     if (!vtint || !vtint->isIntegral())
@@ -487,24 +495,24 @@ void CheckType::checkFloatToIntegerOverflow(const Token *tok, const ValueType *v
     for (const ValueFlow::Value &f : floatValues) {
         if (f.valueType != ValueFlow::Value::ValueType::FLOAT)
             continue;
-        if (!mSettings->isEnabled(&f, false))
+        if (!mSettings.isEnabled(&f, false))
             continue;
-        if (f.floatValue >= std::exp2(mSettings->platform.long_long_bit))
+        if (f.floatValue >= std::exp2(mSettings.platform.long_long_bit))
             floatToIntegerOverflowError(tok, f);
-        else if ((-f.floatValue) > std::exp2(mSettings->platform.long_long_bit - 1))
+        else if ((-f.floatValue) > std::exp2(mSettings.platform.long_long_bit - 1))
             floatToIntegerOverflowError(tok, f);
-        else if (mSettings->platform.type != Platform::Type::Unspecified) {
+        else if (mSettings.platform.type != Platform::Type::Unspecified) {
             int bits = 0;
             if (vtint->type == ValueType::Type::CHAR)
-                bits = mSettings->platform.char_bit;
+                bits = mSettings.platform.char_bit;
             else if (vtint->type == ValueType::Type::SHORT)
-                bits = mSettings->platform.short_bit;
+                bits = mSettings.platform.short_bit;
             else if (vtint->type == ValueType::Type::INT)
-                bits = mSettings->platform.int_bit;
+                bits = mSettings.platform.int_bit;
             else if (vtint->type == ValueType::Type::LONG)
-                bits = mSettings->platform.long_bit;
+                bits = mSettings.platform.long_bit;
             else if (vtint->type == ValueType::Type::LONGLONG)
-                bits = mSettings->platform.long_long_bit;
+                bits = mSettings.platform.long_long_bit;
             else
                 continue;
             if (bits < MathLib::bigint_bits && f.floatValue >= (1ULL << bits))
@@ -513,7 +521,7 @@ void CheckType::checkFloatToIntegerOverflow(const Token *tok, const ValueType *v
     }
 }
 
-void CheckType::floatToIntegerOverflowError(const Token *tok, const ValueFlow::Value &value)
+void CheckTypeImpl::floatToIntegerOverflowError(const Token *tok, const ValueFlow::Value &value)
 {
     std::ostringstream errmsg;
     errmsg << "Undefined behaviour: float (" << value.floatValue << ") to integer conversion overflow.";
@@ -523,10 +531,10 @@ void CheckType::floatToIntegerOverflowError(const Token *tok, const ValueFlow::V
                 errmsg.str(), CWE190, value.isInconclusive() ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckType::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckType::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
     // These are not "simplified" because casts can't be ignored
-    CheckType checkType(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckTypeImpl checkType(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkType.checkTooBigBitwiseShift();
     checkType.checkIntegerOverflow();
     checkType.checkSignConversion();
@@ -534,9 +542,9 @@ void CheckType::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
     checkType.checkFloatToIntegerOverflow();
 }
 
-void CheckType::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckType::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckType c(nullptr, settings, errorLogger);
+    CheckTypeImpl c(nullptr, settings, errorLogger);
     c.tooBigBitwiseShiftError(nullptr, 32, ValueFlow::Value(64));
     c.tooBigSignedBitwiseShiftError(nullptr, 31, ValueFlow::Value(31));
     c.integerOverflowError(nullptr, ValueFlow::Value(1LL<<32));
diff --git a/lib/checktype.h b/lib/checktype.h
index d90e11f6fd1..83eedda5583 100644
--- a/lib/checktype.h
+++ b/lib/checktype.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <list>
@@ -47,15 +48,30 @@ namespace ValueFlow
 class CPPCHECKLIB CheckType : public Check {
 public:
     /** @brief This constructor is used when registering the CheckClass */
-    CheckType() : Check(myName()) {}
+    CheckType() : Check("Type") {}
 
 private:
-    /** @brief This constructor is used when running checks. */
-    CheckType(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Type checks\n"
+               "- bitwise shift by too many bits (only enabled when --platform is used)\n"
+               "- signed integer overflow (only enabled when --platform is used)\n"
+               "- dangerous sign conversion, when signed value can be negative\n"
+               "- possible loss of information when assigning int result to long variable\n"
+               "- possible loss of information when returning int result as long return value\n"
+               "- float conversion overflow\n";
+    }
+};
+
+class CPPCHECKLIB CheckTypeImpl : public CheckImpl {
+public:
+    /** @brief This constructor is used when running checks. */
+    CheckTypeImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** @brief %Check for bitwise shift with too big right operand */
     void checkTooBigBitwiseShift();
@@ -81,22 +97,6 @@ class CPPCHECKLIB CheckType : public Check {
     void longCastAssignError(const Token *tok, const ValueType* src = nullptr, const ValueType* tgt = nullptr);
     void longCastReturnError(const Token *tok, const ValueType* src = nullptr, const ValueType* tgt = nullptr);
     void floatToIntegerOverflowError(const Token *tok, const ValueFlow::Value &value);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Type";
-    }
-
-    std::string classInfo() const override {
-        return "Type checks\n"
-               "- bitwise shift by too many bits (only enabled when --platform is used)\n"
-               "- signed integer overflow (only enabled when --platform is used)\n"
-               "- dangerous sign conversion, when signed value can be negative\n"
-               "- possible loss of information when assigning int result to long variable\n"
-               "- possible loss of information when returning int result as long return value\n"
-               "- float conversion overflow\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
index d271614723e..37d7a1ec0cd 100644
--- a/lib/checkuninitvar.cpp
+++ b/lib/checkuninitvar.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include "checkuninitvar.h"
 
 #include "astutils.h"
+#include "checkimpl.h"
 #include "ctu.h"
 #include "errorlogger.h"
 #include "library.h"
@@ -50,11 +51,6 @@
 // CWE ids used:
 static const CWE CWE_USE_OF_UNINITIALIZED_VARIABLE(457U);
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckUninitVar instance;
-}
-
 //---------------------------------------------------------------------------
 
 // get ast parent, skip possible address-of and casts
@@ -102,7 +98,7 @@ static std::map<nonneg int, VariableValue> getVariableValues(const Token* tok) {
     return ret;
 }
 
-bool CheckUninitVar::diag(const Token* tok)
+bool CheckUninitVarImpl::diag(const Token* tok)
 {
     if (!tok)
         return true;
@@ -111,7 +107,7 @@ bool CheckUninitVar::diag(const Token* tok)
     return !mUninitDiags.insert(tok).second;
 }
 
-void CheckUninitVar::check()
+void CheckUninitVarImpl::check()
 {
     logChecker("CheckUninitVar::check");
 
@@ -131,7 +127,7 @@ void CheckUninitVar::check()
     }
 }
 
-void CheckUninitVar::checkScope(const Scope* scope, const std::set<std::string> &arrayTypeDefs)
+void CheckUninitVarImpl::checkScope(const Scope* scope, const std::set<std::string> &arrayTypeDefs)
 {
     for (const Variable &var : scope->varlist) {
         if ((mTokenizer->isCPP() && var.type() && !var.isPointer() && var.type()->needInitialization != Type::NeedInitialization::True) ||
@@ -216,10 +212,10 @@ void CheckUninitVar::checkScope(const Scope* scope, const std::set<std::string>
                 for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
                     if (!Token::Match(tok, "[;{}] %varid% =", arg.declarationId()))
                         continue;
-                    const Token *allocFuncCallToken = findAllocFuncCallToken(tok->tokAt(2)->astOperand2(), mSettings->library);
+                    const Token *allocFuncCallToken = findAllocFuncCallToken(tok->tokAt(2)->astOperand2(), mSettings.library);
                     if (!allocFuncCallToken)
                         continue;
-                    const Library::AllocFunc *allocFunc = mSettings->library.getAllocFuncInfo(allocFuncCallToken);
+                    const Library::AllocFunc *allocFunc = mSettings.library.getAllocFuncInfo(allocFuncCallToken);
                     if (!allocFunc || allocFunc->initData)
                         continue;
 
@@ -236,7 +232,7 @@ void CheckUninitVar::checkScope(const Scope* scope, const std::set<std::string>
     }
 }
 
-void CheckUninitVar::checkStruct(const Token *tok, const Variable &structvar)
+void CheckUninitVarImpl::checkStruct(const Token *tok, const Variable &structvar)
 {
     const Token *typeToken = structvar.typeStartToken();
     while (Token::Match(typeToken, "%name% ::"))
@@ -304,7 +300,7 @@ static void conditionAlwaysTrueOrFalse(const Token *tok, const std::map<nonneg i
     if (tok->isName() || tok->str() == ".") {
         while (tok && tok->str() == ".")
             tok = tok->astOperand2();
-        const auto it = utils::as_const(variableValue).find(tok ? tok->varId() : ~0U);
+        const auto it = tok ? variableValue.find(tok->varId()) : variableValue.end();
         if (it != variableValue.end()) {
             *alwaysTrue = (it->second != 0LL);
             *alwaysFalse = (it->second == 0LL);
@@ -330,7 +326,7 @@ static void conditionAlwaysTrueOrFalse(const Token *tok, const std::map<nonneg i
         while (vartok && vartok->str() == ".")
             vartok = vartok->astOperand2();
 
-        const auto it = utils::as_const(variableValue).find(vartok ? vartok->varId() : ~0U);
+        const auto it = vartok ? variableValue.find(vartok->varId()) : variableValue.end();
         if (it == variableValue.end())
             return;
 
@@ -383,7 +379,7 @@ static bool isVariableUsed(const Token *tok, const Variable& var)
         return isVariableUsed(tok->astOperand1(),var) || isVariableUsed(tok->astOperand2(),var);
     if (tok->varId() != var.declarationId())
         return false;
-    if (!var.isArray())
+    if (!var.isArray() && !var.isPointer())
         return true;
 
     const Token *parent = tok->astParent();
@@ -397,10 +393,10 @@ static bool isVariableUsed(const Token *tok, const Variable& var)
     return !parent2 || parent2->isConstOp() || (parent2->str() == "=" && parent2->astOperand2() == parent);
 }
 
-bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var, bool * const possibleInit, bool * const noreturn, Alloc* const alloc, const std::string &membervar, std::map<nonneg int, VariableValue>& variableValue)
+bool CheckUninitVarImpl::checkScopeForVariable(const Token *tok, const Variable& var, bool * const possibleInit, bool * const noreturn, Alloc* const alloc, const std::string &membervar, std::map<nonneg int, VariableValue>& variableValue)
 {
     const bool suppressErrors(possibleInit && *possibleInit);  // Assume that this is a variable declaration, rather than a fundef
-    const bool printDebug = mSettings->debugwarnings;
+    const bool printDebug = mSettings.debugwarnings;
 
     if (possibleInit)
         *possibleInit = false;
@@ -767,7 +763,7 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
                 while (rhs && rhs->isCast())
                     rhs = rhs->astOperand2() ? rhs->astOperand2() : rhs->astOperand1();
                 if (rhs && Token::Match(rhs->previous(), "%name% (")) {
-                    const Library::AllocFunc *allocFunc = mSettings->library.getAllocFuncInfo(rhs->astOperand1());
+                    const Library::AllocFunc *allocFunc = mSettings.library.getAllocFuncInfo(rhs->astOperand1());
                     if (allocFunc && !allocFunc->initData) {
                         *alloc = NO_CTOR_CALL;
                         continue;
@@ -784,12 +780,16 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
                 // standard or enum type: check if new initializes the allocated memory
                 if (var.typeStartToken()->isStandardType() || var.typeStartToken()->isEnumType()) {
                     // scalar new with initialization
-                    if (Token::Match(tok->next(), "= new %type% ("))
-                        return true;
-
                     // array new
-                    if (Token::Match(tok->next(), "= new %type% [") && Token::simpleMatch(tok->linkAt(4), "] ("))
-                        return true;
+                    if (Token::Match(tok->next(), "= new ::|%type%")) {
+                        const Token* initTok = tok->tokAt(4);
+                        while (Token::Match(initTok, "::|%type%"))
+                            initTok = initTok->next();
+                        if (Token::simpleMatch(initTok, "["))
+                            initTok = initTok->link()->next();
+                        if (Token::Match(initTok, "[({]"))
+                            return true;
+                    }
                 }
 
                 continue;
@@ -834,7 +834,7 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
                         }
                     }
                 }
-                if (Token::simpleMatch(parent->astParent(), "=") && astIsLHS(parent)) {
+                if (Token::Match(parent->astParent(), "%assign%") && astIsLHS(parent)) {
                     const Token *eq = parent->astParent();
                     if (const Token *errorToken = checkExpr(eq->astOperand2(), var, *alloc, number_of_if==0)) {
                         if (!suppressErrors)
@@ -844,7 +844,8 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
                 }
 
                 // assume that variable is assigned
-                return true;
+                if (!Token::simpleMatch(tok->astParent(), "<<"))
+                    return true;
             }
         }
     }
@@ -852,7 +853,7 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
     return false;
 }
 
-const Token* CheckUninitVar::checkExpr(const Token* tok, const Variable& var, const Alloc alloc, bool known, bool* bailout) const
+const Token* CheckUninitVarImpl::checkExpr(const Token* tok, const Variable& var, const Alloc alloc, bool known, bool* bailout) const
 {
     if (!tok)
         return nullptr;
@@ -881,7 +882,7 @@ const Token* CheckUninitVar::checkExpr(const Token* tok, const Variable& var, co
     return nullptr;
 }
 
-bool CheckUninitVar::checkIfForWhileHead(const Token *startparentheses, const Variable& var, bool suppressErrors, bool isuninit, Alloc alloc, const std::string &membervar)
+bool CheckUninitVarImpl::checkIfForWhileHead(const Token *startparentheses, const Variable& var, bool suppressErrors, bool isuninit, Alloc alloc, const std::string &membervar)
 {
     const Token * const endpar = startparentheses->link();
     if (Token::Match(startparentheses, "( ! %name% %oror%") && startparentheses->tokAt(2)->getValue(0))
@@ -906,7 +907,7 @@ bool CheckUninitVar::checkIfForWhileHead(const Token *startparentheses, const Va
                     continue;
                 uninitvarError(errorToken, errorToken->expressionString(), alloc);
             }
-            return true;
+            return !Token::Match(tok->astParent(), "!|%comp%");
         }
         // skip sizeof / offsetof
         if (isUnevaluated(tok))
@@ -918,7 +919,7 @@ bool CheckUninitVar::checkIfForWhileHead(const Token *startparentheses, const Va
 }
 
 /** recursively check loop, return error token */
-const Token* CheckUninitVar::checkLoopBodyRecursive(const Token *start, const Variable& var, const Alloc alloc, const std::string &membervar, bool &bailout, bool &alwaysReturns) const
+const Token* CheckUninitVarImpl::checkLoopBodyRecursive(const Token *start, const Variable& var, const Alloc alloc, const std::string &membervar, bool &bailout, bool &alwaysReturns) const
 {
     assert(start->str() == "{");
 
@@ -965,7 +966,7 @@ const Token* CheckUninitVar::checkLoopBodyRecursive(const Token *start, const Va
                 return nullptr;
             }
 
-            bool alwaysReturnsUnused;
+            bool alwaysReturnsUnused = false;
             const Token *errorToken1 = checkLoopBodyRecursive(tok, var, alloc, membervar, bailout, alwaysReturnsUnused);
             tok = tok->link();
             if (Token::simpleMatch(tok, "} else {")) {
@@ -1086,7 +1087,7 @@ const Token* CheckUninitVar::checkLoopBodyRecursive(const Token *start, const Va
     return errorToken;
 }
 
-bool CheckUninitVar::checkLoopBody(const Token *tok, const Variable& var, const Alloc alloc, const std::string &membervar, const bool suppressErrors)
+bool CheckUninitVarImpl::checkLoopBody(const Token *tok, const Variable& var, const Alloc alloc, const std::string &membervar, const bool suppressErrors)
 {
     bool bailout = false;
     bool alwaysReturns = false;
@@ -1103,7 +1104,7 @@ bool CheckUninitVar::checkLoopBody(const Token *tok, const Variable& var, const
     return bailout || alwaysReturns;
 }
 
-void CheckUninitVar::checkRhs(const Token *tok, const Variable &var, Alloc alloc, nonneg int number_of_if, const std::string &membervar)
+void CheckUninitVarImpl::checkRhs(const Token *tok, const Variable &var, Alloc alloc, nonneg int number_of_if, const std::string &membervar)
 {
     bool rhs = false;
     int indent = 0;
@@ -1150,7 +1151,7 @@ static bool astIsRhs(const Token *tok)
     return tok && tok->astParent() && tok == tok->astParent()->astOperand2();
 }
 
-const Token* CheckUninitVar::isVariableUsage(const Token *vartok, const Library& library, bool pointer, Alloc alloc, int indirect)
+const Token* CheckUninitVarImpl::isVariableUsage(const Token *vartok, const Library& library, bool pointer, Alloc alloc, int indirect)
 {
     const bool cpp = vartok->isCpp();
     const Token *valueExpr = vartok;   // non-dereferenced , no address of value as variable
@@ -1242,7 +1243,7 @@ const Token* CheckUninitVar::isVariableUsage(const Token *vartok, const Library&
             return nullptr;
     }
     if (alloc != NO_ALLOC) {
-        if (Token::Match(valueExpr->astParent(), "%comp%|%oror%|&&|?|!"))
+        if (Token::Match(valueExpr->astParent(), "%comp%|%oror%|&&|?|!|%"))
             return nullptr;
         if (Token::Match(valueExpr->astParent(), "%or%|&") && valueExpr->astParent()->isBinaryOp())
             return nullptr;
@@ -1257,8 +1258,6 @@ const Token* CheckUninitVar::isVariableUsage(const Token *vartok, const Library&
         const Token *parent = valueExpr->astParent();
         while (Token::simpleMatch(parent, ","))
             parent = parent->astParent();
-        if (Token::simpleMatch(parent, "{"))
-            return valueExpr;
         const int use = isFunctionParUsage(valueExpr, library, pointer, alloc, indirect);
         return (use>0) ? valueExpr : nullptr;
     }
@@ -1296,6 +1295,19 @@ const Token* CheckUninitVar::isVariableUsage(const Token *vartok, const Library&
             }
             if (alloc != NO_ALLOC && astIsRhs(valueExpr))
                 return nullptr;
+        } else if (tok->astParent() && (tok->astParent()->isAssignmentOp() || tok->astParent()->isIncDecOp())) {
+            // NO_ALLOC -> no matter what we read the uninitialized memory.
+            // pointer/array -> safe, as long as we don't dereference
+            bool isPtr = pointer;
+            bool isArr = alloc == ARRAY;
+            // "pointer" and "alloc" get set for non-ptr non-array var
+            if (vartok && vartok->variable()) {
+                isPtr = vartok->variable()->isPointer();
+                isArr = vartok->variable()->isArray();
+            }
+            if ((alloc != NO_ALLOC) && ((isPtr || isArr) && !derefValue)) {
+                return nullptr;
+            }
         }
     }
 
@@ -1354,9 +1366,9 @@ const Token* CheckUninitVar::isVariableUsage(const Token *vartok, const Library&
     return derefValue ? derefValue : valueExpr;
 }
 
-const Token* CheckUninitVar::isVariableUsage(const Token *vartok, bool pointer, Alloc alloc, int indirect) const
+const Token* CheckUninitVarImpl::isVariableUsage(const Token *vartok, bool pointer, Alloc alloc, int indirect) const
 {
-    return isVariableUsage(vartok, mSettings->library, pointer, alloc, indirect);
+    return isVariableUsage(vartok, mSettings.library, pointer, alloc, indirect);
 }
 
 /***
@@ -1365,7 +1377,7 @@ const Token* CheckUninitVar::isVariableUsage(const Token *vartok, bool pointer,
  * is passed "by reference" then it is not necessarily "used".
  * @return  -1 => unknown   0 => not used   1 => used
  */
-int CheckUninitVar::isFunctionParUsage(const Token *vartok, const Library& library, bool pointer, Alloc alloc, int indirect)
+int CheckUninitVarImpl::isFunctionParUsage(const Token *vartok, const Library& library, bool pointer, Alloc alloc, int indirect)
 {
     bool unknown = false;
     const Token *parent = getAstParentSkipPossibleCastAndAddressOf(vartok, &unknown);
@@ -1421,6 +1433,8 @@ int CheckUninitVar::isFunctionParUsage(const Token *vartok, const Library& libra
             const bool isnullbad = library.isnullargbad(start->previous(), argumentNumber + 1);
             if (indirect == 0 && pointer && !address && isnullbad && alloc == NO_ALLOC)
                 return 1;
+            if (vartok->varId() == 0 && vartok->valueType())
+                indirect = vartok->valueType()->pointer;
             bool hasIndirect = false;
             const bool isuninitbad = library.isuninitargbad(start->previous(), argumentNumber + 1, indirect, &hasIndirect);
             if (alloc != NO_ALLOC)
@@ -1433,12 +1447,12 @@ int CheckUninitVar::isFunctionParUsage(const Token *vartok, const Library& libra
     return -1;
 }
 
-int CheckUninitVar::isFunctionParUsage(const Token *vartok, bool pointer, Alloc alloc, int indirect) const
+int CheckUninitVarImpl::isFunctionParUsage(const Token *vartok, bool pointer, Alloc alloc, int indirect) const
 {
-    return CheckUninitVar::isFunctionParUsage(vartok, mSettings->library, pointer, alloc, indirect);
+    return isFunctionParUsage(vartok, mSettings.library, pointer, alloc, indirect);
 }
 
-bool CheckUninitVar::isMemberVariableAssignment(const Token *tok, const std::string &membervar) const
+bool CheckUninitVarImpl::isMemberVariableAssignment(const Token *tok, const std::string &membervar) const
 {
     if (Token::Match(tok, "%name% . %name%") && tok->strAt(2) == membervar) {
         if (Token::Match(tok->tokAt(3), "[=.[]"))
@@ -1482,9 +1496,9 @@ bool CheckUninitVar::isMemberVariableAssignment(const Token *tok, const std::str
                 // check how function handle uninitialized data arguments..
                 const Function *function = ftok->function();
 
-                if (!function && mSettings) {
+                if (!function) {
                     // Function definition not seen, check if direction is specified in the library configuration
-                    const Library::ArgumentChecks::Direction argDirection = mSettings->library.getArgDirection(ftok, 1 + argumentNumber);
+                    const Library::ArgumentChecks::Direction argDirection = mSettings.library.getArgDirection(ftok, 1 + argumentNumber);
                     if (argDirection == Library::ArgumentChecks::Direction::DIR_IN)
                         return false;
                     if (argDirection == Library::ArgumentChecks::Direction::DIR_OUT)
@@ -1507,7 +1521,7 @@ bool CheckUninitVar::isMemberVariableAssignment(const Token *tok, const std::str
     return false;
 }
 
-bool CheckUninitVar::isMemberVariableUsage(const Token *tok, bool isPointer, Alloc alloc, const std::string &membervar) const
+bool CheckUninitVarImpl::isMemberVariableUsage(const Token *tok, bool isPointer, Alloc alloc, const std::string &membervar) const
 {
     if (Token::Match(tok->previous(), "[(,] %name% . %name% [,)]") &&
         tok->strAt(2) == membervar) {
@@ -1540,7 +1554,7 @@ bool CheckUninitVar::isMemberVariableUsage(const Token *tok, bool isPointer, All
         return true;
 
     // TODO: this used to be experimental - enable or remove see #5586
-    if ((false) && // NOLINT(readability-simplify-boolean-expr)
+    if ((false) && // NOLINT(readability-simplify-boolean-expr,readability-redundant-parentheses)
         !isPointer &&
         Token::Match(tok->tokAt(-2), "[(,] & %name% [,)]") &&
         isVariableUsage(tok, isPointer, alloc))
@@ -1549,14 +1563,14 @@ bool CheckUninitVar::isMemberVariableUsage(const Token *tok, bool isPointer, All
     return false;
 }
 
-void CheckUninitVar::uninitdataError(const Token *tok, const std::string &varname)
+void CheckUninitVarImpl::uninitdataError(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::error, "uninitdata", "$symbol:" + varname + "\nMemory is allocated but not initialized: $symbol", CWE_USE_OF_UNINITIALIZED_VARIABLE, Certainty::normal);
 }
 
-void CheckUninitVar::uninitvarError(const Token *tok, const std::string &varname, ErrorPath errorPath)
+void CheckUninitVarImpl::uninitvarError(const Token *tok, const std::string &varname, ErrorPath errorPath)
 {
-    if (diag(tok))
+    if (tok && diag(tok))
         return;
     errorPath.emplace_back(tok, "");
     reportError(std::move(errorPath),
@@ -1567,11 +1581,11 @@ void CheckUninitVar::uninitvarError(const Token *tok, const std::string &varname
                 Certainty::normal);
 }
 
-void CheckUninitVar::uninitvarError(const Token* tok, const ValueFlow::Value& v)
+void CheckUninitVarImpl::uninitvarError(const Token* tok, const ValueFlow::Value& v)
 {
-    if (!mSettings->isEnabled(&v))
+    if (!mSettings.isEnabled(&v))
         return;
-    if (diag(tok))
+    if (tok && diag(tok))
         return;
     const Token* ltok = tok;
     if (tok && Token::simpleMatch(tok->astParent(), ".") && astIsRHS(tok))
@@ -1604,7 +1618,7 @@ void CheckUninitVar::uninitvarError(const Token* tok, const ValueFlow::Value& v)
                 certainty);
 }
 
-void CheckUninitVar::uninitStructMemberError(const Token *tok, const std::string &membername)
+void CheckUninitVarImpl::uninitStructMemberError(const Token *tok, const std::string &membername)
 {
     reportError(tok,
                 Severity::error,
@@ -1612,7 +1626,7 @@ void CheckUninitVar::uninitStructMemberError(const Token *tok, const std::string
                 "$symbol:" + membername + "\nUninitialized struct member: $symbol", CWE_USE_OF_UNINITIALIZED_VARIABLE, Certainty::normal);
 }
 
-void CheckUninitVar::valueFlowUninit()
+void CheckUninitVarImpl::valueFlowUninit()
 {
     logChecker("CheckUninitVar::valueFlowUninit");
 
@@ -1659,28 +1673,28 @@ void CheckUninitVar::valueFlowUninit()
                     if (isarray && tok->variable()->isMember())
                         continue; // Todo: this is a bailout
                     if (isarray && tok->variable()->isStlType() && Token::simpleMatch(tok->astParent(), ".")) {
-                        const auto yield = astContainerYield(tok, mSettings->library);
+                        const auto yield = astContainerYield(tok, mSettings.library);
                         if (yield != Library::Container::Yield::AT_INDEX && yield != Library::Container::Yield::ITEM)
                             continue;
                     }
-                    const bool deref = CheckNullPointer::isPointerDeRef(tok, unknown, *mSettings);
+                    const bool deref = CheckNullPointerImpl::isPointerDeRef(tok, unknown, mSettings.library);
                     uninitderef = deref && v->indirect == 0;
                     const bool isleaf = isLeafDot(tok) || uninitderef;
                     if (!isleaf && Token::Match(tok->astParent(), ". %name%") &&
                         (tok->astParent()->next()->variable() || tok->astParent()->next()->isEnumerator()))
                         continue;
                 }
-                const ExprUsage usage = getExprUsage(tok, v->indirect, *mSettings);
+                const ExprUsage usage = getExprUsage(tok, v->indirect, mSettings);
                 if (usage == ExprUsage::NotUsed || usage == ExprUsage::Inconclusive)
                     continue;
                 if (!v->subexpressions.empty() && usage == ExprUsage::PassedByReference)
                     continue;
                 if (usage != ExprUsage::Used) {
                     if (!(Token::Match(tok->astParent(), ". %name% (|[") && uninitderef) &&
-                        isVariableChanged(tok, v->indirect, *mSettings))
+                        isVariableChanged(tok, v->indirect, mSettings))
                         continue;
                     bool inconclusive = false;
-                    if (isVariableChangedByFunctionCall(tok, v->indirect, *mSettings, &inconclusive) || inconclusive)
+                    if (isVariableChangedByFunctionCall(tok, v->indirect, mSettings.library, &inconclusive) || inconclusive)
                         continue;
                 }
                 uninitvarError(tok, *v);
@@ -1696,7 +1710,7 @@ void CheckUninitVar::valueFlowUninit()
 static bool isVariableUsage(const Settings &settings, const Token *vartok, MathLib::bigint *value)
 {
     (void)value;
-    return CheckUninitVar::isVariableUsage(vartok, settings.library, true, CheckUninitVar::Alloc::ARRAY);
+    return !!CheckUninitVarImpl::isVariableUsage(vartok, settings.library, true, CheckUninitVarImpl::Alloc::ARRAY);
 }
 
 // a Clang-built executable will crash when using the anonymous MyFileInfo later on - so put it in a unique namespace for now
@@ -1726,7 +1740,7 @@ static bool isVariableUsage(const Settings &settings, const Token *argtok, CTU::
     return isVariableUsage(settings, argtok, &value->value);
 }
 
-Check::FileInfo *CheckUninitVar::getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) const
+const Check::FileInfo *CheckUninitVar::getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) const
 {
     const std::list<CTU::FileInfo::UnsafeUsage> &unsafeUsage = CTU::getUnsafeUsage(tokenizer, settings, ::isVariableUsage);
     if (unsafeUsage.empty())
@@ -1737,22 +1751,22 @@ Check::FileInfo *CheckUninitVar::getFileInfo(const Tokenizer &tokenizer, const S
     return fileInfo;
 }
 
-Check::FileInfo * CheckUninitVar::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const
+const Check::FileInfo * CheckUninitVar::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const
 {
     const std::list<CTU::FileInfo::UnsafeUsage> &unsafeUsage = CTU::loadUnsafeUsageListFromXml(xmlElement);
     if (unsafeUsage.empty())
         return nullptr;
 
-    auto *fileInfo = new MyFileInfo;
+    auto *fileInfo = new MyFileInfo(file0);
     fileInfo->unsafeUsage = unsafeUsage;
     return fileInfo;
 }
 
-bool CheckUninitVar::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
+bool CheckUninitVar::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<const Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
 {
     (void)settings;
 
-    CheckUninitVar dummy(nullptr, &settings, &errorLogger);
+    CheckUninitVarImpl dummy(nullptr, settings, errorLogger);
     dummy.
     logChecker("CheckUninitVar::analyseWholeProgram");
 
@@ -1796,20 +1810,21 @@ bool CheckUninitVar::analyseWholeProgram(const CTU::FileInfo &ctu, const std::li
     return foundErrors;
 }
 
-void CheckUninitVar::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckUninitVar::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckUninitVar checkUninitVar(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckUninitVarImpl checkUninitVar(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkUninitVar.valueFlowUninit();
     checkUninitVar.check();
 }
 
-void CheckUninitVar::getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const
+void CheckUninitVar::getErrorMessages(ErrorLogger& errorLogger, const Settings& settings) const
 {
-    CheckUninitVar c(nullptr, settings, errorLogger);
+    CheckUninitVarImpl c(nullptr, settings, errorLogger);
 
     ValueFlow::Value v{};
 
-    c.uninitvarError(nullptr, v); // TODO: does not produce any output
+    c.uninitvarError(nullptr, v);
+    c.uninitvarError(nullptr, "varname", ErrorPath{});
     c.uninitdataError(nullptr, "varname");
     c.uninitStructMemberError(nullptr, "a.b");
 }
diff --git a/lib/checkuninitvar.h b/lib/checkuninitvar.h
index b79e9c22be0..a9156adfe36 100644
--- a/lib/checkuninitvar.h
+++ b/lib/checkuninitvar.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 #include "mathlib.h"
 #include "errortypes.h"
@@ -57,24 +58,38 @@ struct VariableValue {
 /** @brief Checking for uninitialized variables */
 
 class CPPCHECKLIB CheckUninitVar : public Check {
-    friend class TestUninitVar;
-
 public:
     /** @brief This constructor is used when registering the CheckUninitVar */
-    CheckUninitVar() : Check(myName()) {}
+    CheckUninitVar() : Check("Uninitialized variables") {}
 
-    enum Alloc : std::uint8_t { NO_ALLOC, NO_CTOR_CALL, CTOR_CALL, ARRAY };
+private:
+    /** @brief Run checks against the normal token list */
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
 
-    static const Token *isVariableUsage(const Token *vartok, const Library &library, bool pointer, Alloc alloc, int indirect = 0);
-    const Token *isVariableUsage(const Token *vartok, bool pointer, Alloc alloc, int indirect = 0) const;
+    /** @brief Parse current TU and extract file info */
+    const Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) const override;
 
-private:
+    const Check::FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const override;
+
+    /** @brief Analyse all file infos for all TU */
+    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<const Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings& settings) const override;
+
+    std::string classInfo() const override {
+        return "Uninitialized variables\n"
+               "- using uninitialized local variables\n"
+               "- using allocated data before it has been initialized\n";
+    }
+};
+
+class CPPCHECKLIB CheckUninitVarImpl : public CheckImpl {
+public:
     /** @brief This constructor is used when running checks. */
-    CheckUninitVar(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    CheckUninitVarImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
-    /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    enum Alloc : std::uint8_t { NO_ALLOC, NO_CTOR_CALL, CTOR_CALL, ARRAY };
 
     bool diag(const Token* tok);
     /** Check for uninitialized variables */
@@ -92,17 +107,12 @@ class CPPCHECKLIB CheckUninitVar : public Check {
     bool isMemberVariableAssignment(const Token *tok, const std::string &membervar) const;
     bool isMemberVariableUsage(const Token *tok, bool isPointer, Alloc alloc, const std::string &membervar) const;
 
+    static const Token *isVariableUsage(const Token *vartok, const Library &library, bool pointer, Alloc alloc, int indirect = 0);
+    const Token *isVariableUsage(const Token *vartok, bool pointer, Alloc alloc, int indirect = 0) const;
+
     /** ValueFlow-based checking for uninitialized variables */
     void valueFlowUninit();
 
-    /** @brief Parse current TU and extract file info */
-    Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) const override;
-
-    Check::FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const override;
-
-    /** @brief Analyse all file infos for all TU */
-    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
-
     void uninitvarError(const Token* tok, const ValueFlow::Value& v);
     void uninitdataError(const Token *tok, const std::string &varname);
     void uninitvarError(const Token *tok, const std::string &varname, ErrorPath errorPath);
@@ -118,18 +128,6 @@ class CPPCHECKLIB CheckUninitVar : public Check {
     void uninitStructMemberError(const Token *tok, const std::string &membername);
 
     std::set<const Token*> mUninitDiags;
-
-    void getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const override;
-
-    static std::string myName() {
-        return "Uninitialized variables";
-    }
-
-    std::string classInfo() const override {
-        return "Uninitialized variables\n"
-               "- using uninitialized local variables\n"
-               "- using allocated data before it has been initialized\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
index b45200d7128..4177a13a013 100644
--- a/lib/checkunusedfunctions.cpp
+++ b/lib/checkunusedfunctions.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 //---------------------------------------------------------------------------
 #include "checkunusedfunctions.h"
 
+#include "analyzerinfo.h"
 #include "astutils.h"
 #include "errorlogger.h"
 #include "errortypes.h"
@@ -34,7 +35,7 @@
 #include <algorithm>
 #include <cctype>
 #include <cstring>
-#include <fstream>
+#include <functional>
 #include <map>
 #include <sstream>
 #include <tuple>
@@ -64,11 +65,11 @@ static bool isRecursiveCall(const Token* ftok)
     return ftok->function() && ftok->function() == Scope::nestedInFunction(ftok->scope());
 }
 
-void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Settings &settings)
+void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Library &library)
 {
     const char * const FileName = tokenizer.list.getFiles().front().c_str();
 
-    const bool doMarkup = settings.library.markupFile(FileName);
+    const bool doMarkup = library.markupFile(FileName);
 
     // Function declarations..
     if (!doMarkup) {
@@ -138,8 +139,8 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Setting
             lambdaEndToken = findLambdaEndToken(tok);
 
         // parsing of library code to find called functions
-        if (settings.library.isexecutableblock(FileName, tok->str())) {
-            const Token * markupVarToken = tok->tokAt(settings.library.blockstartoffset(FileName));
+        if (library.isexecutableblock(FileName, tok->str())) {
+            const Token * markupVarToken = tok->tokAt(library.blockstartoffset(FileName));
             // not found
             if (!markupVarToken)
                 continue;
@@ -147,12 +148,12 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Setting
             bool start = true;
             // find all function calls in library code (starts with '(', not if or while etc)
             while ((scope || start) && markupVarToken) {
-                if (markupVarToken->str() == settings.library.blockstart(FileName)) {
+                if (markupVarToken->str() == library.blockstart(FileName)) {
                     scope++;
                     start = false;
-                } else if (markupVarToken->str() == settings.library.blockend(FileName))
+                } else if (markupVarToken->str() == library.blockend(FileName))
                     scope--;
-                else if (!settings.library.iskeyword(FileName, markupVarToken->str())) {
+                else if (!library.iskeyword(FileName, markupVarToken->str())) {
                     mFunctionCalls.insert(markupVarToken->str());
                     if (mFunctions.find(markupVarToken->str()) != mFunctions.end())
                         mFunctions[markupVarToken->str()].usedOtherFile = true;
@@ -170,10 +171,10 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Setting
         }
 
         if (!doMarkup // only check source files
-            && settings.library.isexporter(tok->str()) && tok->next() != nullptr) {
+            && library.isexporter(tok->str()) && tok->next() != nullptr) {
             const Token * propToken = tok->next();
             while (propToken && propToken->str() != ")") {
-                if (settings.library.isexportedprefix(tok->str(), propToken->str())) {
+                if (library.isexportedprefix(tok->str(), propToken->str())) {
                     const Token* nextPropToken = propToken->next();
                     const std::string& value = nextPropToken->str();
                     if (mFunctions.find(value) != mFunctions.end()) {
@@ -181,7 +182,7 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Setting
                     }
                     mFunctionCalls.insert(value);
                 }
-                if (settings.library.isexportedsuffix(tok->str(), propToken->str())) {
+                if (library.isexportedsuffix(tok->str(), propToken->str())) {
                     const Token* prevPropToken = propToken->previous();
                     const std::string& value = prevPropToken->str();
                     if (value != ")" && mFunctions.find(value) != mFunctions.end()) {
@@ -193,7 +194,7 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Setting
             }
         }
 
-        if (doMarkup && settings.library.isimporter(FileName, tok->str()) && tok->next()) {
+        if (doMarkup && library.isimporter(FileName, tok->str()) && tok->next()) {
             const Token * propToken = tok->next();
             if (propToken->next()) {
                 propToken = propToken->next();
@@ -209,8 +210,8 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Setting
             }
         }
 
-        if (settings.library.isreflection(tok->str())) {
-            const int argIndex = settings.library.reflectionArgument(tok->str());
+        if (library.isreflection(tok->str())) {
+            const int argIndex = library.reflectionArgument(tok->str());
             if (argIndex >= 0) {
                 const Token * funcToken = tok->next();
                 int index = 0;
@@ -260,11 +261,14 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Setting
             while (Token::Match(funcname, "%name% :: %name%"))
                 funcname = funcname->tokAt(2);
 
+            if (funcname && funcname->isName() && !funcname->function() && !tok->astParent() && Token::Match(tok, "[(,]")) // unknown type in parameter list
+                continue;
+
             if (!Token::Match(funcname, "%name% [(),;]:}<>]"))
                 continue;
         }
 
-        if (!funcname || funcname->isKeyword() || funcname->isStandardType() || funcname->varId() || funcname->enumerator() || funcname->type())
+        if (!funcname || funcname->isKeyword() || funcname->isStandardType() || funcname->varId() || funcname->enumerator() || funcname->type() || funcname->isLiteral())
             continue;
 
         // funcname ( => Assert that the end parentheses isn't followed by {
@@ -362,7 +366,7 @@ void CheckUnusedFunctions::staticFunctionError(ErrorLogger& errorLogger,
         errorLogger.reportErr(errmsg); \
     } while (false)
 
-bool CheckUnusedFunctions::check(const Settings& settings, ErrorLogger& errorLogger) const
+bool CheckUnusedFunctions::check(const Library& library, ErrorLogger& errorLogger) const
 {
     logChecker("CheckUnusedFunctions::check"); // unusedFunction
 
@@ -375,7 +379,7 @@ bool CheckUnusedFunctions::check(const Settings& settings, ErrorLogger& errorLog
         const FunctionUsage &func = it->second;
         if (func.usedOtherFile || func.filename.empty())
             continue;
-        if (settings.library.isentrypoint(it->first))
+        if (library.isentrypoint(it->first))
             continue;
         if (!func.usedSameFile) {
             if (isOperatorFunction(it->first))
@@ -384,7 +388,7 @@ bool CheckUnusedFunctions::check(const Settings& settings, ErrorLogger& errorLog
             if (func.filename != "+")
                 filename = func.filename;
             errors.emplace_back(filename, func.fileIndex, func.lineNumber, func.column, it->first);
-        } else if (func.isC && !func.isStatic && !func.usedOtherFile) {
+        } else if (func.isC && !func.isStatic) {
             std::string filename;
             if (func.filename != "+")
                 filename = func.filename;
@@ -457,54 +461,35 @@ void CheckUnusedFunctions::analyseWholeProgram(const Settings &settings, ErrorLo
     std::map<std::string, Location> decls;
     std::set<std::string> calls;
 
-    const std::string filesTxt(buildDir + "/files.txt");
-    std::ifstream fin(filesTxt.c_str());
-    std::string filesTxtLine;
-    while (std::getline(fin, filesTxtLine)) {
-        const std::string::size_type firstColon = filesTxtLine.find(':');
-        if (firstColon == std::string::npos)
-            continue;
-        const std::string::size_type secondColon = filesTxtLine.find(':', firstColon+1);
-        if (secondColon == std::string::npos)
-            continue;
-        const std::string xmlfile = buildDir + '/' + filesTxtLine.substr(0,firstColon);
-        const std::string sourcefile = filesTxtLine.substr(secondColon+1);
-
-        tinyxml2::XMLDocument doc;
-        const tinyxml2::XMLError error = doc.LoadFile(xmlfile.c_str());
-        if (error != tinyxml2::XML_SUCCESS)
-            continue;
-
-        const tinyxml2::XMLElement * const rootNode = doc.FirstChildElement();
-        if (rootNode == nullptr)
-            continue;
-
-        for (const tinyxml2::XMLElement *e = rootNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
-            if (std::strcmp(e->Name(), "FileInfo") != 0)
+    const auto handler = [&decls, &calls](const char* checkattr, const tinyxml2::XMLElement* e, const AnalyzerInformation::Info& filesTxtInfo) {
+        if (std::strcmp(checkattr,"CheckUnusedFunctions") != 0)
+            return;
+        for (const tinyxml2::XMLElement *e2 = e->FirstChildElement(); e2; e2 = e2->NextSiblingElement()) {
+            const char* functionName = e2->Attribute("functionName");
+            if (functionName == nullptr)
                 continue;
-            const char *checkattr = e->Attribute("check");
-            if (checkattr == nullptr || std::strcmp(checkattr,"CheckUnusedFunctions") != 0)
+            const char* name = e2->Name();
+            if (std::strcmp(name,"functioncall") == 0) {
+                calls.insert(functionName);
                 continue;
-            for (const tinyxml2::XMLElement *e2 = e->FirstChildElement(); e2; e2 = e2->NextSiblingElement()) {
-                const char* functionName = e2->Attribute("functionName");
-                if (functionName == nullptr)
-                    continue;
-                const char* name = e2->Name();
-                if (std::strcmp(name,"functioncall") == 0) {
-                    calls.insert(functionName);
-                    continue;
-                }
-                if (std::strcmp(name,"functiondecl") == 0) {
-                    const char* lineNumber = e2->Attribute("lineNumber");
-                    if (lineNumber) {
-                        const char* file = e2->Attribute("file");
-                        const char* column = default_if_null(e2->Attribute("column"), "0");
-                        // cppcheck-suppress templateInstantiation - TODO: fix this - see #11631
-                        decls[functionName] = Location(file ? file : sourcefile, strToInt<int>(lineNumber), strToInt<int>(column));
-                    }
+            }
+            if (std::strcmp(name,"functiondecl") == 0) {
+                const char* lineNumber = e2->Attribute("lineNumber");
+                if (lineNumber) {
+                    const char* file = e2->Attribute("file");
+                    const char* column = default_if_null(e2->Attribute("column"), "0");
+                    // cppcheck-suppress templateInstantiation - TODO: fix this - see #11631
+                    decls[functionName] = Location(file ? file : filesTxtInfo.sourceFile, strToInt<int>(lineNumber), strToInt<int>(column));
                 }
             }
         }
+    };
+
+    const std::string err = AnalyzerInformation::processFilesTxt(buildDir, handler, settings.debugainfo);
+    if (!err.empty()) {
+        const ErrorMessage errmsg({}, "", Severity::error, err, "internalError", Certainty::normal);
+        errorLogger.reportErr(errmsg);
+        return;
     }
 
     for (auto decl = decls.cbegin(); decl != decls.cend(); ++decl) {
@@ -520,9 +505,9 @@ void CheckUnusedFunctions::analyseWholeProgram(const Settings &settings, ErrorLo
     }
 }
 
-void CheckUnusedFunctions::updateFunctionData(const CheckUnusedFunctions& check)
+void CheckUnusedFunctions::updateFunctionData(const CheckUnusedFunctions& checkUnusedFunctions)
 {
-    for (const auto& entry : check.mFunctions)
+    for (const auto& entry : checkUnusedFunctions.mFunctions)
     {
         FunctionUsage &usage = mFunctions[entry.first];
         if (!usage.lineNumber) {
@@ -536,6 +521,6 @@ void CheckUnusedFunctions::updateFunctionData(const CheckUnusedFunctions& check)
         usage.usedOtherFile |= entry.second.usedOtherFile;
         usage.usedSameFile |= entry.second.usedSameFile;
     }
-    mFunctionDecl.insert(mFunctionDecl.cend(), check.mFunctionDecl.cbegin(), check.mFunctionDecl.cend());
-    mFunctionCalls.insert(check.mFunctionCalls.cbegin(), check.mFunctionCalls.cend());
+    mFunctionDecl.insert(mFunctionDecl.cend(), checkUnusedFunctions.mFunctionDecl.cbegin(), checkUnusedFunctions.mFunctionDecl.cend());
+    mFunctionCalls.insert(checkUnusedFunctions.mFunctionCalls.cbegin(), checkUnusedFunctions.mFunctionCalls.cend());
 }
diff --git a/lib/checkunusedfunctions.h b/lib/checkunusedfunctions.h
index 6f10e3446eb..1b560cfb7cb 100644
--- a/lib/checkunusedfunctions.h
+++ b/lib/checkunusedfunctions.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@ class ErrorLogger;
 class Function;
 class Settings;
 class Tokenizer;
+class Library;
 
 /** @brief Check for functions never called */
 /// @{
@@ -44,7 +45,7 @@ class CPPCHECKLIB CheckUnusedFunctions {
     // Parse current tokens and determine..
     // * Check what functions are used
     // * What functions are declared
-    void parseTokens(const Tokenizer &tokenizer, const Settings &settings);
+    void parseTokens(const Tokenizer &tokenizer, const Library &library);
 
     std::string analyzerInfo(const Tokenizer &tokenizer) const;
 
@@ -56,9 +57,9 @@ class CPPCHECKLIB CheckUnusedFunctions {
     }
 
     // Return true if an error is reported.
-    bool check(const Settings& settings, ErrorLogger& errorLogger) const;
+    bool check(const Library& library, ErrorLogger& errorLogger) const;
 
-    void updateFunctionData(const CheckUnusedFunctions& check);
+    void updateFunctionData(const CheckUnusedFunctions& checkUnusedFunctions);
 
 private:
     static void unusedFunctionError(ErrorLogger& errorLogger,
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
index ddaffa0f817..c5e914ecdec 100644
--- a/lib/checkunusedvar.cpp
+++ b/lib/checkunusedvar.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,11 +40,6 @@
 #include <vector>
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckUnusedVar instance;
-}
-
 static const CWE CWE563(563U);   // Assignment to Variable without Use ('Unused Variable')
 static const CWE CWE665(665U);   // Improper Initialization
 
@@ -254,7 +249,7 @@ void Variables::clearAliases(nonneg int varid)
 
 void Variables::eraseAliases(nonneg int varid)
 {
-    VariableUsage *usage = find(varid);
+    const VariableUsage *usage = find(varid);
 
     if (usage) {
         for (auto aliases = usage->_aliases.cbegin(); aliases != usage->_aliases.cend(); ++aliases)
@@ -334,7 +329,7 @@ void Variables::write(nonneg int varid, const Token* tok)
 
 void Variables::writeAliases(nonneg int varid, const Token* tok)
 {
-    VariableUsage *usage = find(varid);
+    const VariableUsage *usage = find(varid);
 
     if (usage) {
         for (auto aliases = usage->_aliases.cbegin(); aliases != usage->_aliases.cend(); ++aliases) {
@@ -424,6 +419,9 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de
     Variables::VariableUsage *var1 = variables.find(varid1);
 
     if (var1) {
+        if (var1->mType == Variables::pointerArray)
+            variables.use(varid1, tok);
+
         // jump behind '='
         tok = tok->next();
         while (!tok->isAssignmentOp()) {
@@ -562,13 +560,15 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de
                             variables.readAll(varid2, tok);
                         }
                     }
-                } else if (var1->mType == Variables::reference) {
+                } else if (var1->mType == Variables::reference || var1->mType == Variables::referenceArray) {
                     variables.alias(varid1, varid2, true);
                 } else if (var1->mType == Variables::standard && addressOf) {
                     variables.alias(varid1, varid2, true);
                 } else {
-                    if ((var2->mType == Variables::pointer || var2->mType == Variables::pointerArray) && tok->strAt(1) == "[")
+                    if (var2->mType == Variables::pointer || var2->mType == Variables::pointerArray) {
+                        variables.alias(varid1, varid2, true);
                         variables.readAliases(varid2, tok);
+                    }
 
                     variables.read(varid2, tok);
                 }
@@ -699,7 +699,7 @@ static void useFunctionArgs(const Token *tok, Variables& variables)
 //---------------------------------------------------------------------------
 // Usage of function variables
 //---------------------------------------------------------------------------
-void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const scope, Variables& variables) const
+void CheckUnusedVarImpl::checkFunctionVariableUsage_iterateScopes(const Scope* const scope, Variables& variables) const
 {
     // Find declarations if the scope is executable..
     if (scope->isExecutable()) {
@@ -726,14 +726,18 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
                      i->typeEndToken()->isStandardType() ||
                      i->isStlType() ||
                      mTokenizer->getSymbolDatabase()->isRecordTypeWithoutSideEffects(i->type()) ||
-                     mSettings->library.detectContainer(i->typeStartToken()) ||
-                     mSettings->library.getTypeCheck("unusedvar", i->typeStartToken()->str()) == Library::TypeCheck::check)
+                     mSettings.library.detectContainer(i->typeStartToken()) ||
+                     mSettings.library.getTypeCheck("unusedvar", i->typeStartToken()->str()) == Library::TypeCheck::check)
                 type = Variables::standard;
 
             if (type == Variables::none || isPartOfClassStructUnion(i->typeStartToken()))
                 continue;
             const Token* defValTok = i->nameToken()->next();
-            if (Token::Match(i->nameToken()->previous(), "* %var% ) (")) // function pointer. Jump behind parameter list.
+            if (Token::Match(i->nameToken()->previous(), "& %var% )"))
+                defValTok = defValTok->next();
+            while (defValTok && defValTok->str() == "[")
+                defValTok = defValTok->link()->next();
+            if (Token::simpleMatch(defValTok, ") ("))
                 defValTok = defValTok->linkAt(1)->next();
             for (; defValTok; defValTok = defValTok->next()) {
                 if (defValTok->str() == "[")
@@ -848,7 +852,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
             }
         }
         // Freeing memory (not considered "using" the pointer if it was also allocated in this function)
-        if ((Token::Match(tok, "%name% ( %var% )") && mSettings->library.getDeallocFuncInfo(tok)) ||
+        if ((Token::Match(tok, "%name% ( %var% )") && mSettings.library.getDeallocFuncInfo(tok)) ||
             (tok->isCpp() && (Token::Match(tok, "delete %var% ;") || Token::Match(tok, "delete [ ] %var% ;")))) {
             nonneg int varid = 0;
             if (tok->str() != "delete") {
@@ -954,10 +958,10 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
                 // Consider allocating memory separately because allocating/freeing alone does not constitute using the variable
                 else if (var && var->mType == Variables::pointer &&
                          Token::Match(start, "%name% =") &&
-                         findAllocFuncCallToken(start->next()->astOperand2(), mSettings->library)) {
+                         findAllocFuncCallToken(start->next()->astOperand2(), mSettings.library)) {
 
-                    const Token *allocFuncCallToken = findAllocFuncCallToken(start->next()->astOperand2(), mSettings->library);
-                    const Library::AllocFunc *allocFunc = mSettings->library.getAllocFuncInfo(allocFuncCallToken);
+                    const Token *allocFuncCallToken = findAllocFuncCallToken(start->next()->astOperand2(), mSettings.library);
+                    const Library::AllocFunc *allocFunc = mSettings.library.getAllocFuncInfo(allocFuncCallToken);
 
                     bool allocateMemory = !allocFunc || Library::ismemory(allocFunc->groupId);
 
@@ -1005,7 +1009,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
             const Token * const equal = skipBracketsAndMembers(tok->next());
 
             // checked for chained assignments
-            if (tok != start && equal && equal->str() == "=") {
+            if (tok != start && (Token::simpleMatch(equal, "=") || (start->astParent() && Token::simpleMatch(start->astParent()->astParent(), "=")))) {
                 const nonneg int varId = tok->varId();
                 const Variables::VariableUsage * const var = variables.find(varId);
 
@@ -1039,7 +1043,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
                 // Consider allocating memory separately because allocating/freeing alone does not constitute using the variable
                 if (var->mType == Variables::pointer &&
                     ((tok->isCpp() && Token::simpleMatch(skipBrackets(tok->next()), "= new")) ||
-                     (Token::Match(skipBrackets(tok->next()), "= %name% (") && mSettings->library.getAllocFuncInfo(tok->tokAt(2))))) {
+                     (Token::Match(skipBrackets(tok->next()), "= %name% (") && mSettings.library.getAllocFuncInfo(tok->tokAt(2))))) {
                     variables.allocateMemory(varid, tok);
                 } else if (var->mType == Variables::pointer || var->mType == Variables::reference) {
                     variables.read(varid, tok);
@@ -1151,10 +1155,6 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
                         variables.read(tok2->varId(), tok);
                 }
             }
-        } else if (tok->variable() && tok->variable()->isClass() && tok->variable()->type() &&
-                   (tok->variable()->type()->needInitialization == Type::NeedInitialization::False) &&
-                   tok->strAt(1) == ";") {
-            variables.write(tok->varId(), tok);
         }
     }
 }
@@ -1169,9 +1169,9 @@ static bool isReturnedByRef(const Variable* var, const Function* func)
     });
 }
 
-void CheckUnusedVar::checkFunctionVariableUsage()
+void CheckUnusedVarImpl::checkFunctionVariableUsage()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->checkLibrary && !mSettings->isPremiumEnabled("unusedVariable"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.checkLibrary && !mSettings.isPremiumEnabled("unusedVariable") && !mSettings.isPremiumEnabled("unreadVariable"))
         return;
 
     logChecker("CheckUnusedVar::checkFunctionVariableUsage"); // style
@@ -1180,7 +1180,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     auto reportLibraryCfgError = [this](const Token* tok, const std::string& typeName) {
-        if (mSettings->checkLibrary) {
+        if (mSettings.checkLibrary) {
             reportError(tok,
                         Severity::information,
                         "checkLibraryCheckType",
@@ -1198,6 +1198,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()
         const Token *nextStructuredBindingTok = nullptr;
         std::vector<std::pair<const Token*, const Token*>> unusedStructuredBindingTokens;
         size_t structuredBindingTokCount = 0;
+        std::set<const Variable*> diagUnreadVariable; // prevent duplicate warnings
 
         for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
             if (nextStructuredBindingTok) {
@@ -1287,6 +1288,11 @@ void CheckUnusedVar::checkFunctionVariableUsage()
             while (Token::Match(op1tok, ".|[|*"))
                 op1tok = op1tok->astOperand1();
 
+            // Bail out for overloaded indexing
+            if (op1tok && op1tok->valueType() && op1tok->valueType()->pointer == 0 &&
+                op1tok->valueType()->type == ValueType::Type::RECORD && Token::simpleMatch(op1tok->astParent(), "["))
+                continue;
+
             // Assignment in macro => do not warn
             if (isAssignment && tok->isExpandedMacro() && op1tok && op1tok->isExpandedMacro())
                 continue;
@@ -1326,7 +1332,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()
                     std::string typeName = op1Var->getTypeName();
                     if (startsWith(typeName, "::"))
                         typeName.erase(typeName.begin(), typeName.begin() + 2);
-                    switch (mSettings->library.getTypeCheck("unusedvar", typeName)) {
+                    switch (mSettings.library.getTypeCheck("unusedvar", typeName)) {
                     case Library::TypeCheck::def:
                         bailoutTypeName = std::move(typeName);
                         break;
@@ -1351,7 +1357,21 @@ void CheckUnusedVar::checkFunctionVariableUsage()
             if (tok->previous() && tok->previous()->variable() && tok->previous()->variable()->nameToken()->scope()->type == ScopeType::eUnion)
                 continue;
 
-            FwdAnalysis fwdAnalysis(*mSettings);
+            if (const ValueType *vt = expr->valueType()) {
+                if (vt->type == ValueType::RECORD &&
+                    !vt->pointer &&
+                    vt->typeScope &&
+                    vt->typeScope->definedType &&
+                    !symbolDatabase->isRecordTypeWithoutSideEffects(vt->typeScope->definedType))
+                    continue;
+
+                if (vt->type == ValueType::SMART_POINTER &&
+                    vt->smartPointerType &&
+                    !symbolDatabase->isRecordTypeWithoutSideEffects(vt->smartPointerType))
+                    continue;
+            }
+
+            FwdAnalysis fwdAnalysis(mSettings);
             const Token* scopeEnd = ValueFlow::getEndOfExprScope(expr, scope, /*smallest*/ false);
             if (fwdAnalysis.unusedValue(expr, start, scopeEnd)) {
                 if (!bailoutTypeName.empty()) {
@@ -1359,15 +1379,17 @@ void CheckUnusedVar::checkFunctionVariableUsage()
                         reportLibraryCfgError(tok, bailoutTypeName);
                     continue;
                 }
-                if (isTrivialInit && findExpressionChanged(expr, start, scopeEnd, *mSettings))
+                if (isTrivialInit && findExpressionChanged(expr, start, scopeEnd, mSettings))
                     continue;
 
                 // warn
                 if (!expr->variable() || !expr->variable()->isMaybeUnused()) {
                     if (structuredBindingTokCount > 0)
                         unusedStructuredBindingTokens.emplace_back(tok, expr);
-                    else
+                    else {
                         unreadVariableError(tok, expr->expressionString(), false);
+                        diagUnreadVariable.emplace(expr->variable());
+                    }
                 }
             }
         }
@@ -1390,7 +1412,6 @@ void CheckUnusedVar::checkFunctionVariableUsage()
 
             // skip things that are only partially implemented to prevent false positives
             if (usage.mType == Variables::pointerPointer ||
-                usage.mType == Variables::pointerArray ||
                 usage.mType == Variables::referenceArray)
                 continue;
 
@@ -1420,7 +1441,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()
                      !(var->valueType() && var->valueType()->container) &&
                      !(var->isStatic() && isReturnedByRef(var, scope->function)))
                 unassignedVariableError(usage._var->nameToken(), varname);
-            else if (!usage._var->isMaybeUnused() && !usage._modified && !usage._read && var) {
+            else if (!usage._var->isMaybeUnused() && !usage._modified && !usage._read && var && diagUnreadVariable.count(usage._var) == 0) {
                 const Token* vnt = var->nameToken();
                 bool error = false;
                 if (vnt->next()->isSplittedVarDeclEq() || (!var->isReference() && vnt->strAt(1) == "=")) {
@@ -1440,7 +1461,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()
                     if (mTokenizer->isCPP() && var->isClass() &&
                         (!var->valueType() || var->valueType()->type == ValueType::Type::UNKNOWN_TYPE)) {
                         const std::string typeName = var->getTypeName();
-                        switch (mSettings->library.getTypeCheck("unusedvar", typeName)) {
+                        switch (mSettings.library.getTypeCheck("unusedvar", typeName)) {
                         case Library::TypeCheck::def:
                             reportLibraryCfgError(vnt, typeName);
                             break;
@@ -1459,25 +1480,25 @@ void CheckUnusedVar::checkFunctionVariableUsage()
     }
 }
 
-void CheckUnusedVar::unusedVariableError(const Token *tok, const std::string &varname)
+void CheckUnusedVarImpl::unusedVariableError(const Token *tok, const std::string &varname)
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedVariable"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unusedVariable"))
         return;
 
     reportError(tok, Severity::style, "unusedVariable", "$symbol:" + varname + "\nUnused variable: $symbol", CWE563, Certainty::normal);
 }
 
-void CheckUnusedVar::allocatedButUnusedVariableError(const Token *tok, const std::string &varname)
+void CheckUnusedVarImpl::allocatedButUnusedVariableError(const Token *tok, const std::string &varname)
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedVariable"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unusedVariable"))
         return;
 
     reportError(tok, Severity::style, "unusedAllocatedMemory", "$symbol:" + varname + "\nVariable '$symbol' is allocated memory that is never used.", CWE563, Certainty::normal);
 }
 
-void CheckUnusedVar::unreadVariableError(const Token *tok, const std::string &varname, bool modified)
+void CheckUnusedVarImpl::unreadVariableError(const Token *tok, const std::string &varname, bool modified)
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedVariable"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unusedVariable") && !mSettings.isPremiumEnabled("unreadVariable"))
         return;
 
     if (modified)
@@ -1486,9 +1507,9 @@ void CheckUnusedVar::unreadVariableError(const Token *tok, const std::string &va
         reportError(tok, Severity::style, "unreadVariable", "$symbol:" + varname + "\nVariable '$symbol' is assigned a value that is never used.", CWE563, Certainty::normal);
 }
 
-void CheckUnusedVar::unassignedVariableError(const Token *tok, const std::string &varname)
+void CheckUnusedVarImpl::unassignedVariableError(const Token *tok, const std::string &varname)
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedVariable"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unusedVariable"))
         return;
 
     reportError(tok, Severity::style, "unassignedVariable", "$symbol:" + varname + "\nVariable '$symbol' is not assigned a value.", CWE665, Certainty::normal);
@@ -1497,9 +1518,9 @@ void CheckUnusedVar::unassignedVariableError(const Token *tok, const std::string
 //---------------------------------------------------------------------------
 // Check that all struct members are used
 //---------------------------------------------------------------------------
-void CheckUnusedVar::checkStructMemberUsage()
+void CheckUnusedVarImpl::checkStructMemberUsage()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedStructMember") && !mSettings->isPremiumEnabled("unusedVariable"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unusedStructMember") && !mSettings.isPremiumEnabled("unusedVariable"))
         return;
 
     logChecker("CheckUnusedVar::checkStructMemberUsage"); // style
@@ -1621,7 +1642,8 @@ void CheckUnusedVar::checkStructMemberUsage()
 
         for (const Variable &var : scope.varlist) {
             // only warn for variables without side effects
-            if (!var.typeStartToken()->isStandardType() && !var.isPointer() && !astIsContainer(var.nameToken()) && !mTokenizer->getSymbolDatabase()->isRecordTypeWithoutSideEffects(var.type()))
+            if (!(var.valueType() && var.valueType()->type >= ValueType::VOID) && !var.isPointer() && !astIsContainer(var.nameToken()) &&
+                !astIsSmartPointer(var.nameToken()) && !mTokenizer->getSymbolDatabase()->isRecordTypeWithoutSideEffects(var.type()))
                 continue;
             if (isInherited && !var.isPrivate())
                 continue;
@@ -1659,6 +1681,27 @@ void CheckUnusedVar::checkStructMemberUsage()
                     if (use)
                         break;
                 }
+                // Class used in template with unknown definition
+                if (Token::Match(tok, "%name% <") && tok->linkAt(1)) {
+                    if (tok->function())
+                        continue;
+                    if (tok->type() && tok->type()->classScope)
+                        continue;
+                    const Token *start = tok;
+                    while (Token::Match(start->tokAt(-2), "%name% ::"))
+                        start = start->tokAt(-2);
+                    if (mSettings.library.detectContainer(start))
+                        continue;
+                    const Token *end = tok->linkAt(1);
+                    for (; tok != end; tok = tok->next()) {
+                        if (tok->type() && tok->type()->classScope == &scope) {
+                            use = true;
+                            break;
+                        }
+                    }
+                    if (use)
+                        break;
+                }
                 if (tok->variable() != &var)
                     continue;
                 if (tok != var.nameToken()) {
@@ -1678,12 +1721,12 @@ void CheckUnusedVar::checkStructMemberUsage()
     }
 }
 
-void CheckUnusedVar::unusedStructMemberError(const Token* tok, const std::string& structname, const std::string& varname, const std::string& prefix)
+void CheckUnusedVarImpl::unusedStructMemberError(const Token* tok, const std::string& structname, const std::string& varname, const std::string& prefix)
 {
     reportError(tok, Severity::style, "unusedStructMember", "$symbol:" + structname + "::" + varname + '\n' + prefix + " member '$symbol' is never used.", CWE563, Certainty::normal);
 }
 
-bool CheckUnusedVar::isEmptyType(const Type* type)
+bool CheckUnusedVarImpl::isEmptyType(const Type* type)
 {
     // a type that has no variables and no constructor
 
@@ -1704,21 +1747,22 @@ bool CheckUnusedVar::isEmptyType(const Type* type)
     return (emptyType = false);
 }
 
-void CheckUnusedVar::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckUnusedVar::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckUnusedVar checkUnusedVar(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckUnusedVarImpl checkUnusedVar(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     // Coding style checks
     checkUnusedVar.checkStructMemberUsage();
     checkUnusedVar.checkFunctionVariableUsage();
 }
 
-void CheckUnusedVar::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckUnusedVar::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckUnusedVar c(nullptr, settings, errorLogger);
+    CheckUnusedVarImpl c(nullptr, settings, errorLogger);
     c.unusedVariableError(nullptr, "varname");
     c.allocatedButUnusedVariableError(nullptr, "varname");
     c.unreadVariableError(nullptr, "varname", false);
     c.unassignedVariableError(nullptr, "varname");
     c.unusedStructMemberError(nullptr, "structname", "variable");
 }
+
diff --git a/lib/checkunusedvar.h b/lib/checkunusedvar.h
index 5ab79514cf9..2239b4a60d8 100644
--- a/lib/checkunusedvar.h
+++ b/lib/checkunusedvar.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <map>
@@ -42,19 +43,33 @@ class Tokenizer;
 /** @brief Various small checks */
 
 class CPPCHECKLIB CheckUnusedVar : public Check {
-    friend class TestUnusedVar;
-
 public:
     /** @brief This constructor is used when registering the CheckClass */
-    CheckUnusedVar() : Check(myName()) {}
+    CheckUnusedVar() : Check("UnusedVar") {}
 
 private:
-    /** @brief This constructor is used when running checks. */
-    CheckUnusedVar(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "UnusedVar checks\n"
+
+               // style
+               "- unused variable\n"
+               "- allocated but unused variable\n"
+               "- unread variable\n"
+               "- unassigned variable\n"
+               "- unused struct member\n";
+    }
+};
+
+class CPPCHECKLIB CheckUnusedVarImpl : public CheckImpl {
+public:
+    /** @brief This constructor is used when running checks. */
+    CheckUnusedVarImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** @brief %Check for unused function variables */
     void checkFunctionVariableUsage_iterateScopes(const Scope* scope, Variables& variables) const;
@@ -72,25 +87,7 @@ class CPPCHECKLIB CheckUnusedVar : public Check {
     void unreadVariableError(const Token *tok, const std::string &varname, bool modified);
     void unassignedVariableError(const Token *tok, const std::string &varname);
 
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "UnusedVar";
-    }
-
-    std::string classInfo() const override {
-        return "UnusedVar checks\n"
-
-               // style
-               "- unused variable\n"
-               "- allocated but unused variable\n"
-               "- unread variable\n"
-               "- unassigned variable\n"
-               "- unused struct member\n";
-    }
-
     std::map<const Type *,bool> mIsEmptyTypeMap;
-
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkvaarg.cpp b/lib/checkvaarg.cpp
index 96c65ea41a2..ae8b1626ba6 100644
--- a/lib/checkvaarg.cpp
+++ b/lib/checkvaarg.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,14 +30,6 @@
 #include <list>
 #include <vector>
 
-//---------------------------------------------------------------------------
-
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckVaarg instance;
-}
-
-
 //---------------------------------------------------------------------------
 // Ensure that correct parameter is passed to va_start()
 //---------------------------------------------------------------------------
@@ -47,11 +39,11 @@ static const CWE CWE664(664U);   // Improper Control of a Resource Through its L
 static const CWE CWE688(688U);   // Function Call With Incorrect Variable or Reference as Argument
 static const CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
 
-void CheckVaarg::va_start_argument()
+void CheckVaargImpl::va_start_argument()
 {
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
     const std::size_t functions = symbolDatabase->functionScopes.size();
-    const bool printWarnings = mSettings->severity.isEnabled(Severity::warning);
+    const bool printWarnings = mSettings.severity.isEnabled(Severity::warning);
 
     logChecker("CheckVaarg::va_start_argument");
 
@@ -73,7 +65,7 @@ void CheckVaarg::va_start_argument()
                 if (var && var->index() + 2 < function->argCount() && printWarnings) {
                     auto it = function->argumentList.end();
                     std::advance(it, -2);
-                    wrongParameterTo_va_start_error(tok, var->name(), it->name()); // cppcheck-suppress derefInvalidIterator // FP due to isVariableChangedByFunctionCall()
+                    wrongParameterTo_va_start_error(tok, var->name(), it->name());
                 }
                 tok = tok->linkAt(1);
             }
@@ -81,13 +73,13 @@ void CheckVaarg::va_start_argument()
     }
 }
 
-void CheckVaarg::wrongParameterTo_va_start_error(const Token *tok, const std::string& paramIsName, const std::string& paramShouldName)
+void CheckVaargImpl::wrongParameterTo_va_start_error(const Token *tok, const std::string& paramIsName, const std::string& paramShouldName)
 {
     reportError(tok, Severity::warning,
                 "va_start_wrongParameter", "'" + paramIsName + "' given to va_start() is not last named argument of the function. Did you intend to pass '" + paramShouldName + "'?", CWE688, Certainty::normal);
 }
 
-void CheckVaarg::referenceAs_va_start_error(const Token *tok, const std::string& paramName)
+void CheckVaargImpl::referenceAs_va_start_error(const Token *tok, const std::string& paramName)
 {
     reportError(tok, Severity::error,
                 "va_start_referencePassed", "Using reference '" + paramName + "' as parameter for va_start() results in undefined behaviour.", CWE758, Certainty::normal);
@@ -98,9 +90,9 @@ void CheckVaarg::referenceAs_va_start_error(const Token *tok, const std::string&
 // Detect va_list usage after va_end()
 //---------------------------------------------------------------------------
 
-void CheckVaarg::va_list_usage()
+void CheckVaargImpl::va_list_usage()
 {
-    if (mSettings->clang)
+    if (mSettings.clang)
         return;
 
     logChecker("CheckVaarg::va_list_usage"); // notclang
@@ -163,34 +155,34 @@ void CheckVaarg::va_list_usage()
     }
 }
 
-void CheckVaarg::va_end_missingError(const Token *tok, const std::string& varname)
+void CheckVaargImpl::va_end_missingError(const Token *tok, const std::string& varname)
 {
     reportError(tok, Severity::error,
                 "va_end_missing", "va_list '" + varname + "' was opened but not closed by va_end().", CWE664, Certainty::normal);
 }
 
-void CheckVaarg::va_list_usedBeforeStartedError(const Token *tok, const std::string& varname)
+void CheckVaargImpl::va_list_usedBeforeStartedError(const Token *tok, const std::string& varname)
 {
     reportError(tok, Severity::error,
                 "va_list_usedBeforeStarted", "va_list '" + varname + "' used before va_start() was called.", CWE664, Certainty::normal);
 }
 
-void CheckVaarg::va_start_subsequentCallsError(const Token *tok, const std::string& varname)
+void CheckVaargImpl::va_start_subsequentCallsError(const Token *tok, const std::string& varname)
 {
     reportError(tok, Severity::error,
                 "va_start_subsequentCalls", "va_start() or va_copy() called subsequently on '" + varname + "' without va_end() in between.", CWE664, Certainty::normal);
 }
 
-void CheckVaarg::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckVaarg::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckVaarg check(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckVaargImpl check(&tokenizer, tokenizer.getSettings(), errorLogger);
     check.va_start_argument();
     check.va_list_usage();
 }
 
-void CheckVaarg::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckVaarg::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckVaarg c(nullptr, settings, errorLogger);
+    CheckVaargImpl c(nullptr, settings, errorLogger);
     c.wrongParameterTo_va_start_error(nullptr, "arg1", "arg2");
     c.referenceAs_va_start_error(nullptr, "arg1");
     c.va_end_missingError(nullptr, "vl");
diff --git a/lib/checkvaarg.h b/lib/checkvaarg.h
index 7af5d98d66f..eea3f345bcc 100644
--- a/lib/checkvaarg.h
+++ b/lib/checkvaarg.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -41,13 +42,28 @@ class Tokenizer;
 
 class CPPCHECKLIB CheckVaarg : public Check {
 public:
-    CheckVaarg() : Check(myName()) {}
+    CheckVaarg() : Check("Vaarg") {}
+
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
 
 private:
-    CheckVaarg(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Check for misusage of variable argument lists:\n"
+               "- Wrong parameter passed to va_start()\n"
+               "- Reference passed to va_start()\n"
+               "- Missing va_end()\n"
+               "- Using va_list before it is opened\n"
+               "- Subsequent calls to va_start/va_copy()\n";
+    }
+};
 
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+class CPPCHECKLIB CheckVaargImpl : public CheckImpl
+{
+public:
+    CheckVaargImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     void va_start_argument();
     void va_list_usage();
@@ -57,21 +73,6 @@ class CPPCHECKLIB CheckVaarg : public Check {
     void va_end_missingError(const Token *tok, const std::string& varname);
     void va_list_usedBeforeStartedError(const Token *tok, const std::string& varname);
     void va_start_subsequentCallsError(const Token *tok, const std::string& varname);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Vaarg";
-    }
-
-    std::string classInfo() const override {
-        return "Check for misusage of variable argument lists:\n"
-               "- Wrong parameter passed to va_start()\n"
-               "- Reference passed to va_start()\n"
-               "- Missing va_end()\n"
-               "- Using va_list before it is opened\n"
-               "- Subsequent calls to va_start/va_copy()\n";
-    }
 };
 
 /// @}
diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
index 44d10f17c60..0043f5a3cde 100644
--- a/lib/clangimport.cpp
+++ b/lib/clangimport.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 
 #include "errortypes.h"
 #include "mathlib.h"
-#include "settings.h"
+#include "refthunk.h"
 #include "standards.h"
 #include "symboldatabase.h"
 #include "token.h"
@@ -45,6 +45,8 @@
 #include <vector>
 #include <numeric>
 
+class Settings;
+
 static const std::string AccessSpecDecl = "AccessSpecDecl";
 static const std::string ArraySubscriptExpr = "ArraySubscriptExpr";
 static const std::string BinaryOperator = "BinaryOperator";
@@ -122,6 +124,12 @@ static std::string unquote(const std::string &s)
 }
 
 
+// location in a buffer that is generated by clang: "<<built-in>:115:23, file.h:18:19>"
+static bool isGeneratedBufferLocation(const std::string &s, std::string::size_type pos = 0)
+{
+    return s.compare(pos, 12, "<<built-in>:") == 0 || s.compare(pos, 17, "<<scratch space>:") == 0;
+}
+
 static std::vector<std::string> splitString(const std::string &line)
 {
     std::vector<std::string> ret;
@@ -133,13 +141,15 @@ static std::vector<std::string> splitString(const std::string &line)
             pos1 = line.find_first_not_of(' ', pos1 + 1);
             continue;
         }
-        if (line[pos1] == '<')
+        if (line[pos1] == '<') {
             pos2 = line.find('>', pos1);
-        else if (line[pos1] == '\"')
+            if (pos2 != std::string::npos && isGeneratedBufferLocation(line, pos1))
+                pos2 = line.find('>', pos2 + 1);
+        } else if (line[pos1] == '\"')
             pos2 = line.find('\"', pos1+1);
         else if (line[pos1] == '\'') {
             pos2 = line.find('\'', pos1+1);
-            if (pos2 < static_cast<int>(line.size()) - 3 && line.compare(pos2, 3, "\':\'", 0, 3) == 0)
+            if (pos2 < line.size() - 3 && line.compare(pos2, 3, "\':\'", 0, 3) == 0)
                 pos2 = line.find('\'', pos2 + 3);
         } else {
             pos2 = pos1;
@@ -232,8 +242,8 @@ namespace clangimport {
             , mSymbolDatabase(symbolDatabase)
         {}
 
-        const Settings &mSettings;
-        SymbolDatabase &mSymbolDatabase;
+        RefThunk<const Settings> mSettings;
+        RefThunk<SymbolDatabase> mSymbolDatabase;
 
         int enumValue = 0;
 
@@ -302,7 +312,7 @@ namespace clangimport {
         }
 
         // "}" tokens that are not end-of-scope
-        std::set<Token *> mNotScope;
+        std::set<const Token *> mNotScope;
 
         std::map<const Scope *, AccessControl> scopeAccessControl;
     private:
@@ -327,7 +337,10 @@ namespace clangimport {
     public:
         AstNode(std::string nodeType, const std::string &ext, Data *data)
             : nodeType(std::move(nodeType)), mExtTokens(splitString(ext)), mData(data)
-        {}
+        {
+            if (mExtTokens.empty())
+                throw InternalError(nullptr, "invalid AST node: " + this->nodeType, InternalError::AST);
+        }
         std::string nodeType;
         std::vector<AstNodePtr> children;
 
@@ -356,7 +369,7 @@ namespace clangimport {
         /**
          * @throws InternalError thrown if index is out of bounds
          */
-        AstNodePtr getChild(int c) {
+        AstNodePtr getChild(size_t c) {
             if (c >= children.size()) {
                 std::ostringstream err;
                 err << "ClangImport: AstNodePtr::getChild(" << c << ") out of bounds. children.size=" << children.size() << " " << nodeType;
@@ -421,15 +434,13 @@ std::string clangimport::AstNode::getSpelling() const
     if (nodeType == FunctionDecl || nodeType == CXXConstructorDecl || nodeType == CXXMethodDecl) {
         while (typeIndex >= 0 && mExtTokens[typeIndex][0] != '\'')
             typeIndex--;
-        if (typeIndex <= 0)
-            return "";
     }
     if (nodeType == DeclRefExpr) {
         while (typeIndex > 0 && std::isalpha(mExtTokens[typeIndex][0]))
             typeIndex--;
-        if (typeIndex <= 0)
-            return "";
     }
+    if (typeIndex <= 0)
+        return "";
     const std::string &str = mExtTokens[typeIndex - 1];
     if (startsWith(str,"col:"))
         return "";
@@ -508,7 +519,7 @@ void clangimport::AstNode::dumpAst(int num, int indent) const
     for (const auto& tok: mExtTokens)
         std::cout << " " << tok;
     std::cout << std::endl;
-    for (int c = 0; c < children.size(); ++c) {
+    for (size_t c = 0; c < children.size(); ++c) {
         if (children[c])
             children[c]->dumpAst(c, indent + 2);
         else
@@ -561,19 +572,32 @@ void clangimport::AstNode::setLocations(TokenList &tokenList, int file, int line
             if (pos != std::string::npos)
                 col = strToInt<int>(ext.substr(pos+6, ext.find_first_of(":,>", pos+6) - (pos+6)));
         } else if (ext[0] == '<') {
-            const std::string::size_type colon = ext.find(':');
-            if (colon != std::string::npos) {
-                const bool windowsPath = colon == 2 && ext.size() > 3 && ext[2] == ':';
-                const std::string::size_type sep1 = windowsPath ? ext.find(':', 4) : colon;
-                const std::string::size_type sep2 = ext.find(':', sep1 + 1);
-                file = tokenList.appendFileIfNew(ext.substr(1, sep1 - 1));
-                line = strToInt<int>(ext.substr(sep1 + 1, sep2 - sep1 - 1));
+            // start of the file location
+            std::string::size_type pos = 1;
+            if (isGeneratedBufferLocation(ext)) {
+                // Use the end of the range if that is a file location, otherwise the location is unchanged
+                pos = ext.find(", ");
+                if (pos != std::string::npos) {
+                    pos += 2;
+                    if (ext[pos] == '<' || ext.compare(pos, 4, "col:") == 0 || ext.compare(pos, 5, "line:") == 0)
+                        pos = std::string::npos;
+                }
             }
-            else {
-                // "<invalid sloc>" are encountered in every AST dump by some built-in TypedefDecl
-                // an completely empty location block was encountered with a CompoundStmt
-                if (ext != "<<invalid sloc>" && ext != "<>")
-                    throw InternalError(nullptr, "invalid AST location: " + ext, InternalError::AST);
+            if (pos != std::string::npos) {
+                const std::string::size_type colon = ext.find(':', pos);
+                if (colon != std::string::npos) {
+                    const bool windowsPath = colon == pos + 1 && ext.size() > pos + 2;
+                    const std::string::size_type sep1 = windowsPath ? ext.find(':', pos + 3) : colon;
+                    const std::string::size_type sep2 = ext.find(':', sep1 + 1);
+                    file = tokenList.appendFileIfNew(ext.substr(pos, sep1 - pos));
+                    line = strToInt<int>(ext.substr(sep1 + 1, sep2 - sep1 - 1));
+                }
+                else {
+                    // "<invalid sloc>" are encountered in every AST dump by some built-in TypedefDecl
+                    // an completely empty location block was encountered with a CompoundStmt
+                    if (ext != "<<invalid sloc>" && ext != "<>")
+                        throw InternalError(nullptr, "invalid AST location: " + ext, InternalError::AST);
+                }
             }
         }
     }
@@ -642,7 +666,7 @@ const ::Type * clangimport::AstNode::addTypeTokens(TokenList &tokenList, const s
     for (const Token *typeToken = tokenList.back(); Token::Match(typeToken, "&|*|%name%"); typeToken = typeToken->previous()) {
         if (!typeToken->isName())
             continue;
-        const ::Type *recordType = scope->symdb.findVariableType(scope, typeToken);
+        const ::Type *recordType = scope->symdb().findVariableType(scope, typeToken);
         if (recordType) {
             const_cast<Token*>(typeToken)->type(recordType);
             return recordType;
@@ -671,7 +695,7 @@ void clangimport::AstNode::addFullScopeNameTokens(TokenList &tokenList, const Sc
 const Scope *clangimport::AstNode::getNestedInScope(TokenList &tokenList)
 {
     if (!tokenList.back())
-        return &mData->mSymbolDatabase.scopeList.front();
+        return &mData->mSymbolDatabase().scopeList.front();
     if (tokenList.back()->str() == "}" && mData->mNotScope.find(tokenList.back()) == mData->mNotScope.end())
         return tokenList.back()->scope()->nestedIn;
     return tokenList.back()->scope();
@@ -1032,7 +1056,10 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
         return nullptr;
     }
     if (nodeType == EnumConstantDecl) {
-        Token *nameToken = addtoken(tokenList, getSpelling());
+        const std::string name = getSpelling();
+        if (name.empty())
+            throw InternalError(nullptr, "invalid AST node: " + nodeType, InternalError::AST);
+        Token *nameToken = addtoken(tokenList, name);
         auto *scope = const_cast<Scope *>(nameToken->scope());
         scope->enumeratorList.emplace_back(nameToken->scope());
         Enumerator *e = &scope->enumeratorList.back();
@@ -1070,8 +1097,8 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
             const_cast<Token *>(enumscope->bodyEnd)->deletePrevious();
 
         // Create enum type
-        mData->mSymbolDatabase.typeList.emplace_back(enumtok, enumscope, enumtok->scope());
-        enumscope->definedType = &mData->mSymbolDatabase.typeList.back();
+        mData->mSymbolDatabase().typeList.emplace_back(enumtok, enumscope, enumtok->scope());
+        enumscope->definedType = &mData->mSymbolDatabase().typeList.back();
         if (nametok)
             const_cast<Scope *>(enumtok->scope())->definedTypesMap[nametok->str()] = enumscope->definedType;
 
@@ -1119,6 +1146,8 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
         return nullptr;
     }
     if (nodeType == GotoStmt) {
+        if (mExtTokens.size() < 2)
+            return nullptr;
         addtoken(tokenList, "goto");
         addtoken(tokenList, unquote(mExtTokens[mExtTokens.size() - 2]));
         addtoken(tokenList, ";");
@@ -1208,9 +1237,12 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
         if (children.empty())
             return nullptr;
         const Token *defToken = addtoken(tokenList, "namespace");
-        const std::string &s = mExtTokens[mExtTokens.size() - 2];
-        const Token* nameToken = (startsWith(s, "col:") || startsWith(s, "line:")) ?
-                                 addtoken(tokenList, mExtTokens.back()) : nullptr;
+        const Token* nameToken = nullptr;
+        if (mExtTokens.size() >= 2) {
+            const std::string &s = mExtTokens[mExtTokens.size() - 2];
+            if (startsWith(s, "col:") || startsWith(s, "line:"))
+                nameToken = addtoken(tokenList, mExtTokens.back());
+        }
         Scope *scope = createScope(tokenList, ScopeType::eNamespace, children, defToken);
         if (nameToken)
             scope->className = nameToken->str();
@@ -1237,8 +1269,8 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
         }
 
         Scope *recordScope = createScope(tokenList, ScopeType::eStruct, children, classDef);
-        mData->mSymbolDatabase.typeList.emplace_back(classDef, recordScope, classDef->scope());
-        recordScope->definedType = &mData->mSymbolDatabase.typeList.back();
+        mData->mSymbolDatabase().typeList.emplace_back(classDef, recordScope, classDef->scope());
+        recordScope->definedType = &mData->mSymbolDatabase().typeList.back();
         if (!recordName.empty()) {
             recordScope->className = recordName;
             const_cast<Scope *>(classDef->scope())->definedTypesMap[recordName] = recordScope->definedType;
@@ -1363,6 +1395,10 @@ Token * clangimport::AstNode::createTokensCall(TokenList &tokenList)
 
 void clangimport::AstNode::createTokensFunctionDecl(TokenList &tokenList)
 {
+    // an address-only node has no name: addtoken("") adds nothing and would return a null back()
+    const std::string name = getSpelling();
+    if (name.empty())
+        throw InternalError(nullptr, "invalid AST node: " + nodeType, InternalError::AST);
     const bool prev = contains(mExtTokens, "prev");
     const bool hasBody = !children.empty() && children.back()->nodeType == CompoundStmt;
     const bool isStatic = contains(mExtTokens, "static");
@@ -1384,11 +1420,14 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList &tokenList)
     if (mExtTokens.size() > 4 && mExtTokens[1] == "parent")
         addFullScopeNameTokens(tokenList, mData->getScope(mExtTokens[2]));
 
-    Token *nameToken = addtoken(tokenList, getSpelling() + getTemplateParameters());
+    Token *nameToken = addtoken(tokenList, name + getTemplateParameters());
     auto *nestedIn = const_cast<Scope *>(nameToken->scope());
 
     if (prev) {
-        const std::string addr = *(std::find(mExtTokens.cbegin(), mExtTokens.cend(), "prev") + 1);
+        const auto it = std::find(mExtTokens.cbegin(), mExtTokens.cend(), "prev");
+        if (it + 1 == mExtTokens.cend())
+            throw InternalError(nullptr, "invalid AST node: " + nodeType, InternalError::AST);
+        const std::string addr = *(it + 1);
         mData->ref(addr, nameToken);
     }
     if (!nameToken->function()) {
@@ -1431,10 +1470,13 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList &tokenList)
         function->nestedIn = nestedIn;
     function->argDef = par1;
     // Function arguments
-    for (int i = 0; i < children.size(); ++i) {
+    for (size_t i = 0; i < children.size(); ++i) {
         AstNodePtr child = children[i];
         if (child->nodeType != ParmVarDecl)
             continue;
+        // there must be a token between the address and the type
+        if (child->mExtTokens.size() < 3)
+            throw InternalError(nullptr, "invalid AST node: " + child->nodeType, InternalError::AST);
         if (tokenList.back() != par1)
             addtoken(tokenList, ",");
         const Type *recordType = addTypeTokens(tokenList, child->mExtTokens.back(), nestedIn);
@@ -1487,10 +1529,12 @@ void clangimport::AstNode::createTokensForCXXRecord(TokenList &tokenList)
     const bool isStruct = contains(mExtTokens, "struct");
     Token * const classToken = addtoken(tokenList, isStruct ? "struct" : "class");
     std::string className;
-    if (mExtTokens[mExtTokens.size() - 2] == (isStruct?"struct":"class"))
-        className = mExtTokens.back();
-    else
-        className = mExtTokens[mExtTokens.size() - 2];
+    if (mExtTokens.size() >= 2) {
+        if (mExtTokens[mExtTokens.size() - 2] == (isStruct?"struct":"class"))
+            className = mExtTokens.back();
+        else
+            className = mExtTokens[mExtTokens.size() - 2];
+    }
     className += getTemplateParameters();
     /*Token *nameToken =*/ addtoken(tokenList, className);
     // base classes
@@ -1519,8 +1563,8 @@ void clangimport::AstNode::createTokensForCXXRecord(TokenList &tokenList)
         const std::string addr = mExtTokens[0];
         mData->scopeDecl(addr, scope);
         scope->className = className;
-        mData->mSymbolDatabase.typeList.emplace_back(classToken, scope, classToken->scope());
-        scope->definedType = &mData->mSymbolDatabase.typeList.back();
+        mData->mSymbolDatabase().typeList.emplace_back(classToken, scope, classToken->scope());
+        scope->definedType = &mData->mSymbolDatabase().typeList.back();
         const_cast<Scope *>(classToken->scope())->definedTypesMap[className] = scope->definedType;
     }
     addtoken(tokenList, ";");
@@ -1535,6 +1579,9 @@ Token * clangimport::AstNode::createTokensVarDecl(TokenList &tokenList)
     int typeIndex = mExtTokens.size() - 1;
     while (typeIndex > 1 && std::isalpha(mExtTokens[typeIndex][0]))
         typeIndex--;
+    // there must be a name token between the address and the type
+    if (typeIndex < 2)
+        throw InternalError(nullptr, "invalid AST node: " + nodeType, InternalError::AST);
     const std::string type = mExtTokens[typeIndex];
     const std::string name = mExtTokens[typeIndex - 1];
     const Token *startToken = tokenList.back();
@@ -1638,7 +1685,9 @@ void clangimport::parseClangAstDump(Tokenizer &tokenizer, std::istream &f)
         if (pos1 == std::string::npos)
             continue;
         if (!tree.empty() && line.substr(pos1) == "-<<<NULL>>>") {
-            const int level = (pos1 - 1) / 2;
+            const size_t level = (pos1 - 1) / 2;
+            if (level == 0 || level > tree.size())
+                continue;
             tree[level - 1]->children.push_back(nullptr);
             continue;
         }
@@ -1656,7 +1705,7 @@ void clangimport::parseClangAstDump(Tokenizer &tokenizer, std::istream &f)
             continue;
         }
 
-        const int level = (pos1 - 1) / 2;
+        const size_t level = (pos1 - 1) / 2;
         if (level == 0 || level > tree.size())
             continue;
 
diff --git a/lib/config.h b/lib/config.h
index 34d426eb162..c88c431288c 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,12 +35,6 @@
 #  define CPPCHECKLIB
 #endif
 
-// MS Visual C++ memory leak debug tracing
-#if !defined(DISABLE_CRTDBG_MAP_ALLOC) && defined(_MSC_VER) && defined(_DEBUG)
-#  define _CRTDBG_MAP_ALLOC
-#  include <crtdbg.h>
-#endif
-
 // compatibility macros
 #ifndef __has_builtin
 #define __has_builtin(x) 0
@@ -58,16 +52,6 @@
 #define __has_feature(x) 0
 #endif
 
-// C++11 noexcept
-#if defined(__cpp_noexcept_function_type) || \
-    (defined(__GNUC__) && (__GNUC__ >= 5)) \
-    || defined(__clang__) \
-    || defined(__CPPCHECK__)
-#  define NOEXCEPT noexcept
-#else
-#  define NOEXCEPT
-#endif
-
 // C++11 noreturn
 #if __has_cpp_attribute (noreturn) \
     || (defined(__GNUC__) && (__GNUC__ >= 5)) \
@@ -102,6 +86,7 @@
 #  define UNUSED
 #endif
 
+// TODO: AppleClang versions do not align with Clang versions - add check for proper version
 // warn_unused
 #if __has_cpp_attribute (gnu::warn_unused) || \
     (defined(__clang__) && (__clang_major__ >= 15))
@@ -121,6 +106,7 @@
 #  define DEPRECATED
 #endif
 
+// TODO: AppleClang versions do not align with Clang versions - add check for proper version
 // returns_nonnull
 #if __has_cpp_attribute (gnu::returns_nonnull)
 #  define RET_NONNULL [[gnu::returns_nonnull]]
@@ -212,9 +198,15 @@
 #define USE_WINDOWS_SEH
 #endif
 
-#if !defined(NO_UNIX_BACKTRACE_SUPPORT) && defined(__GNUC__) && !defined(__APPLE__) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__SVR4) && !defined(__QNX__) && !defined(_AIX)
+#if !defined(NO_UNIX_BACKTRACE_SUPPORT)
+#if defined(HAVE_EXECINFO_H)
+#if HAVE_EXECINFO_H
 #define USE_UNIX_BACKTRACE_SUPPORT
 #endif
+#elif __has_include(<execinfo.h>)
+#define USE_UNIX_BACKTRACE_SUPPORT
+#endif
+#endif
 
 #if !defined(NO_UNIX_SIGNAL_HANDLING) && defined(__GNUC__) && !defined(__MINGW32__) && !defined(__OS2__)
 #define USE_UNIX_SIGNAL_HANDLING
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index 0fb23203718..8e32e3e3152 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include "addoninfo.h"
 #include "analyzerinfo.h"
 #include "check.h"
+#include "checks.h"
 #include "checkunusedfunctions.h"
 #include "clangimport.h"
 #include "color.h"
@@ -46,6 +47,7 @@
 
 #ifdef HAVE_RULES
 #include "regex.h"
+#include "rule.h"
 #endif
 
 #include <algorithm>
@@ -59,6 +61,7 @@
 #include <exception> // IWYU pragma: keep
 #include <fstream>
 #include <iostream>
+#include <iterator>
 #include <map>
 #include <new>
 #include <set>
@@ -70,17 +73,16 @@
 #include <vector>
 
 #include "json.h"
-#include "xml.h"
 
 #include <simplecpp.h>
 
+namespace tinyxml2 { class XMLElement; }
+
 static constexpr char Version[] = CPPCHECK_VERSION_STRING;
 static constexpr char ExtraVersion[] = "";
 
 static constexpr char FILELIST[] = "cppcheck-addon-ctu-file-list";
 
-static TimerResults s_timerResults;
-
 // CWE ids used
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
 
@@ -99,9 +101,9 @@ class CppCheck::CppCheckLogger : public ErrorLogger
         closePlist();
     }
 
-    void setRemarkComments(std::vector<RemarkComment> remarkComments)
+    void addRemarkComments(const std::vector<RemarkComment> &remarkComments)
     {
-        mRemarkComments = std::move(remarkComments);
+        mRemarkComments.insert(mRemarkComments.end(), remarkComments.begin(), remarkComments.end());
     }
 
     void setLocationMacros(const Token* startTok, const std::vector<std::string>& files)
@@ -123,17 +125,25 @@ class CppCheck::CppCheckLogger : public ErrorLogger
         mErrorList.clear();
     }
 
-    void openPlist(const std::string& filename, const std::vector<std::string>& files)
+    void openPlist(const std::string& filename)
     {
         mPlistFile.open(filename);
-        mPlistFile << ErrorLogger::plistHeader(version(), files);
+        mPlistFile << ErrorLogger::plistHeader(version());
+    }
+
+    void setPlistFilenames(std::vector<std::string> files)
+    {
+        if (mPlistFile.is_open()) {
+            mPlistFilenames = std::move(files);
+        }
     }
 
     void closePlist()
     {
         if (mPlistFile.is_open()) {
-            mPlistFile << ErrorLogger::plistFooter();
+            mPlistFile << ErrorLogger::plistFooter(mPlistFilenames);
             mPlistFile.close();
+            mPlistFilenames.clear();
         }
     }
 
@@ -178,6 +188,8 @@ class CppCheck::CppCheckLogger : public ErrorLogger
         // TODO: only convert if necessary
         const auto errorMessage = SuppressionList::ErrorMessage::fromErrorMessage(msg, macroNames);
 
+        bool suppressed = false;
+
         if (mSuppressions.nomsg.isSuppressed(errorMessage, mUseGlobalSuppressions)) {
             // Safety: Report critical errors to ErrorLogger
             if (mSettings.safety && ErrorLogger::isCriticalErrorId(msg.id)) {
@@ -194,11 +206,13 @@ class CppCheck::CppCheckLogger : public ErrorLogger
                     mErrorLogger.reportErr(msg);
                 }
             }
-            return;
+            suppressed = true;
         }
 
         // TODO: there should be no need for the verbose and default messages here
-        std::string errmsg = msg.toString(mSettings.verbose, mSettings.templateFormat, mSettings.templateLocation);
+        // Code is not needed for deduplication
+        const bool noCode = true;
+        std::string errmsg = msg.toString(mSettings.verbose, mSettings.templateFormat, mSettings.templateLocation, noCode);
         if (errmsg.empty())
             return;
 
@@ -211,6 +225,9 @@ class CppCheck::CppCheckLogger : public ErrorLogger
         if (mAnalyzerInformation)
             mAnalyzerInformation->reportErr(msg);
 
+        if (suppressed)
+            return;
+
         if (!mSuppressions.nofail.isSuppressed(errorMessage) && !mSuppressions.nomsg.isSuppressed(errorMessage)) {
             mExitCode = 1;
         }
@@ -276,6 +293,7 @@ class CppCheck::CppCheckLogger : public ErrorLogger
     std::map<Location, std::set<std::string>> mLocationMacros; // What macros are used on a location?
 
     std::ofstream mPlistFile;
+    std::vector<std::string> mPlistFilenames;
 
     unsigned int mExitCode{};
 
@@ -331,17 +349,17 @@ static std::vector<std::string> split(const std::string &str, const std::string
     return ret;
 }
 
-static std::string getDumpFileName(const Settings& settings, const std::string& filename, int fileIndex)
+static std::string getDumpFileName(const Settings& settings, const FileWithDetails& file)
 {
     std::string extension = ".dump";
-    if (fileIndex > 0)
-        extension = "." + std::to_string(fileIndex) + extension;
+    if (file.fsFileId() > 0)
+        extension = "." + std::to_string(file.fsFileId()) + extension;
     if (!settings.dump && settings.buildDir.empty())
         extension = "." + std::to_string(settings.pid) + extension;
 
     if (!settings.dump && !settings.buildDir.empty())
-        return AnalyzerInformation::getAnalyzerInfoFile(settings.buildDir, filename, "", fileIndex) + extension;
-    return filename + extension;
+        return AnalyzerInformation::getAnalyzerInfoFile(settings.buildDir, file.spath(), "", file.fsFileId()) + extension;
+    return file.spath() + extension;
 }
 
 static std::string getCtuInfoFileName(const std::string &dumpFile)
@@ -351,13 +369,12 @@ static std::string getCtuInfoFileName(const std::string &dumpFile)
 
 static void createDumpFile(const Settings& settings,
                            const FileWithDetails& file,
-                           int fileIndex,
                            std::ofstream& fdump,
                            std::string& dumpFile)
 {
     if (!settings.dump && settings.addons.empty())
         return;
-    dumpFile = getDumpFileName(settings, file.spath(), fileIndex);
+    dumpFile = getDumpFileName(settings, file);
 
     fdump.open(dumpFile);
     if (!fdump.is_open())
@@ -533,6 +550,7 @@ static std::string getDefinesFlags(const std::string &semicolonSeparatedString)
 CppCheck::CppCheck(const Settings& settings,
                    Suppressions& supprs,
                    ErrorLogger &errorLogger,
+                   TimerResults *timerResults,
                    bool useGlobalSuppressions,
                    ExecuteCmdFn executeCommand)
     : mSettings(settings)
@@ -540,6 +558,7 @@ CppCheck::CppCheck(const Settings& settings,
     , mLogger(new CppCheckLogger(errorLogger, mSettings, mSuppressions, useGlobalSuppressions))
     , mErrorLogger(*mLogger)
     , mErrorLoggerDirect(errorLogger)
+    , mTimerResults(timerResults)
     , mUseGlobalSuppressions(useGlobalSuppressions)
     , mExecuteCommand(std::move(executeCommand))
 {}
@@ -659,7 +678,7 @@ static std::string getClangFlags(const Settings& setting, Standards::Language la
 }
 
 // TODO: clear error list before returning
-unsigned int CppCheck::checkClang(const FileWithDetails &file, int fileIndex)
+unsigned int CppCheck::checkClang(const FileWithDetails &file)
 {
     // TODO: clear exitcode
 
@@ -672,7 +691,7 @@ unsigned int CppCheck::checkClang(const FileWithDetails &file, int fileIndex)
     // TODO: get language from FileWithDetails object
     std::string clangStderr;
     if (!mSettings.buildDir.empty())
-        clangStderr = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, file.spath(), "", fileIndex) + ".clang-stderr";
+        clangStderr = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, file.spath(), "", file.fsFileId()) + ".clang-stderr";
 
     std::string exe = mSettings.clangExecutable;
 #ifdef _WIN32
@@ -739,14 +758,14 @@ unsigned int CppCheck::checkClang(const FileWithDetails &file, int fileIndex)
                              const_cast<SymbolDatabase&>(*tokenizer.getSymbolDatabase()),
                              mErrorLogger,
                              mSettings,
-                             &s_timerResults);
+                             mTimerResults);
         tokenizer.printDebugOutput(std::cout);
         checkNormalTokens(tokenizer, nullptr, ""); // TODO: provide analyzer information
 
         // create dumpfile
         std::ofstream fdump;
         std::string dumpFile;
-        createDumpFile(mSettings, file, fileIndex, fdump, dumpFile);
+        createDumpFile(mSettings, file, fdump, dumpFile);
         if (fdump.is_open()) {
             fdump << getLibraryDumpData();
             // TODO: use tinyxml2 to create XML
@@ -790,9 +809,9 @@ unsigned int CppCheck::check(const FileWithDetails &file)
 
     unsigned int returnValue;
     if (mSettings.clang)
-        returnValue = checkClang(file, 0);
+        returnValue = checkClang(file);
     else
-        returnValue = checkFile(file, "", 0);
+        returnValue = checkFile(file, "");
 
     // TODO: call analyseClangTidy()
 
@@ -801,7 +820,7 @@ unsigned int CppCheck::check(const FileWithDetails &file)
 
 unsigned int CppCheck::checkBuffer(const FileWithDetails &file, const char* data, std::size_t size)
 {
-    return checkBuffer(file, "", 0, data, size);
+    return checkBuffer(file, "", data, size);
 }
 
 unsigned int CppCheck::check(const FileSettings &fs)
@@ -818,6 +837,7 @@ unsigned int CppCheck::check(const FileSettings &fs)
     else
         tempSettings.userDefines += fs.cppcheckDefines();
     tempSettings.includePaths = fs.includePaths;
+    tempSettings.userIncludes.insert(tempSettings.userIncludes.end(), fs.forcedIncludes.cbegin(), fs.forcedIncludes.cend());
     tempSettings.userUndefs.insert(fs.undefs.cbegin(), fs.undefs.cend());
     if (fs.standard.find("++") != std::string::npos)
         tempSettings.standards.setCPP(fs.standard);
@@ -828,7 +848,7 @@ unsigned int CppCheck::check(const FileSettings &fs)
     if (mSettings.clang) {
         tempSettings.includePaths.insert(tempSettings.includePaths.end(), fs.systemIncludePaths.cbegin(), fs.systemIncludePaths.cend());
         // need to pass the externally provided ErrorLogger instead of our internal wrapper
-        CppCheck temp(tempSettings, mSuppressions, mErrorLoggerDirect, mUseGlobalSuppressions, mExecuteCommand);
+        CppCheck temp(tempSettings, mSuppressions, mErrorLoggerDirect, mTimerResults, mUseGlobalSuppressions, mExecuteCommand);
         // TODO: propagate back mFileInfo
         const unsigned int returnValue = temp.check(fs.file);
         if (mUnusedFunctionsCheck)
@@ -836,8 +856,8 @@ unsigned int CppCheck::check(const FileSettings &fs)
         return returnValue;
     }
     // need to pass the externally provided ErrorLogger instead of our internal wrapper
-    CppCheck temp(tempSettings, mSuppressions, mErrorLoggerDirect, mUseGlobalSuppressions, mExecuteCommand);
-    const unsigned int returnValue = temp.checkFile(fs.file, fs.cfg, fs.fileIndex);
+    CppCheck temp(tempSettings, mSuppressions, mErrorLoggerDirect, mTimerResults, mUseGlobalSuppressions, mExecuteCommand);
+    const unsigned int returnValue = temp.checkFile(fs.file, fs.cfg);
     if (mUnusedFunctionsCheck)
         mUnusedFunctionsCheck->updateFunctionData(*temp.mUnusedFunctionsCheck);
     while (!temp.mFileInfo.empty()) {
@@ -874,23 +894,27 @@ std::size_t CppCheck::calculateHash(const Preprocessor& preprocessor, const std:
     return preprocessor.calculateHash(toolinfo.str());
 }
 
-unsigned int CppCheck::checkBuffer(const FileWithDetails &file, const std::string &cfgname, int fileIndex, const char* data, std::size_t size)
+unsigned int CppCheck::checkBuffer(const FileWithDetails &file, const std::string &cfgname, const char* data, std::size_t size)
 {
-    const auto f = [&file, data, size](std::vector<std::string>& files, simplecpp::OutputList* outputList) {
-        return simplecpp::TokenList{{data, size}, files, file.spath(), outputList};
+    const auto f = [&file, data, size, this](std::vector<std::string>& files, simplecpp::OutputList* outputList) {
+        simplecpp::DUI dui;
+        dui.std = mSettings.standards.getStdForLanguage(file.lang());
+        return simplecpp::TokenList{{data, size}, files, file.spath(), dui, outputList};
     };
-    return checkInternal(file, cfgname, fileIndex, f);
+    return checkInternal(file, cfgname, f);
 }
 
-unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string &cfgname, int fileIndex)
+unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string &cfgname)
 {
-    const auto f = [&file](std::vector<std::string>& files, simplecpp::OutputList* outputList) {
-        return simplecpp::TokenList{file.spath(), files, outputList};
+    const auto f = [&file, this](std::vector<std::string>& files, simplecpp::OutputList* outputList) {
+        simplecpp::DUI dui;
+        dui.std = mSettings.standards.getStdForLanguage(file.lang());
+        return simplecpp::TokenList{file.spath(), files, dui, outputList};
     };
-    return checkInternal(file, cfgname, fileIndex, f);
+    return checkInternal(file, cfgname, f);
 }
 
-void CppCheck::checkPlistOutput(const FileWithDetails& file, const std::vector<std::string>& files)
+void CppCheck::checkPlistOutput(const FileWithDetails& file)
 {
     if (!mSettings.plistOutput.empty()) {
         const bool slashFound = file.spath().find('/') != std::string::npos;
@@ -901,11 +925,11 @@ void CppCheck::checkPlistOutput(const FileWithDetails& file, const std::vector<s
         // the hash is added to handle when files in different folders have the same name
         const std::size_t fileNameHash = std::hash<std::string> {}(file.spath());
         filename = mSettings.plistOutput + noSuffixFilename + "_" + std::to_string(fileNameHash) + ".plist";
-        mLogger->openPlist(filename, files);
+        mLogger->openPlist(filename);
     }
 }
 
-unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::string &cfgname, int fileIndex, const CreateTokenListFn& createTokenList)
+unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::string &cfgname, const CreateTokenListFn& createTokenList)
 {
     // TODO: move to constructor when CppCheck no longer owns the settings
     if (mSettings.checks.isEnabled(Checks::unusedFunction) && !mUnusedFunctionsCheck)
@@ -918,7 +942,9 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
     if (Settings::terminated())
         return mLogger->exitcode();
 
-    const Timer fileTotalTimer{file.spath(), mSettings.showtime, nullptr, Timer::Type::FILE};
+    std::unique_ptr<OneShotTimer> checkTimeTimer;
+    if (mSettings.showtime == Settings::ShowTime::FILE || mSettings.showtime == Settings::ShowTime::FILE_TOTAL || mSettings.showtime == Settings::ShowTime::TOP5_FILE)
+        checkTimeTimer.reset(new OneShotTimer("Check time: " + file.spath()));
 
     if (!mSettings.quiet) {
         std::string fixedpath = Path::toNativeSeparators(file.spath());
@@ -967,13 +993,13 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
                 tokenlist.createTokens(std::move(tokens));
                 // this is not a real source file - we just want to tokenize it. treat it as C anyways as the language needs to be determined.
                 Tokenizer tokenizer(std::move(tokenlist), mErrorLogger);
-                mUnusedFunctionsCheck->parseTokens(tokenizer, mSettings);
+                mUnusedFunctionsCheck->parseTokens(tokenizer, mSettings.library);
 
                 if (analyzerInformation) {
                     mLogger->setAnalyzerInfo(nullptr);
 
                     std::list<ErrorMessage> errors;
-                    analyzerInformation->analyzeFile(mSettings.buildDir, file.spath(), cfgname, fileIndex, hash, errors);
+                    analyzerInformation->analyzeFile(mSettings.buildDir, file.spath(), cfgname, file.fsFileId(), hash, errors, mSettings.debugainfo);
                     analyzerInformation->setFileInfo("CheckUnusedFunctions", mUnusedFunctionsCheck->analyzerInfo(tokenizer));
                     analyzerInformation->close();
                 }
@@ -990,25 +1016,58 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
         if (preprocessor.reportOutput(outputList, true))
             return mLogger->exitcode();
 
-        if (!preprocessor.loadFiles(files))
-            return mLogger->exitcode();
+        checkPlistOutput(file);
 
-        checkPlistOutput(file, files);
-
-        std::string dumpProlog;
+        std::string dumpFooter;
         if (mSettings.dump || !mSettings.addons.empty()) {
-            dumpProlog += getDumpFileContentsRawTokens(files, tokens1);
+            dumpFooter += getDumpFileContentsRawTokensFooter(tokens1);
         }
 
         // Parse comments and then remove them
-        mLogger->setRemarkComments(preprocessor.getRemarkComments());
+        mLogger->addRemarkComments(preprocessor.getRemarkComments());
         preprocessor.inlineSuppressions(mSuppressions.nomsg);
-        if (mSettings.dump || !mSettings.addons.empty()) {
-            std::ostringstream oss;
-            mSuppressions.nomsg.dump(oss);
-            dumpProlog += oss.str();
-        }
-        preprocessor.removeComments();
+        if (!mSettings.keepComments)
+            preprocessor.removeComments();
+
+        // Get directives
+        std::list<Directive> directives;
+        preprocessor.createDirectives(directives);
+        preprocessor.simplifyPragmaAsm();
+
+        std::set<std::string> configurations;
+        std::set<std::string> configDefines = { "__cplusplus" };
+
+        // Insert library defines
+        const auto getDefineName = [](const std::string &defineString) {
+            return defineString.substr(0, defineString.find_first_of("( "));
+        };
+        std::transform(mSettings.library.defines().begin(),
+                       mSettings.library.defines().end(),
+                       std::inserter(configDefines, configDefines.end()),
+                       getDefineName);
+
+        // Keep track of all included files when using build dir
+        std::set<std::string> includedFiles;
+
+        preprocessor.setLoadCallback([&](simplecpp::FileData &data, bool loaded) {
+            if (analyzerInformation) {
+                includedFiles.insert(data.filename);
+            }
+            if (loaded) {
+                // Do preprocessing on included file
+                mLogger->addRemarkComments(preprocessor.getRemarkComments(data.tokens));
+                preprocessor.inlineSuppressions(data.tokens, mSuppressions.nomsg);
+                if (!mSettings.keepComments)
+                    Preprocessor::removeComments(data.tokens);
+                Preprocessor::createDirectives(data.tokens, directives);
+                Preprocessor::simplifyPragmaAsm(data.tokens);
+                // Discover new configurations from included file
+                if (configurations.size() < maxConfigs)
+                    preprocessor.getConfigs(data.filename, data.tokens, configDefines, configurations);
+            }
+        });
+
+        preprocessor.setPlatformInfo();
 
         if (!mSettings.buildDir.empty()) {
             analyzerInformation.reset(new AnalyzerInformation);
@@ -1016,10 +1075,13 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
         }
 
         if (analyzerInformation) {
+            // Load all included files to get correct hashes and suppressions
+            for (const std::string &filename : analyzerInformation->getIncludes(mSettings.buildDir, file.spath(), cfgname, file.fsFileId()))
+                preprocessor.loadFile(files, filename);
             // Calculate hash so it can be compared with old hash / future hashes
             const std::size_t hash = calculateHash(preprocessor, file.spath());
             std::list<ErrorMessage> errors;
-            if (!analyzerInformation->analyzeFile(mSettings.buildDir, file.spath(), cfgname, fileIndex, hash, errors)) {
+            if (!analyzerInformation->analyzeFile(mSettings.buildDir, file.spath(), cfgname, file.fsFileId(), hash, errors, mSettings.debugainfo)) {
                 while (!errors.empty()) {
                     mErrorLogger.reportErr(errors.front());
                     errors.pop_front();
@@ -1027,22 +1089,20 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
                 mLogger->setAnalyzerInfo(nullptr);
                 return mLogger->exitcode();  // known results => no need to reanalyze file
             }
+            // Clear included file list; we don't want to keep includes that have been removed from the source
+            // Any includes that are still present will be readded
+            includedFiles.clear();
         }
 
-        // Get directives
-        std::list<Directive> directives = preprocessor.createDirectives();
-        preprocessor.simplifyPragmaAsm();
-
-        preprocessor.setPlatformInfo();
-
         // Get configurations..
-        std::set<std::string> configurations;
         if (maxConfigs > 1) {
-            Timer::run("Preprocessor::getConfigs", mSettings.showtime, &s_timerResults, [&]() {
-                configurations = preprocessor.getConfigs();
+            Timer::run("Preprocessor::getConfigs", mTimerResults, [&]() {
+                configurations = { "" };
+                preprocessor.getConfigs(configDefines, configurations);
+                preprocessor.loadAllIncludes(files);
             });
         } else {
-            configurations.insert(mSettings.userDefines);
+            configurations = { mSettings.userDefines };
         }
 
         if (mSettings.checkConfiguration) {
@@ -1076,10 +1136,9 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
         // write dump file xml prolog
         std::ofstream fdump;
         std::string dumpFile;
-        createDumpFile(mSettings, file, fileIndex, fdump, dumpFile);
+        createDumpFile(mSettings, file, fdump, dumpFile);
         if (fdump.is_open()) {
             fdump << getLibraryDumpData();
-            fdump << dumpProlog;
             if (!mSettings.dump)
                 filesDeleter.addFile(dumpFile);
         }
@@ -1123,136 +1182,117 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
 
             if (mSettings.preprocessOnly) {
                 std::string codeWithoutCfg;
-                Timer::run("Preprocessor::getcode", mSettings.showtime, &s_timerResults, [&]() {
+                Timer::run("Preprocessor::getcode", mTimerResults, [&]() {
                     codeWithoutCfg = preprocessor.getcode(currentConfig, files, true);
                 });
 
-                if (startsWith(codeWithoutCfg,"#file"))
-                    codeWithoutCfg.insert(0U, "//");
                 std::string::size_type pos = 0;
-                while ((pos = codeWithoutCfg.find("\n#file",pos)) != std::string::npos)
-                    codeWithoutCfg.insert(pos+1U, "//");
-                pos = 0;
-                while ((pos = codeWithoutCfg.find("\n#endfile",pos)) != std::string::npos)
-                    codeWithoutCfg.insert(pos+1U, "//");
-                pos = 0;
                 while ((pos = codeWithoutCfg.find(Preprocessor::macroChar,pos)) != std::string::npos)
                     codeWithoutCfg[pos] = ' ';
                 mErrorLogger.reportOut(codeWithoutCfg, Color::Reset);
                 continue;
             }
 
-            try {
-                TokenList tokenlist{mSettings, file.lang()};
-
-                {
-                    bool skipCfg = false;
-                    // Create tokens, skip rest of iteration if failed
-                    Timer::run("Tokenizer::createTokens", mSettings.showtime, &s_timerResults, [&]() {
-                        simplecpp::OutputList outputList_cfg;
-                        simplecpp::TokenList tokensP = preprocessor.preprocess(currentConfig, files, outputList_cfg);
-                        const simplecpp::Output* o = preprocessor.handleErrors(outputList_cfg);
-                        if (!o) {
-                            tokenlist.createTokens(std::move(tokensP));
-                        }
-                        else {
-                            // #error etc during preprocessing
-                            configurationError.push_back((currentConfig.empty() ? "\'\'" : currentConfig) + " : [" + tokensP.file(o->location) + ':' + std::to_string(o->location.line) + "] " + o->msg);
-                            --checkCount; // don't count invalid configurations
-
-                            if (!hasValidConfig && currCfg == *configurations.rbegin()) {
-                                // If there is no valid configuration then report error..
-                                preprocessor.error(tokensP.file(o->location), o->location.line, o->location.col, o->msg, o->type);
-                            }
-                            skipCfg = true;
-                        }
-                    });
-                    if (skipCfg)
-                        continue;
-                }
-                hasValidConfig = true;
+            TokenList tokenlist{mSettings, file.lang()};
 
-                Tokenizer tokenizer(std::move(tokenlist), mErrorLogger);
-                try {
-                    if (mSettings.showtime != ShowTime::NONE)
-                        tokenizer.setTimerResults(&s_timerResults);
-                    tokenizer.setDirectives(directives); // TODO: how to avoid repeated copies?
-
-                    // locations macros
-                    mLogger->setLocationMacros(tokenizer.tokens(), files);
-
-                    // If only errors are printed, print filename after the check
-                    if (!mSettings.quiet && (!currentConfig.empty() || checkCount > 1)) {
-                        std::string fixedpath = Path::toNativeSeparators(file.spath());
-                        mErrorLogger.reportOut("Checking " + fixedpath + ": " + currentConfig + "...", Color::FgGreen);
+            {
+                bool skipCfg = false;
+                // Create tokens, skip rest of iteration if failed
+                Timer::run("Tokenizer::createTokens", mTimerResults, [&]() {
+                    simplecpp::OutputList outputList_cfg;
+                    simplecpp::TokenList tokensP = preprocessor.preprocess(currentConfig, files, outputList_cfg);
+                    const simplecpp::Output* o = preprocessor.handleErrors(outputList_cfg);
+                    if (!o) {
+                        tokenlist.createTokens(std::move(tokensP));
                     }
+                    else {
+                        // #error etc during preprocessing
+                        configurationError.push_back((currentConfig.empty() ? "\'\'" : currentConfig) + " : [" + tokensP.file(o->location) + ':' + std::to_string(o->location.line) + "] " + o->msg);
+                        --checkCount; // don't count invalid configurations
+
+                        if (!hasValidConfig && currCfg == *configurations.rbegin()) {
+                            // If there is no valid configuration then report error..
+                            preprocessor.error(o->location, o->msg, o->type);
+                        }
+                        skipCfg = true;
+                    }
+                });
+                if (skipCfg)
+                    continue;
+            }
+            hasValidConfig = true;
 
-                    if (!tokenizer.tokens())
-                        continue;
+            Tokenizer tokenizer(std::move(tokenlist), mErrorLogger);
+            try {
+                tokenizer.setTimerResults(mTimerResults);
+                tokenizer.setDirectives(directives); // TODO: how to avoid repeated copies?
 
-                    // skip rest of iteration if just checking configuration
-                    if (mSettings.checkConfiguration)
-                        continue;
+                // locations macros
+                mLogger->setLocationMacros(tokenizer.tokens(), files);
+
+                // If only errors are printed, print filename after the check
+                if (!mSettings.quiet && (!currentConfig.empty() || checkCount > 1)) {
+                    std::string fixedpath = Path::toNativeSeparators(file.spath());
+                    mErrorLogger.reportOut("Checking " + fixedpath + ": " + currentConfig + "...", Color::FgGreen);
+                }
+
+                if (!tokenizer.tokens())
+                    continue;
+
+                // skip rest of iteration if just checking configuration
+                if (mSettings.checkConfiguration)
+                    continue;
 
 #ifdef HAVE_RULES
-                    // Execute rules for "raw" code
-                    executeRules("raw", tokenizer.list);
+                // Execute rules for "raw" code
+                executeRules("raw", tokenizer.list);
 #endif
 
-                    // Simplify tokens into normal form, skip rest of iteration if failed
-                    if (!tokenizer.simplifyTokens1(currentConfig, fileIndex))
-                        continue;
+                // Simplify tokens into normal form, skip rest of iteration if failed
+                if (!tokenizer.simplifyTokens1(currentConfig, file.fsFileId()))
+                    continue;
 
-                    // dump xml if --dump
-                    if ((mSettings.dump || !mSettings.addons.empty()) && fdump.is_open()) {
-                        fdump << "<dump cfg=\"" << ErrorLogger::toxml(currentConfig) << "\">" << std::endl;
-                        fdump << "  <standards>" << std::endl;
-                        fdump << "    <c version=\"" << mSettings.standards.getC() << "\"/>" << std::endl;
-                        fdump << "    <cpp version=\"" << mSettings.standards.getCPP() << "\"/>" << std::endl;
-                        fdump << "  </standards>" << std::endl;
-                        fdump << getLibraryDumpData();
-                        preprocessor.dump(fdump);
-                        tokenizer.dump(fdump);
-                        fdump << "</dump>" << std::endl;
-                    }
+                // dump xml if --dump
+                if ((mSettings.dump || !mSettings.addons.empty()) && fdump.is_open()) {
+                    fdump << "<dump cfg=\"" << ErrorLogger::toxml(currentConfig) << "\">" << std::endl;
+                    fdump << "  <standards>" << std::endl;
+                    fdump << "    <c version=\"" << mSettings.standards.getC() << "\"/>" << std::endl;
+                    fdump << "    <cpp version=\"" << mSettings.standards.getCPP() << "\"/>" << std::endl;
+                    fdump << "  </standards>" << std::endl;
+                    fdump << getLibraryDumpData();
+                    preprocessor.dump(fdump);
+                    tokenizer.dump(fdump);
+                    fdump << "</dump>" << std::endl;
+                }
 
-                    if (mSettings.inlineSuppressions) {
-                        // Need to call this even if the hash will skip this configuration
-                        mSuppressions.nomsg.markUnmatchedInlineSuppressionsAsChecked(tokenizer);
-                    }
+                if (mSettings.inlineSuppressions) {
+                    // Need to call this even if the hash will skip this configuration
+                    mSuppressions.nomsg.markUnmatchedInlineSuppressionsAsChecked(tokenizer.list);
+                }
 
-                    // Skip if we already met the same simplified token list
-                    if (maxConfigs > 1) {
-                        const std::size_t hash = tokenizer.list.calculateHash();
-                        if (hashes.find(hash) != hashes.end()) {
-                            if (mSettings.debugwarnings)
-                                purgedConfigurationMessage(file.spath(), currentConfig);
-                            continue;
-                        }
-                        hashes.insert(hash);
+                // Skip if we already met the same simplified token list
+                if (maxConfigs > 1) {
+                    const std::size_t hash = tokenizer.list.calculateHash();
+                    if (hashes.find(hash) != hashes.end()) {
+                        if (mSettings.debugwarnings)
+                            purgedConfigurationMessage(file.spath(), currentConfig);
+                        continue;
                     }
-
-                    // Check normal tokens
-                    checkNormalTokens(tokenizer, analyzerInformation.get(), currentConfig);
-                } catch (const InternalError &e) {
-                    ErrorMessage errmsg = ErrorMessage::fromInternalError(e, &tokenizer.list, file.spath());
-                    mErrorLogger.reportErr(errmsg);
+                    hashes.insert(hash);
                 }
-            } catch (const TerminateException &) {
-                // Analysis is terminated
-                if (analyzerInformation)
-                    mLogger->setAnalyzerInfo(nullptr);
-                return mLogger->exitcode();
+
+                // Check normal tokens
+                checkNormalTokens(tokenizer, analyzerInformation.get(), currentConfig);
             } catch (const InternalError &e) {
-                ErrorMessage errmsg = ErrorMessage::fromInternalError(e, nullptr, file.spath());
+                ErrorMessage errmsg = ErrorMessage::fromInternalError(e, &tokenizer.list, file.spath());
                 mErrorLogger.reportErr(errmsg);
             }
         }
 
         if (!hasValidConfig && configurations.size() > 1 && mSettings.severity.isEnabled(Severity::information)) {
             std::string msg;
-            msg = "This file is not analyzed. Cppcheck failed to extract a valid configuration. Use -v for more details.";
-            msg += "\nThis file is not analyzed. Cppcheck failed to extract a valid configuration. The tested configurations have these preprocessor errors:";
+            msg = "This file is not analyzed. No working configuration could be extracted. Use -v for more details.";
+            msg += "\nThis file is not analyzed. No working configuration could be extracted. The tested configurations have these preprocessor errors:";
             for (const std::string &s : configurationError)
                 msg += '\n' + s;
 
@@ -1268,12 +1308,25 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
         }
 
         // TODO: will not be closed if we encountered an exception
-        // dumped all configs, close root </dumps> element now
         if (fdump.is_open()) {
+            // dump all filenames, raw tokens, suppressions
+            std::string dumpHeader = getDumpFileContentsRawTokensHeader(files);
+            fdump << getDumpFileContentsRawTokens(dumpHeader, dumpFooter);
+            mSuppressions.nomsg.dump(fdump);
+            // dumped all configs, close root </dumps> element now
             fdump << "</dumps>" << std::endl;
             fdump.close();
         }
 
+        if (!mSettings.plistOutput.empty()) {
+            mLogger->setPlistFilenames(std::move(files));
+        }
+
+        if (analyzerInformation) {
+            analyzerInformation->writeIncludes(includedFiles);
+            analyzerInformation->writeHash(calculateHash(preprocessor, file.spath()));
+        }
+
         executeAddons(dumpFile, file);
     } catch (const TerminateException &) {
         // Analysis is terminated
@@ -1297,8 +1350,12 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
     // TODO: clear earlier?
     mLogger->clear();
 
-    if (mSettings.showtime == ShowTime::FILE || mSettings.showtime == ShowTime::TOP5_FILE)
-        printTimerResults(mSettings.showtime);
+    if (mTimerResults) {
+        if (mSettings.showtime == Settings::ShowTime::FILE)
+            mTimerResults->showResults();
+        else if (mSettings.showtime == Settings::ShowTime::TOP5_FILE)
+            mTimerResults->showResults(5);
+    }
 
     return mLogger->exitcode();
 }
@@ -1326,6 +1383,8 @@ void CppCheck::internalError(const std::string &filename, const std::string &msg
 
 void CppCheck::checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation* analyzerInformation, const std::string& currentConfig)
 {
+    const ProgressReporter progressReporter(mErrorLogger, mSettings.reportProgress, tokenizer.list.getSourceFilePath(), "Run checkers");
+
     CheckUnusedFunctions unusedFunctionsChecker;
 
     // TODO: this should actually be the behavior if only "--enable=unusedFunction" is specified - see #10648
@@ -1336,8 +1395,7 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation
         const std::time_t maxTime = mSettings.checksMaxTime > 0 ? std::time(nullptr) + mSettings.checksMaxTime : 0;
 
         // call all "runChecks" in all registered Check classes
-        // cppcheck-suppress shadowFunction - TODO: fix this
-        for (Check *check : Check::instances()) {
+        for (Check * const c : CheckInstances::get()) {
             if (Settings::terminated())
                 return;
 
@@ -1355,17 +1413,17 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation
                 return;
             }
 
-            Timer::run(check->name() + "::runChecks", mSettings.showtime, &s_timerResults, [&]() {
-                check->runChecks(tokenizer, &mErrorLogger);
+            Timer::run(c->name() + "::runChecks", mTimerResults, [&]() {
+                c->runChecks(tokenizer, mErrorLogger);
             });
         }
     }
 
     if (mSettings.checks.isEnabled(Checks::unusedFunction) && !mSettings.buildDir.empty()) {
-        unusedFunctionsChecker.parseTokens(tokenizer, mSettings);
+        unusedFunctionsChecker.parseTokens(tokenizer, mSettings.library);
     }
     if (mUnusedFunctionsCheck && mSettings.useSingleJob() && mSettings.buildDir.empty()) {
-        mUnusedFunctionsCheck->parseTokens(tokenizer, mSettings);
+        mUnusedFunctionsCheck->parseTokens(tokenizer, mSettings.library);
     }
 
     if (mSettings.clang) {
@@ -1376,7 +1434,7 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation
     if (mSettings.useSingleJob() || analyzerInformation) {
         // Analyse the tokens..
         {
-            CTU::FileInfo * const fi1 = CTU::getFileInfo(tokenizer);
+            const CTU::FileInfo * const fi1 = CTU::getFileInfo(tokenizer);
             if (analyzerInformation)
                 analyzerInformation->setFileInfo("ctu", fi1->toString());
             if (mSettings.useSingleJob())
@@ -1386,11 +1444,10 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation
         }
 
         if (!doUnusedFunctionOnly) {
-            // cppcheck-suppress shadowFunction - TODO: fix this
-            for (const Check *check : Check::instances()) {
-                if (Check::FileInfo * const fi = check->getFileInfo(tokenizer, mSettings, currentConfig)) {
+            for (const Check * const c : CheckInstances::get()) {
+                if (const Check::FileInfo * const fi = c->getFileInfo(tokenizer, mSettings, currentConfig)) {
                     if (analyzerInformation)
-                        analyzerInformation->setFileInfo(check->name(), fi->toString());
+                        analyzerInformation->setFileInfo(c->name(), fi->toString());
                     if (mSettings.useSingleJob())
                         mFileInfo.push_back(fi);
                     else
@@ -1414,7 +1471,7 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation
 #ifdef HAVE_RULES
 bool CppCheck::hasRule(const std::string &tokenlist) const
 {
-    return std::any_of(mSettings.rules.cbegin(), mSettings.rules.cend(), [&](const Settings::Rule& rule) {
+    return std::any_of(mSettings.rules.cbegin(), mSettings.rules.cend(), [&](const Rule& rule) {
         return rule.tokenlist == tokenlist;
     });
 }
@@ -1432,7 +1489,7 @@ void CppCheck::executeRules(const std::string &tokenlist, const TokenList &list)
         str += tok->str();
     }
 
-    for (const Settings::Rule &rule : mSettings.rules) {
+    for (const Rule &rule : mSettings.rules) {
         if (rule.tokenlist != tokenlist)
             continue;
 
@@ -1490,7 +1547,7 @@ void CppCheck::executeAddons(const std::string& dumpFile, const FileWithDetails&
 {
     if (!dumpFile.empty()) {
         std::vector<std::string> f{dumpFile};
-        Timer::run("CppCheck::executeAddons", mSettings.showtime, &s_timerResults, [&]() {
+        Timer::run("CppCheck::executeAddons", mTimerResults, [&]() {
             executeAddons(f, file.spath());
         });
     }
@@ -1524,6 +1581,8 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
         if (isCtuInfo && addonInfo.name != "misra" && !addonInfo.ctu)
             continue;
 
+        ProgressReporter progressReporter(mErrorLogger, mSettings.reportProgress, files.front(), "addon:" + addonInfo.name + (isCtuInfo ? " (ctu)" : ""));
+
         std::vector<picojson::value> results;
 
         try {
@@ -1640,12 +1699,12 @@ void CppCheck::executeAddonsWholeProgram(const std::list<FileWithDetails> &files
 
     std::vector<std::string> ctuInfoFiles;
     for (const auto &f: files) {
-        const std::string &dumpFileName = getDumpFileName(mSettings, f.path(), 0);
+        const std::string &dumpFileName = getDumpFileName(mSettings, f);
         ctuInfoFiles.push_back(getCtuInfoFileName(dumpFileName));
     }
 
-    for (const auto &f: fileSettings) {
-        const std::string &dumpFileName = getDumpFileName(mSettings, f.filename(), f.fileIndex);
+    for (const auto &fs: fileSettings) {
+        const std::string &dumpFileName = getDumpFileName(mSettings, fs.file);
         ctuInfoFiles.push_back(getCtuInfoFileName(dumpFileName));
     }
 
@@ -1701,7 +1760,7 @@ void CppCheck::getErrorMessages(ErrorLogger &errorlogger)
     settings.templateFormat = "{callstack}: ({severity}) {inconclusive:inconclusive: }{message}"; // TODO: get rid of this
     Suppressions supprs;
 
-    CppCheck cppcheck(settings, supprs, errorlogger, true, nullptr);
+    CppCheck cppcheck(settings, supprs, errorlogger, nullptr, true, nullptr);
     cppcheck.purgedConfigurationMessage("","");
     cppcheck.tooManyConfigsError("",0U);
     // TODO: add functions to get remaining error messages
@@ -1710,8 +1769,8 @@ void CppCheck::getErrorMessages(ErrorLogger &errorlogger)
     s.addEnabled("all");
 
     // call all "getErrorMessages" in all registered Check classes
-    for (auto it = Check::instances().cbegin(); it != Check::instances().cend(); ++it)
-        (*it)->getErrorMessages(&errorlogger, &s);
+    for (const Check * const c : CheckInstances::get())
+        c->getErrorMessages(errorlogger, s);
 
     CheckUnusedFunctions::getErrorMessages(errorlogger);
     Preprocessor::getErrorMessages(errorlogger, s);
@@ -1757,7 +1816,7 @@ void CppCheck::analyseClangTidy(const FileSettings &fileSettings)
     std::string line;
 
     if (!mSettings.buildDir.empty()) {
-        const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, fileSettings.filename(), "", fileSettings.fileIndex);
+        const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, fileSettings.sfilename(), "", fileSettings.file.fsFileId());
         std::ofstream fcmd(analyzerInfoFile + ".clang-tidy-cmd");
         fcmd << istr.str();
     }
@@ -1828,13 +1887,12 @@ bool CppCheck::analyseWholeProgram()
             }
         }
 
-        // cppcheck-suppress shadowFunction - TODO: fix this
-        for (Check *check : Check::instances())
-            errors |= check->analyseWholeProgram(ctu, mFileInfo, mSettings, mErrorLogger);  // TODO: ctu
+        for (Check * const c : CheckInstances::get())
+            errors |= c->analyseWholeProgram(ctu, mFileInfo, mSettings, mErrorLogger);  // TODO: ctu
     }
 
     if (mUnusedFunctionsCheck)
-        errors |= mUnusedFunctionsCheck->check(mSettings, mErrorLogger);
+        errors |= mUnusedFunctionsCheck->check(mSettings.library, mErrorLogger);
 
     return errors && (mLogger->exitcode() > 0);
 }
@@ -1845,79 +1903,47 @@ unsigned int CppCheck::analyseWholeProgram(const std::string &buildDir, const st
         CheckUnusedFunctions::analyseWholeProgram(mSettings, mErrorLogger, buildDir);
 
     if (mUnusedFunctionsCheck)
-        mUnusedFunctionsCheck->check(mSettings, mErrorLogger);
+        mUnusedFunctionsCheck->check(mSettings.library, mErrorLogger);
 
     if (Settings::unusedFunctionOnly())
         return mLogger->exitcode();
 
     executeAddonsWholeProgram(files, fileSettings, ctuInfo);
-    std::list<Check::FileInfo*> fileInfoList;
-    CTU::FileInfo ctuFileInfo;
-
-    // Load all analyzer info data..
-    const std::string filesTxt(buildDir + "/files.txt");
-    std::ifstream fin(filesTxt);
-    std::string filesTxtLine;
-    while (std::getline(fin, filesTxtLine)) {
-        AnalyzerInformation::Info filesTxtInfo;
-        if (!filesTxtInfo.parse(filesTxtLine))
-            continue;
 
-        const std::string xmlfile = buildDir + '/' + filesTxtInfo.afile;
-
-        tinyxml2::XMLDocument doc;
-        const tinyxml2::XMLError error = doc.LoadFile(xmlfile.c_str());
-        if (error != tinyxml2::XML_SUCCESS)
-            continue;
-
-        const tinyxml2::XMLElement * const rootNode = doc.FirstChildElement();
-        if (rootNode == nullptr)
-            continue;
+    std::list<const Check::FileInfo*> fileInfoList;
+    CTU::FileInfo ctuFileInfo;
 
-        for (const tinyxml2::XMLElement *e = rootNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
-            if (std::strcmp(e->Name(), "FileInfo") != 0)
-                continue;
-            const char *checkClassAttr = e->Attribute("check");
-            if (!checkClassAttr)
-                continue;
-            if (std::strcmp(checkClassAttr, "ctu") == 0) {
-                ctuFileInfo.loadFromXml(e);
-                continue;
-            }
-            // cppcheck-suppress shadowFunction - TODO: fix this
-            for (const Check *check : Check::instances()) {
-                if (checkClassAttr == check->name()) {
-                    if (Check::FileInfo* fi = check->loadFileInfoFromXml(e)) {
-                        fi->file0 = filesTxtInfo.sourceFile;
-                        fileInfoList.push_back(fi);
-                    }
+    const auto handler = [&fileInfoList, &ctuFileInfo](const char* checkattr, const tinyxml2::XMLElement* e, const AnalyzerInformation::Info& filesTxtInfo) {
+        if (std::strcmp(checkattr, "ctu") == 0) {
+            ctuFileInfo.loadFromXml(e);
+            return;
+        }
+        for (const Check *check : CheckInstances::get()) {
+            if (checkattr == check->name()) {
+                if (const Check::FileInfo* fi = check->loadFileInfoFromXml(e, filesTxtInfo.sourceFile)) {
+                    fileInfoList.push_back(fi);
                 }
             }
         }
-    }
+    };
 
-    // Analyse the tokens
-    // cppcheck-suppress shadowFunction - TODO: fix this
-    for (Check *check : Check::instances())
-        check->analyseWholeProgram(ctuFileInfo, fileInfoList, mSettings, mErrorLogger);
+    const std::string err = AnalyzerInformation::processFilesTxt(buildDir, handler, mSettings.debugainfo);
+    if (!err.empty()) {
+        const ErrorMessage errmsg({}, "", Severity::error, err, "internalError", Certainty::normal);
+        mErrorLogger.reportErr(errmsg);
+    }
+    else {
+        // Analyse the tokens
+        for (Check * const c : CheckInstances::get())
+            c->analyseWholeProgram(ctuFileInfo, fileInfoList, mSettings, mErrorLogger);
+    }
 
-    for (Check::FileInfo *fi : fileInfoList)
+    for (const Check::FileInfo *fi : fileInfoList)
         delete fi;
 
     return mLogger->exitcode();
 }
 
-// cppcheck-suppress unusedFunction - only used in tests
-void CppCheck::resetTimerResults()
-{
-    s_timerResults.reset();
-}
-
-void CppCheck::printTimerResults(ShowTime mode)
-{
-    s_timerResults.showResults(mode);
-}
-
 bool CppCheck::isPremiumCodingStandardId(const std::string& id) const {
     if (mSettings.premiumArgs.find("--misra") != std::string::npos && startsWith(id, "premium-misra-"))
         return true;
@@ -1928,9 +1954,26 @@ bool CppCheck::isPremiumCodingStandardId(const std::string& id) const {
     return false;
 }
 
-std::string CppCheck::getDumpFileContentsRawTokens(const std::vector<std::string>& files, const simplecpp::TokenList& tokens1) const {
+std::string CppCheck::getDumpFileContentsRawTokens(const std::vector<std::string>& files, const simplecpp::TokenList& tokens1) const
+{
+    std::string header = getDumpFileContentsRawTokensHeader(files);
+    std::string footer = getDumpFileContentsRawTokensFooter(tokens1);
+    return getDumpFileContentsRawTokens(header, footer);
+}
+
+std::string CppCheck::getDumpFileContentsRawTokens(const std::string& header, const std::string& footer)
+{
     std::string dumpProlog;
     dumpProlog += "  <rawtokens>\n";
+    dumpProlog += header;
+    dumpProlog += footer;
+    dumpProlog += "  </rawtokens>\n";
+    return dumpProlog;
+}
+
+std::string CppCheck::getDumpFileContentsRawTokensHeader(const std::vector<std::string>& files) const
+{
+    std::string dumpProlog;
     for (unsigned int i = 0; i < files.size(); ++i) {
         dumpProlog += "    <file index=\"";
         dumpProlog += std::to_string(i);
@@ -1938,6 +1981,12 @@ std::string CppCheck::getDumpFileContentsRawTokens(const std::vector<std::string
         dumpProlog += ErrorLogger::toxml(Path::getRelativePath(files[i], mSettings.basePaths));
         dumpProlog += "\"/>\n";
     }
+    return dumpProlog;
+}
+
+std::string CppCheck::getDumpFileContentsRawTokensFooter(const simplecpp::TokenList& tokens1)
+{
+    std::string dumpProlog;
     for (const simplecpp::Token *tok = tokens1.cfront(); tok; tok = tok->next) {
         dumpProlog += "    <tok ";
 
@@ -1949,7 +1998,7 @@ std::string CppCheck::getDumpFileContentsRawTokens(const std::vector<std::string
         dumpProlog += std::to_string(tok->location.line);
         dumpProlog += "\" ";
 
-        dumpProlog +="column=\"";
+        dumpProlog += "column=\"";
         dumpProlog += std::to_string(tok->location.col);
         dumpProlog += "\" ";
 
@@ -1959,6 +2008,5 @@ std::string CppCheck::getDumpFileContentsRawTokens(const std::vector<std::string
 
         dumpProlog += "/>\n";
     }
-    dumpProlog += "  </rawtokens>\n";
     return dumpProlog;
 }
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
index 44286c294d2..4ccd68193ea 100644
--- a/lib/cppcheck.h
+++ b/lib/cppcheck.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,15 +25,15 @@
 #include "config.h"
 
 #include <cstddef>
-#include <cstdint>
 #include <functional>
 #include <list>
 #include <memory>
 #include <string>
 #include <vector>
 
+#ifdef HAVE_RULES
 class TokenList;
-enum class ShowTime : std::uint8_t;
+#endif
 struct FileSettings;
 class CheckUnusedFunctions;
 class Tokenizer;
@@ -43,6 +43,7 @@ class ErrorLogger;
 class Settings;
 struct Suppressions;
 class Preprocessor;
+class TimerResults;
 
 namespace simplecpp {
     class TokenList;
@@ -71,6 +72,7 @@ class CPPCHECKLIB CppCheck {
     CppCheck(const Settings& settings,
              Suppressions& supprs,
              ErrorLogger &errorLogger,
+             TimerResults* timerResults,
              bool useGlobalSuppressions,
              ExecuteCmdFn executeCommand);
 
@@ -142,9 +144,6 @@ class CPPCHECKLIB CppCheck {
     /** analyse whole program use .analyzeinfo files or ctuinfo string */
     unsigned int analyseWholeProgram(const std::string &buildDir, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const std::string& ctuInfo);
 
-    static void resetTimerResults();
-    static void printTimerResults(ShowTime mode);
-
 private:
     void purgedConfigurationMessage(const std::string &file, const std::string& configuration);
 
@@ -154,6 +153,9 @@ class CPPCHECKLIB CppCheck {
      * @brief Get dumpfile <rawtokens> contents, this is only public for testing purposes
      */
     std::string getDumpFileContentsRawTokens(const std::vector<std::string>& files, const simplecpp::TokenList& tokens1) const;
+    static std::string getDumpFileContentsRawTokens(const std::string& header, const std::string& footer);
+    std::string getDumpFileContentsRawTokensHeader(const std::vector<std::string>& files) const;
+    static std::string getDumpFileContentsRawTokensFooter(const simplecpp::TokenList& tokens1);
 
     std::string getLibraryDumpData() const;
 
@@ -182,9 +184,9 @@ class CPPCHECKLIB CppCheck {
      * @param cfgname  cfg name
      * @return number of errors found
      */
-    unsigned int checkFile(const FileWithDetails& file, const std::string &cfgname, int fileIndex);
+    unsigned int checkFile(const FileWithDetails& file, const std::string &cfgname);
 
-    void checkPlistOutput(const FileWithDetails& file, const std::vector<std::string>& files);
+    void checkPlistOutput(const FileWithDetails& file);
 
     /**
      * @brief Check a file using buffer
@@ -194,7 +196,7 @@ class CPPCHECKLIB CppCheck {
      * @param size the size of the data to be read
      * @return number of errors found
      */
-    unsigned int checkBuffer(const FileWithDetails& file, const std::string &cfgname, int fileIndex, const char* data, std::size_t size);
+    unsigned int checkBuffer(const FileWithDetails& file, const std::string &cfgname, const char* data, std::size_t size);
 
     // TODO: should use simplecpp::OutputList
     using CreateTokenListFn = std::function<simplecpp::TokenList (std::vector<std::string>&, std::list<simplecpp::Output>*)>;
@@ -206,12 +208,12 @@ class CPPCHECKLIB CppCheck {
      * @param createTokenList a function to create the simplecpp::TokenList with
      * @return number of errors found
      */
-    unsigned int checkInternal(const FileWithDetails& file, const std::string &cfgname, int fileIndex, const CreateTokenListFn& createTokenList);
+    unsigned int checkInternal(const FileWithDetails& file, const std::string &cfgname, const CreateTokenListFn& createTokenList);
 
     /**
      * @brief Check normal tokens
      * @param tokenizer tokenizer instance
-     * @param analyzerInformation the analyzer infomation
+     * @param analyzerInformation the analyzer information
      */
     void checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation* analyzerInformation, const std::string& currentConfig);
 
@@ -235,7 +237,7 @@ class CPPCHECKLIB CppCheck {
     void executeRules(const std::string &tokenlist, const TokenList &list);
 #endif
 
-    unsigned int checkClang(const FileWithDetails &file, int fileIndex);
+    unsigned int checkClang(const FileWithDetails &file);
 
     const Settings& mSettings;
     Suppressions& mSuppressions;
@@ -246,11 +248,12 @@ class CPPCHECKLIB CppCheck {
     ErrorLogger& mErrorLogger;
     /** the ErrorLogger provided to this instance */
     ErrorLogger& mErrorLoggerDirect;
+    TimerResults* mTimerResults;
 
     bool mUseGlobalSuppressions;
 
     /** File info used for whole program analysis */
-    std::list<Check::FileInfo*> mFileInfo;
+    std::list<const Check::FileInfo*> mFileInfo;
 
     /** Callback for executing a shell command (exe, args, output) */
     ExecuteCmdFn mExecuteCommand;
diff --git a/lib/cppcheck.natvis b/lib/cppcheck.natvis
index 4b3b2d0aea6..6f5b6fd86a2 100644
--- a/lib/cppcheck.natvis
+++ b/lib/cppcheck.natvis
@@ -10,13 +10,13 @@
 
 
     <Type Name="TokenList">
-    <DisplayString>{mTokensFrontBack.front->mStr} - {mTokensFrontBack.back->mStr}</DisplayString>
+    <DisplayString>{mTokensFrontBack->front->mStr} - {mTokensFrontBack->back->mStr}</DisplayString>
     <Expand>
       <Item Name="[files]">mFiles</Item>
       <CustomListItems Optional="true" MaxItemsPerView="5000">
-        <Variable Name="pCurr" InitialValue="mTokensFrontBack.front" />
+        <Variable Name="pCurr" InitialValue="mTokensFrontBack->front" />
         <Loop>
-          <If Condition="pCurr == mTokensFrontBack.back">
+          <If Condition="pCurr == mTokensFrontBack->back">
             <Break Condition="1"/>
           </If>
           <Item>pCurr</Item>
@@ -68,4 +68,4 @@
   </Type>
   
   
-</AutoVisualizer>
\ No newline at end of file
+</AutoVisualizer>
diff --git a/lib/cppcheck.vcxproj b/lib/cppcheck.vcxproj
index d0175b2997f..6957309e40f 100644
--- a/lib/cppcheck.vcxproj
+++ b/lib/cppcheck.vcxproj
@@ -18,20 +18,20 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup Label="SourceFiles">
-    <ClCompile Include="..\externals\simplecpp\simplecpp.cpp" />
-    <ClCompile Include="..\externals\tinyxml2\tinyxml2.cpp" />
+    <ClCompile Include="..\externals\simplecpp\simplecpp.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <ForcedIncludeFiles></ForcedIncludeFiles>
+    </ClCompile>
+    <ClCompile Include="..\externals\tinyxml2\tinyxml2.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <ForcedIncludeFiles></ForcedIncludeFiles>
+    </ClCompile>
     <ClCompile Include="valueflow.cpp" />
     <ClCompile Include="tokenize.cpp" />
     <ClCompile Include="symboldatabase.cpp" />
     <ClCompile Include="addoninfo.cpp" />
     <ClCompile Include="analyzerinfo.cpp" />
     <ClCompile Include="astutils.cpp" />
-    <ClCompile Include="check.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">Create</PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="check64bit.cpp" />
     <ClCompile Include="checkassert.cpp" />
     <ClCompile Include="checkautovariables.cpp" />
@@ -44,6 +44,12 @@
     <ClCompile Include="checkersreport.cpp" />
     <ClCompile Include="checkexceptionsafety.cpp" />
     <ClCompile Include="checkfunctions.cpp" />
+    <ClCompile Include="checkimpl.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">Create</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="checkinternal.cpp" />
     <ClCompile Include="checkio.cpp" />
     <ClCompile Include="checkleakautovar.cpp" />
@@ -51,6 +57,7 @@
     <ClCompile Include="checknullpointer.cpp" />
     <ClCompile Include="checkother.cpp" />
     <ClCompile Include="checkpostfixoperator.cpp" />
+    <ClCompile Include="checks.cpp" />
     <ClCompile Include="checksizeof.cpp" />
     <ClCompile Include="checkstl.cpp" />
     <ClCompile Include="checkstring.cpp" />
@@ -117,6 +124,7 @@
     <ClInclude Include="checkersreport.h" />
     <ClInclude Include="checkexceptionsafety.h" />
     <ClInclude Include="checkfunctions.h" />
+    <ClInclude Include="checkimpl.h" />
     <ClInclude Include="checkinternal.h" />
     <ClInclude Include="checkio.h" />
     <ClInclude Include="checkleakautovar.h" />
@@ -124,6 +132,7 @@
     <ClInclude Include="checknullpointer.h" />
     <ClInclude Include="checkother.h" />
     <ClInclude Include="checkpostfixoperator.h" />
+    <ClInclude Include="checks.h" />
     <ClInclude Include="checksizeof.h" />
     <ClInclude Include="checkstl.h" />
     <ClInclude Include="checkstring.h" />
@@ -157,8 +166,10 @@
     <ClInclude Include="precompiled.h" />
     <ClInclude Include="preprocessor.h" />
     <ClInclude Include="programmemory.h" />
+    <ClInclude Include="refthunk.h" />
     <ClInclude Include="regex.h" />
     <ClInclude Include="reverseanalyzer.h" />
+    <ClInclude Include="rule.h" />
     <ClInclude Include="sarifreport.h" />
     <ClInclude Include="settings.h" />
     <ClInclude Include="smallvector.h" />
diff --git a/lib/ctu.cpp b/lib/ctu.cpp
index 158c8c1e046..feef065d3ac 100644
--- a/lib/ctu.cpp
+++ b/lib/ctu.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -112,7 +112,7 @@ std::string CTU::FileInfo::FunctionCall::toXmlString() const
         out << ">\n";
         for (const ErrorMessage::FileLocation &loc : callValuePath)
             out << "  <path"
-                << " " << ATTR_LOC_FILENAME << "=\"" << ErrorLogger::toxml(loc.getfile()) << "\""
+                << " " << ATTR_LOC_FILENAME << "=\"" << ErrorLogger::toxml(loc.getfile(false)) << "\""
                 << " " << ATTR_LOC_LINENR << "=\"" << loc.line << "\""
                 << " " << ATTR_LOC_COLUMN << "=\"" << loc.column << "\""
                 << " " << ATTR_INFO << "=\"" << ErrorLogger::toxml(loc.getinfo()) << "\"/>\n";
@@ -231,6 +231,7 @@ bool CTU::FileInfo::NestedCall::loadFromXml(const tinyxml2::XMLElement *xmlEleme
     return !error;
 }
 
+// TODO: bail out on unexpected data
 void CTU::FileInfo::loadFromXml(const tinyxml2::XMLElement *xmlElement)
 {
     for (const tinyxml2::XMLElement *e = xmlElement->FirstChildElement(); e; e = e->NextSiblingElement()) {
@@ -279,11 +280,11 @@ std::list<CTU::FileInfo::UnsafeUsage> CTU::loadUnsafeUsageListFromXml(const tiny
     return ret;
 }
 
-static int isCallFunction(const Scope *scope, int argnr, const Token *&tok)
+static size_t isCallFunction(const Scope *scope, size_t argnr, const Token *&tok)
 {
     const Variable * const argvar = scope->function->getArgumentVar(argnr);
     if (!argvar->isPointer())
-        return -1;
+        return 0;
     for (const Token *tok2 = scope->bodyStart; tok2 != scope->bodyEnd; tok2 = tok2->next()) {
         if (tok2->variable() != argvar)
             continue;
@@ -305,11 +306,11 @@ static int isCallFunction(const Scope *scope, int argnr, const Token *&tok)
         tok = prev->previous();
         return argnr2;
     }
-    return -1;
+    return 0;
 }
 
 
-CTU::FileInfo *CTU::getFileInfo(const Tokenizer &tokenizer)
+const CTU::FileInfo *CTU::getFileInfo(const Tokenizer &tokenizer)
 {
     const SymbolDatabase * const symbolDatabase = tokenizer.getSymbolDatabase();
 
@@ -329,7 +330,7 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer &tokenizer)
             if (!tokFunction)
                 continue;
             const std::vector<const Token *> args(getArguments(tok->previous()));
-            for (int argnr = 0; argnr < args.size(); ++argnr) {
+            for (size_t argnr = 0; argnr < args.size(); ++argnr) {
                 const Token *argtok = args[argnr];
                 if (!argtok)
                     continue;
@@ -426,9 +427,9 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer &tokenizer)
         }
 
         // Nested function calls
-        for (int argnr = 0; argnr < scopeFunction->argCount(); ++argnr) {
+        for (size_t argnr = 0; argnr < scopeFunction->argCount(); ++argnr) {
             const Token *tok;
-            const int argnr2 = isCallFunction(&scope, argnr, tok);
+            const size_t argnr2 = isCallFunction(&scope, argnr, tok);
             if (argnr2 > 0) {
                 FileInfo::NestedCall nestedCall(tokenizer, scopeFunction, tok);
                 nestedCall.myArgNr = argnr + 1;
@@ -441,7 +442,7 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer &tokenizer)
     return fileInfo;
 }
 
-static std::vector<std::pair<const Token *, CTU::FileInfo::Value>> getUnsafeFunction(const Settings &settings, const Scope *scope, int argnr, bool (*isUnsafeUsage)(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *value))
+static std::vector<std::pair<const Token *, CTU::FileInfo::Value>> getUnsafeFunction(const Settings &settings, const Scope *scope, size_t argnr, bool (*isUnsafeUsage)(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *value))
 {
     std::vector<std::pair<const Token *, CTU::FileInfo::Value>> ret;
     const Variable * const argvar = scope->function->getArgumentVar(argnr);
@@ -486,7 +487,7 @@ std::list<CTU::FileInfo::UnsafeUsage> CTU::getUnsafeUsage(const Tokenizer &token
         const Function *const function = scope.function;
 
         // "Unsafe" functions unconditionally reads data before it is written..
-        for (int argnr = 0; argnr < function->argCount(); ++argnr) {
+        for (size_t argnr = 0; argnr < function->argCount(); ++argnr) {
             for (const std::pair<const Token *, CTU::FileInfo::Value> &v : getUnsafeFunction(settings, &scope, argnr, isUnsafeUsage)) {
                 const Token *tok = v.first;
                 const MathLib::bigint val = v.second.value;
@@ -499,7 +500,7 @@ std::list<CTU::FileInfo::UnsafeUsage> CTU::getUnsafeUsage(const Tokenizer &token
 }
 
 static bool findPath(const std::string &callId,
-                     nonneg int callArgNr,
+                     size_t callArgNr,
                      MathLib::bigint unsafeValue,
                      CTU::FileInfo::InvalidValueType invalidValue,
                      const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> &callsMap,
@@ -511,7 +512,7 @@ static bool findPath(const std::string &callId,
     if (index >= maxCtuDepth)
         return false; // TODO: add bailout message?
 
-    const auto it = utils::as_const(callsMap).find(callId);
+    const auto it = callsMap.find(callId);
     if (it == callsMap.end())
         return false;
 
@@ -558,6 +559,20 @@ static bool findPath(const std::string &callId,
     return false;
 }
 
+static std::string getInvalidValueString(CTU::FileInfo::InvalidValueType invalidValue)
+{
+    using InvalidValueType = CTU::FileInfo::InvalidValueType;
+    switch (invalidValue) {
+    case InvalidValueType::null:
+        return "null";
+    case InvalidValueType::uninit:
+        return "uninitialized";
+    case InvalidValueType::bufferOverflow:
+        return "accessed out of bounds";
+    }
+    cppcheck::unreachable();
+}
+
 std::list<ErrorMessage::FileLocation> CTU::FileInfo::getErrorPath(InvalidValueType invalidValue,
                                                                   const CTU::FileInfo::UnsafeUsage &unsafeUsage,
                                                                   const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> &callsMap,
@@ -580,7 +595,7 @@ std::list<ErrorMessage::FileLocation> CTU::FileInfo::getErrorPath(InvalidValueTy
 
     std::list<ErrorMessage::FileLocation> locationList;
 
-    const std::string value1 = (invalidValue == InvalidValueType::null) ? "null" : "uninitialized";
+    const std::string value1 = getInvalidValueString(invalidValue);
 
     for (int index = 9; index >= 0; index--) {
         if (!path[index])
diff --git a/lib/ctu.h b/lib/ctu.h
index 4f5e0b0294c..7eea7e76cc1 100644
--- a/lib/ctu.h
+++ b/lib/ctu.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,6 +52,8 @@ namespace tinyxml2 {
 namespace CTU {
     class CPPCHECKLIB FileInfo : public Check::FileInfo {
     public:
+        FileInfo() : Check::FileInfo("") {}
+
         enum class InvalidValueType : std::uint8_t { null, uninit, bufferOverflow };
 
         std::string toString() const override;
@@ -77,14 +79,14 @@ namespace CTU {
 
         struct UnsafeUsage {
             UnsafeUsage() = default;
-            UnsafeUsage(std::string myId, nonneg int myArgNr, std::string myArgumentName, Location location, MathLib::bigint value)
+            UnsafeUsage(std::string myId, size_t myArgNr, std::string myArgumentName, Location location, MathLib::bigint value)
                 : myId(std::move(myId))
                 , myArgNr(myArgNr)
                 , myArgumentName(std::move(myArgumentName))
                 , location(std::move(location))
                 , value(value) {}
             std::string myId;
-            nonneg int myArgNr{};
+            size_t myArgNr{};
             std::string myArgumentName;
             Location location;
             MathLib::bigint value{};
@@ -94,14 +96,14 @@ namespace CTU {
         class CallBase {
         public:
             CallBase() = default;
-            CallBase(std::string callId, int callArgNr, std::string callFunctionName, Location loc)
+            CallBase(std::string callId, size_t callArgNr, std::string callFunctionName, Location loc)
                 : callId(std::move(callId)), callArgNr(callArgNr), callFunctionName(std::move(callFunctionName)), location(std::move(loc))
             {}
             CallBase(const Tokenizer &tokenizer, const Token *callToken);
             virtual ~CallBase() = default;
             CallBase(const CallBase&) = default;
             std::string callId;
-            int callArgNr{};
+            size_t callArgNr{};
             std::string callFunctionName;
             Location location;
         protected:
@@ -136,7 +138,7 @@ namespace CTU {
             bool loadFromXml(const tinyxml2::XMLElement *xmlElement);
 
             std::string myId;
-            nonneg int myArgNr{};
+            size_t myArgNr{};
         };
 
         std::list<FunctionCall> functionCalls;
@@ -160,7 +162,7 @@ namespace CTU {
     CPPCHECKLIB std::string getFunctionId(const Tokenizer &tokenizer, const Function *function);
 
     /** @brief Parse current TU and extract file info */
-    CPPCHECKLIB RET_NONNULL FileInfo *getFileInfo(const Tokenizer &tokenizer);
+    CPPCHECKLIB RET_NONNULL const FileInfo *getFileInfo(const Tokenizer &tokenizer);
 
     CPPCHECKLIB std::list<FileInfo::UnsafeUsage> getUnsafeUsage(const Tokenizer &tokenizer, const Settings &settings, bool (*isUnsafeUsage)(const Settings &settings, const Token *argtok, FileInfo::Value *value));
 
diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
index e62ed6b806d..30097a4f21c 100644
--- a/lib/errorlogger.cpp
+++ b/lib/errorlogger.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 #include "path.h"
 #include "settings.h"
 #include "suppressions.h"
+#include "symboldatabase.h"
 #include "token.h"
 #include "tokenlist.h"
 #include "utils.h"
@@ -35,6 +36,7 @@
 #include <cstring>
 #include <fstream>
 #include <iomanip>
+#include <numeric>
 #include <sstream>
 #include <string>
 #include <unordered_map>
@@ -45,6 +47,7 @@
 const std::set<std::string> ErrorLogger::mCriticalErrorIds{
     "cppcheckError",
     "cppcheckLimit",
+    "directiveAsMacroParameter",
     "includeNestedTooDeeply",
     "internalAstError",
     "instantiationError",
@@ -59,10 +62,21 @@ const std::set<std::string> ErrorLogger::mCriticalErrorIds{
     "unknownMacro"
 };
 
+static std::size_t sdbm(const std::string& hashString) {
+    return std::accumulate(hashString.cbegin(), hashString.cend(), std::size_t{0}, [](std::size_t h, unsigned char c) {
+        return static_cast<std::size_t>(c) + (h << 6) + (h << 16) - h;
+    });
+}
+
 ErrorMessage::ErrorMessage()
     : severity(Severity::none), cwe(0U), certainty(Certainty::normal)
 {}
 
+static bool needsFallbackHash(const std::string &id)
+{
+    return startsWith(id, "ctu") || id == "unusedFunction" || id == "staticFunction";
+}
+
 // TODO: id and msg are swapped compared to other calls
 ErrorMessage::ErrorMessage(std::list<FileLocation> callStack, std::string file1, Severity severity, const std::string &msg, std::string id, Certainty certainty) :
     callStack(std::move(callStack)), // locations for this error message
@@ -74,6 +88,9 @@ ErrorMessage::ErrorMessage(std::list<FileLocation> callStack, std::string file1,
 {
     // set the summary and verbose messages
     setmsg(msg);
+
+    if (hash == 0 && needsFallbackHash(this->id))
+        calculateWarningHashFromLocations();
 }
 
 
@@ -88,6 +105,9 @@ ErrorMessage::ErrorMessage(std::list<FileLocation> callStack, std::string file1,
 {
     // set the summary and verbose messages
     setmsg(msg);
+
+    if (hash == 0 && needsFallbackHash(this->id))
+        calculateWarningHashFromLocations();
 }
 
 ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack, const TokenList* list, Severity severity, std::string id, const std::string& msg, Certainty certainty)
@@ -106,6 +126,8 @@ ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack, const Token
         file0 = list->getFiles()[0];
 
     setmsg(msg);
+
+    calculateWarningHash(callstack);
 }
 
 
@@ -126,7 +148,7 @@ ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack, const Token
 
     setmsg(msg);
 
-    // hash = calculateWarningHash(list, hashWarning.str());
+    calculateWarningHash(callstack);
 }
 
 ErrorMessage::ErrorMessage(ErrorPath errorPath, const TokenList *tokenList, Severity severity, const char id[], const std::string &msg, const CWE &cwe, Certainty certainty)
@@ -159,9 +181,15 @@ ErrorMessage::ErrorMessage(ErrorPath errorPath, const TokenList *tokenList, Seve
 
     setmsg(msg);
 
-    // hash = calculateWarningHash(tokenList, hashWarning.str());
+    std::list<const Token*> tokens;
+    std::transform(errorPath.cbegin(), errorPath.cend(), std::back_inserter(tokens),
+                   [](const ErrorPathItem& e) {
+        return e.first;
+    });
+    calculateWarningHash(tokens);
 }
 
+// TODO: improve errorhandling?
 ErrorMessage::ErrorMessage(const tinyxml2::XMLElement * const errmsg)
     : severity(Severity::none),
     cwe(0U),
@@ -243,6 +271,74 @@ void ErrorMessage::setmsg(const std::string &msg)
     }
 }
 
+void ErrorMessage::calculateWarningHash(const std::list<const Token*>& callstack)
+{
+    if (callstack.empty())
+        return;
+    // Calculate a hash for this warning message
+    std::string hashString;
+    for (const Token* tok: callstack) {
+        if (!tok)
+            continue;
+        if (!tok->scope())
+            return; // might be a syntax error before scope info has been set
+        if (tok->scope()->isExecutable()) {
+            // Executable scope => include all tokens in the function => if the
+            // function is changed the hash is changed
+            for (const Token* t = tok; t; t = t->previous()) {
+                if (!t->scope()->isExecutable())
+                    break;
+                hashString += " " + t->str();
+            }
+            for (const Token* t = tok->next(); t; t = t->next()) {
+                if (!t->scope()->isExecutable())
+                    break;
+                hashString += " " + t->str();
+            }
+        } else {
+            // Non executable scope => include tokens in current statement => if the current statement is changed the hash is changed
+            for (const Token* t = tok; t; t = t->previous()) {
+                if (t->str() == ";")
+                    break;
+                if (t->scope() != tok->scope()) // stop on {} unless its an initializer
+                    break;
+                hashString += " " + t->str();
+            }
+            for (const Token* t = tok->next(); t; t = t->next()) {
+                hashString += " " + t->str();
+                if (t->str() == ";")
+                    break;
+                if (t->scope() != tok->scope()) // stop on {} unless its an initializer
+                    break;
+            }
+        }
+    }
+
+    hashString = id + '\n' + mShortMessage + '\n' + hashString;
+
+    // hash algorithm: sdbm
+    // any hash algorithm can be used but it has to be the same hash on different platforms and compilers
+    hash = sdbm(hashString);
+}
+
+void ErrorMessage::calculateWarningHashFromLocations()
+{
+    // No token information is available for this warning (e.g. whole-program/CTU
+    // checks, unusedFunction, staticFunction) so calculateWarningHash() can't be
+    // used. Instead hash the id, message and all filenames/notes in the callstack.
+    std::string hashString = id + '\n' + mShortMessage;
+    for (const FileLocation &loc : callStack) {
+        std::string fileName = loc.getfile(false);
+        if (Path::isAbsolute(fileName))
+            fileName = fileName.substr(fileName.rfind('/') + 1);
+        hashString += '\n' + fileName + '\n' + loc.getinfo();
+    }
+
+    // hash algorithm: sdbm
+    // any hash algorithm can be used but it has to be the same hash on different platforms and compilers
+    hash = sdbm(hashString);
+}
+
 static void serializeString(std::string &oss, const std::string & str)
 {
     oss += std::to_string(str.length());
@@ -634,7 +730,7 @@ static void replaceColors(std::string& source, bool erase) {
         replace(source, substitutionMapErase);
 }
 
-std::string ErrorMessage::toString(bool verbose, const std::string &templateFormat, const std::string &templateLocation) const
+std::string ErrorMessage::toString(bool verbose, const std::string &templateFormat, const std::string &templateLocation, bool noCode) const
 {
     assert(!templateFormat.empty());
 
@@ -675,7 +771,8 @@ std::string ErrorMessage::toString(bool verbose, const std::string &templateForm
                 endl = "\r\n";
             else
                 endl = "\r";
-            findAndReplace(result, "{code}", readCode(callStack.back().getOrigFile(), callStack.back().line, callStack.back().column, endl));
+            const std::string code = noCode ? "" : readCode(callStack.back().getOrigFile(), callStack.back().line, callStack.back().column, endl);
+            findAndReplace(result, "{code}", code);
         }
     } else {
         static const std::unordered_map<std::string, std::string> callStackSubstitutionMap =
@@ -706,7 +803,8 @@ std::string ErrorMessage::toString(bool verbose, const std::string &templateForm
                     endl = "\r\n";
                 else
                     endl = "\r";
-                findAndReplace(text, "{code}", readCode(fileLocation.getOrigFile(), fileLocation.line, fileLocation.column, endl));
+                const std::string code = noCode ? "" : readCode(fileLocation.getOrigFile(), fileLocation.line, fileLocation.column, endl);
+                findAndReplace(text, "{code}", code);
             }
             result += '\n' + text;
         }
@@ -820,7 +918,7 @@ std::string ErrorLogger::toxml(const std::string &str)
     return xml;
 }
 
-std::string ErrorLogger::plistHeader(const std::string &version, const std::vector<std::string> &files)
+std::string ErrorLogger::plistHeader(const std::string &version)
 {
     std::ostringstream ostr;
     ostr << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"
@@ -828,12 +926,7 @@ std::string ErrorLogger::plistHeader(const std::string &version, const std::vect
          << "<plist version=\"1.0\">\r\n"
          << "<dict>\r\n"
          << " <key>clang_version</key>\r\n"
-         << "<string>cppcheck version " << version << "</string>\r\n"
-         << " <key>files</key>\r\n"
-         << " <array>\r\n";
-    for (const std::string & file : files)
-        ostr << "  <string>" << ErrorLogger::toxml(file) << "</string>\r\n";
-    ostr << " </array>\r\n"
+         << " <string>cppcheck version " << version << "</string>\r\n"
          << " <key>diagnostics</key>\r\n"
          << " <array>\r\n";
     return ostr.str();
@@ -1079,8 +1172,15 @@ std::string getGuideline(const std::string &errId, ReportType reportType,
     case ReportType::misraC2012:
     case ReportType::misraC2023:
     case ReportType::misraC2025:
-        if (errId.rfind("misra-c20", 0) == 0 || errId.rfind("premium-misra-c-20", 0) == 0)
-            guideline = errId.substr(errId.rfind('-') + 1);
+        if (errId.rfind("misra-c20", 0) == 0 || errId.rfind("premium-misra-c-20", 0) == 0) {
+            auto pos1 = errId.find("20") + 5;
+            if (pos1 >= errId.size())
+                break;
+            if (errId.compare(pos1,4,"dir-",0,4) == 0)
+                pos1 += 4;
+            const auto endpos = errId.find('-', pos1);
+            guideline = errId.substr(pos1, endpos-pos1);
+        }
         break;
     case ReportType::misraCpp2008:
         if (errId.rfind("premium-misra-cpp-2008", 0) == 0)
diff --git a/lib/errorlogger.h b/lib/errorlogger.h
index f8806bbbdca..fa5ad67c7c1 100644
--- a/lib/errorlogger.h
+++ b/lib/errorlogger.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,12 +23,15 @@
 
 #include "config.h"
 #include "errortypes.h"
+#include "refthunk.h"
 
-#include <cstddef>
 #include <cstdint>
+#include <ctime>
 #include <list>
 #include <set>
+#include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
 #include <map>
 
@@ -87,7 +90,7 @@ class CPPCHECKLIB ErrorMessage {
         std::string stringify(bool addcolumn = false) const;
 
         unsigned int fileIndex;
-        int line; // negative value means "no line"
+        int line; // negative value means "no line" - TODO: actually 0 means no line - lines from simplecpp are unsigned
         unsigned int column;
 
         const std::string& getinfo() const {
@@ -150,11 +153,13 @@ class CPPCHECKLIB ErrorMessage {
      * or template to be used. E.g. "{file}:{line},{severity},{id},{message}"
      * @param templateLocation Format Empty string to use default output format
      * or template to be used. E.g. "{file}:{line},{info}"
+     * @param noCode Always replace {code} with an empty string
      * @return formatted string
      */
     std::string toString(bool verbose,
                          const std::string &templateFormat,
-                         const std::string &templateLocation) const;
+                         const std::string &templateLocation,
+                         bool noCode = false) const;
 
     std::string serialize() const;
     /**
@@ -207,6 +212,15 @@ class CPPCHECKLIB ErrorMessage {
 private:
     static std::string fixInvalidChars(const std::string& raw);
 
+    void calculateWarningHash(const std::list<const Token*>& callstack);
+
+    /**
+     * Fallback hash calculation for warnings that have no token information
+     * (e.g. whole-program/CTU checks, unusedFunction, staticFunction). Hashes
+     * the id, message and all filenames/notes in the callstack instead.
+     */
+    void calculateWarningHashFromLocations();
+
     /** Short message */
     std::string mShortMessage;
 
@@ -270,12 +284,19 @@ class CPPCHECKLIB ErrorLogger {
      */
     static std::string toxml(const std::string &str);
 
-    static std::string plistHeader(const std::string &version, const std::vector<std::string> &files);
+    static std::string plistHeader(const std::string &version);
     static std::string plistData(const ErrorMessage &msg);
-    static const char *plistFooter() {
-        return " </array>\r\n"
-               "</dict>\r\n"
-               "</plist>";
+    static std::string plistFooter(const std::vector<std::string>& files) {
+        std::ostringstream ostr;
+        ostr << " </array>\r\n"
+             << " <key>files</key>\r\n"
+             << " <array>\r\n";
+        for (const std::string& file : files)
+            ostr << "  <string>" << ErrorLogger::toxml(file) << "</string>\r\n";
+        ostr << " </array>\r\n"
+             << "</dict>\r\n"
+             << "</plist>";
+        return ostr.str();
     }
 
     static bool isCriticalErrorId(const std::string& id) {
@@ -286,6 +307,43 @@ class CPPCHECKLIB ErrorLogger {
     static const std::set<std::string> mCriticalErrorIds;
 };
 
+/// RAII class for reporting progress messages
+class CPPCHECKLIB ProgressReporter {
+public:
+    ProgressReporter(ErrorLogger& e, int reportProgressInterval, std::string filename, std::string stage) :
+        mErrorLogger(e),
+        mReportProgressInterval(reportProgressInterval),
+        mFilename(std::move(filename)),
+        mStage(std::move(stage)) {
+        report(0);
+    }
+
+    ~ProgressReporter() {
+        if (mReportProgressInterval < 0)
+            return;
+        mErrorLogger().reportProgress(mFilename, mStage.c_str(), 100);
+    }
+
+    void report(int value) {
+        if (mReportProgressInterval < 0 || value == mLastValue)
+            return;
+        const std::time_t t = std::time(nullptr);
+        if (t >= mLastTime + mReportProgressInterval) {
+            mErrorLogger().reportProgress(mFilename, mStage.c_str(), value);
+            mLastTime = t;
+            mLastValue = value;
+        }
+    }
+
+private:
+    RefThunk<ErrorLogger> mErrorLogger;
+    int mReportProgressInterval;
+    std::string mFilename;
+    std::string mStage;
+    std::time_t mLastTime{0};
+    int mLastValue{-1};
+};
+
 /** Replace substring. Example replaceStr("1,NR,3", "NR", "2") => "1,2,3" */
 std::string replaceStr(std::string s, const std::string &from, const std::string &to);
 
@@ -298,12 +356,12 @@ CPPCHECKLIB void substituteTemplateLocationStatic(std::string& templateLocation,
 /** Get a classification string from the given guideline and reporttype */
 CPPCHECKLIB std::string getClassification(const std::string &guideline, ReportType reportType);
 
-/** Get a guidline string froM the given error id, reporttype, mapping and severity */
+/** Get a guideline string froM the given error id, reporttype, mapping and severity */
 CPPCHECKLIB std::string getGuideline(const std::string &errId, ReportType reportType,
                                      const std::map<std::string, std::string> &guidelineMapping,
                                      Severity severity);
 
-/** Get a map from cppcheck error ids to guidlines matching the given report type */
+/** Get a map from cppcheck error ids to guidelines matching the given report type */
 CPPCHECKLIB std::map<std::string, std::string> createGuidelineMapping(ReportType reportType);
 
 /// @}
diff --git a/lib/filesettings.h b/lib/filesettings.h
index 3149421c629..0ef53db85c5 100644
--- a/lib/filesettings.h
+++ b/lib/filesettings.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,16 +34,25 @@
 class FileWithDetails
 {
 public:
+    /**
+     * @throws std::runtime_error thrown if given path is empty
+     */
     FileWithDetails(std::string path, Standards::Language lang, std::size_t size)
-        : mPath(std::move(path))
-        , mPathSimplified(Path::simplifyPath(mPath))
-        , mLang(lang)
+        : mLang(lang)
         , mSize(size)
     {
+        setPath(std::move(path));
         if (mPath.empty())
             throw std::runtime_error("empty path specified");
     }
 
+    void setPath(std::string p)
+    {
+        mPath = std::move(p);
+        mPathSimplified = Path::simplifyPath(mPath);
+        mPathAbsolute.clear();
+    }
+
     const std::string& path() const
     {
         return mPath;
@@ -54,25 +63,45 @@ class FileWithDetails
         return mPathSimplified;
     }
 
+    const std::string& abspath() const
+    {
+        // use delayed resolution as it will fail for files which do not exist
+        if (mPathAbsolute.empty())
+            mPathAbsolute = Path::getAbsoluteFilePath(mPath);
+        return mPathAbsolute;
+    }
+
     std::size_t size() const
     {
         return mSize;
     }
 
-    void setLang(Standards::Language lang)
+    void setLang(Standards::Language language)
     {
-        mLang = lang;
+        mLang = language;
     }
 
     Standards::Language lang() const
     {
         return mLang;
     }
+
+    std::size_t fsFileId() const
+    {
+        return mFsFileId;
+    }
+
+    void setFsFileId(std::size_t id)
+    {
+        mFsFileId = id;
+    }
 private:
     std::string mPath;
     std::string mPathSimplified;
+    mutable std::string mPathAbsolute;
     Standards::Language mLang = Standards::Language::None;
     std::size_t mSize;
+    std::size_t mFsFileId{0};
 };
 
 /** File settings. Multiple configurations for a file is allowed. */
@@ -81,14 +110,12 @@ struct CPPCHECKLIB FileSettings {
         : file(std::move(path), lang, size)
     {}
 
-    int fileIndex = 0;
     std::string cfg;
     FileWithDetails file;
     const std::string& filename() const
     {
         return file.path();
     }
-    // cppcheck-suppress unusedFunction
     const std::string& sfilename() const
     {
         return file.spath();
@@ -121,6 +148,7 @@ struct CPPCHECKLIB FileSettings {
     }
     std::set<std::string> undefs;
     std::list<std::string> includePaths;
+    std::list<std::string> forcedIncludes;
     // only used by clang mode
     std::list<std::string> systemIncludePaths;
     std::string standard;
diff --git a/lib/forwardanalyzer.cpp b/lib/forwardanalyzer.cpp
index 5c97528372b..88cee242c8c 100644
--- a/lib/forwardanalyzer.cpp
+++ b/lib/forwardanalyzer.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "mathlib.h"
+#include "refthunk.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
@@ -50,15 +51,19 @@ namespace {
             : analyzer(analyzer), tokenList(tokenList), errorLogger(errorLogger), settings(settings)
         {}
         ValuePtr<Analyzer> analyzer;
-        const TokenList& tokenList;
-        ErrorLogger& errorLogger;
-        const Settings& settings;
+        RefThunk<const TokenList> tokenList;
+        RefThunk<ErrorLogger> errorLogger;
+        RefThunk<const Settings> settings;
         Analyzer::Action actions;
         bool analyzeOnly{};
         bool analyzeTerminate{};
         Analyzer::Terminate terminate = Analyzer::Terminate::None;
         std::vector<Token*> loopEnds;
         int branchCount = 0;
+        // Nested condition-fork depth on this lineage (copied by fork()); bounds the fan-out.
+        int forkDepth = 0;
+        // Total forks of the traversal (shared via the fork() copy); backstop past the depth bound.
+        std::shared_ptr<int> forkBudget = std::make_shared<int>(0);
 
         Progress Break(Analyzer::Terminate t = Analyzer::Terminate::None) {
             if ((!analyzeOnly || analyzeTerminate) && t != Analyzer::Terminate::None)
@@ -73,7 +78,6 @@ namespace {
             bool check = false;
             bool escape = false;
             bool escapeUnknown = false;
-            bool active = false;
             bool isEscape() const {
                 return escape || escapeUnknown;
             }
@@ -89,6 +93,9 @@ namespace {
             bool isDead() const {
                 return action.isModified() || action.isInconclusive() || isEscape();
             }
+            bool hasGoto() const {
+                return endBlock ? ForwardTraversal::hasGoto(endBlock) : false;
+            }
         };
 
         bool stopUpdates() {
@@ -138,11 +145,11 @@ namespace {
                 // If we are in a loop then jump to the end
                 if (out)
                     *out = loopEnds.back();
-            } else if (Token::Match(tok, "return|throw")) {
+            } else if (isEscapeKeyword(tok, settings)) {
                 traverseRecursive(tok->astOperand2(), f, traverseUnknown);
                 traverseRecursive(tok->astOperand1(), f, traverseUnknown);
                 return Break(Analyzer::Terminate::Escape);
-            } else if (Token::Match(tok, "%name% (") && isEscapeFunction(tok, settings.library)) {
+            } else if (Token::Match(tok, "%name% (") && isEscapeFunction(tok, settings().library)) {
                 // Traverse the parameters of the function before escaping
                 traverseRecursive(tok->next()->astOperand2(), f, traverseUnknown);
                 return Break(Analyzer::Terminate::Escape);
@@ -348,21 +355,9 @@ namespace {
             return Token::findmatch(endBlock->link(), "goto|break", endBlock);
         }
 
-        bool hasInnerReturnScope(const Token* start, const Token* end) const {
-            for (const Token* tok=start; tok != end; tok = tok->previous()) {
-                if (Token::simpleMatch(tok, "}")) {
-                    const Token* ftok = nullptr;
-                    const bool r = isReturnScope(tok, settings.library, &ftok);
-                    if (r)
-                        return true;
-                }
-            }
-            return false;
-        }
-
         bool isEscapeScope(const Token* endBlock, bool& unknown) const {
             const Token* ftok = nullptr;
-            const bool r = isReturnScope(endBlock, settings.library, &ftok);
+            const bool r = isReturnScope(endBlock, settings().library, &ftok);
             if (!r && ftok)
                 unknown = true;
             return r;
@@ -383,30 +378,60 @@ namespace {
             return a;
         }
 
-        bool checkBranch(Branch& branch) const {
-            Analyzer::Action a = analyzeScope(branch.endBlock);
-            branch.action = a;
-            std::vector<ForwardTraversal> ft1 = tryForkUpdateScope(branch.endBlock, a.isModified());
-            const bool bail = hasGoto(branch.endBlock);
-            if (!a.isModified() && !bail) {
-                if (ft1.empty()) {
-                    // Traverse into the branch to see if there is a conditional escape
-                    if (!branch.escape && hasInnerReturnScope(branch.endBlock->previous(), branch.endBlock->link())) {
-                        ForwardTraversal ft2 = fork(true);
-                        ft2.updateScope(branch.endBlock);
-                        if (ft2.terminate == Analyzer::Terminate::Escape) {
-                            branch.escape = true;
-                            branch.escapeUnknown = false;
-                        }
-                    }
-                } else {
-                    if (ft1.front().terminate == Analyzer::Terminate::Escape) {
-                        branch.escape = true;
-                        branch.escapeUnknown = false;
-                    }
+        Progress updateBranch(Branch& branch, int depth)
+        {
+            // Save and reset actions
+            Analyzer::Action prevActions = actions;
+            actions = Analyzer::Action::None;
+            Progress p = updateRange(branch.endBlock->link(), branch.endBlock, depth);
+            branch.action |= actions;
+            // Restore actions
+            actions |= prevActions;
+
+            if (terminate == Analyzer::Terminate::Escape) {
+                branch.escape = true;
+                // The traversal followed an escaping path, but if the scope does not structurally
+                // always escape then another path (e.g. a modified fork) falls through, so the escape
+                // is only conditional - keep isModified() meaningful by not treating it as conclusive.
+                bool structuralUnknown = false;
+                const bool structuralEscape = isEscapeScope(branch.endBlock, structuralUnknown);
+                branch.escapeUnknown = !structuralEscape || structuralUnknown;
+                // The traversal stopped at the escape, so the rest of the scope was not walked; a
+                // fall-through path could still modify the value there - include the whole scope's
+                // actions so isModified() sees it.
+                if (branch.escapeUnknown)
+                    branch.action |= analyzeScope(branch.endBlock);
+            } else {
+                // Detect an escape the traversal did not flag (e.g. an unknown noreturn call);
+                // escapeUnknown reports a possible (unknown) escape.
+                branch.escape = isEscapeScope(branch.endBlock, branch.escapeUnknown);
+                if (terminate != Analyzer::Terminate::None && terminate != Analyzer::Terminate::Modified) {
+                    branch.action |= analyzeScope(branch.endBlock);
                 }
             }
-            return bail;
+
+            return p;
+        }
+
+        // Update the branch that the evaluated condition takes
+        Progress updateTakenBranch(Branch& branch, const Token* skippedBlock, const Token* condTok, int depth)
+        {
+            // The condition is only "known" because of an earlier assumption, so the
+            // skipped block could still modify the value -> lower to possible
+            if (!condTok->hasKnownIntValue() && skippedBlock && analyzeScope(skippedBlock).isModified() &&
+                !analyzer->lowerToPossible())
+                return Break(Analyzer::Terminate::Bail);
+            if (!branch.endBlock)
+                return Progress::Continue;
+            updateScopeState(branch.endBlock);
+            if (updateBranch(branch, depth - 1) == Progress::Break)
+                return Progress::Break;
+            // The branch was entered because of the tracked value; if it might not
+            // return (it ends in a call to an unknown, possibly noreturn function)
+            // then the value might not flow past the branch.
+            if (!condTok->hasKnownIntValue() && !branch.escape && branch.escapeUnknown && !analyzer->lowerToInconclusive())
+                return Break(Analyzer::Terminate::Bail);
+            return Progress::Continue;
         }
 
         bool reentersLoop(Token* endBlock, const Token* condTok, const Token* stepTok) const {
@@ -529,14 +554,12 @@ namespace {
                         forkContinue = false;
                 }
 
-                if (allAnalysis.isModified() || !forkContinue) {
-                    // TODO: Don't bail on missing condition
-                    if (!condTok)
-                        return Break(Analyzer::Terminate::Bail);
-                    if (analyzer->isConditional() && stopUpdates())
-                        return Break(Analyzer::Terminate::Conditional);
-                    analyzer->assume(condTok, false);
-                }
+                // TODO: Don't bail on missing condition
+                if (!condTok)
+                    return Break(Analyzer::Terminate::Bail);
+                if (analyzer->isConditional() && stopUpdates())
+                    return Break(Analyzer::Terminate::Conditional);
+                analyzer->assume(condTok, false);
                 if (forkContinue) {
                     for (ForwardTraversal& ft : ftv) {
                         if (!ft.actions.isIncremental())
@@ -562,16 +585,21 @@ namespace {
             return updateLoop(endToken, endBlock, condTok, initTok, stepTok, true);
         }
 
-        Progress updateScope(Token* endBlock, int depth = 20)
+        void updateScopeState(const Token* endBlock)
         {
-            if (!endBlock)
-                return Break();
             assert(endBlock->link());
-            Token* ctx = endBlock->link()->previous();
+            const Token* ctx = endBlock->link()->previous();
             if (Token::simpleMatch(ctx, ")"))
                 ctx = ctx->link()->previous();
             if (ctx)
                 analyzer->updateState(ctx);
+        }
+
+        Progress updateScope(Token* endBlock, int depth = 20)
+        {
+            if (!endBlock)
+                return Break();
+            updateScopeState(endBlock);
             return updateRange(endBlock->link(), endBlock, depth);
         }
 
@@ -646,11 +674,20 @@ namespace {
                         const bool inElse = scope->type == ScopeType::eElse;
                         const bool inDoWhile = scope->type == ScopeType::eDo;
                         const bool inLoop = contains({ScopeType::eDo, ScopeType::eFor, ScopeType::eWhile}, scope->type);
+                        const bool hasElse = Token::simpleMatch(tok, "} else {");
                         Token* condTok = getCondTokFromEnd(tok);
                         if (!condTok)
                             return Break();
+                        // When the 'else' branch escapes (e.g. returns), control can only continue
+                        // here via the 'then' branch, so the value established there is still
+                        // definite - keep it known instead of lowering to possible.
+                        bool elseEscape = false;
+                        if (!inLoop && !inElse && hasElse) {
+                            bool unknownEscape = false;
+                            elseEscape = isEscapeScope(tok->linkAt(2), unknownEscape);
+                        }
                         if (!condTok->hasKnownIntValue() || inLoop) {
-                            if (!analyzer->lowerToPossible())
+                            if (!elseEscape && !analyzer->lowerToPossible())
                                 return Break(Analyzer::Terminate::Bail);
                         } else if (condTok->getKnownIntValue() == inElse) {
                             return Break();
@@ -673,9 +710,9 @@ namespace {
                                     return Break();
                             }
                         }
-                        analyzer->assume(condTok, !inElse, Analyzer::Assume::Quiet);
+                        analyzer->assume(condTok, !inElse);
                         assert(!inDoWhile || Token::simpleMatch(tok, "} while ("));
-                        if (Token::simpleMatch(tok, "} else {") || inDoWhile)
+                        if (hasElse || inDoWhile)
                             tok = tok->linkAt(2);
                     } else if (contains({ScopeType::eTry, ScopeType::eCatch}, scope->type)) {
                         if (!analyzer->lowerToPossible())
@@ -685,9 +722,9 @@ namespace {
                     }
                 } else if (tok->isControlFlowKeyword() && Token::Match(tok, "if|while|for (") &&
                            Token::simpleMatch(tok->linkAt(1), ") {")) {
-                    if ((settings.vfOptions.maxForwardBranches > 0) && (++branchCount > settings.vfOptions.maxForwardBranches)) {
+                    if ((settings().vfOptions.maxForwardBranches > 0) && (++branchCount > settings().vfOptions.maxForwardBranches)) {
                         // TODO: should be logged on function-level instead of file-level
-                        if (settings.severity.isEnabled(Severity::information)) {
+                        if (settings().severity.isEnabled(Severity::information)) {
                             reportError(Severity::information, "normalCheckLevelMaxBranches", "Limiting analysis of branches. Use --check-level=exhaustive to analyze all branches.");
                         }
                         return Break(Analyzer::Terminate::Bail);
@@ -731,71 +768,80 @@ namespace {
                         if (!thenBranch.check && !elseBranch.check && stopOnCondition(condTok) && stopUpdates())
                             return Break(Analyzer::Terminate::Conditional);
                         const bool hasElse = Token::simpleMatch(endBlock, "} else {");
-                        bool bail = false;
-
-                        // Traverse then block
-                        thenBranch.escape = isEscapeScope(endBlock, thenBranch.escapeUnknown);
+                        tok = hasElse ? endBlock->linkAt(2) : endBlock;
                         if (thenBranch.check) {
-                            thenBranch.active = true;
-                            if (updateScope(endBlock, depth - 1) == Progress::Break)
+                            if (updateTakenBranch(thenBranch, hasElse ? elseBranch.endBlock : nullptr, condTok, depth) ==
+                                Progress::Break)
+                                return Break();
+                        } else if (elseBranch.check) {
+                            if (updateTakenBranch(elseBranch, thenBranch.endBlock, condTok, depth) == Progress::Break)
                                 return Break();
-                        } else if (!elseBranch.check) {
-                            thenBranch.active = true;
-                            if (checkBranch(thenBranch))
-                                bail = true;
-                        }
-                        // Traverse else block
-                        if (hasElse) {
-                            elseBranch.escape = isEscapeScope(endBlock->linkAt(2), elseBranch.escapeUnknown);
-                            if (elseBranch.check) {
-                                elseBranch.active = true;
-                                const Progress result = updateScope(endBlock->linkAt(2), depth - 1);
-                                if (result == Progress::Break)
-                                    return Break();
-                            } else if (!thenBranch.check) {
-                                elseBranch.active = true;
-                                if (checkBranch(elseBranch))
-                                    bail = true;
-                            }
-                            tok = endBlock->linkAt(2);
                         } else {
-                            tok = endBlock;
-                        }
-                        if (thenBranch.active)
+                            const bool conditional = stopOnCondition(condTok);
+                            // The value only flows into the then-branch when the condition can split
+                            // it; for an opaque or correlated condition (e.g. 'if (f(x))') it does
+                            // not, so fork in analyze-only mode: the branch's effect is still tracked
+                            // but nothing is reported in it.
+                            ForwardTraversal ft = fork(!analyzer->updateScope(thenBranch.endBlock, false));
+                            // The branch is traversed below, so don't record its boundary state here.
+                            ft.analyzer->assume(condTok, true, Analyzer::Assume::Pending);
+                            Progress pThen = ft.updateBranch(thenBranch, depth - 1);
+                            // Merge the fork's actions so a modification in the then-branch bubbles up
+                            // to the enclosing branch's isModified().
                             actions |= thenBranch.action;
-                        if (elseBranch.active)
-                            actions |= elseBranch.action;
-                        if (bail)
-                            return Break(Analyzer::Terminate::Bail);
-                        if (thenBranch.isDead() && elseBranch.isDead()) {
-                            if (thenBranch.isModified() && elseBranch.isModified())
-                                return Break(Analyzer::Terminate::Modified);
-                            if (thenBranch.isConclusiveEscape() && elseBranch.isConclusiveEscape())
-                                return Break(Analyzer::Terminate::Escape);
-                            return Break(Analyzer::Terminate::Bail);
-                        }
-                        // Conditional return
-                        if (thenBranch.active && thenBranch.isEscape() && !hasElse) {
-                            if (!thenBranch.isConclusiveEscape()) {
-                                if (!analyzer->lowerToInconclusive())
-                                    return Break(Analyzer::Terminate::Bail);
-                            } else if (thenBranch.check) {
-                                return Break();
-                            } else {
-                                if (analyzer->isConditional() && stopUpdates())
-                                    return Break(Analyzer::Terminate::Conditional);
-                                analyzer->assume(condTok, false);
+
+                            // Commit the condition as false on the main path only when the then-branch
+                            // is dead. The else block, if any, is traversed separately (Pending); with
+                            // no else the false path continues past the closing brace, so record the
+                            // assumed state there (None).
+                            if (thenBranch.isDead())
+                                analyzer->assume(condTok,
+                                                 false,
+                                                 hasElse ? Analyzer::Assume::Pending : Analyzer::Assume::None);
+                            // The else block is traversed on the main path. If it kills the value
+                            // (modified) the main path stops, but the then-fork may still carry the
+                            // value forward, so defer the break until after the fork continues.
+                            Progress pElse = Progress::Continue;
+                            if (hasElse)
+                                pElse = updateBranch(elseBranch, depth - 1);
+                            if (thenBranch.isDead() || elseBranch.isDead()) {
+                                if (conditional && stopUpdates())
+                                    pElse = Break(Analyzer::Terminate::Conditional);
                             }
-                        }
-                        if (thenBranch.isInconclusive() || elseBranch.isInconclusive()) {
-                            if (!analyzer->lowerToInconclusive())
-                                return Break(Analyzer::Terminate::Bail);
-                        } else if (thenBranch.isModified() || elseBranch.isModified()) {
-                            if (!hasElse && analyzer->isConditional() && stopUpdates())
-                                return Break(Analyzer::Terminate::Conditional);
-                            if (!analyzer->lowerToPossible())
+                            if (thenBranch.isModified() || elseBranch.isModified()) {
+                                if (!ft.analyzer->lowerToPossible())
+                                    pThen = Progress::Break;
+                                if (pElse != Progress::Break && !analyzer->lowerToPossible())
+                                    pElse = Break(Analyzer::Terminate::Bail);
+                            }
+                            if (thenBranch.isInconclusive() || elseBranch.isInconclusive()) {
+                                if (!ft.analyzer->lowerToInconclusive())
+                                    pThen = Progress::Break;
+                                if (pElse != Progress::Break && !analyzer->lowerToInconclusive())
+                                    pElse = Break(Analyzer::Terminate::Bail);
+                            }
+                            if (thenBranch.hasGoto() || elseBranch.hasGoto()) {
                                 return Break(Analyzer::Terminate::Bail);
-                            analyzer->assume(condTok, elseBranch.isModified());
+                            }
+                            // Carry the then-fork forward, unless a limit is hit - then only the linear main
+                            // path continues (no bail). forkDepth bounds nesting, forkBudget total. <0 = off.
+                            assert(forkBudget != nullptr);
+                            const int forkDepthLimit = settings().vfOptions.maxForwardConditionForkDepth;
+                            const int forkBudgetLimit = settings().vfOptions.maxForwardConditionForks;
+                            const bool depthOk = forkDepthLimit < 0 || forkDepth < forkDepthLimit;
+                            const bool budgetOk = forkBudgetLimit < 0 || *forkBudget < forkBudgetLimit;
+                            if (pThen != Progress::Break && !thenBranch.isEscape() && depthOk && budgetOk) {
+                                ++(*forkBudget);
+                                ++ft.forkDepth;
+                                ft.updateRange(thenBranch.endBlock, end, depth - 1);
+                            }
+                            if (pElse == Progress::Break) {
+                                // Only the else branch escaped; the then branch falls through, so
+                                // the scope as a whole does not always escape.
+                                if (terminate == Analyzer::Terminate::Escape && !thenBranch.isEscape())
+                                    terminate = Analyzer::Terminate::None;
+                                return Break();
+                            }
                         }
                     }
                 } else if (Token::simpleMatch(tok, "try {")) {
@@ -845,7 +891,7 @@ namespace {
                     return Break();
                 } else if (Token* callTok = callExpr(tok)) {
                     // TODO: Dont traverse tokens a second time
-                    if (start != callTok && tok != callTok && updateRecursive(callTok->astOperand1()) == Progress::Break)
+                    if (start != callTok && tok != callTok && (tok->str() != "." || tok != callTok->astOperand1()) && updateRecursive(callTok->astOperand1()) == Progress::Break)
                         return Break();
                     // Since the call could be an unknown macro, traverse the tokens as a range instead of recursively
                     if (!Token::simpleMatch(callTok, "( )") &&
@@ -873,10 +919,10 @@ namespace {
             return Progress::Continue;
         }
 
-        void reportError(Severity severity, const std::string& id, const std::string& msg) {
-            ErrorMessage::FileLocation loc(tokenList.getSourceFilePath(), 0, 0);
-            const ErrorMessage errmsg({std::move(loc)}, tokenList.getSourceFilePath(), severity, msg, id, Certainty::normal);
-            errorLogger.reportErr(errmsg);
+        void reportError(Severity severity, const std::string& id, const std::string& msg) const {
+            ErrorMessage::FileLocation loc(tokenList().getSourceFilePath(), 0, 0);
+            const ErrorMessage errmsg({std::move(loc)}, tokenList().getSourceFilePath(), severity, msg, id, Certainty::normal);
+            errorLogger().reportErr(errmsg);
         }
 
         static bool isFunctionCall(const Token* tok)
diff --git a/lib/fwdanalysis.cpp b/lib/fwdanalysis.cpp
index 11434e5356d..7b7987e2e91 100644
--- a/lib/fwdanalysis.cpp
+++ b/lib/fwdanalysis.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,9 +26,11 @@
 #include "token.h"
 #include "vfvalue.h"
 
+#include <deque>
 #include <list>
 #include <string>
 #include <utility>
+#include <vector>
 
 static bool isUnchanged(const Token *startToken, const Token *endToken, const std::set<nonneg int> &exprVarIds, bool local)
 {
@@ -93,7 +95,7 @@ static bool hasVolatileCastOrVar(const Token *expr)
     return ret;
 }
 
-FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *startToken, const Token *endToken, const std::set<nonneg int> &exprVarIds, bool local, bool inInnerClass, int depth)
+FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *startToken, const Token *endToken, const std::set<nonneg int> &exprVarIds, bool local, bool inInnerClass, int depth) const
 {
     // Parse the given tokens
     if (++depth > 1000)
@@ -154,10 +156,6 @@ FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *
         }
 
         if (tok->str() == "}") {
-            // Known value => possible value
-            if (tok->scope() == expr->scope())
-                mValueFlowKnown = false;
-
             if (tok->scope()->isLoopScope()) {
                 // check condition
                 const Token *conditionStart = nullptr;
@@ -194,65 +192,6 @@ FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *
         if (Token::simpleMatch(tok, "asm ("))
             return Result(Result::Type::BAILOUT);
 
-        if (mWhat == What::ValueFlow && (Token::Match(tok, "while|for (") || Token::simpleMatch(tok, "do {"))) {
-            const Token *bodyStart = nullptr;
-            const Token *conditionStart = nullptr;
-            if (Token::simpleMatch(tok, "do {")) {
-                bodyStart = tok->next();
-                if (Token::simpleMatch(bodyStart->link(), "} while ("))
-                    conditionStart = bodyStart->link()->tokAt(2);
-            } else {
-                conditionStart = tok->next();
-                if (Token::simpleMatch(conditionStart->link(), ") {"))
-                    bodyStart = conditionStart->link()->next();
-            }
-
-            if (!bodyStart || !conditionStart)
-                return Result(Result::Type::BAILOUT);
-
-            // Is expr changed in condition?
-            if (!isUnchanged(conditionStart, conditionStart->link(), exprVarIds, local))
-                return Result(Result::Type::BAILOUT);
-
-            // Is expr changed in loop body?
-            if (!isUnchanged(bodyStart, bodyStart->link(), exprVarIds, local))
-                return Result(Result::Type::BAILOUT);
-        }
-
-        if (mWhat == What::ValueFlow && Token::simpleMatch(tok, "if (") && Token::simpleMatch(tok->linkAt(1), ") {")) {
-            const Token *bodyStart = tok->linkAt(1)->next();
-            const Token *conditionStart = tok->next();
-            const Token *condTok = conditionStart->astOperand2();
-            if (const ValueFlow::Value* v = condTok->getKnownValue(ValueFlow::Value::ValueType::INT)) {
-                const bool cond = !!v->intvalue;
-                if (cond) {
-                    FwdAnalysis::Result result = checkRecursive(expr, bodyStart, bodyStart->link(), exprVarIds, local, true, depth);
-                    if (result.type != Result::Type::NONE)
-                        return result;
-                } else if (Token::simpleMatch(bodyStart->link(), "} else {")) {
-                    bodyStart = bodyStart->link()->tokAt(2);
-                    FwdAnalysis::Result result = checkRecursive(expr, bodyStart, bodyStart->link(), exprVarIds, local, true, depth);
-                    if (result.type != Result::Type::NONE)
-                        return result;
-                }
-            }
-            tok = bodyStart->link();
-            if (isReturnScope(tok, mSettings.library))
-                return Result(Result::Type::BAILOUT);
-            if (Token::simpleMatch(tok, "} else {"))
-                tok = tok->linkAt(2);
-            if (!tok)
-                return Result(Result::Type::BAILOUT);
-
-            // Is expr changed in condition?
-            if (!isUnchanged(conditionStart, conditionStart->link(), exprVarIds, local))
-                return Result(Result::Type::BAILOUT);
-
-            // Is expr changed in condition body?
-            if (!isUnchanged(bodyStart, bodyStart->link(), exprVarIds, local))
-                return Result(Result::Type::BAILOUT);
-        }
-
         if (!local && Token::Match(tok, "%name% (") && !Token::simpleMatch(tok->linkAt(1), ") {")) {
             // TODO: this is a quick bailout
             return Result(Result::Type::BAILOUT);
@@ -278,22 +217,15 @@ FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *
                 parent = parent->astParent();
                 if (parent->str() == "(" && !parent->isCast())
                     break;
-                if (isSameExpression(false, expr, parent, mSettings, true, false, nullptr)) {
+                if (isSameExpression(false, expr, parent, mSettings, true, false, nullptr))
                     same = true;
-                    if (mWhat == What::ValueFlow) {
-                        KnownAndToken v;
-                        v.known = mValueFlowKnown;
-                        v.token = parent;
-                        mValueFlow.push_back(v);
-                    }
-                }
                 if (Token::Match(parent, ". %var%") && parent->next()->varId() && exprVarIds.find(parent->next()->varId()) == exprVarIds.end() &&
                     isSameExpression(false, expr->astOperand1(), parent->astOperand1(), mSettings, true, false, nullptr)) {
                     other = true;
                     break;
                 }
             }
-            if (mWhat != What::ValueFlow && same && Token::simpleMatch(parent->astParent(), "[") && parent == parent->astParent()->astOperand2()) {
+            if (same && Token::simpleMatch(parent->astParent(), "[") && parent == parent->astParent()->astOperand2()) {
                 return Result(Result::Type::READ);
             }
             if (other)
@@ -357,11 +289,11 @@ FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *
                     ftok = ftok->astParent();
                 if (ftok && Token::Match(ftok->previous(), "%name% (")) {
                     const std::vector<const Token *> args = getArguments(ftok);
-                    int argnr = 0;
+                    size_t argnr = 0;
                     while (argnr < args.size() && args[argnr] != parent)
                         argnr++;
                     if (argnr < args.size()) {
-                        if (mSettings.library.getArgDirection(ftok->astOperand1(), argnr + 1) == Library::ArgumentChecks::Direction::DIR_OUT)
+                        if (mSettings().library.getArgDirection(ftok->astOperand1(), argnr + 1, /*indirect*/ 1) == Library::ArgumentChecks::Direction::DIR_OUT)
                             continue;
                     }
                 }
@@ -380,8 +312,6 @@ FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *
                 return result1;
             if (mWhat == What::UnusedValue && result1.type == Result::Type::WRITE && expr->variable() && expr->variable()->isReference())
                 return result1;
-            if (mWhat == What::ValueFlow && result1.type == Result::Type::WRITE)
-                mValueFlowKnown = false;
             if (mWhat == What::Reassign && result1.type == Result::Type::BREAK) {
                 const Token *scopeEndToken = findNextTokenFromBreak(result1.token);
                 if (scopeEndToken) {
@@ -393,8 +323,6 @@ FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *
             if (Token::simpleMatch(tok->linkAt(1), "} else {")) {
                 const Token *elseStart = tok->linkAt(1)->tokAt(2);
                 const Result &result2 = checkRecursive(expr, elseStart, elseStart->link(), exprVarIds, local, inInnerClass, depth);
-                if (mWhat == What::ValueFlow && result2.type == Result::Type::WRITE)
-                    mValueFlowKnown = false;
                 if (result2.type == Result::Type::READ || result2.type == Result::Type::BAILOUT)
                     return result2;
                 if (result1.type == Result::Type::WRITE && result2.type == Result::Type::WRITE)
@@ -409,6 +337,16 @@ FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *
     return Result(Result::Type::NONE);
 }
 
+static bool isSimpleIndexExpression(const Token* tok)
+{
+    const Token* idx = tok->astOperand2();
+    if (!idx)
+        return false;
+    if (idx->isIncDecOp())
+        idx = idx->astOperand1();
+    return idx->variable() && idx->variable()->scope() == tok->scope();
+}
+
 std::set<nonneg int> FwdAnalysis::getExprVarIds(const Token* expr, bool* localOut, bool* unknownVarIdOut) const
 {
     // all variable ids in expr.
@@ -417,7 +355,7 @@ std::set<nonneg int> FwdAnalysis::getExprVarIds(const Token* expr, bool* localOu
     bool unknownVarId = false;
     visitAstNodes(expr,
                   [&](const Token *tok) {
-        if (tok->str() == "[" && mWhat == What::UnusedValue)
+        if (tok->str() == "[" && mWhat == What::UnusedValue && isSimpleIndexExpression(tok))
             return ChildrenToVisit::op1;
         if (tok->varId() == 0 && tok->isName() && tok->strAt(-1) != ".") {
             // unknown variable
@@ -443,7 +381,7 @@ std::set<nonneg int> FwdAnalysis::getExprVarIds(const Token* expr, bool* localOu
     return exprVarIds;
 }
 
-FwdAnalysis::Result FwdAnalysis::check(const Token* expr, const Token* startToken, const Token* endToken)
+FwdAnalysis::Result FwdAnalysis::check(const Token* expr, const Token* startToken, const Token* endToken) const
 {
     // all variable ids in expr.
     bool local = true;
@@ -464,7 +402,7 @@ FwdAnalysis::Result FwdAnalysis::check(const Token* expr, const Token* startToke
     Result result = checkRecursive(expr, startToken, endToken, exprVarIds, local, false);
 
     // Break => continue checking in outer scope
-    while (mWhat!=What::ValueFlow && result.type == FwdAnalysis::Result::Type::BREAK) {
+    while (result.type == FwdAnalysis::Result::Type::BREAK) {
         const Token *scopeEndToken = findNextTokenFromBreak(result.token);
         if (!scopeEndToken)
             break;
@@ -478,9 +416,18 @@ bool FwdAnalysis::hasOperand(const Token *tok, const Token *lhs) const
 {
     if (!tok)
         return false;
-    if (isSameExpression(false, tok, lhs, mSettings, false, false, nullptr))
-        return true;
-    return hasOperand(tok->astOperand1(), lhs) || hasOperand(tok->astOperand2(), lhs);
+    std::deque<const Token*> nodes{ tok };
+    while (!nodes.empty()) {
+        const Token* node = nodes.front();
+        if (isSameExpression(false, node, lhs, mSettings, false, false, nullptr))
+            return true;
+        if (node->astOperand1())
+            nodes.emplace_back(node->astOperand1());
+        if (node->astOperand2())
+            nodes.emplace_back(node->astOperand2());
+        nodes.pop_front();
+    }
+    return false;
 }
 
 const Token *FwdAnalysis::reassign(const Token *expr, const Token *startToken, const Token *endToken)
@@ -522,7 +469,7 @@ bool FwdAnalysis::possiblyAliased(const Token *expr, const Token *startToken) co
         if (Token::Match(tok, "%name% (") && !Token::Match(tok, "if|while|for")) {
             // Is argument passed by reference?
             const std::vector<const Token*> args = getArguments(tok);
-            for (int argnr = 0; argnr < args.size(); ++argnr) {
+            for (size_t argnr = 0; argnr < args.size(); ++argnr) {
                 if (!Token::Match(args[argnr], "%name%|.|::"))
                     continue;
                 if (tok->function() && tok->function()->getArgumentVar(argnr) && !tok->function()->getArgumentVar(argnr)->isReference() && !tok->function()->isConst())
diff --git a/lib/fwdanalysis.h b/lib/fwdanalysis.h
index 389ea195da2..b57e36ba34b 100644
--- a/lib/fwdanalysis.h
+++ b/lib/fwdanalysis.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,10 +22,10 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
+#include "refthunk.h"
 
 #include <cstdint>
 #include <set>
-#include <vector>
 
 class Token;
 class Settings;
@@ -60,11 +60,6 @@ class FwdAnalysis {
      */
     bool unusedValue(const Token *expr, const Token *startToken, const Token *endToken);
 
-    struct KnownAndToken {
-        bool known{};
-        const Token* token{};
-    };
-
     /** Is there some possible alias for given expression */
     bool possiblyAliased(const Token *expr, const Token *startToken) const;
 
@@ -80,13 +75,11 @@ class FwdAnalysis {
         const Token* token{};
     };
 
-    Result check(const Token *expr, const Token *startToken, const Token *endToken);
-    Result checkRecursive(const Token *expr, const Token *startToken, const Token *endToken, const std::set<nonneg int> &exprVarIds, bool local, bool inInnerClass, int depth=0);
+    Result check(const Token *expr, const Token *startToken, const Token *endToken) const;
+    Result checkRecursive(const Token *expr, const Token *startToken, const Token *endToken, const std::set<nonneg int> &exprVarIds, bool local, bool inInnerClass, int depth=0) const;
 
-    const Settings &mSettings;
-    enum class What : std::uint8_t { Reassign, UnusedValue, ValueFlow } mWhat = What::Reassign;
-    std::vector<KnownAndToken> mValueFlow;
-    bool mValueFlowKnown = true;
+    RefThunk<const Settings> mSettings;
+    enum class What : std::uint8_t { Reassign, UnusedValue } mWhat = What::Reassign;
 };
 
 #endif // fwdanalysisH
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
index acd7842224f..a53760c1a32 100644
--- a/lib/importproject.cpp
+++ b/lib/importproject.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,25 +23,219 @@
 #include "settings.h"
 #include "standards.h"
 #include "suppressions.h"
-#include "token.h"
-#include "tokenlist.h"
 #include "utils.h"
 
 #include <algorithm>
+#include <cctype>
+#include <climits>
+#include <cmath>
 #include <cstdlib>
 #include <cstring>
 #include <fstream>
+#include <initializer_list>
 #include <iostream>
 #include <iterator>
-#include <stack>
+#include <map>
+#include <set>
+#include <sstream>
+#include <stdexcept>
+#include <string>
 #include <unordered_set>
 #include <utility>
 #include <vector>
 
+// Directory listing for wildcard <Import> support -- see listDirectoryFiles()
+// just above processImport().
+#ifndef _WIN32
+#include <dirent.h>
+#else
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#endif
+
 #include "xml.h"
 
 #include "json.h"
 
+
+std::string ImportProject::collectArgs(const std::string &cmd, std::vector<std::string> &args)
+{
+    args.clear();
+
+    std::string::size_type pos = 0;
+    const std::string::size_type end = cmd.size();
+    std::string arg;
+
+    bool inDoubleQuotes = false;
+    bool inSingleQuotes = false;
+
+    while (pos < end) {
+        char c = cmd[pos++];
+
+        if (c == ' ') {
+            if (inDoubleQuotes || inSingleQuotes) {
+                arg.push_back(c);
+                continue;
+            }
+
+            if (!arg.empty())
+                args.push_back(arg);
+            arg.clear();
+
+            pos = cmd.find_first_not_of(' ', pos);
+
+            continue;
+        }
+
+        if (c == '\"' && !inSingleQuotes) {
+            inDoubleQuotes = !inDoubleQuotes;
+            continue;
+        }
+
+        if (c == '\'' && !inDoubleQuotes) {
+            inSingleQuotes = !inSingleQuotes;
+            continue;
+        }
+
+        if (c == '\\' && !inSingleQuotes) {
+            if (pos == end) {
+                arg.push_back('\\');
+                break;
+            }
+
+            c = cmd[pos++];
+
+            if (!std::strchr("\\\"\' ", c))
+                arg.push_back('\\');
+
+            arg.push_back(c);
+            continue;
+        }
+
+        arg.push_back(c);
+    }
+
+    if (inSingleQuotes || inDoubleQuotes)
+        return "Missing closing quote in command string";
+
+    if (!arg.empty())
+        args.push_back(std::move(arg));
+
+    return "";
+}
+
+void ImportProject::parseArgs(FileSettings &fs, const std::vector<std::string> &args)
+{
+    // Accept index by value, return a completion state pair to prevent loop corruption
+    const auto getOptArg = [&args](std::initializer_list<std::string> optNames,
+                                   std::size_t i) -> std::pair<std::string, bool> {
+        const auto &arg = args[i];
+        const auto *const it = std::find_if(optNames.begin(),
+                                            optNames.end(),
+                                            [&arg](const std::string &optName) {
+            return startsWith(arg, optName);
+        });
+
+        if (it == optNames.end())
+            return std::make_pair(std::string(), false);
+
+        const std::size_t optLen = it->size();
+        if (arg.size() == optLen) {
+            // Space-separated argument format (e.g., /I path)
+            if (i + 1 >= args.size())
+                return std::make_pair(std::string(), false);
+            return std::make_pair(args[i + 1], true);     // true flags lookahead consumption
+        }
+
+        // Glued argument format (e.g., /Ipath)
+        return std::make_pair(arg.substr(optLen), false);
+    };
+
+    std::string defs;
+    for (std::size_t i = 0; i < args.size(); i++) {
+        if (args[i].empty())
+            continue;
+
+        std::pair<std::string, bool> optResult;
+
+        if (!(optResult = getOptArg({ "-I", "/I" }, i)).first.empty()) {
+            if (std::none_of(fs.includePaths.cbegin(), fs.includePaths.cend(),
+                             [&](const std::string &path) {
+                return path == optResult.first;
+            })) {
+                fs.includePaths.push_back(std::move(optResult.first));
+            }
+            if (optResult.second)
+                i++; // Safely advance only if the separate lookahead was consumed
+            continue;
+        }
+
+        if (!(optResult = getOptArg({ "-isystem" }, i)).first.empty()) {
+            fs.systemIncludePaths.push_back(std::move(optResult.first));
+            if (optResult.second)
+                i++;
+            continue;
+        }
+
+        if (!(optResult = getOptArg({ "-include", "/FI", "-FI" }, i)).first.empty()) {
+            fs.forcedIncludes.push_back(std::move(optResult.first));
+            if (optResult.second)
+                i++;
+            continue;
+        }
+
+        if (!(optResult = getOptArg({ "-D", "/D" }, i)).first.empty()) {
+            defs += optResult.first + ";";
+            if (optResult.second)
+                i++;
+            continue;
+        }
+
+        if (!(optResult = getOptArg({ "-U", "/U" }, i)).first.empty()) {
+            fs.undefs.insert(std::move(optResult.first));
+            if (optResult.second)
+                i++;
+            continue;
+        }
+
+        if (!(optResult = getOptArg({ "-std=", "/std:" }, i)).first.empty()) {
+            fs.standard = std::move(optResult.first);
+            if (optResult.second)
+                i++;
+            continue;
+        }
+
+        if (!(optResult = getOptArg({ "-f" }, i)).first.empty()) {
+            if (optResult.first == "pic")
+                defs += "__pic__;";
+            else if (optResult.first == "PIC")
+                defs += "__PIC__;";
+            else if (optResult.first == "pie")
+                defs += "__pie__;";
+            else if (optResult.first == "PIE")
+                defs += "__PIE__;";
+            if (optResult.second)
+                i++;
+            continue;
+        }
+
+        if (!(optResult = getOptArg({ "-m" }, i)).first.empty()) {
+            if (optResult.first == "unicode")
+                defs += "UNICODE;";
+            if (optResult.second)
+                i++;
+            continue;
+        }
+    }
+
+    fsSetDefines(fs, std::move(defs));
+}
+
 void ImportProject::ignorePaths(const std::vector<std::string> &ipaths, bool debug)
 {
     PathMatch matcher(ipaths, Path::getCurrentPath());
@@ -66,8 +260,31 @@ void ImportProject::ignoreOtherConfigs(const std::string &cfg)
     }
 }
 
+// Decode %XX sequences back to their original characters.
+static std::string msbuildUnescape(const std::string &s)
+{
+    std::string result;
+    result.reserve(s.size());
+    for (std::size_t i = 0; i < s.size(); ++i) {
+        if (s[i] == '%' && i + 2 < s.size() &&
+            std::isxdigit(static_cast<unsigned char>(s[i + 1])) &&
+            std::isxdigit(static_cast<unsigned char>(s[i + 2]))) {
+            result += static_cast<char>(std::stoi(s.substr(i + 1, 2), nullptr, 16));
+            i += 2;
+        } else {
+            result += s[i];
+        }
+    }
+    return result;
+}
+
 void ImportProject::fsSetDefines(FileSettings& fs, std::string defs)
 {
+    // Strip %(metadata) tokens at the start of the string (no preceding semicolon).
+    while (startsWith(defs, "%(")) {
+        const std::string::size_type pos2 = defs.find(';');
+        defs.erase(0, pos2 == std::string::npos ? std::string::npos : pos2 + 1);
+    }
     while (defs.find(";%(") != std::string::npos) {
         const std::string::size_type pos1 = defs.find(";%(");
         const std::string::size_type pos2 = defs.find(';', pos1+1);
@@ -94,646 +311,4318 @@ void ImportProject::fsSetDefines(FileSettings& fs, std::string defs)
     }
     if (!eq && !defs.empty())
         defs += "=1";
+    defs = msbuildUnescape(defs);
     fs.defines.swap(defs);
 }
 
-static bool simplifyPathWithVariables(std::string &s, std::map<std::string, std::string, cppcheck::stricmp> &variables)
-{
-    std::set<std::string, cppcheck::stricmp> expanded;
-    std::string::size_type start = 0;
-    while ((start = s.find("$(")) != std::string::npos) {
-        const std::string::size_type end = s.find(')',start);
-        if (end == std::string::npos)
-            break;
-        const std::string var = s.substr(start+2,end-start-2);
-        if (expanded.find(var) != expanded.end())
-            break;
-        expanded.insert(var);
-        auto it1 = utils::as_const(variables).find(var);
-        // variable was not found within defined variables
-        if (it1 == variables.end()) {
-            const char *envValue = std::getenv(var.c_str());
-            if (!envValue) {
-                //! \todo generate a debug/info message about undefined variable
-                break;
-            }
-            variables[var] = std::string(envValue);
-            it1 = variables.find(var);
-        }
-        s.replace(start, end - start + 1, it1->second);
+void ImportProject::addDebug(const std::string &msg) {
+    for (const auto &debug : debugs) {
+        // cppcheck-suppress useStlAlgorithm
+        if (debug == msg)
+            return;
     }
-    if (s.find("$(") != std::string::npos)
-        return false;
-    s = Path::simplifyPath(std::move(s));
-    return true;
+    debugs.emplace_back(msg);
 }
 
-void ImportProject::fsSetIncludePaths(FileSettings& fs, const std::string &basepath, const std::list<std::string> &in, std::map<std::string, std::string, cppcheck::stricmp> &variables)
-{
-    std::set<std::string> found;
-    // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
-    const std::list<std::string> copyIn(in);
-    fs.includePaths.clear();
-    for (const std::string &ipath : copyIn) {
-        if (ipath.empty())
-            continue;
-        if (startsWith(ipath,"%("))
-            continue;
-        std::string s(Path::fromNativeSeparators(ipath));
-        if (!found.insert(s).second)
-            continue;
-        if (s[0] == '/' || (s.size() > 1U && s.compare(1,2,":/") == 0)) {
-            if (!endsWith(s,'/'))
-                s += '/';
-            fs.includePaths.push_back(std::move(s));
+// Find the ')' that matches the '(' at position parenPos.
+// Tracks depth for every '(' and ')', not just '$(' pairs: bare parentheses
+// inside static-function argument lists (e.g. Pow(2,3), Format(...)) must
+// also open and close a nesting level, otherwise the inner ')' would be
+// mistaken for the match of the outer one.
+static std::string::size_type findMatchingParen(const std::string &s, std::string::size_type parenPos) {
+    if (parenPos >= s.size() || s[parenPos] != '(')
+        return std::string::npos;
+
+    int depth = 0;
+    char quote = '\0';
+
+    for (std::string::size_type i = parenPos; i < s.size(); ++i) {
+        const char c = s[i];
+
+        if (quote != '\0') {
+            if (c == quote) {
+                // A doubled quote represents a literal quote.
+                if (i + 1 < s.size() && s[i + 1] == quote) {
+                    ++i;
+                    continue;
+                }
+                quote = '\0';
+            }
             continue;
         }
 
-        if (endsWith(s,'/')) // this is a temporary hack, simplifyPath can crash if path ends with '/'
-            s.pop_back();
-
-        if (s.find("$(") == std::string::npos) {
-            s = Path::simplifyPath(basepath + s);
-        } else {
-            if (!simplifyPathWithVariables(s, variables))
-                continue;
+        if (c == '\'' || c == '"') {
+            quote = c;
+        } else if (c == '(') {
+            ++depth;
+        } else if (c == ')') {
+            --depth;
+            if (depth == 0)
+                return i;
         }
-        if (s.empty())
-            continue;
-        fs.includePaths.push_back(s.back() == '/' ? s : (s + '/'));
     }
+
+    return std::string::npos;
 }
 
-ImportProject::Type ImportProject::import(const std::string &filename, Settings *settings, Suppressions *supprs)
-{
-    std::ifstream fin(filename);
-    if (!fin.is_open())
-        return ImportProject::Type::MISSING;
+// Apply an MSBuild property string method (ToLower, Replace, etc.).
+// Used by both the condition evaluator and the property value expander.
+static std::string applyPropertyMethod(std::string value,
+                                       const std::string &method,
+                                       const std::vector<std::string> &args) {
+    if (caseInsensitiveStringCompare(method, "ToUpper") == 0) {
+        if (!args.empty())
+            throw std::runtime_error("ToUpper takes no arguments");
+        std::transform(value.cbegin(), value.cend(), value.begin(), static_cast<int (*)(int)>(std::toupper));
+        return value;
+    }
 
-    mPath = Path::getPathFromFilename(Path::fromNativeSeparators(filename));
-    if (!mPath.empty() && !endsWith(mPath,'/'))
-        mPath += '/';
+    if (caseInsensitiveStringCompare(method, "ToLower") == 0) {
+        if (!args.empty())
+            throw std::runtime_error("ToLower takes no arguments");
+        std::transform(value.cbegin(), value.cend(), value.begin(), static_cast<int (*)(int)>(std::tolower));
+        return value;
+    }
 
-    const std::vector<std::string> fileFilters =
-        settings ? settings->fileFilters : std::vector<std::string>();
+    if (caseInsensitiveStringCompare(method, "Contains") == 0) {
+        if (args.size() != 1)
+            throw std::runtime_error("Contains requires one argument");
+        // .NET String.Contains is case-sensitive by default
+        return value.find(args[0]) != std::string::npos ? "True" : "False";
+    }
 
-    if (endsWith(filename, ".json")) {
-        if (importCompileCommands(fin)) {
-            setRelativePaths(filename);
-            return ImportProject::Type::COMPILE_DB;
+    if (caseInsensitiveStringCompare(method, "StartsWith") == 0) {
+        if (args.size() != 1)
+            throw std::runtime_error("StartsWith requires one argument");
+        // .NET String.StartsWith is case-sensitive by default
+        if (args[0].size() > value.size())
+            return "False";
+        return value.compare(0, args[0].size(), args[0]) == 0 ? "True" : "False";
+    }
+
+    if (caseInsensitiveStringCompare(method, "EndsWith") == 0) {
+        if (args.size() != 1)
+            throw std::runtime_error("EndsWith requires one argument");
+        // .NET String.EndsWith is case-sensitive by default
+        if (args[0].size() > value.size())
+            return "False";
+        return value.compare(value.size() - args[0].size(), args[0].size(), args[0]) == 0 ? "True" : "False";
+    }
+
+    if (caseInsensitiveStringCompare(method, "Trim") == 0) {
+        if (args.empty()) {
+            const std::size_t first = value.find_first_not_of(" \t\r\n");
+            if (first == std::string::npos)
+                return "";
+            const std::size_t last = value.find_last_not_of(" \t\r\n");
+            return value.substr(first, last - first + 1);
         }
-    } else if (endsWith(filename, ".sln")) {
-        if (importSln(fin, mPath, fileFilters)) {
-            setRelativePaths(filename);
-            return ImportProject::Type::VS_SLN;
+        std::string chars;
+        for (const std::string &arg : args)
+            chars += arg;
+        const std::size_t first = value.find_first_not_of(chars);
+        if (first == std::string::npos)
+            return "";
+        const std::size_t last = value.find_last_not_of(chars);
+        return value.substr(first, last - first + 1);
+    }
+
+    if (caseInsensitiveStringCompare(method, "TrimStart") == 0) {
+        if (args.empty()) {
+            const std::size_t first = value.find_first_not_of(" \t\r\n");
+            return first == std::string::npos ? "" : value.substr(first);
         }
-    } else if (endsWith(filename, ".vcxproj")) {
-        std::map<std::string, std::string, cppcheck::stricmp> variables;
-        std::vector<SharedItemsProject> sharedItemsProjects;
-        if (importVcxproj(filename, variables, "", fileFilters, sharedItemsProjects)) {
-            setRelativePaths(filename);
-            return ImportProject::Type::VS_VCXPROJ;
+        std::string chars;
+        for (const std::string &arg : args)
+            chars += arg;
+        const std::size_t first = value.find_first_not_of(chars);
+        return first == std::string::npos ? "" : value.substr(first);
+    }
+
+    if (caseInsensitiveStringCompare(method, "TrimEnd") == 0) {
+        if (args.empty()) {
+            const std::size_t last = value.find_last_not_of(" \t\r\n");
+            return last == std::string::npos ? "" : value.substr(0, last + 1);
         }
-    } else if (endsWith(filename, ".bpr")) {
-        if (importBcb6Prj(filename)) {
-            setRelativePaths(filename);
-            return ImportProject::Type::BORLAND;
+        std::string chars;
+        for (const std::string &arg : args)
+            chars += arg;
+        const std::size_t last = value.find_last_not_of(chars);
+        return last == std::string::npos ? "" : value.substr(0, last + 1);
+    }
+
+    if (caseInsensitiveStringCompare(method, "Substring") == 0) {
+        if (args.size() != 1 && args.size() != 2)
+            throw std::runtime_error("Substring requires one or two arguments");
+        char *end = nullptr;
+        const long start = std::strtol(args[0].c_str(), &end, 10);
+        if (end == args[0].c_str() || *end != '\0')
+            throw std::runtime_error("Invalid Substring start index");
+        if (start < 0 || static_cast<unsigned long>(start) > value.size())
+            throw std::runtime_error("Substring start index out of range");
+        const auto index = static_cast<std::size_t>(start);
+        if (args.size() == 1)
+            return value.substr(index);
+        end = nullptr;
+        const long length = std::strtol(args[1].c_str(), &end, 10);
+        if (end == args[1].c_str() || *end != '\0')
+            throw std::runtime_error("Invalid Substring length");
+        if (length < 0 || static_cast<unsigned long>(length) > value.size() - index)
+            throw std::runtime_error("Substring length out of range");
+        return value.substr(index, static_cast<std::size_t>(length));
+    }
+
+    if (caseInsensitiveStringCompare(method, "Replace") == 0) {
+        if (args.size() != 2)
+            throw std::runtime_error("Replace requires two arguments");
+        if (args[0].empty())
+            throw std::runtime_error("Replace search string cannot be empty");
+        std::size_t pos = 0;
+        while ((pos = value.find(args[0], pos)) != std::string::npos) {
+            value.replace(pos, args[0].size(), args[1]);
+            pos += args[1].size();
         }
-    } else if (settings && supprs && endsWith(filename, ".cppcheck")) {
-        if (importCppcheckGuiProject(fin, *settings, *supprs)) {
-            setRelativePaths(filename);
-            return ImportProject::Type::CPPCHECK_GUI;
+        return value;
+    }
+
+    if (caseInsensitiveStringCompare(method, "IndexOf") == 0) {
+        if (args.empty() || args.size() > 2)
+            throw std::runtime_error("IndexOf requires one or two arguments");
+        std::size_t from = 0;
+        if (args.size() == 2) {
+            char *end = nullptr;
+            const long idx = std::strtol(args[1].c_str(), &end, 10);
+            if (end == args[1].c_str() || *end != '\0')
+                throw std::runtime_error("Invalid IndexOf start index");
+            if (idx < 0 || static_cast<unsigned long>(idx) > value.size())
+                throw std::runtime_error("IndexOf start index out of range");
+            from = static_cast<std::size_t>(idx);
         }
-    } else {
-        return ImportProject::Type::UNKNOWN;
+        const std::size_t found = value.find(args[0], from);
+        return std::to_string(found == std::string::npos ? -1L : static_cast<long>(found));
     }
-    return ImportProject::Type::FAILURE;
-}
 
-static std::string readUntil(const std::string &command, std::string::size_type *pos, const char until[], bool str = false)
-{
-    std::string ret;
-    bool escapedString = false;
-    bool escape = false;
-    for (; *pos < command.size() && (str || !std::strchr(until, command[*pos])); (*pos)++) {
-        if (escape)
-            escape = false;
-        else if (command[*pos] == '\\') {
-            if (str)
-                escape = true;
-            else if (command[*pos + 1] == '"') {
-                if (escapedString)
-                    return ret + "\\\"";
-                escapedString = true;
-                ret += "\\\"";
-                (*pos)++;
-                continue;
-            }
-        } else if (command[*pos] == '\"')
-            str = !str;
-        ret += command[*pos];
+    if (caseInsensitiveStringCompare(method, "LastIndexOf") == 0) {
+        if (args.empty() || args.size() > 2)
+            throw std::runtime_error("LastIndexOf requires one or two arguments");
+        std::size_t from = std::string::npos;
+        if (args.size() == 2) {
+            char *end = nullptr;
+            const long idx = std::strtol(args[1].c_str(), &end, 10);
+            if (end == args[1].c_str() || *end != '\0')
+                throw std::runtime_error("Invalid LastIndexOf start index");
+            if (idx < 0 || static_cast<unsigned long>(idx) > value.size())
+                throw std::runtime_error("LastIndexOf start index out of range");
+            from = static_cast<std::size_t>(idx);
+        }
+        const std::size_t found = value.rfind(args[0], from);
+        return std::to_string(found == std::string::npos ? -1L : static_cast<long>(found));
     }
-    return ret;
-}
 
-static std::string unescape(const std::string &in)
-{
-    std::string out;
-    bool escape = false;
-    for (const char c: in) {
-        if (escape) {
-            escape = false;
-            if (!std::strchr("\\\"\'",c))
-                out += "\\";
-            out += c;
-        } else if (c == '\\')
-            escape = true;
-        else
-            out += c;
+    const bool isPadLeft = caseInsensitiveStringCompare(method, "PadLeft") == 0;
+    if (isPadLeft || caseInsensitiveStringCompare(method, "PadRight") == 0) {
+        if (args.empty() || args.size() > 2)
+            throw std::runtime_error(method + " requires one or two arguments");
+        char *end = nullptr;
+        const long totalWidth = std::strtol(args[0].c_str(), &end, 10);
+        if (end == args[0].c_str() || *end != '\0' || totalWidth < 0)
+            throw std::runtime_error(method + " totalWidth must be a non-negative integer");
+        const char padChar = (args.size() == 2 && !args[1].empty()) ? args[1][0] : ' ';
+        const auto width = static_cast<std::size_t>(totalWidth);
+        if (value.size() >= width)
+            return value;
+        const std::string padding(width - value.size(), padChar);
+        return isPadLeft ? padding + value : value + padding;
     }
-    return out;
+
+    throw std::runtime_error("Unhandled method '" + method + "'");
 }
 
-void ImportProject::fsParseCommand(FileSettings& fs, const std::string& command, bool doUnescape)
+static std::string findFileAbove(const std::string &startDirectory, const std::string &file)
 {
-    std::string defs;
-
-    // Parse command..
-    std::string::size_type pos = 0;
-    while (std::string::npos != (pos = command.find(' ',pos))) {
-        while (pos < command.size() && command[pos] == ' ')
-            pos++;
-        if (pos >= command.size())
+    // startDirectory comes from MSBuildThisFileDirectory which is already
+    // normalized to '/' separators by Path::simplifyPath.
+    std::string currentDir = startDirectory;
+    if (currentDir.size() > 1 && currentDir.back() == '/' && currentDir[currentDir.size() - 2] != ':')
+        currentDir.pop_back();
+
+    while (!currentDir.empty()) {
+        std::string targetFile = Path::join(currentDir, file);
+        if (Path::isFile(targetFile))
+            return targetFile;
+        if (currentDir.back() == '/' || (currentDir.back() == ':' && currentDir.size() == 2))
             break;
-        bool wholeArgQuoted = false;
-        if (command[pos] == '"') {
-            wholeArgQuoted = true;
-            pos++;
-            if (pos >= command.size())
-                break;
-        }
-        if (command[pos] != '/' && command[pos] != '-')
-            continue;
-        pos++;
-        if (pos >= command.size())
+        const std::size_t lastSlash = currentDir.rfind('/');
+        if (lastSlash == std::string::npos)
             break;
-        const char F = command[pos++];
-        if (std::strchr("DUI", F)) {
-            while (pos < command.size() && command[pos] == ' ')
-                ++pos;
-        }
-        std::string fval = readUntil(command, &pos, " =", wholeArgQuoted);
-        if (wholeArgQuoted && fval.back() == '\"')
-            fval.resize(fval.size() - 1);
-        if (F=='D') {
-            std::string defval = readUntil(command, &pos, " ");
-            defs += fval;
-            if (doUnescape) {
-                if (defval.size() >= 3 && startsWith(defval,"=\"") && defval.back()=='\"')
-                    defval = "=" + unescape(defval.substr(2, defval.size() - 3));
-                else if (defval.size() >= 5 && startsWith(defval, "=\\\"") && endsWith(defval, "\\\""))
-                    defval = "=\"" + unescape(defval.substr(3, defval.size() - 5)) + "\"";
-            }
-            if (!defval.empty())
-                defs += defval;
-            defs += ';';
-        } else if (F=='U')
-            fs.undefs.insert(std::move(fval));
-        else if (F=='I') {
-            std::string i = std::move(fval);
-            if (i.size() > 1 && i[0] == '\"' && i.back() == '\"')
-                i = unescape(i.substr(1, i.size() - 2));
-            if (std::find(fs.includePaths.cbegin(), fs.includePaths.cend(), i) == fs.includePaths.cend())
-                fs.includePaths.push_back(std::move(i));
-        } else if (F=='s' && startsWith(fval,"td")) {
-            ++pos;
-            fs.standard = readUntil(command, &pos, " ");
-        } else if (F == 'i' && fval == "system") {
-            ++pos;
-            std::string isystem = readUntil(command, &pos, " ");
-            fs.systemIncludePaths.push_back(std::move(isystem));
-        } else if (F=='m') {
-            if (fval == "unicode") {
-                defs += "UNICODE";
-                defs += ";";
-            }
-        } else if (F=='f') {
-            if (fval == "pic") {
-                defs += "__pic__";
-                defs += ";";
-            } else if (fval == "PIC") {
-                defs += "__PIC__";
-                defs += ";";
-            } else if (fval == "pie") {
-                defs += "__pie__";
-                defs += ";";
-            } else if (fval == "PIE") {
-                defs += "__PIE__";
-                defs += ";";
-            }
-            // TODO: support -fsigned-char and -funsigned-char?
-            // we can only set it globally but in this context it needs to be treated per file
-        }
+        currentDir.resize(lastSlash);
     }
-    fsSetDefines(fs, std::move(defs));
+
+    return "";
 }
 
-bool ImportProject::importCompileCommands(std::istream &istr)
+/// Five-way Windows/Unix path classification used by pathCombineAppend and isPathRooted.
+enum class PathKind : std::uint8_t {
+    Empty,         ///< ""
+    UNC,           ///< \\server\share  or  //server/share
+    DriveAbsolute, ///< C:\foo  or  C:/foo
+    RootRelative,  ///< \foo  or  /foo  (no drive letter)
+    DriveRelative, ///< C:foo  (drive letter, no separator)
+    Relative,      ///< foo  (everything else)
+};
+
+static PathKind classifyPath(const std::string &path)
 {
-    picojson::value compileCommands;
-    istr >> compileCommands;
-    if (!compileCommands.is<picojson::array>()) {
-        errors.emplace_back("compilation database is not a JSON array");
-        return false;
+    if (path.empty())
+        return PathKind::Empty;
+    // UNC: two leading separators.
+    if ((path[0] == '/' || path[0] == '\\') &&
+        path.size() >= 2 && (path[1] == '/' || path[1] == '\\'))
+        return PathKind::UNC;
+    // Windows drive letter.
+    if (path.size() >= 2 &&
+        std::isalpha(static_cast<unsigned char>(path[0])) &&
+        path[1] == ':') {
+        if (path.size() >= 3 && (path[2] == '/' || path[2] == '\\'))
+            return PathKind::DriveAbsolute;
+        return PathKind::DriveRelative;
     }
+    // Single leading separator.
+    if (path[0] == '/' || path[0] == '\\')
+        return PathKind::RootRelative;
+    return PathKind::Relative;
+}
 
-    std::map<std::string, int> fileIndex;
-
-    for (const picojson::value &fileInfo : compileCommands.get<picojson::array>()) {
-        picojson::object obj = fileInfo.get<picojson::object>();
+static bool isRelative(const std::string &path) {
+    return classifyPath(path) >= PathKind::DriveRelative;
+}
 
-        if (obj.count("directory") == 0) {
-            errors.emplace_back("'directory' field in compilation database entry missing");
-            return false;
+// Append one path segment to `result` using Windows path-combination semantics.
+// classifyPath() is the sole authority for path kind; Path::isAbsolute() is
+// intentionally NOT used here because it is host-dependent and would misclassify
+// root-relative Windows paths (\foo -> /foo after fromNativeSeparators) as
+// fully-absolute on Linux.
+//
+// Returns true if the segment was fully resolved, false if it could not be
+// resolved correctly and `result` was left unchanged.  Callers must emit a
+// diagnostic on false; they must NOT silently continue with a wrong path.
+//
+// Two modes, selected by `checkIsAbsolute`:
+//
+//  false  -- MSBuild property-evaluation combine (e.g. $(A)\$(B)):
+//    UNC / DriveAbsolute  -> full reset, returns true
+//    RootRelative  \foo   -> reset path, inherit drive: "C:" + "\foo" = "C:/foo", returns true
+//    DriveRelative  C:foo -> UNSUPPORTED: resolving "C:foo" requires the per-drive CWD
+//                           for drive C:, which is a Windows kernel concept unavailable
+//                           here.  Leaves result unchanged and returns false.
+//    Relative / Empty     -> plain join, returns true
+//
+//  true   -- System.IO.Path.Combine semantics:
+//    UNC / DriveAbsolute  -> full reset, returns true
+//    RootRelative  \foo   -> full reset (Path.IsPathRooted = true; drive NOT inherited,
+//                           matching .NET Path.Combine behaviour), returns true
+//    DriveRelative  C:foo -> full reset (Path.IsPathRooted = true for "C:foo"), returns true
+//    Relative / Empty     -> plain join, returns true
+static bool pathCombineAppend(std::string &result, const std::string &seg, bool checkIsAbsolute = false) {
+    if (seg.empty())
+        return true;
+    switch (classifyPath(seg)) {
+    case PathKind::UNC:
+    case PathKind::DriveAbsolute:
+        // Full reset in both modes.
+        result = seg;
+        return true;
+    case PathKind::RootRelative:
+        if (checkIsAbsolute) {
+            // System.IO.Path.Combine: root-relative is rooted; discard accumulated
+            // base (including any drive letter) and return the segment as-is.
+            result = seg;
+        } else {
+            // MSBuild property eval: reset the path component but preserve the
+            // accumulated drive letter so "\foo" on "C:/project/" -> "C:/foo".
+            if (result.size() >= 2 && std::isalpha(static_cast<unsigned char>(result[0])) && result[1] == ':')
+                result.replace(0, 2, seg);
+            else
+                result = seg;
+        }
+        return true;
+    case PathKind::DriveRelative:
+        if (checkIsAbsolute) {
+            // System.IO.Path.Combine: drive-relative is rooted (Path.IsPathRooted
+            // returns true for "C:foo"); discard the accumulated base.
+            result = seg;
+            return true;
         }
+        // MSBuild property eval: "C:foo" means foo relative to the current directory
+        // of drive C:, a per-drive CWD that is a Windows kernel concept.  We have no
+        // way to resolve this correctly in a cross-platform context.  Leave result
+        // unchanged and signal the caller to emit a diagnostic.
+        return false;
+    case PathKind::Relative:
+    case PathKind::Empty:
+        if (!result.empty() && result.back() != '/' && result.back() != '\\')
+            result += '/';
+        result += seg;
+        return true;
+    }
+    return true; // unreachable; silences -Wreturn-type
+}
 
-        if (!obj["directory"].is<std::string>()) {
-            errors.emplace_back("'directory' field in compilation database entry is not a string");
-            return false;
+// MSBuild special characters that must be percent-encoded in property values.
+static const char MSBUILD_SPECIAL_CHARS[] = "%$@';?*!";
+
+// Encode every MSBuild special character in `s` as %XX.
+static std::string msbuildEscape(const std::string &s)
+{
+    static const char hex[] = "0123456789ABCDEF";
+    std::string result;
+    result.reserve(s.size());
+    for (const unsigned char c : s) {
+        if (std::strchr(MSBUILD_SPECIAL_CHARS, static_cast<char>(c))) {
+            result += '%';
+            result += hex[c >> 4];
+            result += hex[c & 0xF];
+        } else {
+            result += static_cast<char>(c);
         }
+    }
+    return result;
+}
 
-        std::string dirpath = Path::fromNativeSeparators(obj["directory"].get<std::string>());
+static std::string stripDirectoryPart(const std::string &filename) {
+    const auto slash = filename.rfind('/');
+    return (slash != std::string::npos) ? filename.substr(slash + 1) : filename;
+}
 
-        /* CMAKE produces the directory without trailing / so add it if not
-         * there - it is needed by setIncludePaths() */
-        if (!endsWith(dirpath, '/'))
-            dirpath += '/';
+/// Return the stem of \p filename (basename with its final extension removed).
+/// Strips only the tail extension so "foo.targets.props" -> "foo.targets", not "foo".
+static std::string fileStem(const std::string &filename) {
+    const std::string ext = Path::getFilenameExtension(filename);
+    if (ext.empty() || filename.size() <= ext.size())
+        return filename;
+    return filename.substr(0, filename.size() - ext.size());
+}
 
-        const std::string directory = std::move(dirpath);
 
-        bool doUnescape = false;
-        std::string command;
-        if (obj.count("arguments")) {
-            doUnescape = false;
-            if (obj["arguments"].is<picojson::array>()) {
-                for (const picojson::value& arg : obj["arguments"].get<picojson::array>()) {
-                    if (arg.is<std::string>()) {
-                        std::string str = arg.get<std::string>();
-                        if (str.find(' ') != std::string::npos)
-                            str = "\"" + str + "\"";
-                        command += str + " ";
-                    }
-                }
-            } else {
-                errors.emplace_back("'arguments' field in compilation database entry is not a JSON array");
-                return false;
+static bool isPathRooted(const std::string &filename) {
+    switch (classifyPath(filename)) {
+    case PathKind::UNC:
+    case PathKind::DriveAbsolute:
+    case PathKind::RootRelative:
+    case PathKind::DriveRelative: // "C:foo" -- Path.IsPathRooted returns true on Windows
+        return true;
+    default:
+        return false;
+    }
+}
+
+static std::string getRelativePath(const std::string &absolutePath, const std::vector<std::string> &basePaths) {
+    const std::string normAbs = Path::fromNativeSeparators(absolutePath);
+
+    // Split a forward-slash path into components where the first element is
+    // the root token -- keeping roots distinct prevents the common-prefix
+    // algorithm from emitting relative paths that cross root boundaries.
+    //
+    //   UNC absolute  //server/share/a  -> ["//server/share", "a"]
+    //   Drive absolute  C:/foo/a        -> ["C:", "foo", "a"]
+    //   Root relative  /foo/a           -> ["/", "foo", "a"]
+    //   Relative       foo/a            -> ["foo", "a"]  (no root token)
+    //
+    // Cross-root pairs (different drive letters, or UNC paths whose server OR
+    // share differs) will get common == 0 and be rejected before any ".." are
+    // emitted, which is correct: no well-formed relative path can cross roots.
+    const auto split = [](const std::string &s) {
+        std::vector<std::string> parts;
+        std::size_t pos = 0;
+        if (s.size() >= 2 && s[0] == '/' && s[1] == '/') {
+            // UNC path: root is the "//server/share" unit.
+            const std::size_t serverEnd = s.find('/', 2);
+            if (serverEnd == std::string::npos) {
+                // Degenerate "//server" with no share -- treat whole string as root.
+                parts.push_back(s);
+                return parts;
             }
-        } else if (obj.count("command")) {
-            doUnescape = true;
-            if (obj["command"].is<std::string>()) {
-                command = obj["command"].get<std::string>();
-            } else {
-                errors.emplace_back("'command' field in compilation database entry is not a string");
-                return false;
+            const std::size_t shareEnd = s.find('/', serverEnd + 1);
+            if (shareEnd == std::string::npos) {
+                // "//server/share" with no trailing path.
+                parts.push_back(s);
+                return parts;
             }
-        } else {
-            errors.emplace_back("no 'arguments' or 'command' field found in compilation database entry");
-            return false;
+            parts.push_back(s.substr(0, shareEnd)); // "//server/share"
+            pos = shareEnd + 1;
+        } else if (s.size() >= 2 && std::isalpha(static_cast<unsigned char>(s[0])) && s[1] == ':') {
+            // Drive-letter path: root is the two-character drive token "C:".
+            parts.push_back(s.substr(0, 2));
+            pos = 2;
+            if (pos < s.size() && s[pos] == '/')
+                ++pos;
+        } else if (!s.empty() && s[0] == '/') {
+            // Root-relative path: root is "/".
+            parts.emplace_back("/");
+            pos = 1;
         }
-
-        if (!obj.count("file") || !obj["file"].is<std::string>()) {
-            errors.emplace_back("skip compilation database entry because it does not have a proper 'file' field");
-            continue;
+        // else: relative path -- no root token is prepended.
+
+        while (pos < s.size()) {
+            const std::size_t slash = s.find('/', pos);
+            std::string seg = s.substr(pos, slash == std::string::npos ? std::string::npos : slash - pos);
+            if (!seg.empty())
+                parts.push_back(std::move(seg));
+            if (slash == std::string::npos)
+                break;
+            pos = slash + 1;
         }
+        return parts;
+    };
 
-        std::string file = Path::fromNativeSeparators(obj["file"].get<std::string>());
-
-        // Accept file?
-        if (!Path::acceptFile(file))
+    for (const std::string &bp : basePaths) {
+        if (absolutePath == bp || bp.empty()) // Seems to be a file, or path is empty
             continue;
 
-        std::string path;
-        if (Path::isAbsolute(file))
-            path = Path::simplifyPath(std::move(file));
-#ifdef _WIN32
-        else if (file[0] == '/' && directory.size() > 2 && std::isalpha(directory[0]) && directory[1] == ':')
-            // directory: C:\foo\bar
-            // file: /xy/z.c
-            // => c:/xy/z.c
-            path = Path::simplifyPath(directory.substr(0,2) + file);
+        const std::string normBase = Path::fromNativeSeparators(bp);
+
+        // Fast path: absolutePath is directly under basePath -- strip the prefix.
+        if (normAbs.compare(0, normBase.length(), normBase) == 0) {
+            if (endsWith(normBase, '/'))
+                return normAbs.substr(normBase.length());
+            if (normAbs.size() > normBase.size() && normAbs[normBase.size()] == '/')
+                return normAbs.substr(normBase.size() + 1);
+        }
+
+        // Slow path: build a relative path using ".." when absolutePath is above
+        // or beside basePath but shares a common ancestor.
+        std::string base = normBase;
+        if (!base.empty() && base.back() != '/')
+            base += '/';
+
+        const std::vector<std::string> absParts = split(normAbs);
+        const std::vector<std::string> baseParts_ = split(base);
+
+        // Find the length of the common component prefix.
+        std::size_t common = 0;
+        while (common < absParts.size() && common < baseParts_.size() &&
+               Path::sameFileName(absParts[common], baseParts_[common]))
+            ++common;
+
+        if (common == 0)
+            continue; // truly different roots -- skip this basePath
+
+        // One ".." for every extra component in base beyond the common prefix,
+        // then the remaining components of absolutePath.
+        std::string rel;
+        for (std::size_t i = common; i < baseParts_.size(); ++i) {
+            if (!rel.empty())
+                rel += '/';
+            rel += "..";
+        }
+        for (std::size_t i = common; i < absParts.size(); ++i) {
+            if (!rel.empty())
+                rel += '/';
+            rel += absParts[i];
+        }
+        if (!rel.empty())
+            return rel;
+    }
+    // No base path shares a root with absolutePath.  Return the normalized form
+    // so the caller always gets forward slashes, consistent with every other
+    // path in the property map.
+    return normAbs;
+}
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmissing-format-attribute"
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#endif
+
+template<typename ... Args>
+static std::string safeFormat(const char *fmt, Args... args) {
+    const int needed = std::snprintf(nullptr, 0, fmt, args ...);
+    if (needed < 0)
+        return std::string();
+    std::vector<char> buf(static_cast<std::size_t>(needed) + 1);
+    std::snprintf(buf.data(), buf.size(), fmt, args ...);
+    return std::string(buf.data());
+}
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
+// MSBuild evaluates the [MSBuild]::Add/Subtract/Multiply intrinsics in .NET's
+// default unchecked context, so on overflow the result wraps (two's complement).
+// Do the arithmetic on unsigned operands to get the same result without
+// signed-overflow UB.
+static long long wrapAdd(long long a, long long b) {
+    return static_cast<long long>(static_cast<unsigned long long>(a) + static_cast<unsigned long long>(b));
+}
+
+static long long wrapSub(long long a, long long b) {
+    return static_cast<long long>(static_cast<unsigned long long>(a) - static_cast<unsigned long long>(b));
+}
+
+static long long wrapMul(long long a, long long b) {
+    return static_cast<long long>(static_cast<unsigned long long>(a) * static_cast<unsigned long long>(b));
+}
+
+// Evaluate a $([ClassName]::Method(args)) static property function.
+// Returns an empty string for unknown or unimplementable functions rather
+// than throwing, so import can continue gracefully.
+std::string ImportProject::applyMSBuildStaticFunction(const std::string &className,
+                                                      const std::string &member,
+                                                      const std::vector<std::string> &args,
+                                                      const PropertiesMap *properties) {
+    const auto toInt = [](const std::string &s, long long &out) -> bool {
+        if (s.empty())
+            return false;
+        try {
+            size_t idx = 0;
+            out = std::stoll(s, &idx);
+            return idx == s.length();
+        }
+        catch (...) {
+            return false;
+        }
+    };
+
+    if (caseInsensitiveStringCompare(className, "MSBuild") == 0) {
+
+        // $([MSBuild]::IsOSPlatform('Windows'|'Linux'|'OSX'))
+        if (caseInsensitiveStringCompare(member, "IsOSPlatform") == 0 && args.size() == 1) {
+#if defined(_WIN32)
+            const bool onWindows = true, onLinux = false, onOSX = false;
+#elif defined(__APPLE__)
+            const bool onWindows = false, onLinux = false, onOSX = true;
+#else
+            const bool onWindows = false, onLinux = true, onOSX = false;
 #endif
+            if (caseInsensitiveStringCompare(args[0], "Windows") == 0)
+                return onWindows ? "True" : "False";
+            if (caseInsensitiveStringCompare(args[0], "Linux") == 0)
+                return onLinux ? "True" : "False";
+            if (caseInsensitiveStringCompare(args[0], "OSX") == 0 ||
+                caseInsensitiveStringCompare(args[0], "MacOS") == 0)
+                return onOSX ? "True" : "False";
+            return "False";
+        }
+
+        // Arithmetic: Add, Subtract, Multiply, Divide, Modulo
+        if (args.size() == 2) {
+            long long a = 0, b = 0;
+            if (toInt(args[0], a) && toInt(args[1], b)) {
+                if (caseInsensitiveStringCompare(member, "Add") == 0)
+                    return std::to_string(wrapAdd(a, b));
+                if (caseInsensitiveStringCompare(member, "Subtract") == 0)
+                    return std::to_string(wrapSub(a, b));
+                if (caseInsensitiveStringCompare(member, "Multiply") == 0)
+                    return std::to_string(wrapMul(a, b));
+                if (caseInsensitiveStringCompare(member, "Divide") == 0) {
+                    if (b == 0) {
+                        addDebug("MSBuild::Divide: division by zero");
+                        return std::string();
+                    }
+                    if (a == LLONG_MIN && b == -1) {
+                        addDebug("MSBuild::Divide: integer overflow");
+                        return std::string();
+                    }
+                    return std::to_string(a / b);
+                }
+                if (caseInsensitiveStringCompare(member, "Modulo") == 0) {
+                    if (b == 0) {
+                        addDebug("MSBuild::Modulo: division by zero");
+                        return std::string();
+                    }
+                    if (a == LLONG_MIN && b == -1) {
+                        addDebug("MSBuild::Modulo: integer overflow");
+                        return std::string();
+                    }
+                    return std::to_string(a % b);
+                }
+            }
+            // $([MSBuild]::ValueOrDefault(value, default))
+            if (caseInsensitiveStringCompare(member, "ValueOrDefault") == 0)
+                return args[0].empty() ? args[1] : args[0];
+            // $([MSBuild]::MakeRelative(basePath, path))
+            // Returns path expressed relative to basePath.  If the two paths
+            // share no common root (e.g. different drive letters) path is
+            // returned unchanged.
+            if (caseInsensitiveStringCompare(member, "MakeRelative") == 0)
+                return getRelativePath(args[1], {args[0]});
+            // $([MSBuild]::GetDirectoryNameOfFileAbove(startingDirectory, fileName))
+            // Walks up from startingDirectory looking for fileName; returns the
+            // containing directory (no trailing separator) or "" if not found.
+            if (caseInsensitiveStringCompare(member, "GetDirectoryNameOfFileAbove") == 0) {
+                const std::string found = findFileAbove(args[0], args[1]);
+                if (found.empty())
+                    return "";
+                std::string dir = Path::getPathFromFilename(found);
+                if (!dir.empty() && (dir.back() == '/' || dir.back() == '\\'))
+                    dir.pop_back();
+                return dir;
+            }
+            // $([MSBuild]::GetPathOfFileAbove(file, startingDirectory))
+            // Walks up from startingDirectory looking for file; returns the full
+            // path of the file or "" if not found.
+            if (caseInsensitiveStringCompare(member, "GetPathOfFileAbove") == 0)
+                return findFileAbove(args[1], args[0]);
+        }
+
+        // $([MSBuild]::GetPathOfFileAbove(file)) -- 1-arg form.  MSBuild uses the
+        // directory of the file being evaluated (MSBuildThisFileDirectory) as the
+        // start directory.  We read it from the supplied properties map when available;
+        // if absent (properties is null or the key is missing) findFile receives an
+        // empty start directory and returns "" without crashing.
+        if (caseInsensitiveStringCompare(member, "GetPathOfFileAbove") == 0 && args.size() == 1) {
+            std::string startDir;
+            if (properties) {
+                const auto it = properties->find("MSBuildThisFileDirectory");
+                if (it != properties->end())
+                    startDir = it->second;
+            }
+            return findFileAbove(startDir, args[0]);
+        }
+
+        // $([MSBuild]::NormalizePath(seg1[, seg2, ...])) -- join segments, normalize
+        // \ to /, and resolve . and .. components.  Internally MSBuild calls
+        // Path.GetFullPath(Path.Combine(paths)), so multi-segment joining follows
+        // System.IO.Path.Combine semantics: a rooted segment (UNC, DriveAbsolute,
+        // RootRelative, or DriveRelative) resets the accumulated path.
+        if (caseInsensitiveStringCompare(member, "NormalizePath") == 0) {
+            if (args.empty()) {
+                addDebug("NormalizePath: called with no arguments");
+                return "";
+            }
+            // If any arg still contains an unexpanded $(...) reference, the property was
+            // not defined at evaluation time.  Log it and bail out rather than treating
+            // the raw reference text as a literal path component.
+            for (const std::string &a : args) {
+                // cppcheck-suppress useStlAlgorithm
+                if (a.find("$(") != std::string::npos) {
+                    addDebug("NormalizePath: arg contains unexpanded property reference: " + a);
+                    return "";
+                }
+            }
+            std::string result = args[0];
+            for (std::size_t i = 1; i < args.size(); ++i) {
+                // cppcheck-suppress useStlAlgorithm
+                if (!pathCombineAppend(result, args[i], true)) {
+                    addDebug("NormalizePath: could not combine path segments");
+                    return "";
+                }
+            }
+            const PathKind resultKind = classifyPath(result);
+            if (resultKind == PathKind::DriveRelative) {
+                addDebug("NormalizePath: drive-relative path cannot be resolved: " + result);
+                return "";
+            }
+            // Delegate separator normalization and . / .. resolution to the
+            // central Path utilities so all path handling stays consistent.
+            return Path::simplifyPath(Path::fromNativeSeparators(result));
+        }
+
+        // $([MSBuild]::NormalizeDirectory(seg1[, seg2, ...])) -- same as NormalizePath
+        // but always returns a path with a trailing slash.
+        if (caseInsensitiveStringCompare(member, "NormalizeDirectory") == 0) {
+            if (args.empty()) {
+                addDebug("NormalizeDirectory: called with no arguments");
+                return "";
+            }
+            // Reuse NormalizePath logic via recursive call with renamed member.
+            const std::string normalized = applyMSBuildStaticFunction(className, "NormalizePath", args);
+            if (!normalized.empty() && normalized.back() != '/')
+                return normalized + '/';
+            return normalized;
+        }
+
+        if (args.size() == 1) {
+            // $([MSBuild]::EnsureTrailingSlash(path))
+            if (caseInsensitiveStringCompare(member, "EnsureTrailingSlash") == 0) {
+                std::string s = args[0];
+                if (!s.empty() && s.back() != '/' && s.back() != '\\')
+                    s += '/';
+                return s;
+            }
+            // $([MSBuild]::GetTargetPlatformVersion(version)) -- pass through
+            if (caseInsensitiveStringCompare(member, "GetTargetPlatformVersion") == 0)
+                return args[0];
+        }
+
+        // $([MSBuild]::VersionGreaterThan / VersionGreaterThanOrEquals /
+        //           VersionLessThan    / VersionLessThanOrEquals    /
+        //           VersionEquals      / VersionNotEquals(v1, v2))
+        // Component-by-component numeric comparison; missing trailing components
+        // are treated as 0 (so '1.0' == '1.0.0'), which differs from the
+        // condition-expression < / > operators that use -1 for missing parts.
+        if (args.size() == 2 &&
+            (caseInsensitiveStringCompare(member, "VersionGreaterThan") == 0 ||
+             caseInsensitiveStringCompare(member, "VersionGreaterThanOrEquals") == 0 ||
+             caseInsensitiveStringCompare(member, "VersionLessThan") == 0 ||
+             caseInsensitiveStringCompare(member, "VersionLessThanOrEquals") == 0 ||
+             caseInsensitiveStringCompare(member, "VersionEquals") == 0 ||
+             caseInsensitiveStringCompare(member, "VersionNotEquals") == 0)) {
+            const auto parseVer = [](const std::string &s) -> std::vector<int> {
+                std::vector<int> parts;
+                std::size_t pos = 0;
+                while (pos <= s.size()) {
+                    char *end = nullptr;
+                    const long v = std::strtol(s.c_str() + pos, &end, 10);
+                    if (end == s.c_str() + pos)
+                        break;
+                    parts.push_back(static_cast<int>(v));
+                    pos = static_cast<std::size_t>(end - s.c_str());
+                    if (pos < s.size() && s[pos] == '.')
+                        ++pos;
+                    else
+                        break;
+                }
+                return parts;
+            };
+            const std::vector<int> lv = parseVer(args[0]);
+            const std::vector<int> rv = parseVer(args[1]);
+            const std::size_t count = std::max(lv.size(), rv.size());
+            int cmp = 0;
+            for (std::size_t i = 0; i < count && cmp == 0; ++i) {
+                const int l = (i < lv.size()) ? lv[i] : 0;
+                const int r = (i < rv.size()) ? rv[i] : 0;
+                if (l < r)
+                    cmp = -1;
+                else if (l > r)
+                    cmp = 1;
+            }
+            bool result = false;
+            if (caseInsensitiveStringCompare(member, "VersionGreaterThan") == 0)
+                result = cmp > 0;
+            else if (caseInsensitiveStringCompare(member, "VersionGreaterThanOrEquals") == 0)
+                result = cmp >= 0;
+            else if (caseInsensitiveStringCompare(member, "VersionLessThan") == 0)
+                result = cmp < 0;
+            else if (caseInsensitiveStringCompare(member, "VersionLessThanOrEquals") == 0)
+                result = cmp <= 0;
+            else if (caseInsensitiveStringCompare(member, "VersionEquals") == 0)
+                result = cmp == 0;
+            else // VersionNotEquals
+                result = cmp != 0;
+            return result ? "True" : "False";
+        }
+
+        if (args.empty()) {
+            if (caseInsensitiveStringCompare(member, "GetCurrentToolsVersion") == 0)
+                return "Current";
+        }
+    }
+
+    if (caseInsensitiveStringCompare(className, "System.Environment") == 0) {
+        // $([System.Environment]::GetEnvironmentVariable('NAME'))
+        if (caseInsensitiveStringCompare(member, "GetEnvironmentVariable") == 0 && args.size() == 1) {
+            const char *env = std::getenv(args[0].c_str());
+            return env ? env : "";
+        }
+        // $([System.Environment]::GetFolderPath(SpecialFolder.X))
+        if (caseInsensitiveStringCompare(member, "GetFolderPath") == 0 && args.size() == 1) {
+            std::string folderName = args[0];
+            static constexpr char specialFolderPrefix[] = "SpecialFolder.";
+            if (folderName.size() > sizeof(specialFolderPrefix) - 1 &&
+                caseInsensitiveStringCompare(folderName.substr(0, sizeof(specialFolderPrefix) - 1),
+                                             specialFolderPrefix) == 0) {
+                folderName.erase(0, sizeof(specialFolderPrefix) - 1);
+            }
+
+            if (caseInsensitiveStringCompare(folderName, "ProgramFiles") == 0) {
+                const char *pf = std::getenv("ProgramFiles");
+                return pf ? pf : "";
+            }
+
+            if (caseInsensitiveStringCompare(folderName, "ProgramFilesX86") == 0) {
+                const char *pf86 = std::getenv("ProgramFiles(x86)");
+                if (pf86)
+                    return pf86;
+
+                // On a 32-bit Windows environment there may be no separate
+                // ProgramFiles(x86); ProgramFiles is the x86 Program Files directory.
+                const char *pf = std::getenv("ProgramFiles");
+                return pf ? pf : "";
+            }
+
+            return "";
+        }
+    }
+
+    if (caseInsensitiveStringCompare(className, "System.IO.Path") == 0) {
+        if (args.size() == 1) {
+            const std::string filename = Path::simplifyPath(Path::fromNativeSeparators(args[0])); // FIXME can this be relative (toAbsolute)
+            if (caseInsensitiveStringCompare(member, "GetFileName") == 0)
+                return stripDirectoryPart(filename);
+            if (caseInsensitiveStringCompare(member, "GetFileNameWithoutExtension") == 0)
+                return fileStem(stripDirectoryPart(filename));
+            if (caseInsensitiveStringCompare(member, "GetDirectoryName") == 0) {
+                std::string path = Path::getPathFromFilename(filename);
+                if (!path.empty() && path.back() == '/')
+                    path.pop_back();
+                return path;
+            }
+            if (caseInsensitiveStringCompare(member, "GetExtension") == 0)
+                return Path::getFilenameExtension(filename);
+            if (caseInsensitiveStringCompare(member, "IsPathRooted") == 0)
+                return isPathRooted(filename) ? "True" : "False";
+            if (caseInsensitiveStringCompare(member, "GetFullPath") == 0) {
+                if (classifyPath(filename) == PathKind::DriveRelative) {
+                    addDebug("GetFullPath: drive-relative path cannot be resolved: " + filename);
+                    return "";
+                }
+                return toAbsolute(filename);
+            }
+        }
+        if (!args.empty() && caseInsensitiveStringCompare(member, "Combine") == 0) {
+            std::string result = args[0];
+            for (std::size_t i = 1; i < args.size(); ++i) {
+                // cppcheck-suppress useStlAlgorithm
+                if (!pathCombineAppend(result, args[i], true)) {
+                    addDebug("Path.Combine: could not combine path segments");
+                    return "";
+                }
+            }
+            return result;
+        }
+        if (args.size() == 2) {
+            if (caseInsensitiveStringCompare(member, "GetFullPath") == 0) {
+                const std::string path = Path::fromNativeSeparators(args[0]);
+                const std::string basePath = Path::fromNativeSeparators(args[1]);
+                // Use classifyPath so that root-relative paths (\foo) are resolved
+                // against the drive of basePath rather than being misidentified as
+                // fully-absolute on Linux via Path::isAbsolute.
+                const PathKind pathKind = classifyPath(path);
+                const PathKind baseKind = classifyPath(basePath);
+                // basePath must be a fully-qualified absolute path; root-relative or
+                // relative bases cannot be used for GetFullPath resolution.
+                if (baseKind != PathKind::UNC && baseKind != PathKind::DriveAbsolute)
+                    return "";
+                switch (pathKind) {
+                case PathKind::UNC:
+                case PathKind::DriveAbsolute:
+                    return Path::simplifyPath(path);
+                case PathKind::RootRelative: {
+                    // "\foo" is rooted but not fully qualified. Resolve it using the
+                    // volume/root represented by basePath.
+                    if (baseKind == PathKind::DriveAbsolute) {
+                        // "\foo" with "C:/base/" -> "C:/foo"
+                        return Path::simplifyPath(basePath.substr(0, 2) + path);
+                    }
+
+                    // A UNC base has a UNC root of "//server/share".
+                    if (baseKind == PathKind::UNC) {
+                        const std::size_t firstSlash = basePath.find('/', 2);
+                        if (firstSlash == std::string::npos)
+                            return "";
+
+                        const std::size_t secondSlash = basePath.find('/', firstSlash + 1);
+                        if (secondSlash == std::string::npos)
+                            return Path::simplifyPath(basePath + path);
+
+                        return Path::simplifyPath(basePath.substr(0, secondSlash) + path);
+                    }
+
+                    return "";
+                }
+                case PathKind::DriveRelative:
+                    // "C:foo" requires the per-drive current directory for drive C:,
+                    // a Windows kernel concept unavailable in a cross-platform context.
+                    addDebug("GetFullPath: drive-relative path cannot be resolved: " + path);
+                    return "";
+                default: {
+                    std::string combined = basePath;
+                    if (!combined.empty() && combined.back() != '/')
+                        combined += '/';
+                    combined += path;
+                    return Path::simplifyPath(combined);
+                }
+                }
+            }
+        }
+    }
+
+    if (caseInsensitiveStringCompare(className, "System.String") == 0) {
+        if (caseInsensitiveStringCompare(member, "IsNullOrEmpty") == 0 && args.size() == 1)
+            return args[0].empty() ? "True" : "False";
+        if (caseInsensitiveStringCompare(member, "IsNullOrWhiteSpace") == 0 && args.size() == 1) {
+            for (const char c : args[0]) {
+                // cppcheck-suppress useStlAlgorithm
+                if (!std::isspace(static_cast<unsigned char>(c)))
+                    return "False";
+            }
+            return "True";
+        }
+        if (caseInsensitiveStringCompare(member, "Concat") == 0) {
+            std::string result;
+            for (const std::string &a : args)
+                result += a;
+            return result;
+        }
+        if (caseInsensitiveStringCompare(member, "Join") == 0 && args.size() >= 2) {
+            std::string result;
+            for (std::size_t i = 1; i < args.size(); ++i) {
+                if (i > 1)
+                    result += args[0];
+                result += args[i];
+            }
+            return result;
+        }
+        // Format: replace {n} and {n:spec} placeholders; {{ and }} are literal braces.
+        if (caseInsensitiveStringCompare(member, "Format") == 0 && !args.empty()) {
+            // Apply a .NET composite-format specifier to a string value.
+            const auto applySpec = [this](const std::string &arg, const std::string &spec) -> std::string {
+                if (spec.empty())
+                    return arg;
+                const char specChar = spec[0];
+
+                int width = -1;
+                if (spec.size() > 1) {
+                    char *wend = nullptr;
+                    const long w = std::strtol(spec.c_str() + 1, &wend, 10);
+                    if (wend != spec.c_str() + 1 && *wend == '\0' && w >= 0)
+                        width = static_cast<int>(w);
+                }
+
+                char *iend = nullptr;
+                const long long lval = std::strtoll(arg.c_str(), &iend, 10);
+                const bool isInt = !arg.empty() && iend != arg.c_str() && *iend == '\0';
+
+                char *dend = nullptr;
+                const double dval = std::strtod(arg.c_str(), &dend);
+                const bool isDouble = !arg.empty() && dend != arg.c_str() && *dend == '\0';
+
+                if (specChar == 'D' || specChar == 'd') {
+                    if (!isInt)
+                        return arg;
+                    if (width > 0) {
+                        // Handle negative numbers manually to keep '-' outside the zero padding
+                        if (lval == LLONG_MIN) {
+                            // Prevents -lval overflow: LLONG_MIN magnitude is 19 digits.
+                            const std::string magnitude = "9223372036854775808";
+                            const int padding = width - static_cast<int>(magnitude.size());
+
+                            if (padding > 0)
+                                return safeFormat("-%s%s", std::string(padding, '0').c_str(), magnitude.c_str());
+
+                            return safeFormat("-%s", magnitude.c_str());
+                        }
+                        if (lval < 0)
+                            return safeFormat("-%0*lld", width, -lval);
+                        return safeFormat("%0*lld", width, lval);
+                    }
+                    return safeFormat("%lld", lval);
+                }
+
+                if (specChar == 'X' || specChar == 'x') {
+                    if (!isInt)
+                        return arg;
+                    const auto uval = static_cast<unsigned long long>(lval);
+                    if (width > 0) {
+                        return specChar == 'X'
+                            ? safeFormat("%0*llX", width, uval)
+                            : safeFormat("%0*llx", width, uval);
+                    }
+                    return specChar == 'X'
+                        ? safeFormat("%llX", uval)
+                        : safeFormat("%llx", uval);
+                }
+
+                if (specChar == 'F' || specChar == 'f') {
+                    if (!isDouble)
+                        return arg;
+                    const int p = width >= 0 ? width : 2;
+                    return safeFormat("%.*f", p, dval);
+                }
+
+                if (specChar == 'E' || specChar == 'e') {
+                    if (!isDouble)
+                        return arg;
+                    const int p = width >= 0 ? width : 6;
+                    return specChar == 'E'
+                        ? safeFormat("%.*E", p, dval)
+                        : safeFormat("%.*e", p, dval);
+                }
+
+                if (specChar == 'G' || specChar == 'g') {
+                    if (!isDouble)
+                        return arg;
+                    // .NET G/g without explicit precision uses 15 significant digits
+                    // for double; C's %g default of 6 is not the same thing.
+                    const int p = width > 0 ? width : 15;
+                    return specChar == 'G'
+                        ? safeFormat("%.*G", p, dval)
+                        : safeFormat("%.*g", p, dval);
+                }
+                // Unrecognised specifier -- return the raw argument unchanged and log
+                // so that MSBuild incompatibilities are visible rather than silent.
+                this->addDebug("String.Format: unsupported format specifier '" + spec + "'");
+                return arg;
+            };
+
+            const std::string &fmt = args[0];
+            std::string result;
+            result.reserve(fmt.size());
+            for (std::size_t i = 0; i < fmt.size(); ++i) {
+                if (fmt[i] == '{') {
+                    if (i + 1 < fmt.size() && fmt[i + 1] == '{') {
+                        result += '{'; ++i;
+                        continue;
+                    }
+                    const std::size_t close = fmt.find('}', i + 1);
+                    if (close == std::string::npos) {
+                        result += '{';
+                        continue;
+                    }
+                    const std::string inner = fmt.substr(i + 1, close - i - 1);
+                    const std::size_t colon = inner.find(':');
+                    const std::string indexStr = inner.substr(0, colon == std::string::npos ? inner.size() : colon);
+                    const std::string spec = colon != std::string::npos ? inner.substr(colon + 1) : "";
+                    char *end = nullptr;
+                    const long idx = std::strtol(indexStr.c_str(), &end, 10);
+                    if (end != indexStr.c_str() && *end == '\0' && idx >= 0) {
+                        const std::size_t argIdx = static_cast<std::size_t>(idx) + 1;
+                        result += applySpec(argIdx < args.size() ? args[argIdx] : "", spec);
+                        i = close;
+                    } else {
+                        result += '{';
+                    }
+                } else if (fmt[i] == '}' && i + 1 < fmt.size() && fmt[i + 1] == '}') {
+                    result += '}'; ++i;
+                } else {
+                    result += fmt[i];
+                }
+            }
+            return result;
+        }
+    }
+
+    if (caseInsensitiveStringCompare(className, "System.Math") == 0) {
+        const auto toDouble = [](const std::string &s, double &out) -> bool {
+            if (s.empty())
+                return false;
+            char *end = nullptr;
+            out = std::strtod(s.c_str(), &end);
+            return end != s.c_str() && *end == '\0';
+        };
+        // Format a double as an integer string when the value is whole,
+        // otherwise use std::to_string (which gives 6 decimal places).
+        const auto fmtDouble = [](double d) -> std::string {
+            // Converting a double outside the long long range is undefined behaviour
+            if (d >= static_cast<double>(LLONG_MIN) && d < -static_cast<double>(LLONG_MIN)) {
+                const auto i = static_cast<long long>(d);
+                if (!(static_cast<double>(i) < d) && !(static_cast<double>(i) > d))
+                    return std::to_string(i);
+            }
+            return std::to_string(d);
+        };
+        if (args.size() == 1) {
+            double x = 0;
+            if (toDouble(args[0], x)) {
+                if (caseInsensitiveStringCompare(member, "Abs") == 0)
+                    return fmtDouble(x < 0 ? -x : x);
+                if (caseInsensitiveStringCompare(member, "Floor") == 0)
+                    return fmtDouble(std::floor(x));
+                if (caseInsensitiveStringCompare(member, "Ceiling") == 0)
+                    return fmtDouble(std::ceil(x));
+                if (caseInsensitiveStringCompare(member, "Round") == 0) {
+                    // .NET Math.Round defaults to banker's rounding (round-half-to-even),
+                    // not round-half-away-from-zero.
+                    const double fl = std::floor(x);
+                    const double frac = x - fl;
+                    double rounded;
+                    if (frac < 0.5)
+                        rounded = fl;
+                    else if (frac > 0.5)
+                        rounded = fl + 1;
+                    else // exactly 0.5 -- round to nearest even integer
+                        rounded = (std::fabs(std::fmod(fl, 2.0)) < 1) ? fl : fl + 1;
+                    return fmtDouble(rounded);
+                }
+                if (caseInsensitiveStringCompare(member, "Sqrt") == 0 && x >= 0)
+                    return fmtDouble(std::sqrt(x));
+                if (caseInsensitiveStringCompare(member, "Log") == 0 && x > 0)
+                    return fmtDouble(std::log(x));
+                if (caseInsensitiveStringCompare(member, "Log10") == 0 && x > 0)
+                    return fmtDouble(std::log10(x));
+            }
+        }
+        if (args.size() == 2) {
+            double a = 0, b = 0;
+            if (toDouble(args[0], a) && toDouble(args[1], b)) {
+                if (caseInsensitiveStringCompare(member, "Max") == 0)
+                    return fmtDouble(a > b ? a : b);
+                if (caseInsensitiveStringCompare(member, "Min") == 0)
+                    return fmtDouble(a < b ? a : b);
+                if (caseInsensitiveStringCompare(member, "Pow") == 0)
+                    return fmtDouble(std::pow(a, b));
+            }
+        }
+    }
+
+    // $([MSBuild]::Escape / Unescape) -- encode/decode MSBuild special chars as %XX
+    if (caseInsensitiveStringCompare(className, "MSBuild") == 0 && args.size() == 1) {
+        if (caseInsensitiveStringCompare(member, "Escape") == 0)
+            return msbuildEscape(args[0]);
+        if (caseInsensitiveStringCompare(member, "Unescape") == 0)
+            return msbuildUnescape(args[0]);
+        // Bitwise operations
+        {
+            long long a = 0;
+            if (toInt(args[0], a)) {
+                if (caseInsensitiveStringCompare(member, "BitwiseNot") == 0)
+                    return std::to_string(~a);
+            }
+        }
+    }
+
+    if (caseInsensitiveStringCompare(className, "MSBuild") == 0 && args.size() == 2) {
+        long long a = 0, b = 0;
+        if (toInt(args[0], a) && toInt(args[1], b)) {
+            if (caseInsensitiveStringCompare(member, "BitwiseAnd") == 0)
+                return std::to_string(a & b);
+            if (caseInsensitiveStringCompare(member, "BitwiseOr") == 0)
+                return std::to_string(a | b);
+            if (caseInsensitiveStringCompare(member, "BitwiseXor") == 0)
+                return std::to_string(a ^ b);
+        }
+    }
+
+    // $([MSBuild]::GetRegistryValue / GetRegistryValueFromView)
+    // Returns empty on non-Windows; on Windows would need registry access.
+    if (caseInsensitiveStringCompare(className, "MSBuild") == 0 &&
+        (caseInsensitiveStringCompare(member, "GetRegistryValue") == 0 ||
+         caseInsensitiveStringCompare(member, "GetRegistryValueFromView") == 0))
+        return "";
+
+    // $([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform(...))
+    // Arg is itself a static property like $([...OSPlatform]::Windows) which
+    // expands to the platform name string via the same mechanism.
+    if (caseInsensitiveStringCompare(className, "System.Runtime.InteropServices.RuntimeInformation") == 0 &&
+        caseInsensitiveStringCompare(member, "IsOSPlatform") == 0 && args.size() == 1)
+        return applyMSBuildStaticFunction("MSBuild", "IsOSPlatform", args);
+
+    // $([System.Runtime.InteropServices.OSPlatform]::Windows|Linux|OSX) -- static property
+    if (caseInsensitiveStringCompare(className, "System.Runtime.InteropServices.OSPlatform") == 0)
+        return member;  // return the platform name ("Windows", "Linux", "OSX") as a string
+
+    // $([System.IO.FileInfo]::new('path')) / $([System.IO.DirectoryInfo]::new('path'))
+    // Model as a normalized path string so .FullName / .DirectoryName / .Name chains work.
+    if ((caseInsensitiveStringCompare(className, "System.IO.FileInfo") == 0 ||
+         caseInsensitiveStringCompare(className, "System.IO.DirectoryInfo") == 0) &&
+        caseInsensitiveStringCompare(member, "new") == 0 && !args.empty()) {
+        std::string path = Path::fromNativeSeparators(args[0]);
+
+        if (classifyPath(path) != PathKind::UNC && classifyPath(path) != PathKind::DriveAbsolute)
+            path = Path::fromNativeSeparators(Path::getCurrentPath()) + '/' + path;
+
+        return Path::simplifyPath(std::move(path));
+    }
+    // Unknown class or method -- return empty so import continues
+    addDebug("unknown class " + className + " or member " + member);
+    return "";
+}
+
+// Parse the "[ClassName]::Member" portion of a $([ClassName]::Member(...)) static
+// function reference.  On entry pos must point at '['; on return pos is advanced
+// past the member name.  className and member are appended (not assigned) so the
+// caller can initialise them to "" before the call.
+static void parseMSBuildStaticRef(const std::string &s, std::size_t &pos,
+                                  std::string &className, std::string &member)
+{
+    ++pos;  // skip '['
+    while (pos < s.size() && s[pos] != ']')
+        className += s[pos++];
+    if (pos < s.size())  // skip ']'
+        ++pos;
+    if (pos + 1 < s.size() && s[pos] == ':' && s[pos + 1] == ':')
+        pos += 2;  // skip '::'
+    while (pos < s.size()) {
+        const auto c = static_cast<unsigned char>(s[pos]);
+        if (!std::isalnum(c) && c != '_')
+            break;
+        member += s[pos++];
+    }
+}
+
+// Expands $(Name) and $(Name.Method(args)) references in property value strings.
+// Unknown variables are left unexpanded. Use expandPropertyValue() to invoke.
+struct ImportProject::PropertyValueExpander {
+    ImportProject &mProject;
+    const PropertiesMap &mVars;
+    std::string mStr;
+    std::size_t mPos{0};
+    bool mUnknownAsEmpty{ false };
+
+    PropertyValueExpander(ImportProject &project, const PropertiesMap &vars, std::string str, bool unknownAsEmpty = false)
+        : mProject(project), mVars(vars), mStr(std::move(str)), mUnknownAsEmpty(unknownAsEmpty) {}
+    PropertyValueExpander(const PropertyValueExpander &) = delete;
+    PropertyValueExpander &operator=(const PropertyValueExpander &) = delete;
+
+    bool hasValue(const std::string &name) const {
+        if (mVars.count(name))
+            return true;
+        return std::getenv(name.c_str()) != nullptr;
+    }
+
+    std::string lookup(const std::string &name) const {
+        const auto it = mVars.find(name);
+        if (it != mVars.end())
+            return it->second;
+        const char *env = std::getenv(name.c_str());
+        return env ? env : std::string();
+    }
+
+    // Parses a PROPERTY name, handling nested $(...) within the name.
+    // MSBuild property names are [A-Za-z_][A-Za-z0-9_-]* -- unlike method
+    // names (see e.g. the inline scans in tryParseExpr() for '.Method(...)'
+    // chains, and parseMSBuildStaticRef()'s "[ClassName]::Member" scan,
+    // neither of which this function is used for), a property name MAY
+    // contain '-' after the first character, e.g. <My-Property>foo</My-Property>
+    // referenced as $(My-Property). This is the sole call site that reads
+    // the identifier directly after '$(' (see tryParseExpr()), so it's safe
+    // for this one to accept '-' without affecting method-name parsing.
+    std::string parseIdentifier() {
+        std::string result;
+        while (mPos < mStr.size()) {
+            if (mStr.compare(mPos, 2, "$(") == 0) {
+                result += tryParseExpr();
+                continue;
+            }
+            const auto c = static_cast<unsigned char>(mStr[mPos]);
+            if (!std::isalnum(c) && c != '_' && c != '-')
+                break;
+            result += mStr[mPos++];
+        }
+        return result;
+    }
+
+    // Parses one method argument: a quoted string literal (with inner $(...)
+    // expansion) or an unquoted $(...) reference or bare word.
+    std::string parseArg() {
+        while (mPos < mStr.size() && std::isspace(static_cast<unsigned char>(mStr[mPos])))
+            ++mPos;
+        if (mPos < mStr.size() && mStr[mPos] == '\'') {
+            ++mPos;
+            std::string s;
+            // Expand $(...) references embedded inside the quoted string so that
+            // e.g. '$(MSBuildThisFileDirectory)' is resolved before being passed
+            // to NormalizePath / NormalizeDirectory / Path.Combine, etc.
+            while (mPos < mStr.size() && mStr[mPos] != '\'') {
+                if (mStr.compare(mPos, 2, "$(") == 0)
+                    s += tryParseExpr();
+                else
+                    s += mStr[mPos++];
+            }
+            if (mPos < mStr.size()) // consume closing '\''
+                ++mPos;
+            return s;
+        }
+        if (mStr.compare(mPos, 2, "$(") == 0) {
+            std::string s = tryParseExpr();
+            // Append any trailing bare-word text so that unquoted args like
+            // $(ReactNativeDir)..\..\node_modules become one concatenated arg
+            // instead of two separate args.
+            while (mPos < mStr.size() && mStr[mPos] != ',' && mStr[mPos] != ')')
+                s += mStr[mPos++];
+            return s;
+        }
+        // Bare word -- consume until ',' or ')'.
+        std::string s;
+        while (mPos < mStr.size() && mStr[mPos] != ',' && mStr[mPos] != ')')
+            s += mStr[mPos++];
+        return s;
+    }
+
+    // Apply a no-parenthesis property access (.Length, .FullName, .DirectoryName, .Name)
+    // to `value`.  `context` is appended to the "unhandled" debug message.
+    void applyNoParenProperty(std::string &value, const std::string &method, const std::string &context) {
+        if (caseInsensitiveStringCompare(method, "Length") == 0)
+            value = std::to_string(value.size());
+        else if (caseInsensitiveStringCompare(method, "FullName") == 0)
+            value = Path::simplifyPath(value);
+        else if (caseInsensitiveStringCompare(method, "DirectoryName") == 0)
+            value = Path::getPathFromFilename(value);
+        else if (caseInsensitiveStringCompare(method, "Name") == 0)
+            value = stripDirectoryPart(Path::fromNativeSeparators(value));
         else
-            path = Path::simplifyPath(directory + file);
-        FileSettings fs{path, Standards::Language::None, 0}; // file will be identified later on
-        fsParseCommand(fs, command, doUnescape); // read settings; -D, -I, -U, -std, -m*, -f*
-        std::map<std::string, std::string, cppcheck::stricmp> variables;
-        fsSetIncludePaths(fs, directory, fs.includePaths, variables);
-        // Assign a unique index to each file path. If the file path already exists in the map,
-        // increment the index to handle duplicate file entries.
-        fs.fileIndex = fileIndex[path]++;
-        fileSettings.push_back(std::move(fs));
+            mProject.addDebug("unhandled property access '." + method + "'" + context);
     }
 
-    return true;
+    // Parse a ')'-terminated comma-separated arg list starting at mPos (which
+    // must already point past the opening '(').  Advances mPos past the closing ')'.
+    std::vector<std::string> parseArgList() {
+        std::vector<std::string> args;
+        while (mPos < mStr.size() && mStr[mPos] != ')') {
+            args.push_back(parseArg());
+            while (mPos < mStr.size() && std::isspace(static_cast<unsigned char>(mStr[mPos])))
+                ++mPos;
+            if (mPos < mStr.size() && mStr[mPos] == ',')
+                ++mPos;
+        }
+        if (mPos < mStr.size()) // skip ')'
+            ++mPos;
+        return args;
+    }
+
+    // Parses and evaluates $(Name[.Method(args)...]) starting at mPos.
+    // Also handles $([ClassName]::Method(args)) static property functions.
+    // Unknown properties expand to the empty string, except for explicitly
+    // recognized Visual Studio/MSBuild infrastructure properties which remain
+    // symbolic for importer/emulation detection.
+    std::string tryParseExpr() {
+        const std::size_t start = mPos;
+        mPos += 2;  // skip "$("
+
+        // $([ClassName]::Method(args)) -- static property function
+        if (mPos < mStr.size() && mStr[mPos] == '[') {
+            std::string className, member;
+            parseMSBuildStaticRef(mStr, mPos, className, member);
+            std::vector<std::string> args;
+            // Skip optional whitespace between method name and '(' -- legal in MSBuild.
+            while (mPos < mStr.size() && std::isspace(static_cast<unsigned char>(mStr[mPos])))
+                ++mPos;
+            if (mPos < mStr.size() && mStr[mPos] == '(') {
+                ++mPos;  // skip '('
+                args = parseArgList();
+            }
+            std::string value = mProject.applyMSBuildStaticFunction(className, member, args, &mVars);
+            // Handle optional .Property or .Method(args) chain on the result,
+            // e.g. $([System.IO.FileInfo]::new('path').DirectoryName).
+            while (mPos < mStr.size() && mStr[mPos] == '.') {
+                ++mPos;
+                std::string chainMethod;
+                while (mPos < mStr.size()) {
+                    const auto c = static_cast<unsigned char>(mStr[mPos]);
+                    if (!std::isalnum(c) && c != '_')
+                        break;
+                    chainMethod += mStr[mPos++];
+                }
+                if (mPos >= mStr.size() || mStr[mPos] != '(') {
+                    applyNoParenProperty(value, chainMethod, " after static function");
+                    continue;
+                }
+                ++mPos;  // skip '('
+                std::vector<std::string> chainArgs = parseArgList();
+                try {
+                    value = applyPropertyMethod(value, chainMethod, chainArgs);
+                } catch (const std::exception &e) {
+                    mProject.addDebug(std::string("applyPropertyMethod (chained): ") + e.what());
+                } catch (...) {
+                    mProject.addDebug("applyPropertyMethod (chained): unknown error for method '" + chainMethod + "'");
+                }
+            }
+            if (mPos < mStr.size() && mStr[mPos] == ')') // skip outer ')'
+                ++mPos;
+            return value;
+        }
+
+        const std::string name = parseIdentifier();
+        if (name.empty() || !hasValue(name)) {
+            // mStr[start] is '$' and mStr[start + 1] is the opening '('.
+            const std::size_t end = findMatchingParen(mStr, start + 1);
+            mPos = (end != std::string::npos) ? end + 1 : mStr.size();
+            return mUnknownAsEmpty ? std::string() : mStr.substr(start, mPos - start);
+        }
+
+        std::string value = lookup(name);
+        // Parse optional .Method(args) chain.
+        while (mPos < mStr.size() && mStr[mPos] == '.') {
+            ++mPos;
+            std::string method;
+            while (mPos < mStr.size()) {
+                const auto c = static_cast<unsigned char>(mStr[mPos]);
+                if (!std::isalnum(c) && c != '_')
+                    break;
+                method += mStr[mPos++];
+            }
+            if (mPos >= mStr.size() || mStr[mPos] != '(') {
+                // Property access without parentheses (e.g. $(Foo.Length)).
+                applyNoParenProperty(value, method, " on '" + name + "'");
+                continue;
+            }
+            ++mPos;  // skip '('
+            std::vector<std::string> args = parseArgList();
+            try {
+                value = applyPropertyMethod(value, method, args);
+            } catch (const std::exception &e) {
+                mProject.addDebug(std::string("applyPropertyMethod: ") + e.what());
+            } catch (...) {
+                mProject.addDebug("applyPropertyMethod: unknown error for method '" + method + "'");
+            }
+        }
+        if (mPos < mStr.size() && mStr[mPos] == ')') // skip closing ')'
+            ++mPos;
+        return value;
+    }
+
+    // Expand all property expressions in mStr in a single left-to-right pass.
+    // Property values are already evaluated when assigned; do not re-evaluate
+    // newly produced $(...) references in later passes.
+    std::string expand() {
+        mPos = 0;
+        std::string result;
+        result.reserve(mStr.size());
+        while (mPos < mStr.size()) {
+            if (mStr.compare(mPos, 2, "$(") == 0)
+                result += tryParseExpr();
+            else
+                result += mStr[mPos++];
+        }
+        return result;
+    }
+};
+
+void ImportProject::expandMSBuildVariables(std::string &s, const PropertiesMap &properties)
+{
+    PropertyValueExpander expander{*this, properties, s};
+    s = expander.expand();
+}
+
+ImportProject::Type ImportProject::import(const std::string &filename, Settings *settings, Suppressions *supprs)
+{
+    std::ifstream fin(filename);
+    if (!fin.is_open())
+        return ImportProject::Type::MISSING;
+
+    mPath = Path::getPathFromFilename(Path::fromNativeSeparators(filename));
+    if (!mPath.empty() && !endsWith(mPath,'/'))
+        mPath += '/';
+
+    const std::vector<std::string> fileFilters =
+        settings ? settings->fileFilters : std::vector<std::string>();
+
+    if (endsWith(filename, ".json")) {
+        if (processCompileCommands(fin)) {
+            setRelativePaths(filename);
+            return ImportProject::Type::COMPILE_DB;
+        }
+    } else if (endsWith(filename, ".sln")) {
+        if (importSln(fin, filename, fileFilters)) {
+            setRelativePaths(filename);
+            return ImportProject::Type::VS_SLN;
+        }
+    } else if (endsWith(filename, ".slnx")) {
+        if (importSlnx(filename, fileFilters)) {
+            setRelativePaths(filename);
+            return ImportProject::Type::VS_SLNX;
+        }
+    } else if (endsWith(filename, ".vcxproj")) {
+        PropertiesMap mVariables;
+        if (importVcxproj(toAbsolute(filename), mVariables, fileFilters)) {
+            setRelativePaths(filename);
+            return ImportProject::Type::VS_VCXPROJ;
+        }
+    } else if (endsWith(filename, ".bpr")) {
+        if (importBcb6Prj(filename)) {
+            setRelativePaths(filename);
+            return ImportProject::Type::BORLAND;
+        }
+    } else if (settings && supprs && endsWith(filename, ".cppcheck")) {
+        if (importCppcheckGuiProject(fin, *settings, *supprs)) {
+            setRelativePaths(filename);
+            return ImportProject::Type::CPPCHECK_GUI;
+        }
+    } else {
+        return ImportProject::Type::UNKNOWN;
+    }
+    return ImportProject::Type::FAILURE;
 }
 
-bool ImportProject::importSln(std::istream &istr, const std::string &path, const std::vector<std::string> &fileFilters)
-{
-    std::string line;
+bool ImportProject::processCompileCommands(std::istream &istr)
+{
+    picojson::value compileCommands;
+    istr >> compileCommands;
+    if (!compileCommands.is<picojson::array>()) {
+        errors.emplace_back("compilation database is not a JSON array");
+        return false;
+    }
+
+    std::map<std::string, std::size_t> fsFileIds;
+
+    for (const picojson::value &fileInfo : compileCommands.get<picojson::array>()) {
+        picojson::object obj = fileInfo.get<picojson::object>();
+
+        if (obj.count("directory") == 0) {
+            errors.emplace_back("'directory' field in compilation database entry missing");
+            return false;
+        }
+
+        if (!obj["directory"].is<std::string>()) {
+            errors.emplace_back("'directory' field in compilation database entry is not a string");
+            return false;
+        }
+
+        std::string dirpath = Path::fromNativeSeparators(obj["directory"].get<std::string>());
+
+        /* CMAKE produces the directory without trailing / so add it if not
+         * there - it is needed by setIncludePaths() */
+        if (!endsWith(dirpath, '/'))
+            dirpath += '/';
+
+        const std::string directory = std::move(dirpath);
+
+        std::vector<std::string> arguments;
+        if (obj.count("arguments")) {
+            if (obj["arguments"].is<picojson::array>()) {
+                for (const picojson::value& arg : obj["arguments"].get<picojson::array>()) {
+                    if (arg.is<std::string>())
+                        arguments.push_back(arg.get<std::string>());
+                }
+            } else {
+                errors.emplace_back("'arguments' field in compilation database entry is not a JSON array");
+                return false;
+            }
+        } else if (obj.count("command")) {
+            std::string command;
+            if (obj["command"].is<std::string>()) {
+                command = obj["command"].get<std::string>();
+            } else {
+                errors.emplace_back("'command' field in compilation database entry is not a string");
+                return false;
+            }
+
+            std::string error = collectArgs(command, arguments);
+            if (!error.empty()) {
+                errors.emplace_back(error);
+                return false;
+            }
+        } else {
+            errors.emplace_back("no 'arguments' or 'command' field found in compilation database entry");
+            return false;
+        }
+
+        if (!obj.count("file") || !obj["file"].is<std::string>()) {
+            errors.emplace_back("skip compilation database entry because it does not have a proper 'file' field");
+            continue;
+        }
+
+        std::string file = Path::fromNativeSeparators(obj["file"].get<std::string>());
+
+        // Accept file?
+        if (!Path::acceptFile(file))
+            continue;
+
+        std::string path;
+        if (Path::isAbsolute(file))
+            path = Path::simplifyPath(std::move(file));
+#ifdef _WIN32
+        else if (file[0] == '/' && directory.size() > 2 && std::isalpha(directory[0]) && directory[1] == ':')
+            // directory: C:\foo\bar
+            // file: /xy/z.c
+            // => c:/xy/z.c
+            path = Path::simplifyPath(directory.substr(0,2) + file);
+#endif
+        else
+            path = Path::simplifyPath(directory + file);
+        FileSettings fs{path, Standards::Language::None, 0}; // file will be identified later on
+        parseArgs(fs, arguments);
+        PropertiesMap properties;
+        fsSetIncludePaths(fs, directory, fs.includePaths, properties);
+        // Assign a unique index to each file path. If the file path already exists in the map,
+        // increment the index to handle duplicate file entries.
+        fs.file.setFsFileId(fsFileIds[path]++);
+        fileSettings.push_back(std::move(fs));
+    }
+
+    return true;
+}
+
+void ImportProject::setSolution(const std::string &filename, PropertiesMap &properties) {
+    const std::string absolutePath = toAbsolute(filename);
+    properties["SolutionDir"] = Path::getPathFromFilename(absolutePath);
+    properties["SolutionExt"] = Path::getFilenameExtensionInLowerCase(absolutePath);
+    properties["SolutionPath"] = absolutePath;
+    properties["SolutionFileName"] = stripDirectoryPart(absolutePath);
+    properties["SolutionName"] = fileStem(properties["SolutionFileName"]);
+}
+
+bool ImportProject::importSln(std::istream &istr, const std::string &filename, const std::vector<std::string> &fileFilters)
+{
+    std::string line;
+
+    debugs.clear();
+
+    // Strip trailing \r so that CRLF .sln files opened in text mode on Linux/macOS
+    // do not leave a trailing \r on every extracted value.
+    const auto stripCR = [](std::string &s) {
+        if (!s.empty() && s.back() == '\r')
+            s.pop_back();
+    };
+
+    if (!std::getline(istr,line)) {
+        errors.emplace_back("Visual Studio solution file is empty");
+        return false;
+    }
+    stripCR(line);
+
+    // Strip UTF-8 BOM (\xEF\xBB\xBF) when present.
+    if (line.size() >= 3 &&
+        static_cast<unsigned char>(line[0]) == 0xEF &&
+        static_cast<unsigned char>(line[1]) == 0xBB &&
+        static_cast<unsigned char>(line[2]) == 0xBF)
+        line.erase(0, 3);
+
+    // Visual Studio writes a blank line before the header (also handles a BOM-only line).
+    if (line.empty()) {
+        if (!std::getline(istr, line)) {
+            errors.emplace_back("Visual Studio solution file header not found");
+            return false;
+        }
+        stripCR(line);
+    }
+
+    if (!startsWith(line, "Microsoft Visual Studio Solution File")) {
+        errors.emplace_back("Visual Studio solution file header not found");
+        return false;
+    }
+
+    PropertiesMap solutionVariables;
+    setSolution(filename, solutionVariables);
+
+    solutionVariables["VisualStudioVersion"] = "17.0";
+
+    const std::string solutionDir = solutionVariables["SolutionDir"];
+
+    // First pass: parse the solution file to collect the header properties and the list of vcxproj paths.
+    std::vector<std::string> vcxprojs;
+    while (std::getline(istr,line)) {
+        stripCR(line);
+        if (startsWith(line, "VisualStudioVersion = ")) {
+            solutionVariables["VisualStudioVersion"] = line.substr(std::strlen("VisualStudioVersion = "));
+            continue;
+        }
+        if (startsWith(line, "MinimumVisualStudioVersion = ")) {
+            solutionVariables["MinimumVisualStudioVersion"] = line.substr(std::strlen("MinimumVisualStudioVersion = "));
+            continue;
+        }
+        if (!startsWith(line,"Project("))
+            continue;
+        // Search for .vcxproj only in the path field (third quoted token), not in
+        // the project display name which precedes it.  SLN line format is:
+        //   Project("{TypeGUID}") = "DisplayName", "RelativePath", "{ProjGUID}"
+        // The separator between display name and path is the first ", " after ") = ".
+        const std::string::size_type eqMark = line.find(") = \"");
+        const std::string::size_type innerFind = (eqMark != std::string::npos)
+            ? line.find("\", \"", eqMark)
+            : std::string::npos;
+        const std::string::size_type searchStart = (innerFind != std::string::npos) ? innerFind + 3 : 0;
+        // searchStart points to the opening quote of the path field; extract it
+        // and check the extension properly rather than searching for a substring.
+        if (searchStart >= line.size() || line[searchStart] != '\"')
+            continue;
+        const std::string::size_type pathEnd = line.find('\"', searchStart + 1);
+        if (pathEnd == std::string::npos)
+            continue;
+        std::string vcxproj = line.substr(searchStart + 1, pathEnd - searchStart - 1);
+        if (Path::getFilenameExtensionInLowerCase(vcxproj) != ".vcxproj")
+            continue;
+        vcxproj = Path::toNativeSeparators(std::move(vcxproj));
+        vcxproj = toAbsolute(vcxproj, solutionDir, solutionVariables);
+        vcxproj = Path::fromNativeSeparators(std::move(vcxproj));
+        vcxprojs.push_back(std::move(vcxproj));
+    }
+
+    if (vcxprojs.empty()) {
+        errors.emplace_back("no projects found in Visual Studio solution file");
+        return false;
+    }
+
+    for (const std::string &vcxproj : vcxprojs) {
+        PropertiesMap mVariables = solutionVariables;
+        if (!importVcxproj(vcxproj, mVariables, fileFilters)) {
+            errors.emplace_back("failed to load '" + vcxproj + "' from Visual Studio solution");
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool ImportProject::importSlnx(const std::string& filename, const std::vector<std::string>& fileFilters)
+{
+    debugs.clear();
+
+    tinyxml2::XMLDocument doc;
+    const tinyxml2::XMLError error = doc.LoadFile(filename.c_str());
+    if (error != tinyxml2::XML_SUCCESS) {
+        errors.emplace_back(std::string("Visual Studio solution file is not a valid XML - ") + tinyxml2::XMLDocument::ErrorIDToName(error));
+        return false;
+    }
+
+    const tinyxml2::XMLElement* const rootnode = doc.FirstChildElement();
+    if (rootnode == nullptr) {
+        errors.emplace_back("Visual Studio solution file has no XML root node");
+        return false;
+    }
+
+    if (std::strcmp(rootnode->Name(), "Solution") != 0) {
+        errors.emplace_back("Invalid Visual Studio solution file format");
+        return false;
+    }
+
+    PropertiesMap solutionVariables;
+    setSolution(filename, solutionVariables);
+
+    solutionVariables["VisualStudioVersion"] = "18.0";
+
+    bool found = false;
+
+    auto processProject = [&](const tinyxml2::XMLElement* projectNode) -> bool {
+        const char* pathAttribute = projectNode->Attribute("Path");
+        if (pathAttribute == nullptr)
+            return true;
+
+        std::string vcxproj(pathAttribute);
+        vcxproj = Path::toNativeSeparators(std::move(vcxproj));
+
+        if (Path::getFilenameExtensionInLowerCase(vcxproj) != ".vcxproj")
+            return true; // skip other project types
+
+        vcxproj = toAbsolute(vcxproj, solutionVariables["SolutionDir"], solutionVariables);
+
+        vcxproj = Path::fromNativeSeparators(std::move(vcxproj));
+
+        PropertiesMap mVariables = solutionVariables;
+        if (!importVcxproj(vcxproj, mVariables, fileFilters)) {
+            errors.emplace_back("failed to load '" + vcxproj + "' from Visual Studio solution");
+            return false;
+        }
+        found = true;
+        return true;
+    };
+
+    for (const tinyxml2::XMLElement* node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) {
+        const char* name = node->Name();
+        if (std::strcmp(name, "Project") == 0) {
+            if (!processProject(node))
+                return false;
+        } else if (std::strcmp(name, "Folder") == 0) {
+            // Walk nested Folder/Project nodes recursively
+            std::function<bool(const tinyxml2::XMLElement *)> processFolder;
+            processFolder = [&](const tinyxml2::XMLElement *folder) -> bool {
+                for (const tinyxml2::XMLElement *child = folder->FirstChildElement(); child; child = child->NextSiblingElement()) {
+                    const char *childName = child->Name();
+                    if (std::strcmp(childName, "Project") == 0) {
+                        if (!processProject(child))
+                            return false;
+                    } else if (std::strcmp(childName, "Folder") == 0) {
+                        if (!processFolder(child))
+                            return false;
+                    }
+                }
+                return true;
+            };
+            if (!processFolder(node))
+                return false;
+        }
+    }
+
+    if (!found) {
+        errors.emplace_back("no projects found in Visual Studio solution file");
+        return false;
+    }
+
+    return true;
+}
+
+ImportProject::ProjectConfiguration::ProjectConfiguration(const tinyxml2::XMLElement *cfg) {
+    const char *a = cfg->Attribute("Include");
+    if (a)
+        name = a;
+    for (const tinyxml2::XMLElement *e = cfg->FirstChildElement(); e; e = e->NextSiblingElement()) {
+        const char * const text = e->GetText();
+        if (!text)
+            continue;
+        const char * ename = e->Name();
+        if (std::strcmp(ename,"Configuration")==0)
+            configuration = text;
+        else if (std::strcmp(ename,"Platform")==0) {
+            platformStr = text;
+            if (platformStr == "Win32")
+                platform = Win32;
+            else if (platformStr == "x64")
+                platform = x64;
+            else if (platformStr == "ARM64")
+                platform = ARM64;
+            else if (platformStr == "ARM64EC")
+                platform = ARM64EC;
+            else if (platformStr == "ARM")
+                platform = ARM;
+            else
+                platform = Unknown;
+        }
+    }
+}
+
+void ImportProject::checkUnexpandedExpressions(const std::string &text, const char *context)
+{
+    // these are emulated so ignore them
+    if (text == "$(VCTargetsPath)/Microsoft.Cpp.targets" ||
+        text == "$(VCTargetsPath)/Microsoft.Cpp.props" ||
+        text == "$(VCTargetsPath)/Microsoft.Cpp.Default.props")
+        return;
+
+    std::string::size_type pos = 0;
+    while ((pos = text.find("$(", pos)) != std::string::npos) {
+        const std::string::size_type end = findMatchingParen(text, pos + 1);
+        if (end == std::string::npos)
+            break;
+        const std::string propName = text.substr(pos + 2, end - pos - 2);
+        std::stringstream message;
+        message << "unexpanded property $("
+                << propName
+                << ")"
+                << (context ? " in " : "")
+                << (context ? context : "")
+                << ": " << text;
+        addDebug(message.str());
+        pos = end + 1;
+    }
+    pos = 0;
+    while ((pos = text.find("%(", pos)) != std::string::npos) {
+        const std::string::size_type end = findMatchingParen(text, pos + 1);
+        if (end == std::string::npos)
+            break;
+        std::stringstream message;
+        message << "unexpanded metadata %("
+                << text.substr(pos + 2, end - pos - 2)
+                << ")"
+                << (context ? " in " : "")
+                << (context ? context : "")
+                << ": " << text;
+        addDebug(message.str());
+        pos = end + 1;
+    }
+}
+
+/** MSBuild version number: one or more dot-separated non-negative integers.
+ *
+ *  Comparison follows .NET System.Version semantics: missing trailing
+ *  components are treated as -1 rather than 0, so "17" < "17.0" (because
+ *  new Version("17").Minor == -1 < 0 == new Version("17.0").Minor).
+ *
+ *  Use MSBuildVersion::parse() to construct from a string.  An empty
+ *  (default-constructed or failed-parse) instance compares as invalid;
+ *  callers should check empty() before comparing.
+ */
+class MSBuildVersion {
+public:
+    MSBuildVersion() = default;
+
+    /** Parse a version string ("17.0", "16.11.2", "v14.0", "17.0.0-preview.1").
+     *  Rules applied in order:
+     *    1. Strip a single leading 'v' or 'V'.
+     *    2. Truncate at the first '-' or '+' (semver pre-release / build-metadata).
+     *    3. Split the remainder on '.' and parse each segment as a non-negative integer.
+     *    4. Reject any component that is empty, contains whitespace, or is not a
+     *       valid decimal integer (strtol would silently accept leading whitespace
+     *       so we check explicitly).
+     *  Returns an empty (invalid) instance on any parse failure. */
+    static MSBuildVersion parse(const std::string &s) {
+        if (s.empty())
+            return MSBuildVersion();
+
+        // Rule 1: optional leading 'v'/'V'.
+        std::size_t pos = (s[0] == 'v' || s[0] == 'V') ? 1 : 0;
+        if (pos == s.size())
+            return MSBuildVersion();
+
+        // Rule 2: stop at the first pre-release or build-metadata separator.
+        const std::size_t sep = s.find_first_of("-+", pos);
+        const std::size_t limit = (sep == std::string::npos) ? s.size() : sep;
+
+        MSBuildVersion ver;
+        while (pos < limit) {
+            const std::size_t dot = s.find('.', pos);
+            const std::size_t end = (dot == std::string::npos || dot > limit) ? limit : dot;
+
+            // Rule 4a: reject empty components (e.g. "17..0" or trailing dot).
+            if (end == pos)
+                return MSBuildVersion();
+
+            // Rule 4b: reject leading whitespace -- strtol silently skips it.
+            if (std::isspace(static_cast<unsigned char>(s[pos])))
+                return MSBuildVersion();
+
+            // Rule 3: parse the numeric component.
+            const std::string part = s.substr(pos, end - pos);
+            char *endPtr = nullptr;
+            const long value = std::strtol(part.c_str(), &endPtr, 10);
+
+            // Rule 4c: all characters must have been consumed and the value non-negative.
+            if (endPtr == part.c_str() || *endPtr != '\0' || value < 0)
+                return MSBuildVersion();
+
+            ver.mComponents.push_back(static_cast<int>(value));
+
+            if (dot == std::string::npos || dot >= limit)
+                break;
+            pos = dot + 1;
+        }
+
+        if (ver.mComponents.empty())
+            return MSBuildVersion();
+
+        return ver;
+    }
+
+    /** True when this instance could not be parsed or was default-constructed. */
+    bool empty() const {
+        return mComponents.empty();
+    }
+
+    /** Return component \p i, or -1 if the version has fewer than i+1 components
+     *  (.NET semantics: Major/Minor/Build/Revision default to -1). */
+    int component(std::size_t i) const {
+        return (i < mComponents.size()) ? mComponents[i] : -1;
+    }
+
+    bool operator==(const MSBuildVersion &rhs) const {
+        return cmp(rhs) == 0;
+    }
+    bool operator!=(const MSBuildVersion &rhs) const {
+        return cmp(rhs) != 0;
+    }
+    bool operator< (const MSBuildVersion &rhs) const {
+        return cmp(rhs) <  0;
+    }
+    bool operator> (const MSBuildVersion &rhs) const {
+        return cmp(rhs) >  0;
+    }
+    bool operator<=(const MSBuildVersion &rhs) const {
+        return cmp(rhs) <= 0;
+    }
+    bool operator>=(const MSBuildVersion &rhs) const {
+        return cmp(rhs) >= 0;
+    }
+
+    // Apply an MSBuild comparison operator string.
+    bool compareOp(const std::string &op, const MSBuildVersion &rhs) const {
+        if (op == "==" || op == "!=") {
+            const std::size_t count = std::max(mComponents.size(), rhs.mComponents.size());
+
+            // For equality, MSBuild treats omitted trailing version components
+            // as zero: 1 == 1.0 == 1.0.0.
+            bool equal = true;
+            for (std::size_t i = 0; i < count; ++i) {
+                const int lhsComponent = i < mComponents.size() ? mComponents[i] : 0;
+                const int rhsComponent = i < rhs.mComponents.size() ? rhs.mComponents[i] : 0;
+                if (lhsComponent != rhsComponent) {
+                    equal = false;
+                    break;
+                }
+            }
+
+            return op == "==" ? equal : !equal;
+        }
+
+        if (op == "<")
+            return *this < rhs;
+        if (op == ">")
+            return *this > rhs;
+        if (op == "<=")
+            return *this <= rhs;
+        if (op == ">=")
+            return *this >= rhs;
+
+        return false;
+    }
+
+    std::string toString() const {
+        std::string s;
+        for (std::size_t i = 0; i < mComponents.size(); ++i) {
+            if (i > 0)
+                s += '.';
+            s += std::to_string(mComponents[i]);
+        }
+        return s;
+    }
+
+private:
+    std::vector<int> mComponents;
+
+    int cmp(const MSBuildVersion &rhs) const {
+        const std::size_t count = std::max(mComponents.size(), rhs.mComponents.size());
+        for (std::size_t i = 0; i < count; ++i) {
+            const int l = component(i);
+            const int r = rhs.component(i);
+            if (l < r)
+                return -1;
+            if (l > r)
+                return 1;
+        }
+        return 0;
+    }
+};
+
+// see https://learn.microsoft.com/en-us/visualstudio/msbuild/msbuild-conditions
+class ImportProject::ConditionParser {
+public:
+    ConditionParser(ImportProject &project, const std::string &condition, const PropertiesMap &properties)
+        : mProject(project), mCondition(condition), mVariables(properties) {}
+    ConditionParser(const ConditionParser &) = delete;
+    ConditionParser &operator=(const ConditionParser &) = delete;
+
+    bool parse() {
+        const std::string value = parseOr();
+
+        skipWhitespace();
+
+        if (mPos != mCondition.size()) {
+            if (mCondition[mPos] == ')')
+                throw std::runtime_error("unmatched ')' in condition " + mCondition);
+
+            throw std::runtime_error("Invalid condition: '" + mCondition + "'");
+        }
+
+        if (value != "True" && value != "False")
+            throw std::runtime_error("Invalid condition: '" + mCondition + "'");
+
+        return value == "True";
+    }
+
+private:
+    ImportProject &mProject;
+    const std::string &mCondition;
+    const PropertiesMap &mVariables;
+    std::size_t mPos = 0;
+    bool mEvaluate = true;  // false while parsing a short-circuited operand
+
+    void skipWhitespace() {
+        while (mPos < mCondition.size() && std::isspace(static_cast<unsigned char>(mCondition[mPos])))
+            ++mPos;
+    }
+
+    bool match(const std::string &text) {
+        skipWhitespace();
+        if (mCondition.compare(mPos, text.size(), text) != 0)
+            return false;
+        mPos += text.size();
+        return true;
+    }
+
+    bool matchWord(const std::string &word) {
+        skipWhitespace();
+        if (mCondition.size() - mPos < word.size())
+            return false;
+        for (std::size_t i = 0; i < word.size(); ++i) {
+            if (std::tolower(static_cast<unsigned char>(mCondition[mPos + i])) !=
+                std::tolower(static_cast<unsigned char>(word[i])))
+                return false;
+        }
+
+        const std::size_t end = mPos + word.size();
+        if (end < mCondition.size() &&
+            (std::isalnum(static_cast<unsigned char>(mCondition[end])) || mCondition[end] == '_'))
+            return false;
+
+        mPos = end;
+        return true;
+    }
+
+    void expect(const std::string &text) {
+        if (match(text))
+            return;
+
+        if (text == ")")
+            throw std::runtime_error("'(' without closing ')'!");
+
+        throw std::runtime_error("Expected '" + text + "' in condition '" + mCondition + "'");
+    }
+
+    std::string parseOr() {
+        std::string lhs = parseAnd();
+        while (matchWord("or")) {
+            const bool savedEvaluate = mEvaluate;
+            if (lhs == "True")
+                mEvaluate = false;
+            const std::string rhs = parseAnd();
+            mEvaluate = savedEvaluate;
+            if (lhs != "True")
+                lhs = (rhs == "True") ? "True" : "False";
+        }
+        return lhs;
+    }
+
+    std::string parseAnd() {
+        std::string lhs = parseUnary();
+        while (matchWord("and")) {
+            const bool savedEvaluate = mEvaluate;
+            if (lhs == "False")
+                mEvaluate = false;
+            const std::string rhs = parseUnary();
+            mEvaluate = savedEvaluate;
+            if (lhs != "False")
+                lhs = (rhs == "True") ? "True" : "False";
+        }
+        return lhs;
+    }
+
+    std::string parseUnary() {
+        if (match("!") || matchWord("not")) {
+            if (mPos == mCondition.size())
+                throw std::runtime_error("Invalid condition: '" + mCondition + "'");
+            return parseUnary() == "False" ? "True" : "False";
+        }
+
+        return parsePrimary();
+    }
+
+    std::string parsePrimary() {
+        skipWhitespace();
+
+        if (match("(")) {
+            std::string value = parseOr();
+            expect(")");
+            return value;
+        }
+
+        if (matchWord("Exists"))
+            return parseExists();
+
+        if (matchWord("And") || matchWord("Or"))
+            throw std::runtime_error("Invalid condition: '" + mCondition + "'");
+
+        if (matchWord("HasTrailingSlash"))
+            return parseHasTrailingSlash();
+
+        return parseComparison();
+    }
+
+    std::string parseComparison() {
+        const std::string lhs = parseValue();
+        skipWhitespace();
+
+        static constexpr const char *ops[] = { "==", "!=", "<=", ">=", "<", ">" };
+        for (const char *op : ops) {
+            if (match(op)) {
+                const std::string rhs = parseValue();
+                if (!mEvaluate)
+                    return "False";
+                return compare(lhs, op, rhs) ? "True" : "False";
+            }
+        }
+
+        // No operator -- normalize bare boolean-like values (e.g. from property
+        // expansion: $(EnableUnityBuild) == "true") so the rest of the parser,
+        // which uses exact "True"/"False" comparisons, sees a canonical form.
+        if (caseInsensitiveStringCompare(lhs, "true") == 0)
+            return "True";
+        if (caseInsensitiveStringCompare(lhs, "false") == 0)
+            return "False";
+        return lhs;
+    }
+
+    std::string parseValue() {
+        skipWhitespace();
+
+        if (mPos >= mCondition.size())
+            throw std::runtime_error("Missing operator");
+
+        if (matchWord("true"))
+            return "True";
+
+        if (matchWord("false"))
+            return "False";
+
+        if (mCondition[mPos] == '\'')
+            return parseString();
+
+        if (mCondition.compare(mPos, 2, "$(") == 0)
+            return parsePropertyExpression();
+
+        if (std::isdigit(static_cast<unsigned char>(mCondition[mPos])) ||
+            (mCondition[mPos] == '-' &&
+             mPos + 1 < mCondition.size() && std::isdigit(static_cast<unsigned char>(mCondition[mPos + 1])))) {
+            const std::size_t begin = mPos++;
+
+            // Skip leading '-' when checking for hex prefix.
+            const std::size_t digitStart = mPos;
+            // Hex literal: ([-]?)0x<hexdigits> or ([-]?)0X<hexdigits>
+            if (mCondition[digitStart] == '0' &&
+                digitStart + 1 < mCondition.size() &&
+                (mCondition[digitStart + 1] == 'x' || mCondition[digitStart + 1] == 'X') &&
+                digitStart + 2 < mCondition.size() &&
+                std::isxdigit(static_cast<unsigned char>(mCondition[digitStart + 2]))) {
+                mPos = digitStart + 2;  // skip '0x'/'0X'
+                while (mPos < mCondition.size() && std::isxdigit(static_cast<unsigned char>(mCondition[mPos])))
+                    ++mPos;
+            } else {
+                while (mPos < mCondition.size() && std::isdigit(static_cast<unsigned char>(mCondition[mPos])))
+                    ++mPos;
+            }
+
+            return mCondition.substr(begin, mPos - begin);
+        }
+
+        const std::size_t begin = mPos;
+        while (mPos < mCondition.size()) {
+            const auto c = static_cast<unsigned char>(mCondition[mPos]);
+            if (!std::isalnum(c) && c != '_' && c != '-' && c != '.')
+                break;
+            ++mPos;
+        }
+
+        if (mPos != begin)
+            return mCondition.substr(begin, mPos - begin);
+        if (!mEvaluate)
+            return std::string();
+        throw std::runtime_error("Unknown/unhandled operator/operand '" + mCondition.substr(mPos) + "'");
+    }
+
+    std::string parseString() {
+        ++mPos;
+        std::string value;
+
+        while (mPos < mCondition.size()) {
+            const char c = mCondition[mPos++];
+
+            if (c == '\'')
+                return expandProperties(value);
+
+            value += c;
+        }
+
+        if (!mEvaluate)
+            return std::string();
+        throw std::runtime_error("Can not tokenize condition");
+    }
+
+    static bool parseInteger(const std::string &s, long &value)
+    {
+        if (s.empty())
+            return false;
+
+        const char *begin = s.c_str();
+        char *end = nullptr;
+        int base = 10;
+
+        if (s.size() > 2 && s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) {
+            begin += 2;
+            if (*begin == '\0')
+                return false;
+            base = 16;
+        }
+
+        value = std::strtol(begin, &end, base);
+        return end != begin && *end == '\0';
+    }
+
+    // Parses a METHOD or chained-member name (e.g. the "Method" in
+    // $(Foo.Method(...)) or the "Member" in $([Class]::Member.Method(...))).
+    // MSBuild method/member names are [A-Za-z_][A-Za-z0-9_]* -- '-' is not
+    // valid here. See parsePropertyName() below for the different rule that
+    // applies to a PROPERTY name instead; do not use this function for one.
+    std::string parseMethodName() {
+        skipWhitespace();
+        std::string result;
+        while (mPos < mCondition.size()) {
+            if (mCondition.compare(mPos, 2, "$(") == 0) {
+                result += parsePropertyExpression();
+                continue;
+            }
+            const auto c = static_cast<unsigned char>(mCondition[mPos]);
+            if (!std::isalnum(c) && c != '_')
+                break;
+            result += mCondition[mPos++];
+        }
+        if (result.empty())
+            throw std::runtime_error("Expected identifier in condition '" + mCondition + "'");
+        return result;
+    }
+
+    // Parses a PROPERTY name -- the "Name" in $(Name) or $(Name.Method(...)).
+    // MSBuild property names are [A-Za-z_][A-Za-z0-9_-]*: unlike a method or
+    // member name (parseMethodName() above), '-' IS valid here after the
+    // first character, e.g. <My-Property>foo</My-Property> referenced as
+    // $(My-Property). Use this only for the property-name position, never
+    // for a method/member name -- see parseMethodName()'s own doc comment.
+    std::string parsePropertyName() {
+        skipWhitespace();
+        std::string result;
+        while (mPos < mCondition.size()) {
+            if (mCondition.compare(mPos, 2, "$(") == 0) {
+                result += parsePropertyExpression();
+                continue;
+            }
+            const auto c = static_cast<unsigned char>(mCondition[mPos]);
+            if (!std::isalnum(c) && c != '_' && c != '-')
+                break;
+            result += mCondition[mPos++];
+        }
+        if (result.empty())
+            throw std::runtime_error("Expected identifier in condition '" + mCondition + "'");
+        return result;
+    }
+
+    std::string parsePropertyExpression() {
+        expect("$(");
+
+        // $([ClassName]::Method(args)) -- static property function
+        if (mPos < mCondition.size() && mCondition[mPos] == '[') {
+            std::string className, member;
+            parseMSBuildStaticRef(mCondition, mPos, className, member);
+            std::vector<std::string> args;
+            skipWhitespace();  // allow space between method name and '('
+            if (mPos < mCondition.size() && mCondition[mPos] == '(') {
+                ++mPos;  // skip '('
+                skipWhitespace();
+                if (!match(")")) {
+                    do {
+                        args.push_back(parseValue());
+                        skipWhitespace();
+                    } while (match(","));
+                    expect(")");
+                }
+            }
+            std::string value = mEvaluate ? mProject.applyMSBuildStaticFunction(className, member, args, &mVariables) : std::string();
+            // Optional .Property / .Method(args) chain on the static-function result.
+            while (true) {
+                skipWhitespace();
+                if (!match("."))
+                    break;
+                const std::string chainMethod = parseMethodName();
+                if (!match("(")) {
+                    if (mEvaluate) {
+                        if (caseInsensitiveStringCompare(chainMethod, "Length") == 0)
+                            value = std::to_string(value.size());
+                        else if (caseInsensitiveStringCompare(chainMethod, "FullName") == 0)
+                            value = Path::simplifyPath(value);
+                        else if (caseInsensitiveStringCompare(chainMethod, "DirectoryName") == 0)
+                            value = Path::getPathFromFilename(value);
+                        else if (caseInsensitiveStringCompare(chainMethod, "Name") == 0)
+                            value = stripDirectoryPart(Path::fromNativeSeparators(value));
+                        else
+                            mProject.addDebug("unhandled property access '." + chainMethod + "' after static function in condition");
+                    }
+                    continue;
+                }
+                std::vector<std::string> chainArgs;
+                skipWhitespace();
+                if (!match(")")) {
+                    do {
+                        chainArgs.push_back(parseValue());
+                    } while (match(","));
+                    expect(")");
+                }
+                value = mEvaluate ? applyPropertyMethod(std::move(value), chainMethod, chainArgs) : std::string();
+            }
+            expect(")");  // outer closing paren of $(...)
+            return value;
+        }
+
+        std::string value = getPropertyValue(parsePropertyName());
+
+        while (true) {
+            skipWhitespace();
+            if (!match("."))
+                break;
+
+            const std::string method = parseMethodName();
+            if (!match("(")) {
+                // Property access without parentheses (e.g. $(Foo.Length), $(Foo.Name)).
+                if (mEvaluate) {
+                    if (caseInsensitiveStringCompare(method, "Length") == 0)
+                        value = std::to_string(value.size());
+                    else if (caseInsensitiveStringCompare(method, "FullName") == 0)
+                        value = Path::simplifyPath(value);
+                    else if (caseInsensitiveStringCompare(method, "DirectoryName") == 0)
+                        value = Path::getPathFromFilename(value);
+                    else if (caseInsensitiveStringCompare(method, "Name") == 0)
+                        value = stripDirectoryPart(Path::fromNativeSeparators(value));
+                    else
+                        mProject.addDebug("unhandled property access '." + method + "' in condition");
+                }
+                continue;
+            }
+            std::vector<std::string> args;
+            skipWhitespace();
+            if (!match(")")) {
+                do {
+                    args.push_back(parseValue());
+                } while (match(","));
+                expect(")");
+            }
+            value = mEvaluate ? applyPropertyMethod(std::move(value), method, args) : std::string();
+        }
+
+        expect(")");
+        return value;
+    }
+
+    std::string parseExists() {
+        expect("(");
+        std::string path = parseValue();
+        expect(")");
+
+        // Apply the same normalization used by toAbsolute() / processImport():
+        // 1. Normalize native separators so classifyPath() and rfind('/') work.
+        path = Path::fromNativeSeparators(std::move(path));
+        // 2. If any $(Property) survived expansion (unknown property), we cannot
+        //    resolve the path -- return "False" rather than querying the filesystem
+        //    with a literal "$(...)" in the name.
+        if (path.find("$(") != std::string::npos)
+            return "False";
+        // 3. Resolve non-absolute paths against the file containing this condition.
+        // Use classifyPath so that root-relative paths (\foo -> /foo after separator
+        // normalization) are not misidentified as absolute on Linux.
+        {
+            const PathKind pk = classifyPath(path);
+            if (pk != PathKind::UNC && pk != PathKind::DriveAbsolute) {
+                auto it = mVariables.find("MSBuildThisFileDirectory");
+                if (it == mVariables.end())
+                    it = mVariables.find("ProjectDir");
+                if (it != mVariables.end())
+                    path = it->second + path;
+            }
+        }
+        // 4. Canonicalize: collapse . / .. and remove double slashes.
+        path = Path::simplifyPath(std::move(path));
+
+        return (Path::isFile(path) || Path::isDirectory(path)) ? "True" : "False";
+    }
+
+    std::string parseHasTrailingSlash() {
+        expect("(");
+        const std::string value = parseValue();
+        expect(")");
+
+        return (!value.empty() && (value.back() == '/' || value.back() == '\\'))
+            ? "True"
+            : "False";
+    }
+
+    std::string getPropertyValue(const std::string &name) const {
+        const auto it = mVariables.find(name);
+        if (it != mVariables.end())
+            return it->second;
+
+        const char *envValue = std::getenv(name.c_str());
+        return envValue ? envValue : "";
+    }
+
+    std::string expandProperties(const std::string &input) const {
+        // Conditions use the same single-pass property expansion semantics.
+        PropertyValueExpander expander{mProject, mVariables, input, true};
+        return expander.expand();
+    }
+
+    template<typename T>
+    static bool applyComparison(const T &lhsValue, const T &rhsValue, const std::string &op) {
+        if (op == "==")
+            return lhsValue == rhsValue;
+        if (op == "!=")
+            return lhsValue != rhsValue;
+        if (op == "<")
+            return lhsValue < rhsValue;
+        if (op == ">")
+            return lhsValue > rhsValue;
+        if (op == "<=")
+            return lhsValue <= rhsValue;
+        if (op == ">=")
+            return lhsValue >= rhsValue;
+        throw std::runtime_error("Unsupported operation: " + op);
+    }
+
+    bool compare(const std::string &lhs, const std::string &op, const std::string &rhs) const
+    {
+        // Real MSBuild documents <, >, <=, >= as usable only with numeric
+        // values -- a dotted, multi-component string like '17.9.34607.119'
+        // isn't a valid number, which is precisely why the dedicated
+        // $([MSBuild]::VersionGreaterThan(...)) family of functions exists.
+        // This emulation additionally accepts such version strings directly
+        // with these four RELATIONAL operators (matching how real vcxproj
+        // imports compare things like $(VCToolsVersion)), via
+        // MSBuildVersion::compareOp() below and the "Current" keyword
+        // handling right after this comment.
+        //
+        // == and != are different: MSBuild documents them as usable "with
+        // strings, or with numeric values" -- ordinary equality/inequality,
+        // numeric if both sides parse as plain numbers (see the
+        // parseInteger() case below -- unlike <,>,<=,>=, this uniform
+        // "numeric-if-possible" rule for ==/!= IS real, documented MSBuild
+        // behavior, e.g. '$(X)' == '01' matching '$(X)' == '1'), otherwise
+        // case-insensitive string comparison. That is NOT the same thing as
+        // the zero-padded, component-wise equality
+        // $([MSBuild]::VersionEquals(...)) implements (and that
+        // MSBuildVersion::compareOp()'s "==" branch below deliberately
+        // reproduces, for that function's use): applying THAT to a plain ==
+        // would make e.g. '1.1' == '1.1.0' true, which is wrong -- that
+        // zero-padding is VersionEquals()'s own documented behavior, not
+        // =='s. So the version-comparison paths below (both the "Current"
+        // keyword and the general dotted-string one) are gated to the four
+        // relational operators only; ==/!= always fall through to the
+        // ordinary numeric-or-string handling at the bottom of this
+        // function.
+        const bool relational = (op == "<" || op == ">" || op == "<=" || op == ">=");
+
+        if (relational) {
+            // MSBuild keyword "Current" represents the installed toolset version.
+            MSBuildVersion currentVersion;
+            const auto it = mVariables.find("VisualStudioVersion");
+            if (it != mVariables.end())
+                currentVersion = MSBuildVersion::parse(it->second);
+
+            if (currentVersion.empty())
+                currentVersion = MSBuildVersion::parse("18.0"); // VS 2026 fallback
+
+            if (caseInsensitiveStringCompare(lhs, "Current") == 0) {
+                const MSBuildVersion rhsVersion = MSBuildVersion::parse(rhs);
+                if (!rhsVersion.empty())
+                    return currentVersion.compareOp(op, rhsVersion);
+            }
+
+            if (caseInsensitiveStringCompare(rhs, "Current") == 0) {
+                const MSBuildVersion lhsVersion = MSBuildVersion::parse(lhs);
+                if (!lhsVersion.empty())
+                    return lhsVersion.compareOp(op, currentVersion);
+            }
+        }
+
+        // MSBuild tries numeric comparison before other comparison types --
+        // for every operator, == and != included (see this function's own
+        // comment above).
+        long lhsInt = 0;
+        long rhsInt = 0;
+        if (parseInteger(lhs, lhsInt) && parseInteger(rhs, rhsInt))
+            return applyComparison<long>(lhsInt, rhsInt, op);
+
+        // Then it tries boolean comparison -- also for every operator.
+        const auto parseBoolean = [](const std::string &value, bool &result) {
+            if (caseInsensitiveStringCompare(value, "true") == 0) {
+                result = true;
+                return true;
+            }
+            if (caseInsensitiveStringCompare(value, "false") == 0) {
+                result = false;
+                return true;
+            }
+            return false;
+        };
+
+        bool lhsBool = false;
+        bool rhsBool = false;
+        if (parseBoolean(lhs, lhsBool) && parseBoolean(rhs, rhsBool))
+            return applyComparison<bool>(lhsBool, rhsBool, op);
+
+        if (relational) {
+            // Then it tries Version comparison -- relational operators only
+            // (see this function's own comment above).
+            const MSBuildVersion lhsVersion = MSBuildVersion::parse(lhs);
+            const MSBuildVersion rhsVersion = MSBuildVersion::parse(rhs);
+            if (!lhsVersion.empty() && !rhsVersion.empty())
+                return lhsVersion.compareOp(op, rhsVersion);
+        }
+
+        // Finally, == and != fall back to case-insensitive string comparison.
+        if (op == "==" || op == "!=") {
+            const bool equal = caseInsensitiveStringCompare(lhs, rhs) == 0;
+            return op == "==" ? equal : !equal;
+        }
+
+        throw std::runtime_error("Cannot compare '" + lhs + "' and '" + rhs + "'");
+    }
+};
+
+bool ImportProject::evalCondition(const std::string &condition, const PropertiesMap &properties) {
+    try {
+        return ConditionParser(*this, condition, properties).parse();
+    } catch (const std::exception &e) {
+        // Malformed or unsupported condition syntax.  Log so callers can
+        // distinguish "evaluated false" from "could not be evaluated" -- the
+        // build behavior (treat as false and continue) is unchanged.
+        addDebug(std::string("condition unsupported: '") + condition + "': " + e.what());
+        return false;
+    }
+}
+
+bool ImportProject::conditionIsTrue(const tinyxml2::XMLElement *node,  const PropertiesMap &properties) {
+    // See mDiscovering's doc comment: while the discovery bootstrap scan is
+    // running, every Condition is treated as satisfied rather than evaluated
+    // against guessed property values.
+    if (mDiscovering)
+        return true;
+    const char *condAttr = node->Attribute("Condition");
+    if (!condAttr)
+        return true;
+    return evalCondition(condAttr, properties);
+}
+
+bool ImportProject::hasName(const tinyxml2::XMLElement *node, const char *nodeName, const PropertiesMap &properties) {
+    const char *name = node->Name();
+    if (!name || std::strcmp(nodeName, name) != 0)
+        return false;
+    return conditionIsTrue(node, properties);
+}
+
+bool ImportProject::hasNameAndLabel(const tinyxml2::XMLElement *node, const char *nodeName, const char *nodeAttr, const PropertiesMap &properties) {
+    const char *name = node->Name();
+    const char *label = node->Attribute("Label");
+    if (!name || !label || std::strcmp(nodeName, name) != 0 || std::strcmp(label, nodeAttr) != 0)
+        return false;
+    return conditionIsTrue(node, properties);
+}
+
+bool ImportProject::hasNameAndNotLabel(const tinyxml2::XMLElement *node, const char *nodeName, const char *nodeAttr, const PropertiesMap &properties) {
+    const char *name = node->Name();
+    if (!name || std::strcmp(nodeName, name) != 0)
+        return false;
+    const char *label = node->Attribute("Label");
+    if (label && std::strcmp(label, nodeAttr) == 0)
+        return false;
+    return conditionIsTrue(node, properties);
+}
+
+// Structural name check only -- unlike hasName(), does NOT evaluate `node`'s own
+// Condition attribute. Microsoft documents that the Visual Studio C++ project
+// system does not support Condition on project items themselves (item types
+// governed by a rule definition, e.g. ClCompile/ClInclude/etc. inside an
+// <ItemGroup> or <ItemDefinitionGroup>): "Conditions aren't supported for
+// Project items (that is, item types that are treated as project items by
+// rules definitions)." -- only Condition on the item's *metadata* children is
+// honored there (see applyClCompileChild(), which still calls conditionIsTrue()
+// for exactly that reason). Use this instead of hasName() when checking a
+// project item element's name for that reason.
+static bool hasElementName(const tinyxml2::XMLElement *node, const char *nodeName) {
+    const char *name = node->Name();
+    return name && std::strcmp(nodeName, name) == 0;
+}
+
+// Canonical key identifying one project/props/targets file within an evaluation:
+// forward slashes, '.'/'..' collapsed, lower-cased (NTFS is case-insensitive, and
+// MSBuild's own import bookkeeping is case-insensitive too).
+static std::string importFileKey(const std::string &filename)
+{
+    std::string key = Path::simplifyPath(Path::fromNativeSeparators(filename));
+    std::transform(key.begin(), key.end(), key.begin(), [](unsigned char c) {
+        return std::tolower(c);
+    });
+    return key;
+}
+
+bool ImportProject::importGraphDecision(bool conditionHolds, std::string &file)
+{
+    if (!mImportGraph.active)
+        return conditionHolds;
+
+    auto &decisions = mImportGraph.decisions[mImportGraph.currentFile];
+
+    if (mImportGraph.replay) {
+        auto &pos = mImportGraph.cursor[mImportGraph.currentFile];
+        if (pos >= decisions.size()) {
+            // Structural mismatch between the Properties pass and this replay pass --
+            // should not happen (both walk the same, unchanged document), but fail
+            // closed (treat as not taken) rather than read out of bounds or guess.
+            addDebug("import graph replay desync in '" + mImportGraph.currentFile + "'");
+            return false;
+        }
+        const ImportGraph::Decision &decision = decisions[pos++];
+        file = decision.file;
+        return decision.taken;
+    }
+
+    ImportGraph::Decision decision;
+    decision.taken = conditionHolds;
+    decision.file = conditionHolds ? file : std::string();
+    decisions.push_back(std::move(decision));
+    return conditionHolds;
+}
+
+bool ImportProject::importGraphChooseDecision(bool matched, std::size_t &branch)
+{
+    if (!mImportGraph.active)
+        return matched;
+
+    auto &decisions = mImportGraph.decisions[mImportGraph.currentFile];
+
+    if (mImportGraph.replay) {
+        auto &pos = mImportGraph.cursor[mImportGraph.currentFile];
+        if (pos >= decisions.size()) {
+            addDebug("import graph replay desync in '" + mImportGraph.currentFile + "'");
+            return false;
+        }
+        const ImportGraph::Decision &decision = decisions[pos++];
+        branch = decision.branch;
+        return decision.taken;
+    }
+
+    ImportGraph::Decision decision;
+    decision.taken = matched;
+    decision.branch = matched ? branch : 0;
+    decisions.push_back(std::move(decision));
+    return matched;
+}
+
+ImportProject::ImportResult ImportProject::attemptSyntheticImport(std::string file,
+                                                                  PropertiesMap &properties,
+                                                                  MetadataMap &metadata,
+                                                                  std::list<ItemGroupClCompile> &compileList,
+                                                                  std::list<ProjectConfiguration> &projectConfigurationList,
+                                                                  std::unordered_set<std::string> &importStack,
+                                                                  EvalPhase phase)
+{
+    if (!importGraphDecision(!file.empty(), file))
+        return ImportResult::Ok;
+
+    const ImportResult result = processImport(file, properties, metadata, compileList, projectConfigurationList, importStack, phase);
+    if (result > ImportResult::NotResolvable)
+        addDebug("Could not fully import \"" + file + "\" - " + importResultStr(result) + " (continuing)");
+    return result;
+}
+
+namespace {
+    // Trim leading and trailing ASCII whitespace in-place.
+    void trimWhitespace(std::string &s) {
+        const auto first = s.find_first_not_of(" \t\r\n");
+        if (first == std::string::npos) {
+            s.clear();
+            return;
+        }
+        s.erase(0, first);
+        s.erase(s.find_last_not_of(" \t\r\n") + 1);
+    }
+
+    std::list<std::string> toStringList(const std::string &s) {
+        std::list<std::string> ret;
+        std::string::size_type pos1 = 0;
+        std::string::size_type pos2;
+
+        while ((pos2 = s.find(';', pos1)) != std::string::npos) {
+            if (pos2 > pos1) {
+                std::string piece = s.substr(pos1, pos2 - pos1);
+                trimWhitespace(piece);
+                if (!piece.empty())
+                    ret.push_back(msbuildUnescape(piece));
+            }
+            pos1 = pos2 + 1;
+        }
+
+        if (pos1 < s.size()) {
+            std::string piece = s.substr(pos1);
+            trimWhitespace(piece);
+            if (!piece.empty())
+                ret.push_back(msbuildUnescape(piece));
+        }
+
+        return ret;
+    }
+
+    /// Return \p path with its root component stripped.
+    /// The path must already be normalised to forward slashes.
+    /// UNC paths  "//server/share/foo/"  ->  "foo/"
+    /// Local paths "C:/foo/"             ->  "foo/"
+    /// The trailing separator (if any) is preserved unchanged.
+    std::string stripPathRoot(const std::string &path) {
+        if (path.size() >= 2 && path[0] == '/' && path[1] == '/') {
+            // UNC: //server/share/... -- skip server then share component.
+            const auto serverEnd = path.find('/', 2);
+            if (serverEnd == std::string::npos)
+                return {};
+            const auto shareEnd = path.find('/', serverEnd + 1);
+            if (shareEnd == std::string::npos)
+                return {};
+            return path.substr(shareEnd + 1);
+        }
+        // Local absolute (C:/...) or relative: strip up to and including the first '/'.
+        const auto pos = path.find('/');
+        return (pos != std::string::npos) ? path.substr(pos + 1) : path;
+    }
+
+    struct MSBuildThis {
+        PropertiesMap &propertiesMap;
+        std::string thisFile;
+        std::string thisFileName;
+        std::string thisFileExtension;
+        std::string thisFileDirectory;
+        std::string thisFileDirectoryNoRoot;
+        std::string thisFileFullPath;
+
+        MSBuildThis(const std::string &filename, PropertiesMap &properties)
+            : propertiesMap(properties)
+            , thisFile(properties["MSBuildThisFile"])
+            , thisFileName(properties["MSBuildThisFileName"])
+            , thisFileExtension(properties["MSBuildThisFileExtension"])
+            , thisFileDirectory(properties["MSBuildThisFileDirectory"])
+            , thisFileDirectoryNoRoot(properties["MSBuildThisFileDirectoryNoRoot"])
+            , thisFileFullPath(properties["MSBuildThisFileFullPath"]) {
+            setMSBuildThis(filename, properties);
+        }
+        MSBuildThis(const MSBuildThis &) = delete;
+        MSBuildThis &operator=(const MSBuildThis &) = delete;
+
+        static void setMSBuildThis(const std::string &filename, PropertiesMap &properties) {
+            // Normalize once so all subsequent path ops can assume '/' separators.
+            const std::string nfilename = Path::simplifyPath(Path::fromNativeSeparators(filename));
+            properties["MSBuildThisFileFullPath"] = nfilename;
+            const std::string thisFile = stripDirectoryPart(nfilename);
+            properties["MSBuildThisFile"] = thisFile;
+            properties["MSBuildThisFileName"] = fileStem(thisFile);
+            properties["MSBuildThisFileDirectory"] = Path::getPathFromFilename(nfilename);
+            properties["MSBuildThisFileDirectoryNoRoot"] = stripPathRoot(Path::getPathFromFilename(nfilename));
+            properties["MSBuildThisFileExtension"] = Path::getFilenameExtensionInLowerCase(nfilename);
+        }
+
+        ~MSBuildThis() {
+            propertiesMap["MSBuildThisFile"] = thisFile;
+            propertiesMap["MSBuildThisFileName"] = thisFileName;
+            propertiesMap["MSBuildThisFileExtension"] = thisFileExtension;
+            propertiesMap["MSBuildThisFileDirectory"] = thisFileDirectory;
+            propertiesMap["MSBuildThisFileDirectoryNoRoot"] = thisFileDirectoryNoRoot;
+            propertiesMap["MSBuildThisFileFullPath"] = thisFileFullPath;
+        }
+    };
+
+    // Sets ImportProject::mDiscovering for the lifetime of the discovery bootstrap
+    // scan in importVcxproj(), and guarantees it is cleared again even if that scan
+    // exits early -- a stuck mDiscovering would silently make every subsequent
+    // Condition in the whole import (not just this project) evaluate as true.
+    struct DiscoveringGuard {
+        bool &mFlag;
+
+        explicit DiscoveringGuard(bool &flag) : mFlag(flag) {
+            mFlag = true;
+        }
+        DiscoveringGuard(const DiscoveringGuard &) = delete;
+        DiscoveringGuard &operator=(const DiscoveringGuard &) = delete;
+
+        ~DiscoveringGuard() {
+            mFlag = false;
+        }
+    };
+
+    struct ImportStackGuard {
+        std::unordered_set<std::string> &mStack;
+        std::string mKey;
+
+        ImportStackGuard(std::unordered_set<std::string> &stack, std::string key)
+            : mStack(stack), mKey(std::move(key)) {}
+        ImportStackGuard(const ImportStackGuard &) = delete;
+        ImportStackGuard &operator=(const ImportStackGuard &) = delete;
+
+        ~ImportStackGuard() {
+            mStack.erase(mKey);
+        }
+    };
+
+    // Tracks, for the duration of one processImport() call, which container file's
+    // children are being walked -- so importGraphDecision() keys the decision it
+    // records/replays by the right file. Restores the caller's file on return so
+    // recursion unwinds back to the correct context.
+    struct CurrentFileGuard {
+        std::string &mCurrent;
+        std::string mPrev;
+
+        CurrentFileGuard(std::string &current, std::string next)
+            : mCurrent(current), mPrev(current) {
+            mCurrent = std::move(next);
+        }
+        CurrentFileGuard(const CurrentFileGuard &) = delete;
+        CurrentFileGuard &operator=(const CurrentFileGuard &) = delete;
+
+        ~CurrentFileGuard() {
+            mCurrent = std::move(mPrev);
+        }
+    };
+}
+
+std::string ImportProject::toAbsoluteExpanded(const std::string &filename, const std::string &baseDir)
+{
+    if (filename.empty())
+        return filename;
+
+    const std::string normalized = Path::simplifyPath(filename);
+
+    // classifyPath(), not the host-dependent Path::isAbsolute(), decides
+    // whether `normalized` is already fully rooted -- see the doc comment
+    // above pathCombineAppend() for why Path::isAbsolute() is avoided
+    // throughout this file: on a non-Windows host it only recognizes a
+    // leading '/', so a Windows drive-absolute path straight out of a
+    // .vcxproj, e.g. "C:/src/foo.cpp", would be misclassified as relative
+    // and joined onto baseDir -- "<baseDir>/C:/src/foo.cpp" -- which is not
+    // what Visual Studio does, and exactly the kind of host-dependent
+    // divergence this emulation exists to avoid. UNC and DriveAbsolute are
+    // the only PathKinds Path::isAbsolute() itself ever recognized as
+    // absolute, even natively on Windows (a bare "\foo" or "C:foo" both
+    // return false from it there too), so restricting to those two here
+    // keeps this in exact agreement with the previous, Windows-native
+    // behaviour -- just no longer host-dependent.
+    switch (classifyPath(normalized)) {
+    case PathKind::UNC:
+    case PathKind::DriveAbsolute:
+        return normalized;
+    default:
+        break;
+    }
+
+    return Path::simplifyPath(Path::join(baseDir, normalized));
+}
+
+std::string ImportProject::toAbsolute(const std::string &path)
+{
+    std::string internal(Path::fromNativeSeparators(path));
+    switch (classifyPath(internal)) {
+    case PathKind::UNC:
+    case PathKind::DriveAbsolute:
+        return Path::simplifyPath(internal);
+    case PathKind::RootRelative: {
+        // Inherit drive letter from CWD: "\foo" on drive C: -> "C:/foo"
+        const std::string cwd = Path::fromNativeSeparators(Path::getCurrentPath());
+        const std::string drive = (cwd.size() >= 2 &&
+                                   std::isalpha(static_cast<unsigned char>(cwd[0])) &&
+                                   cwd[1] == ':') ? cwd.substr(0, 2) : std::string();
+        return Path::simplifyPath(drive + internal);
+    }
+    default:
+        return Path::simplifyPath(Path::fromNativeSeparators(Path::getCurrentPath()) + "/" + internal);
+    }
+}
+
+std::string ImportProject::toAbsolute(const std::string &filename, const std::string &baseDir, const PropertiesMap &properties)
+{
+    std::string resolved(Path::fromNativeSeparators(filename));
+    if (!simplifyPathWithVariables(resolved, properties))
+        return resolved;
+
+    switch (classifyPath(resolved)) {
+    case PathKind::UNC:
+    case PathKind::DriveAbsolute:
+        return Path::simplifyPath(resolved);
+    case PathKind::RootRelative: {
+        // Inherit drive letter from baseDir: "\foo" with base "C:/project/" -> "C:/foo"
+        const std::string drive = (baseDir.size() >= 2 &&
+                                   std::isalpha(static_cast<unsigned char>(baseDir[0])) &&
+                                   baseDir[1] == ':') ? baseDir.substr(0, 2) : std::string();
+        return Path::simplifyPath(drive + resolved);
+    }
+    case PathKind::DriveRelative:
+        // "C:foo" is relative to the current directory of drive C:, a per-drive
+        // CWD that is a Windows kernel concept unavailable in a cross-platform
+        // context.  Return the path unmodified rather than inventing a wrong base.
+        addDebug("toAbsolute: drive-relative path cannot be resolved: " + resolved);
+        return resolved;
+    default:
+        return Path::simplifyPath(baseDir + resolved);
+    }
+}
+
+bool ImportProject::simplifyPathWithVariables(std::string &s, const PropertiesMap &properties)
+{
+    // Normalize native separators before expansion so the expander sees clean
+    // paths and debug messages report '/' not '\\'.
+    s = Path::fromNativeSeparators(std::move(s));
+    expandMSBuildVariables(s, properties);
+    checkUnexpandedExpressions(s, "path");
+    if (s.find("$(") != std::string::npos)
+        return false;
+    // Property values substituted above may also carry native separators; normalize again.
+    s = Path::fromNativeSeparators(std::move(s));
+    s = Path::simplifyPath(std::move(s));
+    return true;
+}
+
+void ImportProject::fsSetIncludePaths(FileSettings &fs, const std::string &basepath, const std::list<std::string> &in, const PropertiesMap &properties)
+{
+    std::set<std::string> found;
+    // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
+    const std::list<std::string> copyIn(in);
+    fs.includePaths.clear();
+    for (const std::string &ipath : copyIn) {
+        if (ipath.empty())
+            continue;
+        if (startsWith(ipath, "%("))
+            continue;
+        std::string s(Path::fromNativeSeparators(ipath));
+
+        if (s.find("$(") != std::string::npos) {
+            // MSBuild expands an undefined property to the empty string, so
+            // Visual Studio sees "$(Undefined)include" as "include" (relative to
+            // the project directory) and "$(Undefined)\include" as "\include"
+            // (root of the project directory's drive).  Do the same here instead of keeping
+            // the literal "$(...)" text, which can never name a real directory.
+            //
+            // It's not possible to determine whether an unknown property is
+            // intentional or a deficiency in the importer, so expand once with
+            // unknowns preserved purely to report them as debug messages.
+            // Debug messages are not currently communicated to the GUI or CLI
+            // from importers.
+            std::string withUnknowns = s;
+            expandMSBuildVariables(withUnknowns, properties);
+            checkUnexpandedExpressions(withUnknowns, "include path");
+
+            PropertyValueExpander expander{*this, properties, s, /*unknownAsEmpty*/ true};
+            s = Path::fromNativeSeparators(expander.expand());
+            trimWhitespace(s);
+            // An entry consisting only of unknown macros is dropped by Visual Studio.
+            if (s.empty())
+                continue;
+        }
+
+        // simplifyPath can crash if path ends with '/'.  Keep the separator of a
+        // bare root ("/", "C:/") so its PathKind doesn't change.
+        while (s.size() > 1U && endsWith(s, '/') &&
+               !(s.size() == 3U && s[1] == ':'))
+            s.pop_back();
+
+        // Resolve the entry the same way as every other path in a project file:
+        // absolute and UNC paths are kept, root-relative paths ("\include")
+        // take the drive letter of the project directory, and relative paths
+        // are relative to the project directory.
+        s = toAbsolute(s, basepath, properties);
+        if (s.empty())
+            continue;
+        if (!endsWith(s, '/'))
+            s += '/';
+        if (found.insert(s).second)
+            fs.includePaths.push_back(std::move(s));
+    }
+}
+
+static void findAndReplaceCaseInsensitive(std::string &s,
+                                          const std::string &search,
+                                          const std::string &replacement)
+{
+    if (search.empty())
+        return;
+
+    std::size_t pos = 0;
+    while ((pos = s.find(search[0], pos)) != std::string::npos) {
+        if (pos + search.size() <= s.size() &&
+            caseInsensitiveStringCompare(s.substr(pos, search.size()), search) == 0) {
+            s.replace(pos, search.size(), replacement);
+            pos += replacement.size();
+        } else {
+            ++pos;
+        }
+    }
+}
+
+void ImportProject::addProperty(const tinyxml2::XMLElement *node, PropertiesMap &properties) {
+    const char *eName = node->Name();
+    if (!eName || !conditionIsTrue(node, properties))
+        return;
+    const char *eText = node->GetText();
+    std::string text(eText ? eText : "");
+    // Trim indentation/newlines from pretty-printed XML text content.
+    trimWhitespace(text);
+    // Normalize native path separators before expansion so property values are
+    // stored with '/' and debug messages show normalized paths.
+    text = Path::fromNativeSeparators(std::move(text));
+    const std::string selfRef = "$(" + std::string(eName) + ")";
+    // Properties are evaluated at assignment time. Only the explicit self-reference
+    // used for MSBuild-style accumulation needs to be substituted from the old value.
+    const auto it = properties.find(eName);
+    const std::string original = (it != properties.end()) ? it->second : std::string();
+    findAndReplaceCaseInsensitive(text, selfRef, original);
+    expandMSBuildVariables(text, properties);
+    properties[eName] = text;
+    if (caseInsensitiveStringCompare(eName, "ConfigurationType") == 0) {
+        std::string targetExtension = ".exe"; // Windows standard floor default
+        bool extDetermined = false;
+
+        if (caseInsensitiveStringCompare(text, "StaticLibrary") == 0) {
+            targetExtension = ".lib";
+            extDetermined = true;
+        } else if (caseInsensitiveStringCompare(text, "DynamicLibrary") == 0) {
+            targetExtension = ".dll";
+            extDetermined = true;
+        } else if (caseInsensitiveStringCompare(text, "Application") == 0) {
+            targetExtension = ".exe";
+            extDetermined = true;
+        } else if (caseInsensitiveStringCompare(text, "Makefile") == 0 ||
+                   caseInsensitiveStringCompare(text, "Utility") == 0) {
+            targetExtension = ""; // Explicitly clear target extension for meta/script nodes
+            extDetermined = true;
+        }
+
+        // Only overwrite TargetExt if the project file hasn't already provided
+        // an explicit, dedicated user extension override.
+        if (properties.find("TargetExt") == properties.end() || extDetermined) {
+            properties["TargetExt"] = targetExtension;
+        }
+
+        // TargetName defaults to ProjectName when ConfigurationType is established
+        if (properties.find("TargetName") == properties.end() && properties.count("ProjectName") > 0) {
+            properties["TargetName"] = properties["ProjectName"];
+        }
+    }
+
+    checkUnexpandedExpressions(text, eName);
+}
+
+void ImportProject::addMetadata(const tinyxml2::XMLElement *node, const PropertiesMap &properties, MetadataMap &metadata) {
+    const char *eName = node->Name();
+    if (!eName || !conditionIsTrue(node, properties))
+        return;
+    const char *eText = node->GetText();
+    std::string text(eText ? eText : "");
+    trimWhitespace(text);
+    text = Path::fromNativeSeparators(std::move(text));
+    const std::string metaSelfRef = "%(" + std::string(eName) + ")";
+    const std::string propSelfRef = "$(" + std::string(eName) + ")";
+
+    // Pre-expand the accumulated metadata value before embedding it: resolve %(other)
+    // metadata refs and $(prop) refs inside `original` first, then break any tainted
+    // self-references, so they don't propagate into the new value and risk step-3 erasure.
+    std::string original = metadata[eName];
+    findAndReplaceCaseInsensitive(original, metaSelfRef, "");
+    std::string::size_type p = 0;
+
+    // Add a substitution tracking depth limit to explicitly catch and break
+    // circular/infinite macro evaluation loops from malformed recursive property sheets.
+    std::size_t substitutionDepth = 0;
+    while ((p = original.find("%(", p)) != std::string::npos) {
+        if (++substitutionDepth > 100) {
+            addDebug("Circular metadata inheritance chain broken in addMetadata for: " + std::string(eName));
+            break;
+        }
+
+        const std::string::size_type e = findMatchingParen(original, p + 1);
+        if (e == std::string::npos)
+            break;
+        const std::string key = original.substr(p + 2, e - p - 2);
+        const auto it = metadata.find(key);
+        const std::string repl = (it != metadata.end()) ? it->second : std::string();
+        original.replace(p, e - p + 1, repl);
+        p += repl.size();
+    }
+
+    expandMSBuildVariables(original, properties);
+    findAndReplaceCaseInsensitive(original, propSelfRef, "");
+    findAndReplaceCaseInsensitive(text, metaSelfRef, original);
+
+    std::string::size_type pos = 0;
+    std::size_t textSubstitutionDepth = 0;
+    while ((pos = text.find("%(", pos)) != std::string::npos) {
+        if (++textSubstitutionDepth > 100) {
+            addDebug("Circular text metadata reference chain broken in addMetadata for: " + std::string(eName));
+            break;
+        }
+
+        const std::string::size_type end = findMatchingParen(text, pos + 1);
+        if (end == std::string::npos)
+            break;
+        const std::string key = text.substr(pos + 2, end - pos - 2);
+        const auto it = metadata.find(key);
+        const std::string replacement = (it != metadata.end()) ? it->second : std::string();
+        text.replace(pos, end - pos + 1, replacement);
+        pos += replacement.size();
+    }
+
+    expandMSBuildVariables(text, properties);
+
+    // Handle $(eName) self-references: some props files use property-style
+    // accumulation (e.g. <DisableSpecificWarnings>$(DisableSpecificWarnings);4100
+    // </DisableSpecificWarnings>) in ItemDefinitionGroup blocks. Property (and
+    // metadata) names are case-insensitive in MSBuild, matching the
+    // case-insensitive findAndReplaceCaseInsensitive() used for propSelfRef and
+    // metaSelfRef everywhere else in this function and in getMetadata() below --
+    // the plain, case-sensitive findAndReplace() (lib/utils.h, used elsewhere for
+    // unrelated literal placeholder substitution) would miss a self-reference
+    // spelled with different casing than eName.
+    findAndReplaceCaseInsensitive(text, propSelfRef, original);
+    findAndReplaceCaseInsensitive(text, propSelfRef, "");
+    metadata[eName] = text;
+    checkUnexpandedExpressions(text, eName);
+}
+
+std::string ImportProject::getMetadata(const tinyxml2::XMLElement *node, const PropertiesMap &properties, const MetadataMap &metadata, const std::string &original) {
+    const char *eName = node->Name();
+    if (!eName || !conditionIsTrue(node, properties))
+        return original;
+    // An explicitly empty element (<AdditionalOptions/>) is a meaningful assignment
+    // to ""; do NOT treat GetText()==nullptr as "no change".
+    const char *eText = node->GetText();
+    std::string text(eText ? eText : "");
+    trimWhitespace(text);
+    text = Path::fromNativeSeparators(std::move(text));
+    const std::string metaSelfRef = "%(" + std::string(eName) + ")";
+    const std::string propSelfRef = "$(" + std::string(eName) + ")";
+
+    // Pre-expand `original` (the prior per-item value) before embedding it,
+    // matching the same strategy used in addMetadata and addProperty.
+    std::string expandedOriginal = original;
+    findAndReplaceCaseInsensitive(expandedOriginal, metaSelfRef, "");
+    std::string::size_type p = 0;
+
+    // Add a substitution tracking depth limit to explicitly catch and break
+    // circular/infinite macro evaluation loops from malformed recursive property sheets.
+    std::size_t substitutionDepth = 0;
+    while ((p = expandedOriginal.find("%(", p)) != std::string::npos) {
+        if (++substitutionDepth > 100) {
+            addDebug("Circular metadata inheritance chain broken in getMetadata for: " + std::string(eName));
+            break;
+        }
+
+        const std::string::size_type e = findMatchingParen(expandedOriginal, p + 1);
+        if (e == std::string::npos)
+            break;
+        const std::string key = expandedOriginal.substr(p + 2, e - p - 2);
+        const auto it = metadata.find(key);
+        const std::string repl = (it != metadata.end()) ? it->second : std::string();
+        expandedOriginal.replace(p, e - p + 1, repl);
+        p += repl.size();
+    }
+
+    expandMSBuildVariables(expandedOriginal, properties);
+    findAndReplaceCaseInsensitive(expandedOriginal, propSelfRef, "");
+    findAndReplaceCaseInsensitive(text, metaSelfRef, expandedOriginal);
+
+    std::string::size_type pos = 0;
+    std::size_t textSubstitutionDepth = 0;
+    while ((pos = text.find("%(", pos)) != std::string::npos) {
+        if (++textSubstitutionDepth > 100) {
+            addDebug("Circular text metadata reference chain broken in getMetadata for: " + std::string(eName));
+            break;
+        }
+
+        const std::string::size_type end = findMatchingParen(text, pos + 1);
+        if (end == std::string::npos)
+            break;
+        const std::string key = text.substr(pos + 2, end - pos - 2);
+        const auto it = metadata.find(key);
+        const std::string replacement = (it != metadata.end()) ? it->second : std::string();
+        text.replace(pos, end - pos + 1, replacement);
+        pos += replacement.size();
+    }
+
+    expandMSBuildVariables(text, properties);
+
+    // Handle $(eName) self-references: same accumulation pattern as addMetadata.
+    findAndReplaceCaseInsensitive(text, propSelfRef, expandedOriginal);
+    findAndReplaceCaseInsensitive(text, propSelfRef, "");
+    checkUnexpandedExpressions(text, eName);
+    return text;
+}
+
+const std::string &ImportProject::importResultStr(ImportProject::ImportResult result) {
+    static const std::string ok("ok");
+    static const std::string notResolvable("Not Resolvable");
+    static const std::string notFound("Not Found");
+    static const std::string notValid("Not Valid");
+    static const std::string cycle("Cycle");
+    static const std::string unknown("Unknown");
+
+    switch (result) {
+    case ImportProject::ImportResult::Ok:
+        return ok;
+    case ImportProject::ImportResult::NotResolvable:
+        return notResolvable;
+    case ImportProject::ImportResult::NotFound:
+        return notFound;
+    case ImportProject::ImportResult::NotValid:
+        return notValid;
+    case ImportProject::ImportResult::Cycle:
+        return cycle;
+    }
+    return unknown;
+}
+
+void ImportProject::applyClCompileChild(const tinyxml2::XMLElement *e1,
+                                        const PropertiesMap &properties,
+                                        MetadataMap &metadata)
+{
+    const char *eName = e1->Name();
+    if (!eName || !conditionIsTrue(e1, properties))
+        return;
+
+    // Visual Studio permits any item metadata to be overridden at item level.
+    // Keep the same metadata expansion and inheritance behavior used by
+    // ItemDefinitionGroup processing.
+    auto &value = metadata[eName];
+    value = getMetadata(e1, properties, metadata, value);
+}
+
+static void applyAdditionalOptions(MetadataMap &metadata)
+{
+    const std::string &additionalOptions = metadata["AdditionalOptions"];
+    if (additionalOptions.empty())
+        return;
+
+    std::vector<std::string> args;
+    std::string arg;
+    bool quoted = false;
+
+    // Tokenize options by space boundaries, honoring double-quote scopes
+    for (std::size_t i = 0; i < additionalOptions.size(); ++i) {
+        const char c = additionalOptions[i];
+        if (c == '"') {
+            quoted = !quoted;
+        } else if (std::isspace(static_cast<unsigned char>(c)) && !quoted) {
+            if (!arg.empty()) {
+                args.emplace_back(std::move(arg));
+                arg.clear();
+            }
+        } else {
+            arg += c;
+        }
+    }
+    if (!arg.empty())
+        args.emplace_back(std::move(arg));
+
+    for (std::size_t i = 0; i < args.size(); ++i) {
+        const std::string &origOption = args[i];
+        if (origOption.empty())
+            continue;
+
+        std::string option = origOption;
+        std::transform(option.begin(), option.end(), option.begin(), [](unsigned char c) {
+            return std::tolower(c);
+        });
+
+        // Ensure token starts with valid MSVC/GCC switch symbols
+        if (option[0] != '/' && option[0] != '-')
+            continue;
+
+        // 1. Precise Match for Preprocessor Definitions (/D or -D)
+        if (option.size() >= 2 && option[1] == 'd') {
+            // Verify this isn't a long system flag prefix like /debug or /diagnostics
+            if (option.size() == 2 || (option.compare(0, 12, "/diagnostics") != 0 && option.compare(0, 12, "-diagnostics") != 0 &&
+                                       option.compare(0, 6, "/debug") != 0 && option.compare(0, 6, "-debug") != 0 &&
+                                       option.compare(0, 12, "/dynamicbase") != 0 && option.compare(0, 12, "-dynamicbase") != 0 &&
+                                       option.compare(0, 6, "/delay") != 0 && option.compare(0, 6, "-delay") != 0 &&
+                                       option.compare(0, 4, "/doc") != 0 && option.compare(0, 4, "-doc") != 0)) {
+
+                std::string define;
+                if (option.size() == 2) {
+                    // Form: /D MacroName (Space-separated)
+                    if (i + 1 < args.size()) {
+                        define = args[i + 1];
+                        args[i + 1] = ""; // Neutralize lookahead token to skip it cleanly next round
+                    }
+                } else {
+                    // Form: /DMacroName (Glued payload)
+                    define = origOption.substr(2);
+                }
+
+                if (!define.empty()) {
+                    if (!metadata["PreprocessorDefinitions"].empty())
+                        metadata["PreprocessorDefinitions"] += ';';
+                    metadata["PreprocessorDefinitions"] += define;
+                }
+                continue;
+            }
+        }
+
+        // 2. Precise Match for Include Directories (/I or -I)
+        if (option.size() >= 2 && option[1] == 'i') {
+            // Explicitly shield long option variants like GCC's -isystem
+            if (option.compare(0, 8, "-isystem") != 0 && option.compare(0, 8, "/isystem") != 0) {
+
+                std::string path;
+                if (option.size() == 2) {
+                    // Form: /I PathName (Space-separated)
+                    if (i + 1 < args.size()) {
+                        path = args[i + 1];
+                        args[i + 1] = ""; // Neutralize lookahead token to skip it cleanly next round
+                    }
+                } else {
+                    // Form: /IPathName (Glued payload)
+                    path = origOption.substr(2);
+                }
+
+                if (!path.empty()) {
+                    if (!metadata["AdditionalIncludeDirectories"].empty())
+                        metadata["AdditionalIncludeDirectories"] += ';';
+                    metadata["AdditionalIncludeDirectories"] += path;
+                }
+                continue;
+            }
+        }
+
+        // 3. Strict String Matching for Language Standards
+        if (option == "/std:c++11" || option == "-std=c++11") {
+            metadata["LanguageStandard"] = "stdcpp11";
+        } else if (option == "/std:c++14" || option == "-std=c++14") {
+            metadata["LanguageStandard"] = "stdcpp14";
+        } else if (option == "/std:c++17" || option == "-std=c++17") {
+            metadata["LanguageStandard"] = "stdcpp17";
+        } else if (option == "/std:c++20" || option == "-std=c++20") {
+            metadata["LanguageStandard"] = "stdcpp20";
+        } else if (option == "/std:c++23" || option == "-std=c++23") {
+            metadata["LanguageStandard"] = "stdcpp23";
+        } else if (option == "/std:c++latest" || option == "-std=c++latest") {
+            metadata["LanguageStandard"] = "stdcpplatest";
+        } else if (option == "/std:c11" || option == "-std=c11") {
+            metadata["LanguageStandard_C"] = "stdc11";
+        } else if (option == "/std:c17" || option == "-std=c17") {
+            metadata["LanguageStandard_C"] = "stdc17";
+        } else if (option == "/std:clatest" || option == "-std=clatest") {
+            metadata["LanguageStandard_C"] = "stdclatest";
+        }
+    }
+}
+
+// Visual Studio's C++ project system does not reliably resolve a macro in a
+// project item path if that macro's value COULD differ by configuration:
+// "Macros that change their value for different configurations will cause
+// problems... The IDE doesn't expect project item paths to be different for
+// different project configurations." That is a statement about macros whose
+// value varies by configuration, not about user-defined macros in general --
+// a macro a property sheet or PropertyGroup sets to a fixed location (e.g.
+// $(BoostRoot) or $(wxMathPlot) pointing at a third-party library, unconditional
+// on Configuration/Platform) resolves the same way regardless of which
+// configuration the IDE happens to evaluate, so real Visual Studio expands it
+// in an Include/Update/Remove path exactly as it would anywhere else.
+//
+// A small, fixed set of MSBuild "this file"/"this project" location
+// properties are ALWAYS config-invariant by construction, no matter what a
+// given project does with them -- these are exactly what Visual Studio's own
+// Shared Items projects (.vcxitems) use to write portable Include paths, e.g.
+// <ClCompile Include="$(MSBuildThisFileDirectory)TestClass.cpp" /> (see
+// test/cli/shared-items-project). A property this project's own PropertyGroups
+// never touch at all but that resolves to a real OS environment variable is
+// config-invariant too -- it has exactly one value for the whole cppcheck
+// invocation, and MSBuild property evaluation itself falls back to the
+// environment for anything no PropertyGroup sets (PropertyValueExpander::lookup()
+// already does this; the check here just has to agree, or expandMSBuildVariables()
+// below would never even be called to do it). Everything else is only as
+// safe as this particular project makes it: mConfigInvariantProperties (see
+// its doc comment in importproject.h) is computed per project file by
+// priming every configuration's Properties pass before the real
+// per-configuration passes run, and holds every property name that came out
+// with the same value in all of them.
+// MSBuild property names are case-insensitive -- $(msbuildprojectdirectory)
+// and $(MSBuildProjectDirectory) name the same built-in property to real
+// Visual Studio -- so this uses the same cppcheck::stricmp comparator
+// PropertiesMap itself does, not a plain (case-sensitive) std::set.
+static const std::set<std::string, cppcheck::stricmp> &invariantItemPathProperties() {
+    static const std::set<std::string, cppcheck::stricmp> props = {
+        "MSBuildThisFileDirectory", "MSBuildThisFileFullPath", "MSBuildThisFile",
+        "MSBuildThisFileName", "MSBuildThisFileExtension", "MSBuildThisFileDirectoryNoRoot",
+        "MSBuildProjectDirectory", "MSBuildProjectFullPath", "MSBuildProjectFile",
+        "MSBuildProjectName", "MSBuildProjectExtension", "MSBuildProjectDirectoryNoRoot",
+        "SolutionDir", "ProjectDir",
+    };
+    return props;
+}
+
+// Returns whether every $(...) reference in `spec` is a bare reference (no
+// .Method(...) chain, no $([Class]::...) static function) to a property that
+// is always config-invariant (invariantItemPathProperties() above), that
+// this project's configInvariant set says is config-invariant here (every
+// configuration of THIS project resolved it to the same value -- see
+// mConfigInvariantProperties's doc comment), or that resolves via a real OS
+// environment variable of the same name (see this function's own doc
+// comment above). A false result means `spec` depends on something Visual
+// Studio's C++ project system does not reliably resolve in a project item
+// path -- expandItemSpec() must not expand it, though (see its own comment)
+// that does not mean discarding the item.
+static bool hasOnlyInvariantItemPathVariables(const std::string &spec, const std::set<std::string, cppcheck::stricmp> &configInvariant) {
+    std::size_t pos = 0;
+    while ((pos = spec.find("$(", pos)) != std::string::npos) {
+        std::size_t i = pos + 2;
+        std::string name;
+        // MSBuild property names are [A-Za-z_][A-Za-z0-9_-]* -- '-' is valid
+        // after the first character (see PropertyValueExpander::parseIdentifier()'s
+        // doc comment) -- and this scan is only ever used for a bare $(Name)
+        // property reference (the caller requires the very next character to
+        // be ')', never '.' or '('), so there's no method name to worry about
+        // conflating this with here.
+        while (i < spec.size() && (std::isalnum(static_cast<unsigned char>(spec[i])) || spec[i] == '_' || spec[i] == '-'))
+            name += spec[i++];
+        if (name.empty() || i >= spec.size() || spec[i] != ')' ||
+            (!invariantItemPathProperties().count(name) && !configInvariant.count(name) &&
+             std::getenv(name.c_str()) == nullptr))
+            return false;
+        pos = i + 1;
+    }
+    return true;
+}
+
+std::pair<std::string, std::string> ImportProject::expandItemSpec(const std::string &spec,
+                                                                  const std::string &projectDir,
+                                                                  const PropertiesMap &properties)
+{
+    if (spec.empty())
+        return std::make_pair(std::string(), std::string());
+
+    std::string expandedSpec = spec;
+    if (hasOnlyInvariantItemPathVariables(spec, mConfigInvariantProperties)) {
+        // Every $(...) reference here is either one of Visual Studio's own
+        // "this file"/"this project" properties, a property this project
+        // resolves to the same value in every configuration, or a real
+        // environment variable -- all config-invariant, so expanding it here
+        // matches what the IDE itself does (see invariantItemPathProperties()
+        // and mConfigInvariantProperties).
+        expandMSBuildVariables(expandedSpec, properties);
+    } else if (spec.find("$(") != std::string::npos) {
+        // Some other macro reference, one whose value could differ by
+        // configuration in this project and that no environment variable
+        // resolves either -- Visual Studio's C++ project system does not
+        // support that in a project item path (see
+        // invariantItemPathProperties()'s doc comment), so it is not
+        // expanded here.
+        //
+        // That does NOT mean discarding the item, unlike the wildcard/glob
+        // and semicolon-list cases below: a silently vanished ClCompile item
+        // leaves the user with no idea their file went unchecked, short of
+        // rerunning with --debug to see this addDebug() line. Instead,
+        // `expandedSpec` is left as-is (the literal, unexpanded "$(...)"
+        // text stays in it) and falls through the rest of this function to
+        // become the item's resolved path below. That literal path can never
+        // exist on disk, so when cppcheck later tries to actually open it,
+        // simplecpp's normal FileStream failure path reports it exactly like
+        // any other missing source file -- a visible "File is missing: ..."
+        // error citing this literal, still-macro'd path -- which also tells
+        // the user precisely which macro it was that didn't resolve.
+        addDebug("Macro in item path not supported by Visual Studio IDE layout, left unexpanded: '" + spec + "'");
+    }
+
+    if (expandedSpec.find(';') != std::string::npos) {
+        addDebug("Multiple files or semicolon-delimited list detected in path attribute, skipped: '" + spec + "'");
+        return std::make_pair(std::string(), std::string());
+    }
+
+    // Treat the ENTIRE expanded string as a single literal path.
+    // Visual Studio IDE does NOT split 'Include', 'Update', or 'Remove' attributes by semicolons.
+    std::size_t lo = 0, hi = expandedSpec.size();
+    while (lo < hi && std::isspace(static_cast<unsigned char>(expandedSpec[lo]))) ++lo;
+    while (hi > lo && std::isspace(static_cast<unsigned char>(expandedSpec[hi - 1]))) --hi;
+
+    if (lo < hi) {
+        std::string trimmed = expandedSpec.substr(lo, hi - lo);
+
+        // Strip outer encapsulation quotes if present across the entire path string
+        if (trimmed.size() >= 2 && trimmed.front() == '"' && trimmed.back() == '"') {
+            trimmed = trimmed.substr(1, trimmed.size() - 2);
+        }
+
+        const std::string decoded = msbuildUnescape(trimmed);
+
+        // Visual Studio IDE rejects item wildcards/globs entirely during project loading
+        if (decoded.find('*') != std::string::npos || decoded.find('?') != std::string::npos) {
+            addDebug("ClCompile item glob not supported by Visual Studio IDE layout, skipped: '" + decoded + "'");
+            return std::make_pair(std::string(), std::string());
+        }
+
+        // Return a single token pair mapping directly to one literal path on disk
+        return std::make_pair(decoded, toAbsoluteExpanded(decoded, projectDir));
+    }
+
+    return std::make_pair(std::string(), std::string());
+}
+
+void ImportProject::applyClCompileUpdate(const tinyxml2::XMLElement *node,
+                                         const std::string &baseDir,
+                                         const PropertiesMap &properties,
+                                         std::list<ItemGroupClCompile> &compileList)
+{
+    const char *update = node->Attribute("Update");
+    if (!update)
+        return;
+
+    const std::pair<std::string, std::string> updateItem = expandItemSpec(update, baseDir, properties);
+
+    if (updateItem.first.empty())
+        return;
+
+    for (ItemGroupClCompile &compile : compileList) {
+        if (Path::sameFileName(updateItem.second, compile.filename)) {
+            for (const tinyxml2::XMLElement *child = node->FirstChildElement();
+                 child;
+                 child = child->NextSiblingElement()) {
+                applyClCompileChild(child, properties, compile.metadata);
+            }
+            applyAdditionalOptions(compile.metadata);
+        }
+    }
+}
+
+void ImportProject::applyClCompileRemove(const tinyxml2::XMLElement *node,
+                                         const std::string &baseDir,
+                                         const PropertiesMap &properties,
+                                         std::list<ItemGroupClCompile> &compileList)
+{
+    const char *remove = node->Attribute("Remove");
+    if (!remove)
+        return;
+
+    const std::pair<std::string, std::string> removeItem = expandItemSpec(remove, baseDir, properties);
+
+    if (removeItem.first.empty())
+        return;
+
+    for (auto it = compileList.begin(); it != compileList.end();) {
+        if (Path::sameFileName(removeItem.second, it->filename))
+            it = compileList.erase(it);
+        else
+            ++it;
+    }
+}
+
+ImportProject::ImportResult ImportProject::processCompile(const tinyxml2::XMLElement *node,
+                                                          const std::string &projectDir,
+                                                          const PropertiesMap &properties,
+                                                          const MetadataMap &metadata,
+                                                          std::list<ItemGroupClCompile> &compileList)
+{
+    const char *include = node->Attribute("Include");
+    if (!include)
+        return ImportResult::NotFound;
+
+    const std::pair<std::string, std::string> spec = expandItemSpec(include, projectDir, properties);
+    if (spec.first.empty())
+        return ImportResult::NotFound;
+
+    const std::string &toInclude = spec.second;
+    if (!Path::acceptFile(toInclude))
+        return ImportResult::Ok;
+
+    ItemGroupClCompile compile(toInclude);
+    compile.metadata = metadata;
+
+    const std::string base = stripDirectoryPart(toInclude);
+    const std::string::size_type dot = base.rfind('.');
+    const std::string ext = dot != std::string::npos ? base.substr(dot) : std::string();
+    const std::string stem = fileStem(base);
+
+    std::string rootDir;
+    std::size_t afterRoot = 0;
+    if (toInclude.size() >= 2 && toInclude[0] == '/' && toInclude[1] == '/') {
+        const std::size_t srv = toInclude.find('/', 2);
+        const std::size_t shr = (srv != std::string::npos) ? toInclude.find('/', srv + 1) : std::string::npos;
+        if (shr != std::string::npos) {
+            rootDir = toInclude.substr(0, shr + 1);
+            afterRoot = shr + 1;
+        } else {
+            rootDir = toInclude;
+        }
+    } else if (toInclude.size() >= 2 &&
+               std::isalpha(static_cast<unsigned char>(toInclude[0])) &&
+               toInclude[1] == ':') {
+        if (toInclude.size() > 2 && toInclude[2] == '/') {
+            rootDir = toInclude.substr(0, 2) + "/";
+            afterRoot = 3;
+        } else {
+            afterRoot = 2;
+        }
+    } else if (!toInclude.empty() && toInclude[0] == '/') {
+        rootDir = "/";
+        afterRoot = 1;
+    }
+    const std::size_t lastSlash = toInclude.rfind('/');
+    const std::string directory = (lastSlash != std::string::npos && lastSlash >= afterRoot)
+        ? toInclude.substr(afterRoot, lastSlash - afterRoot + 1)
+        : std::string();
+
+    compile.metadata["Identity"] = Path::fromNativeSeparators(spec.first);
+    compile.metadata["FullPath"] = toInclude;
+    compile.metadata["RootDir"] = rootDir;
+    compile.metadata["Filename"] = stem;
+    compile.metadata["Extension"] = ext;
+    compile.metadata["Directory"] = directory;
+    compile.metadata["RecursiveDir"] = std::string();
+
+    const std::string origNorm = Path::fromNativeSeparators(spec.first);
+    const std::size_t relSlash = origNorm.rfind('/');
+    compile.metadata["RelativeDir"] = (relSlash != std::string::npos)
+        ? origNorm.substr(0, relSlash + 1)
+        : std::string();
+
+    for (const tinyxml2::XMLElement *e1 = node->FirstChildElement(); e1; e1 = e1->NextSiblingElement())
+        applyClCompileChild(e1, properties, compile.metadata);
+
+    applyAdditionalOptions(compile.metadata);
+
+    compileList.emplace_back(std::move(compile));
+    return ImportResult::Ok;
+}
+
+// Looks up `name` in `properties`, returning its value or an empty string if absent
+static std::string propertyOrEmpty(const PropertiesMap &properties, const std::string &name)
+{
+    const auto it = properties.find(name);
+    return it != properties.end() ? it->second : std::string();
+}
+
+ImportProject::ImportResult ImportProject::processImportProject(const tinyxml2::XMLElement *node,
+                                                                const std::string &projectDir,
+                                                                PropertiesMap &properties,
+                                                                MetadataMap &metadata,
+                                                                std::list<ItemGroupClCompile> &compileList,
+                                                                std::list<ProjectConfiguration> &projectConfigurationList,
+                                                                std::unordered_set<std::string> &importStack,
+                                                                EvalPhase phase) {
+    // Structural check: is `node` an <Import Project="..."> element at all? Callers
+    // no longer pre-filter this (see the call sites) -- whether it is actually taken
+    // is decided/replayed below via importGraphDecision(), which must run for every
+    // structurally-matching element, including ones whose Condition is false, so the
+    // decision sequence recorded per file stays positionally aligned with what
+    // ItemDefs/Items replay.
+    const char *elementName = node->Name();
+    if (!elementName || std::strcmp(elementName, "Import") != 0)
+        return ImportResult::Ok;
+    const char *projectAttribute = node->Attribute("Project");
+    if (!projectAttribute)
+        return ImportResult::Ok;
+    // During the discovery pass, re-run as a Properties-phase import but silently
+    // discard any errors/debugs it generates -- approximate properties cause many
+    // spurious failures that would confuse the user.
+    if (phase == EvalPhase::Discover) {
+        const auto errSize = errors.size();
+        const auto dbgSize = debugs.size();
+        const ImportResult r = processImportProject(node, projectDir, properties, metadata, compileList,
+                                                    projectConfigurationList, importStack, EvalPhase::Properties);
+        errors.resize(errSize);
+        debugs.resize(dbgSize);
+        return r;
+    }
+    // Resolve this <Import>'s target and decide (Properties pass) or replay
+    // (ItemDefs/Items pass) whether it is taken. See importGraphDecision() for why
+    // ItemDefs/Items must reuse the file Properties actually resolved rather than
+    // recomputing toAbsolute() against properties that may have changed since.
+    std::string file = toAbsolute(projectAttribute, projectDir, properties);
+    if (!importGraphDecision(conditionIsTrue(node, properties), file))
+        return ImportResult::Ok;
+
+    const std::string extension = Path::getFilenameExtensionInLowerCase(file);
+    if (extension == ".props" || extension == ".targets" || extension == ".vcxitems") {
+        const char *sdk = node->Attribute("Sdk");
+        if (sdk) {
+            addDebug("Could not import \"" + file + "\" - " + " (Sdk not supported)");
+            return ImportResult::NotResolvable;
+        }
+
+        // Identify well-known system files by their logical filename rather than a
+        // substring search on the full path.  This avoids false positives when a
+        // user file's path happens to contain "Microsoft.Cpp.props" etc.
+        const auto filenameIs = [&file](const char *name) {
+            const std::string::size_type slash = file.rfind('/');
+            const std::string part = (slash != std::string::npos) ? file.substr(slash + 1) : file;
+            const std::string::size_type paren = part.rfind(')');
+            const std::string namePart = (paren != std::string::npos) ? part.substr(paren + 1) : part;
+            return caseInsensitiveStringCompare(namePart, name) == 0;
+        };
+
+        if (filenameIs("Microsoft.Cpp.targets")) {
+            attemptSyntheticImport(propertyOrEmpty(properties, "ForceImportBeforeCppTargets"),
+                                   properties, metadata, compileList, projectConfigurationList, importStack, phase);
+
+            // Microsoft.Common.targets (imported by Microsoft.Cpp.targets) sets
+            // OutputPath = $(OutDir) when OutputPath is not already defined.
+            // Emulate this before importing Directory.Build.targets so that files
+            // in that chain (e.g. bundle output paths) can expand $(OutputPath).
+            // Property assignment only happens during the Properties pass; ItemDefs/Items
+            // reuse the properties Properties already finished computing.
+            if (phase == EvalPhase::Properties && properties.find("OutputPath") == properties.end()) {
+                const auto outDirIt = properties.find("OutDir");
+                if (outDirIt != properties.end())
+                    properties["OutputPath"] = outDirIt->second;
+            }
+
+            // Emulate key side-effect: Microsoft.Cpp.targets -> Microsoft.Common.targets -> Directory.Build.targets.
+            // $(ImportDirectoryBuildTargets) defaults to true; an explicit "false"
+            // suppresses the import entirely. $(DirectoryBuildTargetsPath), when set,
+            // overrides the upward directory search with an explicit file. See
+            // Microsoft's "Customize your build by folder or solution" docs.
+            const auto importTargetsIt = properties.find("ImportDirectoryBuildTargets");
+            if (importTargetsIt == properties.end() || caseInsensitiveStringCompare(importTargetsIt->second, "false") != 0) {
+                const auto targetsPathIt = properties.find("DirectoryBuildTargetsPath");
+                const std::string directoryBuildTargets = (targetsPathIt != properties.end() && !targetsPathIt->second.empty())
+                                                          ? targetsPathIt->second
+                                                          : findFileAbove(projectDir, "Directory.Build.targets");
+                attemptSyntheticImport(directoryBuildTargets,
+                                       properties, metadata, compileList, projectConfigurationList, importStack, phase);
+            }
+
+            attemptSyntheticImport(propertyOrEmpty(properties, "ForceImportAfterCppTargets"),
+                                   properties, metadata, compileList, projectConfigurationList, importStack, phase);
+
+            return ImportResult::Ok;
+        }
+
+        if (filenameIs("Microsoft.Cpp.Default.props")) {
+            attemptSyntheticImport(propertyOrEmpty(properties, "ForceImportBeforeCppDefaultProps"),
+                                   properties, metadata, compileList, projectConfigurationList, importStack, phase);
+
+            // Emulate key side-effects here, including the Directory.Build.props import that
+            // Microsoft.Common.props would normally perform.
+            // Microsoft.Cpp.Default.props -> Microsoft.Common.props -> Directory.Build.props.
+            // Directory.Build.props is an ordinary import: it is walked in every phase so
+            // that its ItemDefinitionGroups and ItemGroups are collected as well, exactly
+            // like Directory.Build.targets in the Microsoft.Cpp.targets emulation above.
+            // $(ImportDirectoryBuildProps) defaults to true; an explicit "false" suppresses
+            // the import entirely. $(DirectoryBuildPropsPath), when set, overrides the
+            // upward directory search with an explicit file. See Microsoft's "Customize
+            // your build by folder or solution" docs.
+            const auto importPropsIt = properties.find("ImportDirectoryBuildProps");
+            if (importPropsIt == properties.end() || caseInsensitiveStringCompare(importPropsIt->second, "false") != 0) {
+                const auto propsPathIt = properties.find("DirectoryBuildPropsPath");
+                const std::string directoryBuildProps = (propsPathIt != properties.end() && !propsPathIt->second.empty())
+                                                        ? propsPathIt->second
+                                                        : findFileAbove(projectDir, "Directory.Build.props");
+                attemptSyntheticImport(directoryBuildProps,
+                                       properties, metadata, compileList, projectConfigurationList, importStack, phase);
+            }
+
+            // Emulate key defaults set by Microsoft.Cpp.Default.props (properties only).
+            // Derive DefaultPlatformToolset from VisualStudioVersion (already in properties from
+            // the .sln header or the importVcxproj default).  The mapping is:
+            //   VS 10 -> v100, VS 11 -> v110, VS 12 -> v120,
+            //   VS 14 -> v140, VS 15 -> v141, VS 16 -> v142, VS 17 -> v143, VS 18 -> v145
+            if (phase == EvalPhase::Properties && properties.find("DefaultPlatformToolset") == properties.end()) {
+                auto vsIt = properties.find("VisualStudioVersion");
+                if (vsIt != properties.end()) {
+                    int major = 0;
+                    try { major = std::stoi(vsIt->second); } catch (...) {}
+                    std::string toolset;
+                    if (major == 18)
+                        toolset = "v145";
+                    else if (major == 17)
+                        toolset = "v143";
+                    else if (major == 16)
+                        toolset = "v142";
+                    else if (major == 15)
+                        toolset = "v141";
+                    else if (major == 14)
+                        toolset = "v140";
+                    else if (major == 12)
+                        toolset = "v120";
+                    else if (major == 11)
+                        toolset = "v110";
+                    else if (major == 10)
+                        toolset = "v100";
+                    if (!toolset.empty())
+                        properties["DefaultPlatformToolset"] = toolset;
+                }
+            }
 
-    if (!std::getline(istr,line)) {
-        errors.emplace_back("Visual Studio solution file is empty");
-        return false;
-    }
+            attemptSyntheticImport(propertyOrEmpty(properties, "ForceImportAfterCppDefaultProps"),
+                                   properties, metadata, compileList, projectConfigurationList, importStack, phase);
 
-    if (!startsWith(line, "Microsoft Visual Studio Solution File")) {
-        // Skip BOM
-        if (!std::getline(istr, line) || !startsWith(line, "Microsoft Visual Studio Solution File")) {
-            errors.emplace_back("Visual Studio solution file header not found");
-            return false;
+            return ImportResult::Ok;
         }
-    }
 
-    std::map<std::string,std::string,cppcheck::stricmp> variables;
-    variables["SolutionDir"] = path;
+        if (filenameIs("Microsoft.Cpp.props")) {
+            // ForceImportBeforeCppProps: honour any value set before Microsoft.Cpp.props
+            // is processed (e.g. by the vcxproj itself or by Directory.Build.props, which
+            // was already imported via the Microsoft.Cpp.Default.props handler above).
+            attemptSyntheticImport(propertyOrEmpty(properties, "ForceImportBeforeCppProps"),
+                                   properties, metadata, compileList, projectConfigurationList, importStack, phase);
+
+            if (phase == EvalPhase::Properties) {
+                // Provide the output-directory defaults normally supplied by Cpp.props.
+                // Use emplace so values already assigned earlier in the project are preserved.
+                const auto platformIt = properties.find("Platform");
+                const bool isWin32 = platformIt != properties.end() &&
+                                     caseInsensitiveStringCompare(platformIt->second, "Win32") == 0;
+                std::string intDir = isWin32 ? "$(Configuration)/" : "$(Platform)/$(Configuration)/";
+                std::string outDir = isWin32 ? "$(SolutionDir)$(Configuration)/" : "$(SolutionDir)$(Platform)/$(Configuration)/";
+                expandMSBuildVariables(intDir, properties);
+                expandMSBuildVariables(outDir, properties);
+                properties.emplace("IntDir", intDir);
+                properties.emplace("OutDir", outDir);
+                // GeneratedFilesDir defaults to "Generated Files\" (relative to the project
+                // directory) -- that is what Microsoft.Cpp.Default.props provides, and it is
+                // the path CppWinRT projects use by convention (e.g. module.g.cpp).
+                // Do NOT prefix with IntDir here: IntDir is an absolute intermediate path
+                // specific to the build configuration, whereas GeneratedFilesDir is a
+                // project-relative folder that is often committed to source control.
+                properties.emplace("GeneratedFilesDir", "Generated Files/");
+            }
 
-    bool found = false;
-    std::vector<SharedItemsProject> sharedItemsProjects;
-    while (std::getline(istr,line)) {
-        if (!startsWith(line,"Project("))
-            continue;
-        const std::string::size_type pos = line.find(".vcxproj");
-        if (pos == std::string::npos)
-            continue;
-        const std::string::size_type pos1 = line.rfind('\"',pos);
-        if (pos1 == std::string::npos)
-            continue;
-        std::string vcxproj(line.substr(pos1+1, pos-pos1+7));
-        vcxproj = Path::toNativeSeparators(std::move(vcxproj));
-        if (!Path::isAbsolute(vcxproj))
-            vcxproj = path + vcxproj;
-        vcxproj = Path::fromNativeSeparators(std::move(vcxproj));
-        if (!importVcxproj(vcxproj, variables, "", fileFilters, sharedItemsProjects)) {
-            errors.emplace_back("failed to load '" + vcxproj + "' from Visual Studio solution");
-            return false;
+            attemptSyntheticImport(propertyOrEmpty(properties, "ForceImportAfterCppProps"),
+                                   properties, metadata, compileList, projectConfigurationList, importStack, phase);
+
+            return ImportResult::Ok;
         }
-        found = true;
-    }
 
-    if (!found) {
-        errors.emplace_back("no projects found in Visual Studio solution file");
-        return false;
+        ImportResult result = processImport(file, properties, metadata, compileList, projectConfigurationList, importStack, phase);
+        if (result > ImportResult::NotResolvable)
+            addDebug("Could not fully import \"" + file + "\" - " + importResultStr(result) + " (continuing)");
+        if (result == ImportResult::NotResolvable) {
+            addDebug("Could not import \"" + file + "\" - " + importResultStr(result));
+        }
+    } else {
+        addDebug("Could not import \"" + file + "\" unsupported extension " + extension);
     }
-
-    return true;
+    return ImportResult::Ok;
 }
 
-namespace {
-    struct ProjectConfiguration {
-        explicit ProjectConfiguration(const tinyxml2::XMLElement *cfg) {
-            const char *a = cfg->Attribute("Include");
-            if (a)
-                name = a;
-            for (const tinyxml2::XMLElement *e = cfg->FirstChildElement(); e; e = e->NextSiblingElement()) {
-                const char * const text = e->GetText();
-                if (!text)
-                    continue;
-                const char * ename = e->Name();
-                if (std::strcmp(ename,"Configuration")==0)
-                    configuration = text;
-                else if (std::strcmp(ename,"Platform")==0) {
-                    platformStr = text;
-                    if (platformStr == "Win32")
-                        platform = Win32;
-                    else if (platformStr == "x64")
-                        platform = x64;
-                    else
-                        platform = Unknown;
-                }
+ImportProject::ImportResult ImportProject::processImportGroup(const tinyxml2::XMLElement *node,
+                                                              const std::string &baseDir,
+                                                              PropertiesMap &properties,
+                                                              MetadataMap &metadata,
+                                                              std::list<ItemGroupClCompile> &compileList,
+                                                              std::list<ProjectConfiguration> &projectConfigurationList,
+                                                              std::unordered_set<std::string> &importStack,
+                                                              EvalPhase phase) {
+    ImportResult ret = ImportResult::Ok;
+    for (const tinyxml2::XMLElement *e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
+        // processImportProject() itself checks whether `e` is structurally an
+        // <Import Project="..."> element and safely no-ops (returns Ok) otherwise, so
+        // no pre-filter is needed here.
+        const ImportResult result = processImportProject(e, baseDir, properties, metadata, compileList, projectConfigurationList, importStack, phase);
+        if (result > ImportResult::NotResolvable) {
+            if (phase != EvalPhase::Discover) {
+                const char *proj = e->Attribute("Project");
+                addDebug("Could not fully import \"" + std::string(proj ? proj : "") + "\" - " + importResultStr(result) + " (continuing)");
             }
+            ret = std::max(result, ret);
         }
-        std::string name;
-        std::string configuration;
-        enum : std::uint8_t { Win32, x64, Unknown } platform = Unknown;
-        std::string platformStr;
-    };
+    }
+    return ret;
+}
 
-    struct ConditionalGroup {
-        explicit ConditionalGroup(const tinyxml2::XMLElement *idg){
-            const char *condAttr = idg->Attribute("Condition");
-            if (condAttr)
-                mCondition = condAttr;
+ImportProject::ImportResult ImportProject::processChoose(const tinyxml2::XMLElement *node,
+                                                         const std::string &baseDir,
+                                                         PropertiesMap &properties,
+                                                         MetadataMap &metadata,
+                                                         std::list<ItemGroupClCompile> &compileList,
+                                                         std::list<ProjectConfiguration> &projectConfigurationList,
+                                                         std::unordered_set<std::string> &importStack,
+                                                         EvalPhase phase) {
+    if (mDiscovering) {
+        // Discovery cannot know which single <When> a real build would select --
+        // that depends on properties (Configuration/Platform above all) that are
+        // themselves what discovery is trying to find -- so explore every <When>
+        // and any <Otherwise> instead of picking one. mImportGraph is never active
+        // while mDiscovering is set (discovery runs before the per-configuration
+        // loop activates it), so there is no decision to record/replay here either.
+        ImportResult result = ImportResult::Ok;
+        for (const tinyxml2::XMLElement *child = node->FirstChildElement(); child; child = child->NextSiblingElement()) {
+            const char *childName = child->Name();
+            if (!childName)
+                continue;
+            if (std::strcmp(childName, "When") == 0 || std::strcmp(childName, "Otherwise") == 0) {
+                const ImportResult r = processElementChildren(child, baseDir, properties, metadata, compileList, projectConfigurationList, importStack, phase);
+                result = std::max(result, r);
+            }
         }
+        return result;
+    }
 
-        static void replaceAll(std::string &c, const std::string &from, const std::string &to) {
-            std::string::size_type pos;
-            while ((pos = c.find(from)) != std::string::npos) {
-                c.erase(pos,from.size());
-                c.insert(pos,to);
+    bool matched = false;
+    std::size_t branch = 0;
+
+    if (!mImportGraph.replay) {
+        // Decide (or, outside the three-pass evaluation, simply compute --
+        // mDiscovering is handled separately above and never reaches here)
+        // which branch is taken: the first <When> (document order) whose
+        // Condition evaluates true, or the <Otherwise> if none did. Unlike
+        // PropertyGroup/ItemGroup/etc., <Choose> itself carries no Condition --
+        // only its <When> children do -- so this does not go through hasName().
+        std::size_t index = 0;
+        std::size_t otherwiseIndex = 0;
+        bool haveOtherwise = false;
+        for (const tinyxml2::XMLElement *child = node->FirstChildElement(); child; child = child->NextSiblingElement(), ++index) {
+            const char *childName = child->Name();
+            if (!childName)
+                continue;
+            if (std::strcmp(childName, "When") == 0) {
+                const char *cond = child->Attribute("Condition");
+                if (cond && evalCondition(cond, properties)) {
+                    matched = true;
+                    branch = index;
+                    break;
+                }
+            } else if (std::strcmp(childName, "Otherwise") == 0 && !haveOtherwise) {
+                haveOtherwise = true;
+                otherwiseIndex = index;
             }
         }
+        if (!matched && haveOtherwise) {
+            matched = true;
+            branch = otherwiseIndex;
+        }
+    }
 
-        // see https://learn.microsoft.com/en-us/visualstudio/msbuild/msbuild-conditions
-        // properties are .NET String objects and you can call any of its members on them
-        bool conditionIsTrue(const ProjectConfiguration &p) const {
-            if (mCondition.empty())
-                return true;
-            std::string c = '(' + mCondition + ");";
-            replaceAll(c, "$(Configuration)", p.configuration);
-            replaceAll(c, "$(Platform)", p.platformStr);
-
-            // TODO: improve evaluation
-            const Settings s;
-            TokenList tokenlist(s, Standards::Language::C);
-            tokenlist.createTokensFromBuffer(c.data(), c.size()); // TODO: check result
-            // TODO: put in a helper
-            // generate links
-            {
-                std::stack<Token*> lpar;
-                for (Token* tok2 = tokenlist.front(); tok2; tok2 = tok2->next()) {
-                    if (tok2->str() == "(")
-                        lpar.push(tok2);
-                    else if (tok2->str() == ")") {
-                        if (lpar.empty())
-                            break;
-                        Token::createMutualLinks(lpar.top(), tok2);
-                        lpar.pop();
-                    }
-                }
+    if (!importGraphChooseDecision(matched, branch))
+        return ImportResult::Ok;
+
+    // Re-locate the taken child by index rather than reusing a pointer from the
+    // scan above: on replay this file's XML may have been reloaded into a fresh
+    // tinyxml2::XMLDocument since the Properties pass ran (processImport() opens
+    // a new document per phase for every imported file), so any XMLElement*
+    // captured earlier would not be valid here.
+    std::size_t index = 0;
+    for (const tinyxml2::XMLElement *child = node->FirstChildElement(); child; child = child->NextSiblingElement(), ++index) {
+        if (index == branch)
+            return processElementChildren(child, baseDir, properties, metadata, compileList, projectConfigurationList, importStack, phase);
+    }
+    return ImportResult::Ok;
+}
+
+ImportProject::ImportResult ImportProject::processElementChildren(const tinyxml2::XMLElement *parent,
+                                                                  const std::string &baseDir,
+                                                                  PropertiesMap &properties,
+                                                                  MetadataMap &metadata,
+                                                                  std::list<ItemGroupClCompile> &compileList,
+                                                                  std::list<ProjectConfiguration> &projectConfigurationList,
+                                                                  std::unordered_set<std::string> &importStack,
+                                                                  EvalPhase phase) {
+    ImportResult result = ImportResult::Ok;
+
+    for (const tinyxml2::XMLElement *node = parent->FirstChildElement(); node; node = node->NextSiblingElement()) {
+        if (hasName(node, "PropertyGroup", properties)) {
+            // Properties pass only: by the time ItemDefs/Items run, every property in
+            // the whole resolved graph is already final in `properties` -- re-running
+            // PropertyGroup assignment then would be redundant, and evaluating it
+            // against final rather than as-accumulated properties could even produce a
+            // different value than what Properties actually computed.
+            // Also applied directly under EvalPhase::Discover: the discovery bootstrap
+            // scan in importVcxproj() walks its document through this same function
+            // (so <Choose>/<ImportGroup>/<Import> are handled identically to the real
+            // passes), and unlike an imported file reached via processImportProject()
+            // -- which converts Discover to Properties one level down before recursing
+            // -- this is the top-level entry point, so Discover itself must unlock
+            // PropertyGroup here or its properties would never be seeded at all.
+            if (phase == EvalPhase::Properties || phase == EvalPhase::Discover) {
+                for (const tinyxml2::XMLElement *child = node->FirstChildElement(); child; child = child->NextSiblingElement())
+                    addProperty(child, properties);
             }
-            tokenlist.createAst();
-            for (const Token *tok = tokenlist.front(); tok; tok = tok->next()) {
-                if (tok->str() == "(" && tok->astOperand1() && tok->astOperand2()) {
-                    // TODO: this is wrong - it is Contains() not Equals()
-                    if (tok->astOperand1()->expressionString() == "Configuration.Contains")
-                        return ('\'' + p.configuration + '\'') == tok->astOperand2()->str();
+        } else if (hasName(node, "ItemDefinitionGroup", properties)) {
+            // ItemDefs pass only, using the final properties Properties has already
+            // computed -- matching MSBuild's own item-definition evaluation, which runs
+            // as a separate pass over the whole graph after property evaluation.
+            if (phase == EvalPhase::ItemDefs) {
+                // Evaluate metadata defaults sequentially to capture preceding overrides.
+                // Structural name check only (hasElementName(), not hasName()): Visual
+                // Studio does not support Condition on the ClCompile item-definition
+                // element itself, only on its metadata children -- see hasElementName().
+                for (const tinyxml2::XMLElement *item = node->FirstChildElement(); item; item = item->NextSiblingElement()) {
+                    if (!hasElementName(item, "ClCompile"))
+                        continue;
+
+                    for (const tinyxml2::XMLElement *child = item->FirstChildElement(); child; child = child->NextSiblingElement())
+                        addMetadata(child, properties, metadata);
                 }
-                if (tok->str() == "==" && tok->astOperand1() && tok->astOperand2() && tok->astOperand1()->str() == tok->astOperand2()->str())
-                    return true;
             }
-            return false;
-        }
-    private:
-        std::string mCondition;
-    };
+        } else if (hasNameAndLabel(node, "ItemGroup", "ProjectConfigurations", properties)) {
+            // Idempotent (guarded by alreadyPresent below) and cheap, so it is left
+            // unconditional rather than restricted to one phase.
+            for (const tinyxml2::XMLElement *configuration = node->FirstChildElement("ProjectConfiguration"); configuration; configuration = configuration->NextSiblingElement("ProjectConfiguration")) {
+                const ProjectConfiguration pc(configuration);
+                if (pc.configuration.empty())
+                    continue;
 
-    struct ItemDefinitionGroup : ConditionalGroup {
-        explicit ItemDefinitionGroup(const tinyxml2::XMLElement *idg, std::string includePaths) : ConditionalGroup(idg), additionalIncludePaths(std::move(includePaths)) {
-            for (const tinyxml2::XMLElement *e1 = idg->FirstChildElement(); e1; e1 = e1->NextSiblingElement()) {
-                const char* name = e1->Name();
-                if (std::strcmp(name, "ClCompile") == 0) {
-                    enhancedInstructionSet = "StreamingSIMDExtensions2";
-                    for (const tinyxml2::XMLElement *e = e1->FirstChildElement(); e; e = e->NextSiblingElement()) {
-                        const char * const text = e->GetText();
-                        if (!text)
-                            continue;
-                        const char * const ename = e->Name();
-                        if (std::strcmp(ename, "PreprocessorDefinitions") == 0)
-                            preprocessorDefinitions = text;
-                        else if (std::strcmp(ename, "AdditionalIncludeDirectories") == 0) {
-                            if (!additionalIncludePaths.empty())
-                                additionalIncludePaths += ';';
-                            additionalIncludePaths += text;
-                        } else if (std::strcmp(ename, "LanguageStandard") == 0) {
-                            if (std::strcmp(text, "stdcpp14") == 0)
-                                cppstd = Standards::CPP14;
-                            else if (std::strcmp(text, "stdcpp17") == 0)
-                                cppstd = Standards::CPP17;
-                            else if (std::strcmp(text, "stdcpp20") == 0)
-                                cppstd = Standards::CPP20;
-                            else if (std::strcmp(text, "stdcpplatest") == 0)
-                                cppstd = Standards::CPPLatest;
-                        } else if (std::strcmp(ename, "EnableEnhancedInstructionSet") == 0) {
-                            enhancedInstructionSet = text;
-                        }
-                    }
-                }
-                else if (std::strcmp(name, "Link") == 0) {
-                    for (const tinyxml2::XMLElement *e = e1->FirstChildElement(); e; e = e->NextSiblingElement()) {
-                        const char * const text = e->GetText();
-                        if (!text)
-                            continue;
-                        if (std::strcmp(e->Name(), "EntryPointSymbol") == 0) {
-                            entryPointSymbol = text;
-                        }
-                    }
+                const bool alreadyPresent = std::any_of(projectConfigurationList.cbegin(),
+                                                        projectConfigurationList.cend(),
+                                                        [&pc](const ProjectConfiguration &existing) {
+                    return existing.name == pc.name;
+                });
+
+                if (!alreadyPresent) {
+                    projectConfigurationList.emplace_back(pc);
+                    mAllVSConfigs.insert(pc.configuration);
                 }
             }
-        }
-
-        std::string enhancedInstructionSet;
-        std::string preprocessorDefinitions;
-        std::string additionalIncludePaths;
-        std::string entryPointSymbol; // TODO: use this
-        Standards::cppstd_t cppstd = Standards::CPPLatest;
-    };
+        } else if (hasNameAndNotLabel(node, "ItemGroup", "ProjectConfigurations", properties)) {
+            // Items pass only, using the final properties and item definitions Properties
+            // and ItemDefs have already computed -- matching MSBuild's own item
+            // evaluation, the last of its three passes over the whole graph.
+            if (phase == EvalPhase::Items) {
+                // Structural name check only (hasElementName(), not hasName()): Visual
+                // Studio's C++ project system does not support Condition on a ClCompile
+                // project item itself -- only on its metadata children (see
+                // hasElementName()) -- so a Condition here must not hide the item.
+                for (const tinyxml2::XMLElement *item = node->FirstChildElement(); item; item = item->NextSiblingElement()) {
+                    if (!hasElementName(item, "ClCompile"))
+                        continue;
 
-    struct ConfigurationPropertyGroup : ConditionalGroup {
-        explicit ConfigurationPropertyGroup(const tinyxml2::XMLElement *idg) : ConditionalGroup(idg) {
-            for (const tinyxml2::XMLElement *e = idg->FirstChildElement(); e; e = e->NextSiblingElement()) {
-                if (std::strcmp(e->Name(), "UseOfMfc") == 0) {
-                    useOfMfc = true;
-                } else if (std::strcmp(e->Name(), "CharacterSet") == 0) {
-                    useUnicode = std::strcmp(e->GetText(), "Unicode") == 0;
+                    if (item->Attribute("Include"))
+                        processCompile(item, baseDir, properties, metadata, compileList);
+                    else if (item->Attribute("Update"))
+                        applyClCompileUpdate(item, baseDir, properties, compileList);
+                    else if (item->Attribute("Remove"))
+                        applyClCompileRemove(item, baseDir, properties, compileList);
                 }
             }
+        } else if (hasElementName(node, "ImportGroup")) {
+            // An <ImportGroup>'s own Condition gates every import inside it, so it is an
+            // import-graph branch point exactly like an individual <Import> and must be
+            // decided/replayed the same way (see importGraphDecision()) -- ImportGroup
+            // itself never resolves to a file, so the frozen-file half is unused.
+            std::string unusedFile;
+            if (importGraphDecision(conditionIsTrue(node, properties), unusedFile)) {
+                const ImportResult importResult = processImportGroup(node, baseDir, properties, metadata, compileList, projectConfigurationList, importStack, phase);
+                result = std::max(result, importResult);
+            }
+        } else if (hasElementName(node, "Choose")) {
+            // <Choose>'s branch selection is an import-graph branch point exactly
+            // like <Import>/<ImportGroup> -- see processChoose() and
+            // importGraphChooseDecision() for why it must be decided once
+            // (Properties) and replayed (ItemDefs/Items) rather than
+            // re-evaluated every phase.
+            const ImportResult chooseResult = processChoose(node, baseDir, properties, metadata, compileList, projectConfigurationList, importStack, phase);
+            result = std::max(result, chooseResult);
+        } else {
+            // processImportProject() itself checks whether `node` is structurally an
+            // <Import Project="..."> element (safely no-opping otherwise) and, when it
+            // is, decides/replays whether it is taken (it needs to freeze the resolved
+            // file, not just the true/false).
+            const ImportResult importResult = processImportProject(node, baseDir, properties, metadata, compileList, projectConfigurationList, importStack, phase);
+            result = std::max(result, importResult);
         }
+    }
 
-        bool useOfMfc = false;
-        bool useUnicode = false;
-    };
+    return result;
 }
 
-static std::list<std::string> toStringList(const std::string &s)
+// Returns whether `name` matches the '*'/'?' wildcard `pattern` (case-insensitive,
+// matching NTFS semantics -- Visual Studio's C++ project system is a Windows-only
+// concept). '*' matches any run of characters (including none); '?' matches
+// exactly one character. Neither argument is expected to contain a path
+// separator -- this matches one filename against one pattern within a single
+// directory, not a path. Standard greedy iterative glob match.
+static bool matchesWildcardName(const std::string &name, const std::string &pattern)
 {
-    std::list<std::string> ret;
-    std::string::size_type pos1 = 0;
-    std::string::size_type pos2;
-    while ((pos2 = s.find(';',pos1)) != std::string::npos) {
-        ret.push_back(s.substr(pos1, pos2-pos1));
-        pos1 = pos2 + 1;
-        if (pos1 >= s.size())
-            break;
+    std::size_t n = 0, p = 0;
+    std::size_t star = std::string::npos, matchPos = 0;
+    while (n < name.size()) {
+        if (p < pattern.size() &&
+            (pattern[p] == '?' ||
+             std::tolower(static_cast<unsigned char>(pattern[p])) == std::tolower(static_cast<unsigned char>(name[n])))) {
+            ++n;
+            ++p;
+        } else if (p < pattern.size() && pattern[p] == '*') {
+            star = p++;
+            matchPos = n;
+        } else if (star != std::string::npos) {
+            p = star + 1;
+            n = ++matchPos;
+        } else {
+            return false;
+        }
     }
-    if (pos1 < s.size())
-        ret.push_back(s.substr(pos1));
-    return ret;
+    while (p < pattern.size() && pattern[p] == '*')
+        ++p;
+    return p == pattern.size();
 }
 
-static void importPropertyGroup(const tinyxml2::XMLElement *node, std::map<std::string, std::string, cppcheck::stricmp> &variables, std::string &includePath)
+// Lists the regular files (not subdirectories) directly inside `dir` (no
+// trailing separator required, '/' separators only). Returns an empty list if
+// `dir` does not exist or cannot be opened -- a wildcard <Import> matching
+// nothing is a silent no-op, exactly like MSBuild's own ImportBefore/ImportAfter
+// extensibility folders when nothing has been dropped into them. Not recursive:
+// MSBuild's own wildcard Import examples (e.g. "ImportBefore\*") only ever
+// reach into one directory, matching the non-recursive '*' used elsewhere in
+// this file (see expandItemSpec()'s rejection of '*'/'?' in project items).
+#ifdef _WIN32
+static std::vector<std::string> listDirectoryFiles(const std::string &dir)
 {
-    const char* labelAttribute = node->Attribute("Label");
-    if (labelAttribute && std::strcmp(labelAttribute, "UserMacros") == 0) {
-        for (const tinyxml2::XMLElement *propertyGroup = node->FirstChildElement(); propertyGroup; propertyGroup = propertyGroup->NextSiblingElement()) {
-            const char* name = propertyGroup->Name();
-            const char *text = empty_if_null(propertyGroup->GetText());
-            variables[name] = text;
-        }
-
-    } else if (!labelAttribute) {
-        for (const tinyxml2::XMLElement *propertyGroup = node->FirstChildElement(); propertyGroup; propertyGroup = propertyGroup->NextSiblingElement()) {
-            if (std::strcmp(propertyGroup->Name(), "IncludePath") != 0)
-                continue;
-            const char *text = propertyGroup->GetText();
-            if (!text)
-                continue;
-            std::string path(text);
-            const std::string::size_type pos = path.find("$(IncludePath)");
-            if (pos != std::string::npos)
-                path.replace(pos, 14U, includePath);
-            includePath = std::move(path);
-        }
+    std::vector<std::string> files;
+    const std::string searchPath = (dir.empty() ? std::string(".") : dir) + "/*";
+    WIN32_FIND_DATAA findData;
+    const HANDLE hFind = FindFirstFileA(searchPath.c_str(), &findData);
+    if (hFind == INVALID_HANDLE_VALUE)
+        return files;
+    do {
+        if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
+            files.emplace_back(findData.cFileName);
+    } while (FindNextFileA(hFind, &findData));
+    FindClose(hFind);
+    return files;
+}
+#else
+static std::vector<std::string> listDirectoryFiles(const std::string &dir)
+{
+    std::vector<std::string> files;
+    const std::string path = dir.empty() ? std::string(".") : dir;
+    DIR * const dp = opendir(path.c_str());
+    if (!dp)
+        return files;
+    while (const struct dirent * const entry = readdir(dp)) {
+        const std::string name = entry->d_name;
+        if (name == "." || name == "..")
+            continue;
+        if (Path::isDirectory(path + "/" + name))
+            continue;
+        files.push_back(name);
     }
+    closedir(dp);
+    return files;
 }
+#endif
 
-static void loadVisualStudioProperties(const std::string &props, std::map<std::string,std::string,cppcheck::stricmp> &variables, std::string &includePath, const std::string &additionalIncludeDirectories, std::list<ItemDefinitionGroup> &itemDefinitionGroupList)
-{
-    std::string filename(props);
-    // variables can't be resolved
-    if (!simplifyPathWithVariables(filename, variables))
-        return;
+ImportProject::ImportResult ImportProject::processImport(const std::string &file,
+                                                         PropertiesMap &properties,
+                                                         MetadataMap &metadata,
+                                                         std::list<ItemGroupClCompile> &compileList,
+                                                         std::list<ProjectConfiguration> &projectConfigurationList,
+                                                         std::unordered_set<std::string> &importStack,
+                                                         EvalPhase phase) {
+    std::string filename(file);
+    // file can't be resolved
+    if (!simplifyPathWithVariables(filename, properties))
+        return ImportResult::NotResolvable;
 
     // prepend project dir (if it exists) to transform relative paths into absolute ones
-    if (!Path::isAbsolute(filename) && variables.count("ProjectDir") > 0)
-        filename = Path::getAbsoluteFilePath(variables.at("ProjectDir") + filename);
+    // Use classifyPath so that root-relative paths (\foo -> C:\foo) are resolved
+    // against the base drive, not treated as absolute on Linux.
+    const PathKind _fkind = classifyPath(Path::fromNativeSeparators(filename));
+    if (_fkind != PathKind::UNC && _fkind != PathKind::DriveAbsolute && properties.count("ProjectDir") > 0)
+        filename = toAbsolute(filename, properties.at("ProjectDir"), properties);
+
+    // MSBuild allows wildcards in an <Import>'s Project attribute -- unlike
+    // project items (see expandItemSpec()'s rejection of '*'/'?' there, a
+    // *different*, narrower Visual Studio C++ project-system restriction that
+    // does not apply to imports): "When there are wildcards, all matches found
+    // are sorted (for reproducibility), and then they are imported in that
+    // order as if the order had been explicitly set." This is the mechanism
+    // behind the ImportBefore/ImportAfter extensibility folders Visual
+    // Studio's own C++ toolchain files use (e.g.
+    // $(VCTargetsPath)\ImportBefore\Default\*.props), but it applies equally
+    // to any ordinary user-authored wildcard <Import>.
+    const std::string::size_type lastSlash = filename.find_last_of('/');
+    const std::string patternPart = (lastSlash != std::string::npos) ? filename.substr(lastSlash + 1) : filename;
+    if (patternPart.find('*') != std::string::npos || patternPart.find('?') != std::string::npos) {
+        const std::string dirPart = (lastSlash != std::string::npos) ? filename.substr(0, lastSlash) : std::string();
+        std::vector<std::string> matches;
+        for (const std::string &candidate : listDirectoryFiles(dirPart)) {
+            if (matchesWildcardName(candidate, patternPart))
+                // cppcheck-suppress useStlAlgorithm
+                matches.push_back(candidate);
+        }
+        std::sort(matches.begin(), matches.end());
+        ImportResult result = ImportResult::Ok;
+        for (const std::string &match : matches) {
+            const ImportResult r = processImport(dirPart + "/" + match, properties, metadata, compileList,
+                                                 projectConfigurationList, importStack, phase);
+            result = std::max(result, r);
+        }
+        return result;
+    }
+
+    const std::string key = importFileKey(filename);
+    // Detect circular imports before duplicate-import suppression.
+    if (!importStack.insert(key).second)
+        return ImportResult::Cycle;
 
+    ImportStackGuard guard(importStack, key);
+
+    // A previously completed import is ignored.
+    if (mImportGraph.active && !mImportGraph.imported.insert(key).second)
+        return ImportResult::Ok;
     tinyxml2::XMLDocument doc;
-    if (doc.LoadFile(filename.c_str()) != tinyxml2::XML_SUCCESS)
-        return;
+
+    const tinyxml2::XMLError xmlErr = doc.LoadFile(filename.c_str());
+    if (xmlErr != tinyxml2::XML_SUCCESS) {
+        if (xmlErr == tinyxml2::XML_ERROR_FILE_NOT_FOUND ||
+            xmlErr == tinyxml2::XML_ERROR_FILE_COULD_NOT_BE_OPENED ||
+            xmlErr == tinyxml2::XML_ERROR_FILE_READ_ERROR)
+            return ImportResult::NotFound;
+        return ImportResult::NotValid;  // file exists but is malformed XML
+    }
+
     const tinyxml2::XMLElement * const rootnode = doc.FirstChildElement();
     if (rootnode == nullptr)
-        return;
-    for (const tinyxml2::XMLElement *node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) {
-        const char* name = node->Name();
-        if (std::strcmp(name, "ImportGroup") == 0) {
-            const char *labelAttribute = node->Attribute("Label");
-            if (labelAttribute == nullptr || std::strcmp(labelAttribute, "PropertySheets") != 0)
-                continue;
-            for (const tinyxml2::XMLElement *importGroup = node->FirstChildElement(); importGroup; importGroup = importGroup->NextSiblingElement()) {
-                if (std::strcmp(importGroup->Name(), "Import") == 0) {
-                    const char *projectAttribute = importGroup->Attribute("Project");
-                    if (projectAttribute == nullptr)
-                        continue;
-                    std::string loadprj(projectAttribute);
-                    if (loadprj.find('$') == std::string::npos) {
-                        loadprj = Path::getPathFromFilename(filename) + loadprj;
-                    }
-                    loadVisualStudioProperties(loadprj, variables, includePath, additionalIncludeDirectories, itemDefinitionGroupList);
-                }
-            }
-        } else if (std::strcmp(name,"PropertyGroup")==0) {
-            importPropertyGroup(node, variables, includePath);
-        } else if (std::strcmp(name,"ItemDefinitionGroup")==0) {
-            itemDefinitionGroupList.emplace_back(node, additionalIncludeDirectories);
-        }
-    }
+        return ImportResult::NotValid;
+
+    // Every import-graph branch point encountered while walking this file's children
+    // (import decisions or replays) is keyed by this file, so ItemDefs/Items replay
+    // the exact sequence Properties recorded for it.
+    CurrentFileGuard fileGuard(mImportGraph.currentFile, key);
+
+    MSBuildThis msBuildThis(filename, properties);
+    std::string propsDir = Path::getPathFromFilename(filename);
+
+    return processElementChildren(rootnode, propsDir, properties, metadata, compileList,
+                                  projectConfigurationList, importStack, phase);
 }
 
 bool ImportProject::importVcxproj(const std::string &filename,
-                                  std::map<std::string, std::string, cppcheck::stricmp> &variables,
-                                  const std::string &additionalIncludeDirectories,
-                                  const std::vector<std::string> &fileFilters,
-                                  std::vector<SharedItemsProject> &cache)
+                                  PropertiesMap &properties,
+                                  const std::vector<std::string> &fileFilters)
 {
     tinyxml2::XMLDocument doc;
     const tinyxml2::XMLError error = doc.LoadFile(filename.c_str());
@@ -741,245 +4630,656 @@ bool ImportProject::importVcxproj(const std::string &filename,
         errors.emplace_back(std::string("Visual Studio project file is not a valid XML - ") + tinyxml2::XMLDocument::ErrorIDToName(error));
         return false;
     }
-    return importVcxproj(filename, doc, variables, additionalIncludeDirectories, fileFilters, cache);
-}
 
-bool ImportProject::importVcxproj(const std::string &filename, const tinyxml2::XMLDocument &doc, std::map<std::string, std::string, cppcheck::stricmp> &variables, const std::string &additionalIncludeDirectories, const std::vector<std::string> &fileFilters, std::vector<SharedItemsProject> &cache)
-{
-    variables["ProjectDir"] = Path::simplifyPath(Path::getPathFromFilename(filename));
+    // Normalize separators once; callers typically pass toAbsolute() results
+    // but normalize here as a safety net so all subsequent rfind('/') are correct.
+    const std::string nfilename = Path::simplifyPath(Path::fromNativeSeparators(filename));
+
+    // A solution import may already provide VisualStudioVersion.
+    // Direct .vcxproj imports have no solution header, so use the current
+    // supported Visual Studio version as the fallback.
+    properties.emplace("VisualStudioVersion", "18.0");
+
+    // User-extensible MSVC properties that legitimately default to "" when not
+    // set by the project.  In real MSBuild every undefined property expands to
+    // the empty string; seed them here so that props files which append to them
+    // (e.g. <ExtraWarningsToDisable>...;$(DisableSpecificWarnings)</ExtraWarningsToDisable>)
+    // produce a clean resolved value instead of leaving $(X) unexpanded.
+    properties.emplace("DisableSpecificWarnings", "");
+
+    properties["ProjectPath"] = nfilename;
+    const std::string projFileName = stripDirectoryPart(nfilename);
+    properties["ProjectFileName"] = projFileName;
+    const std::string projName = fileStem(projFileName);
+    properties["ProjectName"] = projName;
+    properties["ShortProjectName"] = projName.substr(0, std::min(projName.size(), std::size_t(16)));
+    properties["ProjectExt"] = Path::getFilenameExtensionInLowerCase(nfilename);
+    properties["ProjectDir"] = Path::getPathFromFilename(nfilename);
+
+    // importVcxproj called directly
+    if (properties.find("SolutionDir") == properties.end()) {
+        debugs.clear();
+        properties["SolutionDir"] = properties["ProjectDir"];
+    }
+
+    properties["MSBuildProjectName"] = properties["ProjectName"];
+    properties["MSBuildProjectExtension"] = properties["ProjectExt"];
+    properties["MSBuildProjectDirectory"] = properties["ProjectDir"];
+    // remove file seperator on end of path
+    if (!properties["MSBuildProjectDirectory"].empty() &&
+        (properties["MSBuildProjectDirectory"].back() == '/' ||
+         properties["MSBuildProjectDirectory"].back() == '\\')) {
+        properties["MSBuildProjectDirectory"].pop_back();
+    }
+    properties["MSBuildProjectFile"] = properties["ProjectFileName"];
+    properties["MSBuildProjectFullPath"] = properties["ProjectPath"];
+
+    // TargetName defaults to ProjectName; can be overridden by the XML
+    properties.emplace("TargetName", properties["ProjectName"]);
 
+    // MSBuildProjectDirectoryNoRoot: like MSBuildThisFileDirectoryNoRoot but for the
+    // project itself.  ProjectDir has a trailing '/' which we strip to match the
+    // MSBuildProjectDirectory (no trailing separator) convention.
+    std::string noRoot = stripPathRoot(properties["ProjectDir"]);
+    if (!noRoot.empty() && noRoot.back() == '/')
+        noRoot.pop_back();
+    properties["MSBuildProjectDirectoryNoRoot"] = noRoot;
+
+    properties["BuildingInsideVisualStudio"] = "true";
+    properties["DesignTimeBuild"] = "true";
+
+    MSBuildThis::setMSBuildThis(nfilename, properties);
+
+    std::string projectDir = properties["ProjectDir"];
     std::list<ProjectConfiguration> projectConfigurationList;
-    std::list<std::string> compileList;
-    std::list<ItemDefinitionGroup> itemDefinitionGroupList;
-    std::vector<ConfigurationPropertyGroup> configurationPropertyGroups;
-    std::string includePath;
-    std::vector<SharedItemsProject> sharedItemsProjects;
+    std::list<ItemGroupClCompile> compileList;
+    std::unordered_set<std::string> importStack;
+    MetadataMap metadata;
 
     const tinyxml2::XMLElement * const rootnode = doc.FirstChildElement();
     if (rootnode == nullptr) {
         errors.emplace_back("Visual Studio project file has no XML root node");
         return false;
     }
-    for (const tinyxml2::XMLElement *node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) {
-        const char* name = node->Name();
-        if (std::strcmp(name, "ItemGroup") == 0) {
-            const char *labelAttribute = node->Attribute("Label");
-            if (labelAttribute && std::strcmp(labelAttribute, "ProjectConfigurations") == 0) {
-                for (const tinyxml2::XMLElement *cfg = node->FirstChildElement(); cfg; cfg = cfg->NextSiblingElement()) {
-                    if (std::strcmp(cfg->Name(), "ProjectConfiguration") == 0) {
-                        const ProjectConfiguration p(cfg);
-                        if (p.platform != ProjectConfiguration::Unknown) {
-                            projectConfigurationList.emplace_back(cfg);
-                            mAllVSConfigs.insert(p.configuration);
-                        }
-                    }
-                }
-            } else {
-                for (const tinyxml2::XMLElement *e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
-                    if (std::strcmp(e->Name(), "ClCompile") == 0) {
-                        const char *include = e->Attribute("Include");
-                        if (include && Path::acceptFile(include)) {
-                            std::string toInclude = Path::simplifyPath(Path::isAbsolute(include) ? include : Path::getPathFromFilename(filename) + include);
-                            compileList.emplace_back(toInclude);
-                        }
-                    }
-                }
-            }
-        } else if (std::strcmp(name, "ItemDefinitionGroup") == 0) {
-            itemDefinitionGroupList.emplace_back(node, additionalIncludeDirectories);
-        } else if (std::strcmp(name, "PropertyGroup") == 0) {
-            const char* labelAttribute = node->Attribute("Label");
-            if (labelAttribute && std::strcmp(labelAttribute, "Configuration") == 0) {
-                configurationPropertyGroups.emplace_back(node);
-            } else {
-                importPropertyGroup(node, variables, includePath);
-            }
-        } else if (std::strcmp(name, "ImportGroup") == 0) {
-            const char *labelAttribute = node->Attribute("Label");
-            if (labelAttribute && std::strcmp(labelAttribute, "PropertySheets") == 0) {
-                for (const tinyxml2::XMLElement *e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
-                    if (std::strcmp(e->Name(), "Import") == 0) {
-                        const char *projectAttribute = e->Attribute("Project");
-                        if (projectAttribute)
-                            loadVisualStudioProperties(projectAttribute, variables, includePath, additionalIncludeDirectories, itemDefinitionGroupList);
-                    }
-                }
-            } else if (labelAttribute && std::strcmp(labelAttribute, "Shared") == 0) {
-                for (const tinyxml2::XMLElement *e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
-                    if (std::strcmp(e->Name(), "Import") == 0) {
-                        const char *projectAttribute = e->Attribute("Project");
-                        if (projectAttribute) {
-                            // Path to shared items project is relative to current project directory,
-                            // unless the string starts with $(SolutionDir)
-                            std::string pathToSharedItemsFile;
-                            if (std::string(projectAttribute).rfind("$(SolutionDir)", 0) == 0) {
-                                pathToSharedItemsFile = projectAttribute;
-                            } else {
-                                pathToSharedItemsFile = variables["ProjectDir"] + projectAttribute;
-                            }
-                            if (!simplifyPathWithVariables(pathToSharedItemsFile, variables)) {
-                                errors.emplace_back("Could not simplify path to referenced shared items project");
-                                return false;
-                            }
 
-                            SharedItemsProject toAdd = importVcxitems(pathToSharedItemsFile, fileFilters, cache);
-                            if (!toAdd.successful) {
-                                errors.emplace_back("Could not load shared items project \"" + pathToSharedItemsFile + "\" from original path \"" + std::string(projectAttribute) + "\".");
-                                return false;
-                            }
-                            sharedItemsProjects.emplace_back(toAdd);
-                        }
-                    }
+    // Read MSBuildToolsVersion directly from <Project ToolsVersion="...">.
+    // "Current" is the standard value for VS2019+ and is the correct fallback.
+    const char *toolsVersion = rootnode->Attribute("ToolsVersion");
+    properties["MSBuildToolsVersion"] = toolsVersion ? toolsVersion : "Current";
+
+    // find all Visual Studio project configurations
+    for (const tinyxml2::XMLElement *node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) {
+        if (hasNameAndLabel(node, "ItemGroup", "ProjectConfigurations", properties)) {
+            for (const tinyxml2::XMLElement *pcNode = node->FirstChildElement("ProjectConfiguration"); pcNode; pcNode = pcNode->NextSiblingElement("ProjectConfiguration")) {
+                const ProjectConfiguration pc(pcNode);
+                if (!pc.configuration.empty()) {  // only require a configuration name
+                    projectConfigurationList.emplace_back(pc);
+                    mAllVSConfigs.insert(pc.configuration);
                 }
             }
         }
     }
-    // # TODO: support signedness of char via /J (and potential XML option for it)?
-    // we can only set it globally but in this context it needs to be treated per file
 
-    // Include shared items project files
-    std::vector<std::string> sharedItemsIncludePaths;
-    for (const auto& sharedProject : sharedItemsProjects) {
-        for (const auto &file : sharedProject.sourceFiles) {
-            std::string pathToFile = Path::simplifyPath(Path::getPathFromFilename(sharedProject.pathToProjectFile) + file);
-            compileList.emplace_back(std::move(pathToFile));
+    // Discovery pass: if no ProjectConfigurations were found inline in the vcxproj, walk
+    // the whole document through processElementChildren -- the same dispatch the real
+    // per-configuration passes use -- so every construct that can contain or gate a
+    // configuration-defining import (PropertyGroup, ImportGroup, a bare Import, and
+    // Choose/When/Otherwise, at any depth reached through them) is honoured generically,
+    // no special-casing of individual property names or node kinds required.
+    //
+    // While mDiscovering is set (see its doc comment and DiscoveringGuard),
+    // conditionIsTrue() treats every Condition as satisfied and processChoose()
+    // explores every branch instead of selecting one: real MSBuild/Visual Studio must
+    // know the complete configuration set before evaluation with a specific
+    // Configuration/Platform can even begin, so this scan does not try to predict
+    // which Condition would hold for values it is itself trying to discover -- it
+    // simply assumes every path might contribute a configuration and walks all of
+    // them. Configurations can legitimately be split across multiple imports (e.g.
+    // one property sheet per configuration, each behind its own Condition, or behind
+    // a Choose), and both stopping early and guessing a single property value would
+    // silently lose configurations reachable only a different way.
+    //
+    // Use isolated copies of properties, metadata and importStack so that side-effects
+    // of the discovery imports (extra properties, pre-populated import stack, etc.) do
+    // not bleed into the real per-configuration import pass that follows -- only the
+    // configurations themselves (accumulated into projectConfigurationList/mAllVSConfigs)
+    // persist beyond this block. An extra configuration this over-inclusive scan finds
+    // either genuinely exists or simply picks up no items during the real pass (which
+    // always evaluates every Condition properly, against that configuration's real
+    // properties) and costs nothing.
+    if (projectConfigurationList.empty()) {
+        PropertiesMap discoverProps = properties;
+        // Seed properties that would otherwise be unknown at discovery time. This is
+        // more than cosmetic debug-noise suppression: simplifyPathWithVariables()
+        // treats any path with a surviving unexpanded $(...) as unresolvable, so an
+        // import whose PATH ITSELF embeds one of these -- e.g.
+        // <Import Project="$(Configuration)\Config.props" />, with no Condition or
+        // Choose gating it at all -- would otherwise fail to resolve and its
+        // configuration would be missed entirely, not just logged. Conditions
+        // themselves no longer need a guessed value to select a branch (mDiscovering
+        // ignores them, see above), but property-VALUE expansion is unaffected by
+        // that and still depends on one. These only affect the isolated discovery
+        // copy -- the real per-config pass uses the unmodified properties map.
+        discoverProps.emplace("Platform", "x64");
+        discoverProps.emplace("Configuration", "Debug");
+        // Name-mismatched env vars (same-name ones are auto-resolved by isKnown).
+        auto discoverSeedEnv = [&](const char *prop, const char *envVar) {
+            const char *val = std::getenv(envVar);
+            discoverProps.emplace(prop, val ? val : "");
+        };
+        discoverSeedEnv("VsInstallRoot", "VSINSTALLDIR");
+        discoverSeedEnv("VsInstallDir", "VSINSTALLDIR");
+        discoverSeedEnv("VCInstallDir", "VCINSTALLDIR");
+        discoverSeedEnv("MSBuildProgramFiles32", "ProgramFiles(x86)");
+        discoverSeedEnv("WindowsSdkDir_10", "WindowsSdkDir");
+        // MSBuild-internal properties with no env var equivalent.
+        discoverProps.emplace("VC_LibraryPath_x64", "");
+        discoverProps.emplace("WindowsSDK_WindowsMetadata", "");
+        discoverProps.emplace("WindowsSDK_LibraryPath_x64", "");
+        MetadataMap discoverMeta;
+        std::list<ItemGroupClCompile> discoverCompile;
+        std::unordered_set<std::string> discoverStack;
+
+        DiscoveringGuard discoveringGuard(mDiscovering);
+        processElementChildren(rootnode, projectDir, discoverProps, discoverMeta, discoverCompile,
+                               projectConfigurationList, discoverStack, EvalPhase::Discover);
+    }
+
+    PropertiesMap originalVariables = properties;
+
+    // Visual Studio (like MSBuild) evaluates a project in three passes over the
+    // whole resolved import graph: every PropertyGroup/Import first, so every
+    // property -- wherever in the graph it is set -- is final before anything
+    // else runs, then every ItemDefinitionGroup, then every ItemGroup. See the
+    // EvalPhase doc comment and importGraphDecision() for the full rationale.
+    const std::string rootKey = importFileKey(nfilename);
+
+    // Prime mConfigInvariantProperties: an isolated Properties-only walk per
+    // configuration (same idea as the discovery bootstrap above -- scratch
+    // copies of properties/metadata/import state so nothing here bleeds into
+    // the real per-configuration passes below), just to learn which property
+    // names resolve to the same value in every configuration this project
+    // has. expandItemSpec() (via hasOnlyInvariantItemPathVariables()) treats
+    // those, in addition to the fixed MSBuild "this file"/"this project" set,
+    // as safe to expand in a project item path -- see mConfigInvariantProperties's
+    // doc comment in importproject.h for why that's the right line to draw.
+    // With zero or one configuration every property trivially qualifies (there
+    // is nothing for it to vary across), which is correct: a project that
+    // only ever builds one way can't run into the per-configuration mismatch
+    // the underlying Visual Studio restriction is about.
+    mConfigInvariantProperties.clear();
+    {
+        // Run the priming Properties pass once per configuration, keeping
+        // each configuration's full resulting property map -- needed below
+        // to tell "this property was never set by any PropertyGroup this
+        // project has" (fine: hasOnlyInvariantItemPathVariables() falls
+        // back to checking the OS environment for those, independently of
+        // mConfigInvariantProperties) apart from "this property is set in
+        // SOME of this project's configurations but not others" (not fine:
+        // that is itself a value that varies by configuration -- see below).
+        std::vector<PropertiesMap> perConfigProperties;
+        perConfigProperties.reserve(projectConfigurationList.size());
+        for (const ProjectConfiguration &primePc : projectConfigurationList) {
+            PropertiesMap primeProperties = originalVariables;
+            primeProperties["Configuration"] = primePc.configuration;
+            primeProperties["Platform"] = primePc.platformStr;
+
+            MetadataMap primeMetadata;
+            std::list<ItemGroupClCompile> primeCompileList;
+            std::unordered_set<std::string> primeImportStack;
+
+            mImportGraph = ImportGraph();
+            mImportGraph.active = true;
+            mImportGraph.currentFile = rootKey;
+            mImportGraph.imported.insert(rootKey);
+
+            processElementChildren(rootnode, projectDir, primeProperties, primeMetadata, primeCompileList,
+                                   projectConfigurationList, primeImportStack, EvalPhase::Properties);
+
+            perConfigProperties.push_back(std::move(primeProperties));
+        }
+
+        // Case-insensitive for the same reason mConfigInvariantProperties
+        // itself is (see its doc comment in importproject.h): each
+        // perConfigProperties entry above is itself a PropertiesMap, so
+        // within one configuration "MyRoot" and "myroot" already collapse
+        // to a single entry, but without this comparator here two DIFFERENT
+        // configurations spelling the same property differently -- one
+        // PropertyGroup writing "MyRoot", another "myroot" -- would be
+        // tracked as two unrelated single-value names instead of one
+        // property with (potentially) two different values, and each could
+        // wrongly look config-invariant on its own.
+        //
+        // The union of property names across every configuration -- not
+        // just each configuration's own names -- matters just as much: a
+        // property some, but not all, configurations set (e.g. a PropertyGroup
+        // conditioned on Configuration=='Debug' with no Release counterpart)
+        // is genuinely config-varying, exactly like real MSBuild treats it,
+        // since $(MyRoot) resolves to that PropertyGroup's value under Debug
+        // and to "" (PropertyValueExpander::lookup()'s own fallback for a
+        // name no PropertyGroup and no OS environment variable defines --
+        // see hasOnlyInvariantItemPathVariables()'s separate getenv() check
+        // for the case where an environment variable of the same name DOES
+        // make it invariant regardless) under every configuration that never
+        // sets it. Naively collecting only the values each configuration's
+        // own map happens to contain would miss this entirely: a property
+        // set in exactly one configuration would have exactly one recorded
+        // value there -- itself -- and look spuriously invariant.
+        std::set<std::string, cppcheck::stricmp> allPropertyNames;
+        for (const auto &configProperties : perConfigProperties) {
+            for (const auto &prop : configProperties)
+                // cppcheck-suppress useStlAlgorithm
+                allPropertyNames.insert(prop.first);
         }
-        for (const auto &p : sharedProject.includePaths) {
-            std::string path = Path::simplifyPath(Path::getPathFromFilename(sharedProject.pathToProjectFile) + p);
-            sharedItemsIncludePaths.emplace_back(std::move(path));
+        std::map<std::string, std::set<std::string>, cppcheck::stricmp> valuesByProperty;
+        for (const auto &configProperties : perConfigProperties) {
+            for (const auto &name : allPropertyNames) {
+                const auto it = configProperties.find(name);
+                valuesByProperty[name].insert(it != configProperties.end() ? it->second : std::string());
+            }
+        }
+        for (const auto &prop : valuesByProperty) {
+            if (prop.second.size() == 1)
+                mConfigInvariantProperties.insert(prop.first);
         }
     }
 
-    // Project files
-    PathMatch filtermatcher(fileFilters, Path::getCurrentPath());
-    for (const std::string &cfilename : compileList) {
-        if (!fileFilters.empty() && !filtermatcher.match(cfilename))
-            continue;
+    bool first = true;
+
+    for (const ProjectConfiguration &pc : projectConfigurationList) {
+        if (!first) {
+            compileList.clear();
+            properties = originalVariables;
+            metadata.clear();
+            importStack.clear();
+        } else
+            first = false;
+
+        properties["Configuration"] = pc.configuration;
+        properties["Platform"] = pc.platformStr;
+
+        // Pass 1 (Properties): decide, for every import-graph branch point, whether it
+        // is taken -- using the properties known at that exact point in the walk --
+        // and record the decision sequence per file.
+        mImportGraph = ImportGraph();
+        mImportGraph.active = true;
+        mImportGraph.currentFile = rootKey;
+        mImportGraph.imported.insert(rootKey);
+
+        const ImportResult propertiesResult = processElementChildren(rootnode, projectDir, properties, metadata,
+                                                                     compileList, projectConfigurationList, importStack,
+                                                                     EvalPhase::Properties);
+        if (propertiesResult > ImportResult::NotResolvable)
+            addDebug("Could not fully evaluate \"" + nfilename + "\" - " + importResultStr(propertiesResult));
+
+        // Pass 2 (ItemDefs) and pass 3 (Items) walk the identical document structure
+        // again but *replay* the decisions pass 1 recorded instead of re-evaluating
+        // Condition -- re-checking against the now-final properties could produce a
+        // different graph than pass 1 built, which would desync the properties pass 1
+        // computed from the item definitions/items passes 2/3 evaluate. Which files
+        // get (re-)visited is an automatic, consistent consequence of replaying the
+        // same decisions in the same order, so only 'imported' and 'cursor' -- not
+        // 'decisions' itself -- reset between passes.
+        mImportGraph.replay = true;
+
+        mImportGraph.imported.clear();
+        mImportGraph.imported.insert(rootKey);
+        mImportGraph.cursor.clear();
+        importStack.clear();
+
+        processElementChildren(rootnode, projectDir, properties, metadata,
+                               compileList, projectConfigurationList, importStack,
+                               EvalPhase::ItemDefs);
+
+        mImportGraph.imported.clear();
+        mImportGraph.imported.insert(rootKey);
+        mImportGraph.cursor.clear();
+        importStack.clear();
+
+        const ImportResult itemsResult = processElementChildren(rootnode, projectDir, properties, metadata,
+                                                                compileList, projectConfigurationList, importStack,
+                                                                EvalPhase::Items);
+        if (itemsResult > ImportResult::NotResolvable)
+            addDebug("Could not fully evaluate \"" + nfilename + "\" - " + importResultStr(itemsResult));
+
+        // # TODO: support signedness of char via /J (and potential XML option for it)?
+        // we can only set it globally but in this context it needs to be treated per file
+
+        // Project files
+        PathMatch filtermatcher(fileFilters, Path::getCurrentPath());
+        for (const ItemGroupClCompile &compile : compileList) {
+            if (!fileFilters.empty() && !filtermatcher.match(compile.filename))
+                continue;
 
-        for (const ProjectConfiguration &p : projectConfigurationList) {
+            const std::string &excl = compile.get("ExcludedFromBuild");
+            if (!excl.empty() && caseInsensitiveStringCompare(excl, "true") == 0)
+                continue;
 
             if (!guiProject.checkVsConfigs.empty()) {
-                const bool doChecking = std::any_of(guiProject.checkVsConfigs.cbegin(), guiProject.checkVsConfigs.cend(), [&](const std::string& c) {
-                    return c == p.configuration;
+                const bool doChecking = std::any_of(guiProject.checkVsConfigs.cbegin(), guiProject.checkVsConfigs.cend(), [&](const std::string &c) {
+                    return c == pc.configuration;
                 });
                 if (!doChecking)
                     continue;
             }
 
-            FileSettings fs{cfilename, Standards::Language::None, 0}; // file will be identified later on
-            fs.cfg = p.name;
-            // TODO: detect actual MSC version
+            FileSettings fs{ compile.filename, Standards::Language::None, 0 }; // file will be identified later on
+            fs.cfg = pc.name;
             fs.msc = true;
             fs.defines = "_WIN32=1";
-            if (p.platform == ProjectConfiguration::Win32)
+            if (pc.platform == ProjectConfiguration::Win32) {
                 fs.platformType = Platform::Type::Win32W;
-            else if (p.platform == ProjectConfiguration::x64) {
+                // MSVC always defines _M_IX86 for x86 targets; 600 = Pentium Pro / modern default.
+                fs.defines += ";_M_IX86=600";
+            } else if (pc.platform == ProjectConfiguration::x64) {
                 fs.platformType = Platform::Type::Win64;
                 fs.defines += ";_WIN64=1";
+                // MSVC defines both _M_X64 and _M_AMD64 (both == 100) for x64 targets.
+                fs.defines += ";_M_X64=100;_M_AMD64=100";
+            } else if (pc.platform == ProjectConfiguration::ARM64) {
+                fs.platformType = Platform::Type::WinARM64;
+                fs.defines += ";_M_ARM64=1";
+            } else if (pc.platform == ProjectConfiguration::ARM64EC) {
+                // ARM64EC is an x64-ABI on ARM64 hardware (VS 2022+).
+                // MSVC defines _M_ARM64EC and the two x64 macros for this target.
+                fs.platformType = Platform::Type::WinARM64EC;
+                fs.defines += ";_WIN64=1";
+                fs.defines += ";_M_ARM64EC=1;_M_X64=100;_M_AMD64=100";
+            } else if (pc.platform == ProjectConfiguration::ARM) {
+                fs.platformType = Platform::Type::WinARM;
+                // MSVC defines _M_ARM=7 (Thumb-2 instruction set) for ARM targets.
+                fs.defines += ";_M_ARM=7";
             }
-            std::string additionalIncludePaths;
-            for (const ItemDefinitionGroup &i : itemDefinitionGroupList) {
-                if (!i.conditionIsTrue(p))
-                    continue;
-                fs.standard = Standards::getCPP(i.cppstd);
-                fs.defines += ';' + i.preprocessorDefinitions;
-                if (i.enhancedInstructionSet == "StreamingSIMDExtensions")
-                    fs.defines += ";__SSE__";
-                else if (i.enhancedInstructionSet == "StreamingSIMDExtensions2")
-                    fs.defines += ";__SSE2__";
-                else if (i.enhancedInstructionSet == "AdvancedVectorExtensions")
-                    fs.defines += ";__AVX__";
-                else if (i.enhancedInstructionSet == "AdvancedVectorExtensions2")
-                    fs.defines += ";__AVX2__";
-                else if (i.enhancedInstructionSet == "AdvancedVectorExtensions512")
-                    fs.defines += ";__AVX512__";
-                additionalIncludePaths += ';' + i.additionalIncludePaths;
-            }
-            bool useUnicode = false;
-            for (const ConfigurationPropertyGroup &c : configurationPropertyGroups) {
-                if (!c.conditionIsTrue(p))
-                    continue;
-                // in msbuild the last definition wins
-                useUnicode = c.useUnicode;
-                fs.useMfc = c.useOfMfc;
+
+            // Currently selects C or C++ from the file extension.
+            bool isCFile = Path::getFilenameExtensionInLowerCase(compile.filename) == ".c";
+            const std::string &compileAs = compile.get("CompileAs");
+            if (caseInsensitiveStringCompare(compileAs, "CompileAsC") == 0)
+                isCFile = true;
+            else if (caseInsensitiveStringCompare(compileAs, "CompileAsCpp") == 0)
+                isCFile = false;
+            if (isCFile) {
+                Standards::cstd_t cstd = Standards::C17;
+                const std::string &languageStandardC = compile.get("LanguageStandard_C");
+                if (caseInsensitiveStringCompare(languageStandardC, "stdc11") == 0)
+                    cstd = Standards::C11;
+                else if (caseInsensitiveStringCompare(languageStandardC, "stdc17") == 0)
+                    cstd = Standards::C17;
+                else if (caseInsensitiveStringCompare(languageStandardC, "stdclatest") == 0)
+                    cstd = Standards::CLatest;
+                fs.standard = Standards::getC(cstd);
+            } else {
+                Standards::cppstd_t cppstd = Standards::CPP14;
+                const std::string &languageStandard = compile.get("LanguageStandard");
+                if (caseInsensitiveStringCompare(languageStandard, "stdcpp11") == 0)
+                    cppstd = Standards::CPP11;
+                else if (caseInsensitiveStringCompare(languageStandard, "stdcpp14") == 0)
+                    cppstd = Standards::CPP14;
+                else if (caseInsensitiveStringCompare(languageStandard, "stdcpp17") == 0)
+                    cppstd = Standards::CPP17;
+                else if (caseInsensitiveStringCompare(languageStandard, "stdcpp20") == 0)
+                    cppstd = Standards::CPP20;
+                else if (caseInsensitiveStringCompare(languageStandard, "stdcpp23") == 0)
+                    cppstd = Standards::CPP23;
+                else if (caseInsensitiveStringCompare(languageStandard, "stdcpplatest") == 0)
+                    cppstd = Standards::CPPLatest;
+                fs.standard = Standards::getCPP(cppstd);
             }
-            if (useUnicode) {
-                fs.defines += ";UNICODE=1;_UNICODE=1";
+
+            // Inject _MSC_VER and _MSC_FULL_VER derived from PlatformToolset.
+            // Without these, standard-library and Windows SDK headers (<yvals.h>,
+            // <crtdefs.h>) use generic fallbacks, fail to compile, or misidentify
+            // the supported language standard.
+            std::string mscVer = "1950";      // VS 2026 fallback
+            std::string mscFullVer = "195000000";
+
+            // Prefer item-level override, then project property, then DefaultPlatformToolset.
+            std::string toolset = compile.get("PlatformToolset");
+            if (toolset.empty()) {
+                const auto tsIt = properties.find("PlatformToolset");
+                if (tsIt != properties.end())
+                    toolset = tsIt->second;
+                else {
+                    const auto defIt = properties.find("DefaultPlatformToolset");
+                    if (defIt != properties.end())
+                        toolset = defIt->second;
+                }
             }
-            fsSetDefines(fs, fs.defines);
-            fsSetIncludePaths(fs, Path::getPathFromFilename(filename), toStringList(includePath + ';' + additionalIncludePaths), variables);
-            for (const auto &path : sharedItemsIncludePaths) {
-                fs.includePaths.emplace_back(path);
+
+            if (caseInsensitiveStringCompare(toolset, "v145") == 0) {         // VS 2026
+                mscVer = "1950";
+                mscFullVer = "195000000";
+            } else if (caseInsensitiveStringCompare(toolset, "v144") == 0) { // VS 2025
+                mscVer = "1940";
+                mscFullVer = "194000000";
+            } else if (caseInsensitiveStringCompare(toolset, "v143") == 0) { // VS 2022
+                mscVer = "1930";
+                mscFullVer = "193000000";
+            } else if (caseInsensitiveStringCompare(toolset, "v142") == 0) { // VS 2019
+                mscVer = "1920";
+                mscFullVer = "192000000";
+            } else if (caseInsensitiveStringCompare(toolset, "v141") == 0) { // VS 2017
+                mscVer = "1910";
+                mscFullVer = "191000000";
+            } else if (caseInsensitiveStringCompare(toolset, "v140") == 0) { // VS 2015
+                mscVer = "1900";
+                mscFullVer = "190000000";
+            } else if (caseInsensitiveStringCompare(toolset, "v14") == 0) {
+                try {
+                    const int sub = std::stoi(toolset.substr(3));
+                    mscVer = std::to_string(1900 + (sub * 10));
+                    mscFullVer = mscVer + "00000";
+                } catch (...) {}
+            } else {
+                // Unknown or absent toolset: derive from VisualStudioVersion.
+                const auto vsIt = properties.find("VisualStudioVersion");
+                if (vsIt != properties.end()) {
+                    try {
+                        const double vsVer = std::stod(vsIt->second);
+                        if (vsVer >= 19.0) {
+                            // future VS: keep the default (1940) as a safe floor
+                        } else if (vsVer >= 18.0) { // VS 2026
+                            mscVer = "1950"; mscFullVer = "195000000";
+                        } else if (vsVer >= 17.0) { // VS 2025
+                            mscVer = "1940"; mscFullVer = "194000000";
+                        } else if (vsVer >= 16.0) { // VS 2022
+                            mscVer = "1930"; mscFullVer = "193000000";
+                        } else if (vsVer >= 15.0) { // VS 2019
+                            mscVer = "1920"; mscFullVer = "192000000";
+                        } else if (vsVer >= 14.0) { // VS 2017
+                            mscVer = "1910"; mscFullVer = "191000000";
+                        }
+                    } catch (...) {}
+                }
             }
-            fileSettings.push_back(std::move(fs));
-        }
-    }
 
-    return true;
-}
+            fs.defines += ";_MSC_VER=" + mscVer + ";_MSC_FULL_VER=" + mscFullVer;
+
+            // _MSVC_LANG mirrors the C++ standard flag.  MSVC only defines this for
+            // C++ translation units; C files do not get it (even with /TC).
+            // Note: MSVC does NOT set __cplusplus to the standard value unless
+            // /Zc:__cplusplus is passed; code that needs the standard should test
+            // _MSVC_LANG, which is always set correctly.
+            if (!isCFile) {
+                std::string msvcLang = "201402L"; // MSVC default when no /std: flag is set
+                const std::string &languageStandard = compile.get("LanguageStandard");
+                if (languageStandard == "stdcpp11")
+                    msvcLang = "201103L";
+                else if (languageStandard == "stdcpp14")
+                    msvcLang = "201402L";
+                else if (languageStandard == "stdcpp17")
+                    msvcLang = "201703L";
+                else if (languageStandard == "stdcpp20")
+                    msvcLang = "202002L";
+                else if (languageStandard == "stdcpp23")
+                    msvcLang = "202302L";
+                else if (languageStandard == "stdcpplatest")
+                    msvcLang = "202604L"; // current C++26 draft baseline
+                fs.defines += ";_MSVC_LANG=" + msvcLang;
+            }
 
-ImportProject::SharedItemsProject ImportProject::importVcxitems(const std::string& filename, const std::vector<std::string>& fileFilters, std::vector<SharedItemsProject> &cache)
-{
-    auto isInCacheCheck = [filename](const ImportProject::SharedItemsProject& e) -> bool {
-        return filename == e.pathToProjectFile;
-    };
-    const auto iterator = std::find_if(cache.begin(), cache.end(), isInCacheCheck);
-    if (iterator != std::end(cache)) {
-        return *iterator;
-    }
+            const std::string enableEnhancedInstructionSet = compile.get("EnableEnhancedInstructionSet");
+            if (caseInsensitiveStringCompare(enableEnhancedInstructionSet, "StreamingSIMDExtensions") == 0) {
+                if (pc.platform == ProjectConfiguration::Win32)
+                    fs.defines += ";_M_IX86_FP=1";
+            } else if (caseInsensitiveStringCompare(enableEnhancedInstructionSet, "StreamingSIMDExtensions2") == 0) {
+                if (pc.platform == ProjectConfiguration::Win32)
+                    fs.defines += ";_M_IX86_FP=2";
+            } else if (caseInsensitiveStringCompare(enableEnhancedInstructionSet, "AdvancedVectorExtensions") == 0)
+                fs.defines += ";__AVX__";
+            else if (caseInsensitiveStringCompare(enableEnhancedInstructionSet, "AdvancedVectorExtensions2") == 0)
+                fs.defines += ";__AVX2__";
+            else if (caseInsensitiveStringCompare(enableEnhancedInstructionSet, "AdvancedVectorExtensions512") == 0)
+                fs.defines += ";__AVX512F__";
+
+            const auto charSetIt = properties.find("CharacterSet");
+            const std::string charSet = (charSetIt != properties.end()) ? charSetIt->second : std::string();
+
+            const auto useOfMfcIt = properties.find("UseOfMfc");
+            fs.useMfc = useOfMfcIt != properties.end() && !useOfMfcIt->second.empty() &&
+                        caseInsensitiveStringCompare(useOfMfcIt->second, "false") != 0;
+
+            if (caseInsensitiveStringCompare(charSet, "Unicode") == 0)
+                fs.defines += ";UNICODE=1;_UNICODE=1";
+            else if (caseInsensitiveStringCompare(charSet, "MultiByte") == 0)
+                fs.defines += ";_MBCS=1";
 
-    SharedItemsProject result;
-    result.pathToProjectFile = filename;
+            const auto configurationTypeIt = properties.find("ConfigurationType");
+            if (configurationTypeIt != properties.end() &&
+                caseInsensitiveStringCompare(configurationTypeIt->second, "DynamicLibrary") == 0) {
+                fs.defines += ";_WINDLL";
+            }
 
-    PathMatch filtermatcher(fileFilters, Path::getCurrentPath());
+            if (useOfMfcIt != properties.end() &&
+                caseInsensitiveStringCompare(useOfMfcIt->second, "Dynamic") == 0) {
+                fs.defines += ";_AFXDLL";
+            }
 
-    tinyxml2::XMLDocument doc;
-    const tinyxml2::XMLError error = doc.LoadFile(filename.c_str());
-    if (error != tinyxml2::XML_SUCCESS) {
-        errors.emplace_back(std::string("Visual Studio project file is not a valid XML - ") + tinyxml2::XMLDocument::ErrorIDToName(error));
-        return result;
-    }
-    const tinyxml2::XMLElement * const rootnode = doc.FirstChildElement();
-    if (rootnode == nullptr) {
-        errors.emplace_back("Visual Studio project file has no XML root node");
-        return result;
-    }
-    for (const tinyxml2::XMLElement *node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) {
-        if (std::strcmp(node->Name(), "ItemGroup") == 0) {
-            for (const tinyxml2::XMLElement *e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
-                if (std::strcmp(e->Name(), "ClCompile") == 0) {
-                    const char* include = e->Attribute("Include");
-                    if (include && Path::acceptFile(include)) {
-                        std::string file(include);
-                        findAndReplace(file, "$(MSBuildThisFileDirectory)", "./");
-
-                        // Skip file if it doesn't match the filter
-                        if (!fileFilters.empty() && !filtermatcher.match(file))
-                            continue;
-
-                        result.sourceFiles.emplace_back(file);
+            const auto useOfAtlIt = properties.find("UseOfAtl");
+            if (useOfAtlIt != properties.end() &&
+                caseInsensitiveStringCompare(useOfAtlIt->second, "Dynamic") == 0) {
+                fs.defines += ";_ATL_DLL";
+            }
+
+            std::string runtimeLibrary;
+            const auto runtimeLibraryIt = properties.find("RuntimeLibrary");
+            if (runtimeLibraryIt != properties.end())
+                runtimeLibrary = runtimeLibraryIt->second;
+
+            if (runtimeLibrary.empty()) {
+                const auto useDebugLibrariesIt = properties.find("UseDebugLibraries");
+                const bool debug = useDebugLibrariesIt != properties.end() &&
+                                   caseInsensitiveStringCompare(useDebugLibrariesIt->second, "true") == 0;
+                runtimeLibrary = debug ? "MultiThreadedDebugDLL" : "MultiThreadedDLL";
+            }
+
+            if (caseInsensitiveStringCompare(runtimeLibrary, "MultiThreadedDebugDLL") == 0)
+                fs.defines += ";_MT;_DLL;_DEBUG";
+            else if (caseInsensitiveStringCompare(runtimeLibrary, "MultiThreadedDLL") == 0)
+                fs.defines += ";_MT;_DLL";
+            else if (caseInsensitiveStringCompare(runtimeLibrary, "MultiThreadedDebug") == 0)
+                fs.defines += ";_MT;_DEBUG";
+            else if (caseInsensitiveStringCompare(runtimeLibrary, "MultiThreaded") == 0)
+                fs.defines += ";_MT";
+
+            std::string defines = fs.defines;
+            if (!compile.get("PreprocessorDefinitions").empty())
+                defines += (";" + compile.get("PreprocessorDefinitions"));
+            const std::string &undefStr = compile.get("UndefinePreprocessorDefinitions");
+            if (!undefStr.empty()) {
+                // Build a set of macro names to suppress (skip %(InheritedValues) tokens).
+                std::set<std::string> undefs;
+                std::string seg;
+                for (std::size_t i = 0; i <= undefStr.size(); ++i) {
+                    const char c = (i < undefStr.size()) ? undefStr[i] : ';';
+                    if (c == ';') {
+                        if (!seg.empty() && !startsWith(seg, "%("))
+                            undefs.insert(seg);
+                        seg.clear();
+                    } else {
+                        seg += c;
+                    }
+                }
+                // Remove matching entries from the accumulated defines string.
+                std::string filtered;
+                seg.clear();
+                for (std::size_t i = 0; i <= defines.size(); ++i) {
+                    const char c = (i < defines.size()) ? defines[i] : ';';
+                    if (c == ';') {
+                        if (!seg.empty()) {
+                            const std::string name = seg.substr(0, seg.find('='));
+                            if (undefs.find(name) == undefs.end()) {
+                                if (!filtered.empty())
+                                    filtered += ';';
+                                filtered += seg;
+                            }
+                            seg.clear();
+                        }
                     } else {
-                        errors.emplace_back("Could not find shared items source file");
-                        return result;
+                        seg += c;
                     }
                 }
+                defines = std::move(filtered);
             }
-        } else if (std::strcmp(node->Name(), "ItemDefinitionGroup") == 0) {
-            ItemDefinitionGroup temp(node, "");
-            for (const auto& includePath : toStringList(temp.additionalIncludePaths)) {
-                if (includePath == "%(AdditionalIncludeDirectories)")
+            fsSetDefines(fs, defines);
+            fsSetIncludePaths(fs, projectDir, toStringList(propertyOrEmpty(properties, "IncludePath")), properties);
+
+            std::string rawAdditionalIncludes = compile.get("AdditionalIncludeDirectories");
+            expandMSBuildVariables(rawAdditionalIncludes, properties); // Pre-expand so toStringList splits them cleanly!
+
+            fs.systemIncludePaths = std::move(fs.includePaths);
+            fsSetIncludePaths(fs, projectDir, toStringList(rawAdditionalIncludes), properties);
+
+            std::string rawForcedIncludes = compile.get("ForcedIncludeFiles");
+            expandMSBuildVariables(rawForcedIncludes, properties);
+
+            fs.forcedIncludes.clear();
+            for (const std::string &forcedInclude : toStringList(rawForcedIncludes)) {
+                if (forcedInclude.empty())
                     continue;
 
-                std::string toAdd(includePath);
-                findAndReplace(toAdd, "$(MSBuildThisFileDirectory)", "./");
-                result.includePaths.emplace_back(toAdd);
+                // Standardize native backslashes to uniform forward slashes
+                const std::string normalized = Path::fromNativeSeparators(forcedInclude);
+                const bool relative = isRelative(normalized);
+                std::string resolved;
+
+                if (!relative) {
+                    // Step 2a: For absolute paths, clean up dot notation and simplify structures
+                    resolved = normalized;
+                    simplifyPathWithVariables(resolved, properties);
+                } else {
+                    // Relative paths - Search prioritized include paths FIRST (Visual Studio Priority)
+                    bool matchFound = false;
+                    bool isDir = false;
+
+                    for (const std::string &includePath : fs.includePaths) {
+                        std::string candidate = toAbsolute(normalized, includePath, properties);
+
+                        // Pass the address of isDir to explicitly verify the path is a FILE, never a directory
+                        if (Path::exists(candidate, &isDir) && !isDir) {
+                            resolved = std::move(candidate);
+                            matchFound = true;
+                            break;
+                        }
+                    }
+
+                    // Step 3: Fall back to checking the Project Root Folder only if no include paths matched
+                    if (!matchFound) {
+                        resolved = toAbsolute(normalized, projectDir, properties);
+                    }
+                }
+
+                // Append the safely validated and prioritized file path
+                fs.forcedIncludes.push_back(std::move(resolved));
             }
+
+            fileSettings.push_back(std::move(fs));
         }
     }
 
-    result.successful = true;
-    cache.emplace_back(result);
-    return result;
+    mImportGraph = ImportGraph();  // deactivate: later imports evaluate conditions live
+
+    return true;
 }
 
 bool ImportProject::importBcb6Prj(const std::string &projectFilename)
@@ -1216,17 +5516,17 @@ bool ImportProject::importBcb6Prj(const std::string &projectFilename)
             predefines += ";__WIN32__=1";
     }
 
-    // Include paths may contain variables like "$(BCB)\include" or "$(BCB)\include\vcl".
+    // Include paths may contain properties like "$(BCB)\include" or "$(BCB)\include\vcl".
     // Those get resolved by ImportProject::FileSettings::setIncludePaths by
-    // 1. checking the provided variables map ("BCB" => "C:\\Program Files (x86)\\Borland\\CBuilder6")
-    // 2. checking env variables as a fallback
-    // Setting env is always possible. Configuring the variables via cli might be an addition.
+    // 1. checking the provided properties map ("BCB" => "C:\\Program Files (x86)\\Borland\\CBuilder6")
+    // 2. checking env properties as a fallback
+    // Setting env is always possible. Configuring the properties via cli might be an addition.
     // Reading the BCB6 install location from registry in windows environments would also be possible,
     // but I didn't see any such functionality around the source. Not in favor of adding it only
     // for the BCB6 project loading.
-    std::map<std::string, std::string, cppcheck::stricmp> variables;
+    PropertiesMap properties;
     const std::string defines = predefines + ";" + sysdefines + ";" + userdefines;
-    const std::string cppDefines  = cppPredefines + ";" + defines;
+    const std::string cppDefines = cppPredefines + ";" + defines;
     const bool forceCppMode = (cflags.find("-P") != cflags.end());
 
     for (const std::string &c : compileList) {
@@ -1241,8 +5541,11 @@ bool ImportProject::importBcb6Prj(const std::string &projectFilename)
         // We can also force C++ compilation for all files using the -P command line switch.
         const bool cppMode = forceCppMode || Path::getFilenameExtensionInLowerCase(c) == ".cpp";
         // TODO: needs to set language and ignore later identification and language enforcement
-        FileSettings fs{Path::simplifyPath(Path::isAbsolute(c) ? c : projectDir + c), Standards::Language::None, 0}; // file will be identified later on
-        fsSetIncludePaths(fs, projectDir, toStringList(includePath), variables);
+        // Use classifyPath so that root-relative source paths (\src\foo.cpp) are
+        // resolved against projectDir's drive rather than passed through as-is.
+        const PathKind _ck = classifyPath(Path::fromNativeSeparators(c));
+        FileSettings fs{Path::simplifyPath((_ck == PathKind::UNC || _ck == PathKind::DriveAbsolute) ? c : projectDir + c), Standards::Language::None, 0}; // file will be identified later on
+        fsSetIncludePaths(fs, projectDir, toStringList(includePath), properties);
         fsSetDefines(fs, cppMode ? cppDefines : defines);
         fileSettings.push_back(std::move(fs));
     }
@@ -1252,8 +5555,20 @@ bool ImportProject::importBcb6Prj(const std::string &projectFilename)
 
 static std::string joinRelativePath(const std::string &path1, const std::string &path2)
 {
-    if (!path1.empty() && !Path::isAbsolute(path2))
-        return path1 + path2;
+    if (!path1.empty()) {
+        // Classify path2 to decide whether to prepend path1.
+        // Use the original string (before fromNativeSeparators) so we can tell a
+        // Windows root-relative path "\foo" (starts with backslash) from a
+        // genuine Unix absolute path "/foo" (starts with forward slash):
+        //   - UNC (\\server or //server) and DriveAbsolute (C:\...) are always absolute.
+        //   - A native forward-slash start means Unix-absolute ("/foo") or UNC ("//").
+        //   - A native backslash start means Windows root-relative ("\foo"), which on
+        //     Linux after fromNativeSeparators would look like "/foo" but is NOT absolute.
+        const bool nativelyAbsolute = !path2.empty() && path2[0] == '/';
+        const PathKind pk = classifyPath(Path::fromNativeSeparators(path2));
+        if (!nativelyAbsolute && pk != PathKind::UNC && pk != PathKind::DriveAbsolute)
+            return path1 + path2;
+    }
     return path2;
 }
 
@@ -1340,6 +5655,10 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti
         else if (strcmp(name, CppcheckXml::UndefinesElementName) == 0) {
             for (const std::string &u : readXmlStringList(node, "", CppcheckXml::UndefineName, nullptr))
                 temp.userUndefs.insert(u);
+        } else if (strcmp(name, CppcheckXml::UserIncludeElementName) == 0) {
+            const char* i = node->GetText();
+            if (i)
+                temp.userIncludes.emplace_back(i);
         } else if (strcmp(name, CppcheckXml::ImportProjectElementName) == 0) {
             const std::string t_str = empty_if_null(node->GetText());
             if (!t_str.empty())
@@ -1428,7 +5747,7 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti
                 else if (strcmp(childname, Settings::SafeChecks::XmlExternalVariables) == 0)
                     temp.safeChecks.externalVariables = true;
                 else {
-                    errors.emplace_back("Unknown '" + std::string(Settings::SafeChecks::XmlRootName) + "' element '" + childname + "' in Cppcheck project file");
+                    errors.emplace_back("Unknown '" + std::string(Settings::SafeChecks::XmlRootName) + "' element '" + childname + "' in Cppcheck GUI project file");
                     return false;
                 }
             }
@@ -1451,7 +5770,7 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti
         else if (strcmp(name, CppcheckXml::ProjectNameElementName) == 0)
             ; // no-op
         else {
-            errors.emplace_back("Unknown element '" + std::string(name) + "' in Cppcheck project file");
+            errors.emplace_back("Unknown element '" + std::string(name) + "' in Cppcheck GUI project file");
             return false;
         }
     }
@@ -1461,6 +5780,7 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti
     settings.includePaths = temp.includePaths; // TODO: append instead of overwrite
     settings.userDefines = temp.userDefines; // TODO: append instead of overwrite
     settings.userUndefs = temp.userUndefs; // TODO: append instead of overwrite
+    settings.userIncludes = temp.userIncludes; // TODO: append instead of overwrite
     for (const std::string &addon : temp.addons)
         settings.addons.emplace(addon);
     settings.clang = temp.clang;
@@ -1474,7 +5794,18 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti
 
     for (const std::string &p : paths)
         guiProject.pathNames.push_back(Path::fromNativeSeparators(p));
-    supprs.nomsg.addSuppressions(std::move(suppressions)); // TODO: check result
+
+    bool ok = true;
+    for (const auto &suppression : suppressions) {
+        const std::string addError = supprs.nomsg.addSuppression(suppression);
+        if (!addError.empty()) {
+            errors.emplace_back(addError);
+            ok = false;
+        }
+    }
+    if (!ok)
+        return false;
+
     settings.checkHeaders = temp.checkHeaders;
     settings.checkUnusedTemplates = temp.checkUnusedTemplates;
     settings.maxCtuDepth = temp.maxCtuDepth;
@@ -1496,11 +5827,23 @@ void ImportProject::selectOneVsConfig(Platform::Type platform)
         }
         const FileSettings &fs = *it;
         bool remove = false;
-        if (!startsWith(fs.cfg,"Debug"))
+        const std::string cfgName = fs.cfg.substr(0, fs.cfg.find('|'));
+        if (cfgName.size() < 5 || caseInsensitiveStringCompare(cfgName.substr(0, 5), "Debug") != 0)
+            remove = true;
+
+        if (platform == Platform::Type::Win64 && fs.platformType != Platform::Type::Win64)
             remove = true;
-        if (platform == Platform::Type::Win64 && fs.platformType != platform)
+        else if (platform == Platform::Type::WinARM64 && fs.platformType != Platform::Type::WinARM64)
             remove = true;
-        else if ((platform == Platform::Type::Win32A || platform == Platform::Type::Win32W) && fs.platformType == Platform::Type::Win64)
+        else if (platform == Platform::Type::WinARM64EC && fs.platformType != Platform::Type::WinARM64EC)
+            remove = true;
+        else if (platform == Platform::Type::WinARM && fs.platformType != Platform::Type::WinARM)
+            remove = true;
+        else if ((platform == Platform::Type::Win32A || platform == Platform::Type::Win32W) &&
+                 (fs.platformType == Platform::Type::Win64 ||
+                  fs.platformType == Platform::Type::WinARM64 ||
+                  fs.platformType == Platform::Type::WinARM64EC ||
+                  fs.platformType == Platform::Type::WinARM))
             remove = true;
         else if (filenames.find(fs.filename()) != filenames.end())
             remove = true;
@@ -1525,9 +5868,19 @@ void ImportProject::selectVsConfigurations(Platform::Type platform, const std::v
         bool remove = false;
         if (std::find(configurations.begin(), configurations.end(), config) == configurations.end())
             remove = true;
-        if (platform == Platform::Type::Win64 && fs.platformType != platform)
+        if (platform == Platform::Type::Win64 && fs.platformType != Platform::Type::Win64)
+            remove = true;
+        else if (platform == Platform::Type::WinARM64 && fs.platformType != Platform::Type::WinARM64)
+            remove = true;
+        else if (platform == Platform::Type::WinARM64EC && fs.platformType != Platform::Type::WinARM64EC)
             remove = true;
-        else if ((platform == Platform::Type::Win32A || platform == Platform::Type::Win32W) && fs.platformType == Platform::Type::Win64)
+        else if (platform == Platform::Type::WinARM && fs.platformType != Platform::Type::WinARM)
+            remove = true;
+        else if ((platform == Platform::Type::Win32A || platform == Platform::Type::Win32W) &&
+                 (fs.platformType == Platform::Type::Win64 ||
+                  fs.platformType == Platform::Type::WinARM64 ||
+                  fs.platformType == Platform::Type::WinARM64EC ||
+                  fs.platformType == Platform::Type::WinARM))
             remove = true;
         if (remove) {
             it = fileSettings.erase(it);
@@ -1548,9 +5901,77 @@ void ImportProject::setRelativePaths(const std::string &filename)
         return;
     const std::vector<std::string> basePaths{Path::fromNativeSeparators(Path::getCurrentPath())};
     for (auto &fs: fileSettings) {
-        fs.file = FileWithDetails{Path::getRelativePath(fs.filename(), basePaths), Standards::Language::None, 0}; // file will be identified later on
-        for (auto &includePath: fs.includePaths)
-            includePath = Path::getRelativePath(includePath, basePaths);
+        fs.file.setPath(Path::getRelativePath(fs.filename(), basePaths));
+        for (auto &includePath: fs.includePaths) {
+            const std::string rel = Path::getRelativePath(includePath, basePaths);
+            includePath = rel.empty() ? "." : rel;
+        }
+        for (auto &includePath: fs.systemIncludePaths) {
+            const std::string rel = Path::getRelativePath(includePath, basePaths);
+            includePath = rel.empty() ? "." : rel;
+        }
+        for (auto &forcedInclude: fs.forcedIncludes)
+            forcedInclude = Path::getRelativePath(forcedInclude, basePaths);
     }
 }
 
+// only used by tests (testimportproject.cpp::testVcxprojConditions):
+// cppcheck-suppress unusedFunction
+bool cppcheck::testing::evaluateVcxprojCondition(const std::string& condition,
+                                                 const std::string& configuration,
+                                                 const std::string& platform)
+{
+    ImportProject project;
+    PropertiesMap properties;
+    properties["Platform"] = platform;
+    properties["Configuration"] = configuration;
+    // Use ConditionParser directly so exceptions propagate to the caller;
+    // evalCondition swallows them (by design for production use).
+    ImportProject::ConditionParser parser(project, condition, properties);
+    return parser.parse();
+}
+
+// cppcheck-suppress unusedFunction
+std::string cppcheck::testing::expandMSBuildExpression(const std::string& expr)
+{
+    ImportProject project;
+    PropertiesMap properties;
+    std::string s = expr;
+    project.expandMSBuildVariables(s, properties);
+    return s;
+}
+
+// cppcheck-suppress unusedFunction
+std::string cppcheck::testing::expandMSBuildProperties(const std::string& expr,
+                                                       const std::string& configuration,
+                                                       const std::string& platform)
+{
+    ImportProject project;
+    PropertiesMap properties;
+    properties["Configuration"] = configuration;
+    properties["Platform"] = platform;
+    std::string s = expr;
+    project.expandMSBuildVariables(s, properties);
+    return s;
+}
+
+// only used by tests (testimportproject.cpp::testVcxitemsPathResolution):
+// cppcheck-suppress unusedFunction
+std::string cppcheck::testing::resolveVcxitemsFilename(const std::string& items, const std::string& projectDir)
+{
+    ImportProject project;
+    PropertiesMap properties;
+    if (!projectDir.empty())
+        properties["ProjectDir"] = projectDir;
+    std::string filename(items);
+    if (!project.simplifyPathWithVariables(filename, properties))
+        return {};
+    // Use classifyPath so that root-relative paths (\foo -> C:\foo) are resolved
+    // against the base drive, not treated as absolute on Linux.
+    {
+        const PathKind _fkind = classifyPath(Path::fromNativeSeparators(filename));
+        if (_fkind != PathKind::UNC && _fkind != PathKind::DriveAbsolute && properties.count("ProjectDir") > 0)
+            filename = project.toAbsolute(filename, properties.at("ProjectDir"), properties);
+    }
+    return filename;
+}
diff --git a/lib/importproject.h b/lib/importproject.h
index 45d17a819f7..a258336a551 100644
--- a/lib/importproject.h
+++ b/lib/importproject.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,18 +26,22 @@
 #include "platform.h"
 #include "utils.h"
 
+#include <cstddef>
 #include <cstdint>
 #include <iosfwd>
 #include <list>
 #include <map>
 #include <set>
 #include <string>
+#include <unordered_set>
+#include <utility>
 #include <vector>
 
 class Settings;
 struct Suppressions;
+
 namespace tinyxml2 {
-    class XMLDocument;
+    class XMLElement;
 }
 
 /// @addtogroup Core
@@ -49,14 +53,29 @@ namespace cppcheck {
             return caseInsensitiveStringCompare(lhs,rhs) < 0;
         }
     };
+
+    namespace testing
+    {
+        CPPCHECKLIB bool evaluateVcxprojCondition(const std::string& condition, const std::string& configuration, const std::string& platform);
+        CPPCHECKLIB std::string expandMSBuildExpression(const std::string& expr);
+        CPPCHECKLIB std::string expandMSBuildProperties(const std::string& expr, const std::string& configuration, const std::string& platform);
+        CPPCHECKLIB std::string resolveVcxitemsFilename(const std::string& items, const std::string& projectDir);
+    }
 }
 
+using PropertiesMap = std::map<std::string, std::string, cppcheck::stricmp>;
+using MetadataMap = std::map<std::string, std::string, cppcheck::stricmp>;
+
 /**
  * @brief Importing project settings.
  */
 class CPPCHECKLIB WARN_UNUSED ImportProject {
-    friend class TestImporter;
 public:
+    friend CPPCHECKLIB bool cppcheck::testing::evaluateVcxprojCondition(const std::string &condition, const std::string &configuration, const std::string &platform);
+    friend CPPCHECKLIB std::string cppcheck::testing::expandMSBuildExpression(const std::string &expr);
+    friend CPPCHECKLIB std::string cppcheck::testing::expandMSBuildProperties(const std::string &expr, const std::string &configuration, const std::string &platform);
+    friend CPPCHECKLIB std::string cppcheck::testing::resolveVcxitemsFilename(const std::string &items, const std::string &projectDir);
+
     enum class Type : std::uint8_t {
         NONE,
         UNKNOWN,
@@ -64,17 +83,51 @@ class CPPCHECKLIB WARN_UNUSED ImportProject {
         FAILURE,
         COMPILE_DB,
         VS_SLN,
+        VS_SLNX,
         VS_VCXPROJ,
         BORLAND,
         CPPCHECK_GUI
     };
+    enum class ImportResult : std::uint8_t {
+        Ok,
+        Cycle,         // Visual Studio/MSBuild reports a circular import; continue safely
+        NotResolvable,
+        NotFound,
+        NotValid,
+    };
+
+    /// Visual Studio (like MSBuild) evaluates a project in separate passes over the
+    /// whole resolved import graph: every PropertyGroup/Import first (so every
+    /// property, wherever in the graph it is set, is final before anything else
+    /// runs), then every ItemDefinitionGroup, then every ItemGroup. A PropertyGroup
+    /// positioned after an ItemDefinitionGroup -- or reached through a file imported
+    /// later in the document -- is still visible to that earlier ItemDefinitionGroup.
+    enum class EvalPhase : std::uint8_t {
+        Properties, ///< Pass 1: PropertyGroup + Import/ImportGroup only; decides and records the import graph
+        ItemDefs,   ///< Pass 2: ItemDefinitionGroup only; replays the recorded import graph
+        Items,      ///< Pass 3: ItemGroup only; replays the recorded import graph
+        Discover,   ///< Structural discovery bootstrap scan: PropertyGroup/ImportGroup/
+                    ///< Import/Choose are walked like Properties, but every Condition is
+                    ///< treated as satisfied and Choose explores every branch instead of
+                    ///< selecting one (see mDiscovering), and any errors/debugs generated
+                    ///< are discarded rather than surfaced.
+    };
 
-    static void fsParseCommand(FileSettings& fs, const std::string& command, bool doUnescape);
+protected:
     static void fsSetDefines(FileSettings& fs, std::string defs);
-    static void fsSetIncludePaths(FileSettings& fs, const std::string &basepath, const std::list<std::string> &in, std::map<std::string, std::string, cppcheck::stricmp> &variables);
+    void fsSetIncludePaths(FileSettings& fs, const std::string &basepath, const std::list<std::string> &in, const PropertiesMap &properties);
+    /** Set the project path prefix used to resolve relative paths in the project file.
+     *  Normally set automatically by import(); exposed here so unit tests can exercise
+     *  path-joining without needing a real file on disk. */
+    // cppcheck-suppress unusedFunction
+    void setProjectPath(const std::string& p) {
+        mPath = p;
+    }
 
+public:
     std::list<FileSettings> fileSettings;
     std::vector<std::string> errors;
+    std::vector<std::string> debugs;
 
     ImportProject() = default;
     virtual ~ImportProject() = default;
@@ -100,28 +153,257 @@ class CPPCHECKLIB WARN_UNUSED ImportProject {
     void ignoreOtherConfigs(const std::string &cfg);
 
     Type import(const std::string &filename, Settings *settings=nullptr, Suppressions *supprs=nullptr);
+
+    static const std::string &importResultStr(ImportResult result);
+
 protected:
-    bool importCompileCommands(std::istream &istr);
+    bool processCompileCommands(std::istream &istr);
     bool importCppcheckGuiProject(std::istream &istr, Settings &settings, Suppressions &supprs);
+    static std::string collectArgs(const std::string &cmd, std::vector<std::string> &args);
+    void setRelativePaths(const std::string &filename);
 
 private:
-    struct SharedItemsProject {
-        bool successful = false;
-        std::string pathToProjectFile;
-        std::vector<std::string> includePaths;
-        std::vector<std::string> sourceFiles;
-    };
+    struct PropertyValueExpander;
+    class ConditionParser;
+
+    static void parseArgs(FileSettings &fs, const std::vector<std::string> &args);
 
-    bool importSln(std::istream &istr, const std::string &path, const std::vector<std::string> &fileFilters);
-    SharedItemsProject importVcxitems(const std::string &filename, const std::vector<std::string> &fileFilters, std::vector<SharedItemsProject> &cache);
-    bool importVcxproj(const std::string &filename, std::map<std::string, std::string, cppcheck::stricmp> &variables, const std::string &additionalIncludeDirectories, const std::vector<std::string> &fileFilters, std::vector<SharedItemsProject> &cache);
-    bool importVcxproj(const std::string &filename, const tinyxml2::XMLDocument &doc, std::map<std::string, std::string, cppcheck::stricmp> &variables, const std::string &additionalIncludeDirectories, const std::vector<std::string> &fileFilters, std::vector<SharedItemsProject> &cache);
     bool importBcb6Prj(const std::string &projectFilename);
 
-    void setRelativePaths(const std::string &filename);
+    struct ProjectConfiguration {
+        explicit ProjectConfiguration(const tinyxml2::XMLElement *cfg);
+
+        std::string name;
+        std::string configuration;
+        enum : std::uint8_t { Win32, x64, ARM64, ARM64EC, ARM, Unknown } platform = Unknown;
+        std::string platformStr;
+    };
+
+    struct ItemGroupClCompile {
+        explicit ItemGroupClCompile(std::string filename) : filename(std::move(filename)) {}
+        std::string filename;
+        MetadataMap metadata;
+        const std::string &get(const std::string &key) const {
+            static const std::string empty;
+            const auto it = metadata.find(key);
+            return (it != metadata.end()) ? it->second : empty;
+        }
+    };
+
+    bool importSln(std::istream &istr, const std::string &filename, const std::vector<std::string> &fileFilters);
+    bool importSlnx(const std::string& filename, const std::vector<std::string>& fileFilters);
+    bool importVcxproj(const std::string &filename, PropertiesMap &properties, const std::vector<std::string> &fileFilters);
+
+    ImportResult processImport(const std::string &file,
+                               PropertiesMap &properties,
+                               MetadataMap &metadata,
+                               std::list<ItemGroupClCompile> &compileList,
+                               std::list<ProjectConfiguration> &projectConfigurationList,
+                               std::unordered_set<std::string> &importStack,
+                               EvalPhase phase);
+    ImportResult processImportProject(const tinyxml2::XMLElement *node,
+                                      const std::string &projectDir,
+                                      PropertiesMap &properties,
+                                      MetadataMap &metadata,
+                                      std::list<ItemGroupClCompile> &compileList,
+                                      std::list<ProjectConfiguration> &projectConfigurationList,
+                                      std::unordered_set<std::string> &importStack,
+                                      EvalPhase phase);
+    ImportResult processImportGroup(const tinyxml2::XMLElement *node,
+                                    const std::string &baseDir,
+                                    PropertiesMap &properties,
+                                    MetadataMap &metadata,
+                                    std::list<ItemGroupClCompile> &compileList,
+                                    std::list<ProjectConfiguration> &projectConfigurationList,
+                                    std::unordered_set<std::string> &importStack,
+                                    EvalPhase phase);
+    // Decide (Properties pass) or replay (ItemDefs/Items pass) which single
+    // <When>/<Otherwise> child of a <Choose> is taken, then process that child's
+    // own children (PropertyGroup/ItemDefinitionGroup/ItemGroup/ImportGroup/nested
+    // Choose) exactly as processElementChildren() would process them inline.
+    // During the discovery bootstrap scan (mDiscovering set) this selection is
+    // skipped entirely: every <When> and any <Otherwise> is processed instead of
+    // choosing one -- see the mDiscovering branch at the top of the definition.
+    ImportResult processChoose(const tinyxml2::XMLElement *node,
+                               const std::string &baseDir,
+                               PropertiesMap &properties,
+                               MetadataMap &metadata,
+                               std::list<ItemGroupClCompile> &compileList,
+                               std::list<ProjectConfiguration> &projectConfigurationList,
+                               std::unordered_set<std::string> &importStack,
+                               EvalPhase phase);
+    ImportResult processCompile(const tinyxml2::XMLElement *node,
+                                const std::string &projectDir,
+                                const PropertiesMap &properties,
+                                const MetadataMap &metadata,
+                                std::list<ItemGroupClCompile> &compileList);
+    ImportResult processElementChildren(const tinyxml2::XMLElement *parent,
+                                        const std::string &baseDir,
+                                        PropertiesMap &properties,
+                                        MetadataMap &metadata,
+                                        std::list<ItemGroupClCompile> &compileList,
+                                        std::list<ProjectConfiguration> &projectConfigurationList,
+                                        std::unordered_set<std::string> &importStack,
+                                        EvalPhase phase);
+    void applyClCompileUpdate(const tinyxml2::XMLElement *node,
+                              const std::string &baseDir,
+                              const PropertiesMap &properties,
+                              std::list<ItemGroupClCompile> &compileList);
+    void applyClCompileRemove(const tinyxml2::XMLElement *node,
+                              const std::string &baseDir,
+                              const PropertiesMap &properties,
+                              std::list<ItemGroupClCompile> &compileList);
+    // Returns (original-segment, absolute-path) pairs.  The original segment is
+    // the spec after property expansion but before toAbsolute(), preserving the
+    // relative form needed to compute %(RelativeDir) in processCompile().
+    std::pair<std::string, std::string> expandItemSpec(const std::string &spec,
+                                                       const std::string &projectDir,
+                                                       const PropertiesMap &properties);
+    std::string applyMSBuildStaticFunction(const std::string &className,
+                                           const std::string &member,
+                                           const std::vector<std::string> &args,
+                                           const PropertiesMap *properties = nullptr);
+    void applyClCompileChild(const tinyxml2::XMLElement *e1,
+                             const PropertiesMap &properties,
+                             MetadataMap &metadata);
+    void expandMSBuildVariables(std::string &s, const PropertiesMap &properties);
+    bool evalCondition(const std::string &condition, const PropertiesMap &properties);
+    bool conditionIsTrue(const tinyxml2::XMLElement *node, const PropertiesMap &properties);
+    bool hasName(const tinyxml2::XMLElement *node, const char *nodeName, const PropertiesMap &properties);
+    bool hasNameAndLabel(const tinyxml2::XMLElement *node, const char *nodeName, const char *nodeAttr, const PropertiesMap &properties);
+    bool hasNameAndNotLabel(const tinyxml2::XMLElement * node, const char *nodeName, const char *nodeAttr, const PropertiesMap & properties);
+    // Decide (Properties pass) or replay (ItemDefs/Items pass) whether one import-graph
+    // branch point -- an <Import>, an <ImportGroup>, or a synthetic ForceImportXxx /
+    // Directory.Build.* import attempt performed by attemptSyntheticImport() -- is
+    // taken. During the Properties pass `conditionHolds` (already evaluated by the
+    // caller) is recorded and returned as-is, and `file` (the target path the caller
+    // has already resolved, if any) is recorded alongside it. During ItemDefs/Items,
+    // both the condition and the file the caller just (re)computed are ignored, and
+    // the recorded pair from the Properties pass is replayed instead: the resolved
+    // file's own $(...) references may include a property that was still unset (or
+    // held a different value) at the point Properties visited this branch, so
+    // recomputing it against the now-final properties could resolve to a different
+    // file than Properties actually walked, which would desync the properties
+    // Properties built from the items/definitions ItemDefs/Items evaluate. Outside
+    // the three-pass evaluation (mImportGraph inactive) this simply returns
+    // `conditionHolds` unchanged.
+    bool importGraphDecision(bool conditionHolds, std::string &file);
+    // Same decide/replay discipline as importGraphDecision(), for a <Choose>'s
+    // branch selection instead of an <Import>'s target file. During the
+    // Properties pass `matched` (already computed by the caller: did any
+    // <When> match, or is there an <Otherwise> to fall back to) and `branch`
+    // (the 0-based index, among the Choose's <When>/<Otherwise> children in
+    // document order, of the one that matched) are recorded and returned/left
+    // as-is. During ItemDefs/Items, both are ignored and the recorded pair is
+    // replayed instead: a <When>'s Condition may reference a property that was
+    // still unset (or held a different value) when the Properties pass reached
+    // this Choose, so recomputing it against the now-final properties could
+    // select a different branch than Properties actually walked -- desyncing
+    // the properties Properties built from the items/definitions ItemDefs/Items
+    // evaluate, exactly like an Import resolving to a different file would.
+    // Outside the three-pass evaluation (mImportGraph inactive) this simply
+    // returns `matched` unchanged.
+    bool importGraphChooseDecision(bool matched, std::size_t &branch);
+    // Attempt one of the synthetic (non-XML) imports the Microsoft.Cpp.Default.props /
+    // .props / .targets emulation performs implicitly: the ForceImportBeforeXxx /
+    // ForceImportAfterXxx hook properties, and the Directory.Build.props/.targets
+    // auto-import. `file` is the already-resolved target path, or empty if there is
+    // nothing to import. Participates in the same decide/replay discipline as a
+    // regular <Import> element via importGraphDecision().
+    ImportResult attemptSyntheticImport(std::string file,
+                                        PropertiesMap &properties,
+                                        MetadataMap &metadata,
+                                        std::list<ItemGroupClCompile> &compileList,
+                                        std::list<ProjectConfiguration> &projectConfigurationList,
+                                        std::unordered_set<std::string> &importStack,
+                                        EvalPhase phase);
+    void checkUnexpandedExpressions(const std::string &text, const char *context);
+    bool simplifyPathWithVariables(std::string &s, const PropertiesMap &properties);
+    void addProperty(const tinyxml2::XMLElement *node, PropertiesMap &properties);
+    void addMetadata(const tinyxml2::XMLElement *node, const PropertiesMap &properties, MetadataMap &metadata);
+    std::string getMetadata(const tinyxml2::XMLElement *node, const PropertiesMap &properties, const MetadataMap &metadata, const std::string &original);
+    std::string toAbsolute(const std::string &filename, const std::string &baseDir, const PropertiesMap &properties);
+    static std::string toAbsoluteExpanded(const std::string &filename, const std::string &baseDir);
+    static std::string toAbsolute(const std::string &path);
+    static void setSolution(const std::string &filename, PropertiesMap &properties);
+    void addDebug(const std::string &msg);
+
+    /// Tracks the state of the current three-pass (Properties/ItemDefs/Items)
+    /// evaluation for one project configuration. During the Properties pass every
+    /// import-graph branch point is decided and its outcome recorded; during the
+    /// ItemDefs and Items passes those decisions are replayed in the same order
+    /// instead of being re-evaluated, so all three passes walk the identical
+    /// resolved graph -- exactly what real MSBuild/Visual Studio evaluation does by
+    /// resolving imports once, during property evaluation, and reusing that graph
+    /// for item definitions and items.
+    struct ImportGraph {
+        /// One import-graph branch point's outcome, as decided during the
+        /// Properties pass: whether it was taken and, if so, either the target
+        /// file it resolved to at that time (Import/ImportGroup) or the index of
+        /// the <When>/<Otherwise> child it selected (Choose) -- whichever applies
+        /// to this branch point's kind -- frozen so later passes reuse it
+        /// verbatim instead of recomputing it against possibly-different state.
+        struct Decision {
+            bool taken = false;
+            std::string file;      ///< Import/ImportGroup only; unused for Choose.
+            std::size_t branch = 0; ///< Choose only; unused for Import/ImportGroup.
+        };
+        /// Files already imported during the current pass. An imported file is
+        /// processed at most once per pass; a repeated <Import> of it is ignored
+        /// (MSB4011). Reset at the start of each pass; which files end up in it is
+        /// an automatic consequence of replaying the same decisions in the same
+        /// order, so it does not itself need to be recorded/replayed.
+        std::unordered_set<std::string> imported;
+        /// Per container file (by import-file-key): the decision for each
+        /// import-graph branch point encountered while walking that file's
+        /// children, in traversal order. Populated during the Properties pass;
+        /// read-only afterwards.
+        std::map<std::string, std::vector<Decision>> decisions;
+        /// Per container file: how far ItemDefs/Items replay has consumed that
+        /// file's decisions vector. Reset at the start of each replay pass.
+        std::map<std::string, std::size_t> cursor;
+        /// Import-file-key of the file whose children are currently being walked;
+        /// keys 'decisions'/'cursor'. Maintained by CurrentFileGuard in processImport().
+        std::string currentFile;
+        bool active = false;  ///< true only inside importVcxproj's per-configuration loop
+        bool replay = false;  ///< true during ItemDefs/Items: replay recorded decisions, don't decide
+    };
 
     std::string mPath;
     std::set<std::string> mAllVSConfigs;
+    /// Names of properties that resolve to the SAME value in every one of this
+    /// project's configurations, computed once per project file by a priming
+    /// walk over projectConfigurationList (see importVcxproj()) before the
+    /// real per-configuration passes run. A macro is unsafe in a project item
+    /// path only if its value could differ by configuration -- see
+    /// expandItemSpec()'s use of this alongside invariantItemPathProperties()
+    /// -- so this set, not just that fixed name list, is what a macro's name
+    /// is checked against. Cleared and repopulated at the top of each
+    /// importVcxproj() call; empty (and therefore inert) before the first one.
+    /// MSBuild property names are case-insensitive (PropertyGroup and
+    /// PropertiesMap itself, above, agree on this), so this uses the same
+    /// cppcheck::stricmp comparator PropertiesMap does -- otherwise "MyRoot"
+    /// set in one configuration's PropertyGroup and "myroot" set in another's
+    /// would be tracked as two unrelated names instead of one property, and
+    /// each could wrongly look config-invariant on its own even when the
+    /// property's real value differs by configuration. The priming walk
+    /// (see its comment in importVcxproj()) also tracks a property that only
+    /// SOME configurations set at all -- a value in one configuration and no
+    /// PropertyGroup for it whatsoever in another is itself a difference,
+    /// exactly like real MSBuild resolving it to "" wherever nothing sets
+    /// it -- rather than considering the property only where it happens to
+    /// be present.
+    std::set<std::string, cppcheck::stricmp> mConfigInvariantProperties;
+    ImportGraph mImportGraph;
+    /// True only while importVcxproj()'s discovery bootstrap scan (used when a
+    /// project has no inline ProjectConfigurations) is walking the document. While
+    /// set, conditionIsTrue() treats every Condition as satisfied and processChoose()
+    /// explores every <When>/<Otherwise> instead of selecting one: discovery's only
+    /// goal is to enumerate every ProjectConfiguration reachable through ANY
+    /// combination of property values, and it cannot correctly predict which single
+    /// branch a real build would take for values -- Configuration/Platform above
+    /// all -- that are themselves what is being discovered. See DiscoveringGuard.
+    bool mDiscovering = false;
 };
 
 
@@ -141,6 +423,7 @@ namespace CppcheckXml {
     static constexpr char DefineNameAttrib[] = "name";
     static constexpr char UndefinesElementName[] = "undefines";
     static constexpr char UndefineName[] = "undefine";
+    static constexpr char UserIncludeElementName[] = "user-include";
     static constexpr char PathsElementName[] = "paths";
     static constexpr char PathName[] = "dir";
     static constexpr char PathNameAttrib[] = "name";
@@ -187,7 +470,6 @@ namespace CppcheckXml {
     static constexpr char CodingStandardsElementName[] = "coding-standards";
     static constexpr char CodingStandardElementName[] = "coding-standard";
     static constexpr char CertIntPrecisionElementName[] = "cert-c-int-precision";
-    static constexpr char LicenseFileElementName[] = "license-file";
     static constexpr char ProjectNameElementName[] = "project-name";
 }
 
diff --git a/lib/json.h b/lib/json.h
index 2bcfe102071..7f7107f7864 100644
--- a/lib/json.h
+++ b/lib/json.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@ SUPPRESS_WARNING_CLANG_PUSH("-Wextra-semi-stmt")
 SUPPRESS_WARNING_CLANG_PUSH("-Wzero-as-null-pointer-constant")
 SUPPRESS_WARNING_CLANG_PUSH("-Wformat")
 SUPPRESS_WARNING_CLANG_PUSH("-Wfloat-conversion")
+SUPPRESS_WARNING_CLANG_PUSH("-Wimplicit-float-conversion")
 
 #define PICOJSON_USE_INT64
 #include <picojson.h> // IWYU pragma: export
@@ -37,6 +38,7 @@ SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_CLANG_POP
+SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_GCC_POP
 SUPPRESS_WARNING_POP
 
diff --git a/lib/library.cpp b/lib/library.cpp
index ad5ea13a3ed..6c80e88e5cc 100644
--- a/lib/library.cpp
+++ b/lib/library.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,10 +46,10 @@ struct Library::LibraryData
 {
     struct Platform {
         const PlatformType *platform_type(const std::string &name) const {
-            const auto it = utils::as_const(mPlatformTypes).find(name);
+            const auto it = mPlatformTypes.find(name);
             return (it != mPlatformTypes.end()) ? &(it->second) : nullptr;
         }
-        std::map<std::string, PlatformType> mPlatformTypes;
+        std::unordered_map<std::string, PlatformType> mPlatformTypes;
     };
 
     class ExportedFunctions {
@@ -123,9 +123,9 @@ struct Library::LibraryData
     std::map<std::string, AllocFunc> mDealloc; // deallocation functions
     std::map<std::string, AllocFunc> mRealloc; // reallocation functions
     std::unordered_map<std::string, FalseTrueMaybe> mNoReturn; // is function noreturn?
-    std::map<std::string, std::string> mReturnValue;
-    std::map<std::string, std::string> mReturnValueType;
-    std::map<std::string, int> mReturnValueContainer;
+    std::unordered_map<std::string, std::string> mReturnValue;
+    std::unordered_map<std::string, std::string> mReturnValueType;
+    std::unordered_map<std::string, int> mReturnValueContainer;
     std::map<std::string, std::vector<MathLib::bigint>> mUnknownReturnValues;
     std::map<std::string, bool> mReportErrors;
     std::map<std::string, bool> mProcessAfterCode;
@@ -137,7 +137,7 @@ struct Library::LibraryData
     std::map<std::string, int> mReflection; // invocation of reflection
     std::unordered_map<std::string, struct PodType> mPodTypes; // pod types
     std::map<std::string, PlatformType> mPlatformTypes; // platform independent typedefs
-    std::map<std::string, Platform> mPlatforms; // platform dependent typedefs
+    std::unordered_map<std::string, Platform> mPlatforms; // platform dependent typedefs
     std::map<std::pair<std::string,std::string>, TypeCheck> mTypeChecks;
     std::unordered_map<std::string, NonOverlappingData> mNonOverlappingData;
     std::unordered_set<std::string> mEntrypoints;
@@ -177,7 +177,7 @@ static std::vector<std::string> getnames(const char *names)
 
 static void gettokenlistfromvalid(const std::string& valid, TokenList& tokenList)
 {
-    const std::string str(valid + ',');
+    const std::string str(valid + ",\n");
     tokenList.createTokensFromBuffer(str.data(), str.size()); // TODO: check result?
     for (Token *tok = tokenList.front(); tok; tok = tok->next()) {
         if (Token::Match(tok,"- %num%")) {
@@ -194,12 +194,13 @@ Library::Error Library::load(const char exename[], const char path[], bool debug
     }
 
     const bool is_abs_path = Path::isAbsolute(path);
+    const bool is_rel_path = Path::isRelative(path);
 
     std::string fullfilename(path);
 
     // TODO: what if the extension is not .cfg?
-    // only append extension when we provide the library name and not a path - TODO: handle relative paths?
-    if (!is_abs_path && Path::getFilenameExtension(fullfilename).empty())
+    // only append extension when we provide the library name and not a path
+    if (!is_abs_path && !is_rel_path && Path::getFilenameExtension(fullfilename).empty())
         fullfilename += ".cfg";
 
     std::string absolute_path;
@@ -210,7 +211,7 @@ Library::Error Library::load(const char exename[], const char path[], bool debug
     tinyxml2::XMLError error = xml_LoadFile(doc, fullfilename.c_str());
     if (error == tinyxml2::XML_ERROR_FILE_NOT_FOUND) {
         // only perform further lookups when the given path was not absolute
-        if (!is_abs_path && error == tinyxml2::XML_ERROR_FILE_NOT_FOUND)
+        if (!is_abs_path)
         {
             std::list<std::string> cfgfolders;
     #ifdef FILESDIR
@@ -619,6 +620,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
                 container.startPattern2 = startPattern;
                 if (!endsWith(container.startPattern, '<'))
                     container.startPattern2 += " !!::";
+                container.startPatternHasStd = startsWith(container.startPattern2, "std :: ");
             }
             const char* const endPattern = node->Attribute("endPattern");
             if (endPattern)
@@ -930,6 +932,8 @@ Library::Error Library::loadFunction(const tinyxml2::XMLElement * const node, co
                 }
                 if (const char* const argIndirect = functionnode->Attribute("indirect")) {
                     const int indirect = strToInt<int>(argIndirect);
+                    if (indirect < 0 || indirect >= static_cast<int>(ac.direction.size()))
+                        return Error(ErrorCode::BAD_ATTRIBUTE_VALUE, argIndirect);
                     ac.direction[indirect] = dir; // TODO: handle multiple directions/indirect levels
                 }
                 else
@@ -1322,10 +1326,10 @@ const Library::ArgumentChecks * Library::getarg(const Token *ftok, int argnr) co
     const Function* func = nullptr;
     if (isNotLibraryFunction(ftok, &func))
         return nullptr;
-    const auto it2 = utils::as_const(func->argumentChecks).find(argnr);
+    const auto it2 = func->argumentChecks.find(argnr);
     if (it2 != func->argumentChecks.cend())
         return &it2->second;
-    const auto it3 = utils::as_const(func->argumentChecks).find(-1);
+    const auto it3 = func->argumentChecks.find(-1);
     if (it3 != func->argumentChecks.cend())
         return &it3->second;
     return nullptr;
@@ -1395,12 +1399,18 @@ const Library::Container* Library::detectContainerInternal(const Token* const ty
         break;
     }
 
+    const bool hasScope = typeStart->strAt(1) == "::";
+    const bool bailIfHasStd = !withoutStd && !hasScope;
+
     for (const std::pair<const std::string, Library::Container> & c : mData->mContainers) {
         const Container& container = c.second;
         if (container.startPattern.empty())
             continue;
 
-        const int offset = (withoutStd && startsWith(container.startPattern2, "std :: ")) ? 7 : 0;
+        if (bailIfHasStd && container.startPatternHasStd)
+            continue;
+
+        const int offset = (withoutStd && container.startPatternHasStd) ? 7 : 0;
 
         // If endPattern is undefined, it will always match, but itEndPattern has to be defined.
         if (detect != IteratorOnly && container.endPattern.empty()) {
@@ -1562,8 +1572,7 @@ bool Library::isCompliantValidationExpression(const char* p)
             error |= (*(p + 1) == '-');
         }
         else if (*p == ':') {
-            // cppcheck-suppress bitwiseOnBoolean - TODO: fix this
-            error |= range | (*(p + 1) == '.');
+            error |= range || (*(p + 1) == '.');
             range = true;
             has_dot = false;
             has_E = false;
@@ -1577,8 +1586,7 @@ bool Library::isCompliantValidationExpression(const char* p)
             has_dot = false;
             has_E = false;
         } else if (*p == '.') {
-            // cppcheck-suppress bitwiseOnBoolean - TODO: fix this
-            error |= has_dot | (!std::isdigit(*(p + 1)));
+            error |= has_dot || (!std::isdigit(*(p + 1)));
             has_dot = true;
         } else if (*p == 'E' || *p == 'e') {
             error |= has_E;
@@ -1775,6 +1783,8 @@ bool Library::isFunctionConst(const Token *ftok) const
             const Yield yield = astContainerYield(ftok->astParent()->astOperand1(), *this);
             if (yield == Yield::EMPTY || yield == Yield::SIZE || yield == Yield::BUFFER_NT)
                 return true;
+            if ((yield == Yield::START_ITERATOR || yield == Yield::END_ITERATOR) && ftok->str()[0] == 'c')
+                return true;
         }
         return false;
     }
diff --git a/lib/library.h b/lib/library.h
index b5b19a197b2..709a0db2b90 100644
--- a/lib/library.h
+++ b/lib/library.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 #include "config.h"
 #include "mathlib.h"
 #include "standards.h"
-#include "utils.h"
 
 #include <array>
 #include <cstdint>
@@ -239,23 +238,24 @@ class CPPCHECKLIB Library {
         bool unstableErase{};
         bool unstableInsert{};
         bool view{};
+        bool startPatternHasStd{};
 
         Action getAction(const std::string& function) const {
-            const auto i = utils::as_const(functions).find(function);
+            const auto i = functions.find(function);
             if (i != functions.end())
                 return i->second.action;
             return Action::NO_ACTION;
         }
 
         Yield getYield(const std::string& function) const {
-            const auto i = utils::as_const(functions).find(function);
+            const auto i = functions.find(function);
             if (i != functions.end())
                 return i->second.yield;
             return Yield::NO_YIELD;
         }
 
         const std::string& getReturnType(const std::string& function) const {
-            const auto i = utils::as_const(functions).find(function);
+            const auto i = functions.find(function);
             return (i != functions.end()) ? i->second.returnType : mEmptyString;
         }
 
@@ -481,7 +481,7 @@ class CPPCHECKLIB Library {
     std::string getFunctionName(const Token *ftok, bool &error) const;
 
     static const AllocFunc* getAllocDealloc(const std::map<std::string, AllocFunc> &data, const std::string &name) {
-        const auto it = utils::as_const(data).find(name);
+        const auto it = data.find(name);
         return (it == data.end()) ? nullptr : &it->second;
     }
 
diff --git a/lib/mathlib.cpp b/lib/mathlib.cpp
index f065d63a935..9aba7118858 100644
--- a/lib/mathlib.cpp
+++ b/lib/mathlib.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -266,7 +266,7 @@ MathLib::value MathLib::value::shiftLeft(const MathLib::value &v) const
     if (!isInt() || !v.isInt())
         throw InternalError(nullptr, "Shift operand is not integer");
     MathLib::value ret(*this);
-    if (v.mIntValue >= MathLib::bigint_bits) {
+    if (v.mIntValue < 0 || v.mIntValue >= MathLib::bigint_bits || ret.mIntValue < 0) {
         return ret;
     }
     ret.mIntValue <<= v.mIntValue;
@@ -278,7 +278,7 @@ MathLib::value MathLib::value::shiftRight(const MathLib::value &v) const
     if (!isInt() || !v.isInt())
         throw InternalError(nullptr, "Shift operand is not integer");
     MathLib::value ret(*this);
-    if (v.mIntValue >= MathLib::bigint_bits) {
+    if (v.mIntValue < 0 || v.mIntValue >= MathLib::bigint_bits) {
         return ret;
     }
     ret.mIntValue >>= v.mIntValue;
@@ -532,8 +532,15 @@ double MathLib::toDoubleNumber(const std::string &str, const Token * const tok)
     std::istringstream istr(str);
     istr.imbue(std::locale::classic());
     double ret;
-    if (!(istr >> ret))
-        throw InternalError(tok, "Internal Error. MathLib::toDoubleNumber: conversion failed: " + str);
+    if (!(istr >> ret)) {
+        // Out of the range of double, such as 1e10000 (glibc's HUGE_VAL for
+        // compilers other than GCC): the stream stores the largest finite
+        // value and fails, a compiler makes it infinity.
+        if (!isFloat(str) || std::fabs(ret) < std::numeric_limits<double>::max())
+            throw InternalError(tok, "Internal Error. MathLib::toDoubleNumber: conversion failed: " + str);
+        ret = std::copysign(std::numeric_limits<double>::infinity(), ret);
+        istr.clear();
+    }
     std::string s;
     if (istr >> s) {
         if (isDecimalFloat(str))
@@ -584,6 +591,13 @@ bool MathLib::isFloat(const std::string &str)
     return isDecimalFloat(str) || isFloatHex(str);
 }
 
+bool MathLib::isLongDoubleOutOfDoubleRange(const std::string &str)
+{
+    if (str.empty() || (str.back() != 'l' && str.back() != 'L') || !isFloat(str))
+        return false;
+    return std::isinf(toDoubleNumber(str));
+}
+
 bool MathLib::isDecimalFloat(const std::string &str)
 {
     if (str.empty())
@@ -1224,7 +1238,7 @@ std::string MathLib::calculate(const std::string &first, const std::string &seco
         return MathLib::toString(MathLib::toBigNumber(first) ^ MathLib::toBigNumber(second)) + intsuffix(first, second);
 
     default:
-        throw InternalError(nullptr, std::string("Unexpected action '") + action + "' in MathLib::calculate(). Please report this to Cppcheck developers.");
+        throw InternalError(nullptr, std::string("Unexpected action '") + action + "' in MathLib::calculate().");
     }
 }
 
diff --git a/lib/mathlib.h b/lib/mathlib.h
index d4cc344ee7a..bfa1a5b877b 100644
--- a/lib/mathlib.h
+++ b/lib/mathlib.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -75,7 +75,7 @@ class CPPCHECKLIB MathLib {
         }
 
         /**
-         * @throws InternalError thrown on invalid/unhandled calculation or divison by zero
+         * @throws InternalError thrown on invalid/unhandled calculation or division by zero
          */
         static value calc(char op, const value &v1, const value &v2);
         int compare(const value &v) const;
@@ -115,6 +115,8 @@ class CPPCHECKLIB MathLib {
 
     static bool isInt(const std::string & str);
     static bool isFloat(const std::string &str);
+    /** @brief a long double literal out of the range of double, such as 1e400L, which toDoubleNumber() makes infinity */
+    static bool isLongDoubleOutOfDoubleRange(const std::string &str);
     static bool isDecimalFloat(const std::string &str);
     static bool isNegative(const std::string &str);
     static bool isPositive(const std::string &str);
@@ -138,7 +140,7 @@ class CPPCHECKLIB MathLib {
     static std::string subtract(const std::string & first, const std::string & second);
     static std::string multiply(const std::string & first, const std::string & second);
     /**
-     * @throws InternalError thrown on overflow or divison by zero
+     * @throws InternalError thrown on overflow or division by zero
      */
     static std::string divide(const std::string & first, const std::string & second);
     /**
diff --git a/lib/path.cpp b/lib/path.cpp
index 4f18192c7c0..fc059cdea4e 100644
--- a/lib/path.cpp
+++ b/lib/path.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,6 +51,8 @@
 #endif
 #if defined(__APPLE__)
 #include <mach-o/dyld.h>
+#elif defined(__HAIKU__)
+#include <image.h>
 #endif
 
 
@@ -158,6 +160,17 @@ std::string Path::getCurrentExecutablePath(const char* fallback)
 #elif defined(__APPLE__)
     uint32_t size = sizeof(buf);
     success = (_NSGetExecutablePath(buf, &size) == 0);
+#elif defined(__HAIKU__)
+    int32 cookie = 0;
+    image_info info;
+    while (get_next_image_info(B_CURRENT_TEAM, &cookie, &info) == B_OK)
+    {
+        if (info.type == B_APP_IMAGE)
+        {
+            break;
+        }
+    }
+    return std::string(info.name);
 #else
     const char* procPath =
 #ifdef __SVR4 // Solaris
@@ -189,6 +202,12 @@ bool Path::isAbsolute(const std::string& path)
 #endif
 }
 
+bool Path::isRelative(const std::string& path)
+{
+    const std::string p = fromNativeSeparators(path);
+    return (p.find('/') != std::string::npos) && !isAbsolute(path);
+}
+
 std::string Path::getRelativePath(const std::string& absolutePath, const std::vector<std::string>& basePaths)
 {
     for (const std::string &bp : basePaths) {
@@ -387,7 +406,7 @@ std::string Path::getAbsoluteFilePath(const std::string& filePath)
     if (absolute)
         absolute_path = absolute;
     free(absolute);
-    // only throw on realpath() fialure to resolve a path when the given one was non-existent
+    // only throw on realpath() failure to resolve a path when the given one was non-existent
     if (!spath.empty() && absolute_path.empty() && !exists(spath))
         throw std::runtime_error("path '" + filePath + "' does not exist");
 #else
@@ -458,3 +477,8 @@ std::string Path::join(std::string path1, std::string path2)
         return path2;
     return ((path1.back() == '/') ? path1 : (path1 + "/")) + path2;
 }
+
+std::string Path::join(std::string path1, std::string path2, std::string path3)
+{
+    return Path::join(Path::join(std::move(path1), std::move(path2)), std::move(path3));
+}
diff --git a/lib/path.h b/lib/path.h
index 23db06c4e50..863e74580f8 100644
--- a/lib/path.h
+++ b/lib/path.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -118,6 +118,13 @@ class CPPCHECKLIB Path {
      */
     static bool isAbsolute(const std::string& path);
 
+    /**
+     * @brief Check if given path is relative
+     * @param path Path to check
+     * @return true if given path is relative
+     */
+    static bool isRelative(const std::string& path);
+
     /**
      * @brief Create a relative path from an absolute one, if absolute path is inside the basePaths.
      * @param absolutePath Path to be made relative.
@@ -206,6 +213,13 @@ class CPPCHECKLIB Path {
      * @return the joined path with normalized slashes
      */
     static std::string join(std::string path1, std::string path2);
+
+    /**
+     * @brief join 3 paths with '/' separators
+     * if path2 is an absolute path path1 will be dismissed.
+     * @return the joined path with normalized slashes
+     */
+    static std::string join(std::string path1, std::string path2, std::string path3);
 };
 
 /// @}
diff --git a/lib/pathmatch.cpp b/lib/pathmatch.cpp
index b7d78f048df..87420828f17 100644
--- a/lib/pathmatch.cpp
+++ b/lib/pathmatch.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ PathMatch::PathMatch(std::vector<std::string> patterns, std::string basepath, Sy
 
 bool PathMatch::match(const std::string &path, Filemode mode) const
 {
-    return std::any_of(mPatterns.cbegin(), mPatterns.cend(), [=] (const std::string &pattern) {
+    return std::any_of(mPatterns.cbegin(), mPatterns.cend(), [&] (const std::string &pattern) {
         return match(pattern, path, mBasepath, mode, mSyntax);
     });
 }
@@ -145,7 +145,7 @@ bool PathMatch::match(const std::string &pattern, const std::string &path, const
             continue;
         }
 
-        /* No more path seperators to try from */
+        /* No more path separators to try from */
         return false;
     }
 }
diff --git a/lib/pathmatch.h b/lib/pathmatch.h
index b89ddcbe40b..72fc89b7faa 100644
--- a/lib/pathmatch.h
+++ b/lib/pathmatch.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -169,10 +169,10 @@ class CPPCHECKLIB PathMatch {
         return pattern;
     }
 
-private:
-    friend class TestPathMatch;
+protected:
     class PathIterator;
 
+private:
     /* List of patterns */
     std::vector<std::string> mPatterns;
     /* Base path to with patterns and paths are relative */
@@ -274,9 +274,9 @@ class PathMatch::PathIterator {
     /* Position struct */
     struct Pos {
         /* String pointer */
-        const char *p;
+        const char *p{};
         /* Raw characters left */
-        std::size_t l;
+        std::size_t l{};
         /* Buffered character */
         int c {EOF};
     };
@@ -324,7 +324,7 @@ class PathMatch::PathIterator {
         return c == '/' || (syntax == Syntax::windows && c == '\\');
     }
 
-    /* Syntax helper, check if a chracter is a drive letter */
+    /* Syntax helper, check if a character is a drive letter */
     static bool isdrive(char c)
     {
         return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z');
diff --git a/lib/platform.cpp b/lib/platform.cpp
index 833c012ab8e..b956b687419 100644
--- a/lib/platform.cpp
+++ b/lib/platform.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,6 +40,7 @@ bool Platform::set(Type t)
     case Type::Unspecified: // unknown type sizes (sizes etc are set but are not known)
     case Type::Native: // same as system this code was compile on
         type = t;
+        windows = false;
         sizeof_bool = sizeof(bool);
         sizeof_short = sizeof(short);
         sizeof_int = sizeof(int);
@@ -62,6 +63,7 @@ bool Platform::set(Type t)
     case Type::Win32W:
     case Type::Win32A:
         type = t;
+        windows = true;
         sizeof_bool = 1; // 4 in Visual C++ 4.2
         sizeof_short = 2;
         sizeof_int = 4;
@@ -73,12 +75,13 @@ bool Platform::set(Type t)
         sizeof_wchar_t = 2;
         sizeof_size_t = 4;
         sizeof_pointer = 4;
-        defaultSign = '\0';
+        defaultSign = 's';
         char_bit = 8;
         calculateBitMembers();
         return true;
     case Type::Win64:
         type = t;
+        windows = true;
         sizeof_bool = 1;
         sizeof_short = 2;
         sizeof_int = 4;
@@ -90,12 +93,69 @@ bool Platform::set(Type t)
         sizeof_wchar_t = 2;
         sizeof_size_t = 8;
         sizeof_pointer = 8;
-        defaultSign = '\0';
+        defaultSign = 's';
+        char_bit = 8;
+        calculateBitMembers();
+        return true;
+    case Type::WinARM64:
+        type = t;
+        windows = true;
+        sizeof_bool = 1;
+        sizeof_short = 2;
+        sizeof_int = 4;
+        sizeof_long = 4;
+        sizeof_long_long = 8;
+        sizeof_float = 4;
+        sizeof_double = 8;
+        sizeof_long_double = 8;
+        sizeof_wchar_t = 2;
+        sizeof_size_t = 8;
+        sizeof_pointer = 8;
+        defaultSign = 's';
+        char_bit = 8;
+        calculateBitMembers();
+        return true;
+    case Type::WinARM64EC:
+        // ARM64EC is an x64-ABI on ARM64 hardware (VS 2022+).
+        // Pointer width and size_t are 64-bit; all other layout matches WinARM64.
+        type = t;
+        windows = true;
+        sizeof_bool = 1;
+        sizeof_short = 2;
+        sizeof_int = 4;
+        sizeof_long = 4;
+        sizeof_long_long = 8;
+        sizeof_float = 4;
+        sizeof_double = 8;
+        sizeof_long_double = 8;
+        sizeof_wchar_t = 2;
+        sizeof_size_t = 8;
+        sizeof_pointer = 8;
+        defaultSign = 's';
+        char_bit = 8;
+        calculateBitMembers();
+        return true;
+    case Type::WinARM:
+        type = t;
+        windows = true;
+        sizeof_bool = 1;
+        sizeof_short = 2;
+        sizeof_int = 4;
+        sizeof_long = 4;
+        sizeof_long_long = 8;
+        sizeof_float = 4;
+        sizeof_double = 8;
+        sizeof_long_double = 8;
+        sizeof_wchar_t = 2;
+        sizeof_size_t = 4;
+        sizeof_pointer = 4;
+        defaultSign = 's';
         char_bit = 8;
         calculateBitMembers();
         return true;
     case Type::Unix32:
         type = t;
+        windows = false;
         sizeof_bool = 1;
         sizeof_short = 2;
         sizeof_int = 4;
@@ -107,12 +167,13 @@ bool Platform::set(Type t)
         sizeof_wchar_t = 4;
         sizeof_size_t = 4;
         sizeof_pointer = 4;
-        defaultSign = '\0';
+        defaultSign = 's';
         char_bit = 8;
         calculateBitMembers();
         return true;
     case Type::Unix64:
         type = t;
+        windows = false;
         sizeof_bool = 1;
         sizeof_short = 2;
         sizeof_int = 4;
@@ -124,7 +185,7 @@ bool Platform::set(Type t)
         sizeof_wchar_t = 4;
         sizeof_size_t = 8;
         sizeof_pointer = 8;
-        defaultSign = '\0';
+        defaultSign = 's';
         char_bit = 8;
         calculateBitMembers();
         return true;
@@ -138,12 +199,19 @@ bool Platform::set(Type t)
 
 bool Platform::set(const std::string& platformstr, std::string& errstr, const std::vector<std::string>& paths, bool debug)
 {
+    // TODO: needs to be invalidated in case it was already set
     if (platformstr == "win32A")
         set(Type::Win32A);
     else if (platformstr == "win32W")
         set(Type::Win32W);
     else if (platformstr == "win64")
         set(Type::Win64);
+    else if (platformstr == "winARM64")
+        set(Type::WinARM64);
+    else if (platformstr == "winARM64EC")
+        set(Type::WinARM64EC);
+    else if (platformstr == "winARM")
+        set(Type::WinARM);
     else if (platformstr == "unix32")
         set(Type::Unix32);
     else if (platformstr == "unix64")
@@ -170,11 +238,12 @@ bool Platform::loadFromFile(const std::vector<std::string>& paths, const std::st
         std::cout << "looking for platform '" + filename + "'" << std::endl;
 
     const bool is_abs_path = Path::isAbsolute(filename);
+    const bool is_rel_path = Path::isRelative(filename);
 
     std::string fullfilename(filename);
     // TODO: what if extension is not .xml?
     // only append extension when we provide the library name is not a path - TODO: handle relative paths?
-    if (!is_abs_path && Path::getFilenameExtension(fullfilename).empty())
+    if (!is_abs_path && !is_rel_path && Path::getFilenameExtension(fullfilename).empty())
         fullfilename += ".xml";
 
     // TODO: use native separators
@@ -231,6 +300,14 @@ bool Platform::loadFromFile(const std::vector<std::string>& paths, const std::st
     return loadFromXmlDocument(&doc);
 }
 
+static const char* xmlText(const tinyxml2::XMLElement* node, bool& error)
+{
+    const char* const str = node->GetText();
+    if (!str)
+        error = true;
+    return str;
+}
+
 static unsigned int xmlTextAsUInt(const tinyxml2::XMLElement* node, bool& error)
 {
     unsigned int retval = 0;
@@ -239,6 +316,14 @@ static unsigned int xmlTextAsUInt(const tinyxml2::XMLElement* node, bool& error)
     return retval;
 }
 
+static unsigned int xmlTextAsBool(const tinyxml2::XMLElement* node, bool& error)
+{
+    bool retval = false;
+    if (node->QueryBoolText(&retval) != tinyxml2::XML_SUCCESS)
+        error = true;
+    return retval;
+}
+
 bool Platform::loadFromXmlDocument(const tinyxml2::XMLDocument *doc)
 {
     const tinyxml2::XMLElement * const rootnode = doc->FirstChildElement();
@@ -250,11 +335,9 @@ bool Platform::loadFromXmlDocument(const tinyxml2::XMLDocument *doc)
     for (const tinyxml2::XMLElement *node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) {
         const char* name = node->Name();
         if (std::strcmp(name, "default-sign") == 0) {
-            const char* str = node->GetText();
-            if (str)
+            const char * const str = xmlText(node, error);
+            if (!error)
                 defaultSign = *str;
-            else
-                error = true;
         } else if (std::strcmp(name, "char_bit") == 0)
             char_bit = xmlTextAsUInt(node, error);
         else if (std::strcmp(name, "sizeof") == 0) {
@@ -284,6 +367,9 @@ bool Platform::loadFromXmlDocument(const tinyxml2::XMLDocument *doc)
                     sizeof_wchar_t = xmlTextAsUInt(sz, error);
             }
         }
+        else if (std::strcmp(node->Name(), "windows") == 0) {
+            windows = xmlTextAsBool(node, error);
+        }
     }
     calculateBitMembers();
     type = Type::File;
diff --git a/lib/platform.h b/lib/platform.h
index 4673c4859e6..f630df9cbd7 100644
--- a/lib/platform.h
+++ b/lib/platform.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@
 #include "config.h"
 #include "mathlib.h"
 #include "standards.h"
+#include "utils.h"
 
 #include <cassert>
 #include <climits>
 #include <cstddef>
 #include <cstdint>
-#include <stdexcept>
 #include <string>
 #include <vector>
 
@@ -132,12 +132,17 @@ class CPPCHECKLIB Platform {
 
     char defaultSign;  // unsigned:'u', signed:'s', unknown:'\0'
 
+    bool windows{false}; // indicates if the platform is Windows
+
     enum Type : std::uint8_t {
         Unspecified, // No platform specified
         Native, // whatever system this code was compiled on
         Win32A,
         Win32W,
         Win64,
+        WinARM64,
+        WinARM64EC,
+        WinARM,
         Unix32,
         Unix64,
         File
@@ -167,9 +172,7 @@ class CPPCHECKLIB Platform {
      * @return true if Windows platform type.
      */
     bool isWindows() const {
-        return type == Type::Win32A ||
-               type == Type::Win32W ||
-               type == Type::Win64;
+        return windows;
     }
 
     const char *toString() const {
@@ -188,15 +191,20 @@ class CPPCHECKLIB Platform {
             return "win32W";
         case Type::Win64:
             return "win64";
+        case Type::WinARM64:
+            return "winARM64";
+        case Type::WinARM64EC:
+            return "winARM64EC";
+        case Type::WinARM:
+            return "winARM";
         case Type::Unix32:
             return "unix32";
         case Type::Unix64:
             return "unix64";
         case Type::File:
             return "platformFile";
-        default:
-            throw std::runtime_error("unknown platform");
         }
+        cppcheck::unreachable();
     }
 
     long long unsignedCharMax() const {
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
index 123ef5ca898..c14eaf813ad 100644
--- a/lib/preprocessor.cpp
+++ b/lib/preprocessor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "library.h"
+#include "mathlib.h"
 #include "path.h"
 #include "platform.h"
 #include "settings.h"
@@ -71,15 +72,13 @@ Preprocessor::Preprocessor(simplecpp::TokenList& tokens, const Settings& setting
 
 namespace {
     struct BadInlineSuppression {
-        BadInlineSuppression(std::string file, const int line, unsigned int col, std::string msg) : file(std::move(file)), line(line), col(col), errmsg(std::move(msg)) {}
-        std::string file;
-        int line; // TODO: needs to be unsigned
-        unsigned int col;
+        BadInlineSuppression(const simplecpp::Location& loc, std::string msg) : location(loc), errmsg(std::move(msg)) {}
+        simplecpp::Location location;
         std::string errmsg;
     };
 }
 
-static bool parseInlineSuppressionCommentToken(const simplecpp::TokenList &tokens, const simplecpp::Token *tok, std::list<SuppressionList::Suppression> &inlineSuppressions, std::list<BadInlineSuppression> &bad)
+static bool parseInlineSuppressionCommentToken(const simplecpp::Token *tok, std::list<SuppressionList::Suppression> &inlineSuppressions, std::list<BadInlineSuppression> &bad)
 {
     const std::string cppchecksuppress("cppcheck-suppress");
 
@@ -92,7 +91,7 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::TokenList &token
     if (comment.substr(pos1, cppchecksuppress.size()) != cppchecksuppress)
         return false;
     if (pos1 + cppchecksuppress.size() >= comment.size()) {
-        bad.emplace_back(tokens.file(tok->location), tok->location.line, 0, "suppression without error ID");
+        bad.emplace_back(tok->location, "suppression without error ID");
         return false;
     }
 
@@ -102,7 +101,7 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::TokenList &token
     // skip spaces after "cppcheck-suppress" and its possible prefix
     const std::string::size_type pos2 = comment.find_first_not_of(' ', posEndComment);
     if (pos2 == std::string::npos) {
-        bad.emplace_back(tokens.file(tok->location), tok->location.line, 0, "suppression without error ID");
+        bad.emplace_back(tok->location, "suppression without error ID");
         return false;
     }
 
@@ -112,7 +111,7 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::TokenList &token
     if (posEndComment >= (pos1 + cppchecksuppress.size() + 1)) {
         const std::string suppressCmdString = comment.substr(pos1, pos2-pos1-1);
         if (comment.at(pos1 + cppchecksuppress.size()) != '-') {
-            bad.emplace_back(tokens.file(tok->location), tok->location.line, 0, "unknown suppression type '" + suppressCmdString + "'"); // TODO: set column
+            bad.emplace_back(tok->location, "unknown suppression type '" + suppressCmdString + "'");
             return false;
         }
 
@@ -131,7 +130,7 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::TokenList &token
         else if ("macro" == suppressTypeString)
             errorType = SuppressionList::Type::macro;
         else {
-            bad.emplace_back(tokens.file(tok->location), tok->location.line, 0, "unknown suppression type '" + suppressCmdString + "'"); // TODO: set column
+            bad.emplace_back(tok->location, "unknown suppression type '" + suppressCmdString + "'");
             return false;
         }
     }
@@ -145,11 +144,12 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::TokenList &token
             s.isInline = true;
             s.type = errorType;
             s.lineNumber = tok->location.line;
+            s.column = tok->location.col;
         }
 
         // TODO: return false?
         if (!errmsg.empty())
-            bad.emplace_back(tokens.file(tok->location), tok->location.line, tok->location.col, std::move(errmsg));
+            bad.emplace_back(tok->location, std::move(errmsg));
 
         // TODO: report ones without ID - return false?
         std::copy_if(suppressions.cbegin(), suppressions.cend(), std::back_inserter(inlineSuppressions), [](const SuppressionList::Suppression& s) {
@@ -165,6 +165,7 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::TokenList &token
         s.isInline = true;
         s.type = errorType;
         s.lineNumber = tok->location.line;
+        s.column = tok->location.col;
 
         // TODO: report when no ID - unreachable?
         if (!s.errorId.empty())
@@ -173,7 +174,7 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::TokenList &token
         // TODO: unreachable?
         // TODO: return false?
         if (!errmsg.empty())
-            bad.emplace_back(tokens.file(tok->location), tok->location.line, tok->location.col, std::move(errmsg));
+            bad.emplace_back(tok->location, std::move(errmsg));
     }
 
     return true;
@@ -200,6 +201,8 @@ static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Sett
 
     bool onlyComments = true;
 
+    polyspace::Parser polyspaceParser(settings);
+
     for (const simplecpp::Token *tok = tokens.cfront(); tok; tok = tok->next) {
         if (!tok->comment) {
             onlyComments = false;
@@ -207,20 +210,24 @@ static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Sett
         }
 
         std::list<SuppressionList::Suppression> inlineSuppressions;
-        if (!parseInlineSuppressionCommentToken(tokens, tok, inlineSuppressions, bad))
-            continue;
+        if (polyspace::isPolyspaceComment(tok->str())) {
+            inlineSuppressions = polyspaceParser.parse(tok->str(), tok->location.line, getRelativeFilename(tokens, tok, settings));
+        } else {
+            if (!parseInlineSuppressionCommentToken(tok, inlineSuppressions, bad))
+                continue;
 
-        if (!sameline(tok->previous, tok)) {
-            // find code after comment..
-            if (tok->next) {
-                tok = tok->next;
+            if (!sameline(tok->previous, tok)) {
+                // find code after comment..
+                if (tok->next) {
+                    tok = tok->next;
 
-                while (tok->comment) {
-                    parseInlineSuppressionCommentToken(tokens, tok, inlineSuppressions, bad);
-                    if (tok->next) {
-                        tok = tok->next;
-                    } else {
-                        break;
+                    while (tok->comment) {
+                        parseInlineSuppressionCommentToken(tok, inlineSuppressions, bad);
+                        if (tok->next) {
+                            tok = tok->next;
+                        } else {
+                            break;
+                        }
                     }
                 }
             }
@@ -248,9 +255,11 @@ static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Sett
         // Add the suppressions.
         for (SuppressionList::Suppression &suppr : inlineSuppressions) {
             suppr.fileName = relativeFilename;
+            suppr.fileIndex = tok->location.fileIndex;
 
-            if (SuppressionList::Type::blockBegin == suppr.type)
-            {
+            if (SuppressionList::Type::block == suppr.type) {
+                suppressions.addSuppression(std::move(suppr));
+            } else if (SuppressionList::Type::blockBegin == suppr.type) {
                 inlineSuppressionsBlockBegin.push_back(std::move(suppr));
             } else if (SuppressionList::Type::blockEnd == suppr.type) {
                 bool throwError = true;
@@ -270,6 +279,7 @@ static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Sett
                             suppr.lineBegin = supprBegin->lineNumber;
                             suppr.lineEnd = suppr.lineNumber;
                             suppr.lineNumber = supprBegin->lineNumber;
+                            suppr.column = supprBegin->column;
                             suppr.type = SuppressionList::Type::block;
                             inlineSuppressionsBlockBegin.erase(supprBegin);
                             suppressions.addSuppression(std::move(suppr)); // TODO: check result
@@ -281,8 +291,12 @@ static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Sett
                 }
 
                 if (throwError) {
+                    simplecpp::Location loc;
                     // NOLINTNEXTLINE(bugprone-use-after-move) - moved only when thrownError is false
-                    bad.emplace_back(suppr.fileName, suppr.lineNumber, 0, "Suppress End: No matching begin"); // TODO: set column
+                    loc.fileIndex = suppr.fileIndex;
+                    loc.line = suppr.lineNumber;
+                    loc.col = suppr.column;
+                    bad.emplace_back(loc, "Suppress End: No matching begin");
                 }
             } else if (SuppressionList::Type::unique == suppr.type || suppr.type == SuppressionList::Type::macro) {
                 // special handling when suppressing { warnings for backwards compatibility
@@ -296,83 +310,75 @@ static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Sett
 
                 suppr.thisAndNextLine = thisAndNextLine;
                 suppr.lineNumber = tok->location.line;
+                suppr.column = tok->location.col;
                 suppr.macroName = macroName;
                 suppressions.addSuppression(std::move(suppr)); // TODO: check result
             } else if (SuppressionList::Type::file == suppr.type) {
                 if (onlyComments)
                     suppressions.addSuppression(std::move(suppr)); // TODO: check result
-                else
-                    bad.emplace_back(suppr.fileName, suppr.lineNumber, 0, "File suppression should be at the top of the file"); // TODO: set column
+                else {
+                    simplecpp::Location loc;
+                    loc.fileIndex = suppr.fileIndex;
+                    loc.line = suppr.lineNumber;
+                    loc.col = suppr.column;
+                    bad.emplace_back(loc, "File suppression should be at the top of the file");
+                }
             }
         }
     }
 
-    for (const SuppressionList::Suppression & suppr: inlineSuppressionsBlockBegin)
-        // cppcheck-suppress useStlAlgorithm
-        bad.emplace_back(suppr.fileName, suppr.lineNumber, 0, "Suppress Begin: No matching end"); // TODO: set column
+    for (const SuppressionList::Suppression & suppr: inlineSuppressionsBlockBegin) {
+        simplecpp::Location loc;
+        loc.fileIndex = suppr.fileIndex;
+        loc.line = suppr.lineNumber;
+        loc.col = suppr.column;
+        bad.emplace_back(loc, "Suppress Begin: No matching end");
+    }
 }
 
-void Preprocessor::inlineSuppressions(SuppressionList &suppressions)
+void Preprocessor::inlineSuppressions(SuppressionList &suppressions) const
+{
+    inlineSuppressions(mTokens, suppressions);
+}
+
+void Preprocessor::inlineSuppressions(const simplecpp::TokenList &tokens, SuppressionList &suppressions) const
 {
     if (!mSettings.inlineSuppressions)
         return;
     std::list<BadInlineSuppression> err;
-    ::addInlineSuppressions(mTokens, mSettings, suppressions, err);
-    for (const auto &filedata : mFileCache) {
-        ::addInlineSuppressions(filedata->tokens, mSettings, suppressions, err);
-    }
+    ::addInlineSuppressions(tokens, mSettings, suppressions, err);
     for (const BadInlineSuppression &bad : err) {
-        invalidSuppression(bad.file, bad.line, bad.col, bad.errmsg); // TODO: column is always 0
+        invalidSuppression(bad.location, bad.errmsg);
     }
 }
 
-std::vector<RemarkComment> Preprocessor::getRemarkComments() const
+void Preprocessor::createDirectives(std::list<Directive> &directives) const
 {
-    std::vector<RemarkComment> ret;
-    addRemarkComments(mTokens, ret);
-    for (const auto &filedata : mFileCache) {
-        addRemarkComments(filedata->tokens, ret);
-    }
-    return ret;
+    createDirectives(mTokens, directives);
 }
 
-std::list<Directive> Preprocessor::createDirectives() const
+void Preprocessor::createDirectives(const simplecpp::TokenList &tokens, std::list<Directive> &directives)
 {
-    // directive list..
-    std::list<Directive> directives;
-
-    std::vector<const simplecpp::TokenList *> list;
-    list.reserve(1U + mFileCache.size());
-    list.push_back(&mTokens);
-    std::transform(mFileCache.cbegin(), mFileCache.cend(), std::back_inserter(list),
-                   [](const std::unique_ptr<simplecpp::FileData> &filedata) {
-        return &filedata->tokens;
-    });
-
-    for (const simplecpp::TokenList *tokenList : list) {
-        for (const simplecpp::Token *tok = tokenList->cfront(); tok; tok = tok->next) {
-            if ((tok->op != '#') || (tok->previous && tok->previous->location.line == tok->location.line))
-                continue;
-            if (tok->next && tok->next->str() == "endfile")
+    for (const simplecpp::Token *tok = tokens.cfront(); tok; tok = tok->next) {
+        if ((tok->op != '#') || (tok->previous && tok->previous->location.line == tok->location.line))
+            continue;
+        if (tok->next && tok->next->str() == "endfile")
+            continue;
+        Directive directive(tokens, tok->location, "");
+        for (const simplecpp::Token *tok2 = tok; tok2 && tok2->location.line == directive.linenr; tok2 = tok2->next) {
+            if (tok2->comment)
                 continue;
-            Directive directive(mTokens, tok->location, "");
-            for (const simplecpp::Token *tok2 = tok; tok2 && tok2->location.line == directive.linenr; tok2 = tok2->next) {
-                if (tok2->comment)
-                    continue;
-                if (!directive.str.empty() && (tok2->location.col > tok2->previous->location.col + tok2->previous->str().size()))
-                    directive.str += ' ';
-                if (directive.str == "#" && tok2->str() == "file")
-                    directive.str += "include";
-                else
-                    directive.str += tok2->str();
-
-                directive.strTokens.emplace_back(*tok2);
-            }
-            directives.push_back(std::move(directive));
+            if (!directive.str.empty() && (tok2->location.col > tok2->previous->location.col + tok2->previous->str().size()))
+                directive.str += ' ';
+            if (directive.str == "#" && tok2->str() == "file")
+                directive.str += "include";
+            else
+                directive.str += tok2->str();
+
+            directive.strTokens.emplace_back(*tok2);
         }
+        directives.push_back(std::move(directive));
     }
-
-    return directives;
 }
 
 static std::string readcondition(const simplecpp::Token *iftok, const std::set<std::string> &defined, const std::set<std::string> &undefined)
@@ -413,39 +419,75 @@ static std::string readcondition(const simplecpp::Token *iftok, const std::set<s
 
     if (len == 3 && cond->name && (next1->str() == "==" || next1->str() == "<=" || next1->str() == ">=") && next2->number) {
         if (defined.find(cond->str()) == defined.end())
-            return cond->str() + '=' + cond->next->next->str();
+            return cond->str() + '=' + next1->next->str();
     }
 
+    const auto lessGreaterThanConfig = [](const simplecpp::Token* dtok, const simplecpp::Token* ctok) {
+        auto v = MathLib::toBigNumber(ctok->next->str());
+        if (ctok->op == '<')
+            v -= 1;
+        else
+            v += 1;
+        return dtok->str() + '=' + std::to_string(v);
+    };
+
     if (len == 3 && cond->name && (next1->op == '<' || next1->op == '>') && next2->number) {
         if (defined.find(cond->str()) == defined.end()) {
-            int v = strToInt<int>(cond->next->next->str());
-            if (next1->op == '<')
-                v -= 1;
-            else
-                v += 1;
-            return cond->str() + '=' + std::to_string(v);
+            return lessGreaterThanConfig(cond, next1);
         }
     }
 
     std::set<std::string> configset;
+    bool isNotDefinedMacro = false;
     for (; sameline(iftok,cond); cond = cond->next) {
         if (cond->op == '!') {
             if (!sameline(iftok,cond->next) || !cond->next->name)
                 break;
-            if (cond->next->str() == "defined")
+            if (cond->next->str() == "defined") {
+                isNotDefinedMacro = true;
                 continue;
+            }
             configset.insert(cond->next->str() + "=0");
             continue;
         }
-        if (cond->str() != "defined")
+        if (cond->str() == "==" || cond->str() == "<=" || cond->str() == ">=") {
+            if (!cond->next)
+                break;
+            if (cond->next->number) {
+                const simplecpp::Token *dtok = cond->previous;
+                if (sameline(iftok,dtok) && dtok->name && defined.find(dtok->str()) == defined.end() && undefined.find(dtok->str()) == undefined.end())
+                    configset.insert(dtok->str() + '=' + cond->next->str());
+            }
             continue;
-        const simplecpp::Token *dtok = cond->next;
-        if (!dtok)
-            break;
-        if (dtok->op == '(')
-            dtok = dtok->next;
-        if (sameline(iftok,dtok) && dtok->name && defined.find(dtok->str()) == defined.end() && undefined.find(dtok->str()) == undefined.end())
-            configset.insert(dtok->str());
+        }
+        if (cond->op == '<' || cond->op == '>') {
+            if (!cond->next)
+                break;
+            if (cond->next->number) {
+                const simplecpp::Token *dtok = cond->previous;
+                if (sameline(iftok,dtok) && dtok->name && defined.find(dtok->str()) == defined.end() && undefined.find(dtok->str()) == undefined.end()) {
+                    configset.insert(lessGreaterThanConfig(dtok, cond));
+                }
+            }
+            continue;
+        }
+        if (cond->str() == "defined") {
+            const simplecpp::Token *dtok = cond->next;
+            if (!dtok)
+                break;
+            if (dtok->op == '(')
+                dtok = dtok->next;
+
+            if (sameline(iftok,dtok) && dtok->name && defined.find(dtok->str()) == defined.end() && undefined.find(dtok->str()) == undefined.end()) {
+                if (!isNotDefinedMacro) {
+                    configset.insert(dtok->str() + "=" + dtok->str()); // if defined is set to itself.
+                } else {
+                    configset.insert(dtok->str());
+                }
+                isNotDefinedMacro = false;
+            }
+            continue;
+        }
     }
     std::string cfgStr;
     for (const std::string &s : configset) {
@@ -456,18 +498,19 @@ static std::string readcondition(const simplecpp::Token *iftok, const std::set<s
     return cfgStr;
 }
 
-static bool hasDefine(const std::string &userDefines, const std::string &cfg)
+static bool hasDefine(const std::string &userDefines, const std::string &cfgStr)
 {
-    if (cfg.empty()) {
+    if (cfgStr.empty()) {
         return false;
     }
 
     std::string::size_type pos = 0;
+    const std::string cfgname = cfgStr.substr(0, cfgStr.find('='));
     while (pos < userDefines.size()) {
-        pos = userDefines.find(cfg, pos);
+        pos = userDefines.find(cfgname, pos);
         if (pos == std::string::npos)
             break;
-        const std::string::size_type pos2 = pos + cfg.size();
+        const std::string::size_type pos2 = pos + cfgname.size();
         if ((pos == 0 || userDefines[pos-1U] == ';') && (pos2 == userDefines.size() || userDefines[pos2] == '='))
             return true;
         pos = pos2;
@@ -493,11 +536,11 @@ static std::string cfg(const std::vector<std::string> &configs, const std::strin
     return ret;
 }
 
-static bool isUndefined(const std::string &cfg, const std::set<std::string> &undefined)
+static bool isUndefined(const std::string &cfgStr, const std::set<std::string> &undefined)
 {
-    for (std::string::size_type pos1 = 0U; pos1 < cfg.size();) {
-        const std::string::size_type pos2 = cfg.find(';',pos1);
-        const std::string def = (pos2 == std::string::npos) ? cfg.substr(pos1) : cfg.substr(pos1, pos2 - pos1);
+    for (std::string::size_type pos1 = 0U; pos1 < cfgStr.size();) {
+        const std::string::size_type pos2 = cfgStr.find(';',pos1);
+        const std::string def = (pos2 == std::string::npos) ? cfgStr.substr(pos1) : cfgStr.substr(pos1, pos2 - pos1);
 
         const std::string::size_type eq = def.find('=');
         if (eq == std::string::npos && undefined.find(def) != undefined.end())
@@ -553,8 +596,11 @@ static void getConfigs(const simplecpp::TokenList &tokens, std::set<std::string>
                 const simplecpp::Token *expr1 = cmdtok->next;
                 if (sameline(tok,expr1) && expr1->name && !sameline(tok,expr1->next))
                     config = expr1->str();
-                if (defined.find(config) != defined.end())
+                if (defined.find(config) != defined.end()) {
                     config.clear();
+                } else if ((cmdtok->str() == "ifdef") && sameline(cmdtok,expr1) && !config.empty()) {
+                    config.append("=" + expr1->str()); //Set equal to itself if ifdef.
+                }
             } else if (cmdtok->str() == "if") {
                 config = readcondition(cmdtok, defined, undefined);
             }
@@ -594,6 +640,24 @@ static void getConfigs(const simplecpp::TokenList &tokens, std::set<std::string>
                 }
             }
 
+            // check if config already exists in the ret set, but as a more general or more specific version
+            if (cmdtok->str() != "ifndef")
+            {
+                const std::string::size_type eq = config.find('=');
+                const std::string config2 = (eq != std::string::npos) ? config.substr(0, eq) : config + "=" + config;
+                const std::set<std::string>::iterator it2 = ret.find(config2);
+                if (it2 != ret.end()) {
+                    if (eq == std::string::npos) {
+                        // The instance in ret is more specific than the one in config (no =value), replace it with the one in config
+                        ret.erase(it2);
+                    } else {
+                        // The instance in ret is more general than the one in config (have =value), keep the one in ret
+                        config.clear();
+                        continue;
+                    }
+                }
+            }
+
             configs_if.push_back((cmdtok->str() == "ifndef") ? std::string() : config);
             configs_ifndef.push_back((cmdtok->str() == "ifndef") ? std::move(config) : std::string());
             ret.insert(cfg(configs_if,userDefines));
@@ -627,8 +691,18 @@ static void getConfigs(const simplecpp::TokenList &tokens, std::set<std::string>
                 configs_if.push_back(std::move(config));
                 ret.insert(cfg(configs_if, userDefines));
             } else if (!configs_ifndef.empty()) {
-                configs_if.push_back(configs_ifndef.back());
-                ret.insert(cfg(configs_if, userDefines));
+                //Check if ifndef already existing in ret as more general/specific version
+                const std::string &confCandidate = configs_ifndef.back();
+                if (ret.find(confCandidate) == ret.end()) {
+                    // No instance of config_ifndef in ret. Check if a more specific version exists, in that case replace it
+                    const std::set<std::string>::iterator it = ret.find(confCandidate + "=" + confCandidate);
+                    if (it != ret.end()) {
+                        // The instance in ret is more specific than the one in confCandidate (no =value), replace it with the one in confCandidate
+                        ret.erase(it);
+                    }
+                    configs_if.push_back(configs_ifndef.back());
+                    ret.insert(cfg(configs_if, userDefines));
+                }
             }
         } else if (cmdtok->str() == "endif" && !sameline(tok, cmdtok->next)) {
             if (!configs_if.empty())
@@ -677,43 +751,28 @@ static void getConfigs(const simplecpp::TokenList &tokens, std::set<std::string>
         ret.insert(std::move(elseError));
 }
 
-
-std::set<std::string> Preprocessor::getConfigs() const
+void Preprocessor::getConfigs(std::set<std::string> &defined, std::set<std::string> &configs) const
 {
-    std::set<std::string> ret = { "" };
     if (!mTokens.cfront())
-        return ret;
-
-    std::set<std::string> defined = { "__cplusplus" };
-
-    // Insert library defines
-    for (const auto &define : mSettings.library.defines()) {
-
-        const std::string::size_type paren = define.find("(");
-        const std::string::size_type space = define.find(" ");
-        std::string::size_type end = space;
-
-        if (paren != std::string::npos && paren < space)
-            end = paren;
-
-        defined.insert(define.substr(0, end));
-    }
+        return;
 
-    ::getConfigs(mTokens, defined, mSettings.userDefines, mSettings.userUndefs, ret);
+    ::getConfigs(mTokens, defined, mSettings.userDefines, mSettings.userUndefs, configs);
+}
 
-    for (const auto &filedata : mFileCache) {
-        if (!mSettings.configurationExcluded(filedata->filename))
-            ::getConfigs(filedata->tokens, defined, mSettings.userDefines, mSettings.userUndefs, ret);
-    }
+void Preprocessor::getConfigs(const std::string &filename, const simplecpp::TokenList &tokens, std::set<std::string> &defined, std::set<std::string> &configs) const
+{
+    if (!tokens.cfront())
+        return;
 
-    return ret;
+    if (!mSettings.configurationExcluded(filename))
+        ::getConfigs(tokens, defined, mSettings.userDefines, mSettings.userUndefs, configs);
 }
 
-static void splitcfg(const std::string &cfg, std::list<std::string> &defines, const std::string &defaultValue)
+static void splitcfg(const std::string &cfgStr, std::list<std::string> &defines, const std::string &defaultValue)
 {
-    for (std::string::size_type defineStartPos = 0U; defineStartPos < cfg.size();) {
-        const std::string::size_type defineEndPos = cfg.find(';', defineStartPos);
-        std::string def = (defineEndPos == std::string::npos) ? cfg.substr(defineStartPos) : cfg.substr(defineStartPos, defineEndPos - defineStartPos);
+    for (std::string::size_type defineStartPos = 0U; defineStartPos < cfgStr.size();) {
+        const std::string::size_type defineEndPos = cfgStr.find(';', defineStartPos);
+        std::string def = (defineEndPos == std::string::npos) ? cfgStr.substr(defineStartPos) : cfgStr.substr(defineStartPos, defineEndPos - defineStartPos);
         if (!defaultValue.empty() && def.find('=') == std::string::npos)
             def += '=' + defaultValue;
         defines.push_back(std::move(def));
@@ -723,14 +782,14 @@ static void splitcfg(const std::string &cfg, std::list<std::string> &defines, co
     }
 }
 
-static simplecpp::DUI createDUI(const Settings &mSettings, const std::string &cfg, Standards::Language lang)
+static simplecpp::DUI createDUI(const Settings &mSettings, const std::string &cfgStr, Standards::Language lang)
 {
     // TODO: make it possible to specify platform-dependent sizes
     simplecpp::DUI dui;
 
     splitcfg(mSettings.userDefines, dui.defines, "1");
-    if (!cfg.empty())
-        splitcfg(cfg, dui.defines, "");
+    if (!cfgStr.empty())
+        splitcfg(cfgStr, dui.defines, "");
 
     for (const std::string &def : mSettings.library.defines()) {
         const std::string::size_type pos = def.find_first_of(" (");
@@ -774,21 +833,30 @@ const simplecpp::Output* Preprocessor::handleErrors(const simplecpp::OutputList&
     return reportOutput(outputList, showerror);
 }
 
-bool Preprocessor::loadFiles(std::vector<std::string> &files)
+bool Preprocessor::loadAllIncludes(std::vector<std::string> &files)
 {
     const simplecpp::DUI dui = createDUI(mSettings, "", mLang);
 
     simplecpp::OutputList outputList;
-    mFileCache = simplecpp::load(mTokens, files, dui, &outputList);
+    mFileCache = simplecpp::load(mTokens, files, dui, &outputList, std::move(mFileCache));
     return !handleErrors(outputList);
 }
 
+simplecpp::FileData *Preprocessor::loadFile(std::vector<std::string> &files, const std::string &file)
+{
+    const simplecpp::DUI dui = createDUI(mSettings, "", mLang);
+
+    return mFileCache.get("", file, dui, false, files, nullptr).first;
+}
+
 void Preprocessor::removeComments()
 {
-    mTokens.removeComments();
-    for (const auto &filedata : mFileCache) {
-        filedata->tokens.removeComments();
-    }
+    removeComments(mTokens);
+}
+
+void Preprocessor::removeComments(simplecpp::TokenList &tokens)
+{
+    tokens.removeComments();
 }
 
 void Preprocessor::setPlatformInfo()
@@ -811,9 +879,9 @@ void Preprocessor::setPlatformInfo()
     mTokens.sizeOfType["long double *"] = mSettings.platform.sizeof_pointer;
 }
 
-simplecpp::TokenList Preprocessor::preprocess(const std::string &cfg, std::vector<std::string> &files, simplecpp::OutputList& outputList)
+simplecpp::TokenList Preprocessor::preprocess(const std::string &cfgStr, std::vector<std::string> &files, simplecpp::OutputList& outputList)
 {
-    const simplecpp::DUI dui = createDUI(mSettings, cfg, mLang);
+    const simplecpp::DUI dui = createDUI(mSettings, cfgStr, mLang);
 
     std::list<simplecpp::MacroUsage> macroUsage;
     std::list<simplecpp::IfCond> ifCond;
@@ -822,15 +890,16 @@ simplecpp::TokenList Preprocessor::preprocess(const std::string &cfg, std::vecto
     mMacroUsage = std::move(macroUsage);
     mIfCond = std::move(ifCond);
 
-    tokens2.removeComments();
+    if (!mSettings.keepComments)
+        tokens2.removeComments();
 
     return tokens2;
 }
 
-std::string Preprocessor::getcode(const std::string &cfg, std::vector<std::string> &files, const bool writeLocations)
+std::string Preprocessor::getcode(const std::string &cfgStr, std::vector<std::string> &files, const bool writeLocations)
 {
     simplecpp::OutputList outputList;
-    simplecpp::TokenList tokens2 = preprocess(cfg, files, outputList);
+    simplecpp::TokenList tokens2 = preprocess(cfgStr, files, outputList);
     handleErrors(outputList);
     unsigned int prevfile = 0;
     unsigned int line = 1;
@@ -851,6 +920,13 @@ std::string Preprocessor::getcode(const std::string &cfg, std::vector<std::strin
         if (!tok->macro.empty())
             ret << Preprocessor::macroChar;
         ret << tok->str();
+
+        if (tok->comment)
+            line += std::count_if(tok->str().cbegin(),
+                                  tok->str().cend(),
+                                  [](char c) {
+                return c == '\n';
+            });
     }
 
     return ret.str();
@@ -865,30 +941,33 @@ const simplecpp::Output* Preprocessor::reportOutput(const simplecpp::OutputList
         case simplecpp::Output::ERROR:
             out_ret = &out;
             if (!startsWith(out.msg,"#error") || showerror)
-                error(mTokens.file(out.location), out.location.line, out.location.col, out.msg, out.type);
+                error(out.location, out.msg, out.type);
             break;
         case simplecpp::Output::WARNING:
         case simplecpp::Output::PORTABILITY_BACKSLASH:
+        case simplecpp::Output::PORTABILITY_LINE_DIRECTIVE:
+        case simplecpp::Output::PORTABILITY_NO_EOF_NEWLINE:
             break;
         case simplecpp::Output::MISSING_HEADER: {
             // not considered an "error"
             const std::string::size_type pos1 = out.msg.find_first_of("<\"");
             const std::string::size_type pos2 = out.msg.find_first_of(">\"", pos1 + 1U);
             if (pos1 < pos2 && pos2 != std::string::npos)
-                missingInclude(mTokens.file(out.location), out.location.line, out.location.col, out.msg.substr(pos1+1, pos2-pos1-1), out.msg[pos1] == '\"' ? UserHeader : SystemHeader);
+                missingInclude(out.location, out.msg.substr(pos1+1, pos2-pos1-1), out.msg[pos1] == '\"' ? UserHeader : SystemHeader);
         }
         break;
+        case simplecpp::Output::DIRECTIVE_AS_MACRO_PARAMETER:
         case simplecpp::Output::INCLUDE_NESTED_TOO_DEEPLY:
         case simplecpp::Output::SYNTAX_ERROR:
         case simplecpp::Output::UNHANDLED_CHAR_ERROR:
             out_ret = &out;
-            error(mTokens.file(out.location), out.location.line, out.location.col, out.msg, out.type);
+            error(out.location, out.msg, out.type);
             break;
         case simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND:
         case simplecpp::Output::FILE_NOT_FOUND:
         case simplecpp::Output::DUI_ERROR:
             out_ret = &out;
-            error("", 0, 0, out.msg, out.type);
+            error({}, out.msg, out.type);
             break;
         }
     }
@@ -903,40 +982,45 @@ static std::string simplecppErrToId(simplecpp::Output::Type type)
         return "preprocessorErrorDirective";
     case simplecpp::Output::SYNTAX_ERROR:
         return "syntaxError";
+    case simplecpp::Output::DIRECTIVE_AS_MACRO_PARAMETER:
+        return "directiveAsMacroParameter";
     case simplecpp::Output::UNHANDLED_CHAR_ERROR:
         return "unhandledChar";
     case simplecpp::Output::INCLUDE_NESTED_TOO_DEEPLY:
         return "includeNestedTooDeeply";
     case simplecpp::Output::FILE_NOT_FOUND:
         return "missingFile";
-    // should never occur
     case simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND:
+        return "missingIncludeExplicit";
+    // should never occur
     case simplecpp::Output::DUI_ERROR:
     // handled separately
     case simplecpp::Output::MISSING_HEADER:
     // no handled at all (warnings)
     case simplecpp::Output::WARNING:
     case simplecpp::Output::PORTABILITY_BACKSLASH:
+    case simplecpp::Output::PORTABILITY_LINE_DIRECTIVE:
+    case simplecpp::Output::PORTABILITY_NO_EOF_NEWLINE:
         throw std::runtime_error("unexpected simplecpp::Output type " + std::to_string(type));
     }
 
     cppcheck::unreachable();
 }
 
-void Preprocessor::error(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &msg, simplecpp::Output::Type type)
+void Preprocessor::error(const simplecpp::Location& loc, const std::string &msg, simplecpp::Output::Type type) const
 {
-    error(filename, linenr, col, msg, simplecppErrToId(type));
+    error(loc, msg, simplecppErrToId(type));
 }
 
-void Preprocessor::error(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &msg, const std::string& id)
+void Preprocessor::error(const simplecpp::Location& loc, const std::string &msg, const std::string& id) const
 {
     std::list<ErrorMessage::FileLocation> locationList;
-    if (!filename.empty()) {
-        std::string file = Path::fromNativeSeparators(filename);
+    if (!mTokens.file(loc).empty()) {
+        std::string file = Path::fromNativeSeparators(mTokens.file(loc));
         if (mSettings.relativePaths)
             file = Path::getRelativePath(file, mSettings.basePaths);
 
-        locationList.emplace_back(file, linenr, col);
+        locationList.emplace_back(file, loc.line, loc.col);
     }
     mErrorLogger.reportErr(ErrorMessage(std::move(locationList),
                                         mFile0,
@@ -947,28 +1031,28 @@ void Preprocessor::error(const std::string &filename, unsigned int linenr, unsig
 }
 
 // Report that include is missing
-void Preprocessor::missingInclude(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &header, HeaderTypes headerType)
+void Preprocessor::missingInclude(const simplecpp::Location& loc, const std::string &header, HeaderTypes headerType)
 {
     if (!mSettings.checks.isEnabled(Checks::missingInclude))
         return;
 
     std::list<ErrorMessage::FileLocation> locationList;
-    if (!filename.empty()) {
+    if (!mTokens.file(loc).empty()) {
         // TODO: add relative path handling?
-        locationList.emplace_back(filename, linenr, col);
+        locationList.emplace_back(mTokens.file(loc), loc.line, loc.col);
     }
     ErrorMessage errmsg(std::move(locationList), mFile0, Severity::information,
                         (headerType==SystemHeader) ?
-                        "Include file: <" + header + "> not found. Please note: Cppcheck does not need standard library headers to get proper results." :
+                        "Include file: <" + header + "> not found. Please note: Standard library headers do not need to be provided to get proper results." :
                         "Include file: \"" + header + "\" not found.",
                         (headerType==SystemHeader) ? "missingIncludeSystem" : "missingInclude",
                         Certainty::normal);
     mErrorLogger.reportErr(errmsg);
 }
 
-void Preprocessor::invalidSuppression(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &msg)
+void Preprocessor::invalidSuppression(const simplecpp::Location& loc, const std::string &msg) const
 {
-    error(filename, linenr, col, msg, "invalidSuppression");
+    error(loc, msg, "invalidSuppression");
 }
 
 void Preprocessor::getErrorMessages(ErrorLogger &errorLogger, const Settings &settings)
@@ -976,14 +1060,19 @@ void Preprocessor::getErrorMessages(ErrorLogger &errorLogger, const Settings &se
     std::vector<std::string> files;
     simplecpp::TokenList tokens(files);
     Preprocessor preprocessor(tokens, settings, errorLogger, Standards::Language::CPP);
-    preprocessor.missingInclude("", 1, 2, "", UserHeader);
-    preprocessor.missingInclude("", 1, 2, "", SystemHeader);
-    preprocessor.error("", 1, 2, "message", simplecpp::Output::ERROR);
-    preprocessor.error("", 1, 2, "message", simplecpp::Output::SYNTAX_ERROR);
-    preprocessor.error("", 1, 2, "message", simplecpp::Output::UNHANDLED_CHAR_ERROR);
-    preprocessor.error("", 1, 2, "message", simplecpp::Output::INCLUDE_NESTED_TOO_DEEPLY);
-    preprocessor.error("", 1, 2, "message", simplecpp::Output::FILE_NOT_FOUND);
-    preprocessor.invalidSuppression("", 1, 2, "message");
+    simplecpp::Location loc;
+    loc.line = 1;
+    loc.col = 2;
+    preprocessor.missingInclude(loc, "", UserHeader);
+    preprocessor.missingInclude(loc, "", SystemHeader);
+    preprocessor.error(loc, "message", simplecpp::Output::ERROR);
+    preprocessor.error(loc, "message", simplecpp::Output::SYNTAX_ERROR);
+    preprocessor.error(loc, "message", simplecpp::Output::DIRECTIVE_AS_MACRO_PARAMETER);
+    preprocessor.error(loc, "message", simplecpp::Output::UNHANDLED_CHAR_ERROR);
+    preprocessor.error(loc, "message", simplecpp::Output::INCLUDE_NESTED_TOO_DEEPLY);
+    preprocessor.error(loc, "message", simplecpp::Output::FILE_NOT_FOUND);
+    preprocessor.error(loc, "message", simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND);
+    preprocessor.invalidSuppression(loc, "message");
 }
 
 void Preprocessor::dump(std::ostream &out) const
@@ -995,10 +1084,10 @@ void Preprocessor::dump(std::ostream &out) const
         for (const simplecpp::MacroUsage &macroUsage: mMacroUsage) {
             out << "    <macro"
                 << " name=\"" << macroUsage.macroName << "\""
-                << " file=\"" << ErrorLogger::toxml(mTokens.file(macroUsage.macroLocation)) << "\""
+                << " file=\"" << ErrorLogger::toxml(mSettings.relativePaths ? Path::getRelativePath(mTokens.file(macroUsage.macroLocation), mSettings.basePaths) : mTokens.file(macroUsage.macroLocation)) << "\""
                 << " line=\"" << macroUsage.macroLocation.line << "\""
                 << " column=\"" << macroUsage.macroLocation.col << "\""
-                << " usefile=\"" << ErrorLogger::toxml(mTokens.file(macroUsage.useLocation)) << "\""
+                << " usefile=\"" << ErrorLogger::toxml(mSettings.relativePaths ? Path::getRelativePath(mTokens.file(macroUsage.useLocation), mSettings.basePaths) : mTokens.file(macroUsage.useLocation)) << "\""
                 << " useline=\"" << macroUsage.useLocation.line << "\""
                 << " usecolumn=\"" << macroUsage.useLocation.col << "\""
                 << " is-known-value=\"" << bool_to_string(macroUsage.macroValueKnown) << "\""
@@ -1011,7 +1100,7 @@ void Preprocessor::dump(std::ostream &out) const
         out << "  <simplecpp-if-cond>" << std::endl;
         for (const simplecpp::IfCond &ifCond: mIfCond) {
             out << "    <if-cond"
-                << " file=\"" << ErrorLogger::toxml(mTokens.file(ifCond.location)) << "\""
+                << " file=\"" << ErrorLogger::toxml(mSettings.relativePaths ? Path::getRelativePath(mTokens.file(ifCond.location), mSettings.basePaths) : mTokens.file(ifCond.location)) << "\""
                 << " line=\"" << ifCond.location.line << "\""
                 << " column=\"" << ifCond.location.col << "\""
                 << " E=\"" << ErrorLogger::toxml(ifCond.E) << "\""
@@ -1025,34 +1114,38 @@ void Preprocessor::dump(std::ostream &out) const
 std::size_t Preprocessor::calculateHash(const std::string &toolinfo) const
 {
     std::string hashData = toolinfo;
-    for (const simplecpp::Token *tok = mTokens.cfront(); tok; tok = tok->next) {
-        if (!tok->comment) {
-            hashData += tok->str();
-            hashData += static_cast<char>(tok->location.line);
-            hashData += static_cast<char>(tok->location.col);
-        }
-    }
-    for (const auto &filedata : mFileCache) {
-        for (const simplecpp::Token *tok = filedata->tokens.cfront(); tok; tok = tok->next) {
+    const auto addTokens = [&hashData](const simplecpp::TokenList &tokens) {
+        for (const simplecpp::Token *tok = tokens.cfront(); tok; tok = tok->next) {
             if (!tok->comment) {
                 hashData += tok->str();
                 hashData += static_cast<char>(tok->location.line);
                 hashData += static_cast<char>(tok->location.col);
             }
         }
-    }
+    };
+    addTokens(mTokens);
+
+    // Hash the included files in a fixed order, the order they are loaded in differs between runs
+    std::vector<const simplecpp::FileData *> fileData;
+    fileData.reserve(mFileCache.size());
+    std::transform(mFileCache.cbegin(), mFileCache.cend(), std::back_inserter(fileData), [](const std::unique_ptr<simplecpp::FileData> &data) {
+        return data.get();
+    });
+    std::sort(fileData.begin(), fileData.end(), [](const simplecpp::FileData *a, const simplecpp::FileData *b) {
+        return a->filename < b->filename;
+    });
+    for (const simplecpp::FileData *data : fileData)
+        addTokens(data->tokens);
+
     return (std::hash<std::string>{})(hashData);
 }
 
 void Preprocessor::simplifyPragmaAsm()
 {
-    Preprocessor::simplifyPragmaAsmPrivate(mTokens);
-    for (const auto &filedata : mFileCache) {
-        Preprocessor::simplifyPragmaAsmPrivate(filedata->tokens);
-    }
+    simplifyPragmaAsm(mTokens);
 }
 
-void Preprocessor::simplifyPragmaAsmPrivate(simplecpp::TokenList &tokenList)
+void Preprocessor::simplifyPragmaAsm(simplecpp::TokenList &tokenList)
 {
     // assembler code..
     for (simplecpp::Token *tok = tokenList.front(); tok; tok = tok->next) {
@@ -1099,9 +1192,15 @@ void Preprocessor::simplifyPragmaAsmPrivate(simplecpp::TokenList &tokenList)
     }
 }
 
+std::vector<RemarkComment> Preprocessor::getRemarkComments() const
+{
+    return getRemarkComments(mTokens);
+}
 
-void Preprocessor::addRemarkComments(const simplecpp::TokenList &tokens, std::vector<RemarkComment> &remarkComments) const
+std::vector<RemarkComment> Preprocessor::getRemarkComments(const simplecpp::TokenList &tokens) const
 {
+    std::vector<RemarkComment> remarkComments;
+
     for (const simplecpp::Token *tok = tokens.cfront(); tok; tok = tok->next) {
         if (!tok->comment)
             continue;
@@ -1148,4 +1247,6 @@ void Preprocessor::addRemarkComments(const simplecpp::TokenList &tokens, std::ve
         // Add the suppressions.
         remarkComments.emplace_back(relativeFilename, remarkedToken->location.line, remarkText);
     }
+
+    return remarkComments;
 }
diff --git a/lib/preprocessor.h b/lib/preprocessor.h
index f8f213b13df..5df52934dfc 100644
--- a/lib/preprocessor.h
+++ b/lib/preprocessor.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -98,29 +98,45 @@ class CPPCHECKLIB RemarkComment {
  * configurations that exist in a source file.
  */
 class CPPCHECKLIB WARN_UNUSED Preprocessor {
+    friend class TestPreprocessor;
+
 public:
     /** character that is inserted in expanded macros */
     static char macroChar;
 
     Preprocessor(simplecpp::TokenList& tokens, const Settings& settings, ErrorLogger &errorLogger, Standards::Language lang);
+    Preprocessor(const Preprocessor &) = delete;
+    Preprocessor &operator=(const Preprocessor &) = delete;
+
+    void inlineSuppressions(SuppressionList &suppressions) const;
+
+    void inlineSuppressions(const simplecpp::TokenList &tokens, SuppressionList &suppressions) const;
 
-    void inlineSuppressions(SuppressionList &suppressions);
+    void createDirectives(std::list<Directive> &directives) const;
 
-    std::list<Directive> createDirectives() const;
+    static void createDirectives(const simplecpp::TokenList &tokens, std::list<Directive> &directives);
 
-    std::set<std::string> getConfigs() const;
+    void getConfigs(std::set<std::string> &defined, std::set<std::string> &configs) const;
+
+    void getConfigs(const std::string &filename, const simplecpp::TokenList &tokens, std::set<std::string> &defined, std::set<std::string> &configs) const;
 
     std::vector<RemarkComment> getRemarkComments() const;
 
-    bool loadFiles(std::vector<std::string> &files);
+    std::vector<RemarkComment> getRemarkComments(const simplecpp::TokenList &tokens) const;
+
+    bool loadAllIncludes(std::vector<std::string> &files);
+
+    simplecpp::FileData *loadFile(std::vector<std::string> &files, const std::string &file);
 
     void removeComments();
 
+    static void removeComments(simplecpp::TokenList &tokens);
+
     void setPlatformInfo();
 
-    simplecpp::TokenList preprocess(const std::string &cfg, std::vector<std::string> &files, simplecpp::OutputList& outputList);
+    simplecpp::TokenList preprocess(const std::string &cfgStr, std::vector<std::string> &files, simplecpp::OutputList& outputList);
 
-    std::string getcode(const std::string &cfg, std::vector<std::string> &files, bool writeLocations);
+    std::string getcode(const std::string &cfgStr, std::vector<std::string> &files, bool writeLocations);
 
     /**
      * Calculate HASH. Using toolinfo, tokens1, filedata.
@@ -132,6 +148,8 @@ class CPPCHECKLIB WARN_UNUSED Preprocessor {
 
     void simplifyPragmaAsm();
 
+    static void simplifyPragmaAsm(simplecpp::TokenList &tokenList);
+
     static void getErrorMessages(ErrorLogger &errorLogger, const Settings &settings);
 
     /**
@@ -141,12 +159,15 @@ class CPPCHECKLIB WARN_UNUSED Preprocessor {
 
     const simplecpp::Output* reportOutput(const simplecpp::OutputList &outputList, bool showerror);
 
-    void error(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &msg, simplecpp::Output::Type type);
+    void error(const simplecpp::Location& loc, const std::string &msg, simplecpp::Output::Type type) const;
 
     const simplecpp::Output* handleErrors(const simplecpp::OutputList &outputList);
 
+    void setLoadCallback(simplecpp::FileDataCache::load_callback_type cb) {
+        mFileCache.set_load_callback(std::move(cb));
+    }
+
 private:
-    static void simplifyPragmaAsmPrivate(simplecpp::TokenList &tokenList);
 
     /**
      * Include file types.
@@ -156,18 +177,14 @@ class CPPCHECKLIB WARN_UNUSED Preprocessor {
         SystemHeader
     };
 
-    void missingInclude(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &header, HeaderTypes headerType);
-    void invalidSuppression(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &msg);
-    void error(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &msg, const std::string& id);
-
-    void addRemarkComments(const simplecpp::TokenList &tokens, std::vector<RemarkComment> &remarkComments) const;
+    void missingInclude(const simplecpp::Location& loc, const std::string &header, HeaderTypes headerType);
+    void invalidSuppression(const simplecpp::Location& loc, const std::string &msg) const;
+    void error(const simplecpp::Location& loc, const std::string &msg, const std::string& id) const;
 
     simplecpp::TokenList& mTokens;
 
     const Settings& mSettings;
-    ErrorLogger &mErrorLogger;
-
-    /** list of all directives met while preprocessing file */
+    ErrorLogger& mErrorLogger;
 
     simplecpp::FileDataCache mFileCache;
 
diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
index 750fd6653e0..0d84dc053a8 100644
--- a/lib/programmemory.cpp
+++ b/lib/programmemory.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 #include "infer.h"
 #include "library.h"
 #include "mathlib.h"
+#include "refthunk.h"
 #include "settings.h"
 #include "standards.h"
 #include "symboldatabase.h"
@@ -150,11 +151,11 @@ bool ProgramMemory::getContainerEmptyValue(nonneg int exprid, MathLib::bigint& r
     return false;
 }
 
-void ProgramMemory::setContainerSizeValue(const Token* expr, MathLib::bigint value, bool isEqual)
+void ProgramMemory::setContainerSizeValue(const Token* expr, MathLib::bigint value, bool equal)
 {
     ValueFlow::Value v(value);
     v.valueType = ValueFlow::Value::ValueType::CONTAINER_SIZE;
-    if (!isEqual)
+    if (!equal)
         v.valueKind = ValueFlow::Value::ValueKind::Impossible;
     setValue(expr, v);
 }
@@ -194,7 +195,7 @@ void ProgramMemory::erase_if(const std::function<bool(const ExprIdToken&)>& pred
     if (mValues->empty())
         return;
 
-    // TODO: how to delay until we actuallly modify?
+    // TODO: how to delay until we actually modify?
     copyOnWrite();
 
     for (auto it = mValues->begin(); it != mValues->end();) {
@@ -205,7 +206,7 @@ void ProgramMemory::erase_if(const std::function<bool(const ExprIdToken&)>& pred
     }
 }
 
-void ProgramMemory::swap(ProgramMemory &pm) NOEXCEPT
+void ProgramMemory::swap(ProgramMemory &pm) noexcept
 {
     mValues.swap(pm.mValues);
 }
@@ -262,26 +263,33 @@ ProgramMemory::Map::iterator ProgramMemory::find(nonneg int exprid)
     return mValues->find(ExprIdToken::create(exprid));
 }
 
-static ValueFlow::Value execute(const Token* expr, ProgramMemory& pm, const Settings& settings);
+static ValueFlow::Value execute(const Token* expr,
+                                ProgramMemory& pm,
+                                const Settings& settings,
+                                const ProgramMemory::Map& vars = {});
 
-static bool evaluateCondition(MathLib::bigint r, const Token* condition, ProgramMemory& pm, const Settings& settings)
+static bool evaluateCondition(MathLib::bigint r,
+                              const Token* condition,
+                              ProgramMemory& pm,
+                              const Settings& settings,
+                              const ProgramMemory::Map& vars = {})
 {
     if (!condition)
         return false;
     MathLib::bigint result = 0;
     bool error = false;
-    execute(condition, pm, &result, &error, settings);
+    execute(condition, pm, &result, &error, settings, vars);
     return !error && result == r;
 }
 
-bool conditionIsFalse(const Token* condition, ProgramMemory pm, const Settings& settings)
+bool conditionIsFalse(const Token* condition, ProgramMemory pm, const Settings& settings, const ProgramMemory::Map& vars)
 {
-    return evaluateCondition(0, condition, pm, settings);
+    return evaluateCondition(0, condition, pm, settings, vars);
 }
 
-bool conditionIsTrue(const Token* condition, ProgramMemory pm, const Settings& settings)
+bool conditionIsTrue(const Token* condition, ProgramMemory pm, const Settings& settings, const ProgramMemory::Map& vars)
 {
-    return evaluateCondition(1, condition, pm, settings);
+    return evaluateCondition(1, condition, pm, settings, vars);
 }
 
 static bool frontIs(const std::vector<MathLib::bigint>& v, bool i)
@@ -337,7 +345,13 @@ static bool isBasicForLoop(const Token* tok)
     return true;
 }
 
-static void programMemoryParseCondition(ProgramMemory& pm, const Token* tok, const Token* endTok, const Settings& settings, bool then)
+// findChanged: optional cached findExpressionChanged (see ProgramMemoryState::FindChangedFn).
+static void programMemoryParseCondition(ProgramMemory& pm,
+                                        const Token* tok,
+                                        const Token* endTok,
+                                        const Settings& settings,
+                                        bool then,
+                                        const ProgramMemoryState::FindChangedFn& findChanged = {})
 {
     auto eval = [&](const Token* t) -> std::vector<MathLib::bigint> {
         if (!t)
@@ -351,6 +365,10 @@ static void programMemoryParseCondition(ProgramMemory& pm, const Token* tok, con
             return {result};
         return std::vector<MathLib::bigint>{};
     };
+    // Use the cached closure if given, else compute directly.
+    auto changed = [&](const Token* e, const Token* s, const Token* en) -> const Token* {
+        return findChanged ? findChanged(e, s, en) : findExpressionChanged(e, s, en, settings);
+    };
     if (Token::Match(tok, "==|>=|<=|<|>|!=")) {
         ValueFlow::Value truevalue;
         ValueFlow::Value falsevalue;
@@ -361,7 +379,7 @@ static void programMemoryParseCondition(ProgramMemory& pm, const Token* tok, con
             return;
         if (!truevalue.isIntValue())
             return;
-        if (endTok && findExpressionChanged(vartok, tok->next(), endTok, settings))
+        if (endTok && changed(vartok, tok->next(), endTok))
             return;
         const bool impossible = (tok->str() == "==" && !then) || (tok->str() == "!=" && then);
         const ValueFlow::Value& v = then ? truevalue : falsevalue;
@@ -370,26 +388,26 @@ static void programMemoryParseCondition(ProgramMemory& pm, const Token* tok, con
         if (containerTok)
             pm.setContainerSizeValue(containerTok, v.intvalue, !impossible);
     } else if (Token::simpleMatch(tok, "!")) {
-        programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, !then);
+        programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, !then, findChanged);
     } else if (then && Token::simpleMatch(tok, "&&")) {
-        programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, then);
-        programMemoryParseCondition(pm, tok->astOperand2(), endTok, settings, then);
+        programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, then, findChanged);
+        programMemoryParseCondition(pm, tok->astOperand2(), endTok, settings, then, findChanged);
     } else if (!then && Token::simpleMatch(tok, "||")) {
-        programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, then);
-        programMemoryParseCondition(pm, tok->astOperand2(), endTok, settings, then);
+        programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, then, findChanged);
+        programMemoryParseCondition(pm, tok->astOperand2(), endTok, settings, then, findChanged);
     } else if (Token::Match(tok, "&&|%oror%")) {
         std::vector<MathLib::bigint> lhs = eval(tok->astOperand1());
         std::vector<MathLib::bigint> rhs = eval(tok->astOperand2());
         if (lhs.empty() || rhs.empty()) {
             if (frontIs(lhs, !then))
-                programMemoryParseCondition(pm, tok->astOperand2(), endTok, settings, then);
+                programMemoryParseCondition(pm, tok->astOperand2(), endTok, settings, then, findChanged);
             else if (frontIs(rhs, !then))
-                programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, then);
+                programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, then, findChanged);
             else
                 pm.setIntValue(tok, 0, then);
         }
     } else if (tok && tok->exprId() > 0) {
-        if (endTok && findExpressionChanged(tok, tok->next(), endTok, settings))
+        if (endTok && changed(tok, tok->next(), endTok))
             return;
         pm.setIntValue(tok, 0, then);
         const Token* containerTok = settings.library.getContainerFromYield(tok, Library::Container::Yield::EMPTY);
@@ -398,14 +416,18 @@ static void programMemoryParseCondition(ProgramMemory& pm, const Token* tok, con
     }
 }
 
-static void fillProgramMemoryFromConditions(ProgramMemory& pm, const Scope* scope, const Token* endTok, const Settings& settings)
+static void fillProgramMemoryFromConditions(ProgramMemory& pm,
+                                            const Scope* scope,
+                                            const Token* endTok,
+                                            const Settings& settings,
+                                            const ProgramMemoryState::FindChangedFn& findChanged)
 {
     if (!scope)
         return;
     if (!scope->isLocal())
         return;
     assert(scope != scope->nestedIn);
-    fillProgramMemoryFromConditions(pm, scope->nestedIn, endTok, settings);
+    fillProgramMemoryFromConditions(pm, scope->nestedIn, endTok, settings, findChanged);
     if (scope->type == ScopeType::eIf || scope->type == ScopeType::eWhile || scope->type == ScopeType::eElse || scope->type == ScopeType::eFor) {
         const Token* condTok = getCondTokFromEnd(scope->bodyEnd);
         if (!condTok)
@@ -414,13 +436,16 @@ static void fillProgramMemoryFromConditions(ProgramMemory& pm, const Scope* scop
         bool error = false;
         execute(condTok, pm, &result, &error, settings);
         if (error)
-            programMemoryParseCondition(pm, condTok, endTok, settings, scope->type != ScopeType::eElse);
+            programMemoryParseCondition(pm, condTok, endTok, settings, scope->type != ScopeType::eElse, findChanged);
     }
 }
 
-static void fillProgramMemoryFromConditions(ProgramMemory& pm, const Token* tok, const Settings& settings)
+static void fillProgramMemoryFromConditions(ProgramMemory& pm,
+                                            const Token* tok,
+                                            const Settings& settings,
+                                            const ProgramMemoryState::FindChangedFn& findChanged = {})
 {
-    fillProgramMemoryFromConditions(pm, tok->scope(), tok, settings);
+    fillProgramMemoryFromConditions(pm, tok->scope(), tok, settings, findChanged);
 }
 
 static void fillProgramMemoryFromAssignments(ProgramMemory& pm, const Token* tok, const Settings& settings, const ProgramMemory& state, const ProgramMemory::Map& vars)
@@ -429,22 +454,12 @@ static void fillProgramMemoryFromAssignments(ProgramMemory& pm, const Token* tok
     for (const Token *tok2 = tok; tok2; tok2 = tok2->previous()) {
         if ((Token::simpleMatch(tok2, "=") || Token::Match(tok2->previous(), "%var% (|{")) && tok2->astOperand1() &&
             tok2->astOperand2()) {
-            bool setvar = false;
             const Token* vartok = tok2->astOperand1();
-            for (const auto& p:vars) {
-                if (p.first.getExpressionId() != vartok->exprId())
-                    continue;
-                if (vartok == tok)
-                    continue;
-                pm.setValue(vartok, p.second);
-                setvar = true;
-            }
-            if (!setvar) {
-                if (!pm.hasValue(vartok->exprId())) {
-                    const Token* valuetok = tok2->astOperand2();
-                    ProgramMemory local = state;
-                    pm.setValue(vartok, execute(valuetok, local, settings));
-                }
+            if (!pm.hasValue(vartok->exprId())) {
+                const Token* valuetok = tok2->astOperand2();
+                ProgramMemory local = state;
+                // Tracked values are substituted by execute() when the expression is evaluated.
+                pm.setValue(vartok, execute(valuetok, local, settings, vars));
             }
         } else if (Token::simpleMatch(tok2, ")") && tok2->link() &&
                    Token::Match(tok2->link()->previous(), "assert|ASSERT ( !!)")) {
@@ -516,7 +531,7 @@ static ProgramMemory getInitialProgramState(const Token* tok,
     return pm;
 }
 
-ProgramMemoryState::ProgramMemoryState(const Settings& s) : settings(s)
+ProgramMemoryState::ProgramMemoryState(const Settings& s) : settings(s), changedCache(std::make_shared<ChangedCache>())
 {}
 
 void ProgramMemoryState::replace(ProgramMemory pm, const Token* origin)
@@ -539,7 +554,7 @@ void ProgramMemoryState::addState(const Token* tok, const ProgramMemory::Map& va
 {
     ProgramMemory local = state;
     addVars(local, vars);
-    fillProgramMemoryFromConditions(local, tok, settings);
+    fillProgramMemoryFromConditions(local, tok, settings, getCachedFindExpressionChanged(/*skipDeadCode*/ false));
     ProgramMemory pm;
     fillProgramMemoryFromAssignments(pm, tok, settings, local, vars);
     local.replace(std::move(pm));
@@ -547,44 +562,73 @@ void ProgramMemoryState::addState(const Token* tok, const ProgramMemory::Map& va
     replace(std::move(local), tok);
 }
 
-void ProgramMemoryState::assume(const Token* tok, bool b, bool isEmpty)
+void ProgramMemoryState::assume(const Token* tok, bool b, bool isEmpty, const Token* origin)
 {
     ProgramMemory pm = state;
     if (isEmpty)
         pm.setContainerSizeValue(tok, 0, b);
     else
         programMemoryParseCondition(pm, tok, nullptr, settings, b);
-    const Token* origin = tok;
-    const Token* top = tok->astTop();
-    if (Token::Match(top->previous(), "for|while|if (") && !Token::simpleMatch(tok->astParent(), "?")) {
-        origin = top->link()->next();
-        if (!b && origin->link()) {
-            origin = origin->link();
+    if (!origin) {
+        origin = tok;
+        const Token* top = tok->astTop();
+        if (Token::Match(top->previous(), "for|while|if (") && !Token::simpleMatch(tok->astParent(), "?")) {
+            origin = top->link()->next();
+            if (!b && origin->link()) {
+                origin = origin->link();
+            }
         }
     }
     replace(std::move(pm), origin);
 }
 
-void ProgramMemoryState::removeModifiedVars(const Token* tok)
+ProgramMemoryState::FindChangedFn ProgramMemoryState::getCachedFindExpressionChanged(bool skipDeadCode) const
 {
-    const ProgramMemory& pm = state;
-    auto eval = [&](const Token* cond) -> std::vector<MathLib::bigint> {
-        ProgramMemory pm2 = pm;
-        auto result = execute(cond, pm2, settings);
-        if (isTrue(result))
-            return {1};
-        if (isFalse(result))
-            return {0};
-        return {};
+    // Structural findExpressionChanged() is pure, so memoize it in changedCache (never invalidated).
+    // skipDeadCode adds the dead-code walk; it evaluates guards against a fixed state snapshot (so every
+    // variable follows the same path) and memoizes those evals in evalCache for the closure's lifetime.
+    using EvalCache = std::map<const Token*, std::vector<MathLib::bigint>>;
+    const std::shared_ptr<ChangedCache> cache = changedCache;
+    const Settings* const sp = &settings();
+    ProgramMemory snapshot = state;
+    const std::shared_ptr<EvalCache> evalCache = skipDeadCode ? std::make_shared<EvalCache>() : nullptr;
+    return [cache, sp, snapshot, skipDeadCode, evalCache](const Token* expr,
+                                                          const Token* start,
+                                                          const Token* end) -> const Token* {
+        const auto key = std::make_tuple(expr, start, end);
+        const auto it = cache->find(key);
+        const Token* modified = (it != cache->end())
+                                    ? it->second
+                                    : cache->emplace(key, findExpressionChanged(expr, start, end, *sp)).first->second;
+        if (!skipDeadCode || !modified)
+            return modified;
+        auto eval = [&](const Token* cond) -> std::vector<MathLib::bigint> {
+            const auto cit = evalCache->find(cond);
+            if (cit != evalCache->end())
+                return cit->second;
+            ProgramMemory pm2 = snapshot;
+            const auto result = execute(cond, pm2, *sp);
+            std::vector<MathLib::bigint> r;
+            if (isTrue(result))
+                r = {1};
+            else if (isFalse(result))
+                r = {0};
+            return evalCache->emplace(cond, std::move(r)).first->second;
+        };
+        return findExpressionChangedSkipDeadCode(expr, start, end, *sp, eval);
     };
+}
+
+void ProgramMemoryState::removeModifiedVars(const Token* tok)
+{
+    const auto findChanged = getCachedFindExpressionChanged(/*skipDeadCode*/ true);
     state.erase_if([&](const ExprIdToken& e) {
         const Token* start = origins[e.getExpressionId()];
         const Token* expr = e.tok;
-        if (!expr || findExpressionChangedSkipDeadCode(expr, start, tok, settings, eval)) {
+        const bool changed = !expr || findChanged(expr, start, tok);
+        if (changed)
             origins.erase(e.getExpressionId());
-            return true;
-        }
-        return false;
+        return changed;
     });
 }
 
@@ -632,10 +676,6 @@ static MathLib::bigint asInt(const ValueFlow::Value& value)
     return value.isFloatValue() ? static_cast<MathLib::bigint>(value.floatValue) : value.intvalue;
 }
 
-static std::string removeAssign(const std::string& assign) {
-    return std::string{assign.cbegin(), assign.cend() - 1};
-}
-
 namespace {
     struct assign {
         template<class T, class U>
@@ -651,22 +691,23 @@ static bool isIntegralValue(const ValueFlow::Value& value)
     return value.isIntValue() || value.isIteratorValue() || value.isSymbolicValue();
 }
 
-static ValueFlow::Value evaluate(const std::string& op, const ValueFlow::Value& lhs, const ValueFlow::Value& rhs)
+static ValueFlow::Value evaluate(const Token* op, const ValueFlow::Value& lhs, const ValueFlow::Value& rhs, bool removeAssign = false)
 {
+    const std::string opStr = removeAssign ? op->str().substr(0, op->str().size() - 1) : op->str();
     ValueFlow::Value result;
     if (lhs.isImpossible() && rhs.isImpossible())
         return ValueFlow::Value::unknown();
     if (lhs.isImpossible() || rhs.isImpossible()) {
         // noninvertible
-        if (contains({"%", "/", "&", "|"}, op))
+        if (contains({"%", "/", "&", "|"}, opStr))
             return ValueFlow::Value::unknown();
         result.setImpossible();
     }
     if (isNumericValue(lhs) && isNumericValue(rhs)) {
         if (lhs.isFloatValue() || rhs.isFloatValue()) {
-            result.valueType = ValueFlow::Value::ValueType::FLOAT;
+            result.valueType = op->isArithmeticalOp() ? ValueFlow::Value::ValueType::FLOAT : ValueFlow::Value::ValueType::INT;
             bool error = false;
-            result.floatValue = calculate(op, asFloat(lhs), asFloat(rhs), &error);
+            result.floatValue = calculate(opStr, asFloat(lhs), asFloat(rhs), &error);
             if (error)
                 return ValueFlow::Value::unknown();
             return result;
@@ -678,12 +719,12 @@ static ValueFlow::Value evaluate(const std::string& op, const ValueFlow::Value&
     // If not the same type then one must be int
     if (lhs.valueType != rhs.valueType && !lhs.isIntValue() && !rhs.isIntValue())
         return ValueFlow::Value::unknown();
-    const bool compareOp = contains({"==", "!=", "<", ">", ">=", "<="}, op);
+    const bool compareOp = op->isComparisonOp();
     // Comparison must be the same type
     if (compareOp && lhs.valueType != rhs.valueType)
         return ValueFlow::Value::unknown();
     // Only add, subtract, and compare for non-integers
-    if (!compareOp && !contains({"+", "-"}, op) && !lhs.isIntValue() && !rhs.isIntValue())
+    if (!compareOp && !contains({"+", "-"}, opStr) && !lhs.isIntValue() && !rhs.isIntValue())
         return ValueFlow::Value::unknown();
     // Both can't be iterators for non-compare
     if (!compareOp && lhs.isIteratorValue() && rhs.isIteratorValue())
@@ -701,10 +742,10 @@ static ValueFlow::Value evaluate(const std::string& op, const ValueFlow::Value&
         result.valueType = ValueFlow::Value::ValueType::INT;
     }
     bool error = false;
-    result.intvalue = calculate(op, lhs.intvalue, rhs.intvalue, &error);
+    result.intvalue = calculate(opStr, lhs.intvalue, rhs.intvalue, &error);
     if (error)
         return ValueFlow::Value::unknown();
-    if (result.isImpossible() && op == "!=") {
+    if (result.isImpossible() && opStr == "!=") {
         if (isTrue(result)) {
             result.intvalue = 1;
         } else if (isFalse(result)) {
@@ -1318,7 +1359,10 @@ static void pruneConditions(std::vector<const Token*>& conds,
 namespace {
     struct Executor {
         ProgramMemory* pm;
-        const Settings& settings;
+        RefThunk<const Settings> settings;
+        // Values tracked by the forward/reverse analysis. A tracked value is the authoritative
+        // current value of its expression and takes precedence over the program memory.
+        const ProgramMemory::Map* vars = nullptr;
         int fdepth = 4;
         int depth = 10;
 
@@ -1327,6 +1371,26 @@ namespace {
             assert(pm != nullptr);
         }
 
+        // Is the tracked value for this expression available?
+        const ValueFlow::Value* getTrackedValue(const Token* expr) const
+        {
+            if (!vars || expr->exprId() == 0)
+                return nullptr;
+            const auto it = vars->find(ExprIdToken::create(expr->exprId()));
+            return it == vars->end() ? nullptr : &it->second;
+        }
+
+        // Does the expression read a tracked value? If so, any value cached for it may be stale
+        // (the tracked value may have changed since), so it must be re-evaluated, not served cached.
+        bool dependsOnTrackedValue(const Token* expr) const
+        {
+            if (!vars || vars->empty())
+                return false;
+            return findAstNode(expr, [&](const Token* tok) {
+                return getTrackedValue(tok) != nullptr;
+            }) != nullptr;
+        }
+
         static ValueFlow::Value unknown() {
             return ValueFlow::Value::unknown();
         }
@@ -1449,6 +1513,31 @@ namespace {
             return unknown();
         }
 
+        // Get the size of the container. If the container itself is not tracked in the program
+        // memory then check if it is symbolically equal to a container whose size is tracked.
+        ValueFlow::Value executeContainerSize(const Token* containerTok)
+        {
+            ValueFlow::Value v = execute(containerTok);
+            if (v.isContainerSizeValue())
+                return v;
+            for (const ValueFlow::Value& value : containerTok->values()) {
+                if (!value.isSymbolicValue())
+                    continue;
+                if (value.isImpossible())
+                    continue;
+                if (value.intvalue != 0)
+                    continue;
+                if (!value.tokvalue)
+                    continue;
+                if (value.tokvalue->exprId() == 0)
+                    continue;
+                const ValueFlow::Value* sizeValue = pm->getValue(value.tokvalue->exprId());
+                if (sizeValue && sizeValue->isContainerSizeValue())
+                    return *sizeValue;
+            }
+            return unknown();
+        }
+
         ValueFlow::Value executeImpl(const Token* expr)
         {
             const ValueFlow::Value* value = nullptr;
@@ -1477,14 +1566,14 @@ namespace {
                 const Token* containerTok = expr->tokAt(-2)->astOperand1();
                 const Library::Container::Yield yield = containerTok->valueType()->container->getYield(expr->strAt(-1));
                 if (yield == Library::Container::Yield::SIZE) {
-                    ValueFlow::Value v = execute(containerTok);
+                    ValueFlow::Value v = executeContainerSize(containerTok);
                     if (!v.isContainerSizeValue())
                         return unknown();
                     v.valueType = ValueFlow::Value::ValueType::INT;
                     return v;
                 }
                 if (yield == Library::Container::Yield::EMPTY) {
-                    ValueFlow::Value v = execute(containerTok);
+                    ValueFlow::Value v = executeContainerSize(containerTok);
                     if (!v.isContainerSizeValue())
                         return unknown();
                     if (v.isImpossible() && v.intvalue == 0)
@@ -1501,7 +1590,7 @@ namespace {
                     if (!pm->hasValue(expr->astOperand1()->exprId()))
                         return unknown();
                     ValueFlow::Value& lhs = pm->at(expr->astOperand1()->exprId());
-                    rhs = evaluate(removeAssign(expr->str()), lhs, rhs);
+                    rhs = evaluate(expr, lhs, rhs, /*removeAssign*/ true);
                     if (lhs.isIntValue())
                         ValueFlow::Value::visitValue(rhs, std::bind(assign{}, std::ref(lhs.intvalue), std::placeholders::_1));
                     else if (lhs.isFloatValue())
@@ -1555,7 +1644,7 @@ namespace {
                     return unknown();
                 const MathLib::bigint index = rhs.intvalue;
                 if (index >= 0 && index < strValue.size())
-                    return ValueFlow::Value{strValue[static_cast<std::size_t>(index)]};
+                    return ValueFlow::Value{strValue[index]};
                 if (index == strValue.size())
                     return ValueFlow::Value{};
             } else if (Token::Match(expr, "%cop%") && expr->astOperand1() && expr->astOperand2()) {
@@ -1565,7 +1654,7 @@ namespace {
                 ValueFlow::Value rhs = execute(expr->astOperand2());
                 if (rhs.isUninitValue())
                     return unknown();
-                ValueFlow::Value r = evaluate(expr->str(), lhs, rhs);
+                ValueFlow::Value r = evaluate(expr, lhs, rhs);
                 if (expr->isComparisonOp() && (r.isUninitValue() || r.isImpossible())) {
                     if (rhs.isIntValue() && !expr->astOperand1()->values().empty()) {
                         std::vector<ValueFlow::Value> result = infer(makeIntegralInferModel(),
@@ -1625,7 +1714,15 @@ namespace {
                 }
                 return execute(expr->astOperand1());
             }
-            if (expr->exprId() > 0 && pm->hasValue(expr->exprId())) {
+            // Return the tracked value and write it back when it differs, so later reads see the
+            // same value (as fillProgramMemoryFromAssignments used to do).
+            if (const ValueFlow::Value* tracked = getTrackedValue(expr)) {
+                const ValueFlow::Value* stored = pm->getValue(expr->exprId(), /*impossible*/ true);
+                if (!stored || *stored != *tracked)
+                    pm->setValue(expr, *tracked);
+                return *tracked;
+            }
+            if (expr->exprId() > 0 && pm->hasValue(expr->exprId()) && !dependsOnTrackedValue(expr)) {
                 ValueFlow::Value result = utils::as_const(*pm).at(expr->exprId());
                 if (result.isImpossible() && result.isIntValue() && result.intvalue == 0 && isUsedAsBool(expr, settings)) {
                     result.intvalue = !result.intvalue;
@@ -1666,7 +1763,7 @@ namespace {
                         BuiltinLibraryFunction lf = getBuiltinLibraryFunction(ftok->str());
                         if (lf)
                             return lf(args);
-                        const std::string& returnValue = settings.library.returnValue(ftok);
+                        const std::string& returnValue = settings().library.returnValue(ftok);
                         if (!returnValue.empty()) {
                             std::unordered_map<nonneg int, ValueFlow::Value> arg_map;
                             int argn = 0;
@@ -1818,9 +1915,13 @@ namespace {
     };
 }     // namespace
 
-static ValueFlow::Value execute(const Token* expr, ProgramMemory& pm, const Settings& settings)
+static ValueFlow::Value execute(const Token* expr,
+                                ProgramMemory& pm,
+                                const Settings& settings,
+                                const ProgramMemory::Map& vars)
 {
     Executor ex{&pm, settings};
+    ex.vars = &vars;
     return ex.execute(expr);
 }
 
@@ -1837,7 +1938,7 @@ static std::shared_ptr<Token> createTokenFromExpression(const std::string& retur
 {
     std::shared_ptr<TokenList> tokenList = std::make_shared<TokenList>(settings, cpp ? Standards::Language::CPP : Standards::Language::C);
     {
-        const std::string code = "return " + returnValue + ";";
+        const std::string code = "return " + returnValue + ";\n";
         if (!tokenList->createTokensFromBuffer(code.data(), code.size()))
             return nullptr;
     }
@@ -1910,9 +2011,10 @@ void execute(const Token* expr,
              ProgramMemory& programMemory,
              MathLib::bigint* result,
              bool* error,
-             const Settings& settings)
+             const Settings& settings,
+             const ProgramMemory::Map& vars)
 {
-    ValueFlow::Value v = execute(expr, programMemory, settings);
+    ValueFlow::Value v = execute(expr, programMemory, settings, vars);
     if (!v.isIntValue() || v.isImpossible()) {
         if (error)
             *error = true;
diff --git a/lib/programmemory.h b/lib/programmemory.h
index adb0d1469ce..f3133a53c31 100644
--- a/lib/programmemory.h
+++ b/lib/programmemory.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 
 #include "config.h"
 #include "mathlib.h"
+#include "refthunk.h"
 #include "vfvalue.h" // needed for alias
 
 #include <cstddef>
@@ -28,6 +29,7 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <tuple>
 #include <unordered_map>
 #include <utility>
 #include <vector>
@@ -79,11 +81,11 @@ struct ExprIdToken {
         return !(lhs < rhs);
     }
 
-    const Token& operator*() const NOEXCEPT {
+    const Token& operator*() const noexcept {
         return *tok;
     }
 
-    const Token* operator->() const NOEXCEPT {
+    const Token* operator->() const noexcept {
         return tok;
     }
 
@@ -102,7 +104,7 @@ struct ExprIdToken {
 };
 
 struct CPPCHECKLIB ProgramMemory {
-    using Map = std::unordered_map<ExprIdToken, ValueFlow::Value, ExprIdToken::Hash>;
+    using Map = std::map<ExprIdToken, ValueFlow::Value>;
 
     ProgramMemory() : mValues(new Map()) {}
 
@@ -116,7 +118,7 @@ struct CPPCHECKLIB ProgramMemory {
 
     bool getContainerSizeValue(nonneg int exprid, MathLib::bigint& result) const;
     bool getContainerEmptyValue(nonneg int exprid, MathLib::bigint& result) const;
-    void setContainerSizeValue(const Token* expr, MathLib::bigint value, bool isEqual = true);
+    void setContainerSizeValue(const Token* expr, MathLib::bigint value, bool equal = true);
 
     void setUnknown(const Token* expr);
 
@@ -128,7 +130,7 @@ struct CPPCHECKLIB ProgramMemory {
 
     void erase_if(const std::function<bool(const ExprIdToken&)>& pred);
 
-    void swap(ProgramMemory &pm) NOEXCEPT;
+    void swap(ProgramMemory &pm) noexcept;
 
     void clear();
 
@@ -161,9 +163,26 @@ struct CPPCHECKLIB ProgramMemory {
 };
 
 struct ProgramMemoryState {
+    struct ChangedKeyHash {
+        std::size_t operator()(const std::tuple<const Token*, const Token*, const Token*>& t) const
+        {
+            const std::hash<const Token*> h;
+            std::size_t seed = h(std::get<0>(t));
+            seed ^= h(std::get<1>(t)) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+            seed ^= h(std::get<2>(t)) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+            return seed;
+        }
+    };
+    using ChangedCache =
+        std::unordered_map<std::tuple<const Token*, const Token*, const Token*>, const Token*, ChangedKeyHash>;
+    // The token modifying expr between start and end, or nullptr.
+    using FindChangedFn = std::function<const Token*(const Token* expr, const Token* start, const Token* end)>;
+
     ProgramMemory state;
     std::map<nonneg int, const Token*> origins;
-    const Settings& settings;
+    RefThunk<const Settings> settings;
+    // Memoized findExpressionChanged() pre-filter; structural, so never invalidated.
+    std::shared_ptr<ChangedCache> changedCache;
 
     explicit ProgramMemoryState(const Settings& s);
 
@@ -171,10 +190,13 @@ struct ProgramMemoryState {
 
     void addState(const Token* tok, const ProgramMemory::Map& vars);
 
-    void assume(const Token* tok, bool b, bool isEmpty = false);
+    void assume(const Token* tok, bool b, bool isEmpty = false, const Token* origin = nullptr);
 
     void removeModifiedVars(const Token* tok);
 
+    // A findExpressionChanged() closure memoized in changedCache
+    FindChangedFn getCachedFindExpressionChanged(bool skipDeadCode) const;
+
     ProgramMemory get(const Token* tok, const Token* ctx, const ProgramMemory::Map& vars) const;
 };
 
@@ -184,21 +206,30 @@ void execute(const Token* expr,
              ProgramMemory& programMemory,
              MathLib::bigint* result,
              bool* error,
-             const Settings& settings);
+             const Settings& settings,
+             const ProgramMemory::Map& vars = {});
 
 /**
  * Is condition always false when variable has given value?
  * \param condition   top ast token in condition
  * \param pm   program memory
+ * \param vars  optional tracked values that take precedence over the program memory
  */
-bool conditionIsFalse(const Token* condition, ProgramMemory pm, const Settings& settings);
+bool conditionIsFalse(const Token* condition,
+                      ProgramMemory pm,
+                      const Settings& settings,
+                      const ProgramMemory::Map& vars = {});
 
 /**
  * Is condition always true when variable has given value?
  * \param condition   top ast token in condition
  * \param pm   program memory
+ * \param vars  optional tracked values that take precedence over the program memory
  */
-bool conditionIsTrue(const Token* condition, ProgramMemory pm, const Settings& settings);
+bool conditionIsTrue(const Token* condition,
+                     ProgramMemory pm,
+                     const Settings& settings,
+                     const ProgramMemory::Map& vars = {});
 
 /**
  * Get program memory by looking backwards from given token.
diff --git a/lib/refthunk.h b/lib/refthunk.h
new file mode 100644
index 00000000000..5b2e4d0d5c0
--- /dev/null
+++ b/lib/refthunk.h
@@ -0,0 +1,61 @@
+/* -*- C++ -*-
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 Cppcheck team.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+//---------------------------------------------------------------------------
+#ifndef refthunkH
+#define refthunkH
+//---------------------------------------------------------------------------
+
+#include <memory>
+
+/**
+ * Reference wrapper whose operator() returns the referenced object.
+ *
+ * It is constructed from a reference and converts implicitly back to one
+ * (like std::reference_wrapper), so it can replace a reference data member
+ * without changing the constructor or call sites that pass the member to
+ * functions taking T&. Unlike a reference member it is copyable and
+ * assignable; assignment rebinds it.
+ */
+template<class T>
+struct RefThunk {
+    RefThunk() = delete;
+
+    // cppcheck-suppress noExplicitConstructor
+    // NOLINTNEXTLINE(google-explicit-constructor)
+    constexpr RefThunk(T& t) noexcept : mPtr(std::addressof(t)) {}
+    RefThunk(T&& t) = delete;
+
+    constexpr T& operator()() const noexcept {
+        return *mPtr;
+    }
+
+    constexpr T& get() const noexcept {
+        return *mPtr;
+    }
+
+    // NOLINTNEXTLINE(google-explicit-constructor)
+    constexpr operator T&() const noexcept {
+        return *mPtr;
+    }
+
+private:
+    T* mPtr;
+};
+
+#endif
diff --git a/lib/regex.cpp b/lib/regex.cpp
index 6ad9ad440b0..3a94b293ed5 100644
--- a/lib/regex.cpp
+++ b/lib/regex.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -167,7 +167,7 @@ namespace {
         ~PcreRegex() override
         {
             if (mExtra) {
-                pcre_free(mExtra);
+                pcre_free_study(mExtra);
                 mExtra = nullptr;
             }
             if (mRe) {
@@ -177,7 +177,11 @@ namespace {
         }
 
         std::string compile();
-        std::string match(const std::string& str, const MatchFn& match) const override;
+        std::string match(const std::string& str, const MatchFn& matchFn) const override;
+
+        Engine engine() const override {
+            return Engine::Pcre;
+        }
 
     private:
         std::string mPattern;
@@ -188,15 +192,15 @@ namespace {
     std::string PcreRegex::compile()
     {
         if (mRe)
-            return "pcre_compile failed: regular expression has already been compiled";
+            return "regular expression has already been compiled";
 
         const char *pcreCompileErrorStr = nullptr;
         int erroffset = 0;
         pcre * const re = pcre_compile(mPattern.c_str(),0,&pcreCompileErrorStr,&erroffset,nullptr);
         if (!re) {
             if (pcreCompileErrorStr)
-                return "pcre_compile failed: " + std::string(pcreCompileErrorStr);
-            return "pcre_compile failed: unknown error";
+                return pcreCompileErrorStr;
+            return "unknown error";
         }
 
         // Optimize the regex, but only if PCRE_CONFIG_JIT is available
@@ -209,7 +213,7 @@ namespace {
         if (pcreStudyErrorStr) {
             // pcre_compile() worked, but pcre_study() returned an error. Free the resources allocated by pcre_compile().
             pcre_free(re);
-            return "pcre_study failed: " + std::string(pcreStudyErrorStr);
+            return std::string(pcreStudyErrorStr) + " (pcre_study)";
         }
         mExtra = pcreExtra;
 #endif
@@ -219,10 +223,10 @@ namespace {
         return "";
     }
 
-    std::string PcreRegex::match(const std::string& str, const MatchFn& match) const
+    std::string PcreRegex::match(const std::string& str, const MatchFn& matchFn) const
     {
         if (!mRe)
-            return "pcre_exec failed: regular expression has not been compiled yet";
+            return "regular expression has not been compiled yet";
 
         int pos = 0;
         int ovector[30]= {0};
@@ -231,12 +235,12 @@ namespace {
             if (pcreExecRet == PCRE_ERROR_NOMATCH)
                 return "";
             if (pcreExecRet < 0) {
-                return "pcre_exec failed (pos: " + std::to_string(pos) + "): " + pcreErrorCodeToString(pcreExecRet);
+                return pcreErrorCodeToString(pcreExecRet) + " (pos: " + std::to_string(pos) + ")";
             }
             const auto pos1 = static_cast<unsigned int>(ovector[0]);
             const auto pos2 = static_cast<unsigned int>(ovector[1]);
 
-            match(pos1, pos2);
+            matchFn(pos1, pos2);
 
             // jump to the end of the match for the next pcre_exec
             pos = static_cast<int>(pos2);
@@ -246,10 +250,22 @@ namespace {
     }
 }
 
-std::shared_ptr<Regex> Regex::create(std::string pattern, std::string& err)
+template<typename T>
+static T* createAndCompileRegex(std::string pattern, std::string& err)
 {
-    auto* regex = new PcreRegex(std::move(pattern));
+    T* regex = new T(std::move(pattern));
     err = regex->compile();
+    return regex;
+}
+
+std::shared_ptr<Regex> Regex::create(std::string pattern, Engine engine, std::string& err)
+{
+    Regex* regex = nullptr;
+    if (engine == Engine::Pcre)
+        regex = createAndCompileRegex<PcreRegex>(std::move(pattern), err);
+    else {
+        err = "unknown regular expression engine";
+    }
     if (!err.empty()) {
         delete regex;
         return nullptr;
diff --git a/lib/regex.h b/lib/regex.h
index 5d89dc52054..c17fba41d4e 100644
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <string>
@@ -37,7 +38,15 @@ class CPPCHECKLIB Regex
     using MatchFn = std::function<void (int start, int end)>;
     virtual std::string match(const std::string& str, const MatchFn& matchFn) const = 0;
 
-    static std::shared_ptr<Regex> create(std::string pattern, std::string& err);
+    enum class Engine : std::uint8_t
+    {
+        Unknown = 0,
+        Pcre = 1
+    };
+
+    virtual Engine engine() const = 0;
+
+    static std::shared_ptr<Regex> create(std::string pattern, Engine engine, std::string& err);
 };
 
 #endif // HAVE_RULES
diff --git a/lib/reverseanalyzer.cpp b/lib/reverseanalyzer.cpp
index 671426f5d2d..d6e9480adb7 100644
--- a/lib/reverseanalyzer.cpp
+++ b/lib/reverseanalyzer.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 #include "errortypes.h"
 #include "forwardanalyzer.h"
 #include "mathlib.h"
+#include "refthunk.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
@@ -41,9 +42,9 @@ namespace {
             : analyzer(analyzer), tokenlist(tokenlist), errorLogger(errorLogger), settings(settings)
         {}
         ValuePtr<Analyzer> analyzer;
-        const TokenList& tokenlist;
-        ErrorLogger& errorLogger;
-        const Settings& settings;
+        RefThunk<const TokenList> tokenlist;
+        RefThunk<ErrorLogger> errorLogger;
+        RefThunk<const Settings> settings;
 
         std::pair<bool, bool> evalCond(const Token* tok) const {
             std::vector<MathLib::bigint> result = analyzer->evaluate(tok);
@@ -110,8 +111,11 @@ namespace {
         {
             if (Token::simpleMatch(tok->tokAt(-2), "} else {"))
                 tok = tok->linkAt(-2);
-            if (Token::simpleMatch(tok->previous(), ") {"))
+            if (Token::simpleMatch(tok->previous(), ") {")) {
+                if (Token::simpleMatch(tok->linkAt(-1)->astOperand2(), ";"))
+                    return tok->linkAt(-1)->astOperand2();
                 return tok->linkAt(-1);
+            }
             if (Token::simpleMatch(tok->previous(), "do {"))
                 return tok->previous();
             return tok;
@@ -201,7 +205,7 @@ namespace {
         void traverse(Token* start, const Token* end = nullptr) {
             if (start == end)
                 return;
-            std::size_t i = start->index();
+            nonneg int i = start->index();
             for (Token* tok = start->previous(); succeeds(tok, end); tok = tok->previous()) {
                 if (tok->index() >= i)
                     throw InternalError(tok, "Cyclic reverse analysis.");
@@ -232,7 +236,7 @@ namespace {
                         if (!Token::Match(assignTop->astOperand1(), "%assign%")) {
                             continueB &= updateRecursive(assignTop->astOperand1());
                         }
-                        if (!assignTop->astParent())
+                        if (!assignTop->astParent() || Token::simpleMatch(assignTop->astParent(), ";"))
                             break;
                         assignTop = assignTop->astParent();
                     }
@@ -262,7 +266,7 @@ namespace {
                             // Assignment to
                         } else if (lhsAction.matches() && !assignTok->astOperand2()->hasKnownIntValue() &&
                                    assignTok->astOperand2()->exprId() > 0 &&
-                                   isConstExpression(assignTok->astOperand2(), settings.library)) {
+                                   isConstExpression(assignTok->astOperand2(), settings().library)) {
                             const std::string info = "Assignment to '" + assignTok->expressionString() + "'";
                             ValuePtr<Analyzer> a = analyzer->reanalyze(assignTok->astOperand2(), info);
                             if (a) {
@@ -298,13 +302,13 @@ namespace {
                     if (!condTok)
                         break;
                     Analyzer::Action condAction = analyzeRecursive(condTok);
+                    if (condAction.isModified())
+                        break;
                     const bool inLoop = Token::Match(condTok->astTop()->previous(), "for|while (");
                     // Evaluate condition of for and while loops first
                     if (inLoop) {
                         if (Token::findmatch(tok->link(), "goto|break", tok))
                             break;
-                        if (condAction.isModified())
-                            break;
                         valueFlowGenericForward(condTok, analyzer, tokenlist, errorLogger, settings);
                     }
                     Token* thenEnd;
@@ -337,9 +341,6 @@ namespace {
                         valueFlowGenericForward(condTok, analyzer, tokenlist, errorLogger, settings);
                     else if (condAction.isRead())
                         break;
-                    // If the condition modifies the variable then bail
-                    if (condAction.isModified())
-                        break;
                     tok = jumpToStart(tok->link());
                     continue;
                 }
diff --git a/lib/rule.h b/lib/rule.h
new file mode 100644
index 00000000000..dd5cf92effd
--- /dev/null
+++ b/lib/rule.h
@@ -0,0 +1,43 @@
+/* -*- C++ -*-
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 Cppcheck team.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ruleH
+#define ruleH
+
+#ifdef HAVE_RULES
+
+#include "errortypes.h"
+
+#include <memory>
+#include <string>
+
+class Regex;
+
+/** Rule */
+struct Rule
+{
+    std::string tokenlist = "normal"; // use normal tokenlist
+    std::string pattern;
+    std::string id = "rule"; // default id
+    std::string summary;
+    Severity severity = Severity::style; // default severity
+    std::shared_ptr<Regex> regex;
+};
+#endif // HAVE_RULES
+
+#endif // ruleH
diff --git a/lib/sarifreport.cpp b/lib/sarifreport.cpp
index ce142430f54..38eb9ea96ca 100644
--- a/lib/sarifreport.cpp
+++ b/lib/sarifreport.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/lib/sarifreport.h b/lib/sarifreport.h
index 90667322b2f..6baf88cb04d 100644
--- a/lib/sarifreport.h
+++ b/lib/sarifreport.h
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/lib/settings.cpp b/lib/settings.cpp
index 19b8ce5142f..da576f7a5c8 100644
--- a/lib/settings.cpp
+++ b/lib/settings.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,20 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "addoninfo.h"
 #include "config.h"
+#include "errortypes.h"
 #include "settings.h"
 #include "path.h"
 #include "summaries.h"
 #include "suppressions.h"
-#include "utils.h"
 #include "vfvalue.h"
 
+#ifdef HAVE_RULES
+#include "rule.h"
+#endif
+
 #include <cctype>
 #include <cstdlib>
 #include <cstring>
 #include <fstream>
 #include <iostream>
-#include <map>
 #include <utility>
 
 #include "json.h"
@@ -70,6 +74,14 @@ Settings::Settings()
     pid = getPid();
 }
 
+Settings::~Settings() = default;
+
+Settings::Settings(const Settings&) = default;
+Settings & Settings::operator=(const Settings &) = default;
+
+Settings::Settings(Settings&&) CPPCHECK_NOEXCEPT = default;
+Settings & Settings::operator=(Settings &&) CPPCHECK_NOEXCEPT = default;
+
 std::string Settings::loadCppcheckCfg(Settings& settings, Suppressions& suppressions, bool debug)
 {
     static const std::string cfgFilename = "cppcheck.cfg";
@@ -109,7 +121,7 @@ std::string Settings::loadCppcheckCfg(Settings& settings, Suppressions& suppress
     }
     const picojson::object& obj = json.get<picojson::object>();
     {
-        const auto it = utils::as_const(obj).find("productName");
+        const auto it = obj.find("productName");
         if (it != obj.cend()) {
             const auto& v = it->second;
             if (!v.is<std::string>())
@@ -118,7 +130,16 @@ std::string Settings::loadCppcheckCfg(Settings& settings, Suppressions& suppress
         }
     }
     {
-        const auto it = utils::as_const(obj).find("about");
+        const auto it = obj.find("manualUrl");
+        if (it != obj.cend()) {
+            const auto& v = it->second;
+            if (!v.is<std::string>())
+                return "'manualUrl' is not a string";
+            settings.manualUrl = v.get<std::string>();
+        }
+    }
+    {
+        const auto it = obj.find("about");
         if (it != obj.cend()) {
             const auto& v = it->second;
             if (!v.is<std::string>())
@@ -127,7 +148,7 @@ std::string Settings::loadCppcheckCfg(Settings& settings, Suppressions& suppress
         }
     }
     {
-        const auto it = utils::as_const(obj).find("addons");
+        const auto it = obj.find("addons");
         if (it != obj.cend()) {
             const auto& entry = it->second;
             if (!entry.is<picojson::array>())
@@ -145,7 +166,7 @@ std::string Settings::loadCppcheckCfg(Settings& settings, Suppressions& suppress
         }
     }
     {
-        const auto it = utils::as_const(obj).find("suppressions");
+        const auto it = obj.find("suppressions");
         if (it != obj.cend()) {
             const auto& entry = it->second;
             if (!entry.is<picojson::array>())
@@ -162,7 +183,7 @@ std::string Settings::loadCppcheckCfg(Settings& settings, Suppressions& suppress
         }
     }
     {
-        const auto it = utils::as_const(obj).find("safety");
+        const auto it = obj.find("safety");
         if (it != obj.cend()) {
             const auto& v = it->second;
             if (!v.is<bool>())
@@ -314,6 +335,7 @@ void Settings::setCheckLevel(CheckLevel level)
         vfOptions.maxIfCount = 100;
         vfOptions.doConditionExpressionAnalysis = false;
         vfOptions.maxForwardBranches = 4;
+        vfOptions.maxForwardConditionForkDepth = 0;
         vfOptions.maxIterations = 1;
     }
     else if (level == CheckLevel::normal) {
@@ -323,6 +345,7 @@ void Settings::setCheckLevel(CheckLevel level)
         vfOptions.maxIfCount = 100;
         vfOptions.doConditionExpressionAnalysis = false;
         vfOptions.maxForwardBranches = 4;
+        vfOptions.maxForwardConditionForkDepth = 1;
     }
     else if (level == CheckLevel::exhaustive) {
         // Checking can take a little while. ~ 10 times slower than normal analysis is OK.
@@ -331,6 +354,8 @@ void Settings::setCheckLevel(CheckLevel level)
         vfOptions.maxSubFunctionArgs = 256;
         vfOptions.doConditionExpressionAnalysis = true;
         vfOptions.maxForwardBranches = -1;
+        vfOptions.maxForwardConditionForkDepth = 4;
+        vfOptions.maxForwardConditionForks = 256;
     }
 }
 
@@ -344,8 +369,8 @@ static const std::set<std::string> autosarCheckers{
     "arrayIndexThenCheck",
     "bufferAccessOutOfBounds",
     "comparePointers",
+    "compareValueOutOfTypeRangeError",
     "constParameter",
-    "cstyleCast",
     "ctuOneDefinitionRuleViolation",
     "doubleFree",
     "duplInheritedMember",
@@ -387,7 +412,6 @@ static const std::set<std::string> autosarCheckers{
     "unsignedLessThanZero",
     "unusedFunction",
     "unusedStructMember",
-    "unusedValue",
     "unusedVariable",
     "useInitializationList",
     "variableScope",
@@ -450,6 +474,14 @@ static const std::set<std::string> certCCheckers{
 static const std::set<std::string> certCppCheckers{
     "IOWithoutPositioning",
     "accessMoved",
+    "argumentSize",
+    "arrayIndexOutOfBounds",
+    "arrayIndexOutOfBoundsCond",
+    "arrayIndexThenCheck",
+    "autoVariables",
+    "autovarInvalidDeallocation",
+    "bitwiseOnBoolean",
+    "bufferAccessOutOfBounds",
     "comparePointers",
     "containerOutOfBounds",
     "ctuOneDefinitionRuleViolation",
@@ -457,57 +489,94 @@ static const std::set<std::string> certCppCheckers{
     "danglingReference",
     "danglingTempReference",
     "danglingTemporaryLifetime",
-    "deallocThrow",
+    "deallocret",
     "deallocuse",
     "doubleFree",
     "eraseDereference",
+    "exceptDeallocThrow",
     "exceptThrowInDestructor",
+    "floatConversionOverflow",
     "initializerList",
+    "integerOverflow",
     "invalidContainer",
+    "invalidFunctionArg",
+    "invalidLengthModifierError",
+    "invalidLifetime",
+    "invalidScanfFormatWidth",
+    "invalidscanf",
+    "leakReturnValNotUsed",
+    "leakUnsafeArgAlloc",
     "memleak",
+    "memleakOnRealloc",
     "mismatchAllocDealloc",
     "missingReturn",
+    "negativeIndex",
     "nullPointer",
+    "nullPointerArithmetic",
+    "nullPointerArithmeticRedundantCheck",
+    "nullPointerDefaultArg",
+    "nullPointerRedundantCheck",
+    "objectIndex",
     "operatorEqToSelf",
+    "pointerOutOfBounds",
+    "pointerOutOfBoundsCond",
+    "preprocessorErrorDirective",
+    "resourceLeak",
     "returnDanglingLifetime",
     "sizeofCalculation",
+    "stringLiteralWrite",
     "uninitStructMember",
     "uninitdata",
     "uninitvar",
+    "useClosedFile",
+    "uselessCallsRemove",
     "virtualCallInConstructor",
-    "virtualDestructor"
+    "virtualDestructor",
+    "wrongPrintfScanfArgNum",
+    "wrongPrintfScanfParameterPositionError"
 };
 
 static const std::set<std::string> misrac2012Checkers{
     "argumentSize",
+    "arrayIndexOutOfBounds",
+    "arrayIndexOutOfBoundsCond",
+    "autoVariables",
     "autovarInvalidDeallocation",
     "bufferAccessOutOfBounds",
     "comparePointers",
     "compareValueOutOfTypeRangeError",
+    "constParameter",
+    "constParameterCallback",
     "constParameterPointer",
     "constStatement",
+    "constVariablePointer",
     "danglingLifetime",
     "danglingTemporaryLifetime",
+    "directiveAsMacroParameter",
     "duplicateBreak",
     "funcArgNamesDifferent",
     "incompatibleFileOpen",
+    "incorrectLogicOperator",
     "invalidFunctionArg",
+    "invalidFunctionArgStr",
     "knownConditionTrueFalse",
     "leakNoVarFunctionCall",
     "leakReturnValNotUsed",
+    "legacyUninitvar",
     "memleak",
     "memleakOnRealloc",
     "missingReturn",
+    "negativeIndex",
     "overlappingWriteFunction",
     "overlappingWriteUnion",
     "pointerOutOfBounds",
-    "preprocessorErrorDirective",
     "redundantAssignInSwitch",
     "redundantAssignment",
     "redundantCondition",
     "resourceLeak",
     "returnDanglingLifetime",
     "shadowVariable",
+    "shiftNegative",
     "sizeofCalculation",
     "sizeofwithsilentarraypointer",
     "syntaxError",
@@ -515,6 +584,7 @@ static const std::set<std::string> misrac2012Checkers{
     "unknownEvaluationOrder",
     "unreachableCode",
     "unreadVariable",
+    "unusedFunction",
     "unusedLabel",
     "unusedVariable",
     "useClosedFile",
@@ -523,34 +593,45 @@ static const std::set<std::string> misrac2012Checkers{
 
 static const std::set<std::string> misrac2023Checkers{
     "argumentSize",
+    "arrayIndexOutOfBounds",
+    "arrayIndexOutOfBoundsCond",
+    "autoVariables",
     "autovarInvalidDeallocation",
     "bufferAccessOutOfBounds",
     "comparePointers",
     "compareValueOutOfTypeRangeError",
+    "constParameter",
+    "constParameterCallback",
     "constParameterPointer",
     "constStatement",
+    "constVariablePointer",
     "danglingLifetime",
     "danglingTemporaryLifetime",
+    "directiveAsMacroParameter",
     "duplicateBreak",
     "funcArgNamesDifferent",
     "incompatibleFileOpen",
+    "incorrectLogicOperator",
     "invalidFunctionArg",
+    "invalidFunctionArgStr",
     "knownConditionTrueFalse",
     "leakNoVarFunctionCall",
     "leakReturnValNotUsed",
+    "legacyUninitvar",
     "memleak",
     "memleakOnRealloc",
     "missingReturn",
+    "negativeIndex",
     "overlappingWriteFunction",
     "overlappingWriteUnion",
     "pointerOutOfBounds",
-    "preprocessorErrorDirective",
     "redundantAssignInSwitch",
     "redundantAssignment",
     "redundantCondition",
     "resourceLeak",
     "returnDanglingLifetime",
     "shadowVariable",
+    "shiftNegative",
     "sizeofCalculation",
     "sizeofwithsilentarraypointer",
     "syntaxError",
@@ -558,6 +639,7 @@ static const std::set<std::string> misrac2023Checkers{
     "unknownEvaluationOrder",
     "unreachableCode",
     "unreadVariable",
+    "unusedFunction",
     "unusedLabel",
     "unusedVariable",
     "useClosedFile",
@@ -566,34 +648,45 @@ static const std::set<std::string> misrac2023Checkers{
 
 static const std::set<std::string> misrac2025Checkers{
     "argumentSize",
+    "arrayIndexOutOfBounds",
+    "arrayIndexOutOfBoundsCond",
+    "autoVariables",
     "autovarInvalidDeallocation",
     "bufferAccessOutOfBounds",
     "comparePointers",
     "compareValueOutOfTypeRangeError",
+    "constParameter",
+    "constParameterCallback",
     "constParameterPointer",
     "constStatement",
+    "constVariablePointer",
     "danglingLifetime",
     "danglingTemporaryLifetime",
+    "directiveAsMacroParameter",
     "duplicateBreak",
     "funcArgNamesDifferent",
     "incompatibleFileOpen",
+    "incorrectLogicOperator",
     "invalidFunctionArg",
+    "invalidFunctionArgStr",
     "knownConditionTrueFalse",
     "leakNoVarFunctionCall",
     "leakReturnValNotUsed",
+    "legacyUninitvar",
     "memleak",
     "memleakOnRealloc",
     "missingReturn",
+    "negativeIndex",
     "overlappingWriteFunction",
     "overlappingWriteUnion",
     "pointerOutOfBounds",
-    "preprocessorErrorDirective",
     "redundantAssignInSwitch",
     "redundantAssignment",
     "redundantCondition",
     "resourceLeak",
     "returnDanglingLifetime",
     "shadowVariable",
+    "shiftNegative",
     "sizeofCalculation",
     "sizeofwithsilentarraypointer",
     "syntaxError",
@@ -601,6 +694,7 @@ static const std::set<std::string> misrac2025Checkers{
     "unknownEvaluationOrder",
     "unreachableCode",
     "unreadVariable",
+    "unusedFunction",
     "unusedLabel",
     "unusedVariable",
     "useClosedFile",
@@ -610,10 +704,12 @@ static const std::set<std::string> misrac2025Checkers{
 static const std::set<std::string> misracpp2008Checkers{
     "autoVariables",
     "comparePointers",
+    "compareValueOutOfTypeRangeError",
     "constParameter",
     "constVariable",
     "cstyleCast",
     "ctuOneDefinitionRuleViolation",
+    "dangerousTypeCast",
     "danglingLifetime",
     "duplInheritedMember",
     "duplicateBreak",
@@ -695,18 +791,31 @@ static const std::set<std::string> misracpp2023Checkers{
 
 bool Settings::isPremiumEnabled(const char id[]) const
 {
-    if (premiumArgs.find("autosar") != std::string::npos && autosarCheckers.count(id))
-        return true;
-    if (premiumArgs.find("cert-c-") != std::string::npos && certCCheckers.count(id))
-        return true;
-    if (premiumArgs.find("cert-c++") != std::string::npos && certCppCheckers.count(id))
-        return true;
-    if (premiumArgs.find("misra-c-") != std::string::npos && (misrac2012Checkers.count(id) || misrac2023Checkers.count(id) || misrac2025Checkers.count(id)))
-        return true;
-    if (premiumArgs.find("misra-c++-2008") != std::string::npos && misracpp2008Checkers.count(id))
-        return true;
-    if (premiumArgs.find("misra-c++-2023") != std::string::npos && misracpp2023Checkers.count(id))
-        return true;
+    for (std::string arg: splitString(premiumArgs, ' ')) {
+        std::transform(arg.cbegin(), arg.cend(), arg.begin(), [](char c) {
+            return c=='+' ? 'p' : c;
+        });
+        if (endsWith(arg, ":all"))
+            arg.erase(arg.size()-4);
+        if (arg == "--autosar" && autosarCheckers.count(id))
+            return true;
+        if (arg == "--cert-c" && certCCheckers.count(id))
+            return true;
+        if (arg == "--cert-c-2016" && certCCheckers.count(id))
+            return true;
+        if (startsWith(arg, "--cert-cpp") && certCppCheckers.count(id))
+            return true;
+        if (arg == "--misra-c-2012" && misrac2012Checkers.count(id))
+            return true;
+        if (arg == "--misra-c-2023" && misrac2023Checkers.count(id))
+            return true;
+        if (arg == "--misra-c-2025" && misrac2025Checkers.count(id))
+            return true;
+        if (arg == "--misra-cpp-2008" && misracpp2008Checkers.count(id))
+            return true;
+        if (arg == "--misra-cpp-2023" && misracpp2023Checkers.count(id))
+            return true;
+    }
     return false;
 }
 
@@ -726,3 +835,18 @@ bool Settings::unusedFunctionOnly()
     const char* unusedFunctionOnly = std::getenv("UNUSEDFUNCTION_ONLY");
     return unusedFunctionOnly && (std::strcmp(unusedFunctionOnly, "1") == 0);
 }
+
+bool Settings::collectLogCheckers(bool* summary, bool* xmlReport, bool* textReport) const
+{
+    const bool s = safety || severity.isEnabled(Severity::information);
+    if (summary)
+        *summary = s;
+    const bool x = outputFormat == Settings::OutputFormat::xml && xml_version == 3;
+    if (xmlReport)
+        *xmlReport = x;
+    const bool t = !checkersReportFilename.empty();
+    if (textReport)
+        *textReport = t;
+
+    return s || x || t;
+}
diff --git a/lib/settings.h b/lib/settings.h
index cae78e850eb..52f20afb7c4 100644
--- a/lib/settings.h
+++ b/lib/settings.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,9 +21,7 @@
 #define settingsH
 //---------------------------------------------------------------------------
 
-#include "addoninfo.h"
 #include "config.h"
-#include "errortypes.h"
 #include "library.h"
 #include "platform.h"
 #include "standards.h"
@@ -45,16 +43,16 @@
 #endif
 
 #ifdef HAVE_RULES
-#include <memory>
-
-class Regex;
+struct Rule;
 #endif
-
 struct Suppressions;
-enum class ShowTime : std::uint8_t;
+struct AddonInfo;
 namespace ValueFlow {
     class Value;
 }
+enum class Severity : std::uint8_t;
+enum class Certainty : std::uint8_t;
+enum class Checks : std::uint8_t;
 
 /// @addtogroup Core
 /// @{
@@ -96,6 +94,16 @@ class SimpleEnableGroup {
 };
 
 
+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 9
+// Hack to workaround GCC bug.
+// Details: https://trac.cppcheck.net/ticket/14850
+// seen on g++ before 10.x
+#define  CPPCHECK_NOEXCEPT
+#else
+#define  CPPCHECK_NOEXCEPT  noexcept
+#endif
+
+
 /**
  * @brief This is just a container for general settings so that we don't need
  * to pass individual values to functions or constructors now or in the
@@ -110,6 +118,13 @@ class CPPCHECKLIB WARN_UNUSED Settings {
 
 public:
     Settings();
+    ~Settings();
+
+    Settings(const Settings&);
+    Settings& operator=(const Settings&);
+
+    Settings(Settings&&) CPPCHECK_NOEXCEPT;
+    Settings& operator=(Settings&&) CPPCHECK_NOEXCEPT;
 
     static std::string loadCppcheckCfg(Settings& settings, Suppressions& suppressions, bool debug = false);
 
@@ -189,6 +204,9 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief Are we running from DACA script? */
     bool daca{};
 
+    /** @brief Is --debug-analyzerinfo given? */
+    bool debugainfo{};
+
     /** @brief Is --debug-ast given? */
     bool debugast{};
 
@@ -198,6 +216,9 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief Is --debug-ignore given? */
     bool debugignore{};
 
+    /** @brief Is --debug-ipc given? */
+    bool debugipc{};
+
     /** @brief Internal: Is --debug-lookup or --debug-lookup=all given? */
     bool debuglookup{};
 
@@ -291,6 +312,8 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     int loadAverage{};
 #endif
 
+    std::string manualUrl{"https://cppcheck.sourceforge.io/manual.pdf"};
+
     /** --max-configs value */
     int maxConfigsOption = 0; // "Not Assigned" value
 
@@ -349,6 +372,9 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief Using -E for debugging purposes */
     bool preprocessOnly{};
 
+    /** @brief Keep comments in preprocessed output */
+    bool keepComments{};
+
     /** @brief Is --quiet given? */
     bool quiet{};
 
@@ -359,16 +385,6 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     int reportProgress{-1};
 
 #ifdef HAVE_RULES
-    /** Rule */
-    struct CPPCHECKLIB Rule {
-        std::string tokenlist = "normal"; // use normal tokenlist
-        std::string pattern;
-        std::string id = "rule"; // default id
-        std::string summary;
-        Severity severity = Severity::style; // default severity
-        std::shared_ptr<Regex> regex;
-    };
-
     /**
      * @brief Extra rules
      */
@@ -434,6 +450,15 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     SimpleEnableGroup<Certainty> certainty;
     SimpleEnableGroup<Checks> checks;
 
+    enum class ShowTime : std::uint8_t {
+        NONE,
+        FILE,
+        FILE_TOTAL,
+        SUMMARY,
+        TOP5_SUMMARY,
+        TOP5_FILE
+    };
+
     /** @brief show timing information (--showtime=file|summary|top5) */
     ShowTime showtime{};
 
@@ -472,7 +497,7 @@ class CPPCHECKLIB WARN_UNUSED Settings {
         /** @brief the maximum iterations to execute */
         std::size_t maxIterations = 4;
 
-        /** @brief maximum numer if-branches */
+        /** @brief maximum number if-branches */
         int maxIfCount = -1;
 
         /** @brief maximum number of sets of arguments to pass to subfuncions */
@@ -490,6 +515,15 @@ class CPPCHECKLIB WARN_UNUSED Settings {
         /** @brief Maximum performed forward branches */
         int maxForwardBranches = -1;
 
+        /** @brief Maximum depth of nested condition-fork continuations in the forward analyzer.
+            Bounds the exponential fan-out of carrying condition state forward at exhaustive level (where
+            maxForwardBranches is unlimited); past it the forward analysis continues on a single linear path
+            without skipping any branch. 0 disables forking (linear); a negative value means unlimited. */
+        int maxForwardConditionForkDepth = 4;
+
+        /** @brief Maximum total condition-fork continuations in one forward traversal. */
+        int maxForwardConditionForks = 256;
+
         /** @brief Maximum performed alignof recursion */
         int maxAlignOfRecursion = 100;
 
@@ -577,6 +611,8 @@ class CPPCHECKLIB WARN_UNUSED Settings {
 
     static bool unusedFunctionOnly();
 
+    bool collectLogCheckers(bool* summary = nullptr, bool* xmlReport = nullptr, bool* textReport = nullptr) const;
+
 private:
     static std::string parseEnabled(const std::string &str, std::tuple<SimpleEnableGroup<Severity>, SimpleEnableGroup<Checks>> &groups);
     std::string applyEnabled(const std::string &str, bool enable);
diff --git a/lib/standards.cpp b/lib/standards.cpp
index a0ec72c1580..959f271912d 100644
--- a/lib/standards.cpp
+++ b/lib/standards.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -157,3 +157,15 @@ bool Standards::setStd(const std::string& str)
 {
     return setC(str) || setCPP(str);
 }
+
+std::string Standards::getStdForLanguage(Standards::Language language) const
+{
+    switch (language) {
+    case C:
+        return getC();
+    case CPP:
+        return getCPP();
+    default:
+        return "";
+    }
+}
diff --git a/lib/standards.h b/lib/standards.h
index d2c2a2b8e01..0d10b8c6d5d 100644
--- a/lib/standards.h
+++ b/lib/standards.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -58,6 +58,7 @@ struct CPPCHECKLIB Standards {
     static std::string getCPP(cppstd_t std);
     static cppstd_t getCPP(const std::string &std);
     bool setStd(const std::string& str);
+    std::string getStdForLanguage(Language language) const;
 };
 
 /// @}
diff --git a/lib/summaries.cpp b/lib/summaries.cpp
index a543fcc7065..fa5399fd73d 100644
--- a/lib/summaries.cpp
+++ b/lib/summaries.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 #include "summaries.h"
 
 #include "analyzerinfo.h"
+#include "path.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
@@ -34,7 +35,7 @@
 
 
 
-std::string Summaries::create(const Tokenizer &tokenizer, const std::string &cfg, int fileIndex)
+std::string Summaries::create(const Tokenizer &tokenizer, const std::string &cfg, std::size_t fsFileId)
 {
     const SymbolDatabase *symbolDatabase = tokenizer.getSymbolDatabase();
     const Settings &settings = tokenizer.getSettings();
@@ -82,7 +83,7 @@ std::string Summaries::create(const Tokenizer &tokenizer, const std::string &cfg
     }
 
     if (!settings.buildDir.empty()) {
-        std::string filename = AnalyzerInformation::getAnalyzerInfoFile(settings.buildDir, tokenizer.list.getSourceFilePath(), cfg, fileIndex);
+        std::string filename = AnalyzerInformation::getAnalyzerInfoFile(settings.buildDir, Path::simplifyPath(tokenizer.list.getSourceFilePath()), cfg, fsFileId);
         const std::string::size_type pos = filename.rfind(".a");
         if (pos != std::string::npos) {
             filename[pos+1] = 's';
diff --git a/lib/summaries.h b/lib/summaries.h
index ac3d40d840f..d720d023306 100644
--- a/lib/summaries.h
+++ b/lib/summaries.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,13 +23,14 @@
 
 #include "config.h"
 
+#include <cstddef>
 #include <set>
 #include <string>
 
 class Tokenizer;
 
 namespace Summaries {
-    CPPCHECKLIB std::string create(const Tokenizer &tokenizer, const std::string &cfg, int fileIndex);
+    CPPCHECKLIB std::string create(const Tokenizer &tokenizer, const std::string &cfg, std::size_t fsFileId);
     CPPCHECKLIB void loadReturn(const std::string &buildDir, std::set<std::string> &summaryReturn);
 }
 
diff --git a/lib/suppressions.cpp b/lib/suppressions.cpp
index b91db635478..0089510c86f 100644
--- a/lib/suppressions.cpp
+++ b/lib/suppressions.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,20 +18,22 @@
 
 #include "suppressions.h"
 
+#include "addoninfo.h"
 #include "errorlogger.h"
 #include "filesettings.h"
 #include "path.h"
 #include "pathmatch.h"
 #include "utils.h"
 #include "token.h"
-#include "tokenize.h"
 #include "tokenlist.h"
+#include "settings.h"
 
 #include <algorithm>
 #include <cctype>   // std::isdigit, std::isalnum, etc
 #include <cstring>
-#include <functional> // std::bind, std::placeholders
+#include <exception>
 #include <sstream>
+#include <stdexcept>
 #include <utility>
 
 #include "xml.h"
@@ -133,7 +135,10 @@ std::string SuppressionList::parseXmlFile(const char *filename)
                 s.lineNumber = strToInt<int>(text);
             else if (std::strcmp(name, "symbolName") == 0)
                 s.symbolName = text;
-            else if (*text && std::strcmp(name, "hash") == 0)
+            else if (std::strcmp(name, "macroName") == 0) {
+                s.macroName = text;
+                s.type = SuppressionList::Type::macro;
+            } else if (*text && std::strcmp(name, "hash") == 0)
                 s.hash = strToInt<std::size_t>(text);
             else
                 return std::string("unknown element '") + name + "' in suppressions XML '" + filename + "', expected id/fileName/lineNumber/symbolName/hash.";
@@ -147,6 +152,36 @@ std::string SuppressionList::parseXmlFile(const char *filename)
     return "";
 }
 
+static std::string getExtraComment(const std::string &comment, std::string::size_type startPos, std::string::size_type *delimPos = nullptr)
+{
+    const std::string::size_type semiPos = comment.find(';', startPos);
+    const std::string::size_type slashPos = comment.find("//", startPos);
+    std::string::size_type pos;
+
+    if (delimPos)
+        *delimPos = std::min(semiPos, slashPos);
+
+    if (semiPos < slashPos) {
+        pos = semiPos + 1;
+    } else if (slashPos < semiPos) {
+        pos = slashPos + 2;
+    } else {
+        return "";
+    }
+
+    std::string extra = comment.substr(pos);
+
+    if (startsWith(comment, "/*") && endsWith(comment, "*/"))
+        extra.erase(extra.size() - 2, 2);
+
+    extra = trim(extra);
+
+    for (auto it = extra.begin(); it != extra.end();)
+        it = (*it & 0x80) ? extra.erase(it) : it + 1;
+
+    return extra;
+}
+
 std::vector<SuppressionList::Suppression> SuppressionList::parseMultiSuppressComment(const std::string &comment, std::string *errorMessage)
 {
     std::vector<Suppression> suppressions;
@@ -201,27 +236,41 @@ std::vector<SuppressionList::Suppression> SuppressionList::parseMultiSuppressCom
         suppressions.push_back(std::move(s));
     }
 
+    const std::string extraComment = getExtraComment(comment, end_position);
+
+    if (extraComment.empty())
+        return suppressions;
+
+    for (auto &suppression : suppressions)
+        suppression.extraComment = extraComment;
+
     return suppressions;
 }
 
-SuppressionList::Suppression SuppressionList::parseLine(const std::string &line)
+SuppressionList::Suppression SuppressionList::parseLine(std::string line)
 {
-    std::istringstream lineStream;
     SuppressionList::Suppression suppression;
 
     // Strip any end of line comments
     std::string::size_type endpos = std::min(line.find('#'), line.find("//"));
     if (endpos != std::string::npos) {
+        const std::string::size_type offset = line[endpos] == '#' ? 1 : 2;
+        suppression.extraComment = trim(line.substr(endpos + offset));
         while (endpos > 0 && std::isspace(line[endpos-1])) {
             endpos--;
         }
-        lineStream.str(line.substr(0, endpos));
-    } else {
-        lineStream.str(line);
+        line.resize(endpos);
     }
 
-    if (std::getline(lineStream, suppression.errorId, ':')) {
-        if (std::getline(lineStream, suppression.fileName)) {
+    const auto parts = splitString(line, '\n');
+    const std::string& suppr_l = parts[0];
+
+    const std::string::size_type first_sep = suppr_l.find(':');
+    suppression.errorId = suppr_l.substr(0, first_sep);
+    if (first_sep != std::string::npos) {
+        suppression.fileName = suppr_l.substr(first_sep+1);
+        if (!suppression.fileName.empty()) {
+            // TODO: this only works with files which have an extension
             // If there is not a dot after the last colon in "file" then
             // the colon is a separator and the contents after the colon
             // is a line number..
@@ -231,30 +280,63 @@ SuppressionList::Suppression SuppressionList::parseLine(const std::string &line)
 
             // if a colon is found and there is no dot after it..
             if (pos != std::string::npos &&
-                suppression.fileName.find('.', pos) == std::string::npos) {
-                // Try to parse out the line number
-                try {
-                    std::istringstream istr1(suppression.fileName.substr(pos+1));
-                    istr1 >> suppression.lineNumber;
-                } catch (...) {
-                    suppression.lineNumber = SuppressionList::Suppression::NO_LINE;
-                }
+                suppression.fileName.find('.', pos) == std::string::npos)
+            {
+                // parse out the line number
+                const std::string line_s = suppression.fileName.substr(pos+1);
+                suppression.fileName.erase(pos);
 
-                if (suppression.lineNumber != SuppressionList::Suppression::NO_LINE) {
-                    suppression.fileName.erase(pos);
+                if (suppression.fileName.empty())
+                    throw std::runtime_error("filename is missing");
+
+                try {
+                    suppression.lineNumber = strToInt<int>(line_s);
+                } catch (const std::runtime_error& e) {
+                    throw std::runtime_error(std::string("invalid line number (") + e.what() + ")");
                 }
             }
+            suppression.fileName = Path::simplifyPath(suppression.fileName);
+        } else {
+            throw std::runtime_error("filename is missing");
         }
     }
 
-    suppression.fileName = Path::simplifyPath(suppression.fileName);
+    // TODO: make this optional - do we even encounter this in production code?
+    // when parsing string generated internally by toString() there can be newline
+    for (std::size_t i = 1; i < parts.size(); ++i) {
+        if (startsWith(parts[i], "symbol="))
+            suppression.symbolName = parts[i].substr(7);
+        else if (parts[i] == "polyspace=1")
+            suppression.isPolyspace = true;
+        else
+            throw std::runtime_error("unexpected extra '" + parts[i] + "'");
+    }
 
     return suppression;
 }
 
 std::string SuppressionList::addSuppressionLine(const std::string &line)
 {
-    return addSuppression(parseLine(line));
+    try {
+        return addSuppression(parseLine(line));
+    } catch (const std::exception& e) {
+        return e.what();
+    }
+}
+
+SuppressionList::Suppression *SuppressionList::findSameParameters(const Suppression &suppression)
+{
+    const std::vector<Suppression*> *candidates = &mNonHashSuppressions;
+    if (suppression.hash > 0) {
+        const auto it = mHashSuppressions.find(suppression.hash);
+        if (it == mHashSuppressions.end())
+            return nullptr;
+        candidates = &it->second;
+    }
+    const auto found = std::find_if(candidates->cbegin(), candidates->cend(), [&](const Suppression *s) {
+        return suppression.isSameParameters(*s);
+    });
+    return found != candidates->cend() ? *found : nullptr;
 }
 
 std::string SuppressionList::addSuppression(SuppressionList::Suppression suppression)
@@ -262,9 +344,7 @@ std::string SuppressionList::addSuppression(SuppressionList::Suppression suppres
     std::lock_guard<std::mutex> lg(mSuppressionsSync);
 
     // Check if suppression is already in list
-    auto foundSuppression = std::find_if(mSuppressions.begin(), mSuppressions.end(),
-                                         std::bind(&Suppression::isSameParameters, &suppression, std::placeholders::_1));
-    if (foundSuppression != mSuppressions.end()) {
+    if (findSameParameters(suppression)) {
         return "suppression '" + suppression.toString() + "' already exists";
     }
 
@@ -288,6 +368,12 @@ std::string SuppressionList::addSuppression(SuppressionList::Suppression suppres
 
     mSuppressions.push_back(std::move(suppression));
 
+    Suppression *const added = &mSuppressions.back();
+    if (added->hash > 0)
+        mHashSuppressions[added->hash].push_back(added);
+    else
+        mNonHashSuppressions.push_back(added);
+
     return "";
 }
 
@@ -306,9 +392,8 @@ bool SuppressionList::updateSuppressionState(const SuppressionList::Suppression&
     std::lock_guard<std::mutex> lg(mSuppressionsSync);
 
     // Check if suppression is already in list
-    auto foundSuppression = std::find_if(mSuppressions.begin(), mSuppressions.end(),
-                                         std::bind(&Suppression::isSameParameters, &suppression, std::placeholders::_1));
-    if (foundSuppression != mSuppressions.end()) {
+    Suppression *const foundSuppression = findSameParameters(suppression);
+    if (foundSuppression) {
         if (suppression.checked)
             foundSuppression->checked = true;
         if (suppression.matched)
@@ -332,20 +417,11 @@ bool SuppressionList::Suppression::parseComment(std::string comment, std::string
     if (comment.compare(comment.size() - 2, 2, "*/") == 0)
         comment.erase(comment.size() - 2, 2);
 
-    std::string::size_type extraPos = comment.find(';');
-    std::string::size_type extraDelimiterSize = 1;
-
-    if (extraPos == std::string::npos) {
-        extraPos = comment.find("//", 2);
-        extraDelimiterSize = 2;
-    }
+    std::string::size_type extraPos;
+    extraComment = getExtraComment(comment, 2, &extraPos);
 
-    if (extraPos != std::string::npos) {
-        extraComment = trim(comment.substr(extraPos + extraDelimiterSize));
-        for (auto it = extraComment.begin(); it != extraComment.end();)
-            it = *it & 0x80 ? extraComment.erase(it) : it + 1;
+    if (!extraComment.empty())
         comment.erase(extraPos);
-    }
 
     const std::set<std::string> cppchecksuppress{
         "cppcheck-suppress",
@@ -395,7 +471,7 @@ SuppressionList::Suppression::Result SuppressionList::Suppression::isSuppressed(
             if (!thisAndNextLine || lineNumber + 1 != errmsg.lineNumber)
                 return Result::None;
         }
-        if (!fileName.empty() && !PathMatch::match(fileName, errmsg.getFileName()))
+        if (!fileName.empty() && !isFileNameMatch(errmsg.getFileName()))
             return Result::None;
         if (hash > 0 && hash != errmsg.hash)
             return Result::Checked;
@@ -428,6 +504,21 @@ SuppressionList::Suppression::Result SuppressionList::Suppression::isSuppressed(
     return Result::Matched;
 }
 
+bool SuppressionList::Suppression::isFileNameMatch(const std::string &errorFileName) const
+{
+    const auto it = mFileNameMatchCache.find(errorFileName);
+    if (it != mFileNameMatchCache.end())
+        return it->second;
+
+    const bool result = PathMatch::match(fileName, errorFileName);
+
+    if (mFileNameMatchCache.size() >= mFileNameMatchCacheMaxEntries)
+        mFileNameMatchCache.clear();
+
+    mFileNameMatchCache.emplace(errorFileName, result);
+    return result;
+}
+
 bool SuppressionList::Suppression::isMatch(const SuppressionList::ErrorMessage &errmsg)
 {
     switch (isSuppressed(errmsg)) {
@@ -448,15 +539,24 @@ bool SuppressionList::isSuppressed(const SuppressionList::ErrorMessage &errmsg,
 {
     std::lock_guard<std::mutex> lg(mSuppressionsSync);
 
+    // TODO: handle unmatchedPolyspaceSuppression?
     const bool unmatchedSuppression(errmsg.errorId == "unmatchedSuppression");
     bool returnValue = false;
-    for (Suppression &s : mSuppressions) {
-        if (!global && !s.isLocal())
-            continue;
-        if (unmatchedSuppression && s.errorId != errmsg.errorId)
-            continue;
-        if (s.isMatch(errmsg))
-            returnValue = true;
+    const auto match = [&](const std::vector<Suppression*> &suppressions) {
+        for (Suppression *s : suppressions) {
+            if (!global && !s->isLocal())
+                continue;
+            if (unmatchedSuppression && s->errorId != errmsg.errorId)
+                continue;
+            if (s->isMatch(errmsg))
+                returnValue = true;
+        }
+    };
+    match(mNonHashSuppressions);
+    if (errmsg.hash != 0) {
+        const auto it = mHashSuppressions.find(errmsg.hash);
+        if (it != mHashSuppressions.end())
+            match(it->second);
     }
     return returnValue;
 }
@@ -465,13 +565,21 @@ bool SuppressionList::isSuppressedExplicitly(const SuppressionList::ErrorMessage
 {
     std::lock_guard<std::mutex> lg(mSuppressionsSync);
 
-    for (Suppression &s : mSuppressions) {
-        if (!global && !s.isLocal())
-            continue;
-        if (s.errorId != errmsg.errorId) // Error id must match exactly
-            continue;
-        if (s.isMatch(errmsg))
-            return true;
+    const auto match = [&](const std::vector<Suppression*> &suppressions) {
+        return std::any_of(suppressions.cbegin(), suppressions.cend(), [&](Suppression *s) {
+            if (!global && !s->isLocal())
+                return false;
+            if (s->errorId != errmsg.errorId) // Error id must match exactly
+                return false;
+            return s->isMatch(errmsg);
+        });
+    };
+    if (match(mNonHashSuppressions))
+        return true;
+    if (errmsg.hash != 0) {
+        const auto it = mHashSuppressions.find(errmsg.hash);
+        if (it != mHashSuppressions.end())
+            return match(it->second);
     }
     return false;
 }
@@ -603,25 +711,27 @@ std::list<SuppressionList::Suppression> SuppressionList::getSuppressions() const
     return mSuppressions;
 }
 
-void SuppressionList::markUnmatchedInlineSuppressionsAsChecked(const Tokenizer &tokenizer) {
+void SuppressionList::markUnmatchedInlineSuppressionsAsChecked(const TokenList &tokenlist) {
     std::lock_guard<std::mutex> lg(mSuppressionsSync);
 
     int currLineNr = -1;
     int currFileIdx = -1;
-    for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
+    for (const Token *tok = tokenlist.front(); tok; tok = tok->next()) {
         if (currFileIdx != tok->fileIndex() || currLineNr != tok->linenr()) {
             currLineNr = tok->linenr();
             currFileIdx = tok->fileIndex();
-            for (auto &suppression : mSuppressions) {
+            // checked is not used for hash suppressions
+            for (Suppression *s : mNonHashSuppressions) {
+                Suppression &suppression = *s;
                 if (suppression.type == SuppressionList::Type::unique) {
-                    if (!suppression.checked && (suppression.lineNumber == currLineNr) && (suppression.fileName == tokenizer.list.file(tok))) {
+                    if (!suppression.checked && (suppression.lineNumber == currLineNr) && (suppression.fileName == tokenlist.file(tok))) {
                         suppression.checked = true;
                     }
                 } else if (suppression.type == SuppressionList::Type::block) {
-                    if ((!suppression.checked && (suppression.lineBegin <= currLineNr) && (suppression.lineEnd >= currLineNr) && (suppression.fileName == tokenizer.list.file(tok)))) {
+                    if ((!suppression.checked && (suppression.lineBegin <= currLineNr) && (suppression.lineEnd >= currLineNr) && (suppression.fileName == tokenlist.file(tok)))) {
                         suppression.checked = true;
                     }
-                } else if (!suppression.checked && suppression.fileName == tokenizer.list.file(tok)) {
+                } else if (!suppression.checked && suppression.fileName == tokenlist.file(tok)) {
                     suppression.checked = true;
                 }
             }
@@ -632,7 +742,7 @@ void SuppressionList::markUnmatchedInlineSuppressionsAsChecked(const Tokenizer &
 std::string SuppressionList::Suppression::toString() const
 {
     std::string s;
-    s+= errorId;
+    s += errorId;
     if (!fileName.empty()) {
         s += ':';
         s += fileName;
@@ -641,9 +751,250 @@ std::string SuppressionList::Suppression::toString() const
             s += std::to_string(lineNumber);
         }
     }
-    if (!symbolName.empty()) {
-        s += ':';
-        s += symbolName;
-    }
+    if (!symbolName.empty())
+        s += "\nsymbol=" + symbolName;
+    if (isPolyspace)
+        s += "\npolyspace=1";
     return s;
 }
+
+polyspace::Parser::Parser(const Settings &settings)
+{
+    const bool haveMisraAddon = std::any_of(settings.addonInfos.cbegin(),
+                                            settings.addonInfos.cend(),
+                                            [] (const AddonInfo &info) {
+        return info.name == "misra";
+    });
+
+    if (haveMisraAddon) {
+        mFamilyMap["MISRA-C3"] = "misra-c2012-";
+        mFamilyMap["MISRA2012"] = "misra-c2012-";
+    }
+
+    const auto matchArg = [&](const std::string &arg) {
+        const std::string args = settings.premiumArgs;
+        const std::string::size_type pos = args.find(arg);
+
+        if (pos == std::string::npos)
+            return false;
+
+        const char prevChar = (pos > 0) ? args[pos - 1] : ' ';
+        const char nextChar = (pos + arg.size() < args.size()) ? args[pos + arg.size()] : ' ';
+
+        return prevChar == ' ' && (nextChar == ' ' || nextChar == ':');
+    };
+
+    if (matchArg("--misra-c-2012")) {
+        mFamilyMap["MISRA-C3"] = "premium-misra-c-2012-";
+        mFamilyMap["MISRA2012"] = "premium-misra-c-2012-";
+    }
+
+    if (matchArg("--misra-c-2023"))
+        mFamilyMap["MISRA-C-2023"] = "premium-misra-c-2023-";
+
+    if (matchArg("--misra-cpp-2008") || matchArg("--misra-c++-2008"))
+        mFamilyMap["MISRA-CPP"] = "premium-misra-cpp-2008-";
+
+    if (matchArg("--misra-cpp-2023") || matchArg("--misra-c++-2023"))
+        mFamilyMap["MISRA-CPP-2023"] = "premium-misra-cpp-2023-";
+
+    if (matchArg("--cert-c") || matchArg("--cert-c-2016"))
+        mFamilyMap["CERT-C"] = "premium-cert-c-";
+
+    if (matchArg("--cert-cpp") || matchArg("--cert-c++") ||
+        matchArg("--cert-cpp-2016") || matchArg("--cert-c++-2016"))
+        mFamilyMap["CERT-CPP"] = "premium-cert-cpp-";
+
+    if (matchArg("--autosar"))
+        mFamilyMap["AUTOSAR-CPP14"] = "premium-autosar-";
+}
+
+polyspace::CommentKind polyspace::Parser::parseKind(const std::string& comment, std::string::size_type& pos)
+{
+    const std::string::size_type pos1 = pos;
+    pos = comment.find_first_of(" \t", pos);
+    if (pos >= comment.size())
+        return CommentKind::Invalid;
+
+    const std::string token = comment.substr(pos1, pos-pos1);
+
+    if (token == "polyspace")
+        return CommentKind::Regular;
+
+    if (token == "polyspace-begin")
+        return CommentKind::Begin;
+
+    if (token == "polyspace-end")
+        return CommentKind::End;
+
+    return CommentKind::Invalid;
+}
+
+
+std::list<SuppressionList::Suppression> polyspace::Parser::parse(const std::string &comment, int line, const std::string &filename) const
+{
+    // Syntax for a polyspace suppression:
+    // https://se.mathworks.com/help/bugfinder/ug/annotate-hide-known-acceptable-polyspace-results-web-browser.html
+
+    std::list<SuppressionList::Suppression> ret;
+
+    if (mFamilyMap.empty())
+        return ret;
+
+    for (std::string::size_type pos = comment.find_first_not_of("/* "); pos < comment.size();) {
+        // polyspace
+        const auto polyspaceKind = parseKind(comment, pos);
+        if (polyspaceKind == CommentKind::Invalid)
+            break;
+
+        // optional range
+        const int rangeValue = parseRange(comment, pos);
+
+        // ids..
+        const std::set<std::string> ids = parseIds(comment, pos);
+
+        // skip justification
+        if (pos < comment.size() && comment[pos] == '[') {
+            pos = comment.find(']',pos+1);
+            if (pos >= comment.size())
+                break;
+            pos = comment.find_first_not_of(" \t", pos+1);
+            if (pos >= comment.size())
+                break;
+        }
+
+        // extra comment
+        std::string extraComment;
+        if (pos < comment.size() && comment[pos] == '\"') {
+            const std::string::size_type p1 = pos + 1;
+            pos = comment.find('\"',p1);
+            if (pos >= comment.size())
+                break;
+            extraComment = comment.substr(p1, pos-p1);
+        }
+
+        for (const std::string& errorId: ids) {
+            SuppressionList::Suppression suppr;
+            suppr.errorId = errorId;
+            suppr.isInline = true;
+            suppr.isPolyspace = true;
+            suppr.fileName = filename;
+            suppr.lineNumber = line;
+            suppr.extraComment = extraComment;
+
+            if (rangeValue > 0) {
+                suppr.type = SuppressionList::Type::block;
+                suppr.lineBegin = line;
+                suppr.lineEnd = line + rangeValue;
+            }
+            else if (polyspaceKind == polyspace::CommentKind::Regular)
+                suppr.type = SuppressionList::Type::unique;
+            else if (polyspaceKind == polyspace::CommentKind::Begin)
+                suppr.type = SuppressionList::Type::blockBegin;
+            else
+                suppr.type = SuppressionList::Type::blockEnd;
+
+            ret.emplace_back(suppr);
+        }
+
+        // proceed to next "polyspace" if it exists
+        if (pos < comment.size())
+            pos = comment.find("polyspace", pos);
+    }
+
+    return ret;
+}
+
+
+int polyspace::Parser::parseRange(const std::string& comment, std::string::size_type& pos) {
+    pos = comment.find_first_not_of(" \t", pos);
+    if (pos >= comment.size())
+        return 0;
+    if (comment[pos] != '+')
+        return 0;
+    const std::string::size_type startpos = pos + 1;
+    std::string::size_type endpos = comment.find_first_of(" \t", startpos);
+    if (endpos > comment.size())
+        return 0;
+    const std::string range = comment.substr(startpos, endpos-startpos);
+    try {
+        int ret = std::stoi(range);
+        pos = endpos;
+        return ret;
+    } catch (const std::invalid_argument &) {}
+    return 0;
+}
+
+std::vector<std::pair<std::string, std::string>> polyspace::Parser::parseFamilyRules(const std::string& comment, std::string::size_type& pos) {
+    std::vector<std::pair<std::string, std::string>> fr;
+    std::string family;
+    std::string rule;
+    enum class State: uint8_t { family, colon, rule, rule_or_family } state = State::family;
+    const std::string::size_type endpos = startsWith(comment, "/*") ? comment.size() - 2 : comment.size();
+    for (; pos <= endpos; ++pos) {
+        const char c = comment[pos];
+        if (std::strchr("[\"", c))
+            break;
+        switch (state) {
+        case State::family:
+            if (std::isalnum(c) || std::strchr("-_.",c))
+                family += c;
+            else if (!family.empty() && std::strchr(" \t:",c))
+                state = State::colon;
+            break;
+        case State::colon:
+            if (!std::strchr(" \t:", c)) {
+                rule.clear();
+                --pos;
+                state = State::rule;
+            }
+            break;
+        case State::rule:
+            if (std::strchr(", \t",c)) {
+                if (!rule.empty()) {
+                    fr.emplace_back(family,rule);
+                    rule.clear();
+                    if (c != ',')
+                        state = State::rule_or_family;
+                }
+            }
+            else
+                rule += c;
+            break;
+        case State::rule_or_family:
+            rule.clear();
+            if (std::isalnum(c)) {
+                --pos;
+                family.clear();
+                state = State::family;
+            } else if (c == ',') {
+                --pos;
+                state = State::rule;
+            }
+            break;
+        }
+    }
+    if (!family.empty() && !rule.empty())
+        fr.emplace_back(family,rule);
+    return fr;
+}
+
+std::set<std::string> polyspace::Parser::parseIds(const std::string& comment, std::string::size_type& pos) const {
+    std::set<std::string> ids;
+    for (const auto& fr: parseFamilyRules(comment,pos)) {
+        const auto it = mFamilyMap.find(fr.first);
+        if (it != mFamilyMap.cend())
+            ids.emplace(it->second + fr.second);
+    }
+    return ids;
+}
+
+
+bool polyspace::isPolyspaceComment(const std::string &comment)
+{
+    const std::string polyspace = "polyspace";
+    const std::string::size_type pos = comment.find_first_not_of("/* ");
+    if (pos == std::string::npos)
+        return false;
+    return comment.compare(pos, polyspace.size(), polyspace, 0, polyspace.size()) == 0;
+}
diff --git a/lib/suppressions.h b/lib/suppressions.h
index 022a492c51f..42955ab7b91 100644
--- a/lib/suppressions.h
+++ b/lib/suppressions.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,13 +29,16 @@
 #include <mutex>
 #include <set>
 #include <string>
+#include <unordered_map>
 #include <utility>
 #include <vector>
+#include <map>
 
-class Tokenizer;
+class TokenList;
 class ErrorMessage;
 enum class Certainty : std::uint8_t;
 class FileWithDetails;
+class Settings;
 
 /// @addtogroup Core
 /// @{
@@ -49,14 +52,14 @@ class CPPCHECKLIB SuppressionList {
     };
 
     struct CPPCHECKLIB ErrorMessage {
-        std::size_t hash;
+        std::size_t hash{};
         std::string errorId;
         void setFileName(std::string s);
         const std::string &getFileName() const {
             return mFileName;
         }
-        int lineNumber; // TODO: need to be unsigned
-        Certainty certainty;
+        int lineNumber{}; // TODO: need to be unsigned
+        Certainty certainty{};
         std::string symbolNames;
         std::set<std::string> macroNames;
 
@@ -149,9 +152,12 @@ class CPPCHECKLIB SuppressionList {
         std::string errorId;
         std::string fileName;
         std::string extraComment;
+        // TODO: use simplecpp::Location?
+        int fileIndex{};
         int lineNumber = NO_LINE; // TODO: needs to be unsigned
         int lineBegin = NO_LINE;
         int lineEnd = NO_LINE;
+        int column{};
         Type type = Type::unique;
         std::string symbolName;
         std::string macroName;
@@ -160,8 +166,15 @@ class CPPCHECKLIB SuppressionList {
         bool matched{}; /** This suppression was fully matched in an isSuppressed() call */
         bool checked{}; /** This suppression applied to code which was being analyzed but did not match the error in an isSuppressed() call */
         bool isInline{};
+        bool isPolyspace{};
 
         enum : std::int8_t { NO_LINE = -1 };
+
+    private:
+        bool isFileNameMatch(const std::string &errorFileName) const;
+
+        static constexpr std::size_t mFileNameMatchCacheMaxEntries = 256;
+        mutable std::map<std::string, bool> mFileNameMatchCache;
     };
 
     /**
@@ -190,8 +203,9 @@ class CPPCHECKLIB SuppressionList {
      * Create a Suppression object from a suppression line
      * @param line The line to parse.
      * @return a suppression object
+     * @throws std::runtime_error thrown if the given suppression is invalid
      */
-    static Suppression parseLine(const std::string &line);
+    static Suppression parseLine(std::string line);
 
     /**
      * @brief Don't show the given error.
@@ -278,12 +292,23 @@ class CPPCHECKLIB SuppressionList {
     /**
      * @brief Marks Inline Suppressions as checked if source line is in the token stream
      */
-    void markUnmatchedInlineSuppressionsAsChecked(const Tokenizer &tokenizer);
+    void markUnmatchedInlineSuppressionsAsChecked(const TokenList &tokenlist);
 
 private:
+    /**
+     * @brief Find a suppression with the same parameters. mSuppressionsSync must be locked.
+     * @param suppression the suppression to look for
+     * @return the found suppression, or nullptr
+     */
+    Suppression *findSameParameters(const Suppression &suppression);
+
     mutable std::mutex mSuppressionsSync;
     /** @brief List of error which the user doesn't want to see. */
     std::list<Suppression> mSuppressions;
+    /** @brief Suppressions in mSuppressions with hash > 0, indexed by hash */
+    std::unordered_map<std::size_t, std::vector<Suppression*>> mHashSuppressions;
+    /** @brief Suppressions in mSuppressions with hash == 0 */
+    std::vector<Suppression*> mNonHashSuppressions;
 };
 
 struct Suppressions
@@ -294,6 +319,34 @@ struct Suppressions
     SuppressionList nofail;
 };
 
+namespace polyspace {
+
+    enum class CommentKind : std::uint8_t {
+        Invalid, Regular, Begin, End,
+    };
+
+    class CPPCHECKLIB Parser {
+    public:
+        Parser() = delete;
+        explicit Parser(const Settings &settings);
+
+        std::list<SuppressionList::Suppression> parse(const std::string &comment, int line, const std::string &filename) const;
+
+        static int parseRange(const std::string& comment, std::string::size_type& pos);
+        static std::vector<std::pair<std::string, std::string>> parseFamilyRules(const std::string& comment, std::string::size_type& pos);
+
+    private:
+        std::set<std::string> parseIds(const std::string& comment, std::string::size_type& pos) const;
+
+        static CommentKind parseKind(const std::string& comment, std::string::size_type& pos);
+
+        std::map<std::string, std::string> mFamilyMap;
+    };
+
+    bool CPPCHECKLIB isPolyspaceComment(const std::string &comment);
+
+}
+
 /// @}
 //---------------------------------------------------------------------------
 #endif // suppressionsH
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index b6528d9a9e6..26801640e99 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,6 +39,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cctype>
 #include <cstring>
 #include <functional>
 #include <initializer_list>
@@ -138,8 +139,14 @@ const Token* SymbolDatabase::isEnumDefinition(const Token* tok)
     if (tok->str() == "{")
         return tok;
     tok = tok->next(); // skip ':'
-    while (Token::Match(tok, "%name%|::"))
+    bool hasType = false;
+    while (Token::Match(tok, "%name%|::")) {
+        if (tok->isName())
+            hasType = true;
         tok = tok->next();
+    }
+    if (!hasType)
+        throw InternalError(tok, "SymbolDatabase bailout; invalid enum", InternalError::SYNTAX);
     return Token::simpleMatch(tok, "{") ? tok : nullptr;
 }
 
@@ -160,6 +167,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
     };
 
     std::stack<const Token*> inIfCondition;
+    std::stack<Scope*> pendingIfScopes;
 
     auto addLambda = [this, &scope](const Token* tok, const Token* lambdaEndToken) -> const Token* {
         const Token* lambdaStartToken = lambdaEndToken->link();
@@ -174,11 +182,9 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
     // Store current access in each scope (depends on evaluation progress)
     std::map<const Scope*, AccessControl> access;
 
-    const bool doProgress = (mSettings.reportProgress != -1);
-
-    std::map<Scope *, std::set<std::string>> forwardDecls;
+    std::map<const Scope *, std::set<std::string>> forwardDecls;
 
-    const std::function<Scope *(const Token *, Scope *)> findForwardDeclScope = [&](const Token *tok, Scope *startScope) {
+    const std::function<const Scope *(const Token *, const Scope *)> findForwardDeclScope = [&](const Token *tok, const Scope *startScope) {
         if (tok->str() == "::")
             return findForwardDeclScope(tok->next(), &scopeList.front());
 
@@ -188,25 +194,26 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
             });
 
             if (it == startScope->nestedList.cend())
-                return static_cast<Scope *>(nullptr);
+                return static_cast<const Scope *>(nullptr);
 
             return findForwardDeclScope(tok->tokAt(2), *it);
         }
 
         auto it = forwardDecls.find(startScope);
         if (it == forwardDecls.cend())
-            return static_cast<Scope *>(nullptr);
+            return static_cast<const Scope *>(nullptr);
 
         return it->second.count(tok->str()) > 0 ? startScope : nullptr;
     };
 
+    ProgressReporter progressReporter(mErrorLogger, mSettings.reportProgress, mTokenizer.list.getSourceFilePath(), "SymbolDatabase (find all scopes)");
+
     // find all scopes
     for (const Token *tok = mTokenizer.tokens(); tok; tok = tok ? tok->next() : nullptr) {
         // #5593 suggested to add here:
-        if (doProgress)
-            mErrorLogger.reportProgress(mTokenizer.list.getSourceFilePath(),
-                                        "SymbolDatabase",
-                                        tok->progressValue());
+
+        progressReporter.report(tok->progressValue());
+
         // Locate next class
         if ((tok->isCpp() && tok->isKeyword() &&
              ((Token::Match(tok, "class|struct|union|namespace ::| %name% final| {|:|::|<") &&
@@ -714,7 +721,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                 }
                 // function prototype?
                 else if (declEnd && declEnd->str() == ";") {
-                    if (tok->astParent() && tok->astParent()->str() == "::" &&
+                    if ((Token::simpleMatch(tok->tokAt(-1), "::") || (tok->tokAt(-1) && Token::simpleMatch(tok->tokAt(-2), ":: ~"))) &&
                         Token::Match(declEnd->previous(), "default|delete")) {
                         addClassFunction(scope, tok, argStart);
                         continue;
@@ -767,13 +774,14 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                     scopeList.emplace_back(*this, tok, scope, ScopeType::eSwitch, scopeStartTok);
 
                 scope->nestedList.push_back(&scopeList.back());
-                scope = &scopeList.back();
-                if (scope->type == ScopeType::eFor)
-                    scope->checkVariable(tok->tokAt(2), AccessControl::Local); // check for variable declaration and add it to new scope if found
-                else if (scope->type == ScopeType::eCatch)
-                    scope->checkVariable(tok->tokAt(2), AccessControl::Throw); // check for variable declaration and add it to new scope if found
+                Scope* newScope = &scopeList.back();
+                if (newScope->type == ScopeType::eFor)
+                    newScope->checkVariable(tok->tokAt(2), AccessControl::Local); // check for variable declaration and add it to new scope if found
+                else if (newScope->type == ScopeType::eCatch)
+                    newScope->checkVariable(tok->tokAt(2), AccessControl::Throw); // check for variable declaration and add it to new scope if found
                 tok = tok->next();
                 inIfCondition.push(scopeStartTok);
+                pendingIfScopes.push(newScope);
             } else if (Token::Match(tok, "%var% {")) {
                 endInitList.emplace(tok->linkAt(1), scope);
                 tok = tok->next();
@@ -784,6 +792,8 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                     endInitList.emplace(tok->link(), scope);
                 } else if (!inIfCondition.empty() && tok == inIfCondition.top()) {
                     inIfCondition.pop();
+                    scope = pendingIfScopes.top();
+                    pendingIfScopes.pop();
                 } else if (isExecutableScope(tok)) {
                     scopeList.emplace_back(*this, tok, scope, ScopeType::eUnconditional, tok);
                     scope->nestedList.push_back(&scopeList.back());
@@ -907,7 +917,8 @@ void SymbolDatabase::createSymbolDatabaseCopyAndMoveConstructors()
                 continue;
 
             const Variable* firstArg = func->getArgumentVar(0);
-            if (firstArg->type() == scope.definedType) {
+            // skip references to functions: Foo(Foo& (&f)())
+            if (firstArg->type() == scope.definedType && !Token::Match(firstArg->typeEndToken(), "&|&& %name%| ) (")) {
                 if (firstArg->isRValueReference())
                     func->type = FunctionType::eMoveConstructor;
                 else if (firstArg->isReference() && !firstArg->isPointer())
@@ -1023,7 +1034,7 @@ void SymbolDatabase::createSymbolDatabaseNeedInitialization()
                             if (var.isClass() && !var.isReference()) {
                                 if (var.type()) {
                                     // does this type need initialization?
-                                    if (var.type()->needInitialization == Type::NeedInitialization::True && !var.hasDefault() && !var.isStatic())
+                                    if (var.type()->needInitialization == Type::NeedInitialization::True && !var.hasDefault())
                                         needInitialization = true;
                                     else if (var.type()->needInitialization == Type::NeedInitialization::Unknown) {
                                         if (!(var.valueType() && var.valueType()->type == ValueType::CONTAINER))
@@ -1040,10 +1051,8 @@ void SymbolDatabase::createSymbolDatabaseNeedInitialization()
                             scope.definedType->needInitialization = Type::NeedInitialization::True;
                         else if (!unknown)
                             scope.definedType->needInitialization = Type::NeedInitialization::False;
-                        else {
-                            if (scope.definedType->needInitialization == Type::NeedInitialization::Unknown)
-                                unknowns++;
-                        }
+                        else
+                            unknowns++;
                     }
                 } else if (scope.type == ScopeType::eUnion && scope.definedType->needInitialization == Type::NeedInitialization::Unknown)
                     scope.definedType->needInitialization = Type::NeedInitialization::True;
@@ -1200,7 +1209,7 @@ void SymbolDatabase::createSymbolDatabaseSetFunctionPointers(bool firstPass)
 
             tok->function(function);
 
-            if (tok->strAt(1) != "(")
+            if (!function->isConstructor() && tok->strAt(1) != "(")
                 const_cast<Function *>(function)->functionPointerUsage = tok;
         }
     }
@@ -1243,6 +1252,7 @@ void SymbolDatabase::createSymbolDatabaseSetTypePointers()
 {
     std::unordered_set<std::string> typenames;
     for (const Type &t : typeList) {
+        // cppcheck-suppress useStlAlgorithm - std::transform is cumbersome
         typenames.insert(t.name());
     }
 
@@ -1489,7 +1499,7 @@ void SymbolDatabase::createSymbolDatabaseEnums()
 
 void SymbolDatabase::createSymbolDatabaseIncompleteVars()
 {
-    for (Token* tok = mTokenizer.list.front(); tok != mTokenizer.list.back(); tok = tok->next()) {
+    for (Token* tok = mTokenizer.list.front(); precedes(tok, mTokenizer.list.back()); tok = tok->next()) {
         const Scope * scope = tok->scope();
         if (!scope)
             continue;
@@ -1608,6 +1618,26 @@ static std::string getIncompleteNameID(const Token* tok)
 }
 
 namespace {
+    int getExprIdForOperand(const Token* tok) {
+        if (!tok)
+            return 0;
+
+        int otherExprId = 0;
+
+        // Look through all referenced tokens.
+        // If two exprIds are found and one matches tok->exprId(), return the other.
+        // Otherwise, default to returning tok->exprId().
+        for (const auto& ref: followAllReferences(tok)) {
+            const int refExprId = ref.token->exprId();
+            if (refExprId != 0 && refExprId != tok->exprId()) {
+                if (otherExprId != 0 && otherExprId != refExprId)
+                    return tok->exprId();
+                otherExprId = refExprId;
+            }
+        }
+        return otherExprId != 0 ? otherExprId : tok->exprId();
+    }
+
     struct ExprIdKey {
         std::string parentOp;
         nonneg int operand1;
@@ -1642,8 +1672,8 @@ namespace {
 
             ExprIdKey key;
             key.parentOp = tok->astParent()->str();
-            key.operand1 = op1 ? op1->exprId() : 0;
-            key.operand2 = op2 ? op2->exprId() : 0;
+            key.operand1 = getExprIdForOperand(op1);
+            key.operand2 = getExprIdForOperand(op2);
 
             if (tok->astParent()->isCast() && tok->astParent()->str() == "(") {
                 const Token* typeStartToken;
@@ -1662,19 +1692,6 @@ namespace {
                 key.parentOp += type;
             }
 
-            for (const auto& ref: followAllReferences(op1)) {
-                if (ref.token->exprId() != 0) { // cppcheck-suppress useStlAlgorithm
-                    key.operand1 = ref.token->exprId();
-                    break;
-                }
-            }
-            for (const auto& ref: followAllReferences(op2)) {
-                if (ref.token->exprId() != 0) { // cppcheck-suppress useStlAlgorithm
-                    key.operand2 = ref.token->exprId();
-                    break;
-                }
-            }
-
             if (key.operand1 > key.operand2 && key.operand2 &&
                 Token::Match(tok->astParent(), "%or%|%oror%|+|*|&|&&|^|==|!=")) {
                 // In C++ the order of operands of + might matter
@@ -1915,7 +1932,10 @@ void SymbolDatabase::setArrayDimensionsUsingValueFlow()
                 }
 
                 if (bits > 0 && bits <= 62) {
-                    if (dimension.tok->valueType()->sign == ValueType::Sign::UNSIGNED)
+                    auto sign = dimension.tok->valueType()->sign;
+                    if (sign == ValueType::Sign::UNKNOWN_SIGN && dimension.tok->valueType()->type == ValueType::Type::CHAR)
+                        sign = mDefaultSignedness;
+                    if (sign == ValueType::Sign::UNSIGNED)
                         dimension.num = 1LL << bits;
                     else
                         dimension.num = 1LL << (bits - 1);
@@ -1946,7 +1966,7 @@ bool SymbolDatabase::isFunction(const Token *tok, const Scope* outerScope, const
     // function returning function pointer? '... ( ... %name% ( ... ))( ... ) {'
     // function returning reference to array '... ( & %name% ( ... ))[ ... ] {'
     // TODO: Activate this again
-    if ((false) && tok->str() == "(" && tok->strAt(1) != "*" && // NOLINT(readability-simplify-boolean-expr)
+    if ((false) && tok->str() == "(" && tok->strAt(1) != "*" && // NOLINT(readability-simplify-boolean-expr,readability-redundant-parentheses)
         (tok->link()->strAt(-1) == ")" || Token::simpleMatch(tok->link()->tokAt(-2), ") const"))) {
         const Token* tok2 = tok->link()->next();
         if (tok2 && tok2->str() == "(" && Token::Match(tok2->link()->next(), "{|;|const|=")) {
@@ -2160,7 +2180,7 @@ namespace {
     {
         if (const Scope* scope = var->nameToken()->scope()) {
             auto it = std::find_if(scope->functionList.begin(), scope->functionList.end(), [&](const Function& function) {
-                for (nonneg int arg = 0; arg < function.argCount(); ++arg) {
+                for (size_t arg = 0; arg < function.argCount(); ++arg) {
                     if (var == function.getArgumentVar(arg))
                         return true;
                 }
@@ -2364,9 +2384,9 @@ void SymbolDatabase::validate() const
     validateVariables();
 }
 
-void SymbolDatabase::clangSetVariables(const std::vector<const Variable *> &variableList)
+void SymbolDatabase::clangSetVariables(const std::vector<const Variable *> &vars)
 {
-    mVariableList = variableList;
+    mVariableList = vars;
 }
 
 void SymbolDatabase::debugSymbolDatabase() const
@@ -2497,7 +2517,12 @@ bool Variable::isMember() const {
 
 bool Variable::isPointerArray() const
 {
-    return isArray() && nameToken() && nameToken()->previous() && (nameToken()->strAt(-1) == "*");
+    if (!isArray())
+        return false;
+    const Token* tok = nameToken() ? nameToken()->previous() : nullptr;
+    while (Token::Match(tok, "const|volatile"))
+        tok = tok->previous();
+    return Token::simpleMatch(tok, "*");
 }
 
 bool Variable::isUnsigned() const
@@ -2535,7 +2560,7 @@ void Variable::evaluate(const Settings& settings)
     bool isContainer = false;
     if (mNameToken) {
         setFlag(fIsArray, arrayDimensions(settings, isContainer));
-        setFlag(fIsMaybeUnused, mNameToken->isAttributeMaybeUnused());
+        setFlag(fIsMaybeUnused, mNameToken->isAttributeMaybeUnused() || mNameToken->isAttributeUnused());
     }
 
 
@@ -2572,6 +2597,10 @@ void Variable::evaluate(const Settings& settings)
         } else if (tok->str() == "&&") { // Before simplification, && isn't split up
             setFlag(fIsRValueRef, true);
             setFlag(fIsReference, true); // Set also fIsReference
+        } else if (tok->str() == "(" && Token::simpleMatch(tok->link(), ") (")) {
+            // a reference before the parentheses belongs to the return type of a function pointer: int& (*f)()
+            setFlag(fIsRValueRef, false);
+            setFlag(fIsReference, false);
         }
 
         if (tok->str() == "<" && tok->link())
@@ -2630,16 +2659,16 @@ void Variable::evaluate(const Settings& settings)
     }
 }
 
-void Variable::setValueType(const ValueType &valueType)
+void Variable::setValueType(const ValueType &vt)
 {
-    if (valueType.type == ValueType::Type::UNKNOWN_TYPE) {
+    if (vt.type == ValueType::Type::UNKNOWN_TYPE) {
         const Token *declType = Token::findsimplematch(mTypeStartToken, "decltype (", mTypeEndToken);
         if (declType && !declType->next()->valueType())
             return;
     }
-    const auto* vt = new ValueType(valueType);
+    const auto* tmp = new ValueType(vt);
     delete mValueType;
-    mValueType = vt;
+    mValueType = tmp;
     if ((mValueType->pointer > 0) && (!isArray() || Token::Match(mNameToken->previous(), "( * %name% )")))
         setFlag(fIsPointer, true);
     setFlag(fIsConst, mValueType->constness & (1U << mValueType->pointer));
@@ -3007,10 +3036,10 @@ static bool typesMatch(
     const Token *&new_second)
 {
     // get first type
-    const Type* first_type = first_scope->symdb.findType(first_token, first_scope, /*lookOutside*/ true);
+    const Type* first_type = first_scope->symdb().findType(first_token, first_scope, /*lookOutside*/ true);
     if (first_type) {
         // get second type
-        const Type* second_type = second_scope->symdb.findType(second_token, second_scope, /*lookOutside*/ true);
+        const Type* second_type = second_scope->symdb().findType(second_token, second_scope, /*lookOutside*/ true);
         // check if types match
         if (first_type == second_type) {
             const Token* tok1 = first_token;
@@ -3340,8 +3369,12 @@ static bool checkReturns(const Function* function, bool unknown, bool emptyEnabl
     assert(defEnd != defStart);
     if (pred(defStart, defEnd))
         return true;
-    if (isUnknownType(defStart, defEnd))
+    if (isUnknownType(defStart, defEnd)) {
+        const Token* tok = function->token ? function->token->next() : function->tokenDef->next();
+        if (tok->valueType() && tok->valueType()->type >= ValueType::Type::RECORD)
+            return false;
         return unknown;
+    }
     return false;
 }
 
@@ -3380,6 +3413,20 @@ bool Function::returnsVoid(const Function* function, bool unknown)
     });
 }
 
+bool Function::isCoroutine(const Function* function, const Standards &standards, const Tokenizer &tokens)
+{
+    if (!tokens.isCPP() || standards.cpp < Standards::CPP20)
+        return false;
+    if (!function->functionScope)
+        return false;
+    const Scope *scope = function->functionScope;
+    for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
+        if (Token::Match(tok, "co_return|co_await|co_yield"))
+            return true;
+    }
+    return false;
+}
+
 std::vector<const Token*> Function::findReturns(const Function* f)
 {
     std::vector<const Token*> result;
@@ -3788,7 +3835,7 @@ const Token *Type::initBaseInfo(const Token *tok, const Token *tok1)
                 }
             }
 
-            const Type * baseType = classScope->symdb.findType(base.nameTok, enclosingScope);
+            const Type * baseType = classScope->symdb().findType(base.nameTok, enclosingScope);
             if (baseType && !baseType->findDependency(this))
                 base.type = baseType;
 
@@ -3854,7 +3901,7 @@ void SymbolDatabase::returnImplicitIntError(const Token *tok) const
 const Function* Type::getFunction(const std::string& funcName) const
 {
     if (classScope) {
-        const auto it = utils::as_const(classScope->functionMap).find(funcName);
+        const auto it = classScope->functionMap.find(funcName);
         if (it != classScope->functionMap.end())
             return it->second;
     }
@@ -4065,9 +4112,8 @@ static const char* functionTypeToString(FunctionType type)
         return "Function";
     case FunctionType::eLambda:
         return "Lambda";
-    default:
-        return "Unknown";
     }
+    cppcheck::unreachable();
 }
 
 static std::string tokenToString(const Token* tok, const Tokenizer& tokenizer)
@@ -4431,6 +4477,11 @@ void SymbolDatabase::printXml(std::ostream &out) const
             outs += ErrorLogger::toxml(scope->className);
             outs += "\"";
         }
+        if (scope->classDef) {
+            outs += " classDef=\"";
+            outs += id_string(scope->classDef);
+            outs += "\"";
+        }
         if (scope->bodyStart) {
             outs += " bodyStart=\"";
             outs += id_string(scope->bodyStart);
@@ -4515,7 +4566,7 @@ void SymbolDatabase::printXml(std::ostream &out) const
                         outs += "/>\n";
                     else {
                         outs += ">\n";
-                        for (unsigned int argnr = 0; argnr < function->argCount(); ++argnr) {
+                        for (size_t argnr = 0; argnr < function->argCount(); ++argnr) {
                             const Variable *arg = function->getArgumentVar(argnr);
                             outs += "          <arg nr=\"";
                             outs += std::to_string(argnr+1);
@@ -4578,8 +4629,7 @@ void SymbolDatabase::printXml(std::ostream &out) const
     }
 
     // Variables..
-    for (const Variable *var : mVariableList)
-        variables.insert(var);
+    std::copy(mVariableList.begin(), mVariableList.end(), std::inserter(variables, variables.end()));
     outs += "  <variables>\n";
     for (const Variable *var : variables) {
         if (!var)
@@ -4646,7 +4696,7 @@ void SymbolDatabase::printXml(std::ostream &out) const
 
 static const Type* findVariableTypeIncludingUsedNamespaces(const Scope* scope, const Token* typeTok)
 {
-    const Type* argType = scope->symdb.findVariableType(scope, typeTok);
+    const Type* argType = scope->symdb().findVariableType(scope, typeTok);
     if (argType)
         return argType;
 
@@ -4654,7 +4704,7 @@ static const Type* findVariableTypeIncludingUsedNamespaces(const Scope* scope, c
     while (scope) {
         for (const Scope::UsingInfo &ui : scope->usingList) {
             if (ui.scope) {
-                argType = scope->symdb.findVariableType(ui.scope, typeTok);
+                argType = scope->symdb().findVariableType(ui.scope, typeTok);
                 if (argType)
                     return argType;
             }
@@ -4727,7 +4777,7 @@ void Function::addArguments(const Scope *scope)
         while (Token::Match(typeTok, "const|volatile|enum|struct|::"))
             typeTok = typeTok->next();
         if (Token::Match(typeTok, ",|)")) { // #8333
-            scope->symdb.mTokenizer.syntaxError(typeTok);
+            scope->symdb().mTokenizer.syntaxError(typeTok);
         }
         if (Token::Match(typeTok, "%type% <") && Token::Match(typeTok->linkAt(1), "> :: %type%"))
             typeTok = typeTok->linkAt(1)->tokAt(2);
@@ -4746,7 +4796,7 @@ void Function::addArguments(const Scope *scope)
                     endTok = nameTok->previous();
 
                     if (hasBody())
-                        scope->symdb.debugMessage(nameTok, "varid0", "Function::addArguments found argument \'" + nameTok->str() + "\' with varid 0.");
+                        scope->symdb().debugMessage(nameTok, "varid0", "Function::addArguments found argument \'" + nameTok->str() + "\' with varid 0.");
                 } else
                     endTok = typeTok;
             } else
@@ -4777,7 +4827,7 @@ void Function::addArguments(const Scope *scope)
         if (startTok == nameTok)
             break;
 
-        argumentList.emplace_back(nameTok, startTok, endTok, count++, AccessControl::Argument, argType, functionScope, scope->symdb.mSettings);
+        argumentList.emplace_back(nameTok, startTok, endTok, count++, AccessControl::Argument, argType, functionScope, scope->symdb().mSettings);
 
         if (tok->str() == ")") {
             // check for a variadic function or a variadic template function
@@ -4829,7 +4879,7 @@ std::vector<const Function*> Function::getOverloadedFunctions() const
 
     while (scope) {
         const bool isMemberFunction = scope->isClassOrStruct() && !isStatic();
-        for (auto it = utils::as_const(scope->functionMap).find(tokenDef->str());
+        for (auto it = scope->functionMap.find(tokenDef->str());
              it != scope->functionMap.end() && it->first == tokenDef->str();
              ++it) {
             const Function* func = it->second;
@@ -4880,7 +4930,7 @@ const Function * Function::getOverriddenFunctionRecursive(const ::Type* baseType
         const Scope *parent = derivedFromType->classScope;
 
         // check if function defined in base class
-        auto range = utils::as_const(parent->functionMap).equal_range(tokenDef->str());
+        auto range = parent->functionMap.equal_range(tokenDef->str());
         for (auto it = range.first; it != range.second; ++it) {
             const Function * func = it->second;
             if (func->isImplicitlyVirtual()) { // Base is virtual and of same name
@@ -4937,7 +4987,7 @@ const Function * Function::getOverriddenFunctionRecursive(const ::Type* baseType
     return nullptr;
 }
 
-const Variable* Function::getArgumentVar(nonneg int num) const
+const Variable* Function::getArgumentVar(size_t num) const
 {
     if (num < argumentList.size()) {
         auto it = argumentList.begin();
@@ -5021,7 +5071,7 @@ void Scope::addVariable(const Token *token_, const Token *start_, const Token *e
     // keep possible size_t -> int truncation outside emplace_back() to have a single line
     // C4267 VC++ warning instead of several dozens lines
     const int varIndex = varlist.size();
-    varlist.emplace_back(token_, start_, end_, varIndex, access_, type_, scope_, scope_->symdb.mSettings);
+    varlist.emplace_back(token_, start_, end_, varIndex, access_, type_, scope_, scope_->symdb().mSettings);
 }
 
 // Get variable list..
@@ -5034,7 +5084,7 @@ void Scope::getVariableList()
 
     // global scope
     else if (type == ScopeType::eGlobal)
-        getVariableList(symdb.mTokenizer.tokens(), nullptr);
+        getVariableList(symdb().mTokenizer.tokens(), nullptr);
 
     // forward declaration
     else
@@ -5044,7 +5094,7 @@ void Scope::getVariableList()
 void Scope::getVariableList(const Token* start, const Token* end)
 {
     // Variable declared in condition: if (auto x = bar())
-    if (Token::Match(classDef, "if|while ( %type%") && Token::simpleMatch(classDef->next()->astOperand2(), "=")) {
+    if (Token::Match(classDef, "if|while|switch ( %type%") && Token::simpleMatch(classDef->next()->astOperand2(), "=")) {
         checkVariable(classDef->tokAt(2), defaultAccess());
     }
 
@@ -5179,7 +5229,7 @@ const Token *Scope::checkVariable(const Token *tok, AccessControl varaccess)
     const Token *typestart = tok;
 
     // C++17 structured bindings
-    if (tok && tok->isCpp() && (symdb.mSettings.standards.cpp >= Standards::CPP17) && Token::Match(tok, "auto &|&&| [")) {
+    if (tok && tok->isCpp() && (symdb().mSettings.standards.cpp >= Standards::CPP17) && Token::Match(tok, "auto &|&&| [")) {
         const Token *typeend = Token::findsimplematch(typestart, "[")->previous();
         for (tok = typeend->tokAt(2); Token::Match(tok, "%name%|,"); tok = tok->next()) {
             if (tok->varId())
@@ -5205,7 +5255,7 @@ const Token *Scope::checkVariable(const Token *tok, AccessControl varaccess)
 
         if (vartok->varId() == 0) {
             if (!vartok->isBoolean())
-                symdb.debugMessage(vartok, "varid0", "Scope::checkVariable found variable \'" + vartok->str() + "\' with varid 0.");
+                symdb().debugMessage(vartok, "varid0", "Scope::checkVariable found variable \'" + vartok->str() + "\' with varid 0.");
             return tok;
         }
 
@@ -5231,7 +5281,7 @@ const Token *Scope::checkVariable(const Token *tok, AccessControl varaccess)
                 }
                 if (Token::Match(tok2, ", %name%")) {
                     if (tok2->next()->varId() == 0) {
-                        symdb.debugMessage(tok2->next(), "varid0", "Scope::checkVariable found variable \'" + tok2->strAt(1) + "\' with varid 0.");
+                        symdb().debugMessage(tok2->next(), "varid0", "Scope::checkVariable found variable \'" + tok2->strAt(1) + "\' with varid 0.");
                         return tok;
                     }
                     addVariable(tok2->next(), typestart, vartok->previous(), varaccess, vType, this);
@@ -5264,6 +5314,26 @@ const Variable *Scope::getVariable(const std::string &varname) const
 
 static const Token* skipPointers(const Token* tok)
 {
+    const Token *start = tok;
+    bool memberPointer = false;
+    while (tok) {
+        if (Token::simpleMatch(tok, "::")) {
+            tok = tok->next();
+            continue;
+        }
+        if (Token::Match(tok, "%type% ::")) {
+            tok = tok->tokAt(2);
+            memberPointer = true;
+            continue;
+        }
+        if (Token::Match(tok, "%type% <") && tok->linkAt(1)) {
+            tok = tok->linkAt(1)->next();
+            continue;
+        }
+        break;
+    }
+    if (memberPointer && !Token::simpleMatch(tok, "*"))
+        return start;
     while (Token::Match(tok, "*|&|&&") || (Token::Match(tok, "( [*&]") && Token::Match(tok->link()->next(), "(|["))) {
         tok = tok->next();
         if (tok && tok->strAt(-1) == "(" && Token::Match(tok, "%type% ::"))
@@ -5301,7 +5371,7 @@ bool Scope::isVariableDeclaration(const Token* const tok, const Token*& vartok,
     if (isCPP && Token::Match(tok, "throw|new"))
         return false;
 
-    const bool isCPP11 = isCPP && symdb.mSettings.standards.cpp >= Standards::CPP11;
+    const bool isCPP11 = isCPP && symdb().mSettings.standards.cpp >= Standards::CPP11;
 
     if (isCPP11 && tok->str() == "using")
         return false;
@@ -5797,7 +5867,10 @@ bool Scope::hasInlineOrLambdaFunction(const Token** tokStart, bool onlyInline) c
     });
 }
 
-void Scope::findFunctionInBase(const Token* tok, nonneg int args, std::vector<const Function *> & matches) const
+void Scope::findFunctionInBase(const std::string& name,
+                               const Token* tok,
+                               size_t args,
+                               std::vector<const Function*>& matches) const
 {
     if (isClassOrStruct() && definedType && !definedType->derivedFrom.empty()) {
         const std::vector<Type::BaseInfo> &derivedFrom = definedType->derivedFrom;
@@ -5807,7 +5880,7 @@ void Scope::findFunctionInBase(const Token* tok, nonneg int args, std::vector<co
                 if (base->classScope == this) // Ticket #5120, #5125: Recursive class; tok should have been found already
                     continue;
 
-                auto range = utils::as_const(base->classScope->functionMap).equal_range(tok->str());
+                auto range = base->classScope->functionMap.equal_range(name);
                 for (auto it = range.first; it != range.second; ++it) {
                     const Function *func = it->second;
                     if (func->isDestructor() && !Token::simpleMatch(tok->tokAt(-1), "~"))
@@ -5818,7 +5891,7 @@ void Scope::findFunctionInBase(const Token* tok, nonneg int args, std::vector<co
                     }
                 }
 
-                base->classScope->findFunctionInBase(tok, args, matches);
+                base->classScope->findFunctionInBase(name, tok, args, matches);
             }
         }
     }
@@ -5868,6 +5941,39 @@ std::vector<const Scope*> Scope::findAssociatedScopes() const
 
 //---------------------------------------------------------------------------
 
+// Might an object of the class be converted to a pointer by a conversion operator (also in an unknown base class)?
+// operator C*(), operator ptr()
+static bool mayConvertToPointer(const Scope* classScope)
+{
+    const std::vector<const Scope*> scopes = classScope->findAssociatedScopes();
+    return std::any_of(scopes.cbegin(), scopes.cend(), [](const Scope* scope) {
+        const bool hasConversionOperator = std::any_of(scope->functionList.cbegin(), scope->functionList.cend(), [](const Function& f) {
+            return f.name().size() > 8 && startsWith(f.name(), "operator") &&
+                   (std::isalpha(static_cast<unsigned char>(f.name()[8])) || f.name()[8] == '_' || f.name()[8] == ':');
+        });
+        const bool hasUnknownBase = scope->definedType && std::any_of(scope->definedType->derivedFrom.cbegin(), scope->definedType->derivedFrom.cend(), [](const Type::BaseInfo& base) {
+            return !base.type || !base.type->classScope;
+        });
+        return hasConversionOperator || hasUnknownBase;
+    });
+}
+
+// Returns true if the variable can't be passed for the function argument because only one of them is a pointer to
+// the same class: struct C; void f(C* p); void g(C& r); C c; C* p; f(c); g(p);
+static bool isPointerMismatch(const Variable* callarg, const Variable* funcarg)
+{
+    if (!callarg->type() || callarg->type() != funcarg->type() || callarg->isArray() || funcarg->isArray())
+        return false;
+    // function pointer or reference: C (*f)()
+    if (Token::simpleMatch(callarg->nameToken()->next(), ") (") || (funcarg->nameToken() && Token::simpleMatch(funcarg->nameToken()->next(), ") (")))
+        return false;
+    // assume that incomplete types have no conversion operator
+    if (funcarg->isPointer())
+        return !callarg->isPointer() && (!callarg->type()->classScope || !mayConvertToPointer(callarg->type()->classScope));
+    // a temporary from a converting constructor can bind to const C& and C&&
+    return callarg->isPointer() && funcarg->isReference() && !funcarg->isRValueReference() && !funcarg->isConst();
+}
+
 static void checkVariableCallMatch(const Variable* callarg, const Variable* funcarg, size_t& same, size_t& fallback1, size_t& fallback2)
 {
     if (callarg) {
@@ -5895,7 +6001,7 @@ static void checkVariableCallMatch(const Variable* callarg, const Variable* func
             callarg->typeStartToken()->isLong() == funcarg->typeStartToken()->isLong()) {
             same++;
         } else if (callarg->isArrayOrPointer()) {
-            if (ptrequals && constEquals && funcarg->typeStartToken()->str() == "void")
+            if (ptrequals && constEquals && funcarg->typeStartToken()->str() == "void") // cppcheck-suppress knownConditionTrueFalse // #14418
                 fallback1++;
             else if (constEquals && funcarg->isStlStringType() && Token::Match(callarg->typeStartToken(), "char|wchar_t"))
                 fallback2++;
@@ -5957,8 +6063,10 @@ static bool hasMatchingConstructor(const Scope* classScope, const ValueType* arg
     });
 }
 
-const Function* Scope::findFunction(const Token *tok, bool requireConst, Reference ref) const
+const Function* Scope::findFunction(const Token* tok, bool requireConst, Reference ref, const std::string& funcName) const
 {
+    const std::string& name = funcName.empty() ? tok->str() : funcName;
+
     const bool isCall = Token::Match(tok->next(), "(|{");
 
     const std::vector<const Token *> arguments = getArguments(tok);
@@ -5968,8 +6076,8 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst, Referen
     // find all the possible functions that could match
     const std::size_t args = arguments.size();
 
-    auto addMatchingFunctions = [&](const Scope *scope) {
-        auto range = utils::as_const(scope->functionMap).equal_range(tok->str());
+    auto addMatchingFunctions = [&](const Scope* scope) {
+        auto range = scope->functionMap.equal_range(name);
         for (auto it = range.first; it != range.second; ++it) {
             const Function *func = it->second;
             if (ref == Reference::LValue && func->hasRvalRefQualifier())
@@ -6001,10 +6109,10 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst, Referen
             addMatchingFunctions(nestedScope);
     }
 
-    const std::size_t numberOfMatchesNonBase = matches.size();
+    std::size_t numberOfMatchesNonBase = matches.size();
 
     // check in base classes
-    findFunctionInBase(tok, args, matches);
+    findFunctionInBase(name, tok, args, matches);
 
     // Non-call => Do not match parameters
     if (!isCall) {
@@ -6115,6 +6223,14 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst, Referen
             // check for a match with a variable
             if (Token::Match(arguments[j], "%var% ,|)")) {
                 const Variable * callarg = arguments[j]->variable();
+                if (callarg && isPointerMismatch(callarg, funcarg)) {
+                    // can't match so remove this function from possible matches
+                    matches.erase(matches.begin() + i);
+                    if (i < numberOfMatchesNonBase)
+                        --numberOfMatchesNonBase;
+                    erased = true;
+                    break;
+                }
                 checkVariableCallMatch(callarg, funcarg, same, fallback1, fallback2);
             }
 
@@ -6234,8 +6350,8 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst, Referen
         matches.erase(itPure);
 
     // Only one candidate left
-    if (matches.size() == 1 && std::none_of(functionList.begin(), functionList.end(), [tok](const Function& f) {
-        return startsWith(f.name(), tok->str() + " <");
+    if (matches.size() == 1 && std::none_of(functionList.begin(), functionList.end(), [&name](const Function& f) {
+        return startsWith(f.name(), name + " <");
     }))
         return matches[0];
 
@@ -6401,7 +6517,7 @@ const Function* SymbolDatabase::findFunction(const Token* const tok) const
         }
     }
     // Check for constructor
-    if (Token::Match(tok, "%name% (|{")) {
+    if (!Token::simpleMatch(tok->tokAt(-2), "this .") && Token::Match(tok, "%name% (|{")) {
         ValueType vt = ValueType::parseDecl(tok, mSettings);
         if (vt.typeScope)
             return vt.typeScope->findFunction(tok, false);
@@ -6508,7 +6624,7 @@ Type* Scope::findType(const std::string& name)
 
 //---------------------------------------------------------------------------
 
-Scope *Scope::findInNestedListRecursive(const std::string & name)
+const Scope *Scope::findInNestedListRecursive(const std::string & name) const
 {
     auto it = std::find_if(nestedList.cbegin(), nestedList.cend(), [&](const Scope* s) {
         return s->className == name;
@@ -6516,8 +6632,8 @@ Scope *Scope::findInNestedListRecursive(const std::string & name)
     if (it != nestedList.end())
         return *it;
 
-    for (Scope* scope: nestedList) {
-        Scope *child = scope->findInNestedListRecursive(name);
+    for (const Scope* scope: nestedList) {
+        const Scope *child = scope->findInNestedListRecursive(name);
         if (child)
             return child;
     }
@@ -6737,7 +6853,7 @@ Function * SymbolDatabase::findFunctionInScope(const Token *func, const Scope *n
     const Function * function = nullptr;
     const bool destructor = func->strAt(-1) == "~";
 
-    auto range = utils::as_const(ns->functionMap).equal_range(func->str());
+    auto range = ns->functionMap.equal_range(func->str());
     for (auto it = range.first; it != range.second; ++it) {
         if (it->second->argsMatch(ns, it->second->argDef, func->next(), path, path_length) &&
             it->second->isDestructor() == destructor) {
@@ -6852,7 +6968,7 @@ void SymbolDatabase::setValueType(Token* tok, const Enumerator& enumerator, cons
         if (valuetype.type == ValueType::Type::UNKNOWN_TYPE)
             valuetype.fromLibraryType(type->expressionString(), mSettings);
 
-        if (valuetype.isIntegral()) {
+        if (valuetype.sign == ValueType::UNKNOWN_SIGN && valuetype.isIntegral()) {
             if (type->isSigned())
                 valuetype.sign = ValueType::Sign::SIGNED;
             else if (type->isUnsigned())
@@ -6976,6 +7092,10 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, const
                 setAutoTokenProperties(autoTok);
                 if (vt2->pointer > vt.pointer)
                     vt.pointer++;
+                if (Token::simpleMatch(autoTok->next(), "&"))
+                    vt.reference = Reference::LValue;
+                if (Token::simpleMatch(autoTok->next(), "&&"))
+                    vt.reference = Reference::RValue;
                 setValueType(var1Tok, vt);
                 if (var1Tok != parent->previous())
                     setValueType(parent->previous(), vt);
@@ -7008,7 +7128,7 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, const
         return;
     }
 
-    if (parent->str() == "[" && (!parent->isCpp() || parent->astOperand1() == tok) && valuetype.pointer > 0U && !Token::Match(parent->previous(), "[{,]")) {
+    if (parent->str() == "[" && (!parent->isCpp() || parent->astOperand1() == tok) && valuetype.pointer > 0 && !Token::Match(parent->previous(), "[{,]")) {
         const Token *op1 = parent->astOperand1();
         while (op1 && op1->str() == "[")
             op1 = op1->astOperand1();
@@ -7020,7 +7140,7 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, const
         setValueType(parent, vt);
         return;
     }
-    if (Token::Match(parent->tokAt(-1), "%name% (") && !parent->tokAt(-1)->isKeyword() && parent->astOperand1() == tok && valuetype.pointer > 0U) {
+    if (Token::Match(parent->tokAt(-1), "%name% (") && !parent->tokAt(-1)->isKeyword() && parent->astOperand1() == tok && valuetype.pointer > 0) {
         ValueType vt(valuetype);
         vt.pointer -= 1U;
         setValueType(parent, vt);
@@ -7033,7 +7153,7 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, const
         setValueType(parent, vt);
         return;
     }
-    if (parent->str() == "*" && !parent->astOperand2() && valuetype.pointer > 0U) {
+    if (parent->str() == "*" && !parent->astOperand2() && valuetype.pointer > 0) {
         ValueType vt(valuetype);
         vt.pointer -= 1U;
         setValueType(parent, vt);
@@ -7066,7 +7186,7 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, const
             return;
         }
     }
-    if (parent->str() == "*" && Token::simpleMatch(parent->astOperand2(), "[") && valuetype.pointer > 0U) {
+    if (parent->str() == "*" && Token::simpleMatch(parent->astOperand2(), "[") && valuetype.pointer > 0) {
         const Token *op1 = parent->astOperand2()->astOperand1();
         while (op1 && op1->str() == "[")
             op1 = op1->astOperand1();
@@ -7250,15 +7370,55 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, const
     }
 
     // c++17 auto type deduction of braced init list
-    if (parent->isCpp() && mSettings.standards.cpp >= Standards::CPP17 && vt2 && Token::Match(parent->tokAt(-2), "auto %var% {")) {
-        Token *autoTok = parent->tokAt(-2);
-        setValueType(autoTok, *vt2);
-        setAutoTokenProperties(autoTok);
-        if (parent->previous()->variable())
-            const_cast<Variable*>(parent->previous()->variable())->setValueType(*vt2);
-        else
-            debugMessage(parent->previous(), "debug", "Missing variable class for variable with varid");
-        return;
+    if (parent->isCpp() && mSettings.standards.cpp >= Standards::CPP17
+        && Token::Match(parent->astOperand1(), "%var% {") && vt2) {
+
+        auto reference = Reference::None;
+        nonneg int pointer = 0;
+        nonneg int constness = 0;
+        nonneg int volatileness = 0;
+
+        Token *varTok = parent->astOperand1();
+        Token *typeTok = varTok->previous();
+
+        while (Token::Match(typeTok, "&|&&|*|const|volatile")) {
+            if (typeTok->str() == "&")
+                reference = Reference::LValue;
+            else if (typeTok->str() == "&&")
+                reference = Reference::RValue;
+            else if (typeTok->str() == "*")
+                pointer++;
+            else if (typeTok->str() == "const")
+                constness |= 1 << pointer;
+            else if (typeTok->str() == "volatile")
+                volatileness |= 1 << pointer;
+            typeTok = typeTok->previous();
+        }
+
+        if (typeTok->str() == "auto") {
+            setValueType(typeTok, *vt2);
+            setAutoTokenProperties(typeTok);
+
+            auto *varVt = new ValueType(*vt2);
+
+            varVt->reference = reference;
+            varVt->constness |= constness;
+            varVt->volatileness |= volatileness;
+
+            if (Token::simpleMatch(typeTok->previous(), "const auto"))
+                varVt->constness |= 1 << pointer;
+
+            if (Token::simpleMatch(typeTok->previous(), "volatile auto"))
+                varVt->volatileness |= 1 << pointer;
+
+            varTok->setValueType(varVt);
+
+            if (varTok->variable())
+                const_cast<Variable*>(varTok->variable())->setValueType(*varVt);
+            else
+                debugMessage(varTok, "debug", "Missing variable class for variable with varid");
+            return;
+        }
     }
 
     if (!vt1)
@@ -7513,7 +7673,7 @@ static const Token* parsedecl(const Token* type,
                 valuetype->container = container;
             } else {
                 const Scope *scope = type->scope();
-                valuetype->typeScope = scope->symdb.findScope(typeTokens.front(), scope);
+                valuetype->typeScope = scope->symdb().findScope(typeTokens.front(), scope);
                 if (valuetype->typeScope)
                     valuetype->type = (scope->type == ScopeType::eClass) ? ValueType::Type::RECORD : ValueType::Type::NONSTD;
             }
@@ -7636,9 +7796,7 @@ static const Token* parsedecl(const Token* type,
 
     // Set signedness for integral types..
     if (valuetype->isIntegral() && valuetype->sign == ValueType::Sign::UNKNOWN_SIGN) {
-        if (valuetype->type == ValueType::Type::CHAR)
-            valuetype->sign = defaultSignedness;
-        else if (valuetype->type >= ValueType::Type::SHORT)
+        if (valuetype->type >= ValueType::Type::SHORT)
             valuetype->sign = ValueType::Sign::SIGNED;
     }
 
@@ -7658,14 +7816,14 @@ static const Function *getOperatorFunction(const Token * const tok)
 
     const Scope *classScope = getClassScope(tok->astOperand1());
     if (classScope) {
-        auto it = utils::as_const(classScope->functionMap).find(functionName);
+        auto it = classScope->functionMap.find(functionName);
         if (it != classScope->functionMap.end())
             return it->second;
     }
 
     classScope = getClassScope(tok->astOperand2());
     if (classScope) {
-        auto it = utils::as_const(classScope->functionMap).find(functionName);
+        auto it = classScope->functionMap.find(functionName);
         if (it != classScope->functionMap.end())
             return it->second;
     }
@@ -7686,6 +7844,13 @@ static const Function* getFunction(const Token* tok) {
             lambda = lvar->nameToken()->tokAt(2)->function();
         if (lambda && lambda->retDef)
             return lambda;
+        // calling an object of a class that overloads operator()
+        if (tok != lvar->nameToken() && !lvar->isPointer() && !lvar->isArray() && lvar->typeScope()) {
+            const Function* callOp =
+                lvar->typeScope()->findFunction(tok, lvar->isConst(), Reference::LValue, "operator()");
+            if (callOp && callOp->retDef)
+                return callOp;
+        }
     }
     return nullptr;
 }
@@ -7724,6 +7889,78 @@ static int getIntegerConstantMacroWidth(const Token* tok) {
     return intnum;
 }
 
+void SymbolDatabase::setGenericValueType(Token *par)
+{
+    if (!par)
+        return;
+
+    const Token *tok = par->astOperand2();
+    std::vector<const Token*> stack;
+
+    while (tok && tok->str() == ",") {
+        stack.push_back(tok);
+        tok = tok->astOperand1();
+    }
+
+    if (!tok)
+        return;
+
+    const ValueType *controlVt = tok->valueType();
+
+    if (!controlVt)
+        return;
+
+    const Token *selected = nullptr;
+
+    const auto matchVt = [](const ValueType *control, const ValueType *type) {
+        // Strip top level qualifiers of controlling expression
+        const unsigned int controlMask = ~(1U << control->pointer);
+        return control->isTypeEqual(type) &&
+               control->sign == type->sign &&
+               (static_cast<unsigned int>(control->constness) & controlMask) == static_cast<unsigned int>(type->constness) &&
+               (static_cast<unsigned int>(control->volatileness) & controlMask) == static_cast<unsigned int>(type->volatileness);
+    };
+
+    while (!stack.empty()) {
+        const Token *comma = stack.back();
+        stack.pop_back();
+
+        const Token *type = comma->next();
+        const Token *expr = comma->astOperand2();
+
+        if (type->str() == "default") {
+            if (!selected)
+                selected = expr;
+        } else {
+            ValueType typeVt;
+
+            if (!parsedecl(type, &typeVt, mDefaultSignedness, mSettings))
+                continue;
+
+            if (matchVt(controlVt, &typeVt)) {
+                selected = expr;
+                break;
+            }
+        }
+    }
+
+    if (!selected)
+        return;
+
+    if (selected->valueType()) {
+        setValueType(par, *selected->valueType());
+    } else {
+        const Function *f = selected->function();
+        Token *parent = par->astParent();
+
+        if (f && f->retDef && parent && parent->str() == "(") {
+            ValueType returnVt;
+            if (parsedecl(f->retDef, &returnVt, mDefaultSignedness, mSettings))
+                setValueType(parent, returnVt);
+        }
+    }
+}
+
 void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *tokens)
 {
     if (!tokens)
@@ -7732,7 +7969,18 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
     for (Token *tok = tokens; tok; tok = tok->next())
         tok->setValueType(nullptr);
 
+    std::vector<Token*> genericClosingParens;
+
     for (Token *tok = tokens; tok; tok = tok->next()) {
+        if (Token::simpleMatch(tok, "_Generic (")) {
+            genericClosingParens.push_back(tok->linkAt(1));
+            continue;
+        }
+        if (!genericClosingParens.empty() && tok == genericClosingParens.back()) {
+            setGenericValueType(tok->link());
+            genericClosingParens.pop_back();
+            continue;
+        }
         if (tok->isNumber()) {
             if (MathLib::isFloat(tok->str())) {
                 ValueType::Type type = ValueType::Type::DOUBLE;
@@ -7780,7 +8028,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
 
                 setValueType(tok, ValueType(sign, type, 0U));
             }
-        } else if (tok->isComparisonOp() || tok->tokType() == Token::eLogicalOp) {
+        } else if ((tok->isComparisonOp() || tok->tokType() == Token::eLogicalOp) && tok->astOperand1()) {
             if (tok->isCpp() && tok->isComparisonOp() && (getClassScope(tok->astOperand1()) || getClassScope(tok->astOperand2()))) {
                 const Function *function = getOperatorFunction(tok);
                 if (function) {
@@ -7851,6 +8099,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
 
             else if (Token::simpleMatch(tok->previous(), "sizeof (")) {
                 ValueType valuetype(ValueType::Sign::UNSIGNED, ValueType::Type::LONG, 0U);
+                // TODO: handle via sizeof_size_t instead
                 if (mSettings.platform.type == Platform::Type::Win64)
                     valuetype.type = ValueType::Type::LONGLONG;
 
@@ -7974,7 +8223,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                 if (!typestr.empty()) {
                     ValueType valuetype;
                     TokenList tokenList(mSettings, tok->isCpp() ? Standards::Language::CPP : Standards::Language::C);
-                    const std::string str(typestr+";");
+                    const std::string str(typestr+";\n");
                     tokenList.createTokensFromBuffer(str.data(), str.size()); // TODO: check result?
                     tokenList.simplifyStdType();
                     if (parsedecl(tokenList.front(), &valuetype, mDefaultSignedness, mSettings)) {
@@ -8007,17 +8256,20 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                             }
                         }
                         //Is iterator fetching function called?
-                    } else if (Token::simpleMatch(tok->astOperand1(), "::") &&
-                               tok->astOperand2() &&
-                               tok->astOperand2()->isVariable()) {
-                        const auto* const paramVariable = tok->astOperand2()->variable();
+                    } else if (Token::simpleMatch(tok->astOperand1(), "::") && Token::Match(tok->astOperand2(), "%var%|.|[")) {
+                        const Token* varTok = tok->astOperand2();
+                        while (Token::simpleMatch(varTok, "["))
+                            varTok = varTok->astOperand1();
+                        while (Token::simpleMatch(varTok, "."))
+                            varTok = varTok->astOperand2();
+                        const Variable* const paramVariable = varTok ? varTok->variable() : nullptr;
                         if (!paramVariable ||
                             !paramVariable->valueType() ||
                             !paramVariable->valueType()->container) {
                             continue;
                         }
 
-                        const auto yield = astFunctionYield(tok->previous(), mSettings);
+                        const auto yield = astFunctionYield(tok->previous(), mSettings.library);
                         if (yield == Library::Container::Yield::START_ITERATOR ||
                             yield == Library::Container::Yield::END_ITERATOR ||
                             yield == Library::Container::Yield::ITERATOR) {
@@ -8064,7 +8316,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                     continue;
                 }
                 TokenList tokenList(mSettings, tok->isCpp() ? Standards::Language::CPP : Standards::Language::C);
-                const std::string str(typestr+";");
+                const std::string str(typestr+";\n");
                 if (tokenList.createTokensFromBuffer(str.data(), str.size())) {
                     ValueType vt;
                     tokenList.simplifyPlatformTypes();
@@ -8435,7 +8687,7 @@ namespace {
 }
 
 template<class F>
-static Result accumulateStructMembers(const Scope* scope, F f, ValueType::Accuracy accuracy)
+static Result accumulateStructMembers(const Scope* scope, F f, ValueType::Accuracy accuracy, const Settings& settings)
 {
     size_t total = 0;
     std::set<const Scope*> anonScopes;
@@ -8454,6 +8706,10 @@ static Result accumulateStructMembers(const Scope* scope, F f, ValueType::Accura
                 if (ret.second)
                     total = f(total, *vt, dim, bits);
             }
+            else if (vt->container && vt->container->startPattern == "std :: array <") {
+                const ValueType vtElement = ValueType::parseDecl(vt->containerTypeToken, settings);
+                total = f(total, vtElement, dim, bits);
+            }
             else
                 total = f(total, *vt, dim, bits);
         }
@@ -8480,7 +8736,7 @@ static size_t bitCeil(size_t x)
 
 static size_t getAlignOf(const ValueType& vt, const Settings& settings, ValueType::Accuracy accuracy, ValueType::SizeOf sizeOf, int maxRecursion = 0)
 {
-    if (maxRecursion == settings.vfOptions.maxAlignOfRecursion) {
+    if (maxRecursion > settings.vfOptions.maxAlignOfRecursion) {
         // TODO: add bailout message
         return 0;
     }
@@ -8493,12 +8749,12 @@ static size_t getAlignOf(const ValueType& vt, const Settings& settings, ValueTyp
             size_t a = getAlignOf(vt2, settings, accuracy, ValueType::SizeOf::Pointer, ++maxRecursion);
             return std::max(max, a);
         };
-        Result result = accumulateStructMembers(vt.typeScope, accHelper, accuracy);
+        Result result = accumulateStructMembers(vt.typeScope, accHelper, accuracy, settings);
         size_t total = result.total;
         if (const Type* dt = vt.typeScope->definedType) {
             total = std::accumulate(dt->derivedFrom.begin(), dt->derivedFrom.end(), total, [&](size_t v, const Type::BaseInfo& bi) {
                 if (bi.type && bi.type->classScope)
-                    v += accumulateStructMembers(bi.type->classScope, accHelper, accuracy).total;
+                    v += accumulateStructMembers(bi.type->classScope, accHelper, accuracy, settings).total;
                 return v;
             });
         }
@@ -8511,7 +8767,7 @@ static size_t getAlignOf(const ValueType& vt, const Settings& settings, ValueTyp
 
 size_t ValueType::getSizeOf( const Settings& settings, Accuracy accuracy, SizeOf sizeOf, int maxRecursion) const
 {
-    if (maxRecursion == settings.vfOptions.maxSizeOfRecursion) {
+    if (maxRecursion > settings.vfOptions.maxSizeOfRecursion) {
         // TODO: add bailout message
         return 0;
     }
@@ -8586,14 +8842,14 @@ size_t ValueType::getSizeOf( const Settings& settings, Accuracy accuracy, SizeOf
             }
             return typeScope->type == ScopeType::eUnion ? std::max(total, n) : total + padding + n;
         };
-        Result result = accumulateStructMembers(typeScope, accHelper, accuracy);
+        Result result = accumulateStructMembers(typeScope, accHelper, accuracy, settings);
         size_t total = result.total;
         if (currentBitCount > 0)
             total += currentBitfieldAlloc;
         if (const ::Type* dt = typeScope->definedType) {
             total = std::accumulate(dt->derivedFrom.begin(), dt->derivedFrom.end(), total, [&](size_t v, const ::Type::BaseInfo& bi) {
                 if (bi.type && bi.type->classScope)
-                    v += accumulateStructMembers(bi.type->classScope, accHelper, accuracy).total;
+                    v += accumulateStructMembers(bi.type->classScope, accHelper, accuracy, settings).total;
                 return v;
             });
         }
@@ -8671,7 +8927,7 @@ std::string ValueType::str() const
     } else if (type == ValueType::Type::SMART_POINTER && smartPointer) {
         ret += " smart-pointer(" + smartPointer->name + ")";
     }
-    for (unsigned int p = 0; p < pointer; p++) {
+    for (nonneg int p = 0; p < pointer; p++) {
         ret += " *";
         if (constness & (2 << p))
             ret += " const";
@@ -8755,7 +9011,7 @@ ValueType::MatchResult ValueType::matchParameter(const ValueType *call, const Va
             return ValueType::MatchResult::UNKNOWN;
     }
 
-    if (call->isIntegral() && func->isIntegral() && call->sign != ValueType::Sign::UNKNOWN_SIGN && func->sign != ValueType::Sign::UNKNOWN_SIGN && call->sign != func->sign)
+    if (call->isIntegral() && func->isIntegral() && call->sign != func->sign)
         return ValueType::MatchResult::FALLBACK1;
 
     if (func->reference != Reference::None && (func->constness > call->constness || func->volatileness > call->volatileness))
@@ -8799,5 +9055,5 @@ void SymbolDatabase::getErrorMessages(ErrorLogger& /*errorLogger*/)
 {
     // TODO
     //SymbolDatabase symdb;
-    //symdb.returnImplicitIntError(nullptr);
+    //symdb().returnImplicitIntError(nullptr);
 }
diff --git a/lib/symboldatabase.h b/lib/symboldatabase.h
index 954b31cc05b..832bcddeab3 100644
--- a/lib/symboldatabase.h
+++ b/lib/symboldatabase.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 #include "errortypes.h"
 #include "library.h"
 #include "mathlib.h"
+#include "refthunk.h"
 #include "sourcelocation.h"
 #include "token.h"
 #include "utils.h"
@@ -651,7 +652,7 @@ class CPPCHECKLIB Variable {
         return mValueType;
     }
 
-    void setValueType(const ValueType &valueType);
+    void setValueType(const ValueType &vt);
 
     AccessControl accessControl() const {
         return mAccess;
@@ -767,14 +768,14 @@ class CPPCHECKLIB Function {
 
     std::string fullName() const;
 
-    nonneg int argCount() const {
+    size_t argCount() const {
         return argumentList.size();
     }
-    nonneg int minArgCount() const {
+    size_t minArgCount() const {
         return argumentList.size() - initArgCount;
     }
-    const Variable* getArgumentVar(nonneg int num) const;
-    nonneg int initializedArgCount() const {
+    const Variable* getArgumentVar(size_t num) const;
+    size_t initializedArgCount() const {
         return initArgCount;
     }
     /**
@@ -928,7 +929,7 @@ class CPPCHECKLIB Function {
     const Scope* functionScope{};     ///< scope of function body
     const Scope* nestedIn{};          ///< Scope the function is declared in
     std::list<Variable> argumentList; ///< argument list, must remain list due to clangimport usage!
-    nonneg int initArgCount{};        ///< number of args with default values
+    size_t initArgCount{};            ///< number of args with default values
     FunctionType type = FunctionType::eFunction; ///< constructor, destructor, ...
     const Token* noexceptArg{};       ///< noexcept token
     const Token* throwArg{};          ///< throw token
@@ -945,6 +946,7 @@ class CPPCHECKLIB Function {
     static bool returnsStandardType(const Function* function, bool unknown = false);
 
     static bool returnsVoid(const Function* function, bool unknown = false);
+    static bool isCoroutine(const Function* function, const Standards &standards, const Tokenizer &tokens);
 
     static std::vector<const Token*> findReturns(const Function* f);
 
@@ -1044,7 +1046,7 @@ class CPPCHECKLIB Scope {
     Scope(const SymbolDatabase &symdb_, const Token *classDef_, const Scope *nestedIn_);
     Scope(const SymbolDatabase &symdb_, const Token *classDef_, const Scope *nestedIn_, ScopeType type_, const Token *start_);
 
-    const SymbolDatabase& symdb;
+    RefThunk<const SymbolDatabase> symdb;
     std::string className;
     const Token* classDef{};   ///< class/struct/union/namespace token
     const Token* bodyStart{};  ///< '{' token
@@ -1143,9 +1145,14 @@ class CPPCHECKLIB Scope {
      * @brief find a function
      * @param tok token of function call
      * @param requireConst if const refers to a const variable only const methods should be matched
+     * @param ref reference qualification of the object the function is called on
+     * @param funcName name to look up instead of tok->str(), e.g. "operator()" when tok is a variable that is called
      * @return pointer to function if found or NULL if not found
      */
-    const Function *findFunction(const Token *tok, bool requireConst=false, Reference ref=Reference::None) const;
+    const Function* findFunction(const Token* tok,
+                                 bool requireConst = false,
+                                 Reference ref = Reference::None,
+                                 const std::string& funcName = "") const;
 
     const Scope *findRecordInNestedList(const std::string & name, bool isC = false) const;
     Scope *findRecordInNestedList(const std::string & name, bool isC = false);
@@ -1157,7 +1164,7 @@ class CPPCHECKLIB Scope {
      * @brief find if name is in nested list
      * @param name name of nested scope
      */
-    Scope *findInNestedListRecursive(const std::string & name);
+    const Scope *findInNestedListRecursive(const std::string & name) const;
 
     void addVariable(const Token *token_, const Token *start_,
                      const Token *end_, AccessControl access_, const Type *type_,
@@ -1209,7 +1216,10 @@ class CPPCHECKLIB Scope {
      */
     bool isVariableDeclaration(const Token* tok, const Token*& vartok, const Token*& typetok) const;
 
-    void findFunctionInBase(const Token* tok, nonneg int args, std::vector<const Function *> & matches) const;
+    void findFunctionInBase(const std::string& name,
+                            const Token* tok,
+                            size_t args,
+                            std::vector<const Function*>& matches) const;
 
     /** @brief initialize varlist */
     void getVariableList(const Token *start, const Token *end);
@@ -1340,6 +1350,8 @@ class CPPCHECKLIB SymbolDatabase {
 public:
     explicit SymbolDatabase(Tokenizer& tokenizer);
     ~SymbolDatabase();
+    SymbolDatabase(const SymbolDatabase &) = delete;
+    SymbolDatabase &operator=(const SymbolDatabase &) = delete;
 
     /** @brief Information about all namespaces/classes/structures */
     std::list<Scope> scopeList;
@@ -1411,6 +1423,12 @@ class CPPCHECKLIB SymbolDatabase {
      */
     void validate() const;
 
+    /**
+     * Set value type for generic selection (_Generic).
+     * @param par The opening parenthesis of the _Generic expression.
+     */
+    void setGenericValueType(Token *par);
+
     /** Set valuetype in provided tokenlist */
     void setValueTypeInTokenList(bool reportDebugWarnings, Token *tokens=nullptr);
 
@@ -1424,13 +1442,13 @@ class CPPCHECKLIB SymbolDatabase {
     /** Set array dimensions when valueflow analysis is completed */
     void setArrayDimensionsUsingValueFlow();
 
-    void clangSetVariables(const std::vector<const Variable *> &variableList);
+    void clangSetVariables(const std::vector<const Variable *> &vars);
     void createSymbolDatabaseExprIds();
 
     /* returns the opening { if tok points to enum */
     static const Token* isEnumDefinition(const Token* tok);
 
-    static void getErrorMessages(ErrorLogger &errorLogger);
+    static void getErrorMessages(ErrorLogger& /*errorLogger*/);
 
     // check if type has no side effects (no constructors and no members with constructors)
     /** @todo false negative: check constructors for side effects */
@@ -1503,8 +1521,8 @@ class CPPCHECKLIB SymbolDatabase {
                                       std::list<const Function*> checkedFuncs) const;
 
     Tokenizer& mTokenizer;
-    const Settings &mSettings;
-    ErrorLogger &mErrorLogger;
+    const Settings& mSettings;
+    ErrorLogger& mErrorLogger;
 
     /** variable symbol table */
     std::vector<const Variable *> mVariableList;
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
index 1291993990d..c59fdf288f7 100644
--- a/lib/templatesimplifier.cpp
+++ b/lib/templatesimplifier.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,7 +71,7 @@ namespace {
             return tokenAndName.token() == mToken;
         }
     private:
-        const Token * const mToken;
+        const Token * mToken;
     };
 
     class FindName {
@@ -81,7 +81,7 @@ namespace {
             return tokenAndName.name() == mName;
         }
     private:
-        const std::string mName;
+        std::string mName;
     };
 
     class FindFullName {
@@ -91,7 +91,7 @@ namespace {
             return tokenAndName.fullName() == mFullName;
         }
     private:
-        const std::string mFullName;
+        std::string mFullName;
     };
 }
 
@@ -170,8 +170,12 @@ TemplateSimplifier::TokenAndName::TokenAndName(Token *token, std::string scope,
                 if (isFunction())
                     tok1 = tok1->link()->next();
                 while (tok1 && !Token::Match(tok1, ";|{")) {
-                    if (tok1->str() == "<")
-                        tok1 = tok1->findClosingBracket();
+                    if (tok1->str() == "<") {
+                        if (const Token* closing = tok1->findClosingBracket())
+                            tok1 = closing;
+                        else
+                            syntaxError(tok1);
+                    }
                     else if (Token::Match(tok1, "(|[") && tok1->link())
                         tok1 = tok1->link();
                     if (tok1)
@@ -219,9 +223,8 @@ TemplateSimplifier::TokenAndName::TokenAndName(Token *token, std::string scope,
     }
 
     // make sure at most only one family flag is set
-    assert(isClass() ? !(isFunction() || isVariable()) : true);
-    assert(isFunction() ? !(isClass() || isVariable()) : true);
-    assert(isVariable() ? !(isClass() || isFunction()) : true);
+    if (isClass() + isFunction() + isVariable() > 1)
+        syntaxError(token);
 
     if (mToken)
         mToken->templateSimplifierPointer(this);
@@ -278,7 +281,7 @@ TemplateSimplifier::TemplateSimplifier(Tokenizer &tokenizer)
     mErrorLogger(mTokenizer.getErrorLogger())
 {}
 
-void TemplateSimplifier::checkComplicatedSyntaxErrorsInTemplates()
+void TemplateSimplifier::checkComplicatedSyntaxErrorsInTemplates() const
 {
     // check for more complicated syntax errors when using templates..
     for (const Token *tok = mTokenList.front(); tok; tok = tok->next()) {
@@ -391,13 +394,14 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
         return 0;
     if (tok->str() != "<")
         return 0;
-    if (Token::Match(tok->previous(), "%var% <"))
+    if (Token::Match(tok->previous(), "%var%|) <") && !(tok->linkAt(-1) && Token::simpleMatch(tok->linkAt(-1)->tokAt(-1), "operator")))
         return 0;
     tok = tok->next();
     if (!tok || tok->str() == ">")
         return 0;
 
     unsigned int level = 0;
+    unsigned int ternaryLevel = 0;
 
     while (tok) {
         // skip template template
@@ -457,8 +461,16 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
         }
 
         // Skip '=', '?', ':'
-        if (Token::Match(tok, "=|?|:"))
+        if (Token::Match(tok, "=|?|:")) {
+            if (tok->str()[0] == '?')
+                ++ternaryLevel;
+            else if (tok->str()[0] == ':') {
+                if (ternaryLevel == 0)
+                    return 0;
+                --ternaryLevel;
+            }
             tok = tok->next();
+        }
         if (!tok)
             return 0;
 
@@ -493,7 +505,7 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
             return 0;
 
         // num/type ..
-        if (!tok->isNumber() && tok->tokType() != Token::eChar && tok->tokType() != Token::eString && !tok->isName() && !tok->isOp())
+        if (!tok->isNumber() && tok->tokType() != Token::eChar && tok->tokType() != Token::eString && !tok->isName() && !tok->isOp() && tok->str() != ".")
             return 0;
         tok = tok->next();
         if (!tok)
@@ -624,7 +636,7 @@ void TemplateSimplifier::deleteToken(Token *tok)
         tok->deleteThis();
 }
 
-static void invalidateForwardDecls(const Token* beg, const Token* end, std::map<Token*, Token*>* forwardDecls) {
+static void invalidateForwardDecls(const Token* beg, const Token* end, std::map<const Token*, Token*>* forwardDecls) {
     if (!forwardDecls)
         return;
     for (auto& fwd : *forwardDecls) {
@@ -636,7 +648,7 @@ static void invalidateForwardDecls(const Token* beg, const Token* end, std::map<
     }
 }
 
-bool TemplateSimplifier::removeTemplate(Token *tok, std::map<Token*, Token*>* forwardDecls)
+bool TemplateSimplifier::removeTemplate(Token *tok, std::map<const Token*, Token*>* forwardDecls)
 {
     if (!Token::simpleMatch(tok, "template <"))
         return false;
@@ -1153,6 +1165,8 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration)
                     instantiationArgs[index].push_back(tok1);
                     tok1 = tok1->next();
                 } while (tok1 && tok1 != endLink);
+                if (!tok1)
+                    syntaxError(end);
                 instantiationArgs[index].push_back(tok1);
             } else if (tok1->str() == "<" &&
                        (tok1->strAt(1) == ">" || (tok1->previous()->isName() &&
@@ -1162,6 +1176,8 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration)
                     instantiationArgs[index].push_back(tok1);
                     tok1 = tok1->next();
                 } while (tok1 && tok1 != endLink);
+                if (!tok1)
+                    syntaxError(end);
                 instantiationArgs[index].push_back(tok1);
             } else if (tok1->str() == ",") {
                 ++index;
@@ -1762,7 +1778,7 @@ void TemplateSimplifier::expandTemplate(
                         --typeindentlevel;
                     else if (typetok->str() == "(")
                         ++typeindentlevel;
-                    else if (typetok->str() == ")")
+                    else if (typeindentlevel > 0 && typetok->str() == ")")
                         --typeindentlevel;
                     dst->insertTokenBefore(typetok->str(), typetok->originalName(), typetok->getMacroName());
                     dst->previous()->linenr(start->linenr());
@@ -2082,8 +2098,11 @@ void TemplateSimplifier::expandTemplate(
         std::stack<const Token *> templates;
         int scopeCount = 0;
         for (; tok3; tok3 = tok3->next()) {
-            if (tok3->str() == "{")
+            if (tok3->str() == "{") {
+                if (isFunction && isSpecialization && inTemplateDefinition)
+                    break;
                 ++scopeCount;
+            }
             else if (tok3->str() == "}")
                 --scopeCount;
             if (scopeCount < 0)
@@ -2101,8 +2120,6 @@ void TemplateSimplifier::expandTemplate(
                     Token * const beforeTypeToken = mTokenList.back();
                     bool pointerType = false;
                     const bool isVariadicTemplateArg = templateDeclaration.isVariadic() && itype + 1 == typeParametersInDeclaration.size();
-                    if (isVariadicTemplateArg && mTypesUsedInTemplateInstantiation.size() > 1 && !Token::Match(tok3->next(), "...|<"))
-                        continue;
                     if (isVariadicTemplateArg && Token::Match(tok3, "%name% ... %name%"))
                         tok3 = tok3->tokAt(2);
                     if (!isVariadicTemplateArg && copy && Token::Match(mTypesUsedInTemplateInstantiation[itype].token(), "%num% ,|>|>>") &&
@@ -2127,6 +2144,7 @@ void TemplateSimplifier::expandTemplate(
                         }
                     }
                     const std::string endStr(isVariadicTemplateArg ? ">" : ",>");
+                    Token* begPar = nullptr;
                     for (Token *typetok = mTypesUsedInTemplateInstantiation[itype].token();
                          typetok && (typeindentlevel > 0 || endStr.find(typetok->str()[0]) == std::string::npos);
                          typetok = typetok->next()) {
@@ -2146,10 +2164,14 @@ void TemplateSimplifier::expandTemplate(
                             ++typeindentlevel;
                         } else if (typetok->str() == "(")
                             ++typeindentlevel;
-                        else if (typetok->str() == ")")
+                        else if (typeindentlevel > 0 && typetok->str() == ")")
                             --typeindentlevel;
                         Token *back;
                         if (copy) {
+                            if (isVariadicTemplateArg && typetok == mTypesUsedInTemplateInstantiation[itype].token() && typetok->isLiteral()) {
+                                mTokenList.addtoken("(", mTokenList.back());
+                                begPar = mTokenList.back();
+                            }
                             mTokenList.addtoken(typetok, tok3);
                             back = mTokenList.back();
                         } else
@@ -2178,6 +2200,10 @@ void TemplateSimplifier::expandTemplate(
                         if (copy)
                             back->templateArgFrom(typetok);
                     }
+                    if (begPar) {
+                        mTokenList.addtoken(")", mTokenList.back());
+                        Token::createMutualLinks(begPar, mTokenList.back());
+                    }
                     if (pointerType && Token::simpleMatch(beforeTypeToken, "const")) {
                         mTokenList.addtoken(beforeTypeToken);
                         beforeTypeToken->deleteThis();
@@ -2245,7 +2271,7 @@ void TemplateSimplifier::expandTemplate(
                 Token::Match(tok3->next()->findClosingBracket(), ">|>>")) {
                 const Token *closingBracket = tok3->next()->findClosingBracket();
                 if (Token::simpleMatch(closingBracket->next(), "&")) {
-                    int num = 0;
+                    size_t num = 0;
                     const Token *par = tok3->next();
                     while (num < typeParametersInDeclaration.size() && par != closingBracket) {
                         const std::string pattern("[<,] " + typeParametersInDeclaration[num]->str() + " [,>]");
@@ -2707,7 +2733,7 @@ static bool validTokenEnd(bool bounded, const Token *tok, const Token *backToken
 
 // TODO: This is not the correct class for simplifyCalculations(), so it
 // should be moved away.
-bool TemplateSimplifier::simplifyCalculations(Token* frontToken, const Token *backToken, bool isTemplate)
+bool TemplateSimplifier::simplifyCalculations(Token* frontToken, const Token *backToken, bool isTemplate) const
 {
     bool ret = false;
     const bool bounded = frontToken || backToken;
@@ -2856,9 +2882,9 @@ bool TemplateSimplifier::simplifyCalculations(Token* frontToken, const Token *ba
                 } else if ((((Token::Match(tok->previous(), "[=[(,] 0 * %name%|%num% ,|]|)|;|=|%cop%") ||
                               Token::Match(tok->previous(), "return|case 0 *|&& %name%|%num% ,|:|;|=|%cop%")) &&
                              validTokenEnd(bounded, tok, backToken, 3)) ||
-                            (((Token::Match(tok->previous(), "[=[(,] 0 * (") ||
-                               Token::Match(tok->previous(), "return|case 0 *|&& (")) &&
-                              validTokenEnd(bounded, tok, backToken, 2))))) {
+                            ((Token::Match(tok->previous(), "[=[(,] 0 * (") ||
+                              Token::Match(tok->previous(), "return|case 0 *|&& (")) &&
+                             validTokenEnd(bounded, tok, backToken, 2)))) {
                     tok->deleteNext();
                     if (tok->strAt(1) == "(")
                         eraseTokens(tok, tok->linkAt(1));
@@ -3028,7 +3054,7 @@ bool TemplateSimplifier::matchSpecialization(
                 declToken->isSigned() != instToken->isSigned() ||
                 declToken->isUnsigned() != instToken->isUnsigned() ||
                 declToken->isLong() != instToken->isLong()) {
-                int nr = 0;
+                size_t nr = 0;
                 while (nr < templateParameters.size() && templateParameters[nr]->str() != declToken->str())
                     ++nr;
 
@@ -3126,7 +3152,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
 
     // locate template usage..
     std::string::size_type numberOfTemplateInstantiations = mTemplateInstantiations.size();
-    unsigned int recursiveCount = 0;
+    int recursiveCount = 0;
 
     bool instantiated = false;
 
@@ -3149,7 +3175,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
                                               "templateRecursion",
                                               "TemplateSimplifier: max template recursion ("
                                               + std::to_string(mSettings.maxTemplateRecursion)
-                                              + ") reached for template '"+typeForNewName+"'. You might want to limit Cppcheck recursion.",
+                                              + ") reached for template '"+typeForNewName+"'.",
                                               Certainty::normal);
                     mErrorLogger.reportErr(errmsg);
                 }
@@ -3814,7 +3840,7 @@ void TemplateSimplifier::simplifyTemplates(const std::time_t maxtime)
         // Remove concepts/requires
         // TODO concepts are not removed yet
         for (Token *tok = mTokenList.front(); tok; tok = tok->next()) {
-            if (!Token::Match(tok, ")|>|>> requires %name%|("))
+            if (!Token::Match(tok, ")|>|>>|const|noexcept requires %name%|("))
                 continue;
             const Token* end = skipRequires(tok->next());
             if (end)
@@ -3903,6 +3929,7 @@ void TemplateSimplifier::simplifyTemplates(const std::time_t maxtime)
         std::unordered_map<std::string, int> nameOrdinal;
         int ordinal = 0;
         for (const auto& decl : mTemplateDeclarations) {
+            // cppcheck-suppress useStlAlgorithm - std::transform is cumbersome
             nameOrdinal.emplace(decl.fullName(), ordinal++);
         }
 
diff --git a/lib/templatesimplifier.h b/lib/templatesimplifier.h
index b5285071841..3dc8b6bf1fd 100644
--- a/lib/templatesimplifier.h
+++ b/lib/templatesimplifier.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,6 +47,8 @@ struct newInstantiation;
 class CPPCHECKLIB TemplateSimplifier {
 public:
     explicit TemplateSimplifier(Tokenizer &tokenizer);
+    TemplateSimplifier(const TemplateSimplifier &) = delete;
+    TemplateSimplifier &operator=(const TemplateSimplifier &) = delete;
 
     const std::string& dump() const {
         return mDump;
@@ -58,7 +60,7 @@ class CPPCHECKLIB TemplateSimplifier {
 
     /**
      */
-    void checkComplicatedSyntaxErrorsInTemplates();
+    void checkComplicatedSyntaxErrorsInTemplates() const;
 
     /**
      * is the token pointing at a template parameters block
@@ -333,7 +335,7 @@ class CPPCHECKLIB TemplateSimplifier {
      * @return true if modifications to token-list are done.
      *         false if no modifications are done.
      */
-    bool simplifyCalculations(Token* frontToken = nullptr, const Token *backToken = nullptr, bool isTemplate = true);
+    bool simplifyCalculations(Token* frontToken = nullptr, const Token *backToken = nullptr, bool isTemplate = true) const;
 
     /** Simplify template instantiation arguments.
      * @param start first token of arguments
@@ -463,7 +465,7 @@ class CPPCHECKLIB TemplateSimplifier {
     /**
      * Remove a specific "template < ..." template class/function
      */
-    static bool removeTemplate(Token *tok, std::map<Token*, Token*>* forwardDecls = nullptr);
+    static bool removeTemplate(Token *tok, std::map<const Token*, Token*>* forwardDecls = nullptr);
 
     /** Syntax error
      * @throws InternalError thrown unconditionally
@@ -504,17 +506,17 @@ class CPPCHECKLIB TemplateSimplifier {
         const std::string &indent = "    ") const;
     void printOut(const std::string &text = "") const;
 
-    Tokenizer &mTokenizer;
-    TokenList &mTokenList;
-    const Settings &mSettings;
-    ErrorLogger &mErrorLogger;
+    Tokenizer& mTokenizer;
+    TokenList& mTokenList;
+    const Settings& mSettings;
+    ErrorLogger& mErrorLogger;
     bool mChanged{};
 
     std::list<TokenAndName> mTemplateDeclarations;
     std::list<TokenAndName> mTemplateForwardDeclarations;
-    std::map<Token *, Token *> mTemplateForwardDeclarationsMap;
-    std::map<Token *, Token *> mTemplateSpecializationMap;
-    std::map<Token *, Token *> mTemplatePartialSpecializationMap;
+    std::map<const Token *, Token *> mTemplateForwardDeclarationsMap;
+    std::map<const Token *, Token *> mTemplateSpecializationMap;
+    std::map<const Token *, Token *> mTemplatePartialSpecializationMap;
     std::list<TokenAndName> mTemplateInstantiations;
     std::list<TokenAndName> mInstantiatedTemplates;
     std::list<TokenAndName> mMemberFunctionsToDelete;
diff --git a/lib/timer.cpp b/lib/timer.cpp
index 9e2dd901bea..275acc06078 100644
--- a/lib/timer.cpp
+++ b/lib/timer.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,60 +19,69 @@
 #include "timer.h"
 
 #include <algorithm>
-#include <cstddef>
 #include <iostream>
+#include <numeric>
 #include <utility>
 #include <vector>
 
 namespace {
-    using dataElementType = std::pair<std::string, TimerResultsData>;
-    bool more_second_sec(const dataElementType& lhs, const dataElementType& rhs)
-    {
-        return lhs.second.getSeconds() > rhs.second.getSeconds();
-    }
-
     // TODO: remove and print through (synchronized) ErrorLogger instead
     std::mutex stdCoutLock;
 }
 
 // TODO: this does not include any file context when SHOWTIME_FILE thus rendering it useless - should we include the logging with the progress logging?
 // that could also get rid of the broader locking
-void TimerResults::showResults(ShowTime mode) const
+void TimerResults::showResults(size_t max_results, bool metrics) const
 {
-    if (mode == ShowTime::NONE || mode == ShowTime::FILE_TOTAL)
-        return;
-    std::vector<dataElementType> data;
+    using dataElementType = std::pair<std::string, std::vector<std::chrono::milliseconds>>;
 
+    std::vector<dataElementType> data;
     {
         std::lock_guard<std::mutex> l(mResultsSync);
 
         data.reserve(mResults.size());
         data.insert(data.begin(), mResults.cbegin(), mResults.cend());
     }
-    std::sort(data.begin(), data.end(), more_second_sec);
+
+    const auto asSeconds = [](std::chrono::milliseconds ms) -> std::chrono::duration<double> {
+        return std::chrono::duration_cast<std::chrono::duration<double>>(ms);
+    };
+
+    const auto getSeconds = [&asSeconds](const std::vector<std::chrono::milliseconds>& results) -> std::chrono::duration<double> {
+        return std::accumulate(results.cbegin(), results.cend(), std::chrono::duration<double>{}, [&asSeconds](std::chrono::duration<double> secs, std::chrono::milliseconds duration) {
+            return secs + asSeconds(duration);
+        });
+    };
+
+    std::sort(data.begin(), data.end(), [&getSeconds](const dataElementType& lhs, const dataElementType& rhs) -> bool {
+        return getSeconds(lhs.second) > getSeconds(rhs.second);
+    });
 
     // lock the whole logging operation to avoid multiple threads printing their results at the same time
     std::lock_guard<std::mutex> l(stdCoutLock);
 
-    std::cout << std::endl;
-
     size_t ordinal = 1; // maybe it would be nice to have an ordinal in output later!
     for (auto iter=data.cbegin(); iter!=data.cend(); ++iter) {
-        const double sec = iter->second.getSeconds().count();
-        const double secAverage = sec / static_cast<double>(iter->second.mNumberOfResults);
-        if ((mode != ShowTime::TOP5_FILE && mode != ShowTime::TOP5_SUMMARY) || (ordinal<=5)) {
-            std::cout << iter->first << ": " << sec << "s (avg. " << secAverage << "s - " << iter->second.mNumberOfResults  << " result(s))" << std::endl;
+        if (ordinal <= max_results) {
+            const double sec = getSeconds(iter->second).count();
+            std::cout << iter->first << ": " << sec << "s";
+            if (metrics) {
+                const double secAverage = sec / static_cast<double>(iter->second.size());
+                const double secMin = asSeconds(*std::min_element(iter->second.cbegin(), iter->second.cend())).count();
+                const double secMax = asSeconds(*std::max_element(iter->second.cbegin(), iter->second.cend())).count();
+                std::cout << " (avg. " << secAverage << "s / min " << secMin << "s / max " << secMax << "s - " << iter->second.size() << " result(s))";
+            }
+            std::cout << std::endl;
         }
         ++ordinal;
     }
 }
 
-void TimerResults::addResults(const std::string& str, std::chrono::milliseconds duration)
+void TimerResults::addResults(const std::string& name, std::chrono::milliseconds duration)
 {
     std::lock_guard<std::mutex> l(mResultsSync);
 
-    mResults[str].mDuration += duration;
-    mResults[str].mNumberOfResults++;
+    mResults[name].push_back(duration);
 }
 
 void TimerResults::reset()
@@ -81,13 +90,14 @@ void TimerResults::reset()
     mResults.clear();
 }
 
-Timer::Timer(std::string str, ShowTime showtimeMode, TimerResultsIntf* timerResults, Type type)
+Timer::Timer(std::string str, TimerResultsIntf* timerResults)
     : mName(std::move(str))
-    , mMode(showtimeMode)
-    , mType(type)
-    , mStart(Clock::now())
     , mResults(timerResults)
-{}
+{
+    if (!mResults)
+        return;
+    mStart = Clock::now();
+}
 
 Timer::~Timer()
 {
@@ -96,29 +106,16 @@ Timer::~Timer()
 
 void Timer::stop()
 {
-    if (mMode == ShowTime::NONE)
-        return;
-    if (mType == Type::OVERALL && mMode != ShowTime::TOP5_SUMMARY && mMode != ShowTime::SUMMARY) {
-        mMode = ShowTime::NONE;
-        return;
-    }
-    if (mType == Type::FILE && mMode != ShowTime::TOP5_FILE && mMode != ShowTime::FILE && mMode != ShowTime::FILE_TOTAL) {
-        mMode = ShowTime::NONE;
+    if (mStart == TimePoint{})
         return;
-    }
-    if (mStart != TimePoint{}) {
-        auto diff = std::chrono::duration_cast<std::chrono::milliseconds>(Clock::now() - mStart);
-        if (!mResults) {
-            std::lock_guard<std::mutex> l(stdCoutLock);
-            std::cout << (mType == Type::OVERALL ? "Overall time: " : "Check time: " + mName + ": ") << TimerResultsData::durationToString(diff) << std::endl;
-        } else {
-            mResults->addResults(mName, diff);
-        }
-    }
-    mMode = ShowTime::NONE; // prevent multiple stops
+
+    const auto diff = std::chrono::duration_cast<std::chrono::milliseconds>(Clock::now() - mStart);
+    mResults->addResults(mName, diff);
+
+    mStart = TimePoint{}; // prevent multiple stops
 }
 
-std::string TimerResultsData::durationToString(std::chrono::milliseconds duration)
+static std::string durationToString(std::chrono::milliseconds duration)
 {
     // Extract hours
     auto hours = std::chrono::duration_cast<std::chrono::hours>(duration);
@@ -142,3 +139,21 @@ std::string TimerResultsData::durationToString(std::chrono::milliseconds duratio
         secondsStr.resize(pos + 4); // keep three decimal
     return (ellapsedTime + secondsStr + "s");
 }
+
+OneShotTimer::OneShotTimer(std::string name)
+{
+    class MyResults : public TimerResultsIntf
+    {
+    private:
+        void addResults(const std::string &name, std::chrono::milliseconds duration) override
+        {
+            std::lock_guard<std::mutex> l(stdCoutLock);
+
+            // TODO: do not use std::cout directly
+            std::cout << name << ": " << durationToString(duration) << std::endl;
+        }
+    };
+
+    mResults.reset(new MyResults);
+    mTimer.reset(new Timer(std::move(name), mResults.get()));
+}
diff --git a/lib/timer.h b/lib/timer.h
index f50b3ca3485..1ee7fde52f9 100644
--- a/lib/timer.h
+++ b/lib/timer.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,50 +23,38 @@
 #include "config.h"
 
 #include <chrono>
-#include <cstdint>
+#include <cstddef>
+#include <limits>
 #include <map>
+#include <memory>
 #include <mutex>
 #include <string>
 #include <utility>
-
-enum class ShowTime : std::uint8_t {
-    NONE,
-    FILE,
-    FILE_TOTAL,
-    SUMMARY,
-    TOP5_SUMMARY,
-    TOP5_FILE
-};
+#include <vector>
 
 class CPPCHECKLIB TimerResultsIntf {
 public:
     virtual ~TimerResultsIntf() = default;
 
-    virtual void addResults(const std::string& timerName, std::chrono::milliseconds duation) = 0;
-};
-
-struct TimerResultsData {
-    std::chrono::milliseconds mDuration;
-    long mNumberOfResults{};
-
-    std::chrono::duration<double> getSeconds() const {
-        return std::chrono::duration_cast<std::chrono::duration<double>>(mDuration);
-    }
-
-    static std::string durationToString(std::chrono::milliseconds duration);
+    virtual void addResults(const std::string& name, std::chrono::milliseconds duration) = 0;
 };
 
-class CPPCHECKLIB TimerResults : public TimerResultsIntf {
+class CPPCHECKLIB WARN_UNUSED TimerResults : public TimerResultsIntf {
 public:
     TimerResults() = default;
 
-    void showResults(ShowTime mode) const;
-    void addResults(const std::string& str, std::chrono::milliseconds duration) override;
+    void showResults(size_t max_results = std::numeric_limits<size_t>::max(), bool metrics = true) const;
+    void addResults(const std::string& name, std::chrono::milliseconds duration) override;
 
     void reset();
 
-private:
-    std::map<std::string, TimerResultsData> mResults;
+    std::map<std::string, std::vector<std::chrono::milliseconds>> getResults() const {
+        std::lock_guard<std::mutex> l(mResultsSync);
+        return mResults;
+    }
+
+protected:
+    std::map<std::string, std::vector<std::chrono::milliseconds>> mResults;
     mutable std::mutex mResultsSync;
 };
 
@@ -75,13 +63,7 @@ class CPPCHECKLIB Timer {
     using Clock = std::chrono::high_resolution_clock;
     using TimePoint = std::chrono::time_point<Clock>;
 
-    enum class Type : std::uint8_t {
-        FILE,
-        OVERALL,
-        OTHER
-    };
-
-    Timer(std::string str, ShowTime showtimeMode, TimerResultsIntf* timerResults = nullptr, Type type = Type::OTHER);
+    explicit Timer(std::string str, TimerResultsIntf* timerResults = nullptr);
     ~Timer();
 
     Timer(const Timer&) = delete;
@@ -90,18 +72,25 @@ class CPPCHECKLIB Timer {
     void stop();
 
     template<class TFunc>
-    static void run(std::string str, ShowTime showtimeMode, TimerResultsIntf* timerResults, const TFunc& f) {
-        Timer t(std::move(str), showtimeMode, timerResults);
+    static void run(std::string str, TimerResultsIntf* timerResults, const TFunc& f) {
+        Timer t(std::move(str), timerResults);
         f();
     }
 
 private:
     const std::string mName;
-    ShowTime mMode{};
-    Type mType{};
     TimePoint mStart;
     TimerResultsIntf* mResults{};
 };
 
+class CPPCHECKLIB OneShotTimer
+{
+public:
+    explicit OneShotTimer(std::string name);
+private:
+    std::unique_ptr<TimerResultsIntf> mResults;
+    std::unique_ptr<Timer> mTimer;
+};
+
 //---------------------------------------------------------------------------
 #endif // timerH
diff --git a/lib/token.cpp b/lib/token.cpp
index 5633f291083..eac69decee7 100644
--- a/lib/token.cpp
+++ b/lib/token.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -204,16 +204,15 @@ static const std::unordered_set<std::string> stdTypes = { "bool"
                                                           , "int"
                                                           , "long"
                                                           , "short"
-                                                          , "size_t"
                                                           , "void"
                                                           , "wchar_t"
                                                           , "signed"
                                                           , "unsigned"
 };
 
-bool Token::isStandardType(const std::string& str)
+bool Token::isStandardType(const std::string& s)
 {
-    return stdTypes.find(str) != stdTypes.end();
+    return stdTypes.find(s) != stdTypes.end();
 }
 
 void Token::update_property_isStandardType()
@@ -424,7 +423,7 @@ int multiComparePercent(const Token *tok, const char*& haystack, nonneg int vari
                 return 1;
         } else { // %varid%
             if (varid == 0) {
-                throw InternalError(tok, "Internal error. Token::Match called with varid 0. Please report this to Cppcheck developers");
+                throw InternalError(tok, "Internal error. Token::Match called with varid 0.");
             }
 
             haystack += 6;
@@ -554,7 +553,7 @@ int multiCompareImpl(const Token *tok, const char *haystack, nonneg int varid)
     const char *needle = tok->str().c_str();
     const char *needlePointer = needle;
     for (;;) {
-        if (needlePointer == needle && haystack[0] == '%' && haystack[1] != '|' && haystack[1] != '\0' && haystack[1] != ' ') {
+        if (needlePointer == needle && haystack[0] == '%' && haystack[1] != '|' && haystack[1] != '\0' && haystack[1] != ' ' && haystack[1] != '=') {
             const int ret = multiComparePercent(tok, haystack, varid);
             if (ret < 2)
                 return ret;
@@ -614,7 +613,6 @@ bool Token::simpleMatch(const Token *tok, const char pattern[], size_t pattern_l
         return false; // shortcut
     const char *current = pattern;
     const char *end = pattern + pattern_len;
-    // cppcheck-suppress shadowFunction - TODO: fix this
     const char *next = static_cast<const char*>(std::memchr(pattern, ' ', pattern_len));
     if (!next)
         next = end;
@@ -637,31 +635,31 @@ bool Token::simpleMatch(const Token *tok, const char pattern[], size_t pattern_l
     return true;
 }
 
-bool Token::firstWordEquals(const char *str, const char *word)
+bool Token::firstWordEquals(const char *s, const char *word)
 {
     for (;;) {
-        if (*str != *word)
-            return (*str == ' ' && *word == 0);
-        if (*str == 0)
+        if (*s != *word)
+            return (*s == ' ' && *word == 0);
+        if (*s == 0)
             break;
 
-        ++str;
+        ++s;
         ++word;
     }
 
     return true;
 }
 
-const char *Token::chrInFirstWord(const char *str, char c)
+const char *Token::chrInFirstWord(const char *s, char c)
 {
     for (;;) {
-        if (*str == ' ' || *str == 0)
+        if (*s == ' ' || *s == 0)
             return nullptr;
 
-        if (*str == c)
-            return str;
+        if (*s == c)
+            return s;
 
-        ++str;
+        ++s;
     }
 }
 
@@ -769,7 +767,6 @@ nonneg int Token::getStrArraySize(const Token *tok)
 {
     assert(tok != nullptr);
     assert(tok->tokType() == eString);
-    // cppcheck-suppress shadowFunction - TODO: fix this
     const std::string str(getStringLiteral(tok->str()));
     int sizeofstring = 1;
     for (int i = 0; i < static_cast<int>(str.size()); i++) {
@@ -1014,41 +1011,41 @@ Token *Token::findsimplematch(Token * const startTok, const char pattern[], size
 }
 
 template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
-static T *findmatchImpl(T * const startTok, const char pattern[], const nonneg int varId)
+static T *findmatchImpl(T * const startTok, const char pattern[], const nonneg int varid)
 {
     for (T* tok = startTok; tok; tok = tok->next()) {
-        if (Token::Match(tok, pattern, varId))
+        if (Token::Match(tok, pattern, varid))
             return tok;
     }
     return nullptr;
 }
 
-const Token *Token::findmatch(const Token * const startTok, const char pattern[], const nonneg int varId)
+const Token *Token::findmatch(const Token * const startTok, const char pattern[], const nonneg int varid)
 {
-    return findmatchImpl(startTok, pattern, varId);
+    return findmatchImpl(startTok, pattern, varid);
 }
 
-Token *Token::findmatch(Token * const startTok, const char pattern[], const nonneg int varId) {
-    return findmatchImpl(startTok, pattern, varId);
+Token *Token::findmatch(Token * const startTok, const char pattern[], const nonneg int varid) {
+    return findmatchImpl(startTok, pattern, varid);
 }
 
 template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
-static T *findmatchImpl(T * const startTok, const char pattern[], const Token * const end, const nonneg int varId)
+static T *findmatchImpl(T * const startTok, const char pattern[], const Token * const end, const nonneg int varid)
 {
     for (T* tok = startTok; tok && tok != end; tok = tok->next()) {
-        if (Token::Match(tok, pattern, varId))
+        if (Token::Match(tok, pattern, varid))
             return tok;
     }
     return nullptr;
 }
 
-const Token *Token::findmatch(const Token * const startTok, const char pattern[], const Token * const end, const nonneg int varId)
+const Token *Token::findmatch(const Token * const startTok, const char pattern[], const Token * const end, const nonneg int varid)
 {
-    return findmatchImpl(startTok, pattern, end, varId);
+    return findmatchImpl(startTok, pattern, end, varid);
 }
 
-Token *Token::findmatch(Token * const startTok, const char pattern[], const Token * const end, const nonneg int varId) {
-    return findmatchImpl(startTok, pattern, end, varId);
+Token *Token::findmatch(Token * const startTok, const char pattern[], const Token * const end, const nonneg int varid) {
+    return findmatchImpl(startTok, pattern, end, varid);
 }
 
 void Token::function(const Function *f)
@@ -1333,10 +1330,10 @@ std::string Token::stringifyList(const stringifyOptions& options, const std::vec
 
     std::string ret;
 
-    unsigned int lineNumber = mImpl->mLineNumber - (options.linenumbers ? 1U : 0U);
+    nonneg int lineNumber = mImpl->mLineNumber - (options.linenumbers ? 1 : 0);
     // cppcheck-suppress shadowFunction - TODO: fix this
-    unsigned int fileIndex = options.files ? ~0U : mImpl->mFileIndex;
-    std::map<int, unsigned int> lineNumbers;
+    nonneg int fileIndex = options.files ? ~0U : mImpl->mFileIndex;
+    std::map<nonneg int, nonneg int> lineNumbers;
     for (const Token *tok = this; tok != end; tok = tok->next()) {
         assert(tok && "end precedes token");
         if (!tok)
@@ -1421,11 +1418,6 @@ std::string Token::stringifyList(const Token* end, bool attributes) const
     return stringifyList(false, attributes, false, false, false, nullptr, end);
 }
 
-std::string Token::stringifyList(bool varid) const
-{
-    return stringifyList(varid, false, true, true, true, nullptr, nullptr);
-}
-
 void Token::astParent(Token* tok)
 {
     const Token* tok2 = tok;
@@ -1821,7 +1813,7 @@ void Token::printValueFlow(const std::vector<std::string>& files, bool xml, std:
                 outs += "      <value ";
                 switch (value.valueType) {
                 case ValueFlow::Value::ValueType::INT:
-                    if (tok->valueType() && tok->valueType()->sign == ValueType::UNSIGNED) {
+                    if (tok->valueType() && tok->valueType()->sign == ValueType::UNSIGNED && value.toString() != "!<=-1") {
                         outs += "intvalue=\"";
                         outs += MathLib::toString(static_cast<MathLib::biguint>(value.intvalue));
                         outs += '\"';
@@ -2361,12 +2353,12 @@ const ::Type* Token::typeOf(const Token* tok, const Token** typeTok)
         return tok->variable()->type();
     if (tok->function())
         return tok->function()->retType;
+    if (tok->valueType() && tok->valueType()->typeScope && tok->valueType()->typeScope->definedType)
+        return tok->valueType()->typeScope->definedType;
     if (Token::simpleMatch(tok, "return")) {
-        // cppcheck-suppress shadowFunction - TODO: fix this
         const Scope *scope = tok->scope();
         if (!scope)
             return nullptr;
-        // cppcheck-suppress shadowFunction - TODO: fix this
         const Function *function = scope->function;
         if (!function)
             return nullptr;
@@ -2441,6 +2433,7 @@ std::pair<const Token*, const Token*> Token::typeDecl(const Token* tok, bool poi
                     varTok = varTok->next();
                 while (Token::Match(varTok, "%name% ::"))
                     varTok = varTok->tokAt(2);
+                assert(varTok != tok);
                 std::pair<const Token*, const Token*> r = typeDecl(varTok);
                 if (r.first)
                     return r;
@@ -2476,18 +2469,15 @@ std::pair<const Token*, const Token*> Token::typeDecl(const Token* tok, bool poi
         return {var->typeStartToken(), var->typeEndToken()->next()};
     }
     if (Token::simpleMatch(tok, "return")) {
-        // cppcheck-suppress shadowFunction - TODO: fix this
         const Scope* scope = tok->scope();
         if (!scope)
             return {};
-        // cppcheck-suppress shadowFunction - TODO: fix this
         const Function* function = scope->function;
         if (!function)
             return {};
         return { function->retDef, function->returnDefEnd() };
     }
     if (tok->previous() && tok->previous()->function()) {
-        // cppcheck-suppress shadowFunction - TODO: fix this
         const Function *function = tok->previous()->function();
         return {function->retDef, function->returnDefEnd()};
     }
@@ -2664,26 +2654,26 @@ Token::Impl::~Impl()
     }
 }
 
-void Token::Impl::setCppcheckAttribute(CppcheckAttributesType type, MathLib::bigint value)
+void Token::Impl::setCppcheckAttribute(CppcheckAttributesType attrType, MathLib::bigint value)
 {
     CppcheckAttributes *attr = mCppcheckAttributes;
-    while (attr && attr->type != type)
+    while (attr && attr->type != attrType)
         attr = attr->next;
     if (attr)
         attr->value = value;
     else {
         attr = new CppcheckAttributes;
-        attr->type = type;
+        attr->type = attrType;
         attr->value = value;
         attr->next = mCppcheckAttributes;
         mCppcheckAttributes = attr;
     }
 }
 
-bool Token::Impl::getCppcheckAttribute(CppcheckAttributesType type, MathLib::bigint &value) const
+bool Token::Impl::getCppcheckAttribute(CppcheckAttributesType attrType, MathLib::bigint &value) const
 {
     const CppcheckAttributes *attr = mCppcheckAttributes;
-    while (attr && attr->type != type)
+    while (attr && attr->type != attrType)
         attr = attr->next;
     if (attr)
         value = attr->value;
@@ -2753,3 +2743,10 @@ const SmallVector<ReferenceToken>& Token::refs(bool temporary) const
         mImpl->mRefs.reset(new SmallVector<ReferenceToken>(followAllReferences(this, false)));
     return *mImpl->mRefs;
 }
+
+bool Token::isMutableExpr() const
+{
+    if (mImpl->mMutableExpr == -1)
+        mImpl->mMutableExpr = isMutableExpression(this);
+    return !!mImpl->mMutableExpr;
+}
diff --git a/lib/token.h b/lib/token.h
index 5fddf510b19..8e96c405e97 100644
--- a/lib/token.h
+++ b/lib/token.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@ struct ReferenceToken;
 struct ScopeInfo2 {
     ScopeInfo2(std::string name_, const Token *bodyEnd_, std::set<std::string> usingNamespaces_ = std::set<std::string>()) : name(std::move(name_)), bodyEnd(bodyEnd_), usingNamespaces(std::move(usingNamespaces_)) {}
     std::string name;
-    const Token* const bodyEnd{};
+    const Token* bodyEnd{};
     std::set<std::string> usingNamespaces;
 };
 
@@ -80,7 +80,6 @@ enum class TokenDebug : std::uint8_t { None, ValueFlow, ValueType };
  * The Token class also has other functions for management of token list, matching tokens, etc.
  */
 class CPPCHECKLIB Token {
-    friend class TestToken;
 
 public:
     enum CppcheckAttributesType : std::uint8_t { LOW, HIGH };
@@ -117,6 +116,7 @@ class CPPCHECKLIB Token {
         Token* mAstOperand1{};
         Token* mAstOperand2{};
         Token* mAstParent{};
+        Token* mAstTop{};
 
         // symbol database information
         const Scope* mScope{};
@@ -172,8 +172,10 @@ class CPPCHECKLIB Token {
         std::unique_ptr<SmallVector<ReferenceToken>> mRefs;
         std::unique_ptr<SmallVector<ReferenceToken>> mRefsTemp;
 
-        void setCppcheckAttribute(CppcheckAttributesType type, MathLib::bigint value);
-        bool getCppcheckAttribute(CppcheckAttributesType type, MathLib::bigint &value) const;
+        std::int8_t mMutableExpr{-1};
+
+        void setCppcheckAttribute(CppcheckAttributesType attrType, MathLib::bigint value);
+        bool getCppcheckAttribute(CppcheckAttributesType attrType, MathLib::bigint &value) const;
 
         Impl() = default;
         ~Impl();
@@ -247,35 +249,35 @@ class CPPCHECKLIB Token {
      * For example index 1 would return next token, and 2
      * would return next from that one.
      */
-    const Token *tokAt(int index) const
+    const Token *tokAt(int idx) const
     {
-        return tokAtImpl(this, index);
+        return tokAtImpl(this, idx);
     }
-    Token *tokAt(int index)
+    Token *tokAt(int idx)
     {
-        return tokAtImpl(this, index);
+        return tokAtImpl(this, idx);
     }
 
     /**
      * @return the link to the token in given index, related to this token.
      * For example index 1 would return the link to next token.
      */
-    const Token *linkAt(int index) const
+    const Token *linkAt(int idx) const
     {
-        return linkAtImpl(this, index);
+        return linkAtImpl(this, idx);
     }
-    Token *linkAt(int index)
+    Token *linkAt(int idx)
     {
-        return linkAtImpl(this, index);
+        return linkAtImpl(this, idx);
     }
 
     /**
      * @return String of the token in given index, related to this token.
      * If that token does not exist, an empty string is being returned.
      */
-    const std::string &strAt(int index) const
+    const std::string &strAt(int idx) const
     {
-        const Token *tok = this->tokAt(index);
+        const Token *tok = this->tokAt(idx);
         return tok ? tok->mStr : mEmptyString;
     }
 
@@ -602,11 +604,11 @@ class CPPCHECKLIB Token {
     bool hasAttributeCleanup() const {
         return !mImpl->mAttributeCleanup.empty();
     }
-    void setCppcheckAttribute(CppcheckAttributesType type, MathLib::bigint value) {
-        mImpl->setCppcheckAttribute(type, value);
+    void setCppcheckAttribute(CppcheckAttributesType attrType, MathLib::bigint value) {
+        mImpl->setCppcheckAttribute(attrType, value);
     }
-    bool getCppcheckAttribute(CppcheckAttributesType type, MathLib::bigint &value) const {
-        return mImpl->getCppcheckAttribute(type, value);
+    bool getCppcheckAttribute(CppcheckAttributesType attrType, MathLib::bigint &value) const {
+        return mImpl->getCppcheckAttribute(attrType, value);
     }
     // cppcheck-suppress unusedFunction
     bool hasCppcheckAttributes() const {
@@ -730,11 +732,11 @@ class CPPCHECKLIB Token {
         setFlag(fIsTemplate, b);
     }
 
-    bool isSimplifiedScope() const {
-        return getFlag(fIsSimplifedScope);
+    bool isSimplifiedIfInitStmt() const {
+        return getFlag(fIsSimplifiedIfInitStmt);
     }
-    void isSimplifiedScope(bool b) {
-        setFlag(fIsSimplifedScope, b);
+    void isSimplifiedIfInitStmt(bool b) {
+        setFlag(fIsSimplifiedIfInitStmt, b);
     }
 
     bool isFinalType() const {
@@ -765,7 +767,14 @@ class CPPCHECKLIB Token {
         setFlag(fIsAnonymous, b);
     }
 
-    // cppcheck-suppress unusedFunction
+    bool isInsertedBrace() const {
+        return getFlag(fIsInsertedBrace);
+    }
+    Token* isInsertedBrace(bool b) {
+        setFlag(fIsInsertedBrace, b);
+        return this;
+    }
+
     bool isBitfield() const {
         return mImpl->mBits >= 0;
     }
@@ -870,8 +879,8 @@ class CPPCHECKLIB Token {
     }
     static const Token *findsimplematch(const Token * startTok, const char pattern[], size_t pattern_len, const Token * end);
 
-    static const Token *findmatch(const Token * startTok, const char pattern[], nonneg int varId = 0);
-    static const Token *findmatch(const Token * startTok, const char pattern[], const Token * end, nonneg int varId = 0);
+    static const Token *findmatch(const Token * startTok, const char pattern[], nonneg int varid = 0);
+    static const Token *findmatch(const Token * startTok, const char pattern[], const Token * end, nonneg int varid = 0);
 
     template<size_t count>
     static Token *findsimplematch(Token * const startTok, const char (&pattern)[count]) {
@@ -884,20 +893,20 @@ class CPPCHECKLIB Token {
     }
     static Token *findsimplematch(Token * startTok, const char pattern[], size_t pattern_len, const Token * end);
 
-    static Token *findmatch(Token * startTok, const char pattern[], nonneg int varId = 0);
-    static Token *findmatch(Token * startTok, const char pattern[], const Token * end, nonneg int varId = 0);
+    static Token *findmatch(Token * startTok, const char pattern[], nonneg int varid = 0);
+    static Token *findmatch(Token * startTok, const char pattern[], const Token * end, nonneg int varid = 0);
 
 private:
     template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
-    static T *tokAtImpl(T *tok, int index)
+    static T *tokAtImpl(T *tok, int idx)
     {
-        while (index > 0 && tok) {
+        while (idx > 0 && tok) {
             tok = tok->next();
-            --index;
+            --idx;
         }
-        while (index < 0 && tok) {
+        while (idx < 0 && tok) {
             tok = tok->previous();
-            ++index;
+            ++idx;
         }
         return tok;
     }
@@ -906,15 +915,16 @@ class CPPCHECKLIB Token {
      * @throws InternalError thrown if index is out of range
      */
     template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
-    static T *linkAtImpl(T *thisTok, int index)
+    static T *linkAtImpl(T *thisTok, int idx)
     {
-        T *tok = thisTok->tokAt(index);
+        T *tok = thisTok->tokAt(idx);
         if (!tok) {
             throw InternalError(thisTok, "Internal error. Token::linkAt called with index outside the tokens range.");
         }
         return tok->link();
     }
 
+protected:
     /**
      * Needle is build from multiple alternatives. If one of
      * them is equal to haystack, return value is 1. If there
@@ -1107,7 +1117,7 @@ class CPPCHECKLIB Token {
             options.files = true;
             return options;
         }
-        // cppcheck-suppress unusedFunction
+        // cppcheck-suppress unusedFunction - used in tests only
         static stringifyOptions forDebugVarId() {
             stringifyOptions options = forDebug();
             options.varid = true;
@@ -1139,7 +1149,6 @@ class CPPCHECKLIB Token {
 
     std::string stringifyList(const stringifyOptions& options, const std::vector<std::string>* fileNames = nullptr, const Token* end = nullptr) const;
     std::string stringifyList(const Token* end, bool attributes = true) const;
-    std::string stringifyList(bool varid = false) const;
 
     /**
      * Stringify a list of token, from current instance on.
@@ -1265,7 +1274,7 @@ class CPPCHECKLIB Token {
 
     static std::string typeStr(const Token* tok);
 
-    static bool isStandardType(const std::string& str);
+    static bool isStandardType(const std::string& s);
 
     /**
      * @return a pointer to the Enumerator associated with this token.
@@ -1363,6 +1372,9 @@ class CPPCHECKLIB Token {
     // provides and caches result of a followAllReferences() call
     const SmallVector<ReferenceToken>& refs(bool temporary = true) const;
 
+    // provides and caches the result of a isMutableExpression() call
+    bool isMutableExpr() const;
+
     /**
      * Sets the original name.
      */
@@ -1434,17 +1446,17 @@ class CPPCHECKLIB Token {
 
     /**
      * Works almost like strcmp() except returns only true or false and
-     * if str has empty space &apos; &apos; character, that character is handled
+     * if s has empty space &apos; &apos; character, that character is handled
      * as if it were &apos;\\0&apos;
      */
-    static bool firstWordEquals(const char *str, const char *word);
+    static bool firstWordEquals(const char *s, const char *word);
 
     /**
      * Works almost like strchr() except
-     * if str has empty space &apos; &apos; character, that character is handled
+     * if s has empty space &apos; &apos; character, that character is handled
      * as if it were &apos;\\0&apos;
      */
-    static const char *chrInFirstWord(const char *str, char c);
+    static const char *chrInFirstWord(const char *s, char c);
 
     RET_NONNULL Token* insertToken(const std::string& tokenStr, bool prepend);
     RET_NONNULL Token* insertToken(const std::string& tokenStr, const std::string& originalNameStr, bool prepend);
@@ -1493,7 +1505,7 @@ class CPPCHECKLIB Token {
         fIsImplicitInt          = (1ULL << 33), // Is "int" token implicitly added?
         fIsInline               = (1ULL << 34), // Is this a inline type
         fIsTemplate             = (1ULL << 35),
-        fIsSimplifedScope       = (1ULL << 36), // scope added when simplifying e.g. if (int i = ...; ...)
+        fIsSimplifiedIfInitStmt = (1ULL << 36), // simplified if/switch/while init statement e.g. if (int i = ...; ...) => { int i = ...; if (..) ..  }
         fIsRemovedVoidParameter = (1ULL << 37), // A void function parameter has been removed
         fIsIncompleteConstant   = (1ULL << 38),
         fIsRestrict             = (1ULL << 39), // Is this a restrict pointer type
@@ -1503,6 +1515,7 @@ class CPPCHECKLIB Token {
         fIsInitComma            = (1ULL << 43), // Is this comma located inside some {..}. i.e: {1,2,3,4}
         fIsInitBracket          = (1ULL << 44), // Is this bracket used as a part of variable initialization i.e: int a{5}, b(2);
         fIsAnonymous            = (1ULL << 45), // Is this a token added for an unnamed member
+        fIsInsertedBrace        = (1ULL << 46), // brace added when simplifying e.g. if (x) f(); => if (x) { f(); }
     };
 
     enum : std::uint8_t {
@@ -1557,6 +1570,9 @@ class CPPCHECKLIB Token {
      * @throws InternalError thrown on cyclic dependency
      */
     void astParent(Token* tok);
+    void astTop(Token * tok) {
+        mImpl->mAstTop = tok;
+    }
 
     Token * astOperand1() {
         return mImpl->mAstOperand1;
@@ -1597,6 +1613,9 @@ class CPPCHECKLIB Token {
 
     }
     RET_NONNULL Token *astTop() {
+        if (mImpl->mAstTop) {
+            return mImpl->mAstTop;
+        }
         Token *ret = this;
         while (ret->mImpl->mAstParent)
             ret = ret->mImpl->mAstParent;
@@ -1604,6 +1623,9 @@ class CPPCHECKLIB Token {
     }
 
     RET_NONNULL const Token *astTop() const {
+        if (mImpl->mAstTop) {
+            return mImpl->mAstTop;
+        }
         const Token *ret = this;
         while (ret->mImpl->mAstParent)
             ret = ret->mImpl->mAstParent;
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index cc98703011a..bbcd1bd6b89 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -70,10 +70,10 @@ namespace {
         VarIdScopeInfo(bool isExecutable, bool isStructInit, bool isEnum, nonneg int startVarid)
             : isExecutable(isExecutable), isStructInit(isStructInit), isEnum(isEnum), startVarid(startVarid) {}
 
-        const bool isExecutable{};
-        const bool isStructInit{};
-        const bool isEnum{};
-        const nonneg int startVarid{};
+        bool isExecutable{};
+        bool isStructInit{};
+        bool isEnum{};
+        nonneg int startVarid{};
     };
 }
 
@@ -103,14 +103,14 @@ static void skipEnumBody(T *&tok)
 /**
  * is tok the start brace { of a class, struct, union, or enum
  */
-static bool isClassStructUnionEnumStart(const Token * tok)
+static const Token* isClassStructUnionEnumStart(const Token* tok)
 {
     if (!Token::Match(tok->previous(), "class|struct|union|enum|%name%|>|>> {"))
-        return false;
+        return nullptr;
     const Token * tok2 = tok->previous();
-    while (tok2 && !Token::Match(tok2, "class|struct|union|enum|{|}|;"))
+    while (tok2 && !Token::Match(tok2, "class|struct|union|enum|{|}|)|;"))
         tok2 = tok2->previous();
-    return Token::Match(tok2, "class|struct|union|enum");
+    return (Token::Match(tok2, "class|struct|union|enum") && !Token::simpleMatch(tok2->tokAt(-1), "->")) ? tok2 : nullptr;
 }
 
 //---------------------------------------------------------------------------
@@ -135,7 +135,7 @@ Tokenizer::~Tokenizer()
 
 nonneg int Tokenizer::sizeOfType(const std::string& type) const
 {
-    const auto it = utils::as_const(mTypeSize).find(type);
+    const auto it = mTypeSize.find(type);
     if (it == mTypeSize.end()) {
         const Library::PodType* podtype = mSettings.library.podtype(type);
         if (!podtype)
@@ -154,7 +154,7 @@ nonneg int Tokenizer::sizeOfType(const Token *type) const
     if (type->tokType() == Token::eString)
         return Token::getStrLength(type) + 1U;
 
-    const auto it = utils::as_const(mTypeSize).find(type->str());
+    const auto it = mTypeSize.find(type->str());
     if (it == mTypeSize.end()) {
         const Library::PodType* podtype = mSettings.library.podtype(type->str());
         if (!podtype)
@@ -195,7 +195,7 @@ bool Tokenizer::duplicateTypedef(Token *&tokPtr, const Token *name, const Token
                 if (end->strAt(1) == "(")
                     end = end->linkAt(1);
 
-                end = (end)?end->next():nullptr;
+                end = end ? end->next() : nullptr;
             }
             if (end)
                 end = end->next();
@@ -549,9 +549,9 @@ namespace {
     private:
         Token* mTypedefToken;  // The "typedef" token
         Token* mEndToken{nullptr};  // Semicolon
-        std::pair<Token*, Token*> mRangeType;
-        std::pair<Token*, Token*> mRangeTypeQualifiers;
-        std::pair<Token*, Token*> mRangeAfterVar;
+        std::pair<const Token*, Token*> mRangeType;
+        std::pair<const Token*, Token*> mRangeTypeQualifiers;
+        std::pair<const Token*, Token*> mRangeAfterVar;
         Token* mNameToken{nullptr};
         bool mFail = false;
         bool mReplaceFailed = false;
@@ -563,28 +563,50 @@ namespace {
             if (Token::simpleMatch(start, "typename"))
                 start = start->next();
 
+            const auto checkForRecursion = [this]() {
+                if (Token::Match(mTypedefToken, "typedef %name% %name% ;"))
+                    return;
+                int nBraces = 0;
+                for (const Token *tok = mTypedefToken; tok != mEndToken; tok = tok->next()) {
+                    if (tok->str() == "{")
+                        ++nBraces;
+                    else if (tok->str() == "}")
+                        --nBraces;
+                    if (nBraces > 0)
+                        continue;
+                    if (tok == mNameToken)
+                        continue;
+                    if (tok->str() != mNameToken->str())
+                        continue;
+                    if (Token::Match(tok->previous(), "struct|class|enum|union"))
+                        continue;
+                    throw InternalError(tok, "recursive typedef encountered");
+                }
+            };
+
             // TODO handle unnamed structs etc
             if (Token::Match(start, "const| enum|struct|union|class %name%| {")) {
-                const std::pair<Token*, Token*> rangeBefore(start, Token::findsimplematch(start, "{"));
+                const std::pair<const Token*, Token*> rangeBefore(start, Token::findsimplematch(start, "{"));
 
                 // find typedef name token
-                Token* nameToken = rangeBefore.second->link()->next();
-                while (Token::Match(nameToken, "%name%|* %name%|*"))
-                    nameToken = nameToken->next();
-                const std::pair<Token*, Token*> rangeQualifiers(rangeBefore.second->link()->next(), nameToken);
+                Token* nameTok = rangeBefore.second->link()->next();
+                while (Token::Match(nameTok, "%name%|* %name%|*"))
+                    nameTok = nameTok->next();
+                const std::pair<const Token*, Token*> rangeQualifiers(rangeBefore.second->link()->next(), nameTok);
 
-                if (Token::Match(nameToken, "%name% ;")) {
+                if (Token::Match(nameTok, "%name% ;")) {
                     if (Token::Match(rangeBefore.second->previous(), "enum|struct|union|class {"))
-                        rangeBefore.second->previous()->insertToken(nameToken->str());
+                        rangeBefore.second->previous()->insertToken(nameTok->str());
                     mRangeType = rangeBefore;
                     mRangeTypeQualifiers = rangeQualifiers;
                     Token* typeName = rangeBefore.second->previous();
                     if (typeName->isKeyword()) {
                         // TODO typeName->insertToken("T:" + std::to_string(num++));
-                        typeName->insertToken(nameToken->str());
+                        typeName->insertToken(nameTok->str());
                     }
-                    mNameToken = nameToken;
-                    mEndToken = nameToken->next();
+                    mNameToken = nameTok;
+                    mEndToken = nameTok->next();
+                    checkForRecursion();
                     return;
                 }
             }
@@ -595,6 +617,7 @@ namespace {
                     mRangeType.second = type;
                     mNameToken = type;
                     mEndToken = mNameToken->next();
+                    checkForRecursion();
                     return;
                 }
                 if (type != start && Token::Match(type, "%name% [")) {
@@ -609,6 +632,7 @@ namespace {
                     mEndToken = end->next();
                     mRangeAfterVar.first = mNameToken->next();
                     mRangeAfterVar.second = mEndToken;
+                    checkForRecursion();
                     return;
                 }
                 if (Token::Match(type->next(), "( * const| %name% ) (") && Token::simpleMatch(type->linkAt(1)->linkAt(1), ") ;")) {
@@ -618,6 +642,7 @@ namespace {
                     mRangeType.second = mNameToken;
                     mRangeAfterVar.first = mNameToken->next();
                     mRangeAfterVar.second = mEndToken;
+                    checkForRecursion();
                     return;
                 }
                 if (type != start && Token::Match(type, "%name% ( !!(") && Token::simpleMatch(type->linkAt(1), ") ;") && !type->isStandardType()) {
@@ -627,11 +652,12 @@ namespace {
                     mRangeType.second = type;
                     mRangeAfterVar.first = mNameToken->next();
                     mRangeAfterVar.second = mEndToken;
+                    checkForRecursion();
                     return;
                 }
             }
             // TODO: handle all typedefs
-            if ((false))
+            if ((false)) // NOLINT(readability-redundant-parentheses)
                 printTypedef(typedefToken, std::cout);
             mFail = true;
         }
@@ -723,7 +749,7 @@ namespace {
             // Special handling of function pointer cast
             if (isFunctionPointer && isCast(tok->previous())) {
                 tok->insertToken("*");
-                Token* const tok_1 = insertTokens(tok, std::pair<Token*, Token*>(mRangeType.first, mNameToken->linkAt(1)));
+                Token* const tok_1 = insertTokens(tok, std::pair<const Token*, Token*>(mRangeType.first, mNameToken->linkAt(1)));
                 tok_1->originalName(originalname);
                 tok->deleteThis();
                 return;
@@ -798,7 +824,7 @@ namespace {
             Token *after = tok3;
             while (Token::Match(after, "%name%|*|&|&&|::"))
                 after = after->next();
-            if (Token::Match(mNameToken, "%name% (") && Token::simpleMatch(tok3->next(), "*")) {
+            if (Token::Match(mNameToken, "%name% (") && Token::Match(tok3->next(), "*|const")) {
                 while (Token::Match(after, "(|["))
                     after = after->link()->next();
                 if (after) {
@@ -835,12 +861,17 @@ namespace {
             }
 
             if (isFunctionPointer) {
-                if (Token::Match(after, "( * %name% ) ("))
+                // Keep the argument list for a parenthesized pointer declarator: fp *(name).
+                if (after->previous() != tok3 && Token::Match(after->previous(), "* ( %name% ) ;|,|="))
+                    after = after->link()->next();
+                else if (Token::Match(after, "( * %name% ) ("))
                     after = after->link()->linkAt(1)->next();
                 else if (after->str() == "(") {
                     useAfterVarRange = false;
                     if (Token::simpleMatch(tok3->previous(), "( *"))
                         tok3->deletePrevious();
+                    else if (Token::simpleMatch(tok3->tokAt(-2), "( * const"))
+                        tok3->tokAt(-1)->deletePrevious();
                 }
                 else if (after->str() == "[") {
                     while (after && after->str() == "[")
@@ -996,7 +1027,7 @@ namespace {
             return false;
         }
 
-        static Token* insertTokens(Token* to, std::pair<Token*,Token*> range) {
+        static Token* insertTokens(Token* to, std::pair<const Token*,Token*> range) {
             for (const Token* from = range.first; from != range.second; from = from->next()) {
                 to->insertToken(from->str());
                 to->next()->column(to->column());
@@ -1023,7 +1054,21 @@ namespace {
 }
 
 bool Tokenizer::isFunctionPointer(const Token* tok) {
-    return Token::Match(tok, "%name% ) (");
+    if (!Token::Match(tok, "%name%"))
+        return false;
+    tok = tok->next();
+    while (Token::Match(tok, "["))
+        tok = tok->link()->next();
+    return Token::simpleMatch(tok, ") (");
+}
+
+static bool matchCurrentType(const Token* tok, std::map<int, std::string>& types)
+{
+    if (tok->isC())
+        return false;
+    return std::any_of(types.begin(), types.end(), [&](const std::pair<int, std::string>& element) {
+        return tok->str() == element.second;
+    });
 }
 
 void Tokenizer::simplifyTypedef()
@@ -1041,19 +1086,26 @@ void Tokenizer::simplifyTypedef()
                 if (t != ts.nameToken())
                     existing_data_type += t->str() + " ";
             }
-            numberOfTypedefs[ts.name()].insert(existing_data_type);
+            numberOfTypedefs[ts.name()].emplace(std::move(existing_data_type));
             continue;
         }
     }
 
     int indentlevel = 0;
     std::map<std::string, TypedefSimplifier> typedefs;
+    std::map<int, std::string> inType;
     for (Token* tok = list.front(); tok; tok = tok->next()) {
         if (!tok->isName()) {
-            if (tok->str()[0] == '{')
+            if (tok->str()[0] == '{') {
                 ++indentlevel;
-            else if (tok->str()[0] == '}')
+                if (const Token* typeStart = isClassStructUnionEnumStart(tok)) {
+                    inType.emplace(indentlevel, typeStart->strAt(1));
+                }
+            }
+            else if (tok->str()[0] == '}') {
+                inType.erase(indentlevel);
                 --indentlevel;
+            }
             continue;
         }
 
@@ -1070,7 +1122,7 @@ void Tokenizer::simplifyTypedef()
         }
 
         auto it = typedefs.find(tok->str());
-        if (it != typedefs.end() && it->second.canReplace(tok)) {
+        if (it != typedefs.end() && it->second.canReplace(tok) && !matchCurrentType(tok, inType)) {
             std::set<std::string> r;
             std::string originalname;
             while (it != typedefs.end() && r.insert(tok->str()).second) {
@@ -1097,11 +1149,19 @@ void Tokenizer::simplifyTypedef()
                 syntaxError(t.second.getTypedefToken());
             } else {
                 const Token* const typedefToken = t.second.getTypedefToken();
+                const Token* const nameToken = t.second.nameToken();
                 TypedefInfo typedefInfo;
                 typedefInfo.name = t.second.name();
-                typedefInfo.filename = list.file(typedefToken);
-                typedefInfo.lineNumber = typedefToken->linenr();
-                typedefInfo.column = typedefToken->column();
+                typedefInfo.filename = list.file(nameToken);
+                typedefInfo.lineNumber = nameToken->linenr();
+                typedefInfo.column = nameToken->column();
+                if (Token::Match(typedefToken->next(), "struct|enum|class|union %name% {")) {
+                    typedefInfo.originalName = typedefToken->strAt(2);
+                    if (typedefToken->strAt(2) == typedefInfo.name) {
+                        typedefInfo.tagLine = typedefToken->tokAt(2)->linenr();
+                        typedefInfo.tagColumn = typedefToken->tokAt(2)->column();
+                    }
+                }
                 typedefInfo.used = t.second.isUsed();
                 typedefInfo.isFunctionPointer = isFunctionPointer(t.second.nameToken());
                 if (typedefInfo.isFunctionPointer) {
@@ -1125,24 +1185,28 @@ void Tokenizer::simplifyTypedef()
             list.front()->deleteThis();
     }
 
+    validate();
+
     simplifyTypedefCpp();
 }
 
-static Token* simplifyTypedefCopyTokens(Token* to, const Token* fromStart, const Token* toEnd, const Token* location) {
+static Token* simplifyTypedefCopyTokens(Token* to, const Token* fromStart, const Token* toEnd, const Token* location, const std::string &originalName) {
     Token* ret = TokenList::copyTokens(to, fromStart, toEnd);
     for (Token* tok = to->next(); tok != ret->next(); tok = tok->next()) {
         tok->linenr(location->linenr());
         tok->column(location->column());
         tok->isSimplifiedTypedef(true);
+        tok->originalName(originalName);
     }
     return ret;
 }
 
-static Token* simplifyTypedefInsertToken(Token* tok, const std::string& str, const Token* location) {
+static Token* simplifyTypedefInsertToken(Token* tok, const std::string& str, const Token* location, const std::string &originalName) {
     tok = tok->insertToken(str);
     tok->linenr(location->linenr());
     tok->column(location->column());
     tok->isSimplifiedTypedef(true);
+    tok->originalName(originalName);
     return tok;
 }
 
@@ -1159,11 +1223,10 @@ void Tokenizer::simplifyTypedefCpp()
     std::vector<Space> spaceInfo(1);
 
     const std::time_t maxTime = mSettings.typedefMaxTime > 0 ? std::time(nullptr) + mSettings.typedefMaxTime: 0;
-    const bool doProgress = (mSettings.reportProgress != -1) && !list.getFiles().empty();
+    ProgressReporter progressReporter(mErrorLogger, mSettings.reportProgress, list.getSourceFilePath(), "Tokenize (typedef)");
 
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (doProgress)
-            mErrorLogger.reportProgress(list.getFiles()[0], "Tokenize (typedef)", tok->progressValue());
+        progressReporter.report(tok->progressValue());
 
         if (Settings::terminated())
             return;
@@ -1634,8 +1697,12 @@ void Tokenizer::simplifyTypedefCpp()
         TypedefInfo typedefInfo;
         typedefInfo.name = typeName->str();
         typedefInfo.filename = list.file(typeName);
-        typedefInfo.lineNumber = typeName->linenr();
-        typedefInfo.column = typeName->column();
+        typedefInfo.lineNumber = typeDef->linenr();
+        typedefInfo.column = typeDef->column();
+        if (Token::Match(typeDef->next(), "struct|enum|class|union %name% {") && typeDef->strAt(2) == typedefInfo.name) {
+            typedefInfo.tagLine = typeDef->tokAt(2)->linenr();
+            typedefInfo.tagColumn = typeDef->tokAt(2)->column();
+        }
         typedefInfo.used = false;
         typedefInfo.isFunctionPointer = isFunctionPointer(typeName);
         if (typedefInfo.isFunctionPointer) {
@@ -1975,12 +2042,13 @@ void Tokenizer::simplifyTypedefCpp()
 
                     // start substituting at the typedef name by replacing it with the type
                     const Token* location = tok2;
+                    const std::string originalName = tok2->str();
                     for (Token* tok3 = typeStart; tok3 && (tok3->str() != ";"); tok3 = tok3->next())
                         tok3->isSimplifiedTypedef(true);
                     if (isPointerTypeCall) {
                         tok2->deleteThis();
-                        tok2 = simplifyTypedefInsertToken(tok2, "0", location);
-                        simplifyTypedefInsertToken(tok2->next(), "0", location);
+                        tok2 = simplifyTypedefInsertToken(tok2, "0", location, originalName);
+                        simplifyTypedefInsertToken(tok2->next(), "0", location, originalName);
                     }
                     if (Token::Match(tok2->tokAt(-1), "class|struct|union") && tok2->strAt(-1) == typeStart->str())
                         tok2->deletePrevious();
@@ -1989,6 +2057,7 @@ void Tokenizer::simplifyTypedefCpp()
                         tok2->previous()->str("typedef");
                         tok2->insertToken(tok2->str());
                     }
+                    tok2->originalName(originalName);
                     tok2->str(typeStart->str());
 
                     // restore qualification if it was removed
@@ -1997,12 +2066,12 @@ void Tokenizer::simplifyTypedefCpp()
                             tok2 = tok2->previous();
 
                         if (globalScope) {
-                            tok2 = simplifyTypedefInsertToken(tok2, "::", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "::", location, originalName);
                         }
 
                         for (std::size_t i = classLevel; i < spaceInfo.size(); ++i) {
-                            tok2 = simplifyTypedefInsertToken(tok2, spaceInfo[i].className, location);
-                            tok2 = simplifyTypedefInsertToken(tok2, "::", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, spaceInfo[i].className, location, originalName);
+                            tok2 = simplifyTypedefInsertToken(tok2, "::", location, originalName);
                         }
                     }
 
@@ -2019,11 +2088,11 @@ void Tokenizer::simplifyTypedefCpp()
                                 std::string::size_type spaceIdx = 0;
                                 std::string::size_type startIdx = 0;
                                 while ((spaceIdx = removed1.find(' ', startIdx)) != std::string::npos) {
-                                    simplifyTypedefInsertToken(tok2->previous(), removed1.substr(startIdx, spaceIdx - startIdx), location);
+                                    simplifyTypedefInsertToken(tok2->previous(), removed1.substr(startIdx, spaceIdx - startIdx), location, originalName);
                                     startIdx = spaceIdx + 1;
                                 }
-                                simplifyTypedefInsertToken(tok2->previous(), removed1.substr(startIdx), location);
-                                simplifyTypedefInsertToken(tok2->previous(), "::", location);
+                                simplifyTypedefInsertToken(tok2->previous(), removed1.substr(startIdx), location, originalName);
+                                simplifyTypedefInsertToken(tok2->previous(), "::", location, originalName);
                                 break;
                             }
                             idx = removed1.rfind(" ::");
@@ -2035,23 +2104,23 @@ void Tokenizer::simplifyTypedefCpp()
                     }
                     Token* constTok = Token::simpleMatch(tok2->previous(), "const") ? tok2->previous() : nullptr;
                     // add remainder of type
-                    tok2 = simplifyTypedefCopyTokens(tok2, typeStart->next(), typeEnd, location);
+                    tok2 = simplifyTypedefCopyTokens(tok2, typeStart->next(), typeEnd, location, originalName);
 
                     if (!pointers.empty()) {
                         for (const std::string &p : pointers)
                             // cppcheck-suppress useStlAlgorithm
-                            tok2 = simplifyTypedefInsertToken(tok2, p, location);
+                            tok2 = simplifyTypedefInsertToken(tok2, p, location, originalName);
                         if (constTok && !functionPtr) {
-                            tok2 = simplifyTypedefInsertToken(tok2, "const", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "const", location, originalName);
                             constTok->deleteThis();
                             location = constTok;
                         }
                     }
 
                     if (funcStart && funcEnd) {
-                        tok2 = simplifyTypedefInsertToken(tok2, "(", location);
+                        tok2 = simplifyTypedefInsertToken(tok2, "(", location, originalName);
                         Token *paren = tok2;
-                        tok2 = simplifyTypedefCopyTokens(tok2, funcStart, funcEnd, location);
+                        tok2 = simplifyTypedefCopyTokens(tok2, funcStart, funcEnd, location, originalName);
 
                         if (!inCast)
                             tok2 = processFunc(tok2, inOperator);
@@ -2062,17 +2131,17 @@ void Tokenizer::simplifyTypedefCpp()
                         while (Token::Match(tok2, "%name%|] ["))
                             tok2 = tok2->linkAt(1);
 
-                        tok2 = simplifyTypedefInsertToken(tok2, ")", location);
+                        tok2 = simplifyTypedefInsertToken(tok2, ")", location, originalName);
                         Token::createMutualLinks(tok2, paren);
 
-                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location);
+                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location, originalName);
 
                         if (specStart) {
                             Token *spec = specStart;
-                            tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location);
+                            tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location, originalName);
                             while (spec != specEnd) {
                                 spec = spec->next();
-                                tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location);
+                                tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location, originalName);
                             }
                         }
                     }
@@ -2084,20 +2153,20 @@ void Tokenizer::simplifyTypedefCpp()
                         if (!inTemplate && function && tok2->next() && tok2->strAt(1) != "*")
                             needParen = false;
                         if (needParen) {
-                            tok2 = simplifyTypedefInsertToken(tok2, "(", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "(", location, originalName);
                         }
                         Token *tok3 = tok2;
                         if (namespaceStart) {
                             const Token *tok4 = namespaceStart;
 
                             while (tok4 != namespaceEnd) {
-                                tok2 = simplifyTypedefInsertToken(tok2, tok4->str(), location);
+                                tok2 = simplifyTypedefInsertToken(tok2, tok4->str(), location, originalName);
                                 tok4 = tok4->next();
                             }
-                            tok2 = simplifyTypedefInsertToken(tok2, namespaceEnd->str(), location);
+                            tok2 = simplifyTypedefInsertToken(tok2, namespaceEnd->str(), location, originalName);
                         }
                         if (functionPtr) {
-                            tok2 = simplifyTypedefInsertToken(tok2, "*", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "*", location, originalName);
                         }
 
                         if (!inCast)
@@ -2107,35 +2176,35 @@ void Tokenizer::simplifyTypedefCpp()
                             if (!tok2)
                                 syntaxError(nullptr);
 
-                            tok2 = simplifyTypedefInsertToken(tok2, ")", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, ")", location, originalName);
                             Token::createMutualLinks(tok2, tok3);
                         }
                         if (!tok2)
                             syntaxError(nullptr);
 
-                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location);
+                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location, originalName);
                         if (inTemplate) {
                             tok2 = tok2->next();
                         }
 
                         if (specStart) {
                             Token *spec = specStart;
-                            tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location);
+                            tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location, originalName);
                             while (spec != specEnd) {
                                 spec = spec->next();
-                                tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location);
+                                tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location, originalName);
                             }
                         }
                     } else if (functionRetFuncPtr || functionPtrRetFuncPtr) {
-                        tok2 = simplifyTypedefInsertToken(tok2, "(", location);
+                        tok2 = simplifyTypedefInsertToken(tok2, "(", location, originalName);
                         Token *tok3 = tok2;
-                        tok2 = simplifyTypedefInsertToken(tok2, "*", location);
+                        tok2 = simplifyTypedefInsertToken(tok2, "*", location, originalName);
 
                         Token * tok4 = nullptr;
                         if (functionPtrRetFuncPtr) {
-                            tok2 = simplifyTypedefInsertToken(tok2, "(", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "(", location, originalName);
                             tok4 = tok2;
-                            tok2 = simplifyTypedefInsertToken(tok2, "*", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "*", location, originalName);
                         }
 
                         // skip over variable name if there
@@ -2148,24 +2217,24 @@ void Tokenizer::simplifyTypedefCpp()
                         }
 
                         if (tok4 && functionPtrRetFuncPtr) {
-                            tok2 = simplifyTypedefInsertToken(tok2,")", location);
+                            tok2 = simplifyTypedefInsertToken(tok2,")", location, originalName);
                             Token::createMutualLinks(tok2, tok4);
                         }
 
-                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location);
+                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location, originalName);
 
-                        tok2 = simplifyTypedefInsertToken(tok2, ")", location);
+                        tok2 = simplifyTypedefInsertToken(tok2, ")", location, originalName);
                         Token::createMutualLinks(tok2, tok3);
 
-                        tok2 = simplifyTypedefCopyTokens(tok2, argFuncRetStart, argFuncRetEnd, location);
+                        tok2 = simplifyTypedefCopyTokens(tok2, argFuncRetStart, argFuncRetEnd, location, originalName);
                     } else if (ptrToArray || refToArray) {
-                        tok2 = simplifyTypedefInsertToken(tok2, "(", location);
+                        tok2 = simplifyTypedefInsertToken(tok2, "(", location, originalName);
                         Token *tok3 = tok2;
 
                         if (ptrToArray)
-                            tok2 = simplifyTypedefInsertToken(tok2, "*", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "*", location, originalName);
                         else
-                            tok2 = simplifyTypedefInsertToken(tok2, "&", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "&", location, originalName);
 
                         bool hasName = false;
                         // skip over name
@@ -2184,14 +2253,14 @@ void Tokenizer::simplifyTypedefCpp()
                                 tok2 = tok2->linkAt(1);
                         }
 
-                        simplifyTypedefInsertToken(tok2, ")", location);
+                        simplifyTypedefInsertToken(tok2, ")", location, originalName);
                         Token::createMutualLinks(tok2->next(), tok3);
 
                         if (!hasName)
                             tok2 = tok2->next();
                     } else if (ptrMember) {
                         if (Token::simpleMatch(tok2, "* (")) {
-                            tok2 = simplifyTypedefInsertToken(tok2, "*", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "*", location, originalName);
                         } else {
                             // This is the case of casting operator.
                             // Name is not available, and () should not be
@@ -2200,7 +2269,7 @@ void Tokenizer::simplifyTypedefCpp()
                             Token *openParenthesis = nullptr;
 
                             if (!castOperator) {
-                                tok2 = simplifyTypedefInsertToken(tok2, "(", location);
+                                tok2 = simplifyTypedefInsertToken(tok2, "(", location, originalName);
 
                                 openParenthesis = tok2;
                             }
@@ -2208,25 +2277,25 @@ void Tokenizer::simplifyTypedefCpp()
                             const Token *tok4 = namespaceStart;
 
                             while (tok4 != namespaceEnd) {
-                                tok2 = simplifyTypedefInsertToken(tok2, tok4->str(), location);
+                                tok2 = simplifyTypedefInsertToken(tok2, tok4->str(), location, originalName);
                                 tok4 = tok4->next();
                             }
-                            tok2 = simplifyTypedefInsertToken(tok2, namespaceEnd->str(), location);
+                            tok2 = simplifyTypedefInsertToken(tok2, namespaceEnd->str(), location, originalName);
 
-                            tok2 = simplifyTypedefInsertToken(tok2, "*", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "*", location, originalName);
 
                             if (openParenthesis) {
                                 // Skip over name, if any
                                 if (Token::Match(tok2->next(), "%name%"))
                                     tok2 = tok2->next();
 
-                                tok2 = simplifyTypedefInsertToken(tok2, ")", location);
+                                tok2 = simplifyTypedefInsertToken(tok2, ")", location, originalName);
 
                                 Token::createMutualLinks(tok2, openParenthesis);
                             }
                         }
                     } else if (typeOf) {
-                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location);
+                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location, originalName);
                     } else if (Token::Match(tok2, "%name% [")) {
                         while (Token::Match(tok2, "%name%|] [")) {
                             tok2 = tok2->linkAt(1);
@@ -2248,7 +2317,7 @@ void Tokenizer::simplifyTypedefCpp()
                             // reference or pointer to array?
                             if (Token::Match(tok2, "&|*|&&")) {
                                 tok2 = tok2->previous();
-                                Token *tok3 = simplifyTypedefInsertToken(tok2, "(", location);
+                                Token *tok3 = simplifyTypedefInsertToken(tok2, "(", location, originalName);
 
                                 // handle missing variable name
                                 if (Token::Match(tok3, "( *|&|&& *|&|&& %name%"))
@@ -2259,6 +2328,13 @@ void Tokenizer::simplifyTypedefCpp()
                                     tok2 = tok2->tokAt(2);
                                 else
                                     tok2 = tok2->tokAt(3);
+                                while (tok2->link()) {
+                                    tok2 = tok2->link()->next();
+                                    if (Token::simpleMatch(tok2, ";")) {
+                                        tok2 = tok2->previous();
+                                        break;
+                                    }
+                                }
                                 if (!tok2)
                                     syntaxError(nullptr);
 
@@ -2279,7 +2355,7 @@ void Tokenizer::simplifyTypedefCpp()
                                         tok2 = tok2->tokAt(3);
                                 }
 
-                                tok2 = simplifyTypedefInsertToken(tok2, ")", location);
+                                tok2 = simplifyTypedefInsertToken(tok2, ")", location, originalName);
                                 Token::createMutualLinks(tok2, tok3);
                             }
 
@@ -2290,7 +2366,7 @@ void Tokenizer::simplifyTypedefCpp()
                             while (tok2->strAt(1) == "[")
                                 tok2 = tok2->linkAt(1);
 
-                            tok2 = simplifyTypedefCopyTokens(tok2, arrayStart, arrayEnd, location);
+                            tok2 = simplifyTypedefCopyTokens(tok2, arrayStart, arrayEnd, location, originalName);
                             if (!tok2->next())
                                 syntaxError(tok2);
 
@@ -2407,7 +2483,8 @@ namespace {
             while (scope && scope->parent) {
                 if (scope->name.empty())
                     break;
-                fullName = scope->name + " :: " + fullName;
+                fullName.insert(0, " :: ");
+                fullName.insert(0, scope->name);
                 scope = scope->parent;
             }
         }
@@ -2667,7 +2744,7 @@ namespace {
     {
         Token *tok1 = tok;
 
-        if (tok1 && tok1->str() != nameToken->str())
+        if (!tok1 || tok1->str() != nameToken->str())
             return false;
 
         // skip this using
@@ -2676,6 +2753,9 @@ namespace {
             return false;
         }
 
+        if (!tok->tokAt(-1))
+            return false;
+
         // skip other using with this name
         if (tok1->strAt(-1) == "using") {
             // fixme: this is wrong
@@ -2685,6 +2765,9 @@ namespace {
             return false;
         }
 
+        if (tok1->tokAt(-1)->tokType() == Token::eType || tok1->tokAt(-1)->tokType() == Token::eName)
+            return false;
+
         if (Token::Match(tok1->tokAt(-1), "class|struct|union|enum|namespace")) {
             // fixme
             return false;
@@ -2876,7 +2959,7 @@ static const Token* skipConstVolatileBackwards(const Token* tok) {
 
 bool Tokenizer::simplifyUsing()
 {
-    if (!isCPP() || mSettings.standards.cpp < Standards::CPP11)
+    if (!isCPP())
         return false;
 
     // simplify using N::x; to using x = N::x;
@@ -2917,11 +3000,10 @@ bool Tokenizer::simplifyUsing()
     };
     std::list<Using> usingList;
 
-    const bool doProgress = (mSettings.reportProgress != -1) && !list.getFiles().empty();
+    ProgressReporter progressReporter(mErrorLogger, mSettings.reportProgress, list.getSourceFilePath(), "Tokenize (using)");
 
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (doProgress)
-            mErrorLogger.reportProgress(list.getFiles()[0], "Tokenize (using)", tok->progressValue());
+        progressReporter.report(tok->progressValue());
 
         if (Settings::terminated())
             return substitute;
@@ -2969,7 +3051,6 @@ bool Tokenizer::simplifyUsing()
                 Token::Match(tok->linkAt(2), "] ] = ::| %name%")))))
             continue;
 
-        const std::string& name = tok->strAt(1);
         const Token *nameToken = tok->next();
         std::string scope = currentScope->fullName;
         Token *usingStart = tok;
@@ -2985,6 +3066,9 @@ bool Tokenizer::simplifyUsing()
         if (!usingEnd)
             continue;
 
+        for (Token *typeTok = start; typeTok != usingEnd; typeTok = typeTok->next())
+            typeTok->isSimplifiedTypedef(true);
+
         // Move struct defined in using out of using.
         // using T = struct t { }; => struct t { }; using T = struct t;
         // fixme: this doesn't handle attributes
@@ -3015,7 +3099,7 @@ bool Tokenizer::simplifyUsing()
             if (!hasName) {
                 std::string newName;
                 if (structEnd->strAt(2) == ";")
-                    newName = name;
+                    newName = nameToken->str();
                 else
                     newName = "Unnamed" + std::to_string(mUnnamedCount++);
                 TokenList::copyTokens(structEnd->next(), tok, start);
@@ -3117,8 +3201,15 @@ bool Tokenizer::simplifyUsing()
                 continue;
             }
 
-            // skip template definitions
             if (Token::Match(tok1, "template < !!>")) {
+                Token *paramsEnd = tok1->next()->findClosingBracket();
+                bool shadowed = !paramsEnd;
+                for (const Token *param = tok1->next(); !shadowed && param != paramsEnd; param = param->next())
+                    shadowed = param->str() == nameToken->str();
+                if (!shadowed) {
+                    tok1 = paramsEnd;
+                    continue;
+                }
                 Token *declEndToken = TemplateSimplifier::findTemplateDeclarationEnd(tok1);
                 if (declEndToken)
                     tok1 = declEndToken;
@@ -3162,7 +3253,7 @@ bool Tokenizer::simplifyUsing()
             if (!isTypedefInfoAdded && Token::Match(tok1, "%name% (")) {
                 isTypedefInfoAdded = true;
                 TypedefInfo usingInfo;
-                usingInfo.name = name;
+                usingInfo.name = nameToken->str();
                 usingInfo.filename = list.file(nameToken);
                 usingInfo.lineNumber = nameToken->linenr();
                 usingInfo.column = nameToken->column();
@@ -3207,6 +3298,8 @@ bool Tokenizer::simplifyUsing()
             }
 
             Token * arrayStart = nullptr;
+            Token * fpArgList = nullptr;
+            Token * fpQual = nullptr;
 
             // parse the type
             Token *type = start;
@@ -3306,6 +3399,18 @@ bool Tokenizer::simplifyUsing()
                 } while (type && type->str() == "[");
             }
 
+            // check for function pointer
+            if (type && type->str() == "(") {
+                if (Token::simpleMatch(type->link(), ") (")) {
+                    fpArgList = type->link()->next();
+                    fpQual = type;
+                    type = type->link()->linkAt(1)->next();
+                } else if (type->link()->next() == usingEnd) {
+                    fpArgList = type;
+                    type = usingEnd;
+                }
+            }
+
             // make sure we are in a good state
             if (!tok1 || !tok1->next())
                 break; // bail
@@ -3321,6 +3426,34 @@ bool Tokenizer::simplifyUsing()
                         tok1->deleteThis();
                         substitute = true;
                     }
+                } else if (fpArgList && fpQual && Token::Match(tok1->next(), "%name%")) {
+                    // function pointer
+                    const bool isFuncDecl = Token::simpleMatch(tok1->tokAt(2), "(");
+                    Token *dest = tok1->next();
+                    while (Token::Match(dest, "%name% :: %name%"))
+                        dest = dest->tokAt(2);
+                    TokenList::copyTokens(dest, fpArgList, usingEnd->previous());
+                    Token* const copyEnd = TokenList::copyTokens(tok1, start, fpQual->link()->previous());
+                    Token* leftPar = copyEnd->previous();
+                    while (leftPar->str() != "(")
+                        leftPar = leftPar->previous();
+                    Token *insertTok = isFuncDecl ? copyEnd->linkAt(2) : copyEnd->next();
+                    while (Token::Match(insertTok, "%name% :: %name%"))
+                        insertTok = insertTok->tokAt(2);
+                    Token* const rightPar = insertTok->insertToken(")");
+                    Token::createMutualLinks(leftPar, rightPar);
+                    tok1->deleteThis();
+                    substitute = true;
+                } else if (fpArgList && !fpQual && Token::Match(tok1->next(), "* const| %name%")) {
+                    // function pointer
+                    Token* const dest = tok1->tokAt(tok1->strAt(2) == "const" ? 3 : 2);
+                    Token* const copyEndArgs = TokenList::copyTokens(dest, fpArgList, usingEnd->previous());
+                    Token* const copyEndRet = TokenList::copyTokens(tok1, start, fpArgList->previous());
+                    Token* const leftPar = copyEndRet->insertToken("(");
+                    Token* const rightPar = copyEndArgs->link()->tokAt(-1)->insertToken(")");
+                    Token::createMutualLinks(leftPar, rightPar);
+                    tok1->deleteThis();
+                    substitute = true;
                 } else {
                     // add some qualification back if needed
                     std::string removed1 = std::move(removed);
@@ -3382,6 +3515,8 @@ bool Tokenizer::simplifyUsing()
                 skip = true;
                 simplifyUsingError(usingStart, usingEnd);
             }
+            if (!after)
+                syntaxError(tok1);
             tok1 = after->previous();
         }
 
@@ -3434,7 +3569,7 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration, int fileIndex)
     mConfiguration = configuration;
 
     if (mTimerResults) {
-        Timer t("Tokenizer::simplifyTokens1::simplifyTokenList1", mSettings.showtime, mTimerResults);
+        Timer t("Tokenizer::simplifyTokens1::simplifyTokenList1", mTimerResults);
         if (!simplifyTokenList1(list.getFiles().front().c_str()))
             return false;
     } else {
@@ -3442,18 +3577,16 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration, int fileIndex)
             return false;
     }
 
-    const ShowTime showTime = mTimerResults ? mSettings.showtime : ShowTime::NONE;
-
-    Timer::run("Tokenizer::simplifyTokens1::createAst", showTime, mTimerResults, [&]() {
+    Timer::run("Tokenizer::simplifyTokens1::createAst", mTimerResults, [&]() {
         list.createAst();
         list.validateAst(mSettings.debugnormal);
     });
 
-    Timer::run("Tokenizer::simplifyTokens1::createSymbolDatabase", showTime, mTimerResults, [&]() {
+    Timer::run("Tokenizer::simplifyTokens1::createSymbolDatabase", mTimerResults, [&]() {
         createSymbolDatabase();
     });
 
-    Timer::run("Tokenizer::simplifyTokens1::setValueType", showTime, mTimerResults, [&]() {
+    Timer::run("Tokenizer::simplifyTokens1::setValueType", mTimerResults, [&]() {
         mSymbolDatabase->setValueTypeInTokenList(false);
         mSymbolDatabase->setValueTypeInTokenList(true);
     });
@@ -3468,7 +3601,7 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration, int fileIndex)
     const bool doValueFlow = !disableValueflowEnv || (std::strcmp(disableValueflowEnv, "1") != 0);
 
     if (doValueFlow) {
-        Timer::run("Tokenizer::simplifyTokens1::ValueFlow", showTime, mTimerResults, [&]() {
+        Timer::run("Tokenizer::simplifyTokens1::ValueFlow", mTimerResults, [&]() {
             ValueFlow::setValues(list, *mSymbolDatabase, mErrorLogger, mSettings, mTimerResults);
         });
 
@@ -3499,7 +3632,7 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration, int fileIndex)
 
 //---------------------------------------------------------------------------
 
-void Tokenizer::findComplicatedSyntaxErrorsInTemplates()
+void Tokenizer::findComplicatedSyntaxErrorsInTemplates() const
 {
     validate();
     mTemplateSimplifier->checkComplicatedSyntaxErrorsInTemplates();
@@ -3645,7 +3778,11 @@ void Tokenizer::concatenateNegativeNumberAndAnyPositive()
         if (tok->findOpeningBracket())
             continue;
 
-        while (tok->str() != ">" && tok->next() && tok->strAt(1) == "+" && (!Token::Match(tok->tokAt(2), "%name% (|;") || Token::Match(tok, "%op%")))
+        if (!tok->tokAt(2) || (tok->tokAt(2)->isOp() && !Token::Match(tok->tokAt(2), "[+-*]")))
+            syntaxError(tok);
+
+        while ((tok->isArithmeticalOp() || tok->isComparisonOp()) && tok->str() != ">" && tok->next() && tok->strAt(1) == "+" &&
+               (!Token::Match(tok->tokAt(2), "%name% (|;") || Token::Match(tok, "%op%")))
             tok->deleteNext();
 
         if (Token::Match(tok->next(), "+|- %num%")) {
@@ -3738,7 +3875,7 @@ void Tokenizer::simplifyParenthesizedLibraryFunctions()
         if (!Token::simpleMatch(tok, ") ("))
             continue;
         Token *rpar = tok, *lpar = tok->link();
-        if (!lpar || Token::Match(lpar->previous(), "%name%"))
+        if (!lpar || (Token::Match(lpar->previous(), "%name%") && !Token::Match(lpar->previous(), "return|delete|throw")))
             continue;
         const Token *ftok = rpar->previous();
         if (mSettings.library.isNotLibraryFunction(ftok))
@@ -3778,7 +3915,8 @@ void Tokenizer::simplifyRedundantConsecutiveBraces()
     for (Token *tok = list.front(); tok;) {
         if (Token::simpleMatch(tok, "= {")) {
             tok = tok->linkAt(1);
-        } else if (Token::simpleMatch(tok, "{ {") && Token::simpleMatch(tok->linkAt(1), "} }")) {
+        } else if (Token::simpleMatch(tok, "{ {") && Token::simpleMatch(tok->linkAt(1), "} }") &&
+                   !Token::Match(tok->previous(), "%name%")) {
             //remove internal parentheses
             tok->linkAt(1)->deleteThis();
             tok->deleteNext();
@@ -4181,10 +4319,13 @@ void Tokenizer::simplifyTemplates()
 namespace {
     /** Class used in Tokenizer::setVarIdPass1 */
     class VariableMap {
+    public:
+        struct VarInfo { nonneg int id{}; bool assigned{}; };
+        using MapType = std::unordered_map<std::string, VarInfo>;
     private:
-        std::unordered_map<std::string, nonneg int> mVariableId;
-        std::unordered_map<std::string, nonneg int> mVariableId_global;
-        std::stack<std::vector<std::pair<std::string, nonneg int>>> mScopeInfo;
+        MapType mVariableId;
+        MapType mVariableId_global;
+        std::stack<std::vector<MapType::value_type>> mScopeInfo;
         mutable nonneg int mVarId{};
     public:
         VariableMap() = default;
@@ -4195,7 +4336,10 @@ namespace {
             return mVariableId.find(varname) != mVariableId.end();
         }
 
-        const std::unordered_map<std::string, nonneg int>& map(bool global) const {
+        const MapType& map(bool global) const {
+            return global ? mVariableId_global : mVariableId;
+        }
+        MapType& map(bool global) {
             return global ? mVariableId_global : mVariableId;
         }
         nonneg int& getVarId() {
@@ -4215,8 +4359,8 @@ bool VariableMap::leaveScope()
     if (mScopeInfo.empty())
         return false;
 
-    for (const std::pair<std::string, nonneg int>& outerVariable : mScopeInfo.top()) {
-        if (outerVariable.second != 0)
+    for (const MapType::value_type& outerVariable : mScopeInfo.top()) {
+        if (outerVariable.second.id != 0)
             mVariableId[outerVariable.first] = outerVariable.second;
         else
             mVariableId.erase(outerVariable.first);
@@ -4228,21 +4372,22 @@ bool VariableMap::leaveScope()
 void VariableMap::addVariable(const std::string& varname, bool globalNamespace)
 {
     if (mScopeInfo.empty()) {
-        mVariableId[varname] = ++mVarId;
+        mVariableId[varname].id = ++mVarId;
         if (globalNamespace)
             mVariableId_global[varname] = mVariableId[varname];
         return;
     }
     const auto it = mVariableId.find(varname);
     if (it == mVariableId.end()) {
-        mScopeInfo.top().emplace_back(varname, 0);
-        mVariableId[varname] = ++mVarId;
+        mScopeInfo.top().emplace_back(varname, VarInfo{});
+        mVariableId[varname].id = ++mVarId;
         if (globalNamespace)
             mVariableId_global[varname] = mVariableId[varname];
         return;
     }
     mScopeInfo.top().emplace_back(varname, it->second);
-    it->second = ++mVarId;
+    it->second.id = ++mVarId;
+    it->second.assigned = false;
 }
 
 /**
@@ -4252,7 +4397,7 @@ static bool setVarIdParseDeclaration(Token*& tok, const VariableMap& variableMap
 {
     const Token* const tok1 = tok;
     Token* tok2 = tok;
-    if (!tok2->isName())
+    if (!tok2->isName() || (tok2->tokType() != Token::eType && tok2->tokType() != Token::eName && tok2->tokType() != Token::eKeyword))
         return false;
 
     nonneg int typeCount = 0;
@@ -4419,13 +4564,17 @@ static void setVarIdStructMembers(Token *&tok1,
                     tok->varId(it->second);
                 }
             }
+            if (Token::Match(tok, "%name% = { . %name% =|{")) {
+                setVarIdStructMembers(tok, structMembers, varId);
+                tok = tok->linkAt(2);
+            }
             tok = tok->next();
         }
 
         return;
     }
 
-    while (Token::Match(tok->next(), ")| . %name% !!(")) {
+    while (Token::Match(tok->next(), ")| . %name%")) {
         // Don't set varid for trailing return type
         if (tok->strAt(1) == ")" && Token::Match(tok->linkAt(1)->tokAt(-1), "%name%|]") && !tok->linkAt(1)->tokAt(-1)->isKeyword() &&
             TokenList::isFunctionHead(tok->linkAt(1), "{;")) {
@@ -4447,6 +4596,8 @@ static void setVarIdStructMembers(Token *&tok1,
         std::map<std::string, nonneg int>& members = structMembers[struct_varid];
         const auto it = utils::as_const(members).find(tok->str());
         if (it == members.cend()) {
+            if (Token::Match(tok, "%name% ("))
+                break;
             members[tok->str()] = ++varId;
             tok->varId(varId);
         } else {
@@ -4459,14 +4610,14 @@ static void setVarIdStructMembers(Token *&tok1,
 
 static void addTemplateVarIdUsage(const std::string &tokstr,
                                   const std::map<std::string, std::set<std::string>>& templateVarUsage,
-                                  const std::unordered_map<std::string, nonneg int>& variableMap,
+                                  const VariableMap::MapType& variableMap,
                                   std::set<nonneg int>& templateVarIdUsage) {
     const auto v = templateVarUsage.find(tokstr);
     if (v != templateVarUsage.end()) {
         for (const std::string& varname: v->second) {
             const auto it = variableMap.find(varname);
             if (it != variableMap.end())
-                templateVarIdUsage.insert(it->second);
+                templateVarIdUsage.insert(it->second.id);
         }
     }
 }
@@ -4523,7 +4674,7 @@ static bool setVarIdClassDeclaration(Token* const startToken,
         } else if (initList && indentlevel == 0 && Token::Match(tok->previous(), "[,:] %name% [({]")) {
             const auto it = variableMap.map(false).find(tok->str());
             if (it != variableMap.map(false).end()) {
-                tok->varId(it->second);
+                tok->varId(it->second.id);
             }
         } else if (tok->isName() && tok->varId() <= scopeStartVarId) {
             if (indentlevel > 0 || initList) {
@@ -4541,7 +4692,7 @@ static bool setVarIdClassDeclaration(Token* const startToken,
                 if (!inEnum) {
                     const auto it = variableMap.map(false).find(tok->str());
                     if (it != variableMap.map(false).end()) {
-                        tok->varId(it->second);
+                        tok->varId(it->second.id);
                         setVarIdStructMembers(tok, structMembers, variableMap.getVarId());
                     } else if (tok->str().back() == '>') {
                         addTemplateVarIdUsage(tok->str(), templateVarUsage, variableMap.map(false), templateVarIdUsage);
@@ -4579,7 +4730,7 @@ void Tokenizer::setVarIdClassFunction(const std::string &classname,
         if (Token::Match(tok2, "%name% ::"))
             continue;
 
-        const auto it = utils::as_const(varlist).find(tok2->str());
+        const auto it = varlist.find(tok2->str());
         if (it != varlist.end()) {
             tok2->varId(it->second);
             setVarIdStructMembers(tok2, structMembers, varId_);
@@ -4612,6 +4763,26 @@ static const std::unordered_set<std::string> notstart_cpp = { NOTSTART_C,
                                                               "delete", "friend", "new", "throw", "using", "virtual", "explicit", "const_cast", "dynamic_cast", "reinterpret_cast", "static_cast", "template"
 };
 
+// Returns the end of the lambda that starts at tok in a constructor initializer list, or nullptr
+static const Token* findInitListLambdaEnd(const Token* tok)
+{
+    if (!Token::simpleMatch(tok, "[") || Token::Match(tok->previous(), "%name%|)|]|>"))
+        return nullptr; // array subscript or array size of a new expression
+    // array size of a new expression with pointer or reference type: new T*[n]{...}, new (p) T*[n]{...}
+    for (const Token* prev = tok->previous(); Token::Match(prev, "*|&|&&|::|%name%|>|)"); prev = prev->previous()) {
+        if (prev->str() == "new")
+            return nullptr;
+        if (prev->str() == ")")
+            prev = prev->link();
+        else if (prev->str() == ">") {
+            prev = prev->findOpeningBracket();
+            if (!prev)
+                break;
+        }
+    }
+    return findLambdaEndScope(tok);
+}
+
 void Tokenizer::setVarIdPass1()
 {
     const bool cpp = isCPP();
@@ -4627,6 +4798,7 @@ void Tokenizer::setVarIdPass1()
     std::stack<const Token *> functionDeclEndStack;
     const Token *functionDeclEndToken = nullptr;
     bool initlist = false;
+    std::stack<const Token *> initlistLambdaEnds; // ends of lambdas in constructor initializer lists
     bool inlineFunction = false;
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (tok->isOp())
@@ -4662,6 +4834,13 @@ void Tokenizer::setVarIdPass1()
                     variableMap.enterScope();
                 }
             }
+        } else if (const Token* lambdaEnd = initlist ? findInitListLambdaEnd(tok) : nullptr) {
+            // lambda in initializer list: parse it like a lambda in executable code, the
+            // extra scope holds its parameters and is left at the end of the lambda
+            initlistLambdaEnds.push(lambdaEnd);
+            scopeStack.emplace(/*isExecutable=*/ true, /*isStructInit=*/ false, /*isEnum=*/ false, variableMap.getVarId());
+            variableMap.enterScope();
+            initlist = false;
         } else if (!initlist && tok->str()=="(") {
             const Token * newFunctionDeclEnd = nullptr;
             if (!scopeStack.top().isExecutable)
@@ -4691,7 +4870,7 @@ void Tokenizer::setVarIdPass1()
 
             // parse anonymous namespaces as part of the current scope
             if (!Token::Match(startToken->previous(), "union|struct|enum|namespace {") &&
-                !(initlist && Token::Match(startToken->previous(), "%name%|>|>>|(") && Token::Match(startToken->link(), "} ,|{|)|..."))) {
+                !(initlist && Token::Match(startToken->previous(), "%name%|>|>>|(|,|{") && Token::Match(startToken->link(), "} ,|{|)|}|..."))) {
 
                 if (tok->str() == "{") {
                     bool isExecutable;
@@ -4752,6 +4931,15 @@ void Tokenizer::setVarIdPass1()
                     }
                 }
             }
+
+            if (!initlistLambdaEnds.empty() && initlistLambdaEnds.top() == tok) {
+                // end of lambda in initializer list
+                initlistLambdaEnds.pop();
+                if (scopeStack.size() > 1)
+                    scopeStack.pop();
+                variableMap.leaveScope();
+                initlist = true;
+            }
         }
 
         if ((!scopeStack.top().isStructInit &&
@@ -4822,6 +5010,8 @@ void Tokenizer::setVarIdPass1()
                                               mTemplateSimplifier->getUsedVariables(),
                                               variableMap.map(true),
                                               mTemplateVarIdUsage);
+                        if (!tok3->next())
+                            syntaxError(tok3);
                     }
                 }
 
@@ -4835,7 +5025,7 @@ void Tokenizer::setVarIdPass1()
                 if (declTypeTok) {
                     for (Token *declTok = declTypeTok->linkAt(1); declTok != declTypeTok; declTok = declTok->previous()) {
                         if (declTok->isName() && !Token::Match(declTok->previous(), "::|.") && variableMap.hasVariable(declTok->str()))
-                            declTok->varId(variableMap.map(false).find(declTok->str())->second);
+                            declTok->varId(variableMap.map(false).find(declTok->str())->second.id);
                     }
                 }
 
@@ -4885,7 +5075,7 @@ void Tokenizer::setVarIdPass1()
                         decl = false;
                 } else if (cpp && Token::Match(prev2, "%type% {") && Token::simpleMatch(tok2->link(), "} ;")) { // C++11 initialization style
                     if (tok2->link() != tok2->next() && // add value-initialized variable T x{};
-                        (Token::Match(prev2, "do|try|else") || Token::Match(prev2->tokAt(-2), "struct|class|:")))
+                        (Token::Match(prev2, "do|try|else") || Token::simpleMatch(prev2->tokAt(-2), ":")))
                         continue;
                 } else
                     decl = false;
@@ -4893,7 +5083,7 @@ void Tokenizer::setVarIdPass1()
                 if (decl) {
                     if (isC() && Token::Match(prev2->previous(), "&|&&"))
                         syntaxErrorC(prev2, prev2->strAt(-2) + prev2->strAt(-1) + " " + prev2->str());
-                    variableMap.addVariable(prev2->str(), scopeStack.size() <= 1);
+                    variableMap.addVariable(prev2->str(), scopeStack.size() <= 1 && !functionDeclEndToken);
 
                     if (Token::simpleMatch(tok->previous(), "for (") && Token::Match(prev2, "%name% [=[({,]")) {
                         for (const Token *tok3 = prev2->next(); tok3 && tok3->str() != ";"; tok3 = tok3->next()) {
@@ -4915,7 +5105,7 @@ void Tokenizer::setVarIdPass1()
                                                    Token::Match(tok->tokAt(-1), ":: %name%"))) {
                                 const auto it = variableMap.map(false).find(tok->str());
                                 if (it != variableMap.map(false).end())
-                                    tok->varId(it->second);
+                                    tok->varId(it->second.id);
                             }
                             tok = tok->next();
                         }
@@ -4978,8 +5168,8 @@ void Tokenizer::setVarIdPass1()
                 // there are tokens which can't appear at the begin of a function declaration such as "return"
                 const bool isNotstartKeyword = start->next() && notstart.find(start->strAt(1)) != notstart.end();
 
-                // now check if it is a function declaration
-                if (Token::Match(start, "[;{}] %type% %name%|*") && par && Token::simpleMatch(end, ") ;") && !isNotstartKeyword) {
+                // now check if it is a function (pointer) declaration
+                if ((Token::simpleMatch(start, ") (") || Token::Match(start, "[;{}] %type% %name%|*")) && par && Token::Match(end, ") [;=]") && !isNotstartKeyword) {
                     // function declaration => don't set varid
                     tok = end;
                     continue;
@@ -4990,8 +5180,11 @@ void Tokenizer::setVarIdPass1()
                 !Token::simpleMatch(tok->next(), ": ;") && !(tok->tokAt(-1) && Token::Match(tok->tokAt(-2), "{|, ."))) {
                 const auto it = variableMap.map(globalNamespace).find(tok->str());
                 if (it != variableMap.map(globalNamespace).end()) {
-                    tok->varId(it->second);
-                    setVarIdStructMembers(tok, structMembers, variableMap.getVarId());
+                    if (!it->second.assigned || !Token::Match(tok->previous(), "%type% %name% (") || tok->previous()->isKeyword()) {
+                        it->second.assigned = true;
+                        tok->varId(it->second.id);
+                        setVarIdStructMembers(tok, structMembers, variableMap.getVarId());
+                    }
                 }
             }
         } else if (Token::Match(tok, "::|. %name%") && Token::Match(tok->previous(), ")|]|>|%name%")) {
@@ -5027,14 +5220,30 @@ static std::string getScopeName(const std::list<ScopeInfo2> &scopeInfo)
     return ret;
 }
 
+// If tok is the name in a qualification "name ::" or "name < ... > ::", return the token after the "::"
+static Token * skipQualification(Token *tok)
+{
+    if (!Token::Match(tok, "%name% ::|<"))
+        return nullptr;
+    if (tok->strAt(1) == "<") {
+        tok = tok->next()->findClosingBracket();
+        if (!Token::simpleMatch(tok, "> ::"))
+            return nullptr;
+    }
+    return tok->tokAt(2);
+}
+
+// indexMembersByScopeName() relies on how this matches the scope names: keep the two in sync
 static Token * matchMemberName(const std::list<std::string> &scope, const Token *nsToken, Token *memberToken, const std::list<ScopeInfo2> &scopeInfo)
 {
     auto scopeIt = scopeInfo.cbegin();
 
     // Current scope..
     for (auto it = scope.cbegin(); it != scope.cend(); ++it) {
-        if (scopeIt == scopeInfo.cend() || scopeIt->name != *it)
-            return nullptr;
+        if (scopeIt == scopeInfo.cend() || scopeIt->name != *it) {
+            scopeIt = scopeInfo.cbegin();
+            break;
+        }
         ++scopeIt;
     }
 
@@ -5057,16 +5266,11 @@ static Token * matchMemberName(const std::list<std::string> &scope, const Token
 
     // Parse member tokens..
     while (scopeIt != scopeInfo.end()) {
-        if (!Token::Match(memberToken, "%name% ::|<"))
+        if (!Token::Match(memberToken, "%name%") || memberToken->str() != scopeIt->name)
             return nullptr;
-        if (memberToken->str() != scopeIt->name)
+        memberToken = skipQualification(memberToken);
+        if (!memberToken)
             return nullptr;
-        if (memberToken->strAt(1) == "<") {
-            memberToken = memberToken->next()->findClosingBracket();
-            if (!Token::simpleMatch(memberToken, "> ::"))
-                return nullptr;
-        }
-        memberToken = memberToken->tokAt(2);
         ++scopeIt;
     }
 
@@ -5093,11 +5297,52 @@ static Token * matchMemberName(const Member &member, const std::list<ScopeInfo2>
     return nullptr;
 }
 
+using MembersByScopeName = std::unordered_map<std::string, std::vector<const Member *>>;
+
+// matchMemberName() can only match when the last scope name is matched by a name in the
+// member's scope, in one of its "using namespace" or in its qualification. Index the members
+// by these names, keeping their order, so that each scope only tries its candidates.
+static MembersByScopeName indexMembersByScopeName(const std::list<Member> &members)
+{
+    MembersByScopeName index;
+    for (const Member &member : members) {
+        // members are visited in order, so a member that is already a candidate is the last one
+        const auto addCandidate = [&](const std::string &name) {
+            std::vector<const Member *> &candidates = index[name];
+            if (candidates.empty() || candidates.back() != &member)
+                candidates.push_back(&member);
+        };
+        for (const std::string &name : member.scope)
+            addCandidate(name);
+        for (const Token *ns : member.usingnamespaces) {
+            for (; Token::Match(ns, "%name% ::"); ns = ns->tokAt(2))
+                addCandidate(ns->str());
+            if (Token::Match(ns, "%name%"))
+                addCandidate(ns->str());
+        }
+        Token *tok = member.tok;
+        while (Token *next = skipQualification(tok)) {
+            addCandidate(tok->str());
+            tok = next;
+        }
+    }
+    return index;
+}
+
+static const std::vector<const Member *> &membersForScope(const MembersByScopeName &index, const std::list<ScopeInfo2> &scopeInfo)
+{
+    static const std::vector<const Member *> none;
+    if (scopeInfo.empty())
+        return none;
+    const auto it = index.find(scopeInfo.back().name);
+    return it == index.end() ? none : it->second;
+}
+
 static Token * matchMemberVarName(const Member &var, const std::list<ScopeInfo2> &scopeInfo)
 {
     Token *tok = matchMemberName(var, scopeInfo);
     if (Token::Match(tok, "%name%")) {
-        if (!tok->next() || tok->strAt(1) != "(" || (tok->tokAt(2) && tok->tokAt(2)->isLiteral()))
+        if (!tok->next() || tok->strAt(1) != "(" || (tok->tokAt(2) && (tok->tokAt(2)->isLiteral() || tok->tokAt(2)->isOp())))
             return tok;
     }
     return nullptr;
@@ -5138,7 +5383,16 @@ void Tokenizer::setVarIdPass2()
         std::map<const Token *, std::string> endOfScope;
         std::list<std::string> scope;
         std::list<const Token *> usingnamespaces;
+        const Token *enumEnd = nullptr;
         for (Token *tok = list.front(); tok; tok = tok->next()) {
+            if (isEnumStart(tok)) {
+                enumEnd = tok->link();
+                continue;
+            }
+            if (tok == enumEnd) {
+                enumEnd = nullptr;
+                continue;
+            }
             if (!tok->previous() || Token::Match(tok->previous(), "[;{}]")) {
                 if (Token::Match(tok, "using namespace %name% ::|;")) {
                     Token *endtok = tok->tokAt(2);
@@ -5168,7 +5422,8 @@ void Tokenizer::setVarIdPass2()
                 tok = tok->next()->findClosingBracket()->next();
             else if (usingnamespaces.empty() || tok->varId() || !tok->isName() || tok->isStandardType() || tok->tokType() == Token::eKeyword || tok->tokType() == Token::eBoolean ||
                      Token::Match(tok->previous(), ".|namespace|class|struct|&|&&|*|> %name%") || Token::Match(tok->previous(), "%type%| %name% ( %type%|)") || Token::Match(tok, "public:|private:|protected:") ||
-                     (!tok->next() && Token::Match(tok->previous(), "}|; %name%")))
+                     (!tok->next() && Token::Match(tok->previous(), "}|; %name%")) ||
+                     (enumEnd && Token::Match(tok->previous(), "{|, %name% =|,|}")))
                 continue;
 
             if (tok->strAt(-1) == "::" && tok->tokAt(-2) && tok->tokAt(-2)->isName())
@@ -5187,13 +5442,16 @@ void Tokenizer::setVarIdPass2()
             }
             if (!tok->next())
                 syntaxError(tok);
-            if (Token::Match(tok, "%name% (") && !(tok->tokAt(2) && tok->tokAt(2)->isLiteral()))
+            if (Token::Match(tok, "%name% (") && !(tok->tokAt(2) && (tok->tokAt(2)->isLiteral() || tok->tokAt(2)->isOp())))
                 allMemberFunctions.emplace_back(scope, usingnamespaces, tok1);
             else
                 allMemberVars.emplace_back(scope, usingnamespaces, tok1);
         }
     }
 
+    const MembersByScopeName memberFunctionsByScopeName = indexMembersByScopeName(allMemberFunctions);
+    const MembersByScopeName memberVarsByScopeName = indexMembersByScopeName(allMemberVars);
+
     std::list<ScopeInfo2> scopeInfo;
 
     // class members..
@@ -5310,8 +5568,8 @@ void Tokenizer::setVarIdPass2()
             continue;
 
         // Member variables
-        for (const Member &var : allMemberVars) {
-            Token *tok2 = matchMemberVarName(var, scopeInfo);
+        for (const Member *var : membersForScope(memberVarsByScopeName, scopeInfo)) {
+            Token *tok2 = matchMemberVarName(*var, scopeInfo);
             if (!tok2)
                 continue;
             if (tok2->varId() == 0)
@@ -5322,8 +5580,8 @@ void Tokenizer::setVarIdPass2()
             continue;
 
         // Set variable ids in member functions for this class..
-        for (const Member &func : allMemberFunctions) {
-            Token *tok2 = matchMemberFunctionName(func, scopeInfo);
+        for (const Member *func : membersForScope(memberFunctionsByScopeName, scopeInfo)) {
+            Token *tok2 = matchMemberFunctionName(*func, scopeInfo);
             if (!tok2)
                 continue;
 
@@ -5437,7 +5695,7 @@ void Tokenizer::createLinks2()
     bool isStruct = false;
 
     std::stack<Token*> type;
-    std::stack<Token*> templateTokens;
+    std::stack<const Token*> templateTokens;
     for (Token *token = list.front(); token; token = token->next()) {
         if (Token::Match(token, "%name%|> %name% [:<]"))
             isStruct = true;
@@ -5491,7 +5749,9 @@ void Tokenizer::createLinks2()
 
             while (!type.empty() && type.top()->str() == "<") {
                 const Token* end = type.top()->findClosingBracket();
-                if (Token::Match(end, "> %comp%|;|.|=|{|(|::"))
+                if (Token::Match(end, "> %comp%|;|.|=|{|}|(|)|::"))
+                    break;
+                if (Token::Match(end, "> %name% (|::"))
                     break;
                 // Variable declaration
                 if (Token::Match(end, "> %var% ;") && (type.top()->tokAt(-2) == nullptr || Token::Match(type.top()->tokAt(-2), ";|}|{")))
@@ -5593,7 +5853,22 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
 
     // if MACRO
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (Token::Match(tok, "if|for|while %name% (")) {
+        if (Token::simpleMatch(tok, "if consteval {")) {
+            // 'if consteval { ... }' -> 'if ( __cppcheck_consteval__ ) { ... }'
+            Token *parTok = tok->next();
+            parTok->str("(");
+            Token *evalTok = parTok->insertToken("__cppcheck_consteval__");
+            evalTok->originalName("consteval");
+            evalTok->insertToken(")");
+        } else if (Token::Match(tok, "if !|not consteval {")) {
+            // 'if !consteval { ... }' / 'if not consteval { ... }' -> 'if ( ! __cppcheck_consteval__ ) { ... }'
+            Token *notTok = tok->next();
+            notTok->insertTokenBefore("(");
+            Token *evalTok = notTok->next();
+            evalTok->str("__cppcheck_consteval__");
+            evalTok->originalName("consteval");
+            evalTok->insertToken(")");
+        } else if (Token::Match(tok, "if|for|while %name% (")) {
             if (Token::simpleMatch(tok, "for each")) {
                 // 'for each (x in y )' -> 'for (x : y)'
                 if (Token* in = Token::findsimplematch(tok->tokAt(2), "in", tok->linkAt(2)))
@@ -5663,25 +5938,11 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
 
     validate();
 
-    const ShowTime showTime = mTimerResults ? mSettings.showtime : ShowTime::NONE;
-
     // Bail out if code is garbage
-    Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::findGarbageCode", showTime, mTimerResults, [&]() {
+    Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::findGarbageCode", mTimerResults, [&]() {
         findGarbageCode();
     });
 
-    // if (x) MACRO() ..
-    for (const Token *tok = list.front(); tok; tok = tok->next()) {
-        if (Token::simpleMatch(tok, "if (")) {
-            tok = tok->linkAt(1);
-            if (Token::Match(tok, ") %name% (") &&
-                tok->next()->isUpperCaseName() &&
-                Token::Match(tok->linkAt(2), ") {|else")) {
-                syntaxError(tok->next());
-            }
-        }
-    }
-
     if (Settings::terminated())
         return false;
 
@@ -5707,17 +5968,11 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
     if (isCPP())
         simplifyExternC();
 
+    validate();
+
     // simplify compound statements: "[;{}] ( { code; } ) ;"->"[;{}] code;"
     simplifyCompoundStatements();
 
-    // check for simple syntax errors..
-    for (const Token *tok = list.front(); tok; tok = tok->next()) {
-        if (Token::simpleMatch(tok, "> struct {") &&
-            Token::simpleMatch(tok->linkAt(2), "} ;")) {
-            syntaxError(tok);
-        }
-    }
-
     if (!simplifyAddBraces())
         return false;
 
@@ -5821,7 +6076,7 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
     simplifyTypedefLHS();
 
     // typedef..
-    Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::simplifyTypedef", showTime, mTimerResults, [&]() {
+    Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::simplifyTypedef", mTimerResults, [&]() {
         simplifyTypedef();
     });
 
@@ -5915,7 +6170,7 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
         simplifyTypeIntrinsics();
 
         // Handle templates..
-        Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::simplifyTemplates", showTime, mTimerResults, [&]() {
+        Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::simplifyTemplates", mTimerResults, [&]() {
             simplifyTemplates();
         });
 
@@ -5942,13 +6197,16 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
 
     validate(); // #6772 "segmentation fault (invalid code) in Tokenizer::setVarId"
 
-    Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::setVarId", showTime, mTimerResults, [&](){
+    Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::setVarId", mTimerResults, [&](){
         setVarId();
     });
 
     // Link < with >
     createLinks2();
 
+    // Handle std::aligned_storage<...>
+    simplifyAlignedStorage();
+
     // Mark C++ casts
     markCppCasts();
 
@@ -6134,6 +6392,8 @@ void Tokenizer::dump(std::ostream &out) const
         }
         if (tok->isRemovedVoidParameter())
             outs += " isRemovedVoidParameter=\"true\"";
+        if (tok->isInsertedBrace())
+            outs += " isInsertedBrace=\"true\"";
         if (tok->isSplittedVarDeclComma())
             outs += " isSplittedVarDeclComma=\"true\"";
         if (tok->isSplittedVarDeclEq())
@@ -6152,6 +6412,8 @@ void Tokenizer::dump(std::ostream &out) const
             outs += " isAttributeMaybeUnused=\"true\"";
         if (tok->isAttributeUnused())
             outs += " isAttributeUnused=\"true\"";
+        if (tok->isAttributeUsed())
+            outs += " isAttributeUsed=\"true\"";
         if (tok->isAttributeFallthrough())
             outs += " isAttributeFallthrough=\"true\"";
         if (tok->isInitBracket())
@@ -6309,6 +6571,12 @@ std::string Tokenizer::dumpTypedefInfo() const
         outs += typedefInfo.name;
         outs += "\"";
 
+        if (!typedefInfo.originalName.empty()) {
+            outs += " originalName=\"";
+            outs += typedefInfo.originalName;
+            outs += "\"";
+        }
+
         outs += " file=\"";
         outs += ErrorLogger::toxml(typedefInfo.filename);
         outs += "\"";
@@ -6320,7 +6588,15 @@ std::string Tokenizer::dumpTypedefInfo() const
         outs += " column=\"";
         outs += std::to_string(typedefInfo.column);
         outs += "\"";
+        if (typedefInfo.tagLine > -1 && typedefInfo.tagColumn > -1) {
+            outs += " tagline=\"";
+            outs += std::to_string(typedefInfo.tagLine);
+            outs += "\"";
 
+            outs += " tagcolumn=\"";
+            outs += std::to_string(typedefInfo.tagColumn);
+            outs += "\"";
+        }
         outs += " used=\"";
         outs += std::to_string(typedefInfo.used?1:0);
         outs += "\"";
@@ -6793,7 +7069,7 @@ Token *Tokenizer::simplifyAddBracesToCommand(Token *tok)
             // before the "while"
             if (tokEnd) {
                 tokEnd=tokEnd->next();
-                if (!tokEnd || tokEnd->str()!="while") // no while
+                if (!Token::simpleMatch(tokEnd, "while (") || !Token::simpleMatch(tokEnd->linkAt(1), ") ;")) // no while
                     syntaxError(tok);
             }
         }
@@ -6905,10 +7181,13 @@ Token *Tokenizer::simplifyAddBracesPair(Token *tok, bool commandWithCondition)
 
         tokAfterCondition->previous()->insertToken("{");
         Token * tokOpenBrace=tokAfterCondition->previous();
+        tokOpenBrace->column(tokAfterCondition->column());
+        tokOpenBrace->isInsertedBrace(true);
 
         tokEnd->insertToken("}");
         Token * tokCloseBrace=tokEnd->next();
         tokCloseBrace->column(tokEnd->column());
+        tokCloseBrace->isInsertedBrace(true);
 
         Token::createMutualLinks(tokOpenBrace,tokCloseBrace);
         tokBracesEnd=tokCloseBrace;
@@ -6925,12 +7204,11 @@ void Tokenizer::simplifyFunctionParameters()
         }
 
         // Find the function e.g. foo( x ) or foo( x, y )
-        else if (Token::Match(tok, "%name% ( %name% [,)]") &&
-                 !(tok->strAt(-1) == ":" || tok->strAt(-1) == "," || tok->strAt(-1) == "::")) {
+        else if (Token::Match(tok, "%name% ( %name% [,)]") && !Token::Match(tok->tokAt(-1), ":|,|::|=")) {
             // We have found old style function, now we need to change it
 
             // First step: Get list of argument names in parentheses
-            std::map<std::string, Token *> argumentNames;
+            std::map<std::string, const Token *> argumentNames;
             bool bailOut = false;
             const Token * tokparam = nullptr;
 
@@ -7049,7 +7327,7 @@ void Tokenizer::simplifyFunctionParameters()
             if (argumentNames.size() != argumentNames2.size()) {
                 //move back 'tok1' to the last ';'
                 tok1 = tok1->previous();
-                for (const std::pair<const std::string, Token *>& argumentName : argumentNames) {
+                for (const std::pair<const std::string, const Token *>& argumentName : argumentNames) {
                     if (argumentNames2.find(argumentName.first) == argumentNames2.end()) {
                         //add the missing parameter argument declaration
                         tok1->insertToken(";");
@@ -7237,6 +7515,19 @@ void Tokenizer::simplifyVarDecl(const bool only_k_r_fpar)
     simplifyVarDecl(list.front(), nullptr, only_k_r_fpar);
 }
 
+static Token* isTrailingReturnType(Token* tok)
+{
+    while (Token::Match(tok, "%name%|::|>")) {
+        if (Token* open = tok->findOpeningBracket())
+            tok = open->tokAt(-1);
+        else
+            tok = tok->tokAt(-1);
+    }
+    if (tok && Token::simpleMatch(tok->tokAt(-1), ") ."))
+        return tok->tokAt(-1);
+    return nullptr;
+}
+
 // cppcheck-suppress functionConst - has side effects
 void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, const bool only_k_r_fpar)
 {
@@ -7264,14 +7555,16 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co
                 if (!tok->linkAt(1))
                     syntaxError(tokBegin);
                 // Check for lambdas before skipping
-                if (Token::Match(tok->tokAt(-2), ") . %name%")) { // trailing return type
+                if (Token* trailingStart = isTrailingReturnType(tok)) {
                     // TODO: support lambda without parameter clause?
-                    Token* lambdaStart = tok->linkAt(-2)->previous();
+                    Token* lambdaStart = trailingStart->link()->tokAt(-1);
                     if (Token::simpleMatch(lambdaStart, "]"))
                         lambdaStart = lambdaStart->link();
                     Token* lambdaEnd = findLambdaEndScope(lambdaStart);
                     if (lambdaEnd)
                         simplifyVarDecl(lambdaEnd->link()->next(), lambdaEnd, only_k_r_fpar);
+                    else
+                        simplifyVarDecl(tok->tokAt(2), tok->linkAt(1), only_k_r_fpar);
                 } else {
                     for (Token* tok2 = tok->next(); tok2 != tok->linkAt(1); tok2 = tok2->next()) {
                         Token* lambdaEnd = findLambdaEndScope(tok2);
@@ -7758,12 +8051,12 @@ bool Tokenizer::simplifyCAlternativeTokens()
         if (!tok->isName())
             continue;
 
-        const auto cOpIt = utils::as_const(cAlternativeTokens).find(tok->str());
+        const auto cOpIt = cAlternativeTokens.find(tok->str());
         if (cOpIt != cAlternativeTokens.end()) {
             alt.push_back(tok);
 
             // Is this a variable declaration..
-            if (isC() && Token::Match(tok->previous(), "%type%|* %name% [;,=]"))
+            if (isC() && Token::Match(tok->previous(), "%type%|* %name% [;,=)]"))
                 return false;
 
             if (!Token::Match(tok->previous(), "%name%|%num%|%char%|%str%|)|]|> %name% %name%|%num%|%char%|%op%|%str%|("))
@@ -7781,6 +8074,10 @@ bool Tokenizer::simplifyCAlternativeTokens()
         } else if (Token::Match(tok, "not|compl")) {
             alt.push_back(tok);
 
+            // Is this a variable/parameter declaration
+            if (isC() && Token::Match(tok->previous(), "%type%|* %name% [;,=)]"))
+                return false;
+
             if ((Token::Match(tok->previous(), "%assign%") || Token::Match(tok->next(), "%num%")) && !Token::Match(tok->next(), ".|->")) {
                 replaceAll = true;
                 continue;
@@ -7800,7 +8097,7 @@ bool Tokenizer::simplifyCAlternativeTokens()
         return false;
 
     for (Token *tok: alt) {
-        const auto cOpIt = utils::as_const(cAlternativeTokens).find(tok->str());
+        const auto cOpIt = cAlternativeTokens.find(tok->str());
         if (cOpIt != cAlternativeTokens.end())
             tok->str(cOpIt->second);
         else if (tok->str() == "not")
@@ -7921,8 +8218,8 @@ void Tokenizer::elseif()
 
             if (Token::Match(tok2, "}|;")) {
                 if (tok2->next() && tok2->strAt(1) != "else") {
-                    tok->insertToken("{");
-                    tok2->insertToken("}");
+                    tok->insertToken("{")->isInsertedBrace(true);
+                    tok2->insertToken("}")->isInsertedBrace(true);
                     Token::createMutualLinks(tok->next(), tok2->next());
                     break;
                 }
@@ -7988,7 +8285,8 @@ void Tokenizer::simplifyIfSwitchForInit()
         tok->str("{");
         endscope->insertToken("}");
         Token::createMutualLinks(tok, endscope->next());
-        tok->isSimplifiedScope(true);
+        tok->isInsertedBrace(true);
+        tok->isSimplifiedIfInitStmt(true);
     }
 }
 
@@ -8661,6 +8959,9 @@ void Tokenizer::findGarbageCode() const
             if (!cpp || mSettings.standards.cpp < Standards::CPP20 || !Token::Match(tok->previous(), "%name% : %num% ="))
                 syntaxError(tok, tok->strAt(1) + " " + tok->strAt(2));
         }
+        else if (!cpp && Token::Match(tok, "++|-- ++|--")) {
+            syntaxError(tok, tok->str() + tok->strAt(1));
+        }
         else if (Token::simpleMatch(tok, ") return") && !Token::Match(tok->link()->previous(), "if|while|for (")) {
             if (tok->link()->previous() && tok->link()->previous()->isUpperCaseName())
                 unknownMacroError(tok->link()->previous());
@@ -8700,6 +9001,13 @@ void Tokenizer::findGarbageCode() const
                 if (!Token::simpleMatch(tok->linkAt(1)->linkAt(2), ") ;"))
                     syntaxError(tok->linkAt(1)->linkAt(2));
             }
+            // if (x) MACRO() ..
+            if (Token::simpleMatch(tok, "if (")) {
+                const Token* tok2 = tok->linkAt(1);
+                if (Token::Match(tok2, ") %name% (") && tok2->next()->isUpperCaseName() &&
+                    Token::Match(tok2->linkAt(2), ") {|else"))
+                    syntaxError(tok2->next());
+            }
         }
 
         // keyword keyword
@@ -8716,6 +9024,8 @@ void Tokenizer::findGarbageCode() const
                     syntaxError(tok, prev == tok->previous() ? (prev->str() + " " + tok->str()) : (prev->str() + " .. " + tok->str()));
             }
         }
+        else if (tok->isStandardType() && tok->next() && tok->str() == tok->strAt(1) && tok->str() != "long")
+            syntaxError(tok);
     }
 
     // invalid struct declaration
@@ -8776,6 +9086,16 @@ void Tokenizer::findGarbageCode() const
         else if (tok->isKeyword() && nonGlobalKeywords.count(tok->str()) && !Token::Match(tok->tokAt(-2), "operator %str%"))
             syntaxError(tok, "keyword '" + tok->str() + "' is not allowed in global scope");
     }
+    for (const Token *tok = tokens(); tok; tok = tok->next()) {
+        if (tok->str() == "{" && isClassStructUnionEnumStart(tok)) {
+            for (const Token* tok2 = tok->next(); tok2 != tok->link(); tok2 = tok2->next()) {
+                if (tok2->str() == "{")
+                    tok2 = tok2->link();
+                else if (tok2->isKeyword() && nonGlobalKeywords.count(tok2->str()) && !Token::Match(tok2->tokAt(-2), "operator %str%"))
+                    syntaxError(tok2, "keyword '" + tok2->str() + "' is not allowed in class/struct/union/enum scope");
+            }
+        }
+    }
 
     // case keyword must be inside switch
     for (const Token *tok = tokens(); tok; tok = tok->next()) {
@@ -8814,15 +9134,21 @@ void Tokenizer::findGarbageCode() const
             continue;
         // count number of semicolons
         int semicolons = 0, colons = 0;
-        const Token* const startTok = tok;
-        tok = tok->linkAt(1)->previous(); // find ")" of the for-loop
-        // walk backwards until we find the beginning (startTok) of the for() again
-        for (; tok != startTok; tok = tok->previous()) {
+        const Token* const endTok = tok->linkAt(1);
+        for (tok = tok->tokAt(2); tok != endTok; tok = tok->next()) {
+            if (const Token* lam = findLambdaEndTokenWithoutAST(tok)) {
+                if (lam == endTok)
+                    break;
+                tok = lam;
+                continue;
+            }
             if (tok->str() == ";") { // do the counting
                 semicolons++;
             } else if (tok->str() == ":") {
+                if (tok->strAt(-1) == ",")
+                    syntaxError(tok);
                 colons++;
-            } else if (tok->str() == ")") { // skip pairs of ( )
+            } else if (tok->str() == "(" || tok->str() == "{") { // skip pairs of ( )
                 tok = tok->link();
             }
         }
@@ -8882,7 +9208,8 @@ void Tokenizer::findGarbageCode() const
             if (tok->strAt(1) == "(")
                 syntaxError(tok);
             else if (!(tok->tokType() == Token::Type::eString && Token::simpleMatch(tok->tokAt(-1), "extern")) &&
-                     !(tok->tokType() == Token::Type::eBoolean && cpp && Token::simpleMatch(tok->tokAt(-1), "requires")))
+                     !(tok->tokType() == Token::Type::eBoolean && cpp && Token::simpleMatch(tok->tokAt(-1), "requires")) &&
+                     !Token::simpleMatch(tok->linkAt(1), "} ;"))
                 syntaxError(tok);
         }
         if (Token::Match(tok, "( ) %num%|%bool%|%char%|%str%"))
@@ -8899,7 +9226,7 @@ void Tokenizer::findGarbageCode() const
             syntaxError(tok);
         if (Token::Match(tok, "[;([{] %comp%|%oror%|%or%|%|/"))
             syntaxError(tok);
-        if (Token::Match(tok, "%cop%|= ]") && !Token::simpleMatch(tok, "*") && !(cpp && Token::Match(tok->previous(), "%type%|[|,|%num% &|=|> ]")))
+        if (Token::Match(tok, "%cop%|= ]") && !Token::simpleMatch(tok, "*") && !(cpp && Token::Match(tok->previous(), "<|%type%|[|,|%num% &|=|> ]")))
             syntaxError(tok);
         if (Token::Match(tok, "[+-] [;,)]}]") && !(cpp && Token::simpleMatch(tok->previous(), "operator")))
             syntaxError(tok);
@@ -8923,17 +9250,37 @@ void Tokenizer::findGarbageCode() const
             if (!Token::Match(tok->next(), "%name%|*|~"))
                 syntaxError(tok, tok->strAt(-1) + " " + tok->str() + " " + tok->strAt(1));
         }
+        if (Token::Match(tok, ".|-> .|->"))
+            syntaxError(tok);
         if (Token::Match(tok, "[{,] . %name%") && !Token::Match(tok->tokAt(3), "[.=[{]"))
             syntaxError(tok->next());
         if (Token::Match(tok, "%name% %op% %name%") && !tok->isKeyword() && tok->next()->isIncDecOp())
             syntaxError(tok->next());
+        if (!tok->isKeyword() && Token::Match(tok, "%name% .|-> %name% %name%") && !tok->tokAt(2)->isKeyword()) {
+            if (tok->tokAt(3)->isUpperCaseName())
+                unknownMacroError(tok->tokAt(3));
+            else
+                syntaxError(tok);
+        }
         if (Token::Match(tok, "[!|+-/%^~] )|]"))
             syntaxError(tok);
         if (Token::Match(tok, "==|!=|<=|>= %comp%") && tok->strAt(-1) != "operator")
             syntaxError(tok, tok->str() + " " + tok->strAt(1));
-        if (Token::simpleMatch(tok, "::") && (!Token::Match(tok->next(), "%name%|*|~") ||
-                                              (tok->next()->isKeyword() && !Token::Match(tok->next(), "new|delete|operator"))))
-            syntaxError(tok);
+        if (Token::simpleMatch(tok, "::")) {
+            if (!Token::Match(tok->next(), "%name%|*|~") || (tok->next()->isKeyword() && !Token::Match(tok->next(), "new|delete|operator")))
+                syntaxError(tok);
+            if (Token::simpleMatch(tok->tokAt(-1), ")")) {
+                // NAME(...)::  => NAME is most likely an unknown macro
+                // other cases are valid, e.g. (void)::f(), return (T)::x, new (p) ::T, decltype(x)::type
+                const Token* const prev = tok->linkAt(-1)->tokAt(-1);
+                if (Token::Match(prev, "%name% (") && !prev->isKeyword() && prev->str() != "decltype") { // decltype is no keyword before C++11
+                    if (prev->isUpperCaseName())
+                        unknownMacroError(prev);
+                    else
+                        syntaxError(tok);
+                }
+            }
+        }
         if (Token::Match(tok, "& %comp%|&&|%oror%|&|%or%") && tok->strAt(1) != ">")
             syntaxError(tok);
         if (Token::Match(tok, "%comp%|&&|%oror%|&|%or% }") && tok->str() != ">")
@@ -8942,14 +9289,14 @@ void Tokenizer::findGarbageCode() const
             syntaxError(tok);
         if (Token::Match(tok, ": [)]=]"))
             syntaxError(tok);
-        if (Token::simpleMatch(tok, ", :"))
-            syntaxError(tok);
         if (Token::Match(tok, "typedef [,;:]"))
             syntaxError(tok);
         if (Token::Match(tok, "? %assign%"))
             syntaxError(tok);
-        if (Token::Match(tok, "!|~ %comp%") &&
-            !(cpp && tok->strAt(1) == ">" && Token::simpleMatch(tok->tokAt(-1), "operator")))
+        if (Token::Match(tok, "[!~+-/] %comp%") &&
+            !(cpp && Token::Match(tok->next(), "[<>]") && Token::simpleMatch(tok->tokAt(-1), "operator")))
+            syntaxError(tok);
+        if (Token::Match(tok, "%comp% {") && (!cpp || tok->str() != ">"))
             syntaxError(tok);
         if (Token::Match(tok, "] %name%") && (!cpp || !(tok->tokAt(1)->isKeyword() || (tok->tokAt(-1) && Token::simpleMatch(tok->tokAt(-2), "delete ["))))) {
             if (tok->next()->isUpperCaseName())
@@ -8986,19 +9333,23 @@ void Tokenizer::findGarbageCode() const
                 }
                 if (!tok2->next() || tok2->isControlFlowKeyword() || Token::Match(tok2, "typedef|static|."))
                     syntaxError(tok);
-                if (Token::Match(tok2, "%name% %name%") && tok2->str() == tok2->strAt(1)) {
-                    if (Token::simpleMatch(tok2->tokAt(2), ";"))
-                        continue;
-                    if (tok2->isStandardType() && tok2->str() == "long")
-                        continue;
-                    if (Token::Match(tok2->tokAt(-1), "enum|struct|union") || (isCPP() && Token::Match(tok2->tokAt(-1), "class|::")))
-                        continue;
-                    syntaxError(tok2);
+                if (Token::Match(tok2, "%name% %name%")) {
+                    if (tok2->str() == tok2->strAt(1)) {
+                        if (Token::simpleMatch(tok2->tokAt(2), ";"))
+                            continue;
+                        if (tok2->isStandardType() && tok2->str() == "long")
+                            continue;
+                        if (Token::Match(tok2->tokAt(-1), "enum|struct|union") || (isCPP() && Token::Match(tok2->tokAt(-1), "class|::")))
+                            continue;
+                        syntaxError(tok2);
+                    }
+                    if (Token::Match(tok2->tokAt(2), "%name%") && tok2->isNameOnly() && tok2->tokAt(1)->isNameOnly() && tok2->tokAt(2)->isNameOnly())
+                        syntaxError(tok2);
                 }
             }
         }
-        if (cpp && tok->str() == "namespace" && tok->tokAt(-1)) {
-            if (!Token::Match(tok->tokAt(-1), ";|{|}|using|inline")) {
+        if (cpp && tok->str() == "namespace") {
+            if (tok->tokAt(-1) && !Token::Match(tok->tokAt(-1), ";|{|}|using|inline")) {
                 if (tok->tokAt(-1)->isUpperCaseName())
                     unknownMacroError(tok->tokAt(-1));
                 else if (tok->linkAt(-1) && tok->linkAt(-1)->tokAt(-1) && tok->linkAt(-1)->tokAt(-1)->isUpperCaseName())
@@ -9006,6 +9357,8 @@ void Tokenizer::findGarbageCode() const
                 else
                     syntaxError(tok);
             }
+            if (!tok->next() || (Token::Match(tok->next(), "%name% =") && !Token::Match(tok->tokAt(3), "::|%name%")))
+                syntaxError(tok);
         }
         if (cpp && tok->str() == "using" && !Token::Match(tok->next(), "::|%name%"))
             syntaxError(tok);
@@ -9038,6 +9391,8 @@ void Tokenizer::findGarbageCode() const
                 syntaxError(tok);
             if (Token::simpleMatch(tok, ": template") && !Token::Match(tok->tokAt(-1), "public|private|protected"))
                 syntaxError(tok);
+            if (Token::Match(tok, "> class|struct|union {") && Token::simpleMatch(tok->linkAt(2), "} ;"))
+                syntaxError(tok);
             if (!Token::simpleMatch(tok, "template <"))
                 continue;
             if (!tok->tokAt(2) || tok->tokAt(2)->isLiteral())
@@ -9250,6 +9605,7 @@ void Tokenizer::simplifyStructDecl()
             if (Token::Match(after->next(), "const|static|volatile| *|&| const| (| %type% )| ,|;|[|=|(|{")) {
                 after->insertToken(";");
                 after = after->next();
+                Token *declEnd = after;
                 while (!Token::Match(start, "struct|class|union|enum")) {
                     after->insertToken(start->str());
                     after = after->next();
@@ -9292,6 +9648,16 @@ void Tokenizer::simplifyStructDecl()
                         }
                     }
                 }
+
+                // pull declaration out of for loop
+                if (Token::simpleMatch(start->tokAt(-2), "for ( struct")) {
+                    Token *link = start->linkAt(-1);
+                    start->deletePrevious(2);
+                    declEnd->insertToken("(");
+                    declEnd->next()->link(link);
+                    link->link(declEnd->next());
+                    declEnd->insertToken("for");
+                }
             }
         }
 
@@ -9352,8 +9718,8 @@ static Token* getVariableTokenAfterAttributes(Token* tok) {
     Token *vartok = nullptr;
     Token *after = getTokenAfterAttributes(tok, true);
 
-    // check if after variable name
-    if (Token::Match(after, "[;={]")) {
+    // check if after variable or parameter name
+    if (Token::Match(after, "[;={,)]")) {
         Token *prev = tok->previous();
         while (Token::simpleMatch(prev, "]"))
             prev = prev->link()->previous();
@@ -9613,7 +9979,7 @@ void Tokenizer::simplifyCPPAttribute()
                 if (!head)
                     syntaxError(tok);
 
-                if (Token::simpleMatch(head, ";")) {
+                if (Token::Match(head, ";|,|)")) {
                     Token *backTok = tok;
                     while (Token::Match(backTok, "]|[|)")) {
                         if (Token::Match(backTok, "]|)"))
@@ -9687,10 +10053,19 @@ void Tokenizer::simplifyCPPAttribute()
             Token* atok = nullptr;
             if (Token::Match(tok->previous(), "%name%"))
                 atok = tok->previous();
-            else {
+            else if (Token::simpleMatch(tok->previous(), "]")) {
+                atok = tok;
+                while (atok && Token::simpleMatch(atok->previous(), "]")) {
+                    atok = atok->linkAt(-1);
+                    atok = atok ? atok->previous() : nullptr;
+                }
+                if (!Token::Match(atok, "%name%"))
+                    atok = nullptr;
+            } else {
                 atok = tok;
                 while (isCPPAttribute(atok) || isAlignAttribute(atok))
                     atok = skipCPPOrAlignAttribute(atok)->next();
+                atok = atok ? getVariableTokenAfterAttributes(atok) : atok;
             }
             if (atok) {
                 std::string a;
@@ -9761,6 +10136,15 @@ void Tokenizer::simplifyKeyword()
             }
         }
 
+        if (isC() && (tok->str() == "_Noreturn" || tok->str() == "noreturn")) {
+            Token *nameTok = tok;
+            while (Token::Match(nameTok, "%name%|*"))
+                nameTok = nameTok->next();
+            if (nameTok && nameTok->str() == "(" && TokenList::isFunctionHead(nameTok, "{;")) {
+                nameTok->previous()->isAttributeNoreturn(true);
+            }
+        }
+
         if (isC() || mSettings.standards.cpp == Standards::CPP03) {
             if (tok->str() == "auto")
                 tok->deleteThis();
@@ -9976,6 +10360,8 @@ void Tokenizer::simplifyAsm()
                 instruction = tok->stringifyList(endasm);
                 Token::eraseTokens(tok, endasm);
             } else if (!endasm) {
+                if (!tok->next())
+                    syntaxError(tok);
                 instruction = tok->next()->stringifyList(endasm);
                 Token::eraseTokens(tok, endasm);
                 tok->insertToken(";");
@@ -10140,6 +10526,7 @@ void Tokenizer::simplifyBitfields()
         while (Token::Match(typeTok, "%name% :: %name%"))
             typeTok = typeTok->tokAt(2);
         if (Token::Match(typeTok, "%type% %name% :") &&
+            typeTok->str() != "enum" &&
             !Token::Match(tok->next(), "case|public|protected|private|class|struct") &&
             !Token::simpleMatch(tok->tokAt(2), "default :")) {
             Token *tok1 = typeTok->next();
@@ -10148,7 +10535,7 @@ void Tokenizer::simplifyBitfields()
                     tooLargeError(tok1->tokAt(2));
             if (tok1 && tok1->tokAt(2) &&
                 (Token::Match(tok1->tokAt(2), "%bool%|%num%") ||
-                 !Token::Match(tok1->tokAt(2), "public|protected|private| %type% ::|<|,|{|;"))) {
+                 !Token::Match(tok1->tokAt(2), "public|protected|private| %type% ::|<|,|{"))) {
                 while (tok1->next() && !Token::Match(tok1->next(), "[;,)]{}=]")) {
                     if (Token::Match(tok1->next(), "[([]"))
                         Token::eraseTokens(tok1, tok1->linkAt(1));
@@ -10194,18 +10581,25 @@ void Tokenizer::simplifyBitfields()
     }
 }
 
-static bool isStdContainerOrIterator(const Token* tok, const Settings& settings)
+static bool isStdContainerOrIterator(const Token* tok, const Library& library)
 {
-    const Library::Container* ctr = settings.library.detectContainerOrIterator(tok, nullptr, /*withoutStd*/ true);
+    const Library::Container* ctr = library.detectContainerOrIterator(tok, nullptr, /*withoutStd*/ true);
     return ctr && startsWith(ctr->startPattern, "std ::");
 }
 
-static bool isStdSmartPointer(const Token* tok, const Settings& settings)
+static bool isStdSmartPointer(const Token* tok, const Library& library)
 {
-    const Library::SmartPointer* ptr = settings.library.detectSmartPointer(tok, /*withoutStd*/ true);
+    const Library::SmartPointer* ptr = library.detectSmartPointer(tok, /*withoutStd*/ true);
     return ptr && startsWith(ptr->name, "std::");
 }
 
+static bool isLibraryType(const Token* tok, const Library& library)
+{
+    return library.hasAnyTypeCheck("std::" + tok->str()) ||
+           library.podtype("std::" + tok->str()) ||
+           isStdContainerOrIterator(tok, library);
+}
+
 // Add std:: in front of std classes, when using namespace std; was given
 void Tokenizer::simplifyNamespaceStd()
 {
@@ -10233,14 +10627,15 @@ void Tokenizer::simplifyNamespaceStd()
                 if (start != tok && start->isName() && !start->isKeyword() && (!start->previous() || Token::Match(start->previous(), "[;{}]")))
                     userFunctions.insert(tok->str());
             }
-            if (userFunctions.find(tok->str()) == userFunctions.end() && mSettings.library.matchArguments(tok, "std::" + tok->str()))
+            if ((userFunctions.find(tok->str()) == userFunctions.end() && mSettings.library.matchArguments(tok, "std::" + tok->str())) ||
+                (tok->tokAt(-1)->isKeyword() && isLibraryType(tok, mSettings.library)))
                 insert = true;
         } else if (Token::simpleMatch(tok->next(), "<") &&
-                   (isStdContainerOrIterator(tok, mSettings) || isStdSmartPointer(tok, mSettings)))
+                   (isStdContainerOrIterator(tok, mSettings.library) || isStdSmartPointer(tok, mSettings.library)))
             insert = true;
-        else if (mSettings.library.hasAnyTypeCheck("std::" + tok->str()) ||
-                 mSettings.library.podtype("std::" + tok->str()) ||
-                 isStdContainerOrIterator(tok, mSettings))
+        else if (isLibraryType(tok, mSettings.library))
+            insert = true;
+        else if (Token::simpleMatch(tok, "aligned_storage"))
             insert = true;
 
         if (insert) {
@@ -10361,12 +10756,12 @@ void Tokenizer::simplifyMicrosoftStringFunctions()
     if (!mSettings.platform.isWindows())
         return;
 
-    const bool ansi = mSettings.platform.type == Platform::Type::Win32A;
+    const bool ansi = (mSettings.platform.type == Platform::Type::Win32A); // TODO: check for UNICODE define instead
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (tok->strAt(1) != "(")
             continue;
 
-        const auto match = utils::as_const(apis).find(tok->str());
+        const auto match = apis.find(tok->str());
         if (match!=apis.end()) {
             tok->str(ansi ? match->second.mbcs : match->second.unicode);
             tok->originalName(match->first);
@@ -11057,6 +11452,57 @@ void Tokenizer::simplifyNamespaceAliases()
     }
 }
 
+void Tokenizer::simplifyAlignedStorage()
+{
+    if (!isCPP())
+        return;
+
+    const Standards::cppstd_t std = mSettings.standards.cpp;
+    if (std < Standards::CPP11 || std >= Standards::CPP23)
+        return;
+
+    for (Token *tok = list.front(); tok; tok = tok->next()) {
+        if (!Token::simpleMatch(tok, "std :: aligned_storage <"))
+            continue;
+
+        tok = tok->tokAt(3);
+        const Token *end = tok->link();
+        tok = tok->next();
+
+        if (!tok)
+            break;
+
+        if (!end)
+            continue;
+
+        for (; tok != end; tok = tok->next()) {
+            if (Token::simpleMatch(tok, ",")) {
+                tok = tok->next();
+                break;
+            }
+
+            if (Token::Match(tok, "(|<"))
+                tok = tok->link();
+        }
+
+        std::string str;
+        for (; tok != end; tok = tok->next()) {
+            str += " " + tok->str();
+        }
+
+        if (str.empty())
+            continue;
+
+        if (!Token::Match(tok, "> :: type %name%"))
+            continue;
+
+        str = str.substr(1);
+
+        tok = tok->tokAt(3);
+        tok->addAttributeAlignas(str);
+    }
+}
+
 void Tokenizer::setDirectives(std::list<Directive> directives)
 {
     mDirectives = std::move(directives);
diff --git a/lib/tokenize.h b/lib/tokenize.h
index 616290e7e2a..36f4e48c751 100644
--- a/lib/tokenize.h
+++ b/lib/tokenize.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 
 class Settings;
 class SymbolDatabase;
-class TimerResults;
+class TimerResultsIntf;
 class Token;
 class TemplateSimplifier;
 class ErrorLogger;
@@ -53,7 +53,7 @@ class CPPCHECKLIB Tokenizer {
     Tokenizer(TokenList tokenList, ErrorLogger &errorLogger);
     ~Tokenizer();
 
-    void setTimerResults(TimerResults *tr) {
+    void setTimerResults(TimerResultsIntf *tr) {
         mTimerResults = tr;
     }
 
@@ -327,7 +327,7 @@ class CPPCHECKLIB Tokenizer {
 
     void checkForEnumsWithTypedef();
 
-    void findComplicatedSyntaxErrorsInTemplates();
+    void findComplicatedSyntaxErrorsInTemplates() const;
 
 protected:
     /**
@@ -528,6 +528,11 @@ class CPPCHECKLIB Tokenizer {
      */
     void simplifyNamespaceAliases();
 
+    /**
+     * Handle std::aligned_storage<...>
+     */
+    void simplifyAlignedStorage();
+
     /**
      * Convert C++17 style nested namespace to older style
      */
@@ -693,11 +698,14 @@ class CPPCHECKLIB Tokenizer {
     };
     struct TypedefInfo {
         std::string name;
+        std::string originalName;
         std::string filename;
-        int lineNumber;
-        int column;
-        bool used;
-        bool isFunctionPointer;
+        int lineNumber{};
+        int column{};
+        int tagLine{-1};
+        int tagColumn{-1};
+        bool used{};
+        bool isFunctionPointer{};
         std::vector<TypedefToken> typedefInfoTokens;
     };
     std::vector<TypedefInfo> mTypedefInfo;
@@ -711,9 +719,9 @@ class CPPCHECKLIB Tokenizer {
     nonneg int mUnnamedCount{};
 
     /**
-     * TimerResults
+     * timer results
      */
-    TimerResults* mTimerResults{};
+    TimerResultsIntf* mTimerResults{};
 };
 
 /// @}
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
index 1e476a14ec5..26b24d649c8 100644
--- a/lib/tokenlist.cpp
+++ b/lib/tokenlist.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -102,7 +102,7 @@ int TokenList::appendFileIfNew(std::string fileName)
     if (it != mFiles.cend())
         return static_cast<int>(std::distance(mFiles.cbegin(), it));
 
-    assert(mTokensFrontBack->front == nullptr); // has no effect if tokens have already been created
+    assert(mSettings.clang || mTokensFrontBack->front == nullptr); // has no effect if tokens have already been created
 
     // The "mFiles" vector remembers what files have been tokenized..
     mFiles.push_back(std::move(fileName));
@@ -198,6 +198,7 @@ void TokenList::addtoken(const Token * tok, const nonneg int lineno, const nonne
     mTokensFrontBack->back->column(column);
     mTokensFrontBack->back->fileIndex(fileno);
     mTokensFrontBack->back->flags(tok->flags());
+    mTokensFrontBack->back->tokType(tok->tokType());
 }
 
 void TokenList::addtoken(const Token *tok, const Token *locationTok)
@@ -219,6 +220,7 @@ void TokenList::addtoken(const Token *tok, const Token *locationTok)
     mTokensFrontBack->back->linenr(locationTok->linenr());
     mTokensFrontBack->back->column(locationTok->column());
     mTokensFrontBack->back->fileIndex(locationTok->fileIndex());
+    mTokensFrontBack->back->tokType(tok->tokType());
 }
 
 void TokenList::addtoken(const Token *tok)
@@ -242,6 +244,7 @@ void TokenList::addtoken(const Token *tok)
     mTokensFrontBack->back->linenr(tok->linenr());
     mTokensFrontBack->back->column(tok->column());
     mTokensFrontBack->back->fileIndex(tok->fileIndex());
+    mTokensFrontBack->back->tokType(tok->tokType());
 }
 
 
@@ -330,10 +333,30 @@ bool TokenList::createTokensFromBuffer(const char* data, size_t size)
 
 //---------------------------------------------------------------------------
 
+#ifdef STORE_INPUT_DIR
+#include <atomic>
+#include <fstream>
+
+static void storeInput(const char* data, size_t size)
+{
+    static std::atomic_uint64_t num(0);
+    {
+        std::ofstream out(STORE_INPUT_DIR "/" + std::to_string(num++));
+        out.write(data, size);
+    }
+}
+#endif
+
 bool TokenList::createTokensFromBufferInternal(const char* data, size_t size, const std::string& file0)
 {
+#ifdef STORE_INPUT_DIR
+    storeInput(data, size);
+#endif
+
     simplecpp::OutputList outputList;
-    simplecpp::TokenList tokens({data, size}, mFiles, file0, &outputList);
+    simplecpp::DUI dui;
+    dui.std = mSettings.standards.getStdForLanguage(mLang);
+    simplecpp::TokenList tokens({data, size}, mFiles, file0, dui, &outputList);
 
     createTokens(std::move(tokens));
 
@@ -440,10 +463,10 @@ static Token* skipDecl(Token* tok, std::vector<Token*>* inner = nullptr)
         return Token::Match(tok, "%name%| ,|)");
     };
 
-    if (!Token::Match(tok->previous(), "( %name%"))
+    if (tok->varId() || !Token::Match(tok->previous(), "( %name%"))
         return tok;
     Token *vartok = tok;
-    while (Token::Match(vartok, "%name%|*|&|::|<")) {
+    while (Token::Match(vartok, "%name%|*|&|&&|::|<")) {
         if (vartok->str() == "<") {
             if (vartok->link())
                 vartok = vartok->link();
@@ -526,7 +549,7 @@ static bool iscast(const Token *tok, bool cpp)
         if (!Token::Match(tok2, "%name%|*|::"))
             return false;
 
-        if (tok2->isStandardType() && (tok2->strAt(1) != "(" || Token::Match(tok2->next(), "( * *| )")))
+        if (tok2->isStandardType() && (tok2->strAt(1) != "(" || Token::simpleMatch(tok2->linkAt(1)->tokAt(-1), "* )")))
             type = true;
     }
 
@@ -586,10 +609,16 @@ static bool iscpp11init_impl(const Token * const tok)
     if (nameToken->str() == ">" && nameToken->link())
         nameToken = nameToken->link()->previous();
     if (Token::Match(nameToken, "]|*")) {
-        const Token* newTok = nameToken->link() ? nameToken->link()->previous() : nameToken->previous();
-        while (Token::Match(newTok, "%type%|::|*") && !newTok->isKeyword())
-            newTok = newTok->previous();
-        if (Token::simpleMatch(newTok, "new"))
+        const Token* tok2 = nameToken;
+        if (tok2->link()) {
+            while (tok2 && precedes(tok2->link(), nameToken))
+                tok2 = tok2->link()->previous();
+        }
+        else
+            tok2 = tok2->previous();
+        while (Token::Match(tok2, "%type%|::|*") && !tok2->isKeyword())
+            tok2 = tok2->previous();
+        if (Token::Match(tok2, "new|%var%"))
             return true;
     }
 
@@ -731,6 +760,8 @@ static void compileBinOp(Token *&tok, AST_state& state, void (*f)(Token *&tok, A
         binop->astOperand1(state.op.top());
         state.op.pop();
     }
+    if (!state.op.empty() && state.op.top() == binop)
+        throw InternalError(tok, "Syntax Error: Infinite loop when creating AST.", InternalError::AST);
     state.op.push(binop);
 }
 
@@ -873,7 +904,7 @@ static void compileTerm(Token *&tok, AST_state& state)
                 state.inArrayAssignment--;
                 tok = tok1->link()->next();
             }
-        } else if (!state.inArrayAssignment && !Token::simpleMatch(prev, "=")) {
+        } else if ((!state.inArrayAssignment && !Token::simpleMatch(prev, "=")) || Token::simpleMatch(prev, "?")) {
             state.op.push(tok);
             tok = tok->link()->next();
         } else {
@@ -938,6 +969,21 @@ static bool isPrefixUnary(const Token* tok, bool cpp)
     return tok->strAt(-1) == ")" && iscast(tok->linkAt(-1), cpp);
 }
 
+template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+static T* skipTrailingReturnType(T* tok)
+{
+    if (!Token::Match(tok, ".|->")) // TODO: fix simplification (see garbageCode228)
+        return tok;
+    tok = tok->next();
+    while (Token::Match(tok, "%type%|%name%|::|&|&&|*|<|(")) {
+        if (tok->link())
+            tok = tok->link()->next();
+        else
+            tok = tok->next();
+    }
+    return tok;
+}
+
 /**
  * @throws InternalError thrown if unexpected tokens are encountered
  */
@@ -982,7 +1028,7 @@ static void compilePrecedence2(Token *&tok, AST_state& state)
             else
                 compileUnaryOp(tok, state, compileScope);
         } else if (tok->str() == "[") {
-            if (state.cpp && isPrefixUnary(tok, /*cpp*/ true) && Token::Match(tok->link(), "] (|{|<")) { // Lambda
+            if (state.cpp && isPrefixUnary(tok, /*cpp*/ true) && Token::Match(tok->link(), "] [({<.]")) { // Lambda
                 // What we do here:
                 // - Nest the round bracket under the square bracket.
                 // - Nest what follows the lambda (if anything) with the lambda opening [
@@ -1031,7 +1077,10 @@ static void compilePrecedence2(Token *&tok, AST_state& state)
                         continue;
                     }
                 } else {
-                    Token* const curlyBracket = squareBracket->link()->next();
+                    Token* curlyBracket = squareBracket->link()->next();
+                    curlyBracket = skipTrailingReturnType(curlyBracket);
+                    if (!Token::simpleMatch(curlyBracket, "{"))
+                        throw InternalError(tok, "Syntax error in lambda", InternalError::AST);
                     squareBracket->astOperand1(curlyBracket);
                     state.op.push(squareBracket);
                     tok = curlyBracket->link() ? curlyBracket->link()->next() : nullptr;
@@ -1055,7 +1104,12 @@ static void compilePrecedence2(Token *&tok, AST_state& state)
             else
                 compileUnaryOp(tok, state, compileExpression);
             tok = tok2->link()->next();
-        } else if (Token::simpleMatch(tok->previous(), "requires {")) {
+        } else if ((Token::simpleMatch(tok->tokAt(-1), "requires {") && tok->tokAt(-1)->isKeyword())
+                   || (Token::simpleMatch(tok->tokAt(-1), ")")
+                       && tok->linkAt(-1)
+                       && Token::simpleMatch(tok->linkAt(-1)->tokAt(-1), "requires (") && tok->linkAt(-1)->tokAt(-1)->isKeyword())) {
+            if (!tok->link())
+                throw InternalError(tok, "Syntax error, token has no link.", InternalError::AST);
             tok->astOperand1(state.op.top());
             state.op.pop();
             state.op.push(tok);
@@ -1471,15 +1525,7 @@ const Token* findLambdaEndTokenWithoutAST(const Token* tok) {
         tok = tok->link()->next();
     if (Token::simpleMatch(tok, "mutable"))
         tok = tok->next();
-    if (Token::Match(tok, ".|->")) { // trailing return type
-        tok = tok->next();
-        while (Token::Match(tok, "%type%|%name%|::|&|&&|*|<|(")) {
-            if (tok->link())
-                tok = tok->link()->next();
-            else
-                tok = tok->next();
-        }
-    }
+    tok = skipTrailingReturnType(tok);
     if (!(Token::simpleMatch(tok, "{") && tok->link()))
         return nullptr;
     return tok->link()->next();
@@ -1585,6 +1631,13 @@ static Token * createAstAtToken(Token *tok)
         if (Token::Match(tok2, "%var% [;,)]"))
             return tok2;
     }
+    if (Token::Match(tok, "enum class| %name%| :")) {
+        if (Token::simpleMatch(tok->next(), "class"))
+            tok = tok->next();
+        if (Token::Match(tok->next(), "%name%"))
+            tok = tok->next();
+        return tok->next();
+    }
     if (Token *const endTok = skipMethodDeclEnding(tok)) {
         Token *tok2 = tok;
         do {
@@ -1602,7 +1655,7 @@ static Token * createAstAtToken(Token *tok)
     if (Token::Match(tok, "%type%") && !Token::Match(tok, "return|throw|if|while|new|delete")) {
         bool isStandardTypeOrQualifier = false;
         Token* type = tok;
-        while (Token::Match(type, "%type%|*|&|<")) {
+        while (Token::Match(type, "%type%|*|&|&&|<")) {
             if (type->isName() && (type->isStandardType() || Token::Match(type, "const|mutable|static|volatile")))
                 isStandardTypeOrQualifier = true;
             if (type->str() == "<") {
@@ -1655,6 +1708,8 @@ static Token * createAstAtToken(Token *tok)
                 tok->next()->astOperand1(tok);
                 tok->next()->astOperand2(colon);
 
+                createAstAtTokenInner(colon, tok->linkAt(1), cpp);
+
                 return decl;
             }
         }
@@ -1780,8 +1835,9 @@ static Token * createAstAtToken(Token *tok)
         }
     }
 
-    if (Token::Match(tok, "%type% %name%|*|&|&&|::") && !Token::Match(tok, "return|new|delete")) {
-        int typecount = 0;
+    if ((Token::Match(tok, "%type% %name%|*|&|&&|::") && !Token::Match(tok, "return|new|delete")) ||
+        (Token::Match(tok, ":: %type%") && !tok->next()->isKeyword())) {
+        int typecount = tok->str() == "::" ? 1 : 0;
         Token *typetok = tok;
         while (Token::Match(typetok, "%type%|::|*|&|&&|<")) {
             if (typetok->isName() && !Token::simpleMatch(typetok->previous(), "::"))
@@ -1795,7 +1851,7 @@ static Token * createAstAtToken(Token *tok)
             }
             typetok = typetok->next();
         }
-        if (Token::Match(typetok, "%var% =") && typetok->varId())
+        if (Token::Match(typetok, "%var% [={]"))
             tok = typetok;
 
         // Do not create AST for function declaration
@@ -1804,7 +1860,7 @@ static Token * createAstAtToken(Token *tok)
             !Token::Match(tok, "return|throw") &&
             Token::Match(typetok->previous(), "%name% ( !!*") &&
             typetok->previous()->varId() == 0 &&
-            !typetok->previous()->isKeyword() &&
+            (!typetok->previous()->isKeyword() || typetok->previous()->isOperatorKeyword()) &&
             (skipMethodDeclEnding(typetok->link()) || Token::Match(typetok->link(), ") ;|{")))
             return typetok;
     }
@@ -1860,6 +1916,16 @@ void TokenList::createAst() const
             throw InternalError(tok, "Syntax Error: Infinite loop when creating AST.", InternalError::AST);
         tok = nextTok;
     }
+    for (Token *tok = mTokensFrontBack->front; tok; tok = tok ? tok->next() : nullptr) {
+        if (tok->astParent())
+            continue;
+        if (!tok->astOperand1() && !tok->astOperand2())
+            continue;
+        visitAstNodes(tok, [&](Token* child) {
+            child->astTop(tok);
+            return ChildrenToVisit::op1_and_op2;
+        });
+    }
 }
 
 namespace {
@@ -1893,12 +1959,18 @@ void TokenList::validateAst(bool print) const
         if ((tok->isAssignmentOp() || tok->isComparisonOp() || Token::Match(tok,"[|^/%]")) && tok->astOperand1() && !tok->astOperand2())
             throw InternalError(tok, "Syntax Error: AST broken, binary operator has only one operand.", InternalError::AST);
 
+        if (!(tok->astOperand1() && tok->astOperand2()) && ((isC() && tok->str() == "&&") || Token::Match(tok, "%or%|%oror%")))
+            throw InternalError(tok, "Syntax Error: AST broken, binary operator is missing operand(s).", InternalError::AST);
+
         // Syntax error if we encounter "?" with operand2 that is not ":"
         if (tok->str() == "?") {
             if (!tok->astOperand1() || !tok->astOperand2())
                 throw InternalError(tok, "AST broken, ternary operator missing operand(s)", InternalError::AST);
-            if (tok->astOperand2()->str() != ":")
+            const Token* colon = tok->astOperand2();
+            if (colon->str() != ":")
                 throw InternalError(tok, "Syntax Error: AST broken, ternary operator lacks ':'.", InternalError::AST);
+            if ((colon->astOperand1() && !precedes(colon->astOperand1(), colon)) || !succeeds(colon->astOperand2(), colon))
+                throw InternalError(tok, "AST broken, ternary operator has bad operand(s)", InternalError::AST);
         }
 
         // Check for endless recursion
@@ -1948,7 +2020,7 @@ void TokenList::validateAst(bool print) const
             if (Token::simpleMatch(tok->previous(), "operator"))
                 continue;
             // Skip incomplete code
-            if (!tok->astOperand1() && !tok->astOperand2() && !tok->astParent())
+            if (!tok->astOperand1() && !tok->astOperand2() && !tok->astParent() && !(tok->str().size() == 2 && tok->str()[1] == '='))
                 continue;
             // Skip lambda assignment and/or initializer
             if (Token::Match(tok, "= {|^|["))
@@ -1972,9 +2044,9 @@ void TokenList::validateAst(bool print) const
                                     "' doesn't have two operands.",
                                     InternalError::AST);
         }
-        if (tok->str() == "case" && !tok->astOperand1()) {
+        if (!tok->astOperand1() && Token::Match(tok, "case|!")) {
             throw InternalError(tok,
-                                "Syntax Error: AST broken, 'case' doesn't have an operand.",
+                                "Syntax Error: AST broken, '" + tok->str() + "' doesn't have an operand.",
                                 InternalError::AST);
         }
 
@@ -2275,7 +2347,7 @@ bool TokenList::isCPP() const
     return mLang == Standards::Language::CPP;
 }
 
-const Token * TokenList::isFunctionHead(const Token *tok, const std::string &endsWith)
+const Token * TokenList::isFunctionHead(const Token *tok, const std::string &suffix)
 {
     if (!tok)
         return nullptr;
@@ -2288,11 +2360,11 @@ const Token * TokenList::isFunctionHead(const Token *tok, const std::string &end
     if (Token::Match(tok, ") ;|{|[")) {
         tok = tok->next();
         while (tok && tok->str() == "[" && tok->link()) {
-            if (endsWith.find(tok->str()) != std::string::npos)
+            if (suffix.find(tok->str()) != std::string::npos)
                 return tok;
             tok = tok->link()->next();
         }
-        return (tok && endsWith.find(tok->str()) != std::string::npos) ? tok : nullptr;
+        return (tok && suffix.find(tok->str()) != std::string::npos) ? tok : nullptr;
     }
     if (tok->isCpp() && tok->str() == ")") {
         tok = tok->next();
@@ -2327,7 +2399,7 @@ const Token * TokenList::isFunctionHead(const Token *tok, const std::string &end
         }
         if (tok && tok->str() == ":" && !Token::Match(tok->next(), "%name%|::"))
             return nullptr;
-        return (tok && endsWith.find(tok->str()) != std::string::npos) ? tok : nullptr;
+        return (tok && suffix.find(tok->str()) != std::string::npos) ? tok : nullptr;
     }
     return nullptr;
 }
diff --git a/lib/tokenlist.h b/lib/tokenlist.h
index 764eb67bdee..e2cbb1b3cb7 100644
--- a/lib/tokenlist.h
+++ b/lib/tokenlist.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,7 +56,7 @@ class CPPCHECKLIB TokenList {
     TokenList(const TokenList &) = delete;
     TokenList &operator=(const TokenList &) = delete;
 
-    TokenList(TokenList&& other) NOEXCEPT = default;
+    TokenList(TokenList&& other) noexcept = default;
 
     /** @return the source file path. e.g. "file.cpp" */
     const std::string& getSourceFilePath() const;
@@ -206,10 +206,10 @@ class CPPCHECKLIB TokenList {
     /**
      * is token pointing at function head?
      * @param tok         A '(' or ')' token in a possible function head
-     * @param endsWith    string after function head
-     * @return token matching with endsWith if syntax seems to be a function head else nullptr
+     * @param suffix      string after function head
+     * @return token matching with suffix if syntax seems to be a function head else nullptr
      */
-    static const Token * isFunctionHead(const Token *tok, const std::string &endsWith);
+    static const Token * isFunctionHead(const Token *tok, const std::string &suffix);
 
     const Settings& getSettings() const {
         return mSettings;
@@ -228,6 +228,7 @@ class CPPCHECKLIB TokenList {
     std::vector<std::string> mOrigFiles;
 
     /** settings */
+    // NOLINTNEXTLINE(cppcoreguidelines-avoid-const-or-ref-data-members) - TokenList is move-only
     const Settings& mSettings;
 
     /** File is known to be C/C++ code */
diff --git a/lib/utils.h b/lib/utils.h
index c59e4d3a32c..410bd7c6040 100644
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cctype>
 #include <cstddef>
 #include <cstdint>
 #include <functional>
@@ -124,6 +125,11 @@ bool endsWith(const std::string& str, const char (&end)[N])
     return endsWith(str, end, N - 1);
 }
 
+inline bool endsWith(const std::string& str, const std::string& end)
+{
+    return endsWith(str, end.c_str(), end.length());
+}
+
 inline static bool isPrefixStringCharLiteral(const std::string &str, char q, const std::string& p)
 {
     // str must be at least the prefix plus the start and end quote
@@ -215,7 +221,7 @@ bool strToInt(const std::string& str, T &num, std::string* err = nullptr)
         tmp = std::stoll(str, &idx);
         if (idx != str.size()) {
             if (err)
-                *err = "not an integer";
+                *err = "not an integer (pos)";
             return false;
         }
     } catch (const std::out_of_range&) {
@@ -224,7 +230,7 @@ bool strToInt(const std::string& str, T &num, std::string* err = nullptr)
         return false;
     } catch (const std::invalid_argument &) {
         if (err)
-            *err = "not an integer";
+            *err = "not an integer (invalid_argument)";
         return false;
     }
     if (str.front() == '-' && std::numeric_limits<T>::min() == 0) {
@@ -232,6 +238,16 @@ bool strToInt(const std::string& str, T &num, std::string* err = nullptr)
             *err = "needs to be positive";
         return false;
     }
+    if (str.front() != '+' && str.front() != '-' && isdigit(str.front()) == 0) {
+        if (err)
+            *err = "not an integer";
+        return false;
+    }
+    if (str.size() > 1 && str.front() == '0') {
+        if (err)
+            *err = "not an integer";
+        return false;
+    }
     if (tmp < std::numeric_limits<T>::min() || tmp > std::numeric_limits<T>::max()) {
         if (err)
             *err = "out of range (limits)";
@@ -250,7 +266,7 @@ bool strToInt(const std::string& str, T &num, std::string* err = nullptr)
         tmp = std::stoull(str, &idx);
         if (idx != str.size()) {
             if (err)
-                *err = "not an integer";
+                *err = "not an integer (pos)";
             return false;
         }
     } catch (const std::out_of_range&) {
@@ -259,7 +275,7 @@ bool strToInt(const std::string& str, T &num, std::string* err = nullptr)
         return false;
     } catch (const std::invalid_argument &) {
         if (err)
-            *err = "not an integer";
+            *err = "not an integer (invalid_argument)";
         return false;
     }
     if (str.front() == '-') {
@@ -267,6 +283,16 @@ bool strToInt(const std::string& str, T &num, std::string* err = nullptr)
             *err = "needs to be positive";
         return false;
     }
+    if (str.front() != '+' && isdigit(str.front()) == 0) {
+        if (err)
+            *err = "not an integer";
+        return false;
+    }
+    if (str.size() > 1 && str.front() == '0') {
+        if (err)
+            *err = "not an integer";
+        return false;
+    }
     if (tmp > std::numeric_limits<T>::max()) {
         if (err)
             *err = "out of range (limits)";
@@ -276,6 +302,9 @@ bool strToInt(const std::string& str, T &num, std::string* err = nullptr)
     return true;
 }
 
+/**
+ * @throws std::runtime_error thrown if conversion failed
+ */
 template<typename T>
 T strToInt(const std::string& str)
 {
@@ -395,17 +424,23 @@ static inline T* empty_if_null(T* p)
 }
 
 /**
- * Split string by given sperator.
+ * Split string by given separator.
  * @param str The string to split
- * @param sep The seperator
- * @return The list of seperate strings (including empty ones). The whole input string if no seperator found.
+ * @param sep The separator
+ * @return The list of separate strings (including empty ones). The whole input string if no separator found.
  */
 CPPCHECKLIB std::vector<std::string> splitString(const std::string& str, char sep);
 
 namespace utils {
+    /**
+     * Drop-in replacement for C++17's std::as_const
+     * @param t  The function forms the lvalue reference to const type of this argument.
+     */
     template<class T>
     constexpr typename std::add_const<T>::type & as_const(T& t) noexcept
     {
+        static_assert(!std::is_const<T>::value, "object is already const");
+        static_assert(!std::is_pointer<T>::value, "object is a pointer");
         // NOLINTNEXTLINE(bugprone-return-const-ref-from-parameter) - potential false positive
         return t;
     }
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
index 023d2ebde31..5dfe447cf68 100644
--- a/lib/valueflow.cpp
+++ b/lib/valueflow.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -89,6 +89,7 @@
 #include "infer.h"
 #include "library.h"
 #include "mathlib.h"
+#include "refthunk.h"
 #include "path.h"
 #include "platform.h"
 #include "programmemory.h"
@@ -365,7 +366,7 @@ const Token *ValueFlow::parseCompareInt(const Token *tok, ValueFlow::Value &true
     });
 }
 
-static bool isEscapeScope(const Token* tok, const Settings& settings, bool unknown = false)
+static bool isEscapeScope(const Token* tok, const Library& library, bool unknown = false)
 {
     if (!Token::simpleMatch(tok, "{"))
         return false;
@@ -374,7 +375,7 @@ static bool isEscapeScope(const Token* tok, const Settings& settings, bool unkno
     if (termTok && termTok->scope() == tok->scope())
         return true;
     std::string unknownFunction;
-    if (settings.library.isScopeNoReturn(tok->link(), &unknownFunction))
+    if (library.isScopeNoReturn(tok->link(), &unknownFunction))
         return unknownFunction.empty() || unknown;
     return false;
 }
@@ -401,10 +402,14 @@ void ValueFlow::combineValueProperties(const ValueFlow::Value &value1, const Val
         result.valueType = value2.valueType;
         result.tokvalue = value2.tokvalue;
     }
-    if (value1.isIteratorValue())
+    if (value1.isIteratorValue()) {
         result.valueType = value1.valueType;
-    if (value2.isIteratorValue())
+        result.container = value1.container;
+    }
+    if (value2.isIteratorValue()) {
         result.valueType = value2.valueType;
+        result.container = value2.container;
+    }
     result.condition = value1.condition ? value1.condition : value2.condition;
     result.varId = (value1.varId != 0) ? value1.varId : value2.varId;
     result.varvalue = (result.varId == value1.varId) ? value1.varvalue : value2.varvalue;
@@ -430,12 +435,7 @@ static void valueFlowNumber(TokenList &tokenlist, const Settings& settings)
 
     if (tokenlist.isCPP() || settings.standards.c >= Standards::C23) {
         for (Token *tok = tokenlist.front(); tok; tok = tok->next()) {
-            if (tok->isName() && !tok->varId() && Token::Match(tok, "%bool%")) {
-                ValueFlow::Value value(tok->str() == "true");
-                if (!tok->isTemplateArg())
-                    value.setKnown();
-                setTokenValue(tok, std::move(value), settings);
-            } else if (Token::Match(tok, "[(,] NULL [,)]")) {
+            if (Token::Match(tok, "[(,] NULL [,)]")) {
                 // NULL function parameters are not simplified in the
                 // normal tokenlist
                 ValueFlow::Value value(0);
@@ -504,7 +504,7 @@ static std::vector<const Token*> evaluateType(const Token* start, const Token* e
                     return {};
                 result.insert(result.end(), inner.begin(), inner.end());
             } else {
-                // We cant evaluate the decltype so bail
+                // We can't evaluate the decltype so bail
                 return {};
             }
             tok = tok->linkAt(1);
@@ -692,57 +692,6 @@ static void valueFlowArray(TokenList& tokenlist, const Settings& settings)
     }
 }
 
-static bool isNonZero(const Token* tok)
-{
-    return tok && (!tok->hasKnownIntValue() || tok->getKnownIntValue() != 0);
-}
-
-static const Token* getOtherOperand(const Token* tok)
-{
-    if (!tok)
-        return nullptr;
-    if (!tok->astParent())
-        return nullptr;
-    if (tok->astParent()->astOperand1() != tok)
-        return tok->astParent()->astOperand1();
-    if (tok->astParent()->astOperand2() != tok)
-        return tok->astParent()->astOperand2();
-    return nullptr;
-}
-
-static void valueFlowArrayBool(TokenList& tokenlist, const Settings& settings)
-{
-    for (Token* tok = tokenlist.front(); tok; tok = tok->next()) {
-        if (tok->hasKnownIntValue())
-            continue;
-        const Variable* var = nullptr;
-        bool known = false;
-        const auto val =
-            std::find_if(tok->values().cbegin(), tok->values().cend(), std::mem_fn(&ValueFlow::Value::isTokValue));
-        if (val == tok->values().end()) {
-            var = tok->variable();
-            known = true;
-        } else {
-            var = val->tokvalue->variable();
-            known = val->isKnown();
-        }
-        if (!var)
-            continue;
-        if (!var->isArray() || var->isArgument() || var->isStlType())
-            continue;
-        if (isNonZero(getOtherOperand(tok)) && Token::Match(tok->astParent(), "%comp%"))
-            continue;
-        // TODO: Check for function argument
-        if ((astIsBool(tok->astParent()) && !Token::Match(tok->astParent(), "(|%name%")) ||
-            (tok->astParent() && Token::Match(tok->astParent()->previous(), "if|while|for ("))) {
-            ValueFlow::Value value{1};
-            if (known)
-                value.setKnown();
-            setTokenValue(tok, std::move(value), settings);
-        }
-    }
-}
-
 static void valueFlowArrayElement(TokenList& tokenlist, const Settings& settings)
 {
     for (Token* tok = tokenlist.front(); tok; tok = tok->next()) {
@@ -903,10 +852,10 @@ static void valueFlowSameExpressions(TokenList& tokenlist, const Settings& setti
 
         long long val;
 
-        if (Token::Match(tok, "==|>=|<=|/")) {
+        if (Token::Match(tok, "==|>=|<=|/|/=")) {
             val = 1;
         }
-        else if (Token::Match(tok, "!=|>|<|%|-")) {
+        else if (Token::Match(tok, "!=|>|<|%|%=|-|-=|^|^=")) {
             val = 0;
         }
         else
@@ -1170,7 +1119,7 @@ static void valueFlowImpossibleValues(TokenList& tokenList, const Settings& sett
             value.setImpossible();
             setTokenValue(tok, std::move(value), settings);
         } else if (tok->variable() && tok->variable()->isArray() && !tok->variable()->isArgument() &&
-                   !tok->variable()->isStlType()) {
+                   tok->variable()->getTypeName() != "std::array") {
             ValueFlow::Value value{0};
             value.setImpossible();
             setTokenValue(tok, std::move(value), settings);
@@ -1179,6 +1128,10 @@ static void valueFlowImpossibleValues(TokenList& tokenList, const Settings& sett
             ValueFlow::Value value{0};
             value.setImpossible();
             setTokenValue(tok, std::move(value), settings);
+        } else if (tok->function() && tok->scope()->isExecutable()) {
+            ValueFlow::Value value{0};
+            value.setImpossible();
+            setTokenValue(tok, std::move(value), settings);
         }
     }
 }
@@ -1210,6 +1163,12 @@ static void valueFlowEnumValue(SymbolDatabase & symboldatabase, const Settings &
     }
 }
 
+// trampoline to generate unique timer results entry
+static void valueFlowEnumValueEarly(SymbolDatabase & symboldatabase, const Settings & settings)
+{
+    valueFlowEnumValue(symboldatabase, settings);
+}
+
 static void valueFlowGlobalConstVar(TokenList& tokenList, const Settings& settings)
 {
     // Get variable values...
@@ -1314,10 +1273,9 @@ static Analyzer::Result valueFlowForward(Token* startToken,
     return result;
 }
 
-template<class ValueOrValues>
 static Analyzer::Result valueFlowForward(Token* startToken,
                                          const Token* exprTok,
-                                         ValueOrValues v,
+                                         ValueFlow::Value v,
                                          const TokenList& tokenlist,
                                          ErrorLogger& errorLogger,
                                          const Settings& settings,
@@ -1512,7 +1470,20 @@ ValueFlow::Value ValueFlow::getLifetimeObjValue(const Token *tok, bool inconclus
     // There should only be one lifetime
     if (values.size() != 1)
         return ValueFlow::Value{};
-    return values.front();
+    return std::move(values.front());
+}
+
+static bool checkDotLifetime(const Token* dot, const Token* tok)
+{
+    if (Token::simpleMatch(dot->astOperand1(), "."))
+        return false;
+    if (!dot->astOperand2())
+        return true;
+    if (dot->astOperand2()->varId() && tok->isUnaryOp("*"))
+        return dot->astOperand2()->variable() && dot->astOperand2()->variable()->isArray();
+    if (dot->astOperand2()->valueType() && dot->astOperand2()->valueType()->reference != Reference::None)
+        return false;
+    return true;
 }
 
 template<class Predicate>
@@ -1627,8 +1598,7 @@ static std::vector<ValueFlow::LifetimeToken> getLifetimeTokens(const Token* tok,
             if (vartok->str() == "[" || vartok->isUnaryOp("*"))
                 vartok = vartok->astOperand1();
             else if (vartok->str() == ".") {
-                if (!Token::simpleMatch(vartok->astOperand1(), ".") &&
-                    !(vartok->astOperand2() && vartok->astOperand2()->valueType() && vartok->astOperand2()->valueType()->reference != Reference::None))
+                if (checkDotLifetime(vartok, tok))
                     vartok = vartok->astOperand1();
                 else
                     break;
@@ -1813,7 +1783,8 @@ static bool isNotEqual(std::pair<const Token*, const Token*> x, std::pair<const
 static bool isNotEqual(std::pair<const Token*, const Token*> x, const std::string& y, bool cpp, const Settings& settings)
 {
     TokenList tokenList(settings, cpp ? Standards::Language::CPP : Standards::Language::C);
-    tokenList.createTokensFromBuffer(y.data(), y.size()); // TODO: check result?
+    const std::string str(y + "\n");
+    tokenList.createTokensFromBuffer(str.data(), str.size()); // TODO: check result?
     return isNotEqual(x, std::make_pair(tokenList.front(), tokenList.back()));
 }
 static bool isNotEqual(std::pair<const Token*, const Token*> x, const ValueType* y, bool cpp, const Settings& settings)
@@ -1952,6 +1923,35 @@ const Token* ValueFlow::getEndOfExprScope(const Token* tok, const Scope* default
     return end;
 }
 
+static void getLhsLifetimeParentsImpl(const Token* lhs, const Library& library, std::vector<const Token*>& result)
+{
+    if (!lhs)
+        return;
+
+    if (Token::simpleMatch(lhs, "[")) {
+        getLhsLifetimeParentsImpl(lhs->astOperand1(), library, result);
+    } else if (Token::simpleMatch(lhs, ".") && lhs->originalName() != "->") {
+        const Token* obj = lhs->astOperand1();
+        if (Token::simpleMatch(obj, "[") && obj->exprId() > 0)
+            result.push_back(obj);
+        getLhsLifetimeParentsImpl(obj, library, result);
+    } else {
+        const Token* tok = getParentLifetime(lhs, library);
+        if (tok && tok->exprId() > 0) {
+            const Variable* var = tok->variable();
+            if (!var || var->isLocal() || var->isArgument())
+                result.push_back(tok);
+        }
+    }
+}
+
+static std::vector<const Token*> getLhsLifetimeParents(const Token* lhs, const Library& library)
+{
+    std::vector<const Token*> result;
+    getLhsLifetimeParentsImpl(lhs, library, result);
+    return result;
+}
+
 static void valueFlowForwardLifetime(Token * tok, const TokenList &tokenlist, ErrorLogger &errorLogger, const Settings &settings)
 {
     // Forward lifetimes to constructed variable
@@ -2004,14 +2004,8 @@ static void valueFlowForwardLifetime(Token * tok, const TokenList &tokenlist, Er
                 if (val.lifetimeKind == ValueFlow::Value::LifetimeKind::Address)
                     val.lifetimeKind = ValueFlow::Value::LifetimeKind::SubObject;
             }
-            // TODO: handle `[`
-            if (Token::simpleMatch(parent->astOperand1(), ".")) {
-                const Token* parentLifetime =
-                    getParentLifetime(parent->astOperand1()->astOperand2(), settings.library);
-                if (parentLifetime && parentLifetime->exprId() > 0) {
-                    valueFlowForward(nextExpression, endOfVarScope, parentLifetime, std::move(values), tokenlist, errorLogger, settings);
-                }
-            }
+            for (const Token *p : getLhsLifetimeParents(parent->astOperand1(), settings.library))
+                valueFlowForward(nextExpression, endOfVarScope, p, values, tokenlist, errorLogger, settings);
         }
         // Constructor
     } else if (Token::simpleMatch(parent, "{") && !isScopeBracket(parent)) {
@@ -2459,7 +2453,7 @@ static void valueFlowLifetimeFunction(Token *tok, const TokenList &tokenlist, Er
     const int returnContainer = settings.library.returnValueContainer(tok);
     if (returnContainer >= 0) {
         std::vector<const Token *> args = getArguments(tok);
-        for (int argnr = 1; argnr <= args.size(); ++argnr) {
+        for (size_t argnr = 1; argnr <= args.size(); ++argnr) {
             const Library::ArgumentChecks::IteratorInfo *i = settings.library.getArgIteratorInfo(tok, argnr);
             if (!i)
                 continue;
@@ -2495,8 +2489,8 @@ static void valueFlowLifetimeFunction(Token *tok, const TokenList &tokenlist, Er
         std::vector<const Token *> args = getArguments(tok);
         const std::size_t n = args.size();
         if (n > 1 && Token::typeStr(args[n - 2]) == Token::typeStr(args[n - 1]) &&
-            (((astIsIterator(args[n - 2]) && astIsIterator(args[n - 1])) ||
-              (astIsPointer(args[n - 2]) && astIsPointer(args[n - 1]))))) {
+            ((astIsIterator(args[n - 2]) && astIsIterator(args[n - 1])) ||
+             (astIsPointer(args[n - 2]) && astIsPointer(args[n - 1])))) {
             LifetimeStore{
                 args.back(), "Added to container '" + memtok->str() + "'.", ValueFlow::Value::LifetimeKind::Object}
             .byDerefCopy(memtok, tokenlist, errorLogger, settings);
@@ -2519,6 +2513,8 @@ static void valueFlowLifetimeFunction(Token *tok, const TokenList &tokenlist, Er
         for (const Token* returnTok : returns) {
             if (returnTok == tok)
                 continue;
+            if (!ValueFlow::isLifetimeBorrowed(returnTok, settings))
+                return;
             const Variable *returnVar = ValueFlow::getLifetimeVariable(returnTok, settings);
             if (returnVar && returnVar->isArgument() && (returnVar->isConst() || !isVariableChanged(returnVar, settings))) {
                 LifetimeStore ls = LifetimeStore::fromFunctionArg(f, tok, returnVar, tokenlist, settings, errorLogger);
@@ -2591,7 +2587,7 @@ static void valueFlowLifetimeFunction(Token *tok, const TokenList &tokenlist, Er
             std::vector<const Token*> args = getArguments(tok);
             if (iArg > 0 && iArg <= args.size()) {
                 const Token* varTok = args[iArg - 1];
-                if (varTok->variable() && varTok->variable()->isLocal())
+                if (varTok->variable() && varTok->variable()->isLocal() && varTok->variable()->isArray())
                     LifetimeStore{ varTok, "Passed to '" + tok->str() + "'.", ValueFlow::Value::LifetimeKind::Address }.byRef(
                         tok->next(), tokenlist, errorLogger, settings);
             }
@@ -2700,7 +2696,8 @@ static void valueFlowLifetimeClassConstructor(Token* tok,
                 if (isDesignatedInitializerArg)
                     ls.argtok = ls.argtok->astOperand2();
                 const Variable &var = *it;
-                if (var.valueType() && var.valueType()->container && var.valueType()->container->stdStringLike && !var.valueType()->container->view)
+                if (ls.argtok->valueType() && ls.argtok->valueType()->pointer &&
+                    var.valueType() && var.valueType()->container && var.valueType()->container->stdStringLike && !var.valueType()->container->view)
                     return; // TODO: check in isLifetimeBorrowed()?
                 if (var.isReference() || var.isRValueReference()) {
                     ls.byRef(tok, tokenlist, errorLogger, settings);
@@ -3043,7 +3040,7 @@ static void valueFlowLifetime(TokenList &tokenlist, ErrorLogger &errorLogger, co
             // Skip if its a free function that doesnt yield an iterator to the container
             if (Token::Match(parent->previous(), "%name% (") &&
                 !contains({Library::Container::Yield::START_ITERATOR, Library::Container::Yield::END_ITERATOR},
-                          astFunctionYield(parent->previous(), settings)))
+                          astFunctionYield(parent->previous(), settings.library)))
                 continue;
 
             ValueFlow::Value master;
@@ -3055,7 +3052,7 @@ static void valueFlowLifetime(TokenList &tokenlist, ErrorLogger &errorLogger, co
                 master.lifetimeKind = ValueFlow::Value::LifetimeKind::Iterator;
             } else if (astIsIterator(parent) && Token::Match(parent->previous(), "%name% (") &&
                        contains({Library::Container::Yield::START_ITERATOR, Library::Container::Yield::END_ITERATOR},
-                                astFunctionYield(parent->previous(), settings))) {
+                                astFunctionYield(parent->previous(), settings.library))) {
                 master.errorPath.emplace_back(parent, "Iterator to container is created here.");
                 master.lifetimeKind = ValueFlow::Value::LifetimeKind::Iterator;
             } else if ((astIsPointer(parent->tokAt(2)) &&
@@ -3116,7 +3113,7 @@ static void valueFlowLifetime(TokenList &tokenlist, ErrorLogger &errorLogger, co
             valueFlowLifetimeConstructor(tok->next(), tokenlist, errorLogger, settings);
         }
         // Check function calls
-        else if (Token::Match(tok, "%name% (") && !Token::simpleMatch(tok->linkAt(1), ") {")) {
+        else if (tok->scope()->isExecutable() && Token::Match(tok, "%name% (")) {
             valueFlowLifetimeFunction(tok, tokenlist, errorLogger, settings);
         }
         // Unique pointer lifetimes
@@ -3217,6 +3214,14 @@ static Token* findEndOfFunctionCallForParameter(Token* parameterToken)
     return nextAfterAstRightmostLeaf(parent);
 }
 
+static bool isTryEmplace(const Token* tok)
+{
+    if (tok->str() != "(" || !Token::simpleMatch(tok->astOperand1(), ".") || !tok->astOperand1()->astOperand1() || !Token::simpleMatch(tok->astOperand1()->astOperand2(), "try_emplace"))
+        return false;
+    const ValueType* vt = tok->astOperand1()->astOperand1()->valueType();
+    return vt && vt->container && vt->container->stdAssociativeLike;
+}
+
 static void valueFlowAfterMove(const TokenList& tokenlist, const SymbolDatabase& symboldatabase, ErrorLogger& errorLogger, const Settings& settings)
 {
     if (!tokenlist.isCPP() || settings.standards.cpp < Standards::CPP11)
@@ -3259,9 +3264,17 @@ static void valueFlowAfterMove(const TokenList& tokenlist, const SymbolDatabase&
             const nonneg int varId = varTok->varId();
             // x is not MOVED after assignment if code is:  x = ... std::move(x) .. ;
             const Token *parent = tok->astParent();
+            bool bail = false;
             while (parent && parent->str() != "=" && parent->str() != "return" &&
-                   !(parent->str() == "(" && isOpenParenthesisMemberFunctionCallOfVarId(parent, varId)))
+                   !(parent->str() == "(" && isOpenParenthesisMemberFunctionCallOfVarId(parent, varId))) {
+                if (isTryEmplace(parent)) {
+                    bail = true;
+                    break;
+                }
                 parent = parent->astParent();
+            }
+            if (bail)
+                continue;
             if (parent &&
                 (parent->str() == "return" || // MOVED in return statement
                  parent->str() == "(")) // MOVED in self assignment, isOpenParenthesisMemberFunctionCallOfVarId == true
@@ -3279,8 +3292,11 @@ static void valueFlowAfterMove(const TokenList& tokenlist, const SymbolDatabase&
                         ternaryColon = ternaryColon->astParent();
                     if (Token::simpleMatch(ternaryColon, ":")) {
                         endOfFunctionCall = ternaryColon->astOperand2();
-                        if (Token::simpleMatch(endOfFunctionCall, "("))
-                            endOfFunctionCall = endOfFunctionCall->link();
+                        Token* next = nextAfterAstRightmostLeaf(endOfFunctionCall);
+                        if (next)
+                            endOfFunctionCall = next;
+                        else
+                            endOfFunctionCall = endOfFunctionCall->next();
                     }
                 }
                 ValueFlow::Value value;
@@ -3462,7 +3478,7 @@ static void valueFlowConditionExpressions(const TokenList& tokenlist,
             }
 
             // Check if the block terminates early
-            if (isEscapeScope(blockTok, settings)) {
+            if (isEscapeScope(blockTok, settings.library)) {
                 const Scope* scope2 = scope;
                 // If escaping a loop then only use the loop scope
                 if (isBreakOrContinueScope(blockTok->link())) {
@@ -3563,6 +3579,9 @@ static void valueFlowSymbolic(const TokenList& tokenlist, const SymbolDatabase&
                 continue;
             if (tok->astOperand2()->exprId() == 0)
                 continue;
+            if (tok->astOperand2()->variable() && tok->astOperand2()->variable()->isArray() &&
+                tok->astOperand1()->valueType() && tok->astOperand1()->valueType()->pointer) // array to pointer decay
+                continue;
             if (!isConstExpression(tok->astOperand2(), settings.library))
                 continue;
             if (tok->astOperand1()->valueType() && tok->astOperand2()->valueType()) {
@@ -3652,7 +3671,7 @@ static void valueFlowSymbolicOperators(const SymbolDatabase& symboldatabase, con
                     continue;
 
                 ValueFlow::Value v = makeSymbolic(arg);
-                v.errorPath = c.errorPath;
+                v.errorPath = std::move(c.errorPath);
                 v.errorPath.emplace_back(tok, "Passed to " + tok->str());
                 if (c.intvalue == 0)
                     v.setImpossible();
@@ -3682,7 +3701,7 @@ static void valueFlowSymbolicOperators(const SymbolDatabase& symboldatabase, con
                     continue;
                 if (vartok->exprId() == 0)
                     continue;
-                if (Token::Match(tok, "<<|>>|/") && !astIsLHS(vartok))
+                if (Token::Match(tok, "<<|>>|/|-") && !astIsLHS(vartok))
                     continue;
                 if (Token::Match(tok, "<<|>>|^|+|-|%or%") && constant->intvalue != 0)
                     continue;
@@ -3801,12 +3820,27 @@ static void valueFlowForwardConst(Token* start,
 {
     if (!precedes(start, end))
         throw InternalError(var->nameToken(), "valueFlowForwardConst: start token does not precede the end token.");
+    const bool hasContainerSizeValue = std::any_of(values.begin(), values.end(), [](const ValueFlow::Value& value) {
+        return value.isContainerSizeValue();
+    });
     for (Token* tok = start; tok != end; tok = tok->next()) {
         if (tok->varId() == var->declarationId()) {
             for (const ValueFlow::Value& value : values)
                 setTokenValue(tok, value, settings);
         } else {
             [&] {
+                // Add the container size to iterators of the container (mirrors ContainerExpressionAnalyzer::match)
+                if (hasContainerSizeValue && isIteratorOf(tok, var->declarationId())) {
+                    for (const ValueFlow::Value& value : values) {
+                        if (!value.isContainerSizeValue())
+                            continue;
+                        ValueFlow::Value sizeValue = value;
+                        if (!sizeValue.container)
+                            sizeValue.container = var->nameToken();
+                        setTokenValue(tok, std::move(sizeValue), settings);
+                    }
+                    return;
+                }
                 // Follow references
                 const auto& refs = tok->refs();
                 auto it = std::find_if(refs.cbegin(), refs.cend(), [&](const ReferenceToken& ref) {
@@ -4059,7 +4093,7 @@ static std::list<ValueFlow::Value> truncateValues(std::list<ValueFlow::Value> va
         }
 
         if (value.isIntValue() && sz > 0 && sz < sizeof(MathLib::biguint))
-            value.intvalue = ValueFlow::truncateIntValue(value.intvalue, sz, dst->sign);
+            value.intvalue = ValueFlow::truncateIntValue(value.intvalue, sz, dst, settings.platform);
     }
     return values;
 }
@@ -4079,6 +4113,8 @@ static bool isVariableInit(const Token *tok)
         return false;
     if (var->nameToken() != tok->astOperand1())
         return false;
+    if (var->isPointer())
+        return true;
     const ValueType* vt = var->valueType();
     if (!vt)
         return false;
@@ -4101,7 +4137,7 @@ static bool intersects(const C1& c1, const C2& c2)
     return false;
 }
 
-static void valueFlowAfterAssign(TokenList &tokenlist,
+static void valueFlowAfterAssign(const TokenList &tokenlist,
                                  const SymbolDatabase& symboldatabase,
                                  ErrorLogger &errorLogger,
                                  const Settings &settings,
@@ -4150,11 +4186,15 @@ static void valueFlowAfterAssign(TokenList &tokenlist,
             values.remove_if([&](const ValueFlow::Value& value) {
                 return types.count(value.valueType) > 0;
             });
-            // Remove container size if its not a container
-            if (!astIsContainer(tok->astOperand2()))
+            // Remove container size if its not a container - unless the size records its container
+            // and flows into a pointer to the container data (e.g. p = v.data())
+            if (!astIsContainer(tok->astOperand2())) {
+                const bool lhsIsPointer = astIsPointer(tok->astOperand1());
                 values.remove_if([&](const ValueFlow::Value& value) {
-                    return value.valueType == ValueFlow::Value::ValueType::CONTAINER_SIZE;
+                    return value.valueType == ValueFlow::Value::ValueType::CONTAINER_SIZE &&
+                           (!value.container || !lhsIsPointer);
                 });
+            }
             // Remove symbolic values that are the same as the LHS
             values.remove_if([&](const ValueFlow::Value& value) {
                 if (value.isSymbolicValue() && value.tokvalue)
@@ -4214,6 +4254,7 @@ static void valueFlowAfterAssign(TokenList &tokenlist,
                         continue;
                     const Token* expr = value.tokvalue;
                     value.intvalue = -value.intvalue;
+                    value.invertBound();
                     value.tokvalue = tok->astOperand1();
 
                     // Skip if it intersects with an already assigned symbol
@@ -4531,7 +4572,7 @@ struct ConditionHandler {
                 }
 
                 // Variable changed in loop code
-                const Token* const start = top;
+                const Token* const start = top->strAt(-1) == "for" ? top->astOperand2() : top; // skip init statement
                 const Token* const block = top->link()->next();
                 const Token* const end = block->link();
 
@@ -4605,6 +4646,14 @@ struct ConditionHandler {
         });
     }
 
+    static void lowerToInconclusive(std::list<ValueFlow::Value>& values)
+    {
+        for (ValueFlow::Value& v : values) {
+            if (!v.isImpossible())
+                v.setInconclusive();
+        }
+    }
+
     void afterCondition(TokenList& tokenlist,
                         const SymbolDatabase& symboldatabase,
                         ErrorLogger& errorLogger,
@@ -4837,10 +4886,13 @@ struct ConditionHandler {
                 else if (!dead_if)
                     dead_if = isReturnScope(after, settings.library, &unknownFunction);
 
+                // If the taken branch might not return (it ends in a call to an unknown,
+                // possibly noreturn function) then its values might not flow past the
+                // conditional code -> lower them to inconclusive.
                 if (!dead_if && unknownFunction) {
                     if (settings.debugwarnings)
                         bailout(tokenlist, errorLogger, unknownFunction, "possible noreturn scope");
-                    return;
+                    lowerToInconclusive(thenValues);
                 }
 
                 if (Token::simpleMatch(after, "} else {")) {
@@ -4851,7 +4903,7 @@ struct ConditionHandler {
                     if (!dead_else && unknownFunction) {
                         if (settings.debugwarnings)
                             bailout(tokenlist, errorLogger, unknownFunction, "possible noreturn scope");
-                        return;
+                        lowerToInconclusive(elseValues);
                     }
                 }
 
@@ -4867,11 +4919,15 @@ struct ConditionHandler {
                     std::copy_if(thenValues.cbegin(),
                                  thenValues.cend(),
                                  std::back_inserter(values),
-                                 std::mem_fn(&ValueFlow::Value::isPossible));
+                                 [](const ValueFlow::Value& v) {
+                        return v.isPossible() || v.isInconclusive();
+                    });
                     std::copy_if(elseValues.cbegin(),
                                  elseValues.cend(),
                                  std::back_inserter(values),
-                                 std::mem_fn(&ValueFlow::Value::isPossible));
+                                 [](const ValueFlow::Value& v) {
+                        return v.isPossible() || v.isInconclusive();
+                    });
                 }
 
                 if (values.empty())
@@ -4944,6 +5000,24 @@ static void valueFlowCondition(const ValuePtr<ConditionHandler>& handler,
     handler->afterCondition(tokenlist, symboldatabase, errorLogger, settings, skippedFunctions);
 }
 
+static const Token* getConditionVariable(const Token* tok)
+{
+    if (tok->str() == "!")
+        return tok->astOperand1();
+
+    if (const Token* parent = tok->astParent()) {
+        if (Token::Match(parent, "%oror%|&&|?") ||
+            Token::Match(parent->previous(), "if|while (") ||
+            (parent->str() == ";" && astIsLHS(tok) && Token::simpleMatch(parent->astParent(), ";"))) { // for loop condition
+            if (Token::simpleMatch(tok, "="))
+                return tok->astOperand1();
+            if (!Token::Match(tok, "%comp%|%assign%"))
+                return tok;
+        }
+    }
+    return nullptr;
+}
+
 struct SimpleConditionHandler : ConditionHandler {
     std::vector<Condition> parse(const Token* tok, const Settings& /*settings*/) const override {
 
@@ -4962,19 +5036,7 @@ struct SimpleConditionHandler : ConditionHandler {
         if (!conds.empty())
             return conds;
 
-        const Token* vartok = nullptr;
-
-        if (tok->str() == "!") {
-            vartok = tok->astOperand1();
-
-        } else if (tok->astParent() && (Token::Match(tok->astParent(), "%oror%|&&|?") ||
-                                        Token::Match(tok->astParent()->previous(), "if|while ("))) {
-            if (Token::simpleMatch(tok, "="))
-                vartok = tok->astOperand1();
-            else if (!Token::Match(tok, "%comp%|%assign%"))
-                vartok = tok;
-        }
-
+        const Token* vartok = getConditionVariable(tok);
         if (!vartok)
             return {};
         Condition cond;
@@ -5066,12 +5128,11 @@ static void valueFlowInferCondition(TokenList& tokenlist, const Settings& settin
             }
         } else if (Token::Match(tok->astParent(), "?|&&|!|%oror%") ||
                    Token::Match(tok->astParent()->previous(), "if|while (") ||
-                   (astIsPointer(tok) && isUsedAsBool(tok, settings))) {
+                   ((astIsPointer(tok) || tok->function()) && isUsedAsBool(tok, settings))) {
             std::vector<ValueFlow::Value> result = infer(makeIntegralInferModel(), "!=", tok->values(), 0);
             if (result.size() != 1)
                 continue;
-            ValueFlow::Value value = result.front();
-            setTokenValue(tok, std::move(value), settings);
+            setTokenValue(tok, std::move(result.front()), settings);
         }
     }
 }
@@ -5142,9 +5203,9 @@ struct SymbolicConditionHandler : SimpleConditionHandler {
 };
 
 static bool valueFlowForLoop2(const Token *tok,
-                              ProgramMemory *memory1,
-                              ProgramMemory *memory2,
-                              ProgramMemory *memoryAfter,
+                              ProgramMemory &memory1,
+                              ProgramMemory &memory2,
+                              ProgramMemory &memoryAfter,
                               const Settings& settings)
 {
     // for ( firstExpression ; secondExpression ; thirdExpression )
@@ -5159,8 +5220,18 @@ static bool valueFlowForLoop2(const Token *tok,
     if (error)
         return false;
     execute(secondExpression, programMemory, &result, &error, settings);
-    if (result == 0) // 2nd expression is false => no looping
+    if (result == 0) {
+        if (!error) { // 2nd expression is false => no looping
+            ProgramMemory startMemory(programMemory);
+            ProgramMemory endMemory(programMemory);
+
+            memory1.swap(startMemory);
+            memory2.swap(endMemory);
+            memoryAfter.swap(programMemory);
+            return true;
+        }
         return false;
+    }
     if (error) {
         // If a variable is reassigned in second expression, return false
         bool reassign = false;
@@ -5187,13 +5258,10 @@ static bool valueFlowForLoop2(const Token *tok,
     }
     // TODO: add bailout message
 
-    if (memory1)
-        memory1->swap(startMemory);
+    memory1.swap(startMemory);
     if (!error) {
-        if (memory2)
-            memory2->swap(endMemory);
-        if (memoryAfter)
-            memoryAfter->swap(programMemory);
+        memory2.swap(endMemory);
+        memoryAfter.swap(programMemory);
     }
 
     return true;
@@ -5320,6 +5388,11 @@ static void valueFlowForLoopSimplifyAfter(Token* fortok, nonneg int varid, const
         endToken = fortok->scope()->bodyEnd;
 
     Token* blockTok = fortok->linkAt(1)->linkAt(1);
+    if (const Token* escape = findEscapeStatement(blockTok->scope(), settings.library)) {
+        if (settings.debugwarnings)
+            bailout(tokenlist, errorLogger, escape, "For loop variable bailout on escape statement");
+        return;
+    }
     if (blockTok != endToken) {
         ValueFlow::Value v{num};
         v.errorPath.emplace_back(fortok,"After for loop, " + var->name() + " has value " + v.infoString());
@@ -5368,24 +5441,33 @@ static void valueFlowForLoop(const TokenList &tokenlist, const SymbolDatabase& s
             valueFlowForLoopSimplifyAfter(tok, varid, afterValue, tokenlist, errorLogger, settings);
         } else {
             ProgramMemory mem1, mem2, memAfter;
-            if (valueFlowForLoop2(tok, &mem1, &mem2, &memAfter, settings)) {
-                for (const auto& p : mem1) {
-                    if (!p.second.isIntValue())
-                        continue;
-                    if (p.second.isImpossible())
-                        continue;
-                    if (p.first.tok->varId() == 0)
-                        continue;
-                    valueFlowForLoopSimplify(bodyStart, p.first.tok, false, p.second.intvalue, tokenlist, errorLogger, settings);
-                }
-                for (const auto& p : mem2) {
-                    if (!p.second.isIntValue())
-                        continue;
-                    if (p.second.isImpossible())
-                        continue;
-                    if (p.first.tok->varId() == 0)
-                        continue;
-                    valueFlowForLoopSimplify(bodyStart, p.first.tok, false, p.second.intvalue, tokenlist, errorLogger, settings);
+            if (valueFlowForLoop2(tok, mem1, mem2, memAfter, settings)) {
+                if (mem1 == memAfter) { // #8192 check if loop never runs
+                    Token* condTok = getCondTok(tok);
+                    if (condTok && !condTok->hasKnownIntValue()) {
+                        ValueFlow::Value v(0);
+                        v.setKnown();
+                        ValueFlow::setTokenValue(condTok, std::move(v), settings);
+                    }
+                } else {
+                    for (const auto& p : mem1) {
+                        if (!p.second.isIntValue())
+                            continue;
+                        if (p.second.isImpossible())
+                            continue;
+                        if (p.first.tok->varId() == 0)
+                            continue;
+                        valueFlowForLoopSimplify(bodyStart, p.first.tok, false, p.second.intvalue, tokenlist, errorLogger, settings);
+                    }
+                    for (const auto& p : mem2) {
+                        if (!p.second.isIntValue())
+                            continue;
+                        if (p.second.isImpossible())
+                            continue;
+                        if (p.first.tok->varId() == 0)
+                            continue;
+                        valueFlowForLoopSimplify(bodyStart, p.first.tok, false, p.second.intvalue, tokenlist, errorLogger, settings);
+                    }
                 }
                 for (const auto& p : memAfter) {
                     if (!p.second.isIntValue())
@@ -5490,7 +5572,7 @@ static void valueFlowInjectParameter(const TokenList& tokenlist,
                                      const Settings& settings,
                                      const Variable* arg,
                                      const Scope* functionScope,
-                                     const std::list<ValueFlow::Value>& argvalues)
+                                     std::list<ValueFlow::Value> argvalues)
 {
     // Is argument passed by value or const reference, and is it a known non-class type?
     if (arg->isReference() && !arg->isConst() && !arg->isClass())
@@ -5504,7 +5586,7 @@ static void valueFlowInjectParameter(const TokenList& tokenlist,
     valueFlowForward(const_cast<Token*>(functionScope->bodyStart->next()),
                      functionScope->bodyEnd,
                      arg->nameToken(),
-                     argvalues,
+                     std::move(argvalues),
                      tokenlist,
                      errorLogger,
                      settings);
@@ -5678,7 +5760,7 @@ static void valueFlowSubFunction(const TokenList& tokenlist,
                 // Remove uninit values if argument is passed by value
                 if (argtok->variable() && !argtok->variable()->isPointer() && argvalues.size() == 1 &&
                     argvalues.front().isUninitValue()) {
-                    if (CheckUninitVar::isVariableUsage(argtok, settings.library, false, CheckUninitVar::Alloc::NO_ALLOC, 0))
+                    if (CheckUninitVarImpl::isVariableUsage(argtok, settings.library, false, CheckUninitVarImpl::Alloc::NO_ALLOC, 0))
                         continue;
                 }
 
@@ -5717,7 +5799,7 @@ static void valueFlowFunctionDefaultParameter(const TokenList& tokenlist, const
         const Function* function = scope->function;
         if (!function)
             continue;
-        for (nonneg int arg = function->minArgCount(); arg < function->argCount(); arg++) {
+        for (size_t arg = function->minArgCount(); arg < function->argCount(); arg++) {
             const Variable* var = function->getArgumentVar(arg);
             if (var && var->hasDefault() && Token::Match(var->nameToken(), "%var% = %num%|%str%|%char%|%name% [,)]")) {
                 const std::list<ValueFlow::Value> &values = var->nameToken()->tokAt(2)->values();
@@ -5731,7 +5813,7 @@ static void valueFlowFunctionDefaultParameter(const TokenList& tokenlist, const
                     argvalues.push_back(std::move(v));
                 }
                 if (!argvalues.empty())
-                    valueFlowInjectParameter(tokenlist, errorLogger, settings, var, scope, argvalues);
+                    valueFlowInjectParameter(tokenlist, errorLogger, settings, var, scope, std::move(argvalues));
             }
         }
     }
@@ -5874,7 +5956,7 @@ static bool needsInitialization(const Variable* var)
             return true;
         if (var->valueType()->type == ValueType::Type::ITERATOR)
             return true;
-        if (var->isStlType() && var->isArray()) {
+        if (var->isStlType() && var->getTypeName() == "std::array") {
             if (const Token* ctt = var->valueType()->containerTypeToken) {
                 if (ctt->isStandardType())
                     return true;
@@ -5959,9 +6041,12 @@ static Token* findStartToken(const Variable* var, Token* start, const Library& l
     }))
         return first->previous();
     // Compute the outer scope
-    while (scope && scope->nestedIn != var->scope())
+    while (scope && scope->nestedIn != var->scope()) {
+        if (scope->type == ScopeType::eLambda && !Token::simpleMatch(scope->bodyEnd, "} ("))
+            return start;
         scope = scope->nestedIn;
-    if (!scope)
+    }
+    if (!scope || (scope->type == ScopeType::eLambda && !Token::simpleMatch(scope->bodyEnd, "} (")))
         return start;
     auto* tok = const_cast<Token*>(scope->bodyStart);
     if (!tok)
@@ -6114,7 +6199,7 @@ static bool isContainerSizeChangedByFunction(const Token* tok,
     }
 
     bool inconclusive = false;
-    const bool isChanged = isVariableChangedByFunctionCall(tok, indirect, settings, &inconclusive);
+    const bool isChanged = isVariableChangedByFunctionCall(tok, indirect, settings.library, &inconclusive);
     return (isChanged || inconclusive);
 }
 
@@ -6199,6 +6284,8 @@ bool ValueFlow::isContainerSizeChanged(const Token* tok, int indirect, const Set
         return true;
     if (astIsLHS(tok) && Token::simpleMatch(tok->astParent(), "["))
         return tok->valueType()->container->stdAssociativeLike;
+    if (Token::simpleMatch(tok->astParent(), "*") && indirect > 0)
+        return isContainerSizeChanged(tok->astParent(), indirect - 1, settings, depth + 1);
     const Library::Container::Action action = astContainerAction(tok, settings.library);
     switch (action) {
     case Library::Container::Action::RESIZE:
@@ -6317,9 +6404,9 @@ static void valueFlowSmartPointer(TokenList &tokenlist, ErrorLogger & errorLogge
     }
 }
 
-static Library::Container::Yield findIteratorYield(Token* tok, const Token*& ftok, const Settings& settings)
+static Library::Container::Yield findIteratorYield(Token* tok, const Token*& ftok, const Library& library)
 {
-    auto yield = astContainerYield(tok, settings.library, &ftok);
+    auto yield = astContainerYield(tok, library, &ftok);
     if (ftok)
         return yield;
 
@@ -6327,7 +6414,7 @@ static Library::Container::Yield findIteratorYield(Token* tok, const Token*& fto
         return yield;
 
     // begin/end free functions
-    return astFunctionYield(tok->astParent()->previous(), settings, &ftok);
+    return astFunctionYield(tok->astParent()->previous(), library, &ftok);
 }
 
 static void valueFlowIterators(TokenList& tokenlist, const Settings& settings)
@@ -6340,20 +6427,25 @@ static void valueFlowIterators(TokenList& tokenlist, const Settings& settings)
         if (!astIsContainer(tok))
             continue;
         const Token* ftok = nullptr;
-        const Library::Container::Yield yield = findIteratorYield(tok, ftok, settings);
+        const Library::Container::Yield yield = findIteratorYield(tok, ftok, settings.library);
         if (!ftok)
             continue;
-        if (yield == Library::Container::Yield::START_ITERATOR) {
-            ValueFlow::Value v(0);
-            v.setKnown();
-            v.valueType = ValueFlow::Value::ValueType::ITERATOR_START;
-            setTokenValue(const_cast<Token*>(ftok)->next(), std::move(v), settings);
-        } else if (yield == Library::Container::Yield::END_ITERATOR) {
-            ValueFlow::Value v(0);
-            v.setKnown();
-            v.valueType = ValueFlow::Value::ValueType::ITERATOR_END;
-            setTokenValue(const_cast<Token*>(ftok)->next(), std::move(v), settings);
-        }
+        if (yield != Library::Container::Yield::START_ITERATOR && yield != Library::Container::Yield::END_ITERATOR)
+            continue;
+        // The iterator value records the container it iterates. A pointer or a reference only
+        // transports the iterator, so record the container it refers to instead.
+        const Token* containerTok = tok;
+        if (astIsPointer(containerTok) || (containerTok->variable() && containerTok->variable()->isReference())) {
+            const ValueFlow::Value lifetime = ValueFlow::getLifetimeObjValue(containerTok);
+            if (lifetime.tokvalue && astIsContainer(lifetime.tokvalue) && !astIsPointer(lifetime.tokvalue))
+                containerTok = lifetime.tokvalue;
+        }
+        ValueFlow::Value v(0);
+        v.setKnown();
+        v.valueType = yield == Library::Container::Yield::START_ITERATOR ? ValueFlow::Value::ValueType::ITERATOR_START
+                                                                         : ValueFlow::Value::ValueType::ITERATOR_END;
+        v.container = containerTok;
+        setTokenValue(const_cast<Token*>(ftok)->next(), std::move(v), settings);
     }
 }
 
@@ -6491,6 +6583,9 @@ static std::vector<ValueFlow::Value> getContainerSizeFromConstructorArgs(const s
         if (astIsPointer(args[0])) {
             if (args.size() == 1 && args[0]->tokType() == Token::Type::eString)
                 return {makeContainerSizeValue(Token::getStrLength(args[0]), known)};
+            if (args.size() == 1 && args[0]->variable() && args[0]->variable()->isArray() &&
+                args[0]->variable()->isConst() && args[0]->variable()->dimensions().size() == 1 && args[0]->variable()->dimensions()[0].known)
+                return {makeContainerSizeValue(args[0]->variable()->dimensions()[0].num, known)};
             if (args.size() == 2 && astIsIntegral(args[1], false)) // { char*, count }
                 return {makeContainerSizeValue(args[1], known)};
         } else if (astIsContainer(args[0])) {
@@ -6504,10 +6599,12 @@ static std::vector<ValueFlow::Value> getContainerSizeFromConstructorArgs(const s
     return {};
 }
 
-static bool valueFlowIsSameContainerType(const ValueType& contType, const Token* tok, const Settings& settings)
+static bool valueFlowIsSameContainerType(const ValueType& contType, const Token* tok, bool isView, const Settings& settings)
 {
-    if (!tok || !tok->valueType() || !tok->valueType()->containerTypeToken)
+    if (!tok || !tok->valueType())
         return true;
+    if (!tok->valueType()->containerTypeToken)
+        return !isView;
 
     const ValueType tokType = ValueType::parseDecl(tok->valueType()->containerTypeToken, settings);
     return contType.isTypeEqual(&tokType) || tokType.type == ValueType::Type::UNKNOWN_TYPE;
@@ -6536,7 +6633,7 @@ static std::vector<ValueFlow::Value> getInitListSize(const Token* tok,
                 initList = true;
             else if (vt.isIntegral() && astIsIntegral(args[0], false))
                 initList = true;
-            else if (args.size() == 1 && valueFlowIsSameContainerType(vt, tok->astOperand2(), settings))
+            else if (args.size() == 1 && valueFlowIsSameContainerType(vt, tok->astOperand2(), valueType->container->view, settings))
                 initList = false; // copy ctor
             else if (args.size() == 2 && (!args[0]->valueType() || !args[1]->valueType())) // might be unknown iterators
                 initList = false;
@@ -6706,23 +6803,25 @@ static void valueFlowContainerSize(const TokenList& tokenlist,
                 for (const ValueFlow::Value& value : values)
                     setTokenValue(tok, value, settings);
             }
-            else if (Token::Match(tok->previous(), ",|( {|%str%")) {
-                int nArg{};
-                if (const Token* funcTok = getTokenArgumentFunction(tok, nArg)) {
-                    if (const Function* func = funcTok->function()) {
-                        if (const Variable* var = func->getArgumentVar(nArg)) {
-                            if (var->valueType() && var->valueType()->container && var->valueType()->container->size_templateArgNo < 0) {
-                                auto values = tok->tokType() == Token::Type::eString
-                                   ? std::vector<ValueFlow::Value>{makeContainerSizeValue(Token::getStrLength(tok))}
-                                   : getInitListSize(tok, var->valueType(), settings, true);
-                                ValueFlow::Value tokValue;
-                                tokValue.valueType = ValueFlow::Value::ValueType::TOK;
-                                tokValue.tokvalue = tok;
-                                tokValue.setKnown();
-                                values.push_back(std::move(tokValue));
-
-                                for (const ValueFlow::Value &value : values)
-                                    setTokenValue(tok, value, settings);
+            else if (Token::Match(tok->previous(), ",|(") && (Token::Match(tok, "{|%str%") || settings.library.detectContainer(tok))) {
+                if (Token* argTok = tok->previous()->astOperand2()) {
+                    int nArg{};
+                    if (const Token* funcTok = getTokenArgumentFunction(argTok, nArg)) {
+                        if (const Function* func = funcTok->function()) {
+                            if (const Variable* var = func->getArgumentVar(nArg)) {
+                                if (var->valueType() && var->valueType()->container && var->valueType()->container->size_templateArgNo < 0) {
+                                    auto values = argTok->tokType() == Token::Type::eString
+                                        ? std::vector<ValueFlow::Value>{makeContainerSizeValue(Token::getStrLength(argTok))}
+                                    : getInitListSize(argTok, var->valueType(), settings, true);
+                                    ValueFlow::Value tokValue;
+                                    tokValue.valueType = ValueFlow::Value::ValueType::TOK;
+                                    tokValue.tokvalue = argTok;
+                                    tokValue.setKnown();
+                                    values.push_back(std::move(tokValue));
+
+                                    for (const ValueFlow::Value& value : values)
+                                        setTokenValue(argTok, value, settings);
+                                }
                             }
                         }
                     }
@@ -6772,17 +6871,17 @@ static void valueFlowContainerSize(const TokenList& tokenlist,
             } else if (tok->str() == "+=" && astIsContainer(tok->astOperand1())) {
                 const Token* containerTok = tok->astOperand1();
                 const Token* valueTok = tok->astOperand2();
-                const MathLib::bigint size = ValueFlow::valueFlowGetStrLength(valueTok);
+                const MathLib::bigint size = ValueFlow::valueFlowGetStrLength(valueTok, settings.library);
                 forwardMinimumContainerSize(size, tok, containerTok);
 
             } else if (tok->str() == "=" && Token::simpleMatch(tok->astOperand2(), "+") && astIsContainerString(tok)) {
                 const Token* tok2 = tok->astOperand2();
                 MathLib::bigint size = 0;
                 while (Token::simpleMatch(tok2, "+") && tok2->astOperand2()) {
-                    size += ValueFlow::valueFlowGetStrLength(tok2->astOperand2());
+                    size += ValueFlow::valueFlowGetStrLength(tok2->astOperand2(), settings.library);
                     tok2 = tok2->astOperand1();
                 }
-                size += ValueFlow::valueFlowGetStrLength(tok2);
+                size += ValueFlow::valueFlowGetStrLength(tok2, settings.library);
                 forwardMinimumContainerSize(size, tok, tok->astOperand1());
             }
         }
@@ -6898,6 +6997,12 @@ static void valueFlowDynamicBufferSize(const TokenList& tokenlist, const SymbolD
     auto getBufferSizeFromNew = [&](const Token* newTok) -> MathLib::bigint {
         MathLib::bigint sizeValue = -1, numElem = -1;
 
+        // ::operator new(size_t size)
+        if (Token::Match(newTok->astOperand1(), "::| operatornew")) {
+            const Token *sizeTok = newTok->astOperand2();
+            return sizeTok->hasKnownIntValue() ? sizeTok->getKnownIntValue() : -1;
+        }
+
         if (newTok && newTok->astOperand1()) { // number of elements
             const Token* bracTok = nullptr, *typeTok = nullptr;
             if (newTok->astOperand1()->str() == "[")
@@ -6944,7 +7049,7 @@ static void valueFlowDynamicBufferSize(const TokenList& tokenlist, const SymbolD
             if (!rhs)
                 continue;
 
-            const bool isNew = rhs->isCpp() && rhs->str() == "new";
+            const bool isNew = rhs->isCpp() && (rhs->str() == "new" || (rhs->str() == "(" && Token::Match(rhs->astOperand1(), "::| operatornew")));
             if (!isNew && !Token::Match(rhs->previous(), "%name% ("))
                 continue;
 
@@ -6968,7 +7073,7 @@ static bool getMinMaxValues(const std::string& typestr,
                             MathLib::bigint& maxvalue)
 {
     TokenList typeTokens(settings, cpp ? Standards::Language::CPP : Standards::Language::C);
-    const std::string str(typestr + ";");
+    const std::string str(typestr + ";\n");
     if (!typeTokens.createTokensFromBuffer(str.data(), str.size()))
         return false;
     typeTokens.simplifyPlatformTypes();
@@ -7159,10 +7264,10 @@ struct ValueFlowState {
         : tokenlist(tokenlist), symboldatabase(symboldatabase), errorLogger(errorLogger), settings(settings)
     {}
 
-    TokenList& tokenlist;
-    SymbolDatabase& symboldatabase;
-    ErrorLogger& errorLogger;
-    const Settings& settings;
+    RefThunk<TokenList> tokenlist;
+    RefThunk<SymbolDatabase> symboldatabase;
+    RefThunk<ErrorLogger> errorLogger;
+    RefThunk<const Settings> settings;
     std::set<const Scope*> skippedFunctions;
 };
 
@@ -7191,48 +7296,59 @@ struct ValueFlowPassRunner {
     bool run_once(std::initializer_list<ValuePtr<ValueFlowPass>> passes) const
     {
         return std::any_of(passes.begin(), passes.end(), [&](const ValuePtr<ValueFlowPass>& pass) {
-            return run(pass);
+            return run(pass, 0);
         });
     }
 
     bool run(std::initializer_list<ValuePtr<ValueFlowPass>> passes) const
     {
         std::size_t values = 0;
-        std::size_t n = state.settings.vfOptions.maxIterations;
+        std::size_t n = state.settings().vfOptions.maxIterations;
+        const bool doProgress = state.settings().reportProgress >= 0;
         while (n > 0 && values != getTotalValues()) {
             values = getTotalValues();
+            const std::size_t passnum = state.settings().vfOptions.maxIterations - n + 1;
+            const std::string passnum_s = std::to_string(passnum);
             if (std::any_of(passes.begin(), passes.end(), [&](const ValuePtr<ValueFlowPass>& pass) {
-                return run(pass);
+                // the string concatination is a hot spot in TestIO::testScanfArgument and TestIO::testPrintfArgumentVariables
+                std::string stage = doProgress ? std::string("ValueFlow::") + pass->name() + (' ' + passnum_s) : "";
+                ProgressReporter progressReporter(state.errorLogger, state.settings().reportProgress, state.tokenlist().getSourceFilePath(), std::move(stage));
+                return run(pass, passnum);
             }))
                 return true;
             --n;
         }
-        if (state.settings.debugwarnings) {
+        if (state.settings().debugwarnings) {
             if (n == 0 && values != getTotalValues()) {
-                ErrorMessage::FileLocation loc(state.tokenlist.getFiles()[0], 0, 0);
+                ErrorMessage::FileLocation loc(state.tokenlist().getFiles()[0], 0, 0);
                 ErrorMessage errmsg({std::move(loc)},
                                     "",
                                     Severity::debug,
                                     "ValueFlow maximum iterations exceeded",
                                     "valueFlowMaxIterations",
                                     Certainty::normal);
-                state.errorLogger.reportErr(errmsg);
+                state.errorLogger().reportErr(errmsg);
             }
         }
         return false;
     }
 
-    bool run(const ValuePtr<ValueFlowPass>& pass) const
+    bool run(const ValuePtr<ValueFlowPass>& pass, std::size_t it) const
     {
         auto start = Clock::now();
         if (start > stop) {
             // TODO: add bailout message
             return true;
         }
-        if (!state.tokenlist.isCPP() && pass->cpp())
+        if (!state.tokenlist().isCPP() && pass->cpp())
             return false;
         if (timerResults) {
-            Timer t(pass->name(), state.settings.showtime, timerResults);
+            std::string name = pass->name();
+            if (it > 0) {
+                name += ' ';
+                name += std::to_string(it);
+            }
+            Timer t(name, timerResults);
             pass->run(state);
         } else {
             pass->run(state);
@@ -7243,15 +7359,15 @@ struct ValueFlowPassRunner {
     std::size_t getTotalValues() const
     {
         std::size_t n = 1;
-        for (Token* tok = state.tokenlist.front(); tok; tok = tok->next())
+        for (Token* tok = state.tokenlist().front(); tok; tok = tok->next())
             n += tok->values().size();
         return n;
     }
 
     void setSkippedFunctions()
     {
-        if (state.settings.vfOptions.maxIfCount > 0) {
-            for (const Scope* functionScope : state.symboldatabase.functionScopes) {
+        if (state.settings().vfOptions.maxIfCount > 0) {
+            for (const Scope* functionScope : state.symboldatabase().functionScopes) {
                 int countIfScopes = 0;
                 std::vector<const Scope*> scopes{functionScope};
                 while (!scopes.empty()) {
@@ -7263,22 +7379,22 @@ struct ValueFlowPassRunner {
                             ++countIfScopes;
                     }
                 }
-                if (countIfScopes > state.settings.vfOptions.maxIfCount) {
+                if (countIfScopes > state.settings().vfOptions.maxIfCount) {
                     state.skippedFunctions.emplace(functionScope);
 
-                    if (state.settings.severity.isEnabled(Severity::information)) {
+                    if (state.settings().severity.isEnabled(Severity::information)) {
                         const std::string& functionName = functionScope->className;
                         std::list<ErrorMessage::FileLocation> callstack(
                             1,
-                            ErrorMessage::FileLocation(functionScope->bodyStart, &state.tokenlist));
+                            ErrorMessage::FileLocation(functionScope->bodyStart, &state.tokenlist()));
                         const ErrorMessage errmsg(std::move(callstack),
-                                                  state.tokenlist.getSourceFilePath(),
+                                                  state.tokenlist().getSourceFilePath(),
                                                   Severity::information,
                                                   "Limiting ValueFlow analysis in function '" + functionName + "' since it is too complex. "
                                                   "Please specify --check-level=exhaustive to perform full analysis.",
                                                   "checkLevelNormal", // TODO: use more specific ID
                                                   Certainty::normal);
-                        state.errorLogger.reportErr(errmsg);
+                        state.errorLogger().reportErr(errmsg);
                     }
                 }
             }
@@ -7287,8 +7403,8 @@ struct ValueFlowPassRunner {
 
     void setStopTime()
     {
-        if (state.settings.vfOptions.maxTime >= 0)
-            stop = Clock::now() + std::chrono::seconds{state.settings.vfOptions.maxTime};
+        if (state.settings().vfOptions.maxTime >= 0)
+            stop = Clock::now() + std::chrono::seconds{state.settings().vfOptions.maxTime};
     }
 
     ValueFlowState state;
@@ -7345,6 +7461,8 @@ void ValueFlow::setValues(TokenList& tokenlist,
                           const Settings& settings,
                           TimerResultsIntf* timerResults)
 {
+    ProgressReporter progressReporter(errorLogger, settings.reportProgress, tokenlist.getSourceFilePath(), "ValueFlow");
+
     for (Token* tok = tokenlist.front(); tok; tok = tok->next())
         tok->clearValueFlow();
 
@@ -7362,7 +7480,7 @@ void ValueFlow::setValues(TokenList& tokenlist,
 
     ValueFlowPassRunner runner{ValueFlowState{tokenlist, symboldatabase, errorLogger, settings}, timerResults};
     runner.run_once({
-        VFA(valueFlowEnumValue(symboldatabase, settings)),
+        VFA(valueFlowEnumValueEarly(symboldatabase, settings)),
         VFA(valueFlowNumber(tokenlist, settings)),
         VFA(valueFlowString(tokenlist, settings)),
         VFA(valueFlowTypeTraits(tokenlist, settings)),
@@ -7384,7 +7502,6 @@ void ValueFlow::setValues(TokenList& tokenlist,
         VFA(valueFlowSymbolicOperators(symboldatabase, settings)),
         VFA(valueFlowCondition(SymbolicConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions)),
         VFA(valueFlowSymbolicInfer(symboldatabase, settings)),
-        VFA(valueFlowArrayBool(tokenlist, settings)),
         VFA(valueFlowArrayElement(tokenlist, settings)),
         VFA(valueFlowRightShift(tokenlist, settings)),
         VFA_CPP(
@@ -7395,6 +7512,7 @@ void ValueFlow::setValues(TokenList& tokenlist,
         VFA(valueFlowInferCondition(tokenlist, settings)),
         VFA(valueFlowSwitchVariable(tokenlist, symboldatabase, errorLogger, settings)),
         VFA(valueFlowForLoop(tokenlist, symboldatabase, errorLogger, settings)),
+        VFA(valueFlowDynamicBufferSize(tokenlist, symboldatabase, errorLogger, settings)),
         VFA(valueFlowSubFunction(tokenlist, symboldatabase, errorLogger, settings)),
         VFA(valueFlowFunctionReturn(tokenlist, errorLogger, settings)),
         VFA(valueFlowLifetime(tokenlist, errorLogger, settings)),
@@ -7411,7 +7529,6 @@ void ValueFlow::setValues(TokenList& tokenlist,
     });
 
     runner.run_once({
-        VFA(valueFlowDynamicBufferSize(tokenlist, symboldatabase, errorLogger, settings)),
         VFA(valueFlowDebug(tokenlist, errorLogger, settings)), // TODO: add option to print it after each step/iteration
     });
 }
diff --git a/lib/valueflow.h b/lib/valueflow.h
index a813ff8d286..f701f55c418 100644
--- a/lib/valueflow.h
+++ b/lib/valueflow.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/lib/valueptr.h b/lib/valueptr.h
index 5e0bea0196b..b6f02ef1186 100644
--- a/lib/valueptr.h
+++ b/lib/valueptr.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,12 +53,12 @@ class CPPCHECKLIB ValuePtr {
             mPtr.reset(mClone(rhs.get()));
         }
     }
-    ValuePtr(ValuePtr&& rhs) NOEXCEPT : mPtr(std::move(rhs.mPtr)), mClone(std::move(rhs.mClone)) {}
+    ValuePtr(ValuePtr&& rhs) noexcept : mPtr(std::move(rhs.mPtr)), mClone(std::move(rhs.mClone)) {}
 
-    T* get() NOEXCEPT {
+    T* get() noexcept {
         return mPtr.get();
     }
-    const T* get() const NOEXCEPT {
+    const T* get() const noexcept {
         return mPtr.get();
     }
 
@@ -69,14 +69,14 @@ class CPPCHECKLIB ValuePtr {
         return *get();
     }
 
-    T* operator->() NOEXCEPT {
+    T* operator->() noexcept {
         return get();
     }
-    const T* operator->() const NOEXCEPT {
+    const T* operator->() const noexcept {
         return get();
     }
 
-    void swap(ValuePtr& rhs) NOEXCEPT {
+    void swap(ValuePtr& rhs) noexcept {
         using std::swap;
         swap(mPtr, rhs.mPtr);
         swap(mClone, rhs.mClone);
@@ -88,7 +88,7 @@ class CPPCHECKLIB ValuePtr {
     }
 
     // NOLINTNEXTLINE(google-explicit-constructor)
-    operator bool() const NOEXCEPT {
+    operator bool() const noexcept {
         return !!mPtr;
     }
 
diff --git a/lib/version.h b/lib/version.h
index 3a7c5918b45..dba47774dce 100644
--- a/lib/version.h
+++ b/lib/version.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,9 +20,9 @@
 #ifndef versionH
 #define versionH
 
-#define CPPCHECK_VERSION_STRING "2.19 dev"
-#define CPPCHECK_VERSION 2,18,99,0
+#define CPPCHECK_VERSION_STRING "2.23 dev"
+#define CPPCHECK_VERSION 2,22,99,0
 
-#define LEGALCOPYRIGHT L"Copyright (C) 2007-2025 Cppcheck team."
+#define LEGALCOPYRIGHT L"Copyright (C) 2007-2026 Cppcheck team."
 
 #endif
diff --git a/lib/vf_analyzers.cpp b/lib/vf_analyzers.cpp
index 5f5568663e4..27c27934f31 100644
--- a/lib/vf_analyzers.cpp
+++ b/lib/vf_analyzers.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "library.h"
 #include "mathlib.h"
+#include "refthunk.h"
 #include "programmemory.h"
 #include "smallvector.h"
 #include "settings.h"
@@ -59,10 +60,10 @@ static bool isDereferenceOp(const Token* tok)
 }
 
 struct ValueFlowAnalyzer : Analyzer {
-    const Settings& settings;
+    RefThunk<const Settings> settings;
     ProgramMemoryState pms;
 
-    explicit ValueFlowAnalyzer(const Settings& s) : settings(s), pms(settings) {}
+    explicit ValueFlowAnalyzer(const Settings& s) : settings(s), pms(s) {}
 
     virtual const ValueFlow::Value* getValue(const Token* tok) const = 0;
     virtual ValueFlow::Value* getValue(const Token* tok) = 0;
@@ -139,7 +140,7 @@ struct ValueFlowAnalyzer : Analyzer {
                 return result;
             }
             ConditionState lhs = analyzeCondition(tok->astOperand1(), depth - 1);
-            if (lhs.isUnknownDependent())
+            if (lhs.isUnknownDependent() || !tok->astOperand2())
                 return lhs;
             ConditionState rhs = analyzeCondition(tok->astOperand2(), depth - 1);
             if (rhs.isUnknownDependent())
@@ -222,7 +223,7 @@ struct ValueFlowAnalyzer : Analyzer {
                 return Action::Read;
         }
         bool inconclusive = false;
-        if (isVariableChangedByFunctionCall(tok, getIndirect(tok), getSettings(), &inconclusive))
+        if (isVariableChangedByFunctionCall(tok, getIndirect(tok), getSettings().library, &inconclusive))
             return Action::Read | Action::Invalid;
         if (inconclusive)
             return Action::Read | Action::Inconclusive;
@@ -357,7 +358,7 @@ struct ValueFlowAnalyzer : Analyzer {
             if (dst) {
                 const size_t sz = dst->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
                 if (sz > 0 && sz < sizeof(MathLib::biguint)) {
-                    MathLib::bigint newvalue = ValueFlow::truncateIntValue(value->intvalue, sz, dst->sign);
+                    MathLib::bigint newvalue = ValueFlow::truncateIntValue(value->intvalue, sz, dst, settings().platform);
 
                     /* Handle overflow/underflow for value bounds */
                     if (value->bound != ValueFlow::Value::Bound::Point) {
@@ -673,21 +674,25 @@ struct ValueFlowAnalyzer : Analyzer {
     }
 
     template<class F>
-    std::vector<MathLib::bigint> evaluateInt(const Token* tok, F getProgramMemory) const
+    std::vector<MathLib::bigint> evaluateInt(const Token* tok, F getProgramMemoryFunc) const
     {
         if (const ValueFlow::Value* v = tok->getKnownValue(ValueFlow::Value::ValueType::INT))
-            return {static_cast<int>(v->intvalue)};
+            return {v->intvalue};
         std::vector<MathLib::bigint> result;
-        ProgramMemory pm = getProgramMemory();
+        // Pass the tracked values so a cached program-memory value that depends on one (e.g. 'h(p)'
+        // after 'p' was reassigned) is re-evaluated rather than served stale. The memory is built
+        // from the same state, so compute it once and hand it to the builder.
+        const ProgramState vars = getProgramState();
+        ProgramMemory pm = getProgramMemoryFunc(vars);
         if (Token::Match(tok, "&&|%oror%")) {
-            if (conditionIsTrue(tok, pm, getSettings()))
+            if (conditionIsTrue(tok, pm, getSettings(), vars))
                 result.push_back(1);
-            if (conditionIsFalse(tok, std::move(pm), getSettings()))
+            if (conditionIsFalse(tok, std::move(pm), getSettings(), vars))
                 result.push_back(0);
         } else {
             MathLib::bigint out = 0;
             bool error = false;
-            execute(tok, pm, &out, &error, getSettings());
+            execute(tok, pm, &out, &error, getSettings(), vars);
             if (!error)
                 result.push_back(out);
         }
@@ -696,16 +701,16 @@ struct ValueFlowAnalyzer : Analyzer {
 
     std::vector<MathLib::bigint> evaluateInt(const Token* tok) const
     {
-        return evaluateInt(tok, [&] {
-            return ProgramMemory{getProgramState()};
+        return evaluateInt(tok, [](const ProgramState& vars) {
+            return ProgramMemory{vars};
         });
     }
 
     std::vector<MathLib::bigint> evaluate(Evaluate e, const Token* tok, const Token* ctx = nullptr) const override
     {
         if (e == Evaluate::Integral) {
-            return evaluateInt(tok, [&] {
-                return pms.get(tok, ctx, getProgramState());
+            return evaluateInt(tok, [&](const ProgramState& vars) {
+                return pms.get(tok, ctx, vars);
             });
         }
         if (e == Evaluate::ContainerEmpty) {
@@ -717,36 +722,49 @@ struct ValueFlowAnalyzer : Analyzer {
             ProgramMemory pm = pms.get(tok, ctx, getProgramState());
             MathLib::bigint out = 0;
             if (pm.getContainerEmptyValue(tok->exprId(), out))
-                return {static_cast<int>(out)};
+                return {out};
             return {};
         }
         return {};
     }
 
-    void assume(const Token* tok, bool state, unsigned int flags) override {
-        // Update program state
-        pms.removeModifiedVars(tok);
-        pms.addState(tok, getProgramState());
-        pms.assume(tok, state, flags & Assume::ContainerEmpty);
-
+    void assume(const Token* tok, bool state, unsigned int flags) override
+    {
         bool isCondBlock = false;
         const Token* parent = tok->astParent();
         if (parent) {
             isCondBlock = Token::Match(parent->previous(), "if|while (");
         }
 
+        const Token* endBlock = nullptr;
         if (isCondBlock) {
             const Token* startBlock = parent->link()->next();
             if (Token::simpleMatch(startBlock, ";") && Token::simpleMatch(parent->tokAt(-2), "} while ("))
                 startBlock = parent->linkAt(-2);
-            const Token* endBlock = startBlock->link();
-            if (state) {
-                pms.removeModifiedVars(endBlock);
-                pms.addState(endBlock->previous(), getProgramState());
-            } else {
-                if (Token::simpleMatch(endBlock, "} else {"))
-                    pms.addState(endBlock->linkAt(2)->previous(), getProgramState());
-            }
+            endBlock = startBlock->link();
+        }
+
+        // Without Pending the 'then' block has been traversed and control is leaving it, so anchor
+        // the assumed state at the block end instead of the condition. That keeps assumptions on
+        // variables modified inside the block (e.g. an 'if' narrowing a value computed there) from
+        // being discarded as "modified" once control leaves the block.
+        const bool scopeEnd = !(flags & Assume::Pending) && state && endBlock;
+        const Token* anchor = scopeEnd ? endBlock : tok;
+        const Token* origin = scopeEnd ? endBlock : nullptr;
+
+        // Update program state
+        pms.removeModifiedVars(anchor);
+        pms.addState(anchor, getProgramState());
+        pms.assume(tok, state, flags & Assume::ContainerEmpty, origin);
+
+        // The false path (the true path uses scopeEnd above): record the assumed state where control
+        // continues - the end of the else block, or the closing brace when there is no else - so it
+        // reaches the enclosing scope.
+        if (isCondBlock && !(flags & Assume::Pending) && !state) {
+            if (Token::simpleMatch(endBlock, "} else {"))
+                pms.addState(endBlock->linkAt(2)->previous(), getProgramState());
+            else
+                pms.addState(endBlock, getProgramState());
         }
 
         if (!(flags & Assume::Quiet)) {
@@ -875,7 +893,7 @@ static bool isAliasOf(const Variable * var, const Token *tok, nonneg int varid,
             return false;
         if (val.isLifetimeValue() && !val.isLocalLifetimeValue())
             return false;
-        if (val.isLifetimeValue() && val.lifetimeKind != ValueFlow::Value::LifetimeKind::Address)
+        if (val.isLifetimeValue() && val.lifetimeKind != ValueFlow::Value::LifetimeKind::Address && val.lifetimeKind != ValueFlow::Value::LifetimeKind::SubObject)
             return false;
         if (!Token::Match(val.tokvalue, ".|&|*|%var%"))
             return false;
@@ -981,7 +999,12 @@ struct MultiValueFlowAnalyzer : ValueFlowAnalyzer {
 
     void addErrorPath(const Token* tok, const std::string& s) override {
         for (auto&& p:values) {
-            p.second.errorPath.emplace_back(tok, s);
+            auto& ep = p.second.errorPath;
+            if (std::any_of(ep.begin(), ep.end(), [&](const ErrorPathItem& epi) {
+                return epi.first == tok && epi.second == s;
+            }))
+                continue;
+            ep.emplace_back(tok, s);
         }
     }
 
@@ -1129,7 +1152,12 @@ struct SingleValueFlowAnalyzer : ValueFlowAnalyzer {
     }
 
     void addErrorPath(const Token* tok, const std::string& s) override {
-        value.errorPath.emplace_back(tok, s);
+        auto& ep = value.errorPath;
+        if (std::any_of(ep.begin(), ep.end(), [&](const ErrorPathItem& epi) {
+            return epi.first == tok && epi.second == s;
+        }))
+            return;
+        ep.emplace_back(tok, s);
     }
 
     template<class T>
@@ -1150,7 +1178,7 @@ struct SingleValueFlowAnalyzer : ValueFlowAnalyzer {
     }
 
     bool isAlias(const Token* tok, bool& inconclusive) const override {
-        if (value.isLifetimeValue())
+        if (value.isLifetimeValue() && value.lifetimeKind != ValueFlow::Value::LifetimeKind::SubObject)
             return false;
         for (const auto& m: {
             std::ref(getVars()), std::ref(getAliasedVars())
@@ -1198,18 +1226,40 @@ struct SingleValueFlowAnalyzer : ValueFlowAnalyzer {
 
     bool stopOnCondition(const Token* condTok) const override
     {
-        if (value.isNonValue())
-            return false;
         if (value.isImpossible())
             return false;
-        if (isConditional() && !value.isKnown() && !value.isImpossible())
+        // lifetime values must keep flowing to properly track aliases
+        if (value.isLifetimeValue())
+            return false;
+        // 'conditional' flag (uninit, or lowered after a modifying branch): may depend on a
+        // condition that doesn't mention the variable -> stop
+        if (value.conditional && !value.isKnown())
             return true;
-        if (value.isSymbolicValue())
+        if (value.isNonValue())
             return false;
+        if (value.isSymbolicValue())
+            return isConditional() && !value.isKnown();
+        // conditional via the originating 'condition' (e.g. possible null after 'if (p && ...)'): only flow
+        // if the condition references the value, else a correlation we can't follow (e.g.
+        // 'bool ok = (p != nullptr); if (!ok)') could make a later deref safe -> stop
+        if (value.condition && !value.isKnown() && !conditionReferencesValue(condTok))
+            return true;
         ConditionState cs = analyzeCondition(condTok);
         return cs.isUnknownDependent();
     }
 
+    // Does the condition mention the tracked value, either directly or through a symbolic alias?
+    bool conditionReferencesValue(const Token* condTok) const
+    {
+        return findAstNode(condTok, [&](const Token* tok) {
+            if (match(tok))
+                return true;
+            return std::any_of(tok->values().cbegin(), tok->values().cend(), [&](const ValueFlow::Value& v) {
+                return v.isSymbolicValue() && !v.isImpossible() && v.tokvalue && match(v.tokvalue);
+            });
+        }) != nullptr;
+    }
+
     bool updateScope(const Token* endBlock, bool /*modified*/) const override {
         const Scope* scope = endBlock->scope();
         if (!scope)
@@ -1233,6 +1283,7 @@ struct SingleValueFlowAnalyzer : ValueFlowAnalyzer {
         return false;
     }
 
+private:
     ValuePtr<Analyzer> reanalyze(Token* tok, const std::string& msg) const override {
         ValueFlow::Value newValue = value;
         newValue.errorPath.emplace_back(tok, msg);
@@ -1259,6 +1310,12 @@ struct ExpressionAnalyzer : SingleValueFlowAnalyzer {
             dependOnThis |= exprDependsOnThis(value.tokvalue);
             setupExprVarIds(value.tokvalue);
         }
+        if (value.isContainerSizeValue() && value.container) {
+            // a container size tracked through another expression (e.g. a pointer obtained from
+            // data()) is invalidated by writes to the container it belongs to
+            dependOnThis |= exprDependsOnThis(value.container);
+            setupExprVarIds(value.container);
+        }
         uniqueExprId =
             expr->isUniqueExprId() && (Token::Match(expr, "%cop%") || !isVariableChanged(expr, 0, s));
     }
@@ -1269,7 +1326,7 @@ struct ExpressionAnalyzer : SingleValueFlowAnalyzer {
     }
 
     void setupExprVarIds(const Token* start, int depth = 0) {
-        if (depth > settings.vfOptions.maxExprVarIdDepth) {
+        if (depth > settings().vfOptions.maxExprVarIdDepth) {
             // TODO: add bailout message
             return;
         }
@@ -1431,6 +1488,7 @@ struct SubExpressionAnalyzer : ExpressionAnalyzer {
         partialReads->emplace_back(tok, v);
     }
 
+private:
     // No reanalysis for subexpression
     ValuePtr<Analyzer> reanalyze(Token* /*tok*/, const std::string& /*msg*/) const override {
         return {};
@@ -1462,15 +1520,22 @@ ValuePtr<Analyzer> makeMemberExpressionAnalyzer(std::string varname, const Token
 struct ContainerExpressionAnalyzer : ExpressionAnalyzer {
     ContainerExpressionAnalyzer(const Token* expr, ValueFlow::Value val, const Settings& s)
         : ExpressionAnalyzer(expr, std::move(val), s)
-    {}
+    {
+        // The size of a container expression belongs to that expression. Through a pointer the
+        // size keeps belonging to the container the pointer was obtained from.
+        if (astIsContainer(expr) && !astIsPointer(expr))
+            value.container = expr;
+    }
 
     bool match(const Token* tok) const override {
-        return tok->exprId() == expr->exprId() || (astIsIterator(tok) && isAliasOf(tok, expr->exprId()));
+        return tok->exprId() == expr->exprId() || isIteratorOf(tok, expr->exprId());
     }
 
     Action isWritable(const Token* tok, Direction /*d*/) const override
     {
-        if (astIsIterator(tok))
+        // only writes to the container itself change its size - not writes through an iterator
+        // or to a default-inserted element
+        if (tok->exprId() != expr->exprId())
             return Action::None;
         if (!getValue(tok))
             return Action::None;
@@ -1497,7 +1562,7 @@ struct ContainerExpressionAnalyzer : ExpressionAnalyzer {
             if (action == Library::Container::Action::PUSH || action == Library::Container::Action::POP || action == Library::Container::Action::APPEND) { // TODO: handle more actions?
                 std::vector<const Token*> args = getArguments(tok->tokAt(3));
                 bool isVariadic = false;
-                if (const Library::Function* libFunc = settings.library.getFunction(tok->tokAt(2))) {
+                if (const Library::Function* libFunc = settings().library.getFunction(tok->tokAt(2))) {
                     const auto& argChecks = libFunc->argumentChecks;
                     isVariadic = argChecks.find(-1) != argChecks.end() && argChecks.at(-1).variadic;
                 }
@@ -1545,7 +1610,7 @@ struct ContainerExpressionAnalyzer : ExpressionAnalyzer {
             case Library::Container::Action::APPEND: {
                 std::vector<const Token*> args = getArguments(tok->astParent()->tokAt(2));
                 if (args.size() == 1) // TODO: handle overloads
-                    n = ValueFlow::valueFlowGetStrLength(tok->astParent()->tokAt(3));
+                    n = ValueFlow::valueFlowGetStrLength(tok->astParent()->tokAt(3), settings().library);
                 if (n == 0) // TODO: handle known empty append
                     val->setPossible();
                 break;
diff --git a/lib/vf_common.cpp b/lib/vf_common.cpp
index 333f850d07d..9b1d0387f38 100644
--- a/lib/vf_common.cpp
+++ b/lib/vf_common.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 #include "vf_common.h"
 
 #include "astutils.h"
+#include "library.h"
 #include "mathlib.h"
 #include "path.h"
 #include "platform.h"
@@ -95,15 +96,15 @@ namespace ValueFlow
         return true;
     }
 
-    MathLib::bigint truncateIntValue(MathLib::bigint value, size_t value_size, const ValueType::Sign dst_sign)
+    MathLib::bigint truncateIntValue(MathLib::bigint value, size_t value_size, const ValueType* dst, const Platform& platform)
     {
         if (value_size == 0)
             return value;
 
         const MathLib::biguint unsignedMaxValue = std::numeric_limits<MathLib::biguint>::max() >> ((sizeof(unsignedMaxValue) - value_size) * 8);
-        const MathLib::biguint signBit = 1ULL << (value_size * 8 - 1);
+        const MathLib::biguint signBit = 1ULL << ((value_size * 8) - 1);
         value &= unsignedMaxValue;
-        if (dst_sign == ValueType::Sign::SIGNED && (value & signBit))
+        if ((dst->sign == ValueType::Sign::SIGNED || (dst->sign == ValueType::Sign::UNKNOWN_SIGN && dst->type == ValueType::Type::CHAR && platform.defaultSign == 's')) && (value & signBit))
             value |= ~unsignedMaxValue;
 
         return value;
@@ -138,12 +139,16 @@ namespace ValueFlow
                 // Bad character literal
             }
         } else if (tok->isNumber() && MathLib::isFloat(tok->str())) {
-            Value value;
-            value.valueType = Value::ValueType::FLOAT;
-            value.floatValue = MathLib::toDoubleNumber(tok);
-            if (!tok->isTemplateArg())
-                value.setKnown();
-            setTokenValue(tok, std::move(value), settings);
+            // A long double literal out of the range of double (1e400L) has no
+            // double value: infinity would make different literals compare equal.
+            if (!MathLib::isLongDoubleOutOfDoubleRange(tok->str())) {
+                Value value;
+                value.valueType = Value::ValueType::FLOAT;
+                value.floatValue = MathLib::toDoubleNumber(tok);
+                if (!tok->isTemplateArg())
+                    value.setKnown();
+                setTokenValue(tok, std::move(value), settings);
+            }
         } else if (tok->enumerator() && tok->enumerator()->value_known) {
             Value value(tok->enumerator()->value);
             if (!tok->isTemplateArg())
@@ -154,12 +159,20 @@ namespace ValueFlow
             if (!tok->isTemplateArg())
                 value.setKnown();
             setTokenValue(tok, std::move(value), settings);
+        } else if ((tok->isCpp() || settings.standards.c >= Standards::C23) && (tok->isName() && tok->varId() == 0 && Token::Match(tok, "%bool%"))) {
+            Value value(tok->str() == "true");
+            if (!tok->isTemplateArg())
+                value.setKnown();
+            setTokenValue(tok, std::move(value), settings);
         } else if (Token::simpleMatch(tok, "sizeof (")) {
-            if (tok->next()->astOperand2() && !tok->next()->astOperand2()->isLiteral() && tok->next()->astOperand2()->valueType() &&
-                (tok->next()->astOperand2()->valueType()->pointer == 0 || // <- TODO this is a bailout, abort when there are array->pointer conversions
-                 (tok->next()->astOperand2()->variable() && !tok->next()->astOperand2()->variable()->isArray())) &&
-                !tok->next()->astOperand2()->valueType()->isEnum()) { // <- TODO this is a bailout, handle enum with non-int types
-                const size_t sz = tok->next()->astOperand2()->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
+            const Token* const obj = tok->next()->astOperand2();
+            if (obj && !obj->isLiteral() && obj->valueType() &&
+                (obj->valueType()->pointer == 0 || // <- TODO this is a bailout, abort when there are array->pointer conversions
+                 (obj->variable() && !obj->variable()->isArray())) &&
+                !obj->valueType()->isEnum() && // <- TODO this is a bailout, handle enum with non-int types
+                !(obj->valueType()->container && obj->valueType()->container->startPattern == "std :: array <")) {
+                const auto ptrPointee = obj->valueType()->pointer > 0 ? ValueType::SizeOf::Pointer : ValueType::SizeOf::Pointee;
+                const size_t sz = obj->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ptrPointee);
                 if (sz) {
                     Value value(sz);
                     value.setKnown();
@@ -230,9 +243,7 @@ namespace ValueFlow
                     setTokenValue(tok->tokAt(4), std::move(value), settings);
                 }
             } else if (Token::Match(tok2, "%var% )")) {
-                const Variable *var = tok2->variable();
-                // only look for single token types (no pointers or references yet)
-                if (var && var->typeStartToken() == var->typeEndToken()) {
+                if (const Variable *var = tok2->variable()) {
                     // find the size of the type
                     size_t size = 0;
                     if (var->isEnumType()) {
@@ -240,7 +251,12 @@ namespace ValueFlow
                         if (var->type()->classScope && var->type()->classScope->enumType)
                             size = getSizeOfType(var->type()->classScope->enumType, settings);
                     } else if (var->valueType()) {
-                        size = var->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
+                        if (var->valueType()->container && var->valueType()->container->startPattern == "std :: array <") {
+                            const ValueType vtElement = ValueType::parseDecl(var->valueType()->containerTypeToken, settings);
+                            size = vtElement.getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
+                        }
+                        else
+                            size = var->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
                     } else if (!var->type()) {
                         size = getSizeOfType(var->typeStartToken(), settings);
                     }
@@ -323,7 +339,7 @@ namespace ValueFlow
             if (!tok->isTemplateArg())
                 value.setKnown();
             setTokenValue(tok->next(), std::move(value), settings);
-        } else if (Token::simpleMatch(tok, "= { } ;")) {
+        } else if (Token::simpleMatch(tok, "= { }")) {
             const Token* lhs = tok->astOperand1();
             if (lhs && lhs->valueType() && (lhs->valueType()->isIntegral() || lhs->valueType()->pointer > 0)) {
                 Value value(0);
@@ -386,18 +402,24 @@ namespace ValueFlow
         v.debugPath.emplace_back(tok, std::move(s));
     }
 
-    MathLib::bigint valueFlowGetStrLength(const Token* tok)
+    MathLib::bigint valueFlowGetStrLength(const Token* tok, const Library& library)
     {
         if (tok->tokType() == Token::eString)
             return Token::getStrLength(tok);
         if (astIsGenericChar(tok) || tok->tokType() == Token::eChar)
             return 1;
-        if (const Value* v = tok->getKnownValue(Value::ValueType::CONTAINER_SIZE))
-            return v->intvalue;
+        if (const Value* v = tok->getKnownValue(Value::ValueType::CONTAINER_SIZE)) {
+            // on a pointer the size is the number of elements in the buffer (possibly including
+            // a null terminator), not the length of the string
+            if (!astIsPointer(tok))
+                return v->intvalue;
+        }
         if (const Value* v = tok->getKnownValue(Value::ValueType::TOK)) {
             if (v->tokvalue != tok)
-                return valueFlowGetStrLength(v->tokvalue);
+                return valueFlowGetStrLength(v->tokvalue, library);
         }
+        if (const Token* cont = library.getContainerFromYield(tok, Library::Container::Yield::BUFFER_NT))
+            return valueFlowGetStrLength(cont, library);
         return 0;
     }
 }
diff --git a/lib/vf_common.h b/lib/vf_common.h
index 3ed36e6c47f..448d14ccb41 100644
--- a/lib/vf_common.h
+++ b/lib/vf_common.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
 class Token;
 class Settings;
 class Platform;
+class Library;
 
 namespace ValueFlow
 {
@@ -40,7 +41,7 @@ namespace ValueFlow
 {
     bool getMinMaxValues(const ValueType* vt, const Platform& platform, MathLib::bigint& minValue, MathLib::bigint& maxValue);
 
-    MathLib::bigint truncateIntValue(MathLib::bigint value, size_t value_size, ValueType::Sign dst_sign);
+    MathLib::bigint truncateIntValue(MathLib::bigint value, size_t value_size, const ValueType* dst, const Platform& platform);
 
     Token * valueFlowSetConstantValue(Token *tok, const Settings &settings);
 
@@ -53,7 +54,7 @@ namespace ValueFlow
                            const Token* tok,
                            SourceLocation local = SourceLocation::current());
 
-    MathLib::bigint valueFlowGetStrLength(const Token* tok);
+    MathLib::bigint valueFlowGetStrLength(const Token* tok, const Library& library);
 }
 
 #endif // vfCommonH
diff --git a/lib/vf_settokenvalue.cpp b/lib/vf_settokenvalue.cpp
index 4d39d35daae..e7b715ab36b 100644
--- a/lib/vf_settokenvalue.cpp
+++ b/lib/vf_settokenvalue.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@
 
 namespace ValueFlow
 {
-    static Library::Container::Yield getContainerYield(Token* tok, const Settings& settings, Token*& parent)
+    static Library::Container::Yield getContainerYield(Token* tok, const Library& library, Token*& parent)
     {
         if (Token::Match(tok, ". %name% (") && tok->astParent() == tok->tokAt(2) && tok->astOperand1() &&
             tok->astOperand1()->valueType()) {
@@ -57,7 +57,7 @@ namespace ValueFlow
         }
         if (Token::Match(tok->previous(), "%name% (")) {
             parent = tok;
-            if (const Library::Function* f = settings.library.getFunction(tok->previous())) {
+            if (const Library::Function* f = library.getFunction(tok->previous())) {
                 return f->containerYield;
             }
         }
@@ -72,7 +72,7 @@ namespace ValueFlow
             return value;
         if (!parent->isBinaryOp())
             return value;
-        if (!parent->isConstOp())
+        if (!parent->isConstOp() && !parent->isAssignmentOp())
             return value;
         if (!astIsIntegral(parent->astOperand1(), false))
             return value;
@@ -88,14 +88,14 @@ namespace ValueFlow
         ValueType::Sign sign = ValueType::Sign::UNSIGNED;
         if (n1 < n2)
             sign = vt2->sign;
-        else if (n1 > n2)
+        else // (n1 >= n2)
             sign = vt1->sign;
         Value v = castValue(value, sign, std::max(n1, n2) * 8);
         v.wideintvalue = value.intvalue;
         return v;
     }
 
-    static const Token *getCastTypeStartToken(const Token *parent, const Settings& settings)
+    static const Token *getCastTypeStartToken(const Token *parent, const Library& library)
     {
         // TODO: This might be a generic utility function?
         if (!Token::Match(parent, "{|("))
@@ -114,7 +114,7 @@ namespace ValueFlow
                 ftok = ftok->next();
             while (Token::Match(ftok, "%name% ::"))
                 ftok = ftok->tokAt(2);
-            if (settings.library.isNotLibraryFunction(ftok))
+            if (library.isNotLibraryFunction(ftok))
                 return parent->next();
         }
         if (parent->astOperand2() && Token::Match(parent->astOperand1(), "const_cast|dynamic_cast|reinterpret_cast|static_cast <"))
@@ -126,32 +126,31 @@ namespace ValueFlow
         return value.isIntValue() || value.isFloatValue();
     }
 
-    static void setTokenValueCast(Token *parent, const ValueType &valueType, const Value &value, const Settings &settings)
+    static void setTokenValueCast(Token *parent, const ValueType &valueType, Value value, const Settings &settings)
     {
         if (valueType.pointer || value.isImpossible())
-            setTokenValue(parent,value,settings);
+            setTokenValue(parent,std::move(value),settings);
         else if (valueType.type == ValueType::Type::CHAR)
-            setTokenValue(parent, castValue(value, valueType.sign, settings.platform.char_bit), settings);
+            setTokenValue(parent, castValue(std::move(value), valueType.sign, settings.platform.char_bit), settings);
         else if (valueType.type == ValueType::Type::SHORT)
-            setTokenValue(parent, castValue(value, valueType.sign, settings.platform.short_bit), settings);
+            setTokenValue(parent, castValue(std::move(value), valueType.sign, settings.platform.short_bit), settings);
         else if (valueType.type == ValueType::Type::INT)
-            setTokenValue(parent, castValue(value, valueType.sign, settings.platform.int_bit), settings);
+            setTokenValue(parent, castValue(std::move(value), valueType.sign, settings.platform.int_bit), settings);
         else if (valueType.type == ValueType::Type::LONG)
-            setTokenValue(parent, castValue(value, valueType.sign, settings.platform.long_bit), settings);
+            setTokenValue(parent, castValue(std::move(value), valueType.sign, settings.platform.long_bit), settings);
         else if (valueType.type == ValueType::Type::LONGLONG)
-            setTokenValue(parent, castValue(value, valueType.sign, settings.platform.long_long_bit), settings);
+            setTokenValue(parent, castValue(std::move(value), valueType.sign, settings.platform.long_long_bit), settings);
         else if (valueType.isFloat() && isNumeric(value)) {
-            Value floatValue = value;
-            floatValue.valueType = Value::ValueType::FLOAT;
             if (value.isIntValue())
-                floatValue.floatValue = static_cast<double>(value.intvalue);
-            setTokenValue(parent, std::move(floatValue), settings);
+                value.floatValue = static_cast<double>(value.intvalue);
+            value.valueType = Value::ValueType::FLOAT;
+            setTokenValue(parent, std::move(value), settings);
         } else if (value.isIntValue()) {
             const long long charMax = settings.platform.signedCharMax();
             const long long charMin = settings.platform.signedCharMin();
             if (charMin <= value.intvalue && value.intvalue <= charMax) {
                 // unknown type, but value is small so there should be no truncation etc
-                setTokenValue(parent,value,settings);
+                setTokenValue(parent,std::move(value),settings);
             }
         }
     }
@@ -217,6 +216,25 @@ namespace ValueFlow
         return false;
     }
 
+    static bool isFunctionCall(const Token* tok, const Settings& settings)
+    {
+        if (!tok)
+            return false;
+        if (tok->str() == "{")
+            return true;
+        if (tok->str() == "(") {
+            if (tok->astOperand1() && tok->astOperand1()->isControlFlowKeyword())
+                return false;
+            if (Token::Match(tok->next(), "%name%") && !settings.library.isNotLibraryFunction(tok->next()))
+                return true;
+            if (Token::Match(tok->previous(), "%name%|>"))
+                return true;
+            if (Token::Match(tok->astOperand1(), "%name%|(|[|*|."))
+                return true;
+        }
+        return false;
+    }
+
     /** set ValueFlow value and perform calculations if possible */
     void setTokenValue(Token* tok,
                        Value value,
@@ -232,6 +250,11 @@ namespace ValueFlow
         if (!value.isImpossible() && value.isIntValue())
             value = truncateImplicitConversion(tok->astParent(), value, settings);
 
+        // a container size value on a container expression belongs to that expression, while a
+        // pointer or an iterator only transports the size of the container it was obtained from
+        if (value.isContainerSizeValue() && !astIsPointer(tok) && astIsContainer(tok))
+            value.container = tok;
+
         if (settings.debugnormal)
             setSourceLocation(value, loc, tok);
 
@@ -250,9 +273,7 @@ namespace ValueFlow
                 return !Token::simpleMatch(p, ",");
             });
             // Ensure that the comma isn't a function call
-            if (!callParent || (!Token::Match(callParent->previous(), "%name%|> (") && !Token::simpleMatch(callParent, "{") &&
-                                (!Token::Match(callParent, "( %name%") || settings.library.isNotLibraryFunction(callParent->next())) &&
-                                !(callParent->str() == "(" && (Token::simpleMatch(callParent->astOperand1(), "*") || Token::Match(callParent->astOperand1(), "%name%|("))))) {
+            if (!isFunctionCall(callParent, settings)) {
                 setTokenValue(parent, std::move(value), settings);
                 return;
             }
@@ -292,37 +313,55 @@ namespace ValueFlow
 
                         combineValueProperties(value1, value2, result);
 
-                        if (Token::simpleMatch(parent, "==") && result.intvalue)
+                        if (Token::simpleMatch(parent, "==") && result.intvalue && !(value1.intvalue == 0 && value2.intvalue == 0))
                             continue;
-                        if (Token::simpleMatch(parent, "!=") && !result.intvalue)
+                        if (Token::simpleMatch(parent, "!=") && !result.intvalue && !(value1.intvalue == 0 && value2.intvalue == 0))
                             continue;
 
                         setTokenValue(parent, std::move(result), settings);
                     }
                 }
             }
+            // an empty associative container implies that its default-inserted elements are empty as well
+            if (Token::simpleMatch(parent, "[") && astIsLHS(tok) && astIsContainer(parent) &&
+                tok->valueType()->container && tok->valueType()->container->stdAssociativeLike &&
+                !value.isImpossible() && value.intvalue == 0)
+                setTokenValue(parent, value, settings);
             Token* next = nullptr;
-            const Library::Container::Yield yields = getContainerYield(parent, settings, next);
+            const Library::Container::Yield yields = getContainerYield(parent, settings.library, next);
             if (yields == Library::Container::Yield::SIZE) {
                 value.valueType = Value::ValueType::INT;
+                value.container = nullptr;
+                setTokenValue(next, std::move(value), settings);
+            } else if (contains({Library::Container::Yield::BUFFER,
+                                 Library::Container::Yield::BUFFER_NT,
+                                 Library::Container::Yield::START_ITERATOR,
+                                 Library::Container::Yield::END_ITERATOR,
+                                 Library::Container::Yield::ITERATOR},
+                                yields)) {
+                // The returned pointer or iterator has as many elements available as the container
+                if (yields == Library::Container::Yield::BUFFER_NT)
+                    value.intvalue += 1; // ..plus the null terminator
                 setTokenValue(next, std::move(value), settings);
             } else if (yields == Library::Container::Yield::EMPTY) {
-                Value v(value);
-                v.valueType = Value::ValueType::INT;
-                v.bound = Value::Bound::Point;
+                const Value::Bound bound = value.bound;
+                const long long intvalue = value.intvalue;
+                value.valueType = Value::ValueType::INT;
+                value.container = nullptr;
+                value.bound = Value::Bound::Point;
                 if (value.isImpossible()) {
-                    if (value.intvalue == 0)
-                        v.setKnown();
-                    else if ((value.bound == Value::Bound::Upper && value.intvalue > 0) ||
-                             (value.bound == Value::Bound::Lower && value.intvalue < 0)) {
-                        v.intvalue = 0;
-                        v.setKnown();
+                    if (intvalue == 0)
+                        value.setKnown();
+                    else if ((bound == Value::Bound::Upper && intvalue > 0) ||
+                             (bound == Value::Bound::Lower && intvalue < 0)) {
+                        value.intvalue = 0;
+                        value.setKnown();
                     } else
-                        v.setPossible();
+                        value.setPossible();
                 } else {
-                    v.intvalue = !v.intvalue;
+                    value.intvalue = !value.intvalue;
                 }
-                setTokenValue(next, std::move(v), settings);
+                setTokenValue(next, std::move(value), settings);
             }
             return;
         }
@@ -346,33 +385,32 @@ namespace ValueFlow
                 setTokenValue(parent, std::move(value), settings);
                 return;
             }
-            Value pvalue = value;
             if (!value.subexpressions.empty() && Token::Match(parent, ". %var%")) {
                 if (contains(value.subexpressions, parent->strAt(1)))
-                    pvalue.subexpressions.clear();
+                    value.subexpressions.clear();
                 else
                     return;
             }
             if (parent->isUnaryOp("&")) {
-                pvalue.indirect++;
-                setTokenValue(parent, std::move(pvalue), settings);
+                value.indirect++;
+                setTokenValue(parent, std::move(value), settings);
             } else if (Token::Match(parent, ". %var%") && parent->astOperand1() == tok && parent->astOperand2()) {
-                if (parent->originalName() == "->" && pvalue.indirect > 0)
-                    pvalue.indirect--;
-                setTokenValue(parent->astOperand2(), std::move(pvalue), settings);
+                if (parent->originalName() == "->" && value.indirect > 0)
+                    value.indirect--;
+                setTokenValue(parent->astOperand2(), std::move(value), settings);
             } else if (Token::Match(parent->astParent(), ". %var%") && parent->astParent()->astOperand1() == parent) {
-                if (parent->astParent()->originalName() == "->" && pvalue.indirect > 0)
-                    pvalue.indirect--;
-                setTokenValue(parent->astParent()->astOperand2(), std::move(pvalue), settings);
-            } else if (parent->isUnaryOp("*") && pvalue.indirect > 0) {
-                pvalue.indirect--;
-                setTokenValue(parent, std::move(pvalue), settings);
+                if (parent->astParent()->originalName() == "->" && value.indirect > 0)
+                    value.indirect--;
+                setTokenValue(parent->astParent()->astOperand2(), std::move(value), settings);
+            } else if (parent->isUnaryOp("*") && value.indirect > 0) {
+                value.indirect--;
+                setTokenValue(parent, std::move(value), settings);
             }
             return;
         }
 
         // cast..
-        if (const Token *castType = getCastTypeStartToken(parent, settings)) {
+        if (const Token *castType = getCastTypeStartToken(parent, settings.library)) {
             if (contains({Value::ValueType::INT, Value::ValueType::SYMBOLIC}, value.valueType) &&
                 Token::simpleMatch(parent->astOperand1(), "dynamic_cast"))
                 return;
@@ -382,10 +420,12 @@ namespace ValueFlow
                 && tok->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer)
                 >= valueType.getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer))
                 return;
-            setTokenValueCast(parent, valueType, value, settings);
+            setTokenValueCast(parent, valueType, std::move(value), settings);
         }
 
-        else if (parent->str() == ":") {
+        else if (parent->str() == ":" && Token::simpleMatch(parent->astParent(), "?")) {
+            const std::string condStr(tok == parent->astOperand1() ? "true" : "false");
+            value.errorPath.emplace_back(parent->astParent()->astOperand1(), "Assuming condition '" + parent->astParent()->astOperand1()->expressionString() + "' is " + condStr);
             setTokenValue(parent,std::move(value),settings);
         }
 
@@ -421,11 +461,10 @@ namespace ValueFlow
                 if (ret)
                     return;
 
-                Value v(std::move(value));
-                v.conditional = true;
-                v.changeKnownToPossible();
+                value.conditional = true;
+                value.changeKnownToPossible();
 
-                setTokenValue(parent, std::move(v), settings);
+                setTokenValue(parent, std::move(value), settings);
             }
         }
 
@@ -595,7 +634,7 @@ namespace ValueFlow
         // ~
         else if (parent->str() == "~") {
             for (const Value &val : tok->values()) {
-                if (!val.isIntValue())
+                if (!val.isIntValue() || (val.isImpossible() && val.intvalue < 0))
                     continue;
                 Value v(val);
                 v.intvalue = ~v.intvalue;
@@ -615,7 +654,7 @@ namespace ValueFlow
         }
 
         // unary minus
-        else if (parent->isUnaryOp("-")) {
+        else if (parent->isUnaryOp("-") && !astIsUnsigned(parent)) {
             for (const Value &val : tok->values()) {
                 if (!val.isIntValue() && !val.isFloatValue())
                     continue;
@@ -643,7 +682,7 @@ namespace ValueFlow
                         const ValueType *dst = tok->valueType();
                         if (dst) {
                             const size_t sz = dst->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
-                            MathLib::bigint newvalue = ValueFlow::truncateIntValue(v.intvalue + 1, sz, dst->sign);
+                            MathLib::bigint newvalue = ValueFlow::truncateIntValue(v.intvalue + 1, sz, dst, settings.platform);
                             if (v.bound != ValueFlow::Value::Bound::Point) {
                                 if (newvalue < v.intvalue) {
                                     v.invertBound();
@@ -673,7 +712,7 @@ namespace ValueFlow
                         const ValueType *dst = tok->valueType();
                         if (dst) {
                             const size_t sz = dst->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
-                            MathLib::bigint newvalue = ValueFlow::truncateIntValue(v.intvalue - 1, sz, dst->sign);
+                            MathLib::bigint newvalue = ValueFlow::truncateIntValue(v.intvalue - 1, sz, dst, settings.platform);
                             if (v.bound != ValueFlow::Value::Bound::Point) {
                                 if (newvalue > v.intvalue) {
                                     v.invertBound();
@@ -713,15 +752,13 @@ namespace ValueFlow
             std::vector<const Token*> args = getArguments(value.tokvalue);
             if (const Library::Function* f = settings.library.getFunction(parent->previous())) {
                 if (f->containerYield == Library::Container::Yield::SIZE) {
-                    Value v(std::move(value));
-                    v.valueType = Value::ValueType::INT;
-                    v.intvalue = args.size();
-                    setTokenValue(parent, std::move(v), settings);
+                    value.valueType = Value::ValueType::INT;
+                    value.intvalue = args.size();
+                    setTokenValue(parent, std::move(value), settings);
                 } else if (f->containerYield == Library::Container::Yield::EMPTY) {
-                    Value v(std::move(value));
-                    v.intvalue = args.empty();
-                    v.valueType = Value::ValueType::INT;
-                    setTokenValue(parent, std::move(v), settings);
+                    value.intvalue = args.empty();
+                    value.valueType = Value::ValueType::INT;
+                    setTokenValue(parent, std::move(value), settings);
                 }
             }
         }
diff --git a/lib/vfvalue.cpp b/lib/vfvalue.cpp
index 4ec1c742ab3..308b42b91d1 100644
--- a/lib/vfvalue.cpp
+++ b/lib/vfvalue.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/lib/vfvalue.h b/lib/vfvalue.h
index 8a473143b68..9eab775de24 100644
--- a/lib/vfvalue.h
+++ b/lib/vfvalue.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -322,6 +322,10 @@ namespace ValueFlow
         /** token value - the token that has the value. this is used for pointer aliases, strings, etc. */
         const Token* tokvalue{};
 
+        /** For CONTAINER_SIZE values: the container the size belongs to, when the value is
+         * attached to a token that is not the container itself (an iterator or a pointer) */
+        const Token* container = nullptr;
+
         /** float value */
         double floatValue{};
 
diff --git a/lsan-suppr.txt b/lsan-suppr.txt
deleted file mode 100644
index bf8389f247e..00000000000
--- a/lsan-suppr.txt
+++ /dev/null
@@ -1 +0,0 @@
-leak:libpcre.so
\ No newline at end of file
diff --git a/man/checkers/AssignmentAddressToInteger.md b/man/checkers/AssignmentAddressToInteger.md
new file mode 100644
index 00000000000..a482e0a516b
--- /dev/null
+++ b/man/checkers/AssignmentAddressToInteger.md
@@ -0,0 +1,56 @@
+# AssignmentAddressToInteger and AssignmentIntegerToAddress
+
+**Message**: Assigning a pointer to an integer is not portable.<br/>
+**Category**: Portability<br/>
+**Severity**: Portability<br/>
+**Language**: C/C++
+
+## Description
+
+Code silently narrows a pointer (address) down to a plain integer type, or the other way around, via a
+plain assignment. On platforms where `sizeof(void*) != sizeof(int)` (most notably 64-bit platforms,
+where a pointer is 8 bytes and `int` is usually still 4 bytes) this loses information: part of the
+address is silently discarded.
+
+- `AssignmentAddressToInteger`: a pointer value is assigned to a plain integer variable, for example
+  `int i = p;`.
+- `AssignmentIntegerToAddress`: a plain integer value is assigned to a pointer variable, for example
+  `int *p = i;`.
+
+This checks `char`/`short`/`int` variables (not `long`/`long long`, and not `bool`, which is a common,
+intentional null-check idiom rather than a truncation bug). This checker only runs when the
+`portability` severity is enabled.
+
+## Motivation
+
+Storing an address in a type that is narrower than a pointer is not portable: it works by accident on
+platforms where the two types happen to be the same width, and silently truncates the address (or
+sign-extends a small integer into a bogus address) on platforms where they are not, most notably when
+porting 32-bit code to 64-bit.
+
+## How to fix
+
+Use a pointer type, or an integer type explicitly meant to hold a pointer (`intptr_t`/`uintptr_t` from
+`<cstdint>`), instead of a plain `int`/`char`/etc.
+
+Before:
+```cpp
+int foo(int *p) {
+    int a = p; // <- AssignmentAddressToInteger
+    return a;
+}
+```
+
+After:
+```cpp
+#include <cstdint>
+intptr_t foo(int *p) {
+    intptr_t a = reinterpret_cast<intptr_t>(p);
+    return a;
+}
+```
+
+## Related checkers
+
+- [CastAddressToIntegerAtReturn.md](CastAddressToIntegerAtReturn.md) - the same idea, but for a
+  function `return` rather than a plain assignment.
diff --git a/man/checkers/CastAddressToIntegerAtReturn.md b/man/checkers/CastAddressToIntegerAtReturn.md
new file mode 100644
index 00000000000..bc40eae6a81
--- /dev/null
+++ b/man/checkers/CastAddressToIntegerAtReturn.md
@@ -0,0 +1,55 @@
+# CastAddressToIntegerAtReturn and CastIntegerToAddressAtReturn
+
+**Message**: Returning an address value in a function with integer return type is not portable.<br/>
+**Category**: Portability<br/>
+**Severity**: Portability<br/>
+**Language**: C/C++
+
+## Description
+
+A function silently narrows a pointer (address) down to a plain integer return type, or the other way
+around. On platforms where `sizeof(void*) != sizeof(int)` (most notably 64-bit platforms, where a
+pointer is 8 bytes and `int` is usually still 4 bytes) this loses information: part of the address is
+silently discarded.
+
+- `CastAddressToIntegerAtReturn`: a function with an integer return type returns a pointer value, for
+  example `int foo(char *p) { return p; }`.
+- `CastIntegerToAddressAtReturn`: a function with a pointer return type returns a plain integer value,
+  for example `void* foo(int i) { return i; }`.
+
+This checks `char`/`short`/`int` (not `long`/`long long`, and not `bool`, which is a common,
+intentional idiom rather than a truncation bug), and only when analyzing for a 64-bit target - on a
+32-bit target a pointer and an `int` are the same width, so returning one as the other isn't a
+portability problem there. This checker only runs when the `portability` severity is enabled.
+
+## Motivation
+
+Storing an address in a type that is narrower than a pointer is not portable: it works by accident on
+platforms where the two types happen to be the same width, and silently truncates the address (or
+sign-extends a small integer into a bogus address) on platforms where they are not, most notably when
+porting 32-bit code to 64-bit.
+
+## How to fix
+
+Use a pointer type, or an integer type explicitly meant to hold a pointer (`intptr_t`/`uintptr_t` from
+`<cstdint>`), instead of a plain `int`/`char`/etc.
+
+Before:
+```cpp
+void* foo(int i) {
+    return i; // <- CastIntegerToAddressAtReturn
+}
+```
+
+After:
+```cpp
+#include <cstdint>
+void* foo(intptr_t i) {
+    return reinterpret_cast<void*>(i);
+}
+```
+
+## Related checkers
+
+- [AssignmentAddressToInteger.md](AssignmentAddressToInteger.md) - the same idea, but for a plain
+  assignment rather than a function `return`.
diff --git a/man/checkers/IOWithoutPositioning.md b/man/checkers/IOWithoutPositioning.md
new file mode 100644
index 00000000000..428eeb39c2f
--- /dev/null
+++ b/man/checkers/IOWithoutPositioning.md
@@ -0,0 +1,57 @@
+# IOWithoutPositioning
+
+**Message**: Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A read is immediately followed by a write (or vice versa) on a file opened for both, with no
+`fseek()`/`fsetpos()`/`rewind()`/`fflush()` in between - the C standard says this is undefined
+behaviour.
+
+## Motivation
+
+The C standard requires a positioning call (or an `fflush()`) between a read and a following write (or
+vice versa) on the same read/write stream. Skipping it is undefined behaviour, even though many
+implementations happen to do something predictable with it. cppcheck only follows a local `FILE*`
+variable through straight-line code in the function that opened it; a global or member file handle, or
+passing the handle to another function, is enough uncertainty that it stops checking rather than guess,
+so this only catches the mismatches it can actually prove.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f() {
+    FILE *fp = fopen("a.txt", "r+");
+    if (!fp) return;
+    char buf[10];
+    fread(buf, 1, 10, fp);
+    fwrite(buf, 1, 10, fp); // <- no seek/rewind/fflush since the read above
+    fclose(fp);
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f() {
+    FILE *fp = fopen("a.txt", "r+");
+    if (!fp) return;
+    char buf[10];
+    fread(buf, 1, 10, fp);
+    fseek(fp, 0, SEEK_CUR);
+    fwrite(buf, 1, 10, fp);
+    fclose(fp);
+}
+```
+
+## Related checkers
+
+- [useClosedFile.md](useClosedFile.md), [readWriteOnlyFile.md](readWriteOnlyFile.md),
+  [writeReadOnlyFile.md](writeReadOnlyFile.md), [seekOnAppendedFile.md](seekOnAppendedFile.md),
+  [incompatibleFileOpen.md](incompatibleFileOpen.md) - other checks that follow the same `FILE*` through
+  a function.
diff --git a/man/checkers/StlMissingComparison.md b/man/checkers/StlMissingComparison.md
new file mode 100644
index 00000000000..4e0f57bf089
--- /dev/null
+++ b/man/checkers/StlMissingComparison.md
@@ -0,0 +1,45 @@
+# StlMissingComparison
+
+**Message**: Missing bounds check for extra iterator increment in loop.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+Inside a loop, the iterator is incremented a second time (in addition to the loop's own increment)
+without any bounds check in between, risking incrementing it past `end()`.
+
+## Motivation
+
+An iterator that's advanced twice per iteration without checking for `end()` in between can walk right
+past the end of the container - dereferencing it afterwards, or even just comparing it again, is then
+undefined behaviour. This check flags the missing safety check itself, not a proven out-of-bounds
+increment - if the container always happens to have enough elements left when the extra increment runs,
+the loop never actually goes past `end()` in practice, even though the check that would guarantee this is
+absent.
+
+## How to fix
+
+Before:
+```cpp
+#include <set>
+void f(std::set<int> &ints, bool a) {
+    for (std::set<int>::iterator it = ints.begin(); it != ints.end(); ++it) {
+        if (a) {
+            it++; // <- StlMissingComparison: might increment 'it' past end()
+        }
+    }
+}
+```
+
+After: don't increment the iterator a second time inside the loop body.
+```cpp
+#include <set>
+void f(std::set<int> &ints, bool a) {
+    for (std::set<int>::iterator it = ints.begin(); it != ints.end(); ++it) {
+        if (a) {
+        }
+    }
+}
+```
diff --git a/man/checkers/UnionZeroInit.md b/man/checkers/UnionZeroInit.md
new file mode 100644
index 00000000000..a7941aa5407
--- /dev/null
+++ b/man/checkers/UnionZeroInit.md
@@ -0,0 +1,43 @@
+# UnionZeroInit
+
+**Message**: You are using memset() to initialize a union that also contains a member with a bigger size.<br/>
+**Category**: Portability<br/>
+**Severity**: Portability<br/>
+**Language**: C/C++
+
+## Description
+
+A union is zero-initialized (`= {0}` or `= {}`), but its largest member isn't declared first - only the
+first member is guaranteed to be fully written by that initializer, so the rest of the union's storage
+(beyond the first member's size) may not actually end up zeroed.
+
+## Motivation
+
+An aggregate initializer for a union only initializes the first named member. If a smaller member is
+listed first, the initializer only guarantees that member's bytes are zeroed - the remaining bytes,
+which are only reachable through a later, larger member, are left with whatever was already in memory.
+Code that expects the whole union to be zero can then read uninitialized bytes through the larger
+member.
+
+## How to fix
+
+Declare the union's largest member first, so a `{0}`/`{}` initializer zeroes its entire storage.
+
+Before:
+```cpp
+void foo() {
+    union { char c; int i; } bad0 = {0}; // <- 'i' (the larger member) isn't first
+}
+```
+
+After:
+```cpp
+void foo() {
+    union { int i; char c; } good0 = {0};
+}
+```
+
+## Related checkers
+
+- [overlappingWriteUnion.md](overlappingWriteUnion.md) - a different union-related pitfall, about
+  reading and writing two overlapping members in the same expression.
diff --git a/man/checkers/accessMoved.md b/man/checkers/accessMoved.md
new file mode 100644
index 00000000000..cba7ab04298
--- /dev/null
+++ b/man/checkers/accessMoved.md
@@ -0,0 +1,70 @@
+# accessMoved and accessForwarded
+
+**Message**: Access of moved variable 'v'.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++ only
+
+## Description
+
+A variable is read after it has been passed to `std::move()` (`accessMoved`) or `std::forward()`
+(`accessForwarded`) - by convention, once a value has been moved/forwarded from, its contents are
+unspecified and shouldn't be relied on (except to reset or destroy it).
+
+## Motivation
+
+`std::move()`/`std::forward()` don't themselves do anything except change how the compiler treats the
+expression - the actual "move" happens in whatever constructor or assignment operator the moved-from
+value is subsequently passed into, and its effect on the source object is entirely up to that type. By
+convention a moved-from object is left in a valid but unspecified state, so any code that reads its
+value afterwards (rather than just reassigning or destroying it) is relying on something the language
+doesn't guarantee.
+
+## How to fix
+
+Before:
+```cpp
+#include <utility>
+struct A {};
+void g(A a);
+void f() {
+    A a;
+    g(std::move(a));
+    g(std::move(a)); // <- accessMoved: 'a' was already moved from above
+}
+```
+
+After:
+```cpp
+#include <utility>
+struct A {};
+void g(A a);
+void f() {
+    A a;
+    g(std::move(a));
+}
+```
+
+Before:
+```cpp
+#include <utility>
+template<typename T>
+void g(T&&);
+template<typename T>
+void f(T && t) {
+    g(std::forward<T>(t));
+    T s = t; // <- accessForwarded: 't' was already forwarded above
+}
+```
+
+After:
+```cpp
+#include <utility>
+template<typename T>
+void g(T&&);
+template<typename T>
+void f(T && t) {
+    T s = t;
+    g(std::forward<T>(t));
+}
+```
diff --git a/man/checkers/algorithmOutOfBounds.md b/man/checkers/algorithmOutOfBounds.md
new file mode 100644
index 00000000000..2a1b9d646fd
--- /dev/null
+++ b/man/checkers/algorithmOutOfBounds.md
@@ -0,0 +1,69 @@
+# algorithmOutOfBounds
+
+**Message**: The algorithm 'std::copy' accesses 5 elements through the iterator 'v1.begin()' but only 3 elements are available.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+Many STL algorithms take an iterator that denotes the beginning of a second range (typically an output range) and
+assume that this range is large enough. If it is not, the algorithm writes or reads past the end of the container,
+which is undefined behavior.
+
+This checker compares the number of elements an algorithm accesses with the number of elements that
+are actually available through the iterator, and warns when the access is out of bounds. Three groups
+of algorithms are checked:
+
+- Algorithms that access exactly `last1 - first1` elements through the other iterator: `std::copy`, `std::move`,
+  `std::swap_ranges`, `std::transform`, `std::replace_copy`, `std::replace_copy_if`, `std::reverse_copy`,
+  `std::equal`, `std::mismatch`, `std::is_permutation`, `std::partial_sum`, `std::adjacent_difference` and
+  `std::inner_product`.
+- Algorithms that access at most `last1 - first1` elements, depending on the values in the input range:
+  `std::copy_if`, `std::remove_copy`, `std::remove_copy_if` and `std::unique_copy`. Since the actual number of
+  accessed elements is not known, these are only reported as inconclusive warnings (with `--inconclusive`).
+- Count-based algorithms that access as many elements as the count argument says: `std::copy_n`, `std::fill_n` and
+  `std::generate_n`.
+
+The severity is `error` when the out of bounds access always happens. When the analysis depends on an earlier
+condition in the code, the severity is `warning` and the message has the form "Either the condition 'v.size()==3'
+is redundant or the algorithm ... ".
+
+The checker does not warn when:
+
+- The second range is given with both a begin and an end iterator (for example the two-range overloads of
+  `std::equal`, `std::mismatch` and `std::is_permutation`), since such overloads do not access the second range out
+  of bounds.
+- An iterator adaptor such as `std::back_inserter` or `std::inserter` is used, since those grow the container as
+  needed.
+- The proof would rely on "possible" (non-known) values on both the accessed and the available side.
+
+## How to fix
+
+Make sure the destination range is large enough before calling the algorithm, or use an iterator adaptor such as
+`std::back_inserter` that grows the container as needed.
+
+Before:
+```cpp
+void f(const std::vector<int>& v0) {
+    std::vector<int> v1(3);
+    // If v0 has more than 3 elements, this writes past the end of v1
+    std::copy(v0.begin(), v0.end(), v1.begin());
+}
+```
+
+After:
+```cpp
+void f(const std::vector<int>& v0) {
+    std::vector<int> v1(v0.size());
+    std::copy(v0.begin(), v0.end(), v1.begin());
+}
+```
+
+Or let the container grow:
+```cpp
+void f(const std::vector<int>& v0) {
+    std::vector<int> v1;
+    std::copy(v0.begin(), v0.end(), std::back_inserter(v1));
+}
+```
diff --git a/man/checkers/allocaCalled.md b/man/checkers/allocaCalled.md
new file mode 100644
index 00000000000..c7d55e296ad
--- /dev/null
+++ b/man/checkers/allocaCalled.md
@@ -0,0 +1,70 @@
+# allocaCalled
+
+**Message**: Obsolete function 'alloca' called. In C99 and later it is recommended to use a variable length array instead.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+`alloca()` is called. cppcheck flags every call unconditionally, regardless of the context it's used
+in - it does not check, for example, whether the call is inside a loop.
+
+## Motivation
+
+`alloca()` allocates memory on the stack, but that memory is only freed when the *entire calling
+function* returns - not at the end of the block or loop iteration the call happens to be in, the way a
+normal local variable would be. This makes `alloca()` inside a loop a common way to exhaust the stack:
+each iteration adds another allocation on top of the previous ones, and none of them are released until
+the function finally returns, even though the loop itself may look perfectly ordinary.
+
+Unlike `malloc()`, `alloca()` also has no way to report failure - if a request is too large (whether from
+one oversized call, or many small ones accumulating in a loop), the result is undefined behaviour
+(typically a stack overflow) rather than a clean, checkable error.
+
+## How to fix
+
+Before:
+```cpp
+#include <alloca.h>
+void f(int n, int count) {
+    for (int i = 0; i < count; i++) {
+        char *buf = alloca(n); // <- each iteration's allocation piles up; none are freed until f() returns
+        buf[0] = 0;
+    }
+}
+```
+
+After (C99 and later): a variable length array declared inside the loop body *is* freed at the end of
+each iteration, unlike `alloca()`.
+```cpp
+void f(int n, int count) {
+    for (int i = 0; i < count; i++) {
+        char buf[n];
+        buf[0] = 0;
+    }
+}
+```
+
+Before:
+```cpp
+#include <alloca.h>
+void f(int n) {
+    char *buf = alloca(n); // <- obsolete, no error handling if 'n' is too large
+}
+```
+
+After (C99 and later):
+```cpp
+void f(int n) {
+    char buf[n]; // variable length array
+}
+```
+
+After (C++11 and later):
+```cpp
+#include <array>
+void f() {
+    std::array<char, 128> buf; // fixed-size, or use a dynamically allocated container
+}
+```
diff --git a/man/checkers/argumentSize.md b/man/checkers/argumentSize.md
new file mode 100644
index 00000000000..beff9bbf326
--- /dev/null
+++ b/man/checkers/argumentSize.md
@@ -0,0 +1,47 @@
+# argumentSize
+
+**Message**: Buffer 'a' is too small, the function 'f' expects a bigger buffer in 1st argument<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A function is declared with a fixed-size array parameter (`void f(char a[10])`), and is called with an
+array that's known to be smaller than that.
+
+## Motivation
+
+A parameter declared as `char a[10]` documents (and, inside the function, is used as if) an array of at
+least 10 elements. Calling it with a genuinely smaller array is passed silently - the function has no
+way to know the actual array it received was too small. cppcheck only compares the declared parameter
+size against the size of the array actually passed - it doesn't check whether the function's body goes
+on to access an element near the end of the declared size. If it does, as it's entitled to assume it
+can, that access reads or writes past the real (smaller) array, which is undefined behaviour; if the
+function only ever touches the first few elements in practice, this particular call happens to be
+harmless despite the size mismatch.
+
+## How to fix
+
+Before:
+```cpp
+void f(char a[10]);
+void g() {
+    char a[2];
+    f(a); // <- 'a' is smaller than what f() expects
+}
+```
+
+After:
+```cpp
+void f(char a[10]);
+void g() {
+    char a[10];
+    f(a);
+}
+```
+
+## Related checkers
+
+- [ctuArrayIndex.md](ctuArrayIndex.md) - a related, whole-program check for an out-of-bounds access
+  reached through a function argument, including via a plain pointer parameter.
diff --git a/man/checkers/arithOperationsOnVoidPointer.md b/man/checkers/arithOperationsOnVoidPointer.md
new file mode 100644
index 00000000000..26cf1a7d08a
--- /dev/null
+++ b/man/checkers/arithOperationsOnVoidPointer.md
@@ -0,0 +1,40 @@
+# arithOperationsOnVoidPointer
+
+**Message**: 'x' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.<br/>
+**Category**: Portability<br/>
+**Severity**: Portability<br/>
+**Language**: C/C++
+
+## Description
+
+Pointer arithmetic (`+`, `-`, `++`, `--`, `+=`, `-=`) is performed directly on a `void*`, which isn't
+standard C/C++ (also only a GNU extension).
+
+## Motivation
+
+Pointer arithmetic advances a pointer by a number of elements, each `sizeof(*p)` bytes - but `void` has
+no defined size in standard C/C++, so what "one element" means for a `void*` isn't standard either. Code
+relying on this compiles under gcc/clang's extension (which defines it as if `sizeof(void)` were 1) but
+isn't portable to a strictly-standard-conforming compiler, and is technically undefined behaviour under
+the plain standard rather than the GNU extension cppcheck's own message refers to.
+
+## How to fix
+
+Before:
+```cpp
+void f(void* p) {
+    p = p + 1; // <- arithmetic directly on a void*
+}
+```
+
+After:
+```cpp
+void f(char* p) {
+    p = p + 1;
+}
+```
+
+## Related checkers
+
+- [sizeofVoid.md](sizeofVoid.md) - another `void`-specific, non-standard construct (`sizeof(void)` /
+  `sizeof(*voidPointer)`).
diff --git a/man/checkers/arrayIndexOutOfBounds.md b/man/checkers/arrayIndexOutOfBounds.md
new file mode 100644
index 00000000000..589acbcfa41
--- /dev/null
+++ b/man/checkers/arrayIndexOutOfBounds.md
@@ -0,0 +1,48 @@
+# arrayIndexOutOfBounds and arrayIndexOutOfBoundsCond
+
+**Message**: Array 'a[10]' accessed at index 20, which is out of bounds.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C/C++
+
+## Description
+
+An array is indexed with a value outside its bounds:
+
+- `arrayIndexOutOfBounds`: cppcheck knows for certain the index is outside the array's bounds.
+- `arrayIndexOutOfBoundsCond`: the out-of-bounds index only holds on one branch of a condition checked
+  on the index variable elsewhere in the code - so either that condition is redundant, or this access
+  is a bug.
+
+## Motivation
+
+Reading or writing outside the bounds of an array is undefined behaviour: at best the program crashes
+immediately, at worst it silently corrupts nearby memory and fails much later, or in a different run,
+in a way that's very hard to trace back to the actual cause.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    int a[10];
+    a[20] = 0; // <- arrayIndexOutOfBounds
+}
+```
+
+After:
+```cpp
+void f() {
+    int a[20];
+    a[19] = 0;
+}
+```
+
+## Related checkers
+
+- [pointerOutOfBounds.md](pointerOutOfBounds.md) - the pointer-arithmetic equivalent of this check.
+- [ctuArrayIndex.md](ctuArrayIndex.md) - the same idea, found by cppcheck's whole-program analysis
+  across function calls.
+- [negativeIndex.md](negativeIndex.md) - the same idea, specifically for a negative index.
+- [objectIndex.md](objectIndex.md) - a related out-of-bounds access, through the address of a specific
+  struct member instead of an array.
diff --git a/man/checkers/arrayIndexThenCheck.md b/man/checkers/arrayIndexThenCheck.md
new file mode 100644
index 00000000000..a697a3af402
--- /dev/null
+++ b/man/checkers/arrayIndexThenCheck.md
@@ -0,0 +1,38 @@
+# arrayIndexThenCheck
+
+**Message**: Array index 'i' is used before limits check.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+An array is indexed with a variable, and only *afterwards* is that same variable checked against its
+limits (`a[i] && i < 10`) in a way that looks like it was meant to guard the access. Even where it's
+not currently a bug, this ordering means a bounds check that no longer matches the access (after later
+edits) won't protect anything.
+
+## Motivation
+
+Writing the bounds check after the access it's meant to guard defeats the purpose of a short-circuiting
+`&&`/`||`: by the time the check runs, the access has already happened. Even in cases where the access
+happens to be safe today, this ordering is fragile - it looks protective without actually being so, and
+a later edit to the bounds is easy to get wrong without anything catching it.
+
+## How to fix
+
+Before:
+```cpp
+void f(const char s[], int i) {
+    if (s[i] == 'x' && i < 20) { // <- index used before the limit check
+    }
+}
+```
+
+After:
+```cpp
+void f(const char s[], int i) {
+    if (i < 20 && s[i] == 'x') {
+    }
+}
+```
diff --git a/man/checkers/assertWithSideEffect.md b/man/checkers/assertWithSideEffect.md
new file mode 100644
index 00000000000..647cc3c71eb
--- /dev/null
+++ b/man/checkers/assertWithSideEffect.md
@@ -0,0 +1,69 @@
+# assertWithSideEffect
+
+**Message**: Assert statement calls a function which may have desired side effects: 'foo'.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+The expression inside an `assert(...)` call calls a function that may have a side effect - for example
+a non-`const` member function, or a function whose body is seen to modify a reference/pointer argument
+it was given. When the function's body isn't visible, cppcheck falls back to a narrower guess based on
+whether it's declared `const`/`static`, rather than warning about every unresolvable call - so this
+check only flags a call when it has at least some concrete reason to suspect a side effect.
+
+This checker only runs when the `warning` severity is enabled.
+
+## Motivation
+
+`assert()` is compiled out entirely in release builds (when `NDEBUG` is defined). Relying on a function
+call inside it to actually do something only happens in debug builds and silently vanishes in release
+builds. This is a classic source of code that "works when debugging" and breaks (or does nothing) in
+the shipped build.
+
+## How to fix
+
+Perform the call outside the `assert()`, and assert on the already-computed result.
+
+Before:
+```cpp
+struct Stack {
+    int top = 0;
+    bool pop(int& out) {
+        if (top == 0)
+            return false;
+        out = --top;
+        return true;
+    }
+};
+
+void foo(Stack& s) {
+    int value;
+    assert(s.pop(value)); // <- pop() only runs in debug builds
+}
+```
+
+After:
+```cpp
+struct Stack {
+    int top = 0;
+    bool pop(int& out) {
+        if (top == 0)
+            return false;
+        out = --top;
+        return true;
+    }
+};
+
+void foo(Stack& s) {
+    int value;
+    bool popped = s.pop(value);
+    assert(popped);
+}
+```
+
+## Related checkers
+
+- [assignmentInAssert.md](assignmentInAssert.md) - the same idea, but for a direct assignment inside
+  `assert()` rather than a function call.
diff --git a/man/checkers/assignBoolToFloat.md b/man/checkers/assignBoolToFloat.md
new file mode 100644
index 00000000000..d4691c002c4
--- /dev/null
+++ b/man/checkers/assignBoolToFloat.md
@@ -0,0 +1,32 @@
+# assignBoolToFloat
+
+**Message**: Boolean value assigned to floating point variable.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A `bool` value is assigned to a `float`/`double`/`long double` variable.
+
+## Motivation
+
+Assigning `true`/`false` to a floating-point variable relies on the implicit `bool`-to-float conversion
+(`1.0`/`0.0`) and usually signals a typo or a variable of the wrong type, rather than an intentional
+numeric `1.0`/`0.0`.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    double d = true; // <- likely meant a numeric value
+}
+```
+
+After:
+```cpp
+void f() {
+    double d = 1.0;
+}
+```
diff --git a/man/checkers/assignBoolToPointer.md b/man/checkers/assignBoolToPointer.md
new file mode 100644
index 00000000000..cde6609a1bb
--- /dev/null
+++ b/man/checkers/assignBoolToPointer.md
@@ -0,0 +1,46 @@
+# assignBoolToPointer
+
+**Message**: Boolean value assigned to pointer.<br/>
+**Category**: Correctness/Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+A `bool` value is assigned directly to a pointer variable.
+
+## Motivation
+
+Assigning a `bool` to a pointer almost never expresses what a reader would expect a pointer assignment
+to mean, and is usually a typo for something like assigning through the pointer (`*p = flag;`) instead
+of to it.
+
+The two possible values are not equally risky. Assigning `false` is harmless: it converts to `0`, which
+is always a well-defined way to give the pointer a null value - purely a readability/intent problem, not
+a safety one. Assigning `true` is different: in C++ this pattern is normally rejected outright by the
+compiler; in C it is typically accepted (at most with a warning) as an implicit conversion of the value
+`1` to a pointer, which the C standard leaves implementation-defined - the resulting pointer is not
+guaranteed to be aligned or to point to anything real. If that pointer is later dereferenced, the
+dereference itself is undefined behaviour, because the pointer doesn't actually point to a valid object
+of its type. Since the assigned value is often a variable rather than a literal, either outcome is
+possible depending on what the variable holds at runtime.
+
+## How to fix
+
+Before:
+```cpp
+bool flag;
+bool *p;
+void f() {
+    p = flag; // <- likely meant '*p = flag;'
+}
+```
+
+After:
+```cpp
+bool flag;
+bool *p;
+void f() {
+    *p = flag;
+}
+```
diff --git a/man/checkers/assignIfError.md b/man/checkers/assignIfError.md
new file mode 100644
index 00000000000..617724ffccd
--- /dev/null
+++ b/man/checkers/assignIfError.md
@@ -0,0 +1,40 @@
+# assignIfError
+
+**Message**: Mismatching assignment and comparison, comparison 'y==1' is always false.<br/>
+**Category**: Correctness<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A variable that was just assigned via a bitmask operation (`x = y & 0xf0;`) is compared against a
+constant that mask could never produce.
+
+## Motivation
+
+Once a variable has been masked with `& 0xf0`, its value is constrained to the multiples of 16 that mask
+allows - comparing it against a value the mask rules out (like `1`) can never match, which usually means
+either the mask or the comparison value is wrong.
+
+## How to fix
+
+Before:
+```cpp
+void f(int x) {
+    int y = x & 0xf0;
+    if (y == 1) {} // <- 'y' can never be 1, its low bits were just masked off
+}
+```
+
+After:
+```cpp
+void f(int x) {
+    int y = x & 0xf0;
+    if (y == 0x10) {}
+}
+```
+
+## Related checkers
+
+- [knownConditionTrueFalse.md](knownConditionTrueFalse.md) - the more general check for a condition
+  whose truth value cppcheck already knows in advance.
diff --git a/man/checkers/assignmentInAssert.md b/man/checkers/assignmentInAssert.md
new file mode 100644
index 00000000000..bf550ae7f38
--- /dev/null
+++ b/man/checkers/assignmentInAssert.md
@@ -0,0 +1,46 @@
+# assignmentInAssert
+
+**Message**: Assert statement modifies 'x'.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+The assert expression assigns to, or increments/decrements, a variable that is also used outside the
+assert - for example `assert(x = compute());`.
+
+This checker only runs when the `warning` severity is enabled.
+
+## Motivation
+
+`assert()` is compiled out entirely in release builds (when `NDEBUG` is defined). Any effect placed
+inside it - such as assigning to a variable that's relied on afterwards - only happens in debug builds
+and silently vanishes in release builds. This is a classic source of code that "works when debugging"
+and breaks (or does nothing) in the shipped build.
+
+## How to fix
+
+Perform the assignment outside the `assert()`, and assert on the already-computed result.
+
+Before:
+```cpp
+void f(int y) {
+    int x;
+    assert(x = y + 1); // <- 'x' only gets its value in debug builds
+}
+```
+
+After:
+```cpp
+void f(int y) {
+    int x;
+    x = y + 1;
+    assert(x == 1);
+}
+```
+
+## Related checkers
+
+- [assertWithSideEffect.md](assertWithSideEffect.md) - the same idea, but for a function call inside
+  `assert()` that may have a side effect, rather than a direct assignment.
diff --git a/man/checkers/assignmentInCondition.md b/man/checkers/assignmentInCondition.md
new file mode 100644
index 00000000000..75920adc6b1
--- /dev/null
+++ b/man/checkers/assignmentInCondition.md
@@ -0,0 +1,42 @@
+# assignmentInCondition
+
+**Message**: Suspicious assignment in condition. Condition 't=s' is always true.<br/>
+**Category**: Correctness<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A container or iterator is assigned (`=`) directly inside a condition, where `==` was probably meant -
+as written, the condition is always true.
+
+## Motivation
+
+`if (t = s)` assigns `s` to `t` and then tests the (always-true, for a container/iterator) result of
+that assignment - almost certainly a typo for `if (t == s)`. Because it's valid, compiling code, this is
+easy to miss in review.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+void f(const std::string& s) {
+    std::string t;
+    if (t = s) {} // <- always true, did you mean '=='?
+}
+```
+
+After:
+```cpp
+#include <string>
+void f(const std::string& s) {
+    std::string t = s;
+    if (!t.empty()) {}
+}
+```
+
+## Related checkers
+
+- [clarifyCondition.md](clarifyCondition.md) - a related but distinct mistake: an assignment or bitwise
+  operator next to a comparison with ambiguous precedence.
diff --git a/man/checkers/autoVariables.md b/man/checkers/autoVariables.md
new file mode 100644
index 00000000000..d51b69a3d7f
--- /dev/null
+++ b/man/checkers/autoVariables.md
@@ -0,0 +1,46 @@
+# autoVariables
+
+**Message**: Address of local auto-variable assigned to a function parameter.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+The address of a local variable is assigned to a pointer function *parameter* (directly, through a
+struct member, or through an array element reached via that parameter), so the address leaks back to
+the caller.
+
+## Motivation
+
+The assignment itself just stores an address - the trouble starts once the function returns and `num`
+goes out of scope: the caller is left holding a pointer to memory it doesn't own anymore, and using that
+pointer (which is the entire reason it was written out through the parameter) is undefined behaviour.
+Because the memory involved is usually still intact for a little while afterwards, this kind of bug
+often "works" in testing and then fails unpredictably once something else reuses that memory - which
+makes it worth catching at analysis time instead of at runtime.
+
+## How to fix
+
+Before:
+```cpp
+void foo(int **res) {
+    int num = 2;
+    *res = &num; // <- autoVariables: 'num' won't exist once foo() returns
+}
+```
+
+After: return the value itself, or allocate storage that outlives the function.
+```cpp
+void foo(int *res) {
+    int num = 2;
+    *res = num;
+}
+```
+
+## Related checkers
+
+- [danglingLifetime.md](danglingLifetime.md) - the same idea, but for a local variable's address
+  escaping into a global/static/member pointer instead of a function parameter.
+- [returnDanglingLifetime.md](returnDanglingLifetime.md) - the same idea, but escaping through `return`
+  instead of a parameter.
diff --git a/man/checkers/autovarInvalidDeallocation.md b/man/checkers/autovarInvalidDeallocation.md
new file mode 100644
index 00000000000..f84a7b13164
--- /dev/null
+++ b/man/checkers/autovarInvalidDeallocation.md
@@ -0,0 +1,35 @@
+# autovarInvalidDeallocation
+
+**Message**: Deallocating a pointer that was not dynamically allocated: tmp<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+`free()`/`delete` is called on something that wasn't allocated dynamically - a local array, a string
+literal, or the address of a local/global/static variable.
+
+## Motivation
+
+`free()`/`delete` are only valid on memory that was actually obtained from the matching allocation
+function. Calling either on something else - stack memory, a string literal, an unrelated variable's
+address - is undefined behaviour, typically corrupting the memory allocator's own bookkeeping.
+
+## How to fix
+
+Before:
+```cpp
+void foo() {
+    char tmp[256];
+    free(tmp); // <- autovarInvalidDeallocation: 'tmp' isn't heap-allocated
+}
+```
+
+After:
+```cpp
+void foo() {
+    char *tmp = malloc(256);
+    free(tmp);
+}
+```
diff --git a/man/checkers/badBitmaskCheck.md b/man/checkers/badBitmaskCheck.md
new file mode 100644
index 00000000000..7e6c53c16b7
--- /dev/null
+++ b/man/checkers/badBitmaskCheck.md
@@ -0,0 +1,46 @@
+# badBitmaskCheck
+
+**Message**: Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'?<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning/Style<br/>
+**Language**: C/C++
+
+## Description
+
+A boolean/condition value is computed with `|` where `&` was probably meant - the result of `x | mask`
+is true as soon as `x` is nonzero, regardless of `mask`. This message is also used for the opposite,
+harmless mistake: an operand `| 0` that has no effect and can be removed (reported at `style` severity
+instead of `warning`).
+
+## Motivation
+
+`|` and `&` look similar but behave very differently in a boolean context: `x | mask` is true whenever
+`x` alone is nonzero, so the mask contributes nothing and the check silently always passes. This is easy
+to miss because the code compiles and often "looks right" at a glance.
+
+This check may need `--check-level=exhaustive` to see every case.
+
+## How to fix
+
+Before:
+```cpp
+bool f(int x) {
+    bool b = x | 0x02; // <- always true if x is nonzero
+    return b;
+}
+```
+
+After:
+```cpp
+bool f(int x) {
+    bool b = x & 0x02;
+    return b;
+}
+```
+
+## Related checkers
+
+- [mismatchingBitAnd.md](mismatchingBitAnd.md) - a different bitmask mistake: chained `&` masks that
+  share no bits.
+- [comparisonError.md](comparisonError.md) - a bitwise expression compared against a constant it can
+  never produce.
diff --git a/man/checkers/bitwiseOnBoolean.md b/man/checkers/bitwiseOnBoolean.md
new file mode 100644
index 00000000000..c463b6e4d51
--- /dev/null
+++ b/man/checkers/bitwiseOnBoolean.md
@@ -0,0 +1,43 @@
+# bitwiseOnBoolean
+
+**Message**: Boolean expression 'x' is used in bitwise operation. Did you mean '&&'?<br/>
+**Category**: Readability<br/>
+**Severity**: Style (Inconclusive)<br/>
+**Language**: C/C++ (also applies to C's `_Bool`)
+
+## Description
+
+`&`/`|`/`&=`/`|=` is used where at least one operand is boolean, when `&&`/`||` was likely intended.
+
+## Motivation
+
+This checker is about readability. Readability is subjective - opinions differ about what is more
+readable. Please follow your own opinion.
+
+When both operands are `bool`, `&`/`|` on their `0`/`1` representation happens to produce the same
+truth value as `&&`/`||`, so this code usually still works correctly today. The main reason to flag it
+anyway is common practice: `&&`/`||` is the conventional, unambiguous way to write boolean logic in
+C/C++, while `&`/`|` is understood to mean bitwise work - so a stray single `&`/`|` reads as a likely
+typo even when it happens to be harmless. There is also one real behavioural difference: `&`/`|` always
+evaluates both operands, so if the other side has a side effect, using `&`/`|` instead of `&&`/`||`
+changes whether that side effect happens.
+
+When the *other* operand isn't itself boolean (e.g. an integer flag or count), `&`/`|` combines the
+boolean's `0`/`1` value with it bit-by-bit, which generally is **not** the same truth value `&&`/`||`
+would produce - in that case this points at an actual logic bug, not just a style preference.
+
+## How to fix
+
+Before:
+```cpp
+void f(bool a, bool b) {
+    if (a & b) {} // <- likely meant '&&'
+}
+```
+
+After:
+```cpp
+void f(bool a, bool b) {
+    if (a && b) {}
+}
+```
diff --git a/man/checkers/bufferAccessOutOfBounds.md b/man/checkers/bufferAccessOutOfBounds.md
new file mode 100644
index 00000000000..9280c54d554
--- /dev/null
+++ b/man/checkers/bufferAccessOutOfBounds.md
@@ -0,0 +1,37 @@
+# bufferAccessOutOfBounds
+
+**Message**: Buffer is accessed out of bounds: d<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A call to a function cppcheck has size information for (`strcpy`, `strcat`, `memcpy`, `sprintf`, and
+similar, via the library configuration) is passed a buffer that's too small for what the call can read
+or write.
+
+## Motivation
+
+Many standard library functions read or write a caller-supplied buffer without any bounds checking of
+their own - it's entirely up to the caller to make sure the buffer is large enough. Getting this wrong
+is a very common, very old source of buffer overruns in C/C++ code.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    char d[3] = {};
+    strcat(d, "12345678"); // <- 'd' can't hold this much
+}
+```
+
+After:
+```cpp
+void f() {
+    char d[10] = {};
+    strcat(d, "12345678");
+}
+```
+
diff --git a/man/checkers/catchExceptionByValue.md b/man/checkers/catchExceptionByValue.md
new file mode 100644
index 00000000000..80f058766ab
--- /dev/null
+++ b/man/checkers/catchExceptionByValue.md
@@ -0,0 +1,45 @@
+# catchExceptionByValue
+
+**Message**: Exception should be caught by reference.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++ only
+
+## Description
+
+A `catch` clause catches a class type by value instead of by (const) reference.
+
+## Motivation
+
+Catching by value makes a copy of the exception object (and, if the actual thrown type is more derived
+than the `catch` clause's type, slices it down, losing information) every time an exception is caught -
+catching by `const&` avoids the copy entirely and preserves the exception's real, most-derived type.
+
+## How to fix
+
+Before:
+```cpp
+void doWork();
+void f() {
+    try {
+        doWork();
+    } catch (std::exception err) { // <- caught by value
+    }
+}
+```
+
+After:
+```cpp
+void doWork();
+void f() {
+    try {
+        doWork();
+    } catch (const std::exception& err) {
+    }
+}
+```
+
+## Related checkers
+
+- [exceptRethrowCopy.md](exceptRethrowCopy.md) - a related `catch`-clause mistake: rethrowing with
+  `throw x;` instead of a bare `throw;`.
diff --git a/man/checkers/charBitOp.md b/man/checkers/charBitOp.md
new file mode 100644
index 00000000000..3d595982829
--- /dev/null
+++ b/man/checkers/charBitOp.md
@@ -0,0 +1,48 @@
+# charBitOp
+
+**Message**: When using 'char' variables in bit operations, sign extension can generate unexpected results.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A `char` variable is used as an operand of `&`/`|`/`^` and the result is stored in a wider type
+(`short`/`int`/`long`) - if the `char` is negative, sign extension fills the extra bits with `1`s
+instead of `0`s, so the resulting bit pattern isn't the one that was probably intended.
+
+## Motivation
+
+On many platforms `char` can hold negative values (typically -128..127 instead of 0..255). When a
+negative `char` is used in a bitwise operation with a wider type, it's first sign-extended - the extra,
+high-order bits of the wider type are filled with copies of the sign bit (`1` for a negative value)
+rather than `0`. Code that expects a `char`'s bit pattern to occupy only its low 8 bits and leave the
+rest zero gets a surprising result whenever the `char` happens to be negative.
+
+## How to fix
+
+Use `unsigned char` (or mask the operand) if the intent is to treat the byte as a small non-negative
+number.
+
+Before:
+```cpp
+void foo(int a, int *result) {
+    signed char ch = -1;
+    *result = a | ch; // <- sign extension fills the high bits of 'ch' with 1s
+}
+```
+
+After:
+```cpp
+void foo(int a, int *result) {
+    unsigned char ch = 0xff;
+    *result = a | ch;
+}
+```
+
+## Related checkers
+
+- [signedCharArrayIndex.md](signedCharArrayIndex.md) - the same signed-`char` sign-extension pitfall,
+  but for using a `char` as an array index instead of a bitwise operand.
+- [checkCastIntToCharAndBack.md](checkCastIntToCharAndBack.md) - a different `char`-narrowing pitfall,
+  about storing `getchar()`'s return value in a `char` before comparing it with `EOF`.
diff --git a/man/checkers/checkCastIntToCharAndBack.md b/man/checkers/checkCastIntToCharAndBack.md
new file mode 100644
index 00000000000..23f41bba4f9
--- /dev/null
+++ b/man/checkers/checkCastIntToCharAndBack.md
@@ -0,0 +1,58 @@
+# checkCastIntToCharAndBack
+
+**Message**: Storing getchar() return value in char variable and then comparing with EOF.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+The return value of `getchar()`/`getc()`/`fgetc()` (an `int`, so it can represent every possible byte
+value plus the special value `EOF`) is stored in a `char` and *then* compared with `EOF` - once narrowed
+to `char`, a real byte that happens to equal the platform's `EOF` value as a `char` can be mistaken for
+end-of-file, or vice versa.
+
+## Motivation
+
+`getchar()` and friends return `int` specifically so that every possible `unsigned char` byte value
+(0-255) and the distinct sentinel value `EOF` can all be told apart. Storing the result in a `char`
+first throws away exactly the information needed to make that distinction - depending on the platform's
+`char` signedness and `EOF`'s value, a legitimate byte can end up equal to `EOF` after narrowing, causing
+input to be truncated early, or (less commonly) `EOF` itself to go unrecognized.
+
+## How to fix
+
+Keep the return value in an `int` until after it has been compared with `EOF`.
+
+Before:
+```cpp
+#include <cstdio>
+void bar(char);
+void f() {
+    unsigned char c;
+    c = getchar();
+    while (c != EOF) { // <- 'c' can never actually equal EOF once narrowed
+        bar(c);
+        c = getchar();
+    }
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void bar(int);
+void f() {
+    int c;
+    c = getchar();
+    while (c != EOF) {
+        bar(c);
+        c = getchar();
+    }
+}
+```
+
+## Related checkers
+
+- [charBitOp.md](charBitOp.md) - a different `char`-signedness pitfall, about sign extension in bitwise
+  operations rather than narrowing a stream-read result.
diff --git a/man/checkers/checkLibraryUseIgnore.md b/man/checkers/checkLibraryUseIgnore.md
new file mode 100644
index 00000000000..ace4e9ec3e6
--- /dev/null
+++ b/man/checkers/checkLibraryUseIgnore.md
@@ -0,0 +1,29 @@
+# checkLibraryUseIgnore
+
+**Message**: --check-library: Function f() should have <use>/<leak-ignore> configuration<br/>
+**Category**: Configuration<br/>
+**Severity**: Information<br/>
+**Language**: C/C++
+
+## Description
+
+Only produced with `--check-library`: a function call couldn't be classified as either using or
+ignoring a tracked (allocated) variable passed into it. This is aimed at people writing library
+configurations, not at application code.
+
+## Motivation
+
+cppcheck's leak-tracking checks ([memleak.md](memleak.md) and its siblings) rely on knowing, for every
+function a tracked variable is passed to, whether that function takes ownership of it, merely reads it,
+or does something else. When a library configuration doesn't say, `--check-library` flags the gap so
+the configuration can be completed rather than silently guessing.
+
+## How to fix
+
+Add a `<use>` or `<leak-ignore>` entry for the function in the relevant library configuration file, so
+cppcheck knows how it treats the argument.
+
+## Related checkers
+
+- [memleak.md](memleak.md) and its siblings - the actual leak/double-free/use-after-free checks that
+  this configuration gap affects the accuracy of.
diff --git a/man/checkers/clarifyCalculation.md b/man/checkers/clarifyCalculation.md
new file mode 100644
index 00000000000..11d6da450e8
--- /dev/null
+++ b/man/checkers/clarifyCalculation.md
@@ -0,0 +1,41 @@
+# clarifyCalculation
+
+**Message**: Clarify calculation precedence for '*' and '?'.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A calculation (`a * b`, `a + b`, ...) sits directly to the left of `?` in a ternary expression
+(`a * b ? c : d`) - it's easy to misread this as `a * (b ? c : d)`, but it's actually `(a * b) ? c : d`.
+
+## Motivation
+
+The code compiles exactly as written and does exactly what the operator precedence rules say, but that's
+not always what a quick read suggests - a reader can easily assume the ternary binds to the calculation's
+last operand rather than to the whole calculation. Adding parentheses costs nothing and removes the
+ambiguity for the next reader.
+
+## How to fix
+
+Add parentheses that make the actual grouping explicit.
+
+Before:
+```cpp
+int f(char c) {
+    return 10 * (c == 0) ? 1 : 2; // <- looks like '10 * ((c == 0) ? 1 : 2)'
+}
+```
+
+After:
+```cpp
+int f(char c) {
+    return (10 * (c == 0)) ? 1 : 2;
+}
+```
+
+## Related checkers
+
+- [clarifyStatement.md](clarifyStatement.md) - a different easy-to-misread-precedence pitfall, about
+  `*p++;` rather than a calculation next to `?`.
diff --git a/man/checkers/clarifyCondition.md b/man/checkers/clarifyCondition.md
new file mode 100644
index 00000000000..cf5095956a3
--- /dev/null
+++ b/man/checkers/clarifyCondition.md
@@ -0,0 +1,42 @@
+# clarifyCondition
+
+**Message**: Suspicious condition (assignment + comparison); Clarify expression with parentheses.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+An assignment or a bitwise operator sits next to a comparison in a way whose precedence is easy to
+misread (`x = a < 0`, `a & b == c`) - cppcheck suggests adding parentheses to make the intended meaning
+explicit.
+
+## Motivation
+
+`x = a < 0` really means `x = (a < 0)` (assign a boolean), not `(x = a) < 0` - but a reader skimming the
+line can easily assume the opposite. Adding parentheses costs nothing and removes any ambiguity about
+which reading was intended.
+
+## How to fix
+
+Before:
+```cpp
+void f(int a) {
+    int x;
+    if (x = a < 0) {} // <- is this '(x = a) < 0' or 'x = (a < 0)'?
+}
+```
+
+After:
+```cpp
+void f(int a) {
+    int x;
+    x = (a < 0);
+    if (x) {}
+}
+```
+
+## Related checkers
+
+- [assignmentInCondition.md](assignmentInCondition.md) - a related but distinct mistake: a container or
+  iterator assignment written where a comparison was probably meant.
diff --git a/man/checkers/clarifyStatement.md b/man/checkers/clarifyStatement.md
new file mode 100644
index 00000000000..728b5f9dd53
--- /dev/null
+++ b/man/checkers/clarifyStatement.md
@@ -0,0 +1,43 @@
+# clarifyStatement
+
+**Message**: In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'?<br/>
+**Category**: Code Quality<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A statement like `*p++;` looks like it dereferences the incremented pointer, but `++` binds tighter
+than the dereference - the pointer is incremented and the dereferenced (old) value is simply discarded.
+
+## Motivation
+
+`*p++` is parsed as `*(p++)`: the pointer itself is incremented, and the value that was pointed to
+before the increment is read and then thrown away, since the statement doesn't do anything with it. A
+reader skimming the code can easily assume the intent was to modify what the pointer points to
+(`(*p)++`), which is a different operation entirely.
+
+## How to fix
+
+Add parentheses to make the intended operation explicit.
+
+Before:
+```cpp
+char* f(char* c) {
+    *c++; // <- increments 'c' and discards the old *c, doesn't touch what 'c' points to
+    return c;
+}
+```
+
+After:
+```cpp
+char* f(char* c) {
+    (*c)++;
+    return c;
+}
+```
+
+## Related checkers
+
+- [clarifyCalculation.md](clarifyCalculation.md) - a different easy-to-misread-precedence pitfall, about
+  a calculation next to `?` rather than `*p++`.
diff --git a/man/checkers/commaSeparatedReturn.md b/man/checkers/commaSeparatedReturn.md
new file mode 100644
index 00000000000..faa1981c894
--- /dev/null
+++ b/man/checkers/commaSeparatedReturn.md
@@ -0,0 +1,48 @@
+# commaSeparatedReturn
+
+**Message**: Comma is used in return statement. The comma can easily be misread as a ';'.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A comma appears inside a `return` statement (`return a + 1, b++;`) - this is a single statement using
+the comma operator, easily misread as `return a + 1;` followed by a separate `b++;`.
+
+**This check is currently switched off in cppcheck and never produces a warning**, even for the exact
+code pattern it's meant to catch - it's kept in the error list only so its ID stays recognized (for
+example in older suppression files), not because it's active. Don't rely on it to catch this mistake.
+
+## Motivation
+
+The comma operator lets one statement evaluate several expressions in sequence, discarding all but the
+last one's value - `return a + 1, b++;` actually returns the value of `b++`, not `a + 1`. This reads
+exactly like two separate statements with a typo'd semicolon, which is a very easy way to misjudge what
+value a function returns.
+
+## How to fix
+
+Split the comma expression into separate statements, and make the intended return value explicit.
+
+Before:
+```cpp
+int f(int x, int a, int b) {
+    if (x)
+        return a + 1,   // looks like this is returned...
+    b++;                // ...but this is actually returned instead
+    return 0;
+}
+```
+
+After:
+```cpp
+int f(int x, int a, int b) {
+    if (x) {
+        b++;
+        return b;
+    }
+    return 0;
+}
+```
+
diff --git a/man/checkers/compareBoolExpressionWithInt.md b/man/checkers/compareBoolExpressionWithInt.md
new file mode 100644
index 00000000000..5379e5b7d50
--- /dev/null
+++ b/man/checkers/compareBoolExpressionWithInt.md
@@ -0,0 +1,22 @@
+# compareBoolExpressionWithInt
+
+**Message**: Comparison of a boolean expression with an integer other than 0 or 1.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+A boolean expression (not necessarily a `bool` variable - for example `a && b`, or a comparison) is
+compared against a number.
+
+## Motivation
+
+A boolean expression only ever evaluates to `0` or `1`, so comparing it against any other number is
+always false, and comparing it against `0`/`1` with a relational operator is easy to get backwards -
+either way, this is rarely what the code's author actually intended.
+
+## How to fix
+
+Compare the boolean expression directly, or with `==`/`!=` against `true`/`false`, instead of against
+an arbitrary integer.
diff --git a/man/checkers/comparePointers.md b/man/checkers/comparePointers.md
new file mode 100644
index 00000000000..57de49f3b1e
--- /dev/null
+++ b/man/checkers/comparePointers.md
@@ -0,0 +1,61 @@
+# comparePointers and subtractPointers
+
+**Message**: Comparing pointers that point to different objects<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++ only
+
+## Description
+
+Two pointers that cppcheck can see point into two different, unrelated variables or objects are
+compared (`<`, `>`, `<=`, `>=` - `comparePointers`) or subtracted (`-` - `subtractPointers`). Only
+pointers into the same array/object have a meaningful order or distance between them.
+
+## Motivation
+
+Comparing or subtracting pointers that don't point into the same array or object is undefined
+behaviour: there's no guarantee about how unrelated objects are laid out in memory relative to each
+other, so the result of `<`/`>`/`-` between them isn't meaningful, even though the code compiles and
+often looks reasonable.
+
+## How to fix
+
+Only compare or subtract pointers that point into the same array or object.
+
+Before:
+```cpp
+bool f() {
+    int x = 0;
+    int y = 0;
+    int* xp = &x;
+    int* yp = &y;
+    return xp > yp; // <- comparePointers: 'x' and 'y' are unrelated variables
+}
+```
+
+After:
+```cpp
+bool f() {
+    int arr[2] = {0, 0};
+    int* xp = &arr[0];
+    int* yp = &arr[1];
+    return xp > yp; // pointers into the same array can be meaningfully compared
+}
+```
+
+Before:
+```cpp
+int f() {
+    int x = 0;
+    int y = 1;
+    return &x - &y; // <- subtractPointers: the distance between unrelated variables is meaningless
+}
+```
+
+After:
+```cpp
+int f() {
+    int arr[2] = {0, 1};
+    return &arr[0] - &arr[1];
+}
+```
diff --git a/man/checkers/compareValueOutOfTypeRangeError.md b/man/checkers/compareValueOutOfTypeRangeError.md
new file mode 100644
index 00000000000..e94e748a372
--- /dev/null
+++ b/man/checkers/compareValueOutOfTypeRangeError.md
@@ -0,0 +1,38 @@
+# compareValueOutOfTypeRangeError
+
+**Message**: Comparing expression of type 'unsigned char' against value 256. Condition is always false.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A variable is compared against a constant that lies outside the range its own type can represent (for
+example, an `unsigned char` compared against `256`).
+
+## Motivation
+
+An `unsigned char` can never hold `256` - it wraps around before ever reaching it - so the comparison's
+result is fixed regardless of the variable's actual value. This is usually a sign the variable's type is
+too small for what it's meant to hold, or that the compared-against constant is wrong.
+
+## How to fix
+
+Before:
+```cpp
+void f(unsigned char c) {
+    if (c == 256) {} // <- 'c' can never reach 256
+}
+```
+
+After:
+```cpp
+void f(int c) {
+    if (c == 256) {}
+}
+```
+
+## Related checkers
+
+- [knownConditionTrueFalse.md](knownConditionTrueFalse.md) - the more general check for a condition
+  whose truth value cppcheck already knows in advance.
diff --git a/man/checkers/comparisonError.md b/man/checkers/comparisonError.md
new file mode 100644
index 00000000000..dc0cab73b6c
--- /dev/null
+++ b/man/checkers/comparisonError.md
@@ -0,0 +1,37 @@
+# comparisonError
+
+**Message**: Expression '(X & 0x7) == 0x8' is always false.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A bitwise `&`/`|` expression is compared against a constant that mask could never actually produce.
+
+## Motivation
+
+Masking a value with `& 0x07` can only ever produce a result in `0..7`; comparing that result against
+`8` (or any value the mask can't produce) is either dead code or a sign the mask or the compared-against
+constant is wrong.
+
+## How to fix
+
+Before:
+```cpp
+void f(int a) {
+    if ((a & 0x07) == 8) {} // <- masking with 0x07 can never produce 8
+}
+```
+
+After:
+```cpp
+void f(int a) {
+    if ((a & 0x0f) == 8) {}
+}
+```
+
+## Related checkers
+
+- [badBitmaskCheck.md](badBitmaskCheck.md) - `|` used where `&` was probably meant.
+- [mismatchingBitAnd.md](mismatchingBitAnd.md) - chained `&` masks that share no bits.
diff --git a/man/checkers/comparisonFunctionIsAlwaysTrueOrFalse.md b/man/checkers/comparisonFunctionIsAlwaysTrueOrFalse.md
new file mode 100644
index 00000000000..7ee231c0650
--- /dev/null
+++ b/man/checkers/comparisonFunctionIsAlwaysTrueOrFalse.md
@@ -0,0 +1,37 @@
+# comparisonFunctionIsAlwaysTrueOrFalse
+
+**Message**: Comparison of two identical variables with isless(x,x) always evaluates to false.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+One of the C99 comparison macros (`isgreater`, `isless`, `islessgreater`, `isgreaterequal`,
+`islessequal`) is called with the exact same variable as both arguments, which always evaluates to the
+same result.
+
+## Motivation
+
+Comparing a value against itself with a strict-ordering macro always produces the same, fixed answer -
+so the call doesn't test anything, and is almost always a copy-paste mistake where the second argument
+should have been a different variable.
+
+## How to fix
+
+Before:
+```cpp
+#include <cmath>
+bool f(int x) {
+   return isless(x,x); // <- always false
+}
+```
+
+After:
+```cpp
+#include <cmath>
+bool f(int x, int y) {
+   return isless(x,y);
+}
+```
+
diff --git a/man/checkers/comparisonOfBoolWithBoolError.md b/man/checkers/comparisonOfBoolWithBoolError.md
new file mode 100644
index 00000000000..918b60f8a28
--- /dev/null
+++ b/man/checkers/comparisonOfBoolWithBoolError.md
@@ -0,0 +1,37 @@
+# comparisonOfBoolWithBoolError
+
+**Message**: Comparison of a variable having boolean value using relational (<, >, <= or >=) operator.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+Two `bool` variables are compared with `<`, `>`, `<=` or `>=`.
+
+## Motivation
+
+`bool` only has two values, so ordering two of them doesn't express anything `==`/`!=` wouldn't say
+more clearly, and is easy to get backwards since `false < true` is not always the intuitive direction a
+reader expects.
+
+## How to fix
+
+Before:
+```cpp
+void f(bool a, bool b) {
+    if (a < b) {} // <- relational comparison between two bools
+}
+```
+
+After:
+```cpp
+void f(bool a, bool b) {
+    if (a != b) {}
+}
+```
+
+## Related checkers
+
+- [comparisonOfBoolWithInvalidComparator.md](comparisonOfBoolWithInvalidComparator.md) - the same kind
+  of relational comparison, but against a `true`/`false` literal instead of another `bool` variable.
diff --git a/man/checkers/comparisonOfBoolWithInvalidComparator.md b/man/checkers/comparisonOfBoolWithInvalidComparator.md
new file mode 100644
index 00000000000..4fc9dafd9c9
--- /dev/null
+++ b/man/checkers/comparisonOfBoolWithInvalidComparator.md
@@ -0,0 +1,40 @@
+# comparisonOfBoolWithInvalidComparator
+
+**Message**: Comparison of a boolean value using relational operator (<, >, <= or >=).<br/>
+**Category**: Code Quality<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+A boolean literal (`true`/`false`) is compared to something using `<`, `>`, `<=` or `>=`.
+
+## Motivation
+
+`<`, `>`, `<=` and `>=` are well-defined against a `bool` literal (`false` is `0`, `true` is `1`), so
+this code already compiles and evaluates correctly - there is no functional problem to fix. The reason
+to flag it is readability: `bool` only has two values, so an ordering comparison against `true`/`false`
+says nothing that `==`/`!=` wouldn't say more directly, and it forces the reader to work out which of
+`false`/`true` is "smaller" instead of just reading the equality check. Preferring `==`/`!=` for
+two-valued types is the clearer, more idiomatic style.
+
+## How to fix
+
+Before:
+```cpp
+void f(bool x) {
+    if (x > false) {} // <- relational comparison against a bool literal
+}
+```
+
+After:
+```cpp
+void f(bool x) {
+    if (x == true) {}
+}
+```
+
+## Related checkers
+
+- [comparisonOfBoolWithBoolError.md](comparisonOfBoolWithBoolError.md) - the same kind of relational
+  comparison, but between two `bool` variables instead of against a literal.
diff --git a/man/checkers/comparisonOfFuncReturningBoolError.md b/man/checkers/comparisonOfFuncReturningBoolError.md
new file mode 100644
index 00000000000..b01a4a09e25
--- /dev/null
+++ b/man/checkers/comparisonOfFuncReturningBoolError.md
@@ -0,0 +1,42 @@
+# comparisonOfFuncReturningBoolError and comparisonOfTwoFuncsReturningBoolError
+
+**Message**: Comparison of a function returning boolean value using relational (<, >, <= or >=) operator.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+The result of a function known to return `bool` is compared with `<`, `>`, `<=` or `>=` -
+`comparisonOfFuncReturningBoolError` when one side is such a call, `comparisonOfTwoFuncsReturningBoolError`
+when both sides are.
+
+## Motivation
+
+`<`, `>`, `<=` and `>=` are well-defined for `bool` results (`false` is `0`, `true` is `1`), so this code
+already compiles and evaluates correctly - there is no functional problem to fix. The reason to flag it
+is readability: `bool` only has two values, so ordering the result of a bool-returning function says
+nothing that `==`/`!=` wouldn't say more directly, and it forces the reader to work out which of
+`false`/`true` is "smaller" instead of just reading the equality/logical check. Preferring `==`/`!=` (or
+plain `&&`/`!`) for two-valued results is the clearer, more idiomatic style.
+
+## How to fix
+
+Before:
+```cpp
+bool compare1(int x);
+bool compare2(int x);
+void f(int x) {
+    if (compare1(x) > compare2(x)) {} // <- relational comparison between two bool-returning calls
+}
+```
+
+After:
+```cpp
+bool compare1(int x);
+bool compare2(int x);
+void f(int x) {
+    if (compare1(x) && !compare2(x)) {}
+}
+```
+
diff --git a/man/checkers/complexPatternError.md b/man/checkers/complexPatternError.md
new file mode 100644
index 00000000000..11f6f994e04
--- /dev/null
+++ b/man/checkers/complexPatternError.md
@@ -0,0 +1,38 @@
+# complexPatternError
+
+**Message**: Found complex pattern inside Token::simpleMatch() call: "%type%"<br/>
+**Category**: Code Quality<br/>
+**Severity**: Error<br/>
+**Language**: C++ (cppcheck's own source code only)
+
+## Description
+
+A pattern given to `Token::simpleMatch()`/`Token::findsimplematch()` contains wildcard syntax
+(`%type%`, `[abc]`, `a|b`, ...) that those "simple" functions don't actually interpret; they only do a
+literal, word-by-word text comparison.
+
+This is not a general-purpose checker for arbitrary C/C++ programs - see
+[simplePatternError.md](simplePatternError.md) for the shared background on this internal,
+cppcheck-source-only checker.
+
+## Motivation
+
+Mixing up `Match()` with `simpleMatch()` silently loses the wildcard matching a pattern was written to
+rely on - the code compiles and runs, but the comparison never matches the way the author intended,
+turning into a subtle logic bug in cppcheck's own analysis.
+
+## How to fix
+
+Before:
+```cpp
+Token::simpleMatch(tok, "%type%"); // <- simpleMatch() won't interpret this
+```
+
+After:
+```cpp
+Token::Match(tok, "%type%");
+```
+
+## Related checkers
+
+- [simplePatternError.md](simplePatternError.md) - the opposite mistake, using `Match()` with a pattern that has no wildcard syntax at all.
diff --git a/man/checkers/constParameter.md b/man/checkers/constParameter.md
new file mode 100644
index 00000000000..7f5342ea7f2
--- /dev/null
+++ b/man/checkers/constParameter.md
@@ -0,0 +1,48 @@
+# constParameter
+
+**Message**: Parameter 'x' can be declared as const<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+An array-typed function parameter is never used to modify its contents, so it could be declared as an
+array of `const` elements.
+
+## Motivation
+
+A missing `const` hides a guarantee the compiler could otherwise enforce and readers could otherwise
+rely on: that the function only reads the array, never modifies it.
+
+## How to fix
+
+Before:
+```cpp
+void f(int n, int v[42]) { // <- 'v' is only read
+    int j = 0;
+    for (int i = 0; i < n; ++i) {
+        j += 1;
+        if (j == 1) {}
+    }
+}
+```
+
+After:
+```cpp
+void f(int n, const int v[42]) {
+    int j = 0;
+    for (int i = 0; i < n; ++i) {
+        j += 1;
+        if (j == 1) {}
+    }
+}
+```
+
+## Related checkers
+
+- [constVariable.md](constVariable.md) - the same idea, for a local array variable instead of a parameter.
+- [constParameterReference.md](constParameterReference.md) - the reference-parameter equivalent.
+- [constParameterPointer.md](constParameterPointer.md) - the pointer-parameter equivalent.
+- [constParameterCallback.md](constParameterCallback.md) - the same idea, but for a parameter of a
+  function used as a callback.
diff --git a/man/checkers/constParameterCallback.md b/man/checkers/constParameterCallback.md
new file mode 100644
index 00000000000..bf2009e9846
--- /dev/null
+++ b/man/checkers/constParameterCallback.md
@@ -0,0 +1,44 @@
+# constParameterCallback
+
+**Message**: Parameter 'x' can be declared with const, however it seems that 'f' is a callback function.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+Same idea as [constParameter.md](constParameter.md)/[constParameterReference.md](constParameterReference.md)/
+[constParameterPointer.md](constParameterPointer.md): a parameter is never used to modify what it refers
+to, so it could be declared `const`. This variant is for when the function is used as a callback (passed
+as a function pointer) - fixing it may also require adjusting whatever calls through that function
+pointer.
+
+## Motivation
+
+A missing `const` hides a guarantee the compiler could otherwise enforce and readers could otherwise
+rely on. The callback case is called out separately because the fix isn't purely local: the function
+pointer type it's assigned to also needs to change, or the cast at the call site needs adjusting.
+
+## How to fix
+
+Before:
+```cpp
+#include <vector>
+void dostuff(int (*cb)(std::vector<int>&));
+int callback(std::vector<int>& x) { return x[0]; } // <- 'x' is only read
+void f() { dostuff(callback); }
+```
+
+After: const-ify the parameter, and the function pointer type it's passed through.
+```cpp
+#include <vector>
+void dostuff(int (*cb)(const std::vector<int>&));
+int callback(const std::vector<int>& x) { return x[0]; }
+void f() { dostuff(callback); }
+```
+
+## Related checkers
+
+- [constParameter.md](constParameter.md), [constParameterReference.md](constParameterReference.md),
+  [constParameterPointer.md](constParameterPointer.md) - the same idea, for a parameter that isn't part
+  of a callback function's signature.
diff --git a/man/checkers/constParameterReference.md b/man/checkers/constParameterReference.md
new file mode 100644
index 00000000000..8a6be03d6cc
--- /dev/null
+++ b/man/checkers/constParameterReference.md
@@ -0,0 +1,60 @@
+# constParameterReference
+
+**Message**: Parameter 'x' can be declared as reference to const<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A reference parameter is never used to modify what it refers to, so it could be declared as a reference
+to `const`.
+
+## Motivation
+
+A missing `const` hides a guarantee the compiler could otherwise enforce and readers could otherwise
+rely on: that the function only reads through the reference, never modifies the caller's object through
+it.
+
+## How to fix
+
+Before:
+```cpp
+#include <vector>
+auto foo(std::vector<int>& vec, bool flag) { // <- 'vec' is only read
+    std::vector<int> dummy;
+    std::vector<int>::iterator iter;
+    if (flag)
+        iter = vec.begin();
+    else {
+        dummy.push_back(42);
+        iter = dummy.begin();
+    }
+    return *iter;
+}
+```
+
+After:
+```cpp
+#include <vector>
+auto foo(const std::vector<int>& vec, bool flag) {
+    std::vector<int> dummy;
+    std::vector<int>::iterator iter;
+    if (flag)
+        iter = dummy.begin();
+    else {
+        dummy.push_back(42);
+        iter = dummy.begin();
+    }
+    return *iter;
+}
+```
+
+## Related checkers
+
+- [constParameter.md](constParameter.md) - the array-parameter equivalent.
+- [constParameterPointer.md](constParameterPointer.md) - the pointer-parameter equivalent.
+- [constVariableReference.md](constVariableReference.md) - the same idea, for a local reference
+  variable instead of a parameter.
+- [constParameterCallback.md](constParameterCallback.md) - the same idea, but for a parameter of a
+  function used as a callback.
diff --git a/man/checkers/constStatement.md b/man/checkers/constStatement.md
new file mode 100644
index 00000000000..60c222a12fe
--- /dev/null
+++ b/man/checkers/constStatement.md
@@ -0,0 +1,34 @@
+# constStatement
+
+**Message**: Redundant code: Found a statement that has no effect.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A statement is just a constant, a variable name, or another expression with no side effect, and its
+result is discarded - the statement does nothing.
+
+## Motivation
+
+A statement that's evaluated purely for its result, with that result then thrown away, is either dead
+code left over from editing (for example a comparison that was meant to be an `if`) or a missing
+function call (a `;` typed where `foo();` was meant).
+
+## How to fix
+
+Before:
+```cpp
+void f(int x) {
+    x; // <- result discarded, has no effect
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f(int x) {
+    printf("%d", x);
+}
+```
diff --git a/man/checkers/constVariable.md b/man/checkers/constVariable.md
new file mode 100644
index 00000000000..ca85e979228
--- /dev/null
+++ b/man/checkers/constVariable.md
@@ -0,0 +1,41 @@
+# constVariable
+
+**Message**: Variable 'x' can be declared as const<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A local array variable is never used to modify its contents, so it could be declared as an array of
+`const` elements.
+
+## Motivation
+
+A missing `const` hides a guarantee the compiler could otherwise enforce and readers could otherwise
+rely on: that this array, once initialized, is never written to again.
+
+## How to fix
+
+Before:
+```cpp
+int f() {
+    static int i[1] = {}; // <- 'i' is only read
+    return i[0];
+}
+```
+
+After:
+```cpp
+int f() {
+    static const int i[1] = {};
+    return i[0];
+}
+```
+
+## Related checkers
+
+- [constParameter.md](constParameter.md) - the same idea, for an array-typed function parameter instead
+  of a local variable.
+- [constVariableReference.md](constVariableReference.md) - the reference-variable equivalent.
+- [constVariablePointer.md](constVariablePointer.md) - the pointer-variable equivalent.
diff --git a/man/checkers/constVariablePointer.md b/man/checkers/constVariablePointer.md
new file mode 100644
index 00000000000..617cf3486bc
--- /dev/null
+++ b/man/checkers/constVariablePointer.md
@@ -0,0 +1,45 @@
+# constVariablePointer
+
+**Message**: Variable 'x' can be declared as pointer to const<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A local pointer variable is never used to modify what it points to, so it could be declared as a
+pointer to `const`.
+
+## Motivation
+
+A missing `const` hides a guarantee the compiler could otherwise enforce and readers could otherwise
+rely on: that this pointer is only ever used to read the data it points to.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f() {
+    int x = 5;
+    int *tm = &x; // <- 'tm' is only used to read '*tm'
+    printf("%d\n", *tm);
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f() {
+    int x = 5;
+    const int *tm = &x;
+    printf("%d\n", *tm);
+}
+```
+
+## Related checkers
+
+- [constParameterPointer.md](constParameterPointer.md) - the same idea, for a pointer parameter instead
+  of a local variable.
+- [constVariable.md](constVariable.md) - the array-variable equivalent.
+- [constVariableReference.md](constVariableReference.md) - the reference-variable equivalent.
diff --git a/man/checkers/constVariableReference.md b/man/checkers/constVariableReference.md
new file mode 100644
index 00000000000..3c6c1c98f0b
--- /dev/null
+++ b/man/checkers/constVariableReference.md
@@ -0,0 +1,43 @@
+# constVariableReference
+
+**Message**: Variable 'x' can be declared as reference to const<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A local reference variable is never used to modify what it refers to, so it could be declared as a
+reference to `const`.
+
+## Motivation
+
+A missing `const` hides a guarantee the compiler could otherwise enforce and readers could otherwise
+rely on: that this reference is only ever used to read the object it refers to.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f(int i) {
+    int &j = i; // <- 'j' is only read
+    printf("%d\n", j);
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f(int i) {
+    const int &j = i;
+    printf("%d\n", j);
+}
+```
+
+## Related checkers
+
+- [constParameterReference.md](constParameterReference.md) - the same idea, for a reference parameter
+  instead of a local variable.
+- [constVariable.md](constVariable.md) - the array-variable equivalent.
+- [constVariablePointer.md](constVariablePointer.md) - the pointer-variable equivalent.
diff --git a/man/checkers/containerOutOfBounds.md b/man/checkers/containerOutOfBounds.md
new file mode 100644
index 00000000000..06d6e50defe
--- /dev/null
+++ b/man/checkers/containerOutOfBounds.md
@@ -0,0 +1,45 @@
+# containerOutOfBounds
+
+**Message**: Out of bounds access in 'v\[100\]', if 'v' size is 3 and '100' is 100<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C++
+
+## Description
+
+An index or `.at()` call on a container is out of bounds for what cppcheck knows about the container's
+size.
+
+## Motivation
+
+Accessing a container out of bounds is undefined behaviour - the same class of bug as an out-of-bounds
+array access, but easier to introduce by accident because the container's internal storage can move or
+resize without any visible syntax change at the call site.
+
+## How to fix
+
+Before:
+```cpp
+#include <vector>
+void f() {
+    std::vector<int> v(3);
+    v[100] = 1; // <- containerOutOfBounds
+}
+```
+
+After:
+```cpp
+#include <vector>
+void f() {
+    std::vector<int> v(3);
+    v[2] = 1;
+}
+```
+
+## Related checkers
+
+- [containerOutOfBoundsIndexExpression.md](containerOutOfBoundsIndexExpression.md) - the same idea, but
+  specifically when the index expression itself provably reaches or exceeds the container's size.
+- [stlOutOfBounds.md](stlOutOfBounds.md) - the same idea, but specifically for a loop condition using
+  `<=` instead of `<`.
+- [negativeContainerIndex.md](negativeContainerIndex.md) - the same idea, but for a negative index.
diff --git a/man/checkers/containerOutOfBoundsIndexExpression.md b/man/checkers/containerOutOfBoundsIndexExpression.md
new file mode 100644
index 00000000000..a435318d92f
--- /dev/null
+++ b/man/checkers/containerOutOfBoundsIndexExpression.md
@@ -0,0 +1,39 @@
+# containerOutOfBoundsIndexExpression
+
+**Message**: Out of bounds access of s, index 's.size()' is out of bounds.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+An index expression itself (for example `s[s.size()]`) provably reaches or exceeds the container's own
+size.
+
+## Motivation
+
+Accessing a container out of bounds is undefined behaviour. This particular shape is easy to write by
+accident - `s.size()` looks like it should be the last valid position, but it is actually one past it.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+void f(std::string s) {
+    s[s.size()] = 1; // <- containerOutOfBoundsIndexExpression: one past the last character
+}
+```
+
+After:
+```cpp
+#include <string>
+void f(std::string s) {
+    s[s.size() - 1] = 1;
+}
+```
+
+## Related checkers
+
+- [containerOutOfBounds.md](containerOutOfBounds.md) - the more general out-of-bounds container access
+  check that this is a special case of.
diff --git a/man/checkers/copyCtorAndEqOperator.md b/man/checkers/copyCtorAndEqOperator.md
new file mode 100644
index 00000000000..75a706156c9
--- /dev/null
+++ b/man/checkers/copyCtorAndEqOperator.md
@@ -0,0 +1,28 @@
+# copyCtorAndEqOperator
+
+**Message**: The class 'A' has 'copy constructor' but lack of 'operator='.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+A class defines a copy constructor without also defining `operator=`, or vice versa - having a working
+copy in one direction and the compiler-generated (possibly wrong) one in the other is an easy way to end
+up with a broken half-copy.
+
+**This check is currently switched off in cppcheck** (its message was found to need clarification), so
+it will not appear in current output no matter what code you give it. It's documented here only because
+it remains a real, registered ID.
+
+## Motivation
+
+If a class needs custom copying logic for its copy constructor, it almost always needs the same logic
+for `operator=` (and vice versa) - the compiler-generated version of whichever one is missing just
+copies each member's value, which usually doesn't match the custom behaviour the other one implements.
+
+## Related checkers
+
+- [noCopyConstructor.md](noCopyConstructor.md) and [noOperatorEq.md](noOperatorEq.md) - the more
+  commonly-seen checks for a class that's missing one of these special member functions entirely,
+  rather than defining one without the other.
diff --git a/man/checkers/copyCtorNoAllocation.md b/man/checkers/copyCtorNoAllocation.md
new file mode 100644
index 00000000000..5797ec775b0
--- /dev/null
+++ b/man/checkers/copyCtorNoAllocation.md
@@ -0,0 +1,27 @@
+# copyCtorNoAllocation
+
+**Message**: Copy constructor does not allocate memory for member 'p' although memory has been allocated in other constructors.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+The intended sibling of [copyCtorPointerCopying.md](copyCtorPointerCopying.md): a copy constructor
+copies a pointer without allocating new memory, checked from the allocating constructor's side instead
+of the copy constructor's side.
+
+**This check is dead code in current cppcheck.** Its implementation is commented out in the source
+(citing an unresolved report about the message needing more work), so it can never actually fire, no
+matter what code you give it. It's documented here only because it remains a real, registered ID.
+
+## Motivation
+
+If another constructor allocates memory for a pointer member, a copy constructor that doesn't do the
+same for that member is expected to share the same shallow-copy/double-free risk that
+[copyCtorPointerCopying.md](copyCtorPointerCopying.md) describes.
+
+## Related checkers
+
+- [copyCtorPointerCopying.md](copyCtorPointerCopying.md) - the actively-working check for the same
+  underlying shallow-copy risk, checked from the copy constructor's side.
diff --git a/man/checkers/copyCtorPointerCopying.md b/man/checkers/copyCtorPointerCopying.md
new file mode 100644
index 00000000000..a397c548394
--- /dev/null
+++ b/man/checkers/copyCtorPointerCopying.md
@@ -0,0 +1,66 @@
+# copyCtorPointerCopying
+
+**Message**: Value of pointer 'p', which points to allocated memory, is copied in copy constructor instead of allocating new memory.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+A copy constructor copies a pointer member's *value* (so both objects now point at the same allocated
+memory) instead of allocating a fresh block and copying the pointed-to data - a classic shallow-copy
+bug, usually followed by a double-free once both objects are destroyed.
+
+## Motivation
+
+Once two objects share the same pointer value for a member each believes it owns, whichever is
+destroyed first frees the memory out from under the other - leaving the survivor with a dangling
+pointer, and destroying both eventually frees the same block twice.
+
+## How to fix
+
+Allocate a fresh block in the copy constructor and copy the pointed-to data into it, rather than copying
+the pointer itself.
+
+Before:
+```cpp
+#include <cstring>
+#include <cstdlib>
+class F {
+   char *p;
+   F(const F &f) {
+      p = f.p; // <- both objects now share the same allocated block
+   }
+public:
+   F(char *str) {
+      p = malloc(strlen(str)+1);
+   }
+   ~F();
+   F& operator=(const F&f);
+};
+```
+
+After:
+```cpp
+#include <cstring>
+#include <cstdlib>
+class F {
+   char *p;
+public:
+   F(const F &f) {
+      p = (char*)malloc(strlen(f.p)+1);
+      strcpy(p, f.p);
+   }
+   F(char *str) {
+      p = (char*)malloc(strlen(str)+1);
+      strcpy(p, str);
+   }
+   ~F();
+   F& operator=(const F&f);
+};
+```
+
+## Related checkers
+
+- [noCopyConstructor.md](noCopyConstructor.md) - the related check for when a class allocates a
+  resource but doesn't define a copy constructor at all.
diff --git a/man/checkers/coutCerrMisusage.md b/man/checkers/coutCerrMisusage.md
new file mode 100644
index 00000000000..12da5db7dab
--- /dev/null
+++ b/man/checkers/coutCerrMisusage.md
@@ -0,0 +1,34 @@
+# coutCerrMisusage
+
+**Message**: Invalid usage of output stream: '<< std::cout'.<br/>
+**Category**: Correctness<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+`std::cout`/`std::cerr` is streamed into itself (`std::cout << std::cout;`) - almost always a typo for
+a variable that was meant to be printed.
+
+## Motivation
+
+Streaming `std::cout` into itself doesn't print anything meaningful and is essentially always a typo -
+usually a variable name was meant to be there instead of the stream's own name.
+
+## How to fix
+
+Before:
+```cpp
+#include <iostream>
+void f() {
+    std::cout << std::cout; // <- likely a typo'd variable name
+}
+```
+
+After:
+```cpp
+#include <iostream>
+void f() {
+    std::cout << "hello";
+}
+```
diff --git a/man/checkers/cstyleCast.md b/man/checkers/cstyleCast.md
index 52da49adad2..58c33f06985 100644
--- a/man/checkers/cstyleCast.md
+++ b/man/checkers/cstyleCast.md
@@ -1,4 +1,3 @@
-
 # cstyleCast
 
 **Message**: C-style pointer casting<br/>
@@ -23,7 +22,7 @@ This checker is about C casts that converts to/from a pointer or reference.
 Dangerous conversions are covered by other warnings so this ID `cstyleCast` is primarily about
 writing warnings for casts that are currently safe.
 
-# Motivation
+## Motivation
 
 The motivation of this checker is to modernize c++ code.
 
@@ -31,15 +30,15 @@ The motivation of this checker is to modernize c++ code.
 
 You can use C++ casts such as `static_cast` to fix these warnings.
 
-The `dynamic_cast` should rarelly be used to fix these warnings because dangerousTypeCast is
+The `dynamic_cast` should rarely be used to fix these warnings because dangerousTypeCast is
 reported when that can be a good idea.
 
 Before:
 ```cpp
 struct Base{};
 struct Derived: public Base {};
-void foo(Base* base) {
-    Base *p = (Base*)derived; // <- cstyleCast, cast from derived object to base object is safe now
+void foo(Derived* derived) {
+    Base *p = (Base*)derived; // <- cstyleCast: casting up to a base class is always safe
 }
 ```
 
@@ -47,8 +46,9 @@ After:
 ```cpp
 struct Base{};
 struct Derived: public Base {};
-void foo(Base* base) {
-    Derived *p = static_cast<Derived*>(base);
+void foo(Derived* derived) {
+    Base *p = static_cast<Base*>(derived);
 }
 ```
-The `static_cast` ensures that there will not be loss of constness in the future.
+The `static_cast` documents the intended direction of the cast and will fail to compile if the
+class hierarchy ever changes in a way that makes it invalid.
diff --git a/man/checkers/ctuArrayIndex.md b/man/checkers/ctuArrayIndex.md
new file mode 100644
index 00000000000..1dcde49e62d
--- /dev/null
+++ b/man/checkers/ctuArrayIndex.md
@@ -0,0 +1,49 @@
+# ctuArrayIndex
+
+**Message**: Array index out of bounds; 'p' buffer size is 4 and it is accessed at offset 40.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+The same idea as [arrayIndexOutOfBounds.md](arrayIndexOutOfBounds.md), but found by cppcheck's
+whole-program ("cross translation unit") analysis, which follows a buffer across function calls that
+the normal, per-function analysis doesn't always chain together. Because of this, the same bug can
+sometimes be reported twice - once under the plain ID and once under this `ctu`-prefixed one - for the
+same line.
+
+## Motivation
+
+An out-of-bounds array access is undefined behaviour whether it's visible directly inside one function
+or only becomes apparent by following a buffer through a call into another function - the whole-program
+analysis exists to catch the cases a single function's view can't.
+
+## How to fix
+
+Before:
+```cpp
+void f(char *p) {
+    p[9] = 0;
+}
+void g() {
+    char buf[5];
+    f(buf); // <- 'buf' is too small for what f() does with it
+}
+```
+
+After:
+```cpp
+void f(char *p) {
+    p[9] = 0;
+}
+void g() {
+    char buf[10];
+    f(buf);
+}
+```
+
+## Related checkers
+
+- [arrayIndexOutOfBounds.md](arrayIndexOutOfBounds.md) - the per-function version of this check.
+- [ctuPointerArith.md](ctuPointerArith.md) - the whole-program pointer-arithmetic equivalent.
diff --git a/man/checkers/ctuPointerArith.md b/man/checkers/ctuPointerArith.md
new file mode 100644
index 00000000000..948d5810e7b
--- /dev/null
+++ b/man/checkers/ctuPointerArith.md
@@ -0,0 +1,44 @@
+# ctuPointerArith
+
+**Message**: Pointer arithmetic overflow; 'p' buffer size is 12<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+The same idea as [pointerOutOfBounds.md](pointerOutOfBounds.md), but found by cppcheck's whole-program
+("cross translation unit") analysis, which follows a buffer across function calls that the normal,
+per-function analysis doesn't always chain together. Because of this, the same bug can sometimes be
+reported twice - once under the plain ID and once under this `ctu`-prefixed one - for the same line.
+
+## Motivation
+
+Pointer arithmetic that goes out of bounds is undefined behaviour whether it's visible directly inside
+one function or only becomes apparent by following a buffer through a call into another function - the
+whole-program analysis exists to catch the cases a single function's view can't.
+
+## How to fix
+
+Before:
+```cpp
+void dostuff(int *p) { int x = *(p + 10); }
+int main() {
+    int arr[3];
+    dostuff(arr); // <- 'arr' is too small for what dostuff() does with it
+}
+```
+
+After:
+```cpp
+void dostuff(int *p) { int x = *(p + 10); }
+int main() {
+    int arr[11];
+    dostuff(arr);
+}
+```
+
+## Related checkers
+
+- [pointerOutOfBounds.md](pointerOutOfBounds.md) - the per-function version of this check.
+- [ctuArrayIndex.md](ctuArrayIndex.md) - the whole-program array-indexing equivalent.
diff --git a/man/checkers/ctunullpointer.md b/man/checkers/ctunullpointer.md
new file mode 100644
index 00000000000..c52228cb6bc
--- /dev/null
+++ b/man/checkers/ctunullpointer.md
@@ -0,0 +1,25 @@
+# ctunullpointer
+
+**Message**: Null pointer dereference: p<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C/C++
+
+## Description
+
+The same idea as [nullPointer](nullPointer.md), but found by cppcheck's whole-program ("cross
+translation unit") analysis, which follows a null value across several function calls that the normal,
+per-function analysis doesn't always chain together on its own.
+
+## Motivation
+
+Some null-pointer bugs only become visible when tracing a value across function boundaries - for
+example, a function that's given a null pointer by one of its callers, several call levels away. This
+whole-program analysis catches those cases at the cost of needing every relevant source file analyzed
+together. Because of this, the same bug can sometimes be reported twice - once as a plain `nullPointer`
+and once as `ctunullpointer` - for the same line.
+
+## Related checkers
+
+- [nullPointer.md](nullPointer.md) - the per-function analysis this whole-program analysis complements.
+- [ctunullpointerOutOfMemory.md](ctunullpointerOutOfMemory.md) - the same idea for a pointer from a failable allocation function.
diff --git a/man/checkers/ctunullpointerOutOfMemory.md b/man/checkers/ctunullpointerOutOfMemory.md
new file mode 100644
index 00000000000..be69e2ddb2c
--- /dev/null
+++ b/man/checkers/ctunullpointerOutOfMemory.md
@@ -0,0 +1,28 @@
+# ctunullpointerOutOfMemory and ctunullpointerOutOfResources
+
+**Message**: If memory allocation fails, then there is a possible null pointer dereference: p<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C/C++
+
+## Description
+
+- `ctunullpointerOutOfMemory`: the same idea as [nullPointerOutOfMemory](nullPointerOutOfMemory.md),
+  but found by cppcheck's whole-program ("cross translation unit") analysis, which follows the result
+  of a failable memory allocation across function calls that the normal, per-function analysis doesn't
+  always chain together on its own.
+- `ctunullpointerOutOfResources`: the same idea for a failable resource-allocating function (`fopen`,
+  ...) rather than a memory allocator.
+
+## Motivation
+
+Some "forgot to check the allocation" bugs only become visible when tracing the allocated pointer/handle
+across function boundaries. This whole-program analysis catches those cases at the cost of needing every
+relevant source file analyzed together. Because of this, the same bug can sometimes be reported twice -
+once as a plain `nullPointerOutOfMemory`/`nullPointerOutOfResources` and once with the `ctu` prefix - for
+the same line.
+
+## Related checkers
+
+- [nullPointerOutOfMemory.md](nullPointerOutOfMemory.md) - the per-function analysis this whole-program analysis complements.
+- [ctunullpointer.md](ctunullpointer.md) - the same whole-program analysis without a specific failable allocation involved.
diff --git a/man/checkers/ctuuninitvar.md b/man/checkers/ctuuninitvar.md
new file mode 100644
index 00000000000..865ed3e80c4
--- /dev/null
+++ b/man/checkers/ctuuninitvar.md
@@ -0,0 +1,47 @@
+# ctuuninitvar
+
+**Message**: Using argument p that points at uninitialized variable x<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+The same idea as [uninitvar.md](uninitvar.md), but found by cppcheck's whole-program ("cross
+translation unit") analysis, which follows an uninitialized value across function calls that the
+normal, per-function analysis doesn't always chain together. Because of this, the same bug can
+sometimes be reported twice - once as `uninitvar` and once as `ctuuninitvar` - for the same line.
+
+## Motivation
+
+Reading an uninitialized variable is undefined behaviour whether it's visible directly inside one
+function or only becomes apparent by following a pointer through a call into another function - the
+whole-program analysis exists to catch the cases a single function's view can't.
+
+## How to fix
+
+Before:
+```cpp
+void f(int *p) {
+    a = *p; // <- if f() is ever called with an uninitialized argument
+}
+int main() {
+    int x;
+    f(&x);
+}
+```
+
+After:
+```cpp
+void f(int *p) {
+    a = *p;
+}
+int main() {
+    int x = 0;
+    f(&x);
+}
+```
+
+## Related checkers
+
+- [uninitvar.md](uninitvar.md) - the per-function version of this check.
diff --git a/man/checkers/dangerousTypeCast.md b/man/checkers/dangerousTypeCast.md
index 79538103db5..f4015cd52e5 100644
--- a/man/checkers/dangerousTypeCast.md
+++ b/man/checkers/dangerousTypeCast.md
@@ -1,4 +1,3 @@
-
 # dangerousTypeCast
 
 **Message**: Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast<br/>
@@ -6,6 +5,14 @@
 **Severity**: Warning<br/>
 **Language**: C++, not applicable for C code
 
+## Description
+
+An old-style C cast (`(Type)expr`) is used to convert between two pointer or reference types in a way
+that could be an invalid conversion - for example casting between two unrelated pointer types, or down
+a class hierarchy without any guarantee the object is really of the target type. A C-style cast will
+silently do whatever C++ cast is needed to make the code compile (including a `reinterpret_cast`), so it
+gives no indication of, or protection against, this.
+
 ## Motivation
 
 C style casts can be dangerous in many ways:
diff --git a/man/checkers/danglingLifetime.md b/man/checkers/danglingLifetime.md
new file mode 100644
index 00000000000..037806b0415
--- /dev/null
+++ b/man/checkers/danglingLifetime.md
@@ -0,0 +1,55 @@
+# danglingLifetime
+
+**Message**: Non-local variable 'p' will use pointer to local variable 'x'.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+The address of a local variable/array is assigned to a *global, static, or member* pointer, so it
+outlives the local variable it points to.
+
+## Motivation
+
+Using a pointer after the local variable it points to has gone out of scope is undefined behaviour.
+Because the memory involved is usually still intact for a little while afterwards, this kind of bug
+often "works" in testing and then fails unpredictably once something else reuses that memory - which
+makes it worth catching at analysis time instead of at runtime.
+
+## How to fix
+
+Before:
+```cpp
+int *p;
+void f() {
+    int x;
+    p = &x; // <- danglingLifetime: 'p' outlives 'x'
+}
+```
+
+After:
+```cpp
+int *p;
+void f() {
+    static int x;
+    p = &x;
+}
+```
+
+Alternatively, if `p` is only meant to point at `x` temporarily and is set back to something else before
+`x` disappears, cppcheck already recognizes that as safe and won't warn:
+```cpp
+int *p;
+void f() {
+    int x;
+    p = &x;
+    p = nullptr; // 'p' no longer points to 'x' by the time 'x' is destroyed - not flagged
+}
+```
+
+## Related checkers
+
+- [autoVariables.md](autoVariables.md) - the same idea, but for a local variable's address escaping
+  through a function parameter instead of a global/static/member pointer.
+- [danglingReference.md](danglingReference.md) - the same idea, for a reference instead of a pointer.
diff --git a/man/checkers/danglingReference.md b/man/checkers/danglingReference.md
new file mode 100644
index 00000000000..c5f82d7ec7e
--- /dev/null
+++ b/man/checkers/danglingReference.md
@@ -0,0 +1,28 @@
+# danglingReference
+
+**Message**: Using reference to dangling temporary.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+A reference variable that itself outlives the function (`static`, or a non-local reference parameter)
+is bound to a local variable.
+
+## Motivation
+
+A reference is just another name for the object it's bound to - it doesn't keep that object alive. If
+the reference itself outlives the local variable it was bound to, using it afterwards is undefined
+behaviour, in the same way a dangling pointer would be.
+
+## How to fix
+
+Bind the long-lived reference to something that actually outlives the function (a `static` variable, a
+global, or something the caller owns), not a plain local variable.
+
+## Related checkers
+
+- [danglingLifetime.md](danglingLifetime.md) - the same idea, for a pointer instead of a reference.
+- [danglingTempReference.md](danglingTempReference.md) - a related mistake where a reference is bound
+  to a temporary and used after that temporary has been destroyed, within the same function.
diff --git a/man/checkers/danglingTempReference.md b/man/checkers/danglingTempReference.md
new file mode 100644
index 00000000000..0b85ee2d818
--- /dev/null
+++ b/man/checkers/danglingTempReference.md
@@ -0,0 +1,31 @@
+# danglingTempReference
+
+**Message**: Using reference to dangling temporary.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+A reference bound to a temporary is used after that temporary has already been destroyed.
+
+## Motivation
+
+A temporary object is normally destroyed at the end of the full expression that created it. A small set
+of lifetime-extension rules let a `const&`/`&&` binding stretch that lifetime in some cases, but not all
+- using the reference outside the case where extension actually applies is a use of an already-destroyed
+object.
+
+## How to fix
+
+Only rely on a reference to a temporary within the same full expression that created it, or store the
+value itself (by copy or move) instead of a reference to it if it needs to outlive that expression.
+
+## Related checkers
+
+- [returnTempReference.md](returnTempReference.md) - the same underlying temporary-lifetime mistake,
+  specifically when the reference is returned from the function.
+- [danglingTemporaryLifetime.md](danglingTemporaryLifetime.md) - the same idea, for a pointer or
+  iterator into a temporary instead of a reference.
+- [danglingReference.md](danglingReference.md) - a related mistake where a long-lived reference is
+  bound to a local variable (rather than a temporary) that doesn't outlive it.
diff --git a/man/checkers/danglingTemporaryLifetime.md b/man/checkers/danglingTemporaryLifetime.md
new file mode 100644
index 00000000000..cbc05d7dde3
--- /dev/null
+++ b/man/checkers/danglingTemporaryLifetime.md
@@ -0,0 +1,28 @@
+# danglingTemporaryLifetime
+
+**Message**: Using pointer to dangling temporary.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+A pointer or iterator into a temporary object is used after that temporary has already been destroyed.
+
+## Motivation
+
+A temporary object is normally destroyed at the end of the full expression that created it. A pointer
+or iterator into it doesn't extend its lifetime the way a reference binding sometimes can - so using
+one afterwards is a use of an already-destroyed object.
+
+## How to fix
+
+Only use a pointer/iterator into a temporary within the same full expression that created it, or store
+the value itself (by copy or move) instead if it needs to outlive that expression.
+
+## Related checkers
+
+- [danglingTempReference.md](danglingTempReference.md) - the same idea, for a reference instead of a
+  pointer/iterator.
+- [invalidLifetime.md](invalidLifetime.md) - the same underlying "used after its referent's scope
+  ended" mistake, for a pointer into a named local variable rather than a temporary.
diff --git a/man/checkers/deallocret.md b/man/checkers/deallocret.md
new file mode 100644
index 00000000000..eab1c68e7ce
--- /dev/null
+++ b/man/checkers/deallocret.md
@@ -0,0 +1,40 @@
+# deallocret
+
+**Message**: Returning/dereferencing 'p' after it is deallocated / released<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A locally-allocated variable is returned, or dereferenced as part of a `return`, after it has already
+been freed.
+
+## Motivation
+
+Returning a pointer after it's been freed hands the caller a pointer that's already invalid - using a
+pointer after it's been freed is undefined behaviour regardless of which statement does it.
+
+## How to fix
+
+Before:
+```cpp
+int* f() {
+    int *p = malloc(10);
+    free(p);
+    return p; // <- deallocret
+}
+```
+
+After:
+```cpp
+int* f() {
+    int *p = malloc(10);
+    return p;
+}
+```
+
+## Related checkers
+
+- [deallocuse.md](deallocuse.md) - the same idea, but the freed variable is dereferenced by an ordinary
+  statement rather than a `return`.
diff --git a/man/checkers/deallocuse.md b/man/checkers/deallocuse.md
new file mode 100644
index 00000000000..dd895c37294
--- /dev/null
+++ b/man/checkers/deallocuse.md
@@ -0,0 +1,43 @@
+# deallocuse
+
+**Message**: Dereferencing 'p' after it is deallocated / released<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A locally-allocated variable is dereferenced after it has already been freed.
+
+## Motivation
+
+Using a pointer after it's been freed is undefined behaviour, and one of the more common causes of
+memory corruption - the memory often still looks intact for a while afterwards, which is exactly what
+makes this bug easy to miss in testing.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    int *ptr = new int;
+    delete(ptr);
+    *ptr = 0; // <- deallocuse
+}
+```
+
+After:
+```cpp
+void f() {
+    int *ptr = new int;
+    *ptr = 0;
+    delete(ptr);
+}
+```
+
+## Related checkers
+
+- [deallocret.md](deallocret.md) - the same idea, but the freed variable is dereferenced as part of a
+  `return` statement.
+- [doubleFree.md](doubleFree.md) - the related mistake of freeing the same variable again, rather than
+  dereferencing it.
diff --git a/man/checkers/derefInvalidIterator.md b/man/checkers/derefInvalidIterator.md
new file mode 100644
index 00000000000..a64ecd182ba
--- /dev/null
+++ b/man/checkers/derefInvalidIterator.md
@@ -0,0 +1,70 @@
+# derefInvalidIterator and derefInvalidIteratorRedundantCheck
+
+**Message**: Dereference of an invalid iterator: v.begin()-1<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C++
+
+## Description
+
+An iterator is dereferenced while it could be `end()`, before `begin()`, or otherwise invalid.
+
+- `derefInvalidIterator`: cppcheck can tell directly that the iterator may be invalid at the point it's
+  dereferenced.
+- `derefInvalidIteratorRedundantCheck`: there's a nearby validity check on the same iterator, but the
+  dereference happens where that check doesn't actually apply (for example, after the `if` that checked
+  it, rather than inside it) - either the check is redundant, or the dereference is a bug.
+
+## Motivation
+
+Dereferencing an iterator that doesn't currently point at a real element is undefined behaviour, and is
+easy to get subtly wrong when a validity check exists in the code but is written on the wrong side of
+the dereference.
+
+## How to fix
+
+Before:
+```cpp
+#include <vector>
+void f() {
+    std::vector<int> v{ 1, 2, 3 };
+    v.erase(v.begin() - 1); // <- derefInvalidIterator: 'v.begin()-1' is out of bounds
+}
+```
+
+After:
+```cpp
+#include <vector>
+void f() {
+    std::vector<int> v{ 1, 2, 3 };
+    v.erase(v.begin());
+}
+```
+
+Before:
+```cpp
+#include <vector>
+#include <algorithm>
+int f(std::vector<int> v, int i) {
+    auto it = std::find(v.begin(), v.end(), i);
+    if (it != v.end()) {}
+    return *it; // <- derefInvalidIteratorRedundantCheck: dereferenced outside the 'if' that checked it
+}
+```
+
+After:
+```cpp
+#include <vector>
+#include <algorithm>
+int f(std::vector<int> v, int i) {
+    auto it = std::find(v.begin(), v.end(), i);
+    if (it != v.end())
+        return *it;
+    return -1;
+}
+```
+
+## Related checkers
+
+- [eraseIteratorOutOfBounds.md](eraseIteratorOutOfBounds.md) - the equivalent check for calling
+  `erase()` with (rather than dereferencing) an iterator that could be out of bounds.
diff --git a/man/checkers/doubleFree.md b/man/checkers/doubleFree.md
new file mode 100644
index 00000000000..c732469b99f
--- /dev/null
+++ b/man/checkers/doubleFree.md
@@ -0,0 +1,43 @@
+# doubleFree
+
+**Message**: Memory pointed to by 'p' is freed twice.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+The same locally-allocated variable is freed/released twice.
+
+## Motivation
+
+Freeing the same memory twice is undefined behaviour, and a common way memory-allocator corruption bugs
+are introduced - it's easy to miss when the two frees are far apart, or on different branches that both
+happen to execute. cppcheck only tracks an allocation through straight-line code: as soon as a loop or
+`goto` appears anywhere in the function, it stops checking that function rather than risk a wrong guess,
+so silence on a function with a loop in it isn't proof the code is free of double frees.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    char *p = malloc(10);
+    free(p);
+    free(p); // <- doubleFree
+}
+```
+
+After:
+```cpp
+void f() {
+    char *p = malloc(10);
+    free(p);
+}
+```
+
+## Related checkers
+
+- [deallocuse.md](deallocuse.md) - the related mistake of dereferencing (rather than freeing again)
+  something that's already been freed.
+- [memleak.md](memleak.md) - the opposite mistake: an allocation that's never freed at all.
diff --git a/man/checkers/duplInheritedMember.md b/man/checkers/duplInheritedMember.md
new file mode 100644
index 00000000000..e2b6f4b7d2a
--- /dev/null
+++ b/man/checkers/duplInheritedMember.md
@@ -0,0 +1,46 @@
+# duplInheritedMember
+
+**Message**: The class 'Derived' defines member variable with name 'x' also defined in its parent class 'Base'.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+A derived class declares a data member or (non-virtual, non-constructor/destructor) member function
+with the same name as one a base class already has - the derived one hides the base one, which is
+confusing and easy to do by accident in a large class hierarchy.
+
+## Motivation
+
+When a derived class redeclares a name its base class already uses, the derived member hides the base
+one for code that operates on the derived type - but code that only sees the base class (through a base
+pointer/reference, or inside a base-class member function) still reaches the *base* member. The two
+names look identical at each call site, so which one is actually being used depends entirely on the
+static type in scope at that point, which is easy to get wrong.
+
+## How to fix
+
+Rename one of the two members so there's no ambiguity about which one a given piece of code refers to.
+
+Before:
+```cpp
+class Base {
+   protected:
+   int x;
+};
+struct Derived : Base {
+   int x; // <- hides 'Base::x'
+};
+```
+
+After:
+```cpp
+class Base {
+   protected:
+   int x;
+};
+struct Derived : Base {
+   int y;
+};
+```
diff --git a/man/checkers/duplicateAssignExpression.md b/man/checkers/duplicateAssignExpression.md
new file mode 100644
index 00000000000..07318644398
--- /dev/null
+++ b/man/checkers/duplicateAssignExpression.md
@@ -0,0 +1,45 @@
+# duplicateAssignExpression
+
+**Message**: Same expression used in consecutive assignments of 'i' and 'j'.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+Two variables, declared one after another, are assigned the exact same expression - often a copy-paste
+mistake where the second line should refer to something else.
+
+## Motivation
+
+Two variables initialized to the same expression right next to each other is a common outcome of
+copy-pasting one line and forgetting to change one of the operands - if it's not a mistake, computing
+the same value twice (rather than reusing it) is also wasteful.
+
+## How to fix
+
+Before:
+```cpp
+int f() __attribute__((pure));
+int g() __attribute__((pure));
+void test() {
+    int i = f();
+    int j = f(); // <- same expression as 'i', is this a copy-paste mistake?
+}
+```
+
+After:
+```cpp
+int f() __attribute__((pure));
+int g() __attribute__((pure));
+void h(int, int);
+void test() {
+    int i = f();
+    int j = g();
+    h(i, j);
+}
+```
+
+## Related checkers
+
+- [duplicateExpression.md](duplicateExpression.md) - the same idea for one expression compared against itself, rather than two separate assignments.
diff --git a/man/checkers/duplicateBranch.md b/man/checkers/duplicateBranch.md
new file mode 100644
index 00000000000..51aca89f447
--- /dev/null
+++ b/man/checkers/duplicateBranch.md
@@ -0,0 +1,42 @@
+# duplicateBranch
+
+**Message**: Found duplicate branches for 'if' and 'else'.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+The `if` and `else` branches of a statement contain identical code, so the condition makes no
+difference to what runs.
+
+## Motivation
+
+If both branches do the same thing, the condition is pointless - either the branches were meant to
+differ and one was copy-pasted by mistake, or the `if`/`else` itself can be removed entirely.
+
+## How to fix
+
+Before:
+```cpp
+void f(int a, int &b) {
+    if (a)
+        b = 1;
+    else
+        b = 1; // <- identical to the 'if' branch
+}
+```
+
+After:
+```cpp
+void f(int a, int &b) {
+    if (a)
+        b = 1;
+    else
+        b = 2;
+}
+```
+
+## Related checkers
+
+- [duplicateExpression.md](duplicateExpression.md) - the same "is this a copy-paste mistake?" idea, for an expression instead of a whole branch.
diff --git a/man/checkers/duplicateBreak.md b/man/checkers/duplicateBreak.md
new file mode 100644
index 00000000000..aa1feef6e8e
--- /dev/null
+++ b/man/checkers/duplicateBreak.md
@@ -0,0 +1,45 @@
+# duplicateBreak
+
+**Message**: Consecutive return, break, continue, goto or throw statements are unnecessary.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+Two `return`/`break`/`continue`/`goto`/`throw` statements appear back to back - the second one can
+never be reached.
+
+## Motivation
+
+Once the first of these statements runs, control leaves the current block immediately, so nothing
+written directly after it (in the same block) can ever execute. It's dead code that's safe to delete.
+
+## How to fix
+
+Before:
+```cpp
+void foo(int a) {
+    while (1) {
+        if (a++ >= 100) {
+            break;
+            continue; // <- can never be reached
+        }
+    }
+}
+```
+
+After:
+```cpp
+void foo(int a) {
+    while (1) {
+        if (a++ >= 100) {
+            break;
+        }
+    }
+}
+```
+
+## Related checkers
+
+- [unreachableCode.md](unreachableCode.md) - the more general case of any code (not just another jump statement) placed after one of these statements.
diff --git a/man/checkers/duplicateCondition.md b/man/checkers/duplicateCondition.md
new file mode 100644
index 00000000000..caea8610c9d
--- /dev/null
+++ b/man/checkers/duplicateCondition.md
@@ -0,0 +1,39 @@
+# duplicateCondition
+
+**Message**: The if condition is the same as the previous if condition<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+Two consecutive `if` statements test the exact same condition - the second one is dead code.
+
+## Motivation
+
+If the first `if` didn't change anything the condition depends on, the second, identical `if` can never
+newly become true or false compared to the first - it's either always dead code, or a sign that an
+assignment that was supposed to happen in between is missing.
+
+## How to fix
+
+Before:
+```cpp
+void f(int x) {
+    if (x == 1) {}
+    if (x == 1) {} // <- dead code
+}
+```
+
+After:
+```cpp
+void f(int x) {
+    if (x == 1) {}
+}
+```
+
+## Related checkers
+
+- [multiCondition.md](multiCondition.md) - the same idea, but for `if`/`else if` chains.
+- [identicalConditionAfterEarlyExit.md](identicalConditionAfterEarlyExit.md) - the same idea, but the
+  first check is an early `return`/`throw`/`break`/`continue` instead of a plain `if`.
diff --git a/man/checkers/duplicateConditionalAssign.md b/man/checkers/duplicateConditionalAssign.md
new file mode 100644
index 00000000000..007edf870eb
--- /dev/null
+++ b/man/checkers/duplicateConditionalAssign.md
@@ -0,0 +1,42 @@
+# duplicateConditionalAssign
+
+**Message**: Assignment 'x=5' is redundant with condition 'x==5'.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+An `if` assigns a value to a variable that the condition already guarantees it has (`if (x == 5) x = 5;`) -
+the assignment has no effect.
+
+## Motivation
+
+If the condition already established what the variable equals, assigning that same value again inside
+the `if` changes nothing - it's leftover code from an edit, or a sign the assignment was meant to use a
+different value or variable.
+
+This check may need `--check-level=exhaustive` to see every case.
+
+## How to fix
+
+Before:
+```cpp
+void f(int x) {
+    if (x == 5)
+        x = 5; // <- 'x' is already 5 here
+}
+```
+
+After:
+```cpp
+void f(int x) {
+    if (x == 5) {
+    }
+}
+```
+
+## Related checkers
+
+- [knownConditionTrueFalse.md](knownConditionTrueFalse.md) - the more general check for a condition
+  whose truth value cppcheck already knows in advance.
diff --git a/man/checkers/duplicateExpression.md b/man/checkers/duplicateExpression.md
new file mode 100644
index 00000000000..4fba20bdbc3
--- /dev/null
+++ b/man/checkers/duplicateExpression.md
@@ -0,0 +1,38 @@
+# duplicateExpression
+
+**Message**: Same expression on both sides of '=='.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+The exact same expression appears on both sides of a comparison or other binary operator (`a == a`,
+`a - a`, ...), or more than once in a chain of the same operator.
+
+## Motivation
+
+Comparing or combining an expression with an identical copy of itself always produces the same,
+predetermined result (`true`, `false`, or zero) regardless of the expression's actual value - this is
+almost always a typo for what should have been two different variables.
+
+## How to fix
+
+Before:
+```cpp
+void foo(int a) {
+    if (a == a) { } // <- always true
+}
+```
+
+After:
+```cpp
+void foo(int a, int b) {
+    if (a == b) { }
+}
+```
+
+## Related checkers
+
+- [oppositeExpression.md](oppositeExpression.md) - the mirror-image mistake, comparing an expression against its logical/arithmetic opposite.
+- [duplicateAssignExpression.md](duplicateAssignExpression.md) - the same idea across two separate variable assignments.
diff --git a/man/checkers/duplicateExpressionTernary.md b/man/checkers/duplicateExpressionTernary.md
index 706ad85e2ac..85a4bfeb967 100644
--- a/man/checkers/duplicateExpressionTernary.md
+++ b/man/checkers/duplicateExpressionTernary.md
@@ -17,26 +17,6 @@ The warning is triggered when:
 
 The same expression indicates that there might be some logic error or copy-paste mistake.
 
-## Examples
-
-### Problematic code
-
-```cpp
-// Same expression in both branches
-int result = condition ? x : x;  // Warning: duplicateExpressionTernary
-
-// Same variable referenced through alias
-const int c = a;
-int result = condition ? a : c;  // Warning: duplicateExpressionTernary
-```
-
-### Fixed code
-
-```cpp
-// Different expressions in branches
-int result = condition ? x : y;  // OK
-```
-
 ## How to fix
 
 1. **Check for copy-paste errors**: Verify that both branches are supposed to have the same expression
diff --git a/man/checkers/duplicateValueTernary.md b/man/checkers/duplicateValueTernary.md
index 06e9f8e9be7..a0ae2550293 100644
--- a/man/checkers/duplicateValueTernary.md
+++ b/man/checkers/duplicateValueTernary.md
@@ -23,30 +23,9 @@ However, no warning is generated when:
 
 The same value indicates that there might be some logic error or copy-paste mistake.
 
-## Examples
-
-### Problematic code
-
-```cpp
-// Different expressions, same value
-int result = condition ? (int)1 : 1;  // Warning: duplicateValueTernary
-
-// Different cast syntax, same value
-int result = condition ? 1 : (int)1;  // Warning: duplicateValueTernary
-```
-
-### Fixed code
-
-```cpp
-// Different values in branches
-int result = condition ? 1 : 2;  // OK
-
-// Simplified - condition doesn't matter
-int result = 1;  // OK - removed unnecessary ternary
-
-// Platform-dependent values are allowed
-int size = is_64bit ? sizeof(long) : sizeof(int);  // OK - may differ on platforms
-```
+Note that a ternary whose branches merely *could* differ depending on the platform, such as
+`is_64bit ? sizeof(long) : sizeof(int)`, is not flagged: cppcheck only warns when it can tell both
+branches are the same value on the platform being analyzed.
 
 ## How to fix
 
diff --git a/man/checkers/eraseDereference.md b/man/checkers/eraseDereference.md
new file mode 100644
index 00000000000..35312320b74
--- /dev/null
+++ b/man/checkers/eraseDereference.md
@@ -0,0 +1,51 @@
+# eraseDereference
+
+**Message**: Iterator 'iter' used after element has been erased.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+An iterator is dereferenced (or compared) after the element it pointed to has already been erased.
+
+## Motivation
+
+Once the element an iterator points to has been erased, the iterator itself is invalid - dereferencing
+or comparing it afterwards is undefined behaviour, even though it often still appears to "work" because
+the underlying memory hasn't been reused yet.
+
+## How to fix
+
+Before:
+```cpp
+#include <map>
+#include <iostream>
+void f() {
+    std::map<int, int> ints;
+    std::map<int, int>::iterator iter;
+    iter = ints.begin();
+    ints.erase(iter);
+    std::cout << iter->first << std::endl; // <- eraseDereference: 'iter' was just erased
+}
+```
+
+After:
+```cpp
+#include <map>
+#include <iostream>
+void f() {
+    std::map<int, int> ints = {{1, 2}};
+    std::map<int, int>::iterator iter;
+    iter = ints.begin();
+    std::cout << iter->first << std::endl;
+    ints.erase(iter);
+}
+```
+
+## Related checkers
+
+- [invalidIterator1.md](invalidIterator1.md) - a related mistake where an already-erased iterator is
+  passed to `erase()`/`insert()` again, rather than dereferenced.
+- [derefInvalidIterator.md](derefInvalidIterator.md) - the more general check for dereferencing an
+  iterator that could be invalid for any reason, not specifically because it was just erased.
diff --git a/man/checkers/eraseIteratorOutOfBounds.md b/man/checkers/eraseIteratorOutOfBounds.md
new file mode 100644
index 00000000000..ac24423fd7f
--- /dev/null
+++ b/man/checkers/eraseIteratorOutOfBounds.md
@@ -0,0 +1,64 @@
+# eraseIteratorOutOfBounds and eraseIteratorOutOfBoundsCond
+
+**Message**: Calling function 'erase()' on the iterator 'v.begin()' which is out of bounds.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C++
+
+## Description
+
+`erase()` is called with an iterator that is known to be `end()`, before `begin()`, or otherwise out of
+the container's range.
+
+- `eraseIteratorOutOfBounds`: the iterator is unconditionally known to be out of bounds.
+- `eraseIteratorOutOfBoundsCond`: the iterator is only out of bounds on one branch of a condition
+  tested nearby - either that condition is redundant, or this `erase()` call is a bug.
+
+## Motivation
+
+Calling `erase()` with an iterator that doesn't point at an actual element in the container (`end()`,
+or the result of moving an iterator before `begin()` or past `end()`) is undefined behaviour.
+
+## How to fix
+
+Before:
+```cpp
+#include <vector>
+void f() {
+    std::vector<int> v;
+    v.erase(v.begin()); // <- eraseIteratorOutOfBounds: 'v' is empty, begin() == end()
+}
+```
+
+After:
+```cpp
+#include <vector>
+void f() {
+    std::vector<int> v = {1, 2, 3};
+    v.erase(v.begin());
+}
+```
+
+Before:
+```cpp
+#include <vector>
+void f(std::vector<int>& v, std::vector<int>::iterator it) {
+    if (it == v.end()) {}
+    v.erase(it); // <- eraseIteratorOutOfBoundsCond: 'it' can be end() here
+}
+```
+
+After:
+```cpp
+#include <vector>
+void f(std::vector<int>& v, std::vector<int>::iterator it) {
+    if (it == v.end())
+        return;
+    v.erase(it);
+}
+```
+
+## Related checkers
+
+- [derefInvalidIterator.md](derefInvalidIterator.md) - the equivalent check for dereferencing (rather
+  than erasing through) an iterator that could be out of bounds.
diff --git a/man/checkers/exceptDeallocThrow.md b/man/checkers/exceptDeallocThrow.md
new file mode 100644
index 00000000000..53571ffc8f1
--- /dev/null
+++ b/man/checkers/exceptDeallocThrow.md
@@ -0,0 +1,42 @@
+# exceptDeallocThrow
+
+**Message**: Exception thrown in invalid state, 'p' points at deallocated memory.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning<br/>
+**Language**: C++ only
+
+## Description
+
+A global/static pointer is `delete`d and an exception can then be thrown before the pointer is given a
+new value, leaving a dangling pointer for any surviving code to use.
+
+## Motivation
+
+If an exception is thrown between freeing a pointer and resetting it, any exception handler (or later
+code, if the exception is caught and execution continues) that touches the same global/static pointer
+sees a dangling value - a use-after-free that's easy to miss because the code "looks" like it cleans up
+properly, just not in a safe order.
+
+## How to fix
+
+Before:
+```cpp
+static int* p = nullptr;
+void f(bool someCondition) {
+    delete p;
+    if (someCondition)
+        throw 1; // <- 'p' is left dangling if this throws
+    p = nullptr;
+}
+```
+
+After:
+```cpp
+static int* p = nullptr;
+void f(bool someCondition) {
+    delete p;
+    p = nullptr;
+    if (someCondition)
+        throw 1;
+}
+```
diff --git a/man/checkers/exceptRethrowCopy.md b/man/checkers/exceptRethrowCopy.md
new file mode 100644
index 00000000000..99ca02987fe
--- /dev/null
+++ b/man/checkers/exceptRethrowCopy.md
@@ -0,0 +1,50 @@
+# exceptRethrowCopy
+
+**Message**: Throwing a copy of the caught exception instead of rethrowing the original exception.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++ only
+
+## Description
+
+A `catch` block rethrows the caught exception with `throw x;` instead of a bare `throw;`, which makes
+an unnecessary copy (and can slice a derived exception down to its base type).
+
+## Motivation
+
+`throw x;` constructs a new exception object from `x`, sliced down to whatever type `x` was declared
+as - if the actual thrown object was a more-derived type, that extra information is lost. A bare
+`throw;` rethrows the original exception object exactly as it was, with no copy and no slicing.
+
+## How to fix
+
+Before:
+```cpp
+#include <stdexcept>
+void doWork();
+void f() {
+    try {
+        doWork();
+    } catch (const std::exception& err) {
+        throw err; // <- copies (and can slice) the exception
+    }
+}
+```
+
+After:
+```cpp
+#include <stdexcept>
+void doWork();
+void f() {
+    try {
+        doWork();
+    } catch (const std::exception& err) {
+        throw;
+    }
+}
+```
+
+## Related checkers
+
+- [catchExceptionByValue.md](catchExceptionByValue.md) - a related `catch`-clause mistake: catching by
+  value instead of by reference.
diff --git a/man/checkers/exceptThrowInDestructor.md b/man/checkers/exceptThrowInDestructor.md
new file mode 100644
index 00000000000..a529320267c
--- /dev/null
+++ b/man/checkers/exceptThrowInDestructor.md
@@ -0,0 +1,42 @@
+# exceptThrowInDestructor
+
+**Message**: Class X is not safe, destructor throws exception<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++ only
+
+## Description
+
+A destructor throws an exception.
+
+## Motivation
+
+Destructors are implicitly `noexcept` since C++11, and even before that, throwing from a destructor
+during stack unwinding (while another exception is already propagating) calls `std::terminate()`
+immediately, aborting the program without normal cleanup.
+
+## How to fix
+
+Before:
+```cpp
+class Resource {
+public:
+    ~Resource() {
+        throw 1; // <- destructors are expected not to throw
+    }
+};
+```
+
+After:
+```cpp
+class Resource {
+public:
+    ~Resource() {
+    }
+};
+```
+
+## Related checkers
+
+- [throwInNoexceptFunction.md](throwInNoexceptFunction.md) - the same underlying problem, for any
+  function explicitly marked `noexcept` rather than specifically a destructor.
diff --git a/man/checkers/extraWhitespaceError.md b/man/checkers/extraWhitespaceError.md
new file mode 100644
index 00000000000..5f635a0d776
--- /dev/null
+++ b/man/checkers/extraWhitespaceError.md
@@ -0,0 +1,25 @@
+# extraWhitespaceError
+
+**Message**: Found extra whitespace in the pattern.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Warning<br/>
+**Language**: C++ (cppcheck's own source code only)
+
+## Description
+
+A pattern string has leading/trailing or doubled whitespace, which doesn't change what it matches but
+suggests a typo.
+
+This is not a general-purpose checker for arbitrary C/C++ programs - see
+[simplePatternError.md](simplePatternError.md) for the shared background on this internal,
+cppcheck-source-only checker.
+
+## Motivation
+
+Stray whitespace in a pattern string is harmless to how the pattern matches, but it's a signal that the
+string may have been edited carelessly (for example, a token accidentally deleted without removing its
+surrounding space) - worth a second look even though it isn't a functional bug on its own.
+
+## How to fix
+
+Remove the extra leading, trailing, or doubled whitespace from the pattern string.
diff --git a/man/checkers/fcloseInLoopCondition.md b/man/checkers/fcloseInLoopCondition.md
new file mode 100644
index 00000000000..db7f0a584c6
--- /dev/null
+++ b/man/checkers/fcloseInLoopCondition.md
@@ -0,0 +1,40 @@
+# fcloseInLoopCondition
+
+**Message**: fclose() used as loop condition may skip loop body or double-close file handle.<br/>
+**Category**: Resource Management<br/>
+**Severity**: Warning<br/>
+**Language**: C and C++
+
+## Description
+
+Using `fclose()` as a loop condition leads to two unwanted outcomes:
+
+- On **success**, the condition is false and the loop body never executes. The intent was likely to process the file inside the loop, but it is already closed.
+- On **failure**, the condition is true and the loop body executes but `fclose()` is called again on the already-closed file handle on the next iteration, which is undefined behaviour.
+
+This pattern is almost always a misunderstanding of what `fclose()` returns, or confusion with a function that reads/processes data incrementally (like `fgets` or `fread`). Unlike those functions, `fclose()` is a one-shot teardown operation and has no meaningful retry or loop-until-done semantic.
+
+## How to fix
+
+Call `fclose()` outside the loop condition. If you need to check whether the close succeeded, store the return value and test it separately.
+
+Before:
+```c
+FILE *fp = fopen("data.txt", "r");
+while (fclose(fp)) {
+    /* process file */
+}
+```
+
+After:
+```c
+FILE *fp = fopen("data.txt", "r");
+/* process file */
+if (fclose(fp) != 0) {
+    /* handle close error */
+}
+```
+
+## Related checkers
+
+- `useClosedFile` - for using a file handle that has already been closed
diff --git a/man/checkers/fflushOnInputStream.md b/man/checkers/fflushOnInputStream.md
new file mode 100644
index 00000000000..b09ea8076b8
--- /dev/null
+++ b/man/checkers/fflushOnInputStream.md
@@ -0,0 +1,34 @@
+# fflushOnInputStream
+
+**Message**: fflush() called on input stream 'x' may result in undefined behaviour on non-linux systems.<br/>
+**Category**: Portability<br/>
+**Severity**: Portability<br/>
+**Language**: C/C++
+
+## Description
+
+`fflush()` is called on an input stream (`stdin`, or a file opened for reading).
+
+## Motivation
+
+The C standard only defines `fflush()`'s effect for output streams; on an input stream it's
+implementation-defined - some platforms discard unread input as a convenience, others don't define
+anything useful, so relying on it isn't portable.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f() {
+    fflush(stdin); // <- undefined/implementation-defined on an input stream
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f() {
+    while (getchar() != '\n') {}
+}
+```
diff --git a/man/checkers/floatConversionOverflow.md b/man/checkers/floatConversionOverflow.md
new file mode 100644
index 00000000000..77338965d7b
--- /dev/null
+++ b/man/checkers/floatConversionOverflow.md
@@ -0,0 +1,45 @@
+# floatConversionOverflow
+
+**Message**: Undefined behaviour: float (1e+100) to integer conversion overflow.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C/C++
+
+## Description
+
+This checker detects conversions from a floating point value to an integer type (via explicit cast,
+assignment or `return`) where the floating point value is outside the range that the target integer
+type can represent, based on the platform's configured integer widths.
+
+## Motivation
+
+Converting a floating point value to an integer type is undefined behaviour when the value does not
+fit in the target type (for example, it is too large, too small, NaN, or infinite). Unlike integer
+overflow, this cannot simply be assumed to "wrap around"; the actual result is unpredictable.
+
+## How to fix
+
+Make sure the floating point value fits in the target integer type before converting, for example by
+clamping the value to the valid range, or by using a wider or floating point type instead.
+
+Note: cppcheck only warns when it can determine the actual floating point value (or a bound on it).
+An unconstrained `double` parameter with no known or derivable value is not checked; the example
+below uses a value cppcheck can trace so the warning actually fires.
+
+Before:
+```cpp
+int32_t foo() {
+    double d = 1E100;
+    return (int32_t)d; // <- floatConversionOverflow, 1E100 does not fit in a 32-bit int
+}
+```
+
+After:
+```cpp
+int32_t foo() {
+    double d = 1E100;
+    if (d > (double)INT32_MAX || d < (double)INT32_MIN)
+        return 0; // handle out-of-range value
+    return (int32_t)d;
+}
+```
diff --git a/man/checkers/ftellTextModeFile.md b/man/checkers/ftellTextModeFile.md
new file mode 100644
index 00000000000..847e23b6580
--- /dev/null
+++ b/man/checkers/ftellTextModeFile.md
@@ -0,0 +1,56 @@
+# ftellTextModeFile
+
+**Message**: ftell() result is unspecified when file is opened in mode "t".<br/>
+**Category**: Portability<br/>
+**Severity**: Portability<br/>
+**Language**: C/C++
+
+## Description
+
+This checker detects the use of ftell() on a file open in text (or translate) mode. The text mode is not consistent
+ in between Linux and Windows system and may cause ftell() to return the wrong offset inside a text file.
+
+See section 7.21.9.4p2 of the C11 standard regarding the ftell function states for a text stream:
+
+- For a text stream, its file position indicator contains unspecified information, usable by the fseek function for returning the file position indicator for the stream to its position at the time of the ftell call; the difference between two such return values is not necessarily a meaningful measure of the number of characters written or read.
+
+This warning helps improve code quality by:
+- Making the intent clear that the use of ftell() in "t" mode may cause portability problem.
+
+## Motivation
+
+This checker improves portability accross system.
+
+## How to fix
+
+According to C11, the file must be opened in binary mode 'b' to prevent this problem.
+
+Before:
+```cpp
+     FILE *f = fopen("Example.txt", "rt");
+     if (f)
+     {
+        fseek(f, 0, SEEK_END);
+        printf( "File size %d\n", ftell(f));
+        fclose(f);
+     }
+
+```
+
+After:
+```cpp
+
+     FILE *f = fopen("Example.txt", "rb");
+     if (f)
+     {
+        fseek(f, 0, SEEK_END);
+        printf( "File size %d\n", ftell(f));
+        fclose(f);
+     }
+
+```
+
+## Notes
+
+See https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/fopen-wfopen?view=msvc-170
+
diff --git a/man/checkers/funcArgNamesDifferent.md b/man/checkers/funcArgNamesDifferent.md
new file mode 100644
index 00000000000..8e5841a4a38
--- /dev/null
+++ b/man/checkers/funcArgNamesDifferent.md
@@ -0,0 +1,49 @@
+# funcArgNamesDifferent and funcArgNamesDifferentUnnamed
+
+**Message**: Function 'f' argument 1 names different: declaration 'a' definition 'b'.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style (Inconclusive)<br/>
+**Language**: C/C++
+
+## Description
+
+A function is declared in one place (for example a header) and defined in another, and an argument has
+a different name between the two (`funcArgNamesDifferent`), or is named in one but not the other
+(`funcArgNamesDifferentUnnamed`).
+
+## Motivation
+
+Readers of the declaration alone can be misled about what an argument means if the definition uses a
+different (or more descriptive) name - the declaration is often the only thing visible from a header,
+while the actual logic and its more meaningful names live in the definition.
+
+## How to fix
+
+Before:
+```cpp
+void func2(int a, int b, int c);
+void func2(int A, int B, int C) { } // <- names don't match the declaration
+```
+
+After:
+```cpp
+void func2(int a, int b, int c);
+void func2(int a, int b, int c) { }
+```
+
+Before:
+```cpp
+void f(int a);
+void f(int) {} // <- the definition drops the declared name
+```
+
+After:
+```cpp
+void f(int a);
+void f(int a) {}
+```
+
+## Related checkers
+
+- [funcArgOrderDifferent.md](funcArgOrderDifferent.md) - the same kind of declaration/definition
+  mismatch, but for the order of two arguments that keep their names.
diff --git a/man/checkers/funcArgOrderDifferent.md b/man/checkers/funcArgOrderDifferent.md
new file mode 100644
index 00000000000..0042f6964e4
--- /dev/null
+++ b/man/checkers/funcArgOrderDifferent.md
@@ -0,0 +1,36 @@
+# funcArgOrderDifferent
+
+**Message**: Function 'func2' argument order different: declaration 'a, b, c' definition 'c, b, a'<br/>
+**Category**: Code Quality<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A function's declaration and its definition give the same set of argument names, but in a different
+order - a strong sign that a maintenance edit swapped two parameters in only one of the two places.
+
+## Motivation
+
+If the declaration and definition disagree about which parameter is which, calls written against the
+declaration pass arguments in the wrong logical order relative to what the definition actually does with
+them - a real, easy-to-miss bug, not just a style nit.
+
+## How to fix
+
+Before:
+```cpp
+void func2(int a, int b, int c);
+void func2(int c, int b, int a) { } // <- 'a' and 'c' swapped places
+```
+
+After:
+```cpp
+void func2(int a, int b, int c);
+void func2(int a, int b, int c) { }
+```
+
+## Related checkers
+
+- [funcArgNamesDifferent.md](funcArgNamesDifferent.md) - the same kind of declaration/definition
+  mismatch, but for an argument name changing (or disappearing) rather than two arguments swapping order.
diff --git a/man/checkers/globalLockGuard.md b/man/checkers/globalLockGuard.md
new file mode 100644
index 00000000000..05b1c4b3a07
--- /dev/null
+++ b/man/checkers/globalLockGuard.md
@@ -0,0 +1,43 @@
+# globalLockGuard
+
+**Message**: Lock guard is defined globally. Lock guards are intended to be local. A global lock guard could lead to a deadlock since it won't unlock until the end of the program.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+A `std::lock_guard` (or similar RAII lock wrapper) is declared `static` or at namespace/global scope -
+it's then held for the entire lifetime of the program, since its destructor (which releases the lock)
+never runs until the program exits, defeating the purpose of the lock and risking a permanent deadlock.
+
+## Motivation
+
+A `lock_guard`'s whole purpose is to release the lock automatically when it goes out of scope. Giving
+it static storage duration means it never goes out of scope until the program ends - the lock is taken
+once and never released, so any other code that later tries to lock the same mutex blocks forever.
+
+## How to fix
+
+Before:
+```cpp
+#include <mutex>
+void f() {
+    static std::mutex m;
+    static std::lock_guard<std::mutex> g(m); // <- never unlocked until program exit
+}
+```
+
+After:
+```cpp
+#include <mutex>
+void f() {
+    static std::mutex m;
+    std::lock_guard<std::mutex> g(m);
+}
+```
+
+## Related checkers
+
+- [localMutex.md](localMutex.md) - the opposite mistake: a mutex and its lock declared in the same,
+  too-narrow scope, so the lock has no effect.
diff --git a/man/checkers/identicalConditionAfterEarlyExit.md b/man/checkers/identicalConditionAfterEarlyExit.md
new file mode 100644
index 00000000000..72974ef3612
--- /dev/null
+++ b/man/checkers/identicalConditionAfterEarlyExit.md
@@ -0,0 +1,43 @@
+# identicalConditionAfterEarlyExit
+
+**Message**: Identical condition 'x==1', second condition is always false<br/>
+**Category**: Code Quality<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+After `if (cond) return;` (or `throw`/`continue`/`break`), the same condition is tested again later in
+the function - by that point it can only be false.
+
+## Motivation
+
+Once execution passes the early exit, the condition that would have triggered it is already known to be
+false for the rest of the function - re-testing it is always false, so it's either dead code or a sign
+the two conditions were meant to check different things.
+
+This check may need `--check-level=exhaustive` to see every case.
+
+## How to fix
+
+Before:
+```cpp
+void f(int x) {
+    if (x == 1)
+        return;
+    if (x == 1) {} // <- always false here
+}
+```
+
+After:
+```cpp
+void f(int x) {
+    if (x == 1)
+        return;
+}
+```
+
+## Related checkers
+
+- [duplicateCondition.md](duplicateCondition.md) - the same idea, but for two consecutive plain `if`
+  statements with no early exit in between.
diff --git a/man/checkers/identicalInnerCondition.md b/man/checkers/identicalInnerCondition.md
new file mode 100644
index 00000000000..c2fa1e0d681
--- /dev/null
+++ b/man/checkers/identicalInnerCondition.md
@@ -0,0 +1,47 @@
+# identicalInnerCondition
+
+**Message**: Identical inner 'if' condition is always true.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+An `if` nested directly inside another `if` repeats the exact same condition as the outer one, so the
+inner condition is always true.
+
+## Motivation
+
+If the outer `if` already tested the condition, testing it again immediately inside is redundant - the
+inner `if` can never be false, so it adds nothing but confusion (and cost of a reader wondering whether
+something subtle was intended).
+
+This check may need `--check-level=exhaustive` to see every case.
+
+## How to fix
+
+Before:
+```cpp
+void f(int x) {
+    if (x == 1) {
+        if (x == 1) {} // <- always true
+    }
+}
+```
+
+After: remove the redundant inner check.
+```cpp
+void f(int x) {
+    if (x == 1) {
+    }
+}
+```
+
+## Related checkers
+
+- [oppositeInnerCondition.md](oppositeInnerCondition.md) - the same idea, but the inner condition
+  contradicts the outer one instead of repeating it.
+- [overlappingInnerCondition.md](overlappingInnerCondition.md) - the same idea, but the inner condition
+  is merely implied by (not identical to) the outer one.
+- [multiCondition.md](multiCondition.md) - the same idea, but for an `if`/`else if` chain instead of
+  nested `if`s.
diff --git a/man/checkers/ignoredReturnValue.md b/man/checkers/ignoredReturnValue.md
new file mode 100644
index 00000000000..244888e4625
--- /dev/null
+++ b/man/checkers/ignoredReturnValue.md
@@ -0,0 +1,39 @@
+# ignoredReturnValue and ignoredReturnErrorCode
+
+**Message**: Return value of function $symbol() is not used.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning/Style<br/>
+**Language**: C/C++
+
+## Description
+
+The return value of a function that must be checked is discarded:
+
+- `ignoredReturnValue`: the function is marked `[[nodiscard]]`, or is known to be pure/const, or
+  returns newly allocated memory that would otherwise leak.
+- `ignoredReturnErrorCode`: the function's return value follows a "returns an error code" convention
+  (per its library configuration), so discarding it means a failure could go unnoticed.
+
+## Motivation
+
+If a function's whole purpose is its return value (a pure calculation), or its return value is the only
+way to learn it failed, throwing that value away either wastes the call entirely or hides a possible
+failure that will only surface later, in a more confusing way.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstring>
+void f(char* a, char* b) {
+    strcmp(a, b); // <- the comparison result is thrown away
+}
+```
+
+After:
+```cpp
+#include <cstring>
+void f(char* a, char* b) {
+    if (strcmp(a, b) == 0) {}
+}
+```
diff --git a/man/checkers/incompatibleFileOpen.md b/man/checkers/incompatibleFileOpen.md
new file mode 100644
index 00000000000..bc0e7fd52d6
--- /dev/null
+++ b/man/checkers/incompatibleFileOpen.md
@@ -0,0 +1,44 @@
+# incompatibleFileOpen
+
+**Message**: The file 'a.txt' is opened for read and write access at the same time on different streams<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+The same filename is opened for reading on one stream while another stream already has it open for
+writing (or vice versa).
+
+## Motivation
+
+Two independent streams onto the same file, one reading and one writing, can observe an inconsistent
+view of the file's contents depending on buffering and timing - a portability and correctness hazard
+that's easy to introduce without noticing, since each stream on its own looks fine.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f() {
+    FILE *f1 = fopen("a.txt", "w");
+    FILE *f2 = fopen("a.txt", "r"); // <- 'a.txt' is already open for writing
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f() {
+    FILE *f1 = fopen("a.txt", "r");
+    if (f1) fclose(f1);
+}
+```
+
+## Related checkers
+
+- [useClosedFile.md](useClosedFile.md), [readWriteOnlyFile.md](readWriteOnlyFile.md),
+  [writeReadOnlyFile.md](writeReadOnlyFile.md), [IOWithoutPositioning.md](IOWithoutPositioning.md),
+  [seekOnAppendedFile.md](seekOnAppendedFile.md) - other checks that follow the same `FILE*` through a
+  function.
diff --git a/man/checkers/incompleteArrayFill.md b/man/checkers/incompleteArrayFill.md
new file mode 100644
index 00000000000..41f3ce4f584
--- /dev/null
+++ b/man/checkers/incompleteArrayFill.md
@@ -0,0 +1,45 @@
+# incompleteArrayFill
+
+**Message**: Array 'a[5]' might be filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*a)'?<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning/Portability<br/>
+**Language**: C/C++
+
+## Description
+
+`memset()`/`memcpy()`/`memmove()` is given a byte count equal to the *number of elements* in an array,
+rather than their combined size in bytes - unless each element happens to be exactly one byte, this only
+fills part of the array. When the array's element type is specifically `bool`, this is reported at
+`portability` severity instead: `sizeof(bool)` happens to be `1` on most common platforms (so the code
+"works" there), but the C/C++ standard doesn't guarantee it, so the exact same code is a real, silent
+bug on a platform where `bool` is wider.
+
+## Motivation
+
+These functions take their size argument in bytes, not element count. Passing the element count directly
+is an easy mistake - it compiles fine, and on typical platforms with 1-byte types it can even happen to
+be correct, but for any array element wider than one byte it silently leaves most of the array
+untouched.
+
+## How to fix
+
+Multiply the element count by `sizeof(*array)` (or the element type's size) to get the correct byte
+count.
+
+Before:
+```cpp
+#include <cstring>
+void f() {
+    int a[5];
+    memset(a, 123, 5); // <- fills 5 bytes, not 5 ints
+}
+```
+
+After:
+```cpp
+#include <cstring>
+void f() {
+    int a[5];
+    memset(a, 123, 5 * sizeof(*a));
+}
+```
diff --git a/man/checkers/incorrectLogicOperator.md b/man/checkers/incorrectLogicOperator.md
new file mode 100644
index 00000000000..7acd2d8c735
--- /dev/null
+++ b/man/checkers/incorrectLogicOperator.md
@@ -0,0 +1,42 @@
+# incorrectLogicOperator
+
+**Message**: Logical disjunction always evaluates to true: x != 1 || x != 2.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+Two comparisons on the same variable, joined by `&&`/`||`, combine to something that's always true or
+always false, regardless of the variable's actual value.
+
+## Motivation
+
+`x == 1 && x == 2` can never be true (a variable can't equal both 1 and 2 at once), and
+`x != 1 || x != 2` can never be false (it's always at least one of those). Writing this is a strong
+signal the wrong logical operator was used - `&&` instead of `||`, or vice versa - or that one of the
+compared values is wrong.
+
+This check may need `--check-level=exhaustive` to see every case.
+
+## How to fix
+
+Before:
+```cpp
+void f(int x) {
+    if (x == 1 && x == 2) {} // <- can never be true
+}
+```
+
+After:
+```cpp
+void f(int x) {
+    if (x == 1 || x == 2) {}
+}
+```
+
+## Related checkers
+
+- [redundantCondition.md](redundantCondition.md) - the same style of two-comparisons-on-one-variable
+  analysis, but for when one comparison is already implied by the other rather than making the whole
+  expression always true/false.
diff --git a/man/checkers/incorrectStringBooleanError.md b/man/checkers/incorrectStringBooleanError.md
new file mode 100644
index 00000000000..cdfc503ea7f
--- /dev/null
+++ b/man/checkers/incorrectStringBooleanError.md
@@ -0,0 +1,36 @@
+# incorrectStringBooleanError and incorrectCharBooleanError
+
+**Message**: Conversion of string literal "Hello" to bool always evaluates to true.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A string or char literal is used directly where a boolean is expected (`if ("Hello")`,
+`x ? "a" : "b"` as the whole condition) - this is always `true` unless the literal is exactly
+`""`/`'\0'`.
+
+## Motivation
+
+A non-empty string or character literal converts to `true` every time - if the intent was to check a
+variable's value, using the literal itself instead is a typo that silently makes the condition
+constant, so the code inside always (or never) runs regardless of any real input.
+
+## How to fix
+
+Before:
+```cpp
+int f() {
+    if ("Hello") {} // <- always true
+    return 0;
+}
+```
+
+After:
+```cpp
+int f(bool flag) {
+    if (flag) {}
+    return 0;
+}
+```
diff --git a/man/checkers/incorrectStringCompare.md b/man/checkers/incorrectStringCompare.md
new file mode 100644
index 00000000000..a03b379d62a
--- /dev/null
+++ b/man/checkers/incorrectStringCompare.md
@@ -0,0 +1,35 @@
+# incorrectStringCompare
+
+**Message**: String literal "Hello" doesn't match length argument for substr().<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+`x.substr(pos, len) == "literal"` where `len` doesn't match the length of `"literal"`.
+
+## Motivation
+
+`substr(pos, len)` only ever returns a string of (at most) `len` characters, so comparing it against a
+literal of a different length can never be true (if `len` is too short) or is comparing more characters
+than were actually extracted (if `len` is too long) - either way, the comparison doesn't test what it
+looks like it tests.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+int f(std::string test) {
+    return test.substr(0, 4) == "Hello" ? 0 : 1; // <- "Hello" is 5 chars
+}
+```
+
+After:
+```cpp
+#include <string>
+int f(std::string test) {
+    return test.substr(0, 5) == "Hello" ? 0 : 1;
+}
+```
diff --git a/man/checkers/incrementboolean.md b/man/checkers/incrementboolean.md
new file mode 100644
index 00000000000..a096446d0a1
--- /dev/null
+++ b/man/checkers/incrementboolean.md
@@ -0,0 +1,34 @@
+# incrementboolean
+
+**Message**: Incrementing a variable of type 'bool' with postfix operator++ is deprecated by the C++ Standard. You should assign it the value 'true' instead.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A `bool` variable is incremented with `++`.
+
+## Motivation
+
+Incrementing a `bool` is deprecated by the C++ standard (Annex D) and always just sets it to `true` -
+writing `= true` says the same thing without relying on deprecated, integer-flavored behaviour of a
+type that isn't really a number.
+
+## How to fix
+
+Before:
+```cpp
+bool ready = true;
+void f() {
+    ready++; // <- deprecated
+}
+```
+
+After:
+```cpp
+bool ready = true;
+void f() {
+    ready = true;
+}
+```
diff --git a/man/checkers/initializerList.md b/man/checkers/initializerList.md
new file mode 100644
index 00000000000..989627d1f71
--- /dev/null
+++ b/man/checkers/initializerList.md
@@ -0,0 +1,77 @@
+# initializerList
+
+**Message**: Member variable 'c' is in the wrong order in the initialization list.<br/>
+**Category**: Correctness<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A constructor's member-initializer list either lists members in a different order than they're declared
+in the class (misleading, since members are always initialized in declaration order, not
+initializer-list order), or initializes one member using another member as a source value when that
+source member is declared *after* it - so, despite appearing earlier in the list, the source hasn't
+actually been initialized yet at that point.
+
+## Motivation
+
+C++ always initializes members in the order they're *declared* in the class, regardless of what order
+they're written in the initializer list. cppcheck flags any mismatch between the two orders purely as a
+defensive-programming measure - most of the time (as in the first example below, where every member is
+just initialized from a constant) writing the list out of order is only misleading to a reader, with no
+real consequence. But because members are genuinely initialized in declaration order, a list written out
+of order can also hide a real bug: if one member's initializer reads another member that's declared
+*later*, the value it reads is indeterminate (that member's own storage hasn't been given a value yet),
+and reading an indeterminate scalar value is undefined behaviour - the same underlying problem as reading
+any other uninitialized variable, just harder to spot because the initializer list makes it look like the
+source was already set up. cppcheck doesn't distinguish the two cases - it always suggests reordering the
+list to match declaration order, which prevents the harmful case from ever being possible.
+
+## How to fix
+
+Write the initializer list in the same order the members are declared in the class.
+
+Before:
+```cpp
+class Fred {
+    int a, b, c;
+public:
+    Fred() : c(0), b(0), a(0) { } // <- listed in the reverse of declaration order
+};
+```
+
+After:
+```cpp
+class Fred {
+    int a, b, c;
+public:
+    Fred() : a(0), b(0), c(0) { }
+};
+```
+
+Before:
+```cpp
+class Foo {
+public:
+    Foo(int arg) : a(b), b(arg) {} // <- 'a' is initialized from 'b', but 'b' isn't set yet
+    int a;
+    int b;
+};
+```
+
+After:
+```cpp
+class Foo {
+public:
+    explicit Foo(int arg) : a(arg), b(arg) {}
+    int a;
+    int b;
+};
+```
+
+## Related checkers
+
+- [useInitializationList.md](useInitializationList.md) - a different constructor-initializer-list
+  pitfall, about whether the list is used at all rather than the order members appear in it.
+- [selfInitialization.md](selfInitialization.md) - the more specific case where a member is initialized
+  from itself.
diff --git a/man/checkers/intToPointerCast.md b/man/checkers/intToPointerCast.md
new file mode 100644
index 00000000000..b72749a994e
--- /dev/null
+++ b/man/checkers/intToPointerCast.md
@@ -0,0 +1,44 @@
+# intToPointerCast
+
+**Message**: Casting non-zero decimal integer literal to pointer.<br/>
+**Category**: Portability<br/>
+**Severity**: Portability<br/>
+**Language**: C/C++
+
+## Description
+
+A non-zero integer literal (not a hex address like `0x7000`, which is common in embedded code) is cast
+directly to a pointer.
+
+## Motivation
+
+A decimal, octal, or binary integer literal cast to a pointer looks like it's meant to be a specific
+memory address, but writing addresses in those bases is unusual and easy to mistype or misread compared
+to the conventional hexadecimal form - a small typo can silently produce a very different address.
+
+## How to fix
+
+Write the address in hexadecimal, which is the conventional and clearer way to express a raw address.
+
+Before:
+```cpp
+#include <cstdint>
+uint8_t* f() {
+    uint8_t* ptr = (uint8_t*)7; // <- 7 isn't a real address
+    return ptr;
+}
+```
+
+After:
+```cpp
+#include <cstdint>
+uint8_t* f() {
+    uint8_t* ptr = (uint8_t*)0x7000; // an actual address is fine
+    return ptr;
+}
+```
+
+## Related checkers
+
+- [invalidPointerCast.md](invalidPointerCast.md) - a different pointer-cast portability issue, about
+  casting between two pointer types whose values aren't laid out the same way in memory.
diff --git a/man/checkers/integerOverflow.md b/man/checkers/integerOverflow.md
new file mode 100644
index 00000000000..1c426f5a7ca
--- /dev/null
+++ b/man/checkers/integerOverflow.md
@@ -0,0 +1,57 @@
+# integerOverflow and integerOverflowCond
+
+**Message**: Signed integer overflow for expression 'x*y'.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C/C++
+
+## Description
+
+This checker detects when a signed integer arithmetic expression (`+`, `-`, `*`, `/`, `<<`, etc.) can
+overflow or underflow the range of its result type, based on the platform's configured integer
+widths.
+
+- `integerOverflow`: the overflow/underflow is unconditional - it happens for every value cppcheck can
+  see reaching that point.
+- `integerOverflowCond`: the overflow/underflow only happens under a certain condition elsewhere in the
+  code; the message explains that "Either the condition ... is redundant or there is signed integer
+  overflow/underflow ...".
+
+As a special case, left-shifting into the sign bit (for example `1 << 31` for a 32-bit int) is not
+reported, since this is common practice even though it is technically undefined behaviour; that is
+instead covered by the [shiftTooManyBits](shiftTooManyBits.md) checker family.
+
+## Motivation
+
+Signed integer overflow is undefined behaviour in C and C++. In practice this often means the
+calculation silently produces a wrong (wrapped or truncated) result, and with optimizations enabled
+the compiler is allowed to assume overflow never happens, which can eliminate or reorder code in
+surprising ways.
+
+## How to fix
+
+You can fix these warnings by:
+1. Using a wider integer type for the calculation
+2. Rewriting the calculation to avoid the overflow (for example checking bounds before multiplying)
+3. Using an unsigned type, if wraparound behaviour is actually intended
+
+Note: cppcheck only warns when it can actually determine that the calculation overflows - either from
+a known value (as below) or from a condition elsewhere in the code (see `integerOverflowCond` above).
+A plain `a * b` of two otherwise-unconstrained parameters gives cppcheck nothing to prove an overflow
+with, so it is not reported.
+
+Before:
+```cpp
+int32_t f() {
+    int32_t intmax = 0x7fffffff; // INT32_MAX
+    return intmax + 1; // <- integerOverflow, known to overflow 32-bit int
+}
+```
+
+After:
+```cpp
+int64_t f() {
+    int32_t intmax = 0x7fffffff;
+    return (int64_t)intmax + 1; // <- widen before adding
+}
+```
diff --git a/man/checkers/invalidContainer.md b/man/checkers/invalidContainer.md
new file mode 100644
index 00000000000..402ff69f4bb
--- /dev/null
+++ b/man/checkers/invalidContainer.md
@@ -0,0 +1,71 @@
+# invalidContainer and invalidContainerReference
+
+**Message**: Using pointer to local variable 'v' that may be invalid.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+A pointer or reference taken from inside a container (an element, `.front()`, an iterator, ...) is used
+after a call (`push_back()`, `insert()`, `clear()`, ...) that may have invalidated it.
+
+- `invalidContainer`: the invalidated thing is a pointer or iterator value.
+- `invalidContainerReference`: the invalidated thing is a reference.
+
+## Motivation
+
+Many container operations can reallocate or otherwise invalidate previously-obtained pointers,
+references, and iterators into that container's data, without any visible change at the call site of
+the operation that invalidates them. Using one afterwards is undefined behaviour.
+
+## How to fix
+
+Before:
+```cpp
+#include <vector>
+#include <iostream>
+void f(std::vector<int> &v) {
+    int *v0 = &v[0];
+    v.push_back(123);
+    std::cout << *v0 << std::endl; // <- invalidContainer: push_back() may have reallocated 'v'
+}
+```
+
+After:
+```cpp
+#include <vector>
+#include <iostream>
+void f(std::vector<int> &v) {
+    v.push_back(123);
+    std::cout << v[0] << std::endl;
+}
+```
+
+Before:
+```cpp
+#include <vector>
+#include <iostream>
+void f() {
+    std::vector<int> v = {1};
+    int &v0 = v.front();
+    v.push_back(123);
+    std::cout << v0 << std::endl; // <- invalidContainerReference: push_back() may have reallocated 'v'
+}
+```
+
+After:
+```cpp
+#include <vector>
+#include <iostream>
+void f() {
+    std::vector<int> v = {1};
+    v.push_back(123);
+    std::cout << v.front() << std::endl;
+}
+```
+
+## Related checkers
+
+- [invalidContainerLoop.md](invalidContainerLoop.md) - the equivalent problem when the invalidating
+  call happens while a loop is actively iterating over the same container.
diff --git a/man/checkers/invalidContainerLoop.md b/man/checkers/invalidContainerLoop.md
new file mode 100644
index 00000000000..d6bce6e098a
--- /dev/null
+++ b/man/checkers/invalidContainerLoop.md
@@ -0,0 +1,52 @@
+# invalidContainerLoop
+
+**Message**: Calling 'push_back' while iterating the container is invalid.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+A container is modified with a call that can invalidate iterators (such as `push_back()` on a
+`vector`) while a loop is iterating over that same container.
+
+## Motivation
+
+Modifying a container while a range-based (or iterator-based) loop is walking over it risks invalidating
+the loop's own iterator mid-iteration - for `push_back()` on a `vector`, this happens whenever the call
+needs to reallocate storage, which isn't certain from any single call but is guaranteed to happen
+eventually as the container grows. Once that happens, the loop machinery's next step (comparing,
+dereferencing, or incrementing the now-invalid iterator) is undefined behaviour - even though it often
+appears to "work" for a while before the container's storage actually needs to move.
+
+## How to fix
+
+Before:
+```cpp
+#include <vector>
+void f(std::vector<int> v) {
+    for (auto i : v) {
+        if (i < 5)
+            v.push_back(i * 2); // <- invalidContainerLoop: modifying 'v' while iterating over it
+    }
+}
+```
+
+After:
+```cpp
+#include <vector>
+void f(std::vector<int> v) {
+    std::vector<int> toAdd;
+    for (auto i : v) {
+        if (i < 5)
+            toAdd.push_back(i * 2);
+    }
+    v.insert(v.end(), toAdd.begin(), toAdd.end());
+}
+```
+
+## Related checkers
+
+- [invalidContainer.md](invalidContainer.md) - the more general check for using a pointer, reference,
+  or iterator into a container after some other call may have invalidated it (not necessarily while
+  iterating).
diff --git a/man/checkers/invalidFree.md b/man/checkers/invalidFree.md
new file mode 100644
index 00000000000..57bff5c0198
--- /dev/null
+++ b/man/checkers/invalidFree.md
@@ -0,0 +1,43 @@
+# invalidFree
+
+**Message**: Mismatching address is not returned from malloc(). The address you get from malloc() must be freed without offset.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+`free()`/`delete`/`delete[]` is called on a pointer that has been moved by pointer arithmetic since it
+was allocated - the allocator only recognizes the exact address it originally returned.
+
+## Motivation
+
+Freeing an address other than the exact one an allocator returned is undefined behaviour - typically a
+crash, but potentially memory corruption that surfaces somewhere else entirely. This is easy to
+introduce by accident once a pointer is advanced (for example while parsing or iterating through a
+buffer) and then freed without first restoring it to the original address. cppcheck only tracks a
+pointer as long as it can be sure nothing else changed it; passing it to another function is enough
+uncertainty that cppcheck stops checking it rather than guess, so this catches only the mismatches it
+can prove, not every one that exists.
+
+## How to fix
+
+Free the exact pointer the allocator returned, not one that's been offset since.
+
+Before:
+```cpp
+#include <cstdlib>
+void foo() {
+  char *a; a = malloc(1024);
+  free(a + 10); // <- this isn't the address malloc() returned
+}
+```
+
+After:
+```cpp
+#include <cstdlib>
+void foo() {
+  char *a; a = malloc(1024);
+  free(a);
+}
+```
diff --git a/man/checkers/invalidFunctionArg.md b/man/checkers/invalidFunctionArg.md
new file mode 100644
index 00000000000..d102bfdce9d
--- /dev/null
+++ b/man/checkers/invalidFunctionArg.md
@@ -0,0 +1,40 @@
+# invalidFunctionArg
+
+**Message**: Invalid $symbol() argument nr 1. The value is 0 but the valid values are '1:'.<br/>
+**Category**: Correctness<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C/C++
+
+## Description
+
+An argument value falls outside the numeric range a function actually accepts, based on what cppcheck
+knows about the function (from a library configuration) and about the value passed.
+
+## Motivation
+
+Many standard library functions only behave correctly for a specific range of an argument (a base for
+`strtol()`, a mode for a file function, ...); passing a value outside that range is undefined or
+implementation-defined behaviour that a compiler will not catch.
+
+## How to fix
+
+Before:
+```cpp
+void f(char *a, char **b) {
+    strtol(a, b, 1); // <- base 1 is not valid
+}
+```
+
+After:
+```cpp
+void f(char *a, char **b) {
+    strtol(a, b, 10);
+}
+```
+
+## Related checkers
+
+- [invalidFunctionArgBool.md](invalidFunctionArgBool.md) - the same idea, but for an argument that
+  needs a real boolean rather than a plain `0`/`1`.
+- [invalidFunctionArgStr.md](invalidFunctionArgStr.md) - the same idea, but for an argument that needs
+  a null-terminated C-string.
diff --git a/man/checkers/invalidFunctionArgBool.md b/man/checkers/invalidFunctionArgBool.md
new file mode 100644
index 00000000000..af6e3d691dd
--- /dev/null
+++ b/man/checkers/invalidFunctionArgBool.md
@@ -0,0 +1,41 @@
+# invalidFunctionArgBool
+
+**Message**: Invalid $symbol() argument nr 1. A non-boolean value is required.<br/>
+**Category**: Correctness<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A plain `0`/`1` is passed where a function (per its library configuration) actually requires a real
+boolean argument.
+
+## Motivation
+
+Some functions distinguish a genuine boolean argument from an arbitrary integer that happens to be `0`
+or `1` - passing the wrong kind of value can be accepted silently but not do what's intended.
+
+## How to fix
+
+Before:
+```cpp
+void setFlag(bool enabled);
+void f() {
+    setFlag(1); // <- treat this as a real boolean, not an arbitrary int
+}
+```
+
+After:
+```cpp
+void setFlag(bool enabled);
+void f() {
+    setFlag(true);
+}
+```
+
+## Related checkers
+
+- [invalidFunctionArg.md](invalidFunctionArg.md) - the same idea, but for an argument whose numeric
+  value must fall in a specific range.
+- [invalidFunctionArgStr.md](invalidFunctionArgStr.md) - the same idea, but for an argument that needs
+  a null-terminated C-string.
diff --git a/man/checkers/invalidFunctionArgStr.md b/man/checkers/invalidFunctionArgStr.md
new file mode 100644
index 00000000000..a68e95ad57a
--- /dev/null
+++ b/man/checkers/invalidFunctionArgStr.md
@@ -0,0 +1,46 @@
+# invalidFunctionArgStr
+
+**Message**: Invalid $symbol() argument nr 1. A NUL-terminated string is required.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A `char`/`wchar_t` buffer that isn't null-terminated (for example, the address of a single character)
+is passed where a function (per its library configuration) requires a null-terminated C-string.
+
+## Motivation
+
+Functions like `strlen()`/`strcmp()` scan forward until they find a `'\0'` byte - if the argument isn't
+actually a null-terminated string, whether this reads past the end of whatever memory was passed depends
+on what byte values happen to follow it. If a `'\0'` byte never turns up before the buffer's real end,
+the scan reads out of bounds, which is undefined behaviour; there's no way to guarantee that in advance
+from the code alone, which is exactly why passing a non-null-terminated buffer is dangerous even when a
+particular run happens not to crash.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstring>
+size_t f(char x) {
+    return strlen(&x); // <- 'x' is a single char, not a null-terminated string
+}
+```
+
+After:
+```cpp
+#include <cstring>
+size_t f() {
+    char x[] = "a";
+    return strlen(x);
+}
+```
+
+## Related checkers
+
+- [invalidFunctionArg.md](invalidFunctionArg.md) - the same idea, but for an argument whose numeric
+  value must fall in a specific range.
+- [invalidFunctionArgBool.md](invalidFunctionArgBool.md) - the same idea, but for an argument that
+  needs a real boolean rather than a plain `0`/`1`.
diff --git a/man/checkers/invalidIterator1.md b/man/checkers/invalidIterator1.md
new file mode 100644
index 00000000000..811bf31d678
--- /dev/null
+++ b/man/checkers/invalidIterator1.md
@@ -0,0 +1,43 @@
+# invalidIterator1
+
+**Message**: Invalid iterator: aIt<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+An iterator that hasn't been given a value yet (or is no longer valid) is passed to
+`insert()`/`erase()`.
+
+## Motivation
+
+Passing an iterator that doesn't currently point anywhere valid into a container method is undefined
+behaviour, and is easy to miss when the same iterator was previously used (and invalidated) earlier in
+the function.
+
+## How to fix
+
+Before:
+```cpp
+#include <list>
+void f(const std::list<int>& m) {
+    std::list<int>::iterator aIt = m.begin();
+    m.erase(*aIt);
+    m.erase(aIt); // <- invalidIterator1: 'aIt' was already erased by value above
+}
+```
+
+After:
+```cpp
+#include <list>
+void f(std::list<int>& m) {
+    std::list<int>::iterator aIt = m.begin();
+    m.erase(aIt);
+}
+```
+
+## Related checkers
+
+- [eraseDereference.md](eraseDereference.md) - a related mistake where an iterator is dereferenced,
+  rather than passed to `erase()`, after the element it pointed to was already erased.
diff --git a/man/checkers/invalidLengthModifierError.md b/man/checkers/invalidLengthModifierError.md
new file mode 100644
index 00000000000..55c339067e2
--- /dev/null
+++ b/man/checkers/invalidLengthModifierError.md
@@ -0,0 +1,38 @@
+# invalidLengthModifierError
+
+**Message**: 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A length modifier (`h`, `l`, `I64`, ...) appears in the format string with no conversion specifier
+after it, so it doesn't actually modify anything.
+
+## Motivation
+
+A length modifier only means something when it's immediately followed by a conversion specifier like
+`d` or `u` - on its own it's either a leftover from editing the format string, or a sign that a
+specifier letter was accidentally dropped. It also leaves the format string with no valid conversion
+specification at that point, and the C standard says using an invalid conversion specification is
+undefined behaviour - in practice this usually just misreads the argument list, but nothing prevents a
+library from doing something worse with it.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f() {
+    printf("%I", 5); // <- 'I' with no conversion specifier after it
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f() {
+    printf("%Id", (ptrdiff_t)5);
+}
+```
diff --git a/man/checkers/invalidLifetime.md b/man/checkers/invalidLifetime.md
new file mode 100644
index 00000000000..938b531fe70
--- /dev/null
+++ b/man/checkers/invalidLifetime.md
@@ -0,0 +1,48 @@
+# invalidLifetime
+
+**Message**: Using object that is out of scope.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A pointer (or a lambda capturing one) that refers to a variable is used after that variable's scope has
+already ended - for example, it was only set inside an `if` block, and is used after the block closes.
+
+## Motivation
+
+A variable declared inside a nested block stops existing once that block ends, even though the pointer
+that referred to it is still sitting in an outer scope. Using that pointer afterwards is undefined
+behaviour, and it's easy to overlook because the pointer variable itself is still very much "in scope."
+
+## How to fix
+
+Before:
+```cpp
+void f(bool cond) {
+    int* p;
+    if (cond) {
+        int x = 1;
+        p = &x;
+    }
+    *p = 2; // <- invalidLifetime: 'x' is out of scope here on the 'cond' path
+}
+```
+
+After:
+```cpp
+void f(bool cond) {
+    int local = 1;
+    int* p = &local;
+    if (cond) {
+        *p = 1;
+    }
+    *p = 2;
+}
+```
+
+## Related checkers
+
+- [danglingTemporaryLifetime.md](danglingTemporaryLifetime.md) - the same idea, but for a pointer or
+  iterator into a temporary object instead of a named local variable.
diff --git a/man/checkers/invalidPointerCast.md b/man/checkers/invalidPointerCast.md
new file mode 100644
index 00000000000..6da56bf09a9
--- /dev/null
+++ b/man/checkers/invalidPointerCast.md
@@ -0,0 +1,47 @@
+# invalidPointerCast
+
+**Message**: Casting between float * and double * which have an incompatible binary data representation.<br/>
+**Category**: Portability<br/>
+**Severity**: Portability<br/>
+**Language**: C/C++
+
+## Description
+
+A pointer is cast to a pointer of another type whose values aren't laid out the same way in memory (for
+example `float*` to `double*`, or a pointer to a floating-point type cast to/from an integer pointer) -
+reading through the new pointer doesn't reinterpret the same bytes the same way on every platform.
+
+## Motivation
+
+Reinterpreting the bytes of one type as if they were another only makes sense when both types share the
+same binary layout. Floating-point types in particular can have very different sizes and bit layouts
+across platforms, so code that happens to "work" during development can silently misbehave once built
+for a different target.
+
+cppcheck flags the cast itself, based only on the two pointer types involved - it doesn't check whether
+the resulting pointer is ever actually read through (or otherwise used in a way that depends on the
+bytes matching up). Doing so - reading an object through a pointer to an incompatible type - is where
+the undefined behaviour actually is; forming the pointer alone is not.
+
+## How to fix
+
+Before:
+```cpp
+void test() {
+    float *f = new float[10];
+    delete [] (double*)f; // <- float and double aren't stored the same way
+}
+```
+
+After:
+```cpp
+void test() {
+    float *f = new float[10];
+    delete [] f;
+}
+```
+
+## Related checkers
+
+- [intToPointerCast.md](intToPointerCast.md) - a different pointer-cast portability issue, about casting
+  a plain (non-hex) integer literal directly to a pointer.
diff --git a/man/checkers/invalidPrintfArgType_float.md b/man/checkers/invalidPrintfArgType_float.md
new file mode 100644
index 00000000000..939dfc9c987
--- /dev/null
+++ b/man/checkers/invalidPrintfArgType_float.md
@@ -0,0 +1,40 @@
+# invalidPrintfArgType_float
+
+**Message**: %f in format string (no. 1) requires 'double' but the argument type is 'signed int'<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning/Portability<br/>
+**Language**: C/C++
+
+## Description
+
+The argument for a floating-point specifier (`%f`, `%e`, `%g`, ...) isn't a floating-point value.
+
+## Motivation
+
+Because `printf` is variadic, a `float` argument is promoted to `double` and read back out as
+`double` by the corresponding specifier - passing an integer instead means `printf` reads the wrong
+number of bytes and reinterprets them as a floating-point value. That mismatched read is undefined
+behaviour in its own right, not just a meaningless printed number.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f(int x) {
+    printf("%f", x); // <- needs 'double', not 'int'
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f(double x) {
+    printf("%f", x);
+}
+```
+
+## Related checkers
+
+- [invalidPrintfArgType_uint.md](invalidPrintfArgType_uint.md) / [invalidPrintfArgType_sint.md](invalidPrintfArgType_sint.md) - the integer equivalents.
+- [invalidScanfArgType_float.md](invalidScanfArgType_float.md) - the `scanf`-side equivalent.
diff --git a/man/checkers/invalidPrintfArgType_n.md b/man/checkers/invalidPrintfArgType_n.md
new file mode 100644
index 00000000000..c569da99501
--- /dev/null
+++ b/man/checkers/invalidPrintfArgType_n.md
@@ -0,0 +1,40 @@
+# invalidPrintfArgType_n
+
+**Message**: %n in format string (no. 1) requires 'int \*' but the argument type is 'signed int'<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning/Portability<br/>
+**Language**: C/C++
+
+## Description
+
+For a `printf`-family call, a `%n` specifier is given something that clearly isn't a writable pointer at
+all - a plain integer, or a `const`-qualified pointer. It checks for *some* writable pointer, not
+specifically a pointer to `int`, which is what `%n` actually requires.
+
+## Motivation
+
+`%n` writes the number of characters printed so far back through the pointer it's given - if the
+argument isn't actually a pointer, this writes to whatever address that value happens to represent,
+which is undefined behaviour (and is disabled outright by some platforms/libraries as a security risk).
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f(int x) {
+    printf("%n", x); // <- needs an 'int *', not 'int'
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f(int *x) {
+    printf("%n", x);
+}
+```
+
+## Related checkers
+
+- [invalidPrintfArgType_s.md](invalidPrintfArgType_s.md) / [invalidPrintfArgType_p.md](invalidPrintfArgType_p.md) - the same idea for `%s` and `%p`.
diff --git a/man/checkers/invalidPrintfArgType_p.md b/man/checkers/invalidPrintfArgType_p.md
new file mode 100644
index 00000000000..26cdff2ef33
--- /dev/null
+++ b/man/checkers/invalidPrintfArgType_p.md
@@ -0,0 +1,39 @@
+# invalidPrintfArgType_p
+
+**Message**: %p in format string (no. 1) requires an address but the argument type is 'signed int'<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning/Portability<br/>
+**Language**: C/C++
+
+## Description
+
+For a `printf`-family call, a `%p` specifier isn't given a pointer.
+
+## Motivation
+
+`%p` is meant to print the value of a pointer. Passing a non-pointer argument means `printf` reads it as
+if it were a pointer-sized value from the variadic argument list, which is undefined behaviour the
+moment that mismatched read happens - not just a meaningless value, since on some calling conventions it
+also reads the wrong argument size entirely, throwing off every argument read after it.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f(int x) {
+    printf("%p", x); // <- needs an address, not 'int'
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f(void *x) {
+    printf("%p", x);
+}
+```
+
+## Related checkers
+
+- [invalidPrintfArgType_s.md](invalidPrintfArgType_s.md) / [invalidPrintfArgType_n.md](invalidPrintfArgType_n.md) - the same idea for `%s` and `%n`.
diff --git a/man/checkers/invalidPrintfArgType_s.md b/man/checkers/invalidPrintfArgType_s.md
new file mode 100644
index 00000000000..7616098dfe4
--- /dev/null
+++ b/man/checkers/invalidPrintfArgType_s.md
@@ -0,0 +1,39 @@
+# invalidPrintfArgType_s
+
+**Message**: %s in format string (no. 1) requires 'char \*' but the argument type is 'signed int'<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning/Portability<br/>
+**Language**: C/C++
+
+## Description
+
+For a `printf`-family call, a `%s` specifier isn't given a `char*`.
+
+## Motivation
+
+`printf` reads a `%s` argument as a pointer to a null-terminated string - if the argument is actually a
+plain integer (or any other non-pointer value), `printf` dereferences whatever address that value
+happens to represent, which is undefined behaviour.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f(int x) {
+    printf("%s", x); // <- needs a 'char *', not 'int'
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f(const char *x) {
+    printf("%s", x);
+}
+```
+
+## Related checkers
+
+- [invalidScanfArgType_s.md](invalidScanfArgType_s.md) - the `scanf`-side equivalent.
+- [invalidPrintfArgType_n.md](invalidPrintfArgType_n.md) / [invalidPrintfArgType_p.md](invalidPrintfArgType_p.md) - the same idea for `%n` and `%p`.
diff --git a/man/checkers/invalidPrintfArgType_sint.md b/man/checkers/invalidPrintfArgType_sint.md
new file mode 100644
index 00000000000..b36668c81f4
--- /dev/null
+++ b/man/checkers/invalidPrintfArgType_sint.md
@@ -0,0 +1,42 @@
+# invalidPrintfArgType_sint
+
+**Message**: %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning/Portability<br/>
+**Language**: C/C++
+
+## Description
+
+The argument for a signed-integer specifier (`%d`, `%i`) doesn't match that specifier's expected
+type/size (including the `h`/`hh`/`l`/`ll`/`z`/`j`/`t` length modifiers).
+
+## Motivation
+
+`printf` reads its arguments according to the type the format specifier implies, not the type the
+argument actually has - a signedness or size mismatch means the value is read using the wrong number of
+bytes or the wrong interpretation of the sign bit. Reading a variadic argument through a mismatched type
+like this is undefined behaviour in its own right, not just a display quirk - the printed value being
+nonsensical is only the most visible symptom.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f(unsigned int x) {
+    printf("%d", x); // <- needs signed 'int', not 'unsigned int'
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f(int x) {
+    printf("%d", x);
+}
+```
+
+## Related checkers
+
+- [invalidPrintfArgType_uint.md](invalidPrintfArgType_uint.md) - the unsigned-integer equivalent.
+- [invalidPrintfArgType_float.md](invalidPrintfArgType_float.md) - the floating-point equivalent.
diff --git a/man/checkers/invalidPrintfArgType_uint.md b/man/checkers/invalidPrintfArgType_uint.md
new file mode 100644
index 00000000000..72c12476361
--- /dev/null
+++ b/man/checkers/invalidPrintfArgType_uint.md
@@ -0,0 +1,43 @@
+# invalidPrintfArgType_uint
+
+**Message**: %u in format string (no. 1) requires 'unsigned int' but the argument type is 'signed int'<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning/Portability<br/>
+**Language**: C/C++
+
+## Description
+
+The argument for an unsigned-integer specifier (`%u`, `%x`, `%o`, ...) doesn't match that specifier's
+expected type/size (including the `h`/`hh`/`l`/`ll`/`z`/`j`/`t` length modifiers).
+
+## Motivation
+
+`printf` reads its arguments according to the type the format specifier implies, not the type the
+argument actually has - a signedness or size mismatch means the value is read using the wrong number of
+bytes or the wrong interpretation of the sign bit. Reading a variadic argument through a mismatched type
+like this is undefined behaviour in its own right, not just a display quirk - the printed value being
+nonsensical is only the most visible symptom.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f(int x) {
+    printf("%u", x); // <- needs 'unsigned int', not signed 'int'
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f(unsigned int x) {
+    printf("%u", x);
+}
+```
+
+## Related checkers
+
+- [invalidPrintfArgType_sint.md](invalidPrintfArgType_sint.md) - the signed-integer equivalent.
+- [invalidPrintfArgType_float.md](invalidPrintfArgType_float.md) - the floating-point equivalent.
+- [invalidScanfArgType_int.md](invalidScanfArgType_int.md) - the `scanf`-side equivalent.
diff --git a/man/checkers/invalidScanfArgType_float.md b/man/checkers/invalidScanfArgType_float.md
new file mode 100644
index 00000000000..a99f12811eb
--- /dev/null
+++ b/man/checkers/invalidScanfArgType_float.md
@@ -0,0 +1,42 @@
+# invalidScanfArgType_float
+
+**Message**: %f in format string (no. 1) requires 'float \*' but the argument type is 'signed int \*'<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning/Portability<br/>
+**Language**: C/C++
+
+## Description
+
+For a `scanf`-family call, the argument for a floating-point specifier (`%f`, `%e`, `%g`, ...) isn't a
+pointer to the matching floating-point type.
+
+## Motivation
+
+`scanf` writes the parsed floating-point value through the pointer it's given, in the binary
+floating-point representation that pointer's type implies - a mismatched pointer type (for example an
+`int*`) means the write is the wrong size and reinterprets those bytes incorrectly. Writing through a
+pointer typed differently than the object it actually points to is undefined behaviour in its own
+right, not just a corrupted value.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f(int *x) {
+    scanf("%f", x); // <- needs a 'float *', not 'int *'
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f(float *x) {
+    scanf("%f", x);
+}
+```
+
+## Related checkers
+
+- [invalidScanfArgType_s.md](invalidScanfArgType_s.md) / [invalidScanfArgType_int.md](invalidScanfArgType_int.md) - the same idea for string and integer `scanf` conversions.
+- [invalidPrintfArgType_float.md](invalidPrintfArgType_float.md) - the `printf`-side equivalent.
diff --git a/man/checkers/invalidScanfArgType_int.md b/man/checkers/invalidScanfArgType_int.md
new file mode 100644
index 00000000000..ffc22b9db3d
--- /dev/null
+++ b/man/checkers/invalidScanfArgType_int.md
@@ -0,0 +1,42 @@
+# invalidScanfArgType_int
+
+**Message**: %d in format string (no. 1) requires 'int \*' but the argument type is 'float \*'<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning/Portability<br/>
+**Language**: C/C++
+
+## Description
+
+For a `scanf`-family call, the argument for an integer specifier (`%d`, `%u`, `%x`, ...) isn't a
+pointer to the matching integer type (including the `h`/`hh`/`l`/`ll`/`z`/`j`/`t` length modifiers).
+
+## Motivation
+
+`scanf` writes the parsed integer through the pointer it's given, using exactly as many bytes as the
+specifier's type implies - a mismatched pointer type means the write is the wrong size for what it
+actually points to. Writing through a pointer typed differently than the object it actually points to is
+undefined behaviour in its own right, not just a matter of corrupting adjacent memory or only partially
+updating the intended variable.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f(float *x) {
+    scanf("%d", x); // <- needs an 'int *', not 'float *'
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f(int *x) {
+    scanf("%d", x);
+}
+```
+
+## Related checkers
+
+- [invalidScanfArgType_s.md](invalidScanfArgType_s.md) / [invalidScanfArgType_float.md](invalidScanfArgType_float.md) - the same idea for string and floating-point `scanf` conversions.
+- [invalidPrintfArgType_uint.md](invalidPrintfArgType_uint.md) / [invalidPrintfArgType_sint.md](invalidPrintfArgType_sint.md) - the `printf`-side equivalents.
diff --git a/man/checkers/invalidScanfArgType_s.md b/man/checkers/invalidScanfArgType_s.md
new file mode 100644
index 00000000000..be631260712
--- /dev/null
+++ b/man/checkers/invalidScanfArgType_s.md
@@ -0,0 +1,42 @@
+# invalidScanfArgType_s
+
+**Message**: %s in format string (no. 1) requires a 'char \*' but the argument type is 'signed int \*'<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning/Portability<br/>
+**Language**: C/C++
+
+## Description
+
+For a `scanf`-family call, the argument for a `%s`/`%[...]` specifier isn't a pointer to the matching
+type (remember every `scanf` conversion writes through a pointer).
+
+## Motivation
+
+`scanf` writes the characters it reads directly through the pointer it's given - if that pointer
+doesn't actually point to a `char`/`wchar_t` buffer, the write corrupts whatever memory it does point
+to. Writing through a pointer typed differently than the object it actually points to is undefined
+behaviour in its own right, not just a corrupted value.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f(int x) {
+    scanf("%s", &x); // <- needs a 'char *', not 'int *'
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f() {
+    char x[32];
+    scanf("%31s", x);
+}
+```
+
+## Related checkers
+
+- [invalidScanfArgType_int.md](invalidScanfArgType_int.md) / [invalidScanfArgType_float.md](invalidScanfArgType_float.md) - the same idea for numeric `scanf` conversions.
+- [invalidPrintfArgType_s.md](invalidPrintfArgType_s.md) - the `printf`-side equivalent for `%s`.
diff --git a/man/checkers/invalidScanfFormatWidth.md b/man/checkers/invalidScanfFormatWidth.md
new file mode 100644
index 00000000000..8b65103f95a
--- /dev/null
+++ b/man/checkers/invalidScanfFormatWidth.md
@@ -0,0 +1,61 @@
+# invalidScanfFormatWidth and invalidScanfFormatWidth_smaller
+
+**Message**: Width 9 given in format string (no. 1) is larger than destination buffer 'str[8]', use %8c to prevent overflowing it.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C/C++
+
+## Description
+
+- `invalidScanfFormatWidth`: a `%<width>s`/`%<width>c` field width is *larger* than the destination
+  array - `scanf` doesn't stop at the array's bound, only at the field width, so this overflows the
+  buffer.
+- `invalidScanfFormatWidth_smaller`: the field width is *smaller* than the destination array - not a
+  bug, but a hint that the width might have been computed wrong (this variant needs `--inconclusive` to
+  show, since it's just a suspicious-looking number, not a proven mistake).
+
+## Motivation
+
+`scanf` writes up to as many characters as the field width says, regardless of how big the destination
+buffer actually is - if the width is larger than the buffer, the read overflows it as soon as the input
+actually supplies that many characters (given short enough input, it may not overflow on a particular
+run, which is what makes this easy to miss in testing); if the width is smaller than the buffer, it
+just leaves the buffer holding less than expected. Neither mistake is visible from the call site alone.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f() {
+    char str[8];
+    scanf("%9c", str); // <- invalidScanfFormatWidth: 9 > 8, overflows 'str'
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f() {
+    char str[8];
+    scanf("%8c", str);
+}
+```
+
+Before:
+```cpp
+#include <cstdio>
+void f() {
+    char str[10];
+    scanf("%5s", str); // <- invalidScanfFormatWidth_smaller: 5 is well under 10, worth double-checking
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f() {
+    char str[10];
+    scanf("%9s", str);
+}
+```
diff --git a/man/checkers/invalidTestForOverflow.md b/man/checkers/invalidTestForOverflow.md
new file mode 100644
index 00000000000..769d417d2ba
--- /dev/null
+++ b/man/checkers/invalidTestForOverflow.md
@@ -0,0 +1,40 @@
+# invalidTestForOverflow
+
+**Message**: Invalid test for overflow 'x+100&lt;x'; signed integer overflow is undefined behavior.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A classic overflow check (`x + c < x`) that is itself undefined behaviour for signed integers and
+pointers - optimizing compilers are allowed to, and do, remove such checks.
+
+## Motivation
+
+Signed integer overflow is undefined behaviour in C/C++, so a compiler is allowed to assume it never
+happens - which means it can optimize away a check whose only purpose is to detect that overflow just
+occurred. Code that relies on this pattern can pass in a debug build and silently stop working once
+optimizations are turned on.
+
+## How to fix
+
+Before:
+```cpp
+void f(int x) {
+    if (x + 100 < x) {} // <- relies on signed overflow, which is UB
+}
+```
+
+After:
+```cpp
+#include <limits>
+void f(int x) {
+    if (x > std::numeric_limits<int>::max() - 100) {}
+}
+```
+
+## Related checkers
+
+- [pointerAdditionResultNotNull.md](pointerAdditionResultNotNull.md) - a related undefined-behaviour
+  trap, relying on pointer overflow instead of signed integer overflow.
diff --git a/man/checkers/invalidscanf.md b/man/checkers/invalidscanf.md
new file mode 100644
index 00000000000..e1a832509b1
--- /dev/null
+++ b/man/checkers/invalidscanf.md
@@ -0,0 +1,37 @@
+# invalidscanf
+
+**Message**: scanf() without field width limits can crash with huge input data.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A `scanf`-family call reads a string (`%s`, or a character set `%[...]`) with no maximum field width -
+given long enough input, this overflows the destination buffer.
+
+## Motivation
+
+Without a field width, `scanf("%s", buf)` (and its relatives) will write as much input as it's given,
+with no regard for the size of `buf` - a classic, easily-exploitable buffer overflow driven entirely by
+the input data.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f() {
+    char c[5];
+    scanf("%s", c); // <- no width limit, can overflow 'c'
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f() {
+    char c[5];
+    scanf("%4s", c);
+}
+```
diff --git a/man/checkers/iterateByValue.md b/man/checkers/iterateByValue.md
new file mode 100644
index 00000000000..ac8881d6704
--- /dev/null
+++ b/man/checkers/iterateByValue.md
@@ -0,0 +1,47 @@
+# iterateByValue
+
+**Message**: Variable 'x' is used to iterate by value. It could be declared as a const reference which is usually faster and recommended in C++.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Performance<br/>
+**Language**: C++
+
+## Description
+
+A range-based `for` loop's variable (`for (auto x : container)`) copies each element - copying is
+wasteful when a `const` reference would do.
+
+## Motivation
+
+Copying every element of a container just to read it wastes time and memory proportional to the
+element's size and the container's length, for no benefit over a `const` reference.
+
+## How to fix
+
+Before:
+```cpp
+#include <set>
+#include <string>
+void f() {
+    const std::set<std::string> ss = { "a", "b", "c" };
+    for (auto s : ss) // <- each string is copied
+        (void)s.size();
+}
+```
+
+After:
+```cpp
+#include <set>
+#include <string>
+void f() {
+    const std::set<std::string> ss = { "a", "b", "c" };
+    for (const auto& s : ss)
+        (void)s.size();
+}
+```
+
+## Related checkers
+
+- [passedByValue.md](passedByValue.md) - the same idea, for a function parameter instead of a loop
+  variable.
+- [iterateByValueCallback.md](iterateByValueCallback.md) - the same idea, when the loop is inside a
+  callback function.
diff --git a/man/checkers/iterateByValueCallback.md b/man/checkers/iterateByValueCallback.md
new file mode 100644
index 00000000000..66584610c45
--- /dev/null
+++ b/man/checkers/iterateByValueCallback.md
@@ -0,0 +1,28 @@
+# iterateByValueCallback
+
+**Message**: Variable 'x' is used to iterate by value. It could be declared as a const reference which is usually faster and recommended in C++. However it seems that 'f' is a callback function.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Performance<br/>
+**Language**: C++
+
+## Description
+
+Same idea as [iterateByValue.md](iterateByValue.md): a range-based `for` loop copies each element
+needlessly. This variant is for when the loop is inside a function used as a callback.
+
+## Motivation
+
+Copying every element of a container just to read it wastes time and memory proportional to the
+element's size and the container's length, for no benefit over a `const` reference.
+
+## How to fix
+
+Declare the loop variable as a `const` reference instead of copying each element, the same as for
+[iterateByValue.md](iterateByValue.md).
+
+## Related checkers
+
+- [iterateByValue.md](iterateByValue.md) - the same idea, for a loop that isn't inside a callback
+  function.
+- [passedByValueCallback.md](passedByValueCallback.md) - the same idea, for a callback's parameter
+  instead of a loop variable.
diff --git a/man/checkers/iterators1.md b/man/checkers/iterators1.md
new file mode 100644
index 00000000000..397b34f794f
--- /dev/null
+++ b/man/checkers/iterators1.md
@@ -0,0 +1,48 @@
+# iterators1
+
+**Message**: Same iterator is used with different containers 'l1' and 'l2'.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+An iterator that belongs to one container is passed to an `insert()`/`erase()`-style method of a
+different container.
+
+## Motivation
+
+An iterator only makes sense in the context of the container it came from. Passing it to a different
+container's method is meaningless and undefined behaviour - almost always a copy-paste mistake where
+the wrong container variable was used.
+
+## How to fix
+
+Before:
+```cpp
+#include <list>
+void foo() {
+    std::list<int> l1;
+    std::list<int> l2;
+    std::list<int>::iterator it = l1.begin();
+    l2.insert(it, 0); // <- iterators1: 'it' belongs to l1, not l2
+}
+```
+
+After:
+```cpp
+#include <list>
+void foo() {
+    std::list<int> l1;
+    std::list<int>::iterator it = l1.begin();
+    l1.insert(it, 0);
+}
+```
+
+## Related checkers
+
+- [mismatchingContainerIterator.md](mismatchingContainerIterator.md) - the same code shape is also
+  caught by this related, differently-worded check; both messages can appear together on the same
+  line.
+- [mismatchingContainers.md](mismatchingContainers.md) - the equivalent mistake when the mismatched
+  iterators are compared (`!=`/`==`) rather than passed to a container method.
diff --git a/man/checkers/iterators3.md b/man/checkers/iterators3.md
new file mode 100644
index 00000000000..d37a7b9cdcc
--- /dev/null
+++ b/man/checkers/iterators3.md
@@ -0,0 +1,46 @@
+# iterators3
+
+**Message**: Same iterator is used with containers 'l1' that are temporaries or defined in different scopes.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+An iterator is compared against, or used with, a container of the same name that's actually a
+different variable - a temporary, or one declared in a different, unrelated scope that happens to
+shadow the container the iterator really belongs to.
+
+## Motivation
+
+Two variables sharing a name in different scopes are still two entirely different objects. An iterator
+taken from one of them has no valid relationship to the other, even though the code reads as if it does
+because the name is identical - comparing or using it against the wrong one is undefined behaviour.
+
+## How to fix
+
+Before:
+```cpp
+#include <vector>
+std::vector<int> f();
+bool foo() {
+    return f().begin() != f().end(); // <- iterators3: each call to f() returns a different temporary
+}
+```
+
+After: call the function once and compare against the same instance.
+```cpp
+#include <vector>
+std::vector<int> f();
+bool foo() {
+    std::vector<int> v = f();
+    return v.begin() != v.end();
+}
+```
+
+## Related checkers
+
+- [iterators1.md](iterators1.md) - the same idea, but for two containers that are genuinely
+  different variables (not just same-named ones in different scopes).
+- [mismatchingContainerIterator.md](mismatchingContainerIterator.md) - the same idea, for passing the
+  iterator into another container's method instead of comparing it.
diff --git a/man/checkers/knownArgument.md b/man/checkers/knownArgument.md
new file mode 100644
index 00000000000..23eca5dbdfe
--- /dev/null
+++ b/man/checkers/knownArgument.md
@@ -0,0 +1,56 @@
+# knownArgument and knownArgumentHiddenVariableExpression
+
+**Message**: Argument 'x-x' to function 'func' is always 0. It does not matter what value 'x' has.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+- `knownArgument`: a function/constructor argument is an expression whose value cppcheck can already
+  compute at compile time, regardless of what a variable inside it holds - so passing that variable in
+  was pointless.
+- `knownArgumentHiddenVariableExpression`: same idea, but specifically when a constant part of the
+  expression (`&& false`, `* 0`, `|| true`) completely masks a variable that looks like it should have
+  mattered - a common sign of a stray/leftover condition.
+
+## Motivation
+
+When an argument's value doesn't actually depend on a variable that's visibly part of its expression,
+that's either dead code (the variable can be removed) or a sign the expression doesn't do what its
+author expected - especially in the "hidden variable" case, where a constant operator silently cancels
+out something that looks meaningful.
+
+## How to fix
+
+Before:
+```cpp
+void g(int);
+void f(int x) {
+   g((x & 0x01) >> 7); // <- always 0, no matter what 'x' is
+}
+```
+
+After:
+```cpp
+void g(int);
+void f(int x) {
+   g(x >> 7);
+}
+```
+
+Before:
+```cpp
+void dostuff(int);
+void f(int x) {
+    dostuff(x * 0); // <- 'x' never actually matters here
+}
+```
+
+After:
+```cpp
+void dostuff(int);
+void f(int x) {
+    dostuff(x);
+}
+```
diff --git a/man/checkers/knownConditionTrueFalse.md b/man/checkers/knownConditionTrueFalse.md
new file mode 100644
index 00000000000..51b652c7b90
--- /dev/null
+++ b/man/checkers/knownConditionTrueFalse.md
@@ -0,0 +1,72 @@
+# knownConditionTrueFalse
+
+**Message**: Condition 'x==5' is always true<br/>
+**Category**: Code cleanup<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A condition is always true or always false.
+
+Note: a warning is not written for obvious cases like `if (false)`.
+
+If a condition is always true then technically the condition is redundant. It
+can be removed so that the conditional code will be unconditionally executed.
+This reduces complexity.
+
+If a condition is always false then the conditional code is unreachable and can
+be removed.
+
+It is however also possible that the intended check never actually happens and
+a real bug (a wrong comparison, a typo'd variable, a value that was supposed to
+vary but doesn't) slips through unnoticed.
+
+## Motivation
+
+The condition may be invariant (always true or always false) by mistake,
+otherwise it is possible to cleanup redundant code to reduce complexity.
+
+## How to fix
+
+Before (condition is always true):
+```cpp
+void f() {
+    int x = 5;
+    if (x == 5) { // <- always true
+      dostuff();
+    }
+}
+```
+
+After: The condition is technically redundant, this code is logically the same.
+```cpp
+void f() {
+    dostuff();
+}
+```
+
+Before (condition is always false):
+```cpp
+void f() {
+    int x = 5;
+    if (x < 3) {  // <- always false
+      dostuff();
+    }
+}
+```
+
+After: The conditional code is unreachable, this code is logically the same.
+```cpp
+void f() {
+}
+```
+
+## Related checkers
+
+- [assignIfError.md](assignIfError.md) - the same idea, specifically for a value just narrowed down by
+  a bitmask assignment.
+- [moduloAlwaysTrueFalse.md](moduloAlwaysTrueFalse.md), [compareValueOutOfTypeRangeError.md](compareValueOutOfTypeRangeError.md) -
+  the same idea, for a `%` result or a type's value range instead of a general known value.
+- [duplicateConditionalAssign.md](duplicateConditionalAssign.md) - a related, narrower case: an
+  assignment that repeats a value a condition already guarantees.
diff --git a/man/checkers/knownEmptyContainer.md b/man/checkers/knownEmptyContainer.md
new file mode 100644
index 00000000000..4e2d20c952a
--- /dev/null
+++ b/man/checkers/knownEmptyContainer.md
@@ -0,0 +1,35 @@
+# knownEmptyContainer
+
+**Message**: Iterating over container 'v' that is always empty.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A container or iterator that cppcheck knows is always empty is iterated over or otherwise used as if
+it might contain elements.
+
+## Motivation
+
+Code that iterates over a container cppcheck can prove is empty at that point is dead code - the loop
+body never runs, which is usually not what the author intended.
+
+## How to fix
+
+Before:
+```cpp
+#include <vector>
+void f() {
+    std::vector<int> v;
+    for (auto x : v) {} // <- knownEmptyContainer: 'v' is provably empty here
+}
+```
+
+After:
+```cpp
+#include <vector>
+void f(std::vector<int> v) {
+    for (auto x : v) {}
+}
+```
diff --git a/man/checkers/knownPointerToBool.md b/man/checkers/knownPointerToBool.md
new file mode 100644
index 00000000000..9e5cb7f68df
--- /dev/null
+++ b/man/checkers/knownPointerToBool.md
@@ -0,0 +1,37 @@
+# knownPointerToBool
+
+**Message**: Pointer expression 'p' converted to bool is always true.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A pointer already known to be non-null (its address was just taken, or it was just checked) is
+converted to `bool` - the result can only ever be `true`.
+
+## Motivation
+
+Converting a pointer that's already known to be non-null to `bool` doesn't test anything - it always
+evaluates to `true`, so the code reads as if it's checking something that it isn't.
+
+## How to fix
+
+Before:
+```cpp
+void g(bool);
+void f() {
+    int i = 5;
+    int* p = &i;
+    g(p); // <- 'p' can't be null here, so this is always true
+}
+```
+
+After:
+```cpp
+void g(bool);
+void f(int* p) {
+    g(p);
+}
+```
+
diff --git a/man/checkers/leakNoVarFunctionCall.md b/man/checkers/leakNoVarFunctionCall.md
new file mode 100644
index 00000000000..0753e19a0d0
--- /dev/null
+++ b/man/checkers/leakNoVarFunctionCall.md
@@ -0,0 +1,44 @@
+# leakNoVarFunctionCall
+
+**Message**: Allocation with malloc, strcpy doesn't release it.<br/>
+**Category**: Correctness<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+The result of an allocating call is passed directly into another function that is not known to store,
+free, or otherwise take ownership of it (`strcpy(dst, strdup(src))`) - once that outer call returns,
+nothing holds onto the allocated memory.
+
+## Motivation
+
+Passing an allocation straight into another call without ever storing it in a variable only works if
+that outer call takes ownership (stores or frees the pointer itself). Most functions - like `strcpy()`,
+which only reads through the pointer it's given - don't; once the statement finishes, the allocated
+memory is unreachable and leaked. This is mainly reliable for calls to well-known library functions;
+cppcheck does not reliably work out ownership for a user-defined function, even one whose body is
+visible and plainly doesn't take ownership, so it stays quiet there rather than guess.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    strcpy(a, strdup(p)); // <- strcpy() doesn't free its 2nd argument
+}
+```
+
+After:
+```cpp
+void f() {
+    char* tmp = strdup(p);
+    strcpy(a, tmp);
+    free(tmp);
+}
+```
+
+## Related checkers
+
+- [leakReturnValNotUsed.md](leakReturnValNotUsed.md) - the simpler case where the allocation's result
+  isn't passed anywhere at all, just discarded.
diff --git a/man/checkers/leakReturnValNotUsed.md b/man/checkers/leakReturnValNotUsed.md
new file mode 100644
index 00000000000..246d8656934
--- /dev/null
+++ b/man/checkers/leakReturnValNotUsed.md
@@ -0,0 +1,40 @@
+# leakReturnValNotUsed
+
+**Message**: Return value of allocation function 'malloc' is not stored.<br/>
+**Category**: Correctness<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+The result of an allocating call (`malloc(10);`, `new Foo;`) is discarded immediately - there was never
+anywhere to store it, so it's an instant, guaranteed leak.
+
+## Motivation
+
+An allocating call's whole purpose is to hand back a pointer to the new memory/object - discarding that
+return value immediately means the memory is allocated and then instantly unreachable, with no way for
+anything to ever free it. Unlike most leaks, which depend on some later code path forgetting to free
+something, this one is a leak the moment the line runs.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    malloc(10); // <- return value discarded
+}
+```
+
+After:
+```cpp
+void f() {
+    char* p = (char*)malloc(10);
+    free(p);
+}
+```
+
+## Related checkers
+
+- [memleak.md](memleak.md) - the more general "allocated but never freed" check, for allocations that
+  are stored somewhere but still never freed.
diff --git a/man/checkers/leakUnsafeArgAlloc.md b/man/checkers/leakUnsafeArgAlloc.md
new file mode 100644
index 00000000000..fd3f9ba2049
--- /dev/null
+++ b/man/checkers/leakUnsafeArgAlloc.md
@@ -0,0 +1,42 @@
+# leakUnsafeArgAlloc
+
+**Message**: Unsafe allocation. If shared_ptr() throws, memory could be leaked. Use make_shared<T>() instead.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning (inconclusive)<br/>
+**Language**: C++
+
+## Description
+
+A call constructs a `shared_ptr`/`unique_ptr` around a `new` expression as one argument, while another
+argument is a function call that might throw - if that other call throws before the smart pointer is
+constructed, the raw `new` can leak (a classic pre-C++17 evaluation-order hazard). This is only reported
+with `--inconclusive`, since cppcheck can't tell whether the other argument can actually throw.
+
+## Motivation
+
+Before C++17, the order in which a function call's arguments (and the work needed to construct them)
+run relative to each other was unspecified. If `new int(42)` runs, and then the *other* argument's
+function call throws before `shared_ptr<int>(...)` gets to wrap it, the raw pointer from `new` is never
+adopted by anything and leaks when the exception propagates. `make_shared`/`make_unique` avoid the
+hazard entirely, since there's no separate raw pointer that can be orphaned this way.
+
+## How to fix
+
+Before:
+```cpp
+void g();
+void f(shared_ptr<int> p, int x);
+void x() {
+    f(shared_ptr<int>(new int(42)), g()); // <- leaks if g() throws
+}
+```
+
+After:
+```cpp
+void g();
+void f(shared_ptr<int> p, int x);
+void x() {
+    f(make_shared<int>(42), g());
+}
+```
+
diff --git a/man/checkers/literalWithCharPtrCompare.md b/man/checkers/literalWithCharPtrCompare.md
new file mode 100644
index 00000000000..ff7e724b518
--- /dev/null
+++ b/man/checkers/literalWithCharPtrCompare.md
@@ -0,0 +1,39 @@
+# literalWithCharPtrCompare and charLiteralWithCharPtrCompare
+
+**Message**: String literal compared with variable 'c'. Did you intend to use strcmp() instead?<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A `char*`/`wchar_t*` variable is compared directly against a string or character literal with `==`/`!=`
+- this compares the pointer itself (its address), not the string's contents.
+
+## Motivation
+
+`c == "x"` compiles fine in C/C++ but almost never does what it looks like: it asks whether `c` happens
+to point at the exact same memory as the literal `"x"`, not whether the characters match. This is one of
+the most common C/C++ beginner mistakes, and the compiler gives no warning of its own.
+
+## How to fix
+
+Before:
+```cpp
+bool foo(char* c) {
+    return c == "x"; // <- compares addresses, not contents
+}
+```
+
+After:
+```cpp
+#include <cstring>
+bool foo(char* c) {
+    return strcmp(c, "x") == 0;
+}
+```
+
+## Related checkers
+
+- [staticStringCompare.md](staticStringCompare.md) - a related string-comparison mistake: comparing two
+  string literals (or two identical variables) with a string-comparison function.
diff --git a/man/checkers/localMutex.md b/man/checkers/localMutex.md
new file mode 100644
index 00000000000..e7b50cc0092
--- /dev/null
+++ b/man/checkers/localMutex.md
@@ -0,0 +1,44 @@
+# localMutex
+
+**Message**: The lock is ineffective because the mutex is locked at the same scope as the mutex itself.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+A `std::mutex` and the `lock_guard`/`.lock()` call that locks it are declared in the very same scope -
+the mutex is a fresh, unshared object every time that scope is entered, so nothing else can ever be
+contending for it and the lock has no effect.
+
+## Motivation
+
+A mutex only protects shared data if the same mutex instance is reachable from every place that might
+access that data concurrently. A mutex that's a local variable, locked in the same function it's
+declared in, is a brand-new object on every call - no other thread (or even another call to the same
+function) can ever see or contend for that exact instance, so the "protection" is illusory.
+
+## How to fix
+
+Before:
+```cpp
+#include <mutex>
+void f() {
+    std::mutex m;
+    std::lock_guard<std::mutex> g(m); // <- 'm' is a fresh, private mutex every call
+}
+```
+
+After:
+```cpp
+#include <mutex>
+std::mutex m;
+void f() {
+    std::lock_guard<std::mutex> g(m);
+}
+```
+
+## Related checkers
+
+- [globalLockGuard.md](globalLockGuard.md) - the opposite mistake: a lock guard given static/global
+  storage, so it never releases the lock.
diff --git a/man/checkers/mallocOnClassError.md b/man/checkers/mallocOnClassError.md
new file mode 100644
index 00000000000..cc3cb0e0a5c
--- /dev/null
+++ b/man/checkers/mallocOnClassError.md
@@ -0,0 +1,62 @@
+# mallocOnClassError and mallocOnClassWarning
+
+**Message**: Memory for class instance allocated with malloc(), but class contains a virtual function.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C++
+
+## Description
+
+A C++ class/struct instance is allocated with `malloc()`/`calloc()`/`realloc()` instead of `new` - the
+constructor never runs.
+
+- `mallocOnClassError`: the class clearly needs its constructor to run (it has a virtual function, so
+  its vtable pointer is never set up, or a non-trivial member type that itself needs construction).
+- `mallocOnClassWarning`: a constructor exists but the class might still happen to work out by luck
+  (for example if the constructor only sets members to values that also happen to match zeroed memory).
+
+## Motivation
+
+`malloc()` only allocates raw memory - it never calls a C++ constructor, so no object of that class type
+actually exists in that memory yet. The `malloc()` call itself doesn't crash or misbehave; the risk is
+in what happens next - calling any member function through the pointer (especially a virtual one, which
+reads a vtable pointer that was never set up), or letting a destructor run on it, is undefined behaviour,
+because the standard's rules for using an object of a type only apply once that object's lifetime has
+actually begun via a constructor call.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdlib>
+struct C { virtual void bar(); };
+void foo(C*& p) {
+    p = malloc(sizeof(C)); // <- mallocOnClassError: no constructor/vtable set up
+}
+```
+
+After:
+```cpp
+struct C { virtual void bar(); };
+void foo(C*& p) {
+    p = new C();
+}
+```
+
+Before:
+```cpp
+#include <cstdlib>
+class C { public: C() {} };
+void foo(C*& p) {
+    p = malloc(sizeof(C)); // <- mallocOnClassWarning: C()'s body never runs
+}
+```
+
+After:
+```cpp
+class C { public: C() {} };
+void foo(C*& p) {
+    p = new C();
+}
+```
+
diff --git a/man/checkers/memleak.md b/man/checkers/memleak.md
new file mode 100644
index 00000000000..2fde8a78d43
--- /dev/null
+++ b/man/checkers/memleak.md
@@ -0,0 +1,62 @@
+# memleak and resourceLeak
+
+**Message**: Memory leak: p<br/>
+**Category**: Correctness<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A locally-allocated variable is allocated (`malloc`/`new`/`fopen`/and other functions described the
+same way in the library configuration), but no path frees/releases it before it goes out of scope, is
+reassigned, or the function returns.
+
+- `memleak`: the allocation is memory (`malloc`, `new`, ...).
+- `resourceLeak`: the allocation is some other kind of resource (a file handle from `fopen`, ...).
+
+## Motivation
+
+A memory or resource leak wastes memory/handles until the process exits, which can degrade or crash
+long-running programs. This is easy for a human reviewer to miss, especially across multiple `if`/`else`
+branches, but mechanical enough for cppcheck to track precisely in straightforward code. cppcheck only
+tracks an allocation through straight-line code: once a loop or `goto` appears anywhere in the function,
+it stops checking that function entirely rather than risk a wrong guess, so its silence on a function
+with a loop in it isn't proof the code has no leak.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    char *p = malloc(10); // <- memleak: never freed
+}
+```
+
+After:
+```cpp
+void f() {
+    char *p = malloc(10);
+    free(p);
+}
+```
+
+## False positives to be aware of
+
+- **A false positive is possible when a variable is freed only through a reference alias to it.** The
+  checker doesn't always recognize that freeing the alias also frees the original variable, and can
+  report a leak that doesn't actually exist:
+  ```cpp
+  void f() {
+      char *p;
+      char *&ref = p;
+      p = malloc(10);
+      free(ref); // frees 'p', but is reported as "Memory leak: p" anyway
+  }
+  ```
+
+## Related checkers
+
+- [mismatchAllocDealloc.md](mismatchAllocDealloc.md) - for when the allocation *is* freed, but with the
+  wrong deallocation function.
+- [doubleFree.md](doubleFree.md) / [deallocuse.md](deallocuse.md) / [deallocret.md](deallocret.md) - the
+  related mistakes of freeing something twice, or using it afterwards, once it has been freed.
diff --git a/man/checkers/memleakOnRealloc.md b/man/checkers/memleakOnRealloc.md
new file mode 100644
index 00000000000..ba99fab784f
--- /dev/null
+++ b/man/checkers/memleakOnRealloc.md
@@ -0,0 +1,45 @@
+# memleakOnRealloc
+
+**Message**: Common realloc mistake: 'a' nulled but not freed upon failure<br/>
+**Category**: Correctness<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+The classic `p = realloc(p, newSize);` mistake - if `realloc()` fails, it returns `NULL` without
+freeing the original block, but this code has just overwritten `p` with that `NULL`, losing the only
+pointer to the original (still allocated) memory.
+
+## Motivation
+
+`realloc()` only frees the original block on success; on failure the original block is untouched and
+still needs freeing, but the return value is `NULL`. Assigning the return value straight back onto the
+only variable that pointed to the original block throws that pointer away too, permanently leaking the
+original allocation whenever `realloc()` fails.
+
+## How to fix
+
+Before:
+```cpp
+void foo() {
+    char *a = (char *)malloc(10);
+    a = (char *)realloc(a, 100); // <- original block lost if this fails
+    free(a);
+}
+```
+
+After:
+```cpp
+void foo() {
+    char *a = (char *)malloc(10);
+    char *tmp = (char *)realloc(a, 100);
+    if (tmp)
+        a = tmp;
+    free(a);
+}
+```
+
+## Related checkers
+
+- [memleak.md](memleak.md) - the more general "allocated but never freed" check this one complements.
diff --git a/man/checkers/memsetClass.md b/man/checkers/memsetClass.md
new file mode 100644
index 00000000000..a41159d00e6
--- /dev/null
+++ b/man/checkers/memsetClass.md
@@ -0,0 +1,53 @@
+# memsetClass
+
+**Message**: Using 'memset' on class that contains a 'std::string'.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+`memset()`/`memcpy()`/`memmove()` is used on an object of a type that isn't POD (for example it
+contains a `std::string`) - the constructor, destructor, and copy semantics that type relies on are all
+bypassed.
+
+## Motivation
+
+Raw memory functions like `memset()` don't know anything about C++ object semantics - they just
+overwrite bytes. Using one on an object that has its own constructor/destructor/internal invariants
+(like `std::string`'s internal pointer/length bookkeeping) corrupts that object instead of resetting it.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstring>
+#include <string>
+class Fred {
+public:
+    std::string b;
+};
+void f() {
+    Fred fred;
+    memset(&fred, 0, sizeof(Fred)); // <- memsetClass: bypasses std::string's own management
+}
+```
+
+After:
+```cpp
+#include <string>
+class Fred {
+public:
+    std::string b;
+};
+void f() {
+    Fred fred;
+}
+```
+
+## Related checkers
+
+- [memsetClassFloat.md](memsetClassFloat.md) - the same underlying mistake, specifically for a type
+  containing a `float`/`double` member.
+- [memsetClassReference.md](memsetClassReference.md) - the same underlying mistake, specifically for a
+  type containing a reference member.
diff --git a/man/checkers/memsetClassFloat.md b/man/checkers/memsetClassFloat.md
new file mode 100644
index 00000000000..2fb1c7b8e08
--- /dev/null
+++ b/man/checkers/memsetClassFloat.md
@@ -0,0 +1,54 @@
+# memsetClassFloat
+
+**Message**: Using 'memset' on struct which contains a floating point number.<br/>
+**Category**: Portability<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+`memset()`/`memcpy()`/`memmove()` is used on a type containing a `float`/`double` member - whether an
+all-zero-bytes pattern actually means `0.0` on the target platform isn't something the C++ standard
+guarantees.
+
+## Motivation
+
+Zeroing a struct's bytes to reset a floating-point member to `0.0` relies on the platform's
+floating-point representation matching all-zero-bytes with the value zero. This is true in practice on
+essentially all mainstream hardware (IEEE 754), but it's not guaranteed by the language, so it's a
+portability risk rather than a certainty.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstring>
+typedef float realnum;
+struct multilevel_data {
+  realnum *GammaInv;
+  realnum data[1];
+};
+void f() {
+  multilevel_data d;
+  memset(&d, 0, sizeof(multilevel_data)); // <- memsetClassFloat
+}
+```
+
+After:
+```cpp
+typedef float realnum;
+struct multilevel_data {
+  realnum *GammaInv;
+  realnum data[1];
+};
+void f() {
+  multilevel_data d = {};
+}
+```
+
+## Related checkers
+
+- [memsetClass.md](memsetClass.md) - the same underlying mistake, specifically for a type that isn't
+  POD at all (for example it contains a `std::string`).
+- [memsetClassReference.md](memsetClassReference.md) - the same underlying mistake, specifically for a
+  type containing a reference member.
diff --git a/man/checkers/memsetClassReference.md b/man/checkers/memsetClassReference.md
new file mode 100644
index 00000000000..e9514686462
--- /dev/null
+++ b/man/checkers/memsetClassReference.md
@@ -0,0 +1,54 @@
+# memsetClassReference
+
+**Message**: Using 'memset' on class that contains a reference.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+`memset()`/`memcpy()`/`memmove()` is used on a type containing a reference member - a reference can't
+be reseated after it's bound, so overwriting its bytes doesn't do what an assignment would.
+
+## Motivation
+
+A reference member is bound once, at construction, and can never be made to refer to something else.
+Overwriting its bytes with `memset()` doesn't rebind it - it corrupts whatever internal representation
+the compiler uses for references, which is undefined behaviour.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstring>
+#include <string>
+class A {
+public:
+  std::string &s;
+  A(std::string &str) : s(str) {}
+};
+void f(std::string &str) {
+  A a(str);
+  memset(&a, 0, sizeof(a)); // <- memsetClassReference: can't overwrite a bound reference like this
+}
+```
+
+After:
+```cpp
+#include <string>
+class A {
+public:
+  std::string &s;
+  A(std::string &str) : s(str) {}
+};
+void f(std::string &str) {
+  A a(str);
+}
+```
+
+## Related checkers
+
+- [memsetClass.md](memsetClass.md) - the same underlying mistake, specifically for a type that isn't
+  POD at all (for example it contains a `std::string`).
+- [memsetClassFloat.md](memsetClassFloat.md) - the same underlying mistake, specifically for a type
+  containing a `float`/`double` member.
diff --git a/man/checkers/memsetFloat.md b/man/checkers/memsetFloat.md
new file mode 100644
index 00000000000..4433bcb7195
--- /dev/null
+++ b/man/checkers/memsetFloat.md
@@ -0,0 +1,58 @@
+# memsetFloat and memsetValueOutOfRange
+
+**Message**: The 2nd memset() argument 'x' is a float, its representation is implementation defined.<br/>
+**Category**: Correctness<br/>
+**Severity**: Portability/Warning<br/>
+**Language**: C/C++
+
+## Description
+
+`memset()`'s fill value (2nd argument):
+
+- `memsetFloat`: is a `float`, whose byte representation is implementation-defined - the actual bytes
+  written will vary across platforms.
+- `memsetValueOutOfRange`: is a literal integer that doesn't fit in an `unsigned char` - `memset()`
+  only ever writes the `unsigned char` conversion of this value, so anything outside `0..255` (or the
+  platform's signed-char range) doesn't mean what it looks like.
+
+## Motivation
+
+`memset()` fills memory byte-by-byte using the value converted to `unsigned char`. A `float` argument
+has no portable byte-for-byte meaning in that context, and an integer literal outside a single byte's
+range is silently truncated - both make the call's actual effect different from what the source code
+suggests.
+
+## How to fix
+
+Before:
+```cpp
+void f(void* p, size_t n) {
+    memset(p, 1.0f, n); // <- float, implementation-defined byte pattern
+}
+```
+
+After:
+```cpp
+void f(void* p, size_t n) {
+    memset(p, 0, n);
+}
+```
+
+Before:
+```cpp
+void f(void* p, size_t n) {
+    memset(p, 300, n); // <- 300 doesn't fit in an unsigned char
+}
+```
+
+After:
+```cpp
+void f(void* p, size_t n) {
+    memset(p, 0xff, n);
+}
+```
+
+## Related checkers
+
+- [memsetZeroBytes.md](memsetZeroBytes.md) - a different `memset()` misuse, about the length (3rd)
+  argument being zero rather than the fill value.
diff --git a/man/checkers/memsetZeroBytes.md b/man/checkers/memsetZeroBytes.md
new file mode 100644
index 00000000000..d6ecb11d80e
--- /dev/null
+++ b/man/checkers/memsetZeroBytes.md
@@ -0,0 +1,37 @@
+# memsetZeroBytes
+
+**Message**: memset() called to fill 0 bytes.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+`memset(ptr, value, 0)` - the 2nd and 3rd arguments look swapped, since filling 0 bytes has no effect.
+
+## Motivation
+
+`memset()`'s signature is `memset(void *ptr, int value, size_t num)` - a literal `0` as the last
+argument means the call does nothing at all, which is almost always a sign the fill value and the
+length were written in the wrong order.
+
+## How to fix
+
+Before:
+```cpp
+void f(void* p) {
+    memset(p, sizeof(p), 0); // <- value and length look swapped
+}
+```
+
+After:
+```cpp
+void f(void* p, size_t n) {
+    memset(p, 0, n);
+}
+```
+
+## Related checkers
+
+- [memsetFloat.md](memsetFloat.md) - other `memset()` misuses about the fill-value (2nd) argument
+  rather than the length.
diff --git a/man/checkers/mismatchAllocDealloc.md b/man/checkers/mismatchAllocDealloc.md
new file mode 100644
index 00000000000..4119fa1963e
--- /dev/null
+++ b/man/checkers/mismatchAllocDealloc.md
@@ -0,0 +1,40 @@
+# mismatchAllocDealloc
+
+**Message**: Mismatching allocation and deallocation: f<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A locally-allocated variable is freed with a function that doesn't match how it was allocated (for
+example `new[]` freed with `delete`, or `fopen` freed with `free`).
+
+## Motivation
+
+Freeing something with the wrong function is undefined behaviour: `new[]`/`delete` mismatches can
+corrupt the heap, and freeing a `FILE*` with `free()` instead of `fclose()` skips flushing/closing the
+underlying file descriptor. This is easy for a human reviewer to miss, but mechanical enough for
+cppcheck to track precisely in straightforward code.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    FILE *f = fopen(fname, mode);
+    free(f); // <- mismatchAllocDealloc: fopen() must be matched with fclose()
+}
+```
+
+After:
+```cpp
+void f() {
+    FILE *f = fopen(fname, mode);
+    fclose(f);
+}
+```
+
+## Related checkers
+
+- [memleak.md](memleak.md) - for the related, simpler case of an allocation that is never freed at all.
diff --git a/man/checkers/mismatchingBitAnd.md b/man/checkers/mismatchingBitAnd.md
new file mode 100644
index 00000000000..61cf0f780c7
--- /dev/null
+++ b/man/checkers/mismatchingBitAnd.md
@@ -0,0 +1,43 @@
+# mismatchingBitAnd
+
+**Message**: Mismatching bitmasks. Result is always 0 (X = Y & 0xf0; Z = X & 0x1; => Z=0).<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A variable is masked with `& 0xf0`, and the result is masked again later with a value that shares no
+bits with the first mask - so the final result is always `0`.
+
+## Motivation
+
+Chaining two bitmasks that share no bits is either dead code (the second mask can be removed since the
+result is always `0`) or a sign that one of the two masks is wrong - either way it's worth a second
+look.
+
+## How to fix
+
+Before:
+```cpp
+void f(int x) {
+    int a = x & 0xf0;
+    int b = a & 0x1; // <- always 0, no bits are shared with 0xf0
+    if (b) {}
+}
+```
+
+After:
+```cpp
+void f(int x) {
+    int a = x & 0xf0;
+    int b = a & 0x10;
+    if (b) {}
+}
+```
+
+## Related checkers
+
+- [badBitmaskCheck.md](badBitmaskCheck.md) - `|` used where `&` was probably meant.
+- [comparisonError.md](comparisonError.md) - a bitwise expression compared against a constant it can
+  never produce.
diff --git a/man/checkers/mismatchingContainerExpression.md b/man/checkers/mismatchingContainerExpression.md
new file mode 100644
index 00000000000..0ff9c8f35e3
--- /dev/null
+++ b/man/checkers/mismatchingContainerExpression.md
@@ -0,0 +1,46 @@
+# mismatchingContainerExpression
+
+**Message**: Iterators to containers from different expressions 'f()' and 'g()' are used together.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+Two iterators come from two separate calls to same-looking expressions (for example `begin(f())` and
+`end(g())`) that cppcheck can't prove refer to the same container.
+
+## Motivation
+
+When the container itself is the result of a function call rather than a plain variable, it's easy to
+accidentally call two different functions (or the same function twice, if it returns a different
+container each time) for what was meant to be a single container's begin/end pair.
+
+## How to fix
+
+Before:
+```cpp
+#include <vector>
+#include <algorithm>
+std::vector<int>& f();
+std::vector<int>& g();
+void foo() {
+    (void)std::find(begin(f()), end(g()), 0); // <- mismatchingContainerExpression
+}
+```
+
+After:
+```cpp
+#include <vector>
+#include <algorithm>
+std::vector<int>& f();
+void foo() {
+    (void)std::find(begin(f()), end(f()), 0);
+}
+```
+
+## Related checkers
+
+- [mismatchingContainers.md](mismatchingContainers.md) - the stronger version of this check, for when
+  cppcheck can tell the two iterators definitely belong to different containers (rather than merely
+  being unable to prove they're the same one).
diff --git a/man/checkers/mismatchingContainerIterator.md b/man/checkers/mismatchingContainerIterator.md
new file mode 100644
index 00000000000..60c4a2e7f57
--- /dev/null
+++ b/man/checkers/mismatchingContainerIterator.md
@@ -0,0 +1,47 @@
+# mismatchingContainerIterator
+
+**Message**: Iterator 'it' referring to container 'l1' is used with container 'l2'.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+An iterator that belongs to one container is passed to an `insert()`/`erase()`-style method of a
+different container.
+
+## Motivation
+
+An iterator only makes sense in the context of the container it came from. Passing it to a different
+container's method is meaningless and undefined behaviour - almost always a copy-paste mistake where
+the wrong container variable was used.
+
+## How to fix
+
+Before:
+```cpp
+#include <list>
+void foo() {
+    std::list<int> l1;
+    std::list<int> l2;
+    std::list<int>::iterator it = l1.begin();
+    l2.insert(it, 0); // <- mismatchingContainerIterator: 'it' belongs to l1, not l2
+}
+```
+
+After:
+```cpp
+#include <list>
+void foo() {
+    std::list<int> l1;
+    std::list<int>::iterator it = l1.begin();
+    l1.insert(it, 0);
+}
+```
+
+## Related checkers
+
+- [iterators1.md](iterators1.md) - the same code shape is also caught by this related, differently
+  worded check; both messages can appear together on the same line.
+- [mismatchingContainers.md](mismatchingContainers.md) - the equivalent mistake when the mismatched
+  iterators are compared (`!=`/`==`) rather than passed to a container method.
diff --git a/man/checkers/mismatchingContainers.md b/man/checkers/mismatchingContainers.md
new file mode 100644
index 00000000000..163c8a1c8c8
--- /dev/null
+++ b/man/checkers/mismatchingContainers.md
@@ -0,0 +1,47 @@
+# mismatchingContainers
+
+**Message**: Iterators of different containers 'l1' and 'l2' are used together.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+An iterator that belongs to one container is compared (with `!=`/`==`, or via a relational operator)
+against an iterator from a different container - most often seen as the loop condition of a `for` loop
+that begins with one container's iterator and ends with another's.
+
+## Motivation
+
+Comparing iterators from two different containers is meaningless - there's no relationship between
+their positions - and is almost always a copy-paste mistake, typically a loop's end condition that
+still refers to the wrong container.
+
+## How to fix
+
+Before:
+```cpp
+#include <list>
+void f() {
+    std::list<int> l1;
+    std::list<int> l2;
+    for (std::list<int>::iterator it = l1.begin(); it != l2.end(); ++it) { } // <- mismatchingContainers
+}
+```
+
+After:
+```cpp
+#include <list>
+void f() {
+    std::list<int> l1;
+    for (std::list<int>::iterator it = l1.begin(); it != l1.end(); ++it) { }
+}
+```
+
+## Related checkers
+
+- [iterators1.md](iterators1.md) / [mismatchingContainerIterator.md](mismatchingContainerIterator.md) -
+  the equivalent mistake when the mismatched iterator is passed to a container method instead of
+  compared.
+- [mismatchingContainerExpression.md](mismatchingContainerExpression.md) - a related, weaker check for
+  when cppcheck can't prove two iterator-producing expressions refer to the same container at all.
diff --git a/man/checkers/missingMemberCopy.md b/man/checkers/missingMemberCopy.md
new file mode 100644
index 00000000000..a30223ebd71
--- /dev/null
+++ b/man/checkers/missingMemberCopy.md
@@ -0,0 +1,46 @@
+# missingMemberCopy
+
+**Message**: Member variable 'classname::varname' is not initialized in the copy constructor.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning (Inconclusive)<br/>
+**Language**: C++
+
+## Description
+
+A copy or move constructor is defined (with a body), but one particular member is never assigned
+anywhere in it - everything else about the class suggests it should have been copied.
+
+## Motivation
+
+A hand-written copy/move constructor that forgets one member produces objects whose copies silently
+diverge from the original in that one field - a subtle bug, especially in a class with many members,
+since the constructor still compiles and mostly "looks right."
+
+## How to fix
+
+Copy (or move) the missing member too.
+
+Before:
+```cpp
+struct S {
+    int i{};
+    S() = default;
+    S(const S& s) {} // <- 'i' isn't copied
+};
+```
+
+After:
+```cpp
+struct S {
+    int i{};
+    S() = default;
+    S(const S& s) : i(s.i) {}
+};
+```
+
+## Related checkers
+
+- [operatorEqVarError.md](operatorEqVarError.md) - the same idea, for a hand-written `operator=` instead
+  of a copy/move constructor.
+- [uninitMemberVar.md](uninitMemberVar.md) - the related family of checks for a member that's never
+  initialized by a regular constructor at all.
diff --git a/man/checkers/missingOverride.md b/man/checkers/missingOverride.md
new file mode 100644
index 00000000000..5ed810334d5
--- /dev/null
+++ b/man/checkers/missingOverride.md
@@ -0,0 +1,37 @@
+# missingOverride
+
+**Message**: The function 'f' overrides a function in a base class but is not marked with a 'override' specifier.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A derived class's function has the same signature as a virtual function in its base class, but isn't
+marked `override`.
+
+## Motivation
+
+Without `override`, if a later edit to the base class's signature accidentally stops a derived function
+from being an override (a parameter type change, a typo in the name, ...), the derived function quietly
+becomes an unrelated new function instead - and nothing warns about it, since it's valid C++ either way.
+Marking overrides explicitly turns that silent mismatch into a compile error.
+
+## How to fix
+
+Before:
+```cpp
+class Base { virtual void f(); };
+class Derived : Base { virtual void f(); }; // <- missingOverride: no 'override'
+```
+
+After:
+```cpp
+class Base { virtual void f(); };
+class Derived : Base { void f() override; };
+```
+
+## Related checkers
+
+- [uselessOverride.md](uselessOverride.md) - for when a function *is* correctly overriding a base one,
+  but the override doesn't actually change any behaviour.
diff --git a/man/checkers/missingPercentCharacter.md b/man/checkers/missingPercentCharacter.md
new file mode 100644
index 00000000000..e89362e67d8
--- /dev/null
+++ b/man/checkers/missingPercentCharacter.md
@@ -0,0 +1,36 @@
+# missingPercentCharacter
+
+**Message**: Missing percent character in Token::Match() pattern: "%type"<br/>
+**Category**: Code Quality<br/>
+**Severity**: Error<br/>
+**Language**: C++ (cppcheck's own source code only)
+
+## Description
+
+A `%something` placeholder is missing its closing `%`.
+
+This is not a general-purpose checker for arbitrary C/C++ programs - see
+[simplePatternError.md](simplePatternError.md) for the shared background on this internal,
+cppcheck-source-only checker.
+
+## Motivation
+
+Without the closing `%`, the pattern-matching engine doesn't recognize the text as a placeholder at
+all, and instead tries to match it as literal characters - silently breaking the match the pattern was
+written to perform.
+
+## How to fix
+
+Before:
+```cpp
+Token::Match(tok, "%type"); // <- missing closing '%'
+```
+
+After:
+```cpp
+Token::Match(tok, "%type%");
+```
+
+## Related checkers
+
+- [unknownPattern.md](unknownPattern.md) - a `%something%` placeholder that's correctly closed but isn't a recognized name.
diff --git a/man/checkers/missingReturn.md b/man/checkers/missingReturn.md
new file mode 100644
index 00000000000..cfaa7fde670
--- /dev/null
+++ b/man/checkers/missingReturn.md
@@ -0,0 +1,42 @@
+# missingReturn
+
+**Message**: Found an exit path from function with non-void return type that has missing return statement<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A function with a non-`void` return type has a path that reaches the end of the function (or a
+`case`/`if` branch) without returning a value.
+
+## Motivation
+
+Falling off the end of a value-returning function without a `return` is undefined behaviour the moment
+that code path is actually taken - the standard says so unconditionally, regardless of whether the
+caller ever reads the returned value. Since the checker flags the mere existence of such a path, whether
+this is reached in practice depends on the arguments/state a real call ends up using; when it is
+reached, the caller receives whatever happened to be in the return-value register/location, which is
+unpredictable and can differ between builds, platforms, or optimization levels.
+
+## How to fix
+
+Before:
+```cpp
+int f(int x) {
+    if (x) {
+        return 1;
+    }
+} // <- no return if 'x' is 0
+```
+
+After:
+```cpp
+int f(int x) {
+    if (x) {
+        return 1;
+    }
+    return 0;
+}
+```
+
diff --git a/man/checkers/moduloAlwaysTrueFalse.md b/man/checkers/moduloAlwaysTrueFalse.md
new file mode 100644
index 00000000000..b82103616d6
--- /dev/null
+++ b/man/checkers/moduloAlwaysTrueFalse.md
@@ -0,0 +1,36 @@
+# moduloAlwaysTrueFalse
+
+**Message**: Comparison of modulo result is predetermined, because it is always less than 5.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A `%` result is compared against a constant outside the range that modulo operation could ever produce.
+
+## Motivation
+
+`x % 5` can only ever be `0..4` - comparing it against `5` or anything larger makes the comparison
+predetermined, which usually means the modulo divisor or the compared-against constant is wrong.
+
+## How to fix
+
+Before:
+```cpp
+void f(int x) {
+    if (x % 5 == 5) {} // <- 'x % 5' is always 0..4
+}
+```
+
+After:
+```cpp
+void f(int x) {
+    if (x % 5 == 0) {}
+}
+```
+
+## Related checkers
+
+- [knownConditionTrueFalse.md](knownConditionTrueFalse.md) - the more general check for a condition
+  whose truth value cppcheck already knows in advance.
diff --git a/man/checkers/moduloofone.md b/man/checkers/moduloofone.md
new file mode 100644
index 00000000000..6b3d3ee6db8
--- /dev/null
+++ b/man/checkers/moduloofone.md
@@ -0,0 +1,33 @@
+# moduloofone
+
+**Message**: Modulo of one is always equal to zero<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+An expression is reduced modulo `1`, which is always `0` no matter what the other operand is.
+
+## Motivation
+
+`x % 1` is always `0` for any integer `x` - the computation is pointless and almost always signals a
+typo (a `1` that should have been some other number, or a variable that should have been used instead
+of a literal `1`).
+
+## How to fix
+
+Before:
+```cpp
+void f(unsigned int x) {
+  int y = x % 1; // <- always 0
+}
+```
+
+After:
+```cpp
+void f(unsigned int x) {
+  int y = x % 2;
+  (void)y;
+}
+```
diff --git a/man/checkers/multiCondition.md b/man/checkers/multiCondition.md
new file mode 100644
index 00000000000..1d68492c290
--- /dev/null
+++ b/man/checkers/multiCondition.md
@@ -0,0 +1,58 @@
+# multiCondition
+
+**Message**: Expression is always false because 'else if' condition matches previous condition at line 2.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+An `else if` condition is the same as (dead code), or the exact opposite of (always true), the
+condition already tested by the `if` before it.
+
+## Motivation
+
+By the time an `else if` is reached, the `if` before it is already known to be false. If the `else if`
+condition is identical to that `if`, it can never be true either (dead code); if it's the exact
+opposite, it's guaranteed to be true (redundant, since `else` alone would do the same thing).
+
+## How to fix
+
+Before:
+```cpp
+void f(int x) {
+    if (x == 1) {}
+    else if (x == 1) {} // <- can never be reached
+}
+```
+
+After:
+```cpp
+void f(int x) {
+    if (x == 1) {}
+    else if (x == 2) {}
+}
+```
+
+Before:
+```cpp
+void f(int x) {
+    if (x == 1) {}
+    else if (x != 1) {} // <- always true, we're already past the 'x == 1' branch
+}
+```
+
+After:
+```cpp
+void f(int x) {
+    if (x == 1) {}
+    else {}
+}
+```
+
+## Related checkers
+
+- [duplicateCondition.md](duplicateCondition.md) - the same idea, but for two consecutive plain `if`
+  statements rather than an `if`/`else if` chain.
+- [oppositeInnerCondition.md](oppositeInnerCondition.md), [identicalInnerCondition.md](identicalInnerCondition.md) -
+  the same idea again, but for an `if` nested directly inside another `if`.
diff --git a/man/checkers/multiplySizeof.md b/man/checkers/multiplySizeof.md
new file mode 100644
index 00000000000..8b27e5f16e9
--- /dev/null
+++ b/man/checkers/multiplySizeof.md
@@ -0,0 +1,60 @@
+# multiplySizeof and divideSizeof
+
+**Message**: Multiplying sizeof() with sizeof() indicates a logic error.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning (inconclusive)<br/>
+**Language**: C/C++
+
+## Description
+
+- `multiplySizeof`: `sizeof(a) * sizeof(b)` - multiplying two `sizeof` results together almost never
+  makes sense dimensionally (the result would be "bytes squared").
+- `divideSizeof`: dividing the result of `sizeof()` on a pointer type by another `sizeof()` - since
+  `sizeof(pointer)` is the size of the pointer itself, not of the data it points to, this computes a
+  meaningless ratio.
+
+Both require `--inconclusive` to be enabled.
+
+## Motivation
+
+Both patterns are dimensionally suspicious: multiplying two byte-counts together, or dividing a
+pointer's fixed size by an unrelated element size, essentially never produces the number a program
+actually needs. They're the kind of typo (an extra `sizeof`, or a `sizeof` applied to the wrong
+variable) that's easy to introduce and easy to miss, since the code still compiles.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    int a = 1, b = 1;
+    int s = sizeof(a) * sizeof(b); // <- multiplying two sizeof() results
+}
+```
+
+After:
+```cpp
+void f() {
+    int a = 1, b = 1;
+    int s = sizeof(a) * b; // multiply by the count, not another sizeof()
+}
+```
+
+Before:
+```cpp
+void f(int *p) {
+    int n = 100 / sizeof(p); // <- dividing by the pointer's own size
+}
+```
+
+After:
+```cpp
+void f(int *p) {
+    int n = 100 / sizeof(*p);
+}
+```
+
+## Related checkers
+
+- [pointerSize.md](pointerSize.md) - the same "size of pointer, not of data" mistake, specifically
+  when used as (or to compute) an argument to `malloc`/`memcpy`/`memset`-family functions.
diff --git a/man/checkers/nanInArithmeticExpression.md b/man/checkers/nanInArithmeticExpression.md
new file mode 100644
index 00000000000..5f8134be309
--- /dev/null
+++ b/man/checkers/nanInArithmeticExpression.md
@@ -0,0 +1,42 @@
+# nanInArithmeticExpression
+
+**Message**: Using NaN/Inf in a computation.<br/>
+**Category**: Correctness<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A computation divides by `0.0` and immediately adds or subtracts another value from the result - the
+addition/subtraction is pointless once the division has already produced `NaN`/`Inf`.
+
+## Motivation
+
+Once an expression is `NaN` or `Inf`, further arithmetic on it (other than a handful of operations
+specifically meant to detect/handle that case) can't recover a meaningful value - so code that keeps
+computing with it is either dead weight or a sign the `NaN`/`Inf` case wasn't actually intended.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f() {
+   double x = 3.0 / 0.0 + 1.0; // <- pointless once the division already produced NaN/Inf
+   printf("%f", x);
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f(double divisor) {
+   double x = 3.0 / divisor + 1.0;
+   printf("%f", x);
+}
+```
+
+## Related checkers
+
+- [zerodiv.md](zerodiv.md) - integer division by zero, which is undefined behaviour rather than the
+  well-defined `NaN`/`Inf` result of floating-point division by zero.
diff --git a/man/checkers/negativeArraySize.md b/man/checkers/negativeArraySize.md
new file mode 100644
index 00000000000..97ca1b25336
--- /dev/null
+++ b/man/checkers/negativeArraySize.md
@@ -0,0 +1,60 @@
+# negativeArraySize and negativeMemoryAllocationSize
+
+**Message**: Declaration of array 'a' with negative size is undefined behaviour<br/>
+**Category**: Correctness/Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C/C++
+
+## Description
+
+Something that determines the size of an array-like allocation is known to be negative:
+
+- `negativeArraySize`: a variable-length array is declared with a size cppcheck knows is negative.
+- `negativeMemoryAllocationSize`: a `new[]` expression is given a size cppcheck knows is negative.
+
+## Motivation
+
+- `negativeArraySize`: a variable-length array's size, once converted to the unsigned type it's ultimately
+  represented as, becomes an enormous positive number - so instead of failing cleanly, the declaration
+  either crashes outright or succeeds with a wildly wrong, huge size. This is undefined behaviour.
+- `negativeMemoryAllocationSize`: in C++11 and later, `new[]` is specifically required to detect this and
+  throw `std::bad_array_new_length` instead - so this specific case is a well-defined, catchable error
+  rather than undefined behaviour, but it's still a bug worth flagging: an uncaught exception terminates
+  the program, and any earlier C++ standard leaves the size negotiation undefined instead.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    int n = -1;
+    int a[n]; // <- negativeArraySize
+}
+```
+
+After:
+```cpp
+void f() {
+    int n = 1;
+    int a[n];
+}
+```
+
+Before:
+```cpp
+void f() {
+    int n = -1;
+    int *p = new int[n]; // <- negativeMemoryAllocationSize
+}
+```
+
+After:
+```cpp
+void f() {
+    int n = 1;
+    int *p = new int[n];
+    p[0] = 0;
+    delete[] p;
+}
+```
+
diff --git a/man/checkers/negativeContainerIndex.md b/man/checkers/negativeContainerIndex.md
new file mode 100644
index 00000000000..a628bc99c74
--- /dev/null
+++ b/man/checkers/negativeContainerIndex.md
@@ -0,0 +1,38 @@
+# negativeContainerIndex
+
+**Message**: Array index -11 is out of bounds.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C++
+
+## Description
+
+A container is indexed with a value known to be negative.
+
+## Motivation
+
+Indexing an array-like container with a negative value is undefined behaviour - there is no valid
+element "before the beginning" to access.
+
+## How to fix
+
+Before:
+```cpp
+#include <vector>
+void f(const std::vector<int> &v) {
+    v[-11] = 123; // <- negativeContainerIndex
+}
+```
+
+After:
+```cpp
+#include <vector>
+void f(const std::vector<int> &v) {
+    v[11] = 123;
+}
+```
+
+## Related checkers
+
+- [containerOutOfBounds.md](containerOutOfBounds.md) - the more general out-of-bounds container access
+  check, for indices that are too large rather than negative.
diff --git a/man/checkers/negativeIndex.md b/man/checkers/negativeIndex.md
new file mode 100644
index 00000000000..2b7477f8af0
--- /dev/null
+++ b/man/checkers/negativeIndex.md
@@ -0,0 +1,41 @@
+# negativeIndex
+
+**Message**: Array index -11 is out of bounds.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C/C++
+
+## Description
+
+An array is indexed with a value cppcheck knows is negative.
+
+## Motivation
+
+Indexing an array with a negative value reads or writes memory before the start of the array, which is
+undefined behaviour - it can silently corrupt unrelated data instead of crashing, making the actual
+cause hard to trace back to.
+
+## How to fix
+
+Before:
+```cpp
+void f(int i) {
+    int a[10];
+    if (i == -1)
+        a[i] = 0; // <- negative index
+}
+```
+
+After:
+```cpp
+void f(int i) {
+    int a[10];
+    if (i >= 0 && i < 10)
+        a[i] = 0;
+}
+```
+
+## Related checkers
+
+- [arrayIndexOutOfBounds.md](arrayIndexOutOfBounds.md) - the general out-of-bounds-index check this
+  one complements, for indices known to be too large rather than negative.
diff --git a/man/checkers/noConstructor.md b/man/checkers/noConstructor.md
new file mode 100644
index 00000000000..76616aeaabb
--- /dev/null
+++ b/man/checkers/noConstructor.md
@@ -0,0 +1,51 @@
+# noConstructor
+
+**Message**: The struct 'x' does not have a constructor although it has private member variables.<br/>
+**Category**: Correctness<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A class/struct has private member variables (of a native type, pointer, or a type that itself needs
+initialization) but declares no constructor at all - those members are left with whatever bytes happened
+to already be there when the object is created.
+
+## Motivation
+
+Without a constructor, a class's native-type, pointer, or reference members are left uninitialized when
+an object is created - reading one of them before it's explicitly assigned would be undefined behaviour.
+This checker only looks at the class's shape (private members, no constructor, no default member
+initializer); it doesn't verify that any member is actually read before being set anywhere in the
+program, so it flags classes that are technically at risk even if none of them are ever used that way in
+practice. This check is also deliberately reported at `style` severity rather than `warning`: for
+performance reasons a constructor might be intentionally left out in some cases, so it's presented as a
+suggestion rather than a certain bug.
+
+## How to fix
+
+Add a constructor that initializes every member.
+
+Before:
+```cpp
+class Fred {
+    int i;
+public:
+    void setValue(int i_) { i = i_; } // <- no constructor initializes 'i'
+};
+```
+
+After:
+```cpp
+class Fred {
+    int i;
+public:
+    Fred() : i(0) {}
+    void setValue(int i_) { i = i_; }
+};
+```
+
+## Related checkers
+
+- [uninitMemberVar.md](uninitMemberVar.md) - the related family of checks for when a constructor exists
+  but still misses initializing one or more specific members.
diff --git a/man/checkers/noCopyConstructor.md b/man/checkers/noCopyConstructor.md
new file mode 100644
index 00000000000..afbd4850f2c
--- /dev/null
+++ b/man/checkers/noCopyConstructor.md
@@ -0,0 +1,59 @@
+# noCopyConstructor
+
+**Message**: Struct 'F' does not have a copy constructor which is recommended since it has dynamic memory/resource management.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+The class allocates a resource itself (`new`/`malloc`-family in a constructor, `delete`/`free`-family
+in a destructor) but doesn't define its own copy constructor (or only defaults it) - the
+compiler-generated version would copy the raw pointer, not the resource.
+
+## Motivation
+
+The compiler-generated copy constructor just copies each member's value. For a raw pointer, that means
+the copy ends up pointing at the exact same allocated block as the original - both objects now believe
+they own it, so destroying either one leaves the other holding a dangling pointer, and destroying both
+frees the same memory twice. Using the dangling copy afterward, or freeing the same block twice, is
+undefined behaviour - though which of those actually happens, if either, depends on what the rest of the
+program goes on to do with the two objects. This check fires on the class's shape alone (it allocates a
+resource but has no copy constructor of its own) - it doesn't verify that the class is ever actually
+copied anywhere in the analyzed code, so a class that's never copied is flagged just the same as one that
+is.
+
+## How to fix
+
+Write a copy constructor that allocates a fresh block for the copy (or use a container/smart pointer
+that already manages this correctly, avoiding the need for a hand-written one at all).
+
+Before:
+```cpp
+class F {
+    char *p;
+public:
+    F() { p = new char[10]; } // <- no copy constructor
+    ~F() { delete[] p; }
+};
+```
+
+After:
+```cpp
+class F {
+    char *p;
+public:
+    F() { p = new char[10]; }
+    F(const F& other) { p = new char[10]; }
+    F& operator=(const F& other) { p = other.p; return *this; }
+    ~F() { delete[] p; }
+};
+```
+
+## Related checkers
+
+- [noOperatorEq.md](noOperatorEq.md) and [noDestructor.md](noDestructor.md) - the same underlying
+  "allocates a resource but is missing a special member function" pattern, for `operator=` and the
+  destructor respectively.
+- [copyCtorPointerCopying.md](copyCtorPointerCopying.md) - the more specific case where a copy
+  constructor does exist, but shallow-copies a pointer instead of allocating a fresh block.
diff --git a/man/checkers/noDestructor.md b/man/checkers/noDestructor.md
new file mode 100644
index 00000000000..cd9d3df2337
--- /dev/null
+++ b/man/checkers/noDestructor.md
@@ -0,0 +1,48 @@
+# noDestructor
+
+**Message**: Class 'F' does not have a destructor which is recommended since it has dynamic memory/resource management.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+The class allocates a resource itself (`new`/`malloc`-family in a constructor) but doesn't define its
+own destructor.
+
+## Motivation
+
+Without a destructor, whatever a constructor allocated is never released when the object is destroyed -
+a straightforward memory/resource leak every time an object of this class goes out of scope or is
+deleted.
+
+## How to fix
+
+Add a destructor that releases what the constructor allocated.
+
+Before:
+```cpp
+struct F {
+    char *p;
+    F() { p = new char[10]; } // <- no destructor
+    F(const F&);
+    F& operator=(const F&);
+};
+```
+
+After:
+```cpp
+struct F {
+    char *p;
+    F() { p = new char[10]; }
+    F(const F&);
+    F& operator=(const F&);
+    ~F() { delete[] p; }
+};
+```
+
+## Related checkers
+
+- [noCopyConstructor.md](noCopyConstructor.md) and [noOperatorEq.md](noOperatorEq.md) - the same
+  underlying "allocates a resource but is missing a special member function" pattern, for the copy
+  constructor and `operator=` respectively.
diff --git a/man/checkers/noExplicitConstructor.md b/man/checkers/noExplicitConstructor.md
new file mode 100644
index 00000000000..2d3f4fbbce6
--- /dev/null
+++ b/man/checkers/noExplicitConstructor.md
@@ -0,0 +1,39 @@
+# noExplicitConstructor
+
+**Message**: Class 'Class' has a constructor with 1 argument that is not explicit.<br/>
+**Category**: Correctness<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A constructor that takes exactly one argument (and so can be used for an implicit conversion) isn't
+marked `explicit` - so a value of that argument's type can silently convert into the class wherever the
+class type is expected, which is rarely intended.
+
+## Motivation
+
+A single-argument constructor that isn't `explicit` doubles as an implicit conversion: anywhere the
+class type is expected, a value of the argument's type is silently accepted and converted, without the
+reader seeing any indication a conversion happened at all. This can produce confusing overload
+resolution and surprising implicit conversions that the author never intended.
+
+## How to fix
+
+Mark the constructor `explicit`, unless the implicit conversion is genuinely intended.
+
+Before:
+```cpp
+class Class {
+public:
+    Class(int i) {} // <- not explicit
+};
+```
+
+After:
+```cpp
+class Class {
+public:
+    explicit Class(int i) {}
+};
+```
diff --git a/man/checkers/noOperatorEq.md b/man/checkers/noOperatorEq.md
new file mode 100644
index 00000000000..482455f5d42
--- /dev/null
+++ b/man/checkers/noOperatorEq.md
@@ -0,0 +1,57 @@
+# noOperatorEq
+
+**Message**: Struct 'F' does not have a operator= which is recommended since it has dynamic memory/resource management.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+The class allocates a resource itself (`new`/`malloc`-family in a constructor, `delete`/`free`-family
+in a destructor) but doesn't define its own `operator=` (or only defaults it) - the compiler-generated
+version would copy the raw pointer, not the resource.
+
+## Motivation
+
+The compiler-generated assignment operator just copies each member's value. For a raw pointer, that
+means the assigned-to object ends up pointing at the same allocated block as the source - both objects
+now believe they own it, and the assigned-to object's original allocation is leaked in the process,
+since nothing frees it first. This is more than a leak waiting to happen: if an object of this class is
+ever assigned to another, both are eventually destroyed, and their destructors each free the same block,
+that is a double-free - undefined behaviour. This check fires on the class's shape alone (it allocates a
+resource but has no `operator=` of its own) - it doesn't verify that the class is ever actually assigned
+anywhere in the analyzed code, so a class that's never copy-assigned is flagged just the same as one that
+is.
+
+## How to fix
+
+Write an `operator=` that allocates a fresh block for the assigned-to object (or use a
+container/smart pointer that already manages this correctly).
+
+Before:
+```cpp
+class F {
+    char *p;
+public:
+    F() { p = new char[10]; } // <- no operator=
+    ~F() { delete[] p; }
+};
+```
+
+After:
+```cpp
+class F {
+    char *p;
+public:
+    F() { p = new char[10]; }
+    F(const F& other) { p = new char[10]; }
+    F& operator=(const F& other) { p = other.p; return *this; }
+    ~F() { delete[] p; }
+};
+```
+
+## Related checkers
+
+- [noCopyConstructor.md](noCopyConstructor.md) and [noDestructor.md](noDestructor.md) - the same
+  underlying "allocates a resource but is missing a special member function" pattern, for the copy
+  constructor and destructor respectively.
diff --git a/man/checkers/nullPointer.md b/man/checkers/nullPointer.md
new file mode 100644
index 00000000000..b0519b3f46a
--- /dev/null
+++ b/man/checkers/nullPointer.md
@@ -0,0 +1,63 @@
+# nullPointer
+
+**Message**: Null pointer dereference<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A pointer is definitely, or very likely, null at the point it is dereferenced - for example, it was
+just assigned `0`/`nullptr`, or a variable known to be null was passed in.
+
+## Motivation
+
+Dereferencing a null pointer is undefined behaviour and one of the most common causes of crashes in
+C/C++ programs. cppcheck reports this only when it can actually determine the pointer is null (or very
+likely null); it does not attempt to trace every possible path a pointer's value could have taken to
+get there, so the absence of a warning does not by itself mean a pointer can never be null at that
+point.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    int *p = 0;
+    *p = 1; // <- nullPointer
+}
+```
+
+After:
+```cpp
+void f() {
+    int x = 0;
+    int *p = &x;
+    *p = 1;
+}
+```
+
+## False positives to be aware of
+
+- **A false positive is possible when a guard condition depends on a different parameter than the one
+  being dereferenced.** If a function only dereferences one pointer when another argument has a
+  specific value, cppcheck does not always verify that a given call site actually triggers that
+  value, and can warn even when the guard makes the dereference unreachable for that call:
+  ```cpp
+  void f(int* p, const int* q) {
+      if (*q == -1)
+          *p = 0;
+  }
+  void g() {
+      int x = -2;
+      f(nullptr, &x); // reported as a possible null dereference of 'p', even though *q==-1 is false here
+  }
+  ```
+
+## Related checkers
+
+- [nullPointerRedundantCheck.md](nullPointerRedundantCheck.md) - the same idea, but where a null check on the same pointer exists elsewhere and either it or the dereference is misplaced.
+- [nullPointerDefaultArg.md](nullPointerDefaultArg.md) - the same idea for a pointer parameter that defaults to null.
+- [nullPointerOutOfMemory.md](nullPointerOutOfMemory.md) - the same idea for a pointer that came from an allocation function that can fail.
+- [nullPointerArithmetic.md](nullPointerArithmetic.md) - the same idea for pointer arithmetic instead of a direct dereference.
+- [ctunullpointer.md](ctunullpointer.md) - the same idea, found by whole-program analysis across function calls.
diff --git a/man/checkers/nullPointerArithmetic.md b/man/checkers/nullPointerArithmetic.md
new file mode 100644
index 00000000000..c2987c4132f
--- /dev/null
+++ b/man/checkers/nullPointerArithmetic.md
@@ -0,0 +1,43 @@
+# nullPointerArithmetic
+
+**Message**: Pointer addition with NULL pointer.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+Pointer arithmetic (`p + n`, `p - n`, `p++`, `--p`, ...) is performed on a pointer that is null (or
+could be). Adding to or subtracting from a null pointer is undefined behaviour even though no memory is
+actually touched.
+
+## Motivation
+
+It's easy to assume pointer arithmetic is only dangerous once the result is dereferenced, but the C/C++
+standards make forming an out-of-bounds pointer - including any arithmetic on a null pointer - undefined
+behaviour in its own right, regardless of whether the result is ever used.
+
+## How to fix
+
+Before:
+```cpp
+void foo(char *s) {
+    char *p = s + 20; // <- if foo() is ever called with a null 's'
+}
+void bar() { foo(0); }
+```
+
+After:
+```cpp
+void foo(char *s) {
+    if (s)
+        char *p = s + 20;
+}
+void bar() { foo(0); }
+```
+
+## Related checkers
+
+- [nullPointer.md](nullPointer.md) - the direct-dereference equivalent of this check.
+- [nullPointerArithmeticRedundantCheck.md](nullPointerArithmeticRedundantCheck.md) - the same idea, refined by a nearby null check.
+- [nullPointerArithmeticOutOfMemory.md](nullPointerArithmeticOutOfMemory.md) - the same idea for a pointer from a failable allocation function.
diff --git a/man/checkers/nullPointerArithmeticOutOfMemory.md b/man/checkers/nullPointerArithmeticOutOfMemory.md
new file mode 100644
index 00000000000..7219f2826ef
--- /dev/null
+++ b/man/checkers/nullPointerArithmeticOutOfMemory.md
@@ -0,0 +1,22 @@
+# nullPointerArithmeticOutOfMemory
+
+**Message**: If memory allocation fails: pointer addition with NULL pointer.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+Pointer arithmetic is performed on a pointer that came from a memory-allocation function that can fail
+and return null (`malloc`, `new` in some configurations, ...), without checking for that failure first.
+
+## Motivation
+
+Just like [nullPointerOutOfMemory](nullPointerOutOfMemory.md), assuming an allocation always succeeds
+means that under memory pressure, the very next operation on the result - even pointer arithmetic that
+doesn't dereference anything - is undefined behaviour.
+
+## Related checkers
+
+- [nullPointerArithmetic.md](nullPointerArithmetic.md) - the same idea without a specific failable allocation involved.
+- [nullPointerOutOfMemory.md](nullPointerOutOfMemory.md) - the direct-dereference equivalent of this check.
diff --git a/man/checkers/nullPointerArithmeticRedundantCheck.md b/man/checkers/nullPointerArithmeticRedundantCheck.md
new file mode 100644
index 00000000000..d965cabee06
--- /dev/null
+++ b/man/checkers/nullPointerArithmeticRedundantCheck.md
@@ -0,0 +1,23 @@
+# nullPointerArithmeticRedundantCheck
+
+**Message**: Either the condition 'p' is redundant or there is overflow in pointer addition.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+Pointer arithmetic is performed on a pointer that could be null, and elsewhere in the code there is a
+`NULL`/`nullptr` check on the very same pointer - so either that check is redundant, or the arithmetic
+is a bug.
+
+## Motivation
+
+Just like [nullPointerRedundantCheck](nullPointerRedundantCheck.md), a null check that exists somewhere
+in the code but doesn't actually guard the pointer arithmetic is a strong sign of a misplaced check or
+an unnecessary one.
+
+## Related checkers
+
+- [nullPointerArithmetic.md](nullPointerArithmetic.md) - the same idea without a nearby check to cross-reference.
+- [nullPointerRedundantCheck.md](nullPointerRedundantCheck.md) - the direct-dereference equivalent of this check.
diff --git a/man/checkers/nullPointerDefaultArg.md b/man/checkers/nullPointerDefaultArg.md
new file mode 100644
index 00000000000..5a6b99b1d29
--- /dev/null
+++ b/man/checkers/nullPointerDefaultArg.md
@@ -0,0 +1,39 @@
+# nullPointerDefaultArg
+
+**Message**: Possible null pointer dereference if the default parameter value is used.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A pointer parameter that defaults to `nullptr`/`0` is dereferenced without a null check, so calling the
+function with no argument for that parameter crashes.
+
+## Motivation
+
+A default argument value is one every caller is implicitly allowed to rely on - if that default is
+null and the function dereferences the parameter unconditionally, calling the function the "normal",
+argument-omitted way is itself the bug trigger.
+
+## How to fix
+
+Before:
+```cpp
+void f(int *p = 0) {
+    *p = 1; // <- crashes if called as f()
+}
+```
+
+After:
+```cpp
+void f(int *p = 0) {
+    if (!p)
+        return;
+    *p = 1;
+}
+```
+
+## Related checkers
+
+- [nullPointer.md](nullPointer.md) - the general null-dereference check.
diff --git a/man/checkers/nullPointerOutOfMemory.md b/man/checkers/nullPointerOutOfMemory.md
new file mode 100644
index 00000000000..964ab3d2f72
--- /dev/null
+++ b/man/checkers/nullPointerOutOfMemory.md
@@ -0,0 +1,46 @@
+# nullPointerOutOfMemory and nullPointerOutOfResources
+
+**Message**: Null pointer dereference<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+- `nullPointerOutOfMemory`: a pointer came from a memory-allocation function that can fail and return
+  null (`malloc`, `new` in some configurations, ...) and is used without checking for that failure.
+- `nullPointerOutOfResources`: the same idea for a handle from a resource-allocating function that can
+  fail (`fopen`, ...) rather than a memory allocator.
+
+## Motivation
+
+`malloc()` and similar functions are documented to return `NULL` on failure - assuming they always
+succeed means that, under memory or resource pressure, the very next dereference crashes instead of the
+program handling the failure gracefully.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    int *p = malloc(10);
+    *p = 1; // <- malloc() can return NULL
+    free(p);
+}
+```
+
+After:
+```cpp
+void f() {
+    int *p = malloc(10);
+    if (p) {
+        *p = 1;
+        free(p);
+    }
+}
+```
+
+## Related checkers
+
+- [nullPointer.md](nullPointer.md) - the general null-dereference check.
+- [ctunullpointer.md](ctunullpointer.md) - the whole-program-analysis counterpart, which has its own `ctunullpointerOutOfMemory`/`ctunullpointerOutOfResources` variants.
diff --git a/man/checkers/nullPointerRedundantCheck.md b/man/checkers/nullPointerRedundantCheck.md
new file mode 100644
index 00000000000..5b314bfeb11
--- /dev/null
+++ b/man/checkers/nullPointerRedundantCheck.md
@@ -0,0 +1,47 @@
+# nullPointerRedundantCheck
+
+**Message**: Either the condition 'p' is redundant or there is possible null pointer dereference.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A pointer is dereferenced, and elsewhere in the code there is a `NULL`/`nullptr` check on the very same
+pointer - so either that check is redundant, or the dereference is a bug. This is often more useful
+than a plain null-dereference warning, since it also catches "check after use" and "check the wrong
+branch" mistakes, not just a directly-assigned null value.
+
+## Motivation
+
+A null check that exists somewhere in the code, but doesn't actually guard the dereference, is a strong
+sign of a logic error: either the check was misplaced relative to the code it was meant to protect, or
+the check itself is unnecessary and hides the fact that the pointer can never legitimately be null.
+cppcheck only connects a check to a dereference when it can follow that the two really refer to the
+same pointer value; once the pointer is reassigned, cached in a `bool`, or handed to another function
+in between, that connection can be lost, so this check finding nothing is not proof the pointer is
+always guarded correctly.
+
+## How to fix
+
+Before:
+```cpp
+void f(int *p) {
+    *p = 1;    // <- dereferenced here...
+    if (p) {}  // ...but only checked for null here
+}
+```
+
+After:
+```cpp
+void f(int *p) {
+    if (!p)
+        return;
+    *p = 1;
+}
+```
+
+## Related checkers
+
+- [nullPointer.md](nullPointer.md) - the general null-dereference check this one refines with a nearby-check cross-reference.
+- [nullPointerArithmeticRedundantCheck.md](nullPointerArithmeticRedundantCheck.md) - the same idea for pointer arithmetic instead of a direct dereference.
diff --git a/man/checkers/objectIndex.md b/man/checkers/objectIndex.md
new file mode 100644
index 00000000000..18766ae527d
--- /dev/null
+++ b/man/checkers/objectIndex.md
@@ -0,0 +1,44 @@
+# objectIndex
+
+**Message**: The address of variable 's.x' is accessed at non-zero index.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+The address of one specific member of a variable is taken and then indexed with a nonzero value,
+reaching past that member into the rest of the object.
+
+## Motivation
+
+Indexing past the address of a single member relies on that member happening to be followed by other
+data with a compatible layout - this isn't something the language guarantees (padding, member reordering
+by the compiler in some cases, and unrelated following members all make it unreliable), so it's
+undefined behaviour dressed up as if it worked.
+
+## How to fix
+
+Before:
+```cpp
+struct S { int x; int y; };
+void f() {
+    S s;
+    int *p = &s.x;
+    p[3] = 0; // <- reaches past 'x' into the rest of 's'
+}
+```
+
+After:
+```cpp
+struct S { int x; int y; };
+void f() {
+    S s;
+    s.y = 0;
+}
+```
+
+## Related checkers
+
+- [arrayIndexOutOfBounds.md](arrayIndexOutOfBounds.md) - the more general out-of-bounds-access check,
+  for a plain array rather than the address of a single struct member.
diff --git a/man/checkers/obsoleteFunctionCalled.md b/man/checkers/obsoleteFunctionCalled.md
new file mode 100644
index 00000000000..4c9bd920c84
--- /dev/null
+++ b/man/checkers/obsoleteFunctionCalled.md
@@ -0,0 +1,40 @@
+# &lt;name&gt;Called (for example getsCalled, bsd_signalCalled, or any other function marked this way in a library configuration)
+
+**Message**: Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead.<br/>
+**Category**: Correctness<br/>
+**Severity**: Error/Warning/Style/Portability<br/>
+**Language**: C/C++
+
+## Description
+
+A function known to be obsolete, dangerous, or non-reentrant is called. The message names a safer
+replacement. The exact error ID is built from the function's own name plus `Called` (`getsCalled`,
+`bsd_signalCalled`, ...), and which functions are covered - and at what severity - comes entirely from
+the loaded library configuration (`std.cfg`, `posix.cfg`, and similar), not from a fixed list built into
+cppcheck itself. `alloca()` is handled separately - see [allocaCalled.md](allocaCalled.md).
+
+## Motivation
+
+Some standard library functions are obsolete or unsafe for reasons that aren't visible from their
+signature alone: `gets()` can't bound how much it reads and will happily overflow any buffer, some
+functions from `<signal.h>` are unreliable across platforms, and so on. A caller has no way to know this
+without already being aware of the function's history.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f(char *a) {
+    char *x = gets(a); // <- gets() cannot bound the input, buffer overflow risk
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f(char* buf, int n) {
+    char *x = fgets(buf, n, stdin);
+}
+```
+
diff --git a/man/checkers/operatorEqMissingReturnStatement.md b/man/checkers/operatorEqMissingReturnStatement.md
new file mode 100644
index 00000000000..8a74f7201d1
--- /dev/null
+++ b/man/checkers/operatorEqMissingReturnStatement.md
@@ -0,0 +1,47 @@
+# operatorEqMissingReturnStatement
+
+**Message**: No 'return' statement in non-void function causes undefined behavior.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+An `operator=` reaches the end of its body with no `return` at all, and isn't one of the deliberate
+"never returns" cases covered by
+[operatorEqShouldBeLeftUnimplemented.md](operatorEqShouldBeLeftUnimplemented.md) - undefined behaviour,
+since the (non-`void`) function is expected to produce a value.
+
+## Motivation
+
+Falling off the end of a value-returning function without a `return` is undefined behaviour in C++ in
+its own right, per the standard - it doesn't require the caller to go on and use the "returned" value;
+merely reaching the closing `}` without having returned anything is already the undefined action.
+
+## How to fix
+
+Add the missing `return *this;`.
+
+Before:
+```cpp
+class szp
+{
+  szp &operator =(int *other) {} // <- no return statement
+};
+```
+
+After:
+```cpp
+class szp
+{
+  szp &operator =(int *other) { return *this; }
+};
+```
+
+## Related checkers
+
+- [operatorEqRetRefThis.md](operatorEqRetRefThis.md) - the general check for `operator=` not returning
+  `*this`.
+- [operatorEqShouldBeLeftUnimplemented.md](operatorEqShouldBeLeftUnimplemented.md) - the case where
+  `operator=` deliberately never returns (for example, always throwing), and should instead be declared
+  unimplemented/deleted rather than just missing a `return`.
diff --git a/man/checkers/operatorEqRetRefThis.md b/man/checkers/operatorEqRetRefThis.md
new file mode 100644
index 00000000000..271b89f208a
--- /dev/null
+++ b/man/checkers/operatorEqRetRefThis.md
@@ -0,0 +1,45 @@
+# operatorEqRetRefThis
+
+**Message**: 'operator=' should return reference to 'this' instance.<br/>
+**Category**: Correctness<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A hand-written `operator=` doesn't `return *this;` - code like `a = b = c;` or chaining `.` after an
+assignment then breaks, since the return value isn't what everyone expects.
+
+## Motivation
+
+Idiomatic C++ assignment operators return a reference to the assigned-to object so that assignments can
+be chained (`a = b = c;`) and the result can be used directly. An `operator=` that returns something
+else (or nothing meaningful) silently breaks that convention for any caller who relies on it, which is
+easy to miss since a single, non-chained `a = b;` still compiles and works either way.
+
+## How to fix
+
+Return `*this` from `operator=`.
+
+Before:
+```cpp
+class A {
+public:
+    A & operator=(const A &a) { return a; } // <- returns 'a', not '*this'
+};
+```
+
+After:
+```cpp
+class A {
+public:
+    A & operator=(const A &a) { return *this; }
+};
+```
+
+## Related checkers
+
+- [operatorEqMissingReturnStatement.md](operatorEqMissingReturnStatement.md) - the more severe sibling
+  case where `operator=` has no `return` statement at all.
+- [operatorEqShouldBeLeftUnimplemented.md](operatorEqShouldBeLeftUnimplemented.md) - the case where
+  `operator=` deliberately never returns, and should instead be declared unimplemented/deleted.
diff --git a/man/checkers/operatorEqShouldBeLeftUnimplemented.md b/man/checkers/operatorEqShouldBeLeftUnimplemented.md
new file mode 100644
index 00000000000..9a49a5a3822
--- /dev/null
+++ b/man/checkers/operatorEqShouldBeLeftUnimplemented.md
@@ -0,0 +1,54 @@
+# operatorEqShouldBeLeftUnimplemented
+
+**Message**: 'operator=' should either return reference to 'this' instance or be declared private and left unimplemented.<br/>
+**Category**: Correctness<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+An `operator=` with no `return` statement, whose entire body is a `throw` (or a call to a function that
+never returns) - a common way to try to make an assignment operator uncallable, but the idiomatic way is
+to declare it `private`/`= delete` instead of giving it a body that never returns.
+
+## Motivation
+
+Giving `operator=` a body that always throws is a roundabout, easy-to-misread way of saying "this class
+can't be assigned" - it still compiles as if it were a normal, callable assignment operator, and the
+"can't be assigned" part is only enforced at runtime, when it's too late to catch at compile time. The
+idiomatic ways (`= delete`, or a private declaration with no definition) reject the attempt to assign at
+compile time instead.
+
+## How to fix
+
+Declare the assignment operator `= delete` (or `private` with no body) rather than giving it a body
+that always throws.
+
+Before:
+```cpp
+#include <cstdlib>
+#include <stdexcept>
+class A {
+public:
+    A & operator=(const A &a) {
+        rand();
+        throw std::exception(); // <- always throws instead of assigning
+    }
+};
+```
+
+After:
+```cpp
+class A {
+public:
+    A & operator=(const A &a) = delete;
+};
+```
+
+## Related checkers
+
+- [operatorEqRetRefThis.md](operatorEqRetRefThis.md) - the general check for `operator=` not returning
+  `*this`, of which this is a specific variant.
+- [operatorEqMissingReturnStatement.md](operatorEqMissingReturnStatement.md) - the sibling case where
+  `operator=` reaches the end of its body with no return, but isn't one of these deliberate
+  "never returns" cases.
diff --git a/man/checkers/operatorEqToSelf.md b/man/checkers/operatorEqToSelf.md
new file mode 100644
index 00000000000..f0b029ed32e
--- /dev/null
+++ b/man/checkers/operatorEqToSelf.md
@@ -0,0 +1,59 @@
+# operatorEqToSelf
+
+**Message**: 'operator=' should check for assignment to self to avoid problems with dynamic memory.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+`operator=` allocates/frees a resource but never checks for `a = a;` (self-assignment) - freeing a
+resource and then trying to copy from the same, now-freed object corrupts the object.
+
+## Motivation
+
+`a = a;` is valid, if unusual, code - and an `operator=` that frees its own current resource before
+copying from the source object can, on self-assignment, free the very resource it's about to read from,
+leaving the object corrupted (a use of freed memory, which is undefined behaviour) - though this depends
+on the new value actually being derived from the freed data; cppcheck flags any allocate-without-a-
+self-check pattern in `operator=`, not just the ones it can confirm would read something already freed.
+Since self-assignment is rare in normal code (it usually happens indirectly, through an alias or a
+container operation), this bug can go unnoticed for a long time.
+
+## How to fix
+
+Check for self-assignment (`this == &a`) before freeing anything, and return early if it's true.
+
+Before:
+```cpp
+#include <cstring>
+#include <cstdlib>
+class A {
+public:
+    char *s;
+    A & operator=(const A &a)
+    {
+        free(s); // <- breaks if 'a' is '*this'
+        s = strdup(a.s);
+        return *this;
+    }
+};
+```
+
+After:
+```cpp
+#include <cstring>
+#include <cstdlib>
+class A {
+public:
+    char *s;
+    A & operator=(const A &a)
+    {
+        if (this == &a)
+            return *this;
+        free(s);
+        s = strdup(a.s);
+        return *this;
+    }
+};
+```
diff --git a/man/checkers/operatorEqVarError.md b/man/checkers/operatorEqVarError.md
new file mode 100644
index 00000000000..aef42c8758c
--- /dev/null
+++ b/man/checkers/operatorEqVarError.md
@@ -0,0 +1,45 @@
+# operatorEqVarError
+
+**Message**: Member variable 'classname::varname' is not assigned a value in 'classname::operator='.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+Same idea as [missingMemberCopy.md](missingMemberCopy.md), but for a hand-written `operator=` instead
+of a copy constructor: one particular member is never assigned anywhere in it, even though everything
+else about the class suggests it should have been.
+
+## Motivation
+
+A hand-written `operator=` that forgets one member leaves that member holding its old value after an
+assignment that's supposed to make the object equal to another - a subtle bug that's easy to miss since
+the operator still compiles and mostly "looks right."
+
+## How to fix
+
+Assign the missing member too.
+
+Before:
+```cpp
+struct S {
+    int i{};
+    S() = default;
+    S& operator=(const S& s) { return *this; } // <- 'i' isn't assigned
+};
+```
+
+After:
+```cpp
+struct S {
+    int i{};
+    S() = default;
+    S& operator=(const S& s) { i = s.i; return *this; }
+};
+```
+
+## Related checkers
+
+- [missingMemberCopy.md](missingMemberCopy.md) - the same idea, for a hand-written copy/move constructor
+  instead of `operator=`.
diff --git a/man/checkers/oppositeExpression.md b/man/checkers/oppositeExpression.md
new file mode 100644
index 00000000000..f251057e3f2
--- /dev/null
+++ b/man/checkers/oppositeExpression.md
@@ -0,0 +1,37 @@
+# oppositeExpression
+
+**Message**: Opposite expression on both sides of '&&'.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+An expression and its logical/arithmetic opposite (`a` and `!a`, `x` and `-x`, ...) appear on both
+sides of the same operator - for `&&`/`||` in particular, this makes the whole condition always
+false/true.
+
+## Motivation
+
+Combining an expression with its own negation can never depend on the expression's actual value - the
+result is fixed in advance, which usually means one side was meant to refer to something else.
+
+## How to fix
+
+Before:
+```cpp
+void f(bool a) {
+    if (a && !a) {} // <- always false
+}
+```
+
+After:
+```cpp
+void f(bool a, bool b) {
+    if (a && !b) {}
+}
+```
+
+## Related checkers
+
+- [duplicateExpression.md](duplicateExpression.md) - the mirror-image mistake, comparing an expression against an identical copy of itself.
diff --git a/man/checkers/oppositeInnerCondition.md b/man/checkers/oppositeInnerCondition.md
new file mode 100644
index 00000000000..fe4b7b9453d
--- /dev/null
+++ b/man/checkers/oppositeInnerCondition.md
@@ -0,0 +1,47 @@
+# oppositeInnerCondition
+
+**Message**: Opposite inner 'if' condition leads to a dead code block.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+An `if` nested directly inside another `if` has a condition that contradicts the outer one, so its body
+is dead code.
+
+## Motivation
+
+Once the outer condition is true, the value(s) it depends on are already narrowed down; an inner
+condition that could only be true when the outer one is false can never actually run. This usually means
+either dead code left over from an edit, or a comparison that doesn't say what the author meant.
+
+This check may need `--check-level=exhaustive` to see every case.
+
+## How to fix
+
+Before:
+```cpp
+void f(int x) {
+    if (x == 1) {
+        if (x == 2) {} // <- dead code, x is already 1 here
+    }
+}
+```
+
+After: remove the dead inner check.
+```cpp
+void f(int x) {
+    if (x == 1) {
+    }
+}
+```
+
+## Related checkers
+
+- [identicalInnerCondition.md](identicalInnerCondition.md) - the same idea, but the inner condition
+  repeats the outer one exactly instead of contradicting it.
+- [overlappingInnerCondition.md](overlappingInnerCondition.md) - the same idea, but the inner condition
+  is already implied by (not identical to) the outer one.
+- [multiCondition.md](multiCondition.md) - the same idea, but for an `if`/`else if` chain instead of
+  nested `if`s.
diff --git a/man/checkers/orInComplexPattern.md b/man/checkers/orInComplexPattern.md
new file mode 100644
index 00000000000..1d8684f6756
--- /dev/null
+++ b/man/checkers/orInComplexPattern.md
@@ -0,0 +1,31 @@
+# orInComplexPattern
+
+**Message**: Found \"|\" in complex pattern. You probably intend to use \"%or%\".<br/>
+**Category**: Code Quality<br/>
+**Severity**: Error<br/>
+**Language**: C++ (cppcheck's own source code only)
+
+## Description
+
+A pattern uses a literal `|`/`||` instead of the pattern language's `%or%`/`%oror%`.
+
+This is not a general-purpose checker for arbitrary C/C++ programs - see
+[simplePatternError.md](simplePatternError.md) for the shared background on this internal,
+cppcheck-source-only checker.
+
+## Motivation
+
+A literal `|`/`||` character in a pattern string matches the literal token `|`/`||` in the code being
+analyzed - it does not mean "either of these two alternatives" the way `%or%`/`%oror%` does. This is an
+easy habit to slip into for anyone used to regular-expression syntax, and it silently changes what the
+pattern matches.
+
+## How to fix
+
+Replace the literal `|`/`||` with `%or%`/`%oror%` when the intent is "match either of these token
+types", keeping the literal form only when the code being analyzed should actually contain a `|`/`||`
+character.
+
+## Related checkers
+
+- [unknownPattern.md](unknownPattern.md) - a different kind of placeholder mistake in the same pattern language.
diff --git a/man/checkers/overlappingInnerCondition.md b/man/checkers/overlappingInnerCondition.md
new file mode 100644
index 00000000000..763edbf7512
--- /dev/null
+++ b/man/checkers/overlappingInnerCondition.md
@@ -0,0 +1,47 @@
+# overlappingInnerCondition
+
+**Message**: Overlapping inner 'if' condition is always true.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+An `if` nested directly inside another `if` has a condition that's already guaranteed by the outer one
+(a bitwise overlap, for example `x == 1` outside and `x & 7` inside), so the inner condition is always
+true.
+
+## Motivation
+
+If the outer condition already guarantees the inner one, the inner `if` can never be false - it adds
+nothing but a false impression that there's a real extra check happening.
+
+This check may need `--check-level=exhaustive` to see every case.
+
+## How to fix
+
+Before:
+```cpp
+void f(int x) {
+    if (x == 1) {
+        if (x & 7) {} // <- always true, implied by x == 1
+    }
+}
+```
+
+After: remove the redundant inner check.
+```cpp
+void f(int x) {
+    if (x == 1) {
+    }
+}
+```
+
+## Related checkers
+
+- [identicalInnerCondition.md](identicalInnerCondition.md) - the same idea, but the inner condition is
+  identical to the outer one rather than merely implied by it.
+- [oppositeInnerCondition.md](oppositeInnerCondition.md) - the same idea, but the inner condition
+  contradicts the outer one instead.
+- [multiCondition.md](multiCondition.md) - the same idea, but for an `if`/`else if` chain instead of
+  nested `if`s.
diff --git a/man/checkers/overlappingStrcmp.md b/man/checkers/overlappingStrcmp.md
new file mode 100644
index 00000000000..e10f84108cb
--- /dev/null
+++ b/man/checkers/overlappingStrcmp.md
@@ -0,0 +1,39 @@
+# overlappingStrcmp
+
+**Message**: The expression 'strcmp(x, "b") != 0' is suspicious. It overlaps 'strcmp(x, "a") == 0'.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+`strcmp(x, "a") == 0 || strcmp(x, "b") != 0` - the `!= 0` half is always true whenever the `== 0` half
+is false, since `x` can't equal `"a"` and simultaneously differ from `"a"` in the case that makes the
+first half false. In other words, the second condition doesn't add anything meaningful and is likely a
+copy-paste mistake.
+
+## Motivation
+
+An `||` of two `strcmp()` checks like this always evaluates to true regardless of what `x` actually is,
+which is easy to miss since each half looks like a reasonable, independent check on its own.
+
+## How to fix
+
+Before:
+```cpp
+void f(const char *str) {
+    if (strcmp(str, "a") == 0 || strcmp(str, "b") != 0) {} // <- always true
+}
+```
+
+After:
+```cpp
+void f(const char *str) {
+    if (strcmp(str, "a") == 0 || strcmp(str, "c") == 0) {}
+}
+```
+
+## Related checkers
+
+- [sprintfOverlappingData.md](sprintfOverlappingData.md) - an unrelated string-function misuse in the
+  same checker, about `sprintf()`'s destination and source arguments overlapping.
diff --git a/man/checkers/overlappingWriteFunction.md b/man/checkers/overlappingWriteFunction.md
new file mode 100644
index 00000000000..44e8ac2f3f5
--- /dev/null
+++ b/man/checkers/overlappingWriteFunction.md
@@ -0,0 +1,49 @@
+# overlappingWriteFunction
+
+**Message**: Overlapping read/write in memcpy() is undefined behavior<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A call to a function like `memcpy()` is given source and destination ranges that overlap - only
+`memmove()`-family functions are allowed to have overlapping ranges; `memcpy()` and similar are
+undefined behaviour if the ranges overlap.
+
+## Motivation
+
+`memcpy()` (unlike `memmove()`) is free to copy in whatever order is fastest for the platform - forwards,
+backwards, or in chunks - on the assumption that the source and destination never overlap. If they do
+overlap, the copy can partially overwrite data it still needs to read, corrupting the result in a way
+that can differ between compilers, optimization levels, or standard library implementations. cppcheck
+only reports this when it can work out the exact size being copied; it does not warn just because two
+ranges look suspiciously close together with a size it can't pin down.
+
+## How to fix
+
+Use `memmove()` instead of `memcpy()` when the source and destination ranges might overlap.
+
+Before:
+```cpp
+#include <cstring>
+void foo() {
+    char a[10];
+    memcpy(a, a+1, 2u); // <- source and destination overlap
+}
+```
+
+After:
+```cpp
+#include <cstring>
+void foo() {
+    char a[10];
+    memmove(a, a+1, 2u); // memmove() is defined to handle overlap safely
+}
+```
+
+## Related checkers
+
+- [overlappingWriteUnion.md](overlappingWriteUnion.md) - the same underlying overlapping-read/write
+  hazard, but for reading and writing two overlapping members of a union in one expression instead of a
+  function call.
diff --git a/man/checkers/overlappingWriteUnion.md b/man/checkers/overlappingWriteUnion.md
new file mode 100644
index 00000000000..f9adca82f0f
--- /dev/null
+++ b/man/checkers/overlappingWriteUnion.md
@@ -0,0 +1,51 @@
+# overlappingWriteUnion
+
+**Message**: Overlapping read/write of union is undefined behavior<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A union member is written using the value of a different, overlapping member of the same union in the
+same expression (for example `u.i = u.f;`) - the read and write overlap in memory in a way the compiler
+isn't required to sequence safely.
+
+## Motivation
+
+All members of a union share the same storage. Reading one member while writing a different, overlapping
+one in the same expression is undefined behaviour: the compiler is free to assume the read and write
+don't alias, and can reorder or optimize the expression in ways that don't match what the code visually
+appears to do.
+
+## How to fix
+
+Read the source member into a separate variable first, then write the destination member from that
+variable.
+
+Before:
+```cpp
+void foo() {
+    union { int i; float f; } u;
+    u.i = 0;
+    u.i = u.f; // <- reads and writes the same union storage in one expression
+}
+```
+
+After:
+```cpp
+void foo() {
+    union { int i; float f; } u;
+    u.i = 0;
+    float g = u.f;
+    u.i = (int)g;
+}
+```
+
+## Related checkers
+
+- [overlappingWriteFunction.md](overlappingWriteFunction.md) - the same underlying overlapping-read/write
+  hazard, but for a function call (like `memcpy()`) given overlapping source/destination ranges instead
+  of a union member access.
+- [UnionZeroInit.md](UnionZeroInit.md) - a different union-related pitfall, about a union not being
+  fully zeroed by its initializer.
diff --git a/man/checkers/passedByValue.md b/man/checkers/passedByValue.md
new file mode 100644
index 00000000000..b48a9a0f13c
--- /dev/null
+++ b/man/checkers/passedByValue.md
@@ -0,0 +1,43 @@
+# passedByValue
+
+**Message**: Parameter 'x' should be passed by const reference.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Performance<br/>
+**Language**: C++
+
+## Description
+
+A function parameter of a class/struct/container type (not a small built-in type) is passed by value
+and never modified, so it's copied for nothing - it could be a `const` reference instead.
+
+## Motivation
+
+Passing a non-trivial object by value makes an unnecessary copy every time the function is called; a
+`const` reference avoids the copy while still preventing the function from modifying the caller's
+object.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+#include <cstdio>
+void f(std::string str) { // <- an unnecessary copy of 'str' is made
+    printf("%s\n", str.c_str());
+}
+```
+
+After:
+```cpp
+#include <string>
+#include <cstdio>
+void f(const std::string& str) {
+    printf("%s\n", str.c_str());
+}
+```
+
+## Related checkers
+
+- [passedByValueCallback.md](passedByValueCallback.md) - the same idea, but for a parameter of a
+  function used as a callback.
+- [iterateByValue.md](iterateByValue.md) - the same idea, for a range-based `for` loop's variable.
diff --git a/man/checkers/passedByValueCallback.md b/man/checkers/passedByValueCallback.md
new file mode 100644
index 00000000000..46561cd4c2c
--- /dev/null
+++ b/man/checkers/passedByValueCallback.md
@@ -0,0 +1,43 @@
+# passedByValueCallback
+
+**Message**: Parameter 'x' should be passed by const reference. However it seems that 'f' is a callback function.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Performance<br/>
+**Language**: C++
+
+## Description
+
+Same idea as [passedByValue.md](passedByValue.md): a non-trivial parameter is passed by value and never
+modified, so it's copied for nothing. This variant is for when the function is used as a callback -
+fixing it may also require adjusting the function pointer type it's assigned to.
+
+## Motivation
+
+Passing a non-trivial object by value makes an unnecessary copy every time the function is called. The
+callback case is called out separately because the fix isn't purely local: the function pointer type
+also needs to change.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+#include <cstdio>
+void setCb(void (*cb)(std::string));
+void cb(std::string s) { printf("%s", s.c_str()); } // <- an unnecessary copy of 's' is made
+void f() { setCb(cb); }
+```
+
+After:
+```cpp
+#include <string>
+#include <cstdio>
+void setCb(void (*cb)(const std::string&));
+void cb(const std::string& s) { printf("%s", s.c_str()); }
+void f() { setCb(cb); }
+```
+
+## Related checkers
+
+- [passedByValue.md](passedByValue.md) - the same idea, for a parameter that isn't part of a callback
+  function's signature.
diff --git a/man/checkers/pointerAdditionResultNotNull.md b/man/checkers/pointerAdditionResultNotNull.md
new file mode 100644
index 00000000000..35e1971a102
--- /dev/null
+++ b/man/checkers/pointerAdditionResultNotNull.md
@@ -0,0 +1,38 @@
+# pointerAdditionResultNotNull
+
+**Message**: Comparison is wrong. Result of 'ptr+1' can't be 0 unless there is pointer overflow, and pointer overflow is undefined behaviour.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+Pointer arithmetic is compared against `NULL`/`0`, which can only be true through undefined-behaviour
+pointer overflow.
+
+## Motivation
+
+Adding a positive offset to a valid, non-null pointer can never legitimately produce a null pointer - the
+only way the comparison could be true is via pointer overflow, which is itself undefined behaviour. A
+check written this way doesn't do what it looks like it does.
+
+## How to fix
+
+Before:
+```cpp
+void f(char *p) {
+    if (p + 12 == 0) {} // <- relies on pointer overflow, which is UB
+}
+```
+
+After:
+```cpp
+void f(char *p) {
+    if (p == nullptr) {}
+}
+```
+
+## Related checkers
+
+- [invalidTestForOverflow.md](invalidTestForOverflow.md) - a related undefined-behaviour trap, relying
+  on signed integer overflow instead of pointer overflow.
diff --git a/man/checkers/pointerArithBool.md b/man/checkers/pointerArithBool.md
new file mode 100644
index 00000000000..a14042e59a9
--- /dev/null
+++ b/man/checkers/pointerArithBool.md
@@ -0,0 +1,33 @@
+# pointerArithBool
+
+**Message**: Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour.<br/>
+**Category**: Correctness<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+The result of pointer arithmetic (`p + 1`, `p - 1`, ...) is used directly as a boolean condition.
+
+## Motivation
+
+A pointer produced by arithmetic is essentially always non-null (unless the arithmetic itself is
+undefined behaviour), so converting it straight to `bool` is always `true` and rarely what the code's
+author meant - usually a dereference was intended instead.
+
+## How to fix
+
+Before:
+```cpp
+void f(char *p) {
+    if (p + 1) {} // <- always true unless undefined behaviour
+}
+```
+
+After:
+```cpp
+void f(char *p) {
+    if (p && *(p + 1)) {}
+}
+```
+
diff --git a/man/checkers/pointerLessThanZero.md b/man/checkers/pointerLessThanZero.md
new file mode 100644
index 00000000000..eb696d0d1b4
--- /dev/null
+++ b/man/checkers/pointerLessThanZero.md
@@ -0,0 +1,52 @@
+# pointerLessThanZero and pointerPositive
+
+**Message**: A pointer can not be negative so it is either pointless or an error to check if it is.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A pointer is compared against `0` with `<` (`pointerLessThanZero`) or `>=` (`pointerPositive`) - a
+pointer value can't be negative, so the first can never be true and the second is always true.
+
+## Motivation
+
+Both comparisons are tautological for a pointer, so the branch they guard either never runs or always
+runs - not what the code visibly appears to be testing, and usually a sign that `== nullptr`/`!=
+nullptr` was intended instead.
+
+## How to fix
+
+Before:
+```cpp
+void foo(const int* x) {
+  if (x < 0) {} // <- can never be true
+}
+```
+
+After:
+```cpp
+void foo(const int* x) {
+  if (x == nullptr) {}
+}
+```
+
+Before:
+```cpp
+void foo(const int* x) {
+  if (x >= 0) {} // <- always true
+}
+```
+
+After:
+```cpp
+void foo(const int* x) {
+  if (x != nullptr) {}
+}
+```
+
+## Related checkers
+
+- [unsignedLessThanZero.md](unsignedLessThanZero.md) - the same idea, for an unsigned integer compared
+  against `0` instead of a pointer.
diff --git a/man/checkers/pointerOutOfBounds.md b/man/checkers/pointerOutOfBounds.md
new file mode 100644
index 00000000000..850a4926710
--- /dev/null
+++ b/man/checkers/pointerOutOfBounds.md
@@ -0,0 +1,47 @@
+# pointerOutOfBounds and pointerOutOfBoundsCond
+
+**Message**: Undefined behaviour, pointer arithmetic 'a+20' is out of bounds.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Portability/Warning<br/>
+**Language**: C/C++
+
+## Description
+
+Pointer arithmetic (`p + n`, `p - n`, `p += n`, `p++`, ...) produces a pointer that lands outside the
+array/buffer `p` points into:
+
+- `pointerOutOfBounds`: cppcheck knows for certain the result is out of bounds. This is undefined
+  behaviour even before the resulting pointer is dereferenced.
+- `pointerOutOfBoundsCond`: the out-of-bounds result only holds on one branch of a condition checked
+  elsewhere - so either that condition is redundant, or this arithmetic is a bug.
+
+## Motivation
+
+Forming a pointer that lands outside the bounds of the array it points into is undefined behaviour in
+C/C++, even if that pointer is never dereferenced - the language only guarantees pointer arithmetic
+stays valid up to one-past-the-end of an array. Compilers are allowed to (and do) optimize based on
+this assumption, which can make the resulting bug manifest in surprising, hard-to-reproduce ways.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    int a[10];
+    int *p = a + 20; // <- pointerOutOfBounds
+}
+```
+
+After:
+```cpp
+void f() {
+    int a[20];
+    int *p = a + 19;
+}
+```
+
+## Related checkers
+
+- [arrayIndexOutOfBounds.md](arrayIndexOutOfBounds.md) - the array-indexing equivalent of this check.
+- [ctuPointerArith.md](ctuPointerArith.md) - the same idea, found by cppcheck's whole-program analysis
+  across function calls.
diff --git a/man/checkers/pointerSize.md b/man/checkers/pointerSize.md
new file mode 100644
index 00000000000..518278655d1
--- /dev/null
+++ b/man/checkers/pointerSize.md
@@ -0,0 +1,59 @@
+# pointerSize and sizeofDivisionMemfunc
+
+**Message**: Size of pointer 'x' used instead of size of its data.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+`sizeof(ptr)` (the size of the pointer itself) is used where the size of what it points to was clearly
+intended, as an argument to `malloc`/`calloc`/`memset`/`memcpy`/`memmove`/`strncpy`/`strncmp`/`strncat`:
+
+- `pointerSize`: `sizeof(ptr)` is passed directly as (or as part of) the size argument.
+- `sizeofDivisionMemfunc`: the size argument is computed by *dividing* by `sizeof(ptr)`, when
+  multiplying was clearly intended.
+
+## Motivation
+
+`sizeof(ptr)` is the fixed size of the pointer itself (typically 4 or 8 bytes), not the size of the
+buffer it points to. Using it to size a `malloc`/`memset`/`memcpy`-family call is a classic copy-paste
+bug: it usually still compiles and often still "sort of works" for small, coincidentally-sized cases,
+while silently under- or over-sizing the real operation. The line itself is just a miscalculated size -
+the actual undefined behaviour comes later, if something then reads or writes the buffer assuming it's
+the size that was intended rather than the (usually too small) size it actually got.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    int *x = (int*)malloc(sizeof(x)); // <- size of the pointer, not what it points to
+}
+```
+
+After:
+```cpp
+void f() {
+    int *x = (int*)malloc(sizeof(*x));
+}
+```
+
+Before:
+```cpp
+void f(char* dst, char* src, int size) {
+    memcpy(dst, src, size / sizeof(dst)); // <- dividing by the pointer's size, not the data's
+}
+```
+
+After:
+```cpp
+void f(char* dst, char* src, int size) {
+    memcpy(dst, src, size);
+}
+```
+
+## Related checkers
+
+- [multiplySizeof.md](multiplySizeof.md) - a related but more general `sizeof(a) * sizeof(b)` /
+  `sizeof(a) / sizeof(b)` mistake, not specific to these memory functions.
diff --git a/man/checkers/postfixOperator.md b/man/checkers/postfixOperator.md
new file mode 100644
index 00000000000..99c249ef73e
--- /dev/null
+++ b/man/checkers/postfixOperator.md
@@ -0,0 +1,51 @@
+# postfixOperator
+
+**Message**: Prefer prefix ++/-- operators for non-primitive types.<br/>
+**Category**: Performance<br/>
+**Severity**: Performance<br/>
+**Language**: C++ only
+
+## Description
+
+This checker suggests using the prefix `++`/`--` operator instead of postfix on a variable (or member
+variable) of a non-primitive type - a class, struct or union instance, or a type whose name ends in
+`iterator`, `const_iterator`, `reverse_iterator` or `const_reverse_iterator` - whenever the old value
+produced by the postfix operator is not actually used, for example as a whole statement (`k++;`) or in
+a loop's increment clause (`for (...; ...; i++)`).
+
+It does not warn when the postfix result is genuinely used, for example when passed as a function
+argument (`foo(a++)`), since switching to prefix there would change the program's behavior, not just
+its performance.
+
+This checker only runs when the `performance` severity is enabled, and only applies to C++ (there are
+no classes in C).
+
+## Motivation
+
+For a non-primitive type, the postfix operator typically has to make a copy of the object's previous
+value before modifying it, so that the old value can be returned - even when nothing uses that old
+value. The prefix operator does not need this copy. Built-in types like `int` and pointers don't pay
+for this copy, which is why the checker never warns about those.
+
+## How to fix
+
+Use the prefix operator when the previous value isn't needed.
+
+Before:
+```cpp
+class BigNumber { /* ... */ };
+
+void f(BigNumber& n) {
+    n++; // <- postfixOperator: the returned old value is discarded
+}
+```
+
+After:
+```cpp
+class BigNumber { /* ... */ };
+
+void f(BigNumber& n) {
+    ++n;
+}
+```
+
diff --git a/man/checkers/preprocessorErrorDirective.md b/man/checkers/preprocessorErrorDirective.md
index 44fcb4c1a28..c1a9a2c49c2 100644
--- a/man/checkers/preprocessorErrorDirective.md
+++ b/man/checkers/preprocessorErrorDirective.md
@@ -1,4 +1,3 @@
-
 # preprocessorErrorDirective
 
 **Message**: #error message<br/>
diff --git a/man/checkers/publicAllocationError.md b/man/checkers/publicAllocationError.md
new file mode 100644
index 00000000000..8426a7eba4c
--- /dev/null
+++ b/man/checkers/publicAllocationError.md
@@ -0,0 +1,49 @@
+# publicAllocationError
+
+**Message**: Possible leak in public function. The pointer 'x' is not deallocated before it is allocated.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+A public member function's first action is to allocate a new value directly into a member pointer,
+without checking or freeing whatever it already pointed to - calling this function on an
+already-initialized object leaks the old value.
+
+## Motivation
+
+A public function can be called at any time, including on an object that already holds a previous
+allocation in that member. Overwriting the member with a fresh allocation, without freeing what it
+pointed to first, leaks the old value every time the function is called on an object that already has
+one - which working code calling this function more than once will do.
+
+## How to fix
+
+Before:
+```cpp
+class A {
+    int *p;
+public:
+    A() : p(nullptr) {}
+    void init() { p = new int; } // <- leaks the old 'p' if init() is called twice
+};
+```
+
+After:
+```cpp
+class A {
+    int *p;
+public:
+    A() : p(nullptr) {}
+    void init() {
+        delete p;
+        p = new int;
+    }
+};
+```
+
+## Related checkers
+
+- [unsafeClassCanLeak.md](unsafeClassCanLeak.md) - a related class-ownership leak, where nothing ever
+  frees an allocated member at all.
diff --git a/man/checkers/raceAfterInterlockedDecrement.md b/man/checkers/raceAfterInterlockedDecrement.md
new file mode 100644
index 00000000000..f2d24288143
--- /dev/null
+++ b/man/checkers/raceAfterInterlockedDecrement.md
@@ -0,0 +1,49 @@
+# raceAfterInterlockedDecrement
+
+**Message**: Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.<br/>
+**Category**: Correctness<br/>
+**Severity**: Error<br/>
+**Language**: Windows platform only
+
+## Description
+
+Code checks a variable's value directly right after calling the Windows `InterlockedDecrement()` API on
+it - between the API call and the check, another thread could have already changed the variable again,
+so only the value `InterlockedDecrement()` itself returned can be trusted.
+
+## Motivation
+
+`InterlockedDecrement()` exists specifically to make the decrement-and-check atomic across threads. If
+the code decrements the variable and then reads it again as a separate step, another thread can run in
+between and change the value - the whole point of using the interlocked API is defeated, reintroducing
+the exact race condition it was meant to prevent. cppcheck recognizes this purely from the code shape (an
+`InterlockedDecrement()` call immediately followed by a plain re-read of the same variable) - it has no
+way to confirm another thread genuinely touches that variable, so this is a strong hint of a real race,
+not a proof that one exists in every case it's reported.
+
+## How to fix
+
+Use the value `InterlockedDecrement()` itself returns, instead of re-reading the variable afterwards.
+
+Before:
+```cpp
+void destroy();
+void f() {
+    int counter = 0;
+    InterlockedDecrement(&counter);
+    if (counter) // <- another thread could change 'counter' in between
+        return;
+    destroy();
+}
+```
+
+After:
+```cpp
+void destroy();
+void f() {
+    int counter = 0;
+    if (InterlockedDecrement(&counter) == 0)
+        return;
+    destroy();
+}
+```
diff --git a/man/checkers/readWriteOnlyFile.md b/man/checkers/readWriteOnlyFile.md
new file mode 100644
index 00000000000..2b4f3f5da30
--- /dev/null
+++ b/man/checkers/readWriteOnlyFile.md
@@ -0,0 +1,52 @@
+# readWriteOnlyFile
+
+**Message**: Read operation on a file that was opened only for writing.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+The file was opened in a mode (`"w"`) that only allows writing, and the code then reads from it.
+
+## Motivation
+
+Reading from a stream that was opened write-only is undefined behaviour in the C standard - even where
+an implementation happens to do something predictable with it, code relying on that isn't portable.
+cppcheck follows a `FILE*`'s open mode only through straight-line code in a single function; once it's
+passed to another function, or is a global/member variable, the tracking is dropped rather than
+guessed at, so this check finding nothing does not mean a file is necessarily being used consistently
+with how it was opened.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f() {
+    FILE *fp = fopen("a.txt", "w");
+    if (!fp) return;
+    char buf[10];
+    fread(buf, 1, 10, fp); // <- 'fp' was only opened for writing
+    fclose(fp);
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f() {
+    FILE *fp = fopen("a.txt", "r");
+    if (!fp) return;
+    char buf[10];
+    fread(buf, 1, 10, fp);
+    fclose(fp);
+}
+```
+
+## Related checkers
+
+- [writeReadOnlyFile.md](writeReadOnlyFile.md) - the opposite mismatch: writing to a read-only file.
+- [useClosedFile.md](useClosedFile.md), [IOWithoutPositioning.md](IOWithoutPositioning.md),
+  [seekOnAppendedFile.md](seekOnAppendedFile.md), [incompatibleFileOpen.md](incompatibleFileOpen.md) -
+  other checks that follow the same `FILE*` through a function.
diff --git a/man/checkers/redundantAssignInSwitch.md b/man/checkers/redundantAssignInSwitch.md
new file mode 100644
index 00000000000..b033ccabd95
--- /dev/null
+++ b/man/checkers/redundantAssignInSwitch.md
@@ -0,0 +1,55 @@
+# redundantAssignInSwitch
+
+**Message**: Variable 'x' is reassigned a value before the old one has been used.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A variable is assigned a value in one `switch` `case`, and that value is overwritten by another
+assignment in a later `case` that it falls through into, without the value ever being read in between.
+
+## Motivation
+
+This is the `switch`-fallthrough flavor of a redundant assignment, and it's usually a sign of a missing
+`break;` rather than an intentional fallthrough - if the fallthrough really is intentional, the first
+assignment is still pointless and worth removing for clarity.
+
+## How to fix
+
+Before:
+```cpp
+void bar(int);
+void foo(int a) {
+    int y = 1;
+    switch (a) {
+    case 2:
+        y = 2; // <- falls through into case 3, missing 'break;'?
+    case 3:
+        y = 3;
+    }
+    bar(y);
+}
+```
+
+After:
+```cpp
+void bar(int);
+void foo(int a) {
+    int y = 1;
+    switch (a) {
+    case 2:
+        y = 2;
+        break;
+    case 3:
+        y = 3;
+    }
+    bar(y);
+}
+```
+
+## Related checkers
+
+- [redundantAssignment.md](redundantAssignment.md) - the same idea outside of a `switch`.
+- [redundantBitwiseOperationInSwitch.md](redundantBitwiseOperationInSwitch.md) - the bitwise-assignment equivalent in a `switch`.
diff --git a/man/checkers/redundantAssignment.md b/man/checkers/redundantAssignment.md
new file mode 100644
index 00000000000..7952393b49e
--- /dev/null
+++ b/man/checkers/redundantAssignment.md
@@ -0,0 +1,41 @@
+# redundantAssignment
+
+**Message**: Variable 'x' is reassigned a value before the old one has been used.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A variable is given a value, but that value is completely overwritten by another assignment before
+it's ever read.
+
+## Motivation
+
+This isn't wrong in the sense of producing an incorrect result today, but it signals that something
+didn't happen the way the author intended: a value that was supposed to be used got clobbered first.
+It's also a prime candidate for dead-code cleanup, and occasionally hides an outright bug (for example
+a copy-pasted assignment that should have targeted a different variable).
+
+## How to fix
+
+Before:
+```cpp
+void f(int i) {
+    i = 1;
+    i = 1; // <- the first assignment is pointless
+}
+```
+
+After:
+```cpp
+void f(int i) {
+    i = 1;
+}
+```
+
+## Related checkers
+
+- [redundantAssignInSwitch.md](redundantAssignInSwitch.md) - the same idea, but across fall-through `switch` cases.
+- [redundantInitialization.md](redundantInitialization.md) - the same idea, but for a variable's initializer value.
+- [redundantCopyLocalConst.md](redundantCopyLocalConst.md) - a related redundant-copy check for `const` variables.
diff --git a/man/checkers/redundantBitwiseOperationInSwitch.md b/man/checkers/redundantBitwiseOperationInSwitch.md
new file mode 100644
index 00000000000..23d61a5d227
--- /dev/null
+++ b/man/checkers/redundantBitwiseOperationInSwitch.md
@@ -0,0 +1,52 @@
+# redundantBitwiseOperationInSwitch
+
+**Message**: Redundant bitwise operation on 'x' in 'switch' statement. 'break;' missing?<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+The same bitwise assignment (`x |= 1`, `x &= 1`, ...) is applied to a variable twice across
+fall-through `switch` cases, with nothing reading the value in between.
+
+## Motivation
+
+Just like a redundant plain assignment, this is usually a sign of a missing `break;` between two
+`case` labels - the first bitwise operation has no effect once the identical one runs again in the
+next case.
+
+## How to fix
+
+Before:
+```cpp
+void foo(int a) {
+    int y = 1;
+    switch (a) {
+    case 2:
+        y |= 3; // <- same operation repeated in case 3
+    case 3:
+        y |= 3;
+        break;
+    }
+}
+```
+
+After:
+```cpp
+void foo(int a) {
+    int y = 1;
+    switch (a) {
+    case 2:
+        y |= 3;
+        break;
+    case 3:
+        y |= 3;
+        break;
+    }
+}
+```
+
+## Related checkers
+
+- [redundantAssignInSwitch.md](redundantAssignInSwitch.md) - the plain-assignment equivalent in a `switch`.
diff --git a/man/checkers/redundantCondition.md b/man/checkers/redundantCondition.md
new file mode 100644
index 00000000000..e6066811f32
--- /dev/null
+++ b/man/checkers/redundantCondition.md
@@ -0,0 +1,42 @@
+# redundantCondition
+
+**Message**: Redundant condition: The condition 'x != 4' is redundant since 'x == 3' is sufficient.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+Two comparisons on the same variable, joined by `&&`/`||`, where one comparison is already implied by
+the other and adds nothing.
+
+## Motivation
+
+If `x == 3` is true, `x != 4` is automatically true too - so `(x == 3) && (x != 4)` behaves exactly like
+`x == 3` alone. The extra comparison doesn't change what the code does, only makes it longer and harder
+to read, and can suggest a stricter check was intended than what's actually enforced.
+
+This check may need `--check-level=exhaustive` to see every case.
+
+## How to fix
+
+Before:
+```cpp
+void f(int x, int a) {
+    if ((x==3) && (x!=4)) // <- 'x != 4' adds nothing once 'x == 3' is true
+        a++;
+}
+```
+
+After:
+```cpp
+void f(int x, int a) {
+    if (x==3)
+        a++;
+}
+```
+
+## Related checkers
+
+- [incorrectLogicOperator.md](incorrectLogicOperator.md) - the same style of two-comparisons-on-one-variable
+  analysis, but for when the combination is always entirely true or entirely false.
diff --git a/man/checkers/redundantContinue.md b/man/checkers/redundantContinue.md
new file mode 100644
index 00000000000..fe5208c340e
--- /dev/null
+++ b/man/checkers/redundantContinue.md
@@ -0,0 +1,44 @@
+# redundantContinue
+
+**Message**: 'continue' is redundant since it is the last statement in a loop.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A `continue;` is the last statement in a loop body - the loop was about to move to its next iteration
+anyway, so it has no effect.
+
+## Motivation
+
+A `continue;` in this position doesn't change what the code does, but it can mislead a reader into
+thinking it matters, or that it's guarding something that comes after it in the loop body (when nothing
+does).
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f() {
+    for (int i = 0; i < 10; ++i) {
+        printf("i = %d\n", i);
+        continue; // <- this is already the end of the loop body
+    }
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f() {
+    for (int i = 0; i < 10; ++i) {
+        printf("i = %d\n", i);
+    }
+}
+```
+
+## Related checkers
+
+- [unreachableCode.md](unreachableCode.md) - code that can never run at all, rather than a no-op statement.
diff --git a/man/checkers/redundantCopy.md b/man/checkers/redundantCopy.md
new file mode 100644
index 00000000000..909454d8747
--- /dev/null
+++ b/man/checkers/redundantCopy.md
@@ -0,0 +1,41 @@
+# redundantCopy
+
+**Message**: Buffer 'x' is being written before its old content has been used.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Performance<br/>
+**Language**: C/C++
+
+## Description
+
+A buffer is written, then written again before its first content is ever read - the buffer equivalent
+of a redundant variable assignment. In current versions of cppcheck, this specific message is not
+actually produced for any input: the code path that would emit it exists in the source but isn't
+reachable in practice, so don't expect a warning here even for code that matches the pattern below.
+
+## Motivation
+
+Writing to a buffer twice with nothing reading it in between wastes the work of the first write, which
+is the real, intended idea behind this check - a buffer written twice (by `memset`/`strcpy`/similar)
+with no read in between, including across fall-through `switch` cases. If you're looking for the
+closest actively-working equivalent, see [redundantCopyLocalConst.md](redundantCopyLocalConst.md) (for
+`const` variables) or [redundantAssignment.md](redundantAssignment.md) (the same idea for a plain
+variable instead of a buffer).
+
+## How to fix
+
+Remove or combine the redundant write so the buffer is only written once before it's read:
+
+```cpp
+#include <cstring>
+void bar();
+void f() {
+    char a[10];
+    memset(a, 0, 10);
+    bar();
+}
+```
+
+## Related checkers
+
+- [redundantAssignment.md](redundantAssignment.md) - the same idea for a plain variable instead of a buffer.
+- [redundantCopyLocalConst.md](redundantCopyLocalConst.md) - a different, currently-working redundant-copy check for `const` variables.
diff --git a/man/checkers/redundantCopyLocalConst.md b/man/checkers/redundantCopyLocalConst.md
new file mode 100644
index 00000000000..3ffb3f4214f
--- /dev/null
+++ b/man/checkers/redundantCopyLocalConst.md
@@ -0,0 +1,39 @@
+# redundantCopyLocalConst
+
+**Message**: Use const reference for 'x' to avoid unnecessary data copying.<br/>
+**Category**: Performance<br/>
+**Severity**: Performance<br/>
+**Language**: C/C++
+
+## Description
+
+A local variable is declared `const` and initialized as a copy of an existing object that outlives it -
+since the copy is never modified, a `const` reference would do the same job without copying.
+
+## Motivation
+
+Copying an object (a `std::string`, a container, any non-trivial type) costs time and memory for no
+benefit when the copy is only ever read. A `const&` avoids the copy entirely while behaving identically
+from the reader's point of view.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+void f(std::string str) {
+    std::string s2 = str; // <- 's2' is never modified
+}
+```
+
+After:
+```cpp
+#include <string>
+void f(const std::string& str) {
+    const std::string& s2 = str;
+}
+```
+
+## Related checkers
+
+- [redundantCopy.md](redundantCopy.md) - the buffer-write equivalent of this idea.
diff --git a/man/checkers/redundantIfRemove.md b/man/checkers/redundantIfRemove.md
new file mode 100644
index 00000000000..7fc75a16340
--- /dev/null
+++ b/man/checkers/redundantIfRemove.md
@@ -0,0 +1,43 @@
+# redundantIfRemove
+
+**Message**: Redundant checking of STL container element existence before removing it.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+`container.find(x) != container.end()` (or `container.find(x) != container.npos`) is checked before
+calling `container.remove(x)` - `remove()` on an absent element is a harmless no-op, so the check adds
+nothing.
+
+## Motivation
+
+The existence check reads as if it's guarding against a problem, but `remove()` on an element that
+isn't there simply does nothing - it's not an error condition that needs to be avoided. The check is
+pure overhead: an extra lookup, and an extra branch for a reader to understand, for no behavioral
+difference.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+void f(std::string haystack, std::string needle) {
+    if (haystack.find(needle) != haystack.end()) // <- remove() is safe on a miss
+        haystack.remove(needle);
+}
+```
+
+After:
+```cpp
+#include <string>
+void f(std::string haystack, std::string needle) {
+    haystack.remove(needle);
+}
+```
+
+## Related checkers
+
+- [stlFindInsert.md](stlFindInsert.md) - the same kind of redundant-check-before-a-safe-operation
+  pattern, for `insert()` instead of `remove()`.
diff --git a/man/checkers/redundantInitialization.md b/man/checkers/redundantInitialization.md
new file mode 100644
index 00000000000..734012a41a5
--- /dev/null
+++ b/man/checkers/redundantInitialization.md
@@ -0,0 +1,41 @@
+# redundantInitialization
+
+**Message**: Redundant initialization for 'x'. The initialized value is overwritten before it is read.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A variable's initializer value is overwritten before it's read - the same idea as a redundant
+assignment, but for the value given at declaration.
+
+## Motivation
+
+Giving a variable an initial value only for it to be immediately replaced wastes the work of computing
+that initial value, and can mislead a reader into thinking the initializer matters.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+std::string f() {
+    std::string s = "abc";
+    s = "def"; // <- the "abc" initializer is never read
+    return s;
+}
+```
+
+After:
+```cpp
+#include <string>
+std::string f() {
+    std::string s = "def";
+    return s;
+}
+```
+
+## Related checkers
+
+- [redundantAssignment.md](redundantAssignment.md) - the same idea for a later assignment instead of the initializer.
diff --git a/man/checkers/redundantNextPrevious.md b/man/checkers/redundantNextPrevious.md
new file mode 100644
index 00000000000..78790345927
--- /dev/null
+++ b/man/checkers/redundantNextPrevious.md
@@ -0,0 +1,35 @@
+# redundantNextPrevious
+
+**Message**: Statement is redundant, code can be simplified.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++ (cppcheck's own source code only)
+
+## Description
+
+A chain like `tok->next()->previous()` can be simplified (here, to just `tok`).
+
+This is not a general-purpose checker for arbitrary C/C++ programs - see
+[simplePatternError.md](simplePatternError.md) for the shared background on this internal,
+cppcheck-source-only checker.
+
+## Motivation
+
+Walking forward and then immediately back (or vice versa) always returns to the starting token - the
+extra calls add nothing but noise and a small amount of wasted work.
+
+## How to fix
+
+Before:
+```cpp
+return tok->next()->previous(); // <- redundant
+```
+
+After:
+```cpp
+return tok;
+```
+
+## Related checkers
+
+- [redundantTokCheck.md](redundantTokCheck.md) - a different kind of redundant code involving the same `Token`/pattern-matching API.
diff --git a/man/checkers/redundantPointerOp.md b/man/checkers/redundantPointerOp.md
new file mode 100644
index 00000000000..716d09d1995
--- /dev/null
+++ b/man/checkers/redundantPointerOp.md
@@ -0,0 +1,32 @@
+# redundantPointerOp
+
+**Message**: Redundant pointer operation on 'p' - it's already a pointer.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+`&*p` or `*&p` is used where `p` is already exactly what's needed - taking the address of a dereference
+(or vice versa) just to undo it.
+
+## Motivation
+
+This pattern has no effect beyond what writing `p` directly would achieve, and only adds noise that
+makes a reader wonder if there's a subtlety being expressed that isn't actually there.
+
+## How to fix
+
+Before:
+```cpp
+int *f(int *x) {
+    return &*x; // <- 'x' is already a pointer
+}
+```
+
+After:
+```cpp
+int *f(int *x) {
+    return x;
+}
+```
diff --git a/man/checkers/redundantTokCheck.md b/man/checkers/redundantTokCheck.md
new file mode 100644
index 00000000000..73ce134ed3e
--- /dev/null
+++ b/man/checkers/redundantTokCheck.md
@@ -0,0 +1,36 @@
+# redundantTokCheck
+
+**Message**: Unnecessary check of token; 'Token::Match()' already checks if it is a nullptr.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++ (cppcheck's own source code only)
+
+## Description
+
+Code like `if (tok && Token::Match(tok, "..."))` - the `tok &&` part is redundant, since these
+`Token::*` functions already return false/no-match when given a null token.
+
+This is not a general-purpose checker for arbitrary C/C++ programs - see
+[simplePatternError.md](simplePatternError.md) for the shared background on this internal,
+cppcheck-source-only checker.
+
+## Motivation
+
+Since `Token::Match()` and its relatives already handle a null token safely by returning "no match", an
+explicit null check right before calling one of them adds nothing but visual clutter.
+
+## How to fix
+
+Before:
+```cpp
+if (tok && Token::Match(tok, "foo")) {} // <- 'tok &&' is unnecessary
+```
+
+After:
+```cpp
+if (Token::Match(tok, "foo")) {}
+```
+
+## Related checkers
+
+- [redundantNextPrevious.md](redundantNextPrevious.md) - a different kind of redundant code involving the same `Token` API.
diff --git a/man/checkers/rethrowNoCurrentException.md b/man/checkers/rethrowNoCurrentException.md
new file mode 100644
index 00000000000..8fd0e859bae
--- /dev/null
+++ b/man/checkers/rethrowNoCurrentException.md
@@ -0,0 +1,39 @@
+# rethrowNoCurrentException
+
+**Message**: Rethrowing current exception with 'throw;', it seems there is no current exception to rethrow. If there is no current exception this calls std::terminate().<br/>
+**Category**: Correctness<br/>
+**Severity**: Error<br/>
+**Language**: C++ only
+
+## Description
+
+A bare `throw;` appears somewhere that isn't inside a `catch` block. If there's no exception currently
+being handled, this calls `std::terminate()`.
+
+## Motivation
+
+A bare `throw;` only makes sense while an exception is actively being handled (inside a `catch` block,
+or a function called from one, with the exception still propagating) - used anywhere else, there's no
+exception to rethrow, and the C++ standard says the result is a call to `std::terminate()`, aborting the
+program.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    throw; // <- not inside a catch block
+}
+```
+
+After:
+```cpp
+void doWork();
+void f() {
+    try {
+        doWork();
+    } catch (...) {
+        throw; // fine here: there is a current exception being handled
+    }
+}
+```
diff --git a/man/checkers/returnByReference.md b/man/checkers/returnByReference.md
new file mode 100644
index 00000000000..8909020f844
--- /dev/null
+++ b/man/checkers/returnByReference.md
@@ -0,0 +1,37 @@
+# returnByReference
+
+**Message**: Function returns a copy instead of returning by const reference.<br/>
+**Category**: Performance<br/>
+**Severity**: Performance<br/>
+**Language**: C++
+
+## Description
+
+A getter function returns a large member (or a container/string) by value, making an unnecessary copy
+on every call, when it could return a `const` reference instead.
+
+## Motivation
+
+Returning a container or string by value copies its entire contents on every call, even though the
+caller almost always just wants to look at the member that's already sitting inside the object.
+Returning a `const&` instead avoids that copy entirely.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+struct S {
+    std::string s;
+    std::string getS() const { return s; } // <- returnByReference: copies 's' on every call
+};
+```
+
+After:
+```cpp
+#include <string>
+struct S {
+    std::string s;
+    const std::string& getS() const { return s; }
+};
+```
diff --git a/man/checkers/returnDanglingLifetime.md b/man/checkers/returnDanglingLifetime.md
new file mode 100644
index 00000000000..9d2cb31e02a
--- /dev/null
+++ b/man/checkers/returnDanglingLifetime.md
@@ -0,0 +1,43 @@
+# returnDanglingLifetime
+
+**Message**: Returning pointer to local variable 'num' that will be invalid when returning.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A function returns a pointer, iterator, or a lambda that captures one, which refers to a local
+variable, array, or container.
+
+## Motivation
+
+Using a pointer after the local variable it points to has gone out of scope is undefined behaviour.
+Because the memory involved is usually still intact for a little while afterwards, this kind of bug
+often "works" in testing and then fails unpredictably once something else reuses that memory - which
+makes it worth catching at analysis time instead of at runtime.
+
+## How to fix
+
+Before:
+```cpp
+int* foo() {
+    int num = 2;
+    return &num; // <- returnDanglingLifetime
+}
+```
+
+After:
+```cpp
+int* foo() {
+    static int num = 2;
+    return &num;
+}
+```
+
+## Related checkers
+
+- [returnReference.md](returnReference.md) - the same idea, but for a function whose declared return
+  type is a reference rather than a pointer.
+- [autoVariables.md](autoVariables.md) - the same idea, but escaping through a function parameter
+  instead of `return`.
diff --git a/man/checkers/returnNonBoolInBooleanFunction.md b/man/checkers/returnNonBoolInBooleanFunction.md
new file mode 100644
index 00000000000..6e882f490ce
--- /dev/null
+++ b/man/checkers/returnNonBoolInBooleanFunction.md
@@ -0,0 +1,33 @@
+# returnNonBoolInBooleanFunction
+
+**Message**: Non-boolean value returned from function returning bool<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A function declared to return `bool` returns a value that cppcheck can determine is not `0` or `1`.
+
+## Motivation
+
+A `bool`-returning function is expected to always produce `true`/`false`; returning a value outside
+that range (after the implicit conversion, anything nonzero collapses to `true` anyway) usually signals
+that the wrong expression was returned, or that the function's intent was actually to return a count or
+status code.
+
+## How to fix
+
+Before:
+```cpp
+bool f() {
+    return 2; // <- collapses to 'true', likely not intended
+}
+```
+
+After:
+```cpp
+bool f() {
+    return true;
+}
+```
diff --git a/man/checkers/returnReference.md b/man/checkers/returnReference.md
new file mode 100644
index 00000000000..874afee7887
--- /dev/null
+++ b/man/checkers/returnReference.md
@@ -0,0 +1,41 @@
+# returnReference
+
+**Message**: Reference to local variable returned.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+A function declared to return a reference returns a reference to a local variable.
+
+## Motivation
+
+A reference to a local variable becomes invalid the moment the function returns. Using the returned
+reference afterwards is undefined behaviour, even though the memory is often still intact for a little
+while, which is why this bug can appear to "work" in casual testing.
+
+## How to fix
+
+Before:
+```cpp
+int& foo() {
+    int num = 2;
+    return num; // <- returnReference
+}
+```
+
+After:
+```cpp
+int foo() {
+    int num = 2;
+    return num;
+}
+```
+
+## Related checkers
+
+- [returnTempReference.md](returnTempReference.md) - the same idea, but returning a reference to a
+  temporary object instead of a named local variable.
+- [returnDanglingLifetime.md](returnDanglingLifetime.md) - the equivalent problem for a function that
+  returns a pointer/iterator instead of a reference.
diff --git a/man/checkers/returnStdMoveLocal.md b/man/checkers/returnStdMoveLocal.md
new file mode 100644
index 00000000000..00ac3f318cc
--- /dev/null
+++ b/man/checkers/returnStdMoveLocal.md
@@ -0,0 +1,44 @@
+# returnStdMoveLocal
+
+**Message**: Using std::move for returning object by-value from function will affect copy elision optimization.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Performance<br/>
+**Language**: C++ only
+
+## Description
+
+`return std::move(x);` is used for a local variable or temporary that's returned by value - this
+defeats the compiler's copy elision (RVO/NRVO), which would otherwise avoid the copy entirely without
+`std::move`.
+
+## Motivation
+
+When a local variable is returned by value, the compiler is allowed (and, since C++17 in many cases,
+required) to construct it directly in the caller's storage, skipping any copy or move entirely. Wrapping
+the return in `std::move()` defeats this optimization by forcing a move instead, which is strictly worse
+than the elision the compiler would have done on its own.
+
+## How to fix
+
+Before:
+```cpp
+struct A{};
+A f() {
+    A var;
+    return std::move(var); // <- defeats copy elision
+}
+```
+
+After:
+```cpp
+struct A{};
+A f() {
+    A var;
+    return var;
+}
+```
+
+## Related checkers
+
+- [useStandardLibrary.md](useStandardLibrary.md) - an unrelated performance suggestion in the same
+  checker: replacing a hand-written copy loop with a standard library call.
diff --git a/man/checkers/returnTempReference.md b/man/checkers/returnTempReference.md
new file mode 100644
index 00000000000..13b3842108d
--- /dev/null
+++ b/man/checkers/returnTempReference.md
@@ -0,0 +1,42 @@
+# returnTempReference
+
+**Message**: Reference to temporary returned.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+A function declared to return a reference returns a reference to a temporary object.
+
+## Motivation
+
+A temporary object is destroyed at the end of the full expression that created it (with some narrow
+lifetime-extension exceptions that don't apply once the reference is returned out of the function).
+Returning a reference to one, and then using it, is a use of an already-destroyed object.
+
+## How to fix
+
+Before:
+```cpp
+int get_value();
+const int &get_reference() {
+    const int &x = get_value(); // binds to a temporary
+    return x; // <- returnTempReference
+}
+```
+
+After:
+```cpp
+int get_value();
+int get_reference() {
+    return get_value();
+}
+```
+
+## Related checkers
+
+- [returnReference.md](returnReference.md) - the same idea, but returning a reference to a named local
+  variable instead of a temporary.
+- [danglingTempReference.md](danglingTempReference.md) - the same underlying temporary-lifetime
+  mistake, used within the same function rather than returned from it.
diff --git a/man/checkers/sameIteratorExpression.md b/man/checkers/sameIteratorExpression.md
new file mode 100644
index 00000000000..60181cd66c4
--- /dev/null
+++ b/man/checkers/sameIteratorExpression.md
@@ -0,0 +1,40 @@
+# sameIteratorExpression
+
+**Message**: Same iterators expression are used for algorithm.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+The exact same iterator expression is passed as both the "begin" and "end" argument of an algorithm,
+making the range empty.
+
+## Motivation
+
+A range whose begin and end are the same iterator is always empty, so the algorithm call does nothing -
+this is normally a sign that one of the two arguments was meant to be different (for example the end of
+the container, not its beginning again).
+
+## How to fix
+
+Before:
+```cpp
+#include <algorithm>
+void f(int a[10]) {
+  if (std::any_of(&a[0], &a[0], [](int x){return x > 0;})) {} // <- sameIteratorExpression: an empty range
+}
+```
+
+After:
+```cpp
+#include <algorithm>
+void f(int a[10]) {
+  if (std::any_of(&a[0], &a[10], [](int x){return x > 0;})) {}
+}
+```
+
+## Related checkers
+
+- [mismatchingContainers.md](mismatchingContainers.md) - the opposite mistake: two iterators that
+  belong to different containers being used together.
diff --git a/man/checkers/seekOnAppendedFile.md b/man/checkers/seekOnAppendedFile.md
new file mode 100644
index 00000000000..869c589a0ce
--- /dev/null
+++ b/man/checkers/seekOnAppendedFile.md
@@ -0,0 +1,49 @@
+# seekOnAppendedFile
+
+**Message**: Repositioning operation performed on a file opened in append mode has no effect.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A repositioning call (`fseek()`, `fsetpos()`, `rewind()`) is made on a file that was opened in append
+mode (`"a"`) - every write in append mode always goes to the end of the file regardless, so
+repositioning has no effect.
+
+## Motivation
+
+Code that repositions before writing to an append-mode file is misleading: the reposition is silently
+ignored, so the code doesn't do what it looks like it does, and the call is dead weight.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f() {
+    FILE *fp = fopen("a.txt", "a");
+    if (!fp) return;
+    fseek(fp, 0, SEEK_SET); // <- has no effect in append mode
+    fwrite("x", 1, 1, fp);
+    fclose(fp);
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f() {
+    FILE *fp = fopen("a.txt", "a");
+    if (!fp) return;
+    fwrite("x", 1, 1, fp);
+    fclose(fp);
+}
+```
+
+## Related checkers
+
+- [useClosedFile.md](useClosedFile.md), [readWriteOnlyFile.md](readWriteOnlyFile.md),
+  [writeReadOnlyFile.md](writeReadOnlyFile.md), [IOWithoutPositioning.md](IOWithoutPositioning.md),
+  [incompatibleFileOpen.md](incompatibleFileOpen.md) - other checks that follow the same `FILE*` through
+  a function.
diff --git a/man/checkers/selfAssignment.md b/man/checkers/selfAssignment.md
new file mode 100644
index 00000000000..1023a59297c
--- /dev/null
+++ b/man/checkers/selfAssignment.md
@@ -0,0 +1,34 @@
+# selfAssignment
+
+**Message**: Redundant assignment of 'x' to itself.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A variable is assigned to itself (`x = x;`), which has no effect.
+
+## Motivation
+
+An assignment that reads and writes the exact same variable does nothing useful, and is often a
+leftover from a refactor or a typo for an assignment that was meant to involve a different variable.
+
+## How to fix
+
+Before:
+```cpp
+void foo() {
+    int x = 1;
+    x = x; // <- has no effect
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void foo() {
+    int x = 1;
+    printf("%d", x);
+}
+```
diff --git a/man/checkers/selfInitialization.md b/man/checkers/selfInitialization.md
new file mode 100644
index 00000000000..1fecc4c2a79
--- /dev/null
+++ b/man/checkers/selfInitialization.md
@@ -0,0 +1,47 @@
+# selfInitialization
+
+**Message**: Member variable 'i' is initialized by itself.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+A member is initialized with itself in the initializer list (`Fred() : i(i) {}` with no same-named
+constructor parameter) - it reads its own not-yet-initialized value.
+
+## Motivation
+
+`i(i)` in a member-initializer list refers to the member `i` on both sides (there's no constructor
+parameter with that name to shadow it) - the member ends up "initialized" by reading its own
+uninitialized value, which is undefined behaviour and almost certainly a typo for a differently-named
+constructor parameter.
+
+## How to fix
+
+Give the constructor parameter a distinct name, or otherwise supply a real initial value.
+
+Before:
+```cpp
+class Fred {
+    int i;
+public:
+    Fred() : i(i) { // <- reads its own uninitialized value
+    }
+};
+```
+
+After:
+```cpp
+class Fred {
+    int i;
+public:
+    Fred() : i(0) {
+    }
+};
+```
+
+## Related checkers
+
+- [initializerList.md](initializerList.md) - the related, broader family of member-initializer-list
+  ordering pitfalls.
diff --git a/man/checkers/shadowArgument.md b/man/checkers/shadowArgument.md
new file mode 100644
index 00000000000..6556f2449d6
--- /dev/null
+++ b/man/checkers/shadowArgument.md
@@ -0,0 +1,36 @@
+# shadowArgument
+
+**Message**: Local variable 'x' shadows outer argument<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A local variable has the same name as one of the function's own parameters, which is still in scope -
+the local one hides the parameter for the rest of its scope.
+
+## Motivation
+
+A shadowed name invites confusion about which variable a later line actually refers to, and is a
+standing invitation to edit the wrong one.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f(int x) { { int x = 1; printf("%d", x); } } // <- hides the parameter 'x'
+```
+
+After:
+```cpp
+#include <cstdio>
+void f(int x) { { int y = 1; printf("%d", y); } }
+```
+
+## Related checkers
+
+- [shadowVariable.md](shadowVariable.md) - the same idea, when the outer name is a variable.
+- [shadowFunction.md](shadowFunction.md) - the same idea, when the outer name is a function.
+- [shadowMember.md](shadowMember.md) - the same idea, when the outer name is a class/struct member.
diff --git a/man/checkers/shadowFunction.md b/man/checkers/shadowFunction.md
new file mode 100644
index 00000000000..39ee40e7385
--- /dev/null
+++ b/man/checkers/shadowFunction.md
@@ -0,0 +1,39 @@
+# shadowFunction
+
+**Message**: Local variable 'x' shadows outer function<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A local variable (or parameter) has the same name as a function that is still visible - the local one
+hides the function for the rest of its scope.
+
+## Motivation
+
+A shadowed name invites confusion about which one a later line actually refers to, and is a standing
+invitation to edit the wrong thing - or to be surprised that the function can no longer be called by
+its plain name in that scope.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+int getA();
+void f() { int getA = 1; printf("%d", getA); } // <- hides the function 'getA'
+```
+
+After:
+```cpp
+#include <cstdio>
+int getA();
+void f() { int result = 1; printf("%d", result); }
+```
+
+## Related checkers
+
+- [shadowVariable.md](shadowVariable.md) - the same idea, when the outer name is a variable.
+- [shadowArgument.md](shadowArgument.md) - the same idea, when the outer name is a function parameter.
+- [shadowMember.md](shadowMember.md) - the same idea, when the outer name is a class/struct member.
diff --git a/man/checkers/shadowMember.md b/man/checkers/shadowMember.md
new file mode 100644
index 00000000000..e85f9f66829
--- /dev/null
+++ b/man/checkers/shadowMember.md
@@ -0,0 +1,42 @@
+# shadowMember
+
+**Message**: Local variable 'x' shadows outer member<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A local variable inside a member function has the same name as a class/struct member - the local one
+hides the member for the rest of its scope.
+
+## Motivation
+
+A shadowed name invites confusion about which one a later line actually refers to, and is a standing
+invitation to edit the local variable when the member was intended, or vice versa.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+struct S {
+    int i{};
+    void f() { int i = 1; printf("%d", i); } // <- hides the member 'i'
+};
+```
+
+After:
+```cpp
+#include <cstdio>
+struct S {
+    int i{};
+    void f() { int localCount = 1; printf("%d", localCount); }
+};
+```
+
+## Related checkers
+
+- [shadowVariable.md](shadowVariable.md) - the same idea, when the outer name is a variable.
+- [shadowArgument.md](shadowArgument.md) - the same idea, when the outer name is a function parameter.
+- [shadowFunction.md](shadowFunction.md) - the same idea, when the outer name is a function.
diff --git a/man/checkers/shadowVariable.md b/man/checkers/shadowVariable.md
new file mode 100644
index 00000000000..ff589e7b428
--- /dev/null
+++ b/man/checkers/shadowVariable.md
@@ -0,0 +1,38 @@
+# shadowVariable
+
+**Message**: Local variable 'x' shadows outer variable<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A local variable (or parameter) has the same name as an outer variable that is still in scope - the
+inner one hides the outer one for the rest of its scope.
+
+## Motivation
+
+A shadowed name invites confusion about which variable a later line actually refers to, and is a
+standing invitation to edit the wrong one.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+int x;
+void f() { int x = 1; printf("%d", x); } // <- hides the global 'x'
+```
+
+After:
+```cpp
+#include <cstdio>
+int x;
+void f() { int y = 1; printf("%d", y); }
+```
+
+## Related checkers
+
+- [shadowArgument.md](shadowArgument.md) - the same idea, when the outer name is a function parameter.
+- [shadowFunction.md](shadowFunction.md) - the same idea, when the outer name is a function.
+- [shadowMember.md](shadowMember.md) - the same idea, when the outer name is a class/struct member.
diff --git a/man/checkers/shiftNegative.md b/man/checkers/shiftNegative.md
new file mode 100644
index 00000000000..403812b86c5
--- /dev/null
+++ b/man/checkers/shiftNegative.md
@@ -0,0 +1,38 @@
+# shiftNegative
+
+**Message**: Shifting by a negative value is undefined behaviour<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A bitwise shift (`<<`/`>>`) is done by a negative amount, which is undefined behaviour.
+
+## Motivation
+
+The C/C++ standards leave the result of shifting by a negative amount undefined - the program's actual
+behaviour is not guaranteed and can change with the compiler, optimization level, or platform.
+
+## How to fix
+
+Before:
+```cpp
+void foo() {
+   int a; a = 123;
+   (void)(a << -1); // <- shifting by a negative amount
+}
+```
+
+After:
+```cpp
+void foo() {
+   int a; a = 123;
+   (void)(a << 1);
+}
+```
+
+## Related checkers
+
+- [shiftNegativeLHS.md](shiftNegativeLHS.md) - the same kind of undefined behaviour, but for shifting a
+  negative value rather than shifting by a negative amount.
diff --git a/man/checkers/shiftNegativeLHS.md b/man/checkers/shiftNegativeLHS.md
new file mode 100644
index 00000000000..0b2e0ecf7da
--- /dev/null
+++ b/man/checkers/shiftNegativeLHS.md
@@ -0,0 +1,40 @@
+# shiftNegativeLHS
+
+**Message**: Shifting a negative value is technically undefined behaviour<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Portability<br/>
+**Language**: C/C++
+
+## Description
+
+The value being shifted (rather than the shift amount) is negative, which is technically undefined
+behaviour, even though many compilers implement it as a predictable sign-preserving shift.
+
+## Motivation
+
+The C/C++ standards leave the result of shifting a negative value undefined, even though in practice
+most compilers implement a predictable arithmetic (sign-preserving) shift - code relying on that isn't
+guaranteed to behave the same way on every compiler or platform.
+
+## How to fix
+
+Before:
+```cpp
+void foo() {
+   int x;
+   x = (-10+2) << 3; // <- shifting a negative value
+}
+```
+
+After:
+```cpp
+void foo() {
+   int x;
+   x = (10-2) << 3;
+}
+```
+
+## Related checkers
+
+- [shiftNegative.md](shiftNegative.md) - the same kind of undefined behaviour, but for shifting by a
+  negative amount rather than shifting a negative value.
diff --git a/man/checkers/shiftTooManyBits.md b/man/checkers/shiftTooManyBits.md
new file mode 100644
index 00000000000..8b33fb08a67
--- /dev/null
+++ b/man/checkers/shiftTooManyBits.md
@@ -0,0 +1,52 @@
+# shiftTooManyBits and shiftTooManyBitsSigned
+
+**Message**: Shifting 32-bit value by 40 bits is undefined behaviour<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning/Portability<br/>
+**Language**: C/C++
+
+## Description
+
+This checker warns when a bitwise shift (`<<`, `>>`, `<<=`, `>>=`) shifts a value by a number of bits
+that is greater than or equal to the width of the (promoted) left-hand side type.
+
+There are two related warnings:
+- `shiftTooManyBits`: the shift amount is greater than or equal to the bit width of the type. This is
+  undefined behaviour according to the C/C++ standard.
+- `shiftTooManyBitsSigned`: the left-hand side type is signed and the shift amount is exactly
+  `bits - 1`. Shifting a signed type this far is undefined behaviour before C++14, and
+  implementation-defined behaviour from C++14 onwards - in the C++14-and-later case this is reported
+  as a `portability` message instead of a `warning`, since the behaviour is now defined, just not the
+  same on every platform.
+
+The number of bits of the left-hand side type is determined from the platform settings
+(`int_bit`, `long_bit`, `long_long_bit`), so this checker requires a platform to be configured.
+
+## Motivation
+
+Shifting a value by more bits than its type contains is undefined behaviour. The result is
+unpredictable and can vary between compilers, compiler versions and optimization settings.
+
+cppcheck only warns when it can work out the shift amount directly from the code - a literal value, or
+a condition earlier in the function that pins it down. If the amount can't be determined that way (for
+example it's guarded by several combined conditions, or hidden inside a macro-like call), no warning is
+given even though the shift could still be too large at runtime.
+
+## How to fix
+
+Make sure the shift amount is smaller than the bit width of the left-hand side type. This often means
+casting the left-hand side to a wider type before shifting, or fixing a wrong shift amount.
+
+Before:
+```cpp
+int32_t foo(int32_t x) {
+    return x << 40; // <- shiftTooManyBits, 'int' is only 32 bits
+}
+```
+
+After:
+```cpp
+int64_t foo(int32_t x) {
+    return (int64_t)x << 40; // <- widen the operand before shifting
+}
+```
diff --git a/man/checkers/signConversion.md b/man/checkers/signConversion.md
new file mode 100644
index 00000000000..d371b35ac3e
--- /dev/null
+++ b/man/checkers/signConversion.md
@@ -0,0 +1,80 @@
+# signConversion
+
+**Message**: Expression 'x' can have a negative value. That is converted to an unsigned value and used in an unsigned calculation.<br/>
+**Category**: Type Safety<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+This checker detects arithmetic expressions (other than `+`/`-`) whose result type is unsigned, where
+one of the operands can have a negative value. When that happens, the negative operand is implicitly
+converted to an unsigned value before the calculation, which can produce a very large value instead
+of the intended negative one.
+
+If the negative value is a known constant, the message states the operand "has" a negative value;
+otherwise it states the operand "can have" a negative value, based on cppcheck's analysis of the
+surrounding code.
+
+This checker only runs when the `warning` severity is enabled.
+
+## Motivation
+
+Implicit conversion of a negative value to an unsigned type is well-defined (it wraps around to a
+large positive value), but it rarely matches programmer intent and is a common source of bugs, for
+example in loop conditions, index calculations and buffer size calculations.
+
+## Design note: `+` and `-` are intentionally not checked
+
+This checker does not warn about `+` and `-`, even though the same implicit negative-to-unsigned
+conversion happens there too. This is intentional, not an oversight: for `+` and `-`, adding an
+explicit cast would not change the computed result at all.
+
+```cpp
+void f(int x) { // x can be negative
+    unsigned int a = x + 5U;          // implicit conversion
+    unsigned int b = (unsigned int)x + 5U; // explicit cast - identical result
+}
+```
+
+Two's-complement addition and subtraction commute with truncation to an unsigned width, so the
+implicit conversion already computes exactly what an explicit `(unsigned int)` cast would. There is
+nothing for an explicit cast to fix or clarify, so a warning here would not be actionable. Other
+arithmetic operators (`*`, `/`, `%`, shifts, etc.) do not have this property in the same way and are
+still checked.
+
+## How to fix
+
+You can fix these warnings by:
+1. Making sure the operand cannot be negative in that context (fix upstream logic)
+2. Using a signed type for the calculation
+3. Adding an explicit check or cast to make the intended behaviour clear
+
+Note: cppcheck only warns when it can actually determine that the operand can be negative - either
+from a known value at the call site (as below), or from a condition earlier in the same function. A
+plain `int` parameter with no callers and no surrounding condition gives cppcheck no evidence that it
+can be negative, so it is not reported.
+
+Before:
+```cpp
+unsigned int calcSize(int count, unsigned int itemSize) {
+    return count * itemSize; // <- signConversion, count can have a negative value
+}
+
+void caller() {
+    calcSize(-4, 4);
+}
+```
+
+After:
+```cpp
+unsigned int calcSize(int count, unsigned int itemSize) {
+    if (count < 0)
+        return 0;
+    return count * itemSize;
+}
+
+void caller() {
+    calcSize(-4, 4);
+}
+```
diff --git a/man/checkers/signedCharArrayIndex.md b/man/checkers/signedCharArrayIndex.md
new file mode 100644
index 00000000000..9f42f4c4e3f
--- /dev/null
+++ b/man/checkers/signedCharArrayIndex.md
@@ -0,0 +1,55 @@
+# signedCharArrayIndex and unknownSignCharArrayIndex
+
+**Message**: Signed 'char' type used as array index.<br/>
+**Category**: Undefined Behaviour/Portability<br/>
+**Severity**: Warning/Portability<br/>
+**Language**: C/C++
+
+## Description
+
+- `signedCharArrayIndex` (warning): an array is indexed with a `char` known to be signed, and the index
+  can be 128 or more - once sign-extended, a value like `200` becomes negative, so the access lands
+  before the start of the array instead of near its expected position. This ID specifically covers the
+  case where cppcheck knows the index is a signed `char` that *can* reach 128 or more, but can't work
+  out its exact wrapped-around value; when the concrete wrapped value (or a condition it depends on) is
+  known, the same bug is instead reported as the more specific [negativeIndex.md](negativeIndex.md) or
+  [arrayIndexOutOfBounds.md](arrayIndexOutOfBounds.md), which is what happens in most real code.
+- `unknownSignCharArrayIndex` (portability): the same situation, but for a plain `char` whose signedness
+  the C/C++ standard leaves up to the compiler - the exact same source code indexes the array
+  differently depending on which platform/compiler it's built with.
+
+## Motivation
+
+On many platforms `char` can hold negative values (typically -128..127 instead of 0..255). A byte value
+of 128 or more, once treated as a signed `char`, becomes negative - so using it directly as an array
+index produces a negative index instead of the expected large-but-positive one, reading or writing
+before the start of the array.
+
+## How to fix
+
+Use `unsigned char` for a value that's meant to index into a table by its raw byte value.
+
+Before:
+```cpp
+int buf[256];
+void foo() {
+    char ch = 0x80;
+    buf[ch] = 0; // <- negative on platforms where 'char' is signed
+}
+```
+
+After:
+```cpp
+int buf[256];
+void foo() {
+    unsigned char ch = 0x80;
+    buf[ch] = 0;
+}
+```
+
+## Related checkers
+
+- [negativeIndex.md](negativeIndex.md) and [arrayIndexOutOfBounds.md](arrayIndexOutOfBounds.md) - the
+  more specific IDs this checker's finding is usually superseded by.
+- [charBitOp.md](charBitOp.md) - the same signed-`char` sign-extension pitfall, but for a bitwise
+  operation instead of an array index.
diff --git a/man/checkers/simplePatternError.md b/man/checkers/simplePatternError.md
new file mode 100644
index 00000000000..96e4a9aac26
--- /dev/null
+++ b/man/checkers/simplePatternError.md
@@ -0,0 +1,42 @@
+# simplePatternError
+
+**Message**: Found simple pattern inside Token::Match() call: ";"<br/>
+**Category**: Code Quality<br/>
+**Severity**: Warning<br/>
+**Language**: C++ (cppcheck's own source code only)
+
+## Description
+
+A pattern given to `Token::Match()`/`Token::findmatch()` doesn't actually use any wildcard syntax, so
+the cheaper `Token::simpleMatch()`/`Token::findsimplematch()` could be used instead.
+
+This is not a general-purpose checker for arbitrary C/C++ programs. It only looks for calls to
+cppcheck's own internal pattern-matching API, and reports style/correctness issues in how that API is
+used. It exists to help cppcheck's own contributors write correct and efficient code in the cppcheck
+codebase, not to check any project being analyzed by cppcheck.
+
+It is only compiled in when cppcheck itself is built with the `CHECK_INTERNAL` macro defined - a normal
+end-user build of cppcheck does not have it at all, and even a build that has it still needs
+`--enable=internal` to turn it on.
+
+## Motivation
+
+`Token::Match()` interprets a small wildcard syntax in its pattern string, which costs more than a
+plain text comparison. When a pattern doesn't use any of that syntax, `Token::simpleMatch()` does the
+identical comparison faster.
+
+## How to fix
+
+Before:
+```cpp
+Token::Match(tok, ";"); // <- no wildcard syntax used
+```
+
+After:
+```cpp
+Token::simpleMatch(tok, ";");
+```
+
+## Related checkers
+
+- [complexPatternError.md](complexPatternError.md) - the opposite mistake, using `simpleMatch()` with a pattern that needs wildcard interpretation.
diff --git a/man/checkers/sizeofCalculation.md b/man/checkers/sizeofCalculation.md
new file mode 100644
index 00000000000..012a6d4855d
--- /dev/null
+++ b/man/checkers/sizeofCalculation.md
@@ -0,0 +1,34 @@
+# sizeofCalculation
+
+**Message**: Found calculation inside sizeof().<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning (inconclusive)<br/>
+**Language**: C/C++
+
+## Description
+
+An arithmetic/increment/decrement calculation appears inside `sizeof`, e.g. `sizeof(a + b)` or
+`sizeof(x++)` - it looks like it runs, but it never does.
+
+## Motivation
+
+The operand of `sizeof` is normally not evaluated at all - only its type is used to compute the result.
+A calculation written inside `sizeof` reads as if it executes (especially `x++`, which looks like it
+must have a side effect), but it silently never runs, which is confusing for anyone who later expects
+that side effect to have happened.
+
+## How to fix
+
+Before:
+```cpp
+void f(int a, int b) {
+    int s = sizeof(a + b); // <- the addition never actually happens
+}
+```
+
+After:
+```cpp
+void f(int a, int b) {
+    int s = sizeof(a);
+}
+```
diff --git a/man/checkers/sizeofFunctionCall.md b/man/checkers/sizeofFunctionCall.md
new file mode 100644
index 00000000000..9f3a55e320b
--- /dev/null
+++ b/man/checkers/sizeofFunctionCall.md
@@ -0,0 +1,34 @@
+# sizeofFunctionCall
+
+**Message**: Found function call inside sizeof().<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A function call appears inside `sizeof`, e.g. `sizeof(foo())` - `foo()` is never actually called.
+
+## Motivation
+
+The operand of `sizeof` is normally not evaluated at all - only its type is used to compute the result.
+A function call written inside `sizeof` reads as if it runs (and, worse, hides a call whose return
+value or side effect might have been genuinely needed), but it silently never executes.
+
+## How to fix
+
+Before:
+```cpp
+int compute();
+void f() {
+    int s = sizeof(compute()); // <- compute() is never called
+}
+```
+
+After:
+```cpp
+int compute();
+void f() {
+    int s = sizeof(decltype(compute()));
+}
+```
diff --git a/man/checkers/sizeofVoid.md b/man/checkers/sizeofVoid.md
new file mode 100644
index 00000000000..a8fc7c79899
--- /dev/null
+++ b/man/checkers/sizeofVoid.md
@@ -0,0 +1,40 @@
+# sizeofVoid and sizeofDereferencedVoidPointer
+
+**Message**: Behaviour of 'sizeof(void)' is not covered by the ISO C standard.<br/>
+**Category**: Portability<br/>
+**Severity**: Portability<br/>
+**Language**: C/C++
+
+## Description
+
+- `sizeofVoid`: `sizeof(void)` is used directly - this isn't defined by the C/C++ standard (only by a
+  GNU extension, which defines it as `1`).
+- `sizeofDereferencedVoidPointer`: `sizeof(*p)` where `p` is `void*` - the same underlying problem,
+  reached by dereferencing a `void*` instead of naming `void` directly.
+
+## Motivation
+
+`void` has no size in standard C/C++ - `sizeof(void)` is only meaningful under a GNU extension (where
+it's defined as `1`), so code relying on it is not portable to a strictly-standard-conforming compiler,
+even though gcc/clang will happily accept it.
+
+## How to fix
+
+Before:
+```cpp
+void f(void *p) {
+    int s = sizeof(*p); // <- 'p' is void*, so this is sizeof(void)
+}
+```
+
+After:
+```cpp
+void f(char *p) {
+    int s = sizeof(*p);
+}
+```
+
+## Related checkers
+
+- [arithOperationsOnVoidPointer.md](arithOperationsOnVoidPointer.md) - another `void*`-specific,
+  non-standard construct (pointer arithmetic directly on `void*`).
diff --git a/man/checkers/sizeofsizeof.md b/man/checkers/sizeofsizeof.md
new file mode 100644
index 00000000000..86e2c17c4a9
--- /dev/null
+++ b/man/checkers/sizeofsizeof.md
@@ -0,0 +1,34 @@
+# sizeofsizeof
+
+**Message**: Calling 'sizeof' on 'sizeof'.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+`sizeof(sizeof(x))` - always the same as `sizeof(size_t)`, regardless of what `x` is.
+
+## Motivation
+
+`sizeof(...)` itself evaluates to a `size_t` value, so `sizeof` of that result is always just
+`sizeof(size_t)` - a fixed, platform-defined constant that has nothing to do with `x`. Writing this
+almost always means one `sizeof` too many was typed.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    int a;
+    int s = sizeof(sizeof(a)); // <- always sizeof(size_t), regardless of 'a'
+}
+```
+
+After:
+```cpp
+void f() {
+    int a;
+    int s = sizeof(a);
+}
+```
diff --git a/man/checkers/sizeofwithnumericparameter.md b/man/checkers/sizeofwithnumericparameter.md
new file mode 100644
index 00000000000..5dabab68532
--- /dev/null
+++ b/man/checkers/sizeofwithnumericparameter.md
@@ -0,0 +1,33 @@
+# sizeofwithnumericparameter
+
+**Message**: Suspicious usage of 'sizeof' with a numeric constant as parameter.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+`sizeof` is applied to a plain numeric constant, e.g. `sizeof(10)`.
+
+## Motivation
+
+`sizeof` is nearly always resolved at compile time from the *type* of its operand, not its value - a
+numeric literal's type is whatever the compiler infers for it (usually `int`), not something meaningful
+to size a buffer or count elements by. This is almost always a mistake for a type name, or a variable
+whose size was actually intended.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    int size = sizeof(10); // <- probably meant a type or a variable, not the literal 10
+}
+```
+
+After:
+```cpp
+void f() {
+    int size = sizeof(int);
+}
+```
diff --git a/man/checkers/sizeofwithsilentarraypointer.md b/man/checkers/sizeofwithsilentarraypointer.md
new file mode 100644
index 00000000000..edcd3674a65
--- /dev/null
+++ b/man/checkers/sizeofwithsilentarraypointer.md
@@ -0,0 +1,34 @@
+# sizeofwithsilentarraypointer
+
+**Message**: Using 'sizeof' on array given as function argument returns size of a pointer.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+`sizeof` is applied to an array that was received as a function parameter - which has already decayed
+to a plain pointer, so the result is the pointer's size, not the array's.
+
+## Motivation
+
+An array parameter (`int a[10]`) is really just a pointer as far as the function body is concerned - the
+size information from the declaration is not available at runtime. `sizeof(a)` inside the function
+silently returns the size of the pointer, not the number of bytes the caller's array actually occupies,
+which is easy to miss since the declaration still visually looks like an array.
+
+## How to fix
+
+Before:
+```cpp
+void f(int a[10]) {
+    int n = sizeof(a) / sizeof(int); // <- 'a' decayed to int*, this is not 10
+}
+```
+
+After:
+```cpp
+void f(int a[10], int n) {
+    int m = n / sizeof(int); // pass the real element count instead
+}
+```
diff --git a/man/checkers/sprintfOverlappingData.md b/man/checkers/sprintfOverlappingData.md
new file mode 100644
index 00000000000..ed710f46009
--- /dev/null
+++ b/man/checkers/sprintfOverlappingData.md
@@ -0,0 +1,43 @@
+# sprintfOverlappingData
+
+**Message**: Undefined behavior: Variable is used as parameter and destination in s[n]printf().<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+The same variable is used as both the destination and a source argument of `sprintf`/`snprintf`/
+`swprintf`, which is undefined behaviour.
+
+## Motivation
+
+`sprintf()` and its relatives may write to the destination buffer while still reading from it if a
+source argument aliases the destination - the C standard leaves this undefined, so the actual result
+(correct output, garbled output, or a crash) depends on the specific library implementation.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void foo() {
+    char buf[100];
+    sprintf(buf, "%s", buf); // <- source and destination overlap
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void foo() {
+    char buf[100] = "hi";
+    char tmp[100];
+    sprintf(tmp, "%s", buf); // write to a different buffer
+}
+```
+
+## Related checkers
+
+- [overlappingStrcmp.md](overlappingStrcmp.md) - an unrelated string-function misuse in the same
+  checker, about a redundant/contradictory pair of `strcmp()` checks.
diff --git a/man/checkers/staticStringCompare.md b/man/checkers/staticStringCompare.md
new file mode 100644
index 00000000000..b2e5a49bc95
--- /dev/null
+++ b/man/checkers/staticStringCompare.md
@@ -0,0 +1,41 @@
+# staticStringCompare and stringCompare
+
+**Message**: Unnecessary comparison of static strings.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+Two string literals (`staticStringCompare`), or two identical-looking string variables
+(`stringCompare`), are compared with a string-comparison function (`strcmp`, `stricmp`, `wcscmp`, ...) -
+the result is already known at compile time either way.
+
+## Motivation
+
+Comparing two string literals, or a variable against itself under a different name, can never vary at
+runtime - the comparison's result is fixed regardless of any input, which usually means a variable name
+was typed wrong, or the comparison is leftover from earlier code that used to compare something real.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstring>
+int main() {
+    if (strcmp("00FF00", "00FF00") == 0) {} // <- always true
+}
+```
+
+After:
+```cpp
+#include <cstring>
+int main(const char* value) {
+    if (strcmp(value, "00FF00") == 0) {} // compare the actual variable
+}
+```
+
+## Related checkers
+
+- [literalWithCharPtrCompare.md](literalWithCharPtrCompare.md) - a related string-comparison mistake:
+  comparing a pointer against a literal with `==` instead of a string-comparison function.
diff --git a/man/checkers/stlBoundaries.md b/man/checkers/stlBoundaries.md
new file mode 100644
index 00000000000..0174b5abb67
--- /dev/null
+++ b/man/checkers/stlBoundaries.md
@@ -0,0 +1,36 @@
+# stlBoundaries
+
+**Message**: Dangerous comparison using operator< on iterator.<br/>
+**Category**: Correctness<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+An iterator that doesn't support ordering (for example a `std::list` or `std::set` iterator) is
+compared with `<`/`>` instead of `!=`/`==` - the relative order of two such iterators isn't guaranteed
+to mean anything.
+
+## Motivation
+
+Only random-access iterators (like a `std::vector` or `std::deque` iterator) have a well-defined
+"less than" relationship. For other container types, the underlying storage isn't laid out in a way
+that makes iterator order meaningful, so comparing with `<`/`>` is not portable and not reliable.
+
+## How to fix
+
+Before:
+```cpp
+#include <list>
+bool foo(std::list<int>::iterator it1, std::list<int>::iterator it2) {
+    return it1 < it2; // <- stlBoundaries: order of list iterators isn't guaranteed
+}
+```
+
+After:
+```cpp
+#include <list>
+bool foo(std::list<int>::iterator it1, std::list<int>::iterator it2) {
+    return it1 != it2;
+}
+```
diff --git a/man/checkers/stlFindInsert.md b/man/checkers/stlFindInsert.md
new file mode 100644
index 00000000000..af4a47e0ea2
--- /dev/null
+++ b/man/checkers/stlFindInsert.md
@@ -0,0 +1,46 @@
+# stlFindInsert
+
+**Message**: Searching before insertion is not necessary.<br/>
+**Category**: Performance<br/>
+**Severity**: Performance<br/>
+**Language**: C++
+
+## Description
+
+An associative container is searched with `.find()`, and if nothing was found, the same key is
+inserted right afterwards - the search is redundant since `insert()`/`emplace()` already report whether
+the key existed.
+
+## Motivation
+
+Searching a container and then inserting into it based on the result does the lookup twice: once
+explicitly with `.find()`, and again internally inside `insert()`/`emplace()` to find the right place
+(or detect the key is already present). Going straight to `insert()`/`emplace()` gets the same behavior
+in one lookup instead of two.
+
+## How to fix
+
+Before:
+```cpp
+#include <set>
+void f1(std::set<unsigned>& s, unsigned x) {
+    if (s.find(x) == s.end()) { // <- redundant, insert() already knows if x is present
+        s.insert(x);
+    }
+}
+```
+
+After:
+```cpp
+#include <set>
+void f1(std::set<unsigned>& s, unsigned x) {
+    s.insert(x);
+}
+```
+
+## Related checkers
+
+- [redundantIfRemove.md](redundantIfRemove.md) - a similar redundant-check-before-a-safe-operation
+  pattern, for `remove()` instead of `insert()`.
+- [stlIfFind.md](stlIfFind.md) - a different `find()`-related mistake, where the result is misread as a
+  boolean.
diff --git a/man/checkers/stlIfFind.md b/man/checkers/stlIfFind.md
new file mode 100644
index 00000000000..a3e022b8db8
--- /dev/null
+++ b/man/checkers/stlIfFind.md
@@ -0,0 +1,63 @@
+# stlIfFind and stlIfStrFind
+
+**Message**: Suspicious condition. The result of find() is an iterator, but it is not properly checked.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning/Performance<br/>
+**Language**: C++
+
+## Description
+
+The result of a container's `.find()` is used directly as a boolean condition:
+
+- `stlIfFind`: this tests whether the resulting iterator happens to be "truthy", not whether the
+  element was found, which is virtually never what's intended.
+- `stlIfStrFind`: the same mistake specifically for `std::string::find()`, which returns a *position*,
+  not an iterator - comparing it directly as a boolean is wrong far more often than not (position 0 -
+  a match at the very start of the string - is falsy). With a C++20-or-later standard, this is instead
+  reported as a performance suggestion to use `string::starts_with()`.
+
+## Motivation
+
+`find()` on most containers returns an iterator (or, for `std::string`, a position) that must be
+compared against `.end()` (or `std::string::npos`) to know whether something was actually found. Using
+the raw result as a boolean condition compiles cleanly and can even look like it works in quick testing,
+but it is testing the wrong thing - a genuine logic bug hiding behind code that reads as correct.
+
+## How to fix
+
+Before:
+```cpp
+#include <set>
+void f(std::set<int> s) {
+    if (s.find(12)) { } // <- stlIfFind: this checks the iterator's "truthiness", not whether 12 was found
+}
+```
+
+After:
+```cpp
+#include <set>
+void f(std::set<int> s) {
+    if (s.find(12) != s.end()) { }
+}
+```
+
+Before:
+```cpp
+#include <string>
+void f(const std::string &s) {
+    if (s.find("abc")) { } // <- stlIfStrFind: position 0 (a match at the start) is falsy here
+}
+```
+
+After:
+```cpp
+#include <string>
+void f(const std::string &s) {
+    if (s.find("abc") != std::string::npos) { }
+}
+```
+
+## Related checkers
+
+- [stlFindInsert.md](stlFindInsert.md) - a different `find()`-related redundancy, checking before
+  inserting into an associative container.
diff --git a/man/checkers/stlOutOfBounds.md b/man/checkers/stlOutOfBounds.md
new file mode 100644
index 00000000000..e8cf07a6ac8
--- /dev/null
+++ b/man/checkers/stlOutOfBounds.md
@@ -0,0 +1,44 @@
+# stlOutOfBounds
+
+**Message**: When ii==foo.size(), foo.at(ii) is out of bounds.<br/>
+**Category**: Correctness<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+A loop of the form `for (i = 0; i <= container.size(); ++i)` uses `<=` instead of `<`, so the last
+iteration indexes one past the end.
+
+## Motivation
+
+This is one of the most common off-by-one mistakes in loops that walk a container by index: the loop
+condition looks like a natural "up to and including the size" check, but the valid indices only go up
+to `size() - 1`.
+
+## How to fix
+
+Before:
+```cpp
+#include <vector>
+void f(std::vector<int> foo) {
+    for (unsigned int ii = 0; ii <= foo.size(); ++ii) { // <- stlOutOfBounds
+       foo.at(ii) = 0;
+    }
+}
+```
+
+After:
+```cpp
+#include <vector>
+void f(std::vector<int> foo) {
+    for (unsigned int ii = 0; ii < foo.size(); ++ii) {
+       foo.at(ii) = 0;
+    }
+}
+```
+
+## Related checkers
+
+- [containerOutOfBounds.md](containerOutOfBounds.md) - the more general out-of-bounds container access
+  check that this loop-condition mistake is a specific cause of.
diff --git a/man/checkers/stlSize.md b/man/checkers/stlSize.md
new file mode 100644
index 00000000000..8dddc868132
--- /dev/null
+++ b/man/checkers/stlSize.md
@@ -0,0 +1,45 @@
+# stlSize
+
+**Message**: Possible inefficient checking for 'x' emptiness.<br/>
+**Category**: Performance<br/>
+**Severity**: Performance<br/>
+**Language**: C++ (only checked with a pre-C++11 standard, and only for `std::list`)
+
+## Description
+
+`.size()` is compared against `0`/`1` on a container whose `.size()` isn't guaranteed to be
+constant-time (only checked pre-C++11, and only for `std::list`) - `.empty()` is always at least as
+fast.
+
+## Motivation
+
+Before C++11, `std::list::size()` was allowed to take time proportional to the number of elements
+(implementations were free to compute it by walking the list), while `.empty()` is always O(1).
+Comparing `.size()` against `0`/`1` where `.empty()` would do is therefore a real, if usually small,
+performance cost, and easy to write out of habit from code that works with other containers.
+
+## How to fix
+
+Before:
+```cpp
+#include <list>
+struct Fred {
+    void foo();
+    std::list<int> x;
+};
+void Fred::foo() {
+    if (x.size() == 0) {} // <- only with a pre-C++11 standard: size() isn't guaranteed O(1)
+}
+```
+
+After:
+```cpp
+#include <list>
+struct Fred {
+    void foo();
+    std::list<int> x;
+};
+void Fred::foo() {
+    if (x.empty()) {}
+}
+```
diff --git a/man/checkers/stlcstr.md b/man/checkers/stlcstr.md
new file mode 100644
index 00000000000..9e823ae922e
--- /dev/null
+++ b/man/checkers/stlcstr.md
@@ -0,0 +1,69 @@
+# stlcstr and stlcstrthrow
+
+**Message**: Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+The pointer from `.c_str()` (or an implicit conversion to `std::string` followed by `.c_str()`) escapes
+the function it was taken in, in a way that leaves it dangling:
+
+- `stlcstr`: the pointer is returned from a function - the string it points into was a temporary or
+  local variable that no longer exists once the function returns.
+- `stlcstrthrow`: the pointer is thrown as an exception - the string it points into is destroyed as the
+  stack unwinds, so the caught pointer is immediately dangling.
+
+## Motivation
+
+`std::string::c_str()` only stays valid for as long as the `std::string` it came from is still alive
+(and hasn't been modified). Returning or throwing that pointer instead of the string itself is a
+dangling-pointer bug: the pointer looks fine at the point it's produced, and only misbehaves later,
+wherever it's eventually used.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+const char *get_msg() {
+    std::string errmsg;
+    return errmsg.c_str(); // <- stlcstr: dangling as soon as 'errmsg' is destroyed
+}
+```
+
+After:
+```cpp
+#include <string>
+std::string get_msg() {
+    std::string errmsg;
+    return errmsg;
+}
+```
+
+Before:
+```cpp
+#include <string>
+void f() {
+    std::string errmsg;
+    throw errmsg.c_str(); // <- stlcstrthrow: dangling once the exception propagates past 'errmsg'
+}
+```
+
+After:
+```cpp
+#include <string>
+void f() {
+    std::string errmsg;
+    throw errmsg;
+}
+```
+
+## Related checkers
+
+- [stlcstrReturn.md](stlcstrReturn.md), [stlcstrParam.md](stlcstrParam.md),
+  [stlcstrConstructor.md](stlcstrConstructor.md), [stlcstrAssignment.md](stlcstrAssignment.md),
+  [stlcstrConcat.md](stlcstrConcat.md), [stlcstrStream.md](stlcstrStream.md) - the same
+  `.c_str()`-when-a-`std::string`-would-do idea, in other call-site shapes; those are inefficient
+  rather than dangerous.
diff --git a/man/checkers/stlcstrAssignment.md b/man/checkers/stlcstrAssignment.md
new file mode 100644
index 00000000000..44460758c79
--- /dev/null
+++ b/man/checkers/stlcstrAssignment.md
@@ -0,0 +1,45 @@
+# stlcstrAssignment
+
+**Message**: Assigning the result of c_str() to a std::string is slow and redundant.<br/>
+**Category**: Performance<br/>
+**Severity**: Performance<br/>
+**Language**: C++
+
+## Description
+
+A `std::string` is assigned the result of `.c_str()` called on another `std::string` - going through
+`c_str()` forces an unnecessary `strlen()` call that assigning directly from the source `std::string`
+would avoid.
+
+## Motivation
+
+Assigning a `const char*` to a `std::string` requires calling `strlen()` to find its length, even
+though the source `std::string` already knows its own length. Assigning from the `std::string` directly
+skips that redundant scan.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+std::string f(const std::string& a) {
+    std::string b = a.c_str(); // <- forces a strlen() that's already known
+    return b;
+}
+```
+
+After:
+```cpp
+#include <string>
+std::string f(const std::string& a) {
+    std::string b = a;
+    return b;
+}
+```
+
+## Related checkers
+
+- [stlcstr.md](stlcstr.md) - the dangerous (not just inefficient) version of this mistake.
+- [stlcstrReturn.md](stlcstrReturn.md), [stlcstrParam.md](stlcstrParam.md),
+  [stlcstrConstructor.md](stlcstrConstructor.md), [stlcstrConcat.md](stlcstrConcat.md),
+  [stlcstrStream.md](stlcstrStream.md) - the same idea in other call-site shapes.
diff --git a/man/checkers/stlcstrConcat.md b/man/checkers/stlcstrConcat.md
new file mode 100644
index 00000000000..d06a1b1c9cd
--- /dev/null
+++ b/man/checkers/stlcstrConcat.md
@@ -0,0 +1,43 @@
+# stlcstrConcat
+
+**Message**: Concatenating the result of c_str() and a std::string is slow and redundant.<br/>
+**Category**: Performance<br/>
+**Severity**: Performance<br/>
+**Language**: C++
+
+## Description
+
+`.c_str()` called on a `std::string` is concatenated (`+`) with another `std::string` - going through
+`c_str()` forces an unnecessary `strlen()` call that concatenating the two `std::string`s directly
+would avoid.
+
+## Motivation
+
+Concatenating a `const char*` with a `std::string` requires calling `strlen()` on the `const char*` to
+find its length, even though the `std::string` it came from already knew its own length. Concatenating
+the two `std::string`s directly skips that redundant scan.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+std::string g(const std::string& a, const std::string& b) {
+    return a + b.c_str(); // <- forces a strlen() that's already known
+}
+```
+
+After:
+```cpp
+#include <string>
+std::string g(const std::string& a, const std::string& b) {
+    return a + b;
+}
+```
+
+## Related checkers
+
+- [stlcstr.md](stlcstr.md) - the dangerous (not just inefficient) version of this mistake.
+- [stlcstrReturn.md](stlcstrReturn.md), [stlcstrParam.md](stlcstrParam.md),
+  [stlcstrConstructor.md](stlcstrConstructor.md), [stlcstrAssignment.md](stlcstrAssignment.md),
+  [stlcstrStream.md](stlcstrStream.md) - the same idea in other call-site shapes.
diff --git a/man/checkers/stlcstrConstructor.md b/man/checkers/stlcstrConstructor.md
new file mode 100644
index 00000000000..0985d821688
--- /dev/null
+++ b/man/checkers/stlcstrConstructor.md
@@ -0,0 +1,45 @@
+# stlcstrConstructor
+
+**Message**: Constructing a std::string from the result of c_str() is slow and redundant.<br/>
+**Category**: Performance<br/>
+**Severity**: Performance<br/>
+**Language**: C++
+
+## Description
+
+A `std::string` is constructed from the result of `.c_str()` called on another `std::string` - going
+through `c_str()` forces an unnecessary `strlen()` call that constructing directly from the source
+`std::string` would avoid.
+
+## Motivation
+
+Constructing a `std::string` from a `const char*` requires calling `strlen()` to find its length, even
+though the source `std::string` already knows its own length. Constructing from the `std::string`
+directly skips that redundant scan.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+std::string f(const std::string& a) {
+    std::string b(a.c_str()); // <- forces a strlen() that's already known
+    return b;
+}
+```
+
+After:
+```cpp
+#include <string>
+std::string f(const std::string& a) {
+    std::string b(a);
+    return b;
+}
+```
+
+## Related checkers
+
+- [stlcstr.md](stlcstr.md) - the dangerous (not just inefficient) version of this mistake.
+- [stlcstrReturn.md](stlcstrReturn.md), [stlcstrParam.md](stlcstrParam.md),
+  [stlcstrAssignment.md](stlcstrAssignment.md), [stlcstrConcat.md](stlcstrConcat.md),
+  [stlcstrStream.md](stlcstrStream.md) - the same idea in other call-site shapes.
diff --git a/man/checkers/stlcstrParam.md b/man/checkers/stlcstrParam.md
new file mode 100644
index 00000000000..2345c14c784
--- /dev/null
+++ b/man/checkers/stlcstrParam.md
@@ -0,0 +1,49 @@
+# stlcstrParam
+
+**Message**: Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.<br/>
+**Category**: Performance<br/>
+**Severity**: Performance<br/>
+**Language**: C++
+
+## Description
+
+`.c_str()` is used purely to feed a `const char*` into a function parameter that's typed `std::string`
+- going through `c_str()` forces an unnecessary `strlen()`/copy that passing the `std::string` directly
+would avoid.
+
+## Motivation
+
+Calling `.c_str()` just to hand the result to a parameter that would have happily accepted the
+`std::string` itself throws away the length information the `std::string` already had, forcing a
+`strlen()` scan (and a copy) to reconstruct it. Passing the `std::string` directly is both simpler and
+faster.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+void Foo1(const std::string& s);
+void f() {
+    std::string str = "bar";
+    Foo1(str.c_str()); // <- Foo1() already accepts a std::string
+}
+```
+
+After:
+```cpp
+#include <string>
+void Foo1(const std::string& s);
+void f() {
+    std::string str = "bar";
+    Foo1(str);
+}
+```
+
+## Related checkers
+
+- [stlcstr.md](stlcstr.md) - the dangerous (not just inefficient) version of this mistake, where the
+  pointer ends up dangling.
+- [stlcstrReturn.md](stlcstrReturn.md), [stlcstrConstructor.md](stlcstrConstructor.md),
+  [stlcstrAssignment.md](stlcstrAssignment.md), [stlcstrConcat.md](stlcstrConcat.md),
+  [stlcstrStream.md](stlcstrStream.md) - the same idea in other call-site shapes.
diff --git a/man/checkers/stlcstrReturn.md b/man/checkers/stlcstrReturn.md
new file mode 100644
index 00000000000..f74f72ff420
--- /dev/null
+++ b/man/checkers/stlcstrReturn.md
@@ -0,0 +1,47 @@
+# stlcstrReturn
+
+**Message**: Returning the result of c_str() in a function that returns std::string is slow and redundant.<br/>
+**Category**: Performance<br/>
+**Severity**: Performance<br/>
+**Language**: C++
+
+## Description
+
+`.c_str()` is used purely to feed a `const char*` into a `return` statement of a function that returns
+`std::string` - going through `c_str()` forces an unnecessary `strlen()`/copy that constructing the
+`std::string` result directly would avoid.
+
+## Motivation
+
+Calling `.c_str()` just to hand the result back to something that would have happily accepted the
+`std::string` itself throws away the length information the `std::string` already had, forcing a
+`strlen()` scan (and a copy) to reconstruct it. Passing/returning the `std::string` directly is both
+simpler and faster.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+std::string get_msg() {
+    std::string errmsg;
+    return errmsg.c_str(); // <- forces an unnecessary strlen()/copy
+}
+```
+
+After:
+```cpp
+#include <string>
+std::string get_msg() {
+    std::string errmsg;
+    return errmsg;
+}
+```
+
+## Related checkers
+
+- [stlcstr.md](stlcstr.md) - the dangerous (not just inefficient) version of this mistake, where the
+  function returns `const char*` and the pointer ends up dangling.
+- [stlcstrParam.md](stlcstrParam.md), [stlcstrConstructor.md](stlcstrConstructor.md),
+  [stlcstrAssignment.md](stlcstrAssignment.md), [stlcstrConcat.md](stlcstrConcat.md),
+  [stlcstrStream.md](stlcstrStream.md) - the same idea in other call-site shapes.
diff --git a/man/checkers/stlcstrStream.md b/man/checkers/stlcstrStream.md
new file mode 100644
index 00000000000..2653e328853
--- /dev/null
+++ b/man/checkers/stlcstrStream.md
@@ -0,0 +1,44 @@
+# stlcstrStream
+
+**Message**: Passing the result of c_str() to a stream is slow and redundant.<br/>
+**Category**: Performance<br/>
+**Severity**: Performance<br/>
+**Language**: C++
+
+## Description
+
+`.c_str()` called on a `std::string` is streamed (`<<`) into an output stream - going through `c_str()`
+forces an unnecessary `strlen()` call that streaming the `std::string` directly would avoid.
+
+## Motivation
+
+Streaming a `const char*` requires the stream to call `strlen()` on it to find its length, even though
+the `std::string` it came from already knew its own length. Streaming the `std::string` directly skips
+that redundant scan.
+
+## How to fix
+
+Before:
+```cpp
+#include <sstream>
+#include <string>
+void f(std::stringstream& strm, const std::string& s) {
+    strm << s.c_str(); // <- forces a strlen() that's already known
+}
+```
+
+After:
+```cpp
+#include <sstream>
+#include <string>
+void f(std::stringstream& strm, const std::string& s) {
+    strm << s;
+}
+```
+
+## Related checkers
+
+- [stlcstr.md](stlcstr.md) - the dangerous (not just inefficient) version of this mistake.
+- [stlcstrReturn.md](stlcstrReturn.md), [stlcstrParam.md](stlcstrParam.md),
+  [stlcstrConstructor.md](stlcstrConstructor.md), [stlcstrAssignment.md](stlcstrAssignment.md),
+  [stlcstrConcat.md](stlcstrConcat.md) - the same idea in other call-site shapes.
diff --git a/man/checkers/strPlusChar.md b/man/checkers/strPlusChar.md
new file mode 100644
index 00000000000..97ceed0388b
--- /dev/null
+++ b/man/checkers/strPlusChar.md
@@ -0,0 +1,45 @@
+# strPlusChar
+
+**Message**: Unusual pointer arithmetic. A value of type 'char' is added to a string literal.<br/>
+**Category**: Correctness<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A string literal has a `char`/`wchar_t` value added to it with `+`, with the literal written on the
+left-hand side (`"text" + ch`) - the same expression with the operands swapped (`ch + "text"`) is not
+covered by this check.
+
+## Motivation
+
+`"/usr" + '/'` doesn't concatenate the character onto the string - a string literal decays to a
+`const char*`, so `+` here is pointer arithmetic: it adds the character's numeric value to the pointer,
+producing a pointer into the middle of (or past the end of) the literal. This looks like string
+concatenation but is nothing like it.
+
+This can lead to undefined behaviour by itself, separate from whatever happens if the pointer is later
+used: the C++ standard only allows pointer arithmetic to land inside the array or exactly one past its
+end, and a character value large enough to land outside that range (as `'/'` does against the 5-byte
+`"/usr"`) makes the addition itself undefined behaviour, whether or not the resulting pointer is ever
+dereferenced. cppcheck doesn't check whether the specific character value would actually stay in range -
+this is flagged purely because the syntactic pattern (a string literal plus a `char`) is essentially
+always a concatenation mistake, not because cppcheck has determined that this particular addition goes
+out of bounds.
+
+## How to fix
+
+Before:
+```cpp
+void foo() {
+    const char *p = "/usr" + '/'; // <- pointer arithmetic on a string literal
+}
+```
+
+After:
+```cpp
+#include <string>
+void foo() {
+    std::string p = std::string("/usr") + '/';
+}
+```
diff --git a/man/checkers/stringLiteralWrite.md b/man/checkers/stringLiteralWrite.md
new file mode 100644
index 00000000000..ee38a753098
--- /dev/null
+++ b/man/checkers/stringLiteralWrite.md
@@ -0,0 +1,35 @@
+# stringLiteralWrite
+
+**Message**: Modifying string literal "abc" directly or indirectly is undefined behaviour.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A string literal is modified through a pointer to it (directly, or via a pointer passed to another
+function).
+
+## Motivation
+
+String literals are typically stored in read-only memory, so writing to one crashes or corrupts memory
+unpredictably depending on the platform. `char *p = "abc";` compiles without warning even though `p`
+points at memory that must not be written to.
+
+## How to fix
+
+Before:
+```cpp
+void f() {
+    char *abc = "abc";
+    abc[0] = 'a'; // <- undefined behaviour
+}
+```
+
+After:
+```cpp
+void f() {
+    char abc[] = "abc"; // a real, modifiable array
+    abc[0] = 'a';
+}
+```
diff --git a/man/checkers/suspiciousCase.md b/man/checkers/suspiciousCase.md
new file mode 100644
index 00000000000..1dbd9932ddc
--- /dev/null
+++ b/man/checkers/suspiciousCase.md
@@ -0,0 +1,45 @@
+# suspiciousCase
+
+**Message**: Found suspicious case label in switch(). Operator '&&' probably doesn't work as intended.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning (Inconclusive)<br/>
+**Language**: C/C++
+
+## Description
+
+A `switch` `case` label contains `&&`/`||` (`case A&&B:`) - a case label must be a single constant, so
+this doesn't test both `A` and `B`; it's normally a sign that `if`/`else` or several `case` labels were
+intended instead.
+
+## Motivation
+
+A `case` label is required to be a single constant expression - `A && B` is still just one expression
+(evaluating to `0` or `1`), not a test of "when `A` and `B`." Code written this way almost never means
+what a reader would guess from the `&&`/`||` at a glance, and usually indicates the author meant to test
+multiple values or conditions in a way `switch` doesn't directly support.
+
+## How to fix
+
+Use separate `case` labels (to match several values) or an `if`/`else` chain (to test a real logical
+condition) instead.
+
+Before:
+```cpp
+void foo(int a, int A, int B) {
+    switch(a) {
+        case A&&B: // <- a case label must be one constant, not a logical expression
+            foo(a, A, B);
+    }
+}
+```
+
+After:
+```cpp
+void foo(int a, int A, int B) {
+    switch(a) {
+        case A:
+        case B:
+            foo(a, A, B);
+    }
+}
+```
diff --git a/man/checkers/suspiciousFloatingPointCast.md b/man/checkers/suspiciousFloatingPointCast.md
new file mode 100644
index 00000000000..9e405c42efa
--- /dev/null
+++ b/man/checkers/suspiciousFloatingPointCast.md
@@ -0,0 +1,34 @@
+# suspiciousFloatingPointCast
+
+**Message**: Floating-point cast causes loss of precision.<br/>
+**Category**: Correctness<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A `double`/`long double` value is cast down to a narrower floating type (`float`, or `double` from
+`long double`) and then used somewhere that expected the original, wider type back - the narrowing
+silently throws away precision for no benefit.
+
+## Motivation
+
+Casting to a narrower floating type and then immediately using the result as the wider type again
+gains nothing - the precision lost in the cast can't come back, and the code would behave identically
+(with better precision) if the cast were simply removed.
+
+## How to fix
+
+Before:
+```cpp
+double f(double a, double b, float c) {
+    return a + (float)b + c; // <- 'b' loses precision for no reason
+}
+```
+
+After:
+```cpp
+double f(double a, double b, float c) {
+    return a + b + c;
+}
+```
diff --git a/man/checkers/suspiciousSemicolon.md b/man/checkers/suspiciousSemicolon.md
new file mode 100644
index 00000000000..0de8287cb67
--- /dev/null
+++ b/man/checkers/suspiciousSemicolon.md
@@ -0,0 +1,43 @@
+# suspiciousSemicolon
+
+**Message**: Suspicious use of ; at the end of 'if' statement.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A stray `;` immediately follows an `if`/`for`/`while` condition, right before a `{ ... }` block - the
+block is then unconditional, but reads as if it were controlled by the condition.
+
+## Motivation
+
+`if (cond);` is a complete statement on its own (an empty statement, executed only when `cond` is true),
+so a `{ ... }` block written right after it is a separate, always-executed statement - not the body of
+the `if` at all. This is a classic typo that silently turns a conditional block into unconditional code,
+and it's easy to miss on a quick read since the block still looks indented as if it belonged to the
+`if`.
+
+## How to fix
+
+Remove the stray semicolon.
+
+Before:
+```cpp
+void do_something();
+void foo(bool quit) {
+  while (!quit); { // <- the loop body is just ';' - this block always runs once
+    do_something();
+  }
+}
+```
+
+After:
+```cpp
+void do_something();
+void foo(bool quit) {
+  while (!quit) {
+    do_something();
+  }
+}
+```
diff --git a/man/checkers/terminateStrncpy.md b/man/checkers/terminateStrncpy.md
new file mode 100644
index 00000000000..c554ade8d81
--- /dev/null
+++ b/man/checkers/terminateStrncpy.md
@@ -0,0 +1,40 @@
+# terminateStrncpy
+
+**Message**: The buffer 'dest' may not be null-terminated after the call to strncpy().<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning (inconclusive)<br/>
+**Language**: C/C++
+
+## Description
+
+`strncpy()` is called with a length equal to (or larger than) the destination buffer's size, and the
+source may be at least that long - in that case `strncpy()` does not null-terminate the destination, so
+it may not be a valid C string afterwards. Since this is a "may not be null-terminated" finding rather
+than a certainty, it is only reported when `--inconclusive` is enabled.
+
+## Motivation
+
+`strncpy()` only writes a trailing `'\0'` if the source string is shorter than the given length; if the
+source is at least as long as the length, the destination is left completely full with no terminator.
+Any later code that treats the buffer as a normal null-terminated C string then reads past its end.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstring>
+void f() {
+    char dest[10];
+    strncpy(dest, "abcdefghijklmnop", sizeof(dest)); // <- may not be null-terminated
+}
+```
+
+After:
+```cpp
+#include <cstring>
+void f() {
+    char dest[10];
+    strncpy(dest, "abcdefghijklmnop", sizeof(dest) - 1);
+    dest[sizeof(dest) - 1] = '\0';
+}
+```
diff --git a/man/checkers/thisSubtraction.md b/man/checkers/thisSubtraction.md
new file mode 100644
index 00000000000..ec12d91dbf9
--- /dev/null
+++ b/man/checkers/thisSubtraction.md
@@ -0,0 +1,48 @@
+# thisSubtraction
+
+**Message**: Suspicious pointer subtraction. Did you forget to dereference it?<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+The code contains `this-x` - almost always a typo for `this->x`, since subtracting an arbitrary value
+from `this` as a pointer is rarely meaningful.
+
+## Motivation
+
+`this-x` and `this->x` look almost identical but mean completely different things: one does pointer
+arithmetic on `this` itself (rarely intended), the other accesses member `x`. This is an easy typo to
+make and an easy one to miss when reading over code quickly.
+
+It's also not merely a readability problem: `this` points to a single object, not an array, so subtracting
+any nonzero value from it produces a pointer outside that object's bounds, which the standard's pointer
+arithmetic rules make undefined behaviour to even form, before it's ever dereferenced or compared. cppcheck
+doesn't evaluate `x` here, though - it flags the `this - x` syntax on sight, regardless of what `x` actually
+is, so this is reported purely as a likely typo for `this->x`, not because cppcheck has confirmed the
+subtraction itself is unsafe.
+
+## How to fix
+
+Before:
+```cpp
+class C {
+public:
+    int x;
+    void f() {
+        this-x; // <- thisSubtraction: likely meant 'this->x'
+    }
+};
+```
+
+After:
+```cpp
+class C {
+public:
+    int x;
+    void f() {
+        this->x;
+    }
+};
+```
diff --git a/man/checkers/thisUseAfterFree.md b/man/checkers/thisUseAfterFree.md
new file mode 100644
index 00000000000..0713de349b8
--- /dev/null
+++ b/man/checkers/thisUseAfterFree.md
@@ -0,0 +1,42 @@
+# thisUseAfterFree
+
+**Message**: Class member 'x' is accessed after deleting 'this' (or a smart pointer holding it).<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+A member function `delete`s (or `.reset()`s) a pointer/smart-pointer that holds `this` itself, and then
+goes on to call another method or use another member - by that point the object has already been
+destroyed.
+
+## Motivation
+
+Once an object has deleted itself (typically via a `static` "instance" pointer, or a smart pointer that
+owns it), continuing to use `this` - or anything reached through it, including other member functions -
+is a use-after-free, even though the memory may still look intact for a little while afterwards.
+
+## How to fix
+
+Before:
+```cpp
+class C {
+public:
+  void dostuff() { delete mInstance; hello(); } // <- thisUseAfterFree: 'this' is gone after the delete
+private:
+  static C *mInstance;
+  void hello() {}
+};
+```
+
+After:
+```cpp
+class C {
+public:
+  void dostuff() { hello(); delete mInstance; }
+  void hello() {}
+private:
+  static C *mInstance;
+};
+```
diff --git a/man/checkers/throwInEntryPoint.md b/man/checkers/throwInEntryPoint.md
new file mode 100644
index 00000000000..e4c1f9d3acd
--- /dev/null
+++ b/man/checkers/throwInEntryPoint.md
@@ -0,0 +1,47 @@
+# throwInEntryPoint
+
+**Message**: Unhandled exception thrown in function that is an entry point.<br/>
+**Category**: Correctness<br/>
+**Severity**: Error<br/>
+**Language**: C++ only
+
+## Description
+
+An exception can escape a recognized program entry point (`main`, or others such as `_init`/`_fini`
+when the matching library configuration is loaded).
+
+## Motivation
+
+An exception that escapes `main()` (or another entry point) is not caught by anything, so the C++
+runtime calls `std::terminate()` - the program aborts, typically without the cleanup a caught,
+handled exception would have allowed.
+
+## How to fix
+
+Before:
+```cpp
+void doWork();
+int main() {
+    doWork(); // <- if this throws, nothing will catch it
+    return 0;
+}
+```
+
+After:
+```cpp
+#include <exception>
+void doWork();
+int main() {
+    try {
+        doWork();
+    } catch (const std::exception&) {
+        return 1;
+    }
+    return 0;
+}
+```
+
+## Related checkers
+
+- [throwInNoexceptFunction.md](throwInNoexceptFunction.md) - the same underlying problem, for a
+  function explicitly marked `noexcept` instead of a recognized entry point.
diff --git a/man/checkers/throwInNoexceptFunction.md b/man/checkers/throwInNoexceptFunction.md
new file mode 100644
index 00000000000..d69cddfb7a8
--- /dev/null
+++ b/man/checkers/throwInNoexceptFunction.md
@@ -0,0 +1,39 @@
+# throwInNoexceptFunction
+
+**Message**: Unhandled exception thrown in function declared not to throw exceptions.<br/>
+**Category**: Correctness<br/>
+**Severity**: Error<br/>
+**Language**: C++ only
+
+## Description
+
+A function declared `noexcept`, `throw()`, or with an equivalent `__attribute__((nothrow))`/
+`__declspec(nothrow)`, throws (or calls something that throws) anyway.
+
+## Motivation
+
+If an exception escapes a function promised not to throw, `std::terminate()` is called immediately -
+the program aborts without any of the normal stack-unwinding cleanup (destructors further up the call
+stack are not guaranteed to run).
+
+## How to fix
+
+Before:
+```cpp
+void f() noexcept {
+    throw 1; // <- contradicts the noexcept promise
+}
+```
+
+After:
+```cpp
+void f() noexcept {
+}
+```
+
+## Related checkers
+
+- [exceptThrowInDestructor.md](exceptThrowInDestructor.md) - the same underlying problem, specifically
+  for a destructor (implicitly `noexcept`).
+- [throwInEntryPoint.md](throwInEntryPoint.md) - the same underlying problem, for a recognized program
+  entry point instead of an explicitly `noexcept` function.
diff --git a/man/checkers/truncLongCast.md b/man/checkers/truncLongCast.md
index 7157a5b6627..01d9400d0dc 100644
--- a/man/checkers/truncLongCast.md
+++ b/man/checkers/truncLongCast.md
@@ -7,12 +7,17 @@
 
 ## Description
 
-This checker warns when a calculation has type 'int' and it could potentially overflow that and the result is implicitly or explicitly converted to a larger
-integer type after the loss of information has already occured.
+A multiplication (`*`) or left-shift (`<<`) is computed using `int` arithmetic, and only afterwards -
+once any overflow has already happened - is the result widened to a larger integer type by an implicit
+or explicit conversion. Widening after the fact doesn't recover information that `int` arithmetic already
+lost.
 
 ## Motivation
 
-The motivation of this checker is to catch bugs. Unintentional loss of information.
+Declaring a wider result type (`long`, `int64_t`, ...) is often meant to give a calculation more room, so
+it doesn't overflow. That only works if the wider type is used for the calculation itself; if the
+multiplication or shift is still done in `int` and only the final result is widened, the overflow already
+happened before the conversion, and the wider type just carries forward a truncated value.
 
 ## How to fix
 
@@ -47,4 +52,4 @@ After (change type of assigned variable):
 void foo(int32_t y) {
     int32_t x = y * y;
 }
-```
\ No newline at end of file
+```
diff --git a/man/checkers/unassignedVariable.md b/man/checkers/unassignedVariable.md
new file mode 100644
index 00000000000..cec8da2a0ee
--- /dev/null
+++ b/man/checkers/unassignedVariable.md
@@ -0,0 +1,44 @@
+# unassignedVariable
+
+**Message**: Variable 'i' is not assigned a value.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A variable is read (or its address is taken) without ever having been given a value first.
+
+## Motivation
+
+Reading a variable that's never been assigned is a sign of a bug: a forgotten initialization, or a
+variable name that was meant to refer to something else. (Note this checker flags the code pattern
+itself; see [uninitvar.md](uninitvar.md) for the related, more precise check on genuinely reading an
+uninitialized value.)
+
+## How to fix
+
+Give the variable a value before reading it.
+
+Before:
+```cpp
+int foo() {
+    int i; // <- read below without ever being assigned
+    return i;
+}
+```
+
+After:
+```cpp
+int foo() {
+    int i = 0;
+    return i;
+}
+```
+
+## Related checkers
+
+- [uninitvar.md](uninitvar.md) - the closely related, more precise family of checks specifically about
+  reading an uninitialized value.
+- [unusedVariable.md](unusedVariable.md) and [unreadVariable.md](unreadVariable.md) - the sibling
+  findings for a variable that's never used at all, or assigned but never read.
diff --git a/man/checkers/unhandledExceptionSpecification.md b/man/checkers/unhandledExceptionSpecification.md
new file mode 100644
index 00000000000..a63abe03e69
--- /dev/null
+++ b/man/checkers/unhandledExceptionSpecification.md
@@ -0,0 +1,39 @@
+# unhandledExceptionSpecification
+
+**Message**: Unhandled exception specification when calling function thrower().<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++ only
+
+## Description
+
+A function with no exception specification of its own calls another function that has an (old-style,
+C++17-removed) `throw(SomeType)` dynamic exception specification, without any `try`/`catch` in between.
+
+## Motivation
+
+A dynamic exception specification like `throw(int)` documents that a function can only throw that
+particular type - calling it without handling that possibility is worth a second look, especially since
+this old-style specification was removed from the language in C++17 and callers may not realize it's
+still meaningful in the code they're reading.
+
+## How to fix
+
+Before:
+```cpp
+void thrower() throw(int);
+void f() {
+    thrower(); // <- unhandled 'throw(int)' specification
+}
+```
+
+After:
+```cpp
+void thrower() throw(int);
+void f() {
+    try {
+        thrower();
+    } catch (int) {
+    }
+}
+```
diff --git a/man/checkers/uninitMemberVar.md b/man/checkers/uninitMemberVar.md
new file mode 100644
index 00000000000..b7d498df8a2
--- /dev/null
+++ b/man/checkers/uninitMemberVar.md
@@ -0,0 +1,142 @@
+# uninitMemberVar, uninitMemberVarPrivate, uninitDerivedMemberVar, uninitDerivedMemberVarPrivate, uninitMemberVarNoCtor, uninitMemberVarPrivateNoCtor, uninitDerivedMemberVarNoCtor and uninitDerivedMemberVarPrivateNoCtor
+
+**Message**: Member variable 'x' is not initialized in the constructor.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+A constructor (or copy/move constructor) doesn't give a member variable any value. All eight IDs here
+are the exact same underlying finding, distinguished only by three independent, combinable details of
+the situation:
+
+- **`Derived`** appears in the ID when the uninitialized member actually belongs to a *base* class
+  rather than the class whose constructor is being looked at.
+- **`Private`** appears in the ID when either there's no constructor at all and only some of the
+  class's members happen to have in-class default values (so the ones without one are flagged this
+  way), or the specific constructor that's missing the initialization is itself `private`.
+- **`NoCtor`** appears in the ID when the class has no constructor at all, but *some* of its members do
+  have in-class default initializers - which means cppcheck can tell that whoever wrote the class was
+  thinking about initialization, making it worth flagging any other member that has no default.
+
+Of the eight combinations, three (`uninitMemberVarPrivateNoCtor`, `uninitDerivedMemberVarNoCtor`,
+`uninitDerivedMemberVarPrivateNoCtor`) are only theoretically possible - in the current version of
+cppcheck, none of the code paths that would build these particular three ID strings are actually
+reachable, so you will not see them in practice.
+
+## Motivation
+
+Reading a member before it's ever been given a value is undefined behaviour, whether or not the class
+manages any resource - the member's contents are simply whatever bytes happened to already be in that
+memory.
+
+## How to fix
+
+Give every member a value, either via an in-class default initializer or in every constructor's
+member-initializer list.
+
+Before:
+```cpp
+class Fred {
+public:
+    Fred() {} // <- 'i' is never given a value
+    int i;
+};
+```
+
+After:
+```cpp
+class Fred {
+public:
+    Fred() : i(0) {}
+    int i;
+};
+```
+
+Before:
+```cpp
+class C {
+private:
+    int i1 = 0;
+    int i2; // <- no constructor, and 'i2' has no default like 'i1' does
+};
+```
+
+After:
+```cpp
+class C {
+private:
+    int i1 = 0;
+    int i2 = 0;
+};
+```
+
+Before:
+```cpp
+class Base {
+public:
+    virtual void foo() = 0;
+    int x; // <- left uninitialized by every class that derives from Base
+};
+class Derived: public Base {
+public:
+    Derived() {}
+    void foo() override;
+};
+```
+
+After:
+```cpp
+class Base {
+public:
+    Base() : x(0) {}
+    virtual void foo() = 0;
+    int x;
+};
+class Derived: public Base {
+public:
+    Derived() {}
+    void foo() override;
+};
+```
+
+Before:
+```cpp
+class B { int i; }; // <- B's own (private) constructor doesn't init 'i'
+class D : B {
+    explicit D(int) {}
+};
+```
+
+After:
+```cpp
+class B {
+    int i;
+public:
+    B() : i(0) {}
+};
+class D : B {
+    explicit D(int) {}
+};
+```
+
+Before:
+```cpp
+struct S {
+    int a = 0, b; // <- 'a' has a default, 'b' doesn't
+};
+```
+
+After:
+```cpp
+struct S {
+    int a = 0, b = 0;
+};
+```
+
+## Related checkers
+
+- [noConstructor.md](noConstructor.md) - the related check for when a class has no constructor at all.
+- [missingMemberCopy.md](missingMemberCopy.md) - the analogous finding for a copy/move constructor that
+  simply forgets to copy one particular member, rather than never initializing it.
diff --git a/man/checkers/uninitStructMember.md b/man/checkers/uninitStructMember.md
new file mode 100644
index 00000000000..f705c1acede
--- /dev/null
+++ b/man/checkers/uninitStructMember.md
@@ -0,0 +1,47 @@
+# uninitStructMember
+
+**Message**: Uninitialized struct member: x<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A specific struct/class member is read before that particular member has been set, even if other
+members of the same variable have been.
+
+## Motivation
+
+Initializing some members of a struct doesn't initialize the rest - reading a member that was never
+assigned is undefined behaviour, the same as reading an uninitialized plain variable, and easy to miss
+when other, nearby members of the same variable were set correctly.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+#include <cstdlib>
+struct ABC { int a; int b; };
+void f() {
+    struct ABC *abc = (struct ABC*)malloc(sizeof(struct ABC));
+    printf("%d", abc->a); // <- uninitStructMember
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+#include <cstdlib>
+struct ABC { int a; int b; };
+void f() {
+    struct ABC *abc = (struct ABC*)malloc(sizeof(struct ABC));
+    abc->a = 0;
+    printf("%d", abc->a);
+}
+```
+
+## Related checkers
+
+- [uninitvar.md](uninitvar.md) - the general "read before assignment" check this one specializes for
+  one particular struct member.
diff --git a/man/checkers/uninitdata.md b/man/checkers/uninitdata.md
new file mode 100644
index 00000000000..66e0b74ecd0
--- /dev/null
+++ b/man/checkers/uninitdata.md
@@ -0,0 +1,48 @@
+# uninitdata
+
+**Message**: Memory is allocated but not initialized: x<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+Like [uninitvar.md](uninitvar.md), but specifically for memory obtained from an allocation function
+(`malloc`, etc.) - the block exists, but its contents haven't been written yet.
+
+## Motivation
+
+Memory returned by `malloc()` and similar functions is not zero-initialized - it holds whatever bytes
+happened to already be there. Reading through it before writing to it is undefined behaviour, just like
+reading an uninitialized plain variable, but easier to overlook since the allocation itself looks like
+it "created" the value.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+#include <cstdlib>
+struct ABC { int a; int b; };
+void f() {
+    struct ABC *abc = (struct ABC*)malloc(sizeof(struct ABC));
+    printf("%d", abc->a); // <- uninitdata
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+#include <cstdlib>
+struct ABC { int a; int b; };
+void f() {
+    struct ABC *abc = (struct ABC*)malloc(sizeof(struct ABC));
+    abc->a = 0;
+    printf("%d", abc->a);
+}
+```
+
+## Related checkers
+
+- [uninitvar.md](uninitvar.md) - the general "read before assignment" check this one specializes for
+  allocated memory.
diff --git a/man/checkers/uninitvar.md b/man/checkers/uninitvar.md
new file mode 100644
index 00000000000..507c368a47c
--- /dev/null
+++ b/man/checkers/uninitvar.md
@@ -0,0 +1,82 @@
+# uninitvar and legacyUninitvar
+
+**Message**: Uninitialized variable: x<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A local variable, pointer, or struct member is read (or its uninitialized value is passed along)
+before any assignment reaches that point:
+
+- `uninitvar`: the main check.
+- `legacyUninitvar`: an older, separate analysis that catches some patterns the main `uninitvar` check
+  doesn't (and vice versa) - both run, so the same kind of bug can be reported under either ID depending
+  on the exact code shape.
+
+## Motivation
+
+Reading a variable before it has been given a value is undefined behaviour in C/C++: the variable's
+contents are whatever bytes happened to already be in that memory, which is unpredictable and can
+differ between runs, builds, or optimization levels. This is one of the most common sources of subtle,
+hard-to-reproduce bugs.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f() {
+    int x;
+    printf("%d", x); // <- uninitvar
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f() {
+    int x = 0;
+    printf("%d", x);
+}
+```
+
+## False positives to be aware of
+
+- **Passing a member-access expression as an argument to an unresolved, all-uppercase macro-like call**
+  can be wrongly flagged, since cppcheck can't tell whether the macro actually evaluates its argument
+  at runtime (many such macros, like size- or offset-computing ones, don't):
+  ```cpp
+  void f() {
+      struct SData * s;
+      TYPEOF(s->status); // flagged as reading uninitialized 's', even if TYPEOF never evaluates it
+  }
+  ```
+- **A cast applied to `&variable` can be misread as reading the variable itself**, when it's actually
+  ambiguous whether `&` means "address of" (which never requires the variable to hold a value) or a
+  bitwise AND:
+  ```cpp
+  int main() {
+      int done;
+      dostuff(1, (AuPointer) &done); // flagged, even though '&done' alone doesn't read 'done'
+  }
+  ```
+- **Casting a variable of a type cppcheck doesn't recognize to a pointer type can be wrongly treated as
+  reading it**, particularly in C code using an opaque/typedef'd type:
+  ```c
+  void f() {
+      DES_cblock d;     // unknown type
+      char *dp;
+      dp = (char *)d;   // flagged as reading uninitialized 'd', even though the type is opaque to cppcheck
+  }
+  ```
+
+## Related checkers
+
+- [uninitdata.md](uninitdata.md) - the same idea, for memory obtained from an allocation function
+  rather than a plain variable.
+- [uninitStructMember.md](uninitStructMember.md) - the same idea, narrowed to one specific struct
+  member.
+- [ctuuninitvar.md](ctuuninitvar.md) - the same idea, found by whole-program analysis across function
+  calls.
diff --git a/man/checkers/unknownEvaluationOrder.md b/man/checkers/unknownEvaluationOrder.md
new file mode 100644
index 00000000000..20684d90228
--- /dev/null
+++ b/man/checkers/unknownEvaluationOrder.md
@@ -0,0 +1,49 @@
+# unknownEvaluationOrder
+
+**Message**: Expression 'x = x++;' depends on order of evaluation of side effects<br/>
+**Category**: Undefined Behaviour/Portability<br/>
+**Severity**: Error/Portability<br/>
+**Language**: C/C++
+
+## Description
+
+An expression reads and modifies the same variable more than once with no defined order between the
+two (for example `x = x++;` or `x++, x++`). This is reported at two different severities because the
+language rules genuinely differ between the two shapes:
+
+- **Error** (for example `x = x++;`): the read and the modification aren't just unordered, they actively
+  conflict - this is undefined behaviour in both C and C++.
+- **Portability**: the specific expression shape is one where C++17 tightened the sequencing rules
+  enough that the order is merely *unspecified* (one of a few valid outcomes, not anything-goes) - not
+  undefined behaviour under C++17, but still worth flagging since older compilers/standards, or C, may
+  treat the same code as undefined instead.
+
+## Motivation
+
+When the same variable is both read and modified more than once in one expression with no sequencing
+between the two, different compilers (or the same compiler at different optimization levels) can
+legally produce different results. For the `Error` shape this is undefined behaviour outright; for the
+`Portability` shape, C++17 guarantees the result is at least one of a small set of valid outcomes, but
+which one is still compiler-dependent, so the code isn't portable even though it's not undefined.
+
+## How to fix
+
+Before:
+```cpp
+int dostuff();
+void f() {
+  int x = dostuff();
+  return x + x++; // <- depends on evaluation order
+}
+```
+
+After:
+```cpp
+int dostuff();
+int f() {
+  int x = dostuff();
+  int y = x++;
+  return x + y;
+}
+```
+
diff --git a/man/checkers/unknownMacro.md b/man/checkers/unknownMacro.md
new file mode 100644
index 00000000000..e0b352eab63
--- /dev/null
+++ b/man/checkers/unknownMacro.md
@@ -0,0 +1,66 @@
+# unknownMacro
+
+**Message**: There is an unknown macro here somewhere. Configuration is required. If AAA is a macro then please configure it.<br/>
+**Category**: Configuration<br/>
+**Severity**: Error<br/>
+**Language**: C and C++
+
+## Description
+
+Cppcheck has found code that is confusing and does not know how to analyze it. This is a critical
+error, the analysis of the whole translation unit is aborted. Such error in a header file can mean
+that analysis of many source files are aborted.
+
+Your code is probably OK but you need to configure Cppcheck to make Cppcheck understand the code
+better.
+
+## How to fix
+
+Review the configuration.
+
+If Cppcheck warns about a macro that is defined in a 3rd party library, and there is a cfg file for
+that, then a `--library=` option may be a proper solution.
+
+If Cppcheck warns about a macro that is defined in a header that should be included, make sure that
+this header is included properly. Cppcheck must have the include path.
+
+If Cppcheck warns about a compiler keyword add a `-D` that defines this keyword somehow. I.e. if
+cppcheck should just ignore the keyword then an `-DKEYWORD=` option is suggested.
+
+## Example
+
+### Example code 1
+```
+    fprintf(stderr, "Generating up to " F_U64 " sequences and up to " F_U64 " bases.\n", nSeqs, nBases);
+```
+
+Warning:
+
+canu-2.2/src/seqrequester/src/seqrequester/generate.H:72:41: error: There is an unknown macro here somewhere. Configuration is required. If F_U64 is a macro then please configure it. [unknownMacro]
+
+Fix:
+
+Somehow `F_U64` must be specified for Cppcheck to be able to analyse this properly. Either:
+ * Add `-DF_U64="x"` to explicitly tell Cppcheck what it should replace F_U64 with. Or;
+ * Add `-I..` so that headers are included properly.
+ * If the symbol is defined in a 3rd party library adding a corresponding `--library=` might solve such issue.
+
+### Example code 2
+```
+BOTAN_FUNC_ISA("crypto")
+void AES_128::hw_aes_encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const
+```
+
+Warning:
+
+botan-2.19.5+dfsg/src/lib/block/aes/aes_power8/aes_power8.cpp:103:1: error: There is an unknown macro here somewhere. Configuration is required. If BOTAN_FUNC_ISA is a macro then please configure it. [unknownMacro]
+
+Fix:
+
+Somehow `BOTAN_FUNC_ISA` must be specified for Cppcheck to be able to analyse this properly. Either:
+ * Add `-DBOTAN_FUNC_ISA(X)=` to explicitly tell Cppcheck that BOTAN_FUNC_ISA("crypto") should be ignored. Or;
+ * Add `-I..` so that headers are included properly.
+ * If the symbol is defined in a 3rd party library adding a corresponding `--library=` might solve such issue.
+
+
+
diff --git a/man/checkers/unknownPattern.md b/man/checkers/unknownPattern.md
new file mode 100644
index 00000000000..f8748e03fb2
--- /dev/null
+++ b/man/checkers/unknownPattern.md
@@ -0,0 +1,29 @@
+# unknownPattern
+
+**Message**: Unknown pattern used: "%typex%"<br/>
+**Category**: Code Quality<br/>
+**Severity**: Error<br/>
+**Language**: C++ (cppcheck's own source code only)
+
+## Description
+
+A `%something%` placeholder isn't one of the pattern language's recognized names.
+
+This is not a general-purpose checker for arbitrary C/C++ programs - see
+[simplePatternError.md](simplePatternError.md) for the shared background on this internal,
+cppcheck-source-only checker.
+
+## Motivation
+
+An unrecognized placeholder name is almost always a typo for a real one (`%type%` misspelled as
+`%typex%`, for example) - since the pattern engine doesn't know what it means, the match silently fails
+to do what was intended.
+
+## How to fix
+
+Correct the placeholder name to one the pattern language actually recognizes (`%type%`, `%var%`,
+`%num%`, ...).
+
+## Related checkers
+
+- [missingPercentCharacter.md](missingPercentCharacter.md) - a placeholder that's missing its closing `%` entirely, rather than misspelled.
diff --git a/man/checkers/unpreciseMathCall.md b/man/checkers/unpreciseMathCall.md
new file mode 100644
index 00000000000..daf657114bd
--- /dev/null
+++ b/man/checkers/unpreciseMathCall.md
@@ -0,0 +1,40 @@
+# unpreciseMathCall
+
+**Message**: Expression 'exp(x) - 1' can be replaced by 'expm1(x)' to avoid loss of precision.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+An expression like `exp(x) - 1` or `log(1 + x)` should be written as `expm1(x)`/`log1p(x)` to avoid
+losing precision for small `x`.
+
+## Motivation
+
+For small `x`, `exp(x)` is very close to `1`, so `exp(x) - 1` subtracts two nearly-equal
+floating-point numbers - a classic way to lose most of the significant digits of the result.
+`expm1()`/`log1p()` are designed to compute the same mathematical result without this cancellation.
+
+## How to fix
+
+Before:
+```cpp
+#include <cmath>
+void f() {
+    print(exp(3.5) - 1); // <- loses precision for small arguments
+}
+```
+
+After:
+```cpp
+#include <cmath>
+void f() {
+    print(expm1(3.5));
+}
+```
+
+## Related checkers
+
+- [wrongmathcall.md](wrongmathcall.md) - a related but distinct math-function issue: passing a literal
+  value outside a function's valid domain.
diff --git a/man/checkers/unreachableCode.md b/man/checkers/unreachableCode.md
new file mode 100644
index 00000000000..4ed841196fb
--- /dev/null
+++ b/man/checkers/unreachableCode.md
@@ -0,0 +1,42 @@
+# unreachableCode
+
+**Message**: Statements following return, break, continue, goto or throw will never be executed.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+Code appears right after a `return`/`break`/`continue`/`goto`/`throw`, or after a call to a function
+that never returns - none of it can ever execute.
+
+## Motivation
+
+This is dead code by definition: control leaves the enclosing block before reaching it, so it can be
+deleted with no change in behavior. It's also worth double-checking that the surrounding logic is
+actually correct, since unreachable code sometimes reveals a misplaced statement.
+
+## How to fix
+
+Before:
+```cpp
+void bar();
+void foo() {
+    return;
+    bar(); // <- can never run
+}
+```
+
+After:
+```cpp
+void bar();
+void foo() {
+    bar();
+    return;
+}
+```
+
+## Related checkers
+
+- [duplicateBreak.md](duplicateBreak.md) - the specific case where the unreachable statement is itself another `return`/`break`/`continue`/`goto`/`throw`.
+- [unreachableSwitchCase.md](unreachableSwitchCase.md) - a `switch` `case` that can never be selected, rather than code placed after an exit statement.
diff --git a/man/checkers/unreachableSwitchCase.md b/man/checkers/unreachableSwitchCase.md
new file mode 100644
index 00000000000..1a1f61a53b0
--- /dev/null
+++ b/man/checkers/unreachableSwitchCase.md
@@ -0,0 +1,51 @@
+# unreachableSwitchCase
+
+**Message**: Switch case 'x' can never be selected because the switch condition is known to be 'y'.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A `switch` is given a value cppcheck already knows, and a `case` label in it can never match that
+value.
+
+## Motivation
+
+A `case` that can never be reached is dead code, and can indicate a mistake nearby - for example, that
+the `switch`'s value was meant to still be variable at this point but has already been narrowed down by
+an earlier check.
+
+## How to fix
+
+Before:
+```cpp
+enum T { A, B };
+void f(const T &t) {
+    if (t == A) {
+        switch (t) {
+        case A:
+            break;
+        case B: // <- 't' is known to be A here
+            break;
+        }
+    }
+}
+```
+
+After:
+```cpp
+enum T { A, B };
+void f(const T &t) {
+    switch (t) {
+    case A:
+        break;
+    case B:
+        break;
+    }
+}
+```
+
+## Related checkers
+
+- [unreachableCode.md](unreachableCode.md) - code placed after an exit statement, rather than a `case` that can't be selected.
diff --git a/man/checkers/unreadVariable.md b/man/checkers/unreadVariable.md
new file mode 100644
index 00000000000..b90d870e3ad
--- /dev/null
+++ b/man/checkers/unreadVariable.md
@@ -0,0 +1,55 @@
+# unreadVariable
+
+**Message**: Variable 'x' is assigned a value that is never used.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A variable is assigned a value (or modified), but that value is never read afterwards - so the
+assignment has no effect.
+
+## Motivation
+
+An assignment whose value is never read is pointless code that adds noise for readers, and is often a
+sign of a bug: a forgotten follow-up use of the variable, a typo'd variable name on the next line, or
+dead code left over from a refactor.
+
+## How to fix
+
+Remove the pointless assignment, or actually read the value afterwards.
+
+Before:
+```cpp
+void f() {
+    int x = 5; // <- never read afterwards
+}
+```
+
+After:
+```cpp
+void f() {
+    int x = 5;
+    print(x);
+}
+```
+
+## False positives to be aware of
+
+- **An RAII guard object bound through `auto&&` can be wrongly reported as an unused assignment.** An
+  object whose entire purpose is its constructor/destructor side effect (for example a
+  `std::lock_guard`) has no "value" to read back, but is not just an unused assignment either:
+  ```cpp
+  #include <mutex>
+  void f(std::mutex& mutex) {
+      auto&& g = std::lock_guard<std::mutex>{ mutex }; // reported as unread, but 'g' locks/unlocks the mutex
+  }
+  ```
+
+## Related checkers
+
+- [unusedVariable.md](unusedVariable.md) - the sibling finding for a variable that's never read *or*
+  written at all.
+- [unassignedVariable.md](unassignedVariable.md) - the opposite situation: a variable read before it's
+  ever assigned.
diff --git a/man/checkers/unsafeClassCanLeak.md b/man/checkers/unsafeClassCanLeak.md
new file mode 100644
index 00000000000..4b3cd53823b
--- /dev/null
+++ b/man/checkers/unsafeClassCanLeak.md
@@ -0,0 +1,41 @@
+# unsafeClassCanLeak
+
+**Message**: Class 'A' is unsafe, 'A::b' can leak by wrong usage.<br/>
+**Category**: Correctness<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A class allocates a member (typically in its constructor) but has no visible destructor logic that
+frees it - so every place that creates one of these objects has to remember to clean it up manually,
+which is easy to get wrong.
+
+## Motivation
+
+A class that owns an allocation but doesn't free it in its own destructor pushes the cleanup
+responsibility out onto every single place that uses the class - if even one of those places forgets, or
+an exception skips the manual cleanup, the allocation leaks. Freeing what the class owns, inside its own
+destructor, makes the class safe to use without every caller having to think about it.
+
+## How to fix
+
+Before:
+```cpp
+class A {
+    int *b;
+public:
+    A() { b = new int; } // <- no destructor frees 'b'
+};
+```
+
+After:
+```cpp
+class A {
+    int *b;
+public:
+    A() { b = new int; }
+    ~A() { delete b; }
+};
+```
+
diff --git a/man/checkers/unsafeClassRefMember.md b/man/checkers/unsafeClassRefMember.md
new file mode 100644
index 00000000000..2c1381d993a
--- /dev/null
+++ b/man/checkers/unsafeClassRefMember.md
@@ -0,0 +1,31 @@
+# unsafeClassRefMember
+
+**Message**: Storing reference to member argument in the class member is unsafe.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+A `const&` member is initialized directly from a `const&` constructor argument - if a caller ever
+passes a temporary or a short-lived local variable there, the member ends up referring to something
+that's already been destroyed.
+
+This check only runs when analysis is configured through a Cppcheck GUI/project file that turns on
+"safe checks" for classes (`<safe-checks><class-public/></safe-checks>`) - there is no plain
+command-line flag for it, so it will not appear in an ordinary `--enable=...` run.
+
+## Motivation
+
+Storing a reference member straight from a constructor's reference parameter looks harmless, but it
+makes the object's validity depend entirely on the lifetime of whatever the caller happened to pass in -
+if that argument was a temporary, the member becomes a dangling reference the moment the constructor
+call's statement finishes, and every later use of the member is undefined behaviour. This check fires on
+the constructor's signature alone - it doesn't (and can't, from the class definition by itself) know what
+every caller actually passes in, so a class that's only ever constructed with a long-lived object is
+flagged just the same as one that's handed a temporary.
+
+## How to fix
+
+Store a copy of the value instead of a reference to it, unless the class's contract explicitly requires
+the referred-to object to outlive it.
diff --git a/man/checkers/unsignedLessThanZero.md b/man/checkers/unsignedLessThanZero.md
new file mode 100644
index 00000000000..26a93cc129c
--- /dev/null
+++ b/man/checkers/unsignedLessThanZero.md
@@ -0,0 +1,52 @@
+# unsignedLessThanZero and unsignedPositive
+
+**Message**: Checking if unsigned expression 'x' is less than zero.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+An unsigned expression is compared against `0` in a way that can never be true (`unsignedLessThanZero`:
+`x < 0`) or is always true (`unsignedPositive`: `x >= 0`), since an unsigned value can't be negative.
+
+## Motivation
+
+Both comparisons are tautological for an unsigned type, so the branch they guard either never runs or
+always runs - not what the code visibly appears to be testing, and a common leftover from a variable
+that used to be signed.
+
+## How to fix
+
+Before:
+```cpp
+void foo(unsigned int x) {
+  if (x < 0) {} // <- can never be true
+}
+```
+
+After:
+```cpp
+void foo(int x) {
+  if (x < 0) {}
+}
+```
+
+Before:
+```cpp
+void foo() {
+  for(unsigned char i = 10; i >= 0; i--) {} // <- always true, infinite loop risk
+}
+```
+
+After:
+```cpp
+void foo() {
+  for(int i = 10; i >= 0; i--) {}
+}
+```
+
+## Related checkers
+
+- [pointerLessThanZero.md](pointerLessThanZero.md) - the same idea, for a pointer compared against `0`
+  instead of an unsigned integer.
diff --git a/man/checkers/unusedAllocatedMemory.md b/man/checkers/unusedAllocatedMemory.md
new file mode 100644
index 00000000000..5f1d053694d
--- /dev/null
+++ b/man/checkers/unusedAllocatedMemory.md
@@ -0,0 +1,42 @@
+# unusedAllocatedMemory
+
+**Message**: Variable 'p' is allocated memory that is never used.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A variable is assigned the result of an allocation (`malloc`, `new`, ...), but the allocated memory
+itself is never read or written - only, at most, freed again.
+
+## Motivation
+
+Allocating memory that's never actually used is pointless, and usually a sign that some code that was
+meant to fill or use the buffer was never written, or was removed during a refactor without noticing the
+allocation.
+
+## How to fix
+
+Actually use the allocated memory, or remove the allocation.
+
+Before:
+```cpp
+void f() {
+    char* p = (char*)malloc(10); // <- allocated but never touched
+}
+```
+
+After:
+```cpp
+void f() {
+    char* p = (char*)malloc(10);
+    p[0] = 'x';
+    free(p);
+}
+```
+
+## Related checkers
+
+- [unusedVariable.md](unusedVariable.md) - the general form of this finding, for any variable that's
+  never read or written.
diff --git a/man/checkers/unusedFunction.md b/man/checkers/unusedFunction.md
new file mode 100644
index 00000000000..0b878137dd0
--- /dev/null
+++ b/man/checkers/unusedFunction.md
@@ -0,0 +1,75 @@
+# unusedFunction and staticFunction
+
+**Message**: The function 'foo' is never used.<br/>
+**Category**: Unused Code<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+- `unusedFunction`: a function is defined but never called (and its address is never taken) anywhere
+  in the code cppcheck was given.
+- `staticFunction` (C only): a function is only ever called from within its own file, and could be
+  given internal linkage by declaring it `static`.
+
+Both are only enabled through `--enable=unusedFunction` - not through `--enable=style`, even though
+the messages are reported at `style` severity - and cppcheck explicitly recommends only enabling this
+check when the whole program (every source file of the project) is being analyzed together, not a
+single file in isolation.
+
+Both only consider a function "used" through a direct, by-name call (or its address being taken)
+somewhere in that whole-program analysis. A virtual function is never checked, since it may only ever
+be reached polymorphically through a base-class pointer/reference, which cppcheck doesn't attempt to
+trace; operator overloads are likewise never checked, since they're often invoked implicitly through
+operator syntax or required by generic code, making usage hard to establish reliably by name alone.
+
+## Motivation
+
+An unused function is dead code: it adds to what has to be read and maintained without doing
+anything. For `staticFunction`, giving an internal-only function `static` linkage documents that it
+is not part of the file's public interface, and can also help the compiler optimize it.
+
+## How to fix
+
+Remove a function that's genuinely unused, or make sure the code that calls it is included in the
+same whole-program analysis. Add `static` to a C function that's only called from its own file.
+
+Before:
+```cpp
+void helper() { /* ... */ } // <- unusedFunction: never called anywhere in the analyzed code
+
+int main() {
+    return 0;
+}
+```
+
+After:
+```cpp
+void helper() { /* ... */ }
+
+int main() {
+    helper();
+    return 0;
+}
+```
+
+Before (C):
+```c
+void helper(void) { /* ... */ } // <- staticFunction: only called from this file
+
+int main(void) {
+    helper();
+    return 0;
+}
+```
+
+After:
+```c
+static void helper(void) { /* ... */ }
+
+int main(void) {
+    helper();
+    return 0;
+}
+```
+
diff --git a/man/checkers/unusedLabel.md b/man/checkers/unusedLabel.md
new file mode 100644
index 00000000000..3452ee3f0b4
--- /dev/null
+++ b/man/checkers/unusedLabel.md
@@ -0,0 +1,94 @@
+# unusedLabel, unusedLabelSwitch, unusedLabelConfiguration and unusedLabelSwitchConfiguration
+
+**Message**: Label 'x' is not used.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style/Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A `goto` label is declared but no `goto` anywhere in the file jumps to it. The four IDs are the same
+finding, refined by context:
+
+- `unusedLabel`: the plain case - style severity.
+- `unusedLabelSwitch`: the label sits directly where a `case` inside a `switch` was probably meant -
+  warning severity, since this is a more likely sign of an actual typo.
+- `unusedLabelConfiguration` / `unusedLabelSwitchConfiguration`: the same two situations, but the file
+  also contains `#if`/`#ifdef`, so the missing `goto` might simply be in a preprocessor branch that
+  wasn't analyzed this time.
+
+## Motivation
+
+An unused label is either dead code left over from a refactor, or - especially when it appears right
+where a `case` would fit inside a `switch` - a typo for a different keyword entirely. Either way it's
+worth a second look: removing genuinely dead labels keeps the code honest about what it does, and
+catching a `case`/label typo can fix a real logic bug.
+
+## How to fix
+
+Either remove the label, or actually jump to it - or, if it was meant to be a `case`, fix the typo.
+
+Before:
+```cpp
+void f() {
+    label: // <- nothing 'goto's here
+}
+```
+
+After: either remove the label, or actually jump to it.
+```cpp
+void f() {
+    label:
+    ;
+    goto label;
+}
+```
+
+Before:
+```cpp
+int test(char art) {
+    switch (art) {
+    caseZERO: // <- looks like a typo for 'case 0:'
+        return 0;
+    case 2:
+        return 2;
+    }
+    return -1;
+}
+```
+
+After:
+```cpp
+int test(char art) {
+    switch (art) {
+    case 0:
+        return 0;
+    case 2:
+        return 2;
+    }
+    return -1;
+}
+```
+
+Before:
+```cpp
+void f() {
+#ifdef X
+    goto END;
+#endif
+END: // <- only reachable through code hidden behind '#ifdef X'
+    ;
+}
+```
+
+After: keep the label's only `goto` in the same preprocessor branch as the label, or remove the label if
+it's genuinely unused.
+```cpp
+void f() {
+#ifdef X
+    goto END;
+END:
+#endif
+    ;
+}
+```
diff --git a/man/checkers/unusedPrivateFunction.md b/man/checkers/unusedPrivateFunction.md
new file mode 100644
index 00000000000..e4809534a2c
--- /dev/null
+++ b/man/checkers/unusedPrivateFunction.md
@@ -0,0 +1,42 @@
+# unusedPrivateFunction
+
+**Message**: Unused private function: 'Fred::f'<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A private member function is never called from anywhere in the class (or a friend of it).
+
+## Motivation
+
+Since a private function can only ever be called from inside its own class (or a friend), one that's
+never called anywhere in the visible code is dead code - it can be removed without affecting any
+caller outside the class.
+
+## How to fix
+
+Before:
+```cpp
+class Fred {
+private:
+    unsigned int f(); // <- unusedPrivateFunction: never called
+public:
+    Fred();
+};
+Fred::Fred() { }
+unsigned int Fred::f() { return 1; }
+```
+
+After:
+```cpp
+class Fred {
+private:
+    unsigned int f();
+public:
+    Fred();
+};
+Fred::Fred() { f(); }
+unsigned int Fred::f() { return 1; }
+```
diff --git a/man/checkers/unusedScopedObject.md b/man/checkers/unusedScopedObject.md
new file mode 100644
index 00000000000..6a29c74e621
--- /dev/null
+++ b/man/checkers/unusedScopedObject.md
@@ -0,0 +1,52 @@
+# unusedScopedObject
+
+**Message**: Instance of 'x' object is destroyed immediately.<br/>
+**Category**: Correctness<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+An object is constructed as a temporary (`Lock(mutex);` instead of `Lock lock(mutex);`) and destroyed
+again immediately at the end of the same statement - if the class's constructor/destructor pair matters
+for its side effects (as with a scope guard), this defeats the purpose, since the "lock" is released
+before the very next statement runs.
+
+## Motivation
+
+RAII types like lock guards, scoped timers, or transaction guards rely on their destructor running at
+the end of a *scope*, not at the end of the single statement that constructed them. Forgetting to give
+the object a name accidentally destroys it right away, silently disabling whatever protection it was
+supposed to provide for the following code.
+
+## How to fix
+
+Before:
+```cpp
+#include <iostream>
+class Lock {
+public:
+    Lock(int i) { std::cout << "Lock " << i << std::endl; }
+    ~Lock() { std::cout << "~Lock" << std::endl; }
+};
+int main() {
+    Lock(123); // <- constructed and destroyed on this line alone
+    std::cout << "hello" << std::endl;
+    return 0;
+}
+```
+
+After:
+```cpp
+#include <iostream>
+class Lock {
+public:
+    explicit Lock(int i) { std::cout << "Lock " << i << std::endl; }
+    ~Lock() { std::cout << "~Lock" << std::endl; }
+};
+int main() {
+    Lock lock(123);
+    std::cout << "hello" << std::endl;
+    return 0;
+}
+```
diff --git a/man/checkers/unusedStructMember.md b/man/checkers/unusedStructMember.md
new file mode 100644
index 00000000000..5c08ef7b65f
--- /dev/null
+++ b/man/checkers/unusedStructMember.md
@@ -0,0 +1,45 @@
+# unusedStructMember
+
+**Message**: struct member 'Point::unusedField' is never used.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A struct/class/union member is never referenced anywhere in the file.
+
+This checker performs a single-file analysis, it checks structs declared in the source file. This
+checker does not work properly if you analyze a header file directly. You are not recommended to
+run cppcheck on header files directly.
+
+## Motivation
+
+An unused struct member usually means the field can be removed, or - just as often - that it *should*
+be used somewhere and isn't, which is worth a second look.
+
+## How to fix
+
+Remove the field, or actually use it.
+
+Before:
+```cpp
+struct Point {
+    int x;
+    int y;
+    int unusedField; // <- never referenced anywhere
+};
+```
+
+After:
+```cpp
+struct Point {
+    int x;
+    int y;
+};
+```
+
+## Related checkers
+
+- [unusedVariable.md](unusedVariable.md) - the same idea, for a local variable instead of a struct
+  member.
diff --git a/man/checkers/unusedVariable.md b/man/checkers/unusedVariable.md
new file mode 100644
index 00000000000..858875ecca7
--- /dev/null
+++ b/man/checkers/unusedVariable.md
@@ -0,0 +1,46 @@
+# unusedVariable
+
+**Message**: Unused variable: x<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A variable is declared but never read or written at all.
+
+## Motivation
+
+A variable that's never touched after being declared is dead code: it adds to what has to be read and
+maintained without doing anything, and is often a sign of a bug - a typo'd variable name, or code left
+over from a refactor that no longer does what it used to.
+
+## How to fix
+
+Remove the variable, or actually use it.
+
+Before:
+```cpp
+void f() {
+    int x = 5; // <- declared and never read or written again
+}
+```
+
+After:
+```cpp
+void f() {
+    int x = 5;
+    print(x);
+}
+```
+
+## Related checkers
+
+- [unreadVariable.md](unreadVariable.md) - the sibling finding for a variable that *is* assigned a
+  value, but that value is never read afterwards.
+- [unusedAllocatedMemory.md](unusedAllocatedMemory.md) - the same idea, specifically for memory obtained
+  from an allocation function.
+- [unassignedVariable.md](unassignedVariable.md) - the opposite situation: a variable read before it's
+  ever assigned.
+- [unusedStructMember.md](unusedStructMember.md) - the same idea, for a struct/class/union member
+  instead of a local variable.
diff --git a/man/checkers/useClosedFile.md b/man/checkers/useClosedFile.md
new file mode 100644
index 00000000000..aa01de27a37
--- /dev/null
+++ b/man/checkers/useClosedFile.md
@@ -0,0 +1,48 @@
+# useClosedFile
+
+**Message**: Used file that is not opened.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A read, write, or positioning call is made on a `FILE*` after it's already been closed.
+
+## Motivation
+
+Using a file handle after `fclose()` is undefined behaviour - the underlying resource is gone, so any
+further operation on it can't be relied on to do anything sensible.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f() {
+    FILE *f1 = fopen("a.txt", "r");
+    if (!f1) return;
+    fclose(f1);
+    char buf[1];
+    fread(buf, 1, 1, f1); // <- 'f1' is already closed
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f() {
+    FILE *f1 = fopen("a.txt", "r");
+    if (!f1) return;
+    char buf[1];
+    fread(buf, 1, 1, f1);
+    fclose(f1);
+}
+```
+
+## Related checkers
+
+- [readWriteOnlyFile.md](readWriteOnlyFile.md), [writeReadOnlyFile.md](writeReadOnlyFile.md),
+  [IOWithoutPositioning.md](IOWithoutPositioning.md), [seekOnAppendedFile.md](seekOnAppendedFile.md),
+  [incompatibleFileOpen.md](incompatibleFileOpen.md) - other checks that follow the same `FILE*` through
+  a function to catch a different kind of open-mode/state mismatch.
diff --git a/man/checkers/useInitializationList.md b/man/checkers/useInitializationList.md
new file mode 100644
index 00000000000..94975d622e0
--- /dev/null
+++ b/man/checkers/useInitializationList.md
@@ -0,0 +1,49 @@
+# useInitializationList
+
+**Message**: Variable 's' is assigned in constructor body. Consider performing initialization in initialization list.<br/>
+**Category**: Performance<br/>
+**Severity**: Performance<br/>
+**Language**: C++
+
+## Description
+
+A constructor assigns a member a value in its body, where the exact same value could have been passed
+via the member-initializer list instead - doing it in the list avoids first default-constructing the
+member and then immediately overwriting it.
+
+## Motivation
+
+Assigning a member in the constructor body means the member is first default-constructed and then
+immediately reassigned - for a type with a nontrivial default constructor (like `std::string`), that's
+extra, avoidable work done on every single object construction.
+
+## How to fix
+
+Move the assignment into the member-initializer list.
+
+Before:
+```cpp
+#include <string>
+class C {
+    std::string s;
+public:
+    explicit C(const std::string& str) {
+        s = str; // <- could be done in the initializer list instead
+    }
+};
+```
+
+After:
+```cpp
+#include <string>
+class C {
+    std::string s;
+public:
+    explicit C(const std::string& str) : s(str) {}
+};
+```
+
+## Related checkers
+
+- [initializerList.md](initializerList.md) - a different constructor-initializer-list pitfall, about
+  the *order* members are listed in, rather than whether the list is used at all.
diff --git a/man/checkers/useStandardLibrary.md b/man/checkers/useStandardLibrary.md
new file mode 100644
index 00000000000..6eac1d7aa66
--- /dev/null
+++ b/man/checkers/useStandardLibrary.md
@@ -0,0 +1,41 @@
+# useStandardLibrary
+
+**Message**: Consider using std::memcpy instead of loop.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++ only
+
+## Description
+
+A hand-written byte-by-byte copy or fill loop that could be replaced with `memcpy`/`memset`.
+
+## Motivation
+
+A standard library function like `memcpy()` is at least as fast as a hand-written loop (the library or
+compiler can vectorize/optimize it directly), is shorter to read, and doesn't need to be double-checked
+for off-by-one mistakes the way a raw loop does.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdint>
+void f(void* dst, const void* src, const size_t count) {
+    size_t i;
+    for (i = 0; count > i; ++i) // <- hand-written copy loop
+        (reinterpret_cast<uint8_t*>(dst))[i] = (reinterpret_cast<const uint8_t*>(src))[i];
+}
+```
+
+After:
+```cpp
+#include <cstring>
+void f(void* dst, const void* src, const size_t count) {
+    std::memcpy(dst, src, count);
+}
+```
+
+## Related checkers
+
+- [returnStdMoveLocal.md](returnStdMoveLocal.md) - an unrelated performance suggestion in the same
+  checker: avoiding a `std::move()` that defeats copy elision.
diff --git a/man/checkers/useStlAlgorithm.md b/man/checkers/useStlAlgorithm.md
new file mode 100644
index 00000000000..c5fe6431be9
--- /dev/null
+++ b/man/checkers/useStlAlgorithm.md
@@ -0,0 +1,49 @@
+# useStlAlgorithm
+
+**Message**: Consider using std::any_of algorithm instead of a raw loop.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+A hand-written loop follows a shape (accumulate a value, count matches, find the first/last match, copy
+matching elements, ...) that a single call to a standard `<algorithm>` function would do more clearly
+and with less room for an off-by-one mistake.
+
+## Motivation
+
+A raw loop that reimplements a standard algorithm is more code to read and more room for a subtle bug
+(an off-by-one, a missed edge case) than calling the algorithm that already exists for exactly this
+purpose. Naming the intent directly (`std::any_of`, `std::count_if`, `std::find_if`, `std::copy_if`,
+`std::transform`, ...) also tells a reader what the loop is *for* without having to trace through its
+body.
+
+## How to fix
+
+Before:
+```cpp
+#include <vector>
+bool f(bool b) {
+  std::vector<int> v;
+  if (b)
+    v.push_back(0);
+  for (auto i : v)      // <- consider std::any_of instead of this raw loop
+    if (v[i] > 0)
+      return true;
+  return false;
+}
+```
+
+After:
+```cpp
+#include <vector>
+#include <algorithm>
+bool f(bool b) {
+  std::vector<int> v;
+  if (b)
+    v.push_back(0);
+  return std::any_of(v.begin(), v.end(), [](int i){ return v[i] > 0; });
+}
+```
+
diff --git a/man/checkers/uselessAssignmentArg.md b/man/checkers/uselessAssignmentArg.md
new file mode 100644
index 00000000000..e19d6f5be23
--- /dev/null
+++ b/man/checkers/uselessAssignmentArg.md
@@ -0,0 +1,38 @@
+# uselessAssignmentArg and uselessAssignmentPtrArg
+
+**Message**: Assignment of function parameter has no effect outside the function.<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A function parameter (plain or pointer) is assigned a new value that is never used afterwards - since
+parameters are passed by value in C/C++, this change is invisible to the caller and has no effect.
+
+- `uselessAssignmentArg`: the parameter is an ordinary by-value parameter.
+- `uselessAssignmentPtrArg`: the parameter is a pointer itself being reassigned (not what it points to).
+
+## Motivation
+
+Assigning to a by-value parameter without reading it again afterwards looks like it's meant to
+communicate something back to the caller, but it can't - parameters are local copies. This usually
+means either the assignment is pointless leftover code, or the author actually needed a pointer/
+reference parameter (or a return value) to get the result back out.
+
+## How to fix
+
+Before:
+```cpp
+void foo(int b) {
+    b = 5; // <- uselessAssignmentArg: caller never sees this
+}
+```
+
+After: change the return type instead of the parameter, or drop the assignment.
+```cpp
+int foo() {
+    return 5;
+}
+```
+
diff --git a/man/checkers/uselessCallsCompare.md b/man/checkers/uselessCallsCompare.md
new file mode 100644
index 00000000000..cf0bcd6677a
--- /dev/null
+++ b/man/checkers/uselessCallsCompare.md
@@ -0,0 +1,43 @@
+# uselessCallsCompare
+
+**Message**: It is inefficient to call 'x.compare(x)' as it always returns 0.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+`x.compare(x)` - calling `.compare()` with the object itself as the argument always returns `0`, which
+looks like a meaningful check but never is - usually a copy-paste mistake where the wrong variable was
+used for one side.
+
+## Motivation
+
+Comparing a value against itself is always true (or, for `.compare()`, always `0`) - the call is dead
+code that adds nothing, and the fact that it was written at all suggests the intent was to compare two
+different values, one of which was mistyped.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+void f() {
+    std::string s1, s2;
+    s2.compare(s2); // <- always returns 0
+}
+```
+
+After:
+```cpp
+#include <string>
+void f() {
+    std::string s1, s2;
+    s1.compare(s2);
+}
+```
+
+## Related checkers
+
+- [uselessCallsSwap.md](uselessCallsSwap.md) - the same self-argument mistake, for `.swap()` instead of
+  `.compare()`.
diff --git a/man/checkers/uselessCallsConstructor.md b/man/checkers/uselessCallsConstructor.md
new file mode 100644
index 00000000000..8643abf433c
--- /dev/null
+++ b/man/checkers/uselessCallsConstructor.md
@@ -0,0 +1,38 @@
+# uselessCallsConstructor
+
+**Message**: Inefficient constructor call: container 'x' is assigned a partial copy of itself. Use erase() or resize() instead.<br/>
+**Category**: Performance<br/>
+**Severity**: Performance<br/>
+**Language**: C++
+
+## Description
+
+A container is assigned a range constructed from its own begin/(begin+offset) - this makes an
+unnecessary temporary copy of part of the container's own data, when `erase()`/`resize()` would do the
+same trim in place.
+
+## Motivation
+
+Building a whole new range-constructed container from a slice of a container's own elements, just to
+assign it back over the original, copies data that's already sitting in the right place - an in-place
+trim (`erase()`/`resize()`) achieves the same final content without the temporary copy.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+std::string f(std::string s, std::size_t end) {
+    s = { s.begin(), s.begin() + end }; // <- an unnecessary partial self-copy
+    return s;
+}
+```
+
+After:
+```cpp
+#include <string>
+std::string f(std::string s, std::size_t end) {
+    s.resize(end);
+    return s;
+}
+```
diff --git a/man/checkers/uselessCallsEmpty.md b/man/checkers/uselessCallsEmpty.md
new file mode 100644
index 00000000000..50c7d9479b2
--- /dev/null
+++ b/man/checkers/uselessCallsEmpty.md
@@ -0,0 +1,36 @@
+# uselessCallsEmpty
+
+**Message**: Ineffective call of function 'empty()'. Did you intend to call 'clear()' instead?<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+`.empty()` is called and its result is thrown away - since `.empty()` has no side effect, this almost
+certainly should have been `.clear()`.
+
+## Motivation
+
+`.empty()` only reports whether a container has any elements; it never removes anything. Calling it and
+discarding the result does nothing at all, which is a strong sign the intended call was `.clear()`
+(which does have the effect the code was presumably trying to achieve).
+
+## How to fix
+
+Before:
+```cpp
+#include <vector>
+bool foo(std::vector<int>& v) {
+    v.empty(); // <- result discarded, has no effect
+    return v.empty();
+}
+```
+
+After:
+```cpp
+#include <vector>
+bool foo(std::vector<int>& v) {
+    return v.empty();
+}
+```
diff --git a/man/checkers/uselessCallsRemove.md b/man/checkers/uselessCallsRemove.md
new file mode 100644
index 00000000000..753c3bb2e99
--- /dev/null
+++ b/man/checkers/uselessCallsRemove.md
@@ -0,0 +1,41 @@
+# uselessCallsRemove
+
+**Message**: Return value of std::remove() ignored. Elements remain in container.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C++
+
+## Description
+
+The return value of `std::remove()`/`std::remove_if()`/`std::unique()` is ignored - these algorithms
+don't actually shrink the container, they only move the elements to keep to the front and return the
+new logical end; without also calling the container's `erase()` with that return value, the "removed"
+elements are still there.
+
+## Motivation
+
+`std::remove()`/`std::remove_if()`/`std::unique()` cannot resize a container themselves (they only see
+a pair of iterators, not the container), so they can only rearrange elements and report where the "new
+end" is. Ignoring that return value leaves the container at its original size, with the elements that
+were supposed to be removed still physically present (just in an unspecified state) between the new
+logical end and the true end - the classic "erase-remove idiom" exists precisely to complete this.
+
+## How to fix
+
+Before:
+```cpp
+#include <vector>
+#include <algorithm>
+void f(std::vector<int> a, int val) {
+    std::remove(a.begin(), a.end(), val); // <- elements aren't actually removed
+}
+```
+
+After:
+```cpp
+#include <vector>
+#include <algorithm>
+void f(std::vector<int> a, int val) {
+    a.erase(std::remove(a.begin(), a.end(), val), a.end());
+}
+```
diff --git a/man/checkers/uselessCallsSubstr.md b/man/checkers/uselessCallsSubstr.md
new file mode 100644
index 00000000000..a5c0825a6dc
--- /dev/null
+++ b/man/checkers/uselessCallsSubstr.md
@@ -0,0 +1,39 @@
+# uselessCallsSubstr
+
+**Message**: Ineffective call of function 'substr' because it returns a copy of the object. Use operator= instead.<br/>
+**Category**: Performance<br/>
+**Severity**: Performance<br/>
+**Language**: C++
+
+## Description
+
+A `substr()` call whose arguments make it a no-op (returns an unmodified copy of the whole string),
+always return an empty string, or (when assigned back to the same string) just a slower way to write
+`resize()`/`pop_back()`/`replace()`.
+
+## Motivation
+
+`substr()` copies characters into a new string - when the requested range happens to be the whole
+string, an empty range, or a prefix/suffix of the string it's being assigned back into, that copy is
+pure overhead compared to the more direct operation (`operator=`, `resize()`, `pop_back()`, `replace()`)
+that achieves the same result.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+void f() {
+    std::string s1, s2;
+    s2 = s1.substr(); // <- substr() with no arguments just copies the whole string
+}
+```
+
+After:
+```cpp
+#include <string>
+void f() {
+    std::string s1, s2;
+    s2 = s1;
+}
+```
diff --git a/man/checkers/uselessCallsSwap.md b/man/checkers/uselessCallsSwap.md
new file mode 100644
index 00000000000..d34c5cb1a55
--- /dev/null
+++ b/man/checkers/uselessCallsSwap.md
@@ -0,0 +1,42 @@
+# uselessCallsSwap
+
+**Message**: It is inefficient to swap a object with itself by calling 'x.swap(x)'<br/>
+**Category**: Performance<br/>
+**Severity**: Performance<br/>
+**Language**: C++
+
+## Description
+
+`x.swap(x)` - calling `.swap()` with the object itself as the argument is an inefficient no-op -
+usually a copy-paste mistake where the wrong variable was used for one side.
+
+## Motivation
+
+Swapping a value with itself has no effect: the call still does the work of a swap (temporaries,
+moves) for a result that's guaranteed to be identical to not calling it at all. The fact that it was
+written at all suggests the intent was to swap with a different variable, one of which was mistyped.
+
+## How to fix
+
+Before:
+```cpp
+#include <string>
+void f() {
+    std::string s1, s2;
+    s2.swap(s2); // <- no effect, just wasted work
+}
+```
+
+After:
+```cpp
+#include <string>
+void f() {
+    std::string s1, s2;
+    s1.swap(s2);
+}
+```
+
+## Related checkers
+
+- [uselessCallsCompare.md](uselessCallsCompare.md) - the same self-argument mistake, for `.compare()`
+  instead of `.swap()`.
diff --git a/man/checkers/uselessOverride.md b/man/checkers/uselessOverride.md
new file mode 100644
index 00000000000..3907a5b01a9
--- /dev/null
+++ b/man/checkers/uselessOverride.md
@@ -0,0 +1,39 @@
+# uselessOverride
+
+**Message**: The function 'f' is an unnecessary overload; it is identical to the parent function<br/>
+**Category**: Code Quality<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+An overriding function's body is either functionally identical to the base version, or just calls the
+base version and returns its result - the override adds a function call for no behavioural difference.
+
+## Motivation
+
+An override that does nothing differently from the base class is dead weight: it adds an indirection
+and a place for the two versions to accidentally drift apart later, without changing what the program
+does today.
+
+## How to fix
+
+Before:
+```cpp
+struct B { virtual int f() { return 5; } };
+struct D : B {
+    int f() override { return B::f(); } // <- uselessOverride: identical to the base version
+};
+```
+
+After: remove the pointless override entirely.
+```cpp
+struct B { virtual int f() { return 5; } };
+struct D : B {
+};
+```
+
+## Related checkers
+
+- [missingOverride.md](missingOverride.md) - for a function that overrides a base one without being
+  marked `override`, regardless of whether the override is useless.
diff --git a/man/checkers/va_end_missing.md b/man/checkers/va_end_missing.md
new file mode 100644
index 00000000000..80ac6e0ea26
--- /dev/null
+++ b/man/checkers/va_end_missing.md
@@ -0,0 +1,42 @@
+# va_end_missing
+
+**Message**: va_list 'args' was opened but not closed by va_end().<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A local `va_list` variable is opened with `va_start()`/`va_copy()`, but the function can finish without
+it being closed by `va_end()`.
+
+## Motivation
+
+Every `va_list` opened with `va_start()`/`va_copy()` must be matched with exactly one `va_end()` call
+before it goes out of scope. Leaving one open is undefined behaviour on some implementations, and can
+also leak resources the implementation associated with iterating the variadic arguments.
+
+## How to fix
+
+Call `va_end()` on every path that leaves the function after `va_start()`.
+
+Before:
+```cpp
+void log(const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+} // <- va_end() never called
+```
+
+After:
+```cpp
+void log(const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+    va_end(args);
+}
+```
+
+## Related checkers
+
+- [va_start_wrongParameter.md](va_start_wrongParameter.md), [va_start_referencePassed.md](va_start_referencePassed.md), [va_list_usedBeforeStarted.md](va_list_usedBeforeStarted.md), [va_start_subsequentCalls.md](va_start_subsequentCalls.md) - other misuses of the same `va_list`/`va_start()`/`va_end()` facility.
diff --git a/man/checkers/va_list_usedBeforeStarted.md b/man/checkers/va_list_usedBeforeStarted.md
new file mode 100644
index 00000000000..7ddb4844cce
--- /dev/null
+++ b/man/checkers/va_list_usedBeforeStarted.md
@@ -0,0 +1,46 @@
+# va_list_usedBeforeStarted
+
+**Message**: va_list 'args' used before va_start() was called.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A `va_list` variable is read - passed to `va_arg()`, `va_copy()` or `va_end()` - before `va_start()`
+(or `va_copy()`) was called on it, or after it was already closed with `va_end()`.
+
+## Motivation
+
+A `va_list` only refers to a valid argument sequence between a matching `va_start()`/`va_copy()` and the
+`va_end()` that closes it. Reading it outside that window - too early, or again after it's already been
+closed - is undefined behaviour, since there's no argument sequence for it to actually point to.
+
+## How to fix
+
+Only read a `va_list` after it has been opened with `va_start()`/`va_copy()`, and before it is closed
+with `va_end()`.
+
+Before:
+```cpp
+void log(const char* fmt, ...) {
+    va_list args;
+    int first = va_arg(args, int); // <- used before va_start()
+    va_start(args, fmt);
+    va_end(args);
+}
+```
+
+After:
+```cpp
+void log(const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+    int first = va_arg(args, int);
+    va_end(args);
+}
+```
+
+## Related checkers
+
+- [va_start_wrongParameter.md](va_start_wrongParameter.md), [va_start_referencePassed.md](va_start_referencePassed.md), [va_start_subsequentCalls.md](va_start_subsequentCalls.md), [va_end_missing.md](va_end_missing.md) - other misuses of the same `va_list`/`va_start()`/`va_end()` facility.
diff --git a/man/checkers/va_start_referencePassed.md b/man/checkers/va_start_referencePassed.md
new file mode 100644
index 00000000000..f877bb76df4
--- /dev/null
+++ b/man/checkers/va_start_referencePassed.md
@@ -0,0 +1,25 @@
+# va_start_referencePassed
+
+**Message**: Using reference 'x' as parameter for va_start() results in undefined behaviour.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+A reference parameter is passed as the second argument to `va_start()`. This is undefined behaviour.
+
+## Motivation
+
+`va_start()` needs the actual last named parameter as it's stored on the stack, not a reference to it -
+a reference is a different object from what the calling convention expects at that point, so using one
+here doesn't reliably locate the variadic arguments that follow.
+
+## How to fix
+
+Avoid declaring the last named parameter before `...` as a reference, or otherwise ensure `va_start()`
+is given the real parameter rather than a reference to it.
+
+## Related checkers
+
+- [va_start_wrongParameter.md](va_start_wrongParameter.md), [va_list_usedBeforeStarted.md](va_list_usedBeforeStarted.md), [va_start_subsequentCalls.md](va_start_subsequentCalls.md), [va_end_missing.md](va_end_missing.md) - other misuses of the same `va_list`/`va_start()`/`va_end()` facility.
diff --git a/man/checkers/va_start_subsequentCalls.md b/man/checkers/va_start_subsequentCalls.md
new file mode 100644
index 00000000000..6cd8fb14dac
--- /dev/null
+++ b/man/checkers/va_start_subsequentCalls.md
@@ -0,0 +1,25 @@
+# va_start_subsequentCalls
+
+**Message**: va_start() or va_copy() called subsequently on 'args' without va_end() in between.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+`va_start()` or `va_copy()` is called again on a `va_list` that is already open, without an intervening
+`va_end()`.
+
+## Motivation
+
+Reopening a `va_list` that's still open, without closing it first, is undefined behaviour on many
+implementations - the two calls to `va_start()`/`va_copy()` can leave the `va_list` in an inconsistent
+state, and whatever `va_arg()` reads afterward is unreliable.
+
+## How to fix
+
+Call `va_end()` on a `va_list` before opening it again with `va_start()`/`va_copy()`.
+
+## Related checkers
+
+- [va_start_wrongParameter.md](va_start_wrongParameter.md), [va_start_referencePassed.md](va_start_referencePassed.md), [va_list_usedBeforeStarted.md](va_list_usedBeforeStarted.md), [va_end_missing.md](va_end_missing.md) - other misuses of the same `va_list`/`va_start()`/`va_end()` facility.
diff --git a/man/checkers/va_start_wrongParameter.md b/man/checkers/va_start_wrongParameter.md
new file mode 100644
index 00000000000..32ecd73ce4c
--- /dev/null
+++ b/man/checkers/va_start_wrongParameter.md
@@ -0,0 +1,44 @@
+# va_start_wrongParameter
+
+**Message**: 'level' given to va_start() is not last named argument of the function. Did you intend to pass 'fmt'?<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+The parameter passed as the second argument to `va_start()` is not the function's actual last named
+parameter (the one right before `...`).
+
+## Motivation
+
+`va_start()` needs the last named parameter to locate where the variadic arguments begin on the stack.
+Passing any other parameter is undefined behaviour - `va_arg()` calls that follow can then read garbage
+instead of the actual variadic arguments, and the exact symptom depends on the compiler and calling
+convention.
+
+## How to fix
+
+Pass the function's true last named parameter to `va_start()`.
+
+Before:
+```cpp
+void log(const char* fmt, const char* tag, int level, ...) {
+    va_list args;
+    va_start(args, fmt); // <- 'level' is the actual last named parameter
+    va_end(args);
+}
+```
+
+After:
+```cpp
+void log(const char* fmt, const char* tag, int level, ...) {
+    va_list args;
+    va_start(args, level);
+    va_end(args);
+}
+```
+
+## Related checkers
+
+- [va_start_referencePassed.md](va_start_referencePassed.md), [va_list_usedBeforeStarted.md](va_list_usedBeforeStarted.md), [va_start_subsequentCalls.md](va_start_subsequentCalls.md), [va_end_missing.md](va_end_missing.md) - other misuses of the same `va_list`/`va_start()`/`va_end()` facility.
diff --git a/man/checkers/varFuncNullUB.md b/man/checkers/varFuncNullUB.md
new file mode 100644
index 00000000000..41694c22cb0
--- /dev/null
+++ b/man/checkers/varFuncNullUB.md
@@ -0,0 +1,37 @@
+# varFuncNullUB
+
+**Message**: Passing NULL after the last typed argument to a variadic function leads to undefined behaviour.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Portability<br/>
+**Language**: C/C++
+
+## Description
+
+`NULL` is passed as the last argument to a variadic function (`...`) - on platforms where `NULL` is
+defined as a plain `0` rather than a pointer-sized constant, the function reading its arguments through
+`va_arg()` may misinterpret it, since the two constants aren't guaranteed to be the same size.
+
+## Motivation
+
+`NULL`'s definition (`0`, `0L`, or `(void*)0`) is implementation-defined. On a platform where
+`sizeof(int) != sizeof(void*)` and `NULL` expands to a plain integer `0`, a variadic function expecting
+to read a pointer-sized sentinel through `va_arg()` reads the wrong number of bytes - which can crash or
+silently read garbage for the following arguments. The bug is invisible on platforms where `NULL`
+happens to be pointer-sized, so it can go unnoticed for a long time.
+
+## How to fix
+
+Cast the sentinel to the pointer type the function actually expects, instead of relying on `NULL`'s
+platform-specific definition.
+
+Before:
+```cpp
+void a(...);
+void b() { a(NULL); } // <- passing NULL as the last variadic argument
+```
+
+After:
+```cpp
+void a(...);
+void b() { a((void*)0); }
+```
diff --git a/man/checkers/variableScope.md b/man/checkers/variableScope.md
new file mode 100644
index 00000000000..1a0d82f93c3
--- /dev/null
+++ b/man/checkers/variableScope.md
@@ -0,0 +1,45 @@
+# variableScope
+
+**Message**: The scope of the variable 'x' can be reduced.<br/>
+**Category**: Readability<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+A variable is declared in an outer scope, it can be declared in an inner scope.
+
+## Motivation
+
+It is common practice, especially in C++ code, to declare variables in inner scope when
+possible.
+
+The motivation is to make the code more readable.
+
+Opinions about what is more readable can differ so make your own decisions - these warnings
+can be easily suppressed.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f(bool x) {
+    int i = 0; // <- 'i' is only used inside the 'if' below
+    if (x) {
+        i = 10;
+        printf("%d\n", i);
+    }
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f(bool x) {
+    if (x) {
+        int i = 10;
+        printf("%d\n", i);
+    }
+}
+```
diff --git a/man/checkers/virtualCallInConstructor.md b/man/checkers/virtualCallInConstructor.md
new file mode 100644
index 00000000000..8e8a2a55aa6
--- /dev/null
+++ b/man/checkers/virtualCallInConstructor.md
@@ -0,0 +1,74 @@
+# virtualCallInConstructor and pureVirtualCall
+
+**Message**: Call of pure virtual function 'pure' in constructor.<br/>
+**Category**: Correctness/Undefined Behaviour<br/>
+**Severity**: Warning/Error<br/>
+**Language**: C++
+
+## Description
+
+A constructor or destructor calls a virtual function on `this`. During construction/destruction the
+object's dynamic type is only ever the class currently running, so this never dispatches to a derived
+override the way it looks like it should.
+
+- `virtualCallInConstructor`: the called function does have a body in the current class, so the call is
+  well-defined - it's just probably not calling what the author expected.
+- `pureVirtualCall`: the called function has no implementation at all (pure virtual), so the call is
+  undefined behaviour outright.
+
+## Motivation
+
+Code that calls a virtual function from a constructor or destructor, expecting a derived class's
+override to run, is a common misunderstanding of C++'s object-construction model. `pureVirtualCall` in
+particular is a crash waiting to happen, since there is no function body to call at all at that point.
+
+## How to fix
+
+Before:
+```cpp
+class A {
+    virtual int f() { return 1; }
+public:
+    A();
+};
+A::A() {
+    f(); // <- virtualCallInConstructor: dynamic binding doesn't apply here
+}
+```
+
+After:
+```cpp
+class A {
+    virtual int f() { return 1; }
+    int init() { return 1; }
+public:
+    A();
+};
+A::A() {
+    init();
+}
+```
+
+Before:
+```cpp
+class A {
+    virtual void pure() = 0;
+public:
+    A();
+};
+A::A() {
+    pure(); // <- pureVirtualCall: 'pure' has no body to call
+}
+```
+
+After:
+```cpp
+class A {
+    virtual void pure() = 0;
+public:
+    A();
+};
+A::A() {
+}
+```
+
diff --git a/man/checkers/virtualDestructor.md b/man/checkers/virtualDestructor.md
new file mode 100644
index 00000000000..0990b45c78d
--- /dev/null
+++ b/man/checkers/virtualDestructor.md
@@ -0,0 +1,54 @@
+# virtualDestructor
+
+**Message**: Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+A base class has virtual member functions (so it's clearly meant to be used polymorphically) but a
+non-virtual destructor - deleting a derived object through a base-class pointer then only runs the base
+class's destructor, leaking whatever the derived part owned.
+
+## Motivation
+
+This is outright undefined behaviour that can appear to "work" (the memory for the derived part is
+still freed by the base's `delete`, even though its destructor never ran) until an unrelated change -
+adding a derived class that owns a resource, for instance - makes it actually leak or corrupt memory.
+
+## How to fix
+
+Before:
+```cpp
+class Base {
+public:
+    virtual void f() {}
+    ~Base() {} // <- virtualDestructor: not virtual
+};
+class Derived : public Base {
+public:
+    ~Derived() { (void)11; }
+};
+void f() {
+    Base *base = new Derived;
+    delete base;
+}
+```
+
+After:
+```cpp
+class Base {
+public:
+    virtual void f() {}
+    virtual ~Base() {}
+};
+class Derived : public Base {
+public:
+    ~Derived() override { (void)11; }
+};
+void f() {
+    Base *base = new Derived;
+    delete base;
+}
+```
diff --git a/man/checkers/writeReadOnlyFile.md b/man/checkers/writeReadOnlyFile.md
new file mode 100644
index 00000000000..2a1c2c167bf
--- /dev/null
+++ b/man/checkers/writeReadOnlyFile.md
@@ -0,0 +1,46 @@
+# writeReadOnlyFile
+
+**Message**: Write operation on a file that was opened only for reading.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error<br/>
+**Language**: C/C++
+
+## Description
+
+The file was opened in a mode (`"r"`) that only allows reading, and the code then writes to it.
+
+## Motivation
+
+Writing to a stream that was opened read-only is undefined behaviour in the C standard - even where an
+implementation happens to do something predictable with it, code relying on that isn't portable.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f() {
+    FILE *fp = fopen("a.txt", "r");
+    if (!fp) return;
+    fwrite("x", 1, 1, fp); // <- 'fp' was only opened for reading
+    fclose(fp);
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f() {
+    FILE *fp = fopen("a.txt", "w");
+    if (!fp) return;
+    fwrite("x", 1, 1, fp);
+    fclose(fp);
+}
+```
+
+## Related checkers
+
+- [readWriteOnlyFile.md](readWriteOnlyFile.md) - the opposite mismatch: reading from a write-only file.
+- [useClosedFile.md](useClosedFile.md), [IOWithoutPositioning.md](IOWithoutPositioning.md),
+  [seekOnAppendedFile.md](seekOnAppendedFile.md), [incompatibleFileOpen.md](incompatibleFileOpen.md) -
+  other checks that follow the same `FILE*` through a function.
diff --git a/man/checkers/wrongPrintfScanfArgNum.md b/man/checkers/wrongPrintfScanfArgNum.md
new file mode 100644
index 00000000000..1455678b6b6
--- /dev/null
+++ b/man/checkers/wrongPrintfScanfArgNum.md
@@ -0,0 +1,40 @@
+# wrongPrintfScanfArgNum
+
+**Message**: printf format string requires 2 parameters but only 1 is given.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C/C++
+
+## Description
+
+The format string's conversion specifiers (`%d`, `%s`, ...) don't match the number of arguments
+actually given to a `printf`/`scanf`-family call - too many or too few.
+
+## Motivation
+
+`printf`/`scanf` format strings are not type- or count-checked by the C or C++ language itself - the
+compiler trusts that whatever conversion specifiers you wrote match whatever arguments follow. Too few
+arguments means a conversion reads garbage memory as if it were a real argument; too many just means
+wasted arguments, but often signals a forgotten `%` specifier.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void f() {
+    printf("%d%s", 1); // <- format string needs 2 arguments, only 1 given
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void f() {
+    printf("%d%s", 1, "x");
+}
+```
+
+## Related checkers
+
+- [wrongPrintfScanfParameterPositionError.md](wrongPrintfScanfParameterPositionError.md) - a related mistake with POSIX positional specifiers (`%2$d`).
diff --git a/man/checkers/wrongPrintfScanfParameterPositionError.md b/man/checkers/wrongPrintfScanfParameterPositionError.md
new file mode 100644
index 00000000000..c3ea86c32b3
--- /dev/null
+++ b/man/checkers/wrongPrintfScanfParameterPositionError.md
@@ -0,0 +1,39 @@
+# wrongPrintfScanfParameterPositionError
+
+**Message**: printf: referencing parameter 4 while 3 arguments given.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A POSIX positional specifier (`%2$d`) references an argument number that doesn't exist, or numbering
+starts at `0` instead of `1`.
+
+## Motivation
+
+POSIX positional format specifiers let a format string reference its arguments out of order, but that
+also means a typo in the position number silently reads the wrong argument, or - as checked here - one
+that isn't even there.
+
+## How to fix
+
+Before:
+```cpp
+#include <cstdio>
+void foo() {
+    printf("%1$d, %d, %4$d\n", 1, 2, 3); // <- no 4th argument
+}
+```
+
+After:
+```cpp
+#include <cstdio>
+void foo() {
+    printf("%1$d, %d, %3$d\n", 1, 2, 3);
+}
+```
+
+## Related checkers
+
+- [wrongPrintfScanfArgNum.md](wrongPrintfScanfArgNum.md) - the plain (non-positional) argument-count mismatch.
diff --git a/man/checkers/wrongfeofUsage.md b/man/checkers/wrongfeofUsage.md
new file mode 100644
index 00000000000..9a3d0bbf5f6
--- /dev/null
+++ b/man/checkers/wrongfeofUsage.md
@@ -0,0 +1,42 @@
+# wrongfeofUsage
+
+**Message**: Using feof() as a loop condition causes the last line to be processed twice.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+`feof()` returns non-zero only after a read operation has failed because the end of file was reached. When used as the sole condition of a loop, the loop body executes one extra time after the last successful read: the read fails silently (or returns partial data), and only then does `feof()` return true and terminate the loop.
+
+This checker matches `while (!feof(fp))` and `do { ... } while (!feof(fp))` loops and warns when all of the following are true:
+
+- The loop body contains at least one file-read call (`fgets`, `fgetc`, `getc`, `fread`, or `fscanf`) on the same file pointer.
+- The destination (return value or output buffer) of the **last** file-read call in the loop is used after that call within the same loop iteration.
+
+The checker skips loops that contain a control-flow statement (`return`, `break`, `goto`, `continue`, `throw`) as those are too complex to analyze reliably, and loops where the file pointer appears in a context other than a recognised I/O function (`fgets`, `fgetc`, `getc`, `fread`, `fscanf`, `fprintf`, `fwrite`, `fputs`, `fputc`, `putc`).
+
+## How to fix
+
+Check the return value of the read function directly in the loop condition.
+
+Before:
+```c
+void process(FILE *fp) {
+    char line[256];
+    while (!feof(fp)) {          /* wrong: processes last line twice */
+        fgets(line, sizeof(line), fp);
+        puts(line);
+    }
+}
+```
+
+After:
+```c
+void process(FILE *fp) {
+    char line[256];
+    while (fgets(line, sizeof(line), fp) != NULL) {
+        puts(line);
+    }
+}
+```
\ No newline at end of file
diff --git a/man/checkers/wrongmathcall.md b/man/checkers/wrongmathcall.md
new file mode 100644
index 00000000000..7aff324d117
--- /dev/null
+++ b/man/checkers/wrongmathcall.md
@@ -0,0 +1,42 @@
+# wrongmathcall
+
+**Message**: Passing value -2 to log() leads to implementation-defined result.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+A literal value outside a math function's valid domain is passed directly (for example a negative
+number to `log()`, or `0` as the divisor to `fmod()`). This check only looks at a literal numeric value
+written directly in the call - it does not evaluate variables or computed expressions, even when their
+value is otherwise known to be out of range.
+
+## Motivation
+
+Math functions like `log()`, `sqrt()`, or `asin()` are only defined for part of the real numbers; calling
+them with a value outside that domain is undefined or implementation-defined and typically produces
+`NaN` or a platform-specific result rather than a clean error.
+
+## How to fix
+
+Before:
+```cpp
+#include <cmath>
+void f() {
+    double y = log(-2); // <- log() of a negative number
+}
+```
+
+After:
+```cpp
+#include <cmath>
+void f(double x) {
+    double y = (x > 0) ? log(x) : 0.0;
+}
+```
+
+## Related checkers
+
+- [unpreciseMathCall.md](unpreciseMathCall.md) - a related but distinct math-function issue: a
+  precision-losing way of writing a calculation that a more precise function already covers.
diff --git a/man/checkers/zerodiv.md b/man/checkers/zerodiv.md
new file mode 100644
index 00000000000..5585bf188ec
--- /dev/null
+++ b/man/checkers/zerodiv.md
@@ -0,0 +1,60 @@
+# zerodiv and zerodivcond
+
+**Message**: Division by zero.<br/>
+**Category**: Undefined Behaviour<br/>
+**Severity**: Error/Warning<br/>
+**Language**: C/C++
+
+## Description
+
+- `zerodiv`: an integer division or `%` has a divisor that's known to be zero.
+- `zerodivcond`: the same problem, but the zero divisor only holds on one branch of a condition
+  tested elsewhere - so either that condition is redundant, or this is a genuine division by zero.
+
+## Motivation
+
+Integer division by zero is undefined behaviour: the program's actual behaviour (a crash, a trap, or
+something else) is not guaranteed by the language standard and can change with the compiler,
+optimization level, or platform.
+
+## How to fix
+
+Before:
+```cpp
+#include <iostream>
+void foo() {
+    std::cout << 42 / (int)0; // <- zerodiv
+}
+```
+
+After:
+```cpp
+#include <iostream>
+void foo(int divisor) {
+    std::cout << 42 / divisor;
+}
+```
+
+Before:
+```cpp
+int f(int x, int y) {
+    if (x == y) {}
+    return 1 / (x-y); // <- zerodivcond: division by zero if x == y
+}
+```
+
+After:
+```cpp
+int f(int x, int y) {
+    if (x == y)
+        return 0;
+    return 1 / (x-y);
+}
+```
+
+## Design notes
+
+- **Dividing a floating-point value by `0.0` is not reported as `zerodiv`.** Unlike integer division,
+  floating-point division by zero is well-defined by IEEE 754 (it produces `Inf` or `NaN` rather than
+  undefined behaviour), so cppcheck only flags it separately, and only in the narrow shape described in
+  [nanInArithmeticExpression.md](nanInArithmeticExpression.md).
diff --git a/man/cppcheck.1.xml b/man/cppcheck.1.xml
index db3a5a9baa6..1a63b86e200 100644
--- a/man/cppcheck.1.xml
+++ b/man/cppcheck.1.xml
@@ -117,6 +117,9 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
       <arg choice="opt">
         <option>--errorlist</option>
       </arg>
+      <arg choice="opt">
+        <option>--exitcode-suppress=&lt;spec&gt;</option>
+      </arg>
       <arg choice="opt">
         <option>--exitcode-suppressions=&lt;file&gt;</option>
       </arg>
@@ -256,6 +259,14 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
       <!-- Use the variablelist.term.separator and the
            variablelist.term.break.after parameters to
            control the term elements. -->
+      <varlistentry>
+        <term>
+          <option>-CC</option>
+        </term>
+        <listitem>
+          <para>Do not remove comments during preprocessing (requires -E).</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <option>--check-config</option>
@@ -290,6 +301,14 @@ Example: -DDEBUG=1 -D__cplusplus</para>
 Example: '-UDEBUG'</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <option>-E</option>
+        </term>
+        <listitem>
+          <para>Print preprocessor output on stdout and don't do any further processing.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <option>--disable=&lt;id&gt;</option>
@@ -343,6 +362,14 @@ Example: '-UDEBUG'</para>
           <para>Print a list of all possible error messages in XML format.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <option>--exitcode-suppress=&lt;spec&gt;</option>
+        </term>
+        <listitem>
+          <para>Used to specify an error ID which should not result in a non-zero exitcode.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <option>--exitcode-suppressions=&lt;file&gt;</option>
diff --git a/man/manual-ja.docbook b/man/manual-ja.docbook
index 1c13d3d0526..0b2a39cc59e 100644
--- a/man/manual-ja.docbook
+++ b/man/manual-ja.docbook
@@ -1702,11 +1702,11 @@ Checking unusedvar.cpp...
 
         <itemizedlist>
           <listitem>
-            <para>Cppcheck プロジェクト������アドオンを以下�場所��供�����。: <uri>http://github.com/danmar/cppcheck/blob/master/addons</uri></para>
+            <para>Cppcheck プロジェクト������アドオンを以下�場所��供�����。: <uri>http://github.com/cppcheck-opensource/cppcheck/blob/master/addons</uri></para>
           </listitem>
 
           <listitem>
-            <para>ublinter��格�定義�れ����未定義動作�注力��&quot;lint&quot;��。: <uri>http://github.com/danmar/ublinter</uri></para>
+            <para>ublinter��格�定義�れ����未定義動作�注力��&quot;lint&quot;��。: <uri>http://github.com/cppcheck-opensource/ublinter</uri></para>
           </listitem>
         </itemizedlist>
 
diff --git a/man/manual-premium.md b/man/manual-premium.md
index 9f2e5992537..3553acc1b91 100644
--- a/man/manual-premium.md
+++ b/man/manual-premium.md
@@ -7,8 +7,8 @@ documentclass: report
 
 # Introduction
 
-Cppcheck is an analysis tool for C/C++ code. It provides unique code analysis to detect bugs and focuses on detecting 
-undefined behaviour and dangerous coding constructs. The goal is to detect only real errors in the code, and generate 
+Cppcheck is an analysis tool for C/C++ code. It provides unique code analysis to detect bugs and focuses on detecting
+undefined behaviour and dangerous coding constructs. The goal is to detect only real errors in the code, and generate
 as few false positives (wrongly reported warnings) as possible. Cppcheck is designed to analyze your C/C++ code even
 if it has non-standard syntax, as is common in for example embedded projects.
 
@@ -16,7 +16,7 @@ Supported code and platforms:
 
 - Cppcheck checks non-standard code that contains various compiler extensions, inline assembly code, etc.
 - Cppcheck should be compilable by any compiler that supports C++11 or later.
-- Cppcheck is cross platform and is used in various posix/windows/etc environments.
+- Cppcheck is cross-platform and is used in various posix/windows/etc environments.
 
 The checks in Cppcheck are not perfect. There are bugs that should be found, that Cppcheck fails to detect.
 
@@ -29,11 +29,11 @@ The kinds of bugs that you can find with static analysis are:
 - Coding style
 
 There are many bugs that you can not find with static analysis. Static analysis tools do not have human knowledge about
-what your program is intended to do. If the output from your program is valid but unexpected then in most cases this is
-not detected by static analysis tools. For instance, if your small program writes "Helo" on the screen instead of "Hello"
+what your program is intended to do. If the output from your program is valid but unexpected, then in most cases this is
+not detected by static analysis tools. For instance, if your small program writes "Helo" on the screen instead of "Hello",
 it is unlikely that any tool will complain about that.
 
-Static analysis should be used as a complement in your quality assurance. It does not replace any of;
+Static analysis should be used as a complement in your quality assurance. It does not replace any of:
 
 - Careful design
 - Testing
@@ -69,7 +69,7 @@ Here is some simple code:
         return 0;
     }
 
-If you save that into file1.c and execute:
+If you save that into `file1.c` and execute:
 
     cppcheck file1.c
 
@@ -84,7 +84,7 @@ Normally a program has many source files. Cppcheck can check all source files in
 
     cppcheck path
 
-If "path" is a folder, then Cppcheck will recursively check all source files in this folder:
+If `path` is a folder, then Cppcheck will recursively check all source files in this folder:
 
     Checking path/file1.cpp...
     1/2 files checked 50% done
@@ -93,21 +93,22 @@ If "path" is a folder, then Cppcheck will recursively check all source files in
 
 ### Check files manually or use project file
 
-With Cppcheck you can check files manually by specifying files/paths to check and settings. Or you can use a build 
+With Cppcheck you can check files manually by specifying files/paths to check and settings. Or you can use a build
 environment, such as CMake or Visual Studio.
 
-We don't know which approach (project file or manual configuration) will give you the best results. It is recommended 
-that you try both. It is possible that you will get different results so that to find the largest amount of bugs you 
+We don't know which approach (project file or manual configuration) will give you the best results. It is recommended
+that you try both. It is possible that you will get different results so that to find the largest amount of bugs you
 need to use both approaches. Later chapters will describe this in more detail.
 
 ### Check files matching a given file filter
 
 With `--file-filter=<str>` you can configure file filter(s) and then only those files matching the filter will be checked.
 
-You can use `**`, `*` and `?` in the file filter pattern.  
-`**`: matches zero or more characters, including path separators  
-`*`: matches zero or more characters, excluding path separators  
-`?`: matches any single character except path separators
+You can use `**`, `*` and `?` in the file filter pattern.
+
+- `**` matches zero or more characters, including path separators.
+- `*` matches zero or more characters, excluding path separators.
+- `?` matches any single character except path separators.
 
 For example, this command below means that `src/test1.cpp` could be checked, but `src/file2.cpp` and `src/test/file1.cpp` will not be checked:
 
@@ -121,30 +122,33 @@ A common use case for `--file-filter` is to check a project, but only check cert
     cppcheck --project=compile_commands.json --file-filter=src/*.c
 
 Typically a `compile_commands.json` contains absolute paths. However no matter if `compile_commands.json` contains absolute paths or relative paths, the option `--file-filter=src/*.c` would mean that:
- * a file with relative path `test1.c` is not checked.
- * a file with relative path `src/test2.c` can be checked.
- * a file with relative path `src/test3.cpp` is not checked.
+
+- a file with relative path `test1.c` is not checked.
+- a file with relative path `src/test2.c` can be checked.
+- a file with relative path `src/test3.cpp` is not checked.
 
 ### Ignore files matching a given pattern
 
 With `-i <str>` you can configure filename/directory patterns that should be ignored.
 
-A file that is ignored will not be checked directly (the complete translation unit is skipped). Any header #include'd from a source file which is not ignored is checked indirectly, regardless if the header is ignored.
+A file that is ignored will not be checked directly (the complete translation unit is skipped). Any header `#include`'d from a source file which is not ignored is checked indirectly, regardless if the header is ignored.
+
+> *Note*: If you want to filter out warnings for a header file, then `-i` will not work. Use suppressions instead.
 
-> *Note*: If you want to filter out warnings for a header file then `-i` will not work. Use suppressions instead.
+You can use `**`, `*` and `?` in the pattern to specify excluded folders/files.
 
-You can use `**`, `*` and `?` in the pattern to specify excluded folders/files.  
-`**`: matches zero or more characters, including path separators  
-`*`: matches zero or more characters, excluding path separators  
-`?`: matches any single character except path separators
+- `**` matches zero or more characters, including path separators.
+- `*` matches zero or more characters, excluding path separators.
+- `?` matches any single character except path separators.
 
 A use case for `-i` is to check a project, but exclude certain files/folders:
 
     cppcheck --project=compile_commands.json -itest
 
 Typically a `compile_commands.json` contains absolute paths. However no matter if `compile_commands.json` contains absolute paths or relative paths, the option `-itest` would mean that:
- * a file with relative path `test1.cpp` can be checked.
- * a file with relative path `test/somefile.cpp` is not checked
+
+- a file with relative path `test1.cpp` can be checked.
+- a file with relative path `test/somefile.cpp` is not checked
 
 ### Clang parser (experimental)
 
@@ -155,7 +159,7 @@ Install `clang`. Then use Cppcheck option `--clang`.
 Cppcheck executes clang with the -ast-dump option, imports the output, converts it to Cppcheck's internal format, and then
 performs standard analysis.
 
-You can also pass a custom Clang executable to the option by using for example `--clang=clang-10`. You can also pass it 
+You can also pass a custom Clang executable to the option by using for example `--clang=clang-10`. You can also pass it
 with a path. On Windows it will append the `.exe` extension unless you use a path.
 
 ## Severities
@@ -176,17 +180,17 @@ stylistic issues, such as unused functions, redundant code, constness, operator
 
 **performance**
 
-run time performance suggestions based on common knowledge, though it is not certain any measurable speed difference 
+run time performance suggestions based on common knowledge, though it is not certain any measurable speed difference
 will be achieved by fixing these messages.
 
 **portability**
 
-portability warnings. Implementation defined behavior. 64-bit portability. Some undefined behavior that probably works 
+portability warnings. Implementation defined behavior. 64-bit portability. Some undefined behavior that probably works
 "as you want", etc.
 
 **information**
 
-configuration problems, which does not relate to the syntactical correctness, but the used Cppcheck configuration could 
+configuration problems, which does not relate to the syntactical correctness, but the used Cppcheck configuration could
 be improved.
 
 ## Possible speedup analysis of template code
@@ -220,7 +224,7 @@ Cppcheck output:
 As you can see Cppcheck has instantiated `a<i+1>` until `a<101>` was reached
 and then it bails out.
 
-To limit template recursion you can:
+To limit template recursion, you can:
 
 - add template specialisation
 - configure Cppcheck, which can be done in the GUI project file dialog
@@ -244,7 +248,6 @@ Example code with template specialisation:
 
 You can pass `-D__cppcheck__` when checking this code.
 
-
 # Cppcheck build folder
 
 Using a Cppcheck build folder is not mandatory but it is recommended.
@@ -278,36 +281,55 @@ You can import and use Cppcheck GUI project files in the command line tool:
 
     cppcheck --project=foobar.cppcheck
 
-The Cppcheck GUI has a few options that are not available in the command line directly. To use these options you can import a GUI project file. 
+The Cppcheck GUI has a few options that are not available in the command line directly. To use these options, you can import a GUI project file.
 The command line tool usage is kept intentionally simple and the options are therefore limited.
 
-To ignore certain folders in the project you can use `-i`. This will skip the analysis of source files in the `foo` folder.
+To ignore certain folders in the project, you can use `-i`. This will skip the analysis of source files in the `foo` folder.
 
     cppcheck --project=foobar.cppcheck -ifoo
 
-## CMake
+## Compilation database (CMake etc.)
 
-Generate a compile database (a JSON file containing compilation commands for each source file):
+Many build systems can generate a compilation database (a JSON file containing compilation commands for each source file).
+Example `cmake` command to generate the file:
 
     cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON .
 
-The file `compile_commands.json` is created in the current folder. Now run Cppcheck like this:
+When you have a `compile_commands.json` file, you can run Cppcheck like this:
 
     cppcheck --project=compile_commands.json
 
+By default only 1 configuration is checked because that is consistent with the compilation. If you want to check more configurations, you can use `--max-configs` or `--force`. For example:
+
+    cppcheck --project=compile_commands.json --force
+
 To ignore certain folders you can use `-i`. This will skip analysis of source files in the `foo` folder.
 
     cppcheck --project=compile_commands.json -ifoo
 
+### `-isystem`, `-I`, `--sysroot`
+
+We have a [script](https://github.com/cppcheck-opensource/cppcheck/blob/main/tools/tweak-compile-commands.py) that tweaks compile_commands.json.
+
+You can use it to:
+ * use `--sysroot` flags in Cppcheck analysis
+ * use `-isystem` paths in Cppcheck analysis
+ * remove `-I` paths from the compile_commands.json
+
+See [script documentation](https://github.com/cppcheck-opensource/cppcheck/blob/main/tools/tweak-compile-commands.md).
 
 ## Visual Studio
 
-You can run Cppcheck on individual project files (\*.vcxproj) or on a whole solution (\*.sln)
+You can run Cppcheck on individual project files (`*.vcxproj`) or on a whole solution (`*.sln`) or (`*.slnx`).
 
 Running Cppcheck on an entire Visual Studio solution:
 
     cppcheck --project=foobar.sln
 
+Running Cppcheck on an entire Visual Studio 2026 solution:
+
+    cppcheck --project=foobar.slnx
+
 Running Cppcheck on a Visual Studio project:
 
     cppcheck --project=foobar.vcxproj
@@ -319,7 +341,7 @@ Limiting on a single configuration:
 
 In the `Cppcheck GUI` you have the option to only analyze a single debug configuration. If you want to use this option on the command line, then create a `Cppcheck GUI` project with this activated and then import the GUI project file on the command line.
 
-To ignore certain folders in the project you can use `-i`. This will skip analysis of source files in the `foo` folder.
+To ignore certain folders in the project, you can use `-i`. This will skip analysis of source files in the `foo` folder.
 
     cppcheck --project=foobar.vcxproj -ifoo
 
@@ -329,25 +351,28 @@ Running Cppcheck on a C++ Builder 6 project:
 
     cppcheck --project=foobar.bpr
 
-
-To ignore certain folders in the project you can use `-i`. This will skip analysis of source files in the `foo` folder.
+To ignore certain folders in the project, you can use `-i`. This will skip analysis of source files in the `foo` folder.
 
     cppcheck --project=foobar.bpr -ifoo
 
 ## Other
 
-If you can generate a compile database, then it is possible to import that in Cppcheck.
+If you generate a compilation database, then it is possible to import that in Cppcheck.
 
-In Linux you can use for instance the `bear` (build ear) utility to generate a compile database from arbitrary build tools:
+### Makefile
+
+In Linux you can convert a Makefile to a `compile_commands.json` using for instance `bear` (build ear) utility:
 
     bear -- make
 
-# Preprocessor Settings
+If you don't use Linux, there are Python scripts that converts a Makefile into a compilation database.
+
+# Preprocessor settings
 
-If you use `--project` then Cppcheck will automatically use the preprocessor settings in the imported project file and
+If you use `--project`, then Cppcheck will automatically use the preprocessor settings in the imported project file and
 likely you don't have to configure anything extra.
 
-If you don't use `--project` then a bit of manual preprocessor configuration might be required. However Cppcheck has
+If you don't use `--project`, then a bit of manual preprocessor configuration might be required. However Cppcheck has
 automatic configuration of defines.
 
 ## Automatic configuration of preprocessor defines
@@ -355,7 +380,7 @@ automatic configuration of defines.
 Cppcheck automatically test different combinations of preprocessor defines to achieve as high coverage in the analysis
 as possible.
 
-Here is a file that has 3 bugs (when x,y,z are assigned).
+Here is a file that has 3 bugs (when `x`, `y`, `z` are assigned).
 
     #ifdef A
         x=100/0;
@@ -386,14 +411,14 @@ Example:
     cppcheck test.c
 
     # only test configuration "-DA"
-    # No bug is found (#error)
+    # No bug is found; because C is not defined the #error will cause a preprocessor error
     cppcheck -DA test.c
 
     # only test configuration "-DA -DC"
     # The first bug is found
     cppcheck -DA -DC test.c
 
-    # The configuration "-DC" is tested
+    # Test all configurations that does not define "A"
     # The last bug is found
     cppcheck -UA test.c
 
@@ -401,20 +426,27 @@ Example:
     # The two first bugs are found
     cppcheck --force -DA test.c
 
+    # only test 1 valid configuration
+    # Bug(s) will be found
+    cppcheck --max-configs=1 test.c
+
+    # test 2 valid configurations with "X" defined.
+    # Bug(s) will be found
+    cppcheck --max-configs=2 -DX test.c
 
 ## Include paths
 
-To add an include path, use `-I`, followed by the path.
+To add an include path, use `-I` followed by the path.
 
-Cppcheck's preprocessor basically handles includes like any other preprocessor. However, while other preprocessors 
-stop working when they encounter a missing header, Cppcheck will just print an information message and continues 
+Cppcheck's preprocessor basically handles includes like any other preprocessor. However, while other preprocessors
+stop working when they encounter a missing header, Cppcheck will just print an information message and continues
 parsing the code.
 
-The purpose of this behaviour is that Cppcheck is meant to work without necessarily seeing the entire code. 
-Actually, it is recommended to not give all include paths. 
-While it is useful for Cppcheck to see the declaration of a class when checking the implementation of its members, 
-passing standard library headers is discouraged, because the analysis will not work fully and lead to a longer checking 
-time. For such cases, .cfg files are the preferred way to provide information about the implementation of functions and 
+The purpose of this behaviour is that Cppcheck is meant to work without necessarily seeing the entire code.
+Actually, it is recommended to not give all include paths.
+While it is useful for Cppcheck to see the declaration of a class when checking the implementation of its members,
+passing standard library headers is discouraged, because the analysis will not work fully and lead to a longer checking
+time. For such cases, `.cfg` files are the preferred way to provide information about the implementation of functions and
 types to Cppcheck, see below for more information.
 
 # Platform
@@ -445,7 +477,7 @@ You can also create your own custom platform configuration in a XML file. Here i
       </sizeof>
     </platform>
 
-# C/C++ Standard
+# C/C++ standard
 
 Use `--std` on the command line to specify a C/C++ standard.
 
@@ -474,7 +506,7 @@ the GUI, the build dir is configured in the project options.
 Rechecking code will be much faster. Cppcheck does not analyse unchanged code. The old warnings are
 loaded from the build dir and reported again.
 
-Whole program analysis does not work when multiple threads are used; unless you use a cppcheck
+Whole program analysis does not work when multiple threads are used unless you use a Cppcheck
 build dir. For instance, the unusedFunction warnings require whole program analysis.
 
 # Suppressions
@@ -492,12 +524,13 @@ The format for an error suppression is one of:
     [error id]:[filename2]
     [error id]
 
-The `error id` is the id that you want to suppress. The id of a warning is shown in brackets in the normal cppcheck text output.
+The `error id` is the id that you want to suppress. The id of a warning is shown in brackets in the normal Cppcheck text output.
+
+The `error id` and `filename` patterns may contain `**`, `*` or `?`.
 
-The `error id` and `filename` patterns may contain `**`, `*` or `?`.  
-`**`: matches zero or more characters, including path separators  
-`*`: matches zero or more characters, excluding path separators  
-`?`: matches any single character except path separators
+- `**` matches zero or more characters, including path separators.
+- `*` matches zero or more characters, excluding path separators.
+- `?` matches any single character except path separators.
 
 It is recommended to use forward-slash `/` in the filename pattern as path separator on all operating systems.
 
@@ -539,9 +572,10 @@ You can specify suppressions in a XML file, for example as follows:
     </suppressions>
 
 The `id` and `fileName` patterns may contain `**`, `*` or `?`.
-`**`: matches zero or more characters, including path separators
-`*`: matches zero or more characters, excluding path separators
-`?`: matches any single character except path separators
+
+- `**` matches zero or more characters, including path separators.
+- `*` matches zero or more characters, excluding path separators.
+- `?` matches any single character except path separators.
 
 The XML format is extensible and may be extended with further attributes in the future.
 
@@ -549,9 +583,37 @@ The usage of the suppressions file is as follows:
 
     cppcheck --suppress-xml=suppressions.xml src/
 
+### The `<hash>` element
+
+Cppcheck calculates a unique ID for each error, called the hash. The hash depends on the code that
+is related to the error, not on where that code is located. This means that the hash for an error
+stays the same even when unrelated code elsewhere in the file is added, removed or moved, shifting
+the line numbers around. The hash only changes if the related code itself is modified.
+
+This makes hash-based suppressions more robust than line-based suppressions: once you have
+reviewed and suppressed a specific warning, the suppression keeps working even after the file is
+edited, as long as the offending code is not changed.
+
+The hash for an error is included as the `hash` attribute in the [XML output](#the-error-element).
+You can copy that value into a `<hash>` element in a suppressions XML file:
+
+    <?xml version="1.0"?>
+    <suppressions>
+      <suppress>
+        <id>uninitvar</id>
+        <fileName>src/file1.c</fileName>
+        <hash>12345678</hash>
+      </suppress>
+    </suppressions>
+
+A suppression can use `<hash>` on its own, without `<id>`, to suppress a specific error regardless
+of its id. It is also possible to combine `<hash>` with `<id>`, `<fileName>`, `<lineNumber>` and
+`<symbolName>`; when several of these are specified, all of them must match for the suppression to
+apply.
+
 ## Inline suppressions
 
-Suppressions can also be added directly in the code by adding comments that contain special keywords. 
+Suppressions can also be added directly in the code by adding comments that contain special keywords.
 Note that adding comments sacrifices the readability of the code somewhat.
 
 This code will normally generate an error message:
@@ -576,7 +638,7 @@ You can suppress a warning `aaaa` with:
 
     // cppcheck-suppress aaaa
 
-Suppressing multiple ids in one comment by using []:
+Suppressing multiple ids in one comment by using `[]`:
 
     // cppcheck-suppress [aaaa, bbbb]
 
@@ -607,7 +669,6 @@ Suppressing warnings `aaaa` where macro is used:
     ...
     x = MACRO; // <- aaaa warnings are suppressed here
 
-
 Suppressing multiple ids where macro is used:
 
     // cppcheck-suppress-macro [aaaa, bbbb]
@@ -636,7 +697,21 @@ Or at the same line as the code:
         arr[10] = 0;  // cppcheck-suppress arrayIndexOutOfBounds
     }
 
-In this example there are 2 lines with code and 1 suppression comment. The suppression comment only applies to 1 line: `a = b + c;`.
+The suppression comment and the line of code may be separated by additional comments or empty lines:
+
+    void f() {
+        char arr[5];
+
+        // cppcheck-suppress arrayIndexOutOfBounds
+
+        arr[10] = 0;
+
+        // cppcheck-suppress arrayIndexOutOfBounds
+        // Set the tenth element of arr to zero
+        arr[10] = 0;
+    }
+
+In the example below there are 2 lines with code and 1 suppression comment. The suppression comment only applies to 1 line: `a = b + c;`.
 
     void f() {
         a = b + c; // cppcheck-suppress abc
@@ -683,7 +758,6 @@ Suppression comment on the same line as the code:
         arr[10] = arr[10] / 0;  // cppcheck-suppress[arrayIndexOutOfBounds,zerodiv]
     }
 
-
 ### Symbol name
 
 You can specify that the inline suppression only applies to a specific symbol:
@@ -702,6 +776,120 @@ You can write comments about a suppression as follows:
     // cppcheck-suppress warningid ; some comment
     // cppcheck-suppress warningid // some comment
 
+# Generating and using a baseline
+
+When you first run Cppcheck on an existing codebase it's common to get a
+large number of warnings. A "baseline" lets you suppress all of today's
+warnings and see only *new* warnings introduced from now on.
+
+This works by asking Cppcheck to include a content-based `hash` for every warning
+(computed from the surrounding code, not the line number), then converting today's
+warnings into an XML suppressions file keyed on `id` + `fileName` + `hash`. Because
+the hash is based on content rather than line number, warnings stay suppressed even
+after unrelated lines above them are added or removed. A warning only reappears if
+the code it actually points at changes, or a new warning shows up elsewhere.
+
+## 1. Generate the baseline
+
+Run Cppcheck with `--xml` and capture stderr (where Cppcheck writes its XML) to a
+file:
+
+```sh
+cppcheck --enable=style --xml src 2> baseline-results.xml
+```
+
+Use whatever combination of `--enable`/defines/include paths you normally
+analyze the project with — the suppressions you get out only cover the
+checks you ran.
+
+## 2. Convert the results into a suppressions file
+
+A [script](https://github.com/cppcheck-opensource/cppcheck/blob/main/tools/generate-baseline-suppressions.py) can be used to generate the baseline:
+```sh
+python3 generate-baseline-suppressions.py baseline-results.xml suppressions.xml
+```
+
+This produces a `suppressions.xml` like:
+
+```xml
+<?xml version="1.0"?>
+<suppressions>
+  <suppress>
+    <id>uninitvar</id>
+    <fileName>src/file1.c</fileName>
+    <hash>12345678</hash>
+  </suppress>
+</suppressions>
+```
+
+`suppressions.xml` needs to be shared by everyone who runs Cppcheck on this
+codebase, including CI.
+
+Having a script instead of using some special cppcheck flags has the advantages:
+ * it's flexible. You can tweak it if needed.
+ * there is fewer flags for us to maintain and document, and for you to learn.
+
+## 3. Use the baseline on future runs
+
+```sh
+cppcheck --enable=style --xml --suppress-xml=suppressions.xml src
+```
+
+Only warnings that aren't in the baseline are reported: new warnings in changed
+code, and warnings for checks/files that weren't covered when the baseline was
+generated.
+
+## 4. Refreshing the baseline
+
+Re-run steps 1-2 whenever you want to accept the current state as the new
+baseline (e.g. after cleaning up a batch of warnings, or deliberately accepting a
+new one). Regenerating overwrites `suppressions.xml` with an entry for every
+warning present at that time.
+
+## The baseline doesn't need to be kept in sync
+
+Once code that a baselined warning pointed at is fixed, refactored away, or
+deleted, its `suppress` entry in `suppressions.xml` becomes dead: nothing will
+ever match it again. You don't need to go find and remove it.
+
+Cppcheck's `unmatchedSuppression` check (part of `--enable=all`) normally warns
+about suppressions that never matched anything, on the theory that a
+suppression nobody needs is probably a mistake. But it does *not* fire for
+`suppress` entries that carry a `<hash>` — which is every entry the baseline
+script generates. So a baseline file with plenty of dead entries produces no
+noise, and developers never need to prune it by hand — it only needs to be
+regenerated (step 4) when you deliberately want to reset what's accepted.
+
+## Caveats
+
+- A warning can only be suppressed this way if it carries a `hash` attribute in
+  the XML output. Almost all checks compute one. Critical errors, i.e. syntax
+  errors do not get hash and must be fixed. Certain information messages do not
+  get hash neither.
+- Changed Cppcheck options might produce new warnings that are not suppressed
+  by the baseline.
+- Cppcheck upgrades don't affect the hash directly (it isn't version-tagged),
+  but if a new release for instance changes a check's message wording, the hash
+  changes with it — so upgrading Cppcheck can resurrect baselined warnings for
+  checks whose messages were reworded, even though nothing in the analyzed code
+  changed.
+
+## Strategies for gradually shrinking the baseline
+
+A baseline makes it possible to adopt Cppcheck in CI immediately without
+fixing everything first, but nothing about it enforces that the accepted set
+of warnings actually shrinks over time.
+
+Generic advice:
+
+- **Prioritize by severity** Checks like `uninitvar` or
+  `nullPointer` are more valuable to clear than `style` warnings; a baseline
+  makes it possible to drive the highest-severity checks to zero first while
+  deliberately leaving lower-risk ones suppressed longer.
+- **Be careful** Every fix is a code change, and every code change carries some
+  risk of introducing a new bug. It can make sense to leave some things suppressed
+  to minimize the risk that bugs are introduced in working code.
+
 # XML output
 
 Cppcheck can generate output in XML format. Use `--xml` to enable this format.
@@ -783,7 +971,7 @@ If you want to reformat the output so that it looks different, then you can use
 
 ## Predefined output formats
 
-To get Visual Studio compatible output you can use --template=vs:
+To get Visual Studio compatible output, you can use `--template=vs`:
 
     cppcheck --template=vs samples/arrayIndexOutOfBounds/bad.c
 
@@ -793,7 +981,7 @@ This output will look like this:
     samples/arrayIndexOutOfBounds/bad.c(6): error: Array
     'a[2]' accessed at index 2, which is out of bounds.
 
-To get gcc compatible output you can use --template=gcc:
+To get GCC-compatible output, you can use `--template=gcc`:
 
     cppcheck --template=gcc samples/arrayIndexOutOfBounds/bad.c
 
@@ -831,7 +1019,7 @@ The output will look like this:
     samples/arrayIndexOutOfBounds/bad.c,6,error,arrayIndexOutOfBounds,
     Array 'a[2]' accessed at index 2, which is out of bounds.
 
-## User defined output format (multi line)
+## User defined output format (multi-line)
 
 Many warnings have multiple locations. Example code:
 
@@ -847,9 +1035,9 @@ Many warnings have multiple locations. Example code:
         return 0;
     }
 
-There is a possible null pointer dereference at line 3. 
-Cppcheck can show how it came to that conclusion by showing extra location information. 
-You need to use both --template and --template-location at the command line, for example:
+There is a possible null pointer dereference at line 3.
+Cppcheck can show how it came to that conclusion by showing extra location information.
+You need to use both `--template` and `--template-location` at the command line, for example:
 
     cppcheck \
     --template="{file}:{line}: {severity}: {message}\n{code}" \
@@ -871,13 +1059,13 @@ The output from Cppcheck is:
         *p = 3;
          ^
 
-The first line in the warning is formatted by the --template format.
+The first line in the warning is formatted by the `--template` format.
 
-The other lines in the warning are formatted by the --template-location format.
+The other lines in the warning are formatted by the `--template-location` format.
 
-### Format specifiers for --template
+### Format specifiers for `--template`
 
-The available specifiers for --template are:
+The available specifiers for `--template` are:
 
 **{file}**
 
@@ -893,11 +1081,11 @@ Column number
 
 **{callstack}**
 
-Write all locations. Each location is written in [{file}:{line}] format and the locations are separated by ->. For instance it might look like: [multiline.c:8] -> [multiline.c:9] -> [multiline.c:3]
+Write all locations. Each location is written in `[{file}:{line}]` format and the locations are separated by `->`. For instance it might look like: `[multiline.c:8] -> [multiline.c:9] -> [multiline.c:3]`
 
 **{inconclusive:text}**
 
-If warning is inconclusive, then the given text is written. The given text can be any text that does not contain }. Example: {inconclusive:inconclusive,}
+If warning is inconclusive, then the given text is written. The given text can be any text that does not contain `}`. Example: `{inconclusive:inconclusive,}`
 
 **{severity}**
 
@@ -931,7 +1119,7 @@ Newline
 
 Carriage return
 
-### Format specifiers for --template-location
+### Format specifiers for `--template-location`
 
 The available specifiers for `--template-location` are:
 
@@ -983,7 +1171,7 @@ Example code:
         int x = 0;
     }
 
-In Cppcheck text output the remarks are not shown by default, you can use `--template` option `{remark}` to show remarks:
+In Cppcheck text output, the remarks are not shown by default, you can use `--template` option `{remark}` to show remarks:
 
     $ ./cppcheck --enable=style \
     --template="{file}:{line}: {message} [{id}]\\n{remark}" test1.c
@@ -992,12 +1180,12 @@ In Cppcheck text output the remarks are not shown by default, you can use `--tem
     test1.c:4: Variable 'x' is assigned a value that is never used. [unreadVariable]
     Initialize x with 0
 
-In xml output the comment text is provided in a "remark" attribute:
+In XML output, the comment text is provided in a `remark` attribute:
 
     $ ./cppcheck --enable=style --xml test1.c
-    ....
+    ...
     remark="Initialize x with 0"
-    ....
+    ...
 
 # Addons
 
@@ -1007,52 +1195,51 @@ Cppcheck is distributed with a few addons which are listed below.
 
 ## Supported addons
 
-### namingng.py
+### `namingng.py`
 
-[namingng.py](https://github.com/danmar/cppcheck/blob/main/addons/namingng.py) allows you to configure and check naming conventions.
+[`namingng.py`](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/namingng.py) allows you to configure and check naming conventions.
 
 You need to have a configuration file that defines your naming conventions. By default the filename `namingng.config.json` is used but there is an option so you can use any filename you want.
 
 Example configuration of naming conventions:
-```
-{
-   "RE_VARNAME": ["[a-z]*[a-zA-Z0-9_]*\\Z"],
-   "RE_PRIVATE_MEMBER_VARIABLE": null,
-   "RE_FUNCTIONNAME": ["[a-z0-9A-Z]*\\Z"],
-   "_comment": "comments can be added to the config with underscore-prefixed keys",
-   "include_guard": {
-       "input": "path",
-       "prefix": "GUARD_",
-       "case": "upper",
-       "max_linenr": 5,
-       "RE_HEADERFILE": "[^/].*\\.h\\Z",
-       "required": true
-   },
-   "var_prefixes": {"uint32_t": "ui32"},
-   "function_prefixes": {"uint16_t": "ui16",
-                         "uint32_t": "ui32"}
-}
-```
 
-### threadsafety.py
+    {
+        "RE_VARNAME": ["[a-z]*[a-zA-Z0-9_]*\\Z"],
+        "RE_PRIVATE_MEMBER_VARIABLE": null,
+        "RE_FUNCTIONNAME": ["[a-z0-9A-Z]*\\Z"],
+        "_comment": "comments can be added to the config with underscore-prefixed keys",
+        "include_guard": {
+            "input": "path",
+            "prefix": "GUARD_",
+            "case": "upper",
+            "max_linenr": 5,
+            "RE_HEADERFILE": "[^/].*\\.h\\Z",
+            "required": true
+        },
+        "var_prefixes": {"uint32_t": "ui32"},
+        "function_prefixes": {"uint16_t": "ui16",
+                              "uint32_t": "ui32"}
+    }
+
+### `threadsafety.py`
 
-[threadsafety.py](https://github.com/danmar/cppcheck/blob/main/addons/threadsafety.py) analyses Cppcheck dump files to locate thread safety issues like static local objects used by multiple threads.
+[`threadsafety.py`](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/threadsafety.py) analyses Cppcheck dump files to locate thread safety issues like static local objects used by multiple threads.
 
-### y2038.py
+### `y2038.py`
 
-[y2038.py](https://github.com/danmar/cppcheck/blob/main/addons/y2038.py) checks source code for [year 2038 problem](https://en.wikipedia.org/wiki/Year_2038_problem) safety.
+[`y2038.py`](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/y2038.py) checks source code for [year 2038 problem](https://en.wikipedia.org/wiki/Year_2038_problem) safety.
 
-## Running Addons
+## Running addons
 
 Addons can be executed with the `--addon` option:
 
     cppcheck --addon=namingng.py somefile.c
 
-Likewise, if you have created your own script you can execute that:
+Likewise, if you have created your own script, you can execute that:
 
     cppcheck --addon=mychecks.py somefile.c
 
-You can configure how you want to execute an addon in a json file. For example:
+You can configure how you want to execute an addon in a JSON file. For example:
 
     {
         "script": "mychecks.py",
@@ -1062,7 +1249,7 @@ You can configure how you want to execute an addon in a json file. For example:
         "ctu": false
     }
 
-To use that json file to execute your addon use the --addon option:
+To use that JSON file to execute your addon, use the `--addon` option:
 
     cppcheck --addon=mychecks.json somefile.c
 
@@ -1072,75 +1259,75 @@ Cppcheck search for addons in the local folder first and then in the installatio
 
 # Library configuration
 
-When external libraries are used, such as WinAPI, POSIX, gtk, Qt, etc, Cppcheck has no information about functions, types, or macros contained in those libraries. Cppcheck then fails to detect various problems in the code, or might even abort the analysis. But this can be fixed by using the appropriate configuration files.
-
-Cppcheck already contains configurations for several libraries. They can be loaded as described below. Note that the configuration for the standard libraries of C and C++, std.cfg, is always loaded by cppcheck. If you create or update a configuration file for a popular library, we would appreciate if you supplied it to the cppcheck project.
-
-## Using a .cfg file
-
-To use a .cfg file shipped with cppcheck, pass the `--library=<lib>` option. The table below shows the currently existing libraries:
-
-| .cfg file         | Library       | Comment       |
-| ----------------- | ------------- | ------------- |
-| avr.cfg           |               |               |
-| bento4.cfg        | [Bento4](http://www.bento4.com/) | |
-| boost.cfg         | [Boost](http://www.boost.org/) | |
-| bsd.cfg           | [BSD](https://www.freebsd.org/) | |
-| cairo.cfg         | [cairo](https://www.cairographics.org/) | |
-| cppcheck-lib.cfg  | [Cppcheck](http://cppcheck.net/) | Used in selfcheck of |
-|                   |               |the Cppcheck code base |
-| cppunit.cfg       | [CppUnit](https://sourceforge.net/projects/cppunit/) | |
-| dpdk.cfg          |               |               |
-| embedded_sql.cfg  |               |               |
-| emscripten.cfg | | |
-| ginac.cfg | | |
-| gnu.cfg | [GNU](https://www.gnu.org/) | |
-| googletest.cfg | [GoogleTest](https://github.com/google/googletest) | |
-| gtk.cfg | [GTK](https://www.gtk.org/) | |
-| icu.cfg | | |
-| kde.cfg | [KDE](https://kde.org/) | |
-| libcerror.cfg | [libcerror](https://github.com/libyal/libcerror) | |
-| libcurl.cfg | [libcurl](https://curl.se/libcurl/) | |
-| libsigc++.cfg | [libsigc++](https://github.com/libsigcplusplus/libsigcplusplus) | |
-| lua.cfg | | |
-| mfc.cfg | [MFC](https://learn.microsoft.com/en-us/cpp/mfc/mfc-desktop-applications) | |
-| microsoft_atl.cfg | [ATL](https://learn.microsoft.com/en-us/cpp/atl/active-template-library-atl-concepts) | |
-| microsoft_sal.cfg | [SAL annotations](https://learn.microsoft.com/en-us/cpp/c-runtime-library/sal-annotations) | |
-| microsoft_unittest.cfg | [CppUnitTest](https://learn.microsoft.com/en-us/visualstudio/test/microsoft-visualstudio-testtools-cppunittestframework-api-reference) | |
-| motif.cfg | | |
-| nspr.cfg | | |
-| ntl.cfg | | |
-| opencv2.cfg | [OpenCV](https://opencv.org/) | |
-| opengl.cfg | [OpenGL](https://opengl.org/) | |
-| openmp.cfg | [OpenMP](https://www.openmp.org/) | |
-| openssl.cfg | [OpenSSL](https://www.openssl.org/) | |
-| pcre.cfg | [PCRE](https://pcre.org/) | |
-| posix.cfg | [POSIX](https://pubs.opengroup.org/onlinepubs/9699919799/) | |
-| python.cfg | | |
-| qt.cfg | [Qt](https://doc.qt.io/qt.html) | |
-| ruby.cfg | | |
-| sdl.cfg | | |
-| sfml.cfg | | |
-| sqlite3.cfg | [SQLite](https://www.sqlite.org/) | |
-| std.cfg | C/C++ standard library | Loaded by default |
-| tinyxml2.cfg | [TinyXML-2](https://github.com/leethomason/tinyxml2) | |
-| vcl.cfg | | |
-| windows.cfg | [Win32 API](https://learn.microsoft.com/en-us/windows/win32/) | |
-| wxsqlite3.cfg | | |
-| wxsvg.cfg | | |
-| wxwidgets.cfg | [wxWidgets](https://www.wxwidgets.org/) | |
-| zephyr.cfg | | |
-| zlib.cfg | [zlib](https://www.zlib.net) | |
-
-## Creating a custom .cfg file
-
-You can create and use your own .cfg files for your projects. Use `--check-library` to get hints about what you should configure.
+When external libraries are used, such as WinAPI, POSIX, gtk, Qt, etc., Cppcheck has no information about functions, types, or macros contained in those libraries. Cppcheck then fails to detect various problems in the code, or might even abort the analysis. But this can be fixed by using the appropriate configuration files.
+
+Cppcheck already contains configurations for several libraries. They can be loaded as described below. Note that the configuration for the standard libraries of C and C++, `std.cfg`, is always loaded by Cppcheck. If you create or update a configuration file for a popular library, we would appreciate if you supplied it to the Cppcheck project.
+
+## Using a `.cfg` file
+
+To use a `.cfg` file shipped with Cppcheck, pass the `--library=<lib>` option. The table below shows the currently existing libraries:
+
+| `.cfg` file | Library | Comment |
+| --- | --- | --- |
+| `avr.cfg` | | |
+| `bento4.cfg` | [Bento4](http://www.bento4.com/) | |
+| `boost.cfg` | [Boost](http://www.boost.org/) | |
+| `bsd.cfg` | [BSD](https://www.freebsd.org/) | |
+| `cairo.cfg` | [cairo](https://www.cairographics.org/) | |
+| `cppcheck-lib.cfg` | [Cppcheck](http://cppcheck.net/) | Used in selfcheck of the Cppcheck code base |
+| `cppunit.cfg` | [CppUnit](https://sourceforge.net/projects/cppunit/) | |
+| `dpdk.cfg` | | |
+| `embedded_sql.cfg` | | |
+| `emscripten.cfg` | | |
+| `ginac.cfg` | | |
+| `gnu.cfg` | [GNU](https://www.gnu.org/) | |
+| `googletest.cfg` | [GoogleTest](https://github.com/google/googletest) | |
+| `gtk.cfg` | [GTK](https://www.gtk.org/) | |
+| `icu.cfg` | | |
+| `kde.cfg` | [KDE](https://kde.org/) | |
+| `libcerror.cfg` | [libcerror](https://github.com/libyal/libcerror) | |
+| `libcurl.cfg` | [libcurl](https://curl.se/libcurl/) | |
+| `libsigc++.cfg` | [libsigc++](https://github.com/libsigcplusplus/libsigcplusplus) | |
+| `lua.cfg` | | |
+| `mfc.cfg` | [MFC](https://learn.microsoft.com/en-us/cpp/mfc/mfc-desktop-applications) | |
+| `microsoft_atl.cfg` | [ATL](https://learn.microsoft.com/en-us/cpp/atl/active-template-library-atl-concepts) | |
+| `microsoft_gsl.cfg` | [Microsoft.GSL](https://github.com/microsoft/gsl) | |
+| `microsoft_sal.cfg` | [SAL annotations](https://learn.microsoft.com/en-us/cpp/c-runtime-library/sal-annotations) | |
+| `microsoft_unittest.cfg` | [CppUnitTest](https://learn.microsoft.com/en-us/visualstudio/test/microsoft-visualstudio-testtools-cppunittestframework-api-reference) | |
+| `motif.cfg` | | |
+| `nspr.cfg` | | |
+| `ntl.cfg` | | |
+| `opencv2.cfg` | [OpenCV](https://opencv.org/) | |
+| `opengl.cfg` | [OpenGL](https://opengl.org/) | |
+| `openmp.cfg` | [OpenMP](https://www.openmp.org/) | |
+| `openssl.cfg` | [OpenSSL](https://www.openssl.org/) | |
+| `pcre.cfg` | [PCRE](https://pcre.org/) | |
+| `posix.cfg` | [POSIX](https://pubs.opengroup.org/onlinepubs/9699919799/) | |
+| `python.cfg` | | |
+| `qt.cfg` | [Qt](https://doc.qt.io/qt.html) | |
+| `ruby.cfg` | | |
+| `sdl.cfg` | | |
+| `sfml.cfg` | | |
+| `sqlite3.cfg` | [SQLite](https://www.sqlite.org/) | |
+| `std.cfg` | C/C++ standard library | Loaded by default |
+| `tinyxml2.cfg` | [TinyXML-2](https://github.com/leethomason/tinyxml2) | |
+| `vcl.cfg` | | |
+| `windows.cfg` | [Win32 API](https://learn.microsoft.com/en-us/windows/win32/) | |
+| `wxsqlite3.cfg` | | |
+| `wxsvg.cfg` | | |
+| `wxwidgets.cfg` | [wxWidgets](https://www.wxwidgets.org/) | |
+| `zephyr.cfg` | | |
+| `zlib.cfg` | [zlib](https://www.zlib.net) | |
+
+## Creating a custom `.cfg` file
+
+You can create and use your own `.cfg` files for your projects. Use `--check-library` to get hints about what you should configure.
 
 You can use the `Library Editor` in the `Cppcheck GUI` to edit configuration files. It is available in the `View` menu.
 
-The .cfg file format is documented in the `Reference: Cppcheck .cfg format` (https://cppcheck.sourceforge.io/reference-cfg-format.pdf) document.
+The `.cfg` file format is documented in the `Reference: Cppcheck .cfg format` (<https://cppcheck.sourceforge.io/reference-cfg-format.pdf>) document.
 
-# HTML Report
+# HTML report
 
 You can convert the XML output from Cppcheck into a HTML report. You'll need Python and the pygments module (<http://pygments.org/>) for this to work. In the Cppcheck source tree there is a folder htmlreport that contains a script that transforms a Cppcheck XML file into HTML output.
 
@@ -1170,15 +1357,17 @@ Example usage:
     cppcheck-htmlreport --file=err.xml --report-dir=test1 --source-dir=.
 
 or
+
     cppcheck gui/test.cpp --xml 2> err.xml
     cppcheck-htmlreport --file=err.xml --report-dir=test1 \
          --source-dir=https://github.com/<username>/<repo>/blob/<branch>/
 
-## Choosing Between Local Annotated HTML and Remote Repository Links
+## Choosing between local annotated HTML and remote repository links
+
+`cppcheck-htmlreport` supports two modes for linking to source files:
 
-cppcheck-htmlreport supports two modes for linking to source files:
- - Local annotated HTML files (default when `--source-dir` is a filesystem path)
- - Remote GitHub/GitLab links (when `--source-dir` is a URL)
+- Local annotated HTML files (default when `--source-dir` is a filesystem path)
+- Remote GitHub/GitLab links (when `--source-dir` is a URL)
 
 Pointing `--source-dir` to a filesystem path generates local annotated HTML files.
 This is useful when you need a fully self-contained report that works offline,
@@ -1193,13 +1382,13 @@ handled by the hosting service.
 In general, local mode fits air-gapped environments, while remote mode works
 best for CI workflows and large or private repositories.
 
-# Check Level
+# Check level
 
 ## Reduced
 
 The "reduced" check level performs a limited data flow analysis. If developers
-want to run cppcheck directly during development and require faster results
-than "normal" provides then this reduced checking can be an option.
+want to run Cppcheck directly during development and require faster results
+than "normal" provides, then this reduced checking can be an option.
 
 ## Normal
 
@@ -1209,7 +1398,7 @@ The "normal" check level should be useful during active development:
 
 - checking files while you edit them.
 - block changes to the repo
-- etc
+- etc.
 
 ## Exhaustive
 
@@ -1218,7 +1407,7 @@ When you can wait longer for the results you can enable the "exhaustive" checkin
 Exhaustive checking level should be useful for scenarios where you can wait for results. For instance:
 
 - nightly builds
-- etc
+- etc.
 
 # Speeding up analysis
 
@@ -1226,18 +1415,17 @@ Exhaustive checking level should be useful for scenarios where you can wait for
 
 For performance reasons it might be a good idea to limit preprocessor configurations to check.
 
-## Limit ValueFlow: max if count
+## Limit ValueFlow: max `if` count
 
-The command line option `--performance-valueflow-max-if-count` adjusts the max count for number of if in a function.
+The command line option `--performance-valueflow-max-if-count` adjusts the max count for number of `if` in a function.
 
-When that limit is exceeded there is a limitation of data flow in that function. It is not drastic:
+When that limit is exceeded, there is a limitation of data flow in that function. It is not drastic:
 
 - Analysis of other functions are not affected.
 - It's only for some specific data flow analysis, we have data flow analysis that is always executed.
 - All checks are always executed. There can still be plenty of warnings in the limited function.
 
-There is data flow analysis that slows down exponentially when number of if increase. And the limit is intended to avoid that
-analysis time explodes.
+There is data flow analysis that slows down exponentially when number of `if` increase. And the limit is intended to avoid that analysis time explodes.
 
 ## GUI options
 
@@ -1248,13 +1436,13 @@ In the GUI:
 - Open the project dialog.
 - In the "Analysis" tab there are several options.
 
-If you want to use these limitations on the command line also you can import the GUI project file with --project.
+If you want to use these limitations on the command line too, you can import the GUI project file with `--project`.
 
 # Cppcheck Premium
 
 ## Bug hunting
 
-This is analysis that is more noisy than normal analysis. Most warnings will be false positives (cppcheck will wrongly claim that there are bugs). The design goal is to not have more than roughly 5 - 10 false positives in each file.
+This is analysis that is more noisy than normal analysis. Most warnings will be false positives (Cppcheck will wrongly claim that there are bugs). The design goal is to not have more than roughly 5 to 10 false positives in each file.
 
 It is not intended to be used in normal CI or regular static analysis by developers. The noise makes it useless for that.
 
@@ -1262,7 +1450,7 @@ It is intended to be used when you are looking for bugs and you really can accep
 
 - You have developed a brand new feature and want to ensure that there are no bugs.
 - Maybe as part of release testing your product you can run bug hunting on modified files.
-- Etc
+- Etc.
 
 Technically, analysis that is "sound" will detect all bugs. Analysis that is "soundy" has the goal to detect most bugs and it tries to keep the noise at an reasonable level.
 
@@ -1270,41 +1458,41 @@ The Cppcheck bug hunting analysis is "soundy".
 
 Command:
 
-    cppcheck --premium=bughunting ....
+    cppcheck --premium=bughunting ...
 
 ## Coding standards
 
 Command to activate Autosar checkers:
 
-    cppcheck --premium=autosar ....
+    cppcheck --premium=autosar ...
 
 Command to activate Cert C checkers:
 
-    cppcheck --premium=cert-c ....
+    cppcheck --premium=cert-c ...
 
 Command to activate Cert C++ checkers:
 
-    cppcheck --premium=cert-c++ ....
+    cppcheck --premium=cert-c++ ...
 
 Command to activate Misra C 2012 checkers:
 
-    cppcheck --premium=misra-c-2012 ....
+    cppcheck --premium=misra-c-2012 ...
 
 Command to activate Misra C 2023 checkers:
 
-    cppcheck --premium=misra-c-2023 ....
+    cppcheck --premium=misra-c-2023 ...
 
 Command to activate Misra C 2025 checkers:
 
-    cppcheck --premium=misra-c-2025 ....
+    cppcheck --premium=misra-c-2025 ...
 
 Command to activate Misra C++ 2008 checkers:
 
-    cppcheck --premium=misra-c++-2008 ....
+    cppcheck --premium=misra-c++-2008 ...
 
 Command to activate Misra C++ 2023 checkers:
 
-    cppcheck --premium=misra-c++-2023 ....
+    cppcheck --premium=misra-c++-2023 ...
 
 ### Checking all C and C++ files
 
@@ -1312,7 +1500,7 @@ The `cert-c` and `misra-c-*` coding standards target C and therefore the checker
 
 The `autosar`, `cert-c++` and `misra-c++-*` coding standards target C++ and therefore the checkers only check C++ files by default.
 
-If you want to check all files you can append ":all" to the coding standard. Example:
+If you want to check all files, you can append `:all` to the coding standard. Example:
 
     # Misra C checkers are executed on C files, not on C++ files
     cppcheck --premium=misra-c-2025 path
@@ -1320,18 +1508,12 @@ If you want to check all files you can append ":all" to the coding standard. Exa
     # Misra C checkers are executed on C and C++ files
     cppcheck --premium=misra-c-2025:all path
 
-
 ## Compliance report
 
-### Graphical user interface
-
-Run a analysis with some coding standards enabled. After that you can click on
-the `Compliance report...` in the `File` menu.
-
 ### Command line
 
 There is a tool `compliance-report` that is distributed with Cppcheck Premium. To see
-all available options run `compliance-report` in a terminal with no options.
+all available options, run `compliance-report` in a terminal with no options.
 
 Below is example usage to generate a Misra C 2012 compliance report.
 
@@ -1344,12 +1526,12 @@ Description of the options:
 - `--misra-c-2012`: Generate a compliance report for misra-c-2012
 - `--project-name`: The name of the project
 - `--project-version`: The version of the project
-- `--output-file`: html filename that the report should be written to
-- `results.xml`: The xml output from cppcheck
+- `--output-file`: HTML filename that the report should be written to
+- `results.xml`: The XML output from Cppcheck
 
 ## Metrics
 
-To generate metrics add option `--premium=metrics`. The metrics are saved in the xml v3 report.
+To generate metrics, add option `--premium=metrics`. The metrics are saved in the XML v3 report.
 Example:
 
     cppcheck --premium=metrics test.c --xml-version=3 2> res.xml
@@ -1358,41 +1540,41 @@ We provide a small simple python script that creates a metrics report in CSV for
 
     python3 HISReport.py -f res.xml -j path/to/cppcheck-id-mapping.json -o test.csv
 
-the `cppcheck-id-mapping.json` is provided in the cppcheck premium installation folder, i.e.
+The `cppcheck-id-mapping.json` is provided in the Cppcheck premium installation folder, i.e.
 `/opt/cppcheckpremium` or `C:\Program Files\Cppcheck Premium`.
 
-We do not have a ready-made solution to generate a html/pdf report. You can easily tweak our
-HISReport.py script so that it generates html and get the report exactly as you want.
+We do not have a ready-made solution to generate a HTML/pdf report. You can easily tweak our
+`HISReport.py` script so that it generates HTML and get the report exactly as you want.
 
 ## Licenses
 
-### Commercial Terms
+### Commercial terms
 
 Information about Cppcheck Premium licenses:
-https://www.cppcheck.com/plans-pricing
+<https://www.cppcheck.com/plans-pricing>
 
-### Installation / Registration
+### Installation / registration
 
 This is described on the Cppcheck Premium website:
-https://www.cppcheck.com
+<https://www.cppcheck.com>
 
 ### License file path
 
 There are predefined paths where the premium addon search for license files. If you want to
-provide an arbitrary license file path on the command line you can use the option
+provide an arbitrary license file path on the command line, you can use the option
 `--premium-license-file`. Example:
 
     cppcheck --premium-license-file=path/to/file.lic test.cpp
 
-If an explicit path is provided like this then premium addon does not search for license
+If an explicit path is provided like this, then premium addon does not search for license
 files in the predefined paths.
 
 ### Troubleshooting
 
-#### Step 1: check premiumaddon debug output
+#### Step 1: check `premiumaddon` debug output
 
-If your license does not work you can get some details about the license validation by executing
-premiumaddon binary with the `--debug` option.
+If your license does not work, you can get some details about the license validation by executing
+`premiumaddon` binary with the `--debug` option.
 
 Windows:
 
@@ -1404,18 +1586,17 @@ Linux/Mac:
 
 These commands can be executed from an arbitrary folder.
 
-#### Step 2: clean up cppcheck build dir
+#### Step 2: clean up Cppcheck build dir
 
 Command line:
-If you use --cppcheck-build-dir then remove all files in the specified folder and recheck.
+If you use `--cppcheck-build-dir`, then remove all files in the specified folder and recheck.
 
 Cppcheck GUI:
-The GUI normally by default creates a cppcheck build dir. Clear all results and recheck.
+The GUI normally by default creates a Cppcheck build dir. Clear all results and recheck.
 You can clear all results by clicking on the brush icon in the toolbar. Or by open `Edit` menu and selecting menu item `Clear results`.
 
-#### Step 3: remove cppcheck-premium-loc files
+#### Step 3: remove `cppcheck-premium-loc` files
 
-If you have cppcheck-premium-loc files in your project folders those should be removed.
+If you have `cppcheck-premium-loc` files in your project folders, those should be removed.
 
 If such files are generated during analysis, then review your scripts to check why those files are generated.
-
diff --git a/man/manual.md b/man/manual.md
index d8da119f388..85dad95f8bb 100644
--- a/man/manual.md
+++ b/man/manual.md
@@ -1,6 +1,6 @@
 ---
 title: Cppcheck manual
-subtitle: Version 2.19 dev
+subtitle: Version 2.23 dev
 author: Cppcheck team
 lang: en
 documentclass: report
@@ -8,8 +8,8 @@ documentclass: report
 
 # Introduction
 
-Cppcheck is an analysis tool for C/C++ code. It provides unique code analysis to detect bugs and focuses on detecting 
-undefined behaviour and dangerous coding constructs. The goal is to detect only real errors in the code, and generate 
+Cppcheck is an analysis tool for C/C++ code. It provides unique code analysis to detect bugs and focuses on detecting
+undefined behaviour and dangerous coding constructs. The goal is to detect only real errors in the code, and generate
 as few false positives (wrongly reported warnings) as possible. Cppcheck is designed to analyze your C/C++ code even
 if it has non-standard syntax, as is common in for example embedded projects.
 
@@ -17,7 +17,7 @@ Supported code and platforms:
 
 - Cppcheck checks non-standard code that contains various compiler extensions, inline assembly code, etc.
 - Cppcheck should be compilable by any compiler that supports C++11 or later.
-- Cppcheck is cross platform and is used in various posix/windows/etc environments.
+- Cppcheck is cross-platform and is used in various posix/windows/etc environments.
 
 The checks in Cppcheck are not perfect. There are bugs that should be found, that Cppcheck fails to detect.
 
@@ -30,11 +30,11 @@ The kinds of bugs that you can find with static analysis are:
 - Coding style
 
 There are many bugs that you can not find with static analysis. Static analysis tools do not have human knowledge about
-what your program is intended to do. If the output from your program is valid but unexpected then in most cases this is
-not detected by static analysis tools. For instance, if your small program writes "Helo" on the screen instead of "Hello"
+what your program is intended to do. If the output from your program is valid but unexpected, then in most cases this is
+not detected by static analysis tools. For instance, if your small program writes "Helo" on the screen instead of "Hello",
 it is unlikely that any tool will complain about that.
 
-Static analysis should be used as a complement in your quality assurance. It does not replace any of;
+Static analysis should be used as a complement in your quality assurance. It does not replace any of:
 
 - Careful design
 - Testing
@@ -70,7 +70,7 @@ Here is some simple code:
         return 0;
     }
 
-If you save that into file1.c and execute:
+If you save that into `file1.c` and execute:
 
     cppcheck file1.c
 
@@ -85,7 +85,7 @@ Normally a program has many source files. Cppcheck can check all source files in
 
     cppcheck path
 
-If "path" is a folder, then Cppcheck will recursively check all source files in this folder:
+If `path` is a folder, then Cppcheck will recursively check all source files in this folder:
 
     Checking path/file1.cpp...
     1/2 files checked 50% done
@@ -94,21 +94,22 @@ If "path" is a folder, then Cppcheck will recursively check all source files in
 
 ### Check files manually or use project file
 
-With Cppcheck you can check files manually by specifying files/paths to check and settings. Or you can use a build 
+With Cppcheck you can check files manually by specifying files/paths to check and settings. Or you can use a build
 environment, such as CMake or Visual Studio.
 
-We don't know which approach (project file or manual configuration) will give you the best results. It is recommended 
-that you try both. It is possible that you will get different results so that to find the largest amount of bugs you 
+We don't know which approach (project file or manual configuration) will give you the best results. It is recommended
+that you try both. It is possible that you will get different results so that to find the largest amount of bugs you
 need to use both approaches. Later chapters will describe this in more detail.
 
 ### Check files matching a given file filter
 
 With `--file-filter=<str>` you can configure file filter(s) and then only those files matching the filter will be checked.
 
-You can use `**`, `*` and `?` in the file filter pattern.  
-`**`: matches zero or more characters, including path separators  
-`*`: matches zero or more characters, excluding path separators  
-`?`: matches any single character except path separators
+You can use `**`, `*` and `?` in the file filter pattern.
+
+- `**` matches zero or more characters, including path separators.
+- `*` matches zero or more characters, excluding path separators.
+- `?` matches any single character except path separators.
 
 For example, this command below means that `src/test1.cpp` could be checked, but `src/file2.cpp` and `src/test/file1.cpp` will not be checked:
 
@@ -122,22 +123,24 @@ A common use case for `--file-filter` is to check a project, but only check cert
     cppcheck --project=compile_commands.json --file-filter=src/*.c
 
 Typically a `compile_commands.json` contains absolute paths. However no matter if `compile_commands.json` contains absolute paths or relative paths, the option `--file-filter=src/*.c` would mean that:
- * a file with relative path `test1.c` is not checked.
- * a file with relative path `src/test2.c` can be checked.
- * a file with relative path `src/test3.cpp` is not checked.
+
+- a file with relative path `test1.c` is not checked.
+- a file with relative path `src/test2.c` can be checked.
+- a file with relative path `src/test3.cpp` is not checked.
 
 ### Ignore files matching a given pattern
 
 With `-i <str>` you can configure filename/directory patterns that should be ignored.
 
-A file that is ignored will not be checked directly (the complete translation unit is skipped). Any header #include'd from a source file which is not ignored is checked indirectly, regardless if the header is ignored.
+A file that is ignored will not be checked directly (the complete translation unit is skipped). Any header `#include`'d from a source file which is not ignored is checked indirectly, regardless if the header is ignored.
+
+> *Note*: If you want to filter out warnings for a header file, then `-i` will not work. Use suppressions instead.
 
-> *Note*: If you want to filter out warnings for a header file then `-i` will not work. Use suppressions instead.
+You can use `**`, `*` and `?` in the pattern to specify excluded folders/files.
 
-You can use `**`, `*` and `?` in the pattern to specify excluded folders/files.  
-`**`: matches zero or more characters, including path separators  
-`*`: matches zero or more characters, excluding path separators  
-`?`: matches any single character except path separators
+- `**` matches zero or more characters, including path separators.
+- `*` matches zero or more characters, excluding path separators.
+- `?` matches any single character except path separators.
 
 A use case for `-i` is to check a project, but exclude certain files/folders:
 
@@ -145,8 +148,8 @@ A use case for `-i` is to check a project, but exclude certain files/folders:
 
 Typically a `compile_commands.json` contains absolute paths. However no matter if `compile_commands.json` contains absolute paths or relative paths, the option `-itest` would mean that:
 
- * a file with relative path `test1.cpp` can be checked.
- * a file with relative path `test/somefile.cpp` is not checked
+- a file with relative path `test1.cpp` can be checked.
+- a file with relative path `test/somefile.cpp` is not checked
 
 ### Clang parser (experimental)
 
@@ -157,7 +160,7 @@ Install `clang`. Then use Cppcheck option `--clang`.
 Cppcheck executes clang with the -ast-dump option, imports the output, converts it to Cppcheck's internal format, and then
 performs standard analysis.
 
-You can also pass a custom Clang executable to the option by using for example `--clang=clang-10`. You can also pass it 
+You can also pass a custom Clang executable to the option by using for example `--clang=clang-10`. You can also pass it
 with a path. On Windows it will append the `.exe` extension unless you use a path.
 
 ## Severities
@@ -178,17 +181,17 @@ stylistic issues, such as unused functions, redundant code, constness, operator
 
 **performance**
 
-run time performance suggestions based on common knowledge, though it is not certain any measurable speed difference 
+run time performance suggestions based on common knowledge, though it is not certain any measurable speed difference
 will be achieved by fixing these messages.
 
 **portability**
 
-portability warnings. Implementation defined behavior. 64-bit portability. Some undefined behavior that probably works 
+portability warnings. Implementation defined behavior. 64-bit portability. Some undefined behavior that probably works
 "as you want", etc.
 
 **information**
 
-configuration problems, which does not relate to the syntactical correctness, but the used Cppcheck configuration could 
+configuration problems, which does not relate to the syntactical correctness, but the used Cppcheck configuration could
 be improved.
 
 ## Possible speedup analysis of template code
@@ -222,7 +225,7 @@ Cppcheck output:
 As you can see Cppcheck has instantiated `a<i+1>` until `a<101>` was reached
 and then it bails out.
 
-To limit template recursion you can:
+To limit template recursion, you can:
 
 - add template specialisation
 - configure Cppcheck, which can be done in the GUI project file dialog
@@ -246,7 +249,6 @@ Example code with template specialisation:
 
 You can pass `-D__cppcheck__` when checking this code.
 
-
 # Cppcheck build folder
 
 Using a Cppcheck build folder is not mandatory but it is recommended.
@@ -280,25 +282,25 @@ You can import and use Cppcheck GUI project files in the command line tool:
 
     cppcheck --project=foobar.cppcheck
 
-The Cppcheck GUI has a few options that are not available in the command line directly. To use these options you can import a GUI project file. 
+The Cppcheck GUI has a few options that are not available in the command line directly. To use these options, you can import a GUI project file.
 The command line tool usage is kept intentionally simple and the options are therefore limited.
 
-To ignore certain folders in the project you can use `-i`. This will skip the analysis of source files in the `foo` folder.
+To ignore certain folders in the project, you can use `-i`. This will skip the analysis of source files in the `foo` folder.
 
     cppcheck --project=foobar.cppcheck -ifoo
 
-## Compilation database (cmake etc)
+## Compilation database (CMake etc.)
 
 Many build systems can generate a compilation database (a JSON file containing compilation commands for each source file).
 Example `cmake` command to generate the file:
 
     cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON .
 
-When you have a `compile_commands.json` file you can run Cppcheck like this:
+When you have a `compile_commands.json` file, you can run Cppcheck like this:
 
     cppcheck --project=compile_commands.json
 
-By default only 1 configuration is checked because that is consistent with the compilation. If you want to check more configurations you can use `--max-configs` or `--force`. For example:
+By default only 1 configuration is checked because that is consistent with the compilation. If you want to check more configurations, you can use `--max-configs` or `--force`. For example:
 
     cppcheck --project=compile_commands.json --force
 
@@ -306,15 +308,29 @@ To ignore certain folders you can use `-i`. This will skip analysis of source fi
 
     cppcheck --project=compile_commands.json -ifoo
 
+### `-isystem`, `-I`, `--sysroot`
+
+We have a [script](https://github.com/cppcheck-opensource/cppcheck/blob/main/tools/tweak-compile-commands.py) that tweaks compile_commands.json.
+
+You can use it to:
+ * use `--sysroot` flags in Cppcheck analysis
+ * use `-isystem` paths in Cppcheck analysis
+ * remove `-I` paths from the compile_commands.json
+
+See [script documentation](https://github.com/cppcheck-opensource/cppcheck/blob/main/tools/tweak-compile-commands.md).
 
 ## Visual Studio
 
-You can run Cppcheck on individual project files (\*.vcxproj) or on a whole solution (\*.sln)
+You can run Cppcheck on individual project files (`*.vcxproj`) or on a whole solution (`*.sln`) or (`*.slnx`).
 
 Running Cppcheck on an entire Visual Studio solution:
 
     cppcheck --project=foobar.sln
 
+Running Cppcheck on an entire Visual Studio 2026 solution:
+
+    cppcheck --project=foobar.slnx
+
 Running Cppcheck on a Visual Studio project:
 
     cppcheck --project=foobar.vcxproj
@@ -326,7 +342,7 @@ Limiting on a single configuration:
 
 In the `Cppcheck GUI` you have the option to only analyze a single debug configuration. If you want to use this option on the command line, then create a `Cppcheck GUI` project with this activated and then import the GUI project file on the command line.
 
-To ignore certain folders in the project you can use `-i`. This will skip analysis of source files in the `foo` folder.
+To ignore certain folders in the project, you can use `-i`. This will skip analysis of source files in the `foo` folder.
 
     cppcheck --project=foobar.vcxproj -ifoo
 
@@ -336,8 +352,7 @@ Running Cppcheck on a C++ Builder 6 project:
 
     cppcheck --project=foobar.bpr
 
-
-To ignore certain folders in the project you can use `-i`. This will skip analysis of source files in the `foo` folder.
+To ignore certain folders in the project, you can use `-i`. This will skip analysis of source files in the `foo` folder.
 
     cppcheck --project=foobar.bpr -ifoo
 
@@ -347,18 +362,18 @@ If you generate a compilation database, then it is possible to import that in Cp
 
 ### Makefile
 
-In Linux you can convert a Makefile to a compile_commands.json using for instance `bear` (build ear) utility:
+In Linux you can convert a Makefile to a `compile_commands.json` using for instance `bear` (build ear) utility:
 
     bear -- make
 
-If you don't use Linux; there are python scripts that converts a Makefile into a compilation database.
+If you don't use Linux, there are Python scripts that converts a Makefile into a compilation database.
 
-# Preprocessor Settings
+# Preprocessor settings
 
-If you use `--project` then Cppcheck will automatically use the preprocessor settings in the imported project file and
+If you use `--project`, then Cppcheck will automatically use the preprocessor settings in the imported project file and
 likely you don't have to configure anything extra.
 
-If you don't use `--project` then a bit of manual preprocessor configuration might be required. However Cppcheck has
+If you don't use `--project`, then a bit of manual preprocessor configuration might be required. However Cppcheck has
 automatic configuration of defines.
 
 ## Automatic configuration of preprocessor defines
@@ -366,7 +381,7 @@ automatic configuration of defines.
 Cppcheck automatically test different combinations of preprocessor defines to achieve as high coverage in the analysis
 as possible.
 
-Here is a file that has 3 bugs (when x,y,z are assigned).
+Here is a file that has 3 bugs (when `x`, `y`, `z` are assigned).
 
     #ifdef A
         x=100/0;
@@ -422,17 +437,17 @@ Example:
 
 ## Include paths
 
-To add an include path, use `-I`, followed by the path.
+To add an include path, use `-I` followed by the path.
 
-Cppcheck's preprocessor basically handles includes like any other preprocessor. However, while other preprocessors 
-stop working when they encounter a missing header, Cppcheck will just print an information message and continues 
+Cppcheck's preprocessor basically handles includes like any other preprocessor. However, while other preprocessors
+stop working when they encounter a missing header, Cppcheck will just print an information message and continues
 parsing the code.
 
-The purpose of this behaviour is that Cppcheck is meant to work without necessarily seeing the entire code. 
-Actually, it is recommended to not give all include paths. 
-While it is useful for Cppcheck to see the declaration of a class when checking the implementation of its members, 
-passing standard library headers is discouraged, because the analysis will not work fully and lead to a longer checking 
-time. For such cases, .cfg files are the preferred way to provide information about the implementation of functions and 
+The purpose of this behaviour is that Cppcheck is meant to work without necessarily seeing the entire code.
+Actually, it is recommended to not give all include paths.
+While it is useful for Cppcheck to see the declaration of a class when checking the implementation of its members,
+passing standard library headers is discouraged, because the analysis will not work fully and lead to a longer checking
+time. For such cases, `.cfg` files are the preferred way to provide information about the implementation of functions and
 types to Cppcheck, see below for more information.
 
 # Platform
@@ -463,7 +478,7 @@ You can also create your own custom platform configuration in a XML file. Here i
       </sizeof>
     </platform>
 
-# C/C++ Standard
+# C/C++ standard
 
 Use `--std` on the command line to specify a C/C++ standard.
 
@@ -492,7 +507,7 @@ the GUI, the build dir is configured in the project options.
 Rechecking code will be much faster. Cppcheck does not analyse unchanged code. The old warnings are
 loaded from the build dir and reported again.
 
-Whole program analysis does not work when multiple threads are used; unless you use a cppcheck
+Whole program analysis does not work when multiple threads are used unless you use a Cppcheck
 build dir. For instance, the unusedFunction warnings require whole program analysis.
 
 # Suppressions
@@ -510,12 +525,13 @@ The format for an error suppression is one of:
     [error id]:[filename2]
     [error id]
 
-The `error id` is the id that you want to suppress. The id of a warning is shown in brackets in the normal cppcheck text output.
+The `error id` is the id that you want to suppress. The id of a warning is shown in brackets in the normal Cppcheck text output.
+
+The `error id` and `filename` patterns may contain `**`, `*` or `?`.
 
-The `error id` and `filename` patterns may contain `**`, `*` or `?`.  
-`**`: matches zero or more characters, including path separators  
-`*`: matches zero or more characters, excluding path separators  
-`?`: matches any single character except path separators
+- `**` matches zero or more characters, including path separators.
+- `*` matches zero or more characters, excluding path separators.
+- `?` matches any single character except path separators.
 
 It is recommended to use forward-slash `/` in the filename pattern as path separator on all operating systems.
 
@@ -557,9 +573,10 @@ You can specify suppressions in a XML file, for example as follows:
     </suppressions>
 
 The `id` and `fileName` patterns may contain `**`, `*` or `?`.
-`**`: matches zero or more characters, including path separators
-`*`: matches zero or more characters, excluding path separators
-`?`: matches any single character except path separators
+
+- `**` matches zero or more characters, including path separators.
+- `*` matches zero or more characters, excluding path separators.
+- `?` matches any single character except path separators.
 
 The XML format is extensible and may be extended with further attributes in the future.
 
@@ -567,9 +584,37 @@ The usage of the suppressions file is as follows:
 
     cppcheck --suppress-xml=suppressions.xml src/
 
+### The `<hash>` element
+
+Cppcheck calculates a unique ID for each error, called the hash. The hash depends on the code that
+is related to the error, not on where that code is located. This means that the hash for an error
+stays the same even when unrelated code elsewhere in the file is added, removed or moved, shifting
+the line numbers around. The hash only changes if the related code itself is modified.
+
+This makes hash-based suppressions more robust than line-based suppressions: once you have
+reviewed and suppressed a specific warning, the suppression keeps working even after the file is
+edited, as long as the offending code is not changed.
+
+The hash for an error is included as the `hash` attribute in the [XML output](#the-error-element).
+You can copy that value into a `<hash>` element in a suppressions XML file:
+
+    <?xml version="1.0"?>
+    <suppressions>
+      <suppress>
+        <id>uninitvar</id>
+        <fileName>src/file1.c</fileName>
+        <hash>12345678</hash>
+      </suppress>
+    </suppressions>
+
+A suppression can use `<hash>` on its own, without `<id>`, to suppress a specific error regardless
+of its id. It is also possible to combine `<hash>` with `<id>`, `<fileName>`, `<lineNumber>` and
+`<symbolName>`; when several of these are specified, all of them must match for the suppression to
+apply.
+
 ## Inline suppressions
 
-Suppressions can also be added directly in the code by adding comments that contain special keywords. 
+Suppressions can also be added directly in the code by adding comments that contain special keywords.
 Note that adding comments sacrifices the readability of the code somewhat.
 
 This code will normally generate an error message:
@@ -594,7 +639,7 @@ You can suppress a warning `aaaa` with:
 
     // cppcheck-suppress aaaa
 
-Suppressing multiple ids in one comment by using []:
+Suppressing multiple ids in one comment by using `[]`:
 
     // cppcheck-suppress [aaaa, bbbb]
 
@@ -625,7 +670,6 @@ Suppressing warnings `aaaa` where macro is used:
     ...
     x = MACRO; // <- aaaa warnings are suppressed here
 
-
 Suppressing multiple ids where macro is used:
 
     // cppcheck-suppress-macro [aaaa, bbbb]
@@ -654,7 +698,21 @@ Or at the same line as the code:
         arr[10] = 0;  // cppcheck-suppress arrayIndexOutOfBounds
     }
 
-In this example there are 2 lines with code and 1 suppression comment. The suppression comment only applies to 1 line: `a = b + c;`.
+The suppression comment and the line of code may be separated by additional comments or empty lines:
+
+    void f() {
+        char arr[5];
+
+        // cppcheck-suppress arrayIndexOutOfBounds
+
+        arr[10] = 0;
+
+        // cppcheck-suppress arrayIndexOutOfBounds
+        // Set the tenth element of arr to zero
+        arr[10] = 0;
+    }
+
+In the example below there are 2 lines with code and 1 suppression comment. The suppression comment only applies to 1 line: `a = b + c;`.
 
     void f() {
         a = b + c; // cppcheck-suppress abc
@@ -701,7 +759,6 @@ Suppression comment on the same line as the code:
         arr[10] = arr[10] / 0;  // cppcheck-suppress[arrayIndexOutOfBounds,zerodiv]
     }
 
-
 ### Symbol name
 
 You can specify that the inline suppression only applies to a specific symbol:
@@ -720,6 +777,120 @@ You can write comments about a suppression as follows:
     // cppcheck-suppress warningid ; some comment
     // cppcheck-suppress warningid // some comment
 
+# Generating and using a baseline
+
+When you first run Cppcheck on an existing codebase it's common to get a
+large number of warnings. A "baseline" lets you suppress all of today's
+warnings and see only *new* warnings introduced from now on.
+
+This works by asking Cppcheck to include a content-based `hash` for every warning
+(computed from the surrounding code, not the line number), then converting today's
+warnings into an XML suppressions file keyed on `id` + `fileName` + `hash`. Because
+the hash is based on content rather than line number, warnings stay suppressed even
+after unrelated lines above them are added or removed. A warning only reappears if
+the code it actually points at changes, or a new warning shows up elsewhere.
+
+## 1. Generate the baseline
+
+Run Cppcheck with `--xml` and capture stderr (where Cppcheck writes its XML) to a
+file:
+
+```sh
+cppcheck --enable=style --xml src 2> baseline-results.xml
+```
+
+Use whatever combination of `--enable`/defines/include paths you normally
+analyze the project with — the suppressions you get out only cover the
+checks you ran.
+
+## 2. Convert the results into a suppressions file
+
+A [script](https://github.com/cppcheck-opensource/cppcheck/blob/main/tools/generate-baseline-suppressions.py) can be used to generate the baseline:
+```sh
+python3 generate-baseline-suppressions.py baseline-results.xml suppressions.xml
+```
+
+This produces a `suppressions.xml` like:
+
+```xml
+<?xml version="1.0"?>
+<suppressions>
+  <suppress>
+    <id>uninitvar</id>
+    <fileName>src/file1.c</fileName>
+    <hash>12345678</hash>
+  </suppress>
+</suppressions>
+```
+
+`suppressions.xml` needs to be shared by everyone who runs Cppcheck on this
+codebase, including CI.
+
+Having a script instead of using some special cppcheck flags has the advantages:
+ * it's flexible. You can tweak it if needed.
+ * there is fewer flags for us to maintain and document, and for you to learn.
+
+## 3. Use the baseline on future runs
+
+```sh
+cppcheck --enable=style --xml --suppress-xml=suppressions.xml src
+```
+
+Only warnings that aren't in the baseline are reported: new warnings in changed
+code, and warnings for checks/files that weren't covered when the baseline was
+generated.
+
+## 4. Refreshing the baseline
+
+Re-run steps 1-2 whenever you want to accept the current state as the new
+baseline (e.g. after cleaning up a batch of warnings, or deliberately accepting a
+new one). Regenerating overwrites `suppressions.xml` with an entry for every
+warning present at that time.
+
+## The baseline doesn't need to be kept in sync
+
+Once code that a baselined warning pointed at is fixed, refactored away, or
+deleted, its `suppress` entry in `suppressions.xml` becomes dead: nothing will
+ever match it again. You don't need to go find and remove it.
+
+Cppcheck's `unmatchedSuppression` check (part of `--enable=all`) normally warns
+about suppressions that never matched anything, on the theory that a
+suppression nobody needs is probably a mistake. But it does *not* fire for
+`suppress` entries that carry a `<hash>` — which is every entry the baseline
+script generates. So a baseline file with plenty of dead entries produces no
+noise, and developers never need to prune it by hand — it only needs to be
+regenerated (step 4) when you deliberately want to reset what's accepted.
+
+## Caveats
+
+- A warning can only be suppressed this way if it carries a `hash` attribute in
+  the XML output. Almost all checks compute one. Critical errors, i.e. syntax
+  errors do not get hash and must be fixed. Certain information messages do not
+  get hash neither.
+- Changed Cppcheck options might produce new warnings that are not suppressed
+  by the baseline.
+- Cppcheck upgrades don't affect the hash directly (it isn't version-tagged),
+  but if a new release for instance changes a check's message wording, the hash
+  changes with it — so upgrading Cppcheck can resurrect baselined warnings for
+  checks whose messages were reworded, even though nothing in the analyzed code
+  changed.
+
+## Strategies for gradually shrinking the baseline
+
+A baseline makes it possible to adopt Cppcheck in CI immediately without
+fixing everything first, but nothing about it enforces that the accepted set
+of warnings actually shrinks over time.
+
+Generic advice:
+
+- **Prioritize by severity** Checks like `uninitvar` or
+  `nullPointer` are more valuable to clear than `style` warnings; a baseline
+  makes it possible to drive the highest-severity checks to zero first while
+  deliberately leaving lower-risk ones suppressed longer.
+- **Be careful** Every fix is a code change, and every code change carries some
+  risk of introducing a new bug. It can make sense to leave some things suppressed
+  to minimize the risk that bugs are introduced in working code.
+
 # XML output
 
 Cppcheck can generate output in XML format. Use `--xml` to enable this format.
@@ -801,7 +972,7 @@ If you want to reformat the output so that it looks different, then you can use
 
 ## Predefined output formats
 
-To get Visual Studio compatible output you can use --template=vs:
+To get Visual Studio compatible output, you can use `--template=vs`:
 
     cppcheck --template=vs samples/arrayIndexOutOfBounds/bad.c
 
@@ -811,7 +982,7 @@ This output will look like this:
     samples/arrayIndexOutOfBounds/bad.c(6): error: Array
     'a[2]' accessed at index 2, which is out of bounds.
 
-To get gcc compatible output you can use --template=gcc:
+To get GCC-compatible output, you can use `--template=gcc`:
 
     cppcheck --template=gcc samples/arrayIndexOutOfBounds/bad.c
 
@@ -849,7 +1020,7 @@ The output will look like this:
     samples/arrayIndexOutOfBounds/bad.c,6,error,arrayIndexOutOfBounds,
     Array 'a[2]' accessed at index 2, which is out of bounds.
 
-## User defined output format (multi line)
+## User defined output format (multi-line)
 
 Many warnings have multiple locations. Example code:
 
@@ -865,9 +1036,9 @@ Many warnings have multiple locations. Example code:
         return 0;
     }
 
-There is a possible null pointer dereference at line 3. 
-Cppcheck can show how it came to that conclusion by showing extra location information. 
-You need to use both --template and --template-location at the command line, for example:
+There is a possible null pointer dereference at line 3.
+Cppcheck can show how it came to that conclusion by showing extra location information.
+You need to use both `--template` and `--template-location` at the command line, for example:
 
     cppcheck \
     --template="{file}:{line}: {severity}: {message}\n{code}" \
@@ -889,13 +1060,13 @@ The output from Cppcheck is:
         *p = 3;
          ^
 
-The first line in the warning is formatted by the --template format.
+The first line in the warning is formatted by the `--template` format.
 
-The other lines in the warning are formatted by the --template-location format.
+The other lines in the warning are formatted by the `--template-location` format.
 
-### Format specifiers for --template
+### Format specifiers for `--template`
 
-The available specifiers for --template are:
+The available specifiers for `--template` are:
 
 **{file}**
 
@@ -911,11 +1082,11 @@ Column number
 
 **{callstack}**
 
-Write all locations. Each location is written in [{file}:{line}] format and the locations are separated by ->. For instance it might look like: [multiline.c:8] -> [multiline.c:9] -> [multiline.c:3]
+Write all locations. Each location is written in `[{file}:{line}]` format and the locations are separated by `->`. For instance it might look like: `[multiline.c:8] -> [multiline.c:9] -> [multiline.c:3]`
 
 **{inconclusive:text}**
 
-If warning is inconclusive, then the given text is written. The given text can be any text that does not contain }. Example: {inconclusive:inconclusive,}
+If warning is inconclusive, then the given text is written. The given text can be any text that does not contain `}`. Example: `{inconclusive:inconclusive,}`
 
 **{severity}**
 
@@ -949,7 +1120,7 @@ Newline
 
 Carriage return
 
-### Format specifiers for --template-location
+### Format specifiers for `--template-location`
 
 The available specifiers for `--template-location` are:
 
@@ -1001,7 +1172,7 @@ Example code:
         int x = 0;
     }
 
-In Cppcheck text output the remarks are not shown by default, you can use `--template` option `{remark}` to show remarks:
+In Cppcheck text output, the remarks are not shown by default, you can use `--template` option `{remark}` to show remarks:
 
     $ ./cppcheck --enable=style \
     --template="{file}:{line}: {message} [{id}]\\n{remark}" test1.c
@@ -1010,12 +1181,12 @@ In Cppcheck text output the remarks are not shown by default, you can use `--tem
     test1.c:4: Variable 'x' is assigned a value that is never used. [unreadVariable]
     Initialize x with 0
 
-In xml output the comment text is provided in a "remark" attribute:
+In XML output, the comment text is provided in a `remark` attribute:
 
     $ ./cppcheck --enable=style --xml test1.c
-    ....
+    ...
     remark="Initialize x with 0"
-    ....
+    ...
 
 # Addons
 
@@ -1025,11 +1196,11 @@ Cppcheck is distributed with a few addons which are listed below.
 
 ## Supported addons
 
-### misra.py
+### `misra.py`
 
-[misra.py](https://github.com/danmar/cppcheck/blob/main/addons/misra.py) is used to verify compliance with MISRA C 2012, a proprietary set of guidelines to avoid questionable code, developed for embedded systems.
+[`misra.py`](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/misra.py) is used to verify compliance with MISRA C 2012, a proprietary set of guidelines to avoid questionable code, developed for embedded systems.
 
-The misra.py script does not provide rule texts, those should be downloaded from [MISRA](https://gitlab.com/MISRA/MISRA-C/MISRA-C-2012/tools)
+The `misra.py` script does not provide rule texts, those should be downloaded from [MISRA](https://gitlab.com/MISRA/MISRA-C/MISRA-C-2012/tools).
 
 To load the rule texts, create a configuration file. Example `misra.json`:
 
@@ -1047,52 +1218,51 @@ To use that `misra.json` in Cppcheck analysis, use option `--addon=misra.json`:
 
 Misra checkers in open source Cppcheck only cover MISRA rules partially and for full coverage use Cppcheck Premium.
 
-### namingng.py
+### `namingng.py`
 
-[namingng.py](https://github.com/danmar/cppcheck/blob/main/addons/namingng.py) allows you to configure and check naming conventions.
+[`namingng.py`](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/namingng.py) allows you to configure and check naming conventions.
 
 You need to have a configuration file that defines your naming conventions. By default the filename `namingng.config.json` is used but there is an option so you can use any filename you want.
 
 Example configuration of naming conventions:
-```
-{
-   "RE_VARNAME": ["[a-z]*[a-zA-Z0-9_]*\\Z"],
-   "RE_PRIVATE_MEMBER_VARIABLE": null,
-   "RE_FUNCTIONNAME": ["[a-z0-9A-Z]*\\Z"],
-   "_comment": "comments can be added to the config with underscore-prefixed keys",
-   "include_guard": {
-       "input": "path",
-       "prefix": "GUARD_",
-       "case": "upper",
-       "max_linenr": 5,
-       "RE_HEADERFILE": "[^/].*\\.h\\Z",
-       "required": true
-   },
-   "var_prefixes": {"uint32_t": "ui32"},
-   "function_prefixes": {"uint16_t": "ui16",
-                         "uint32_t": "ui32"}
-}
-```
 
-### threadsafety.py
+    {
+        "RE_VARNAME": ["[a-z]*[a-zA-Z0-9_]*\\Z"],
+        "RE_PRIVATE_MEMBER_VARIABLE": null,
+        "RE_FUNCTIONNAME": ["[a-z0-9A-Z]*\\Z"],
+        "_comment": "comments can be added to the config with underscore-prefixed keys",
+        "include_guard": {
+            "input": "path",
+            "prefix": "GUARD_",
+            "case": "upper",
+            "max_linenr": 5,
+            "RE_HEADERFILE": "[^/].*\\.h\\Z",
+            "required": true
+        },
+        "var_prefixes": {"uint32_t": "ui32"},
+        "function_prefixes": {"uint16_t": "ui16",
+                              "uint32_t": "ui32"}
+    }
+
+### `threadsafety.py`
 
-[threadsafety.py](https://github.com/danmar/cppcheck/blob/main/addons/threadsafety.py) analyses Cppcheck dump files to locate thread safety issues like static local objects used by multiple threads.
+[`threadsafety.py`](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/threadsafety.py) analyses Cppcheck dump files to locate thread safety issues like static local objects used by multiple threads.
 
-### y2038.py
+### `y2038.py`
 
-[y2038.py](https://github.com/danmar/cppcheck/blob/main/addons/y2038.py) checks source code for [year 2038 problem](https://en.wikipedia.org/wiki/Year_2038_problem) safety.
+[`y2038.py`](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/y2038.py) checks source code for [year 2038 problem](https://en.wikipedia.org/wiki/Year_2038_problem) safety.
 
-## Running Addons
+## Running addons
 
 Addons can be executed with the `--addon` option:
 
     cppcheck --addon=namingng.py somefile.c
 
-Likewise, if you have created your own script you can execute that:
+Likewise, if you have created your own script, you can execute that:
 
     cppcheck --addon=mychecks.py somefile.c
 
-You can configure how you want to execute an addon in a json file. For example:
+You can configure how you want to execute an addon in a JSON file. For example:
 
     {
         "script": "mychecks.py",
@@ -1102,7 +1272,7 @@ You can configure how you want to execute an addon in a json file. For example:
         "ctu": false
     }
 
-To use that json file to execute your addon use the --addon option:
+To use that JSON file to execute your addon, use the `--addon` option:
 
     cppcheck --addon=mychecks.json somefile.c
 
@@ -1112,75 +1282,75 @@ Cppcheck search for addons in the local folder first and then in the installatio
 
 # Library configuration
 
-When external libraries are used, such as WinAPI, POSIX, gtk, Qt, etc, Cppcheck has no information about functions, types, or macros contained in those libraries. Cppcheck then fails to detect various problems in the code, or might even abort the analysis. But this can be fixed by using the appropriate configuration files.
-
-Cppcheck already contains configurations for several libraries. They can be loaded as described below. Note that the configuration for the standard libraries of C and C++, std.cfg, is always loaded by cppcheck. If you create or update a configuration file for a popular library, we would appreciate if you supplied it to the cppcheck project.
-
-## Using a .cfg file
-
-To use a .cfg file shipped with cppcheck, pass the `--library=<lib>` option. The table below shows the currently existing libraries:
-
-| .cfg file         | Library       | Comment       |
-| ----------------- | ------------- | ------------- |
-| avr.cfg           |               |               |
-| bento4.cfg        | [Bento4](http://www.bento4.com/) | |
-| boost.cfg         | [Boost](http://www.boost.org/) | |
-| bsd.cfg           | [BSD](https://www.freebsd.org/) | |
-| cairo.cfg         | [cairo](https://www.cairographics.org/) | |
-| cppcheck-lib.cfg  | [Cppcheck](http://cppcheck.net/) | Used in selfcheck of |
-|                   |               |the Cppcheck code base |
-| cppunit.cfg       | [CppUnit](https://sourceforge.net/projects/cppunit/) | |
-| dpdk.cfg          |               |               |
-| embedded_sql.cfg  |               |               |
-| emscripten.cfg | | |
-| ginac.cfg | | |
-| gnu.cfg | [GNU](https://www.gnu.org/) | |
-| googletest.cfg | [GoogleTest](https://github.com/google/googletest) | |
-| gtk.cfg | [GTK](https://www.gtk.org/) | |
-| icu.cfg | | |
-| kde.cfg | [KDE](https://kde.org/) | |
-| libcerror.cfg | [libcerror](https://github.com/libyal/libcerror) | |
-| libcurl.cfg | [libcurl](https://curl.se/libcurl/) | |
-| libsigc++.cfg | [libsigc++](https://github.com/libsigcplusplus/libsigcplusplus) | |
-| lua.cfg | | |
-| mfc.cfg | [MFC](https://learn.microsoft.com/en-us/cpp/mfc/mfc-desktop-applications) | |
-| microsoft_atl.cfg | [ATL](https://learn.microsoft.com/en-us/cpp/atl/active-template-library-atl-concepts) | |
-| microsoft_sal.cfg | [SAL annotations](https://learn.microsoft.com/en-us/cpp/c-runtime-library/sal-annotations) | |
-| microsoft_unittest.cfg | [CppUnitTest](https://learn.microsoft.com/en-us/visualstudio/test/microsoft-visualstudio-testtools-cppunittestframework-api-reference) | |
-| motif.cfg | | |
-| nspr.cfg | | |
-| ntl.cfg | | |
-| opencv2.cfg | [OpenCV](https://opencv.org/) | |
-| opengl.cfg | [OpenGL](https://opengl.org/) | |
-| openmp.cfg | [OpenMP](https://www.openmp.org/) | |
-| openssl.cfg | [OpenSSL](https://www.openssl.org/) | |
-| pcre.cfg | [PCRE](https://pcre.org/) | |
-| posix.cfg | [POSIX](https://pubs.opengroup.org/onlinepubs/9699919799/) | |
-| python.cfg | | |
-| qt.cfg | [Qt](https://doc.qt.io/qt.html) | |
-| ruby.cfg | | |
-| sdl.cfg | | |
-| sfml.cfg | | |
-| sqlite3.cfg | [SQLite](https://www.sqlite.org/) | |
-| std.cfg | C/C++ standard library | Loaded by default |
-| tinyxml2.cfg | [TinyXML-2](https://github.com/leethomason/tinyxml2) | |
-| vcl.cfg | | |
-| windows.cfg | [Win32 API](https://learn.microsoft.com/en-us/windows/win32/) | |
-| wxsqlite3.cfg | | |
-| wxsvg.cfg | | |
-| wxwidgets.cfg | [wxWidgets](https://www.wxwidgets.org/) | |
-| zephyr.cfg | | |
-| zlib.cfg | [zlib](https://www.zlib.net) | |
-
-## Creating a custom .cfg file
-
-You can create and use your own .cfg files for your projects. Use `--check-library` to get hints about what you should configure.
+When external libraries are used, such as WinAPI, POSIX, gtk, Qt, etc., Cppcheck has no information about functions, types, or macros contained in those libraries. Cppcheck then fails to detect various problems in the code, or might even abort the analysis. But this can be fixed by using the appropriate configuration files.
+
+Cppcheck already contains configurations for several libraries. They can be loaded as described below. Note that the configuration for the standard libraries of C and C++, `std.cfg`, is always loaded by Cppcheck. If you create or update a configuration file for a popular library, we would appreciate if you supplied it to the Cppcheck project.
+
+## Using a `.cfg` file
+
+To use a `.cfg` file shipped with Cppcheck, pass the `--library=<lib>` option. The table below shows the currently existing libraries:
+
+| `.cfg` file | Library | Comment |
+| --- | --- | --- |
+| `avr.cfg` | | |
+| `bento4.cfg` | [Bento4](http://www.bento4.com/) | |
+| `boost.cfg` | [Boost](http://www.boost.org/) | |
+| `bsd.cfg` | [BSD](https://www.freebsd.org/) | |
+| `cairo.cfg` | [cairo](https://www.cairographics.org/) | |
+| `cppcheck-lib.cfg` | [Cppcheck](http://cppcheck.net/) | Used in selfcheck of the Cppcheck code base |
+| `cppunit.cfg` | [CppUnit](https://sourceforge.net/projects/cppunit/) | |
+| `dpdk.cfg` | | |
+| `embedded_sql.cfg` | | |
+| `emscripten.cfg` | | |
+| `ginac.cfg` | | |
+| `gnu.cfg` | [GNU](https://www.gnu.org/) | |
+| `googletest.cfg` | [GoogleTest](https://github.com/google/googletest) | |
+| `gtk.cfg` | [GTK](https://www.gtk.org/) | |
+| `icu.cfg` | | |
+| `kde.cfg` | [KDE](https://kde.org/) | |
+| `libcerror.cfg` | [libcerror](https://github.com/libyal/libcerror) | |
+| `libcurl.cfg` | [libcurl](https://curl.se/libcurl/) | |
+| `libsigc++.cfg` | [libsigc++](https://github.com/libsigcplusplus/libsigcplusplus) | |
+| `lua.cfg` | | |
+| `mfc.cfg` | [MFC](https://learn.microsoft.com/en-us/cpp/mfc/mfc-desktop-applications) | |
+| `microsoft_atl.cfg` | [ATL](https://learn.microsoft.com/en-us/cpp/atl/active-template-library-atl-concepts) | |
+| `microsoft_gsl.cfg` | [Microsoft.GSL](https://github.com/microsoft/gsl) | |
+| `microsoft_sal.cfg` | [SAL annotations](https://learn.microsoft.com/en-us/cpp/c-runtime-library/sal-annotations) | |
+| `microsoft_unittest.cfg` | [CppUnitTest](https://learn.microsoft.com/en-us/visualstudio/test/microsoft-visualstudio-testtools-cppunittestframework-api-reference) | |
+| `motif.cfg` | | |
+| `nspr.cfg` | | |
+| `ntl.cfg` | | |
+| `opencv2.cfg` | [OpenCV](https://opencv.org/) | |
+| `opengl.cfg` | [OpenGL](https://opengl.org/) | |
+| `openmp.cfg` | [OpenMP](https://www.openmp.org/) | |
+| `openssl.cfg` | [OpenSSL](https://www.openssl.org/) | |
+| `pcre.cfg` | [PCRE](https://pcre.org/) | |
+| `posix.cfg` | [POSIX](https://pubs.opengroup.org/onlinepubs/9699919799/) | |
+| `python.cfg` | | |
+| `qt.cfg` | [Qt](https://doc.qt.io/qt.html) | |
+| `ruby.cfg` | | |
+| `sdl.cfg` | | |
+| `sfml.cfg` | | |
+| `sqlite3.cfg` | [SQLite](https://www.sqlite.org/) | |
+| `std.cfg` | C/C++ standard library | Loaded by default |
+| `tinyxml2.cfg` | [TinyXML-2](https://github.com/leethomason/tinyxml2) | |
+| `vcl.cfg` | | |
+| `windows.cfg` | [Win32 API](https://learn.microsoft.com/en-us/windows/win32/) | |
+| `wxsqlite3.cfg` | | |
+| `wxsvg.cfg` | | |
+| `wxwidgets.cfg` | [wxWidgets](https://www.wxwidgets.org/) | |
+| `zephyr.cfg` | | |
+| `zlib.cfg` | [zlib](https://www.zlib.net) | |
+
+## Creating a custom `.cfg` file
+
+You can create and use your own `.cfg` files for your projects. Use `--check-library` to get hints about what you should configure.
 
 You can use the `Library Editor` in the `Cppcheck GUI` to edit configuration files. It is available in the `View` menu.
 
-The .cfg file format is documented in the `Reference: Cppcheck .cfg format` (https://cppcheck.sourceforge.io/reference-cfg-format.pdf) document.
+The `.cfg` file format is documented in the `Reference: Cppcheck .cfg format` (<https://cppcheck.sourceforge.io/reference-cfg-format.pdf>) document.
 
-# HTML Report
+# HTML report
 
 You can convert the XML output from Cppcheck into a HTML report. You'll need Python and the pygments module (<http://pygments.org/>) for this to work. In the Cppcheck source tree there is a folder htmlreport that contains a script that transforms a Cppcheck XML file into HTML output.
 
@@ -1210,15 +1380,17 @@ Example usage:
     cppcheck-htmlreport --file=err.xml --report-dir=test1 --source-dir=.
 
 or
+
     cppcheck gui/test.cpp --xml 2> err.xml
     cppcheck-htmlreport --file=err.xml --report-dir=test1 \
          --source-dir=https://github.com/<username>/<repo>/blob/<branch>/
 
-## Choosing Between Local Annotated HTML and Remote Repository Links
+## Choosing between local annotated HTML and remote repository links
+
+`cppcheck-htmlreport` supports two modes for linking to source files:
 
-cppcheck-htmlreport supports two modes for linking to source files:
- - Local annotated HTML files (default when `--source-dir` is a filesystem path)
- - Remote GitHub/GitLab links (when `--source-dir` is a URL)
+- Local annotated HTML files (default when `--source-dir` is a filesystem path)
+- Remote GitHub/GitLab links (when `--source-dir` is a URL)
 
 Pointing `--source-dir` to a filesystem path generates local annotated HTML files.
 This is useful when you need a fully self-contained report that works offline,
@@ -1233,13 +1405,13 @@ handled by the hosting service.
 In general, local mode fits air-gapped environments, while remote mode works
 best for CI workflows and large or private repositories.
 
-# Check Level
+# Check level
 
 ## Reduced
 
 The "reduced" check level performs a limited data flow analysis. If developers
-want to run cppcheck directly during development and require faster results
-than "normal" provides then this reduced checking can be an option.
+want to run Cppcheck directly during development and require faster results
+than "normal" provides, then this reduced checking can be an option.
 
 ## Normal
 
@@ -1249,7 +1421,7 @@ The "normal" check level should be useful during active development:
 
 - checking files while you edit them.
 - block changes to the repo
-- etc
+- etc.
 
 ## Exhaustive
 
@@ -1258,7 +1430,7 @@ When you can wait longer for the results you can enable the "exhaustive" checkin
 Exhaustive checking level should be useful for scenarios where you can wait for results. For instance:
 
 - nightly builds
-- etc
+- etc.
 
 # Speeding up analysis
 
@@ -1266,18 +1438,17 @@ Exhaustive checking level should be useful for scenarios where you can wait for
 
 For performance reasons it might be a good idea to limit preprocessor configurations to check.
 
-## Limit ValueFlow: max if count
+## Limit ValueFlow: max `if` count
 
-The command line option `--performance-valueflow-max-if-count` adjusts the max count for number of if in a function.
+The command line option `--performance-valueflow-max-if-count` adjusts the max count for number of `if` in a function.
 
-When that limit is exceeded there is a limitation of data flow in that function. It is not drastic:
+When that limit is exceeded, there is a limitation of data flow in that function. It is not drastic:
 
 - Analysis of other functions are not affected.
 - It's only for some specific data flow analysis, we have data flow analysis that is always executed.
 - All checks are always executed. There can still be plenty of warnings in the limited function.
 
-There is data flow analysis that slows down exponentially when number of if increase. And the limit is intended to avoid that
-analysis time explodes.
+There is data flow analysis that slows down exponentially when number of `if` increase. And the limit is intended to avoid that analysis time explodes.
 
 ## GUI options
 
@@ -1288,4 +1459,4 @@ In the GUI:
 - Open the project dialog.
 - In the "Analysis" tab there are several options.
 
-If you want to use these limitations on the command line also you can import the GUI project file with --project.
+If you want to use these limitations on the command line too, you can import the GUI project file with `--project`.
diff --git a/man/reference-cfg-format.md b/man/reference-cfg-format.md
index 7a9e3b6dee7..596fd6cb856 100644
--- a/man/reference-cfg-format.md
+++ b/man/reference-cfg-format.md
@@ -1,6 +1,6 @@
 ---
 title: Cppcheck .cfg format
-subtitle: Version 2.19 dev
+subtitle: Version 2.23 dev
 author: Cppcheck team
 lang: en
 documentclass: report
diff --git a/man/writing-addons.md b/man/writing-addons.md
index da21ea513ad..6bc7b124e76 100644
--- a/man/writing-addons.md
+++ b/man/writing-addons.md
@@ -1,6 +1,6 @@
 ---
 title: Writing addons
-subtitle: Version 2.19 dev
+subtitle: Version 2.23 dev
 author: Cppcheck team
 lang: en
 documentclass: report
diff --git a/oss-fuzz/Makefile b/oss-fuzz/Makefile
index 02d2e7fbde2..081aa035cdc 100644
--- a/oss-fuzz/Makefile
+++ b/oss-fuzz/Makefile
@@ -45,7 +45,6 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/addoninfo.o \
               $(libcppdir)/analyzerinfo.o \
               $(libcppdir)/astutils.o \
-              $(libcppdir)/check.o \
               $(libcppdir)/check64bit.o \
               $(libcppdir)/checkassert.o \
               $(libcppdir)/checkautovariables.o \
@@ -58,6 +57,7 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/checkersreport.o \
               $(libcppdir)/checkexceptionsafety.o \
               $(libcppdir)/checkfunctions.o \
+              $(libcppdir)/checkimpl.o \
               $(libcppdir)/checkinternal.o \
               $(libcppdir)/checkio.o \
               $(libcppdir)/checkleakautovar.o \
@@ -65,6 +65,7 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/checknullpointer.o \
               $(libcppdir)/checkother.o \
               $(libcppdir)/checkpostfixoperator.o \
+              $(libcppdir)/checks.o \
               $(libcppdir)/checksizeof.o \
               $(libcppdir)/checkstl.o \
               $(libcppdir)/checkstring.o \
@@ -152,46 +153,43 @@ simplecpp.o: ../externals/simplecpp/simplecpp.cpp ../externals/simplecpp/simplec
 tinyxml2.o: ../externals/tinyxml2/tinyxml2.cpp ../externals/tinyxml2/tinyxml2.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -w -D_LARGEFILE_SOURCE -c -o $@ ../externals/tinyxml2/tinyxml2.cpp
 
-$(libcppdir)/valueflow.o: ../lib/valueflow.cpp ../lib/addoninfo.h ../lib/analyzer.h ../lib/astutils.h ../lib/calculate.h ../lib/check.h ../lib/checkers.h ../lib/checkuninitvar.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/findtoken.h ../lib/forwardanalyzer.h ../lib/infer.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/programmemory.h ../lib/reverseanalyzer.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/timer.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vf_analyzers.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
+$(libcppdir)/valueflow.o: ../lib/valueflow.cpp ../lib/analyzer.h ../lib/astutils.h ../lib/calculate.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkuninitvar.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/findtoken.h ../lib/forwardanalyzer.h ../lib/infer.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/programmemory.h ../lib/refthunk.h ../lib/reverseanalyzer.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/timer.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vf_analyzers.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/valueflow.cpp
 
-$(libcppdir)/tokenize.o: ../lib/tokenize.cpp ../externals/simplecpp/simplecpp.h ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/preprocessor.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/summaries.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/timer.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/tokenize.o: ../lib/tokenize.cpp ../externals/simplecpp/simplecpp.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/preprocessor.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/summaries.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/timer.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/tokenize.cpp
 
-$(libcppdir)/symboldatabase.o: ../lib/symboldatabase.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/keywords.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/symboldatabase.o: ../lib/symboldatabase.cpp ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/keywords.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/symboldatabase.cpp
 
 $(libcppdir)/addoninfo.o: ../lib/addoninfo.cpp ../externals/picojson/picojson.h ../lib/addoninfo.h ../lib/config.h ../lib/json.h ../lib/path.h ../lib/standards.h ../lib/utils.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/addoninfo.cpp
 
-$(libcppdir)/analyzerinfo.o: ../lib/analyzerinfo.cpp ../externals/tinyxml2/tinyxml2.h ../lib/analyzerinfo.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/filesettings.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/standards.h ../lib/utils.h ../lib/xml.h
+$(libcppdir)/analyzerinfo.o: ../lib/analyzerinfo.cpp ../externals/tinyxml2/tinyxml2.h ../lib/analyzerinfo.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/filesettings.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/refthunk.h ../lib/standards.h ../lib/utils.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/analyzerinfo.cpp
 
-$(libcppdir)/astutils.o: ../lib/astutils.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkclass.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/findtoken.h ../lib/infer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vfvalue.h
+$(libcppdir)/astutils.o: ../lib/astutils.cpp ../lib/astutils.h ../lib/check.h ../lib/checkclass.h ../lib/checkers.h ../lib/checkimpl.h ../lib/config.h ../lib/errortypes.h ../lib/findtoken.h ../lib/infer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/astutils.cpp
 
-$(libcppdir)/check.o: ../lib/check.cpp ../lib/addoninfo.h ../lib/check.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
-	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/check.cpp
-
-$(libcppdir)/check64bit.o: ../lib/check64bit.cpp ../lib/addoninfo.h ../lib/check.h ../lib/check64bit.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/check64bit.o: ../lib/check64bit.cpp ../lib/check.h ../lib/check64bit.h ../lib/checkers.h ../lib/checkimpl.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/check64bit.cpp
 
-$(libcppdir)/checkassert.o: ../lib/checkassert.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkassert.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkassert.o: ../lib/checkassert.cpp ../lib/astutils.h ../lib/check.h ../lib/checkassert.h ../lib/checkers.h ../lib/checkimpl.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkassert.cpp
 
-$(libcppdir)/checkautovariables.o: ../lib/checkautovariables.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkautovariables.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/checkautovariables.o: ../lib/checkautovariables.cpp ../lib/astutils.h ../lib/check.h ../lib/checkautovariables.h ../lib/checkers.h ../lib/checkimpl.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkautovariables.cpp
 
-$(libcppdir)/checkbool.o: ../lib/checkbool.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkbool.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkbool.o: ../lib/checkbool.cpp ../lib/astutils.h ../lib/check.h ../lib/checkbool.h ../lib/checkers.h ../lib/checkimpl.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkbool.cpp
 
-$(libcppdir)/checkbufferoverrun.o: ../lib/checkbufferoverrun.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkbufferoverrun.h ../lib/checkers.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/checkbufferoverrun.o: ../lib/checkbufferoverrun.cpp ../externals/tinyxml2/tinyxml2.h ../lib/astutils.h ../lib/check.h ../lib/checkbufferoverrun.h ../lib/checkers.h ../lib/checkimpl.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vf_common.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkbufferoverrun.cpp
 
-$(libcppdir)/checkclass.o: ../lib/checkclass.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkclass.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/checkclass.o: ../lib/checkclass.cpp ../externals/tinyxml2/tinyxml2.h ../lib/astutils.h ../lib/check.h ../lib/checkclass.h ../lib/checkers.h ../lib/checkimpl.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkclass.cpp
 
-$(libcppdir)/checkcondition.o: ../lib/checkcondition.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkcondition.h ../lib/checkers.h ../lib/checkother.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkcondition.o: ../lib/checkcondition.cpp ../lib/astutils.h ../lib/check.h ../lib/checkcondition.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkother.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkcondition.cpp
 
 $(libcppdir)/checkers.o: ../lib/checkers.cpp ../lib/checkers.h ../lib/config.h
@@ -200,73 +198,79 @@ $(libcppdir)/checkers.o: ../lib/checkers.cpp ../lib/checkers.h ../lib/config.h
 $(libcppdir)/checkersidmapping.o: ../lib/checkersidmapping.cpp ../lib/checkers.h ../lib/config.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkersidmapping.cpp
 
-$(libcppdir)/checkersreport.o: ../lib/checkersreport.cpp ../lib/addoninfo.h ../lib/checkers.h ../lib/checkersreport.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/standards.h ../lib/utils.h
+$(libcppdir)/checkersreport.o: ../lib/checkersreport.cpp ../lib/addoninfo.h ../lib/checkers.h ../lib/checkersreport.h ../lib/config.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/standards.h ../lib/utils.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkersreport.cpp
 
-$(libcppdir)/checkexceptionsafety.o: ../lib/checkexceptionsafety.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkexceptionsafety.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkexceptionsafety.o: ../lib/checkexceptionsafety.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkexceptionsafety.h ../lib/checkimpl.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkexceptionsafety.cpp
 
-$(libcppdir)/checkfunctions.o: ../lib/checkfunctions.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkfunctions.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/checkfunctions.o: ../lib/checkfunctions.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkfunctions.h ../lib/checkimpl.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkfunctions.cpp
 
-$(libcppdir)/checkinternal.o: ../lib/checkinternal.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkinternal.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkimpl.o: ../lib/checkimpl.cpp ../lib/checkers.h ../lib/checkimpl.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkimpl.cpp
+
+$(libcppdir)/checkinternal.o: ../lib/checkinternal.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkinternal.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkinternal.cpp
 
-$(libcppdir)/checkio.o: ../lib/checkio.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkio.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkio.o: ../lib/checkio.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkio.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkio.cpp
 
-$(libcppdir)/checkleakautovar.o: ../lib/checkleakautovar.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkleakautovar.h ../lib/checkmemoryleak.h ../lib/checknullpointer.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkleakautovar.o: ../lib/checkleakautovar.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkleakautovar.h ../lib/checkmemoryleak.h ../lib/checknullpointer.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkleakautovar.cpp
 
-$(libcppdir)/checkmemoryleak.o: ../lib/checkmemoryleak.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkmemoryleak.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkmemoryleak.o: ../lib/checkmemoryleak.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkmemoryleak.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkmemoryleak.cpp
 
-$(libcppdir)/checknullpointer.o: ../lib/checknullpointer.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checknullpointer.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/findtoken.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/checknullpointer.o: ../lib/checknullpointer.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checknullpointer.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/findtoken.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checknullpointer.cpp
 
-$(libcppdir)/checkother.o: ../lib/checkother.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkother.h ../lib/config.h ../lib/errortypes.h ../lib/fwdanalysis.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/checkother.o: ../lib/checkother.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkother.h ../lib/config.h ../lib/errortypes.h ../lib/fwdanalysis.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkother.cpp
 
-$(libcppdir)/checkpostfixoperator.o: ../lib/checkpostfixoperator.cpp ../lib/addoninfo.h ../lib/check.h ../lib/checkers.h ../lib/checkpostfixoperator.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkpostfixoperator.o: ../lib/checkpostfixoperator.cpp ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkpostfixoperator.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkpostfixoperator.cpp
 
-$(libcppdir)/checksizeof.o: ../lib/checksizeof.cpp ../lib/addoninfo.h ../lib/check.h ../lib/checkers.h ../lib/checksizeof.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checks.o: ../lib/checks.cpp ../lib/check.h ../lib/check64bit.h ../lib/checkassert.h ../lib/checkautovariables.h ../lib/checkbool.h ../lib/checkbufferoverrun.h ../lib/checkclass.h ../lib/checkcondition.h ../lib/checkexceptionsafety.h ../lib/checkfunctions.h ../lib/checkimpl.h ../lib/checkinternal.h ../lib/checkio.h ../lib/checkleakautovar.h ../lib/checkmemoryleak.h ../lib/checknullpointer.h ../lib/checkother.h ../lib/checkpostfixoperator.h ../lib/checks.h ../lib/checksizeof.h ../lib/checkstl.h ../lib/checkstring.h ../lib/checktype.h ../lib/checkuninitvar.h ../lib/checkunusedvar.h ../lib/checkvaarg.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/refthunk.h ../lib/standards.h ../lib/vfvalue.h
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checks.cpp
+
+$(libcppdir)/checksizeof.o: ../lib/checksizeof.cpp ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checksizeof.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checksizeof.cpp
 
-$(libcppdir)/checkstl.o: ../lib/checkstl.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checknullpointer.h ../lib/checkstl.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/pathanalysis.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/checkstl.o: ../lib/checkstl.cpp ../lib/astutils.h ../lib/calculate.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checknullpointer.h ../lib/checkstl.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/pathanalysis.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkstl.cpp
 
-$(libcppdir)/checkstring.o: ../lib/checkstring.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkstring.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkstring.o: ../lib/checkstring.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkstring.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkstring.cpp
 
-$(libcppdir)/checktype.o: ../lib/checktype.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checktype.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/checktype.o: ../lib/checktype.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checktype.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checktype.cpp
 
-$(libcppdir)/checkuninitvar.o: ../lib/checkuninitvar.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checknullpointer.h ../lib/checkuninitvar.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkuninitvar.o: ../lib/checkuninitvar.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checknullpointer.h ../lib/checkuninitvar.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkuninitvar.cpp
 
-$(libcppdir)/checkunusedfunctions.o: ../lib/checkunusedfunctions.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/checkunusedfunctions.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/checkunusedfunctions.o: ../lib/checkunusedfunctions.cpp ../externals/tinyxml2/tinyxml2.h ../lib/analyzerinfo.h ../lib/astutils.h ../lib/checkers.h ../lib/checkunusedfunctions.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkunusedfunctions.cpp
 
-$(libcppdir)/checkunusedvar.o: ../lib/checkunusedvar.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkunusedvar.h ../lib/config.h ../lib/errortypes.h ../lib/fwdanalysis.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/checkunusedvar.o: ../lib/checkunusedvar.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkunusedvar.h ../lib/config.h ../lib/errortypes.h ../lib/fwdanalysis.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkunusedvar.cpp
 
-$(libcppdir)/checkvaarg.o: ../lib/checkvaarg.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkvaarg.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkvaarg.o: ../lib/checkvaarg.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkvaarg.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkvaarg.cpp
 
-$(libcppdir)/clangimport.o: ../lib/clangimport.cpp ../lib/addoninfo.h ../lib/checkers.h ../lib/clangimport.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/clangimport.o: ../lib/clangimport.cpp ../lib/clangimport.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/refthunk.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/clangimport.cpp
 
 $(libcppdir)/color.o: ../lib/color.cpp ../lib/color.h ../lib/config.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/color.cpp
 
-$(libcppdir)/cppcheck.o: ../lib/cppcheck.cpp ../externals/picojson/picojson.h ../externals/simplecpp/simplecpp.h ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/analyzerinfo.h ../lib/check.h ../lib/checkers.h ../lib/checkunusedfunctions.h ../lib/clangimport.h ../lib/color.h ../lib/config.h ../lib/cppcheck.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/filesettings.h ../lib/json.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/preprocessor.h ../lib/regex.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/suppressions.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/timer.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/version.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/cppcheck.o: ../lib/cppcheck.cpp ../externals/picojson/picojson.h ../externals/simplecpp/simplecpp.h ../lib/addoninfo.h ../lib/analyzerinfo.h ../lib/check.h ../lib/checkers.h ../lib/checks.h ../lib/checkunusedfunctions.h ../lib/clangimport.h ../lib/color.h ../lib/config.h ../lib/cppcheck.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/filesettings.h ../lib/json.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/preprocessor.h ../lib/refthunk.h ../lib/regex.h ../lib/rule.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/suppressions.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/timer.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/version.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/cppcheck.cpp
 
-$(libcppdir)/ctu.o: ../lib/ctu.cpp ../externals/tinyxml2/tinyxml2.h ../lib/astutils.h ../lib/check.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/ctu.o: ../lib/ctu.cpp ../externals/tinyxml2/tinyxml2.h ../lib/astutils.h ../lib/check.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/refthunk.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/ctu.cpp
 
-$(libcppdir)/errorlogger.o: ../lib/errorlogger.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/check.h ../lib/checkers.h ../lib/color.h ../lib/config.h ../lib/cppcheck.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.h ../lib/suppressions.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/errorlogger.o: ../lib/errorlogger.cpp ../externals/tinyxml2/tinyxml2.h ../lib/check.h ../lib/checkers.h ../lib/color.h ../lib/config.h ../lib/cppcheck.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/suppressions.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/errorlogger.cpp
 
 $(libcppdir)/errortypes.o: ../lib/errortypes.cpp ../lib/config.h ../lib/errortypes.h ../lib/utils.h
@@ -275,13 +279,13 @@ $(libcppdir)/errortypes.o: ../lib/errortypes.cpp ../lib/config.h ../lib/errortyp
 $(libcppdir)/findtoken.o: ../lib/findtoken.cpp ../lib/astutils.h ../lib/config.h ../lib/errortypes.h ../lib/findtoken.h ../lib/library.h ../lib/mathlib.h ../lib/smallvector.h ../lib/standards.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/findtoken.cpp
 
-$(libcppdir)/forwardanalyzer.o: ../lib/forwardanalyzer.cpp ../lib/addoninfo.h ../lib/analyzer.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/forwardanalyzer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueptr.h ../lib/vfvalue.h
+$(libcppdir)/forwardanalyzer.o: ../lib/forwardanalyzer.cpp ../lib/analyzer.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/forwardanalyzer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueptr.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/forwardanalyzer.cpp
 
-$(libcppdir)/fwdanalysis.o: ../lib/fwdanalysis.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/fwdanalysis.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/fwdanalysis.o: ../lib/fwdanalysis.cpp ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/fwdanalysis.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/fwdanalysis.cpp
 
-$(libcppdir)/importproject.o: ../lib/importproject.cpp ../externals/picojson/picojson.h ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/filesettings.h ../lib/importproject.h ../lib/json.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/pathmatch.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.h ../lib/suppressions.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/importproject.o: ../lib/importproject.cpp ../externals/picojson/picojson.h ../externals/tinyxml2/tinyxml2.h ../lib/checkers.h ../lib/config.h ../lib/filesettings.h ../lib/importproject.h ../lib/json.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/pathmatch.h ../lib/platform.h ../lib/settings.h ../lib/standards.h ../lib/suppressions.h ../lib/utils.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/importproject.cpp
 
 $(libcppdir)/infer.o: ../lib/infer.cpp ../lib/calculate.h ../lib/config.h ../lib/errortypes.h ../lib/infer.h ../lib/mathlib.h ../lib/smallvector.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueptr.h ../lib/vfvalue.h
@@ -290,7 +294,7 @@ $(libcppdir)/infer.o: ../lib/infer.cpp ../lib/calculate.h ../lib/config.h ../lib
 $(libcppdir)/keywords.o: ../lib/keywords.cpp ../lib/config.h ../lib/keywords.h ../lib/standards.h ../lib/utils.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/keywords.cpp
 
-$(libcppdir)/library.o: ../lib/library.cpp ../externals/tinyxml2/tinyxml2.h ../lib/astutils.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/library.o: ../lib/library.cpp ../externals/tinyxml2/tinyxml2.h ../lib/astutils.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/refthunk.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/library.cpp
 
 $(libcppdir)/mathlib.o: ../lib/mathlib.cpp ../externals/simplecpp/simplecpp.h ../lib/config.h ../lib/errortypes.h ../lib/mathlib.h ../lib/smallvector.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
@@ -299,64 +303,64 @@ $(libcppdir)/mathlib.o: ../lib/mathlib.cpp ../externals/simplecpp/simplecpp.h ..
 $(libcppdir)/path.o: ../lib/path.cpp ../externals/simplecpp/simplecpp.h ../lib/config.h ../lib/path.h ../lib/standards.h ../lib/utils.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/path.cpp
 
-$(libcppdir)/pathanalysis.o: ../lib/pathanalysis.cpp ../lib/astutils.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/pathanalysis.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/pathanalysis.o: ../lib/pathanalysis.cpp ../lib/astutils.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/pathanalysis.h ../lib/refthunk.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/pathanalysis.cpp
 
 $(libcppdir)/pathmatch.o: ../lib/pathmatch.cpp ../lib/config.h ../lib/path.h ../lib/pathmatch.h ../lib/standards.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/pathmatch.cpp
 
-$(libcppdir)/platform.o: ../lib/platform.cpp ../externals/tinyxml2/tinyxml2.h ../lib/config.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/standards.h ../lib/xml.h
+$(libcppdir)/platform.o: ../lib/platform.cpp ../externals/tinyxml2/tinyxml2.h ../lib/config.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/standards.h ../lib/utils.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/platform.cpp
 
-$(libcppdir)/preprocessor.o: ../lib/preprocessor.cpp ../externals/simplecpp/simplecpp.h ../lib/addoninfo.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/preprocessor.h ../lib/settings.h ../lib/standards.h ../lib/suppressions.h ../lib/utils.h
+$(libcppdir)/preprocessor.o: ../lib/preprocessor.cpp ../externals/simplecpp/simplecpp.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/preprocessor.h ../lib/refthunk.h ../lib/settings.h ../lib/standards.h ../lib/suppressions.h ../lib/utils.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/preprocessor.cpp
 
-$(libcppdir)/programmemory.o: ../lib/programmemory.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/calculate.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/infer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/programmemory.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vfvalue.h
+$(libcppdir)/programmemory.o: ../lib/programmemory.cpp ../lib/astutils.h ../lib/calculate.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/infer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/programmemory.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/programmemory.cpp
 
 $(libcppdir)/regex.o: ../lib/regex.cpp ../lib/config.h ../lib/regex.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/regex.cpp
 
-$(libcppdir)/reverseanalyzer.o: ../lib/reverseanalyzer.cpp ../lib/addoninfo.h ../lib/analyzer.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/forwardanalyzer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/reverseanalyzer.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueptr.h ../lib/vfvalue.h
+$(libcppdir)/reverseanalyzer.o: ../lib/reverseanalyzer.cpp ../lib/analyzer.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/forwardanalyzer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/reverseanalyzer.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueptr.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/reverseanalyzer.cpp
 
-$(libcppdir)/sarifreport.o: ../lib/sarifreport.cpp ../externals/picojson/picojson.h ../lib/addoninfo.h ../lib/check.h ../lib/checkers.h ../lib/config.h ../lib/cppcheck.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/json.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/sarifreport.h ../lib/settings.h ../lib/standards.h ../lib/utils.h
+$(libcppdir)/sarifreport.o: ../lib/sarifreport.cpp ../externals/picojson/picojson.h ../lib/check.h ../lib/checkers.h ../lib/config.h ../lib/cppcheck.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/json.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/sarifreport.h ../lib/settings.h ../lib/standards.h ../lib/utils.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/sarifreport.cpp
 
-$(libcppdir)/settings.o: ../lib/settings.cpp ../externals/picojson/picojson.h ../lib/addoninfo.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/json.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/standards.h ../lib/summaries.h ../lib/suppressions.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/settings.o: ../lib/settings.cpp ../externals/picojson/picojson.h ../lib/addoninfo.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/json.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/rule.h ../lib/settings.h ../lib/standards.h ../lib/summaries.h ../lib/suppressions.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/settings.cpp
 
 $(libcppdir)/standards.o: ../lib/standards.cpp ../externals/simplecpp/simplecpp.h ../lib/config.h ../lib/standards.h ../lib/utils.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/standards.cpp
 
-$(libcppdir)/summaries.o: ../lib/summaries.cpp ../lib/addoninfo.h ../lib/analyzerinfo.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/summaries.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/summaries.o: ../lib/summaries.cpp ../lib/analyzerinfo.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/summaries.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/summaries.cpp
 
-$(libcppdir)/suppressions.o: ../lib/suppressions.cpp ../externals/tinyxml2/tinyxml2.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/filesettings.h ../lib/mathlib.h ../lib/path.h ../lib/pathmatch.h ../lib/platform.h ../lib/smallvector.h ../lib/standards.h ../lib/suppressions.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/suppressions.o: ../lib/suppressions.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/filesettings.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/pathmatch.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.h ../lib/suppressions.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/suppressions.cpp
 
-$(libcppdir)/templatesimplifier.o: ../lib/templatesimplifier.cpp ../lib/addoninfo.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/templatesimplifier.o: ../lib/templatesimplifier.cpp ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/templatesimplifier.cpp
 
 $(libcppdir)/timer.o: ../lib/timer.cpp ../lib/config.h ../lib/timer.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/timer.cpp
 
-$(libcppdir)/token.o: ../lib/token.cpp ../externals/simplecpp/simplecpp.h ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/tokenrange.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/token.o: ../lib/token.cpp ../externals/simplecpp/simplecpp.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/tokenrange.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/token.cpp
 
-$(libcppdir)/tokenlist.o: ../lib/tokenlist.cpp ../externals/simplecpp/simplecpp.h ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/keywords.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/tokenlist.o: ../lib/tokenlist.cpp ../externals/simplecpp/simplecpp.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/keywords.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/tokenlist.cpp
 
 $(libcppdir)/utils.o: ../lib/utils.cpp ../lib/config.h ../lib/utils.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/utils.cpp
 
-$(libcppdir)/vf_analyzers.o: ../lib/vf_analyzers.cpp ../lib/addoninfo.h ../lib/analyzer.h ../lib/astutils.h ../lib/calculate.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/programmemory.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vf_analyzers.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
+$(libcppdir)/vf_analyzers.o: ../lib/vf_analyzers.cpp ../lib/analyzer.h ../lib/astutils.h ../lib/calculate.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/programmemory.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vf_analyzers.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_analyzers.cpp
 
-$(libcppdir)/vf_common.o: ../lib/vf_common.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
+$(libcppdir)/vf_common.o: ../lib/vf_common.cpp ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_common.cpp
 
-$(libcppdir)/vf_settokenvalue.o: ../lib/vf_settokenvalue.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/calculate.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueflow.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
+$(libcppdir)/vf_settokenvalue.o: ../lib/vf_settokenvalue.cpp ../lib/astutils.h ../lib/calculate.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/refthunk.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueflow.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_settokenvalue.cpp
 
 $(libcppdir)/vfvalue.o: ../lib/vfvalue.cpp ../lib/config.h ../lib/errortypes.h ../lib/mathlib.h ../lib/smallvector.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
diff --git a/oss-fuzz/main.cpp b/oss-fuzz/main.cpp
index 65c350c920a..e1bd5952966 100644
--- a/oss-fuzz/main.cpp
+++ b/oss-fuzz/main.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@ static const FileWithDetails s_file("test.cpp", Standards::Language::CPP, 0);
 static void doCheck(const uint8_t *data, size_t dataSize)
 {
     Suppressions supprs;
-    CppCheck cppcheck(s_settings, supprs, s_errorLogger, false, nullptr);
+    CppCheck cppcheck(s_settings, supprs, s_errorLogger, nullptr, false, nullptr);
     cppcheck.checkBuffer(s_file, reinterpret_cast<const char*>(data), dataSize);
 }
 
diff --git a/platforms/arm64-linux.xml b/platforms/arm64-linux.xml
new file mode 100644
index 00000000000..d8b6a4e7cf6
--- /dev/null
+++ b/platforms/arm64-linux.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!-- 64-bit ARM Linux (AArch64 LP64 ABI). This describes the default setup. This platform file may also be suitable for bare-metal and RTOS targets (e.g. Zephyr, FreeRTOS) that use the AArch64 LP64 ABI. -->
+<platform>
+  <char_bit>8</char_bit>
+  <default-sign>unsigned</default-sign>
+  <sizeof>
+    <bool>1</bool>
+    <short>2</short>
+    <int>4</int>
+    <long>8</long>
+    <long-long>8</long-long>
+    <float>4</float>
+    <double>8</double>
+    <long-double>16</long-double>
+    <pointer>8</pointer>
+    <size_t>8</size_t>
+    <wchar_t>4</wchar_t>
+  </sizeof>
+</platform>
diff --git a/platforms/arm64-macos.xml b/platforms/arm64-macos.xml
new file mode 100644
index 00000000000..b5713159d2d
--- /dev/null
+++ b/platforms/arm64-macos.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!-- 64-bit ARM macOS / Apple Silicon (Apple arm64 LP64 ABI). This describes the default setup. -->
+<platform>
+  <char_bit>8</char_bit>
+  <default-sign>signed</default-sign>
+  <sizeof>
+    <bool>1</bool>
+    <short>2</short>
+    <int>4</int>
+    <long>8</long>
+    <long-long>8</long-long>
+    <float>4</float>
+    <double>8</double>
+    <long-double>8</long-double>
+    <pointer>8</pointer>
+    <size_t>8</size_t>
+    <wchar_t>4</wchar_t>
+  </sizeof>
+</platform>
diff --git a/platforms/arm64-wchar_t2.xml b/platforms/arm64-wchar_t2.xml
index 2b0cff4989f..32d17d926d2 100644
--- a/platforms/arm64-wchar_t2.xml
+++ b/platforms/arm64-wchar_t2.xml
@@ -12,7 +12,7 @@
     <double>8</double>
     <long-double>8</long-double>
     <pointer>8</pointer>
-    <size_t>4</size_t>
+    <size_t>8</size_t>
     <wchar_t>2</wchar_t>
   </sizeof>
 </platform>
diff --git a/platforms/arm64-wchar_t4.xml b/platforms/arm64-wchar_t4.xml
index 35183bb089c..6842ff977df 100644
--- a/platforms/arm64-wchar_t4.xml
+++ b/platforms/arm64-wchar_t4.xml
@@ -12,7 +12,7 @@
     <double>8</double>
     <long-double>8</long-double>
     <pointer>8</pointer>
-    <size_t>4</size_t>
+    <size_t>8</size_t>
     <wchar_t>4</wchar_t>
   </sizeof>
 </platform>
diff --git a/platforms/arm64-windows.xml b/platforms/arm64-windows.xml
new file mode 100644
index 00000000000..f1ea3f39daf
--- /dev/null
+++ b/platforms/arm64-windows.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!-- 64-bit ARM Windows (LLP64 ABI). This describes the default MSVC setup. LLP64 only defines the sizes of int, long, long long and pointers; other properties such as the signedness of char, the size of long double and the size of wchar_t are Windows specific, so a generic arm64 LLP64 platform file would not necessarily be identical to this one. -->
+<platform>
+  <char_bit>8</char_bit>
+  <default-sign>signed</default-sign>
+  <sizeof>
+    <bool>1</bool>
+    <short>2</short>
+    <int>4</int>
+    <long>4</long>
+    <long-long>8</long-long>
+    <float>4</float>
+    <double>8</double>
+    <long-double>8</long-double>
+    <pointer>8</pointer>
+    <size_t>8</size_t>
+    <wchar_t>2</wchar_t>
+  </sizeof>
+</platform>
diff --git a/platforms/riscv32.xml b/platforms/riscv32.xml
new file mode 100644
index 00000000000..1ba1f7e431d
--- /dev/null
+++ b/platforms/riscv32.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<platform>
+  <char_bit>8</char_bit>
+  <default-sign>unsigned</default-sign>
+  <sizeof>
+    <bool>1</bool>
+    <short>2</short>
+    <int>4</int>
+    <long>4</long>
+    <long-long>8</long-long>
+    <float>4</float>
+    <double>8</double>
+    <long-double>16</long-double>
+    <pointer>4</pointer>
+    <size_t>4</size_t>
+    <wchar_t>4</wchar_t>
+  </sizeof>
+</platform>
diff --git a/platforms/riscv64.xml b/platforms/riscv64.xml
new file mode 100644
index 00000000000..818c2841580
--- /dev/null
+++ b/platforms/riscv64.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<platform>
+  <char_bit>8</char_bit>
+  <default-sign>unsigned</default-sign>
+  <sizeof>
+    <bool>1</bool>
+    <short>2</short>
+    <int>4</int>
+    <long>8</long>
+    <long-long>8</long-long>
+    <float>4</float>
+    <double>8</double>
+    <long-double>16</long-double>
+    <pointer>8</pointer>
+    <size_t>8</size_t>
+    <wchar_t>4</wchar_t>
+  </sizeof>
+</platform>
diff --git a/readme.md b/readme.md
index 72f368b3293..6671fdd4827 100644
--- a/readme.md
+++ b/readme.md
@@ -1,9 +1,10 @@
-# **Cppcheck** 
+# **Cppcheck**
+
+NOTE: This repository was recently moved from https://github.com/danmar/cppcheck to https://github.com/cppcheck-opensource/cppcheck. Please make sure to update all your references to it accordingly.
 
 |release-windows|OSS-Fuzz|Coverity Scan Build Status|include-what-you-use|License|
 |:--:|:--:|:--:|:--:|:--:|
-|[![release-windows](https://github.com/danmar/cppcheck/actions/workflows/release-windows.yml/badge.svg?branch=main)](https://github.com/danmar/cppcheck/actions/workflows/release-windows.yml)|[![OSS-Fuzz](https://oss-fuzz-build-logs.storage.googleapis.com/badges/cppcheck.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:cppcheck)|[![Coverity Scan Build Status](https://img.shields.io/coverity/scan/512.svg)](https://scan.coverity.com/projects/512)|[![include-what-you-use](https://github.com/danmar/cppcheck/actions/workflows/iwyu.yml/badge.svg?branch=main)](https://github.com/danmar/cppcheck/actions/workflows/iwyu.yml)|[![License](https://img.shields.io/badge/license-GPL3.0-blue.svg)](https://opensource.org/licenses/GPL-3.0)
-
+|[![release-windows](https://github.com/cppcheck-opensource/cppcheck/actions/workflows/release-windows.yml/badge.svg?branch=main)](https://github.com/cppcheck-opensource/cppcheck/actions/workflows/release-windows.yml)|[![OSS-Fuzz](https://oss-fuzz-build-logs.storage.googleapis.com/badges/cppcheck.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:cppcheck)|[![Coverity Scan Build Status](https://img.shields.io/coverity/scan/512.svg)](https://scan.coverity.com/projects/512)|[![include-what-you-use](https://github.com/cppcheck-opensource/cppcheck/actions/workflows/iwyu.yml/badge.svg?branch=main)](https://github.com/cppcheck-opensource/cppcheck/actions/workflows/iwyu.yml)|[![License](https://img.shields.io/badge/license-GPL3.0-blue.svg)](https://opensource.org/licenses/GPL-3.0)|
 
 ## About the name
 
@@ -21,7 +22,8 @@ Cppcheck is a hobby project with limited resources. You can help us by donating
 
  1. Download (and extract) Cppcheck source code.
  2. Run (Linux/MacOS example):
-    ```
+
+    ```shell
     cd cppcheck/
     python3 -m venv .venv
     source .venv/bin/activate
@@ -30,19 +32,20 @@ Cppcheck is a hobby project with limited resources. You can help us by donating
     ./tools/donate-cpu.py
     ```
 
-The script will analyse debian source code and upload the results to a cppcheck server. We need these results both to improve Cppcheck and to detect regressions.
+The script will analyse Debian source code and upload the results to a Cppcheck server. We need these results both to improve Cppcheck and to detect regressions.
 
-You can stop the script whenever you like with Ctrl C.
+You can stop the script whenever you like with Ctrl+C.
 
 ## Compiling
 
-Cppcheck requires a C++ compiler with (partial) C++11 support. Minimum required versions are GCC 5.1 / Clang 3.5 / Visual Studio 2015.
+Cppcheck requires a C++ compiler with (partial) C++11 support. Minimum required versions are GCC 5.1 / Clang 3.5 / AppleClang 6.0 / Visual Studio 2015.
 
 To build the GUI application, you need to use the CMake build system.
 
 When building the command line tool, [PCRE](http://www.pcre.org/) is optional. It is used if you build with rules.
 
 There are multiple compilation choices:
+
 * CMake - cross platform build tool
 * (Windows) Visual Studio
 * (Windows) Qt Creator + MinGW
@@ -52,7 +55,7 @@ The minimum required Python version is 3.7.
 
 ### CMake
 
-The minimum required version is CMake 3.13.
+The minimum required version is CMake 3.22.
 
 Example, compiling Cppcheck with cmake:
 
@@ -62,22 +65,22 @@ cmake --build build
 ```
 
 If you want to compile the GUI you can use the flag.
--DBUILD_GUI=ON
+`-DBUILD_GUI=ON`
 
 For rules support (requires pcre) use the flag.
--DHAVE_RULES=ON
+`-DHAVE_RULES=ON`
 
 For release builds it is recommended that you use:
--DUSE_MATCHCOMPILER=ON
+`-DUSE_MATCHCOMPILER=ON`
 
 For building the tests use the flag.
--DBUILD_TESTS=ON
+`-DBUILD_TESTING=ON`
 
-Using cmake you can generate project files for Visual Studio,XCode,etc.
+Using CMake you can generate project files for Visual Studio, XCode, etc.
 
 #### Building a specific configuration
 
-For single-configuration generators (like "Unix Makefiles") you can generate and build a specific configuration (e.g. "RelWithDebInfo") using:
+For single-configuration generators (like "Unix Makefiles") you can generate and build a specific configuration (e.g. "`RelWithDebInfo`") using:
 
 ```shell
 cmake -S . -B build_RelWithDebInfo -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
@@ -93,88 +96,26 @@ cmake --build build --config RelWithDebInfo
 
 ### Visual Studio
 
-Use the cppcheck.sln file. The file is configured for Visual Studio 2019, but the platform toolset can be changed easily to older or newer versions. The solution contains platform targets for both x86 and x64.
+Use the `cppcheck.sln` file. The file is configured for Visual Studio 2019, but the platform toolset can be changed easily to older or newer versions. The solution contains platform targets for both x86 and x64.
 
-To compile with rules, select "Release-PCRE" or "Debug-PCRE" configuration. pcre.lib (pcre64.lib for x64 builds) and pcre.h are expected to be in /externals then. A current version of PCRE for Visual Studio can be obtained using [vcpkg](https://github.com/microsoft/vcpkg).
+To compile with rules, select "`Release-PCRE`" or "`Debug-PCRE`" configuration. `pcre.lib` (`pcre64.lib` for x64 builds) and `pcre.h` are expected to be in `/externals` then. A current version of PCRE for Visual Studio can be obtained using [vcpkg](https://github.com/microsoft/vcpkg).
 
 ### Visual Studio (from command line)
 
-If you do not wish to use the Visual Studio IDE, you can compile cppcheck from the command line the following command.
+If you do not wish to use the Visual Studio IDE, you can compile Cppcheck from the command line the following command.
 
 ```shell
 msbuild cppcheck.sln
 ```
 
-### VS Code (on Windows)
-
-Install MSYS2 to get GNU toolchain with g++ and gdb (https://www.msys2.org/).
-Create a settings.json file in the .vscode folder with the following content (adjust path as necessary):
-
-```
-{
-    "terminal.integrated.shell.windows": "C:\\msys64\\usr\\bin\\bash.exe",
-    "terminal.integrated.shellArgs.windows": [
-        "--login",
-    ],
-    "terminal.integrated.env.windows": {
-        "CHERE_INVOKING": "1",
-        "MSYSTEM": "MINGW64",
-    }
-}
-```
-
-Run "make" in the terminal to build cppcheck.
+### VS Code
 
-For debugging create a launch.json file in the .vscode folder with the following content, which covers configuration for debugging cppcheck and misra.py:
-
-```
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "cppcheck",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/cppcheck.exe",
-            "args": [
-                "--dump",
-                "${workspaceFolder}/addons/test/misra/misra-test.c"
-            ],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "externalConsole": true,
-            "MIMode": "gdb",
-            "miDebuggerPath": "C:/msys64/mingw64/bin/gdb.exe",
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                }
-            ]
-        },
-        {
-            "name": "misra.py",
-            "type": "python",
-            "request": "launch",
-            "program": "${workspaceFolder}/addons/misra.py",
-            "console": "integratedTerminal",
-            "args": [
-                "${workspaceFolder}/addons/test/misra/misra-test.c.dump"
-            ]
-        }
-    ]
-}
-```
+Cppcheck Official is an extension officially supported by the cppcheck team allowing you to easily use cppcheck in VS Code. You can find it in VS Code Marketplace through the extension tab in your IDE. For instructions on how to set it up and use it, see the readme on the github page: <https://github.com/cppchecksolutions/vscode-cppcheck-official>
 
 ### Qt Creator + MinGW
 
 The PCRE dll is needed to build the CLI. It can be downloaded here:
-http://software-download.name/pcre-library-windows/
+<http://software-download.name/pcre-library-windows/>
 
 ### GNU compilers
 
@@ -204,22 +145,22 @@ g++ -o cppcheck -std=c++11 -Iexternals -Iexternals/simplecpp -Iexternals/tinyxml
 
 #### Flags
 
--  `MATCHCOMPILER=yes`
+* `MATCHCOMPILER=yes`
    Several `Token` matching patterns are converted into more efficient C++ code at compile time (requires Python to be installed).
 
--  `FILESDIR=/usr/share/cppcheck`
-   Specifies the folder where cppcheck files (addons, cfg, platform) are installed to.
+* `FILESDIR=/usr/share/cppcheck`
+   Specifies the folder where Cppcheck files (addons, cfg, platform) are installed to.
 
--  `HAVE_RULES=yes`
+* `HAVE_RULES=yes`
    Enables rules (requires PCRE to be installed).
 
--  `CXXOPTS="-O2"`
+* `CXXOPTS="-O2"`
    Enables most compiler optimizations.
 
--  `CPPOPTS="-DNDEBUG"`
+* `CPPOPTS="-DNDEBUG"`
    Disables assertions.
 
--  `HAVE_BOOST=yes`
+* `HAVE_BOOST=yes`
    Enables usage of more efficient container from Boost (requires Boost to be installed).
 
 ### MinGW
@@ -230,7 +171,7 @@ mingw32-make
 
 If you encounter the following error with `MATCHCOMPILER=yes` you need to specify your Python interpreter via `PYTHON_INTERPRETER`.
 
-```
+```text
 process_begin: CreateProcess(NULL, which python3, ...) failed.
 makefile:24: pipe: No error
 process_begin: CreateProcess(NULL, which python, ...) failed.
@@ -238,10 +179,10 @@ makefile:27: pipe: No error
 makefile:30: *** Did not find a Python interpreter.  Stop.
 ```
 
-### Other Compiler/IDE
+### Other compiler/IDE
 
 1. Create an empty project file / makefile.
-2. Add all cpp files in the cppcheck cli and lib folders to the project file / makefile.
+2. Add all cpp files in the Cppcheck cli and lib folders to the project file / makefile.
 3. Add all cpp files in the externals folders to the project file / makefile.
 4. Compile.
 
@@ -255,17 +196,17 @@ mv cppcheck cppcheck.exe
 
 ## Packages
 
-Besides building yourself on the platform of your choice there are also several ways to obtain pre-built packages.<br/>
+Besides building yourself on the platform of your choice there are also several ways to obtain pre-built packages.
 
 ### Official
 
 Official packages are maintained by the Cppcheck team.
 
-- (Windows) An official Windows installer is available via the official Cppcheck SourceForge page: https://cppcheck.sourceforge.io.
-- (Windows) Official builds of the current development versions are available via the [release-windows](https://github.com/danmar/cppcheck/actions/workflows/release-windows.yml) workflow. They are built nightly for the `main` branch and for each commit for release branches. As these are development versions please refrain from using these in production environments!
-  - A portable package (i.e. does not require installation) is available as the `portable` artifact. This is still a work-in-progress - see https://trac.cppcheck.net/ticket/10771 for details.
-  - An installer is available via the `installer` artifact.
-- (Multi-Platform) A premium version with additional features provided by the original author of Cppcheck is available for purchase via https://www.cppcheck.com.
+* (Windows) An official Windows installer is available via the official Cppcheck SourceForge page: <https://cppcheck.sourceforge.io>.
+* (Windows) Official builds of the current development versions are available via the [release-windows](https://github.com/cppcheck-opensource/cppcheck/actions/workflows/release-windows.yml) workflow. They are built nightly for the `main` branch and for each commit for release branches. As these are development versions please refrain from using these in production environments!
+  * A portable package (i.e. does not require installation) is available as the `portable` artifact. This is still a work-in-progress - see <https://trac.cppcheck.net/ticket/10771> for details.
+  * An installer is available via the `installer` artifact.
+* (Multi-Platform) A premium version with additional features provided by the original author of Cppcheck is available for purchase via <https://www.cppcheck.com>.
 
 ### Third-party
 
@@ -273,23 +214,23 @@ Third-party packages are ***not*** maintained by the Cppcheck team but their res
 
 *Note:* The following list is purely informational and listed in no particular order.
 
-*Note:* Please always try to obtain the package from the primary official source of your operating system/distro first and make sure you are getting the latest released/tagged version (see https://github.com/danmar/cppcheck/tags). Some packages might not carry the latest patch version though.
+*Note:* Please always try to obtain the package from the primary official source of your operating system/distro first and make sure you are getting the latest released/tagged version (see <https://github.com/cppcheck-opensource/cppcheck/tags>). Some packages might not carry the latest patch version though.
 
 *Note:* Some issues might be related to additional patches carried by the builds in these packages or by the packaging itself. Please try to verify the issue with an official build before reporting it upstream. Otherwise you might need toreport it to the respective maintainer of the package.
 
-- (Windows / Outdated) A portable package is available via https://portableapps.com/apps/development/cppcheck-portable.
-- (Windows / Outdated) A package is available via https://community.chocolatey.org/packages/cppcheck.
-- (Windows / Outdated) A package is available via https://winget.run/pkg/Cppcheck/Cppcheck.
-- (Windows) A package is available via https://scoop.sh/#/apps?q=cppcheck.
-- (Linux/Unix) Many major distros offer Cppcheck packages via their integrated package managers (`yum`, `apt`, `pacman`, etc.). See https://pkgs.org/search/?q=cppcheck or https://repology.org/project/cppcheck for an overview.
-- (Linux/Unix) Unless you are using a "rolling" distro, it is likely that they are not carrying the latest version. There are several external (mainly unsupported) repositories like AUR (ArchLinux), PPA (ubuntu), EPEL (CentOS/Fedora) etc. which might provide up-to-date packages. 
-- (Linux/Unix / Outdated) The Canonical Snapcraft packages (https://snapcraft.io/cppcheck / https://snapcraft.io/cppcheckgui) are unmaintained and contain very old (development) versions. Please refrain from using them! See https://trac.cppcheck.net/ticket/11641 for more details.
-- (MacOS) A package is available via Homebrew (`brew`). See https://formulae.brew.sh/formula/cppcheck.
-- (MacOS) A package is available via https://ports.macports.org/port/cppcheck.
-- (Multi-Platform) A package is available via https://anaconda.org/conda-forge/cppcheck.
-- (Multi-Platform) A package is available via https://conan.io/center/recipes/cppcheck.
-- Packages are also available from various download portals (mainly the Windows installer - sometimes re-packaged).
+* (Windows / Outdated) A portable package is available via <https://portableapps.com/apps/development/cppcheck-portable>.
+* (Windows / Outdated) A package is available via <https://community.chocolatey.org/packages/cppcheck>.
+* (Windows / Outdated) A package is available via <https://winget.run/pkg/Cppcheck/Cppcheck>.
+* (Windows) A package is available via <https://scoop.sh/#/apps?q=cppcheck>.
+* (Linux/Unix) Many major distros offer Cppcheck packages via their integrated package managers (`yum`, `apt`, `pacman`, etc.). See <https://pkgs.org/search/?q=cppcheck> or <https://repology.org/project/cppcheck> for an overview.
+* (Linux/Unix) Unless you are using a "rolling" distro, it is likely that they are not carrying the latest version. There are several external (mainly unsupported) repositories like AUR (ArchLinux), PPA (Ubuntu), EPEL (CentOS/Fedora) etc. which might provide up-to-date packages.
+* (Linux/Unix / Outdated) The Canonical Snapcraft packages (<https://snapcraft.io/cppcheck> / <https://snapcraft.io/cppcheckgui>) are unmaintained and contain very old (development) versions. Please refrain from using them! See <https://trac.cppcheck.net/ticket/11641> for more details.
+* (MacOS) A package is available via Homebrew (`brew`). See <https://formulae.brew.sh/formula/cppcheck>.
+* (MacOS) A package is available via <https://ports.macports.org/port/cppcheck>.
+* (Multi-Platform) A package is available via <https://anaconda.org/conda-forge/cppcheck>.
+* (Multi-Platform) A package is available via <https://conan.io/center/recipes/cppcheck>.
+* Packages are also available from various download portals (mainly the Windows installer - sometimes re-packaged).
 
 ## Webpage
 
-https://cppcheck.sourceforge.io/
+<https://cppcheck.sourceforge.io/>
diff --git a/readmeja.md b/readmeja.md
index 6d9dae60c95..7299d61745c 100644
--- a/readmeja.md
+++ b/readmeja.md
@@ -2,7 +2,7 @@
 
 | Linux ビルド状態 | Windows ビルド状態 | Coverity Scan Build 状態 |
 |:--:|:--:|:--:|
-| [![Linux ビルド状態](https://img.shields.io/travis/danmar/cppcheck/master.svg?label=Linux%20build)](https://travis-ci.org/danmar/cppcheck) | [![Windows ビルド状態](https://img.shields.io/appveyor/ci/danmar/cppcheck/master.svg?label=Windows%20build)](https://ci.appveyor.com/project/danmar/cppcheck/branch/master) | [![Coverity Scan Build 状態](https://img.shields.io/coverity/scan/512.svg)](https://scan.coverity.com/projects/512) |
+| [![Linux ビルド状態](https://img.shields.io/travis/cppcheck-opensource/cppcheck/master.svg?label=Linux%20build)](https://travis-ci.org/cppcheck-opensource/cppcheck) | [![Windows ビルド状態](https://img.shields.io/appveyor/ci/cppcheck-opensource/cppcheck/master.svg?label=Windows%20build)](https://ci.appveyor.com/project/cppcheck-opensource/cppcheck/branch/master) | [![Coverity Scan Build 状態](https://img.shields.io/coverity/scan/512.svg)](https://scan.coverity.com/projects/512) |
 
 ## ������
 
diff --git a/releasenotes.txt b/releasenotes.txt
index 919e355fb1b..33fd4106800 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -1,5 +1,5 @@
 
-Release Notes for Cppcheck 2.20
+Release Notes for Cppcheck 2.23
 
 Major bug fixes & crashes:
 -
@@ -13,8 +13,15 @@ C/C++ support:
 GUI:
 -
 
-Changed interface:
+Suppressions:
+-
+
+Import project:
 -
 
 Infrastructure & dependencies:
+- Added arm64 platform files arm64-windows.xml, arm64-linux.xml and arm64-macos.xml (Apple Silicon).
+  These describe the default setup for that OS. The arm64-wchar_t2.xml and arm64-wchar_t4.xml files are kept.
+
+Other:
 -
diff --git a/samples/unreadVariable/out.txt b/samples/unreadVariable/out.txt
index 2b1c295a8c6..1797e13dbbe 100644
--- a/samples/unreadVariable/out.txt
+++ b/samples/unreadVariable/out.txt
@@ -1,6 +1,3 @@
 samples\unreadVariable\bad.cpp:5:34: style: Variable 's2' is assigned a value that is never used. [unreadVariable]
     std::string s1 = "test1", s2 = "test2";
                                  ^
-samples\unreadVariable\bad.cpp:5:31: style: Variable 's2' is assigned a value that is never used. [unreadVariable]
-    std::string s1 = "test1", s2 = "test2";
-                              ^
diff --git a/selfcheck.sh b/selfcheck.sh
new file mode 100755
index 00000000000..e9a39ec43cb
--- /dev/null
+++ b/selfcheck.sh
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+cmake_output=cmake.output
+selfcheck_options_extra="$1"
+
+cppcheck_bin=./cppcheck
+
+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"
+selfcheck_options="$selfcheck_options $selfcheck_options_extra"
+cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
+qt_options="--library=qt -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_MOC_HAS_STRINGDATA"  # TODO: use 69 as revision
+naming_options="--addon-python=$(command -v python) --addon=naming.json"
+
+mkdir_cmd=$(command -v mkdir)
+rm_cmd=$(command -v rm)
+
+# clear PATH to prevent unintentional process invocations
+export PATH=
+
+ec=0
+
+$cppcheck_bin $selfcheck_options \
+  externals \
+  || ec=1
+
+$mkdir_cmd b1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
+  --cppcheck-build-dir=b1 \
+  frontend \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
+  --cppcheck-build-dir=b1 \
+  -Ifrontend \
+  cli \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
+  --cppcheck-build-dir=b1 --enable=internal \
+  lib \
+  || ec=1
+
+$mkdir_cmd b2
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options $qt_options \
+  --cppcheck-build-dir=b2 \
+  -DQT_CHARTS_LIB \
+  -I$cmake_output/gui -Ifrontend -Igui \
+  gui/*.cpp $cmake_output/gui \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options \
+  -Ifrontend -Icli \
+  test/*.cpp \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options \
+  -Icli \
+  tools/dmake/*.cpp \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $qt_options \
+  -I$cmake_output/tools/triage -Igui \
+  tools/triage/*.cpp $cmake_output/tools/triage \
+  || ec=1
+
+$rm_cmd -rf b2
+$rm_cmd -rf b1
+
+exit $ec
\ No newline at end of file
diff --git a/selfcheck_san.sh b/selfcheck_san.sh
new file mode 100755
index 00000000000..92e34ba6e4f
--- /dev/null
+++ b/selfcheck_san.sh
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+cmake_output="$1"
+selfcheck_options_extra="$2"
+
+cppcheck_bin=$cmake_output/bin/cppcheck
+
+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"
+selfcheck_options="$selfcheck_options $selfcheck_options_extra"
+cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
+qt_options="--library=qt -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_MOC_HAS_STRINGDATA"
+qt_options="$qt_options --suppress=autoNoType:*/moc_*.cpp --suppress=symbolDatabaseWarning:*/moc_*.cpp"
+naming_options="--addon-python=$(command -v python) --addon=naming.json"
+
+# clear PATH to prevent unintentional process invocations
+export PATH=
+
+ec=0
+
+$cppcheck_bin $selfcheck_options \
+  externals \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
+  frontend \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
+  -Ifrontend \
+  cli \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
+  --enable=internal \
+  lib \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options $qt_options \
+  --suppress=constVariablePointer:*/moc_*.cpp \
+  -DQT_CHARTS_LIB \
+  -I$cmake_output/gui -Ifrontend -Igui \
+  gui/*.cpp $cmake_output/gui \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options \
+  -Ifrontend -Icli \
+  test/*.cpp \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options \
+  -Icli \
+  tools/dmake/*.cpp \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $qt_options \
+  -I$cmake_output/tools/triage -Igui \
+  tools/triage/*.cpp $cmake_output/tools/triage \
+  || ec=1
+
+exit $ec
\ No newline at end of file
diff --git a/snap/gui/cppcheck-gui.desktop b/snap/gui/cppcheck-gui.desktop
deleted file mode 100644
index bd540376da2..00000000000
--- a/snap/gui/cppcheck-gui.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Cppcheck
-Comment=A tool for static C/C++ code analysis
-Exec=cppcheck-gui
-Icon=${SNAP}/meta/gui/cppcheck-gui.png
-Terminal=true
-StartupNotify=true
-Categories=Development;Debugger;Qt;
diff --git a/snap/gui/cppcheck-gui.png b/snap/gui/cppcheck-gui.png
deleted file mode 100644
index 25d7aef5f31..00000000000
Binary files a/snap/gui/cppcheck-gui.png and /dev/null differ
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
deleted file mode 100644
index 030a2048afe..00000000000
--- a/snap/snapcraft.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-name:               cppcheckgui
-version:            '1.81.99'
-summary:            A tool for static C/C++ code analysis
-description:        |
-  A tool for static C/C++ code analysis
-grade:              stable
-confinement:        strict
-icon:               snap/gui/cppcheck-gui.png
-type:               app
-
-apps:
-  cppcheckgui:
-    command:        desktop-launch ${SNAP}/bin/cppcheck-gui
-    plugs:          [home, unity7, x11, network-bind, network-control]
-
-parts:
-  cppcheckgui:
-    source-type:    git
-    plugin:         cmake
-    configflags:
-      - -DBUILD_GUI=ON
-    after:          [desktop-qt5]
-    build-packages:
-      # A list of Ubuntu packages to be installed on the host to aid in building the part.
-      # These packages will not go into the final snap.
-      - build-essential
-      - qt5-default
-      - qtbase5-dev
-      - dpkg-dev
-      # For Qt5LinguistTools
-      - qttools5-dev
-      - qttools5-dev-tools
-  desktop-qt5:
-    stage-packages:
-      # A set of Ubuntu packages to be downloaded and unpacked to join the part before it’s built.
-      # Note that these packages are not installed on the host.
-      # Like the rest of the part, all files from these packages will make it into the final snap unless filtered out via the prime keyword.
-      - libqt5gui5
-      - libqt5svg5 # for loading icon themes which are svg
-      - libtiff5-dev
-      - libjpeg8-dev
-      - libxkbcommon0
-      - ttf-ubuntu-font-family
-      - dmz-cursor-theme
-      - light-themes
-      - shared-mime-info
-      - libgdk-pixbuf2.0-0
-      - locales-all
-      - xcb
-      - libxcb1
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index dca02d19194..f1e59e17daf 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (BUILD_TESTS)
+if (BUILD_TESTING)
     add_subdirectory(signal)
     add_subdirectory(seh)
 
@@ -47,6 +47,8 @@ if (BUILD_TESTS)
     if (REGISTER_TESTS)
         # CMAKE_MATCH_<n> usage for if (MATCHES) requires CMake 3.9
 
+        add_subdirectory(addon)
+
         find_package(Threads REQUIRED)
         include(ProcessorCount)
         ProcessorCount(N)
@@ -79,7 +81,7 @@ if (BUILD_TESTS)
             set(oneValueArgs PLATFORM NAME)
             set(multiValueArgs ADD_LIBRARY)
 
-            cmake_parse_arguments(PARSE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+            cmake_parse_arguments(PARSE "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
             get_filename_component(LIBRARY ${CFG_TEST} NAME_WE)
             # TODO: get rid of this
             if(PARSE_ADD_LIBRARY)
diff --git a/test/addon/CMakeLists.txt b/test/addon/CMakeLists.txt
new file mode 100644
index 00000000000..bb04afb6c51
--- /dev/null
+++ b/test/addon/CMakeLists.txt
@@ -0,0 +1,41 @@
+if (NOT Python_Interpreter_FOUND)
+    message(WARNING "Python interpreter not found - skipping addon tests.")
+    return()
+endif()
+
+# creating a virtual environment needs the venv and ensurepip modules - some
+# distributions ship them separately from the interpreter (e.g. the Debian/Ubuntu
+# python3-venv package)
+execute_process(COMMAND ${Python_EXECUTABLE} -c "import venv, ensurepip"
+        RESULT_VARIABLE PYTHON_VENV_RESULT
+        OUTPUT_QUIET
+        ERROR_QUIET)
+if (NOT PYTHON_VENV_RESULT EQUAL 0)
+    message(WARNING "Python venv module not available (e.g. install the python3-venv package) - skipping addon tests.")
+    return()
+endif()
+
+set(VENV_DIR ${CMAKE_CURRENT_BINARY_DIR}/venv)
+if (WIN32)
+    set(VENV_PYTHON ${VENV_DIR}/Scripts/python.exe)
+else()
+    set(VENV_PYTHON ${VENV_DIR}/bin/python)
+endif()
+
+# fixture: create a virtual environment and install the python dependencies into it
+add_test(NAME addon-venv-create
+        COMMAND ${Python_EXECUTABLE} -m venv ${VENV_DIR})
+set_tests_properties(addon-venv-create PROPERTIES
+        FIXTURES_SETUP addon-venv-dir)
+
+add_test(NAME addon-venv-install
+        COMMAND ${VENV_PYTHON} -m pip install -r ${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt)
+set_tests_properties(addon-venv-install PROPERTIES
+        FIXTURES_REQUIRED addon-venv-dir
+        FIXTURES_SETUP addon-venv
+        TIMEOUT 300)
+
+add_test(NAME addon-cppcheckdata
+        COMMAND ${VENV_PYTHON} -m pytest --cppcheck-binary=$<TARGET_FILE:cppcheck> ${CMAKE_CURRENT_SOURCE_DIR})
+set_tests_properties(addon-cppcheckdata PROPERTIES
+        FIXTURES_REQUIRED addon-venv)
diff --git a/test/addon/conftest.py b/test/addon/conftest.py
new file mode 100644
index 00000000000..87012983951
--- /dev/null
+++ b/test/addon/conftest.py
@@ -0,0 +1,201 @@
+"""pytest configuration for the addon tests.
+
+The tests exercise addons/cppcheckdata.py against dump files that are
+generated on the fly with the cppcheck binary given by --cppcheck-binary.
+"""
+import os
+import shutil
+import subprocess
+import sys
+
+import pytest
+
+# Make 'import cppcheckdata' resolve to <repo>/addons/cppcheckdata.py
+_ADDONS_DIR = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', 'addons'))
+if _ADDONS_DIR not in sys.path:
+    sys.path.insert(0, _ADDONS_DIR)
+
+
+def pytest_addoption(parser):
+    parser.addoption('--cppcheck-binary',
+                     default='cppcheck',
+                     help='path to the cppcheck binary used to generate dump files '
+                          '(default: cppcheck found in PATH)')
+
+
+@pytest.fixture(scope='session')
+def cppcheck_binary(request):
+    binary = request.config.getoption('--cppcheck-binary')
+    resolved = shutil.which(binary)
+    if resolved is None:
+        pytest.fail("cppcheck binary '%s' not found - point --cppcheck-binary at a cppcheck executable" % binary)
+    return os.path.abspath(resolved)
+
+
+class DumpFactory:
+    """Runs 'cppcheck --dump' on a source snippet and parses the result."""
+
+    def __init__(self, binary, tmp_path_factory):
+        self.binary = binary
+        self.tmp_path_factory = tmp_path_factory
+
+    def create(self, code, filename='test.c', extra_args=()):
+        """Write the code to a file, dump it and return the dump file path."""
+        directory = self.tmp_path_factory.mktemp('cppcheckdata')
+        path = directory / filename
+        path.write_text(code)
+        cmd = [self.binary, '--dump', '--quiet', str(path)] + list(extra_args)
+        proc = subprocess.run(cmd,
+                              stdout=subprocess.PIPE,
+                              stderr=subprocess.PIPE,
+                              check=True,
+                              universal_newlines=True)
+        assert proc.returncode == 0, \
+            'cppcheck failed with exit code %d:\n%s\n%s' % (proc.returncode, proc.stdout, proc.stderr)
+        return str(path) + '.dump'
+
+    def parse(self, code, filename='test.c', extra_args=()):
+        """Write the code to a file, dump it and return the parsed CppcheckData."""
+        import cppcheckdata
+        return cppcheckdata.parsedump(self.create(code, filename, extra_args))
+
+
+@pytest.fixture(scope='session')
+def dump_factory(cppcheck_binary, tmp_path_factory):
+    return DumpFactory(cppcheck_binary, tmp_path_factory)
+
+
+SAMPLE_C = """#define ANSWER 42
+static int add(int a, int b)
+{
+    return a + b;
+}
+
+double half(double d)
+{
+    return d / 2.0;
+}
+
+int main(void)
+{
+    int x = ANSWER;
+    int arr[10];
+    arr[0] = add(x, 1);
+    int neg = -x;
+    return arr[0] + neg;
+}
+"""
+
+SAMPLE_CPP = """namespace ns {
+    int twice(int v) { return 2 * v; }
+}
+
+class Shape {
+public:
+    virtual ~Shape() {}
+    virtual double area() const = 0;
+protected:
+    double mScale;
+};
+
+enum Color { RED, GREEN };
+
+const int limit = 5;
+bool flag = true;
+const char *msg = "hello";
+char ch = 'x';
+
+int run()
+{
+    Color color = RED;
+    if (flag && limit > 1) {
+        return ns::twice(21);
+    }
+    return static_cast<int>(color);
+}
+"""
+
+MULTI_CFG_C = """typedef int myint;
+typedef float myfloat;
+#if defined(FOO) && FOO > 1
+int foo(void) { return 1; }
+#endif
+myint bar(void) { myint y = 3; return y; }
+"""
+
+MATCH_C = """struct Point {
+    int x;
+    int y;
+};
+
+int calc(int a, int b)
+{
+    int bit_or = a | b;
+    int log_or = a || b;
+    int mod = a % b;
+    int mul = a * b;
+    int not_a = !a;
+    int neq = a != b;
+    int arr[3];
+    arr[0] = a;
+    a += 1;
+    if (a > b) {
+        return a;
+    }
+    return calc(a, b);
+}
+"""
+
+MATCH_CPP = """class Widget {};
+
+bool use(int i, int j)
+{
+    std::vector<int> v;
+    bool less = i < j;
+    return less && v.empty();
+}
+"""
+
+
+@pytest.fixture(scope='session')
+def sample_data(dump_factory):
+    """Parsed dump of the canonical C sample."""
+    return dump_factory.parse(SAMPLE_C, filename='sample.c')
+
+
+@pytest.fixture(scope='session')
+def sample_cfg(sample_data):
+    cfgs = sample_data.configurations
+    assert len(cfgs) == 1
+    return cfgs[0]
+
+
+@pytest.fixture(scope='session')
+def sample_cpp_data(dump_factory):
+    """Parsed dump of the canonical C++ sample."""
+    return dump_factory.parse(SAMPLE_CPP, filename='sample.cpp')
+
+
+@pytest.fixture(scope='session')
+def sample_cpp_cfg(sample_cpp_data):
+    cfgs = sample_cpp_data.configurations
+    assert len(cfgs) == 1
+    return cfgs[0]
+
+
+@pytest.fixture(scope='session')
+def multi_cfg_data(dump_factory):
+    """Parsed dump of a file with two preprocessor configurations."""
+    return dump_factory.parse(MULTI_CFG_C, filename='multi.c')
+
+
+@pytest.fixture(scope='session')
+def match_cfg(dump_factory):
+    """Configuration of a C sample covering the match() pattern syntax."""
+    return dump_factory.parse(MATCH_C, filename='match.c').configurations[0]
+
+
+@pytest.fixture(scope='session')
+def match_cpp_cfg(dump_factory):
+    """Configuration of a C++ sample with linked '<' tokens for match()."""
+    return dump_factory.parse(MATCH_CPP, filename='match.cpp').configurations[0]
diff --git a/test/addon/requirements.txt b/test/addon/requirements.txt
new file mode 100644
index 00000000000..e079f8a6038
--- /dev/null
+++ b/test/addon/requirements.txt
@@ -0,0 +1 @@
+pytest
diff --git a/test/addon/test_cppcheckdata.py b/test/addon/test_cppcheckdata.py
new file mode 100644
index 00000000000..fc5d553e78b
--- /dev/null
+++ b/test/addon/test_cppcheckdata.py
@@ -0,0 +1,934 @@
+"""Unit tests for addons/cppcheckdata.py
+
+Most tests parse dump files generated with the cppcheck binary
+(see conftest.py); tests of pure helper classes construct the
+objects directly from dicts (which provide the same .get() API
+as the XML elements).
+"""
+import json
+import sys
+
+import pytest
+
+import cppcheckdata
+
+
+def find_tokens(cfg, token_str):
+    return [tok for tok in cfg.tokenlist if tok.str == token_str]
+
+
+def find_token(cfg, token_str, skip=0):
+    tokens = find_tokens(cfg, token_str)
+    assert len(tokens) > skip, "token '%s' (skip=%d) not found" % (token_str, skip)
+    return tokens[skip]
+
+
+def find_function(cfg, name):
+    for function in cfg.functions:
+        if function.name == name:
+            return function
+    assert False, "function '%s' not found" % name
+
+
+def find_scope(cfg, scope_type, className=None):
+    for scope in cfg.scopes:
+        if scope.type == scope_type and (className is None or scope.className == className):
+            return scope
+    assert False, "scope '%s' not found" % scope_type
+
+
+def find_variable(cfg, name):
+    for variable in cfg.variables:
+        if variable.nameToken and variable.nameToken.str == name:
+            return variable
+    assert False, "variable '%s' not found" % name
+
+
+class TestCppcheckData:
+    def test_language(self, sample_data, sample_cpp_data):
+        assert sample_data.language == 'c'
+        assert sample_cpp_data.language == 'cpp'
+
+    def test_platform(self, sample_data):
+        platform = sample_data.platform
+        assert platform.name
+        assert platform.char_bit == 8
+        assert platform.short_bit >= 16
+        assert platform.int_bit >= 16
+        assert platform.long_bit >= 32
+        assert platform.long_long_bit >= 64
+        assert platform.pointer_bit > 0
+        assert 'char_bit=8' in repr(platform)
+
+    def test_files(self, sample_data):
+        assert len(sample_data.files) == 1
+        assert sample_data.files[0].endswith('sample.c')
+
+    def test_rawtokens(self, sample_data):
+        raw = sample_data.rawTokens
+        # the not yet preprocessed code contains the directive tokens
+        assert [tok.str for tok in raw[:4]] == ['#', 'define', 'ANSWER', '42']
+        assert raw[-1].str == '}'
+        assert raw[0].file.endswith('sample.c')
+        assert raw[0].linenr == 1
+        # next/previous chain
+        assert raw[0].previous is None
+        assert raw[-1].next is None
+        for i in range(len(raw) - 1):
+            assert raw[i].next is raw[i + 1]
+            assert raw[i + 1].previous is raw[i]
+
+    def test_configurations(self, sample_data):
+        cfgs = sample_data.configurations
+        assert len(cfgs) == 1
+        assert cfgs[0].name == ''
+
+    def test_iterconfigurations(self, multi_cfg_data):
+        it = multi_cfg_data.iterconfigurations()
+        cfgs = list(it)
+        assert len(cfgs) == 2
+        assert cfgs[0].name == ''
+        assert 'FOO' in cfgs[1].name
+        # 'foo()' is only tokenized in the FOO configuration
+        assert not find_tokens(cfgs[0], 'foo')
+        assert find_tokens(cfgs[1], 'foo')
+
+    def test_configurations_kept(self, multi_cfg_data):
+        data = cppcheckdata.parsedump(multi_cfg_data.filename)
+        cfgs = data.configurations
+        assert len(cfgs) == 2
+        # later accesses and iterconfigurations() return the same objects
+        assert data.configurations is cfgs
+        iterated = list(data.iterconfigurations())
+        assert len(iterated) == 2
+        assert iterated[0] is cfgs[0]
+        assert iterated[1] is cfgs[1]
+
+    def test_iterconfigurations_not_kept(self, multi_cfg_data):
+        data = cppcheckdata.parsedump(multi_cfg_data.filename)
+        first = next(data.iterconfigurations())
+        # each call parses the dump file again
+        assert next(data.iterconfigurations()) is not first
+        assert len(data.configurations) == 2
+        assert data.configurations[0] is not first
+
+    def test_standards(self, sample_cfg, sample_cpp_cfg):
+        assert sample_cfg.standards.c.startswith('c')
+        assert sample_cpp_cfg.standards.cpp.startswith('c++')
+        assert sample_cfg.standards.posix is False
+        assert 'c=' in repr(sample_cfg.standards)
+
+
+class TestToken:
+    def test_tokenlist(self, sample_cfg):
+        code = ' '.join(tok.str for tok in sample_cfg.tokenlist)
+        assert 'static int add ( int a , int b )' in code
+        # the macro has been expanded
+        assert 'x = 42' in code
+
+    def test_next_previous(self, sample_cfg):
+        tokens = sample_cfg.tokenlist
+        assert tokens[0].previous is None
+        assert tokens[-1].next is None
+        for i in range(len(tokens) - 1):
+            assert tokens[i].next is tokens[i + 1]
+            assert tokens[i + 1].previous is tokens[i]
+
+    def test_location(self, sample_cfg):
+        tok = sample_cfg.tokenlist[0]
+        assert tok.str == 'static'
+        assert tok.file.endswith('sample.c')
+        assert tok.linenr == 2
+        assert tok.column == 1
+
+    def test_link(self, sample_cfg):
+        parenthesis = find_token(sample_cfg, '(')
+        assert parenthesis.link.str == ')'
+        assert parenthesis.link.link is parenthesis
+        bracket = find_token(sample_cfg, '[')
+        assert bracket.link.str == ']'
+        brace = find_token(sample_cfg, '{')
+        assert brace.link.str == '}'
+
+    def test_scope(self, sample_cfg):
+        assert sample_cfg.tokenlist[0].scope.type == 'Global'
+        return_tok = find_token(sample_cfg, 'return')
+        assert return_tok.scope.type == 'Function'
+        assert return_tok.scope.className == 'add'
+
+    def test_name_number_flags(self, sample_cfg):
+        name_tok = find_token(sample_cfg, 'main')
+        assert name_tok.isName
+        assert not name_tok.isNumber
+        num_tok = find_token(sample_cfg, '42')
+        assert num_tok.isNumber
+        assert num_tok.isInt
+        assert not num_tok.isFloat
+        float_tok = find_token(sample_cfg, '2.0')
+        assert float_tok.isNumber
+        assert float_tok.isFloat
+
+    def test_operator_flags(self, sample_cfg, sample_cpp_cfg):
+        plus = find_token(sample_cfg, '+')
+        assert plus.isOp
+        assert plus.isArithmeticalOp
+        assign = find_token(sample_cfg, '=')
+        assert assign.isOp
+        assert assign.isAssignmentOp
+        logical = find_token(sample_cpp_cfg, '&&')
+        assert logical.isOp
+        assert logical.isLogicalOp
+        comparison = find_token(sample_cpp_cfg, '>')
+        assert comparison.isOp
+        assert comparison.isComparisonOp
+
+    def test_string_char(self, sample_cpp_cfg):
+        string_tok = find_token(sample_cpp_cfg, '"hello"')
+        assert string_tok.isString
+        assert string_tok.strlen == 5
+        char_tok = find_token(sample_cpp_cfg, "'x'")
+        assert char_tok.isChar
+
+    @pytest.mark.xfail(strict=False,
+                       reason='Tokenizer::dump checks Token::isName() before Token::isBoolean() and '
+                              'eBoolean tokens are names, so type="boolean" is never dumped')
+    def test_boolean(self, sample_cpp_cfg):
+        bool_tok = find_token(sample_cpp_cfg, 'true')
+        assert bool_tok.isBoolean
+
+    def test_cast(self, sample_cpp_cfg):
+        # static_cast<int>(...) is simplified to a C-style cast
+        assert any(tok.isCast for tok in sample_cpp_cfg.tokenlist)
+
+    def test_macro_expansion(self, sample_cfg):
+        tok = find_token(sample_cfg, '42')
+        assert tok.isExpandedMacro
+        assert tok.macroName == 'ANSWER'
+
+    def test_removed_void_parameter(self, sample_cfg):
+        main_tok = find_token(sample_cfg, 'main')
+        assert main_tok.next.isRemovedVoidParameter
+
+    def test_splitted_var_decl(self, sample_cfg):
+        # 'int x = ANSWER;' is simplified to 'int x ; x = 42 ;'
+        assert any(tok.isSplittedVarDeclEq for tok in sample_cfg.tokenlist)
+
+    def test_variable_and_var_id(self, sample_cfg):
+        x_decl = find_token(sample_cfg, 'x')
+        assert x_decl.varId
+        assert x_decl.variable.nameToken is x_decl
+        # all 'x' tokens refer to the same variable and varId
+        for tok in find_tokens(sample_cfg, 'x'):
+            assert tok.varId == x_decl.varId
+            assert tok.variable is x_decl.variable
+
+    def test_function(self, sample_cfg):
+        add_call = find_token(sample_cfg, 'add', skip=1)
+        assert add_call.function
+        assert add_call.function.name == 'add'
+
+    def test_value_type(self, sample_cfg):
+        x_tok = find_token(sample_cfg, 'x')
+        assert x_tok.valueType.type == 'int'
+        assert x_tok.valueType.sign == 'signed'
+        assert x_tok.valueType.pointer == 0
+        assert x_tok.valueType.isIntegral()
+        assert not x_tok.valueType.isFloat()
+        assert not x_tok.valueType.isEnum()
+        d_tok = find_token(sample_cfg, 'd')
+        assert d_tok.valueType.type == 'double'
+        assert d_tok.valueType.isFloat()
+        # in 'arr[0] = ...' the array decays to a pointer
+        arr_use = find_token(sample_cfg, 'arr', skip=1)
+        assert arr_use.valueType.pointer == 1
+
+    def test_value_type_enum(self, sample_cpp_cfg):
+        color_tok = find_token(sample_cpp_cfg, 'color')
+        assert color_tok.valueType.isEnum()
+        assert color_tok.valueType.typeScope.className == 'Color'
+
+    def test_ast(self, sample_cfg):
+        plus = find_token(sample_cfg, '+')
+        assert plus.astOperand1.str == 'a'
+        assert plus.astOperand2.str == 'b'
+        assert plus.astParent.str == 'return'
+        assert plus.isBinaryOp()
+        assert not plus.isUnaryOp('+')
+
+    def test_ast_unary_op(self, sample_cfg):
+        # the '-' in 'int neg = -x;'
+        minus = find_token(sample_cfg, '-')
+        assert minus.isUnaryOp('-')
+        assert not minus.isBinaryOp()
+        assert minus.astOperand1.str == 'x'
+        assert minus.astOperand2 is None
+
+    def test_ast_parents_top(self, sample_cfg):
+        a_tok = find_token(sample_cfg, 'a', skip=1)  # the 'a' in 'return a + b;'
+        assert [tok.str for tok in a_tok.astParents()] == ['+', 'return']
+        assert a_tok.astTop().str == 'return'
+
+    def test_values(self, sample_cfg):
+        # 'x' has the known value 42 when it is used
+        x_use = find_token(sample_cfg, 'x', skip=2)
+        assert x_use.getKnownIntValue() == 42
+        value = x_use.getValue(42)
+        assert value.intvalue == 42
+        assert value.isKnown()
+        assert not value.isPossible()
+        assert x_use.getValue(43) is None
+        assert 'intvalue=42' in repr(value)
+
+    def test_values_possible(self, sample_cfg):
+        # inside add() the argument 'a' has the possible value 42
+        a_use = find_token(sample_cfg, 'a', skip=1)
+        assert a_use.getKnownIntValue() is None
+        value = a_use.getValue(42)
+        assert value is not None
+        assert value.isPossible()
+
+    def test_impossible_values(self, sample_cfg):
+        # impossible values are separated from the possible/known ones
+        arr_tokens = find_tokens(sample_cfg, 'arr')
+        impossible = [v for tok in arr_tokens for v in tok.impossible_values]
+        assert impossible
+        assert all(v.isImpossible() for v in impossible)
+        possible_or_known = [v for tok in arr_tokens for v in tok.values]
+        assert all(not v.isImpossible() for v in possible_or_known)
+
+    def test_forward_backward(self, sample_cfg):
+        add_def = find_token(sample_cfg, 'add')
+        strs = [tok.str for tok in add_def.forward()]
+        assert strs[:4] == ['add', '(', 'int', 'a']
+        end = add_def.tokAt(2)
+        assert [tok.str for tok in add_def.forward(end=end)] == ['add', '(']
+        strs = [tok.str for tok in add_def.backward()]
+        assert strs[:3] == ['add', 'int', 'static']
+        start = sample_cfg.tokenlist[0]
+        assert [tok.str for tok in add_def.backward(start=start)] == ['add', 'int']
+
+    def test_tokAt_linkAt(self, sample_cfg):
+        add_def = find_token(sample_cfg, 'add')
+        assert add_def.tokAt(0) is add_def
+        assert add_def.tokAt(1).str == '('
+        assert add_def.tokAt(-1).str == 'int'
+        assert add_def.linkAt(1).str == ')'
+
+    def test_repr(self, sample_cfg):
+        tok = sample_cfg.tokenlist[0]
+        assert "str='static'" in repr(tok)
+
+
+class TestScope:
+    def test_scopes(self, sample_cfg):
+        types = [scope.type for scope in sample_cfg.scopes]
+        assert types.count('Global') == 1
+        assert types.count('Function') == 3
+
+    def test_global_scope(self, sample_cfg):
+        global_scope = find_scope(sample_cfg, 'Global')
+        assert global_scope.nestedIn is None
+        assert not global_scope.isExecutable
+        assert len(global_scope.nestedList) == 3
+
+    def test_function_scope(self, sample_cfg):
+        scope = find_scope(sample_cfg, 'Function', className='add')
+        assert scope.bodyStart.str == '{'
+        assert scope.bodyEnd.str == '}'
+        assert scope.bodyStart.link is scope.bodyEnd
+        assert scope.nestedIn.type == 'Global'
+        assert scope.function.name == 'add'
+        assert scope.isExecutable
+
+    def test_varlist(self, sample_cfg):
+        scope = find_scope(sample_cfg, 'Function', className='main')
+        names = [var.nameToken.str for var in scope.varlist]
+        assert names == ['x', 'arr', 'neg']
+
+    def test_cpp_scopes(self, sample_cpp_cfg):
+        types = {scope.type for scope in sample_cpp_cfg.scopes}
+        assert {'Global', 'Namespace', 'Class', 'Enum', 'Function', 'If'} <= types
+        assert find_scope(sample_cpp_cfg, 'Namespace', className='ns')
+        assert find_scope(sample_cpp_cfg, 'Class', className='Shape')
+        if_scope = find_scope(sample_cpp_cfg, 'If')
+        assert if_scope.isExecutable
+        class_scope = find_scope(sample_cpp_cfg, 'Class')
+        assert not class_scope.isExecutable
+
+
+class TestFunction:
+    def test_functions(self, sample_cfg):
+        names = {function.name for function in sample_cfg.functions}
+        assert names == {'add', 'half', 'main'}
+
+    def test_arguments(self, sample_cfg):
+        add = find_function(sample_cfg, 'add')
+        assert sorted(add.argument.keys()) == [1, 2]
+        assert add.argument[1].nameToken.str == 'a'
+        assert add.argument[2].nameToken.str == 'b'
+        main = find_function(sample_cfg, 'main')
+        assert main.argument == {}
+
+    def test_attributes(self, sample_cfg):
+        add = find_function(sample_cfg, 'add')
+        assert add.isStatic
+        assert add.type == 'Function'
+        assert add.tokenDef.str == 'add'
+        assert add.token.str == 'add'
+        assert add.nestedIn.type == 'Global'
+        main = find_function(sample_cfg, 'main')
+        assert not main.isStatic
+
+    def test_virtual(self, sample_cpp_cfg):
+        area = find_function(sample_cpp_cfg, 'area')
+        assert area.hasVirtualSpecifier
+        twice = find_function(sample_cpp_cfg, 'twice')
+        assert not twice.hasVirtualSpecifier
+        assert twice.nestedIn.className == 'ns'
+
+
+class TestVariable:
+    def test_local(self, sample_cfg):
+        x = find_variable(sample_cfg, 'x')
+        assert x.access == 'Local'
+        assert x.isLocal
+        assert not x.isArgument
+        assert not x.isGlobal
+        assert not x.isArray
+        assert x.typeStartToken.str == 'int'
+        assert x.typeEndToken.str == 'int'
+        assert x.scope.className == 'main'
+
+    def test_argument(self, sample_cfg):
+        a = find_variable(sample_cfg, 'a')
+        assert a.access == 'Argument'
+        assert a.isArgument
+        assert not a.isLocal
+
+    def test_array(self, sample_cfg):
+        arr = find_variable(sample_cfg, 'arr')
+        assert arr.isArray
+        assert not arr.isPointer
+
+    def test_global_const(self, sample_cpp_cfg):
+        limit = find_variable(sample_cpp_cfg, 'limit')
+        assert limit.access == 'Global'
+        assert limit.isGlobal
+        assert limit.isConst
+        assert not limit.isStatic
+
+    def test_pointer(self, sample_cpp_cfg):
+        msg = find_variable(sample_cpp_cfg, 'msg')
+        assert msg.isPointer
+        assert not msg.isArray
+
+    def test_class_member(self, sample_cpp_cfg):
+        member = find_variable(sample_cpp_cfg, 'mScale')
+        assert member.access == 'Protected'
+        assert member.isClass is False
+
+
+class TestPreprocessor:
+    def test_directives(self, sample_cfg):
+        directives = sample_cfg.directives
+        assert len(directives) == 1
+        assert directives[0].str == '#define ANSWER 42'
+        assert directives[0].file.endswith('sample.c')
+        assert directives[0].linenr == 1
+        assert "#define ANSWER 42" in repr(directives[0])
+
+    def test_macro_usage(self, sample_cfg):
+        macros = sample_cfg.macro_usage
+        assert len(macros) == 1
+        macro = macros[0]
+        assert macro.name == 'ANSWER'
+        assert macro.usefile.endswith('sample.c')
+        assert int(macro.useline) == 14
+        assert macro.isKnownValue
+        assert "name='ANSWER'" in repr(macro)
+
+    def test_if_conditions(self, multi_cfg_data):
+        cfgs = multi_cfg_data.configurations
+        for cfg in cfgs:
+            assert len(cfg.preprocessor_if_conditions) == 1
+            assert cfg.preprocessor_if_conditions[0].linenr == 3
+        assert cfgs[0].preprocessor_if_conditions[0].result == 0
+        assert cfgs[1].preprocessor_if_conditions[0].result == 1
+        assert 'result=' in repr(cfgs[0].preprocessor_if_conditions[0])
+
+    def test_typedef_info(self, multi_cfg_data):
+        cfg = multi_cfg_data.configurations[0]
+        typedefs = {info.name: info for info in cfg.typedefInfo}
+        assert set(typedefs.keys()) == {'myint', 'myfloat'}
+        assert typedefs['myint'].used
+        assert not typedefs['myfloat'].used
+        assert typedefs['myint'].linenr == 1
+
+
+class TestHelperFunctions:
+    def test_getArguments(self, sample_cfg):
+        add_call = find_token(sample_cfg, 'add', skip=1)
+        args = cppcheckdata.getArguments(add_call)
+        assert [tok.str for tok in args] == ['x', '1']
+
+    def test_getArguments_no_call(self, sample_cfg):
+        int_tok = find_token(sample_cfg, 'int')
+        assert cppcheckdata.getArguments(int_tok) is None
+
+    def test_get_function_call_name_args(self, sample_cfg):
+        add_call = find_token(sample_cfg, 'add', skip=1)
+        name, args = cppcheckdata.get_function_call_name_args(add_call)
+        assert name == 'add'
+        assert [tok.str for tok in args] == ['x', '1']
+
+    def test_get_function_call_name_args_namespace(self, sample_cpp_cfg):
+        twice_call = find_token(sample_cpp_cfg, 'twice', skip=1)
+        name, args = cppcheckdata.get_function_call_name_args(twice_call)
+        assert name == 'ns::twice'
+        assert [tok.str for tok in args] == ['21']
+
+    def test_get_function_call_name_args_not_a_call(self, sample_cfg):
+        # the function definition is not a call
+        add_def = find_token(sample_cfg, 'add')
+        name, args = cppcheckdata.get_function_call_name_args(add_def)
+        assert name is None
+        assert args is None
+
+    def test_astIsFloat(self, sample_cfg):
+        division = find_token(sample_cfg, '/')
+        assert cppcheckdata.astIsFloat(division)
+        plus = find_token(sample_cfg, '+')  # a + b with int operands
+        assert not cppcheckdata.astIsFloat(plus)
+        assert not cppcheckdata.astIsFloat(None)
+
+
+class TestMatch:
+    """Tests for the cppcheckdata.match()/simpleMatch() pattern matching."""
+
+    def test_simpleMatch(self, match_cfg):
+        calc_def = find_token(match_cfg, 'calc')
+        assert cppcheckdata.simpleMatch(calc_def, 'calc')
+        assert cppcheckdata.simpleMatch(calc_def, 'calc ( int a , int b )')
+        assert not cppcheckdata.simpleMatch(calc_def, 'calc ( int b')
+        assert not cppcheckdata.simpleMatch(None, 'calc')
+
+    def test_literal_sequence(self, match_cfg):
+        calc_def = find_token(match_cfg, 'calc')
+        assert cppcheckdata.match(calc_def, 'calc ( int')
+        assert cppcheckdata.match(calc_def, 'calc ( int a , int b )')
+        assert not cppcheckdata.match(calc_def, 'calc ( char')
+        # the match is anchored at the given token
+        assert not cppcheckdata.match(calc_def, 'int calc')
+
+    def test_empty_pattern_and_no_token(self, match_cfg):
+        calc_def = find_token(match_cfg, 'calc')
+        assert not cppcheckdata.match(calc_def, '')
+        assert not cppcheckdata.match(None, 'calc')
+
+    def test_end(self, match_cfg):
+        calc_def = find_token(match_cfg, 'calc')
+        res = cppcheckdata.match(calc_def, 'calc')
+        assert res.end is calc_def
+        res = cppcheckdata.match(calc_def, 'calc ( int')
+        assert res.end.str == 'int'
+
+    # ---- literal operator tokens ----
+
+    def test_literal_bitwise_or(self, match_cfg):
+        # a literal '|' in the pattern matches a '|' token ...
+        bit_or = find_token(match_cfg, '|')
+        assert cppcheckdata.match(bit_or, '|')
+        assert cppcheckdata.match(bit_or.previous, '%var% | %var% ;')
+        # ... but not a '||' token, and it is not an either-or alternation
+        log_or = find_token(match_cfg, '||')
+        assert not cppcheckdata.match(log_or, '|')
+
+    def test_literal_logical_or(self, match_cfg):
+        log_or = find_token(match_cfg, '||')
+        assert cppcheckdata.match(log_or, '||')
+        assert cppcheckdata.match(log_or.previous, '%var% || %var% ;')
+        bit_or = find_token(match_cfg, '|')
+        assert not cppcheckdata.match(bit_or, '||')
+
+    def test_literal_not(self, match_cfg):
+        not_tok = find_token(match_cfg, '!')
+        assert cppcheckdata.match(not_tok, '! %var% ;')
+        assert not cppcheckdata.match(find_token(match_cfg, '!='), '!')
+
+    def test_literal_not_equal(self, match_cfg):
+        neq = find_token(match_cfg, '!=')
+        assert cppcheckdata.match(neq, '!=')
+        assert cppcheckdata.match(neq.previous, '%var% != %var% ;')
+        assert not cppcheckdata.match(find_token(match_cfg, '='), '!=')
+        assert not cppcheckdata.match(neq, '=')
+
+    def test_literal_star(self, match_cfg):
+        mul = find_token(match_cfg, '*')
+        assert cppcheckdata.match(mul, '*')
+        assert cppcheckdata.match(mul.previous, '%var% * %var% ;')
+
+    def test_literal_percent(self, match_cfg):
+        mod = find_token(match_cfg, '%')
+        assert cppcheckdata.match(mod, '%')
+        assert cppcheckdata.match(mod.previous, '%var% % %var% ;')
+
+    def test_literal_parentheses(self, match_cfg):
+        calc_call = find_token(match_cfg, 'calc', skip=1)
+        assert cppcheckdata.match(calc_call, 'calc ( %var% , %var% ) ;')
+
+    # ---- %keyword% patterns ----
+
+    def test_any(self, match_cfg):
+        for token_str in ('calc', '(', '3', ';', '|', '{'):
+            assert cppcheckdata.match(find_token(match_cfg, token_str), '%any%')
+        plus_assign = find_token(match_cfg, '+=')
+        assert cppcheckdata.match(plus_assign, '%assign% %any% ;')
+
+    def test_assign(self, match_cfg):
+        assert cppcheckdata.match(find_token(match_cfg, '='), '%assign%')
+        assert cppcheckdata.match(find_token(match_cfg, '+='), '%assign%')
+        assert not cppcheckdata.match(find_token(match_cfg, '!='), '%assign%')
+        assert not cppcheckdata.match(find_token(match_cfg, '|'), '%assign%')
+
+    def test_comp(self, match_cfg):
+        assert cppcheckdata.match(find_token(match_cfg, '>'), '%comp%')
+        assert cppcheckdata.match(find_token(match_cfg, '!='), '%comp%')
+        assert not cppcheckdata.match(find_token(match_cfg, '='), '%comp%')
+        assert not cppcheckdata.match(find_token(match_cfg, '|'), '%comp%')
+
+    def test_name(self, match_cfg):
+        assert cppcheckdata.match(find_token(match_cfg, 'calc'), '%name%')
+        assert cppcheckdata.match(find_token(match_cfg, 'int'), '%name%')
+        assert not cppcheckdata.match(find_token(match_cfg, '3'), '%name%')
+        assert not cppcheckdata.match(find_token(match_cfg, '('), '%name%')
+
+    def test_op(self, match_cfg):
+        for op in ('|', '||', '*', '%', '!=', '>', '=', '+='):
+            assert cppcheckdata.match(find_token(match_cfg, op), '%op%'), op
+        assert not cppcheckdata.match(find_token(match_cfg, ';'), '%op%')
+        assert not cppcheckdata.match(find_token(match_cfg, 'calc'), '%op%')
+
+    def test_or(self, match_cfg):
+        assert cppcheckdata.match(find_token(match_cfg, '|'), '%or%')
+        assert not cppcheckdata.match(find_token(match_cfg, '||'), '%or%')
+
+    def test_oror(self, match_cfg):
+        assert cppcheckdata.match(find_token(match_cfg, '||'), '%oror%')
+        assert not cppcheckdata.match(find_token(match_cfg, '|'), '%oror%')
+
+    def test_var(self, match_cfg):
+        a_use = find_token(match_cfg, 'a', skip=1)
+        assert cppcheckdata.match(a_use, '%var%')
+        # a function name is a %name% but not a %var%
+        assert not cppcheckdata.match(find_token(match_cfg, 'calc'), '%var%')
+        assert not cppcheckdata.match(find_token(match_cfg, '3'), '%var%')
+
+    # ---- link patterns ----
+
+    def test_link_parentheses(self, match_cfg):
+        calc_call = find_token(match_cfg, 'calc', skip=1)
+        res = cppcheckdata.match(calc_call.next, '(*)')
+        assert res
+        assert res.end.str == ')'
+        assert res.end is calc_call.next.link
+        # the pattern continues after the linked token
+        assert cppcheckdata.match(calc_call, '%name% (*) ;')
+        # '(*)' only matches at a '(' token
+        assert not cppcheckdata.match(calc_call, '(*)')
+
+    def test_link_brackets(self, match_cfg):
+        arr_decl = find_token(match_cfg, 'arr')
+        assert cppcheckdata.match(arr_decl, 'arr [*] ;')
+        arr_use = find_token(match_cfg, 'arr', skip=1)
+        res = cppcheckdata.match(arr_use, '%name% [*] %assign% %var% ;')
+        assert res
+
+    def test_link_braces(self, match_cfg):
+        if_scope = find_scope(match_cfg, 'If')
+        res = cppcheckdata.match(if_scope.bodyStart, '{*}')
+        assert res
+        assert res.end is if_scope.bodyEnd
+
+    def test_link_combined(self, match_cfg):
+        if_tok = find_token(match_cfg, 'if')
+        res = cppcheckdata.match(if_tok, 'if (*) {*}')
+        assert res
+        assert res.end.str == '}'
+
+    def test_link_angle_brackets(self, match_cpp_cfg):
+        # the '<' of 'std::vector<int>' is linked to the '>'
+        template_lt = find_token(match_cpp_cfg, '<')
+        assert template_lt.link
+        res = cppcheckdata.match(template_lt, '<*>')
+        assert res
+        assert res.end.str == '>'
+        assert cppcheckdata.match(template_lt.previous, 'vector <*> %var%')
+        # the '<' in 'i < j' is a comparison without a link
+        comparison_lt = find_token(match_cpp_cfg, '<', skip=1)
+        assert comparison_lt.link is None
+        assert not cppcheckdata.match(comparison_lt, '<*>')
+
+    # ---- either-or alternation ----
+
+    def test_alternatives(self, match_cfg):
+        struct_tok = find_token(match_cfg, 'struct')
+        assert cppcheckdata.match(struct_tok, 'struct|class %name% {')
+        assert not cppcheckdata.match(struct_tok, 'union|enum %name% {')
+
+    def test_alternatives_cpp(self, match_cpp_cfg):
+        class_tok = find_token(match_cpp_cfg, 'class')
+        assert cppcheckdata.match(class_tok, 'struct|class %name% {')
+
+    def test_alternatives_with_keyword(self, match_cfg):
+        struct_tok = find_token(match_cfg, 'struct')
+        assert cppcheckdata.match(struct_tok, '%op%|struct')
+        assert not cppcheckdata.match(struct_tok, '%op%|%comp%')
+
+    # ---- negation ----
+
+    def test_negation(self, match_cfg):
+        struct_tok = find_token(match_cfg, 'struct')
+        assert cppcheckdata.match(struct_tok, 'struct !!;')
+        assert not cppcheckdata.match(struct_tok, 'struct !!Point')
+
+    def test_negation_keyword(self, match_cfg):
+        calc_call = find_token(match_cfg, 'calc', skip=1)
+        assert cppcheckdata.match(calc_call, '%name% !!%op%')
+        assert not cppcheckdata.match(calc_call, '%name% !!(')
+
+    @pytest.mark.xfail(strict=False,
+                       reason='in the C++ Token::Match a negation also matches when there is no token, '
+                              'in match() it does not')
+    def test_negation_no_token(self, match_cfg):
+        last = match_cfg.tokenlist[-1]
+        assert last.str == '}'
+        assert cppcheckdata.match(last, '} !!x')
+
+    # ---- bindings ----
+
+    def test_bindings(self, match_cfg):
+        calc_call = find_token(match_cfg, 'calc', skip=1)
+        res = cppcheckdata.match(calc_call, '%name%@ftok (*)')
+        assert res
+        assert res.ftok is calc_call
+        assert res.ftok.str == 'calc'
+        assert res.end.str == ')'
+
+    def test_multiple_bindings(self, match_cfg):
+        bit_or_lhs = find_token(match_cfg, 'bit_or', skip=1)
+        res = cppcheckdata.match(bit_or_lhs, '%var%@lhs = %var%@op1 | %var%@op2 ;')
+        assert res
+        assert res.lhs.str == 'bit_or'
+        assert res.op1.str == 'a'
+        assert res.op2.str == 'b'
+
+    def test_binding_on_link_pattern(self, match_cfg):
+        calc_call = find_token(match_cfg, 'calc', skip=1)
+        # the binding is the '(' token, end is behind the linked ')'
+        res = cppcheckdata.match(calc_call, '%name% (*)@paren')
+        assert res
+        assert res.paren.str == '('
+        assert res.paren.link is res.end
+
+    def test_bindings_on_failure(self, match_cfg):
+        calc_call = find_token(match_cfg, 'calc', skip=1)
+        res = cppcheckdata.match(calc_call, '%name%@ftok [*]@brackets')
+        assert not res
+        # all bindings (including 'end') read as None on a failed match
+        assert res.ftok is None
+        assert res.brackets is None
+        assert res.end is None
+
+    def test_unknown_binding_raises(self, match_cfg):
+        calc_call = find_token(match_cfg, 'calc', skip=1)
+        res = cppcheckdata.match(calc_call, '%name%@ftok (*)')
+        assert res
+        with pytest.raises(AttributeError):
+            res.nosuchbinding # pylint: disable=W0104
+        res = cppcheckdata.match(calc_call, '%name%@ftok [*]')
+        assert not res
+        with pytest.raises(AttributeError):
+            res.nosuchbinding # pylint: disable=W0104
+
+    # ---- '**' forward search ----
+
+    def test_find_forward(self, match_cfg):
+        calc_def = find_token(match_cfg, 'calc')
+        # '**' searches forward, skipping linked groups: the '{' found here
+        # is the function body, not a '{' inside the parameter list
+        res = cppcheckdata.match(calc_def, 'calc **{')
+        assert res
+        assert res.end.str == '{'
+        assert not cppcheckdata.match(calc_def, 'calc **nosuchtoken')
+
+
+class TestSuppressions:
+    def make_suppression(self, **kwargs):
+        return cppcheckdata.Suppression(kwargs)
+
+    def test_line_suppression(self):
+        supp = self.make_suppression(errorId='zerodiv', lineNumber='5')
+        assert supp.isMatch('a.c', '5', 'msg', 'zerodiv')
+        assert not supp.isMatch('a.c', '5', 'msg', 'nullPointer')
+
+    @pytest.mark.xfail(strict=False,
+                       reason='the "other suppression" fallback in Suppression.isMatch() does not check '
+                              'that lineNumber is unset, so a line suppression matches every line')
+    def test_line_suppression_other_line(self):
+        supp = self.make_suppression(errorId='zerodiv', lineNumber='5')
+        assert not supp.isMatch('a.c', '6', 'msg', 'zerodiv')
+
+    def test_wildcard_errorId(self):
+        supp = self.make_suppression(errorId='*', lineNumber='5')
+        assert supp.isMatch('a.c', '5', 'msg', 'anything')
+
+    def test_file_suppression(self):
+        supp = self.make_suppression(errorId='zerodiv', fileName='a.c', type='file')
+        assert supp.isMatch('a.c', '1', 'msg', 'zerodiv')
+        assert supp.isMatch('a.c', '99', 'msg', 'zerodiv')
+        assert not supp.isMatch('b.c', '1', 'msg', 'zerodiv')
+
+    def test_block_suppression(self):
+        supp = self.make_suppression(errorId='zerodiv', type='block', lineBegin='3', lineEnd='7')
+        assert supp.isMatch('a.c', '5', 'msg', 'zerodiv')
+        assert not supp.isMatch('a.c', '3', 'msg', 'zerodiv')
+        assert not supp.isMatch('a.c', '7', 'msg', 'zerodiv')
+
+    def test_global_suppression(self):
+        supp = self.make_suppression(errorId='zerodiv')
+        assert supp.isMatch('a.c', '1', 'msg', 'zerodiv')
+        assert supp.isMatch('b.c', '99', 'other', 'zerodiv')
+
+    def test_symbolName(self):
+        supp = self.make_suppression(errorId='zerodiv', symbolName='xyz')
+        assert supp.isMatch('a.c', '1', 'error on xyz here', 'zerodiv')
+        assert not supp.isMatch('a.c', '1', 'other message', 'zerodiv')
+
+    def test_dumpfile_suppressions(self, dump_factory):
+        code = ('void f(void)\n'
+                '{\n'
+                '    int a;\n'
+                '    // cppcheck-suppress uninitvar\n'
+                '    a++;\n'
+                '}\n')
+        data = dump_factory.parse(code, extra_args=['--inline-suppr'])
+        assert len(data.suppressions) == 1
+        supp = data.suppressions[0]
+        assert supp.errorId == 'uninitvar'
+        assert supp.fileName.endswith('test.c')
+        assert int(supp.lineNumber) == 5
+        # parsedump() also sets the suppressions used by is_suppressed()
+        location = cppcheckdata.Location({'file': supp.fileName, 'line': '5', 'column': '5'})
+        assert cppcheckdata.is_suppressed(location, 'msg', 'uninitvar')
+        assert not cppcheckdata.is_suppressed(location, 'msg', 'nullPointer')
+        # NOTE: a non-matching line is not checked here - see test_line_suppression_other_line
+
+
+class TestPureHelpers:
+    """Tests that construct objects from dicts and do not need a dump file."""
+
+    def test_location(self):
+        loc = cppcheckdata.Location({'file': 'a.c', 'line': '3', 'column': '7'})
+        assert loc.file == 'a.c'
+        assert loc.linenr == 3
+        assert loc.column == 7
+
+    def test_location_defaults(self):
+        loc = cppcheckdata.Location({'file': 'a.c'})
+        assert loc.linenr == 0
+        assert loc.column == 0
+
+    def test_location_linenr_alias(self):
+        loc = cppcheckdata.Location({'file': 'a.c', 'linenr': '4'})
+        assert loc.linenr == 4
+
+    def test_value_kinds(self):
+        known = cppcheckdata.Value({'intvalue': '42', 'known': 'true'})
+        assert known.intvalue == 42
+        assert known.isKnown()
+        assert not known.isPossible()
+        possible = cppcheckdata.Value({'intvalue': '1', 'possible': 'true'})
+        assert possible.isPossible()
+        impossible = cppcheckdata.Value({'intvalue': '0', 'impossible': 'true'})
+        assert impossible.isImpossible()
+        inconclusive = cppcheckdata.Value({'intvalue': '2', 'inconclusive': 'true'})
+        assert inconclusive.isInconclusive()
+
+    def test_value_condition(self):
+        value = cppcheckdata.Value({'intvalue': '1', 'possible': 'true', 'condition-line': '12'})
+        assert value.condition == 12
+
+    def test_argument_parser(self):
+        parser = cppcheckdata.ArgumentParser()
+        args = parser.parse_args(['a.dump', 'b.ctu-info', '--cli', '-q'])
+        assert args.dumpfile == ['a.dump', 'b.ctu-info']
+        assert args.cli
+        assert args.quiet
+        assert args.file_list is None
+        assert '{severity}' in args.template
+
+    def test_get_files(self, tmp_path):
+        file_list = tmp_path / 'files.txt'
+        file_list.write_text('c.dump\nd.ctu-info\n')
+        parser = cppcheckdata.ArgumentParser()
+        args = parser.parse_args(['a.dump', 'b.ctu-info', '--file-list', str(file_list)])
+        dump_files, ctu_info_files = cppcheckdata.get_files(args)
+        assert dump_files == ['a.dump', 'c.dump']
+        assert ctu_info_files == ['b.ctu-info', 'd.ctu-info']
+
+
+class TestReporting:
+    def test_reportError_cli(self, monkeypatch, capsys):
+        monkeypatch.setattr(sys, 'argv', ['myaddon.py', '--cli'])
+        location = cppcheckdata.Location({'file': 'a.c', 'line': '3', 'column': '7'})
+        cppcheckdata.reportError(location, 'error', 'the message', 'myaddon', 'myid', extra='extra info')
+        msg = json.loads(capsys.readouterr().out)
+        assert msg == {'file': 'a.c',
+                       'linenr': 3,
+                       'column': 7,
+                       'severity': 'error',
+                       'message': 'the message',
+                       'addon': 'myaddon',
+                       'errorId': 'myid',
+                       'extra': 'extra info'}
+
+    def test_reportError_cli_column_override(self, monkeypatch, capsys):
+        monkeypatch.setattr(sys, 'argv', ['myaddon.py', '--cli'])
+        location = cppcheckdata.Location({'file': 'a.c', 'line': '3', 'column': '7'})
+        cppcheckdata.reportError(location, 'error', 'the message', 'myaddon', 'myid', columnOverride=42)
+        msg = json.loads(capsys.readouterr().out)
+        assert msg['column'] == 42
+
+    def test_reportError_stderr(self, monkeypatch, capsys):
+        monkeypatch.setattr(sys, 'argv', ['myaddon.py'])
+        monkeypatch.setattr(cppcheckdata, 'current_dumpfile_suppressions', [])
+        monkeypatch.setattr(cppcheckdata, 'EXIT_CODE', 0)
+        location = cppcheckdata.Location({'file': 'a.c', 'line': '3', 'column': '7'})
+        cppcheckdata.reportError(location, 'style', 'the message', 'myaddon', 'myid')
+        stderr = capsys.readouterr().err
+        assert stderr == '[a.c:3] (style) the message [myaddon-myid]\n'
+        assert cppcheckdata.EXIT_CODE == 1
+
+    def test_reportError_stderr_suppressed(self, monkeypatch, capsys):
+        monkeypatch.setattr(sys, 'argv', ['myaddon.py'])
+        suppression = cppcheckdata.Suppression({'errorId': 'myaddon-myid'})
+        monkeypatch.setattr(cppcheckdata, 'current_dumpfile_suppressions', [suppression])
+        monkeypatch.setattr(cppcheckdata, 'EXIT_CODE', 0)
+        location = cppcheckdata.Location({'file': 'a.c', 'line': '3', 'column': '7'})
+        cppcheckdata.reportError(location, 'style', 'the message', 'myaddon', 'myid')
+        assert capsys.readouterr().err == ''
+        assert cppcheckdata.EXIT_CODE == 0
+
+    def test_log_checker_cli(self, monkeypatch, capsys):
+        monkeypatch.setattr(sys, 'argv', ['myaddon.py', '--cli'])
+        cppcheckdata.log_checker('SomeChecker', 'myaddon')
+        msg = json.loads(capsys.readouterr().out)
+        assert msg == {'addon': 'myaddon',
+                       'severity': 'none',
+                       'message': 'SomeChecker',
+                       'errorId': 'logChecker'}
+
+    def test_log_checker_no_cli(self, monkeypatch, capsys):
+        monkeypatch.setattr(sys, 'argv', ['myaddon.py'])
+        cppcheckdata.log_checker('SomeChecker', 'myaddon')
+        assert capsys.readouterr().out == ''
diff --git a/test/cfg/boost.cpp b/test/cfg/boost.cpp
index 7e724a8b472..27fae71b499 100644
--- a/test/cfg/boost.cpp
+++ b/test/cfg/boost.cpp
@@ -22,6 +22,8 @@
 #include <boost/thread/mutex.hpp> // IWYU pragma: keep
 #include <boost/thread/lock_guard.hpp>
 #include <boost/test/unit_test.hpp> // IWYU pragma: keep
+#include <boost/test/data/test_case.hpp>
+#include <boost/test/data/monomorphic.hpp>
 #include <boost/core/scoped_enum.hpp>
 #include <boost/foreach.hpp>
 
@@ -155,6 +157,7 @@ void test_BOOST_FOREACH_5()
 {
     std::set<int> data;
     BOOST_FOREACH(const int& i, get_data())
+        // cppcheck-suppress useStlAlgorithm
         data.insert(i);
 }
 
@@ -199,3 +202,46 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(my_tuple_test, T, test_types_w_tuples)
 }
 
 BOOST_AUTO_TEST_SUITE_END()
+
+// https://www.boost.org/doc/libs/latest/libs/test/doc/html/boost_test/tests_organization/test_cases/test_case_generation/datasets.html
+namespace bdata = boost::unit_test::data;
+
+// Dataset generating a Fibonacci sequence
+struct fibonacci_dataset {
+    // the type of the samples is deduced
+    // cppcheck-suppress unusedStructMember // FP #14795, used in template is_dataset
+    static const int arity = 1;
+
+    struct iterator {
+        int operator*() const { return b; }
+        void operator++() {
+            a = a + b;
+            std::swap(a, b);
+        }
+    private:
+        int a = 1;
+        int b = 1; // b is the output
+    };
+
+    // size is infinite
+    bdata::size_t size() const { return bdata::BOOST_TEST_DS_INFINITE_SIZE; }
+
+    // iterator
+    static iterator begin() { return iterator(); }
+};
+
+namespace boost { namespace unit_test { namespace data { namespace monomorphic {
+  // registering fibonacci_dataset as a proper dataset
+  template <>
+  struct is_dataset<fibonacci_dataset> : boost::mpl::true_ {};
+}}}}
+
+// Creating a test-driven dataset, the zip is for checking
+BOOST_DATA_TEST_CASE(
+    test1,
+    fibonacci_dataset() ^ bdata::make( { 1, 2, 3, 5, 8, 13, 21, 35, 56 } ),
+    fib_sample, exp)
+{
+      // cppcheck-suppress valueFlowBailoutIncompleteVar // TODO: fib_sample declared in test case
+      BOOST_TEST(fib_sample == exp);
+}
diff --git a/test/cfg/bsd.c b/test/cfg/bsd.c
index 3cb39c14810..e5a749ebb8f 100644
--- a/test/cfg/bsd.c
+++ b/test/cfg/bsd.c
@@ -11,6 +11,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <sys/mman.h>
 #include <sys/time.h>
 #include <sys/uio.h>
 
@@ -180,3 +181,9 @@ void reallocarray_notused(void)
     // cppcheck-suppress [leakReturnValNotUsed, ignoredReturnValue]
     reallocarray(NULL, 10, 10);
 }
+
+void mmap_fixed(void *addr) // No constParameterPointer: mmap() may replace the mapping at addr
+{
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
+    (void)mmap(addr, 0x1000, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0);
+}
diff --git a/test/cfg/cairo.c b/test/cfg/cairo.c
index a081a8fe52c..b8c518225a0 100644
--- a/test/cfg/cairo.c
+++ b/test/cfg/cairo.c
@@ -9,6 +9,9 @@
 
 #include <cairo.h>
 
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 2, 3)
+#endif
+
 void validCode(cairo_surface_t *target)
 {
     cairo_t * cairo1 = cairo_create(target);
diff --git a/test/cfg/gnu.c b/test/cfg/gnu.c
index 14dfcc7700f..7a2abd8aef5 100644
--- a/test/cfg/gnu.c
+++ b/test/cfg/gnu.c
@@ -12,6 +12,7 @@
 #define _GNU_SOURCE
 
 #include <string.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -157,6 +158,132 @@ int nullPointer_getopt_long_only(int argc, char* const* argv, const char* optstr
     return getopt_long_only(argc, argv, optstring, longopts, longindex);
 }
 
+bool nullPointer_builtin_add_overflow(char a, char b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_add_overflow(a, b, (char *)0);
+}
+
+bool nullPointer_builtin_sadd_overflow(int a, int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_sadd_overflow(a, b, (int *)0);
+}
+
+bool nullPointer_builtin_saddl_overflow(long int a, long int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_saddl_overflow(a, b, (long int *)0);
+}
+
+bool nullPointer_builtin_saddll_overflow(long long int a, long long int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_saddll_overflow(a, b, (long long int *)0);
+}
+
+bool nullPointer_builtin_uadd_overflow(unsigned int a, unsigned int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_uadd_overflow(a, b, (unsigned int *)0);
+}
+
+bool nullPointer_builtin_uaddl_overflow(unsigned long int a, unsigned long int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_uaddl_overflow(a, b, (unsigned long int *)0);
+}
+
+bool nullPointer_builtin_uaddll_overflow(unsigned long long int a, unsigned long long int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_uaddll_overflow(a, b, (unsigned long long int *)0);
+}
+
+bool nullPointer_builtin_sub_overflow(char a, char b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_sub_overflow(a, b, (char *)0);
+}
+
+bool nullPointer_builtin_ssub_overflow(int a, int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_ssub_overflow(a, b, (int *)0);
+}
+
+bool nullPointer_builtin_ssubl_overflow(long int a, long int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_ssubl_overflow(a, b, (long int *)0);
+}
+
+bool nullPointer_builtin_ssubll_overflow(long long int a, long long int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_ssubll_overflow(a, b, (long long int *)0);
+}
+
+bool nullPointer_builtin_usub_overflow(unsigned int a, unsigned int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_usub_overflow(a, b, (unsigned int *)0);
+}
+
+bool nullPointer_builtin_usubl_overflow(unsigned long int a, unsigned long int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_usubl_overflow(a, b, (unsigned long int *)0);
+}
+
+bool nullPointer_builtin_usubll_overflow(unsigned long long int a, unsigned long long int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_usubll_overflow(a, b, (unsigned long long int *)0);
+}
+
+bool nullPointer_builtin_mul_overflow(char a, char b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_mul_overflow(a, b, (char *)0);
+}
+
+bool nullPointer_builtin_smul_overflow(int a, int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_smul_overflow(a, b, (int *)0);
+}
+
+bool nullPointer_builtin_smull_overflow(long int a, long int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_smull_overflow(a, b, (long int *)0);
+}
+
+bool nullPointer_builtin_smulll_overflow(long long int a, long long int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_smulll_overflow(a, b, (long long int *)0);
+}
+
+bool nullPointer_builtin_umul_overflow(unsigned int a, unsigned int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_umul_overflow(a, b, (unsigned int *)0);
+}
+
+bool nullPointer_builtin_umull_overflow(unsigned long int a, unsigned long int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_umull_overflow(a, b, (unsigned long int *)0);
+}
+
+bool nullPointer_builtin_umulll_overflow(unsigned long long int a, unsigned long long int b)
+{
+    // cppcheck-suppress nullPointer
+    return __builtin_umulll_overflow(a, b, (unsigned long long int *)0);
+}
+
 #if !defined(__APPLE__)
 int nullPointer_getservent_r(struct servent *restrict result_buf, const char *restrict buf, size_t buflen, struct servent **restrict result)
 {
@@ -197,6 +324,31 @@ void knownConditionTrueFalse_ffsll(long long i)
     if (ffsll(i) == 0) {}
 }
 
+int uninitvar_popcount() {
+    unsigned int a;
+    // cppcheck-suppress uninitvar
+    int b = __builtin_popcount(a); // popcount requires init arg
+    return b;
+}
+
+int invalidFunctionArg_clz() {
+    // cppcheck-suppress invalidFunctionArg
+    return __builtin_clz(0);
+}
+
+int invalidFunctionArgBool_ctzg(unsigned int a, unsigned int b) {
+    // cppcheck-suppress invalidFunctionArgBool
+    return __builtin_ctzg(a, a % b == 0);
+}
+
+#if __GNUC__ > 14
+int ignoredReturnValue_stdc_width(size_t n) {
+    // cppcheck-suppress ignoredReturnValue
+    __builtin_stdc_bit_width(n);
+    return 0;
+}
+#endif
+
 #if !defined(__APPLE__)
 int nullPointer_semtimedop(int semid, struct sembuf *sops, size_t nsops, const struct timespec *timeout)
 {
@@ -224,6 +376,13 @@ wchar_t *nullPointer_wmempcpy(wchar_t *dest, const wchar_t *src, size_t n)
     return wmempcpy(dest,src,n);
 }
 
+void bufferAccessOutOfBounds_wmempcpy(const wchar_t *src)
+{
+    wchar_t buf[3];
+    // cppcheck-suppress bufferAccessOutOfBounds
+    wmempcpy(buf, src, 5);
+}
+
 int uninitvar_getpw(uid_t uid, char *buf)
 {
     uid_t someUid;
@@ -461,6 +620,216 @@ void uninitvar__builtin_memset(void)
     (void)__builtin_memset(s,c,n);
 }
 
+void uninitvar__builtin_add_overflow(void)
+{
+    char a;
+    char b;
+    char c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_add_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_sadd_overflow(void)
+{
+    int a;
+    int b;
+    int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_sadd_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_saddl_overflow(void)
+{
+    long int a;
+    long int b;
+    long int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_saddl_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_saddll_overflow(void)
+{
+    long long int a;
+    long long int b;
+    long long int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_saddll_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_uadd_overflow(void)
+{
+    unsigned int a;
+    unsigned int b;
+    unsigned int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_uadd_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_uaddl_overflow(void)
+{
+    unsigned long int a;
+    unsigned long int b;
+    unsigned long int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_uaddl_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_uaddll_overflow(void)
+{
+    unsigned long long int a;
+    unsigned long long int b;
+    unsigned long long int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_uaddll_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_sub_overflow(void)
+{
+    char a;
+    char b;
+    char c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_sub_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_ssub_overflow(void)
+{
+    int a;
+    int b;
+    int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_ssub_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_ssubl_overflow(void)
+{
+    long int a;
+    long int b;
+    long int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_ssubl_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_ssubll_overflow(void)
+{
+    long long int a;
+    long long int b;
+    long long int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_ssubll_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_usub_overflow(void)
+{
+    unsigned int a;
+    unsigned int b;
+    unsigned int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_usub_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_usubl_overflow(void)
+{
+    unsigned long int a;
+    unsigned long int b;
+    unsigned long int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_usubl_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_usubll_overflow(void)
+{
+    unsigned long long int a;
+    unsigned long long int b;
+    unsigned long long int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_usubll_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_mul_overflow(void)
+{
+    char a;
+    char b;
+    char c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_mul_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_smul_overflow(void)
+{
+    int a;
+    int b;
+    int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_smul_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_smull_overflow(void)
+{
+    long int a;
+    long int b;
+    long int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_smull_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_smulll_overflow(void)
+{
+    long long int a;
+    long long int b;
+    long long int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_smulll_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_umul_overflow(void)
+{
+    unsigned int a;
+    unsigned int b;
+    unsigned int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_umul_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_umull_overflow(void)
+{
+    unsigned long int a;
+    unsigned long int b;
+    unsigned long int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_umull_overflow(a, b, &c);
+}
+
+void uninitvar__builtin_umulll_overflow(void)
+{
+    unsigned long long int a;
+    unsigned long long int b;
+    unsigned long long int c;
+
+    // cppcheck-suppress uninitvar
+    (void)__builtin_umulll_overflow(a, b, &c);
+}
+
 void bufferAccessOutOfBounds__builtin_memset(void)
 {
     uint8_t buf[42];
@@ -536,3 +905,10 @@ int nullPointer_epoll_ctl(int epfd, int op, int fd, struct epoll_event *event)
     return epoll_ctl(epfd, EPOLL_CTL_DEL, fd, NULL);
 }
 #endif
+
+void mmap_fixed(void *addr) // No constParameterPointer: mmap() may replace the mapping at addr
+{
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
+    // cppcheck-suppress leakReturnValNotUsed
+    (void)mmap(addr, 0x1000, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+}
diff --git a/test/cfg/gtk.c b/test/cfg/gtk.c
index 8d5e9dd801d..2612b572638 100644
--- a/test/cfg/gtk.c
+++ b/test/cfg/gtk.c
@@ -11,8 +11,16 @@
 #include <glib.h>
 #include <glib/gtypes.h>
 #include <glib/gi18n.h>
+#include <gtk/gtk.h>
 
 
+#if GLIB_CHECK_VERSION(2, 3, 4)
+#endif
+#if GTK_CHECK_VERSION(4, 5, 6)
+#endif
+#if ATK_CHECK_VERSION(2, 3, 6)
+#endif
+
 void validCode(int argInt, GHashTableIter * hash_table_iter, GHashTable * hash_table)
 {
     g_assert_cmpint(4 + 1, >=, 5);
@@ -51,6 +59,14 @@ void validCode(int argInt, GHashTableIter * hash_table_iter, GHashTable * hash_t
     g_string_free(pGStr1, TRUE);
 
     gchar * pGchar1 = g_strconcat("a", "b", NULL);
+
+    // g_str_has_prefix and g_str_has_suffix can have side effects because they use
+    // g_return_val_if_fail, which logs to the console upon failure
+    // cppcheck-suppress assertWithSideEffect
+    g_assert_true(g_str_has_prefix(pGchar1, "a"));
+    // cppcheck-suppress assertWithSideEffect
+    g_assert_true(g_str_has_suffix(pGchar1, "b"));
+
     printf("%s", pGchar1);
     g_free(pGchar1);
 
@@ -74,6 +90,10 @@ void validCode(int argInt, GHashTableIter * hash_table_iter, GHashTable * hash_t
         // cppcheck-suppress valueFlowBailout // TODO: caused by <pure/>?
         printf("%s", str);
     g_free(str);
+
+    // transfer none functions: return value should not be unreffed
+    const GApplication *app = g_application_get_default();
+    printf("%p\n", app);
 }
 
 void g_malloc_test()
@@ -394,6 +414,7 @@ void g_error_new_test()
     g_error_new(1, -2, "a %d", 1);
 
     const GError * pNew2 = g_error_new(1, -2, "a %d", 1);
+    g_assert_true(g_error_matches(pNew2, 1, -2));
     printf("%p", pNew2);
     // cppcheck-suppress memleak
 }
@@ -518,6 +539,16 @@ void g_variant_test() {
     // cppcheck-suppress memleak
 }
 
+void g_list_test() {
+    GList *list1 = NULL;
+    gchar *c = "c";
+
+    list1 = g_list_append(list1, c);
+    g_assert_true(g_list_find(list1, c) != NULL);
+
+    g_list_free(list1);
+}
+
 void g_queue_test() {
     // cppcheck-suppress leakReturnValNotUsed
     g_queue_new();
@@ -573,3 +604,129 @@ void g_tree_test() {
     printf("%p\n", tree2);
     // cppcheck-suppress memleak
 }
+
+void gtk_widget_destroy_test() {
+    GtkWidget *widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    gtk_widget_show(widget);
+    // cppcheck-suppress memleak
+
+    widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    gtk_widget_show(widget);
+    // cppcheck-suppress mismatchAllocDealloc
+    g_object_unref(widget);
+}
+
+void g_return_if_fail_test(const char *s) {
+    // cppcheck-suppress valueFlowBailout
+    g_return_if_fail(s);
+
+    if (*s)
+        // cppcheck-suppress valueFlowBailout
+        g_return_if_fail(*s == 'a');
+    else
+        g_info("Test the else branch can be parsed");
+}
+
+int g_return_val_if_fail_test(const char *s) {
+    // cppcheck-suppress valueFlowBailout
+    g_return_val_if_fail(s, 1);
+
+    if (*s)
+        // cppcheck-suppress valueFlowBailout
+        g_return_val_if_fail(*s == 'a', 1);
+    else
+        g_info("Test the else branch can be parsed");
+
+    return 0;
+}
+
+void g_return_if_reached_test(const char *s) {
+    if (s)
+        g_return_if_reached();
+    else
+        g_info("Test the else branch can be parsed");
+}
+
+int g_return_val_if_reached_test(const char *s) {
+    if (s)
+        g_return_val_if_reached(1);
+    else
+        g_info("Test the else branch can be parsed");
+
+    return 0;
+}
+
+void g_ascii_formatd_test(double d)
+{
+    // g_ascii_formatd() writes the buffer and formats exactly one double
+    gchar buf[39];
+    g_ascii_formatd(buf, sizeof(buf), "%.2f", d);
+    g_print("%s", buf);
+
+    // cppcheck-suppress invalidPrintfArgType_sint
+    g_ascii_formatd(buf, sizeof(buf), "%d", d);
+    g_print("%s", buf);
+
+    gchar small[4];
+    // cppcheck-suppress bufferAccessOutOfBounds
+    g_ascii_formatd(small, sizeof(buf), "%.2f", d);
+    g_print("%s", small);
+}
+
+void g_ascii_formatd_format_test(const gchar *format, int i)
+{
+    gchar buf[39];
+    // cppcheck-suppress invalidFunctionArgBool
+    g_ascii_formatd(buf, sizeof(buf), format, i == 1);
+    g_print("%s", buf);
+
+    struct {
+        double x;
+    } s;
+    // cppcheck-suppress [uninitvar, uninitStructMember]
+    g_ascii_formatd(buf, sizeof(buf), format, s.x);
+    g_print("%s", buf);
+}
+
+#define MY_APP_TYPE_WINDOW my_app_window_get_type()
+G_DECLARE_FINAL_TYPE(MyAppWindow, my_app_window, MY_APP, WINDOW, GtkWindow)
+struct _MyAppWindow {
+    GtkWindow parent;
+};
+G_DEFINE_TYPE(MyAppWindow, my_app_window, GTK_TYPE_WINDOW)
+// cppcheck-suppress constParameterPointer
+static void my_app_window_class_init(MyAppWindowClass *class) {
+}
+// cppcheck-suppress constParameterPointer
+static void my_app_window_init(MyAppWindow *window) {
+}
+
+void g_declare_and_define_type_test(void) {
+    // cppcheck-suppress checkLibraryFunction
+    MyAppWindow *window = g_object_new(MY_APP_TYPE_WINDOW, NULL);
+    gtk_widget_show(GTK_WIDGET(window));
+    g_object_unref(window);
+}
+
+#if GLIB_CHECK_VERSION(2, 74, 0)
+typedef enum {
+    MY_ENUM_A,
+    MY_ENUM_B,
+} MyEnum;
+G_DEFINE_ENUM_TYPE (MyEnum, my_enum,
+    G_DEFINE_ENUM_VALUE (MY_ENUM_A, "a"),
+    G_DEFINE_ENUM_VALUE (MY_ENUM_B, "b"))
+typedef enum {
+    MY_FLAGS_A = 1 << 0,
+    MY_FLAGS_B = 1 << 1,
+} MyFlags;
+G_DEFINE_FLAGS_TYPE (MyFlags, my_flags,
+    G_DEFINE_ENUM_VALUE (MY_FLAGS_A, "a"),
+    G_DEFINE_ENUM_VALUE (MY_FLAGS_B, "b"))
+
+int g_define_enum_and_flags_type_test(void) {
+    MyEnum e = MY_ENUM_A;
+    MyFlags f = MY_FLAGS_A;
+    return e + f;
+}
+#endif
diff --git a/test/cfg/libcurl.c b/test/cfg/libcurl.c
index 07fd26b031f..f5faadbd0d1 100644
--- a/test/cfg/libcurl.c
+++ b/test/cfg/libcurl.c
@@ -12,6 +12,16 @@
 #include <curl/curl.h>
 #include <stdio.h>
 
+struct S_WriteHeader {
+    int x;
+};
+
+size_t cb_WriteHeader(void * /*ptr*/, size_t size, size_t nmemb, void *p) {
+    // cppcheck-suppress constVariablePointer
+    struct S_WriteHeader *s = (struct S_WriteHeader *)p;
+    return s->x ? size * nmemb : 0;
+}
+
 void validCode()
 {
     CURL *curl = curl_easy_init();
@@ -19,6 +29,9 @@ void validCode()
         CURLcode res;
         // cppcheck-suppress valueFlowBailoutIncompleteVar
         curl_easy_setopt(curl, CURLOPT_URL, "http://example.com");
+        curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, cb_WriteHeader);
+        struct S_WriteHeader s;
+        curl_easy_setopt(curl, CURLOPT_WRITEHEADER, &s); // #14692
         res = curl_easy_perform(curl);
         if (res != CURLE_OK) {
             printf("error");
diff --git a/test/cfg/microsoft_gsl.cpp b/test/cfg/microsoft_gsl.cpp
new file mode 100644
index 00000000000..4241cce045d
--- /dev/null
+++ b/test/cfg/microsoft_gsl.cpp
@@ -0,0 +1,72 @@
+// Test library configuration for microsoft_gsl.cfg
+//
+// Usage:
+// $ cppcheck --check-library --library=microsoft_gsl --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr --suppress=autoNoType test/cfg/microsoft_gsl.cpp
+// =>
+// No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
+//
+
+// C++ Standard Library
+#include <vector>
+
+// Guideline Support Library
+#include <gsl/gsl>
+
+struct owner_type
+{
+  owner_type() = default;
+  owner_type(const owner_type &) = delete;
+  owner_type(owner_type &&) = default;
+
+  ~owner_type() { delete ptr_; }
+
+  auto operator=(const owner_type &) -> owner_type & = delete;
+  auto operator=(owner_type &&) -> owner_type & = default;
+
+private:
+  gsl::owner<int *> ptr_{new int(42)};
+};
+
+auto pre_and_post_condition_test(int i) -> int
+{
+  Expects(i > 0);
+
+  const auto result{i * 2};
+
+  Ensures(result > 0);
+  return result;
+}
+
+auto suppress_macro_test(std::span<int> s) -> int
+{
+  GSL_SUPPRESS("bounds.1")
+  return s[0];
+}
+
+auto iterate_over_container_test(const std::vector<int> &v) -> int
+{
+  int sum{0};
+
+  for (gsl::index i{0}; i < v.size(); ++i)
+  {
+    sum += v[i];
+  }
+  return sum;
+}
+
+void not_null_test(gsl::not_null<int *> p)
+{
+  Expects(p != nullptr);
+  *p = 42;
+}
+
+void strict_not_null_test(gsl::strict_not_null<int *> p)
+{
+  Expects(p != nullptr);
+  *p = 42;
+}
+
+auto byte_test(gsl::byte b) -> gsl::byte
+{
+  return b | 0x81;
+}
diff --git a/test/cfg/posix.c b/test/cfg/posix.c
index 2e53d171dec..874ae168e34 100644
--- a/test/cfg/posix.c
+++ b/test/cfg/posix.c
@@ -37,6 +37,7 @@
 #include <strings.h>
 #if defined(__APPLE__)
 #include <xlocale.h>
+#include <limits.h>
 #endif
 #if !defined(__APPLE__)
 #include <mqueue.h>
@@ -193,6 +194,12 @@ void invalidFunctionArgStr_mbsnrtowcs(void)
     if (mbsnrtowcs (wenough, &cp, 1, 10, &s) != 1 || wcscmp (wenough, L"AEF") != 0) {}
 }
 
+int invalidFunctionArgStr_strncasecmp(const char* s)
+{
+    const char buf[3] = {'a', 'b', 'c'};
+    return strncasecmp(buf, s, 3);
+}
+
 struct tm * ignoredReturnValue_localtime(const time_t *tp)
 {
     // cppcheck-suppress [ignoredReturnValue,localtimeCalled]
@@ -718,6 +725,13 @@ size_t bufferAccessOutOfBounds_strnlen(const char *s, size_t maxlen)
     size_t len = strnlen(buf,2);
     // cppcheck-suppress bufferAccessOutOfBounds
     len+=strnlen(buf,3);
+    len+=strnlen("ab",5);
+    return len;
+}
+
+size_t bufferAccessOutOfBounds_strncasecmp(const char *s)
+{
+    size_t len = strncasecmp(s, "abc", 5);
     return len;
 }
 
@@ -1312,7 +1326,7 @@ void uninitvar(int fd)
     pthread_mutex_t mutex, mutex1, mutex2, mutex3;
     // cppcheck-suppress uninitvar
     write(x1,"ab",2);
-    // TODO cppcheck-suppress uninitvar
+    // cppcheck-suppress uninitvar
     write(fd,buf,2); // #6325
     // cppcheck-suppress uninitvar
     write(fd,"ab",x2);
@@ -1408,7 +1422,7 @@ void timet_h(const struct timespec* ptp1)
     clock_settime(clk_id2, ptp1);
 
     struct timespec tp;
-    // FIXME cppcheck-suppress uninitvar
+    // cppcheck-suppress uninitvar
     clock_settime(CLOCK_REALTIME, &tp); // #6577 - false negative
     // cppcheck-suppress uninitvar
     clock_settime(clk_id3, &tp);
@@ -1508,3 +1522,116 @@ void invalidFunctionArg_nice(int inc)
     // cppcheck-suppress invalidFunctionArg
     nice(+20);
 }
+
+void pthread_cond_wait_test(pthread_cond_t *cond, pthread_mutex_t *mutex)
+{
+    (void)pthread_cond_wait(cond, mutex);
+}
+
+void pthread_cond_timedwait_test(pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timespec *abstime)
+{
+    // cppcheck-suppress nullPointer
+    (void)pthread_cond_timedwait(cond, mutex, NULL);
+    (void)pthread_cond_timedwait(cond, mutex, abstime);
+}
+
+void pthread_cond_init_test(pthread_cond_t *cond, const pthread_condattr_t *attr)
+{
+    (void)pthread_cond_init(cond, NULL);
+    (void)pthread_cond_init(cond, attr);
+    const pthread_condattr_t *uattr;
+    // cppcheck-suppress uninitvar
+    (void)pthread_cond_init(cond, uattr);
+}
+
+void pthread_cond_destroy_test(const pthread_cond_t *cond)
+{
+    (void)pthread_cond_destroy(cond);
+}
+
+void pthread_cleanup_push_test(void (*routine)(void *), void *arg)
+{
+    pthread_cleanup_push(routine, arg);
+    pthread_cleanup_pop(0);
+}
+
+void pthread_cleanup_push_test_NULL(void (*routine)(void *))
+{
+    pthread_cleanup_push(routine, NULL);
+    pthread_cleanup_pop(0);
+}
+
+void pthread_mutexattr_init_test(pthread_mutexattr_t *attr)
+{
+    (void)pthread_mutexattr_init(attr);
+}
+
+void pthread_mutexattr_destroy_test(pthread_mutexattr_t *attr)
+{
+    (void)pthread_mutexattr_destroy(attr);
+}
+
+void pthread_mutexattr_settype_test(const pthread_mutexattr_t *attr, int type)
+{
+    (void)pthread_mutexattr_settype(attr, type);
+}
+
+void pthread_mutexattr_gettype_test(const pthread_mutexattr_t *attr, int *type)
+{
+    (void)pthread_mutexattr_gettype(attr, type);
+}
+
+void pthread_setcancelstate_test(int state, int *oldstate)
+{
+    (void)pthread_setcancelstate(state, oldstate);
+}
+
+void pthread_setcanceltype_test(int type, int *oldtype)
+{
+    (void)pthread_setcanceltype(type, oldtype);
+}
+
+void pthread_cancel_test(pthread_t thread)
+{
+    (void)pthread_cancel(thread);
+}
+
+void pthread_define_test()
+{
+    PTHREAD_STACK_MIN;
+    PTHREAD_CANCEL_ASYNCHRONOUS;
+    PTHREAD_CANCEL_ENABLE;
+    PTHREAD_CANCEL_DEFERRED;
+    PTHREAD_CANCEL_DISABLE;
+    PTHREAD_CANCELED;
+    pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+    (void)cond;
+    PTHREAD_CREATE_DETACHED;
+    PTHREAD_CREATE_JOINABLE;
+    PTHREAD_EXPLICIT_SCHED;
+    PTHREAD_INHERIT_SCHED;
+    PTHREAD_MUTEX_DEFAULT;
+    PTHREAD_MUTEX_ERRORCHECK;
+    PTHREAD_MUTEX_NORMAL;
+    pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+    (void)mutex;
+    PTHREAD_MUTEX_RECURSIVE;
+    pthread_once_t once_block = PTHREAD_ONCE_INIT;
+    (void)once_block;
+    PTHREAD_PRIO_INHERIT;
+    PTHREAD_PRIO_NONE;
+    PTHREAD_PRIO_PROTECT;
+    PTHREAD_PROCESS_SHARED;
+    PTHREAD_PROCESS_PRIVATE;
+    pthread_rwlock_t rwlock = PTHREAD_RWLOCK_INITIALIZER;
+    (void)rwlock;
+    PTHREAD_SCOPE_PROCESS;
+    PTHREAD_SCOPE_SYSTEM;
+}
+
+void mmap_fixed(void *addr) // No constParameterPointer: mmap() may replace the mapping at addr
+{
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
+    // cppcheck-suppress leakReturnValNotUsed
+    (void)mmap(addr, 0x1000, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED, 0, 0);
+}
diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
index d508eeef487..fe2f48e3175 100644
--- a/test/cfg/qt.cpp
+++ b/test/cfg/qt.cpp
@@ -32,8 +32,10 @@
 #include <QPointF>
 #include <QRegion>
 #include <QTransform>
+#include <QDir>
+#include <QTimer>
 
-// TODO: this is actually avilable via Core5Compat but I could not get it to work with pkg-config
+// TODO: this is actually available via Core5Compat but I could not get it to work with pkg-config
 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 #include <QLinkedList>
 #endif
@@ -54,6 +56,39 @@ int ignoredReturnValue_QSize_width(const QSize &s)
     return s.width();
 }
 
+
+void ignoredReturnValue_QDir(const QString& dirname)
+{
+    QDir dir(dirname);
+
+    // cppcheck-suppress ignoredReturnValue
+    dir.exists("abc");
+
+    // cppcheck-suppress ignoredReturnErrorCode
+    dir.mkdir("abc");
+
+    // cppcheck-suppress ignoredReturnValue
+    dir.count();
+
+    // cppcheck-suppress ignoredReturnValue
+    dir.filePath("abc");
+
+    // cppcheck-suppress ignoredReturnValue
+    dir.entryList();
+}
+
+void assertWithSideEffect_QDir_exists(const char *path) { // #14720
+    QDir dir(path);
+    assert(dir.exists());
+    (void)dir;
+}
+
+void assertWithSideEffect_QDir_mkdir(const char *path) { // #12468
+    QDir dir;
+    // cppcheck-suppress [assertWithSideEffect, checkLibraryNoReturn] // TODO: #8329
+    Q_ASSERT(dir.mkdir(path));
+}
+
 void unusedVariable_QTransform()
 {
     // cppcheck-suppress unusedVariable
@@ -177,7 +212,6 @@ void QString1(QString s)
 bool QString2()
 {
     QString s;
-    // cppcheck-suppress knownConditionTrueFalse
     return s.size();
 }
 
@@ -700,6 +734,7 @@ namespace {
     private:
         int m_value;
     };
+    // cppcheck-suppress shadowFunction
     void Counter1::setValue(int value) {
         if (value != m_value) {
             m_value = value;
@@ -723,6 +758,7 @@ namespace {
     private:
         int m_value;
     };
+    // cppcheck-suppress shadowFunction
     void Counter2::setValue(int value) {
         if (value != m_value) {
             m_value = value;
@@ -862,3 +898,20 @@ int qdateIsValid()
     Q_ASSERT(qd.isValid()); // Should not warn here with assertWithSideEffect
     return qd.month(); 
 }
+
+void qAssertX()
+{
+    const char *where = "test";
+    const char *what = "assertion failed";
+    Q_ASSERT_X(false, where, what);
+}
+
+struct S_QTimer_connect : QObject { // #13846
+    S_QTimer_connect() {
+        // cppcheck-suppress checkLibraryFunction - timeout() is a signal from QTimer
+        QObject::connect(&timer, SIGNAL(timeout()), this, SLOT(update()));
+    }
+    QTimer timer;
+private slots:
+    bool update();
+};
diff --git a/test/cfg/runtests.sh b/test/cfg/runtests.sh
index c8c1515e66c..4cf17b3a9df 100755
--- a/test/cfg/runtests.sh
+++ b/test/cfg/runtests.sh
@@ -549,7 +549,7 @@ function check_file {
         kde.cpp)
             # TODO: "kde-4config" is no longer commonly available in recent distros
             #kde_fn
-           cppcheck_run --library="$lib" --library=qt "${DIR}""$f"
+            cppcheck_run --library="$lib" --library=qt "${DIR}""$f"
             ;;
         libcurl.c)
             libcurl_fn
@@ -563,6 +563,9 @@ function check_file {
             lua_fn
             cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
+        microsoft_gsl.cpp)
+            cppcheck_run --suppress=autoNoType --library="$lib" "${DIR}""$f"
+            ;;
         mfc.cpp)
             mfc_fn
             cppcheck_run --platform=win64 --library="$lib" "${DIR}""$f"
diff --git a/test/cfg/std.c b/test/cfg/std.c
index b96f1bf8317..a8914d608a9 100644
--- a/test/cfg/std.c
+++ b/test/cfg/std.c
@@ -7,7 +7,7 @@
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
-// cppcheck-suppress-file valueFlowBailout
+// cppcheck-suppress-file [valueFlowBailout,purgedConfiguration]
 
 #include <string.h>
 #include <stdio.h>
@@ -38,6 +38,17 @@
 #include <math.h>
 #include <stddef.h>
 
+void test_int32_min() {
+    // cppcheck-suppress shiftNegativeLHS
+    // cppcheck-suppress shiftTooManyBits ; tests that INT32_MIN is a 32-bit expression (not 64-bit expression)
+    (void)(INT32_MIN >> 40);
+}
+
+void test_int64_min() {
+    // TODO cppcheck-suppress knownConditionTrueFalse // #13814
+    if (INT64_MIN < 0) {}
+}
+
 size_t invalidFunctionArgStr_wcslen(void)
 {
     const wchar_t terminated0[] = L"ABCDEF49620910";
@@ -67,6 +78,9 @@ void invalidFunctionArgStr_strncat(void)
     // No warning is expected for
     strncat (str1, &src, 1);
     puts (str1);
+    char d[] = {'a','b','c'};
+    // cppcheck-suppress invalidFunctionArgStr
+    strncat(d, "def", 1);
 }
 
 char * invalidFunctionArgStr_strpbrk( const char *p )
@@ -276,6 +290,13 @@ char* nullPointer_fgets(char *buffer, int n, FILE *stream)
     return fgets(buffer, n, stream);
 }
 
+void nullPointer_fseek(void) { // #10948
+    FILE *p = fopen("foo", "r");
+    // cppcheck-suppress nullPointerOutOfResources
+    fseek(p, 1, SEEK_SET);
+    fclose(p);
+}
+
 void memleak_aligned_alloc(void)
 {
     // cppcheck-suppress [unusedAllocatedMemory, unreadVariable, constVariablePointer]
@@ -598,6 +619,20 @@ void bufferAccessOutOfBounds_wcsncpy()
     wcsncpy(s, L"abc", 17);
 }
 
+void bufferAccessOutOfBounds_wmemcpy()
+{
+    wchar_t a[4];
+    // cppcheck-suppress bufferAccessOutOfBounds
+    wmemcpy(a, L"abcd", 5);
+}
+
+int bufferAccessOutOfBounds_wmemcmp(const wchar_t* b)
+{
+    const wchar_t a[4] = { L'a', L'b', L'c', L'd' };
+    // cppcheck-suppress bufferAccessOutOfBounds
+    return wmemcmp(a, b, 5);
+}
+
 int nullPointer_wcsncmp(const wchar_t* s1, const wchar_t* s2, size_t n)
 {
     // cppcheck-suppress nullPointer
@@ -2919,6 +2954,27 @@ void *bufferAccessOutOfBounds_memchr(const void *s, int c, size_t n)
     return memchr(s,c,n);
 }
 
+bool bufferAccessOutOfBounds_wmemchr(wchar_t c)
+{
+    const wchar_t buf[] = {'a', 'b', 'c'};
+    // cppcheck-suppress bufferAccessOutOfBounds
+    return wmemchr(buf, c, 5) != NULL;
+}
+
+void bufferAccessOutOfBounds_wmemset(wchar_t c)
+{
+    wchar_t buf[3];
+    // cppcheck-suppress bufferAccessOutOfBounds
+    wmemset(buf, c, 5);
+}
+
+void bufferAccessOutOfBounds_wmemmove(const wchar_t* s)
+{
+    wchar_t d[3];
+    // cppcheck-suppress bufferAccessOutOfBounds
+    wmemmove(d, s, 5);
+}
+
 void uninitvar_wmemchr(void)
 {
     const wchar_t *cs;
@@ -3501,6 +3557,13 @@ void invalidFunctionArg_strchr(const char *cs, int c)
     (void)strchr(cs, 256);
 }
 
+void constParameterPointer_strchr(char *str) // #14453
+{
+	char *sep = strchr(str, ':');
+	if (sep)
+		*sep = '\0';
+}
+
 void invalidFunctionArg_log10(float f, double d, const long double ld)
 {
     // cppcheck-suppress invalidFunctionArg
@@ -4888,6 +4951,10 @@ void invalidFunctionArgString(char c)
     char d='d';
     /* cppcheck-suppress invalidFunctionArgStr */
     (void)strcat(str,&d);
+
+    char a[] = { 'a', 'b', 'c' };
+    /* cppcheck-suppress [bufferAccessOutOfBounds,invalidFunctionArgStr] */
+    (void)strcat(a, "def");
 }
 
 void ignoredReturnValue_abs(int i)
diff --git a/test/cfg/std.cpp b/test/cfg/std.cpp
index 8a9976a94ae..cf4f74b6dbf 100644
--- a/test/cfg/std.cpp
+++ b/test/cfg/std.cpp
@@ -586,7 +586,6 @@ void bufferAccessOutOfBounds_std_ofstream_write(std::ofstream &os, const char* s
     (void)os.write(s,n);
 }
 
-// cppcheck-suppress constParameterReference // TODO: FP
 void bufferAccessOutOfBounds_std_ifstream_get(std::ifstream& in, std::streambuf& sb)
 {
     char cBuf[10];
@@ -870,7 +869,7 @@ char * overlappingWriteFunction_strncat(const char *src, char *dest, const std::
     // cppcheck-suppress overlappingWriteFunction
     (void)strncat(dest, dest+1, 2);
     char buffer[] = "strncat";
-    // cppcheck-suppress overlappingWriteFunction
+    // cppcheck-suppress [overlappingWriteFunction,returnDanglingLifetime]
     return strncat(buffer, buffer + 1, 3);
 }
 
@@ -883,7 +882,7 @@ wchar_t * overlappingWriteFunction_wcsncat(const wchar_t *src, wchar_t *dest, co
     // cppcheck-suppress overlappingWriteFunction
     (void)wcsncat(dest, dest+1, 2);
     wchar_t buffer[] = L"strncat";
-    // cppcheck-suppress overlappingWriteFunction
+    // cppcheck-suppress [overlappingWriteFunction,returnDanglingLifetime]
     return wcsncat(buffer, buffer + 1, 3);
 }
 
@@ -918,8 +917,8 @@ char * overlappingWriteFunction_strncpy(char *buf, const std::size_t count)
 
 void * overlappingWriteFunction_memmove(void)
 {
-    // No warning shall be shown:
     char str[] = "memmove handles overlapping data well";
+    // cppcheck-suppress returnDanglingLifetime
     return memmove(str,str+3,4);
 }
 
@@ -1059,7 +1058,7 @@ void returnValue_std_isgreater(void)
 {
     // cppcheck-suppress knownConditionTrueFalse
     if (std::isgreater(4,2) == 0) {}
-    // @todo support floats
+    // cppcheck-suppress knownConditionTrueFalse
     if (std::isgreater(4.0f,2.0f) == 0) {}
 }
 
@@ -1067,7 +1066,7 @@ void returnValue_std_isgreaterequal(void)
 {
     // cppcheck-suppress knownConditionTrueFalse
     if (std::isgreaterequal(4,2) == 0) {}
-    // @todo support floats
+    // cppcheck-suppress knownConditionTrueFalse
     if (std::isgreaterequal(4.0f,2.0f) == 0) {}
 }
 
@@ -1075,7 +1074,7 @@ void returnValue_std_isless(void)
 {
     // cppcheck-suppress knownConditionTrueFalse
     if (std::isless(4,2) == 0) {}
-    // @todo support floats
+    // cppcheck-suppress knownConditionTrueFalse
     if (std::isless(4.0f,2.0f) == 0) {}
 }
 
@@ -1083,7 +1082,7 @@ void returnValue_std_islessequal(void)
 {
     // cppcheck-suppress knownConditionTrueFalse
     if (std::islessequal(4,2) == 0) {}
-    // @todo support floats
+    // cppcheck-suppress knownConditionTrueFalse
     if (std::islessequal(4.0f,2.0f) == 0) {}
 }
 
@@ -1094,8 +1093,10 @@ void returnValue_std_islessgreater(void)
     // cppcheck-suppress knownConditionTrueFalse
     if (std::islessgreater(2,4) == 0) {}
 
-    if (std::islessgreater(4.0f,2.0f) == 0) {} // @todo support floats
-    if (std::islessgreater(2.0f,4.0f) == 0) {} // @todo support floats
+    // cppcheck-suppress knownConditionTrueFalse
+    if (std::islessgreater(4.0f,2.0f) == 0) {}
+    // cppcheck-suppress knownConditionTrueFalse
+    if (std::islessgreater(2.0f,4.0f) == 0) {}
 }
 
 void bufferAccessOutOfBounds(void)
@@ -2837,6 +2838,13 @@ void uninitvar_logb(void)
     (void)std::logbl(ld);
 }
 
+void bool_isless(float f1, float f2)
+{
+    // cppcheck-suppress compareBoolExpressionWithInt
+    // cppcheck-suppress compareValueOutOfTypeRangeError
+    if (std::isless(f1,f2)==123) {}
+}
+
 void uninitvar_isless(void)
 {
     float f1,f2;
@@ -2852,6 +2860,13 @@ void uninitvar_isless(void)
     (void)std::isless(ld1,ld2);
 }
 
+void bool_islessequal(float f1, float f2)
+{
+    // cppcheck-suppress compareBoolExpressionWithInt
+    // cppcheck-suppress compareValueOutOfTypeRangeError
+    if (std::islessequal(f1,f2)==123) {}
+}
+
 void uninitvar_islessequal(void)
 {
     float f1,f2;
@@ -2867,6 +2882,13 @@ void uninitvar_islessequal(void)
     (void)std::islessequal(ld1,ld2);
 }
 
+void bool_islessgreater(float f1, float f2)
+{
+    // cppcheck-suppress compareBoolExpressionWithInt
+    // cppcheck-suppress compareValueOutOfTypeRangeError
+    if (std::islessgreater(f1,f2)==123) {}
+}
+
 void uninitvar_islessgreater(void)
 {
     float f1,f2;
@@ -2893,6 +2915,13 @@ void uninitvar_nan(void)
     (void)std::nanl(tagp3);
 }
 
+void bool_isnan(float f)
+{
+    // cppcheck-suppress compareBoolExpressionWithInt
+    // cppcheck-suppress compareValueOutOfTypeRangeError
+    if (std::isnan(f)==123) {}
+}
+
 void uninitvar_isnan(void)
 {
     double d;
@@ -2900,6 +2929,13 @@ void uninitvar_isnan(void)
     (void)std::isnan(d);
 }
 
+void bool_isnormal(float f)
+{
+    // cppcheck-suppress compareBoolExpressionWithInt
+    // cppcheck-suppress compareValueOutOfTypeRangeError
+    if (std::isnormal(f)==123) {}
+}
+
 void uninitvar_isnormal(void)
 {
     double d;
@@ -2907,6 +2943,13 @@ void uninitvar_isnormal(void)
     (void)std::isnormal(d);
 }
 
+void bool_isunordered(float f1, float f2)
+{
+    // cppcheck-suppress compareBoolExpressionWithInt
+    // cppcheck-suppress compareValueOutOfTypeRangeError
+    if (std::isunordered(f1,f2)==123) {}
+}
+
 void uninitvar_isunordered(void)
 {
     double d1,d2;
@@ -3442,6 +3485,13 @@ void uninivar_scalbln(void)
     (void)std::scalblnl(ld,i3);
 }
 
+void bool_signbit(float f)
+{
+    // cppcheck-suppress compareBoolExpressionWithInt
+    // cppcheck-suppress compareValueOutOfTypeRangeError
+    if (std::signbit(f)==123) {}
+}
+
 void uninitvar_signbit(void)
 {
     double d;
@@ -4981,6 +5031,18 @@ std::span<const int> returnDanglingLifetime_std_span1() {
 }
 #endif
 
+void* returnDanglingLifetime_memcpy() { // #14833
+    char a[4];
+    // cppcheck-suppress returnDanglingLifetime
+    return memcpy(a, "abc", 4);
+}
+
+wchar_t* returnDanglingLifetime_wcscat() {
+    wchar_t a[10]{L"abc"};
+    // cppcheck-suppress returnDanglingLifetime
+    return wcscat(a, L"def");
+}
+
 void beginEnd()
 {
     std::vector<int> v;
@@ -5003,7 +5065,7 @@ void beginEnd()
     //cppcheck-suppress ignoredReturnValue
     std::crend(v);
 
-    // cppcheck-suppress constVariable
+    // TODO cppcheck-suppress constVariable
     int arr[4];
 
     //cppcheck-suppress ignoredReturnValue
@@ -5025,6 +5087,44 @@ void beginEnd()
     std::crend(arr);
 }
 
+struct S_constParameter_std_begin { // #11617
+    int a[2];
+};
+
+struct T_constParameter_std_begin {
+    std::vector<int> v;
+};
+
+struct U_constParameter_std_begin {
+    std::vector<int> v[1][1];
+};
+
+void f(S_constParameter_std_begin& s) {
+    std::for_each(std::begin(s.a), std::end(s.a), [](int& i) { ++i; });
+}
+
+void f(T_constParameter_std_begin& t) {
+    std::for_each(std::begin(t.v), std::end(t.v), [](int& i) { ++i; });
+}
+
+void f(U_constParameter_std_begin& u) {
+    std::for_each(std::begin(u.v[0][0]), std::end(u.v[0][0]), [](int& i) { ++i; });
+}
+
+void g_constVariable_std_begin(int* p) { *p = 0; }
+
+int f_constVariable_std_begin() {
+    int arr[1];
+    g_constVariable_std_begin(std::begin(arr));
+    *std::begin(arr) = 1;
+    return arr[0];
+}
+
+std::size_t uninitvar_std_size() { // #14976
+    int a[3];
+    return std::size(a);
+}
+
 void smartPtr_get()
 {
     std::unique_ptr<int> p;
@@ -5166,6 +5266,20 @@ void constVariablePointer_push_back(std::vector<T*>& d, const std::vector<T*>& s
     }
 }
 
+struct S_constVariablePointer_wstring { // #14575
+    std::wstring m;
+    const std::wstring& get() const { return m; }
+};
+
+S_constVariablePointer_wstring* g_constVariablePointer_wstring();
+
+void h_constVariablePointer_wstring(const wchar_t*);
+
+void f_constVariablePointer_wstring() {
+    S_constVariablePointer_wstring* s = g_constVariablePointer_wstring(); // cppcheck-suppress constVariablePointer
+    h_constVariablePointer_wstring(s->get().c_str());
+}
+
 std::streampos constParameterPointer_istream_tellg(std::istream* p) { // #13801
     return p->tellg();
 }
@@ -5318,4 +5432,14 @@ int containerOutOfBounds_std_initializer_list() { // #14340
     // cppcheck-suppress derefInvalidIterator
     int i = *x.end();
     return i + containerOutOfBounds_std_initializer_list_access(x);
-}
\ No newline at end of file
+}
+
+int* missingReturn_std_throw_with_nested() { // #14374
+    try {
+        int* p = new int();
+        return p;
+    }
+    catch (...) {
+        std::throw_with_nested(std::runtime_error("xyz"));
+    }
+}
diff --git a/test/cfg/windows.cpp b/test/cfg/windows.cpp
index 5951cb74c07..689fd425604 100644
--- a/test/cfg/windows.cpp
+++ b/test/cfg/windows.cpp
@@ -11,6 +11,7 @@
 
 #include <Windows.h>
 #include <WinCon.h>
+#include <SetupAPI.h>
 #include <cstdio>
 #include <direct.h>
 #include <evntrace.h>
@@ -22,6 +23,7 @@
 #include <wchar.h>
 #include <atlstr.h>
 #include <string>
+#include <locale.h>
 
 bool UpdateTraceACalled(TRACEHANDLE traceHandle, LPCSTR loggerName, EVENT_TRACE_PROPERTIES* pProperties)
 {
@@ -54,6 +56,13 @@ void invalid_socket()
     // cppcheck-suppress resourceLeak
 }
 
+void invalid_socket_noleak(int a, int t, int p) { // #14155
+    SOCKET s = socket(a, t, p);
+    if (s == INVALID_SOCKET)
+        return;
+    closesocket(s);
+}
+
 void resourceLeak_OpenThread(const DWORD dwDesiredAccess, const BOOL bInheritHandle, const DWORD dwThreadId)
 {
     HANDLE proc = OpenThread(dwDesiredAccess, bInheritHandle, dwThreadId);
@@ -85,6 +94,10 @@ std::string constVariable_GetModuleFileName(void) {
     return std::string{path};
 }
 
+const TCHAR* constVariable_MAKEINTRESOURCE() { // #14564
+    return MAKEINTRESOURCE(5 - 1);
+}
+
 int stringCompare_mbscmp(const unsigned char *string1, const unsigned char *string2)
 {
     // cppcheck-suppress stringCompare
@@ -603,6 +616,27 @@ void memleak_malloca()
     // cppcheck-suppress memleak
 }
 
+void memleak_create_locale()
+{
+    // cppcheck-suppress-begin valueFlowBailoutIncompleteVar
+    _locale_t locale = _create_locale(LC_ALL, "C");
+    _locale_t wlocale = _wcreate_locale(LC_ALL, L"C");
+    (void) locale;
+    (void) wlocale;
+    // cppcheck-suppress-end valueFlowBailoutIncompleteVar
+    // cppcheck-suppress memleak
+}
+
+void no_memleak_create_locale()
+{
+    // cppcheck-suppress-begin valueFlowBailoutIncompleteVar
+    _locale_t locale = _create_locale(LC_ALL, "C");
+    _locale_t wlocale = _wcreate_locale(LC_ALL, L"C");
+    _free_locale(locale);
+    _free_locale(wlocale);
+    // cppcheck-suppress-end valueFlowBailoutIncompleteVar
+}
+
 void memleak_AllocateAndInitializeSid()
 {
     PSID pEveryoneSID = NULL;
@@ -850,7 +884,7 @@ void uninitvar()
     // cppcheck-suppress uninitvar
     lstrcat(buf, _T("test"));
     buf[0] = _T('\0');
-    // TODO cppcheck-suppress constVariable
+    // cppcheck-suppress constVariable
     TCHAR buf2[2];
     // cppcheck-suppress lstrcatCalled
     // cppcheck-suppress uninitvar
@@ -1216,3 +1250,13 @@ void SEH_unusedLabel() { // #13233
     __finally {
     }
 }
+
+HWND constParameterPointer_CreateWindow(void* param) { // #14560
+    return CreateWindow(L"MessageWnd", NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, param);
+}
+
+void constParameterPointer_SetupDiGetDeviceInstanceId(HDEVINFO info, SP_DEVINFO_DATA *data) {
+    const DWORD buffer_size = 256;
+    TCHAR buffer[buffer_size];
+    SetupDiGetDeviceInstanceId(info, data, buffer, buffer_size, NULL);
+}
diff --git a/test/cfg/wxwidgets.cpp b/test/cfg/wxwidgets.cpp
index 983f3e1bbc3..c25dfa8e1b4 100644
--- a/test/cfg/wxwidgets.cpp
+++ b/test/cfg/wxwidgets.cpp
@@ -972,6 +972,10 @@ void ignoredReturnValue_wxDC_GetSizeMM(const wxDC &dc, wxCoord *width, wxCoord *
     (void)dc.GetSizeMM();
 }
 
+void ignoredReturnValue_wxPanel_Layout(wxPanel* panel) { // #14403
+    panel->Layout();
+}
+
 wxSizerItem* invalidFunctionArgBool_wxSizer_Add(wxSizer *sizer, wxWindow * window, const wxSizerFlags &flags)
 {
     // No warning is expected for
diff --git a/test/cli/clang-import_test.py b/test/cli/clang-import_test.py
index e4ec19a5ada..da5bb2f3af7 100644
--- a/test/cli/clang-import_test.py
+++ b/test/cli/clang-import_test.py
@@ -128,6 +128,21 @@ def test_log(tmpdir):
     assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)
 
 
+def test_include(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write('#include "test.h"')
+
+    with open(tmp_path / 'test.h', 'wt') as f:
+        f.write('int x;\n')
+
+    exitcode, stdout, stderr = cppcheck(['-q', '--clang', '--debug', str(test_file)])
+    assert exitcode == 0, stderr if not stdout else stdout
+    # the number of empty lines after "##file" depends on the builtin declarations in the clang AST dump
+    assert '##file {}\n'.format(tmp_path / 'test.h') in stdout, stdout
+    assert '\n1: int x@var1 ;\n' in stdout, stdout
+
+
 def test_warning(tmpdir):  # #12424
     test_file = os.path.join(tmpdir, 'test_2')
     with open(test_file, 'wt') as f:
diff --git a/test/cli/dumpfile_test.py b/test/cli/dumpfile_test.py
index 932c4363a30..5dbb29f9e38 100644
--- a/test/cli/dumpfile_test.py
+++ b/test/cli/dumpfile_test.py
@@ -132,3 +132,17 @@ def test_container_methods(tmpdir):
     with open(dumpfile, 'rt') as f:
         dump = f.read()
     assert '<f name="emplace" action="push" yield="iterator"/>' in dump
+
+def test_line_macro(tmpdir):
+    test_file = str(tmpdir / 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write('#define MACRO() __LINE__\n')
+        f.write('int x = MACRO();\n')
+
+    exitcode, _, stderr = cppcheck(['--dump', test_file])
+    assert exitcode == 0, stderr
+
+    dumpfile = test_file + '.dump'
+    with open(dumpfile, 'rt') as f:
+        dump = f.read()
+    assert 'type="number" isInt="true" macroName="__LINE__"' in dump
diff --git a/test/cli/exclude/DebugX64.cpp b/test/cli/exclude/DebugX64.cpp
new file mode 100644
index 00000000000..cfb1fce687a
--- /dev/null
+++ b/test/cli/exclude/DebugX64.cpp
@@ -0,0 +1,8 @@
+#include <iostream>
+
+int foo()
+{
+	std::cout << "DebugX64\n";
+	int x = 3 / 0; (void)x; // ERROR
+	return 0;
+}
diff --git a/test/cli/exclude/ReleaseX64.cpp b/test/cli/exclude/ReleaseX64.cpp
new file mode 100644
index 00000000000..8fa6e6d0f82
--- /dev/null
+++ b/test/cli/exclude/ReleaseX64.cpp
@@ -0,0 +1,8 @@
+#include <iostream>
+
+int foo()
+{
+	std::cout << "ReleaseX64\n";
+	int x = 3 / 0; (void)x; // ERROR
+	return 0;
+}
diff --git a/test/cli/exclude/exclude.cppcheck b/test/cli/exclude/exclude.cppcheck
new file mode 100644
index 00000000000..50d7da84486
--- /dev/null
+++ b/test/cli/exclude/exclude.cppcheck
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+    <builddir>exclude-cppcheck-build-dir</builddir>
+    <importproject>exclude.slnx</importproject>
+    <analyze-all-vs-configs>false</analyze-all-vs-configs>
+    <check-headers>true</check-headers>
+    <check-unused-templates>true</check-unused-templates>
+    <inline-suppression>true</inline-suppression>
+    <max-ctu-depth>2</max-ctu-depth>
+    <max-template-recursion>100</max-template-recursion>
+    <vs-configurations>
+        <config>Debug</config>
+    </vs-configurations>
+    <check-level-normal/>
+    <project-name>exclude</project-name>
+</project>
diff --git a/test/cli/exclude/exclude.slnx b/test/cli/exclude/exclude.slnx
new file mode 100644
index 00000000000..837662784ac
--- /dev/null
+++ b/test/cli/exclude/exclude.slnx
@@ -0,0 +1,6 @@
+<Solution>
+  <Configurations>
+    <Platform Name="x64" />
+  </Configurations>
+  <Project Path="exclude.vcxproj" Id="c9d1dca1-d8ff-4c05-9159-f00816645319" />
+</Solution>
diff --git a/test/cli/exclude/exclude.vcxproj b/test/cli/exclude/exclude.vcxproj
new file mode 100644
index 00000000000..cc326aaec2f
--- /dev/null
+++ b/test/cli/exclude/exclude.vcxproj
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>18.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{c9d1dca1-d8ff-4c05-9159-f00816645319}</ProjectGuid>
+    <RootNamespace>exclude</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="DebugX64.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ReleaseX64.cpp">
+     <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="foo.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/test/cli/exclude/foo.h b/test/cli/exclude/foo.h
new file mode 100644
index 00000000000..5d5f8f0c9e7
--- /dev/null
+++ b/test/cli/exclude/foo.h
@@ -0,0 +1 @@
+int foo();
diff --git a/test/cli/exclude_test.py b/test/cli/exclude_test.py
new file mode 100644
index 00000000000..4f674aac34e
--- /dev/null
+++ b/test/cli/exclude_test.py
@@ -0,0 +1,20 @@
+
+# python -m pytest exclude_test.py
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+__proj_dir = os.path.join(__script_dir, 'exclude')
+
+def test_exclude():
+    args = [
+        '--template=cppcheck1',
+        '--project=exclude/exclude.cppcheck',
+        '--no-cppcheck-build-dir'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    filename = os.path.join('exclude', 'DebugX64.cpp')
+    assert ret == 0, stdout
+    assert stderr == '[%s:6]: (error) Division by zero.\n' % filename
diff --git a/test/cli/fuzz-crash/crash-0400fbfed5c89e368e436dbac630db0f80db94bd b/test/cli/fuzz-crash/crash-0400fbfed5c89e368e436dbac630db0f80db94bd
new file mode 100644
index 00000000000..d6e9b32be37
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-0400fbfed5c89e368e436dbac630db0f80db94bd
@@ -0,0 +1 @@
+typedef i(*const type2)();typedef t(ty)();(v ty)type2()
diff --git a/test/cli/fuzz-crash/crash-17be2b85446aeb0c7722bedfad4b0e4af27fae3d b/test/cli/fuzz-crash/crash-17be2b85446aeb0c7722bedfad4b0e4af27fae3d
new file mode 100644
index 00000000000..0f06807b7ba
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-17be2b85446aeb0c7722bedfad4b0e4af27fae3d
@@ -0,0 +1 @@
+{for([]{});}
diff --git a/test/cli/fuzz-crash/crash-1c67200986f8cd9788ccf3dbb764d49cb67819b1 b/test/cli/fuzz-crash/crash-1c67200986f8cd9788ccf3dbb764d49cb67819b1
new file mode 100644
index 00000000000..06055955e6b
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-1c67200986f8cd9788ccf3dbb764d49cb67819b1
@@ -0,0 +1 @@
+e U U,i
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-41fefbc326c326d02c9e1fe315280ddd326e8a5b b/test/cli/fuzz-crash/crash-41fefbc326c326d02c9e1fe315280ddd326e8a5b
new file mode 100644
index 00000000000..b090d2bf345
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-41fefbc326c326d02c9e1fe315280ddd326e8a5b
@@ -0,0 +1 @@
+#if<
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-42dad53b40278386e4ebd224813e26541cc725f1 b/test/cli/fuzz-crash/crash-42dad53b40278386e4ebd224813e26541cc725f1
new file mode 100644
index 00000000000..3a9abbf229f
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-42dad53b40278386e4ebd224813e26541cc725f1
@@ -0,0 +1 @@
+using C=C*;C{{}}
diff --git a/test/cli/fuzz-crash/crash-4ad024d4f64dfd58d73a3296173fe13860fb8b70 b/test/cli/fuzz-crash/crash-4ad024d4f64dfd58d73a3296173fe13860fb8b70
new file mode 100644
index 00000000000..7aaf95a8378
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-4ad024d4f64dfd58d73a3296173fe13860fb8b70
@@ -0,0 +1 @@
+n f(){auto x=i->o x}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-5ac13e244448ff767f6596c220edb9ef7b61fa6d b/test/cli/fuzz-crash/crash-5ac13e244448ff767f6596c220edb9ef7b61fa6d
new file mode 100644
index 00000000000..7bbc08cfd6d
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-5ac13e244448ff767f6596c220edb9ef7b61fa6d
@@ -0,0 +1 @@
+template<>struct t<>();
diff --git a/test/cli/fuzz-crash/crash-60d6b7bc43d21f6a8ad8eb8cca551e45c31c6a32 b/test/cli/fuzz-crash/crash-60d6b7bc43d21f6a8ad8eb8cca551e45c31c6a32
new file mode 100644
index 00000000000..4a60eb05b88
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-60d6b7bc43d21f6a8ad8eb8cca551e45c31c6a32
@@ -0,0 +1 @@
+t
i(){using S};
diff --git a/test/cli/fuzz-crash/crash-6d019f821f348d758d8d88bd7de692af6f9b07f4 b/test/cli/fuzz-crash/crash-6d019f821f348d758d8d88bd7de692af6f9b07f4
new file mode 100644
index 00000000000..cd0cc97f0fb
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-6d019f821f348d758d8d88bd7de692af6f9b07f4
@@ -0,0 +1 @@
+#error\

\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-793c09dbb007b0e1a295f592813f40f8d6d449d1 b/test/cli/fuzz-crash/crash-793c09dbb007b0e1a295f592813f40f8d6d449d1
new file mode 100644
index 00000000000..706fe52b407
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-793c09dbb007b0e1a295f592813f40f8d6d449d1
@@ -0,0 +1 @@
+enum{A=s(u)0&=s};
diff --git a/test/cli/fuzz-crash/crash-7c3e963c9c28dab506696d0dbe8aaf8772d5302f b/test/cli/fuzz-crash/crash-7c3e963c9c28dab506696d0dbe8aaf8772d5302f
new file mode 100644
index 00000000000..ff8d3a2d0ac
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-7c3e963c9c28dab506696d0dbe8aaf8772d5302f
@@ -0,0 +1 @@
+h>teu<""e<>;template<F=F>teu=d
diff --git a/test/cli/fuzz-crash/crash-7d409757e9b94fc2eb23758b655e056ec3dd9d09 b/test/cli/fuzz-crash/crash-7d409757e9b94fc2eb23758b655e056ec3dd9d09
new file mode 100644
index 00000000000..8b8929bc573
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-7d409757e9b94fc2eb23758b655e056ec3dd9d09
@@ -0,0 +1 @@
+_asm
diff --git a/test/cli/fuzz-crash/crash-9054eec11c4eb2cccf3ae02cdc3469fae5f8d9ae b/test/cli/fuzz-crash/crash-9054eec11c4eb2cccf3ae02cdc3469fae5f8d9ae
new file mode 100644
index 00000000000..5a088af4bda
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-9054eec11c4eb2cccf3ae02cdc3469fae5f8d9ae
@@ -0,0 +1 @@
+(c*8s){}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-b4bd9ce1af8a423d15d034f42c7b99dc0f8a0a7d b/test/cli/fuzz-crash/crash-b4bd9ce1af8a423d15d034f42c7b99dc0f8a0a7d
new file mode 100644
index 00000000000..e7b11b223da
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-b4bd9ce1af8a423d15d034f42c7b99dc0f8a0a7d
@@ -0,0 +1 @@
+d o(n c){do if(c){}while(0)n}
diff --git a/test/cli/fuzz-crash/crash-be54fe1da04e7a624214b58f3b572b87082a2e93 b/test/cli/fuzz-crash/crash-be54fe1da04e7a624214b58f3b572b87082a2e93
new file mode 100644
index 00000000000..e263f9d8c66
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-be54fe1da04e7a624214b58f3b572b87082a2e93
@@ -0,0 +1 @@
+(({}namespace d=n));
diff --git a/test/cli/fuzz-crash/crash-c540e04fe675639b7ead821efc2f5c037b6c89e0 b/test/cli/fuzz-crash/crash-c540e04fe675639b7ead821efc2f5c037b6c89e0
new file mode 100644
index 00000000000..f2fb80ecd28
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-c540e04fe675639b7ead821efc2f5c037b6c89e0
@@ -0,0 +1 @@
+o o(){i n;for(i x:v)n=n+<1;}
diff --git a/test/cli/fuzz-crash/crash-cd91802f0554ab425b82191389c9db2be0d50040 b/test/cli/fuzz-crash/crash-cd91802f0554ab425b82191389c9db2be0d50040
new file mode 100644
index 00000000000..b2a885a35d3
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-cd91802f0554ab425b82191389c9db2be0d50040
@@ -0,0 +1 @@
+{f F<{enum{E=1};}>}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-def181ea7bf444e7a9d0f85b3ad264c31a0b90e4 b/test/cli/fuzz-crash/crash-def181ea7bf444e7a9d0f85b3ad264c31a0b90e4
new file mode 100644
index 00000000000..3b609c62362
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-def181ea7bf444e7a9d0f85b3ad264c31a0b90e4
@@ -0,0 +1 @@
+enum
f:{};
diff --git a/test/cli/fuzz-crash/crash-fb09b3314f55a502c8dd27f3f114122c71dd207e b/test/cli/fuzz-crash/crash-fb09b3314f55a502c8dd27f3f114122c71dd207e
new file mode 100644
index 00000000000..3a017fdb2e0
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-fb09b3314f55a502c8dd27f3f114122c71dd207e
@@ -0,0 +1 @@
+;namespace b=i;;namespace b={}
diff --git a/test/cli/fuzz-crash_c/14742 b/test/cli/fuzz-crash_c/14742
new file mode 100644
index 00000000000..a645277c405
--- /dev/null
+++ b/test/cli/fuzz-crash_c/14742
@@ -0,0 +1 @@
+i(){b?8:{}!$}
diff --git a/test/cli/fuzz-crash_c/crash-18b7d7437e79f7e1b843b676e0c3beaf4929d043 b/test/cli/fuzz-crash_c/crash-18b7d7437e79f7e1b843b676e0c3beaf4929d043
new file mode 100644
index 00000000000..6a015200e02
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-18b7d7437e79f7e1b843b676e0c3beaf4929d043
@@ -0,0 +1 @@
+v(){p?1:p..}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash_c/crash-3be27d29a1cc703716c646e3cfdf21cc896654fa b/test/cli/fuzz-crash_c/crash-3be27d29a1cc703716c646e3cfdf21cc896654fa
new file mode 100644
index 00000000000..e999e558f64
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-3be27d29a1cc703716c646e3cfdf21cc896654fa
@@ -0,0 +1 @@
+i(){!:!=!!?:1}
diff --git a/test/cli/fuzz-crash_c/crash-401f925d3c6fd78f864ffd7bf0531bd6a76bb832 b/test/cli/fuzz-crash_c/crash-401f925d3c6fd78f864ffd7bf0531bd6a76bb832
new file mode 100644
index 00000000000..a778e6e2823
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-401f925d3c6fd78f864ffd7bf0531bd6a76bb832
@@ -0,0 +1 @@
+i(){!!:!=!&&d}
diff --git a/test/cli/fuzz-crash_c/crash-493bda132c00d17406b5e661e034867029a1fac1 b/test/cli/fuzz-crash_c/crash-493bda132c00d17406b5e661e034867029a1fac1
new file mode 100644
index 00000000000..1cff3b66c8d
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-493bda132c00d17406b5e661e034867029a1fac1
@@ -0,0 +1 @@
+v(){union{a i;for(i=0;!i;);};}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash_c/crash-8367ada820697bc89f56262df59bdf457b62c808 b/test/cli/fuzz-crash_c/crash-8367ada820697bc89f56262df59bdf457b62c808
new file mode 100644
index 00000000000..08345550d64
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-8367ada820697bc89f56262df59bdf457b62c808
@@ -0,0 +1 @@
+i(){s a;for(;;)y{for(;;);};}
diff --git a/test/cli/fuzz-crash_c/crash-85cab41781812453dfc8e74e1f0b915225f7a0a1 b/test/cli/fuzz-crash_c/crash-85cab41781812453dfc8e74e1f0b915225f7a0a1
new file mode 100644
index 00000000000..a2e58c69ea7
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-85cab41781812453dfc8e74e1f0b915225f7a0a1
@@ -0,0 +1 @@
+n(f=n){n&&,n}
diff --git a/test/cli/fuzz-crash_c/crash-8a4f047728c598ad00d835c16e7fbef5e43e8489 b/test/cli/fuzz-crash_c/crash-8a4f047728c598ad00d835c16e7fbef5e43e8489
new file mode 100644
index 00000000000..3b81bf6f322
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-8a4f047728c598ad00d835c16e7fbef5e43e8489
@@ -0,0 +1 @@
+n(S=n){n*,+&&n}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash_c/crash-9feb09f580c0cf101456c6c650ab4193b1009d07 b/test/cli/fuzz-crash_c/crash-9feb09f580c0cf101456c6c650ab4193b1009d07
new file mode 100644
index 00000000000..8577d6ccb7f
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-9feb09f580c0cf101456c6c650ab4193b1009d07
@@ -0,0 +1 @@
+d(){e?&d=d++++F:a}
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/oom-6fd8356f0baeb3bb43463298803b94ac8ea93cac b/test/cli/fuzz-timeout/oom-6fd8356f0baeb3bb43463298803b94ac8ea93cac
new file mode 100644
index 00000000000..29e36cf8c55
--- /dev/null
+++ b/test/cli/fuzz-timeout/oom-6fd8356f0baeb3bb43463298803b94ac8ea93cac
@@ -0,0 +1 @@
+typedef struct D{itoftor;}tor tor;
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/timeout-242e02017d15d072fd7a230de22faeef0816693d b/test/cli/fuzz-timeout/timeout-242e02017d15d072fd7a230de22faeef0816693d
new file mode 100644
index 00000000000..c269baf1efe
--- /dev/null
+++ b/test/cli/fuzz-timeout/timeout-242e02017d15d072fd7a230de22faeef0816693d
@@ -0,0 +1 @@
+typedef const v*v,*;
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/timeout-5225c0e6e895cdd05a15c388547d13a78a2574e2 b/test/cli/fuzz-timeout/timeout-5225c0e6e895cdd05a15c388547d13a78a2574e2
new file mode 100644
index 00000000000..71e751bb201
--- /dev/null
+++ b/test/cli/fuzz-timeout/timeout-5225c0e6e895cdd05a15c388547d13a78a2574e2
@@ -0,0 +1 @@
+template<t>struct e<j><;
diff --git a/test/cli/fuzz-timeout/timeout-5e798df7f1bc86caef9901d6662319a4d636f269 b/test/cli/fuzz-timeout/timeout-5e798df7f1bc86caef9901d6662319a4d636f269
new file mode 100644
index 00000000000..35e56badcc8
--- /dev/null
+++ b/test/cli/fuzz-timeout/timeout-5e798df7f1bc86caef9901d6662319a4d636f269
@@ -0,0 +1 @@
+typedef consted e,{}
diff --git a/test/cli/helloworld/helloworld.slnx b/test/cli/helloworld/helloworld.slnx
new file mode 100644
index 00000000000..ae14b4c329b
--- /dev/null
+++ b/test/cli/helloworld/helloworld.slnx
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Solution>
+  <Configurations>
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Project Path="helloworld.vcxproj" />
+</Solution>
diff --git a/test/cli/helloworld/helloworld_slnx.cppcheck b/test/cli/helloworld/helloworld_slnx.cppcheck
new file mode 100644
index 00000000000..cf0bff648cc
--- /dev/null
+++ b/test/cli/helloworld/helloworld_slnx.cppcheck
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+    <root name="."/>
+    <importproject>helloworld.slnx</importproject>
+    <analyze-all-vs-configs>false</analyze-all-vs-configs>
+</project>
diff --git a/test/cli/helloworld_test.py b/test/cli/helloworld_test.py
index c4ffec69c9c..65c0e4921a0 100644
--- a/test/cli/helloworld_test.py
+++ b/test/cli/helloworld_test.py
@@ -107,7 +107,7 @@ def test_addon_relative_path():
     filename = os.path.join('helloworld', 'main.c')
     assert ret == 0, stdout
     assert stdout == ('Checking %s ...\n'
-                      'Checking %s: SOME_CONFIG...\n' % (filename, filename))
+                      'Checking %s: SOME_CONFIG=SOME_CONFIG...\n' % (filename, filename))
     assert stderr == ('[%s:5]: (error) Division by zero.\n'
                       '[%s:4]: (style) misra violation (use --rule-texts=<file> to get proper output)\n' % (filename, filename))
 
@@ -125,7 +125,7 @@ def test_addon_with_gui_project(tmp_path):
     assert ret == 0, stdout
     assert stdout.strip().split('\n') == [
         'Checking %s ...' % filename,
-        'Checking %s: SOME_CONFIG...' % filename
+        'Checking %s: SOME_CONFIG=SOME_CONFIG...' % filename
     ]
     assert stderr == ('[%s:5]: (error) Division by zero.\n'
                       '[%s:4]: (style) misra violation (use --rule-texts=<file> to get proper output)\n' % (filename, filename))
@@ -223,11 +223,12 @@ def test_cppcheck_project_local_path_select_one_multiple():
 def test_cppcheck_project_local_path_analyze_all():
     __test_cppcheck_project_local_path(['--analyze-all-vs-configs'], 'Debug|Win32 Debug|x64 Release|Win32 Release|x64')
 
-def test_cppcheck_project_relative_path():
+@pytest.mark.parametrize("project_file", ["helloworld.cppcheck", "helloworld_slnx.cppcheck"])
+def test_cppcheck_project_relative_path(project_file):
     args = [
         '--template=cppcheck1',
         '--platform=win64',
-        '--project=' + os.path.join('helloworld', 'helloworld.cppcheck')
+        '--project=' + os.path.join('helloworld', project_file)
     ]
     ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
     filename = os.path.join('helloworld', 'main.c')
@@ -235,11 +236,12 @@ def test_cppcheck_project_relative_path():
     assert __getVsConfigs(stdout, filename) == 'Debug|x64'
     assert stderr == '[%s:5]: (error) Division by zero.\n' % filename
 
-def test_cppcheck_project_absolute_path():
+@pytest.mark.parametrize("project_file", ["helloworld.cppcheck", "helloworld_slnx.cppcheck"])
+def test_cppcheck_project_absolute_path(project_file):
     args = [
         '--template=cppcheck1',
         '--platform=win64',
-        '--project=' + os.path.join(__proj_dir, 'helloworld.cppcheck')
+        '--project=' + os.path.join(__proj_dir, project_file)
     ]
     ret, stdout, stderr = cppcheck(args)
     filename = os.path.join(__proj_dir, 'main.c')
@@ -296,11 +298,12 @@ def test_suppress_project_absolute(tmp_path):
     assert ret == 0, stdout
     assert stderr == ''
 
-def test_exclude():
+@pytest.mark.parametrize("project_file", ["helloworld.cppcheck", "helloworld_slnx.cppcheck"])
+def test_exclude(project_file):
     args = [
         '-i' + 'helloworld',
         '--platform=win64',
-        '--project=' + os.path.join('helloworld', 'helloworld.cppcheck')
+        '--project=' + os.path.join('helloworld', project_file)
     ]
     ret, stdout, _ = cppcheck(args, cwd=__script_dir)
     assert ret == 1
@@ -360,7 +363,7 @@ def test_missing_include_system():  # #11283
     ]
 
     _, _, stderr = cppcheck(args, cwd=__script_dir)
-    assert stderr.replace('\\', '/') == 'helloworld/main.c:1:2: information: Include file: <stdio.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n'
+    assert stderr.replace('\\', '/') == 'helloworld/main.c:1:2: information: Include file: <stdio.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n'
 
 
 def test_sarif():
diff --git a/test/cli/inline-suppress-polyspace_test.py b/test/cli/inline-suppress-polyspace_test.py
new file mode 100644
index 00000000000..ad7e7df3b55
--- /dev/null
+++ b/test/cli/inline-suppress-polyspace_test.py
@@ -0,0 +1,63 @@
+
+# python -m pytest inline-suppress-polyspace_test.py
+
+import os
+from testutils import assert_cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_unmatched_polyspace_suppression(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write('int f(void); /* polyspace MISRA2012:8.2 */\n')
+
+    args = ['--addon=misra', '--template=simple', '--enable=style,information', '--inline-suppr', 'test.c']
+
+    out_exp = ['Checking test.c ...']
+    err_exp = ['test.c:1:14: information: Unmatched suppression: misra-c2012-8.2 [unmatchedPolyspaceSuppression]']
+
+    assert_cppcheck(args, ec_exp=0, err_exp=err_exp, out_exp=out_exp, cwd=str(tmp_path))
+
+
+def test_1(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write('int f(); /* polyspace MISRA2012:8.2 */\n')
+
+    args = ['--addon=misra', '--template=simple', '--enable=style,information', '--inline-suppr', 'test.c']
+
+    out_exp = ['Checking test.c ...']
+    err_exp = []
+
+    assert_cppcheck(args, ec_exp=0, err_exp=err_exp, out_exp=out_exp, cwd=str(tmp_path))
+
+
+def test_block(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write('/* polyspace +1 MISRA2012:8.2 */\n'
+                'int f();\n' # <- suppression applies to this line
+                'int g();\n') # <- suppression does not apply to this line
+
+    args = ['--addon=misra', '--template=simple', '--enable=style,information', '--inline-suppr', 'test.c']
+
+    out_exp = ['Checking test.c ...']
+    err_exp = ['test.c:3:6: style: misra violation (use --rule-texts=<file> to get proper output) [misra-c2012-8.2]']
+
+    assert_cppcheck(args, ec_exp=0, err_exp=err_exp, out_exp=out_exp, cwd=str(tmp_path))
+
+
+def test_begin_end(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write('/* polyspace-begin MISRA2012:8.2 */\n'
+                'int f();\n'
+                '/* polyspace-end MISRA2012:8.2 */\n')
+
+    args = ['--addon=misra', '--template=simple', '--enable=style,information', '--inline-suppr', 'test.c']
+
+    out_exp = ['Checking test.c ...']
+    err_exp = []
+
+    assert_cppcheck(args, ec_exp=0, err_exp=err_exp, out_exp=out_exp, cwd=str(tmp_path))
diff --git a/test/cli/inline-suppress_test.py b/test/cli/inline-suppress_test.py
index 7b8be839df4..065a59f5067 100644
--- a/test/cli/inline-suppress_test.py
+++ b/test/cli/inline-suppress_test.py
@@ -82,7 +82,7 @@ def test_unmatched_suppression():
     ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
     lines = stderr.splitlines()
     assert lines == [
-        '{}2.c:2:0: information: Unmatched suppression: some_warning_id [unmatchedSuppression]'.format(__proj_inline_suppres_path)
+        '{}2.c:2:1: information: Unmatched suppression: some_warning_id [unmatchedSuppression]'.format(__proj_inline_suppres_path)
     ]
     assert stdout == ''
     assert ret == 1, stdout
@@ -100,7 +100,7 @@ def test_unmatched_suppression_path_with_extra_stuff():
     ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
     lines = stderr.splitlines()
     assert lines == [
-        '{}2.c:2:0: information: Unmatched suppression: some_warning_id [unmatchedSuppression]'.format(__proj_inline_suppres_path)
+        '{}2.c:2:1: information: Unmatched suppression: some_warning_id [unmatchedSuppression]'.format(__proj_inline_suppres_path)
     ]
     assert stdout == ''
     assert ret == 1, stdout
@@ -248,6 +248,30 @@ def test_build_dir(tmpdir):
     assert stdout == ''
     assert ret == 0, stdout
 
+
+def test_build_dir_include(tmpdir):
+    args = [
+        '-q',
+        '--template=simple',
+        '--cppcheck-build-dir={}'.format(tmpdir),
+        '--enable=all',
+        '--inline-suppr',
+        '{}5.cpp'.format(__proj_inline_suppres_path)
+    ]
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == []
+    assert stdout == ''
+    assert ret == 0, stdout
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == []
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
 def test_build_dir_jobs_suppressions(tmpdir): #14064
     args = [
         '-q',
@@ -431,8 +455,8 @@ def __test_unused_function_unmatched(tmpdir, extra_args):
     lines = stderr.splitlines()
     lines.sort()
     assert lines == [
-        '{}unusedFunctionUnmatched.cpp:5:0: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path),
-        '{}unusedFunctionUnmatched.cpp:5:0: information: Unmatched suppression: unusedFunction [unmatchedSuppression]'.format(__proj_inline_suppres_path)
+        '{}unusedFunctionUnmatched.cpp:5:1: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path),
+        '{}unusedFunctionUnmatched.cpp:5:1: information: Unmatched suppression: unusedFunction [unmatchedSuppression]'.format(__proj_inline_suppres_path)
     ]
     assert stdout == ''
     assert ret == 0, stdout
@@ -478,7 +502,7 @@ def test_unused_function_disabled_unmatched():
 
     ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
     assert stderr.splitlines() == [
-        '{}unusedFunctionUnmatched.cpp:5:0: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path)
+        '{}unusedFunctionUnmatched.cpp:5:1: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path)
     ]
     assert stdout == ''
     assert ret == 0, stdout
@@ -496,8 +520,8 @@ def test_unmatched_cfg():
 
     ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
     assert stderr.splitlines() == [
-        '{}cfg.c:5:0: information: Unmatched suppression: id [unmatchedSuppression]'.format(__proj_inline_suppres_path),
-        '{}cfg.c:9:0: information: Unmatched suppression: id [unmatchedSuppression]'.format(__proj_inline_suppres_path),
+        '{}cfg.c:5:5: information: Unmatched suppression: id [unmatchedSuppression]'.format(__proj_inline_suppres_path),
+        '{}cfg.c:9:5: information: Unmatched suppression: id [unmatchedSuppression]'.format(__proj_inline_suppres_path),
     ]
     assert stdout == ''
     assert ret == 0, stdout
@@ -518,7 +542,7 @@ def test_unused_function_disabled_unmatched_j():
 
     ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
     assert stderr.splitlines() == [
-        '{}unusedFunctionUnmatched.cpp:5:0: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path)
+        '{}unusedFunctionUnmatched.cpp:5:1: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path)
     ]
     assert stdout == ''
     assert ret == 0, stdout
@@ -536,7 +560,7 @@ def test_misra_disabled_unmatched():  #14232
 
     ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
     assert stderr.splitlines() == [
-        '{}misraUnmatched.c:5:0: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path)
+        '{}misraUnmatched.c:5:1: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path)
     ]
     assert stdout == ''
     assert ret == 0, stdout
@@ -554,7 +578,7 @@ def test_premium_disabled_unmatched():  #13663
 
     ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
     assert stderr.splitlines() == [
-        '{}premiumUnmatched.cpp:5:0: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path)
+        '{}premiumUnmatched.cpp:5:1: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path)
     ]
     assert stdout == ''
     assert ret == 0, stdout
\ No newline at end of file
diff --git a/test/cli/lookup_test.py b/test/cli/lookup_test.py
index cab96a7f6bb..5ff4f8d7d22 100644
--- a/test/cli/lookup_test.py
+++ b/test/cli/lookup_test.py
@@ -205,14 +205,35 @@ def test_lib_lookup_relative_noext_notfound(tmpdir):
     assert exitcode == 1, stdout if stdout else stderr
     lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
     assert lines == [
-        "looking for library 'config/gnu.cfg'",
-        "looking for library '{}/config/gnu.cfg'".format(exepath),
-        "looking for library '{}/cfg/config/gnu.cfg'".format(exepath),
+        "looking for library 'config/gnu'",
+        "looking for library '{}/config/gnu'".format(exepath),
+        "looking for library '{}/cfg/config/gnu'".format(exepath),
         "library not found: 'config/gnu'",
         "cppcheck: Failed to load library configuration file 'config/gnu'. File not found"
     ]
 
 
+# TODO: this can never be found - bail out early?
+def test_lib_lookup_relative_noext_trailing_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=library', '--library=config/gnu/', test_file])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        "looking for library 'config/gnu/'",
+        "looking for library '{}/config/gnu/'".format(exepath),
+        "looking for library '{}/cfg/config/gnu/'".format(exepath),
+        "library not found: 'config/gnu/'",
+        "cppcheck: Failed to load library configuration file 'config/gnu/'. File not found"
+    ]
+
+
 def test_lib_lookup_absolute(tmpdir):
     test_file = os.path.join(tmpdir, 'test.c')
     with open(test_file, 'wt'):
@@ -258,6 +279,48 @@ def test_lib_lookup_absolute_notfound(tmpdir):
     ]
 
 
+def test_lib_lookup_absolute_noext_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    cfg_file = os.path.join(tmpdir, 'test')
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=library', '--library={}'.format(cfg_file), test_file])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        "looking for library '{}'".format(cfg_file),
+        "library not found: '{}'".format(cfg_file),
+        "cppcheck: Failed to load library configuration file '{}'. File not found".format(cfg_file)
+    ]
+
+
+# TODO: this can never be found - bail out early?
+def test_lib_lookup_absolute_noext_trailing_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    cfg_file = os.path.join(tmpdir, 'test')
+    cfg_file_trail = cfg_file + os.path.sep
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=library', '--library={}'.format(cfg_file_trail), test_file])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        "looking for library '{}'".format(cfg_file_trail),
+        "library not found: '{}'".format(cfg_file_trail),
+        "cppcheck: Failed to load library configuration file '{}'. File not found".format(cfg_file_trail)
+    ]
+
+
 def test_lib_lookup_nofile(tmpdir):
     test_file = os.path.join(tmpdir, 'test.c')
     with open(test_file, 'wt'):
@@ -544,14 +607,38 @@ def test_platform_lookup_relative_noext_notfound(tmpdir):
     lines = stdout.splitlines()
     assert lines == [
         "looking for platform 'platform/none'",
-        "try to load platform file '{}/platform/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platform/none.xml".format(cwd, cwd),
-        "try to load platform file '{}/platforms/platform/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/platform/none.xml".format(cwd, cwd),
-        "try to load platform file '{}/platform/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platform/none.xml".format(exepath, exepath),
-        "try to load platform file '{}/platforms/platform/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/platform/none.xml".format(exepath, exepath),
+        "try to load platform file '{}/platform/none' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platform/none".format(cwd, cwd),
+        "try to load platform file '{}/platforms/platform/none' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/platform/none".format(cwd, cwd),
+        "try to load platform file '{}/platform/none' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platform/none".format(exepath, exepath),
+        "try to load platform file '{}/platforms/platform/none' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/platform/none".format(exepath, exepath),
         "cppcheck: error: unrecognized platform: 'platform/none'."
     ]
 
 
+# TODO: this can never be found - bail out early?
+def test_platform_lookup_relative_noext_trailing_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=platform', '--platform=platform/none/', test_file])
+    cwd = os.getcwd()
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        cwd = cwd.replace('\\', '/')
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform 'platform/none/'",
+        "try to load platform file '{}/platform/none/' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platform/none/".format(cwd, cwd),
+        "try to load platform file '{}/platforms/platform/none/' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/platform/none/".format(cwd, cwd),
+        "try to load platform file '{}/platform/none/' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platform/none/".format(exepath, exepath),
+        "try to load platform file '{}/platforms/platform/none/' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/platform/none/".format(exepath, exepath),
+        "cppcheck: error: unrecognized platform: 'platform/none/'."
+    ]
+
+
 def test_platform_lookup_absolute(tmpdir):
     test_file = os.path.join(tmpdir, 'test.c')
     with open(test_file, 'wt'):
@@ -590,6 +677,42 @@ def test_platform_lookup_absolute_notfound(tmpdir):
     ]
 
 
+def test_platform_lookup_absolute_noext_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    platform_file = os.path.join(tmpdir, 'test')
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=platform', '--platform={}'.format(platform_file), test_file])
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform '{}'".format(platform_file),
+        "try to load platform file '{}' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}".format(platform_file, platform_file),
+        "cppcheck: error: unrecognized platform: '{}'.".format(platform_file)
+    ]
+
+
+# TODO: this can never be found - bail out early?
+def test_platform_lookup_absolute_noext_trailing_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    platform_file = os.path.join(tmpdir, 'test')
+    platform_file_trail = platform_file + os.path.sep
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=platform', '--platform={}'.format(platform_file_trail), test_file])
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform '{}'".format(platform_file_trail),
+        "try to load platform file '{}' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}".format(platform_file_trail, platform_file_trail),
+        "cppcheck: error: unrecognized platform: '{}'.".format(platform_file_trail)
+    ]
+
+
 @pytest.mark.skip  # TODO: fails when not run from the root folder
 def test_platform_lookup_nofile(tmpdir):
     test_file = os.path.join(tmpdir, 'test.c')
@@ -644,12 +767,14 @@ def test_addon_lookup(tmpdir):
     exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=misra', test_file])
     exepath = os.path.dirname(exe)
     exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
     assert exitcode == 0, stdout if stdout else stderr
     lines = stdout.splitlines()
     assert lines == [
         "looking for addon 'misra.py'",
         "looking for addon '{}misra.py'".format(exepath_sep),
-        "looking for addon '{}addons/misra.py'".format(exepath_sep),  # TODO: mixed separators
+        "looking for addon '{}addons/misra.py'".format(exepath_sep),
         'Checking {} ...'.format(test_file)
     ]
 
@@ -662,12 +787,14 @@ def test_addon_lookup_ext(tmpdir):
     exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=misra.py', test_file])
     exepath = os.path.dirname(exe)
     exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
     assert exitcode == 0, stdout if stdout else stderr
     lines = stdout.splitlines()
     assert lines == [
         "looking for addon 'misra.py'",
         "looking for addon '{}misra.py'".format(exepath_sep),
-        "looking for addon '{}addons/misra.py'".format(exepath_sep),  # TODO: mixed separators
+        "looking for addon '{}addons/misra.py'".format(exepath_sep),
         'Checking {} ...'.format(test_file)
     ]
 
@@ -680,12 +807,14 @@ def test_addon_lookup_notfound(tmpdir):
     exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=none', test_file])
     exepath = os.path.dirname(exe)
     exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
     assert exitcode == 1, stdout
     lines = stdout.splitlines()
     assert lines == [
         "looking for addon 'none.py'",
         "looking for addon '{}none.py'".format(exepath_sep),
-        "looking for addon '{}addons/none.py'".format(exepath_sep),  # TODO: mixed separators
+        "looking for addon '{}addons/none.py'".format(exepath_sep),
         'Did not find addon none.py'
     ]
 
@@ -696,13 +825,15 @@ def test_addon_lookup_notfound_project(tmpdir):  # #13940 / #13941
     exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=none', '--project={}'.format(project_file)])
     exepath = os.path.dirname(exe)
     exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
     assert exitcode == 1, stdout
     lines = stdout.splitlines()
     assert lines == [
         # TODO: needs to look relative to the project file first
         "looking for addon 'none.py'",
         "looking for addon '{}none.py'".format(exepath_sep),
-        "looking for addon '{}addons/none.py'".format(exepath_sep),  # TODO: mixed separators
+        "looking for addon '{}addons/none.py'".format(exepath_sep),
         'Did not find addon none.py'
     ]
 
@@ -713,12 +844,14 @@ def test_addon_lookup_notfound_compdb(tmpdir):
     exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=none', '--project={}'.format(compdb_file)])
     exepath = os.path.dirname(exe)
     exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
     assert exitcode == 1, stdout
     lines = stdout.splitlines()
     assert lines == [
         "looking for addon 'none.py'",
         "looking for addon '{}none.py'".format(exepath_sep),
-        "looking for addon '{}addons/none.py'".format(exepath_sep),  # TODO: mixed separators
+        "looking for addon '{}addons/none.py'".format(exepath_sep),
         'Did not find addon none.py'
     ]
 
@@ -731,12 +864,14 @@ def test_addon_lookup_ext_notfound(tmpdir):
     exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=none.py', test_file])
     exepath = os.path.dirname(exe)
     exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
     assert exitcode == 1, stdout
     lines = stdout.splitlines()
     assert lines == [
         "looking for addon 'none.py'",
         "looking for addon '{}none.py'".format(exepath_sep),
-        "looking for addon '{}addons/none.py'".format(exepath_sep),  # TODO: mixed separators
+        "looking for addon '{}addons/none.py'".format(exepath_sep),
         'Did not find addon none.py'
     ]
 
@@ -749,16 +884,19 @@ def test_addon_lookup_relative_notfound(tmpdir):
     exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=addon/misra.py', test_file])
     exepath = os.path.dirname(exe)
     exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
     assert exitcode == 1, stdout
     lines = stdout.splitlines()
     assert lines == [
         "looking for addon 'addon/misra.py'",
         "looking for addon '{}addon/misra.py'".format(exepath_sep),
-        "looking for addon '{}addons/addon/misra.py'".format(exepath_sep),  # TODO: mixed separators
+        "looking for addon '{}addons/addon/misra.py'".format(exepath_sep),
         'Did not find addon addon/misra.py'
     ]
 
 
+# FIXME: an addon requires a file extension as we need to differentiate between .py and .json addons
 def test_addon_lookup_relative_noext_notfound(tmpdir):
     test_file = os.path.join(tmpdir, 'test.c')
     with open(test_file, 'wt'):
@@ -767,16 +905,40 @@ def test_addon_lookup_relative_noext_notfound(tmpdir):
     exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=addon/misra', test_file])
     exepath = os.path.dirname(exe)
     exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
     assert exitcode == 1, stdout
     lines = stdout.splitlines()
     assert lines == [
         "looking for addon 'addon/misra.py'",
         "looking for addon '{}addon/misra.py'".format(exepath_sep),
-        "looking for addon '{}addons/addon/misra.py'".format(exepath_sep),  # TODO: mixed separators
+        "looking for addon '{}addons/addon/misra.py'".format(exepath_sep),
         'Did not find addon addon/misra.py'
     ]
 
 
+# TODO: this can never be found - bail out early?
+def test_addon_lookup_relative_noext_trailing_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=addon/misra/', test_file])
+    exepath = os.path.dirname(exe)
+    exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = stdout.splitlines()
+    assert lines == [
+        # TODO: should not append extension
+        "looking for addon 'addon/misra/.py'",
+        "looking for addon '{}addon/misra/.py'".format(exepath_sep),
+        "looking for addon '{}addons/addon/misra/.py'".format(exepath_sep),
+        'Did not find addon addon/misra/.py'
+    ]
+
+
 def test_addon_lookup_absolute(tmpdir):
     test_file = os.path.join(tmpdir, 'test.c')
     with open(test_file, 'wt'):
@@ -811,6 +973,43 @@ def test_addon_lookup_absolute_notfound(tmpdir):
     ]
 
 
+# FIXME: an addon requires a file extension as we need to differentiate between .py and .json addons
+def test_addon_lookup_absolute_noext_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    addon_file = os.path.join(tmpdir, 'test')
+    addon_file_py = os.path.join(tmpdir, 'test.py')  # TODO: do not add extension
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=addon', '--addon={}'.format(addon_file), test_file])
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for addon '{}'".format(addon_file_py),
+        'Did not find addon {}'.format(addon_file_py)
+    ]
+
+
+# TODO: this can never be found - bail out early?
+def test_addon_lookup_absolute_noext_trailing_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    addon_file = os.path.join(tmpdir, 'test')
+    addon_file_trail = addon_file + os.path.sep
+    addon_file_trail_py = addon_file_trail + '.py'  # TODO: do not add extension
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=addon', '--addon={}'.format(addon_file_trail), test_file])
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for addon '{}'".format(addon_file_trail_py),
+        'Did not find addon {}'.format(addon_file_trail_py)
+    ]
+
+
 def test_addon_lookup_nofile(tmpdir):
     test_file = os.path.join(tmpdir, 'test.c')
     with open(test_file, 'wt'):
@@ -825,12 +1024,14 @@ def test_addon_lookup_nofile(tmpdir):
     exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=misra', test_file])
     exepath = os.path.dirname(exe)
     exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
     assert exitcode == 0, stdout if stdout else stderr
     lines = stdout.splitlines()
     assert lines == [
         "looking for addon 'misra.py'",
         "looking for addon '{}misra.py'".format(exepath_sep),
-        "looking for addon '{}addons/misra.py'".format(exepath_sep),  # TODO: mixed separators
+        "looking for addon '{}addons/misra.py'".format(exepath_sep),
         'Checking {} ...'.format(test_file)
     ]
 
diff --git a/test/cli/more-projects_test.py b/test/cli/more-projects_test.py
index 03dc00ed0f3..98304bbe8aa 100644
--- a/test/cli/more-projects_test.py
+++ b/test/cli/more-projects_test.py
@@ -173,7 +173,6 @@ def test_project_empty_fields(tmpdir):
   </libraries>
   <suppressions/>
   <suppressions>
-    <suppression/>
   </suppressions>
   <vs-configurations/>
   <vs-configurations>
@@ -258,7 +257,7 @@ def test_project_std(tmpdir):
 
 
 
-@pytest.mark.skip() # clang-tidy is not available in all cases
+@pytest.mark.skip() # clang-tidy is not available in all cases - TODO: enable conditionally
 def test_clang_tidy(tmpdir):
     test_file = os.path.join(tmpdir, 'test.cpp')
     with open(test_file, 'wt') as f:
@@ -657,7 +656,7 @@ def test_project_file_duplicate_2(tmpdir):
     assert stderr == ''
 
 
-def test_project_file_duplicate_3(tmpdir):
+def test_project_file_duplicate_3(tmpdir):  # #12834
     test_file_a = os.path.join(tmpdir, 'a.c')
     with open(test_file_a, 'wt'):
         pass
@@ -687,33 +686,18 @@ def test_project_file_duplicate_3(tmpdir):
 </project>""".format(in_file_a, in_file_b, in_file_c, in_file_d, in_file_e, in_file_f, tmpdir))
 
     args = ['--project={}'.format(project_file)]
-    args.append('-j1') # TODO: remove when fixed
 
     exitcode, stdout, stderr = cppcheck(args, cwd=tmpdir)
     assert exitcode == 0
     lines = stdout.splitlines()
-    # TODO: only a single file should be checked
-    if sys.platform == 'win32':
-        assert lines == [
-            'Checking {} ...'.format(test_file_a),
-            '1/3 files checked 33% done',
-            'Checking {} ...'.format(test_file_a),
-            '2/3 files checked 66% done',
-            'Checking {} ...'.format(test_file_a),
-            '3/3 files checked 100% done'
-        ]
-    else:
-        assert lines == [
-            'Checking {} ...'.format(test_file_a),
-            '1/2 files checked 50% done',
-            'Checking {} ...'.format(test_file_a),
-            '2/2 files checked 100% done'
-        ]
+    assert lines == [
+        'Checking {} ...'.format(test_file_a)
+    ]
     assert stderr == ''
 
 
 @pytest.mark.skipif(sys.platform != 'win32', reason="requires Windows")
-def test_project_file_duplicate_4(tmpdir):
+def test_project_file_duplicate_4(tmpdir):  # #12834
     test_file_a = os.path.join(tmpdir, 'a.c')
     with open(test_file_a, 'wt'):
         pass
@@ -756,19 +740,12 @@ def test_project_file_duplicate_4(tmpdir):
                      args2[0], args2[1], args2[2], args2[3], args2[4], args2[5], args2[6]))
 
     args = ['--project={}'.format(project_file)]
-    args.append('-j1') # TODO: remove when fixed
 
     exitcode, stdout, stderr = cppcheck(args, cwd=tmpdir)
     assert exitcode == 0
     lines = stdout.splitlines()
-    # TODO: only a single file should be checked
     assert lines == [
-        'Checking {} ...'.format(test_file_a),
-        '1/3 files checked 33% done',
-        'Checking {} ...'.format(test_file_a),
-        '2/3 files checked 66% done',
-        'Checking {} ...'.format(test_file_a),
-        '3/3 files checked 100% done'
+        'Checking {} ...'.format(test_file_a)
     ]
     assert stderr == ''
 
diff --git a/test/cli/other_test.py b/test/cli/other_test.py
index c4ae2fab5cf..0123a97128e 100644
--- a/test/cli/other_test.py
+++ b/test/cli/other_test.py
@@ -1,4 +1,3 @@
-
 # python -m pytest test-other.py
 
 import os
@@ -9,10 +8,18 @@
 import subprocess
 import shutil
 
-from testutils import cppcheck, assert_cppcheck, cppcheck_ex, __lookup_cppcheck_exe
+from testutils import cppcheck, assert_cppcheck, cppcheck_ex, __lookup_cppcheck_exe, create_compile_commands
 from xml.etree import ElementTree
 
 
+try:
+    # TODO: handle exitcode?
+    subprocess.call(['clang-tidy', '--version'])
+    __has_clang_tidy = True
+except OSError:
+    __has_clang_tidy = False
+
+
 def __remove_verbose_log(l : list):
     l.remove('Defines:')
     l.remove('Undefines:')
@@ -169,9 +176,67 @@ def test_progress(tmpdir):
             "progress: Tokenize (typedef) 62%\n"
             "progress: Tokenize (typedef) 75%\n"
             "progress: Tokenize (typedef) 87%\n"
-            "progress: SymbolDatabase 0%\n"
-            "progress: SymbolDatabase 12%\n"
-            "progress: SymbolDatabase 87%\n"
+            "progress: Tokenize (typedef) 100%\n"
+            "progress: SymbolDatabase (find all scopes) 0%\n"
+            "progress: SymbolDatabase (find all scopes) 12%\n"
+            "progress: SymbolDatabase (find all scopes) 87%\n"
+            "progress: SymbolDatabase (find all scopes) 100%\n"
+            "progress: ValueFlow 0%\n"
+            "progress: ValueFlow::valueFlowImpossibleValues(tokenlist, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowImpossibleValues(tokenlist, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowSymbolicOperators(symboldatabase, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowSymbolicOperators(symboldatabase, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowCondition(SymbolicConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 0%\n"
+            "progress: ValueFlow::valueFlowCondition(SymbolicConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 100%\n"
+            "progress: ValueFlow::valueFlowSymbolicInfer(symboldatabase, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowSymbolicInfer(symboldatabase, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowArrayElement(tokenlist, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowArrayElement(tokenlist, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowRightShift(tokenlist, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowRightShift(tokenlist, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowCondition(ContainerConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 0%\n"
+            "progress: ValueFlow::valueFlowCondition(ContainerConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 100%\n"
+            "progress: ValueFlow::valueFlowAfterAssign(tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 0%\n"
+            "progress: ValueFlow::valueFlowAfterAssign(tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 100%\n"
+            "progress: ValueFlow::valueFlowAfterSwap(tokenlist, symboldatabase, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowAfterSwap(tokenlist, symboldatabase, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowCondition(SimpleConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 0%\n"
+            "progress: ValueFlow::valueFlowCondition(SimpleConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 100%\n"
+            "progress: ValueFlow::valueFlowInferCondition(tokenlist, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowInferCondition(tokenlist, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowSwitchVariable(tokenlist, symboldatabase, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowSwitchVariable(tokenlist, symboldatabase, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowForLoop(tokenlist, symboldatabase, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowForLoop(tokenlist, symboldatabase, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowDynamicBufferSize(tokenlist, symboldatabase, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowDynamicBufferSize(tokenlist, symboldatabase, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowSubFunction(tokenlist, symboldatabase, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowSubFunction(tokenlist, symboldatabase, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowFunctionReturn(tokenlist, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowFunctionReturn(tokenlist, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowLifetime(tokenlist, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowLifetime(tokenlist, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowFunctionDefaultParameter(tokenlist, symboldatabase, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowFunctionDefaultParameter(tokenlist, symboldatabase, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowUninit(tokenlist, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowUninit(tokenlist, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowAfterMove(tokenlist, symboldatabase, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowAfterMove(tokenlist, symboldatabase, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowSmartPointer(tokenlist, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowSmartPointer(tokenlist, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowIterators(tokenlist, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowIterators(tokenlist, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowCondition(IteratorConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 0%\n"
+            "progress: ValueFlow::valueFlowCondition(IteratorConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 100%\n"
+            "progress: ValueFlow::valueFlowIteratorInfer(tokenlist, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowIteratorInfer(tokenlist, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowContainerSize(tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 0%\n"
+            "progress: ValueFlow::valueFlowContainerSize(tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 100%\n"
+            "progress: ValueFlow::valueFlowSafeFunctions(tokenlist, symboldatabase, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowSafeFunctions(tokenlist, symboldatabase, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow 100%\n"
+            "progress: Run checkers 0%\n"
+            "progress: Run checkers 100%\n"
             )
     assert stderr == ""
 
@@ -362,7 +427,30 @@ def test_addon_misra(tmpdir):
     assert lines == [
         'Checking {} ...'.format(test_file)
     ]
-    assert stderr == '{}:2:1: style: misra violation (use --rule-texts=<file> to get proper output) [misra-c2012-2.3]\ntypedef int MISRA_5_6_VIOLATION;\n^\n'.format(test_file)
+    assert stderr == '{}:2:13: style: misra violation (use --rule-texts=<file> to get proper output) [misra-c2012-2.3]\ntypedef int MISRA_5_6_VIOLATION;\n            ^\n'.format(test_file)
+
+
+def test_report_type_misra_c_2025_20_6(tmpdir):  # #15017
+    """ using a preprocessor directive as a macro parameter is a MISRA C 20.6 violation """
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write("""
+#define A(X) X
+
+A(
+#ifdef __GNUC__
+    1
+#else
+    0
+#endif
+)
+""")
+
+    args = ['--template=simple', '--report-type=misra-c-2025', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    assert stderr == "{}:5:1: Required: failed to expand 'A', it is invalid to use a preprocessor directive as macro parameter [20.6]\n".format(test_file)
 
 
 def test_addon_y2038(tmpdir):
@@ -392,9 +480,9 @@ def test_addon_threadsafety(tmpdir):
     test_file = os.path.join(tmpdir, 'test.cpp')
     with open(test_file, 'wt') as f:
         f.write("""
-extern const char* f()
+extern void f()
 {
-    return strerror(1);
+    elf_fill(1);
 }
         """)
 
@@ -406,7 +494,7 @@ def test_addon_threadsafety(tmpdir):
     assert lines == [
         'Checking {} ...'.format(test_file)
     ]
-    assert stderr == '{}:4:12: warning: strerror is MT-unsafe [threadsafety-unsafe-call]\n'.format(test_file)
+    assert stderr == '{}:4:5: warning: elf_fill is MT-unsafe [threadsafety-unsafe-call]\n'.format(test_file)
 
 
 def test_addon_naming(tmpdir):
@@ -730,7 +818,7 @@ def test_addon_misc(tmpdir):
         f.write("""
 extern void f()
 {
-    char char* [] = {"a" "b"}
+    const char* c[] = {"a" "b"};
 }
         """)
 
@@ -742,7 +830,7 @@ def test_addon_misc(tmpdir):
     assert lines == [
         'Checking {} ...'.format(test_file)
     ]
-    assert stderr == '{}:4:26: style: String concatenation in array initialization, missing comma? [misc-stringConcatInArrayInit]\n'.format(test_file)
+    assert stderr == '{}:4:28: style: String concatenation in array initialization, missing comma? [misc-stringConcatInArrayInit]\n'.format(test_file)
 
 
 def test_invalid_addon_json(tmpdir):
@@ -896,30 +984,197 @@ def test_unused_function_include(tmpdir):
     __test_unused_function_include(tmpdir, [])
 
 
-# TODO: test with all other types
-def test_showtime_top5_file(tmpdir):
-    test_file = os.path.join(tmpdir, 'test.cpp')
+# TODO: test with multiple files
+def __test_showtime(tmp_path, showtime, exp_res, exp_last, use_compdb=False, use_addons=False, use_clang_tidy=False, extra_args=None):
+    test_file = tmp_path / 'test.cpp'  # the use of C++ is intentional
     with open(test_file, 'wt') as f:
-        f.write("""
-                int main(int argc)
-                {
-                }
-                """)
+        f.write(
+"""
+void f()
+{
+    (void)(*((int*)0)); // cppcheck-suppress nullPointer
+}
+""")
 
-    args = ['--showtime=top5_file', '--quiet', test_file]
+    args = [
+        f'--showtime={showtime}',
+        '--quiet',
+        '--inline-suppr'
+    ]
+
+    if use_addons:
+        args += ['--addon=misra', '--addon=misc']
+
+    if use_clang_tidy:
+        args += ['--clang-tidy']
+        args += ['--suppress=clang-tidy-misc-use-internal-linkage']
+        args += ['--suppress=clang-tidy-google-readability-casting']
+        args += ['--suppress=clang-tidy-modernize-avoid-c-style-cast']
+        args += ['--suppress=clang-tidy-hicpp-use-nullptr']
+        args += ['--suppress=clang-tidy-modernize-use-nullptr']
+
+    if use_compdb:
+        compdb_file = tmp_path / 'compile_commands.json'
+        create_compile_commands(compdb_file, [test_file])
+
+        args.append(f'--project={compdb_file}')
+    else:
+        args.append(str(test_file))
+
+    if extra_args:
+        args += extra_args
 
     exitcode, stdout, stderr = cppcheck(args)
-    assert exitcode == 0  # TODO: needs to be 1
+    assert exitcode == 0
     lines = stdout.splitlines()
-    assert len(lines) == 7
-    assert lines[0] == ''
-    for i in range(1, 5):
-        if lines[i].startswith('valueFlowLifetime'):
-            assert lines[i].endswith(' - 2 result(s))')
-        elif lines[i].startswith('valueFlowEnumValue'):
-            assert lines[i].endswith(' - 2 result(s))')
-        else:
-            assert lines[i].endswith(' result(s))')
+    exp_len = exp_res
+    if 'cppcheck internal API usage' in stdout:
+        exp_len += 1
+    if use_addons:
+        exp_len += 1  # TODO: should have individual entries for each addon and whole program analysis
+    # TODO: add entry for clang-tidy analysis
+    exp_len += 1  # last line
+    assert len(lines) == exp_len
+    for i in range(1, exp_res):
+        assert 'avg.' in lines[i]
+    assert lines[exp_len-1].startswith(exp_last)
+    assert not 'avg.' in lines[exp_len-1]
+    assert stderr == ''
+
+
+def __test_showtime_top5_file(tmp_path, use_compdb=False):
+    __test_showtime(tmp_path, 'top5_file', 5, 'Check time: ', use_compdb=use_compdb)
+
+
+def test_showtime_top5_file(tmp_path):
+    __test_showtime_top5_file(tmp_path)
+
+
+def test_showtime_top5_file_compdb(tmp_path):
+    __test_showtime_top5_file(tmp_path, use_compdb=True)
+
+
+def __test_showtime_top5_summary(tmp_path, use_compdb=False):
+    __test_showtime(tmp_path, 'top5_summary', 5, 'Overall time: ', use_compdb=use_compdb)
+
+
+def test_showtime_top5_summary(tmp_path):
+    __test_showtime_top5_summary(tmp_path)
+
+
+def test_showtime_top5_summary_compdb(tmp_path):
+    __test_showtime_top5_summary(tmp_path, use_compdb=True)
+
+
+def __test_showtime_file(tmp_path, use_compdb=False, use_addons=False, use_clang_tidy=False):
+    exp_res = 78
+    # project analysis does not call Preprocessor::getConfig()
+    if use_compdb:
+        exp_res -= 1
+    __test_showtime(tmp_path, 'file', exp_res, 'Check time: ', use_compdb=use_compdb, use_addons=use_addons, use_clang_tidy=use_clang_tidy)
+
+
+def test_showtime_file(tmp_path):
+    __test_showtime_file(tmp_path)
+
+
+def test_showtime_file_compdb(tmp_path):
+    __test_showtime_file(tmp_path, use_compdb=True)
+
+
+def test_showtime_file_addon(tmp_path):
+    __test_showtime_file(tmp_path, use_addons=True)
+
+
+def test_showtime_file_addon_compdb(tmp_path):
+    __test_showtime_file(tmp_path, use_addons=True, use_compdb=True)
+
+
+@pytest.mark.skipif(not __has_clang_tidy, reason='clang-tidy is not available')
+def test_showtime_file_clang_tidy(tmp_path):
+    __test_showtime_file(tmp_path, use_clang_tidy=True)
+
+
+@pytest.mark.skipif(not __has_clang_tidy, reason='clang-tidy is not available')
+def test_showtime_file_clang_tidy_compdb(tmp_path):
+    __test_showtime_file(tmp_path, use_clang_tidy=True, use_compdb=True)
+
+
+def __test_showtime_summary(tmp_path, use_compdb=False, use_addons=False, use_clang_tidy=False):
+    exp_res = 78
+    # project analysis does not call Preprocessor::getConfig()
+    if use_compdb:
+        exp_res -= 1
+    __test_showtime(tmp_path, 'summary', exp_res, 'Overall time: ', use_compdb=use_compdb, use_addons=use_addons, use_clang_tidy=use_clang_tidy)
+
+
+def test_showtime_summary(tmp_path):
+    __test_showtime_summary(tmp_path)
+
+
+def test_showtime_summary_compdb(tmp_path):
+    __test_showtime_summary(tmp_path, use_compdb=True)
+
+
+def test_showtime_summary_addon(tmp_path):
+    __test_showtime_summary(tmp_path, use_addons=True)
+
+
+def test_showtime_summary_addon_compdb(tmp_path):
+    __test_showtime_summary(tmp_path, use_addons=True, use_compdb=True)
+
+
+@pytest.mark.skipif(not __has_clang_tidy, reason='clang-tidy is not available')
+def test_showtime_summary_clang_tidy(tmp_path):
+    __test_showtime_summary(tmp_path, use_clang_tidy=True)
+
+
+@pytest.mark.skipif(not __has_clang_tidy, reason='clang-tidy is not available')
+def test_showtime_summary_clang_tidy_compdb(tmp_path):
+    __test_showtime_summary(tmp_path, use_clang_tidy=True, use_compdb=True)
+
+
+def __test_showtime_file_total(tmp_path, use_compdb=False):
+    __test_showtime(tmp_path, 'file-total', 0, 'Check time: ', use_compdb=use_compdb)
+
+
+def test_showtime_file_total(tmp_path):
+    __test_showtime_file_total(tmp_path)
+
+
+def test_showtime_file_total_compdb(tmp_path):
+    __test_showtime_file_total(tmp_path, True)
+
+
+def test_showtime_unique(tmp_path):
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, 'wt') as f:
+        f.write(
+"""
+void f()
+{
+    (void)(*((int*)0)); // cppcheck-suppress nullPointer
+}
+""")
+
+    args = [
+        '--showtime=summary',
+        '--quiet',
+        '--inline-suppr',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    multi_res = []
+    for line in stdout.splitlines():
+        # TODO: remove when we no longer emit empty line
+        if not line:
+            continue
+        if any(i in line for i in ['1 result(s)', 'Overall time:']):
+            continue
+        multi_res.append(line)
+    assert multi_res == []
     assert stderr == ''
 
 
@@ -1216,7 +1471,7 @@ def test_file_duplicate_2(tmpdir):
     assert stderr == ''
 
 
-def test_file_duplicate_3(tmpdir):
+def test_file_duplicate_3(tmpdir):  # #12834
     test_file_a = os.path.join(tmpdir, 'a.c')
     with open(test_file_a, 'wt'):
         pass
@@ -1230,43 +1485,18 @@ def test_file_duplicate_3(tmpdir):
     in_file_f = os.path.join(tmpdir, 'dummy', '..', 'a.c')
 
     args = [in_file_a, in_file_b, in_file_c, in_file_d, in_file_e, in_file_f, str(tmpdir)]
-    args.append('-j1') # TODO: remove when fixed
 
     exitcode, stdout, stderr = cppcheck(args, cwd=tmpdir)
     assert exitcode == 0, stdout if stdout else stderr
     lines = stdout.splitlines()
-    # TODO: only a single file should be checked
-    if sys.platform == 'win32':
-        assert lines == [
-            'Checking {} ...'.format('a.c'),
-            '1/6 files checked 16% done',
-            'Checking {} ...'.format('a.c'),
-            '2/6 files checked 33% done',
-            'Checking {} ...'.format('a.c'),
-            '3/6 files checked 50% done',
-            'Checking {} ...'.format(test_file_a),
-            '4/6 files checked 66% done',
-            'Checking {} ...'.format(test_file_a),
-            '5/6 files checked 83% done',
-            'Checking {} ...'.format(test_file_a),
-            '6/6 files checked 100% done'
-        ]
-    else:
-        assert lines == [
-            'Checking {} ...'.format('a.c'),
-            '1/4 files checked 25% done',
-            'Checking {} ...'.format('a.c'),
-            '2/4 files checked 50% done',
-            'Checking {} ...'.format(test_file_a),
-            '3/4 files checked 75% done',
-            'Checking {} ...'.format(test_file_a),
-            '4/4 files checked 100% done'
-        ]
+    assert lines == [
+        'Checking {} ...'.format('a.c')
+    ]
     assert stderr == ''
 
 
 @pytest.mark.skipif(sys.platform != 'win32', reason="requires Windows")
-def test_file_duplicate_4(tmpdir):
+def test_file_duplicate_4(tmpdir):  # #12834
     test_file_a = os.path.join(tmpdir, 'a.c')
     with open(test_file_a, 'wt'):
         pass
@@ -1284,25 +1514,12 @@ def test_file_duplicate_4(tmpdir):
     for a in args1:
         args2.append(a.replace('\\', '/'))
     args = args1 + args2
-    args.append('-j1') # TODO: remove when fixed
 
     exitcode, stdout, stderr = cppcheck(args, cwd=tmpdir)
     assert exitcode == 0, stdout if stdout else stderr
     lines = stdout.splitlines()
-    # TODO: only a single file should be checked
     assert lines == [
-        'Checking {} ...'.format('a.c'),
-        '1/6 files checked 16% done',
-        'Checking {} ...'.format('a.c'),
-        '2/6 files checked 33% done',
-        'Checking {} ...'.format('a.c'),
-        '3/6 files checked 50% done',
-        'Checking {} ...'.format(test_file_a),
-        '4/6 files checked 66% done',
-        'Checking {} ...'.format(test_file_a),
-        '5/6 files checked 83% done',
-        'Checking {} ...'.format(test_file_a),
-        '6/6 files checked 100% done'
+        'Checking {} ...'.format('a.c')
     ]
     assert stderr == ''
 
@@ -2124,7 +2341,7 @@ def test_builddir_hash_check_level(tmp_path):  # #13376
     cache_file = (build_dir / 'test.a1')
 
     root = ElementTree.fromstring(cache_file.read_text())
-    hash_1 = root.get('hash')
+    hash_1 = root.findtext('hash')
 
     args += ['--check-level=exhaustive']
 
@@ -2133,7 +2350,7 @@ def test_builddir_hash_check_level(tmp_path):  # #13376
     assert stderr == ''
 
     root = ElementTree.fromstring(cache_file.read_text())
-    hash_2 = root.get('hash')
+    hash_2 = root.findtext('hash')
 
     assert hash_1 != hash_2
 
@@ -2335,7 +2552,7 @@ def __test_inline_suppr(tmp_path, extra_args):  # #13087
     assert exitcode == 0, stdout
     assert stdout == ''
     assert stderr.splitlines() == [
-        '{}:4:0: information: Unmatched suppression: memleak [unmatchedSuppression]'.format(test_file)
+        '{}:4:1: information: Unmatched suppression: memleak [unmatchedSuppression]'.format(test_file)
     ]
 
 
@@ -2353,8 +2570,6 @@ def test_inline_suppr_builddir(tmp_path):
     __test_inline_suppr(tmp_path, ['--cppcheck-build-dir={}'.format(build_dir), '-j1'])
 
 
-# TODO: the suppressions are generated outside of the scope which captures the analysis information
-@pytest.mark.xfail(strict=True)
 def test_inline_suppr_builddir_cached(tmp_path):
     build_dir = tmp_path / 'b1'
     os.mkdir(build_dir)
@@ -2368,8 +2583,6 @@ def test_inline_suppr_builddir_j(tmp_path):
     __test_inline_suppr(tmp_path, ['--cppcheck-build-dir={}'.format(build_dir), '-j2'])
 
 
-# TODO: the suppressions are generated outside of the scope which captures the analysis information
-@pytest.mark.xfail(strict=True)
 def test_inline_suppr_builddir_j_cached(tmp_path):
     build_dir = tmp_path / 'b1'
     os.mkdir(build_dir)
@@ -2476,7 +2689,7 @@ def test_xml_output(tmp_path):  # #13391 / #13485
 <results version="2">
     <cppcheck version="{}"/>
     <errors>
-        <error id="nullPointerRedundantCheck" severity="warning" msg="Either the condition &apos;p&apos; is redundant or there is possible null pointer dereference: p." verbose="Either the condition &apos;p&apos; is redundant or there is possible null pointer dereference: p." cwe="476" file0="{}" remark="boom">
+        <error id="nullPointerRedundantCheck" severity="warning" msg="Either the condition &apos;p&apos; is redundant or there is possible null pointer dereference: p." verbose="Either the condition &apos;p&apos; is redundant or there is possible null pointer dereference: p." cwe="476" hash="2884341854190588507" file0="{}" remark="boom">
             <location file="{}" line="5" column="12" info="Null pointer dereference"/>
             <location file="{}" line="4" column="8" info="Assuming that condition &apos;p&apos; is not redundant"/>
             <symbol>p</symbol>
@@ -2567,7 +2780,7 @@ def __test_addon_suppr(tmp_path, extra_args):
     assert exitcode == 0, stdout
     assert stdout == ''
     assert stderr.splitlines() == [
-        '{}:4:1: style: misra violation (use --rule-texts=<file> to get proper output) [misra-c2012-2.3]'.format(test_file),
+        '{}:4:13: style: misra violation (use --rule-texts=<file> to get proper output) [misra-c2012-2.3]'.format(test_file),
     ]
 
 
@@ -3238,13 +3451,6 @@ def test_check_unused_templates_func(tmp_path):  # #13714
     assert stdout.splitlines() == []
     assert stderr.splitlines() == []  # no error since the unused templates are not being checked
 
-try:
-    # TODO: handle exitcode?
-    subprocess.call(['clang-tidy', '--version'])
-    has_clang_tidy = True
-except OSError:
-    has_clang_tidy = False
-
 def __test_clang_tidy(tmpdir, use_compdb):
     test_file = os.path.join(tmpdir, 'test.cpp')
     with open(test_file, 'wt') as f:
@@ -3275,18 +3481,18 @@ def __test_clang_tidy(tmpdir, use_compdb):
     ]
 
 
-@pytest.mark.skipif(not has_clang_tidy, reason='clang-tidy is not available')
+@pytest.mark.skipif(not __has_clang_tidy, reason='clang-tidy is not available')
 @pytest.mark.xfail(strict=True)  # TODO: clang-tidy is only invoked with FileSettings - see #12053
 def test_clang_tidy(tmpdir):  # #12053
     __test_clang_tidy(tmpdir, False)
 
 
-@pytest.mark.skipif(not has_clang_tidy, reason='clang-tidy is not available')
+@pytest.mark.skipif(not __has_clang_tidy, reason='clang-tidy is not available')
 def test_clang_tidy_project(tmpdir):
     __test_clang_tidy(tmpdir, True)
 
 
-@pytest.mark.skipif(not has_clang_tidy, reason='clang-tidy is not available')
+@pytest.mark.skipif(not __has_clang_tidy, reason='clang-tidy is not available')
 def test_clang_tidy_error_exit(tmp_path):  # #13828 / #13829
     test_file = tmp_path / 'test.cpp'
     with open(test_file, 'wt') as f:
@@ -3351,13 +3557,48 @@ def test_suppress_unmatched_wildcard(tmp_path):  # #13660
     exitcode, stdout, stderr = cppcheck(args, cwd=tmp_path)
     assert exitcode == 0, stdout
     assert stdout.splitlines() == []
-    # TODO: invalid locations - see #13659
     assert stderr.splitlines() == [
-        'test*.c:-1:0: information: Unmatched suppression: id [unmatchedSuppression]',
-        'test*.c:-1:0: information: Unmatched suppression: id2 [unmatchedSuppression]',
-        'tes?.c:-1:0: information: Unmatched suppression: id2 [unmatchedSuppression]'
+        'test*.c:0:0: information: Unmatched suppression: id [unmatchedSuppression]',
+        'test*.c:0:0: information: Unmatched suppression: id2 [unmatchedSuppression]',
+        'tes?.c:0:0: information: Unmatched suppression: id2 [unmatchedSuppression]'
+    ]
+
+
+def test_suppress_unmatched_wildcard_cached(tmp_path):  # #14585
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write(
+"""void f()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    build_dir = tmp_path / 'b1'
+    os.makedirs(build_dir)
+
+    # need to run in the temporary folder because the path of the suppression has to match
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=information',
+        '--cppcheck-build-dir={}'.format(build_dir),
+        '--suppress=nullPointer:test*.c',
+        'test.c'
     ]
 
+    stderr_exp = []
+
+    exitcode, stdout, stderr = cppcheck(args, cwd=tmp_path)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == stderr_exp
+
+    exitcode, stdout, stderr = cppcheck(args, cwd=tmp_path)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == stderr_exp
+
 
 def test_suppress_unmatched_wildcard_unchecked(tmp_path):
     # make sure that unmatched wildcards suppressions are reported if files matching the expressions were processesd
@@ -3380,12 +3621,11 @@ def test_suppress_unmatched_wildcard_unchecked(tmp_path):
     exitcode, stdout, stderr = cppcheck(args, cwd=tmp_path)
     assert exitcode == 0, stdout
     assert stdout.splitlines() == []
-    # TODO: invalid locations - see #13659
     assert stderr.splitlines() == [
-        'test*.c:-1:0: information: Unmatched suppression: id [unmatchedSuppression]',
-        'tes?.c:-1:0: information: Unmatched suppression: id [unmatchedSuppression]',
-        '*:-1:0: information: Unmatched suppression: id2 [unmatchedSuppression]',
-        'test*.c:-1:0: information: Unmatched suppression: * [unmatchedSuppression]'
+        'test*.c:0:0: information: Unmatched suppression: id [unmatchedSuppression]',
+        'tes?.c:0:0: information: Unmatched suppression: id [unmatchedSuppression]',
+        '*:0:0: information: Unmatched suppression: id2 [unmatchedSuppression]',
+        'test*.c:0:0: information: Unmatched suppression: * [unmatchedSuppression]'
     ]
 
 
@@ -3839,12 +4079,12 @@ def test_unmatched_file(tmp_path):  # #14248 / #14249
     ret, stdout, stderr = cppcheck(args)
     assert stdout == ''
     assert stderr.splitlines() == [
-        f'{lib_file}:-1:0: information: Unmatched suppression: error [unmatchedSuppression]',
-        f'{lib_file}:-1:0: information: Unmatched suppression: error2 [unmatchedSuppression]',
-        f'{lib_file}:-1:0: information: Unmatched suppression: error3 [unmatchedSuppression]',
-        f'{lib_file}:-1:0: information: Unmatched suppression: error4 [unmatchedSuppression]',
-        f'{lib_file}:-1:0: information: Unmatched suppression: error5 [unmatchedSuppression]',
-        f'{lib_file}:-1:0: information: Unmatched suppression: error6 [unmatchedSuppression]'
+        f'{lib_file}:0:0: information: Unmatched suppression: error [unmatchedSuppression]',
+        f'{lib_file}:0:0: information: Unmatched suppression: error2 [unmatchedSuppression]',
+        f'{lib_file}:0:0: information: Unmatched suppression: error3 [unmatchedSuppression]',
+        f'{lib_file}:0:0: information: Unmatched suppression: error4 [unmatchedSuppression]',
+        f'{lib_file}:0:0: information: Unmatched suppression: error5 [unmatchedSuppression]',
+        f'{lib_file}:0:0: information: Unmatched suppression: error6 [unmatchedSuppression]'
     ]
     assert ret == 0, stdout
 
@@ -4018,9 +4258,120 @@ def test_no_valid_configuration(tmp_path):
         '{}:1:2: error: No header in #include [syntaxError]'.format(test_file),
         '{}:1:2: error: No header in #include [syntaxError]'.format(test_file),
         '{}:1:2: error: No header in #include [syntaxError]'.format(test_file),
-        '{}:0:0: information: This file is not analyzed. Cppcheck failed to extract a valid configuration. Use -v for more details. [noValidConfiguration]'.format(test_file)
+        '{}:0:0: information: This file is not analyzed. No working configuration could be extracted. Use -v for more details. [noValidConfiguration]'.format(test_file)
+    ]
+
+
+# The implementation for "A::a" is missing - so don't check if "A::b" is used or not
+def test_unused_private_function_incomplete_impl(tmpdir):
+    test_inc = os.path.join(tmpdir, 'test.h')
+    with open(test_inc, 'wt') as f:
+        f.write(
+"""
+class A
+{
+public:
+    A();
+    void a();
+private:
+    void b();
+};
+""")
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write(
+"""
+#include "test.h"
+
+A::A() { }
+void A::b() { }
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=style',
+        '--suppress=functionStatic',  # we do not care about this - this was converted from TestUnusedPrivateFunction
+        test_file
+    ]
+
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout == ''
+    assert stderr.splitlines() == []
+    assert ret == 0, stdout
+
+
+def test_unused_private_function_multi_file(tmpdir):  # ticket #2567
+    test_inc = os.path.join(tmpdir, 'test.h')
+    with open(test_inc, 'wt') as f:
+        f.write(
+"""
+struct Fred
+{
+    Fred()
+    {
+        Init();
+    }
+private:
+    void Init();
+};
+""")
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write(
+"""
+#include "test.h"
+
+void Fred::Init()
+{
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=style',
+        '--suppress=functionStatic',  # we do not care about this - this was converted from TestUnusedPrivateFunction
+        test_file
+    ]
+
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout == ''
+    assert stderr.splitlines() == []
+    assert ret == 0, stdout
+
+
+def test_missing_doublequote_include(tmpdir):
+    test_inc = os.path.join(tmpdir, 'abc.h')
+    with open(test_inc, 'wt') as f:
+        f.write(
+'''
+#define a
+"
+''')
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write(
+"""
+#include "abc.h"
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        test_file
     ]
 
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout == ''
+    assert stderr.splitlines() == [
+        f"{test_inc}:3:1: error: No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported. [syntaxError]"
+    ]
+    assert ret == 0, stdout
+
 
 def test_no_valid_configuration_check_config(tmp_path):
     test_file = tmp_path / 'test.c'
@@ -4100,22 +4451,552 @@ def __test_active_checkers(tmp_path, active_cnt, total_cnt, use_misra=False, use
 
 
 def test_active_unusedfunction_only(tmp_path):
-    __test_active_checkers(tmp_path, 1, 975, use_unusedfunction_only=True)
+    __test_active_checkers(tmp_path, 1, 189, use_unusedfunction_only=True)
 
 
 def test_active_unusedfunction_only_builddir(tmp_path):
     checkers_exp = [
         'CheckUnusedFunctions::check'
     ]
-    __test_active_checkers(tmp_path, 1, 975, use_unusedfunction_only=True, checkers_exp=checkers_exp)
+    __test_active_checkers(tmp_path, 1, 189, use_unusedfunction_only=True, checkers_exp=checkers_exp)
 
 
 def test_active_unusedfunction_only_misra(tmp_path):
-    __test_active_checkers(tmp_path, 1, 1175, use_unusedfunction_only=True, use_misra=True)
+    __test_active_checkers(tmp_path, 1, 389, use_unusedfunction_only=True, use_misra=True)
 
 
 def test_active_unusedfunction_only_misra_builddir(tmp_path):
     checkers_exp = [
         'CheckUnusedFunctions::check'
     ]
-    __test_active_checkers(tmp_path, 1, 1175, use_unusedfunction_only=True, use_misra=True, checkers_exp=checkers_exp)
+    __test_active_checkers(tmp_path, 1, 389, use_unusedfunction_only=True, use_misra=True, checkers_exp=checkers_exp)
+
+
+def test_analyzerinfo(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write(
+"""void f()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    build_dir = tmp_path / 'b1'
+    os.makedirs(build_dir)
+
+    test_a1_file = build_dir / 'test.a1'
+
+    args = [
+        '-q',
+        '--debug-analyzerinfo',
+        '--template=simple',
+        '--cppcheck-build-dir={}'.format(build_dir),
+        '--enable=all',
+        str(test_file)
+    ]
+
+    stderr_exp = [
+        '{}:3:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file),
+        "{}:1:6: style: The function 'f' is never used. [unusedFunction]".format(test_file)
+    ]
+
+    def run_and_assert_cppcheck(stdout_exp):
+        exitcode, stdout, stderr = cppcheck(args)
+        assert exitcode == 0, stdout
+        assert stdout.splitlines() == stdout_exp
+        assert stderr.splitlines() == stderr_exp
+
+    test_file_s = str(test_file).replace('\\', '/')
+    test_a1_file_s = str(test_a1_file).replace('\\', '/')
+
+    # no cached results
+    run_and_assert_cppcheck([
+        "no cached result '{}' for '{}' found".format(test_a1_file_s, test_file_s)
+    ])
+
+    # cached results
+    run_and_assert_cppcheck([
+        "skipping analysis - loaded 1 cached finding(s) from '{}' for '{}'".format(test_a1_file_s, test_file_s)
+    ])
+
+    # modified file
+    with open(test_file, 'a') as f:
+        f.write('\n#define DEF')
+
+    run_and_assert_cppcheck([
+        "discarding cached result from '{}' for '{}' - hash mismatch".format(test_a1_file_s, test_file_s)
+    ])
+
+    # invalid XML
+    with open(test_a1_file, 'a') as f:
+        f.write('.')
+
+    run_and_assert_cppcheck([
+        "discarding cached result - failed to load '{}' for '{}' (XML_ERROR_PARSING_TEXT)".format(test_a1_file_s, test_file_s)
+    ])
+
+    # missing root node
+    with open(test_a1_file, 'w') as f:
+        f.write('<?xml version="1.0"?>')
+
+    run_and_assert_cppcheck([
+        "discarding cached result from '{}' for '{}' - no root node found".format(test_a1_file_s, test_file_s)
+    ])
+
+    # mismatched root node
+    with open(test_a1_file, 'w') as f:
+        f.write('<?xml version="1.0"?><root/>')
+
+    run_and_assert_cppcheck([
+        "discarding cached result from '{}' for '{}' - unexpected root node".format(test_a1_file_s, test_file_s)
+    ])
+
+    # missing 'hash' node
+    with open(test_a1_file, 'w') as f:
+        f.write('<?xml version="1.0"?><analyzerinfo/>')
+
+    run_and_assert_cppcheck([
+        "discarding cached result from '{}' for '{}' - no 'hash' node found".format(test_a1_file_s, test_file_s)
+    ])
+
+    # invalid 'hash' node
+    with open(test_a1_file, 'w') as f:
+        f.write('<?xml version="1.0"?><analyzerinfo><hash>hash</hash></analyzerinfo>')
+
+    run_and_assert_cppcheck([
+        "discarding cached result from '{}' for '{}' - hash mismatch".format(test_a1_file_s, test_file_s)
+    ])
+
+    # TODO:
+    # - invalid error
+    # - internalError
+
+
+def test_analyzerinfo_include_order(tmp_path):  # #15132
+    with open(tmp_path / 'z.h', 'wt') as f:
+        f.write('int z;\n')
+    with open(tmp_path / 'a.h', 'wt') as f:
+        f.write('int a;\n')
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write(
+"""#include "z.h"
+#include "a.h"
+int f(void) { return a + z; }
+""")
+
+    build_dir = tmp_path / 'b1'
+    os.makedirs(build_dir)
+
+    args = [
+        '-q',
+        '--debug-analyzerinfo',
+        '--cppcheck-build-dir={}'.format(build_dir),
+        str(test_file)
+    ]
+
+    test_file_s = str(test_file).replace('\\', '/')
+    test_a1_file_s = str(build_dir / 'test.a1').replace('\\', '/')
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == [
+        "no cached result '{}' for '{}' found".format(test_a1_file_s, test_file_s)
+    ]
+    assert stderr.splitlines() == []
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == [
+        "skipping analysis - loaded 0 cached finding(s) from '{}' for '{}'".format(test_a1_file_s, test_file_s)
+    ]
+    assert stderr.splitlines() == []
+
+
+def test_ctu_function_call_path_slash(tmp_path):  # #14591
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, "w") as f:
+        f.write(
+"""void g(T* p)
+{
+    *p = 0;
+}
+
+void f(T* p)
+{
+    p = nullptr;
+    g(p);
+}
+""")
+
+    build_dir = tmp_path / 'b1'
+    os.makedirs(build_dir)
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--cppcheck-build-dir={}'.format(build_dir),
+        str(test_file)
+    ]
+
+    exitcode, _, _ = cppcheck(args)
+    assert exitcode == 0
+
+    test_a1_file = build_dir / 'test.a1'
+    analyzerinfo = ElementTree.fromstring(test_a1_file.read_text())
+    function_call_paths = analyzerinfo.findall('FileInfo/function-call/path')
+    assert len(function_call_paths) == 1
+    file = function_call_paths[0].attrib['file']
+    assert file
+    assert not '\\' in file  # the path was incorrectly converted to native
+
+
+# TODO: Remove duplication/builddir when 7079 is merged
+def test_inline_block_suppr_builddir_twice(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write("""
+// cppcheck-suppress-begin [zerodiv]
+x = 10 / 0;
+// cppcheck-suppress-end [zerodiv]
+""")
+
+    build_dir = tmp_path / 'b'
+    os.mkdir(build_dir)
+
+    args = [
+        '-q',
+        '--cppcheck-build-dir={}'.format(build_dir),
+        '--enable=all',
+        '--inline-suppr',
+        str(test_file)
+    ]
+
+    for _ in range(2):
+        exitcode, stdout, stderr = cppcheck(args)
+        assert exitcode == 0
+        assert stdout == ''
+        assert stderr == ''
+
+
+def test_dui_include(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write('void f() {}')
+
+    inc_file = tmp_path / 'inc.h'
+    with open(inc_file, "w") as f:
+        f.write(
+"""
+void f_i()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        f'--include={inc_file}',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    assert stdout == ''
+    assert stderr.splitlines() == [
+        f'{inc_file}:4:14: error: Null pointer dereference: (int*)0 [nullPointer]'
+    ]
+
+
+def test_dui_include_missing(tmp_path):  # #14675
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write('void f() {}')
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--include=missing.h',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    assert stdout == ''
+    assert stderr.splitlines() == [
+        f"{test_file}:0:0: error: Can not open include file 'missing.h' that is explicitly included. [missingIncludeExplicit]"
+    ]
+
+
+def test_dui_include_relative(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write('void f() {}')
+
+    inc_file = tmp_path / 'inc.h'
+    with open(inc_file, "w") as f:
+        f.write(
+"""
+void f_i()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--include=inc.h',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args, cwd=tmp_path)
+    assert exitcode == 0
+    assert stdout == ''
+    assert stderr.splitlines() == [
+        'inc.h:4:14: error: Null pointer dereference: (int*)0 [nullPointer]'
+    ]
+
+
+def test_dui_include_relative_missing(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write('void f() {}')
+
+    inc_file = tmp_path / 'inc.h'
+    with open(inc_file, "w") as f:
+        f.write(
+"""
+void f_i()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--include=inc.h',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args,)
+    assert exitcode == 0
+    assert stdout == ''
+    assert stderr.splitlines() == [
+        f"{test_file}:0:0: error: Can not open include file 'inc.h' that is explicitly included. [missingIncludeExplicit]"
+    ]
+
+
+def test_dui_include_absolute_missing(tmp_path):  # #14675
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write('void f() {}')
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--include=/share/include/missing.h',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    assert stdout == ''
+    assert stderr.splitlines() == [
+        f"{test_file}:0:0: error: Can not open include file '/share/include/missing.h' that is explicitly included. [missingIncludeExplicit]"
+    ]
+
+
+@pytest.mark.skipif(sys.platform == 'win32', reason="requires ProcessExecutor")
+def test_ipc(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write('void f() {}')
+
+    args = [
+        '-q',
+        '--debug-ipc',
+        '-j2',
+        '--executor=process',
+        '--no-cppcheck-build-dir',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    assert stdout.splitlines() == [
+        'writeToPipe - 5 - 0',
+        'handleRead - 5 - 0'
+    ]
+    assert stderr.splitlines() == []
+
+
+@pytest.mark.skipif(sys.platform == 'win32', reason="requires ProcessExecutor")
+def test_ipc_suppressions(tmp_path):
+    test1_file = tmp_path / 'test1.c'
+    with open(test1_file, "w") as f:
+        f.write('void f() {}')
+
+    test2_file = tmp_path / 'test2.c'
+    with open(test2_file, "w") as f:
+        f.write('void f() {}')
+
+    test3_file = tmp_path / 'test3.c'
+    with open(test3_file, "w") as f:
+        f.write('void f() {}')
+
+    args = [
+        '-q',
+        '--debug-ipc',
+        '-j2',
+        '--executor=process',
+        '--no-cppcheck-build-dir',
+        '--suppress=id0:test1.c',
+        str(tmp_path)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    # sort the lines since the order is not fixed
+    stdout_exp = [
+        'writeToPipe - 4 - id0:test1.c;0;1;0;',
+        'handleRead - 4 - id0:test1.c;0;1;0;',
+        'writeToPipe - 5 - 0',
+        'handleRead - 5 - 0',
+        'writeToPipe - 5 - 0',
+        'handleRead - 5 - 0',
+        'writeToPipe - 5 - 0',
+        'handleRead - 5 - 0'
+    ]
+    stdout_exp.sort()
+    stdout_lines = stdout.splitlines()
+    stdout_lines.sort()
+    assert stdout_lines == stdout_exp
+    assert stderr.splitlines() == []
+
+
+@pytest.mark.skipif(sys.platform == 'win32', reason="requires ProcessExecutor")
+def test_ipc_inline_suppressions(tmp_path):
+    test1_file = tmp_path / 'test1.c'
+    with open(test1_file, "w") as f:
+        f.write('void f() {} // cppcheck-suppress id1')
+
+    test2_file = tmp_path / 'test2.c'
+    with open(test2_file, "w") as f:
+        f.write('void f() {} // cppcheck-suppress id2')
+
+    test3_file = tmp_path / 'test3.c'
+    with open(test3_file, "w") as f:
+        f.write('void f() {} // cppcheck-suppress id3')
+
+    args = [
+        '-q',
+        '--debug-ipc',
+        '-j2',
+        '--executor=process',
+        '--no-cppcheck-build-dir',
+        '--inline-suppr',
+        str(tmp_path)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    # sort the lines since the order is not fixed
+    stdout_exp = [
+        f'writeToPipe - 3 - id1:{test1_file}:1;13;1;0;',
+        f'handleRead - 3 - id1:{test1_file}:1;13;1;0;',
+        'writeToPipe - 5 - 0',
+        'handleRead - 5 - 0',
+        f'writeToPipe - 3 - id2:{test2_file}:1;13;1;0;',
+        f'handleRead - 3 - id2:{test2_file}:1;13;1;0;',
+        'writeToPipe - 5 - 0',
+        'handleRead - 5 - 0',
+        f'writeToPipe - 3 - id3:{test3_file}:1;13;1;0;',
+        f'handleRead - 3 - id3:{test3_file}:1;13;1;0;',
+        'writeToPipe - 5 - 0',
+        'handleRead - 5 - 0'
+    ]
+    stdout_exp.sort()
+    stdout_lines = stdout.splitlines()
+    stdout_lines.sort()
+    assert stdout_lines == stdout_exp
+    assert stderr.splitlines() == []
+
+
+@pytest.mark.skipif(sys.platform == 'win32', reason="requires ProcessExecutor")
+def test_ipc_hash_suppressions(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write('void f() { int x = 1; }')
+
+    _, _, stderr = cppcheck(['--enable=style', '--xml-version=3', str(test_file)])
+    error_hash = ElementTree.fromstring(stderr).find('.//error').get('hash')
+
+    suppr_file = tmp_path / 'suppr.xml'
+    with open(suppr_file, "w") as f:
+        f.write(f'<suppressions><suppress><id>unreadVariable</id><fileName>{test_file}</fileName><hash>{error_hash}</hash></suppress></suppressions>')
+
+    args = [
+        '-q',
+        '--debug-ipc',
+        '-j2',
+        '--executor=process',
+        '--no-cppcheck-build-dir',
+        '--enable=style',
+        f'--suppress-xml={suppr_file}',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    # the hash suppression is not sent to the parent
+    assert stdout.splitlines() == [
+        'writeToPipe - 5 - 0',
+        'handleRead - 5 - 0'
+    ]
+    assert stderr.splitlines() == []
+
+test_redundant_file_reads_params = [
+    ([],                       3),
+    (['--suppress=zerodiv'],   1),
+    (['--template=cppcheck1'], 1),
+    (['--xml'],                1),
+]
+
+@pytest.mark.skipif(sys.platform != 'linux' or 'ASAN_OPTIONS' in os.environ, reason="uses strace")
+@pytest.mark.parametrize('flags,expected', test_redundant_file_reads_params)
+def test_redundant_file_reads(tmpdir, flags, expected):
+    source_pathname = os.path.join(tmpdir, 'test.c')
+    content = """
+void f(int x) {
+    int y = x / 0;
+    int z = x / 0;
+}
+"""
+    cppcheck_path = __lookup_cppcheck_exe()
+
+    with open(source_pathname, 'wt') as f:
+        f.write(content)
+
+    args = [
+        'strace',
+         '--summary-only',
+         '--summary-columns=count',
+         '--trace=openat',
+         '--follow-forks',
+         f'--trace-path={source_pathname}',
+         cppcheck_path,
+         '-q',
+         source_pathname,
+    ]
+
+    args += flags
+    proc = subprocess.Popen(args, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE)
+
+    _, stderr = proc.communicate()
+
+    assert proc.returncode == 0
+    assert stderr.splitlines()[-1].strip() == f'{expected} total'.encode('utf-8')
diff --git a/test/cli/performance_test.py b/test/cli/performance_test.py
index 9f5141f2bb9..ea1ad8bd5ff 100644
--- a/test/cli/performance_test.py
+++ b/test/cli/performance_test.py
@@ -3,6 +3,7 @@
 
 import os
 import sys
+import time
 
 import pytest
 
@@ -146,6 +147,29 @@ def test_slow_exprid(tmpdir):
     my_env["DISABLE_VALUEFLOW"] = "1"
     cppcheck([filename], env=my_env)
 
+@pytest.mark.timeout(35)
+def test_stack_overflow_AST(tmpdir):
+    # 14435
+    filename = os.path.join(tmpdir, 'hang.cpp')
+    with open(filename, 'wt') as f:
+        f.write("""
+#define ROW 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+#define ROW8 ROW ROW ROW ROW ROW ROW ROW ROW
+#define ROW64 ROW8 ROW8 ROW8 ROW8 ROW8 ROW8 ROW8 ROW8
+#define ROW512 ROW64 ROW64 ROW64 ROW64 ROW64 ROW64 ROW64 ROW64
+#define ROW4096 ROW512 ROW512 ROW512 ROW512 ROW512 ROW512 ROW512 ROW512
+#define ROW32768 ROW4096 ROW4096 ROW4096 ROW4096 ROW4096 ROW4096 ROW4096 ROW4096
+void f(std::vector<int>& v) {
+	v = {
+		ROW32768 0
+	};
+}
+        """)
+
+    my_env = os.environ.copy()
+    my_env["DISABLE_VALUEFLOW"] = "1"
+    cppcheck([filename], env=my_env)
+
 
 @pytest.mark.timeout(10)
 def test_slow_initlist_varchanged(tmpdir):
@@ -221,6 +245,7 @@ def test_slow_many_scopes(tmpdir):
                 }""")
     cppcheck([filename]) # should not take more than ~1 second
 
+
 @pytest.mark.skipif(sys.platform == 'darwin', reason='GitHub macOS runners are too slow')
 @pytest.mark.timeout(20)
 def test_crash_array_in_namespace(tmpdir):
@@ -241,6 +266,28 @@ def test_crash_array_in_namespace(tmpdir):
                 }""")
     cppcheck([filename]) # should not take more than ~5 seconds
 
+
+@pytest.mark.skipif(sys.platform == 'darwin', reason='GitHub macOS runners are too slow')
+@pytest.mark.timeout(30)
+def test_crash_array_in_array(tmpdir):
+    # 12861
+    filename = os.path.join(tmpdir, 'hang.cpp')
+    with open(filename, 'wt') as f:
+        f.write(r"""
+                #define ROW A, A, A, A, A, A, A, A,
+                #define ROW8 ROW ROW ROW ROW ROW ROW ROW ROW
+                #define ROW64 ROW8 ROW8 ROW8 ROW8 ROW8 ROW8 ROW8 ROW8
+                #define ROW512 ROW64 ROW64 ROW64 ROW64 ROW64 ROW64 ROW64 ROW64
+                #define ROW4096 ROW512 ROW512 ROW512 ROW512 ROW512 ROW512 ROW512 ROW512
+                void f() {
+                    static const char A = 'a';
+                    const char a[] = {
+                        ROW4096 ROW4096 ROW4096 ROW4096
+                    };
+                }""")
+    cppcheck([filename])
+
+
 @pytest.mark.timeout(5)
 def test_slow_bifurcate(tmpdir):
     # #14134
@@ -367,3 +414,67 @@ class C {
                 	}
                 }""")
     cppcheck([filename]) # should not take more than ~1 second
+
+
+@pytest.mark.timeout(60)
+def test_slow_many_headers(tmpdir):
+    # 14113
+    c_file = os.path.join(tmpdir, 'source.c')
+    h_file = os.path.join(tmpdir, 'header.h')
+    n_hdr = 128
+    with open(c_file, 'wt') as f:
+        f.write('#include "header.h"\n')
+    with open(h_file, 'wt') as f:
+        for i in range(n_hdr):
+            f.write(f'#ifdef CONFIG{i}\n#include "header{i}.h"\n#endif\n')
+    for i in range(n_hdr):
+        h_file_i = os.path.join(tmpdir, f"header{i}.h")
+        with open(h_file_i, 'wt') as f:
+            for j in range(2048):
+                f.write(f'#define MACRO{j}{(" "+str(j))*128}\n')
+            f.write(f'MACRO{i}\n')
+    # creating the files used for testing can be slow, so we use perf counter here instead
+    start = time.perf_counter_ns()
+    cppcheck(['-DCONFIG0', c_file])
+    end = time.perf_counter_ns()
+    assert end - start < 2 * 10**9 # max 2 sec
+
+
+@pytest.mark.skipif(sys.platform == 'darwin', reason='GitHub macOS runners are too slow')
+@pytest.mark.timeout(5)
+def test_large_number_of_violations_and_suppressions(tmpdir):
+    filename_main = os.path.join(tmpdir, 'main.c')
+    # This name causes the PathMatch::match() to iterate ~70 times, which is not unrealistic for a header file placed in subdirs.
+    # The number of iterations also depends on how the suppressions are written.
+    header_name = 'long_filename_to_simulate_a_more_realistic_header_placed_in_subdirs.h'
+    header_file = os.path.join(tmpdir, header_name)
+    suppressions_file = os.path.join(tmpdir, 'suppressions.txt')
+
+    # Create a main file that includes a header and returns 0.
+    with open(filename_main, "w") as f:
+        f.write(f'#include "{header_name}"\n\n')
+        f.write('int main() \n')
+        f.write('{\n')
+        f.write('    return 0;\n')
+        f.write('}\n')
+
+    # Create a header file with macro definitions that violates misra because they start with an underscore.
+    with open(header_file, "w") as f:
+        f.write(f'#ifndef {header_name.upper().replace(".", "_")}\n')
+        f.write(f'#define {header_name.upper().replace(".", "_")}\n')
+        f.write('\n')
+        for i in range(5000):
+            f.write(f'#define _FOO{i} {i}\n')
+        f.write('\n')
+        f.write(f'#endif // {header_name.upper().replace(".", "_")}\n')
+
+    # Create a suppressions file that suppresses the misra violation for the macros in the header file
+    with open(suppressions_file, "w") as f:
+        f.write(f'misra-c2012-2.5:{header_name}\n')
+        f.write(f'misra-c2012-21.1:{header_name}\n')
+        # Create other suppressions that don't match the file name to test that iterating the suppressions are faster with cache
+        for i in range(300):
+            f.write(f'misra-c2012-2.5:**/{i}/{header_name}\n')
+            f.write(f'misra-c2012-21.1:**/{i}/{header_name}\n')
+
+    cppcheck([filename_main] + ['--addon=misra.py', '--check-level=exhaustive', '--enable=all', f'--suppressions-list={suppressions_file}'])
diff --git a/test/cli/premium_test.py b/test/cli/premium_test.py
index 1bb01260b42..820f7b680e9 100644
--- a/test/cli/premium_test.py
+++ b/test/cli/premium_test.py
@@ -29,6 +29,7 @@ def __copy_cppcheck_premium(tmpdir):
                     "addons": [],
                     "productName": "NAME",
                     "about": "NAME",
+                    "manualUrl" : "https://files.cppchecksolutions.com/manual.pdf",
                     "safety": true
                 }
                 """.replace('NAME', __PRODUCT_NAME))
@@ -87,11 +88,11 @@ def test_build_dir_hash_cppcheck_product(tmpdir):
     assert exitcode == 0
 
     def _get_hash(s:str):
-        i = s.find(' hash="')
+        i = s.find('<hash>')
         if i <= -1:
             return ''
         i += 7
-        return s[i:s.find('"', i)]
+        return s[i:s.find('</hash>', i)]
 
     with open(build_dir.join('test.a1'), 'rt') as f:
         f1 = f.read()
diff --git a/test/cli/proj-inline-suppress/5.cpp b/test/cli/proj-inline-suppress/5.cpp
new file mode 100644
index 00000000000..c2c717ba8b3
--- /dev/null
+++ b/test/cli/proj-inline-suppress/5.cpp
@@ -0,0 +1 @@
+#include "5.h"
diff --git a/test/cli/proj-inline-suppress/5.h b/test/cli/proj-inline-suppress/5.h
new file mode 100644
index 00000000000..63967f45e28
--- /dev/null
+++ b/test/cli/proj-inline-suppress/5.h
@@ -0,0 +1,5 @@
+struct expected
+{
+    // cppcheck-suppress noExplicitConstructor
+    expected(int){}
+};
diff --git a/test/cli/proj-inline-suppress/cfg.c b/test/cli/proj-inline-suppress/cfg.c
index b597217fa32..42709095dcf 100644
--- a/test/cli/proj-inline-suppress/cfg.c
+++ b/test/cli/proj-inline-suppress/cfg.c
@@ -2,9 +2,9 @@ void f()
 {
 #if DEF_1
     // cppcheck-suppress id
-    (void)0;
+    ;
 #endif
 
     // cppcheck-suppress id
-    (void)0;
+    ;
 }
diff --git a/test/cli/proj2_test.py b/test/cli/proj2_test.py
index c9516d9ddbf..aa8cf6d3355 100644
--- a/test/cli/proj2_test.py
+++ b/test/cli/proj2_test.py
@@ -18,6 +18,11 @@
            'x = 3 / 0;\n' +
            '      ^\n') % os.path.join('b', 'b.c')
 
+def __get_lines(s):
+    # file order is not guaranteed when multiple jobs are used (TEST_CPPCHECK_INJECT_J) so
+    # compare output order-independently
+    return sorted(s.split('\n'))
+
 def __create_compile_commands(proj_dir):
     proj_dir = str(proj_dir)
     j = [{'directory': os.path.join(proj_dir, 'a'), 'command': 'gcc -c a.c', 'file': 'a.c'},
@@ -152,7 +157,7 @@ def test_gui_project_loads_relative_vs_solution_2(tmp_path):
     create_gui_project_file(os.path.join(tmp_path, 'test.cppcheck'), root_path='proj2', import_project='proj2/proj2.sln')
     ret, stdout, stderr = cppcheck(['--project=test.cppcheck'], cwd=tmp_path)
     assert ret == 0, stdout
-    assert stderr == __ERR_A + __ERR_B
+    assert __get_lines(stderr) == __get_lines(__ERR_A + __ERR_B)
 
 def test_gui_project_loads_relative_vs_solution_with_exclude(tmp_path):
     proj_dir = tmp_path / 'proj2'
@@ -170,4 +175,4 @@ def test_gui_project_loads_absolute_vs_solution_2(tmp_path):
                             import_project=os.path.join(proj_dir, 'proj2.sln'))
     ret, stdout, stderr = cppcheck(['--project=test.cppcheck'], cwd=tmp_path)
     assert ret == 0, stdout
-    assert stderr == __ERR_A + __ERR_B
+    assert __get_lines(stderr) == __get_lines(__ERR_A + __ERR_B)
diff --git a/test/cli/project-suppressions.py b/test/cli/project-suppressions.py
new file mode 100644
index 00000000000..e2b6ba5e7d6
--- /dev/null
+++ b/test/cli/project-suppressions.py
@@ -0,0 +1,33 @@
+
+# python -m pytest project-suppressions.py
+
+from testutils import create_gui_project_file, assert_cppcheck
+
+def test_cli_and_project_suppressions(tmp_path):
+    # Uninitvar suppressed in project file
+    suppressions = [{ 'id': 'uninitvar' }]
+    project_path = tmp_path / 'project.cppcheck'
+    create_gui_project_file(project_path, root_path=str(tmp_path), suppressions=suppressions)
+
+    # Uninitvar suppressed on command line before import
+    args = ['--suppress=uninitvar', f'--project={project_path}']
+    out_exp = [
+        "cppcheck: error: suppression 'uninitvar' already exists",
+        f"cppcheck: error: failed to load project '{project_path}'. An error occurred."
+    ]
+    assert_cppcheck(args, ec_exp=1, out_exp=out_exp)
+
+def test_multiple_cli_and_project_suppressions(tmp_path):
+    # Uninitvar and unreadVariable suppressed in project file
+    suppressions = [{ 'id': 'uninitvar' }, { 'id': 'unreadVariable' },]
+    project_path = tmp_path / 'project.cppcheck'
+    create_gui_project_file(project_path, root_path=str(tmp_path), suppressions=suppressions)
+
+    # Uninitvar and unreadVariable suppressed on command line before import
+    args = ['--suppress=uninitvar', '--suppress=unreadVariable', f'--project={project_path}']
+    out_exp = [
+        "cppcheck: error: suppression 'uninitvar' already exists",
+        "cppcheck: error: suppression 'unreadVariable' already exists",
+        f"cppcheck: error: failed to load project '{project_path}'. An error occurred."
+    ]
+    assert_cppcheck(args, ec_exp=1, out_exp=out_exp)
diff --git a/test/cli/project_test.py b/test/cli/project_test.py
index ec1ef56d7d1..86d528f074f 100644
--- a/test/cli/project_test.py
+++ b/test/cli/project_test.py
@@ -7,7 +7,7 @@
 from testutils import cppcheck
 
 
-@pytest.mark.parametrize("project_ext", ["json", "sln", "vcxproj", "bpr", "cppcheck"])
+@pytest.mark.parametrize("project_ext", ["json", "sln", "slnx", "vcxproj", "bpr", "cppcheck"])
 def test_missing_project(project_ext):
     project_file = "file.{}".format(project_ext)
 
@@ -20,9 +20,9 @@ def test_missing_project(project_ext):
 def __test_project_error(tmpdir, ext, content, expected):
     project_file = os.path.join(tmpdir, "file.{}".format(ext))
 
-    with open(project_file, 'w') as f:
+    with open(project_file, 'wb') as f:
         if content is not None:
-            f.write(content)
+            f.write(content.encode('utf-8'))
 
     ret, stdout, stderr = cppcheck(['--project=' + str(project_file)])
     assert 1 == ret
@@ -33,6 +33,7 @@ def __test_project_error(tmpdir, ext, content, expected):
 @pytest.mark.parametrize("project_ext, expected", [
     ("json", "compilation database is not a JSON array"),
     ("sln", "Visual Studio solution file is empty"),
+    ("slnx", "Visual Studio solution file is not a valid XML - XML_ERROR_EMPTY_DOCUMENT"),
     ("vcxproj", "Visual Studio project file is not a valid XML - XML_ERROR_EMPTY_DOCUMENT"),
     ("bpr", "Borland project file is not a valid XML - XML_ERROR_EMPTY_DOCUMENT"),
     ("cppcheck", "Cppcheck GUI project file is not a valid XML - XML_ERROR_EMPTY_DOCUMENT")
@@ -64,7 +65,7 @@ def test_json_entry_file_not_found(tmpdir):
         "--project=" + str(project_file)
     ])
     assert 0 == ret
-    assert stderr == f"nofile:0:0: error: File is missing: {missing_file_posix} [missingFile]\n"
+    assert stderr == f"{missing_file}:0:0: error: File is missing: {missing_file_posix} [missingFile]\n"
 
 
 def test_json_no_arguments(tmpdir):
@@ -101,7 +102,7 @@ def test_sln_invalid_file(tmpdir):
 
 
 def test_sln_no_header(tmpdir):
-    content = "\xEF\xBB\xBF\r\n" \
+    content = "\r\n" \
               "some header"
 
     expected = "Visual Studio solution file header not found"
@@ -110,7 +111,7 @@ def test_sln_no_header(tmpdir):
 
 
 def test_sln_no_projects(tmpdir):
-    content = "\xEF\xBB\xBF\r\n" \
+    content = "\r\n" \
               "Microsoft Visual Studio Solution File, Format Version 12.00\r\n"
 
     expected = "no projects found in Visual Studio solution file"
@@ -119,7 +120,7 @@ def test_sln_no_projects(tmpdir):
 
 
 def test_sln_project_file_not_found(tmpdir):
-    content = "\xEF\xBB\xBF\r\n" \
+    content = "\r\n" \
               "Microsoft Visual Studio Solution File, Format Version 12.00\r\n" \
               "# Visual Studio Version 16\r\n" \
               "VisualStudioVersion = 16.0.29020.237\r\n" \
@@ -138,6 +139,92 @@ def test_sln_project_file_not_found(tmpdir):
     __test_project_error(tmpdir, "sln", content, expected)
 
 
+def test_slnx_no_xml_root(tmpdir):
+    content = '<?xml version="1.0" encoding="utf-8"?>'
+
+    expected = "Visual Studio solution file has no XML root node"
+
+    __test_project_error(tmpdir, "slnx", content, expected)
+
+
+def test_slnx_invalid_xml_root(tmpdir):
+    content = '<?xml version="1.0" encoding="UTF-8"?>\r\n' \
+              "<Invalid>\r\n" \
+              "</Invalid>\r\n"
+
+    expected = "Invalid Visual Studio solution file format"
+
+    __test_project_error(tmpdir, "slnx", content, expected)
+
+
+def test_slnx_no_projects(tmpdir):
+    content = '<?xml version="1.0" encoding="UTF-8"?>\r\n' \
+              "<Solution>\r\n" \
+              "  <Configurations>\r\n" \
+              '    <Platform Name="x64" />\r\n' \
+              '    <Platform Name="x86" />\r\n' \
+              "  </Configurations>\r\n" \
+              "</Solution>\r\n"
+
+    expected = "no projects found in Visual Studio solution file"
+
+    __test_project_error(tmpdir, "slnx", content, expected)
+
+
+def test_slnx_no_projects_in_folder(tmpdir):
+    content = '<?xml version="1.0" encoding="UTF-8"?>\r\n' \
+              "<Solution>\r\n" \
+              "  <Configurations>\r\n" \
+              '    <Platform Name="x64" />\r\n' \
+              '    <Platform Name="x86" />\r\n' \
+              "  </Configurations>\r\n" \
+              '  <Folder Name="/common/">\r\n' \
+              '  </Folder>\r\n' \
+          "</Solution>\r\n"
+
+    expected = "no projects found in Visual Studio solution file"
+
+    __test_project_error(tmpdir, "slnx", content, expected)
+
+
+def test_slnx_project_file_not_found(tmpdir):
+    content = '<?xml version="1.0" encoding="UTF-8"?>\r\n' \
+              "<Solution>\r\n" \
+              "  <Configurations>\r\n" \
+              '    <Platform Name="x64" />\r\n' \
+              '    <Platform Name="x86" />\r\n' \
+              "  </Configurations>\r\n" \
+              '  <Project Path="test.vcxproj" />\r\n' \
+              "</Solution>\r\n"
+
+    expected = "Visual Studio project file is not a valid XML - XML_ERROR_FILE_NOT_FOUND\n" \
+               "cppcheck: error: failed to load '{}' from Visual Studio solution".format(os.path.join(tmpdir, "test.vcxproj"))
+    if sys.platform == "win32":
+        expected = expected.replace('\\', '/')
+
+    __test_project_error(tmpdir, "slnx", content, expected)
+
+
+def test_slnx_project_file_in_folder_not_found(tmpdir):
+    content = '<?xml version="1.0" encoding="UTF-8"?>\r\n' \
+              "<Solution>\r\n" \
+              "  <Configurations>\r\n" \
+              '    <Platform Name="x64" />\r\n' \
+              '    <Platform Name="x86" />\r\n' \
+              "  </Configurations>\r\n" \
+              '  <Folder Name="/common/">\r\n' \
+              '    <Project Path="common/test.vcxproj" />\r\n' \
+              '  </Folder>\r\n' \
+              "</Solution>\r\n"
+
+    expected = "Visual Studio project file is not a valid XML - XML_ERROR_FILE_NOT_FOUND\n" \
+               "cppcheck: error: failed to load '{}' from Visual Studio solution".format(os.path.join(tmpdir, "common/test.vcxproj"))
+    if sys.platform == "win32":
+        expected = expected.replace('\\', '/')
+
+    __test_project_error(tmpdir, "slnx", content, expected)
+
+
 def test_vcxproj_no_xml_root(tmpdir):
     content = '<?xml version="1.0" encoding="utf-8"?>'
 
diff --git a/test/cli/props-dirs/Cpp.Build.props b/test/cli/props-dirs/Cpp.Build.props
new file mode 100644
index 00000000000..c7ec9783a4b
--- /dev/null
+++ b/test/cli/props-dirs/Cpp.Build.props
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Project configurations -->
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <Import Project="Cpp.Build.targets" />
+</Project>
diff --git a/test/cli/props-dirs/Cpp.Build.targets b/test/cli/props-dirs/Cpp.Build.targets
new file mode 100644
index 00000000000..341027f3c7a
--- /dev/null
+++ b/test/cli/props-dirs/Cpp.Build.targets
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+</Project>
diff --git a/test/cli/props-dirs/Directory.Build.props b/test/cli/props-dirs/Directory.Build.props
new file mode 100644
index 00000000000..0e0ec4010eb
--- /dev/null
+++ b/test/cli/props-dirs/Directory.Build.props
@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
+  </PropertyGroup>
+  <Import Project="$(RepoRoot)Cpp.Build.props" />
+</Project>
diff --git a/test/cli/props-dirs/Directory.Build.targets b/test/cli/props-dirs/Directory.Build.targets
new file mode 100644
index 00000000000..8c119d5413b
--- /dev/null
+++ b/test/cli/props-dirs/Directory.Build.targets
@@ -0,0 +1,2 @@
+<Project>
+</Project>
diff --git a/test/cli/props-dirs/ProjA/ProjA.vcxproj b/test/cli/props-dirs/ProjA/ProjA.vcxproj
new file mode 100644
index 00000000000..9ce10068a8b
--- /dev/null
+++ b/test/cli/props-dirs/ProjA/ProjA.vcxproj
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{a1a1a1a1-a1a1-a1a1-a1a1-a1a1a1a1a1a1}</ProjectGuid>
+    <RootNamespace>ProjA</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <!-- Pulls in shared/shared.props, which itself pulls in common/common.props -->
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(MSBuildThisFileDirectory)..\shared\shared.props" />
+    <Import Project="..\shared\shared2.props" />
+  </ImportGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>PROJA_DEFINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="a.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/props-dirs/ProjA/a.cpp b/test/cli/props-dirs/ProjA/a.cpp
new file mode 100644
index 00000000000..aab1237748c
--- /dev/null
+++ b/test/cli/props-dirs/ProjA/a.cpp
@@ -0,0 +1,15 @@
+#include "common.h"
+#include "common2.h"
+
+#ifndef COMMON_H_INCLUDED_MARKER
+#error "common.h was not found - AdditionalIncludeDirectories from common.props did not resolve"
+#endif
+#ifndef COMMON2_H_INCLUDED_MARKER
+#error "common2.h was not found - AdditionalIncludeDirectories from common.props did not resolve"
+#endif
+
+int main()
+{
+    int x = 1;
+    return x / 0;
+}
diff --git a/test/cli/props-dirs/ProjB/ProjB.vcxproj b/test/cli/props-dirs/ProjB/ProjB.vcxproj
new file mode 100644
index 00000000000..3daf8907924
--- /dev/null
+++ b/test/cli/props-dirs/ProjB/ProjB.vcxproj
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{b2b2b2b2-b2b2-b2b2-b2b2-b2b2b2b2b2b2}</ProjectGuid>
+    <RootNamespace>ProjB</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <!-- Imports common/common.props DIRECTLY - does NOT go through shared/shared.props.
+       Must NOT see PROJA_DEFINE or SHARED_DEFINE from ProjA, which is processed first
+       in the same solution (regression coverage for the mVariables cross-project leak). -->
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(MSBuildThisFileDirectory)..\common\common.props" />
+    <Import Project="..\common\common2.props" />
+  </ImportGroup>
+  <ItemGroup>
+    <ClCompile Include="b.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/props-dirs/ProjB/b.cpp b/test/cli/props-dirs/ProjB/b.cpp
new file mode 100644
index 00000000000..8c3e4016529
--- /dev/null
+++ b/test/cli/props-dirs/ProjB/b.cpp
@@ -0,0 +1,15 @@
+#include "common.h"
+#include "common2.h"
+
+#ifndef COMMON_H_INCLUDED_MARKER
+#error "common.h was not found - AdditionalIncludeDirectories from common.props did not resolve"
+#endif
+#ifndef COMMON2_H_INCLUDED_MARKER
+#error "common2.h was not found - AdditionalIncludeDirectories from common.props did not resolve"
+#endif
+
+int main()
+{
+    int y = 2;
+    return y / 0;
+}
diff --git a/test/cli/props-dirs/common/common.h b/test/cli/props-dirs/common/common.h
new file mode 100644
index 00000000000..72674fc6c62
--- /dev/null
+++ b/test/cli/props-dirs/common/common.h
@@ -0,0 +1,3 @@
+#ifndef COMMON_H_INCLUDED_MARKER
+#define COMMON_H_INCLUDED_MARKER
+#endif
diff --git a/test/cli/props-dirs/common/common.props b/test/cli/props-dirs/common/common.props
new file mode 100644
index 00000000000..f969a6e897d
--- /dev/null
+++ b/test/cli/props-dirs/common/common.props
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Imported from both ProjA (indirectly, via shared/shared.props) and ProjB (directly).
+       AdditionalIncludeDirectories uses $(MSBuildThisFileDirectory) to prove it resolves to
+       this file's own directory (common/) rather than to whichever project imported it. -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>COMMON_DEFINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/props-dirs/common/common2.h b/test/cli/props-dirs/common/common2.h
new file mode 100644
index 00000000000..320e68a96fa
--- /dev/null
+++ b/test/cli/props-dirs/common/common2.h
@@ -0,0 +1,3 @@
+#ifndef COMMON2_H_INCLUDED_MARKER
+#define COMMON2_H_INCLUDED_MARKER
+#endif
diff --git a/test/cli/props-dirs/common/common2.props b/test/cli/props-dirs/common/common2.props
new file mode 100644
index 00000000000..cf945d49ffa
--- /dev/null
+++ b/test/cli/props-dirs/common/common2.props
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Imported from both ProjA (indirectly, via shared/shared.props) and ProjB (directly).
+       AdditionalIncludeDirectories uses $(MSBuildThisFileDirectory) to prove it resolves to
+       this file's own directory (common/) rather than to whichever project imported it. -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>COMMON2_DEFINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/props-dirs/props-dirs.slnx b/test/cli/props-dirs/props-dirs.slnx
new file mode 100644
index 00000000000..0aae89ada2a
--- /dev/null
+++ b/test/cli/props-dirs/props-dirs.slnx
@@ -0,0 +1,7 @@
+<Solution>
+  <Configurations>
+    <Platform Name="x64" />
+  </Configurations>
+  <Project Path="ProjA/ProjA.vcxproj" Id="a1a1a1a1-a1a1-a1a1-a1a1-a1a1a1a1a1a1" />
+  <Project Path="ProjB/ProjB.vcxproj" Id="b2b2b2b2-b2b2-b2b2-b2b2-b2b2b2b2b2b2" />
+</Solution>
diff --git a/test/cli/props-dirs/shared/shared.props b/test/cli/props-dirs/shared/shared.props
new file mode 100644
index 00000000000..623e1094e9f
--- /dev/null
+++ b/test/cli/props-dirs/shared/shared.props
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Only imported by ProjA. Chains into common/common.props via a relative,
+       $(MSBuildThisFileDirectory)-based path - this is the cross-directory nested
+       props-importing-props case (ProjA/ -> shared/ -> common/). -->
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(MSBuildThisFileDirectory)..\common\common.props" />
+  </ImportGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>SHARED_DEFINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/props-dirs/shared/shared2.props b/test/cli/props-dirs/shared/shared2.props
new file mode 100644
index 00000000000..745a5d45a21
--- /dev/null
+++ b/test/cli/props-dirs/shared/shared2.props
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Only imported by ProjA. Chains into common/common.props via a relative,
+       $(MSBuildThisFileDirectory)-based path - this is the cross-directory nested
+       props-importing-props case (ProjA/ -> shared/ -> common/). -->
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(MSBuildThisFileDirectory)..\common\common2.props" />
+  </ImportGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>SHARED2_DEFINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/props_dirs_test.py b/test/cli/props_dirs_test.py
new file mode 100644
index 00000000000..bccfe3cf2bc
--- /dev/null
+++ b/test/cli/props_dirs_test.py
@@ -0,0 +1,93 @@
+
+# python -m pytest props_dirs_test.py
+#
+# Regression coverage for MSBuild property-sheet (.props) loading across multiple
+# directories:
+#   - $(MSBuildThisFileDirectory) must resolve to each .props file's own directory,
+#     not the importing project's directory, even through a chain of nested imports
+#     (ProjA/ -> shared/shared.props -> common/common.props).
+#   - AdditionalIncludeDirectories set via that chain must actually make a header in a
+#     different directory (common/common.h) resolvable from the project's source file.
+#   - A project that imports common/common.props directly (ProjB) must pick up exactly
+#     what that file sets and nothing that a *different* project in the same solution
+#     (ProjA) added on top - no cross-project variable leakage.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+__ERR_A = ('%s:14:14: error: Division by zero. [zerodiv]\n'
+           '    return x / 0;\n'
+           '             ^\n') % os.path.join('props-dirs', 'ProjA', 'a.cpp')
+__ERR_B = ('%s:14:14: error: Division by zero. [zerodiv]\n'
+           '    return y / 0;\n'
+           '             ^\n') % os.path.join('props-dirs', 'ProjB', 'b.cpp')
+
+
+def __get_lines(s):
+    # file order is not guaranteed when multiple jobs are used (TEST_CPPCHECK_INJECT_J) so
+    # compare output order-independently
+    return sorted(s.split('\n'))
+
+
+def test_props_dirs_solution():
+    args = [
+        '--project=props-dirs/props-dirs.slnx',
+        '--no-cppcheck-build-dir'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    # both files were actually analyzed (division by zero fires) which also proves
+    # "common.h" was found via AdditionalIncludeDirectories - if it hadn't resolved, the
+    # #error guard in each .cpp would have fired instead and there would be no zerodiv
+    assert __get_lines(stderr) == __get_lines(__ERR_A + __ERR_B)
+
+
+def test_props_dirs_defines_and_standard():
+    args = [
+        '--project=props-dirs/props-dirs.slnx',
+        '--no-cppcheck-build-dir',
+        '--dump'
+    ]
+    ret, stdout, _ = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    dump_a = os.path.join(__script_dir, 'props-dirs', 'ProjA', 'a.cpp.dump')
+    dump_b = os.path.join(__script_dir, 'props-dirs', 'ProjB', 'b.cpp.dump')
+    assert os.path.exists(dump_a), f"Dump file not found at {dump_a}"
+    assert os.path.exists(dump_b), f"Dump file not found at {dump_b}"
+
+    with open(dump_a, 'rt') as f:
+        dump_a_content = f.read()
+    with open(dump_b, 'rt') as f:
+        dump_b_content = f.read()
+
+    # ProjA imports shared/shared.props (-> common/common.props) and shared/shared2.props
+    # (-> common/common2.props), and sets its own PROJA_DEFINE.
+    # v143 toolset -> _MSC_VER=1930/_MSC_FULL_VER=193000000; common.props sets stdcpp17
+    # -> _MSVC_LANG=201703L.
+    assert '_WIN32=1' in dump_a_content
+    assert '_WIN64=1' in dump_a_content
+    assert '_M_X64=100' in dump_a_content
+    assert '_MSC_VER=1930' in dump_a_content
+    assert '_MSC_FULL_VER=193000000' in dump_a_content
+    assert '_MSVC_LANG=201703L' in dump_a_content
+    assert 'PROJA_DEFINE=1' in dump_a_content
+    assert 'SHARED_DEFINE=1' in dump_a_content
+    assert 'COMMON_DEFINE=1' in dump_a_content
+    assert '<cpp version="c++17"/>' in dump_a_content
+
+    # ProjB imports common/common.props and common/common2.props directly - it must see
+    # COMMON2_DEFINE and COMMON_DEFINE, but none of ProjA's or shared's defines.
+    assert '_MSC_VER=1930' in dump_b_content
+    assert '_MSC_FULL_VER=193000000' in dump_b_content
+    assert '_MSVC_LANG=201703L' in dump_b_content
+    assert 'COMMON2_DEFINE=1' in dump_b_content
+    assert 'COMMON_DEFINE=1' in dump_b_content
+    assert '<cpp version="c++17"/>' in dump_b_content
+    assert 'PROJA_DEFINE' not in dump_b_content
+    assert 'SHARED_DEFINE' not in dump_b_content
+    assert 'SHARED2_DEFINE' not in dump_b_content
diff --git a/test/cli/slnx-folders/app/app.cpp b/test/cli/slnx-folders/app/app.cpp
new file mode 100644
index 00000000000..3454c2de254
--- /dev/null
+++ b/test/cli/slnx-folders/app/app.cpp
@@ -0,0 +1,7 @@
+#include "../lib/lib.h"
+
+int main(int argc, char *argv[])
+{
+	int x = 3 / 0; (void)x; // ERROR
+	return foo();
+}
diff --git a/test/cli/slnx-folders/app/app.vcxproj b/test/cli/slnx-folders/app/app.vcxproj
new file mode 100644
index 00000000000..b72ae55c565
--- /dev/null
+++ b/test/cli/slnx-folders/app/app.vcxproj
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>18.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{0de77c38-881a-4f9f-bdfa-2c429968985e}</ProjectGuid>
+    <RootNamespace>unused</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>..\x64\Debug\</OutDir>
+    <IntDir>x64\Debug\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>..\x64\Release\</OutDir>
+    <IntDir>x64\Release\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>../lib</AdditionalLibraryDirectories>
+    </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="app.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\lib\lib.vcxproj">
+      <Project>{93BE1430-BE74-35DF-1882-AF70E49C9898}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/test/cli/slnx-folders/lib/lib.cpp b/test/cli/slnx-folders/lib/lib.cpp
new file mode 100644
index 00000000000..b4a89cee1c7
--- /dev/null
+++ b/test/cli/slnx-folders/lib/lib.cpp
@@ -0,0 +1,9 @@
+#include <iostream>
+#include "lib.h"
+
+int foo()
+{
+	std::cout << "hello world\n";
+	int x = 3 / 0; (void)x; // ERROR
+	return 0;
+}
diff --git a/test/cli/slnx-folders/lib/lib.h b/test/cli/slnx-folders/lib/lib.h
new file mode 100644
index 00000000000..cf790ac3eab
--- /dev/null
+++ b/test/cli/slnx-folders/lib/lib.h
@@ -0,0 +1 @@
+extern int foo();
diff --git a/test/cli/slnx-folders/lib/lib.vcxproj b/test/cli/slnx-folders/lib/lib.vcxproj
new file mode 100644
index 00000000000..232c2478e2f
--- /dev/null
+++ b/test/cli/slnx-folders/lib/lib.vcxproj
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>18.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{93BE1430-BE74-35DF-1882-AF70E49C9898}</ProjectGuid>
+    <RootNamespace>unused</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>..\x64\Debug\</OutDir>
+    <IntDir>x64\Debug\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>..\x64\Release\</OutDir>
+    <IntDir>x64\Release\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>../lib</AdditionalLibraryDirectories>
+    </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="lib.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/test/cli/slnx-folders/slnx-folders.cppcheck b/test/cli/slnx-folders/slnx-folders.cppcheck
new file mode 100644
index 00000000000..4fa0c4e7623
--- /dev/null
+++ b/test/cli/slnx-folders/slnx-folders.cppcheck
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+    <builddir>slnx-folders-cppcheck-build-dir</builddir>
+    <importproject>slnx-folders.slnx</importproject>
+    <analyze-all-vs-configs>false</analyze-all-vs-configs>
+    <check-headers>true</check-headers>
+    <check-unused-templates>true</check-unused-templates>
+    <inline-suppression>true</inline-suppression>
+    <max-ctu-depth>2</max-ctu-depth>
+    <max-template-recursion>100</max-template-recursion>
+    <vs-configurations>
+        <config>Debug</config>
+        <config>Release</config>
+    </vs-configurations>
+    <check-level-normal/>
+    <project-name>slnx-folders</project-name>
+</project>
diff --git a/test/cli/slnx-folders/slnx-folders.slnx b/test/cli/slnx-folders/slnx-folders.slnx
new file mode 100644
index 00000000000..fd50c3a054c
--- /dev/null
+++ b/test/cli/slnx-folders/slnx-folders.slnx
@@ -0,0 +1,14 @@
+<Solution>
+  <Configurations>
+    <Platform Name="x64" />
+  </Configurations>
+  <Folder Name="ParentFolder">
+    <Folder Name="/Lib/">
+      <File Path="lib/lib.h" />
+      <Project Path="lib\lib.vcxproj" />
+    </Folder>
+    <Folder Name="/App/">
+      <Project Path="app\app.vcxproj" Id="0de77c38-881a-4f9f-bdfa-2c429968985e" />
+    </Folder>
+  </Folder>
+</Solution>
diff --git a/test/cli/slnx-folders_test.py b/test/cli/slnx-folders_test.py
new file mode 100644
index 00000000000..b9dd5f09c92
--- /dev/null
+++ b/test/cli/slnx-folders_test.py
@@ -0,0 +1,73 @@
+
+# python -m pytest slnx-folders_test.py
+
+import os
+import re
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+__proj_dir = os.path.join(__script_dir, 'slnx-folders')
+
+def get_lines(s):
+    return sorted(s.split('\n'))
+
+# Get Visual Studio configurations checking a file
+# Checking {file} {config}...
+def __getVsConfigs(stdout, filename):
+    ret = []
+    for line in stdout.split('\n'):
+        if not line.startswith('Checking %s ' % filename):
+            continue
+        if not line.endswith('...'):
+            continue
+        res = re.match(r'.* ([A-Za-z0-9|]+)...', line)
+        if res:
+            ret.append(res.group(1))
+    ret.sort()
+    return ' '.join(ret)
+
+def test_relative_path():
+    args = [
+        '--template=cppcheck1',
+        'slnx-folders'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    filename1 = os.path.join('slnx-folders', 'app', 'app.cpp')
+    filename2 = os.path.join('slnx-folders', 'lib', 'lib.cpp')
+    assert ret == 0, stdout
+    expected = (
+        '[%s:5]: (error) Division by zero.\n'
+        '[%s:7]: (error) Division by zero.\n' % (filename1, filename2)
+    )
+    assert get_lines(stderr) == get_lines(expected)
+
+def test_local_path():
+    args = [
+        '--template=cppcheck1',
+        '.'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__proj_dir)
+    filename1 = os.path.join('app', 'app.cpp')
+    filename2 = os.path.join('lib', 'lib.cpp')
+    assert ret == 0, stdout
+    expected = (
+        '[%s:5]: (error) Division by zero.\n'
+        '[%s:7]: (error) Division by zero.\n' % (filename1, filename2)
+    )
+    assert get_lines(stderr) == get_lines(expected)
+
+def test_absolute_path():
+    args = [
+        '--template=cppcheck1',
+        __proj_dir
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    filename1 = os.path.join(__proj_dir, 'app', 'app.cpp')
+    filename2 = os.path.join(__proj_dir, 'lib', 'lib.cpp')
+    assert ret == 0, stdout
+    expected = (
+        '[%s:5]: (error) Division by zero.\n'
+        '[%s:7]: (error) Division by zero.\n' % (filename1, filename2)
+    )
+    assert get_lines(stderr) == get_lines(expected)
diff --git a/test/cli/testutils.py b/test/cli/testutils.py
index f352af49f15..2140c42205b 100644
--- a/test/cli/testutils.py
+++ b/test/cli/testutils.py
@@ -5,6 +5,7 @@
 import subprocess
 import time
 import tempfile
+import json
 
 # Create Cppcheck project file
 import sys
@@ -45,6 +46,22 @@ def create_gui_project_file(project_file, root_path=None, import_project=None, p
         f.write(cppcheck_xml)
 
 
+def create_compile_commands(compdb_file, files):
+    compdb = []
+    # TODO: bail out on empty list
+    for f in files:
+        compdb.append(
+            {
+                "file": str(f),
+                "directory": os.path.dirname(f),
+                "command": "gcc -c {}".format(os.path.basename(f))
+            }
+        )
+    compdb_j = json.dumps(compdb)
+    with open(compdb_file, 'wt') as f:
+        f.write(compdb_j)
+
+
 def __lookup_cppcheck_exe():
     # path the script is located in
     script_path = os.path.dirname(os.path.realpath(__file__))
diff --git a/test/cli/vcxproj-unicode/main.cpp b/test/cli/vcxproj-unicode/main.cpp
new file mode 100644
index 00000000000..1a0e6f02e86
--- /dev/null
+++ b/test/cli/vcxproj-unicode/main.cpp
@@ -0,0 +1,7 @@
+#include <iostream>
+
+int main() {
+	std::cout << "Hello world!" << std::endl;
+	return 0;
+}
+
diff --git a/test/cli/vcxproj-unicode/vcxproj_unicode.vcxproj b/test/cli/vcxproj-unicode/vcxproj_unicode.vcxproj
new file mode 100644
index 00000000000..cc7549a0e06
--- /dev/null
+++ b/test/cli/vcxproj-unicode/vcxproj_unicode.vcxproj
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MultiByte|Win32">
+      <Configuration>MultiByte</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Configuration">
+    <!-- Only to test that the last configuration entry overwrites this -->
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <UseOfMfc>Static</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MultiByte|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+</Project>
diff --git a/test/cli/vcxproj_choose/main.cpp b/test/cli/vcxproj_choose/main.cpp
new file mode 100644
index 00000000000..76e8197013a
--- /dev/null
+++ b/test/cli/vcxproj_choose/main.cpp
@@ -0,0 +1 @@
+int main() { return 0; }
diff --git a/test/cli/vcxproj_choose/vcxproj_choose.vcxproj b/test/cli/vcxproj_choose/vcxproj_choose.vcxproj
new file mode 100644
index 00000000000..f83db51b5fb
--- /dev/null
+++ b/test/cli/vcxproj_choose/vcxproj_choose.vcxproj
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{33333333-3333-3333-3333-333333333333}</ProjectGuid>
+    <RootNamespace>choosetest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- Choose picks a branch based on a property that is only assigned by a
+       PropertyGroup positioned AFTER this Choose in the document -- the branch
+       selection itself must freeze during the Properties pass and replay
+       identically during ItemDefs/Items, exactly like an <Import>'s resolved
+       target file does (see vcxproj_property_order_test.py for that case). -->
+  <Choose>
+    <When Condition="'$(UseSpecialDefine)'=='true'">
+      <ItemDefinitionGroup>
+        <ClCompile>
+          <PreprocessorDefinitions>CHOSEN_BRANCH=When;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+        </ClCompile>
+      </ItemDefinitionGroup>
+      <PropertyGroup>
+        <FromWhenBranch>true</FromWhenBranch>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <ItemDefinitionGroup>
+        <ClCompile>
+          <PreprocessorDefinitions>CHOSEN_BRANCH=Otherwise;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+        </ClCompile>
+      </ItemDefinitionGroup>
+      <PropertyGroup>
+        <FromOtherwiseBranch>true</FromOtherwiseBranch>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+
+  <!-- Set after the Choose; must still be visible to the When Condition that
+       already ran during the Properties pass (i.e. must NOT flip the branch
+       that ItemDefs/Items replay just because it's now defined). -->
+  <PropertyGroup>
+    <UseSpecialDefine>true</UseSpecialDefine>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_choose_test.py b/test/cli/vcxproj_choose_test.py
new file mode 100644
index 00000000000..a261dfada7b
--- /dev/null
+++ b/test/cli/vcxproj_choose_test.py
@@ -0,0 +1,44 @@
+
+# python -m pytest vcxproj_choose_test.py
+#
+# Regression coverage for MSBuild/Visual Studio <Choose>/<When>/<Otherwise>
+# support: Visual Studio's project evaluator (the same Microsoft.Build engine
+# msbuild.exe uses) selects a Choose's branch once, using properties as
+# accumulated at that point in the document, and reuses that same branch for
+# item-definition and item evaluation -- it does not re-evaluate the <When>
+# Condition a second time against final properties. This fixture's <Choose>
+# depends on a property that is only assigned by a PropertyGroup positioned
+# AFTER the Choose; if cppcheck dropped Choose/When/Otherwise entirely (as it
+# used to), the ItemDefinitionGroup inside it would never be evaluated at all,
+# and if it instead re-evaluated the When Condition against final properties
+# during item-definition/item evaluation, it would pick the wrong branch
+# ("When" instead of the "Otherwise" branch Properties actually selected).
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_choose():
+    args = [
+        '--project=vcxproj_choose/vcxproj_choose.vcxproj',
+        '--no-cppcheck-build-dir',
+        '--dump'
+    ]
+    ret, stdout, _ = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    dump_file = os.path.join(__script_dir, 'vcxproj_choose', 'main.cpp.dump')
+    assert os.path.exists(dump_file), "Dump file not found at %s" % dump_file
+
+    with open(dump_file, 'rt') as f:
+        dump_content = f.read()
+
+    # UseSpecialDefine is unset at the point Properties reaches the Choose (it is
+    # only assigned afterwards), so the Properties pass selects <Otherwise> --
+    # and ItemDefs/Items must replay that same selection rather than
+    # re-evaluating the When Condition against the now-final property value.
+    assert 'CHOSEN_BRANCH=Otherwise' in dump_content, dump_content
+    assert 'CHOSEN_BRANCH=When' not in dump_content, dump_content
diff --git a/test/cli/vcxproj_directory_build_disabled/Directory.Build.props b/test/cli/vcxproj_directory_build_disabled/Directory.Build.props
new file mode 100644
index 00000000000..747f1613e36
--- /dev/null
+++ b/test/cli/vcxproj_directory_build_disabled/Directory.Build.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>PROPS_DEFINE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/vcxproj_directory_build_disabled/Directory.Build.targets b/test/cli/vcxproj_directory_build_disabled/Directory.Build.targets
new file mode 100644
index 00000000000..fac7a9f273f
--- /dev/null
+++ b/test/cli/vcxproj_directory_build_disabled/Directory.Build.targets
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>TARGETS_DEFINE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/vcxproj_directory_build_disabled/main.cpp b/test/cli/vcxproj_directory_build_disabled/main.cpp
new file mode 100644
index 00000000000..61931dfffa0
--- /dev/null
+++ b/test/cli/vcxproj_directory_build_disabled/main.cpp
@@ -0,0 +1,15 @@
+// Each check below fails with #error if Directory.Build.props/.targets was
+// imported despite ImportDirectoryBuildProps/ImportDirectoryBuildTargets being
+// set to false; see vcxproj_directory_build_disabled_test.py.
+#if defined(PROPS_DEFINE)
+#error Directory.Build.props was imported despite ImportDirectoryBuildProps=false
+#endif
+#if defined(TARGETS_DEFINE)
+#error Directory.Build.targets was imported despite ImportDirectoryBuildTargets=false
+#endif
+
+int main()
+{
+    int x = 3 / 0; // ERROR
+    return x;
+}
diff --git a/test/cli/vcxproj_directory_build_disabled/vcxproj_directory_build_disabled.vcxproj b/test/cli/vcxproj_directory_build_disabled/vcxproj_directory_build_disabled.vcxproj
new file mode 100644
index 00000000000..bddcfb9bc8a
--- /dev/null
+++ b/test/cli/vcxproj_directory_build_disabled/vcxproj_directory_build_disabled.vcxproj
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <!-- ImportDirectoryBuildProps/Targets default to true (Microsoft's own MSBuild
+       infrastructure sets them, mirrored here by attemptSyntheticImport()'s
+       Microsoft.Cpp.Default.props/Microsoft.Cpp.targets emulation) -- setting them
+       to false here, before either import point is reached, must suppress the
+       automatic Directory.Build.props/.targets import entirely. -->
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{88888888-8888-8888-8888-888888888888}</ProjectGuid>
+    <RootNamespace>dirbuilddisabledtest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
+    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_directory_build_disabled_test.py b/test/cli/vcxproj_directory_build_disabled_test.py
new file mode 100644
index 00000000000..cf07274016f
--- /dev/null
+++ b/test/cli/vcxproj_directory_build_disabled_test.py
@@ -0,0 +1,33 @@
+
+# python -m pytest vcxproj_directory_build_disabled_test.py
+#
+# Regression coverage for $(ImportDirectoryBuildProps) / $(ImportDirectoryBuildTargets):
+# attemptSyntheticImport()'s emulation of Microsoft.Cpp.Default.props (which normally
+# imports Directory.Build.props) and Microsoft.Cpp.targets (which normally imports
+# Directory.Build.targets) must honor these controls, which Microsoft documents in
+# "Customize your build by folder or solution". Both default to true, but this
+# fixture's Globals PropertyGroup -- processed before either import point is
+# reached -- sets both to false, so neither Directory.Build.props nor
+# Directory.Build.targets (both sitting right next to the project, exactly where
+# the automatic upward search would otherwise find them) may be imported.
+#
+# main.cpp turns either file's ItemDefinitionGroup contribution into a #error, so
+# the only expected diagnostic is the deliberate division by zero.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_directory_build_disabled():
+    args = [
+        '--template=cppcheck1',
+        '--project=vcxproj_directory_build_disabled/vcxproj_directory_build_disabled.vcxproj',
+        '--no-cppcheck-build-dir'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+    filename = os.path.join('vcxproj_directory_build_disabled', 'main.cpp')
+    assert stderr == '[%s:13]: (error) Division by zero.\n' % filename
diff --git a/test/cli/vcxproj_directory_build_path/CustomBuild.props b/test/cli/vcxproj_directory_build_path/CustomBuild.props
new file mode 100644
index 00000000000..c4591915f91
--- /dev/null
+++ b/test/cli/vcxproj_directory_build_path/CustomBuild.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>RIGHT_PROPS_DEFINE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/vcxproj_directory_build_path/CustomBuild.targets b/test/cli/vcxproj_directory_build_path/CustomBuild.targets
new file mode 100644
index 00000000000..3a11e53f679
--- /dev/null
+++ b/test/cli/vcxproj_directory_build_path/CustomBuild.targets
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>RIGHT_TARGETS_DEFINE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/vcxproj_directory_build_path/Directory.Build.props b/test/cli/vcxproj_directory_build_path/Directory.Build.props
new file mode 100644
index 00000000000..b15b0db8926
--- /dev/null
+++ b/test/cli/vcxproj_directory_build_path/Directory.Build.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>WRONG_PROPS_DEFINE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/vcxproj_directory_build_path/Directory.Build.targets b/test/cli/vcxproj_directory_build_path/Directory.Build.targets
new file mode 100644
index 00000000000..9a18ed7fe4e
--- /dev/null
+++ b/test/cli/vcxproj_directory_build_path/Directory.Build.targets
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>WRONG_TARGETS_DEFINE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/vcxproj_directory_build_path/main.cpp b/test/cli/vcxproj_directory_build_path/main.cpp
new file mode 100644
index 00000000000..7dc10ed6c2b
--- /dev/null
+++ b/test/cli/vcxproj_directory_build_path/main.cpp
@@ -0,0 +1,21 @@
+// Each check below fails with #error if DirectoryBuildPropsPath/
+// DirectoryBuildTargetsPath did not override the upward directory search with
+// the explicit file they name; see vcxproj_directory_build_path_test.py.
+#if !defined(RIGHT_PROPS_DEFINE)
+#error DirectoryBuildPropsPath override (CustomBuild.props) was not imported
+#endif
+#if defined(WRONG_PROPS_DEFINE)
+#error Directory.Build.props was imported even though DirectoryBuildPropsPath overrides the search
+#endif
+#if !defined(RIGHT_TARGETS_DEFINE)
+#error DirectoryBuildTargetsPath override (CustomBuild.targets) was not imported
+#endif
+#if defined(WRONG_TARGETS_DEFINE)
+#error Directory.Build.targets was imported even though DirectoryBuildTargetsPath overrides the search
+#endif
+
+int main()
+{
+    int x = 3 / 0; // ERROR
+    return x;
+}
diff --git a/test/cli/vcxproj_directory_build_path/vcxproj_directory_build_path.vcxproj b/test/cli/vcxproj_directory_build_path/vcxproj_directory_build_path.vcxproj
new file mode 100644
index 00000000000..bd596b95cde
--- /dev/null
+++ b/test/cli/vcxproj_directory_build_path/vcxproj_directory_build_path.vcxproj
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <!-- DirectoryBuildPropsPath/DirectoryBuildTargetsPath, when set, override the
+       upward directory search with an explicit file -- Directory.Build.props and
+       Directory.Build.targets sitting right next to this project (which the
+       upward search would otherwise find first) must NOT be imported; only
+       CustomBuild.props/.targets should be. -->
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{99999999-9999-9999-9999-999999999999}</ProjectGuid>
+    <RootNamespace>dirbuildpathtest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <DirectoryBuildPropsPath>CustomBuild.props</DirectoryBuildPropsPath>
+    <DirectoryBuildTargetsPath>CustomBuild.targets</DirectoryBuildTargetsPath>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_directory_build_path_test.py b/test/cli/vcxproj_directory_build_path_test.py
new file mode 100644
index 00000000000..721e6ba9b8d
--- /dev/null
+++ b/test/cli/vcxproj_directory_build_path_test.py
@@ -0,0 +1,32 @@
+
+# python -m pytest vcxproj_directory_build_path_test.py
+#
+# Regression coverage for $(DirectoryBuildPropsPath) / $(DirectoryBuildTargetsPath):
+# when set, Microsoft documents that these override attemptSyntheticImport()'s
+# normal upward-directory search (see "Customize your build by folder or
+# solution") with an explicit file. This fixture's Globals PropertyGroup sets
+# both to "CustomBuild.props"/"CustomBuild.targets", while Directory.Build.props
+# and Directory.Build.targets -- which the upward search would otherwise find
+# first, since they sit right next to the project -- are also present, each
+# defining a macro the *other* file does not. main.cpp turns any mismatch (the
+# override not imported, or the plain Directory.Build.* file imported anyway)
+# into a #error, so the only expected diagnostic is the deliberate division by
+# zero.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_directory_build_path():
+    args = [
+        '--template=cppcheck1',
+        '--project=vcxproj_directory_build_path/vcxproj_directory_build_path.vcxproj',
+        '--no-cppcheck-build-dir'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+    filename = os.path.join('vcxproj_directory_build_path', 'main.cpp')
+    assert stderr == '[%s:19]: (error) Division by zero.\n' % filename
diff --git a/test/cli/vcxproj_discover_choose/Configs.props b/test/cli/vcxproj_discover_choose/Configs.props
new file mode 100644
index 00000000000..aeebadde55d
--- /dev/null
+++ b/test/cli/vcxproj_discover_choose/Configs.props
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+</Project>
diff --git a/test/cli/vcxproj_discover_choose/main.cpp b/test/cli/vcxproj_discover_choose/main.cpp
new file mode 100644
index 00000000000..76e8197013a
--- /dev/null
+++ b/test/cli/vcxproj_discover_choose/main.cpp
@@ -0,0 +1 @@
+int main() { return 0; }
diff --git a/test/cli/vcxproj_discover_choose/vcxproj_discover_choose.vcxproj b/test/cli/vcxproj_discover_choose/vcxproj_discover_choose.vcxproj
new file mode 100644
index 00000000000..982b085258c
--- /dev/null
+++ b/test/cli/vcxproj_discover_choose/vcxproj_discover_choose.vcxproj
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{dddddddd-dddd-dddd-dddd-dddddddddddd}</ProjectGuid>
+    <RootNamespace>discoverchoosetest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <!-- No inline <ItemGroup Label="ProjectConfigurations"> anywhere in this file, so
+       importVcxproj() must fall back to its Discovery bootstrap pass to find any
+       configuration at all. The only path to one is this top-level <Choose>: its
+       <When> is unconditionally true, and the <ImportGroup> inside it imports
+       Configs.props, which is what actually defines Debug|x64. The Discovery scan
+       used to walk PropertyGroup/ImportGroup/Import at the top level but never
+       looked inside <Choose>, so it silently found nothing here and cppcheck failed
+       outright with "no C or C++ source files found" despite the project being
+       well-formed. -->
+  <Choose>
+    <When Condition="true">
+      <ImportGroup>
+        <Import Project="Configs.props" />
+      </ImportGroup>
+    </When>
+  </Choose>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="ConfigDebug">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_discover_choose_test.py b/test/cli/vcxproj_discover_choose_test.py
new file mode 100644
index 00000000000..c56d058c8f2
--- /dev/null
+++ b/test/cli/vcxproj_discover_choose_test.py
@@ -0,0 +1,43 @@
+
+# python -m pytest vcxproj_discover_choose_test.py
+#
+# Regression coverage for the vcxproj configuration-discovery pass (used only
+# when a project has no inline <ItemGroup Label="ProjectConfigurations"> and
+# must find its configurations by walking imports): it must also look inside
+# a top-level <Choose>, not just top-level PropertyGroup/ImportGroup/Import.
+#
+# This fixture's only configuration (Debug|x64) is defined in Configs.props,
+# which is reachable only through an <ImportGroup> nested inside a top-level
+# <Choose><When Condition="true">. A discovery pass that walks
+# PropertyGroup/ImportGroup/Import at the top level but never inspects <Choose>
+# at all never finds Configs.props, so no configuration is discovered and
+# cppcheck fails outright ("no C or C++ source files found") even though the
+# project is well-formed -- this is a different bug than the discovery pass
+# stopping early (covered by vcxproj_split_configs_test.py): here the node type
+# is never even recognized, so it doesn't matter whether it's found first,
+# last, or is the only import in the project.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_discover_choose():
+    args = [
+        '--project=vcxproj_discover_choose/vcxproj_discover_choose.vcxproj',
+        '--no-cppcheck-build-dir',
+        '--dump'
+    ]
+    ret, stdout, _ = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    # Windows prints native '\' path separators ("Checking foo\main.cpp ...");
+    # normalize before matching so this passes on every platform (same idiom
+    # used by test_log() in clang-import_test.py).
+    normalized_stdout = stdout.replace('\\', '/')
+
+    # The configuration reachable only through the top-level Choose must be
+    # discovered and checked, not silently dropped.
+    assert 'Checking vcxproj_discover_choose/main.cpp Debug|x64' in normalized_stdout, stdout
diff --git a/test/cli/vcxproj_discover_property_path/Debug/Configs.props b/test/cli/vcxproj_discover_property_path/Debug/Configs.props
new file mode 100644
index 00000000000..aeebadde55d
--- /dev/null
+++ b/test/cli/vcxproj_discover_property_path/Debug/Configs.props
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+</Project>
diff --git a/test/cli/vcxproj_discover_property_path/main.cpp b/test/cli/vcxproj_discover_property_path/main.cpp
new file mode 100644
index 00000000000..76e8197013a
--- /dev/null
+++ b/test/cli/vcxproj_discover_property_path/main.cpp
@@ -0,0 +1 @@
+int main() { return 0; }
diff --git a/test/cli/vcxproj_discover_property_path/vcxproj_discover_property_path.vcxproj b/test/cli/vcxproj_discover_property_path/vcxproj_discover_property_path.vcxproj
new file mode 100644
index 00000000000..71677194e2b
--- /dev/null
+++ b/test/cli/vcxproj_discover_property_path/vcxproj_discover_property_path.vcxproj
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{11111111-2222-3333-4444-555555555555}</ProjectGuid>
+    <RootNamespace>discoverpropertypathtest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <!-- No inline <ItemGroup Label="ProjectConfigurations">, so importVcxproj() must
+       fall back to its Discovery bootstrap pass to find any configuration at all.
+       This <Import> is NOT gated by any Condition or Choose -- discovery's
+       "ignore every Condition" behavior (mDiscovering) has nothing to do here.
+       The PATH ITSELF embeds $(Configuration), so resolving it at all depends on
+       Discovery seeding a guessed value for that property; without a seed the
+       path is left with a literal, unexpanded "$(Configuration)" segment, which
+       simplifyPathWithVariables() treats as unresolvable, and the import (and the
+       only configuration it defines) is silently skipped. -->
+  <Import Project="$(Configuration)\Configs.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="ConfigDebug">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_discover_property_path_test.py b/test/cli/vcxproj_discover_property_path_test.py
new file mode 100644
index 00000000000..8007b969471
--- /dev/null
+++ b/test/cli/vcxproj_discover_property_path_test.py
@@ -0,0 +1,44 @@
+
+# python -m pytest vcxproj_discover_property_path_test.py
+#
+# Regression coverage for the vcxproj configuration-discovery pass (used only
+# when a project has no inline <ItemGroup Label="ProjectConfigurations"> and
+# must find its configurations by walking imports): it must still seed a
+# guessed Configuration/Platform, even though it now ignores every Condition
+# (see vcxproj_discover_choose_test.py / mDiscovering).
+#
+# This fixture's only <Import> has no Condition and is not behind a <Choose> --
+# there is nothing for "ignore every Condition" to help with here. Instead, the
+# import's PATH ITSELF embeds $(Configuration): <Import Project=
+# "$(Configuration)\Configs.props" />. Resolving that path at all requires a
+# concrete value for $(Configuration); without a seeded guess it is left as a
+# literal, unexpanded "$(Configuration)" segment, which
+# simplifyPathWithVariables() treats as unresolvable, so the import -- and the
+# only configuration it defines -- is silently skipped and cppcheck fails
+# outright ("no C or C++ source files found") despite the project being
+# well-formed.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_discover_property_path():
+    args = [
+        '--project=vcxproj_discover_property_path/vcxproj_discover_property_path.vcxproj',
+        '--no-cppcheck-build-dir',
+        '--dump'
+    ]
+    ret, stdout, _ = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    # Windows prints native '\' path separators ("Checking foo\main.cpp ...");
+    # normalize before matching so this passes on every platform (same idiom
+    # used by test_log() in clang-import_test.py).
+    normalized_stdout = stdout.replace('\\', '/')
+
+    # The configuration reachable only through the unconditional, path-embedded
+    # $(Configuration) import must be discovered and checked.
+    assert 'Checking vcxproj_discover_property_path/main.cpp Debug|x64' in normalized_stdout, stdout
diff --git a/test/cli/vcxproj_duplicate_import/Common.props b/test/cli/vcxproj_duplicate_import/Common.props
new file mode 100644
index 00000000000..b3058925ff6
--- /dev/null
+++ b/test/cli/vcxproj_duplicate_import/Common.props
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Counter>$(Counter)X</Counter>
+  </PropertyGroup>
+</Project>
diff --git a/test/cli/vcxproj_duplicate_import/main.cpp b/test/cli/vcxproj_duplicate_import/main.cpp
new file mode 100644
index 00000000000..76e8197013a
--- /dev/null
+++ b/test/cli/vcxproj_duplicate_import/main.cpp
@@ -0,0 +1 @@
+int main() { return 0; }
diff --git a/test/cli/vcxproj_duplicate_import/vcxproj_duplicate_import.vcxproj b/test/cli/vcxproj_duplicate_import/vcxproj_duplicate_import.vcxproj
new file mode 100644
index 00000000000..6fe09159cd9
--- /dev/null
+++ b/test/cli/vcxproj_duplicate_import/vcxproj_duplicate_import.vcxproj
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{66666666-6666-6666-6666-666666666666}</ProjectGuid>
+    <RootNamespace>duptest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- Common.props is imported twice via two separate <Import> elements (a
+       realistic pattern: e.g. one direct import plus the same file reachable
+       through a shared property sheet). Real MSBuild/VS evaluates an already-
+       imported file exactly once (MSB4011); its PropertyGroup must not be
+       re-applied a second time. Common.props appends to Counter non-
+       idempotently, so double-processing is directly observable. -->
+  <Import Project="Common.props" />
+  <Import Project="Common.props" />
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>COUNTER_VALUE=$(Counter);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_duplicate_import_test.py b/test/cli/vcxproj_duplicate_import_test.py
new file mode 100644
index 00000000000..d9fb3583d4d
--- /dev/null
+++ b/test/cli/vcxproj_duplicate_import_test.py
@@ -0,0 +1,40 @@
+
+# python -m pytest vcxproj_duplicate_import_test.py
+#
+# Regression coverage for MSBuild/Visual Studio duplicate-import handling
+# (MSB4011): once a project file has been imported, a later <Import> of the
+# same file (by resolved, case-insensitive path) is a no-op -- its content is
+# not evaluated a second time. This fixture imports Common.props via two
+# separate <Import> elements; Common.props appends to a property
+# (Counter = $(Counter)X) non-idempotently, so double-processing is directly
+# observable: processed once, Counter ends up "X"; processed twice, "XX".
+# Checked in all three evaluation passes (Properties/ItemDefs/Items), not just
+# Properties, since each pass has its own 'imported' dedup state that must
+# independently reproduce the same "process once" result.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_duplicate_import():
+    args = [
+        '--project=vcxproj_duplicate_import/vcxproj_duplicate_import.vcxproj',
+        '--no-cppcheck-build-dir',
+        '--dump'
+    ]
+    ret, stdout, _ = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    dump_file = os.path.join(__script_dir, 'vcxproj_duplicate_import', 'main.cpp.dump')
+    assert os.path.exists(dump_file), "Dump file not found at %s" % dump_file
+
+    with open(dump_file, 'rt') as f:
+        dump_content = f.read()
+
+    # Common.props must be evaluated exactly once despite being referenced by
+    # two separate <Import> elements -- Counter must be "X", not "XX".
+    assert 'COUNTER_VALUE=X;' in dump_content, dump_content
+    assert 'COUNTER_VALUE=XX' not in dump_content, dump_content
diff --git a/test/cli/vcxproj_forced_includes/AllX64.h b/test/cli/vcxproj_forced_includes/AllX64.h
new file mode 100644
index 00000000000..0c3063b59f4
--- /dev/null
+++ b/test/cli/vcxproj_forced_includes/AllX64.h
@@ -0,0 +1,6 @@
+class all
+{
+	all() {
+		int x = 3 / 0; (void)x; // ERROR
+	}
+};
diff --git a/test/cli/vcxproj_forced_includes/DebugX64.cpp b/test/cli/vcxproj_forced_includes/DebugX64.cpp
new file mode 100644
index 00000000000..cfb1fce687a
--- /dev/null
+++ b/test/cli/vcxproj_forced_includes/DebugX64.cpp
@@ -0,0 +1,8 @@
+#include <iostream>
+
+int foo()
+{
+	std::cout << "DebugX64\n";
+	int x = 3 / 0; (void)x; // ERROR
+	return 0;
+}
diff --git a/test/cli/vcxproj_forced_includes/DebugX64.h b/test/cli/vcxproj_forced_includes/DebugX64.h
new file mode 100644
index 00000000000..ab3bfb495da
--- /dev/null
+++ b/test/cli/vcxproj_forced_includes/DebugX64.h
@@ -0,0 +1,6 @@
+class debug
+{
+	debug() {
+		int x = 3 / 0; (void)x; // ERROR
+	}
+};
\ No newline at end of file
diff --git a/test/cli/vcxproj_forced_includes/GlobalDebugX64.h b/test/cli/vcxproj_forced_includes/GlobalDebugX64.h
new file mode 100644
index 00000000000..48038886307
--- /dev/null
+++ b/test/cli/vcxproj_forced_includes/GlobalDebugX64.h
@@ -0,0 +1,6 @@
+class global
+{
+	global() {
+		int x = 3 / 0; (void)x; // ERROR
+	}
+};
diff --git a/test/cli/vcxproj_forced_includes/GlobalReleaseX64.h b/test/cli/vcxproj_forced_includes/GlobalReleaseX64.h
new file mode 100644
index 00000000000..48038886307
--- /dev/null
+++ b/test/cli/vcxproj_forced_includes/GlobalReleaseX64.h
@@ -0,0 +1,6 @@
+class global
+{
+	global() {
+		int x = 3 / 0; (void)x; // ERROR
+	}
+};
diff --git a/test/cli/vcxproj_forced_includes/PropsDebugX64.h b/test/cli/vcxproj_forced_includes/PropsDebugX64.h
new file mode 100644
index 00000000000..49643c7ea86
--- /dev/null
+++ b/test/cli/vcxproj_forced_includes/PropsDebugX64.h
@@ -0,0 +1,6 @@
+class props
+{
+	props() {
+		int x = 3 / 0; (void)x; // ERROR
+	}
+};
diff --git a/test/cli/vcxproj_forced_includes/PropsReleaseX64.h b/test/cli/vcxproj_forced_includes/PropsReleaseX64.h
new file mode 100644
index 00000000000..49643c7ea86
--- /dev/null
+++ b/test/cli/vcxproj_forced_includes/PropsReleaseX64.h
@@ -0,0 +1,6 @@
+class props
+{
+	props() {
+		int x = 3 / 0; (void)x; // ERROR
+	}
+};
diff --git a/test/cli/vcxproj_forced_includes/ReleaseX64.cpp b/test/cli/vcxproj_forced_includes/ReleaseX64.cpp
new file mode 100644
index 00000000000..8fa6e6d0f82
--- /dev/null
+++ b/test/cli/vcxproj_forced_includes/ReleaseX64.cpp
@@ -0,0 +1,8 @@
+#include <iostream>
+
+int foo()
+{
+	std::cout << "ReleaseX64\n";
+	int x = 3 / 0; (void)x; // ERROR
+	return 0;
+}
diff --git a/test/cli/vcxproj_forced_includes/ReleaseX64.h b/test/cli/vcxproj_forced_includes/ReleaseX64.h
new file mode 100644
index 00000000000..49f9766f927
--- /dev/null
+++ b/test/cli/vcxproj_forced_includes/ReleaseX64.h
@@ -0,0 +1,6 @@
+class release
+{
+	release() {
+		int x = 3 / 0; (void)x; // ERROR
+	}
+};
\ No newline at end of file
diff --git a/test/cli/vcxproj_forced_includes/foo.h b/test/cli/vcxproj_forced_includes/foo.h
new file mode 100644
index 00000000000..5d5f8f0c9e7
--- /dev/null
+++ b/test/cli/vcxproj_forced_includes/foo.h
@@ -0,0 +1 @@
+int foo();
diff --git a/test/cli/vcxproj_forced_includes/vcxproj_forced_includes.props b/test/cli/vcxproj_forced_includes/vcxproj_forced_includes.props
new file mode 100644
index 00000000000..22e858590c1
--- /dev/null
+++ b/test/cli/vcxproj_forced_includes/vcxproj_forced_includes.props
@@ -0,0 +1,8 @@
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PropsDebugX64.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">PropsReleaseX64.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/vcxproj_forced_includes/vcxproj_forced_includes.slnx b/test/cli/vcxproj_forced_includes/vcxproj_forced_includes.slnx
new file mode 100644
index 00000000000..f586cfa3a29
--- /dev/null
+++ b/test/cli/vcxproj_forced_includes/vcxproj_forced_includes.slnx
@@ -0,0 +1,6 @@
+<Solution>
+  <Configurations>
+    <Platform Name="x64" />
+  </Configurations>
+  <Project Path="vcxproj_forced_includes.vcxproj" Id="c9d1dca1-d8ff-4c05-9159-f00816645319" />
+</Solution>
diff --git a/test/cli/vcxproj_forced_includes/vcxproj_forced_includes.vcxproj b/test/cli/vcxproj_forced_includes/vcxproj_forced_includes.vcxproj
new file mode 100644
index 00000000000..bd1676af947
--- /dev/null
+++ b/test/cli/vcxproj_forced_includes/vcxproj_forced_includes.vcxproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>18.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{c9d1dca1-d8ff-4c05-9159-f00816645319}</ProjectGuid>
+    <RootNamespace>exclude</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <Import Project="$(SolutionDir)\vcxproj_forced_includes.props" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+	  <ForcedIncludeFiles>$(MSBuildThisFileDirectory)GlobalDebugX64.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <ForcedIncludeFiles>$(MSBuildThisFileDirectory)GlobalReleaseX64.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="DebugX64.cpp">
+      <ForcedIncludeFiles>$(MSBuildThisFileDirectory)AllX64.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MSBuildThisFileDirectory)DebugX64.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MSBuildThisFileDirectory)ReleaseX64.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ReleaseX64.cpp">
+      <ForcedIncludeFiles>$(MSBuildThisFileDirectory)AllX64.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MSBuildThisFileDirectory)DebugX64.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MSBuildThisFileDirectory)ReleaseX64.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="foo.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/test/cli/vcxproj_forced_includes_test.py b/test/cli/vcxproj_forced_includes_test.py
new file mode 100644
index 00000000000..e86b254f7da
--- /dev/null
+++ b/test/cli/vcxproj_forced_includes_test.py
@@ -0,0 +1,59 @@
+
+# python -m pytest vcxproj_forced_includes_test.py
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+__proj_dir = os.path.join(__script_dir, 'vcxproj_forced_includes')
+
+def get_lines(s):
+    return sorted(s.split('\n'))
+
+def test_vcxproj_forced_includes_debug():
+    args = [
+        '--template=cppcheck1',
+        '--project=vcxproj_forced_includes/vcxproj_forced_includes.slnx',
+        '--project-configuration=Debug|x64',
+        '--no-cppcheck-build-dir'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    filename1 = os.path.join('vcxproj_forced_includes', 'DebugX64.cpp')
+    filename2 = os.path.join('vcxproj_forced_includes', 'DebugX64.h')
+    filename3 = os.path.join('vcxproj_forced_includes', 'AllX64.h')
+    filename4 = os.path.join('vcxproj_forced_includes', 'GlobalDebugX64.h')
+    filename5 = os.path.join('vcxproj_forced_includes', 'PropsDebugX64.h')
+    assert ret == 0, stdout
+    expected = (
+        '[%s:6]: (error) Division by zero.\n'
+        '[%s:4]: (error) Division by zero.\n'
+        '[%s:4]: (error) Division by zero.\n'
+        '[%s:4]: (error) Division by zero.\n'
+        '[%s:4]: (error) Division by zero.\n' % (filename1, filename2, filename3, filename4, filename5)
+    )
+    assert get_lines(stderr) == get_lines(expected)
+
+
+def test_vcxproj_forced_includes_release():
+    args = [
+        '--template=cppcheck1',
+        '--project=vcxproj_forced_includes/vcxproj_forced_includes.slnx',
+        '--project-configuration=Release|x64',
+        '--no-cppcheck-build-dir'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    filename1 = os.path.join('vcxproj_forced_includes', 'ReleaseX64.cpp')
+    filename2 = os.path.join('vcxproj_forced_includes', 'ReleaseX64.h')
+    filename3 = os.path.join('vcxproj_forced_includes', 'AllX64.h')
+    filename4 = os.path.join('vcxproj_forced_includes', 'GlobalReleaseX64.h')
+    filename5 = os.path.join('vcxproj_forced_includes', 'PropsReleaseX64.h')
+    assert ret == 0, stdout
+    expected = (
+        '[%s:6]: (error) Division by zero.\n'
+        '[%s:4]: (error) Division by zero.\n'
+        '[%s:4]: (error) Division by zero.\n'
+        '[%s:4]: (error) Division by zero.\n'
+        '[%s:4]: (error) Division by zero.\n' % (filename1, filename2, filename3, filename4, filename5)
+    )
+    assert get_lines(stderr) == get_lines(expected)
diff --git a/test/cli/vcxproj_import_condition/conditional.props b/test/cli/vcxproj_import_condition/conditional.props
new file mode 100644
index 00000000000..8f93474463e
--- /dev/null
+++ b/test/cli/vcxproj_import_condition/conditional.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>SHOULD_NOT_APPEAR=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/vcxproj_import_condition/main.cpp b/test/cli/vcxproj_import_condition/main.cpp
new file mode 100644
index 00000000000..76e8197013a
--- /dev/null
+++ b/test/cli/vcxproj_import_condition/main.cpp
@@ -0,0 +1 @@
+int main() { return 0; }
diff --git a/test/cli/vcxproj_import_condition/vcxproj_import_condition.vcxproj b/test/cli/vcxproj_import_condition/vcxproj_import_condition.vcxproj
new file mode 100644
index 00000000000..b4352581e87
--- /dev/null
+++ b/test/cli/vcxproj_import_condition/vcxproj_import_condition.vcxproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{55555555-5555-5555-5555-555555555555}</ProjectGuid>
+    <RootNamespace>condtest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- LateFlag is NOT yet set when this Import's Condition is evaluated during
+       the Properties pass -- so the condition is false and the import must NOT
+       be taken. If phases 2/3 re-evaluate this Condition using end-of-phase-1
+       (final) properties instead of replaying the frozen taken/not-taken
+       decision, they would incorrectly take this import once LateFlag=true. -->
+  <Import Project="conditional.props" Condition="'$(LateFlag)'=='true'" />
+
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <LateFlag>true</LateFlag>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_import_condition_test.py b/test/cli/vcxproj_import_condition_test.py
new file mode 100644
index 00000000000..bd1cf4e6df7
--- /dev/null
+++ b/test/cli/vcxproj_import_condition_test.py
@@ -0,0 +1,43 @@
+
+# python -m pytest vcxproj_import_condition_test.py
+#
+# Regression coverage for MSBuild/Visual Studio's three-pass evaluation order:
+# an <Import>'s Condition is decided exactly once, during the Properties pass,
+# using properties as accumulated at the point Properties reaches it -- not
+# re-evaluated during the ItemDefs/Items passes against end-of-Properties
+# (final) property state. This fixture's <Import Project="conditional.props">
+# has a Condition that depends on a property (LateFlag) which is only assigned
+# by a PropertyGroup positioned AFTER the Import -- so the Properties pass
+# sees it unset and does not take the import. If ItemDefs/Items instead
+# re-evaluated the same Condition against the now-final properties (where
+# LateFlag=true), they would incorrectly take the import there and pick up
+# conditional.props's ItemDefinitionGroup, leaking SHOULD_NOT_APPEAR into the
+# dump even though the import was never actually part of the resolved graph
+# Properties built.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_import_condition():
+    args = [
+        '--project=vcxproj_import_condition/vcxproj_import_condition.vcxproj',
+        '--no-cppcheck-build-dir',
+        '--dump'
+    ]
+    ret, stdout, _ = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    dump_file = os.path.join(__script_dir, 'vcxproj_import_condition', 'main.cpp.dump')
+    assert os.path.exists(dump_file), "Dump file not found at %s" % dump_file
+
+    with open(dump_file, 'rt') as f:
+        dump_content = f.read()
+
+    # conditional.props must stay un-imported in every phase -- its Condition
+    # was false when Properties decided it, and that decision must be replayed
+    # (not re-evaluated) by ItemDefs/Items.
+    assert 'SHOULD_NOT_APPEAR' not in dump_content, dump_content
diff --git a/test/cli/vcxproj_import_graph/Directory.Build.props b/test/cli/vcxproj_import_graph/Directory.Build.props
new file mode 100644
index 00000000000..de26fe1ecac
--- /dev/null
+++ b/test/cli/vcxproj_import_graph/Directory.Build.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>DIRBUILD_DEFINE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/vcxproj_import_graph/dup.props b/test/cli/vcxproj_import_graph/dup.props
new file mode 100644
index 00000000000..ab74367157d
--- /dev/null
+++ b/test/cli/vcxproj_import_graph/dup.props
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!-- appends one character per import: "1" if imported once, "11" if twice -->
+    <DupImportCount>$(DupImportCount)1</DupImportCount>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>DUP_IMPORT_COUNT=$(DupImportCount);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/vcxproj_import_graph/guarded.props b/test/cli/vcxproj_import_graph/guarded.props
new file mode 100644
index 00000000000..a0c33fbbf98
--- /dev/null
+++ b/test/cli/vcxproj_import_graph/guarded.props
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <GuardedImported>true</GuardedImported>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>GUARDED_DEFINE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/vcxproj_import_graph/main.cpp b/test/cli/vcxproj_import_graph/main.cpp
new file mode 100644
index 00000000000..bd828b0e725
--- /dev/null
+++ b/test/cli/vcxproj_import_graph/main.cpp
@@ -0,0 +1,20 @@
+// Each check below fails with #error when the import graph is not walked the way
+// MSBuild / Visual Studio walk it; see vcxproj_import_graph_test.py.
+#if !defined(GUARDED_DEFINE)
+#error ItemDefinitionGroup of guarded.props (import guard) was not applied
+#endif
+#if DUP_IMPORT_COUNT != 1
+#error dup.props was imported more than once
+#endif
+#if !defined(DIRBUILD_DEFINE)
+#error ItemDefinitionGroup of Directory.Build.props was not applied
+#endif
+#if !defined(PROJ_DEFINE)
+#error ItemDefinitionGroup of the project was not applied
+#endif
+
+int main()
+{
+    int x = 3 / 0; // ERROR
+    return x;
+}
diff --git a/test/cli/vcxproj_import_graph/vcxproj_import_graph.slnx b/test/cli/vcxproj_import_graph/vcxproj_import_graph.slnx
new file mode 100644
index 00000000000..c740f7a1631
--- /dev/null
+++ b/test/cli/vcxproj_import_graph/vcxproj_import_graph.slnx
@@ -0,0 +1,6 @@
+<Solution>
+  <Configurations>
+    <Platform Name="x64" />
+  </Configurations>
+  <Project Path="vcxproj_import_graph.vcxproj" Id="4f0c2b5e-1a7d-4c3e-9b8a-2d6e7f1c0a91" />
+</Solution>
diff --git a/test/cli/vcxproj_import_graph/vcxproj_import_graph.vcxproj b/test/cli/vcxproj_import_graph/vcxproj_import_graph.vcxproj
new file mode 100644
index 00000000000..1a8d4720cb9
--- /dev/null
+++ b/test/cli/vcxproj_import_graph/vcxproj_import_graph.vcxproj
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{4f0c2b5e-1a7d-4c3e-9b8a-2d6e7f1c0a91}</ProjectGuid>
+    <RootNamespace>vcxprojimportgraph</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <!-- Import guard: guarded.props sets GuardedImported=true.  MSBuild resolves the
+         import graph once (during property evaluation), so the ItemDefinitionGroup in
+         guarded.props must still be applied although the guard is false afterwards. -->
+    <Import Project="guarded.props" Condition="'$(GuardedImported)' != 'true'" />
+    <!-- dup.props is imported twice; MSBuild ignores the second import (MSB4011). -->
+    <Import Project="dup.props" />
+    <Import Project="dup.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;PROJ_DEFINE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/test/cli/vcxproj_import_graph_test.py b/test/cli/vcxproj_import_graph_test.py
new file mode 100644
index 00000000000..f72b8d7bd99
--- /dev/null
+++ b/test/cli/vcxproj_import_graph_test.py
@@ -0,0 +1,32 @@
+# python -m pytest vcxproj_import_graph_test.py
+#
+# MSBuild (and therefore Visual Studio) resolves the import graph exactly once, while
+# evaluating properties, and then walks that same graph for item definitions and items.
+# This fixture checks that cppcheck's three-phase evaluation does the same:
+#   - an <Import> guarded by a property that the imported file itself sets
+#     (<Import Project="guarded.props" Condition="'$(GuardedImported)' != 'true'"/>)
+#     still contributes its ItemDefinitionGroup
+#   - a file that is imported twice is processed only once (MSB4011)
+#   - Directory.Build.props, imported through the Microsoft.Cpp.Default.props emulation,
+#     contributes its ItemDefinitionGroup as well
+# main.cpp turns every one of these into an #error, so the only expected diagnostic is
+# the deliberate division by zero.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_import_graph():
+    args = [
+        '--template=cppcheck1',
+        '--project=vcxproj_import_graph/vcxproj_import_graph.slnx',
+        '--project-configuration=Debug|x64',
+        '--no-cppcheck-build-dir'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+    filename = os.path.join('vcxproj_import_graph', 'main.cpp')
+    assert stderr == '[%s:18]: (error) Division by zero.\n' % filename
diff --git a/test/cli/vcxproj_import_wildcard/ImportBefore/a.props b/test/cli/vcxproj_import_wildcard/ImportBefore/a.props
new file mode 100644
index 00000000000..33aea328de2
--- /dev/null
+++ b/test/cli/vcxproj_import_wildcard/ImportBefore/a.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>WILDCARD_A_DEFINE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/vcxproj_import_wildcard/ImportBefore/b.props b/test/cli/vcxproj_import_wildcard/ImportBefore/b.props
new file mode 100644
index 00000000000..193b35a1fc7
--- /dev/null
+++ b/test/cli/vcxproj_import_wildcard/ImportBefore/b.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>WILDCARD_B_DEFINE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/test/cli/vcxproj_import_wildcard/ImportBefore/decoy.txt b/test/cli/vcxproj_import_wildcard/ImportBefore/decoy.txt
new file mode 100644
index 00000000000..a0ba20a47fb
--- /dev/null
+++ b/test/cli/vcxproj_import_wildcard/ImportBefore/decoy.txt
@@ -0,0 +1,2 @@
+Not a .props file -- the "*.props" wildcard pattern must not attempt to load
+this as XML. If it did, cppcheck would fail since this isn't valid XML.
diff --git a/test/cli/vcxproj_import_wildcard/main.cpp b/test/cli/vcxproj_import_wildcard/main.cpp
new file mode 100644
index 00000000000..79c249d89d3
--- /dev/null
+++ b/test/cli/vcxproj_import_wildcard/main.cpp
@@ -0,0 +1,18 @@
+// Each check below fails with #error unless the wildcard <Import Project=
+// "ImportBefore\*.props" /> correctly expanded to import BOTH a.props and
+// b.props (sorted, per MSBuild's own documented behavior), while skipping
+// decoy.txt (extension doesn't match "*.props") and the nonexistent
+// ImportAfter\*.props wildcard resolved to nothing without error. See
+// vcxproj_import_wildcard_test.py.
+#if !defined(WILDCARD_A_DEFINE)
+#error ImportBefore/a.props (matched by wildcard Import) was not imported
+#endif
+#if !defined(WILDCARD_B_DEFINE)
+#error ImportBefore/b.props (matched by wildcard Import) was not imported
+#endif
+
+int main()
+{
+    int x = 3 / 0; // ERROR
+    return x;
+}
diff --git a/test/cli/vcxproj_import_wildcard/vcxproj_import_wildcard.vcxproj b/test/cli/vcxproj_import_wildcard/vcxproj_import_wildcard.vcxproj
new file mode 100644
index 00000000000..938fe0931d2
--- /dev/null
+++ b/test/cli/vcxproj_import_wildcard/vcxproj_import_wildcard.vcxproj
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee}</ProjectGuid>
+    <RootNamespace>importwildcardtest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- Mirrors the real ImportBefore/ImportAfter extensibility mechanism Visual
+       Studio's own C++ toolchain files use (e.g.
+       $(VCTargetsPath)\ImportBefore\Default\*.props): a wildcard <Import>
+       matching every file in a directory, filtered by extension, sorted so
+       a.props and b.props both apply regardless of filesystem enumeration
+       order, and skipping decoy.txt since it doesn't match "*.props". -->
+  <Import Project="ImportBefore\*.props" />
+  <!-- ImportAfter does not exist at all -- a wildcard matching nothing must be
+       a silent no-op, exactly like MSBuild's own empty extensibility folders. -->
+  <Import Project="ImportAfter\*.props" />
+
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_import_wildcard_test.py b/test/cli/vcxproj_import_wildcard_test.py
new file mode 100644
index 00000000000..c9d06096607
--- /dev/null
+++ b/test/cli/vcxproj_import_wildcard_test.py
@@ -0,0 +1,43 @@
+
+# python -m pytest vcxproj_import_wildcard_test.py
+#
+# Regression coverage for wildcard <Import> support: MSBuild allows wildcards in
+# an <Import>'s Project attribute -- a *different*, general mechanism from the
+# Visual Studio C++ project-system restriction against wildcards in project
+# items (see vcxproj_split_configs_test.py and expandItemSpec()'s rejection of
+# '*'/'?' there). This is the mechanism behind the ImportBefore/ImportAfter
+# extensibility folders Visual Studio's own C++ toolchain files use, e.g.
+# $(VCTargetsPath)\ImportBefore\Default\*.props -- but it applies equally to
+# any ordinary user-authored wildcard <Import>, which is what this fixture
+# exercises directly (rather than depending on the synthetic, hand-emulated
+# Microsoft.Cpp.*.props/targets handlers, which do not read the real files and
+# so never reach a wildcard import inside them).
+#
+# This fixture's <Import Project="ImportBefore\*.props" /> must expand to
+# BOTH a.props and b.props (sorted, "as if the order had been explicitly
+# set" per Microsoft's own docs), while skipping decoy.txt (its extension
+# doesn't match "*.props", so it must never even be attempted as XML -- it
+# isn't valid XML, so a match would make cppcheck fail outright). A second
+# <Import Project="ImportAfter\*.props" /> pointing at a directory that does
+# not exist at all must be a silent no-op, not an error.
+#
+# main.cpp turns any of these going wrong into a #error, so the only expected
+# diagnostic is the deliberate division by zero.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_import_wildcard():
+    args = [
+        '--template=cppcheck1',
+        '--project=vcxproj_import_wildcard/vcxproj_import_wildcard.vcxproj',
+        '--no-cppcheck-build-dir'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+    filename = os.path.join('vcxproj_import_wildcard', 'main.cpp')
+    assert stderr == '[%s:16]: (error) Division by zero.\n' % filename
diff --git a/test/cli/vcxproj_include_dir_macro/RealInc/myheader.h b/test/cli/vcxproj_include_dir_macro/RealInc/myheader.h
new file mode 100644
index 00000000000..133cdac53de
--- /dev/null
+++ b/test/cli/vcxproj_include_dir_macro/RealInc/myheader.h
@@ -0,0 +1 @@
+#define FROM_REAL_HEADER 1
diff --git a/test/cli/vcxproj_include_dir_macro/main.cpp b/test/cli/vcxproj_include_dir_macro/main.cpp
new file mode 100644
index 00000000000..401e2b3df79
--- /dev/null
+++ b/test/cli/vcxproj_include_dir_macro/main.cpp
@@ -0,0 +1,5 @@
+#include "myheader.h"
+#ifndef FROM_REAL_HEADER
+#error myheader.h (under RealInc) was not found
+#endif
+int main() { return 0; }
diff --git a/test/cli/vcxproj_include_dir_macro/vcxproj_include_dir_macro.vcxproj b/test/cli/vcxproj_include_dir_macro/vcxproj_include_dir_macro.vcxproj
new file mode 100644
index 00000000000..7f339ac81f4
--- /dev/null
+++ b/test/cli/vcxproj_include_dir_macro/vcxproj_include_dir_macro.vcxproj
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{dddddddd-dddd-dddd-dddd-dddddddddddd}</ProjectGuid>
+    <RootNamespace>incdirmacrotest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- CppcheckTestIncDirMacro is not defined anywhere in this project (no
+       PropertyGroup, no property sheet) and is not expected to be set as an
+       environment variable either -- it is deliberately unresolvable.
+       MSBuild expands an undefined property to the empty string, so this
+       entry is "\RealInc": the root of the project directory's drive, NOT
+       the RealInc folder next to this project. Visual Studio would not find
+       myheader.h through it, and neither must cppcheck.
+       See vcxproj_include_dir_macro_test.py. -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(CppcheckTestIncDirMacro)\RealInc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_include_dir_macro/vcxproj_include_dir_macro_relative.vcxproj b/test/cli/vcxproj_include_dir_macro/vcxproj_include_dir_macro_relative.vcxproj
new file mode 100644
index 00000000000..cd5ced0239d
--- /dev/null
+++ b/test/cli/vcxproj_include_dir_macro/vcxproj_include_dir_macro_relative.vcxproj
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee}</ProjectGuid>
+    <RootNamespace>incdirmacrorelativetest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- Same unresolvable CppcheckTestIncDirMacro as in
+       vcxproj_include_dir_macro.vcxproj, but with no separator after it.
+       MSBuild expands it to the empty string, leaving "RealInc", which is
+       relative to the project directory -- so Visual Studio finds
+       myheader.h through it, and so must cppcheck.
+       See vcxproj_include_dir_macro_test.py. -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(CppcheckTestIncDirMacro)RealInc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_include_dir_macro_test.py b/test/cli/vcxproj_include_dir_macro_test.py
new file mode 100644
index 00000000000..c56d6b5a1c6
--- /dev/null
+++ b/test/cli/vcxproj_include_dir_macro_test.py
@@ -0,0 +1,54 @@
+# python -m pytest vcxproj_include_dir_macro_test.py
+#
+# Regression coverage for an unresolvable macro in AdditionalIncludeDirectories
+# (fsSetIncludePaths(), lib/importproject.cpp).
+#
+# MSBuild expands an undefined property to the empty string, and the result is
+# handed to cl.exe like any other include directory. cppcheck must do the same
+# rather than keep the literal "$(...)" text, which can never name a real
+# directory. Whether the expanded entry finds anything depends on what is left:
+#
+#   $(Undefined)\RealInc -> "\RealInc"  root of the project directory's drive
+#   $(Undefined)RealInc  -> "RealInc"   relative to the project directory
+#
+# Both fixture projects compile main.cpp, which #includes "myheader.h" --
+# present only under RealInc/ next to the projects. CppcheckTestIncDirMacro is
+# not defined anywhere (no PropertyGroup, and not expected to be a real
+# environment variable). main.cpp's #error fires if and only if the header was
+# not found, which independently shows how the entry was resolved.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+__not_found = ('vcxproj_include_dir_macro/main.cpp:3:2: error: #error myheader.h (under RealInc) '
+               'was not found [preprocessorErrorDirective]')
+
+
+def __run(project):
+    args = [
+        '--project=vcxproj_include_dir_macro/%s' % project,
+        '--no-cppcheck-build-dir',
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+    # The unresolved macro is expanded to an empty string, as Visual Studio
+    # does -- it is not reported as a project import error.
+    assert 'cppcheck: error:' not in stdout, stdout
+    return stderr.replace('\\', '/')
+
+
+def test_vcxproj_include_dir_macro_root_relative():
+    # "\RealInc" is the root of the drive, not the RealInc folder next to the
+    # project, so myheader.h must NOT be found.
+    stderr = __run('vcxproj_include_dir_macro.vcxproj')
+    assert __not_found in stderr, stderr
+
+
+def test_vcxproj_include_dir_macro_relative():
+    # "RealInc" is relative to the project directory, so myheader.h IS found.
+    stderr = __run('vcxproj_include_dir_macro_relative.vcxproj')
+    assert __not_found not in stderr, stderr
+    assert 'preprocessorErrorDirective' not in stderr, stderr
diff --git a/test/cli/vcxproj_item_absolute_drive_path/vcxproj_item_absolute_drive_path.vcxproj b/test/cli/vcxproj_item_absolute_drive_path/vcxproj_item_absolute_drive_path.vcxproj
new file mode 100644
index 00000000000..26a6097d11f
--- /dev/null
+++ b/test/cli/vcxproj_item_absolute_drive_path/vcxproj_item_absolute_drive_path.vcxproj
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{dddddddd-eeee-ffff-0000-111111111111}</ProjectGuid>
+    <RootNamespace>itemabsolutedrivepathtest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- A plain Windows drive-absolute path, no macros involved at all, so
+       expandItemSpec() passes it straight through to
+       ImportProject::toAbsoluteExpanded() unchanged. On a non-Windows host,
+       Path::isAbsolute("C:/nonexistent/foo.cpp") is false (it only
+       recognizes a leading '/'), so toAbsoluteExpanded() used to treat this
+       as relative and join it onto the project directory --
+       "<projectDir>/C:/nonexistent/foo.cpp" -- instead of using the
+       already-absolute path as-is, the way real Visual Studio (and
+       toAbsoluteExpanded() itself running natively on Windows) does. See
+       vcxproj_item_absolute_drive_path_test.py. -->
+  <ItemGroup>
+    <ClCompile Include="C:\nonexistent\foo.cpp" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_item_absolute_drive_path_test.py b/test/cli/vcxproj_item_absolute_drive_path_test.py
new file mode 100644
index 00000000000..de22d09de1e
--- /dev/null
+++ b/test/cli/vcxproj_item_absolute_drive_path_test.py
@@ -0,0 +1,49 @@
+
+# python -m pytest vcxproj_item_absolute_drive_path_test.py
+#
+# Regression coverage for ImportProject::toAbsoluteExpanded() using the
+# host-dependent Path::isAbsolute() to decide whether a ClCompile item path
+# is already fully rooted (lib/importproject.cpp). Path::isAbsolute() only
+# recognizes a leading '/' on a non-Windows host, so a Windows
+# drive-absolute path straight out of a .vcxproj -- e.g. "C:/nonexistent/foo.cpp",
+# with no macro involved at all -- would be misclassified as relative and
+# joined onto the project directory instead of used as-is, producing
+# something like "<projectDir>/C:/nonexistent/foo.cpp" -- not what real
+# Visual Studio does (and not what toAbsoluteExpanded() itself would do
+# running natively on Windows, where Path::isAbsolute() DOES recognize
+# "C:\..." as absolute). The fix uses classifyPath() -- the same
+# host-independent Windows/Unix path classification already used throughout
+# this file (see pathCombineAppend(), toAbsolute(), etc.) -- instead.
+#
+# This fixture's only <ClCompile> item is Include="C:\nonexistent\foo.cpp",
+# a plain drive-absolute path with nothing to macro-expand, so
+# expandItemSpec() passes it straight through to toAbsoluteExpanded().
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_item_absolute_drive_path():
+    args = [
+        '--project=vcxproj_item_absolute_drive_path/vcxproj_item_absolute_drive_path.vcxproj',
+        '--no-cppcheck-build-dir',
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    normalized_stdout = stdout.replace('\\', '/')
+    normalized_stderr = stderr.replace('\\', '/')
+
+    # The drive-absolute path must be used exactly as-is -- not joined onto
+    # the project directory.
+    assert 'Checking C:/nonexistent/foo.cpp Debug|x64...' in normalized_stdout, stdout
+    assert normalized_stderr.count('C:/nonexistent/foo.cpp:0:0: error: File is missing: C:/nonexistent/foo.cpp [missingFile]') == 1, stderr
+
+    # It must NOT have been nested under the project directory -- that would
+    # mean toAbsoluteExpanded() wrongly treated the already-absolute path as
+    # relative and joined it onto projectDir.
+    assert 'vcxproj_item_absolute_drive_path/C:' not in normalized_stdout, stdout
+    assert 'vcxproj_item_absolute_drive_path/C:' not in normalized_stderr, stderr
diff --git a/test/cli/vcxproj_item_condition/foo.cpp b/test/cli/vcxproj_item_condition/foo.cpp
new file mode 100644
index 00000000000..76e8197013a
--- /dev/null
+++ b/test/cli/vcxproj_item_condition/foo.cpp
@@ -0,0 +1 @@
+int main() { return 0; }
diff --git a/test/cli/vcxproj_item_condition/vcxproj_item_condition.vcxproj b/test/cli/vcxproj_item_condition/vcxproj_item_condition.vcxproj
new file mode 100644
index 00000000000..2c293865e2b
--- /dev/null
+++ b/test/cli/vcxproj_item_condition/vcxproj_item_condition.vcxproj
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{66666666-6666-6666-6666-666666666666}</ProjectGuid>
+    <RootNamespace>itemcondtest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="ConfigDebug">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="ConfigRelease">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- Microsoft documents that the Visual Studio C++ project system does not
+       support Condition on project items themselves -- only on their
+       metadata. So even though this Condition is false for Release, real
+       Visual Studio still includes foo.cpp when building Release|x64: the
+       Condition on the ClCompile item is simply never evaluated. -->
+  <ItemGroup>
+    <ClCompile Include="foo.cpp" Condition="'$(Configuration)'=='Debug'" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_item_condition_test.py b/test/cli/vcxproj_item_condition_test.py
new file mode 100644
index 00000000000..5788df861fd
--- /dev/null
+++ b/test/cli/vcxproj_item_condition_test.py
@@ -0,0 +1,47 @@
+
+# python -m pytest vcxproj_item_condition_test.py
+#
+# Regression coverage for Condition on a ClCompile *project item* itself
+# (as opposed to Condition on the item's metadata children, which is a
+# different, fully-supported feature -- see applyClCompileChild()).
+#
+# Microsoft documents that the Visual Studio C++ project system does not
+# support Condition on project items: "Conditions aren't supported for
+# Project items (that is, item types that are treated as project items by
+# rules definitions)." -- see
+# https://learn.microsoft.com/en-us/cpp/build/reference/vcxproj-file-structure
+#
+# This fixture's only <ClCompile> item is Include="foo.cpp"
+# Condition="'$(Configuration)'=='Debug'". A discovery/evaluation pass that
+# honors that Condition (i.e. treats the item like any other conditioned
+# element) drops foo.cpp entirely when evaluating Release|x64 -- but real
+# Visual Studio ignores the Condition on the item itself and always includes
+# foo.cpp, in both Debug and Release. So foo.cpp must be checked under both
+# configurations.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_item_condition():
+    args = [
+        '--project=vcxproj_item_condition/vcxproj_item_condition.vcxproj',
+        '--no-cppcheck-build-dir',
+        '--dump'
+    ]
+    ret, stdout, _ = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    # Windows prints native '\' path separators ("Checking foo\main.cpp ...");
+    # normalize before matching so this passes on every platform (same idiom
+    # used by test_log() in clang-import_test.py).
+    normalized_stdout = stdout.replace('\\', '/')
+
+    # foo.cpp's Condition is gated on Configuration=='Debug', but Visual
+    # Studio does not evaluate Condition on project items -- so foo.cpp must
+    # be checked under BOTH configurations, not just Debug.
+    assert 'Checking vcxproj_item_condition/foo.cpp Debug|x64' in normalized_stdout, stdout
+    assert 'Checking vcxproj_item_condition/foo.cpp Release|x64' in normalized_stdout, stdout
diff --git a/test/cli/vcxproj_item_macro_path/SomeDir/foo.cpp b/test/cli/vcxproj_item_macro_path/SomeDir/foo.cpp
new file mode 100644
index 00000000000..76e8197013a
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path/SomeDir/foo.cpp
@@ -0,0 +1 @@
+int main() { return 0; }
diff --git a/test/cli/vcxproj_item_macro_path/vcxproj_item_macro_path.vcxproj b/test/cli/vcxproj_item_macro_path/vcxproj_item_macro_path.vcxproj
new file mode 100644
index 00000000000..639f8d759e2
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path/vcxproj_item_macro_path.vcxproj
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{77777777-7777-7777-7777-777777777777}</ProjectGuid>
+    <RootNamespace>itemmacropathtest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- SomeDir is an ordinary, user-defined property (not one of the fixed
+       "this file"/"this project" location properties Visual Studio's Shared
+       Items mechanism relies on), and -- unlike a property a property sheet
+       sets once, unconditionally -- it genuinely differs between this
+       project's two configurations. Microsoft documents that the Visual
+       Studio C++ project system does not support a macro whose value could
+       differ by configuration in a project item path: real Visual Studio
+       would show this ClCompile item as unresolved, not silently expand
+       $(SomeDir) to whichever configuration's value happened to be active
+       and pick up foo.cpp. See vcxproj_item_macro_path_invariant_test.py for
+       the opposite case, where the macro's value is the same in every
+       configuration and Visual Studio does expand it. -->
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <SomeDir>SomeDir</SomeDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <SomeDir>SomeOtherDir</SomeDir>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClCompile Include="$(SomeDir)\foo.cpp" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_item_macro_path_case_builtin/foo.cpp b/test/cli/vcxproj_item_macro_path_case_builtin/foo.cpp
new file mode 100644
index 00000000000..c5e4ff6a07d
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_case_builtin/foo.cpp
@@ -0,0 +1,8 @@
+// Reached only if $(msbuildprojectdirectory)\foo.cpp was correctly
+// recognized as the (case-insensitive) built-in MSBuildProjectDirectory
+// property and expanded -- see vcxproj_item_macro_path_case_test.py.
+int main()
+{
+    int x = 3 / 0; // ERROR
+    return x;
+}
diff --git a/test/cli/vcxproj_item_macro_path_case_builtin/vcxproj_item_macro_path_case_builtin.vcxproj b/test/cli/vcxproj_item_macro_path_case_builtin/vcxproj_item_macro_path_case_builtin.vcxproj
new file mode 100644
index 00000000000..b8babcfcd02
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_case_builtin/vcxproj_item_macro_path_case_builtin.vcxproj
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb}</ProjectGuid>
+    <RootNamespace>itemmacropathcasebuiltintest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- MSBuildProjectDirectory is one of the fixed "this file"/"this
+       project" properties that is always config-invariant by construction
+       (invariantItemPathProperties()) -- but MSBuild property names are
+       case-insensitive, so real Visual Studio resolves this reference
+       regardless of casing. Referencing it here as all-lowercase
+       "msbuildprojectdirectory" is the regression case for
+       invariantItemPathProperties() itself needing a case-insensitive
+       lookup, not just mConfigInvariantProperties. See
+       vcxproj_item_macro_path_case_test.py. -->
+  <ItemGroup>
+    <ClCompile Include="$(msbuildprojectdirectory)\foo.cpp" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_item_macro_path_case_invariant/SameCaseDir/mathplot.cpp b/test/cli/vcxproj_item_macro_path_case_invariant/SameCaseDir/mathplot.cpp
new file mode 100644
index 00000000000..f35ae700ca5
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_case_invariant/SameCaseDir/mathplot.cpp
@@ -0,0 +1,8 @@
+// Reached only if $(MYROOT)\mathplot.cpp was correctly recognized as the
+// same config-invariant property as MyRoot/myroot and expanded -- see
+// vcxproj_item_macro_path_case_test.py.
+int main()
+{
+    int x = 3 / 0; // ERROR
+    return x;
+}
diff --git a/test/cli/vcxproj_item_macro_path_case_invariant/vcxproj_item_macro_path_case_invariant.vcxproj b/test/cli/vcxproj_item_macro_path_case_invariant/vcxproj_item_macro_path_case_invariant.vcxproj
new file mode 100644
index 00000000000..29810cf054e
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_case_invariant/vcxproj_item_macro_path_case_invariant.vcxproj
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}</ProjectGuid>
+    <RootNamespace>itemmacropathcaseinvarianttest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- MyRoot/myroot are the SAME property to MSBuild (case-insensitive) and
+       resolve to the exact same value in both configurations -- genuinely
+       config-invariant, like vcxproj_item_macro_path_invariant_test.py's
+       ExternalLibRoot, just spelled with different casing per configuration
+       here, and the item below references it under a THIRD casing
+       (MYROOT). All three must be recognized as the one property: real
+       Visual Studio resolves it, so cppcheck must too, not just when every
+       occurrence happens to share one exact spelling. See
+       vcxproj_item_macro_path_case_test.py. -->
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <MyRoot>SameCaseDir</MyRoot>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <myroot>SameCaseDir</myroot>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClCompile Include="$(MYROOT)\mathplot.cpp" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_item_macro_path_case_test.py b/test/cli/vcxproj_item_macro_path_case_test.py
new file mode 100644
index 00000000000..d4e80820ed5
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_case_test.py
@@ -0,0 +1,107 @@
+
+# python -m pytest vcxproj_item_macro_path_case_test.py
+#
+# Regression coverage for MSBuild property-name case-insensitivity in the
+# ClCompile item-path macro analysis (expandItemSpec() /
+# hasOnlyInvariantItemPathVariables(), lib/importproject.cpp). Real MSBuild
+# property names are case-insensitive -- PropertiesMap itself already uses
+# cppcheck::stricmp for exactly this reason -- but the config-invariance
+# analysis this feature added (mConfigInvariantProperties, the priming-pass
+# valuesByProperty map, and the fixed invariantItemPathProperties() set) used
+# plain, case-sensitive std::set/std::map. That mismatch has two distinct,
+# independently regressed failure modes:
+#
+# 1. A property genuinely set to DIFFERENT values in different
+#    configurations, but spelled with different casing in each
+#    PropertyGroup (e.g. <CaseRoot> for Debug, <caseroot> for Release), gets
+#    tracked as two unrelated single-valued names instead of one
+#    multi-valued one -- each looks (wrongly) invariant on its own, so
+#    cppcheck would expand and check two different real files instead of
+#    correctly leaving the item unexpanded (matching real Visual Studio's
+#    documented restriction -- see vcxproj_item_macro_path_test.py).
+#    test_vcxproj_item_macro_path_case_variant covers this.
+#
+# 2. A property that genuinely IS config-invariant (same value everywhere),
+#    or one of the fixed MSBuildThisFile.../MSBuildProject... properties,
+#    fails to be recognized as such if it's spelled with different casing
+#    across the PropertyGroups that set it and/or the item path that
+#    references it -- real Visual Studio resolves it regardless, but
+#    cppcheck would wrongly reject it and report a real, checkable file as
+#    missing. test_vcxproj_item_macro_path_case_invariant (a user-defined
+#    property spelled three different ways) and
+#    test_vcxproj_item_macro_path_case_builtin (a fixed MSBuild property
+#    referenced in lowercase) cover this.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_item_macro_path_case_variant():
+    args = [
+        '--project=vcxproj_item_macro_path_case_variant/vcxproj_item_macro_path_case_variant.vcxproj',
+        '--no-cppcheck-build-dir',
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    normalized_stdout = stdout.replace('\\', '/')
+    normalized_stderr = stderr.replace('\\', '/')
+    literal_path = 'vcxproj_item_macro_path_case_variant/$(CaseRoot)/foo.cpp'
+
+    # $(CaseRoot) genuinely varies by configuration -- "CaseRoot" (Debug) and
+    # "caseroot" (Release) are the same MSBuild property, just spelled
+    # differently -- so it must NOT be expanded in either configuration,
+    # exactly like vcxproj_item_macro_path_test.py's same-casing case.
+    assert ('Checking %s Debug|x64...' % literal_path) in normalized_stdout, stdout
+    assert ('Checking %s Release|x64...' % literal_path) in normalized_stdout, stdout
+    assert normalized_stderr.count('%s:0:0: error: File is missing: %s [missingFile]' % (literal_path, literal_path)) == 1, stderr
+
+    # The real files under DebugCaseDir/ and ReleaseCaseDir/ must never be
+    # reached -- if they were, their #error would surface here instead, and
+    # that would mean the case-sensitivity bug let a genuinely-varying
+    # property slip through as "invariant".
+    assert 'DebugCaseDir/foo.cpp' not in normalized_stdout, stdout
+    assert 'ReleaseCaseDir/foo.cpp' not in normalized_stdout, stdout
+
+
+def test_vcxproj_item_macro_path_case_invariant():
+    args = [
+        '--project=vcxproj_item_macro_path_case_invariant/vcxproj_item_macro_path_case_invariant.vcxproj',
+        '--no-cppcheck-build-dir',
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    normalized_stdout = stdout.replace('\\', '/')
+    filename = 'vcxproj_item_macro_path_case_invariant/SameCaseDir/mathplot.cpp'
+
+    # $(MYROOT) must resolve in both configurations to the one property real
+    # Visual Studio sees, however it's spelled at each definition/reference
+    # site (MyRoot / myroot / MYROOT) -- not be rejected as unsupported.
+    assert ('Checking %s Debug|x64...' % filename) in normalized_stdout, stdout
+    assert ('Checking %s Release|x64...' % filename) in normalized_stdout, stdout
+
+    normalized_stderr = stderr.replace('\\', '/')
+    assert normalized_stderr.count('%s:6:15: error: Division by zero.' % filename) == 1, stderr
+
+
+def test_vcxproj_item_macro_path_case_builtin():
+    args = [
+        '--project=vcxproj_item_macro_path_case_builtin/vcxproj_item_macro_path_case_builtin.vcxproj',
+        '--no-cppcheck-build-dir',
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    normalized_stdout = stdout.replace('\\', '/')
+    filename = 'vcxproj_item_macro_path_case_builtin/foo.cpp'
+
+    # $(msbuildprojectdirectory), all lowercase, must still be recognized as
+    # the fixed MSBuildProjectDirectory property and expanded.
+    assert ('Checking %s Debug|x64...' % filename) in normalized_stdout, stdout
+
+    normalized_stderr = stderr.replace('\\', '/')
+    assert normalized_stderr.count('%s:6:15: error: Division by zero.' % filename) == 1, stderr
diff --git a/test/cli/vcxproj_item_macro_path_case_variant/DebugCaseDir/foo.cpp b/test/cli/vcxproj_item_macro_path_case_variant/DebugCaseDir/foo.cpp
new file mode 100644
index 00000000000..9a9e81d27c6
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_case_variant/DebugCaseDir/foo.cpp
@@ -0,0 +1,2 @@
+#error DebugCaseDir/foo.cpp must never be checked -- $(CaseRoot) genuinely varies by configuration (case-insensitively) and must not be expanded
+int main() { return 0; }
diff --git a/test/cli/vcxproj_item_macro_path_case_variant/ReleaseCaseDir/foo.cpp b/test/cli/vcxproj_item_macro_path_case_variant/ReleaseCaseDir/foo.cpp
new file mode 100644
index 00000000000..5d4ef0c337c
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_case_variant/ReleaseCaseDir/foo.cpp
@@ -0,0 +1,2 @@
+#error ReleaseCaseDir/foo.cpp must never be checked -- $(CaseRoot) genuinely varies by configuration (case-insensitively) and must not be expanded
+int main() { return 0; }
diff --git a/test/cli/vcxproj_item_macro_path_case_variant/vcxproj_item_macro_path_case_variant.vcxproj b/test/cli/vcxproj_item_macro_path_case_variant/vcxproj_item_macro_path_case_variant.vcxproj
new file mode 100644
index 00000000000..cd79684f61f
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_case_variant/vcxproj_item_macro_path_case_variant.vcxproj
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{99999999-9999-9999-9999-999999999999}</ProjectGuid>
+    <RootNamespace>itemmacropathcasevarianttest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- MSBuild property names are case-insensitive: to real Visual Studio,
+       "CaseRoot" (set here for Debug) and "caseroot" (set here for Release)
+       are the exact same property, and it genuinely resolves to a DIFFERENT
+       value in each configuration -- exactly the case
+       vcxproj_item_macro_path_test.py covers with a single consistent
+       spelling. This fixture is the regression case for the same property
+       spelled with different casing in different configurations: a
+       case-SENSITIVE analysis of "which properties are config-invariant"
+       sees "CaseRoot" (one value, from Debug) and "caseroot" (one value,
+       from Release) as two unrelated single-valued names and wrongly
+       concludes each is invariant, when the real, case-folded property
+       "CaseRoot"/"caseroot" is not invariant at all. See
+       vcxproj_item_macro_path_case_test.py. -->
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <CaseRoot>DebugCaseDir</CaseRoot>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <caseroot>ReleaseCaseDir</caseroot>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClCompile Include="$(CaseRoot)\foo.cpp" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_item_macro_path_env/EnvLibRoot/mathplot.cpp b/test/cli/vcxproj_item_macro_path_env/EnvLibRoot/mathplot.cpp
new file mode 100644
index 00000000000..6300635aa46
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_env/EnvLibRoot/mathplot.cpp
@@ -0,0 +1,8 @@
+// Reached only if $(CppcheckTestEnvLibRoot)\mathplot.cpp was correctly
+// resolved via the CppcheckTestEnvLibRoot environment variable -- see
+// vcxproj_item_macro_path_env_test.py.
+int main()
+{
+    int x = 3 / 0; // ERROR
+    return x;
+}
diff --git a/test/cli/vcxproj_item_macro_path_env/vcxproj_item_macro_path_env.vcxproj b/test/cli/vcxproj_item_macro_path_env/vcxproj_item_macro_path_env.vcxproj
new file mode 100644
index 00000000000..304c471589d
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_env/vcxproj_item_macro_path_env.vcxproj
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{99999999-9999-9999-9999-999999999999}</ProjectGuid>
+    <RootNamespace>itemmacropathenvtest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- CppcheckTestEnvLibRoot is NOT set anywhere in this project -- no
+       PropertyGroup, no property sheet, nothing. It exists only as a real OS
+       environment variable, set by the test itself before invoking cppcheck
+       (mirroring how a real developer might point $(wxMathPlot)-style macros
+       at a library checked out somewhere on their machine via a machine- or
+       user-level environment variable rather than a project-level property).
+       MSBuild property evaluation falls back to the environment for any
+       property nothing else defines, and that fallback value can't differ by
+       configuration -- it's one process-wide value -- so real Visual Studio
+       resolves this Include path the same way regardless of which
+       configuration is active. See vcxproj_item_macro_path_env_test.py. -->
+  <ItemGroup>
+    <ClCompile Include="$(CppcheckTestEnvLibRoot)\mathplot.cpp" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_item_macro_path_env_test.py b/test/cli/vcxproj_item_macro_path_env_test.py
new file mode 100644
index 00000000000..ff0e7a99b66
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_env_test.py
@@ -0,0 +1,74 @@
+
+# python -m pytest vcxproj_item_macro_path_env_test.py
+#
+# Regression coverage for the environment-variable fallback in
+# expandItemSpec()'s ClCompile item-path macro check (see
+# vcxproj_item_macro_path_test.py / vcxproj_item_macro_path_invariant_test.py
+# for the general rule this is a special case of): a $(...) reference in an
+# Include/Update/Remove path to a property no PropertyGroup or property
+# sheet in the project ever sets, but that resolves via a real OS
+# environment variable of the same name, is config-invariant exactly like a
+# property-sheet constant is -- an environment variable has exactly one
+# value for the whole cppcheck invocation, it cannot differ between
+# Debug|x64 and Release|x64 -- and real MSBuild property evaluation itself
+# falls back to the environment for anything nothing else defines. So real
+# Visual Studio resolves it, and cppcheck must too.
+#
+# This fixture's only <ClCompile> item is
+# Include="$(CppcheckTestEnvLibRoot)\mathplot.cpp", where
+# CppcheckTestEnvLibRoot is not defined anywhere in the project itself.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_item_macro_path_env_var_set():
+    env = os.environ.copy()
+    env['CppcheckTestEnvLibRoot'] = 'EnvLibRoot'
+
+    args = [
+        '--project=vcxproj_item_macro_path_env/vcxproj_item_macro_path_env.vcxproj',
+        '--no-cppcheck-build-dir',
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir, env=env)
+    assert ret == 0, stdout
+
+    normalized_stdout = stdout.replace('\\', '/')
+    filename = 'vcxproj_item_macro_path_env/EnvLibRoot/mathplot.cpp'
+
+    # Both configurations must resolve $(CppcheckTestEnvLibRoot)\mathplot.cpp
+    # via the environment variable to the same real file and actually check
+    # it -- not treat the macro as unsupported just because no PropertyGroup
+    # in the project itself ever set it.
+    assert ('Checking %s Debug|x64...' % filename) in normalized_stdout, stdout
+    assert ('Checking %s Release|x64...' % filename) in normalized_stdout, stdout
+
+    normalized_stderr = stderr.replace('\\', '/')
+    assert normalized_stderr.count('%s:6:15: error: Division by zero.' % filename) == 1, stderr
+
+
+def test_vcxproj_item_macro_path_env_var_unset():
+    env = os.environ.copy()
+    env.pop('CppcheckTestEnvLibRoot', None)
+
+    args = [
+        '--project=vcxproj_item_macro_path_env/vcxproj_item_macro_path_env.vcxproj',
+        '--no-cppcheck-build-dir',
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir, env=env)
+    assert ret == 0, stdout
+
+    normalized_stdout = stdout.replace('\\', '/')
+    normalized_stderr = stderr.replace('\\', '/')
+    literal_path = 'vcxproj_item_macro_path_env/$(CppcheckTestEnvLibRoot)/mathplot.cpp'
+
+    # With no environment variable and no project property defining it
+    # either, $(CppcheckTestEnvLibRoot) is genuinely unresolvable -- the item
+    # must still be checked (and reported missing) under its literal path in
+    # both configurations, not silently dropped.
+    assert ('Checking %s Debug|x64...' % literal_path) in normalized_stdout, stdout
+    assert ('Checking %s Release|x64...' % literal_path) in normalized_stdout, stdout
+    assert normalized_stderr.count('%s:0:0: error: File is missing: %s [missingFile]' % (literal_path, literal_path)) == 1, stderr
diff --git a/test/cli/vcxproj_item_macro_path_hyphen/HyphenDir/foo.cpp b/test/cli/vcxproj_item_macro_path_hyphen/HyphenDir/foo.cpp
new file mode 100644
index 00000000000..7bb863299e2
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_hyphen/HyphenDir/foo.cpp
@@ -0,0 +1,10 @@
+// Reached only if $(My-Root)\foo.cpp was correctly recognized as a
+// config-invariant property reference and expanded -- which requires the
+// hyphen in "My-Root" to be accepted as part of the property name by
+// hasOnlyInvariantItemPathVariables()'s inline scanner. See
+// vcxproj_item_macro_path_hyphen_test.py.
+int main()
+{
+    int x = 3 / 0; // ERROR
+    return x;
+}
diff --git a/test/cli/vcxproj_item_macro_path_hyphen/vcxproj_item_macro_path_hyphen.vcxproj b/test/cli/vcxproj_item_macro_path_hyphen/vcxproj_item_macro_path_hyphen.vcxproj
new file mode 100644
index 00000000000..bab49b16519
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_hyphen/vcxproj_item_macro_path_hyphen.vcxproj
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{bbbbbbbb-cccc-dddd-eeee-ffffffffffff}</ProjectGuid>
+    <RootNamespace>itemmacropathhyphentest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- Regression coverage for hasOnlyInvariantItemPathVariables()'s inline
+       property-name scanner rejecting '-'. Real MSBuild property names are
+       [A-Za-z_][A-Za-z0-9_-]* -- '-' IS valid after the first character
+       (see lib/importproject.cpp's PropertyValueExpander::parseIdentifier()
+       and hasOnlyInvariantItemPathVariables() doc comments) -- so
+       <My-Root>foo</My-Root>, referenced below as $(My-Root), is one valid
+       property name to real Visual Studio, genuinely invariant (only one
+       configuration, and it's the only place this property is set).
+       Before the fix, the scanner stopped at the first '-', capturing only
+       "My" as the parsed name; since the character immediately after that
+       truncated name is '-' and not the required ')', the whole $(...)
+       reference was rejected as "not provably invariant" and left
+       unexpanded -- so cppcheck would report the literal, un-expandable
+       "$(My-Root)\foo.cpp" as a missing file instead of resolving and
+       checking the real HyphenDir/foo.cpp. See
+       vcxproj_item_macro_path_hyphen_test.py. -->
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <My-Root>HyphenDir</My-Root>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClCompile Include="$(My-Root)\foo.cpp" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_item_macro_path_hyphen_test.py b/test/cli/vcxproj_item_macro_path_hyphen_test.py
new file mode 100644
index 00000000000..3218e751f1f
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_hyphen_test.py
@@ -0,0 +1,49 @@
+
+# python -m pytest vcxproj_item_macro_path_hyphen_test.py
+#
+# Regression coverage for hasOnlyInvariantItemPathVariables()'s inline
+# property-name scanner rejecting '-' (lib/importproject.cpp). Real MSBuild
+# property names are [A-Za-z_][A-Za-z0-9_-]* -- '-' IS valid after the
+# first character, e.g. <My-Root>HyphenDir</My-Root> referenced as
+# $(My-Root) -- but the scanner used to decide whether a ClCompile item
+# path's macro references are all safely config-invariant only accepted
+# [A-Za-z0-9_], so it stopped at the first '-' and captured a truncated
+# name. Since the character right after that truncated name was '-' (not
+# the required closing ')'), the whole reference was rejected as "not
+# provably invariant" and left unexpanded, even though this property is
+# only ever set once, to one value -- genuinely invariant, exactly like
+# vcxproj_item_macro_path_invariant_test.py's ExternalLibRoot. See
+# vcxproj_item_macro_path_hyphen/vcxproj_item_macro_path_hyphen.vcxproj.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_item_macro_path_hyphen():
+    args = [
+        '--project=vcxproj_item_macro_path_hyphen/vcxproj_item_macro_path_hyphen.vcxproj',
+        '--no-cppcheck-build-dir',
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    normalized_stdout = stdout.replace('\\', '/')
+    filename = 'vcxproj_item_macro_path_hyphen/HyphenDir/foo.cpp'
+
+    # $(My-Root) must resolve to "HyphenDir" and be expanded -- reaching and
+    # checking the real file, not being left as the literal, un-expandable
+    # "$(My-Root)\foo.cpp" text.
+    assert ('Checking %s Debug|x64...' % filename) in normalized_stdout, stdout
+
+    normalized_stderr = stderr.replace('\\', '/')
+    assert normalized_stderr.count('%s:8:15: error: Division by zero.' % filename) == 1, stderr
+
+    # It must never be reported as a missing file under the literal,
+    # unexpanded macro text -- that would mean the hyphen truncated the
+    # scanned property name and the reference was wrongly rejected as
+    # "not provably invariant".
+    assert '$(My-Root)' not in normalized_stdout, stdout
+    assert '$(My-Root)' not in normalized_stderr, stderr
diff --git a/test/cli/vcxproj_item_macro_path_invariant/ExternalLibRoot/mathplot.cpp b/test/cli/vcxproj_item_macro_path_invariant/ExternalLibRoot/mathplot.cpp
new file mode 100644
index 00000000000..7c43e7f9d47
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_invariant/ExternalLibRoot/mathplot.cpp
@@ -0,0 +1,7 @@
+// Reached only if $(ExternalLibRoot)\mathplot.cpp was correctly expanded and
+// checked -- see vcxproj_item_macro_path_invariant_test.py.
+int main()
+{
+    int x = 3 / 0; // ERROR
+    return x;
+}
diff --git a/test/cli/vcxproj_item_macro_path_invariant/vcxproj_item_macro_path_invariant.vcxproj b/test/cli/vcxproj_item_macro_path_invariant/vcxproj_item_macro_path_invariant.vcxproj
new file mode 100644
index 00000000000..cc812ac6072
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_invariant/vcxproj_item_macro_path_invariant.vcxproj
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{88888888-8888-8888-8888-888888888888}</ProjectGuid>
+    <RootNamespace>itemmacropathinvarianttest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- ExternalLibRoot models a real-world pattern: a property sheet (or, as
+       here for simplicity, an unconditioned PropertyGroup) pointing at a
+       fixed third-party library location, e.g. $(wxMathPlot) or $(BoostRoot)
+       in a real project. It is an ordinary user-defined property -- not one
+       of the fixed "this file"/"this project" location properties -- but it
+       resolves to the exact same value in EVERY configuration this project
+       has (nothing here conditions it on Configuration/Platform). Per
+       Microsoft's documented restriction (see
+       vcxproj_item_macro_path_test.py), that is precisely what makes it safe
+       for the IDE to resolve in a project item path: a single Solution
+       Explorer file list can show one fixed file regardless of which
+       configuration happens to be active, because the path really is the
+       same either way. Real Visual Studio expands it and picks up
+       mathplot.cpp; so must cppcheck. -->
+  <PropertyGroup>
+    <ExternalLibRoot>ExternalLibRoot</ExternalLibRoot>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClCompile Include="$(ExternalLibRoot)\mathplot.cpp" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_item_macro_path_invariant_test.py b/test/cli/vcxproj_item_macro_path_invariant_test.py
new file mode 100644
index 00000000000..a7928ad5c46
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_invariant_test.py
@@ -0,0 +1,52 @@
+
+# python -m pytest vcxproj_item_macro_path_invariant_test.py
+#
+# Regression coverage for the flip side of vcxproj_item_macro_path_test.py:
+# a macro in a ClCompile project item's Include/Update/Remove path whose
+# value is the SAME in every one of the project's configurations. Real Visual
+# Studio has no trouble resolving this -- it's the well-known pattern of a
+# property sheet (or, as here, an unconditioned PropertyGroup) defining a
+# fixed third-party library location, e.g. $(wxMathPlot) or $(BoostRoot), and
+# referencing it directly in an Include path. Microsoft's documented
+# restriction is specifically about macros whose value COULD differ by
+# configuration -- see vcxproj_item_macro_path_test.py and
+# https://learn.microsoft.com/en-us/cpp/build/reference/vcxproj-file-structure
+# -- so a config-invariant macro like this one is not the case that
+# restriction describes, and cppcheck must expand it just like real Visual
+# Studio does, not treat it the same as a genuinely varying one.
+#
+# This fixture has two configurations (Debug|x64, Release|x64) and one
+# <ClCompile Include="$(ExternalLibRoot)\mathplot.cpp" />, where
+# ExternalLibRoot is set once, unconditionally, to the same value regardless
+# of configuration. main.cpp's deliberate division by zero proves the file
+# was actually found and checked (not silently skipped as unresolved) in
+# every configuration.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_item_macro_path_invariant():
+    args = [
+        '--project=vcxproj_item_macro_path_invariant/vcxproj_item_macro_path_invariant.vcxproj',
+        '--no-cppcheck-build-dir',
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    normalized_stdout = stdout.replace('\\', '/')
+    filename = 'vcxproj_item_macro_path_invariant/ExternalLibRoot/mathplot.cpp'
+
+    # Both configurations must resolve $(ExternalLibRoot)\mathplot.cpp to the
+    # same real file and actually check it -- not treat the macro as
+    # unsupported and end up with no valid source files.
+    assert ('Checking %s Debug|x64...' % filename) in normalized_stdout, stdout
+    assert ('Checking %s Release|x64...' % filename) in normalized_stdout, stdout
+
+    # Same underlying file checked under both configurations -- cppcheck
+    # dedups the identical diagnostic, so it's reported exactly once.
+    normalized_stderr = stderr.replace('\\', '/')
+    assert normalized_stderr.count('%s:5:15: error: Division by zero.' % filename) == 1, stderr
diff --git a/test/cli/vcxproj_item_macro_path_missing_config/DebugDir/foo.cpp b/test/cli/vcxproj_item_macro_path_missing_config/DebugDir/foo.cpp
new file mode 100644
index 00000000000..0e5ed632320
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_missing_config/DebugDir/foo.cpp
@@ -0,0 +1,2 @@
+#error DebugDir/foo.cpp must never be checked -- $(MyRoot) is unset in Release|x64, so it genuinely varies by configuration and must not be expanded
+int main() { return 0; }
diff --git a/test/cli/vcxproj_item_macro_path_missing_config/vcxproj_item_macro_path_missing_config.vcxproj b/test/cli/vcxproj_item_macro_path_missing_config/vcxproj_item_macro_path_missing_config.vcxproj
new file mode 100644
index 00000000000..628207b23b5
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_missing_config/vcxproj_item_macro_path_missing_config.vcxproj
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{cccccccc-cccc-cccc-cccc-cccccccccccc}</ProjectGuid>
+    <RootNamespace>itemmacropathmissingconfigtest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- MyRoot is set ONLY for Debug|x64 -- Release|x64 has no PropertyGroup
+       for it at all (not even an empty one). A per-configuration analysis
+       that only records the values a property actually has in each
+       configuration it appears in would see exactly one recorded value
+       ("DebugDir", from Debug) and wrongly conclude MyRoot is
+       config-invariant. But $(MyRoot) genuinely resolves differently by
+       configuration -- to "DebugDir" under Debug, and to "" (no
+       PropertyGroup, no OS environment variable of that name) under
+       Release, exactly like real MSBuild property evaluation -- so this is
+       the same "Visual Studio can't reliably resolve this in an item path"
+       case vcxproj_item_macro_path_test.py covers with two DIFFERING
+       values, just with one of them being "unset" rather than a second
+       explicit value. See vcxproj_item_macro_path_missing_config_test.py. -->
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <MyRoot>DebugDir</MyRoot>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClCompile Include="$(MyRoot)\foo.cpp" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_item_macro_path_missing_config_test.py b/test/cli/vcxproj_item_macro_path_missing_config_test.py
new file mode 100644
index 00000000000..2100e0dc02f
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_missing_config_test.py
@@ -0,0 +1,55 @@
+
+# python -m pytest vcxproj_item_macro_path_missing_config_test.py
+#
+# Regression coverage for mConfigInvariantProperties's priming pass only
+# recording a property's value in configurations where it is actually SET
+# (lib/importproject.cpp). A property a PropertyGroup sets in only some of a
+# project's configurations -- with no PropertyGroup for it at all in the
+# others -- still genuinely varies by configuration: real MSBuild resolves
+# $(MyRoot) to the PropertyGroup's value under the configuration that sets
+# it, and to "" under every configuration that doesn't (no PropertyGroup, no
+# matching OS environment variable -- see
+# vcxproj_item_macro_path_env_test.py for the case where one does exist).
+# Naively collecting only the values each configuration's own property map
+# happens to contain misses this: a property set in exactly one
+# configuration has exactly one recorded value there and looks spuriously
+# invariant, when the real, config-varying picture is "one real value in one
+# configuration, empty in the rest" -- two distinct values, not one.
+#
+# This fixture's only <ClCompile> item is Include="$(MyRoot)\foo.cpp", where
+# MyRoot is set only by Debug|x64's PropertyGroup; Release|x64 has none.
+# DebugDir/foo.cpp's #error independently proves the item was never expanded
+# and checked under Debug -- only that it consistently stays literal (and
+# reported missing) in both configurations, exactly like
+# vcxproj_item_macro_path_test.py's same-two-explicit-values case.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_item_macro_path_missing_config():
+    args = [
+        '--project=vcxproj_item_macro_path_missing_config/vcxproj_item_macro_path_missing_config.vcxproj',
+        '--no-cppcheck-build-dir',
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    normalized_stdout = stdout.replace('\\', '/')
+    normalized_stderr = stderr.replace('\\', '/')
+    literal_path = 'vcxproj_item_macro_path_missing_config/$(MyRoot)/foo.cpp'
+
+    # $(MyRoot) is unset in Release|x64 -- it genuinely varies by
+    # configuration -- so it must NOT be expanded in EITHER configuration,
+    # not just the one where it happens to be unset.
+    assert ('Checking %s Debug|x64...' % literal_path) in normalized_stdout, stdout
+    assert ('Checking %s Release|x64...' % literal_path) in normalized_stdout, stdout
+    assert normalized_stderr.count('%s:0:0: error: File is missing: %s [missingFile]' % (literal_path, literal_path)) == 1, stderr
+
+    # DebugDir/foo.cpp must never be reached -- if it were, its #error would
+    # surface here instead, meaning MyRoot's being unset in Release wrongly
+    # let Debug's value be treated as config-invariant.
+    assert 'DebugDir/foo.cpp' not in normalized_stdout, stdout
diff --git a/test/cli/vcxproj_item_macro_path_test.py b/test/cli/vcxproj_item_macro_path_test.py
new file mode 100644
index 00000000000..1cb35164492
--- /dev/null
+++ b/test/cli/vcxproj_item_macro_path_test.py
@@ -0,0 +1,69 @@
+
+# python -m pytest vcxproj_item_macro_path_test.py
+#
+# Regression coverage for macro ($(...)) expansion in a ClCompile project
+# item's Include/Update/Remove path (as opposed to expansion elsewhere, e.g.
+# in metadata values or Condition attributes, which is unaffected).
+#
+# Microsoft documents that the Visual Studio C++ project system does not
+# reliably resolve a macro in a project item path if that macro's value could
+# differ by configuration -- "The IDE doesn't expect project item paths to be
+# different for different project configurations" -- see
+# https://learn.microsoft.com/en-us/cpp/build/reference/vcxproj-file-structure
+# That is specifically about macros whose value VARIES by configuration: the
+# fixed set of MSBuild "this file"/"this project" location properties
+# (MSBuildThisFileDirectory and friends) are always exempt, since they can't
+# vary by construction -- see test/cli/shared-items-project, covered
+# separately by test_shared_items_project() in more-projects_test.py -- and so
+# is any other property THIS project happens to resolve to the same value in
+# every one of its configurations, e.g. one a property sheet sets once,
+# unconditionally (see vcxproj_item_macro_path_invariant_test.py).
+#
+# This fixture's only <ClCompile> item is Include="$(SomeDir)\foo.cpp", where
+# SomeDir is an ordinary user-defined property that genuinely differs between
+# the project's two configurations (SomeDir for Debug|x64, SomeOtherDir for
+# Release|x64) -- exactly the case Visual Studio can't reliably resolve, since
+# a single Solution Explorer file list can't show two different files
+# depending on which configuration happens to be active. Expanding $(SomeDir)
+# here would resolve to a real file that genuinely exists on disk in either
+# configuration -- but real Visual Studio does not expand it, so cppcheck
+# must not either.
+#
+# Critically, "must not expand it" does not mean the item silently vanishes:
+# a user whose real project has a file like this would have no way to know
+# it went unchecked. So the item is still kept, under its literal,
+# unexpanded path ("vcxproj_item_macro_path/$(SomeDir)/foo.cpp") -- which
+# can never exist on disk -- and cppcheck reports it exactly like any other
+# missing source file, a normal, visible "File is missing: ..." error that
+# also names the exact unresolved macro path, not just an addDebug() trace
+# nobody but a --debug run would ever see.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_item_macro_path():
+    args = [
+        '--project=vcxproj_item_macro_path/vcxproj_item_macro_path.vcxproj',
+        '--no-cppcheck-build-dir',
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    normalized_stdout = stdout.replace('\\', '/')
+    normalized_stderr = stderr.replace('\\', '/')
+    literal_path = 'vcxproj_item_macro_path/$(SomeDir)/foo.cpp'
+
+    # $(SomeDir) must NOT be expanded -- Visual Studio can't reliably resolve
+    # it either, since it genuinely differs between configurations -- but the
+    # item must still be checked (and fail to be found) under its literal,
+    # unexpanded path, in both configurations, rather than disappearing.
+    assert ('Checking %s Debug|x64...' % literal_path) in normalized_stdout, stdout
+    assert ('Checking %s Release|x64...' % literal_path) in normalized_stdout, stdout
+
+    # Same literal (nonexistent) path in both configurations -- cppcheck
+    # dedups the identical diagnostic, so it's reported exactly once.
+    assert normalized_stderr.count('%s:0:0: error: File is missing: %s [missingFile]' % (literal_path, literal_path)) == 1, stderr
diff --git a/test/cli/vcxproj_metadata_self_reference_case/foo.cpp b/test/cli/vcxproj_metadata_self_reference_case/foo.cpp
new file mode 100644
index 00000000000..449a9a7862f
--- /dev/null
+++ b/test/cli/vcxproj_metadata_self_reference_case/foo.cpp
@@ -0,0 +1,21 @@
+// Reached (division-by-zero branch) only if BOTH BASE_DEFINE and
+// EXTRA_DEFINE ended up defined -- which requires addMetadata()'s
+// case-mismatched "$(preprocessordefinitions)" self-reference (see the
+// second ItemDefinitionGroup in the .vcxproj) to have correctly resolved to
+// "BASE_DEFINE", accumulated from the first ItemDefinitionGroup. Before the
+// fix, that self-reference was left as literal, unresolved macro text
+// instead -- so BASE_DEFINE was never actually defined, and this file would
+// take the "not defined" branch below instead, hiding the division by zero.
+// See vcxproj_metadata_self_reference_case_test.py.
+#if defined(BASE_DEFINE) && defined(EXTRA_DEFINE)
+int main()
+{
+    int x = 3 / 0; // ERROR
+    return x;
+}
+#else
+int main()
+{
+    return 0;
+}
+#endif
diff --git a/test/cli/vcxproj_metadata_self_reference_case/vcxproj_metadata_self_reference_case.vcxproj b/test/cli/vcxproj_metadata_self_reference_case/vcxproj_metadata_self_reference_case.vcxproj
new file mode 100644
index 00000000000..4dc9d515f78
--- /dev/null
+++ b/test/cli/vcxproj_metadata_self_reference_case/vcxproj_metadata_self_reference_case.vcxproj
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{cccccccc-dddd-eeee-ffff-000011112222}</ProjectGuid>
+    <RootNamespace>metadataselfreferencecasetest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <!-- Regression coverage for addMetadata()'s "$(eName) self-reference"
+       accumulation idiom (lib/importproject.cpp) using plain, case-sensitive
+       findAndReplace() instead of findAndReplaceCaseInsensitive() -- the same
+       function already used everywhere else in this file for property/metadata
+       name comparisons, and MetadataMap itself is already case-insensitive
+       (cppcheck::stricmp). Item metadata names are case-insensitive in real
+       MSBuild, so a self-reference spelled with different casing than its own
+       element's tag name -- $(preprocessordefinitions) inside a
+       <PreprocessorDefinitions> element -- must still resolve to the value
+       accumulated by the preceding ItemDefinitionGroup ("BASE_DEFINE"), not be
+       left as literal, unresolved macro text. See
+       vcxproj_metadata_self_reference_case_test.py. -->
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>BASE_DEFINE</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>$(preprocessordefinitions);EXTRA_DEFINE</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="foo.cpp" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_metadata_self_reference_case_test.py b/test/cli/vcxproj_metadata_self_reference_case_test.py
new file mode 100644
index 00000000000..5881bb052b6
--- /dev/null
+++ b/test/cli/vcxproj_metadata_self_reference_case_test.py
@@ -0,0 +1,42 @@
+
+# python -m pytest vcxproj_metadata_self_reference_case_test.py
+#
+# Regression coverage for addMetadata()'s "$(eName) self-reference"
+# accumulation idiom (lib/importproject.cpp) using plain, case-sensitive
+# findAndReplace() instead of findAndReplaceCaseInsensitive() -- the same
+# function already used everywhere else in this file for property/metadata
+# name comparisons, and MetadataMap itself is already case-insensitive
+# (cppcheck::stricmp). Real MSBuild item metadata names are case-insensitive,
+# so a self-reference like $(preprocessordefinitions) inside a
+# <PreprocessorDefinitions> element must resolve regardless of casing -- see
+# vcxproj_metadata_self_reference_case/vcxproj_metadata_self_reference_case.vcxproj,
+# which accumulates PreprocessorDefinitions across two ItemDefinitionGroup
+# blocks, the second referencing the first back via a differently-cased
+# $(preprocessordefinitions).
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_metadata_self_reference_case():
+    args = [
+        '--project=vcxproj_metadata_self_reference_case/vcxproj_metadata_self_reference_case.vcxproj',
+        '--no-cppcheck-build-dir',
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    normalized_stdout = stdout.replace('\\', '/')
+    filename = 'vcxproj_metadata_self_reference_case/foo.cpp'
+
+    assert ('Checking %s Debug|x64...' % filename) in normalized_stdout, stdout
+
+    normalized_stderr = stderr.replace('\\', '/')
+
+    # Reached only if BOTH BASE_DEFINE (accumulated from the first
+    # ItemDefinitionGroup, via the case-mismatched self-reference) and
+    # EXTRA_DEFINE ended up defined.
+    assert normalized_stderr.count('%s:13:15: error: Division by zero.' % filename) == 1, stderr
diff --git a/test/cli/vcxproj_property_order/main.cpp b/test/cli/vcxproj_property_order/main.cpp
new file mode 100644
index 00000000000..905869dfa38
--- /dev/null
+++ b/test/cli/vcxproj_property_order/main.cpp
@@ -0,0 +1,4 @@
+int main()
+{
+    return 0;
+}
diff --git a/test/cli/vcxproj_property_order/vcxproj_property_order.vcxproj b/test/cli/vcxproj_property_order/vcxproj_property_order.vcxproj
new file mode 100644
index 00000000000..54d921985c9
--- /dev/null
+++ b/test/cli/vcxproj_property_order/vcxproj_property_order.vcxproj
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{7a1f4e2c-9b3d-4a6e-8c1f-3e5d7a9b2c4f}</ProjectGuid>
+    <RootNamespace>vcxprojpropertyorder</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <!-- ItemDefinitionGroup deliberately appears BEFORE the PropertyGroup below that sets
+       LateDefinedProp. Real MSBuild/Visual Studio fully resolves every property in the
+       project before evaluating any item definitions or items, so LateDefinedProp must
+       still be visible here even though it is assigned later in the document. -->
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>LATE_DEFINE=$(LateDefinedProp);_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+  <!-- Set after the ItemDefinitionGroup/ItemGroup above; must still be visible to them. -->
+  <PropertyGroup>
+    <LateDefinedProp>42</LateDefinedProp>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/test/cli/vcxproj_property_order_test.py b/test/cli/vcxproj_property_order_test.py
new file mode 100644
index 00000000000..818ce4b6a86
--- /dev/null
+++ b/test/cli/vcxproj_property_order_test.py
@@ -0,0 +1,39 @@
+
+# python -m pytest vcxproj_property_order_test.py
+#
+# Regression coverage for MSBuild/Visual Studio property-before-items evaluation
+# order: a project fully resolves every property across the whole file before
+# evaluating any ItemDefinitionGroup or ItemGroup, regardless of where in the
+# document that property happens to be set. This fixture's ItemDefinitionGroup
+# references a property that is only assigned by a PropertyGroup positioned AFTER
+# it (and after the ItemGroup) -- if cppcheck evaluated the project as one
+# document-order pass instead of a real Properties-then-ItemDefs-then-Items
+# sequence, that property would still be unset (and therefore unexpanded) at the
+# point the ItemDefinitionGroup is evaluated.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_property_order():
+    args = [
+        '--project=vcxproj_property_order/vcxproj_property_order.vcxproj',
+        '--no-cppcheck-build-dir',
+        '--dump'
+    ]
+    ret, stdout, _ = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    dump_file = os.path.join(__script_dir, 'vcxproj_property_order', 'main.cpp.dump')
+    assert os.path.exists(dump_file), "Dump file not found at %s" % dump_file
+
+    with open(dump_file, 'rt') as f:
+        dump_content = f.read()
+
+    # LateDefinedProp is set by a PropertyGroup below the ItemDefinitionGroup that
+    # uses it; the ItemDefinitionGroup must still see its final value (42), not an
+    # unexpanded '$(LateDefinedProp)' or an empty expansion.
+    assert 'LATE_DEFINE=42' in dump_content, dump_content
diff --git a/test/cli/vcxproj_split_configs/ConfigsDebug.props b/test/cli/vcxproj_split_configs/ConfigsDebug.props
new file mode 100644
index 00000000000..aeebadde55d
--- /dev/null
+++ b/test/cli/vcxproj_split_configs/ConfigsDebug.props
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+</Project>
diff --git a/test/cli/vcxproj_split_configs/ConfigsRelease.props b/test/cli/vcxproj_split_configs/ConfigsRelease.props
new file mode 100644
index 00000000000..94921237e83
--- /dev/null
+++ b/test/cli/vcxproj_split_configs/ConfigsRelease.props
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+</Project>
diff --git a/test/cli/vcxproj_split_configs/main.cpp b/test/cli/vcxproj_split_configs/main.cpp
new file mode 100644
index 00000000000..76e8197013a
--- /dev/null
+++ b/test/cli/vcxproj_split_configs/main.cpp
@@ -0,0 +1 @@
+int main() { return 0; }
diff --git a/test/cli/vcxproj_split_configs/vcxproj_split_configs.vcxproj b/test/cli/vcxproj_split_configs/vcxproj_split_configs.vcxproj
new file mode 100644
index 00000000000..cf87ec77dc8
--- /dev/null
+++ b/test/cli/vcxproj_split_configs/vcxproj_split_configs.vcxproj
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}</ProjectGuid>
+    <RootNamespace>splitconfigtest3</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <!-- ConfigsRelease.props is unconditional and comes FIRST -- discovery (which
+       guesses Configuration=Debug only for property expansion, not for what it
+       finds structurally) picks it up regardless, becoming the first discovered
+       configuration ("Release|x64"). ConfigsDebug.props is gated on
+       Configuration=='Debug', which is TRUE for discovery's own guess -- but if
+       discovery stops scanning as soon as Release|x64 is found, it never reaches
+       this second import at all. Nor does the "accidental rescue" (the real
+       per-configuration pass for whichever config WAS found) help here: that
+       pass runs with Configuration=Release (the config it's actually
+       evaluating), so the Condition below evaluates false during it. -->
+  <Import Project="ConfigsRelease.props" />
+  <ImportGroup Condition="'$(Configuration)'=='Debug'">
+    <Import Project="ConfigsDebug.props" />
+  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="ConfigDebug">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="ConfigRelease">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/test/cli/vcxproj_split_configs_test.py b/test/cli/vcxproj_split_configs_test.py
new file mode 100644
index 00000000000..8196add7edf
--- /dev/null
+++ b/test/cli/vcxproj_split_configs_test.py
@@ -0,0 +1,49 @@
+
+# python -m pytest vcxproj_split_configs_test.py
+#
+# Regression coverage for the vcxproj configuration-discovery pass (used only
+# when a project has no inline <ItemGroup Label="ProjectConfigurations"> and
+# must find its configurations by walking imports): it must not stop scanning
+# as soon as it finds the first configuration. Real MSBuild/Visual Studio has
+# to know the complete configuration set before evaluation with a specific
+# Configuration/Platform pair is even possible, so its own preliminary parse
+# does not stop early either -- configurations can legitimately be split
+# across multiple imports.
+#
+# This fixture is deliberately ordered so a naive "stop at the first
+# configuration found" discovery pass fails it: ConfigsRelease.props is
+# unconditional and comes first, so it is found regardless; ConfigsDebug.props
+# is reachable only through an ImportGroup gated on Configuration=='Debug',
+# positioned AFTER it. A discovery pass that stops once Release|x64 is found
+# never reaches that second import at all -- and simply re-running the real
+# per-configuration evaluation pass for Release|x64 does not rescue it either,
+# since that pass evaluates with Configuration=Release, so the Debug-gated
+# ImportGroup's Condition is false during it too. Only a discovery pass that
+# keeps scanning (using its own guessed Configuration, seeded before the scan
+# starts) reaches and evaluates the second import and finds Debug|x64 as well.
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_vcxproj_split_configs():
+    args = [
+        '--project=vcxproj_split_configs/vcxproj_split_configs.vcxproj',
+        '--no-cppcheck-build-dir',
+        '--dump'
+    ]
+    ret, stdout, _ = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+
+    # Windows prints native '\' path separators ("Checking foo\main.cpp ...");
+    # normalize before matching so this passes on every platform (same idiom
+    # used by test_log() in clang-import_test.py).
+    normalized_stdout = stdout.replace('\\', '/')
+
+    # Both configurations must be discovered and checked, not just whichever
+    # one the (possibly early-stopping) discovery pass happens to find first.
+    assert 'Checking vcxproj_split_configs/main.cpp Release|x64' in normalized_stdout, stdout
+    assert 'Checking vcxproj_split_configs/main.cpp Debug|x64' in normalized_stdout, stdout
diff --git a/test/cli/vcxproj_unicode_test.py b/test/cli/vcxproj_unicode_test.py
new file mode 100644
index 00000000000..b59a4c4ad4e
--- /dev/null
+++ b/test/cli/vcxproj_unicode_test.py
@@ -0,0 +1,63 @@
+
+# python -m pytest vcxproj_unicode_test.py
+
+from testutils import cppcheck
+
+import os
+import shutil
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+__proj_dir = os.path.join(__script_dir, 'vcxproj-unicode')
+
+def _get_dump_for_configuration(tmp_path, configuration):
+    proj_dir = tmp_path / 'vcxproj-unicode'
+    shutil.copytree(__proj_dir, proj_dir)
+
+    args = [
+        '--template=cppcheck1',
+        '--project=vcxproj-unicode/vcxproj_unicode.vcxproj',
+        f'--project-configuration={configuration}',
+        '--no-cppcheck-build-dir',
+        '--dump'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=str(tmp_path))
+    assert ret == 0, stdout
+    assert stderr == '', stderr
+
+    dump_path = proj_dir / 'main.cpp.dump'
+    assert dump_path.exists(), f"Dump file not found at {dump_path}"
+
+    with open(dump_path, 'rt') as f:
+        return f.read()
+
+def test_vcxproj_unicode_debug(tmp_path):
+    dump_content = _get_dump_for_configuration(tmp_path, 'Debug|Win32')
+
+    # v143 toolset -> _MSC_VER=1930, _MSC_FULL_VER=193000000
+    assert '_WIN32=1' in dump_content
+    assert '_M_IX86=600' in dump_content
+    assert '_MSC_VER=1930' in dump_content
+    assert '_MSC_FULL_VER=193000000' in dump_content
+    assert '_MSVC_LANG=201402L' in dump_content  # default C++14, no LanguageStandard set
+    assert 'UNICODE=1' in dump_content
+    assert '_UNICODE=1' in dump_content
+    assert '_MBCS' not in dump_content
+
+def test_vcxproj_unicode_release(tmp_path):
+    dump_content = _get_dump_for_configuration(tmp_path, 'Release|Win32')
+
+    # v143 toolset, CharacterSet=NotSet, UseOfMfc=Static
+    assert '_WIN32=1' in dump_content
+    assert '_M_IX86=600' in dump_content
+    assert '_MSC_VER=1930' in dump_content
+    assert '_MSC_FULL_VER=193000000' in dump_content
+    assert '_MSVC_LANG=201402L' in dump_content
+    assert 'UNICODE' not in dump_content
+    assert '_MBCS' not in dump_content
+
+def test_vcxproj_multibyte(tmp_path):
+    dump_content = _get_dump_for_configuration(tmp_path, 'MultiByte|Win32')
+
+    # MultiByte projects must define _MBCS and must NOT define UNICODE or _UNICODE (M-1)
+    assert '_MBCS=1' in dump_content
+    assert 'UNICODE' not in dump_content
diff --git a/test/fixture.cpp b/test/fixture.cpp
index 5585ab58b58..a561b4fc28f 100644
--- a/test/fixture.cpp
+++ b/test/fixture.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,12 +18,12 @@
 
 #include "fixture.h"
 
-#include "cppcheck.h"
 #include "errortypes.h"
 #include "helpers.h"
 #include "library.h"
 #include "options.h"
 #include "redirect.h"
+#include "timer.h"
 
 #include <algorithm>
 #include <cstdio>
@@ -89,35 +89,44 @@ TestFixture::TestFixture(const char * const _name)
     : classname(_name)
 {}
 
+TestFixture::~TestFixture() = default;
 
 bool TestFixture::prepareTest(const char testname[])
 {
     mTemplateFormat.clear();
     mTemplateLocation.clear();
-    CppCheck::resetTimerResults();
 
     prepareTestInternal();
 
     // Check if tests should be executed
-    if (testToRun.empty() || testToRun == testname) {
-        // Tests will be executed - prepare them
-        mTestname = testname;
-        ++countTests;
-        if (quiet_tests) {
-            std::putchar('.'); // Use putchar to write through redirection of std::cout/cerr
-            std::fflush(stdout);
-        } else {
-            std::cout << classname << "::" << mTestname << std::endl;
-        }
-        return !dry_run;
+    if (!testsToRun.empty()) {
+        const bool match = testsToRun.count(testname);
+        if ((match && exclude_tests) || (!match && !exclude_tests))
+            return false;
+    }
+
+    // Tests will be executed - prepare them
+    mTestname = testname;
+    ++countTests;
+    std::string fullTestName =  classname + "::" + mTestname;
+    if (quiet_tests) {
+        std::putchar('.'); // Use putchar to write through redirection of std::cout/cerr
+        std::fflush(stdout);
+    } else {
+        std::cout << fullTestName << std::endl;
     }
-    return false;
+    if (timer_results)
+        mTimer.reset(new Timer(fullTestName, timer_results));
+    return !dry_run;
 }
 
 void TestFixture::teardownTest()
 {
     teardownTestInternal();
 
+    if (mTimer)
+        mTimer->stop();
+
     {
         const std::string s = errout_str();
         if (!s.empty())
@@ -348,12 +357,13 @@ void TestFixture::printHelp()
         "    -q                   Do not print the test cases that have run.\n"
         "    -h, --help           Print this help.\n"
         "    -n                   Print no summaries.\n"
-        "    -d                   Do not execute the tests.\n";
+        "    -d                   Do not execute any tests (dry run).\n"
+        "    -x                   Exclude the specified tests.\n";
 }
 
-void TestFixture::run(const std::string &str)
+void TestFixture::run(const std::set<std::string> &tests)
 {
-    testToRun = str;
+    testsToRun = tests;
     try {
         if (quiet_tests) {
             std::cout << '\n' << classname << ':';
@@ -381,7 +391,9 @@ void TestFixture::processOptions(const options& args)
 {
     quiet_tests = args.quiet();
     dry_run = args.dry_run();
+    exclude_tests = args.exclude_tests();
     exename = args.exe();
+    timer_results = args.timer_results();
 }
 
 std::size_t TestFixture::runTests(const options& args)
@@ -389,21 +401,31 @@ std::size_t TestFixture::runTests(const options& args)
     countTests = 0;
     errmsg.str("");
 
+    const auto& which_tests = args.which_tests();
+    const auto exclude_tests = args.exclude_tests();
+
     // TODO: bail out when given class/test is not found?
-    for (std::string classname : args.which_test()) {
-        std::string testname;
-        if (classname.find("::") != std::string::npos) {
-            testname = classname.substr(classname.find("::") + 2);
-            classname.erase(classname.find("::"));
+    for (TestInstance * test : TestRegistry::theInstance().tests())
+    {
+        std::set<std::string> tests;
+        if (!which_tests.empty()) {
+            const auto it = which_tests.find(test->classname);
+            const bool match = it != which_tests.cend();
+            if (match && exclude_tests && it->second.empty()) // only bailout when the whole fixture is excluded
+                continue;
+            if (!match && !exclude_tests)
+                continue;
+            if (match)
+                tests = it->second;
         }
 
-        for (TestInstance * test : TestRegistry::theInstance().tests()) {
-            if (classname.empty() || test->classname == classname) {
-                TestFixture* fixture = test->create();
-                fixture->processOptions(args);
-                fixture->run(testname);
-            }
-        }
+        TestFixture* fixture;
+        const auto f = [&](){
+            fixture = test->create();
+        };
+        Timer::run(test->classname + " - create", args.timer_results(), f);
+        fixture->processOptions(args);
+        fixture->run(tests);
     }
 
     if (args.summary() && !args.dry_run()) {
@@ -487,7 +509,7 @@ TestFixture::SettingsBuilder& TestFixture::SettingsBuilder::library(const char l
     if (REDUNDANT_CHECK && std::find(settings.libraries.cbegin(), settings.libraries.cend(), lib) != settings.libraries.cend())
         throw std::runtime_error("redundant setting: libraries (" + std::string(lib) + ")");
     // TODO: exename is not yet set
-    const Library::ErrorCode lib_error = settings.library.load(fixture.exename.c_str(), lib).errorcode;
+    const Library::ErrorCode lib_error = settings.library.load(fixture().exename.c_str(), lib).errorcode;
     if (lib_error != Library::ErrorCode::OK)
         throw std::runtime_error("loading library '" + std::string(lib) + "' failed - " + std::to_string(static_cast<int>(lib_error)));
     // strip extension
@@ -509,7 +531,7 @@ TestFixture::SettingsBuilder& TestFixture::SettingsBuilder::platform(Platform::T
 
     std::string errstr;
     // TODO: exename is not yet set
-    if (!settings.platform.set(platformStr, errstr, {fixture.exename}))
+    if (!settings.platform.set(platformStr, errstr, {fixture().exename}))
         throw std::runtime_error("platform '" + platformStr + "' not found");
     return *this;
 }
diff --git a/test/fixture.h b/test/fixture.h
index 5983ae66a3a..3d1e96562ba 100644
--- a/test/fixture.h
+++ b/test/fixture.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 #include "config.h"
 #include "errorlogger.h"
 #include "errortypes.h"
+#include "refthunk.h"
 #include "platform.h"
 #include "settings.h"
 #include "standards.h"
@@ -32,8 +33,8 @@
 #include <cstddef>
 #include <cstdint>
 #include <exception>
-#include <list>
 #include <memory>
+#include <set>
 #include <sstream>
 #include <stdexcept>
 #include <string>
@@ -42,6 +43,8 @@
 
 class options;
 class Tokenizer;
+class Timer;
+class TimerResultsIntf;
 
 class TestFixture : public ErrorLogger {
 private:
@@ -56,9 +59,11 @@ class TestFixture : public ErrorLogger {
 
 protected:
     std::string exename;
-    std::string testToRun;
+    std::set<std::string> testsToRun;
     bool quiet_tests{};
     bool dry_run{};
+    bool exclude_tests{};
+    TimerResultsIntf* timer_results{};
     bool mNewTemplate{};
 
     virtual void run() = 0;
@@ -130,21 +135,13 @@ class TestFixture : public ErrorLogger {
 
     void processOptions(const options& args);
 
-    template<typename T>
-    static T& getCheck()
+    static Check& getCheck(Check& check)
     {
-        for (Check *check : Check::instances()) {
-            //cppcheck-suppress useStlAlgorithm
-            if (T* c = dynamic_cast<T*>(check))
-                return *c;
-        }
-        throw std::runtime_error("instance not found");
+        return check;
     }
 
-    template<typename T>
-    static void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+    static void runChecks(Check& check, const Tokenizer &tokenizer, ErrorLogger& errorLogger)
     {
-        Check& check = getCheck<T>();
         check.runChecks(tokenizer, errorLogger);
     }
 
@@ -243,7 +240,7 @@ class TestFixture : public ErrorLogger {
     private:
         SettingsBuilder& libraryxml(const char xmldata[], std::size_t len);
 
-        const TestFixture &fixture;
+        RefThunk<const TestFixture> fixture;
         Settings settings;
 
         static constexpr bool REDUNDANT_CHECK = false;
@@ -284,19 +281,22 @@ class TestFixture : public ErrorLogger {
     std::ostringstream mOutput;
     std::ostringstream mErrout;
 
-    void reportOut(const std::string &outmsg, Color c = Color::Reset) override;
+    std::unique_ptr<Timer> mTimer;
+
+    void reportOut(const std::string &outmsg, Color /*c*/ = Color::Reset) override;
     void reportErr(const ErrorMessage &msg) override;
     void reportMetric(const std::string &metric) override
     {
         (void) metric;
     }
-    void run(const std::string &str);
+    void run(const std::set<std::string> &tests);
 
 public:
     static void printHelp();
     const std::string classname;
 
     explicit TestFixture(const char * _name);
+    ~TestFixture() override;
 
     static std::size_t runTests(const options& args);
 };
@@ -331,8 +331,7 @@ class TestInstance {
 #define ASSERT_EQUALS_ENUM_LOC( EXPECTED, ACTUAL, FILE_, LINE_ ) assertEqualsEnum(FILE_, LINE_, (EXPECTED), (ACTUAL))
 #define ASSERT_EQUALS_ENUM_LOC_MSG( EXPECTED, ACTUAL, MSG, FILE_, LINE_ ) assertEqualsEnum(FILE_, LINE_, (EXPECTED), (ACTUAL), MSG)
 #define TODO_ASSERT_EQUALS_ENUM( WANTED, CURRENT, ACTUAL ) todoAssertEqualsEnum(__FILE__, __LINE__, WANTED, CURRENT, ACTUAL)
-#define ASSERT_THROW_EQUALS( CMD, EXCEPTION, EXPECTED ) do { try { (void)(CMD); assertThrowFail(__FILE__, __LINE__); } catch (const EXCEPTION&e) { assertEquals(__FILE__, __LINE__, EXPECTED, e.errorMessage); } catch (...) { assertThrowFail(__FILE__, __LINE__); } } while (false)
-#define ASSERT_THROW_EQUALS_2( CMD, EXCEPTION, EXPECTED ) do { try { (void)(CMD); assertThrowFail(__FILE__, __LINE__); } catch (const AssertFailedError&) { throw; } catch (const EXCEPTION&e) { assertEquals(__FILE__, __LINE__, EXPECTED, e.what()); } catch (...) { assertThrowFail(__FILE__, __LINE__); } } while (false)
+#define ASSERT_THROW_EQUALS( CMD, EXCEPTION, EXPECTED ) do { try { (void)(CMD); assertThrowFail(__FILE__, __LINE__); } catch (const AssertFailedError&) { throw; } catch (const EXCEPTION&e) { assertEquals(__FILE__, __LINE__, EXPECTED, e.what()); } catch (...) { assertThrowFail(__FILE__, __LINE__); } } while (false)
 #define ASSERT_THROW_INTERNAL( CMD, TYPE ) do { try { (void)(CMD); assertThrowFail(__FILE__, __LINE__); } catch (const AssertFailedError&) { throw; } catch (const InternalError& e) { assertEqualsEnum(__FILE__, __LINE__, InternalError::TYPE, e.type); } catch (...) { assertThrowFail(__FILE__, __LINE__); } } while (false)
 #define ASSERT_THROW_INTERNAL_EQUALS( CMD, TYPE, EXPECTED ) do { try { (void)(CMD); assertThrowFail(__FILE__, __LINE__); } catch (const AssertFailedError&) { throw; } catch (const InternalError& e) { assertEqualsEnum(__FILE__, __LINE__, InternalError::TYPE, e.type); assertEquals(__FILE__, __LINE__, EXPECTED, e.errorMessage); } catch (...) { assertThrowFail(__FILE__, __LINE__); } } while (false)
 #define ASSERT_NO_THROW( CMD ) do { try { (void)(CMD); } catch (const AssertFailedError&) { throw; } catch (...) { assertNoThrowFail(__FILE__, __LINE__, true); } } while (false)
diff --git a/test/helpers.cpp b/test/helpers.cpp
index 25b4564ed38..06ad0c4c298 100644
--- a/test/helpers.cpp
+++ b/test/helpers.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -113,18 +113,23 @@ ScopedFile::~ScopedFile() {
 
 void SimpleTokenizer2::preprocess(const char* code, std::size_t size, std::vector<std::string> &files, const std::string& file0, Tokenizer& tokenizer, ErrorLogger& errorlogger)
 {
+    const Standards &standards = tokenizer.getSettings().standards;
+    const Standards::Language language = tokenizer.isCPP() ? Standards::CPP : Standards::C;
     simplecpp::OutputList outputList;
-    simplecpp::TokenList tokens1({code, size}, files, file0, &outputList);
+    simplecpp::DUI dui;
+    dui.std = standards.getStdForLanguage(language);
+    simplecpp::TokenList tokens1({code, size}, files, file0, dui, &outputList);
 
     Preprocessor preprocessor(tokens1, tokenizer.getSettings(), errorlogger, Path::identify(tokens1.getFiles()[0], false));
-    (void)preprocessor.loadFiles(files); // TODO: check result
+    (void)preprocessor.loadAllIncludes(files); // TODO: check result
     simplecpp::TokenList tokens2 = preprocessor.preprocess("", files, outputList);
     (void)preprocessor.reportOutput(outputList, true);
 
     // Tokenizer..
     tokenizer.list.createTokens(std::move(tokens2));
 
-    std::list<Directive> directives = preprocessor.createDirectives();
+    std::list<Directive> directives;
+    preprocessor.createDirectives(directives);
     tokenizer.setDirectives(std::move(directives));
 }
 
diff --git a/test/helpers.h b/test/helpers.h
index 5a0bd106812..cd4cde7af1c 100644
--- a/test/helpers.h
+++ b/test/helpers.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@
 #include "tokenlist.h"
 
 #include <cstddef>
+#include <cstdio>
 #include <stdexcept>
 #include <sstream>
 #include <string>
@@ -135,7 +136,7 @@ class SimpleTokenList
     }
 
 private:
-    const Settings settings;
+    Settings settings;
     TokenList list;
 };
 
diff --git a/test/main.cpp b/test/main.cpp
index 571b126922d..e0495583494 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,14 +22,10 @@
 #include "fixture.h"
 
 #include <cstdlib>
+#include <iostream>
 
 int main(int argc, char *argv[])
 {
-    // MS Visual C++ memory leak debug tracing
-#if defined(_MSC_VER) && defined(_DEBUG)
-    _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF);
-#endif
-
     Preprocessor::macroChar = '$';     // While macroChar is char(1) per default outside test suite, we require it to be a human-readable character here.
     gDisableColors = true;
 
@@ -39,6 +35,13 @@ int main(int argc, char *argv[])
         TestFixture::printHelp();
         return EXIT_SUCCESS;
     }
+    if (!args.errors().empty()) {
+        for (const auto& error : args.errors())
+        {
+            std::cout << "error: " << error << '\n';
+        }
+        return EXIT_FAILURE;
+    }
     const std::size_t failedTestsCount = TestFixture::runTests(args);
     return (failedTestsCount == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
diff --git a/test/options.cpp b/test/options.cpp
index e8b3be139ae..757b6cdff86 100644
--- a/test/options.cpp
+++ b/test/options.cpp
@@ -1,5 +1,5 @@
 // Cppcheck - A tool for static C/C++ code analysis
-// Copyright (C) 2007-2025 Cppcheck team.
+// Copyright (C) 2007-2026 Cppcheck team.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -16,24 +16,50 @@
 
 #include "options.h"
 
+#include "timer.h"
+
 options::options(int argc, const char* const argv[])
-    : mWhichTests(argv + 1, argv + argc)
-    ,mQuiet(mWhichTests.count("-q") != 0)
-    ,mHelp(mWhichTests.count("-h") != 0 || mWhichTests.count("--help"))
-    ,mSummary(mWhichTests.count("-n") == 0)
-    ,mDryRun(mWhichTests.count("-d") != 0)
-    ,mExe(argv[0])
+    : mExe(argv[0])
 {
-    for (auto it = mWhichTests.cbegin(); it != mWhichTests.cend();) {
-        if (!it->empty() && (((*it)[0] == '-') || (it->find("::") != std::string::npos && mWhichTests.count(it->substr(0, it->find("::"))))))
-            it = mWhichTests.erase(it);
-        else
-            ++it;
+    const std::set<std::string> args(argv + 1, argv + argc);
+    for (const auto& arg : args) {
+        if (arg.empty())
+            continue; // empty argument
+        if (arg[0] == '-') {
+            if (arg == "-q")
+                mQuiet = true;
+            else if (arg == "-h" || arg == "--help")
+                mHelp = true;
+            else if (arg == "-n")
+                mSummary = false;
+            else if (arg == "-d")
+                mDryRun = true;
+            else if (arg == "-x")
+                mExcludeTests = true;
+            else if (arg == "-t")
+                mTimerResults.reset(new TimerResults);
+            else
+                mErrors.emplace_back("unknown option '" + arg + "'");
+            continue; // command-line switch
+        }
+        const auto pos = arg.find("::");
+        if (pos == std::string::npos) {
+            mWhichTests[arg] = {}; // run whole fixture
+            continue;
+        }
+        const std::string fixture = arg.substr(0, pos);
+        const auto it = mWhichTests.find(fixture);
+        if (it != mWhichTests.cend() && it->second.empty())
+            continue; // whole fixture is already included
+        const std::string test = arg.substr(pos+2);
+        mWhichTests[fixture].emplace(test); // run individual test
     }
+}
 
-    if (mWhichTests.empty()) {
-        mWhichTests.insert("");
-    }
+options::~options()
+{
+    if (mTimerResults)
+        mTimerResults->showResults(10, false);
 }
 
 bool options::quiet() const
@@ -56,7 +82,7 @@ bool options::dry_run() const
     return mDryRun;
 }
 
-const std::set<std::string>& options::which_test() const
+const std::map<std::string, std::set<std::string>>& options::which_tests() const
 {
     return mWhichTests;
 }
@@ -65,3 +91,18 @@ const std::string& options::exe() const
 {
     return mExe;
 }
+
+bool options::exclude_tests() const
+{
+    return mExcludeTests;
+}
+
+TimerResultsIntf* options::timer_results() const
+{
+    return mTimerResults.get();
+}
+
+const std::vector<std::string>& options::errors() const
+{
+    return mErrors;
+}
diff --git a/test/options.h b/test/options.h
index 18df1dd79b2..0bd83cef78b 100644
--- a/test/options.h
+++ b/test/options.h
@@ -1,5 +1,5 @@
 // Cppcheck - A tool for static C/C++ code analysis
-// Copyright (C) 2007-2024 Cppcheck team.
+// Copyright (C) 2007-2026 Cppcheck team.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -17,8 +17,14 @@
 #ifndef OPTIONS_H
 #define OPTIONS_H
 
+#include <map>
+#include <memory>
 #include <set>
 #include <string>
+#include <vector>
+
+class TimerResultsIntf;
+class TimerResults;
 
 /**
  * @brief Class to parse command-line parameters for ./testrunner .
@@ -29,6 +35,7 @@ class options {
 public:
     /** Call from main() to populate object */
     options(int argc, const char* const argv[]);
+    ~options();
     /** Don't print the name of each method being tested. */
     bool quiet() const;
     /** Print help. */
@@ -37,8 +44,15 @@ class options {
     bool summary() const;
     /** Perform dry run. */
     bool dry_run() const;
-    /** Which test should be run. Empty string means 'all tests' */
-    const std::set<std::string>& which_test() const;
+    /** Exclude provided lists of tests. */
+    bool exclude_tests() const;
+    /** The timer results. */
+    TimerResultsIntf* timer_results() const;
+    /** Which tests should be run. */
+    const std::map<std::string, std::set<std::string>>& which_tests() const;
+
+    /** Errors encountered during option processing. */
+    const std::vector<std::string>& errors() const;
 
     const std::string& exe() const;
 
@@ -47,11 +61,14 @@ class options {
     options& operator =(const options&) = delete;
 
 private:
-    std::set<std::string> mWhichTests;
-    const bool mQuiet;
-    const bool mHelp;
-    const bool mSummary;
-    const bool mDryRun;
+    std::map<std::string, std::set<std::string>> mWhichTests;
+    std::vector<std::string> mErrors;
+    bool mQuiet{};
+    bool mHelp{};
+    bool mSummary{true};
+    bool mDryRun{};
+    bool mExcludeTests{};
+    std::unique_ptr<TimerResults> mTimerResults;
     std::string mExe;
 };
 
diff --git a/test/scripts/extracttests.py b/test/scripts/extracttests.py
index a45c8261d64..776211152d4 100755
--- a/test/scripts/extracttests.py
+++ b/test/scripts/extracttests.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 #
 # Cppcheck - A tool for static C/C++ code analysis
-# Copyright (C) 2007-2021 Cppcheck team.
+# Copyright (C) 2007-2025 Cppcheck team.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/test/seh/test-sehwrapper.cpp b/test/seh/test-sehwrapper.cpp
index a92753b8423..2c17d62334a 100644
--- a/test/seh/test-sehwrapper.cpp
+++ b/test/seh/test-sehwrapper.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test/signal/test-signalhandler.cpp b/test/signal/test-signalhandler.cpp
index 153ec95f245..faf815b6577 100644
--- a/test/signal/test-signalhandler.cpp
+++ b/test/signal/test-signalhandler.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test/test64bit.cpp b/test/test64bit.cpp
index 6f9a5fbda2f..1507f15ec72 100644
--- a/test/test64bit.cpp
+++ b/test/test64bit.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,8 +49,7 @@ class Test64BitPortability : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check char variable usage..
-        Check64BitPortability check64BitPortability(&tokenizer, &settings, this);
+        Check64BitPortabilityImpl check64BitPortability(&tokenizer, settings, *this);
         check64BitPortability.pointerassignment();
     }
 
@@ -59,7 +58,7 @@ class Test64BitPortability : public TestFixture {
         check("using CharArray = char[16];\n"
               "void f() {\n"
               "    CharArray foo = \"\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct T { std::vector<int>*a[2][2]; };\n" // #11560
@@ -80,7 +79,7 @@ class Test64BitPortability : public TestFixture {
         check("void foo()\n"
               "{\n"
               "    a = p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -89,65 +88,65 @@ class Test64BitPortability : public TestFixture {
               "{\n"
               "    int a = p;\n"
               "    return a + 4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (portability) Assigning a pointer to an integer is not portable. [AssignmentAddressToInteger]\n", errout_str());
 
         check("int foo(int p[])\n"
               "{\n"
               "    int a = p;\n"
               "    return a + 4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (portability) Assigning a pointer to an integer is not portable. [AssignmentAddressToInteger]\n", errout_str());
 
         check("int foo(int p[])\n"
               "{\n"
               "    int *a = p;\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (portability) Returning an address value in a function with integer return type is not portable. [CastAddressToIntegerAtReturn]\n", errout_str());
 
         check("void foo(int x)\n"
               "{\n"
               "    int *p = x;\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (portability) Assigning an integer to a pointer is not portable. [AssignmentIntegerToAddress]\n", errout_str());
 
         check("int f(const char *p) {\n" // #4659
               "    return 6 + p[2] * 256;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(int *p) {\n" // #6096
               "    bool a = p;\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::array<int,2> f();\n"
               "void g() {\n"
               "    std::array<int, 2> a = f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::array<int,2> f(int x);\n"
               "void g(int i) {\n"
               "    std::array<int, 2> a = f(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("typedef std::array<int, 2> Array;\n"
               "Array f(int x);\n"
               "void g(int i) {\n"
               "    Array a = f(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("typedef std::array<int, 2> Array;\n"
               "Array f();\n"
               "void g(int i) {\n"
               "    Array a = f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #9951
@@ -175,7 +174,7 @@ class Test64BitPortability : public TestFixture {
         check("struct Foo { int *p; };\n"
               "void f(struct Foo *foo) {\n"
               "    int i = foo->p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (portability) Assigning a pointer to an integer is not portable. [AssignmentAddressToInteger]\n", errout_str());
 
         check("struct S {\n" // #10145
@@ -193,7 +192,7 @@ class Test64BitPortability : public TestFixture {
         // Ticket #2892
         check("void foo(int *p) {\n"
               "    int a = (p != NULL);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -202,74 +201,74 @@ class Test64BitPortability : public TestFixture {
         check("void foo(int *p) {\n"
               "    int x = 10;\n"
               "    int *a = p + x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p) {\n"
               "    int x = 10;\n"
               "    int *a = x + p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p) {\n"
               "    int x = 10;\n"
               "    int *a = x * x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (portability) Assigning an integer to a pointer is not portable. [AssignmentIntegerToAddress]\n", errout_str());
 
         check("void foo(int *start, int *end) {\n"
               "    int len;\n"
               "    int len = end + 10 - start;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void returnIssues() {
         check("void* foo(int i) {\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (portability) Returning an integer in a function with pointer return type is not portable. [CastIntegerToAddressAtReturn]\n", errout_str());
 
         check("void* foo(int* i) {\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void* foo() {\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(int i) {\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo {};\n"
               "\n"
               "int* dostuff(Foo foo) {\n"
               "  return foo;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(char* c) {\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (portability) Returning an address value in a function with integer return type is not portable. [CastAddressToIntegerAtReturn]\n", errout_str());
 
         check("int foo(char* c) {\n"
               "    return 1+c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (portability) Returning an address value in a function with integer return type is not portable. [CastAddressToIntegerAtReturn]\n", errout_str());
 
         check("std::string foo(char* c) {\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(char *a, char *b) {\n" // #4486
               "    return a + 1 - b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct s {\n" // 4642
@@ -277,13 +276,13 @@ class Test64BitPortability : public TestFixture {
               "};\n"
               "int func(struct s *p) {\n"
               " return 1 + p->i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static void __iomem *f(unsigned int port_no) {\n"
               "  void __iomem *mmio = hpriv->mmio;\n"
               "  return mmio + (port_no * 0x80);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7247: don't check return statements in nested functions..
@@ -291,7 +290,7 @@ class Test64BitPortability : public TestFixture {
               "  struct {\n"
               "    const char * name() { return \"abc\"; }\n"
               "  } table;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7451: Lambdas
@@ -299,7 +298,7 @@ class Test64BitPortability : public TestFixture {
               "  auto it = std::find_if(outputs.begin(), outputs.end(),\n"
               "     [&](int ele) { return \"test\" == text; });\n"
               "  return nullptr;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #12159
diff --git a/test/testanalyzerinformation.cpp b/test/testanalyzerinformation.cpp
index 35e86e0dbb8..0356630686c 100644
--- a/test/testanalyzerinformation.cpp
+++ b/test/testanalyzerinformation.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,12 +33,13 @@ class TestAnalyzerInformation : public TestFixture {
     TestAnalyzerInformation() : TestFixture("TestAnalyzerInformation") {}
 
 private:
-    class AnalyzerInformationTest : public AnalyzerInformation
+    class AnalyzerInformationTest final : public AnalyzerInformation
     {
         friend class TestAnalyzerInformation;
     };
 
     void run() override {
+        TEST_CASE(getAnalyzerInfoFileFromFilesTxt);
         TEST_CASE(getAnalyzerInfoFile);
         TEST_CASE(duplicateFile);
         TEST_CASE(filesTextDuplicateFile);
@@ -46,12 +47,50 @@ class TestAnalyzerInformation : public TestFixture {
         TEST_CASE(skipAnalysis);
     }
 
-    void getAnalyzerInfoFile() const {
+    void getAnalyzerInfoFileFromFilesTxt() const {
         constexpr char filesTxt[] = "file1.a4:::file1.c\n";
-        std::istringstream f1(filesTxt);
-        ASSERT_EQUALS("file1.a4", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f1, "file1.c", "", 0));
-        std::istringstream f2(filesTxt);
-        ASSERT_EQUALS("file1.a4", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f2, "./file1.c", "", 0));
+        std::istringstream f(filesTxt);
+        ASSERT_EQUALS("file1.a4", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f, "file1.c", "", 0));
+        f.str(filesTxt);
+        ASSERT_EQUALS("file1.a4", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f, "./file1.c", "", 0));
+
+        // only an exact match is used - "executor.cpp" is a suffix of "processexecutor.cpp"
+        // so both used to resolve to the same analyzer info file
+        {
+            constexpr char suffixTxt[] = "executor.a1:::executor.cpp\n"
+                                         "processexecutor.a2:::processexecutor.cpp\n";
+            std::istringstream f1(suffixTxt);
+            ASSERT_EQUALS("executor.a1", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f1, "executor.cpp", "", 0));
+            std::istringstream f2(suffixTxt);
+            ASSERT_EQUALS("processexecutor.a2", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f2, "processexecutor.cpp", "", 0));
+        }
+
+        // the same, with the exact match on the first line
+        {
+            constexpr char suffixTxt[] = "processexecutor.a1:::processexecutor.cpp\n"
+                                         "executor.a2:::executor.cpp\n";
+            std::istringstream f1(suffixTxt);
+            ASSERT_EQUALS("processexecutor.a1", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f1, "processexecutor.cpp", "", 0));
+            std::istringstream f2(suffixTxt);
+            ASSERT_EQUALS("executor.a2", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f2, "executor.cpp", "", 0));
+        }
+
+        // a path that only ends with the path in files.txt is not a match
+        {
+            constexpr char relTxt[] = "a.a1:::src/a.c\n";
+            std::istringstream f1(relTxt);
+            ASSERT_EQUALS("", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f1, "/home/proj/src/a.c", "", 0));
+        }
+
+        // no match at all
+        {
+            constexpr char noneTxt[] = "a.a1:::a.c\n";
+            std::istringstream f1(noneTxt);
+            ASSERT_EQUALS("", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f1, "b.c", "", 0));
+        }
+    }
+
+    void getAnalyzerInfoFile() const {
         ASSERT_EQUALS("builddir/file1.c.analyzerinfo", AnalyzerInformation::getAnalyzerInfoFile("builddir", "file1.c", "", 0));
         ASSERT_EQUALS("builddir/file1.c.analyzerinfo", AnalyzerInformation::getAnalyzerInfoFile("builddir", "some/path/file1.c", "", 0));
     }
@@ -59,14 +98,14 @@ class TestAnalyzerInformation : public TestFixture {
     void filesTextDuplicateFile() const {
         std::list<FileSettings> fileSettings;
         fileSettings.emplace_back("a.c", Standards::Language::C, 10);
-        fileSettings.back().fileIndex = 0;
+        fileSettings.back().file.setFsFileId(0);
         fileSettings.emplace_back("a.c", Standards::Language::C, 10);
-        fileSettings.back().fileIndex = 1;
+        fileSettings.back().file.setFsFileId(1);
 
         const char expected[] = "a.a1:::a.c\n"
                                 "a.a2::1:a.c\n";
 
-        ASSERT_EQUALS(expected, AnalyzerInformationTest::getFilesTxt({}, "", fileSettings));
+        ASSERT_EQUALS(expected, AnalyzerInformationTest::getFilesTxt({}, fileSettings));
     }
 
     void duplicateFile() const {
@@ -90,19 +129,19 @@ class TestAnalyzerInformation : public TestFixture {
         ASSERT_EQUALS(true, info.parse("a:b::d"));
         ASSERT_EQUALS("a", info.afile);
         ASSERT_EQUALS("b", info.cfg);
-        ASSERT_EQUALS(0, info.fileIndex);
+        ASSERT_EQUALS(0, info.fsFileId);
         ASSERT_EQUALS("d", info.sourceFile);
 
         ASSERT_EQUALS(true, info.parse("e:f:12:g"));
         ASSERT_EQUALS("e", info.afile);
         ASSERT_EQUALS("f", info.cfg);
-        ASSERT_EQUALS(12, info.fileIndex);
+        ASSERT_EQUALS(12, info.fsFileId);
         ASSERT_EQUALS("g", info.sourceFile);
 
         ASSERT_EQUALS(true, info.parse("odr1.a1:::C:/dm/cppcheck-fix-13333/test/cli/whole-program/odr1.cpp"));
         ASSERT_EQUALS("odr1.a1", info.afile);
         ASSERT_EQUALS("", info.cfg);
-        ASSERT_EQUALS(0, info.fileIndex);
+        ASSERT_EQUALS(0, info.fsFileId);
         ASSERT_EQUALS("C:/dm/cppcheck-fix-13333/test/cli/whole-program/odr1.cpp", info.sourceFile);
     }
 
@@ -114,7 +153,8 @@ class TestAnalyzerInformation : public TestFixture {
 
             const tinyxml2::XMLError xmlError = doc.Parse(
                 "<?xml version=\"1.0\"?>"
-                "<analyzerinfo hash=\"100\">"
+                "<analyzerinfo>"
+                "<hash>100</hash>"
                 "<error id=\"premium-invalidLicense\" severity=\"error\" msg=\"Invalid license: No license file was found, contact sales@cppchecksolutions.com\" verbose=\"Invalid license: No license file was found, contact sales@cppchecksolutions.com\" file0=\"test.c\">"
                 "<location file=\"Cppcheck Premium\" line=\"0\" column=\"0\"/>"
                 "</error>"
@@ -122,7 +162,7 @@ class TestAnalyzerInformation : public TestFixture {
                 );
             ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
 
-            ASSERT_EQUALS(false, AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS("'premium-invalidLicense' encountered", AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
             ASSERT_EQUALS(0, errorList.size());
         }
 
@@ -133,7 +173,8 @@ class TestAnalyzerInformation : public TestFixture {
 
             const tinyxml2::XMLError xmlError = doc.Parse(
                 "<?xml version=\"1.0\"?>"
-                "<analyzerinfo hash=\"100\">"
+                "<analyzerinfo>"
+                "<hash>100</hash>"
                 "<error id=\"premium-internalError\" severity=\"error\" msg=\"Something went wrong\" verbose=\"Something went wrong\" file0=\"test.c\">"
                 "<location file=\"Cppcheck\" line=\"0\" column=\"0\"/>"
                 "</error>"
@@ -141,7 +182,7 @@ class TestAnalyzerInformation : public TestFixture {
                 );
             ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
 
-            ASSERT_EQUALS(false, AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS("'premium-internalError' encountered", AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
             ASSERT_EQUALS(0, errorList.size());
         }
 
@@ -152,7 +193,8 @@ class TestAnalyzerInformation : public TestFixture {
 
             const tinyxml2::XMLError xmlError = doc.Parse(
                 "<?xml version=\"1.0\"?>"
-                "<analyzerinfo hash=\"100\">"
+                "<analyzerinfo>"
+                "<hash>100</hash>"
                 "<error id=\"internalError\" severity=\"error\" msg=\"Something went wrong\" verbose=\"Something went wrong\" file0=\"test.c\">"
                 "<location file=\"Cppcheck\" line=\"0\" column=\"0\"/>"
                 "</error>"
@@ -160,7 +202,7 @@ class TestAnalyzerInformation : public TestFixture {
                 );
             ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
 
-            ASSERT_EQUALS(false, AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS("'internalError' encountered", AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
             ASSERT_EQUALS(0, errorList.size());
         }
 
@@ -171,7 +213,8 @@ class TestAnalyzerInformation : public TestFixture {
 
             const tinyxml2::XMLError xmlError = doc.Parse(
                 "<?xml version=\"1.0\"?>"
-                "<analyzerinfo hash=\"100\">"
+                "<analyzerinfo>"
+                "<hash>100</hash>"
                 "<error id=\"nullPointer\" severity=\"error\" msg=\"Null pointer dereference: ptr\" verbose=\"Null pointer dereference: ptr\" cwe=\"476\" file0=\"test.c\">"
                 "<location file=\"test.c\" line=\"4\" column=\"3\" info=\"Null pointer dereference\"/>"
                 "<location file=\"test.c\" line=\"3\" column=\"12\" info=\"Assignment &apos;ptr=NULL&apos;, assigned value is 0\"/>"
@@ -181,7 +224,7 @@ class TestAnalyzerInformation : public TestFixture {
                 );
             ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
 
-            ASSERT_EQUALS(true, AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS("", AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
             ASSERT_EQUALS(1, errorList.size());
         }
 
@@ -192,12 +235,13 @@ class TestAnalyzerInformation : public TestFixture {
 
             const tinyxml2::XMLError xmlError = doc.Parse(
                 "<?xml version=\"1.0\"?>"
-                "<analyzerinfo hash=\"100\">"
+                "<analyzerinfo>"
+                "<hash>100</hash>"
                 "</analyzerinfo>"
                 );
             ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
 
-            ASSERT_EQUALS(true, AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS("", AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
             ASSERT_EQUALS(0, errorList.size());
         }
 
@@ -208,7 +252,8 @@ class TestAnalyzerInformation : public TestFixture {
 
             const tinyxml2::XMLError xmlError = doc.Parse(
                 "<?xml version=\"1.0\"?>"
-                "<analyzerinfo hash=\"100\">"
+                "<analyzerinfo>"
+                "<hash>100</hash>"
                 "<error id=\"nullPointer\" severity=\"error\" msg=\"Null pointer dereference: ptr\" verbose=\"Null pointer dereference: ptr\" cwe=\"476\" file0=\"test.c\">"
                 "<location file=\"test.c\" line=\"4\" column=\"3\" info=\"Null pointer dereference\"/>"
                 "<location file=\"test.c\" line=\"3\" column=\"12\" info=\"Assignment &apos;ptr=NULL&apos;, assigned value is 0\"/>"
@@ -218,7 +263,7 @@ class TestAnalyzerInformation : public TestFixture {
                 );
             ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
 
-            ASSERT_EQUALS(false, AnalyzerInformationTest::skipAnalysis(doc, 99, errorList));
+            ASSERT_EQUALS("hash mismatch", AnalyzerInformationTest::skipAnalysis(doc, 99, errorList));
             ASSERT_EQUALS(0, errorList.size());
         }
 
@@ -230,7 +275,37 @@ class TestAnalyzerInformation : public TestFixture {
             const tinyxml2::XMLError xmlError = doc.Parse("");
             ASSERT_EQUALS(tinyxml2::XML_ERROR_EMPTY_DOCUMENT, xmlError);
 
-            ASSERT_EQUALS(false, AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS("no root node found", AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS(0, errorList.size());
+        }
+
+        // Unexpected root node
+        {
+            std::list<ErrorMessage> errorList;
+            tinyxml2::XMLDocument doc;
+
+            const tinyxml2::XMLError xmlError = doc.Parse(
+                "<?xml version=\"1.0\"?>"
+                "<ainfo/>"
+                );
+            ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
+
+            ASSERT_EQUALS("unexpected root node", AnalyzerInformationTest::skipAnalysis(doc, 99, errorList));
+            ASSERT_EQUALS(0, errorList.size());
+        }
+
+        // No 'hash' node found
+        {
+            std::list<ErrorMessage> errorList;
+            tinyxml2::XMLDocument doc;
+
+            const tinyxml2::XMLError xmlError = doc.Parse(
+                "<?xml version=\"1.0\"?>"
+                "<analyzerinfo/>"
+                );
+            ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
+
+            ASSERT_EQUALS("no 'hash' node found", AnalyzerInformationTest::skipAnalysis(doc, 99, errorList));
             ASSERT_EQUALS(0, errorList.size());
         }
     }
diff --git a/test/testassert.cpp b/test/testassert.cpp
index 412a7cb750b..c3c271a1bf2 100644
--- a/test/testassert.cpp
+++ b/test/testassert.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,8 +39,8 @@ class TestAssert : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckAssert>(tokenizer, this);
+        CheckAssert check;
+        runChecks(check, tokenizer, *this);
     }
 
     void run() override {
@@ -61,7 +61,7 @@ class TestAssert : public TestFixture {
             "   if (b) { a = 1+2 };\n"
             "   return a;\n"
             "}\n"
-            "assert(foo() == 3);");
+            "assert(foo() == 3);\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -69,7 +69,7 @@ class TestAssert : public TestFixture {
             "    int b=a+1;\n"
             "    return b;\n"
             "}\n"
-            "assert(foo(1) == 2);");
+            "assert(foo(1) == 2);\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -80,7 +80,7 @@ class TestAssert : public TestFixture {
             "    a = 1+2;\n"
             "    return a;\n"
             "}\n"
-            "assert(foo() == 3);");
+            "assert(foo() == 3);\n");
         ASSERT_EQUALS("[test.cpp:6:8]: (warning) Assert statement calls a function which may have desired side effects: 'foo'. [assertWithSideEffect]\n", errout_str());
 
         //  Ticket #4937 "false positive: Assert calls a function which may have desired side effects"
@@ -92,7 +92,7 @@ class TestAssert : public TestFixture {
               "};\n"
               "void foo() {\n"
               "   assert( !SquarePack::isRank1Or8(push2) );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct SquarePack {\n"
@@ -103,7 +103,7 @@ class TestAssert : public TestFixture {
               "};\n"
               "void foo() {\n"
               "   assert( !SquarePack::isRank1Or8(push2) );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:25]: (warning) Assert statement calls a function which may have desired side effects: 'isRank1Or8'. [assertWithSideEffect]\n", errout_str());
 
         check("struct SquarePack {\n"
@@ -114,7 +114,7 @@ class TestAssert : public TestFixture {
               "};\n"
               "void foo() {\n"
               "   assert( !SquarePack::isRank1Or8(push2) );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:25]: (warning) Assert statement calls a function which may have desired side effects: 'isRank1Or8'. [assertWithSideEffect]\n", errout_str());
 
         check("struct SquarePack {\n"
@@ -125,7 +125,7 @@ class TestAssert : public TestFixture {
               "};\n"
               "void foo() {\n"
               "   assert( !SquarePack::isRank1Or8(push2) );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Geometry {\n"
@@ -136,7 +136,7 @@ class TestAssert : public TestFixture {
               "\n"
               "void Geometry::ReadGeometry() {\n"
               "    assert(empty());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #4811
@@ -147,6 +147,17 @@ class TestAssert : public TestFixture {
               "    assert(g());\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("int i;\n" // #14973
+              "bool f() {\n"
+              "    i = 0;\n"
+              "    return true;\n"
+              "}\n"
+              "void g() {\n"
+              "    bool (*fp)() = f;\n"
+              "    assert(fp == f);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void memberFunctionCallInAssert() {
@@ -155,15 +166,15 @@ class TestAssert : public TestFixture {
               "};\n"
               "void foo(SquarePack s) {\n"
               "   assert( s.Foo() );\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:5:14]: (warning) Assert statement calls a function which may have desired side effects: 'Foo'. [assertWithSideEffect]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:14]: (warning) Assert statement calls a function which may have desired side effects: 'Foo'. If there are no side effects, consider declaring the method const. [assertWithSideEffect]\n", errout_str());
 
         check("struct SquarePack {\n"
               "   int Foo() const;\n"
               "};\n"
               "void foo(SquarePack* s) {\n"
               "   assert( s->Foo() );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct SquarePack {\n"
@@ -171,14 +182,14 @@ class TestAssert : public TestFixture {
               "};\n"
               "void foo(SquarePack* s) {\n"
               "   assert( s->Foo() );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct SquarePack {\n"
               "};\n"
               "void foo(SquarePack* s) {\n"
               "   assert( s->Foo() );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -187,54 +198,54 @@ class TestAssert : public TestFixture {
               "    int a; a = 0;\n"
               "    assert(a = 2);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (warning) Assert statement modifies 'a'. [assignmentInAssert]\n", errout_str());
 
         check("void f(int a) {\n"
               "    assert(a == 2);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b) {\n"
               "    assert(a == 2 && (b = 1));\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (warning) Assert statement modifies 'b'. [assignmentInAssert]\n", errout_str());
 
         check("void f() {\n"
               "    int a; a = 0;\n"
               "    assert(a += 2);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (warning) Assert statement modifies 'a'. [assignmentInAssert]\n", errout_str());
 
         check("void f() {\n"
               "    int a; a = 0;\n"
               "    assert(a *= 2);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (warning) Assert statement modifies 'a'. [assignmentInAssert]\n", errout_str());
 
         check("void f() {\n"
               "    int a; a = 0;\n"
               "    assert(a -= 2);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (warning) Assert statement modifies 'a'. [assignmentInAssert]\n", errout_str());
 
         check("void f() {\n"
               "    int a = 0;\n"
               "    assert(a--);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (warning) Assert statement modifies 'a'. [assignmentInAssert]\n", errout_str());
 
         check("void f() {\n"
               "    int a = 0;\n"
               "    assert(--a);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (warning) Assert statement modifies 'a'. [assignmentInAssert]\n", errout_str());
 
         check("void f() {\n"
@@ -243,19 +254,19 @@ class TestAssert : public TestFixture {
               "                  auto const expected = someOtherValue;\n"
               "                  return tmp == expected;\n"
               "                }));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void crash() {
         check("void foo() {\n"
               "  assert(sizeof(struct { int a[x++]; })==sizeof(int));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // #9790
               "  assert(kad_bucket_hash(&(kad_guid) { .bytes = { 0 } }, & (kad_guid){.bytes = { 0 }}) == -1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 };
diff --git a/test/testastutils.cpp b/test/testastutils.cpp
index 8ca2412a095..46dde522338 100644
--- a/test/testastutils.cpp
+++ b/test/testastutils.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -62,29 +62,29 @@ class TestAstUtils : public TestFixture {
     void findLambdaEndTokenTest() {
         const Token* nullTok = nullptr;
         ASSERT(nullptr == (::findLambdaEndToken)(nullTok));
-        ASSERT_EQUALS(false, findLambdaEndToken("void f() { }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[]{ }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[]{ return 0; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](){ }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[&](){ }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[&, i](){ }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) { return -1; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](int a, int b) { return a + b; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](int a, int b) mutable { return a + b; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](int a, int b) constexpr { return a + b; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) -> int { return -1; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) mutable -> int { return -1; }"));
-        ASSERT_EQUALS(false, findLambdaEndToken("[](void) foo -> int { return -1; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> int { return -1; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> int* { return x; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> const * int { return x; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) mutable -> const * int { return x; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> const ** int { return x; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> const * const* int { return x; }"));
-        ASSERT_EQUALS(false, findLambdaEndToken("int** a[] { new int*[2] { new int, new int} }", "[ ]"));
-        ASSERT_EQUALS(false, findLambdaEndToken("int** a[] { new int*[2] { new int, new int} }", "[ 2"));
-        ASSERT_EQUALS(false, findLambdaEndToken("shared_ptr<Type *[]> sp{ new Type *[2] {new Type, new Type}, Deleter<Type>{ 2 } };", "[ 2"));
-        ASSERT_EQUALS(true, findLambdaEndToken("int i = 5 * []{ return 7; }();", "[", /*checkNext*/ false));
+        ASSERT_EQUALS(false, findLambdaEndToken("void f() { }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[]{ }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[]{ return 0; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](){ }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[&](){ }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[&, i](){ }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) { return -1; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](int a, int b) { return a + b; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](int a, int b) mutable { return a + b; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](int a, int b) constexpr { return a + b; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) -> int { return -1; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) mutable -> int { return -1; }\n"));
+        ASSERT_EQUALS(false, findLambdaEndToken("[](void) foo -> int { return -1; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> int { return -1; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> int* { return x; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> const * int { return x; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) mutable -> const * int { return x; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> const ** int { return x; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> const * const* int { return x; }\n"));
+        ASSERT_EQUALS(false, findLambdaEndToken("int** a[] { new int*[2] { new int, new int} };\n", "[ ]"));
+        ASSERT_EQUALS(false, findLambdaEndToken("int** a[] { new int*[2] { new int, new int} };\n", "[ 2"));
+        ASSERT_EQUALS(false, findLambdaEndToken("shared_ptr<Type *[]> sp{ new Type *[2] {new Type, new Type}, Deleter<Type>{ 2 } };\n", "[ 2"));
+        ASSERT_EQUALS(true, findLambdaEndToken("int i = 5 * []{ return 7; }();\n", "[", /*checkNext*/ false));
     }
 
 #define findLambdaStartToken(...) findLambdaStartToken_(__FILE__, __LINE__, __VA_ARGS__)
@@ -98,25 +98,25 @@ class TestAstUtils : public TestFixture {
 
     void findLambdaStartTokenTest() {
         ASSERT(nullptr == (::findLambdaStartToken)(nullptr));
-        ASSERT_EQUALS(false, findLambdaStartToken("void f() { }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[]{ }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[]{ return 0; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](){ }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[&](){ }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[&, i](){ }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) { return -1; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](int a, int b) { return a + b; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](int a, int b) mutable { return a + b; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](int a, int b) constexpr { return a + b; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) -> int { return -1; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) mutable -> int { return -1; }"));
-        ASSERT_EQUALS(false, findLambdaStartToken("[](void) foo -> int { return -1; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> int { return -1; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> int* { return x; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> const * int { return x; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) mutable -> const * int { return x; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> const ** int { return x; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> const * const* int { return x; }"));
+        ASSERT_EQUALS(false, findLambdaStartToken("void f() { }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[]{ }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[]{ return 0; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](){ }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[&](){ }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[&, i](){ }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) { return -1; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](int a, int b) { return a + b; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](int a, int b) mutable { return a + b; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](int a, int b) constexpr { return a + b; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) -> int { return -1; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) mutable -> int { return -1; }\n"));
+        ASSERT_EQUALS(false, findLambdaStartToken("[](void) foo -> int { return -1; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> int { return -1; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> int* { return x; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> const * int { return x; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) mutable -> const * int { return x; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> const ** int { return x; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> const * const* int { return x; }\n"));
     }
 
 #define isNullOperand(...) isNullOperand_(__FILE__, __LINE__, __VA_ARGS__)
@@ -128,16 +128,16 @@ class TestAstUtils : public TestFixture {
     }
 
     void isNullOperandTest() {
-        ASSERT_EQUALS(true, isNullOperand("(void*)0;"));
-        ASSERT_EQUALS(true, isNullOperand("(void*)0U;"));
-        ASSERT_EQUALS(true, isNullOperand("(void*)0x0LL;"));
-        ASSERT_EQUALS(true, isNullOperand("NULL;"));
-        ASSERT_EQUALS(true, isNullOperand("nullptr;"));
-        ASSERT_EQUALS(true, isNullOperand("(void*)NULL;"));
-        ASSERT_EQUALS(true, isNullOperand("static_cast<int*>(0);"));
-        ASSERT_EQUALS(false, isNullOperand("0;"));
-        ASSERT_EQUALS(false, isNullOperand("(void*)0.0;"));
-        ASSERT_EQUALS(false, isNullOperand("(void*)1;"));
+        ASSERT_EQUALS(true, isNullOperand("(void*)0;\n"));
+        ASSERT_EQUALS(true, isNullOperand("(void*)0U;\n"));
+        ASSERT_EQUALS(true, isNullOperand("(void*)0x0LL;\n"));
+        ASSERT_EQUALS(true, isNullOperand("NULL;\n"));
+        ASSERT_EQUALS(true, isNullOperand("nullptr;\n"));
+        ASSERT_EQUALS(true, isNullOperand("(void*)NULL;\n"));
+        ASSERT_EQUALS(true, isNullOperand("static_cast<int*>(0);\n"));
+        ASSERT_EQUALS(false, isNullOperand("0;\n"));
+        ASSERT_EQUALS(false, isNullOperand("(void*)0.0;\n"));
+        ASSERT_EQUALS(false, isNullOperand("(void*)1;\n"));
     }
 
 #define isReturnScope(...) isReturnScope_(__FILE__, __LINE__, __VA_ARGS__)
@@ -152,22 +152,22 @@ class TestAstUtils : public TestFixture {
     }
 
     void isReturnScopeTest() {
-        ASSERT_EQUALS(true, isReturnScope("void f() { if (a) { return; } }", -2));
-        ASSERT_EQUALS(true, isReturnScope("int f() { if (a) { return {}; } }", -2));                        // #8891
-        ASSERT_EQUALS(true, isReturnScope("std::string f() { if (a) { return std::string{}; } }", -2));     // #8891
-        ASSERT_EQUALS(true, isReturnScope("std::string f() { if (a) { return std::string{\"\"}; } }", -2)); // #8891
-        ASSERT_EQUALS(true, isReturnScope("void f() { if (a) { return (ab){0}; } }", -2)); // #7103
-        ASSERT_EQUALS(false, isReturnScope("void f() { if (a) { return (ab){0}; } }", -4)); // #7103
-        ASSERT_EQUALS(true, isReturnScope("void f() { if (a) { {throw new string(x);}; } }", -4)); // #7144
-        ASSERT_EQUALS(true, isReturnScope("void f() { if (a) { {throw new string(x);}; } }", -2)); // #7144
-        ASSERT_EQUALS(false, isReturnScope("void f() { [=]() { return data; }; }", -1));
-        ASSERT_EQUALS(true, isReturnScope("auto f() { return [=]() { return data; }; }", -1));
-        ASSERT_EQUALS(true, isReturnScope("auto f() { return [=]() { return data; }(); }", -1));
-        ASSERT_EQUALS(false, isReturnScope("auto f() { [=]() { return data; }(); }", -1));
-
-        ASSERT_EQUALS(true, isReturnScope("void negativeTokenOffset() { return; }", -1));
-        ASSERT_EQUALS(false, isReturnScope("void zeroTokenOffset() { return; }", 0));
-        ASSERT_EQUALS(true, isReturnScope("void positiveTokenOffset() { return; }", 7));
+        ASSERT_EQUALS(true, isReturnScope("void f() { if (a) { return; } }\n", -2));
+        ASSERT_EQUALS(true, isReturnScope("int f() { if (a) { return {}; } }\n", -2));                        // #8891
+        ASSERT_EQUALS(true, isReturnScope("std::string f() { if (a) { return std::string{}; } }\n", -2));     // #8891
+        ASSERT_EQUALS(true, isReturnScope("std::string f() { if (a) { return std::string{\"\"}; } }\n", -2)); // #8891
+        ASSERT_EQUALS(true, isReturnScope("void f() { if (a) { return (ab){0}; } }\n", -2)); // #7103
+        ASSERT_EQUALS(false, isReturnScope("void f() { if (a) { return (ab){0}; } }\n", -4)); // #7103
+        ASSERT_EQUALS(true, isReturnScope("void f() { if (a) { {throw new string(x);}; } }\n", -4)); // #7144
+        ASSERT_EQUALS(true, isReturnScope("void f() { if (a) { {throw new string(x);}; } }\n", -2)); // #7144
+        ASSERT_EQUALS(false, isReturnScope("void f() { [=]() { return data; }; }\n", -1));
+        ASSERT_EQUALS(true, isReturnScope("auto f() { return [=]() { return data; }; }\n", -1));
+        ASSERT_EQUALS(true, isReturnScope("auto f() { return [=]() { return data; }(); }\n", -1));
+        ASSERT_EQUALS(false, isReturnScope("auto f() { [=]() { return data; }(); }\n", -1));
+
+        ASSERT_EQUALS(true, isReturnScope("void negativeTokenOffset() { return; }\n", -1));
+        ASSERT_EQUALS(false, isReturnScope("void zeroTokenOffset() { return; }\n", 0));
+        ASSERT_EQUALS(true, isReturnScope("void positiveTokenOffset() { return; }\n", 7));
     }
 
 #define isSameExpression(...) isSameExpression_(__FILE__, __LINE__, __VA_ARGS__)
@@ -181,33 +181,33 @@ class TestAstUtils : public TestFixture {
     }
 
     void isSameExpressionTestInternal(bool cpp) {
-        ASSERT_EQUALS(true,  isSameExpression("x = 1 + 1;", "1", "1", cpp));
-        ASSERT_EQUALS(false, isSameExpression("x = 1 + 1u;", "1", "1u", cpp));
-        ASSERT_EQUALS(true,  isSameExpression("x = 1.0 + 1.0;", "1.0", "1.0", cpp));
-        ASSERT_EQUALS(false, isSameExpression("x = 1.0f + 1.0;", "1.0f", "1.0", cpp));
-        ASSERT_EQUALS(false, isSameExpression("x = 1L + 1;", "1L", "1", cpp));
-        ASSERT_EQUALS(true,  isSameExpression("x = 0.0f + 0x0p+0f;", "0.0f", "0x0p+0f", cpp));
-        ASSERT_EQUALS(true,  isSameExpression("x < x;", "x", "x", cpp));
-        ASSERT_EQUALS(false, isSameExpression("x < y;", "x", "y", cpp));
-        ASSERT_EQUALS(true,  isSameExpression("(x + 1) < (x + 1);", "+", "+", cpp));
-        ASSERT_EQUALS(false, isSameExpression("(x + 1) < (x + 1L);", "+", "+", cpp));
-        ASSERT_EQUALS(!cpp,  isSameExpression("(1 + x) < (x + 1);", "+", "+", cpp));
-        ASSERT_EQUALS(false, isSameExpression("(1.0l + x) < (1.0 + x);", "+", "+", cpp));
-        ASSERT_EQUALS(!cpp,  isSameExpression("(0.0 + x) < (x + 0x0p+0);", "+", "+", cpp));
-        ASSERT_EQUALS(true,  isSameExpression("void f() {double y = 1e1; (x + y) < (x + 10.0); } ", "+", "+", cpp));
-        ASSERT_EQUALS(!cpp,  isSameExpression("void f() {double y = 1e1; (x + 10.0) < (y + x); } ", "+", "+", cpp));
-        ASSERT_EQUALS(true,  isSameExpression("void f() {double y = 1e1; double z = 10.0; (x + y) < (x + z); } ", "+", "+", cpp));
-        ASSERT_EQUALS(true,  isSameExpression("A + A", "A", "A", cpp));
+        ASSERT_EQUALS(true,  isSameExpression("x = 1 + 1;\n", "1", "1", cpp));
+        ASSERT_EQUALS(false, isSameExpression("x = 1 + 1u;\n", "1", "1u", cpp));
+        ASSERT_EQUALS(true,  isSameExpression("x = 1.0 + 1.0;\n", "1.0", "1.0", cpp));
+        ASSERT_EQUALS(false, isSameExpression("x = 1.0f + 1.0;\n", "1.0f", "1.0", cpp));
+        ASSERT_EQUALS(false, isSameExpression("x = 1L + 1;\n", "1L", "1", cpp));
+        ASSERT_EQUALS(true,  isSameExpression("x = 0.0f + 0x0p+0f;\n", "0.0f", "0x0p+0f", cpp));
+        ASSERT_EQUALS(true,  isSameExpression("x < x;\n", "x", "x", cpp));
+        ASSERT_EQUALS(false, isSameExpression("x < y;\n", "x", "y", cpp));
+        ASSERT_EQUALS(true,  isSameExpression("(x + 1) < (x + 1);\n", "+", "+", cpp));
+        ASSERT_EQUALS(false, isSameExpression("(x + 1) < (x + 1L);\n", "+", "+", cpp));
+        ASSERT_EQUALS(!cpp,  isSameExpression("(1 + x) < (x + 1);\n", "+", "+", cpp));
+        ASSERT_EQUALS(false, isSameExpression("(1.0l + x) < (1.0 + x);\n", "+", "+", cpp));
+        ASSERT_EQUALS(!cpp,  isSameExpression("(0.0 + x) < (x + 0x0p+0);\n", "+", "+", cpp));
+        ASSERT_EQUALS(true,  isSameExpression("void f() {double y = 1e1; (x + y) < (x + 10.0); } \n", "+", "+", cpp));
+        ASSERT_EQUALS(!cpp,  isSameExpression("void f() {double y = 1e1; (x + 10.0) < (y + x); } \n", "+", "+", cpp));
+        ASSERT_EQUALS(true,  isSameExpression("void f() {double y = 1e1; double z = 10.0; (x + y) < (x + z); } \n", "+", "+", cpp));
+        ASSERT_EQUALS(true,  isSameExpression("A + A\n", "A", "A", cpp));
 
         // the remaining test cases are not valid C code
         if (!cpp)
             return;
 
         //https://trac.cppcheck.net/ticket/9700
-        ASSERT_EQUALS(true, isSameExpression("A::B + A::B;", "::", "::", cpp));
-        ASSERT_EQUALS(false, isSameExpression("A::B + A::C;", "::", "::", cpp));
-        ASSERT_EQUALS(true, isSameExpression("A::B* get() { if(x) return new A::B(true); else return new A::B(true); }", "new", "new", cpp));
-        ASSERT_EQUALS(false, isSameExpression("A::B* get() { if(x) return new A::B(true); else return new A::C(true); }", "new", "new", cpp));
+        ASSERT_EQUALS(true, isSameExpression("A::B + A::B;\n", "::", "::", cpp));
+        ASSERT_EQUALS(false, isSameExpression("A::B + A::C;\n", "::", "::", cpp));
+        ASSERT_EQUALS(true, isSameExpression("A::B* get() { if(x) return new A::B(true); else return new A::B(true); }\n", "new", "new", cpp));
+        ASSERT_EQUALS(false, isSameExpression("A::B* get() { if(x) return new A::B(true); else return new A::C(true); }\n", "new", "new", cpp));
     }
 
     void isSameExpressionCpp() {
@@ -233,7 +233,7 @@ class TestAstUtils : public TestFixture {
         (void)isVariableChanged("void f() {\n"
                                 "  int b;\n"
                                 "  if (b) { (int)((INTOF(8))result >> b); }\n"
-                                "}", "if", "}");
+                                "}\n", "if", "}");
         // #9235
         ASSERT_EQUALS(false,
                       isVariableChanged("void f() {\n"
@@ -242,13 +242,13 @@ class TestAstUtils : public TestFixture {
                                         "= a",
                                         "}"));
 
-        ASSERT_EQUALS(false, isVariableChanged("void f(const A& a) { a.f(); }", "{", "}"));
+        ASSERT_EQUALS(false, isVariableChanged("void f(const A& a) { a.f(); }\n", "{", "}"));
         ASSERT_EQUALS(true,
                       isVariableChanged("void g(int*);\n"
                                         "void f(int x) { g(&x); }\n",
                                         "{",
                                         "}"));
-        ASSERT_EQUALS(false, isVariableChanged("const int A[] = { 1, 2, 3 };", "[", "]"));
+        ASSERT_EQUALS(false, isVariableChanged("const int A[] = { 1, 2, 3 };\n", "[", "]"));
     }
 
 #define isVariableChangedByFunctionCall(...) isVariableChangedByFunctionCall_( __FILE__, __LINE__, __VA_ARGS__)
@@ -259,7 +259,7 @@ class TestAstUtils : public TestFixture {
         const Token * const argtok = Token::findmatch(tokenizer.tokens(), pattern);
         ASSERT_LOC(argtok, file, line);
         int indirect = (argtok->variable() && argtok->variable()->isArray());
-        return (isVariableChangedByFunctionCall)(argtok, indirect, settingsDefault, inconclusive);
+        return (isVariableChangedByFunctionCall)(argtok, indirect, settingsDefault.library, inconclusive);
     }
 
     void isVariableChangedByFunctionCallTest() {
@@ -267,7 +267,7 @@ class TestAstUtils : public TestFixture {
         { // #8271 - template method
             const char code[] = "void f(int x) {\n"
                                 "  a<int>(x);\n"
-                                "}";
+                                "}\n";
             bool inconclusive = false;
             ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "x ) ;", &inconclusive));
             ASSERT_EQUALS(true, inconclusive);
@@ -431,8 +431,8 @@ class TestAstUtils : public TestFixture {
 
     void isExpressionChangedTest()
     {
-        ASSERT_EQUALS(true, isExpressionChanged("void f(std::map<int, int>& m) { m[0]; }", "m [", "{", "}"));
-        ASSERT_EQUALS(false, isExpressionChanged("void f(const A& a) { a.f(); }", "a .", "{", "}"));
+        ASSERT_EQUALS(true, isExpressionChanged("void f(std::map<int, int>& m) { m[0]; }\n", "m [", "{", "}"));
+        ASSERT_EQUALS(false, isExpressionChanged("void f(const A& a) { a.f(); }\n", "a .", "{", "}"));
 
         ASSERT_EQUALS(true,
                       isExpressionChanged("void g(int*);\n"
@@ -459,17 +459,17 @@ class TestAstUtils : public TestFixture {
     }
 
     void nextAfterAstRightmostLeafTest() {
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("void f(int a, int b) { int x = a + b; }", "=", "; }"));
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a); }", "=", "; }"));
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a)[b]; }", "=", "; }"));
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(g(a)[b]); }", "=", "; }"));
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(g(a)[b] + a); }", "=", "; }"));
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a)[b + 1]; }", "=", "; }"));
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("void f() { int a; int b; int x = [](int a){}; }", "=", "; }"));
-
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = a + b; }", "+", "; }"));
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a)[b + 1]; }", "+", "] ; }"));
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a + 1)[b]; }", "+", ") ["));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("void f(int a, int b) { int x = a + b; }\n", "=", "; }"));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a); }\n", "=", "; }"));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a)[b]; }\n", "=", "; }"));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(g(a)[b]); }\n", "=", "; }"));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(g(a)[b] + a); }\n", "=", "; }"));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a)[b + 1]; }\n", "=", "; }"));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("void f() { int a; int b; int x = [](int a){}; }\n", "=", "; }"));
+
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = a + b; }\n", "+", "; }"));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a)[b + 1]; }\n", "+", "] ; }"));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a + 1)[b]; }\n", "+", ") ["));
     }
 
     enum class Result : std::uint8_t {False, True, Fail};
@@ -486,37 +486,37 @@ class TestAstUtils : public TestFixture {
     }
 
     void isUsedAsBool() {
-        ASSERT(Result::True == isUsedAsBool("void f() { bool b = true; }", "b"));
-        ASSERT(Result::False ==isUsedAsBool("void f() { int i = true; }", "i"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (i) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; while (i) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; for (;i;) {} }", "i ; )"));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i; for (;;i) {} }", "i )"));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i; for (i;;) {} }", "i ; ; )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; for (int j=0; i; ++j) {} }", "i ; ++"));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (i == 2) {} }", "i =="));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (i == true) {} }", "i =="));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i,j; if (i == (j&&f())) {} }", "i =="));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (!i == 0) {} }", "i =="));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (!i) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (!!i) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (i && f()) {} }", "i &&"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; int j = i && f(); }", "i &&"));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (i & f()) {} }", "i &"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (static_cast<bool>(i)) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if ((bool)i) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (1+static_cast<bool>(i)) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (1+(bool)i) {} }", "i )"));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (1+static_cast<int>(i)) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (1+!static_cast<int>(i)) {} }", "i )"));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (1+(int)i) {} }", "i )"));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (i + 2) {} }", "i +"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; bool b = i; }", "i ; }"));
-        ASSERT(Result::True == isUsedAsBool("void f(bool b); void f() { int i; f(i); }","i )"));
-        ASSERT(Result::False == isUsedAsBool("void f() { int *i; if (*i) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int *i; if (*i) {} }", "* i )"));
-        ASSERT(Result::True == isUsedAsBool("int g(); void h(bool); void f() { h(g()); }", "( ) )"));
-        ASSERT(Result::True == isUsedAsBool("int g(int); void h(bool); void f() { h(g(0)); }", "( 0 ) )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { bool b = true; }\n", "b"));
+        ASSERT(Result::False ==isUsedAsBool("void f() { int i = true; }\n", "i"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (i) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; while (i) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; for (;i;) {} }\n", "i ; )"));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i; for (;;i) {} }\n", "i )"));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i; for (i;;) {} }\n", "i ; ; )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; for (int j=0; i; ++j) {} }\n", "i ; ++"));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (i == 2) {} }\n", "i =="));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (i == true) {} }\n", "i =="));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i,j; if (i == (j&&f())) {} }\n", "i =="));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (!i == 0) {} }\n", "i =="));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (!i) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (!!i) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (i && f()) {} }\n", "i &&"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; int j = i && f(); }\n", "i &&"));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (i & f()) {} }\n", "i &"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (static_cast<bool>(i)) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if ((bool)i) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (1+static_cast<bool>(i)) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (1+(bool)i) {} }\n", "i )"));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (1+static_cast<int>(i)) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (1+!static_cast<int>(i)) {} }\n", "i )"));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (1+(int)i) {} }\n", "i )"));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (i + 2) {} }\n", "i +"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; bool b = i; }\n", "i ; }"));
+        ASSERT(Result::True == isUsedAsBool("void f(bool b); void f() { int i; f(i); }\n","i )"));
+        ASSERT(Result::False == isUsedAsBool("void f() { int *i; if (*i) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int *i; if (*i) {} }\n", "* i )"));
+        ASSERT(Result::True == isUsedAsBool("int g(); void h(bool); void f() { h(g()); }\n", "( ) )"));
+        ASSERT(Result::True == isUsedAsBool("int g(int); void h(bool); void f() { h(g(0)); }\n", "( 0 ) )"));
     }
 };
 
diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp
index 2117fe7ba8d..d5ab5855c32 100644
--- a/test/testautovariables.cpp
+++ b/test/testautovariables.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,7 +47,8 @@ class TestAutoVariables : public TestFixture {
         SimpleTokenizer tokenizer(settings1, *this, options.cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        runChecks<CheckAutoVariables>(tokenizer, this);
+        CheckAutoVariables check;
+        runChecks(check, tokenizer, *this);
     }
 
     void run() override {
@@ -69,6 +70,7 @@ class TestAutoVariables : public TestFixture {
         TEST_CASE(testautovar15); // ticket #6538
         TEST_CASE(testautovar16); // ticket #8114
         TEST_CASE(testautovar17);
+        TEST_CASE(testautovar18);
         TEST_CASE(testautovar_array1);
         TEST_CASE(testautovar_array2);
         TEST_CASE(testautovar_array3);
@@ -130,6 +132,8 @@ class TestAutoVariables : public TestFixture {
         TEST_CASE(returnReference26);
         TEST_CASE(returnReference27);
         TEST_CASE(returnReference28);
+        TEST_CASE(returnReference29);
+        TEST_CASE(returnReference30); // #15094
         TEST_CASE(returnReferenceFunction);
         TEST_CASE(returnReferenceContainer);
         TEST_CASE(returnReferenceLiteral);
@@ -177,21 +181,21 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int num = 2;\n"
               "    *res = &num;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("void func1(int **res)\n"
               "{\n"
               "    int num = 2;\n"
               "    res = &num;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it? [uselessAssignmentPtrArg]\n", errout_str());
 
         check("void func1(int **res)\n"
               "{\n"
               "    int num = 2;\n"
               "    foo.res = &num;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -203,7 +207,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int num = 2;\n"
               "    *res = &num;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("class Fred {\n"
@@ -213,7 +217,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int num = 2;\n"
               "    res = &num;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it? [uselessAssignmentPtrArg]\n", errout_str());
 
         check("class Fred {\n"
@@ -223,7 +227,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int num = 2;\n"
               "    foo.res = &num;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -232,7 +236,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int x[100];\n"
               "    *p = x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
@@ -241,7 +245,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    static int x[100];\n"
               "    *p = x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -250,7 +254,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    char a;\n"
               "    ab->a = &a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error, inconclusive) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
@@ -259,14 +263,14 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    char a[10];\n"
               "    x->str = a;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(struct X *x)\n"
               "{\n"
               "    char a[10];\n"
               "    x->str = a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error, inconclusive) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
@@ -276,7 +280,7 @@ class TestAutoVariables : public TestFixture {
               "    struct txt_scrollpane_s * scrollpane;\n"
               "    target->parent = &scrollpane->widget;\n"
               "    return scrollpane;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -284,12 +288,12 @@ class TestAutoVariables : public TestFixture {
         check("void foo(int*& p) {\n"
               "    int i = 0;\n"
               "    p = &i;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("void foo(std::string& s) {\n"
               "    s = foo;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -300,7 +304,7 @@ class TestAutoVariables : public TestFixture {
               "    FN fn;\n"
               "    FP fp;\n"
               "    p = &fn.i;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("struct FN {int i;};\n"
@@ -309,7 +313,7 @@ class TestAutoVariables : public TestFixture {
               "    FN fn;\n"
               "    FP fp;\n"
               "    p = &p_fp->i;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("struct FN {int i;};\n"
@@ -318,100 +322,100 @@ class TestAutoVariables : public TestFixture {
               "    FN fn;\n"
               "    FP fp;\n"
               "    p = &fp.f->i;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
     void testautovar10() { // #2930 - assignment of function parameter
         check("void foo(char* p) {\n"
               "    p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it? [uselessAssignmentPtrArg]\n", errout_str());
 
         check("void foo(int b) {\n"
               "    b = foo(b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Assignment of function parameter has no effect outside the function. [uselessAssignmentArg]\n", errout_str());
 
         check("void foo(int b) {\n"
               "    b += 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Assignment of function parameter has no effect outside the function. [uselessAssignmentArg]\n", errout_str());
 
         check("void foo(std::string s) {\n"
               "    s = foo(b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Assignment of function parameter has no effect outside the function. [uselessAssignmentArg]\n", errout_str());
 
         check("void foo(char* p) {\n" // don't warn for self assignment, there is another warning for this
               "  p = p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* p) {\n"
               "    if (!p) p = buf;\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* p) {\n"
               "    if (!p) p = buf;\n"
               "    do_something(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* p) {\n"
               "    while (!p) p = buf;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* p) {\n"
               "    p = 0;\n"
               "    asm(\"somecmd\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(Foo* p) {\n"
               "    p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it? [uselessAssignmentPtrArg]\n", errout_str());
 
         check("class Foo {};\n"
               "void foo(Foo p) {\n"
               "    p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Assignment of function parameter has no effect outside the function. [uselessAssignmentArg]\n", errout_str());
 
         check("void foo(Foo p) {\n"
               "    p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int& p) {\n"
               "    p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("double foo(double d) {\n" // #5005
               "    int i = d;\n"
               "    d = i;\n"
-              "    return d;"
-              "}",dinit(CheckOptions, $.inconclusive = false));
+              "    return d;\n"
+              "}\n",dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int* ptr) {\n" // #4793
               "    ptr++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it? [uselessAssignmentPtrArg]\n", errout_str());
 
         check("void foo(int* ptr) {\n" // #3177
               "    --ptr;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it? [uselessAssignmentPtrArg]\n", errout_str());
 
         check("void foo(struct S* const x) {\n" // #7839
               "    ++x->n;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -422,7 +426,7 @@ class TestAutoVariables : public TestFixture {
               "void foo(char** p) {\n"
               "    struct A a = bar();\n"
               "    *p = &(*a.data)[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -431,36 +435,36 @@ class TestAutoVariables : public TestFixture {
               "void foo(char** p) {\n"
               "    struct A a = bar();\n"
               "    *p = &a.data[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("void f(char **out) {\n"
               "  struct S *p = glob;\n"
               "  *out = &p->data;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4998
         check("void f(s8**out) {\n"
               "  s8 *p;\n"  // <- p is pointer => no error
               "  *out = &p[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(s8**out) {\n"
               "  s8 p[10];\n"  // <- p is array => error
               "  *out = &p[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
     void testautovar12() { // Ticket #5024, #5050 - Crash on invalid input
-        ASSERT_THROW_INTERNAL(check("void f(int* a) { a = }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(check("void f(int* a) { a = }\n"), SYNTAX);
         check("struct custom_type { custom_type(int) {} };\n"
               "void func(int) {}\n"
               "int var;\n"
               "void init() { func(var); }\n"
-              "UNKNOWN_MACRO_EXPANDING_TO_SIGNATURE { custom_type a(var); }");
+              "UNKNOWN_MACRO_EXPANDING_TO_SIGNATURE { custom_type a(var); }\n");
     }
 
     void testautovar13() { // Ticket #5537
@@ -470,7 +474,7 @@ class TestAutoVariables : public TestFixture {
               "  ~FileManager() {\n"
               "    delete &UniqueRealDirs;\n"
               "   }\n"
-              "};");
+              "};\n");
     }
 
     void testautovar14() { // Ticket #4776
@@ -480,7 +484,7 @@ class TestAutoVariables : public TestFixture {
               "    x = x >> 1;\n"
               "    goto label;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -493,7 +497,7 @@ class TestAutoVariables : public TestFixture {
               "    if (lumdiff > 5.0f)\n"
               "        return &darkOutline;\n"
               "    return 0;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -501,7 +505,7 @@ class TestAutoVariables : public TestFixture {
         check("void f(const void* ptr, bool* result) {\n"
               "  int dummy;\n"
               "  *result = (&dummy < ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -516,12 +520,21 @@ class TestAutoVariables : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void testautovar18() {
+        check("struct S { int* p; };\n"
+              "void foo(struct S* s) {\n"
+              "    int x;\n"
+              "    s[2].p = &x;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
+    }
+
     void testautovar_array1() {
         check("void func1(int* arr[2])\n"
               "{\n"
               "    int num=2;"
               "    arr[0]=&num;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
@@ -533,7 +546,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int num=2;"
               "    arr[0]=&num;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:19]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
@@ -584,7 +597,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    XPoint DropPoint;\n"
               "    ds->location_data = (XtPointer *)&DropPoint;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error, inconclusive) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
@@ -592,7 +605,7 @@ class TestAutoVariables : public TestFixture {
         check("void remove_duplicate_matches (char **matches) {\n"
               "  char dead_slot;\n"
               "  matches[0] = (char *)&dead_slot;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
@@ -601,7 +614,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int num=2;"
               "    return &num;"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:26] -> [test.cpp:3:9] -> [test.cpp:3:26]: (error) Returning pointer to local variable 'num' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
     }
 
@@ -613,7 +626,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int num=2;"
               "    return &num;"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:26] -> [test.cpp:6:9] -> [test.cpp:6:26]: (error) Returning pointer to local variable 'num' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
     }
 
@@ -623,7 +636,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    void *&value = tls[id];"
               "    return &value;"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -632,7 +645,7 @@ class TestAutoVariables : public TestFixture {
         check("void foo() {\n"
               "  int cond2;\n"
               "  dostuff([&cond2]() { return &cond2; });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -669,7 +682,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    extern struct foo f;\n"
               "    return &f;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -679,7 +692,7 @@ class TestAutoVariables : public TestFixture {
               "  pcb->root0 = &root0;\n"
               "  dostuff(pcb);\n"
               "  pcb->root0 = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(cb* pcb) {\n"
@@ -688,7 +701,7 @@ class TestAutoVariables : public TestFixture {
               "  dostuff(pcb);\n"
               "  if (condition) return;\n" // <- not reassigned => error
               "  pcb->root0 = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error, inconclusive) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("void foo(cb* pcb) {\n"
@@ -697,7 +710,7 @@ class TestAutoVariables : public TestFixture {
               "  dostuff(pcb);\n"
               "  if (condition)\n"
               "    pcb->root0 = 0;\n"  // <- conditional reassign => error
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error, inconclusive) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("struct S { int *p; };\n"
@@ -709,10 +722,9 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "    struct S s;\n"
               "    g(&s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n"
-            "[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n",   // duplicate
+            "[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n",
             errout_str());
     }
 
@@ -728,7 +740,7 @@ class TestAutoVariables : public TestFixture {
               "    delete[] (tmp4);\n"
               "    char tmp5[256];\n"
               "    delete[] tmp5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Deallocation of an auto-variable results in undefined behaviour. [autovarInvalidDeallocation]\n"
                       "[test.cpp:5:12]: (error) Deallocation of an auto-variable results in undefined behaviour. [autovarInvalidDeallocation]\n"
                       "[test.cpp:7:12]: (error) Deallocation of an auto-variable results in undefined behaviour. [autovarInvalidDeallocation]\n"
@@ -737,28 +749,28 @@ class TestAutoVariables : public TestFixture {
 
         check("void func1(char * ptr) {\n"
               "    free(ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void func1() {\n"
               "    char* tmp1[256];\n"
               "    init(tmp1);\n"
               "    delete tmp1[34];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void func1() {\n"
               "    static char tmp1[256];\n"
               "    char *p = tmp1;\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (error) Deallocation of a static variable (tmp1) results in undefined behaviour. [autovarInvalidDeallocation]\n", errout_str());
 
         check("char tmp1[256];\n"
               "void func1() {\n"
               "    char *p; if (x) p = tmp1;\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (error) Deallocation of a global variable (tmp1) results in undefined behaviour. [autovarInvalidDeallocation]\n", errout_str());
 
         check("void f()\n"
@@ -769,7 +781,7 @@ class TestAutoVariables : public TestFixture {
               "        abc(0, psz_title);\n"
               "        free(psz_title);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #2298 new check: passing stack-address to free()
@@ -777,44 +789,44 @@ class TestAutoVariables : public TestFixture {
               "   int *p = malloc(4);\n"
               "   free(&p);\n"
               "   return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Deallocation of an auto-variable results in undefined behaviour. [autovarInvalidDeallocation]\n", errout_str());
         check("int main() {\n"
               "   int i;\n"
               "   free(&i);\n"
               "   return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Deallocation of an auto-variable results in undefined behaviour. [autovarInvalidDeallocation]\n", errout_str());
 
         // #5732
         check("int main() {\n"
               "   long (*pKoeff)[256] = new long[9][256];\n"
               "   delete[] pKoeff;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int main() {\n"
               "   long *pKoeff[256];\n"
               "   delete[] pKoeff;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Deallocation of an auto-variable results in undefined behaviour. [autovarInvalidDeallocation]\n", errout_str());
 
         check("int main() {\n"
               "   long *pKoeff[256];\n"
               "   free (pKoeff);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Deallocation of an auto-variable results in undefined behaviour. [autovarInvalidDeallocation]\n", errout_str());
 
         check("void foo() {\n"
               "   const intPtr& intref = Getter();\n"
               "   delete intref;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test() {\n"
               "   MyObj& obj = *new MyObj;\n"
               "   delete &obj;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6506
@@ -826,7 +838,7 @@ class TestAutoVariables : public TestFixture {
               "  F().free(c1);\n"
               "  char *c2 = 0;\n"
               "  F().free(&c2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class foo {\n"
@@ -835,14 +847,14 @@ class TestAutoVariables : public TestFixture {
               "    char **dst_copy = NULL;\n"
               "    free(&dst_copy);\n"
               "  }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6551
         check("bool foo( ) {\n"
               "  SwTxtFld * pTxtFld = GetFldTxtAttrAt();\n"
               "  delete static_cast<SwFmtFld*>(&pTxtFld->GetAttr());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8910
@@ -852,14 +864,14 @@ class TestAutoVariables : public TestFixture {
               "    if (data_size > sizeof (stack)) data = malloc (data_size);\n"
               "    else data = (RGNDATA *)stack;\n"
               "    if ((char *)data != stack) free (data);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8923
         check("void f(char **args1, char *args2[]) {\n"
               "    free((char **)args1);\n"
               "    free((char **)args2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10097
@@ -974,7 +986,7 @@ class TestAutoVariables : public TestFixture {
         check("void f(EventPtr *eventP, ActionPtr **actionsP) {\n"
               "    EventPtr event = *eventP;\n"
               "    *actionsP = &event->actions;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -982,7 +994,7 @@ class TestAutoVariables : public TestFixture {
         check("static void function(unsigned long **datap) {\n"
               "    struct my_s *mr = global_structure_pointer;\n"
               "    *datap = &mr->value;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -991,7 +1003,7 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "  int x[10];\n"
               "  p = x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7] -> [test.cpp:3:7] -> [test.cpp:4:3]: (error) Non-local variable 'p' will use pointer to local variable 'x'. [danglingLifetime]\n", errout_str());
 
         check("int *p;\n"
@@ -999,7 +1011,7 @@ class TestAutoVariables : public TestFixture {
               "  int x[10];\n"
               "  p = x;\n"
               "  p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1008,7 +1020,7 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "  int x;\n"
               "  p = &x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7] -> [test.cpp:3:7] -> [test.cpp:4:3]: (error) Non-local variable 'p' will use pointer to local variable 'x'. [danglingLifetime]\n", errout_str());
 
         check("int *p;\n"
@@ -1016,7 +1028,7 @@ class TestAutoVariables : public TestFixture {
               "  int x;\n"
               "  p = &x;\n"
               "  p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1027,7 +1039,7 @@ class TestAutoVariables : public TestFixture {
               "    ptr = &x;\n"
               "  }\n"
               "  int *ptr;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:11] -> [test.cpp:3:9] -> [test.cpp:4:5]: (error) Non-local variable 'ptr' will use pointer to local variable 'x'. [danglingLifetime]\n", errout_str());
 
         check("struct A {\n"
@@ -1037,7 +1049,7 @@ class TestAutoVariables : public TestFixture {
               "    ptr = 0;\n"
               "  }\n"
               "  int *ptr;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct R {\n" // #11393
@@ -1061,7 +1073,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    char str[100] = {0};\n"
               "    return str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:12] -> [test.cpp:3:10] -> [test.cpp:4:12]: (error) Returning pointer to local variable 'str' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -1071,7 +1083,7 @@ class TestAutoVariables : public TestFixture {
               "    char str[100] = {0};\n"
               "    char *p = str;\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:15] -> [test.cpp:3:10] -> [test.cpp:5:12]: (error) Returning pointer to local variable 'str' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -1083,7 +1095,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    char str[100] = {0};\n"
               "    return str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:12] -> [test.cpp:6:10] -> [test.cpp:7:12]: (error) Returning pointer to local variable 'str' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -1095,7 +1107,7 @@ class TestAutoVariables : public TestFixture {
               "    char temp[42];\n"
               "    char *tp = temp;\n"
               "    tp = format_reg(tp);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1104,7 +1116,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    char str[100] = {0};\n"
               "    return str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred {\n"
@@ -1114,7 +1126,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    char str[100] = {0};\n"
               "    return str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1124,14 +1136,14 @@ class TestAutoVariables : public TestFixture {
         check("char *foo() {\n"
               "    char q[] = \"AAAAAAAAAAAA\";\n"
               "    return &q[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12] -> [test.cpp:2:10] -> [test.cpp:3:12]: (error) Returning pointer to local variable 'q' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("char *foo()\n"
               "{\n"
               "    static char q[] = \"AAAAAAAAAAAA\";\n"
               "    return &q[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("char *foo()\n"
@@ -1140,7 +1152,7 @@ class TestAutoVariables : public TestFixture {
               "char *p;\n"
               "p = &q[1];\n"
               "return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5] -> [test.cpp:3:6] -> [test.cpp:6:8]: (error) Returning pointer to local variable 'q' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
     }
 
@@ -1148,7 +1160,7 @@ class TestAutoVariables : public TestFixture {
         check("char *foo() {\n"
               "    char x[10] = {0};\n"
               "    return x+5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:12] -> [test.cpp:2:10] -> [test.cpp:3:13]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -1156,7 +1168,7 @@ class TestAutoVariables : public TestFixture {
         check("char *foo(int y) {\n"
               "    char x[10] = {0};\n"
               "    return (x+8)-y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:13] -> [test.cpp:2:10] -> [test.cpp:3:17]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -1166,7 +1178,7 @@ class TestAutoVariables : public TestFixture {
         check("char *foo() {\n"
               "    int x[10] = {0};\n"
               "    return (char *)x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:20] -> [test.cpp:2:9] -> [test.cpp:3:12]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -1177,7 +1189,7 @@ class TestAutoVariables : public TestFixture {
               "    int x = 123;\n"
               "    int p = &x;\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
     }
 
@@ -1187,35 +1199,35 @@ class TestAutoVariables : public TestFixture {
               "    int s = 0;\n"
               "    int& x = s;\n"
               "    return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12] -> [test.cpp:5:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("std::string &foo()\n"
               "{\n"
               "    std::string s;\n"
               "    return s;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("std::vector<int> &foo()\n"
               "{\n"
               "    std::vector<int> v;\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("std::vector<int> &foo()\n"
               "{\n"
               "    static std::vector<int> v;\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int> &foo()\n"
               "{\n"
               "    thread_local std::vector<int> v;\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string hello()\n"
@@ -1226,7 +1238,7 @@ class TestAutoVariables : public TestFixture {
               "std::string &f()\n"
               "{\n"
               "    return hello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:17]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         // make sure scope is used in function lookup
@@ -1237,7 +1249,7 @@ class TestAutoVariables : public TestFixture {
               "};\n"
               "std::string &f() {\n"
               "    return hello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string hello() {\n"
@@ -1246,7 +1258,7 @@ class TestAutoVariables : public TestFixture {
               "\n"
               "std::string &f() {\n"
               "    return hello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:17]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("std::string hello() {\n"
@@ -1255,7 +1267,7 @@ class TestAutoVariables : public TestFixture {
               "\n"
               "std::string &f() {\n"
               "    return hello().substr(1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:26]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("class Foo;\n"
@@ -1265,7 +1277,7 @@ class TestAutoVariables : public TestFixture {
               "\n"
               "Foo& f() {\n"
               "    return hello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:17]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         // make sure function overloads are handled properly
@@ -1280,7 +1292,7 @@ class TestAutoVariables : public TestFixture {
               "\n"
               "Foo& f() {\n"
               "    return hello(true);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("Foo hello() {\n"
@@ -1289,7 +1301,7 @@ class TestAutoVariables : public TestFixture {
               "\n"
               "Foo& f() {\n" // Unknown type - might be a reference
               "    return hello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1301,7 +1313,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    std::string s;\n"
               "    return s;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("class Fred {\n"
@@ -1311,7 +1323,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    std::vector<int> v;\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("class Fred {\n"
@@ -1321,7 +1333,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    static std::vector<int> v;\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred {\n"
@@ -1334,7 +1346,7 @@ class TestAutoVariables : public TestFixture {
               "std::string &Fred::f()\n"
               "{\n"
               "    return hello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:17]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("class Fred {\n"
@@ -1348,7 +1360,7 @@ class TestAutoVariables : public TestFixture {
               "std::string &Fred::f()\n"
               "{\n"
               "    return hello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:11:17]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("class Bar;\n"
@@ -1357,7 +1369,7 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "Bar& bar() {\n"
               "    return foo();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:15]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("std::map<int, string> foo() {\n"
@@ -1365,7 +1377,7 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "std::map<int, string>& bar() {\n"
               "    return foo();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:15]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("Bar foo() {\n"
@@ -1373,13 +1385,13 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "Bar& bar() {\n" // Unknown type - might be a typedef to a reference type
               "    return foo();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         // Don't crash with function in unknown scope (#4076)
-        check("X& a::Bar() {}"
+        check("X& a::Bar() {}\n"
               "X& foo() {"
               "    return Bar();"
-              "}");
+              "}\n");
     }
 
     void returnReference3() {
@@ -1387,7 +1399,7 @@ class TestAutoVariables : public TestFixture {
               "    double ret = getValue();\n"
               "    rd = ret;\n"
               "    return rd;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1396,7 +1408,7 @@ class TestAutoVariables : public TestFixture {
         check("double a;\n"
               "double & f() {\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1416,7 +1428,7 @@ class TestAutoVariables : public TestFixture {
               "        const A &ra = pb->a;\n"
               "        return ra;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1424,7 +1436,7 @@ class TestAutoVariables : public TestFixture {
         check("Fred & create() {\n"
               "    Fred &fred(*new Fred);\n"
               "    return fred;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1433,14 +1445,14 @@ class TestAutoVariables : public TestFixture {
               "std::string &a(int);\n"
               "std::string &b() {\n"
               "    return a(12);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string &a(int);\n"
               "std::string a();\n"
               "std::string &b() {\n"
               "    return a(12);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1449,14 +1461,14 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<int>::iterator it = v.begin();\n"
               "    int& value = *it;\n"
               "    return value;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference9() {
         check("int& f(bool b, int& x, int& y) {\n"
               "    return b ? x : y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1465,14 +1477,14 @@ class TestAutoVariables : public TestFixture {
               "int& g() {\n"
               "    A a;\n"
               "    return a.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:15]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("class A { int& f() const; };\n"
               "int& g() {\n"
               "    A a;\n"
               "    return a.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1480,19 +1492,19 @@ class TestAutoVariables : public TestFixture {
         check("class A { static int f(); };\n"
               "int& g() {\n"
               "    return A::f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("class A { static int& f(); };\n"
               "int& g() {\n"
               "    return A::f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace A { int& f(); }\n"
               "int& g() {\n"
               "    return A::f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1500,14 +1512,14 @@ class TestAutoVariables : public TestFixture {
         check("class A { static int& f(); };\n"
               "auto g() {\n"
               "    return &A::f;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A { static int& f(); };\n"
               "auto g() {\n"
               "    auto x = &A::f;\n"
               "    return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1516,14 +1528,14 @@ class TestAutoVariables : public TestFixture {
               "void* vp = &v;\n"
               "int& foo(size_t i) {\n"
               "    return ((std::vector<int>*)vp)->at(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int> v;\n"
               "void* vp = &v;\n"
               "int& foo(size_t i) {\n"
               "    return static_cast<std::vector<int>*>(vp)->at(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1536,7 +1548,7 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "void* &A::f() {\n"
               "    return g()->m;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1549,7 +1561,7 @@ class TestAutoVariables : public TestFixture {
               "template <class T>\n"
               "const int& f(const T&) {\n"
               "    return f<T>();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template <class T>\n"
@@ -1557,19 +1569,19 @@ class TestAutoVariables : public TestFixture {
               "template <class T>\n"
               "const int& f(const T&) {\n"
               "    return g<T>();\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
     void returnReference16() {
         check("int& f(std::tuple<int>& x) {\n"
               "    return std::get<0>(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int& f(int x) {\n"
               "    return std::get<0>(std::make_tuple(x));\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
@@ -1577,7 +1589,7 @@ class TestAutoVariables : public TestFixture {
         check("auto g() -> int&;\n"
               "int& f() {\n"
               "    return g();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1586,7 +1598,7 @@ class TestAutoVariables : public TestFixture {
               "auto f(T& x) -> decltype(x);\n"
               "int& g(int* x) {\n"
               "    return f(*x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1594,7 +1606,7 @@ class TestAutoVariables : public TestFixture {
     void returnReference19() {
         check("struct C : B {\n"
               "    const B &f() const { return (const B &)*this; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1605,7 +1617,7 @@ class TestAutoVariables : public TestFixture {
               "};\n"
               "int& b() {\n"
               "    return a()();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("auto a() {\n"
@@ -1616,13 +1628,13 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "const int& c() {\n"
               "    return a()();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::function<int&()> a();\n"
               "int& b() {\n"
               "    return a()();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9889
@@ -1748,6 +1760,36 @@ class TestAutoVariables : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void returnReference29()
+    {
+        check("const std::string& f() {\n" // #12548
+              "    return std::string{};\n"
+              "}\n"
+              "const std::string& g() {\n"
+              "    return {};\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:23]: (error) Reference to temporary returned. [returnTempReference]\n"
+                      "[test.cpp:5:12]: (error) Reference to temporary returned. [returnTempReference]\n",
+                      errout_str());
+    }
+
+    void returnReference30() // #15094
+    {
+        check("int& f1(int& (*fp)()) { return fp(); }\n"
+              "void f2(int& (*fp)()) { int& r = fp(); r = 2; }\n"
+              "struct D {\n"
+              "    int& call() { return f(); }\n"
+              "    int& (*f)();\n"
+              "};\n"
+              "const int& f3(const int& (*fp)(int)) { return fp(1); }\n"
+              "int& (*g)();\n"
+              "int& f4() { return g(); }\n"
+              "typedef int& (*FP)();\n"
+              "int& f5(FP fp) { return fp(); }\n"
+              "int* f6(int& (*fp)()) { return &fp(); }\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void returnReferenceFunction() {
         check("int& f(int& a) {\n"
               "    return a;\n"
@@ -1755,7 +1797,7 @@ class TestAutoVariables : public TestFixture {
               "int& hello() {\n"
               "    int x = 0;\n"
               "    return f(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:14] -> [test.cpp:2:12] -> [test.cpp:6:12] -> [test.cpp:6:13]: (error) Reference to local variable returned. [returnReference]\n",
             errout_str());
@@ -1766,7 +1808,7 @@ class TestAutoVariables : public TestFixture {
               "int* hello() {\n"
               "    int x = 0;\n"
               "    return &f(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:14] -> [test.cpp:2:12] -> [test.cpp:6:13] -> [test.cpp:6:12] -> [test.cpp:5:9] -> [test.cpp:6:12]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -1776,7 +1818,7 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "int * g(int x) {\n"
               "    return f(&x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:14] -> [test.cpp:5:14] -> [test.cpp:4:13] -> [test.cpp:5:13]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("int* f(int * x) {\n"
@@ -1785,7 +1827,7 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "int * g(int x) {\n"
               "    return f(&x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int& a) {\n"
@@ -1794,7 +1836,7 @@ class TestAutoVariables : public TestFixture {
               "int& hello() {\n"
               "    int x = 0;\n"
               "    return f(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:13]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("int& f(int a) {\n"
@@ -1803,7 +1845,7 @@ class TestAutoVariables : public TestFixture {
               "int& hello() {\n"
               "    int x = 0;\n"
               "    return f(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("int f(int a) {\n"
@@ -1812,14 +1854,14 @@ class TestAutoVariables : public TestFixture {
               "int& hello() {\n"
               "    int x = 0;\n"
               "    return f(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:13]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("template<class T>\n"
               "int& f(int& x, T y) {\n"
               "    x += y;\n"
               "    return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1827,31 +1869,31 @@ class TestAutoVariables : public TestFixture {
         check("auto& f() {\n"
               "    std::vector<int> x;\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("auto& f() {\n"
               "    std::vector<int> x;\n"
               "    return x.front();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14] -> [test.cpp:3:19]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("std::vector<int> g();\n"
               "auto& f() {\n"
               "    return g().front();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16] -> [test.cpp:3:21]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("auto& f() {\n"
               "    return std::vector<int>{1}.front();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:32] -> [test.cpp:2:37]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("struct A { int foo; };\n"
               "int& f(std::vector<A> v) {\n"
               "    auto it = v.begin();\n"
               "    return it->foo;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:22] -> [test.cpp:4:14]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("template <class T, class K, class V>\n"
@@ -1885,7 +1927,7 @@ class TestAutoVariables : public TestFixture {
               "int& f(std::vector<A>& v) {\n"
               "    auto it = v.begin();\n"
               "    return it->foo;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static std::vector<int> A[2];\n"
@@ -1899,18 +1941,18 @@ class TestAutoVariables : public TestFixture {
     void returnReferenceLiteral() {
         check("const std::string &a() {\n"
               "    return \"foo\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("const std::string a() {\n"
               "    return \"foo\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const std::string& f(const std::string& x) { return x; }\n"
               "const std::string &a() {\n"
               "    return f(\"foo\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:42] -> [test.cpp:1:53] -> [test.cpp:3:12] -> [test.cpp:3:13]: (error) Reference to temporary returned. [returnTempReference]\n",
             errout_str());
@@ -1918,59 +1960,59 @@ class TestAutoVariables : public TestFixture {
         check("const char * f(const char * x) { return x; }\n"
               "const std::string &a() {\n"
               "    return f(\"foo\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
     }
 
     void returnReferenceCalculation() {
         check("const std::string &a(const std::string& str) {\n"
               "    return \"foo\" + str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("int& operator<<(int out, int path) {\n"
               "    return out << path;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("std::ostream& operator<<(std::ostream& out, const std::string& path) {\n"
               "    return out << path;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::ostream& operator<<(std::ostream* out, const std::string& path) {\n"
               "    return *out << path;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("Unknown1& operator<<(Unknown1 out, Unknown2 path) {\n"
               "    return out << path;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int& a(int b) {\n"
               "    return 2*(b+1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("const std::string &a(const std::string& str) {\n"
               "    return str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const std::string &a(int bar) {\n"
               "    return foo(bar + 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const std::string a(const std::string& str) {\n"
               "    return \"foo\" + str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int& incValue(int& value) {\n"
               "    return ++value;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1981,7 +2023,7 @@ class TestAutoVariables : public TestFixture {
               "    [](const Item& lhs, const Item& rhs) {\n"
               "        return false;\n"
               "    });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5844
@@ -1991,13 +2033,13 @@ class TestAutoVariables : public TestFixture {
               "    return var;\n"
               "  }();\n"
               "return s_var;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7583
         check("Command& foo() {\n"
               "  return f([]() -> int { return 1; });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2010,16 +2052,16 @@ class TestAutoVariables : public TestFixture {
               "        }\n"
               "    };\n"
               "    return _make(_Wrapper::call, pmf);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void returnReferenceRecursive() {
-        check("int& f() { return f(); }");
+        check("int& f() { return f(); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int& g(int& i) { return i; }\n"
-              "int& f() { return g(f()); }");
+              "int& f() { return g(f()); }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2029,7 +2071,7 @@ class TestAutoVariables : public TestFixture {
               "auto f() {\n"
               "    const int& x = h();\n"
               "    return [&] { return x; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18] -> [test.cpp:5:25] -> [test.cpp:4:16] -> [test.cpp:5:12]: (error) Returning lambda that captures local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("void g(int*);\n"
@@ -2037,7 +2079,7 @@ class TestAutoVariables : public TestFixture {
               "int* f() {\n"
               "    const int& x = h();\n"
               "    return &x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18] -> [test.cpp:5:12] -> [test.cpp:4:16] -> [test.cpp:5:12]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("void g(int*);\n"
@@ -2045,7 +2087,7 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "    int& x = h();\n"
               "    g(&x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:12] -> [test.cpp:5:7] -> [test.cpp:4:15] -> [test.cpp:5:7]: (error) Using pointer that is a temporary. [danglingTemporaryLifetime]\n"
             "[test.cpp:4:12] -> [test.cpp:5:8]: (error) Using reference to dangling temporary. [danglingTempReference]\n",
@@ -2056,7 +2098,7 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "    const int& x = h();\n"
               "    g(&x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Data {\n"
@@ -2065,7 +2107,7 @@ class TestAutoVariables : public TestFixture {
               "const char* foo() {\n"
               "    const Data& data = getData();\n"
               "    return data.path.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2074,7 +2116,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    static int &r = k;\n"
               "    return r;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19] -> [test.cpp:3:17]: (error) Non-local reference variable 'r' to local variable 'k' [danglingReference]\n",
                       errout_str());
 
@@ -2082,7 +2124,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    static int &r = k;\n"
               "    return r;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2250,7 +2292,7 @@ class TestAutoVariables : public TestFixture {
               "   {\n"
               "      pNum = apNum;\n"
               "   }\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -2259,28 +2301,28 @@ class TestAutoVariables : public TestFixture {
         check("int* foo(int y)\n"
               "{\n"
               "  return &y;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:1:14] -> [test.cpp:3:10]: (error) Returning pointer to local variable 'y' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("int ** foo(int * y)\n"
               "{\n"
               "  return &y;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:1:18] -> [test.cpp:3:10]: (error) Returning pointer to local variable 'y' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("const int * foo(const int & y)\n"
               "{\n"
               "  return &y;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
         check("int * foo(int * y)\n"
               "{\n"
               "  return y;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -2290,7 +2332,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    struct s *r = f();\n"
               "    *q = &r->p;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -2301,7 +2343,7 @@ class TestAutoVariables : public TestFixture {
               "  const_tree_iterator& parent() {\n"
               "    return const_tree_iterator(foo);\n"
               "  }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:31]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
     }
 
@@ -2312,7 +2354,7 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "void opened_cb () {\n"
               "	g_signal_connect (G_CALLBACK (removed_cb));\n"
-              "}");
+              "}\n");
     }
 
     void danglingLifetimeLambda() {
@@ -2320,30 +2362,30 @@ class TestAutoVariables : public TestFixture {
               "    int a = 1;\n"
               "    auto l = [&](){ return a; };\n"
               "    return l;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:28] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f() {\n"
               "    int a = 1;\n"
               "    return [&](){ return a; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:26] -> [test.cpp:2:9] -> [test.cpp:3:12]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f(int a) {\n"
               "    return [&](){ return a; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:26] -> [test.cpp:1:12] -> [test.cpp:2:12]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f(int a) {\n"
               "    auto p = &a;\n"
               "    return [=](){ return p; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14] -> [test.cpp:3:26] -> [test.cpp:1:12] -> [test.cpp:3:12]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto g(int& a) {\n"
               "    int p = a;\n"
               "    return [&](){ return p; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:26] -> [test.cpp:2:9] -> [test.cpp:3:12]: (error) Returning lambda that captures local variable 'p' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f() {\n"
@@ -2351,7 +2393,7 @@ class TestAutoVariables : public TestFixture {
               "        int a = 1;\n"
               "        return [&](){ return a; };\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:30] -> [test.cpp:3:13] -> [test.cpp:4:16]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f(int b) {\n"
@@ -2359,30 +2401,30 @@ class TestAutoVariables : public TestFixture {
               "        a += b;\n"
               "        return [&](){ return a; };\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:30] -> [test.cpp:2:20] -> [test.cpp:4:16]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto g(int& a) {\n"
               "    return [&](){ return a; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("auto g(int a) {\n"
               "    auto p = a;\n"
               "    return [=](){ return p; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("auto g(int& a) {\n"
               "    auto p = a;\n"
               "    return [=](){ return p; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("auto g(int& a) {\n"
               "    int& p = a;\n"
               "    return [&](){ return p; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<class F>\n"
@@ -2390,7 +2432,7 @@ class TestAutoVariables : public TestFixture {
               "auto f() {\n"
               "    int x;\n"
               "    return g([&]() { return x; });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("auto f() {\n"
@@ -2463,28 +2505,28 @@ class TestAutoVariables : public TestFixture {
         check("auto f(const std::vector<int>& x) {\n"
               "    auto it = x.begin();\n"
               "    return it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int>::iterator f() {\n"
               "    std::vector<int> x;\n"
               "    auto it = x.begin();\n"
               "    return it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:22] -> [test.cpp:2:22] -> [test.cpp:4:12]: (error) Returning iterator to local container 'x' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f() {\n"
               "    std::vector<int> x;\n"
               "    auto it = std::begin(x);\n"
               "    return it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25] -> [test.cpp:2:22] -> [test.cpp:4:12]: (error) Returning iterator to local container 'x' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("int* f() {\n"
               "    std::vector<int> x;\n"
               "    auto p = x.data();\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:20] -> [test.cpp:2:22] -> [test.cpp:4:12]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2493,7 +2535,7 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<int> x;\n"
               "    auto p = &x[0];\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:14] -> [test.cpp:2:22] -> [test.cpp:4:12]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2502,7 +2544,7 @@ class TestAutoVariables : public TestFixture {
               "int* f(std::vector<A> v) {\n"
               "    auto it = v.begin();\n"
               "    return &it->foo;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:22] -> [test.cpp:4:12] -> [test.cpp:2:23] -> [test.cpp:4:12]: (error) Returning pointer to local variable 'v' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2510,14 +2552,14 @@ class TestAutoVariables : public TestFixture {
         check("std::vector<int>::iterator f(std::vector<int> x) {\n"
               "    auto it = x.begin();\n"
               "    return it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22] -> [test.cpp:1:47] -> [test.cpp:3:12]: (error) Returning iterator to local container 'x' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f() {\n"
               "    std::vector<int> x;\n"
               "    auto it = x.begin();\n"
               "    return std::next(it);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:22] -> [test.cpp:2:22] -> [test.cpp:4:21]: (error) Returning iterator to local container 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2526,7 +2568,7 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<int> x;\n"
               "    auto it = x.begin();\n"
               "    return it + 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:22] -> [test.cpp:2:22] -> [test.cpp:4:15]: (error) Returning iterator to local container 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2535,7 +2577,7 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<int> x;\n"
               "    auto it = x.begin();\n"
               "    return std::next(it + 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:22] -> [test.cpp:4:25] -> [test.cpp:2:22] -> [test.cpp:4:21]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2545,7 +2587,7 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<int*> v;\n"
               "    v.push_back(&i);\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:17] -> [test.cpp:4:17] -> [test.cpp:2:9] -> [test.cpp:5:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2557,7 +2599,7 @@ class TestAutoVariables : public TestFixture {
               "    v.push_back(&i);\n"
               "    r.assign(v.begin(), v.end());\n"
               "    return r;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:5:17] -> [test.cpp:5:17] -> [test.cpp:5:5] -> [test.cpp:3:9] -> [test.cpp:7:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2568,7 +2610,7 @@ class TestAutoVariables : public TestFixture {
               "        int i;\n"
               "        v.push_back(&i);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS(
             "[test.cpp:5:21] -> [test.cpp:5:21] -> [test.cpp:4:13] -> [test.cpp:5:9]: (error) Non-local variable 'v' will use object that points to local variable 'i'. [danglingLifetime]\n",
             errout_str());
@@ -2580,7 +2622,7 @@ class TestAutoVariables : public TestFixture {
               "        int * p = &i;\n"
               "        v.push_back(p);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS(
             "[test.cpp:5:19] -> [test.cpp:6:21] -> [test.cpp:4:13] -> [test.cpp:6:9]: (error) Non-local variable 'v' will use object that points to local variable 'i'. [danglingLifetime]\n",
             errout_str());
@@ -2593,7 +2635,7 @@ class TestAutoVariables : public TestFixture {
               "        v.push_back(&x);\n"
               "        m.insert(m.end(), v.begin(), v.end());\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS(
             "[test.cpp:6:21] -> [test.cpp:6:21] -> [test.cpp:6:9] -> [test.cpp:4:13] -> [test.cpp:7:9]: (error) Non-local variable 'm' will use object that points to local variable 'x'. [danglingLifetime]\n"
             "[test.cpp:6:21] -> [test.cpp:6:21] -> [test.cpp:6:9] -> [test.cpp:4:13] -> [test.cpp:7:18]: (error) Non-local variable 'm' will use object that points to local variable 'x'. [danglingLifetime]\n", // duplicate
@@ -2604,7 +2646,7 @@ class TestAutoVariables : public TestFixture {
               "        return it;\n"
               "    }\n"
               "    return {};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:26] -> [test.cpp:1:47] -> [test.cpp:3:16]: (error) Returning iterator to local container 'v' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2612,7 +2654,7 @@ class TestAutoVariables : public TestFixture {
         check("const char * f() {\n"
               "   std::string ba(\"hello\");\n"
               "   return ba.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:19] -> [test.cpp:2:16] -> [test.cpp:3:19]: (error) Returning pointer to local variable 'ba' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2634,7 +2676,7 @@ class TestAutoVariables : public TestFixture {
         check("std::vector<int> g();\n"
               "auto f() {\n"
               "    return g().begin();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:21] -> [test.cpp:3:21]: (error) Returning iterator that will be invalid when returning. [returnDanglingLifetime]\n",
                       errout_str());
 
@@ -2642,15 +2684,14 @@ class TestAutoVariables : public TestFixture {
               "std::vector<int>::iterator f() {\n"
               "    auto it = g().begin();\n"
               "    return it;\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:3:24] -> [test.cpp:3:16] -> [test.cpp:4:5]: (error) Using iterator that is a temporary. [danglingTemporaryLifetime]\n"
-                      "[test.cpp:3:24] -> [test.cpp:4:12]: (error) Returning iterator that will be invalid when returning. [returnDanglingLifetime]\n",
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:24] -> [test.cpp:3:16] -> [test.cpp:4:5]: (error) Using iterator that is a temporary. [danglingTemporaryLifetime]\n",
                       errout_str());
 
         check("std::vector<int> g();\n"
               "int& f() {\n"
               "    return *g().begin();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:22] -> [test.cpp:3:12]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("struct A {\n"
@@ -2659,7 +2700,7 @@ class TestAutoVariables : public TestFixture {
               "        char s[3];\n"
               "        v.push_back(s);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<std::string> f() {\n"
@@ -2667,46 +2708,46 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<std::string> v;\n"
               "    v.push_back(s);\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("auto f() {\n"
               "  static std::vector<int> x;\n"
               "  return x.begin();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string g() {\n"
               "    std::vector<char> v;\n"
               "    return v.data();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int>::iterator f(std::vector<int>* v) {\n"
               "    return v->begin();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int>::iterator f(std::vector<int>* v) {\n"
               "    std::vector<int>* v = new std::vector<int>();\n"
               "    return v->begin();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(std::vector<int> v) {\n"
               "    return *v.begin();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(std::vector<int> v) {\n"
               "    return v.end() - v.begin();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("auto g() {\n"
               "    std::vector<char> v;\n"
               "    return {v, [v]() { return v.data(); }};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<class F>\n"
@@ -2714,7 +2755,7 @@ class TestAutoVariables : public TestFixture {
               "auto f() {\n"
               "    std::vector<char> v;\n"
               "    return g([&]() { return v.data(); });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int> g();\n"
@@ -2724,7 +2765,7 @@ class TestAutoVariables : public TestFixture {
               "        std::vector<int> v = g();\n"
               "        m.insert(m.end(), v.begin(), v.end());\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
@@ -2734,7 +2775,7 @@ class TestAutoVariables : public TestFixture {
               "        v.insert(a, a+1);\n"
               "    }\n"
               "    return v.back() == 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
@@ -2745,7 +2786,7 @@ class TestAutoVariables : public TestFixture {
               "    struct B {};\n"
               "    std::map< S, B > m1;\n"
               "    std::map< S, B > m2;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -2754,33 +2795,33 @@ class TestAutoVariables : public TestFixture {
               "    void f() {\n"
               "        v.push_back(&x);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("size_t f(const std::string& x) {\n"
               "    std::string y = \"x\";\n"
               "    return y.find(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string* f();\n"
               "const char* g() {\n"
               "    std::string* var = f();\n"
               "    return var->c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string f() {\n"
               "    std::vector<char> data{};\n"
               "    data.push_back('a');\n"
               "    return std::string{ data.data(), data.size() };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<char*> f() {\n"
               "    char a = 0;\n"
               "    return std::vector<char*>{&a};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:31] -> [test.cpp:3:31] -> [test.cpp:2:10] -> [test.cpp:3:30]: (error) Returning object that points to local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("std::vector<int>* g();\n"
@@ -2915,6 +2956,39 @@ class TestAutoVariables : public TestFixture {
               "    return it;\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:3:44] -> [test.cpp:2:22] -> [test.cpp:4:12]: (error) Returning iterator to local container 'x' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
+
+        check("void f(std::vector<int*>& m) {\n"
+              "    int x;\n"
+              "    m.push_back(&x);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:17] -> [test.cpp:3:17] -> [test.cpp:2:9] -> [test.cpp:3:5]: (error) Non-local variable 'm' will use object that points to local variable 'x'. [danglingLifetime]\n", errout_str());
+
+        check("struct P {\n"
+              "    int h() const;\n"
+              "    int x;\n"
+              "    int& r;\n"
+              "};\n"
+              "int f(const P& p) {\n"
+              "    return p.h();\n"
+              "}\n"
+              "struct C {\n"
+              "    void g() {\n"
+              "        int i = 1;\n"
+              "        P q(m, i);\n"
+              "        f(q);\n"
+              "    }\n"
+              "    int m;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("std::string to_string(const char* p) {\n" // #14818
+              "    return p;\n"
+              "}\n"
+              "std::string get() {\n"
+              "    std::string s;\n"
+              "    return to_string(s.c_str());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void danglingLifetimeContainerView()
@@ -3142,6 +3216,14 @@ class TestAutoVariables : public TestFixture {
         ASSERT_EQUALS(
             "[test.cpp:3:12] -> [test.cpp:2:10] -> [test.cpp:3:12]: (error) Returning pointer to local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
+
+        check("std::string_view f() {\n" // #14465
+              "    std::vector<std::string> v;\n"
+              "    return *v.begin();\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:12] -> [test.cpp:3:12]: (error) Returning object that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
     }
 
     void danglingLifetimeUniquePtr()
@@ -3176,26 +3258,35 @@ class TestAutoVariables : public TestFixture {
               "    return s[0].p.get();\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("std::unique_ptr<int> g_p;\n" // #14958
+              "int* f() {\n"
+              "    std::unique_ptr<int> tmp = std::make_unique<int>();\n"
+              "    int* p = tmp.get();\n"
+              "    g_p = std::move(tmp);\n"
+              "    return p;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
     void danglingLifetime() {
         check("auto f() {\n"
               "    std::vector<int> a;\n"
               "    auto it = a.begin();\n"
               "    return [=](){ return it; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:22] -> [test.cpp:4:26] -> [test.cpp:2:22] -> [test.cpp:4:12]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f(std::vector<int> a) {\n"
               "    auto it = a.begin();\n"
               "    return [=](){ return it; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22] -> [test.cpp:3:26] -> [test.cpp:1:25] -> [test.cpp:3:12]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("struct e {};\n"
               "e * j() {\n"
               "    e c[20];\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:12] -> [test.cpp:3:7] -> [test.cpp:4:12]: (error) Returning pointer to local variable 'c' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3203,12 +3294,12 @@ class TestAutoVariables : public TestFixture {
         check("auto f(std::vector<int>& a) {\n"
               "    auto it = a.begin();\n"
               "    return [=](){ return it; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int * f(int a[]) {\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -3216,14 +3307,14 @@ class TestAutoVariables : public TestFixture {
               "        uint32_t f[6];\n"
               "    } d;\n"
               "    uint32_t *a = d.f;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Don't decay std::array
         check("std::array<char, 1> f() {\n"
               "    std::array<char, 1> x;\n"
               "    return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Make sure we don't hang
@@ -3231,7 +3322,7 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "    using T = A[3];\n"
               "    A &&a = T{1, 2, 3}[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Make sure we don't hang
@@ -3239,7 +3330,7 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "    using T = A[3];\n"
               "    A &&a = T{1, 2, 3}[1]();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Make sure we don't hang
@@ -3247,7 +3338,7 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "    using T = A[3];\n"
               "    A &&a = T{1, 2, 3}[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Make sure we don't hang
@@ -3255,7 +3346,7 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "    using T = A[3];\n"
               "    A &&a = T{1, 2, 3}[1]();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Crash #8872
@@ -3263,14 +3354,14 @@ class TestAutoVariables : public TestFixture {
               "  void operator()(b c) override {\n"
               "    d(c, [&] { c->e });\n"
               "  }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
               "  void operator()(b c) override {\n"
               "    d(c, [=] { c->e });\n"
               "  }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
@@ -3279,7 +3370,7 @@ class TestAutoVariables : public TestFixture {
               "a f() {\n"
               "    char c[20];\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
@@ -3289,7 +3380,7 @@ class TestAutoVariables : public TestFixture {
               "    char c[20];\n"
               "    a d = c;\n"
               "    return d;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -3297,14 +3388,14 @@ class TestAutoVariables : public TestFixture {
               "        std::vector<int> v;\n"
               "        auto g() { return v.end(); }\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int * f(std::vector<int>& v) {\n"
               "    for(int & x : v)\n"
               "        return &x;\n"
               "    return nullptr;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9275
@@ -3316,7 +3407,7 @@ class TestAutoVariables : public TestFixture {
               "    char buf[1024];\n"
               "    const char* msg = buf;\n"
               "    m = msg;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9201
@@ -3324,14 +3415,14 @@ class TestAutoVariables : public TestFixture {
               "    struct a { int m; };\n"
               "    static a b{0};\n"
               "    return &b.m;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9453
         check("int *ptr;\n"
               "void foo(int arr[]) {\n"
               "    ptr = &arr[2];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9639
@@ -3342,7 +3433,7 @@ class TestAutoVariables : public TestFixture {
               "const char * f() {\n"
               "  const Fred &fred = getFred();\n"
               "  return fred.s.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9534
@@ -3352,14 +3443,14 @@ class TestAutoVariables : public TestFixture {
               "int* f(int i, std::vector<A>& v) {\n"
               "    A& y = v[i];\n"
               "    return &y.x[i];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9712
         check("std::string f(const char *str) {\n"
               "    char value[256];\n"
               "    return value;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9770
@@ -3518,7 +3609,7 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "    *p = 0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5:13] -> [test.cpp:2:9] -> [test.cpp:7:6]: (error) Static variable 'p' will use pointer to local variable 'a'. [danglingLifetime]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:13] -> [test.cpp:4:9] -> [test.cpp:2:9] -> [test.cpp:7:6]: (error) Static variable 'p' will use pointer to local variable 'a'. [danglingLifetime]\n", errout_str());
 
         // #10902
         check("void f() {\n"
@@ -3533,7 +3624,7 @@ class TestAutoVariables : public TestFixture {
         check("auto f() {\n"
               "    int a;\n"
               "    return std::ref(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:21] -> [test.cpp:2:9] -> [test.cpp:3:20]: (error) Returning object that points to local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3541,7 +3632,7 @@ class TestAutoVariables : public TestFixture {
         check("auto f() {\n"
               "    int a;\n"
               "    return std::make_tuple(std::ref(a));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:37] -> [test.cpp:3:36] -> [test.cpp:2:9] -> [test.cpp:3:27]: (error) Returning object that points to local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3553,7 +3644,7 @@ class TestAutoVariables : public TestFixture {
               "auto g() {\n"
               "    std::vector<int> v;\n"
               "    return by_value(v.begin());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:28] -> [test.cpp:7:28] -> [test.cpp:3:12] -> [test.cpp:3:25] -> [test.cpp:6:22] -> [test.cpp:7:20]: (error) Returning object that points to local variable 'v' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3576,7 +3667,7 @@ class TestAutoVariables : public TestFixture {
               "auto f() {\n"
               "    int i = 0;\n"
               "    return by_ref(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:12] -> [test.cpp:1:19] -> [test.cpp:2:25] -> [test.cpp:6:19] -> [test.cpp:5:9] -> [test.cpp:6:18]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3594,7 +3685,7 @@ class TestAutoVariables : public TestFixture {
               "    int a;\n"
               "    std::tie(a) = x;\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::pair<std::string, std::string>\n"
@@ -3843,7 +3934,7 @@ class TestAutoVariables : public TestFixture {
               "A f() {\n"
               "    int i = 0;\n"
               "    return A{i, i};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:14] -> [test.cpp:6:9] -> [test.cpp:7:13]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3855,7 +3946,7 @@ class TestAutoVariables : public TestFixture {
               "A f() {\n"
               "    int i = 0;\n"
               "    return {i, i};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:13] -> [test.cpp:6:9] -> [test.cpp:7:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3868,7 +3959,7 @@ class TestAutoVariables : public TestFixture {
               "    int i = 0;\n"
               "    A r{i, i};\n"
               "    return r;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:9] -> [test.cpp:6:9] -> [test.cpp:8:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3881,7 +3972,7 @@ class TestAutoVariables : public TestFixture {
               "    int i = 0;\n"
               "    A r = {i, i};\n"
               "    return r;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:12] -> [test.cpp:6:9] -> [test.cpp:8:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3893,7 +3984,7 @@ class TestAutoVariables : public TestFixture {
               "A f(int& x) {\n"
               "    int i = 0;\n"
               "    return A{i, x};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:14] -> [test.cpp:6:9] -> [test.cpp:7:13]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3905,7 +3996,7 @@ class TestAutoVariables : public TestFixture {
               "A f(int& x) {\n"
               "    int i = 0;\n"
               "    return A{x, i};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -3914,14 +4005,14 @@ class TestAutoVariables : public TestFixture {
               "};\n"
               "A f(int& x) {\n"
               "    return A{x, x};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int i; const int& j; };\n"
               "A f(int& x) {\n"
               "    int y = 0;\n"
               "    return A{y, x};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
@@ -3957,6 +4048,15 @@ class TestAutoVariables : public TestFixture {
             "[test.cpp:6:30] -> [test.cpp:6:30] -> [test.cpp:6:21] -> [test.cpp:5:21] -> [test.cpp:8:12]: (error) Returning object that points to local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
 
+        check("struct S { const std::string& r; };\n" // #14209
+              "S f() {\n"
+              "    std::string s;\n"
+              "    return S{ s };\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:15] -> [test.cpp:3:17] -> [test.cpp:4:13]: (error) Returning object that points to local variable 's' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
+
         check("struct A { int& x; };\n" // #14247
               "A f() {\n"
               "    int x = 0;\n"
@@ -3998,6 +4098,14 @@ class TestAutoVariables : public TestFixture {
               "    struct S s = { .i = 0, true };\n"
               "}\n"); // don't crash
         ASSERT_EQUALS("", errout_str());
+
+        check("struct A { int& r; };\n" // #14772
+              "A* f() {\n"
+              "    int x = 0;\n"
+              "    return new A{ x };\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:19] -> [test.cpp:3:9] -> [test.cpp:4:17]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
     }
 
     void danglingLifetimeInitList() {
@@ -4005,34 +4113,34 @@ class TestAutoVariables : public TestFixture {
               "    int i = 0;\n"
               "    std::vector<int*> v = {&i, &i};\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:28] -> [test.cpp:3:28] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n"
-            "[test.cpp:3:32] -> [test.cpp:3:32] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n", // duplicate
+            "[test.cpp:3:32] -> [test.cpp:3:32] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
 
         check("std::vector<int*> f() {\n"
               "    int i = 0;\n"
               "    std::vector<int*> v{&i, &i};\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:25] -> [test.cpp:3:25] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n"
-            "[test.cpp:3:29] -> [test.cpp:3:29] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n", // duplicate
+            "[test.cpp:3:29] -> [test.cpp:3:29] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
 
         check("std::vector<int*> f() {\n"
               "    int i = 0;\n"
               "    return {&i, &i};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:13] -> [test.cpp:3:13] -> [test.cpp:2:9] -> [test.cpp:3:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n"
-            "[test.cpp:3:17] -> [test.cpp:3:17] -> [test.cpp:2:9] -> [test.cpp:3:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n", // duplicate
+            "[test.cpp:3:17] -> [test.cpp:3:17] -> [test.cpp:2:9] -> [test.cpp:3:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
 
         check("std::vector<int*> f(int& x) {\n"
               "    return {&x, &x};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<std::string> f() {\n"
@@ -4040,7 +4148,7 @@ class TestAutoVariables : public TestFixture {
               "    x.insert(\"1\");\n"
               "    x.insert(\"2\");\n"
               "    return { x.begin(), x.end() };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4049,7 +4157,7 @@ class TestAutoVariables : public TestFixture {
               "A f() {\n"
               "   std::string ba(\"hello\");\n"
               "   return ba.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { A(const char *a); };\n"
@@ -4057,7 +4165,7 @@ class TestAutoVariables : public TestFixture {
               "   std::string ba(\"hello\");\n"
               "   A bp = ba.c_str();\n"
               "   return bp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { A(const char *a); };\n"
@@ -4066,7 +4174,7 @@ class TestAutoVariables : public TestFixture {
               "   std::vector<A> v;\n"
               "   v.push_back(ba.c_str());\n"
               "   return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string f(const std::string& x) {\n"
@@ -4074,7 +4182,7 @@ class TestAutoVariables : public TestFixture {
               "  if (!x.empty())\n"
               "    return x + c;\n"
               "  return \"\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string f(const std::string& x) {\n"
@@ -4082,7 +4190,7 @@ class TestAutoVariables : public TestFixture {
               "  if (!x.empty())\n"
               "    return c + 1;\n"
               "  return \"\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4105,7 +4213,7 @@ class TestAutoVariables : public TestFixture {
               "void f(int& i) {\n"
               "    int* x = &g(0);\n"
               "    i += *x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:26] -> [test.cpp:2:12] -> [test.cpp:5:15] -> [test.cpp:5:14] -> [test.cpp:5:17] -> [test.cpp:6:11]: (error) Using pointer that is a temporary. [danglingTemporaryLifetime]\n",
             errout_str());
@@ -4115,7 +4223,7 @@ class TestAutoVariables : public TestFixture {
               "    const char* b = a.toStdString().c_str();\n"
               "    QString c = b;\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:42] -> [test.cpp:3:34] -> [test.cpp:4:15]: (error) Using pointer that is a temporary. [danglingTemporaryLifetime]\n",
                       errout_str());
 
@@ -4123,7 +4231,7 @@ class TestAutoVariables : public TestFixture {
               "    const char *x = s.substr(1,2).c_str();\n"
               "    auto i = s.substr(4,5).begin();\n"
               "    return *i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:33] -> [test.cpp:3:22] -> [test.cpp:4:13]: (error) Using iterator that is a temporary. [danglingTemporaryLifetime]\n",
                       errout_str());
 
@@ -4131,7 +4239,7 @@ class TestAutoVariables : public TestFixture {
               "    std::stringstream tmp;\n"
               "    const std::string &str = tmp.str();\n"
               "    return std::string(str.c_str(), 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int get_value();\n"
@@ -4240,7 +4348,7 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<char*> cargs = f({ \"0\", \"0\" });\n"
               "    (void)cargs;\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:6:12] -> [test.cpp:4:47] -> [test.cpp:3:22] -> [test.cpp:1:58] -> [test.cpp:4:40] -> [test.cpp:9:34] -> [test.cpp:9:34] -> [test.cpp:10:11]: (error) Using object that is a temporary. [danglingTemporaryLifetime]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:6:12] -> [test.cpp:4:47] -> [test.cpp:3:22] -> [test.cpp:1:58] -> [test.cpp:4:40] -> [test.cpp:3:24] -> [test.cpp:9:34] -> [test.cpp:9:34] -> [test.cpp:10:11]: (error) Using object that is a temporary. [danglingTemporaryLifetime]\n", errout_str());
 
         check("struct C {\n" // #9194
               "    const int& m;\n"
@@ -4380,6 +4488,116 @@ class TestAutoVariables : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:5:14] -> [test.cpp:5:18] -> [test.cpp:6:7]: (error) Using pointer that is a temporary. [danglingTemporaryLifetime]\n",
                       errout_str());
+
+        check("struct A { const int* data[2]; };\n"
+              "A g() {\n"
+              "    int x = 0;\n"
+              "    A a;\n"
+              "    a.data[0] = &x;\n"
+              "    return a;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:17] -> [test.cpp:3:9] -> [test.cpp:6:12]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
+
+        check("struct A { const int* data[2]; };\n"
+              "A g() {\n"
+              "    int x = 0;\n"
+              "    A a[2];\n"
+              "    a[0].data[0] = &x;\n"
+              "    return a[0];\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:20] -> [test.cpp:3:9] -> [test.cpp:6:13]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
+
+        check("struct A { const int* data[2]; };\n"
+              "A* g() {\n"
+              "    int x = 0;\n"
+              "    static A arr[2];\n"
+              "    arr[0].data[0] = &x;\n"
+              "    return arr;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:22] -> [test.cpp:3:9] -> [test.cpp:6:12]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
+
+        check("struct A { const int* p; };\n"
+              "A g(int i) {\n"
+              "    int x = 0;\n"
+              "    A arr[2];\n"
+              "    arr[i].p = &x;\n"
+              "    return arr[i];\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:16] -> [test.cpp:3:9] -> [test.cpp:6:15]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
+
+        check("struct A { const int* p; };\n"
+              "A* g(int i) {\n"
+              "    int x = 0;\n"
+              "    static A arr[2];\n"
+              "    arr[i].p = &x;\n"
+              "    return arr;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:16] -> [test.cpp:3:9] -> [test.cpp:6:12]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
+
+        check("struct A { const int* p; };\n"
+              "struct B { A arr[2]; };\n"
+              "B g(int i) {\n"
+              "    int x = 0;\n"
+              "    B b;\n"
+              "    b.arr[i].p = &x;\n"
+              "    return b;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:18] -> [test.cpp:4:9] -> [test.cpp:7:12]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
+
+        check("struct A { const int* p; };\n"
+              "A* g() {\n"
+              "    int x = 0;\n"
+              "    static A a;\n"
+              "    A* ap = &a;\n"
+              "    ap->p = &x;\n"
+              "    (*ap).p = &x;\n"
+              "    return ap;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct A { int* a; int* b; };\n"
+              "static A g;\n"
+              "int* f() {\n"
+              "    int x = 0;\n"
+              "    g.a = &x;\n"
+              "    return g.b;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:11] -> [test.cpp:4:9] -> [test.cpp:5:6]: (error) Non-local variable 'g.a' will use pointer to local variable 'x'. [danglingLifetime]\n",
+                      errout_str());
+
+        check("struct A { int* a; int* b; };\n"
+              "static A g;\n"
+              "int* f() {\n"
+              "    int x = 0;\n"
+              "    g.a = &x;\n"
+              "    return g.a;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:11] -> [test.cpp:4:9] -> [test.cpp:5:6]: (error) Non-local variable 'g.a' will use pointer to local variable 'x'. [danglingLifetime]\n"
+                      "[test.cpp:5:11] -> [test.cpp:4:9] -> [test.cpp:6:13]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
+
+        check("int* f() {\n" // #11168
+              "    auto x = get();\n"
+              "    return &*x.a;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int a[1]; };\n"
+              "int& f(S s) {\n"
+              "    return *s.a;\n"
+              "}\n"
+              "int* g(S s) {\n"
+              "    return &*s.a;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12]: (error) Reference to local variable returned. [returnReference]\n"
+                      "[test.cpp:6:12] -> [test.cpp:5:10] -> [test.cpp:6:12]: (error) Returning pointer to local variable 's' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
     }
 
     void danglingLifetimeClassMemberFunctions()
@@ -4508,8 +4726,8 @@ class TestAutoVariables : public TestFixture {
               "        f = [&]{ return b; };\n"
               "    }\n"
               "    f();\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:5:25] -> [test.cpp:4:13] -> [test.cpp:7:5]: (error) Using lambda that captures local variable 'b' that is out of scope. [invalidLifetime]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:25] -> [test.cpp:3:11] -> [test.cpp:4:13] -> [test.cpp:7:5]: (error) Using lambda that captures local variable 'b' that is out of scope. [invalidLifetime]\n", errout_str());
 
         check("void f(bool b)  {\n"
               "  int* x;\n"
@@ -4518,9 +4736,9 @@ class TestAutoVariables : public TestFixture {
               "    x = y;\n"
               "  }\n"
               "  x[3];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:5:9] -> [test.cpp:4:9] -> [test.cpp:7:3]: (error) Using pointer to local variable 'y' that is out of scope. [invalidLifetime]\n",
+            "[test.cpp:5:9] -> [test.cpp:3:6] -> [test.cpp:4:9] -> [test.cpp:7:3]: (error) Using pointer to local variable 'y' that is out of scope. [invalidLifetime]\n",
             errout_str());
 
         check("void foo(int a) {\n"
@@ -4530,7 +4748,7 @@ class TestAutoVariables : public TestFixture {
               "        f = [&]{ return b; };\n"
               "        f();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
@@ -4539,7 +4757,7 @@ class TestAutoVariables : public TestFixture {
               "};\n"
               "void a::b() {\n"
               "  c.end()\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void b(char f[], char c[]) {\n"
@@ -4547,7 +4765,7 @@ class TestAutoVariables : public TestFixture {
               "    std::string e;\n"
               "    b(f, e.c_str())\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
@@ -4557,11 +4775,11 @@ class TestAutoVariables : public TestFixture {
               "        s = buf;\n"
               "    }\n"
               "    std::cout << s;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int &a[];\n"
-              "void b(){int *c = a};");
+              "void b(){int *c = a};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -4575,7 +4793,7 @@ class TestAutoVariables : public TestFixture {
               "            return y.x;\n"
               "        };\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace test {\n"
@@ -4684,6 +4902,21 @@ class TestAutoVariables : public TestFixture {
               "}\n");
         ASSERT_EQUALS("", errout_str());
 
+        check("struct S {\n"
+              "    int* a[1];\n"
+              "    int* b[1][1];\n"
+              "};\n"
+              "void f(S* s) {\n"
+              "    int i = 0;\n"
+              "    s->a[0] = &i;\n"
+              "}\n"
+              "void g(S* s) {\n"
+              "    int i = 0;\n"
+              "    s->b[0][0] = &i;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:7:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n"
+                      "[test.cpp:11:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n",
+                      errout_str());
     }
 
     void deadPointer() {
@@ -4694,8 +4927,8 @@ class TestAutoVariables : public TestFixture {
               "    p = &x;\n"
               "  }\n"
               "  *p = 0;\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9] -> [test.cpp:7:4]: (error) Using pointer to local variable 'x' that is out of scope. [invalidLifetime]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:3:7] -> [test.cpp:4:9] -> [test.cpp:7:4]: (error) Using pointer to local variable 'x' that is out of scope. [invalidLifetime]\n", errout_str());
 
         // FP: don't warn in subfunction
         check("void f(struct KEY *key) {\n"
@@ -4711,7 +4944,7 @@ class TestAutoVariables : public TestFixture {
               "  } else {\n"
               "  }\n"
               "  f(tmp);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Don't warn about references (#6399)
@@ -4723,7 +4956,7 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "    if (former_hover != pitem)\n"
               "        dosth();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -4734,9 +4967,9 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "    if (former_hover != pitem)\n"
               "        dosth();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:5:24] -> [test.cpp:3:47] -> [test.cpp:4:26] -> [test.cpp:7:9]: (error) Using pointer to local variable 'item' that is out of scope. [invalidLifetime]\n",
+            "[test.cpp:5:24] -> [test.cpp:3:47] -> [test.cpp:3:47] -> [test.cpp:4:26] -> [test.cpp:7:9]: (error) Using pointer to local variable 'item' that is out of scope. [invalidLifetime]\n",
             errout_str());
 
         // #6575
@@ -4747,7 +4980,7 @@ class TestAutoVariables : public TestFixture {
               "    };\n"
               "    EventReport * rep = &repData;\n"
               "    rep->setEventType(NDB_LE_Connected);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8785
@@ -4760,8 +4993,10 @@ class TestAutoVariables : public TestFixture {
               "    if(b && a)\n"
               "        return *iPtr;\n"
               "    return 0;\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:5:16] -> [test.cpp:4:13] -> [test.cpp:8:17]: (error) Using pointer to local variable 'x' that is out of scope. [invalidLifetime]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:5:16] -> [test.cpp:3:8] -> [test.cpp:7:10] -> [test.cpp:4:13] -> [test.cpp:8:17]: (error) Using pointer to local variable 'x' that is out of scope. [invalidLifetime]\n",
+            errout_str());
 
         // #11753
         check("int main(int argc, const char *argv[]) {\n"
@@ -4772,7 +5007,7 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "    std::cout << s;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5:26] -> [test.cpp:4:14] -> [test.cpp:7:18]: (error) Using pointer to local variable 'buff' that is out of scope. [invalidLifetime]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:26] -> [test.cpp:3:14] -> [test.cpp:4:14] -> [test.cpp:7:18]: (error) Using pointer to local variable 'buff' that is out of scope. [invalidLifetime]\n", errout_str());
 
         check("char* f(char* dst) {\n"
               "    const char* src = \"abc\";\n"
diff --git a/test/testbool.cpp b/test/testbool.cpp
index 70860a8c169..46365c11af3 100644
--- a/test/testbool.cpp
+++ b/test/testbool.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -88,36 +88,36 @@ class TestBool : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this, options.cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check...
-        runChecks<CheckBool>(tokenizer, this);
+        CheckBool check;
+        runChecks(check, tokenizer, *this);
     }
 
 
     void assignBoolToPointer() {
         check("void foo(bool *p) {\n"
               "    p = false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
 
         check("void foo(bool *p) {\n"
               "    p = (x<y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
 
         check("void foo(bool *p) {\n"
               "    p = (x||y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
 
         check("void foo(bool *p) {\n"
               "    p = (x&&y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
 
         // check against potential false positives
         check("void foo(bool *p) {\n"
               "    *p = false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #5046 - false positive: Boolean value assigned to pointer
@@ -127,7 +127,7 @@ class TestBool : public TestFixture {
               "void f() {\n"
               "    S s = {0};\n"
               "    *s.p = true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -136,13 +136,13 @@ class TestBool : public TestFixture {
               "void f() {\n"
               "    S s = {0};\n"
               "    s.p = true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:9]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
 
         // ticket #5627 - false positive: template
         check("void f() {\n"
               "    X *p = new ::std::pair<int,int>[rSize];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #6588 (c mode)
@@ -152,7 +152,7 @@ class TestBool : public TestFixture {
               "  const int *rmat = n < 4 ? " /* OK */
               "                       ctx->q_intra_matrix :"
               "                       ctx->q_chroma_intra_matrix;\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:19]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
 
         // ticket #6588 (c++ mode)
@@ -162,7 +162,7 @@ class TestBool : public TestFixture {
               "  const int *rmat = n < 4 ? " /* OK */
               "                       ctx->q_intra_matrix :"
               "                       ctx->q_chroma_intra_matrix;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
 
         // ticket #6665
@@ -171,37 +171,37 @@ class TestBool : public TestFixture {
               "  char* m1 = compare(a, b) < 0\n"
               "      ? (compare(b, c) < 0 ? b : (compare(a, c) < 0 ? c : a))\n"
               "      : (compare(a, c) < 0 ? a : (compare(b, c) < 0 ? c : b));\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         // #7381
         check("void foo(bool *p, bool b) {\n"
               "    p = b;\n"
               "    p = &b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
     }
 
     void assignBoolToFloat() {
         check("void foo1() {\n"
               "    double d = false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Boolean value assigned to floating point variable. [assignBoolToFloat]\n", errout_str());
 
         check("void foo2() {\n"
               "    float d = true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Boolean value assigned to floating point variable. [assignBoolToFloat]\n", errout_str());
 
         check("void foo3() {\n"
               "    long double d = (2>1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:19]: (style) Boolean value assigned to floating point variable. [assignBoolToFloat]\n", errout_str());
 
         // stability - don't crash:
         check("void foo4() {\n"
               "    unknown = false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -210,7 +210,7 @@ class TestBool : public TestFixture {
               "void f() {\n"
               "    S s = {0};\n"
               "    s.p = true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:9]: (style) Boolean value assigned to floating point variable. [assignBoolToFloat]\n", errout_str());
 
         check("struct S {\n"
@@ -219,7 +219,7 @@ class TestBool : public TestFixture {
               "void f() {\n"
               "    S s = {0};\n"
               "    *s.p[0] = true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:13]: (style) Boolean value assigned to floating point variable. [assignBoolToFloat]\n", errout_str());
     }
 
@@ -227,91 +227,91 @@ class TestBool : public TestFixture {
         check("void f(int x) {\n"
               "    if ((x && 0x0f)==6)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x && 0x0f)==0)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x || 0x0f)==6)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x || 0x0f)==0)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x & 0x0f)==6)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x | 0x0f)==6)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
         check("void f(int x) {\n"
               "    if ((5 && x)==3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((5 && x)==3 || (8 && x)==9)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:17]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n"
-            "[test.cpp:2:32]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n",   // duplicate
+            "[test.cpp:2:32]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n",
             errout_str());
 
         check("void f(int x) {\n"
               "    if ((5 && x)!=3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
 
         check("void f(int x) {\n"
               "    if ((5 && x) > 3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((5 && x) > 0)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((5 && x) < 0)\n"
               "        a++;\n"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Comparison of a boolean expression with an integer. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((5 && x) < 1)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((5 && x) > 1)\n"
               "        a++;\n"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Comparison of a boolean expression with an integer. [compareBoolExpressionWithInt]\n", errout_str());
 
@@ -319,91 +319,91 @@ class TestBool : public TestFixture {
         check("void f(int x) {\n"
               "    if (0 < (5 && x))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (0 > (5 && x))\n"
               "        a++;\n"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of a boolean expression with an integer. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (1 > (5 && x))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (1 < (5 && x))\n"
               "        a++;\n"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of a boolean expression with an integer. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(bool x ) {\n"
               "  if ( x > false )\n"
               "      a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("void f(bool x ) {\n"
               "  if ( false < x )\n"
               "      a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("void f(bool x ) {\n"
               "  if ( x < false )\n"
               "      a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("void f(bool x ) {\n"
               "  if ( false > x )\n"
               "      a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("void f(bool x ) {\n"
               "  if ( x >= false )\n"
               "      a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("void f(bool x ) {\n"
               "  if ( false >= x )\n"
               "      a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("void f(bool x ) {\n"
               "  if ( x <= false )\n"
               "      a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("void f(bool x ) {\n"
               "  if ( false <= x )\n"
               "      a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("typedef int (*func)(bool invert);\n"
               "void x(int, func f);\n"
               "void foo(int error) {\n"
               "  if (error == ABC) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f() { return !a+b<c; }"); // #5072
+        check("int f() { return !a+b<c; }\n"); // #5072
         ASSERT_EQUALS("",errout_str());
 
-        check("int f() { return (!a+b<c); }");
+        check("int f() { return (!a+b<c); }\n");
         ASSERT_EQUALS("",errout_str());
 
-        check("int f() { return (a+(b<5)<=c); }");
+        check("int f() { return (a+(b<5)<=c); }\n");
         ASSERT_EQUALS("",errout_str());
     }
 
@@ -412,85 +412,85 @@ class TestBool : public TestFixture {
               "    if (!x == 10) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (!x != 10) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x != 10) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (10 == !x) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (10 != !x) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if (y != !x) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, bool y) {\n"
               "    if (y != !x) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (10 != x) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    return (!y == !x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int a) {\n"
               "  return (x()+1 == !a);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
-        check("void f() { if (!!a+!!b+!!c>1){} }");
+        check("void f() { if (!!a+!!b+!!c>1){} }\n");
         ASSERT_EQUALS("",errout_str());
 
-        check("void f(int a, int b, int c) { if (a != !b || c) {} }");
+        check("void f(int a, int b, int c) { if (a != !b || c) {} }\n");
         ASSERT_EQUALS("",errout_str());
 
-        check("void f(int a, int b, int c) { if (1 < !!a + !!b + !!c) {} }");
+        check("void f(int a, int b, int c) { if (1 < !!a + !!b + !!c) {} }\n");
         ASSERT_EQUALS("",errout_str());
 
-        check("void f(int a, int b, int c) { if (1 < !(a+b)) {} }");
+        check("void f(int a, int b, int c) { if (1 < !(a+b)) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:37]: (warning) Comparison of a boolean expression with an integer. [compareBoolExpressionWithInt]\n",errout_str());
     }
 
     void comparisonOfBoolExpressionWithInt3() {
         check("int f(int x) {\n"
               "    return t<0>() && x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -498,48 +498,48 @@ class TestBool : public TestFixture {
         // #5016
         check("void f() {\n"
               "  for(int i = 4; i > -1 < 5 ; --i) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int a, int b, int c) {\n"
               "  return (a > b) < c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b, int c) {\n"
               "  return x(a > b) < c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b, int c) {\n"
               "  return a > b == c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // templates
         check("struct Tokenizer { TokenList list; };\n"
               "void Tokenizer::f() {\n"
               "  std::list<Token*> locationList;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5063 - or
         check("void f() {\n"
               "  return a > b or c < d;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "  return (a < b) != 0U;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("int f() {\n"
               "  return (a < b) != 0x0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("int f() {\n"
               "  return (a < b) != 42U;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
     }
 
@@ -563,7 +563,7 @@ class TestBool : public TestFixture {
               "     }\n"
               "     else\n"
               "         return true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfTwoFuncsReturningBoolError]\n", errout_str());
     }
 
@@ -588,7 +588,7 @@ class TestBool : public TestFixture {
               "  }\n"
               "    else\n"
               "     return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Comparison of a function returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfFuncReturningBoolError]\n"
                       "[test.cpp:11:7]: (style) Comparison of a function returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfFuncReturningBoolError]\n", errout_str());
     }
@@ -600,7 +600,7 @@ class TestBool : public TestFixture {
               "         printf(\"foo\");\n"
               "   }\n"
               "}\n"
-              "bool compare(int temp);");
+              "bool compare(int temp);\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n"
                       "[test.cpp:3:12]: (style) Comparison of a function returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfFuncReturningBoolError]\n", errout_str());
     }
@@ -626,7 +626,7 @@ class TestBool : public TestFixture {
               " }\n"
               " else\n"
               "     return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Comparison of a function returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfFuncReturningBoolError]\n", errout_str());
     }
 
@@ -650,7 +650,7 @@ class TestBool : public TestFixture {
               "     }\n"
               "     else\n"
               "         return true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfTwoFuncsReturningBoolError]\n", errout_str());
     }
 
@@ -664,7 +664,7 @@ class TestBool : public TestFixture {
               "    if(compare1(temp) > compare2(temp)){\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace Foo {\n"
@@ -676,7 +676,7 @@ class TestBool : public TestFixture {
               "    if(compare1(temp) > compare2(temp)){\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int compare1(int temp);\n"
@@ -688,7 +688,7 @@ class TestBool : public TestFixture {
               "            printf(\"foo\");\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:20]: (style) Comparison of a function returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfFuncReturningBoolError]\n", errout_str());
 
         check("int compare1(int temp);\n"
@@ -700,7 +700,7 @@ class TestBool : public TestFixture {
               "            printf(\"foo\");\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool compare1(int temp);\n"
@@ -709,7 +709,7 @@ class TestBool : public TestFixture {
               "    if(foo.compare1(temp) > compare2(temp)){\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -739,7 +739,7 @@ class TestBool : public TestFixture {
               "    if(b > a){ \n"                             // here warning should be displayed
               "        ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) Comparison of a variable having boolean value using relational (<, >, <= or >=) operator. [comparisonOfBoolWithBoolError]\n", errout_str());
         // op: <
         check("int main(void){\n"
@@ -748,7 +748,7 @@ class TestBool : public TestFixture {
               "    if(b < a){ \n"                             // here warning should be displayed
               "        ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) Comparison of a variable having boolean value using relational (<, >, <= or >=) operator. [comparisonOfBoolWithBoolError]\n", errout_str());
         // op: >=
         check("int main(void){\n"
@@ -757,7 +757,7 @@ class TestBool : public TestFixture {
               "    if(b >= a){ \n"                             // here warning should be displayed
               "        ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) Comparison of a variable having boolean value using relational (<, >, <= or >=) operator. [comparisonOfBoolWithBoolError]\n", errout_str());
         // op: <=
         check("int main(void){\n"
@@ -766,7 +766,7 @@ class TestBool : public TestFixture {
               "    if(b <= a){ \n"                             // here warning should be displayed
               "        ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) Comparison of a variable having boolean value using relational (<, >, <= or >=) operator. [comparisonOfBoolWithBoolError]\n", errout_str());
     }
 
@@ -778,7 +778,7 @@ class TestBool : public TestFixture {
               "  if ( eval(argv[1]) > eval(argv[2]) )\n"
               "    return 1;\n"
               "  return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -812,96 +812,96 @@ class TestBool : public TestFixture {
     void bitwiseOnBoolean() { // 3062
         check("void f(_Bool a, _Bool b) {\n"
               "    if(a & b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '&&'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(_Bool a, _Bool b) {\n"
               "    if(a | b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "    if(a & !b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '&&'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "    if(a | !b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'? [bitwiseOnBoolean]\n", errout_str());
 
         check("bool a, b;\n"
               "void f() {\n"
               "    if(a & b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '&&'? [bitwiseOnBoolean]\n", errout_str());
 
         check("bool a, b;\n"
               "void f() {\n"
               "    if(a & !b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '&&'? [bitwiseOnBoolean]\n", errout_str());
 
         check("bool a, b;\n"
               "void f() {\n"
               "    if(a | b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'? [bitwiseOnBoolean]\n", errout_str());
 
         check("bool a, b;\n"
               "void f() {\n"
               "    if(a | !b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(bool a, int b) {\n"
               "    if(a & b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '&&'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(int a, bool b) {\n"
               "    if(a & b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Boolean expression 'b' is used in bitwise operation. Did you mean '&&'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(int a, int b) {\n"
               "    if((a > 0) & (b < 0)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (style, inconclusive) Boolean expression 'a>0' is used in bitwise operation. Did you mean '&&'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(bool a, int b) {\n"
               "    if(a | b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(int a, bool b) {\n"
               "    if(a | b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Boolean expression 'b' is used in bitwise operation. Did you mean '||'? [bitwiseOnBoolean]\n", errout_str());
 
         check("int f(bool a, int b) {\n"
               "    return a | b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(bool a, int b) {\n"
               "    return a | b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(int a, int b) {\n"
               "    if(a & b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
               "    foo(bar, &b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n" // #9405
               "    class C { void foo(bool &b) {} };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f();\n"
@@ -970,27 +970,27 @@ class TestBool : public TestFixture {
 
     void incrementBoolean() {
         check("bool bValue = true;\n"
-              "void f() { bValue++; }");
+              "void f() { bValue++; }\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (style) Incrementing a variable of type 'bool' with postfix operator++ is deprecated by the C++ Standard. You should assign it the value 'true' instead. [incrementboolean]\n", errout_str());
 
         check("void f(bool test){\n"
               "    test++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Incrementing a variable of type 'bool' with postfix operator++ is deprecated by the C++ Standard. You should assign it the value 'true' instead. [incrementboolean]\n", errout_str());
 
         check("void f(bool* test){\n"
               "    (*test)++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (style) Incrementing a variable of type 'bool' with postfix operator++ is deprecated by the C++ Standard. You should assign it the value 'true' instead. [incrementboolean]\n", errout_str());
 
         check("void f(bool* test){\n"
               "    test[0]++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Incrementing a variable of type 'bool' with postfix operator++ is deprecated by the C++ Standard. You should assign it the value 'true' instead. [incrementboolean]\n", errout_str());
 
         check("void f(int test){\n"
               "    test++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -999,51 +999,51 @@ class TestBool : public TestFixture {
               "    if (x < 10) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(bool x) {\n"
               "    if (10 >= x) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(bool x) {\n"
               "    if (x != 0) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool x) {\n"  // #3356
               "    if (x == 1) {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool x) {\n"
               "    if (x != 10) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(bool x) {\n"
               "    if (x == 10) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(bool x) {\n"
               "    if (x == 0) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("DensePropertyMap<int, true> visited;"); // #4075
+        check("DensePropertyMap<int, true> visited;\n"); // #4075
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1052,28 +1052,28 @@ class TestBool : public TestFixture {
               "    if (x == y) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, bool y) {\n"
               "    if (x == y) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool x, bool y) {\n"
               "    if (x == y) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool x, fooClass y) {\n"
               "    if (x == y) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1082,35 +1082,35 @@ class TestBool : public TestFixture {
               "    if (y > false) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("void f(int y) {\n"
               "    if (true == y) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool y) {\n"
               "    if (y == true) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool y) {\n"
               "    if (false < 5) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
     }
 
     void comparisonOfBoolWithInt4() {
         check("void f(int x) {\n"
               "    if (!x == 1) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1118,21 +1118,21 @@ class TestBool : public TestFixture {
         check("void SetVisible(int index, bool visible) {\n"
               "    bool (SciTEBase::*ischarforsel)(char ch);\n"
               "    if (visible != GetVisible(index)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void comparisonOfBoolWithInt6() { // #4224 - integer is casted to bool
         check("void SetVisible(bool b, int i) {\n"
               "    if (b == (bool)i) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void comparisonOfBoolWithInt7() { // #4846 - (!x==true)
         check("void f(int x) {\n"
               "    if (!x == true) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1142,7 +1142,7 @@ class TestBool : public TestFixture {
               "    auto res = Fun();\n"
               "    if (expectedResult == res)\n"
               "        throw 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int Fun();\n"
@@ -1150,7 +1150,7 @@ class TestBool : public TestFixture {
               "    auto res = Fun();\n"
               "    if (expectedResult == res)\n"
               "        throw 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool Fun();\n"
@@ -1158,7 +1158,7 @@ class TestBool : public TestFixture {
               "    auto res = Fun();\n"
               "    if (5 + expectedResult == res)\n"
               "        throw 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int Fun();\n"
@@ -1166,7 +1166,7 @@ class TestBool : public TestFixture {
               "    auto res = Fun();\n"
               "    if (5 + expectedResult == res)\n"
               "        throw 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int Fun();\n"
@@ -1174,7 +1174,7 @@ class TestBool : public TestFixture {
               "    auto res = Fun();\n"
               "    if (expectedResult == res + 5)\n"
               "        throw 2;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
@@ -1185,7 +1185,7 @@ class TestBool : public TestFixture {
               "        b = !b;\n"
               "    }\n"
               "    return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1210,76 +1210,76 @@ class TestBool : public TestFixture {
     void pointerArithBool1() { // #5126
         check("void f(char *p) {\n"
               "    if (p+1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour. [pointerArithBool]\n", errout_str());
 
         check("void f(char *p) {\n"
               "    do {} while (p+1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:19]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour. [pointerArithBool]\n", errout_str());
 
         check("void f(char *p) {\n"
               "    while (p-1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour. [pointerArithBool]\n", errout_str());
 
         check("void f(char *p) {\n"
               "    for (int i = 0; p+1; i++) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour. [pointerArithBool]\n", errout_str());
 
         check("void f(char *p) {\n"
               "    if (p && p+1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour. [pointerArithBool]\n", errout_str());
 
         check("void f(char *p) {\n"
               "    if (p+2 || p) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour. [pointerArithBool]\n", errout_str());
     }
 
     void returnNonBool() {
         check("bool f(void) {\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    return 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    return 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f(void) {\n"
               "    return -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f(void) {\n"
               "    return 1 + 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f(void) {\n"
               "    int x = 0;\n"
               "    return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    int x = 10;\n"
               "    return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f(void) {\n"
               "    return 2 < 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
@@ -1287,7 +1287,7 @@ class TestBool : public TestFixture {
               "    if (a)\n"
               "        ret = 1;\n"
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
@@ -1295,20 +1295,20 @@ class TestBool : public TestFixture {
               "    if (a)\n"
               "        ret = 3;\n"
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f(void) {\n"
               "    if (a)\n"
               "        return 3;\n"
               "    return 4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n"
                       "[test.cpp:4:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f(void) {\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1316,42 +1316,42 @@ class TestBool : public TestFixture {
         check("bool f(void) {\n"
               "    auto x = [](void) { return -1; };\n"
               "    return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    auto x = [](void) { return -1; };\n"
               "    return 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f(void) {\n"
               "    auto x = [](void) -> int { return -1; };\n"
               "    return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    auto x = [](void) -> int { return -1; };\n"
               "    return 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
     }
 
     void returnNonBoolLogicalOp() {
         check("bool f(int x) {\n"
               "    return x & 0x4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x, int y) {\n"
               "    return x | y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x) {\n"
               "    return (x & 0x2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1359,7 +1359,7 @@ class TestBool : public TestFixture {
         check("class X {\n"
               "    public:\n"
               "        bool f() { return -1;}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:20]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f() {\n"
@@ -1368,7 +1368,7 @@ class TestBool : public TestFixture {
               "            int f() { return -1;}\n"
               "    };\n"
               "    return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
@@ -1377,7 +1377,7 @@ class TestBool : public TestFixture {
               "            int f() { return -1;}\n"
               "    };\n"
               "    return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
@@ -1386,7 +1386,7 @@ class TestBool : public TestFixture {
               "            bool f() { return -1;}\n"
               "    };\n"
               "    return -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n"
                       "[test.cpp:4:24]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
     }
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
index ec02406dcc8..7771d294d2c 100644
--- a/test/testbufferoverrun.cpp
+++ b/test/testbufferoverrun.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,8 +35,9 @@ class TestBufferOverrun : public TestFixture {
     TestBufferOverrun() : TestFixture("TestBufferOverrun") {}
 
 private:
-    /*const*/ Settings settings0 = settingsBuilder().library("std.cfg").severity(Severity::warning).severity(Severity::style).severity(Severity::portability).build();
+    /*const*/ Settings settings0 = settingsBuilder().library("std.cfg").severity(Severity::warning).severity(Severity::style).build();
     const Settings settings0_i = settingsBuilder(settings0).certainty(Certainty::inconclusive).build();
+    const Settings settings0_p = settingsBuilder(settings0).severity(Severity::portability).build();
     const Settings settings1 = settingsBuilder(settings0).severity(Severity::performance).certainty(Certainty::inconclusive).build();
 
     struct CheckOptions
@@ -55,8 +56,8 @@ class TestBufferOverrun : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for buffer overruns..
-        runChecks<CheckBufferOverrun>(tokenizer, this);
+        CheckBufferOverrun check;
+        runChecks(check, tokenizer, *this);
     }
 
     // TODO: get rid of this
@@ -65,8 +66,8 @@ class TestBufferOverrun : public TestFixture {
         SimpleTokenizer tokenizer(settings0_i, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for buffer overruns..
-        runChecks<CheckBufferOverrun>(tokenizer, this);
+        CheckBufferOverrun check;
+        runChecks(check, tokenizer, *this);
     }
 
 #define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
@@ -78,8 +79,8 @@ class TestBufferOverrun : public TestFixture {
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check for buffer overruns..
-        runChecks<CheckBufferOverrun>(tokenizer, this);
+        CheckBufferOverrun check;
+        runChecks(check, tokenizer, *this);
     }
 
     void run() override {
@@ -163,6 +164,7 @@ class TestBufferOverrun : public TestFixture {
         TEST_CASE(array_index_74); // #11088
         TEST_CASE(array_index_75);
         TEST_CASE(array_index_76);
+        TEST_CASE(array_index_77);
         TEST_CASE(array_index_multidim);
         TEST_CASE(array_index_switch_in_for);
         TEST_CASE(array_index_for_in_for);   // FP: #2634
@@ -196,6 +198,7 @@ class TestBufferOverrun : public TestFixture {
         TEST_CASE(array_index_function_parameter);
         TEST_CASE(array_index_enum_array); // #8439
         TEST_CASE(array_index_container); // #9386
+        TEST_CASE(array_index_container_data); // pointer from data()/c_str() carries the container size
         TEST_CASE(array_index_two_for_loops);
         TEST_CASE(array_index_new); // #7690
 
@@ -225,6 +228,9 @@ class TestBufferOverrun : public TestFixture {
         TEST_CASE(buffer_overrun_34); //#11035
         TEST_CASE(buffer_overrun_35); //#2304
         TEST_CASE(buffer_overrun_36);
+        TEST_CASE(buffer_overrun_37);
+        TEST_CASE(buffer_overrun_38);
+        TEST_CASE(buffer_overrun_39);
         TEST_CASE(buffer_overrun_errorpath);
         TEST_CASE(buffer_overrun_bailoutIfSwitch);  // ticket #2378 : bailoutIfSwitch
         TEST_CASE(buffer_overrun_function_array_argument);
@@ -263,6 +269,7 @@ class TestBufferOverrun : public TestFixture {
         TEST_CASE(minsize_sizeof);
         TEST_CASE(minsize_strlen);
         TEST_CASE(minsize_mul);
+        TEST_CASE(minsize_overflow);
         TEST_CASE(unknownType);
 
         TEST_CASE(terminateStrncpy1);
@@ -323,7 +330,7 @@ class TestBufferOverrun : public TestFixture {
               "    {\n"
               "        char str[50];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -345,7 +352,7 @@ class TestBufferOverrun : public TestFixture {
               "void f4(const char str[])\n"
               "{\n"
               "    strcpy(buf, str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -356,7 +363,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char data[1];\n"
               "    return abc.data[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -366,7 +373,7 @@ class TestBufferOverrun : public TestFixture {
         check("static void f() {\n"
               "    char data[100];\n"
               "    const char *p = data + 100;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -378,7 +385,7 @@ class TestBufferOverrun : public TestFixture {
               "    snprintf(group, 32, \"%u\", 0);\n"
               "    struct group *gr;\n"
               "    snprintf(group, 32, \"%u\", gr->gr_gid);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -388,14 +395,14 @@ class TestBufferOverrun : public TestFixture {
               "    char str[0x10] = {0};\n"
               "    str[15] = 0;\n"
               "    str[16] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:8]: (error) Array 'str[16]' accessed at index 16, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("char f()\n"
               "{\n"
               "    char str[16] = {0};\n"
               "    return str[16];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:15]: (error) Array 'str[16]' accessed at index 16, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // test stack array
@@ -405,7 +412,7 @@ class TestBufferOverrun : public TestFixture {
               "   int y;\n"
               "   y = x[ 4 ];\n"
               "   return y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (error) Array 'x[3]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("int f()\n"
@@ -414,15 +421,15 @@ class TestBufferOverrun : public TestFixture {
               "   int y;\n"
               "   y = x[ 2 ];\n"
               "   return y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int x[5] = {0};\n"
-              "int a = x[10];");
+              "int a = x[10];\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Array 'x[5]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("int x[5] = {0};\n"
-              "int a = (x)[10];");
+              "int a = (x)[10];\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (error) Array 'x[5]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -433,21 +440,21 @@ class TestBufferOverrun : public TestFixture {
               "    char *str = new char[0x10];\n"
               "    str[i] = 0;\n"
               "}\n"
-              "void b() { a(16); }");
+              "void b() { a(16); }\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (error) Array 'str[16]' accessed at index 16, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_4() {
-        check("char c = \"abc\"[4];");
+        check("char c = \"abc\"[4];\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (error) Array '\"abc\"[4]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
-        check("p = &\"abc\"[4];");
+        check("p = &\"abc\"[4];\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("char c = \"\\0abc\"[2];");
+        check("char c = \"\\0abc\"[2];\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("char c = L\"abc\"[4];");
+        check("char c = L\"abc\"[4];\n");
         ASSERT_EQUALS("[test.cpp:1:16]: (error) Array 'L\"abc\"[4]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -458,7 +465,7 @@ class TestBufferOverrun : public TestFixture {
               "    int i, sum=0;\n"
               "    for (i = 0; i < 100; i++)\n"
               "        sum += val[i];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:19]: (error) Array 'val[50]' accessed at index 99, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
@@ -467,7 +474,7 @@ class TestBufferOverrun : public TestFixture {
               "    int i, sum=0;\n"
               "    for (i = 1; i < 100; i++)\n"
               "        sum += val[i];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:19]: (error) Array 'val[50]' accessed at index 99, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f(int a)\n"
@@ -476,7 +483,7 @@ class TestBufferOverrun : public TestFixture {
               "    int i, sum=0;\n"
               "    for (i = a; i < 100; i++)\n"
               "        sum += val[i];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:19]: (error) Array 'val[50]' accessed at index 99, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("typedef struct g g2[3];\n"
@@ -486,21 +493,21 @@ class TestBufferOverrun : public TestFixture {
               "  {\n"
               "    a[i]=0;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int argc)\n"
               "{\n"
               "  char a[2];\n"
               "  for (int i = 4; i < argc; i++){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a[10]) {\n"
               "    for (int i=0;i<50;++i) {\n"
               "        a[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Array 'a[10]' accessed at index 49, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -514,7 +521,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    struct ABC abc;\n"
               "    abc.str[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:12]: (error) Array 'abc.str[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("struct ABC\n"
@@ -526,7 +533,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    struct ABC abc;\n"
               "    return abc.str[10];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:19]: (error) Array 'abc.str[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // This is not out of bounds because it is a variable length array
@@ -539,7 +546,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    struct ABC* x = malloc(sizeof(struct ABC) + 10);\n"
               "    x->str[1] = 0;"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // This is not out of bounds because it is not a variable length array
@@ -553,7 +560,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    struct ABC* x = malloc(sizeof(struct ABC) + 10);\n"
               "    x->str[1] = 0;"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         // This is not out of bounds because it is a variable length array
@@ -567,8 +574,8 @@ class TestBufferOverrun : public TestFixture {
               "static void f()\n"
               "{\n"
               "    struct ABC* x = malloc(sizeof(struct ABC) + 10);\n"
-              "    x->str[10] = 0;"
-              "}");
+              "    x->str[10] = 0;\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // This is out of bounds because it is outside the memory allocated.
@@ -581,8 +588,8 @@ class TestBufferOverrun : public TestFixture {
               "static void f()\n"
               "{\n"
               "    struct ABC* x = malloc(sizeof(struct ABC) + 10);\n"
-              "    x->str[11] = 0;"
-              "}");
+              "    x->str[11] = 0;\n"
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:9]: (error) Array 'str[1]' accessed at index 11, which is out of bounds.\n", "", errout_str());
 
         // This is out of bounds if 'sizeof(ABC)' is 1 (No padding)
@@ -594,8 +601,8 @@ class TestBufferOverrun : public TestFixture {
               "static void f()\n"
               "{\n"
               "    struct ABC* x = malloc(sizeof(ABC) + 10);\n"
-              "    x->str[11] = 0;"
-              "}");
+              "    x->str[11] = 0;\n"
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         // This is out of bounds because it is outside the memory allocated
@@ -608,8 +615,8 @@ class TestBufferOverrun : public TestFixture {
               "static void f()\n"
               "{\n"
               "    struct ABC* x = malloc(sizeof(struct ABC));\n"
-              "    x->str[1] = 0;"
-              "}");
+              "    x->str[1] = 0;\n"
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:9]: (error) Array 'str[1]' accessed at index 1, which is out of bounds.\n", "", errout_str());
 
         // This is out of bounds because it is outside the memory allocated
@@ -622,8 +629,8 @@ class TestBufferOverrun : public TestFixture {
               "static void f()\n"
               "{\n"
               "    struct ABC* x = malloc(sizeof(ABC));\n"
-              "    x->str[1] = 0;"
-              "}");
+              "    x->str[1] = 0;\n"
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         // This is out of bounds because it is not a variable array
@@ -635,8 +642,8 @@ class TestBufferOverrun : public TestFixture {
               "static void f()\n"
               "{\n"
               "    struct ABC x;\n"
-              "    x.str[1] = 0;"
-              "}");
+              "    x.str[1] = 0;\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:10]: (error) Array 'x.str[1]' accessed at index 1, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("struct foo\n"
@@ -649,19 +656,19 @@ class TestBufferOverrun : public TestFixture {
               "    foo f;\n"
               "    for ( unsigned int i = 0; i < 64; ++i )\n"
               "        f.str[i] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:14]: (error) Array 'f.str[10]' accessed at index 63, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("struct AB { char a[NUM]; char b[NUM]; }\n"
               "void f(struct AB *ab) {\n"
               "    ab->a[0] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("union { char a[1]; int b; } ab;\n"
               "void f() {\n"
               "    ab.a[2] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Array 'ab.a[1]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -675,7 +682,7 @@ class TestBufferOverrun : public TestFixture {
               "static void f(struct ABC *abc)\n"
               "{\n"
               "    abc->str[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:13]: (error) Array 'abc->str[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -694,7 +701,7 @@ class TestBufferOverrun : public TestFixture {
               "    {\n"
               "        abc->str[10] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:13:17]: (error) Array 'abc->str[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -709,7 +716,7 @@ class TestBufferOverrun : public TestFixture {
               "Fred::Fred()\n"
               "{\n"
               "    str[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:8]: (error) Array 'str[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("class Fred\n"
@@ -722,7 +729,7 @@ class TestBufferOverrun : public TestFixture {
               "char Fred::c()\n"
               "{\n"
               "    return str[10];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:15]: (error) Array 'str[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -735,7 +742,7 @@ class TestBufferOverrun : public TestFixture {
               "        if (i < 10)\n"
               "            int x = buf[i];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -745,7 +752,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[10];\n"
               "    for (int i = 0; i < 10; i++)\n"
               "        a[i+10] = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index 19, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -755,7 +762,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[10];\n"
               "    for (int i = 0; i < 10; i++)\n"
               "        a[10+i] = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index 19, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -765,7 +772,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[10];\n"
               "    for (int i = 0; i < 10; i++)\n"
               "        a[i+1] = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -775,7 +782,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[10];\n"
               "    for (int i = 0; i < 10; i++)\n"
               "        a[i*2] = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index 18, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
@@ -783,7 +790,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[12];\n"
               "    for (int i = 0; i < 12; i+=6)\n"
               "        a[i+5] = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -791,21 +798,21 @@ class TestBufferOverrun : public TestFixture {
               "    int a[12];\n"
               "    for (int i = 0; i < 12; i+=6)\n"
               "        a[i+6] = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[12]' accessed at index 12, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"  // #4398
               "    int a[2];\n"
               "    for (int i = 0; i < 4; i+=2)\n"
               "        a[i] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'a[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"  // #4398
               "    int a[2];\n"
               "    for (int i = 0; i < 4; i+=2)\n"
               "        do_stuff(a+i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -818,7 +825,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = i;\n"
               "        i+=1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -829,7 +836,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = i;\n"
               "        i++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -840,7 +847,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = i;\n"
               "        ++i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -851,7 +858,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = i;\n"
               "        i=4;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:10]: (error) Array 'a[5]' accessed at index 5, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
@@ -862,7 +869,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = i;\n"
               "        i+=1;\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Buffer overrun\n", "", errout_str());
     }
 
@@ -872,7 +879,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "  char a[2];\n"
               "  char *end = &(a[2]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Getting more than one past the end is not legal
@@ -880,7 +887,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "  char a[2];\n"
               "  char *end = &(a[3]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (error) Array 'a[2]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -891,7 +898,7 @@ class TestBufferOverrun : public TestFixture {
               " int b[10];\n"
               " for ( int i = 0; i < 9; i++ )\n"
               "  b[i] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -905,7 +912,7 @@ class TestBufferOverrun : public TestFixture {
               " for(int j=0; j<3; ++j) {\n"
               "  int b = indices[j];\n"
               " }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -913,7 +920,7 @@ class TestBufferOverrun : public TestFixture {
         check("int main() {\n"
               "  size_t indices[2];\n"
               "  int b = indices[2];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (error) Array 'indices[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -922,7 +929,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char c[10];\n"
               "    c[1<<23]='a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 'c[10]' accessed at index 8388608, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -941,7 +948,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[n];\n"     // n <= SCHAR_MAX
               "    a[-1] = 0;\n"    // negative index
               "    a[128] = 0;\n"   // 128 > SCHAR_MAX
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[128]' accessed at index -1, which is out of bounds. [negativeIndex]\n"
                       "[test.cpp:4:6]: (error) Array 'a[128]' accessed at index 128, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
@@ -949,7 +956,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[n];\n"     // n <= UCHAR_MAX
               "    a[-1] = 0;\n"    // negative index
               "    a[256] = 0;\n"   // 256 > UCHAR_MAX
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[256]' accessed at index -1, which is out of bounds. [negativeIndex]\n"
                       "[test.cpp:4:6]: (error) Array 'a[256]' accessed at index 256, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
@@ -957,7 +964,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[n];\n"     // n <= SHRT_MAX
               "    a[-1] = 0;\n"    // negative index
               "    a[32768] = 0;\n" // 32768 > SHRT_MAX
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[32768]' accessed at index -1, which is out of bounds. [negativeIndex]\n"
                       "[test.cpp:4:6]: (error) Array 'a[32768]' accessed at index 32768, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
@@ -965,7 +972,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[n];\n"     // n <= USHRT_MAX
               "    a[-1] = 0;\n"    // negative index
               "    a[65536] = 0;\n" // 65536 > USHRT_MAX
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[65536]' accessed at index -1, which is out of bounds. [negativeIndex]\n"
                       "[test.cpp:4:6]: (error) Array 'a[65536]' accessed at index 65536, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
@@ -973,26 +980,26 @@ class TestBufferOverrun : public TestFixture {
               "    int a[n];\n"     // n <= SHRT_MAX
               "    a[-1] = 0;\n"    // negative index
               "    a[32768] = 0;\n" // 32768 > SHRT_MAX
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[32768]' accessed at index -1, which is out of bounds. [negativeIndex]\n"
                       "[test.cpp:4:6]: (error) Array 'a[32768]' accessed at index 32768, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f(int n) {\n"
               "    int a[n];\n"     // n <= INT_MAX
               "    a[-1] = 0;\n"    // negative index
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[2147483648]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
 
         check("void f(unsigned int n) {\n"
               "    int a[n];\n"     // n <= UINT_MAX
               "    a[-1] = 0;\n"    // negative index
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[4294967296]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
 
         check("void f(signed int n) {\n"
               "    int a[n];\n"     // n <= INT_MAX
               "    a[-1] = 0;\n"    // negative index
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[2147483648]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
@@ -1000,7 +1007,7 @@ class TestBufferOverrun : public TestFixture {
         check("void foo()\n"
               "{\n"
               "   long l[SOME_SIZE];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1010,7 +1017,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[3];\n"
               "    for (int i = 3; 0 <= i; i--)\n"
               "        a[i] = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[3]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
@@ -1018,7 +1025,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[4];\n"
               "    for (int i = 3; 0 <= i; i--)\n"
               "        a[i] = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1028,7 +1035,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[10];\n"
               "    for (int i = 0; i < 10; i++)\n"
               "        a[i-1] = a[i];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
@@ -1039,7 +1046,7 @@ class TestBufferOverrun : public TestFixture {
               "    int i[2];\n"
               "    int *ip = i + 1;\n"
               "    ip[-10] = 1;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Array ip[-10] out of bounds.\n", "", errout_str());
     }
 
@@ -1051,7 +1058,7 @@ class TestBufferOverrun : public TestFixture {
               "    int *i = iBuf + 9;"
               "    int *ii = i + -5;"
               "    ii[10] = 0;"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Array ii[10] out of bounds.\n", "", errout_str());
     }
 
@@ -1061,7 +1068,7 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    UINT8 x[2];\n"
               "    x[5] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'x[2]' accessed at index 5, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -1078,7 +1085,7 @@ class TestBufferOverrun : public TestFixture {
               "void y() {\n"
               "    struct s1 obj;\n"
               "    x(obj.delay, 123);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct s1 {\n"
@@ -1092,7 +1099,7 @@ class TestBufferOverrun : public TestFixture {
               "void y() {\n"
               "    struct s1 obj;\n"
               "    x(obj.delay, 123);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:11] -> [test.cpp:6]: (error) Array 'obj.delay[3]' accessed at index 4, which is out of bounds.\n",
                            "",
                            errout_str());
@@ -1103,7 +1110,7 @@ class TestBufferOverrun : public TestFixture {
               "\n"
               "void f() {\n"
               "    struct s1 *obj;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1117,14 +1124,14 @@ class TestBufferOverrun : public TestFixture {
               "       m_x[1] = 0;\n"
               "    }\n"
               "    int m_x[1];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:7:11]: (error) Array 'm_x[1]' accessed at index 1, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_33() {
         check("void foo(char bar[][4]) {\n"
               "    baz(bar[5]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1133,7 +1140,7 @@ class TestBufferOverrun : public TestFixture {
               "    int y[2][2][2];\n"
               "    y[0][2][0] = 0;\n"
               "    y[0][0][2] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'y[2][2][2]' accessed at index y[0][2][0], which is out of bounds. [arrayIndexOutOfBounds]\n"
                       "[test.cpp:4:6]: (error) Array 'y[2][2][2]' accessed at index y[0][0][2], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
@@ -1153,7 +1160,7 @@ class TestBufferOverrun : public TestFixture {
               "    ptest->a[10] = 3;\n"
               "    ptest->b[10][2] = 4;\n"
               "    ptest->b[0][19] = 4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:11]: (error) Array 'test.a[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n"
                       "[test.cpp:10:11]: (error) Array 'test.b[10][5]' accessed at index test.b[10][2], which is out of bounds. [arrayIndexOutOfBounds]\n"
                       "[test.cpp:11:11]: (error) Array 'test.b[10][5]' accessed at index test.b[0][19], which is out of bounds. [arrayIndexOutOfBounds]\n"
@@ -1174,7 +1181,7 @@ class TestBufferOverrun : public TestFixture {
               "    ptest = &test;\n"
               "    ptest->a[9][5] = 4;\n"
               "    ptest->a[0][50] = 4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:11]: (error) Array 'test.a[10][5]' accessed at index test.a[9][5], which is out of bounds. [arrayIndexOutOfBounds]\n"
                       "[test.cpp:9:11]: (error) Array 'test.a[10][5]' accessed at index test.a[0][50], which is out of bounds. [arrayIndexOutOfBounds]\n"
                       "[test.cpp:12:13]: (error) Array 'ptest->a[10][5]' accessed at index ptest->a[9][5], which is out of bounds. [arrayIndexOutOfBounds]\n"
@@ -1185,21 +1192,21 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    struct Struct { unsigned m_Var[1]; } s;\n"
               "    s.m_Var[1] = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Array 's.m_Var[1]' accessed at index 1, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("struct Struct { unsigned m_Var[1]; };\n"
               "void f() {\n"
               "    struct Struct s;\n"
               "    s.m_Var[1] = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Array 's.m_Var[1]' accessed at index 1, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("struct Struct { unsigned m_Var[1]; };\n"
               "void f() {\n"
               "    struct Struct * s = calloc(40);\n"
               "    s->m_Var[1] = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1211,7 +1218,7 @@ class TestBufferOverrun : public TestFixture {
               "};\n"
               "Fred::Fred(const Fred & rhs) {\n"
               "    m_b[2] = rhs.m_b[2];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (error) Array 'm_b[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n"
                       "[test.cpp:7:21]: (error) Array 'rhs.m_b[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
@@ -1223,7 +1230,7 @@ class TestBufferOverrun : public TestFixture {
               "        for (unsigned int i = 0; i < 15; i++)\n"
               "            i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1242,7 +1249,7 @@ class TestBufferOverrun : public TestFixture {
               "            }\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1251,7 +1258,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char a[10];\n"
               "    a[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 'a[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -1260,7 +1267,7 @@ class TestBufferOverrun : public TestFixture {
               "    char a[10];\n"
               "    for (int i = 0; i < 10; ++i)\n"
               "        f2(&a[i + 1]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1273,7 +1280,7 @@ class TestBufferOverrun : public TestFixture {
               "\n"
               "void b() {\n"
               "    struct Fred { char data[3]; } fred;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void a() {\n"
@@ -1284,7 +1291,7 @@ class TestBufferOverrun : public TestFixture {
               "void b() {\n"
               "    struct Fred { char data[3]; } fred;\n"
               "    fred.data[4] = 0;\n"  // <- error
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:14]: (error) Array 'fred.data[3]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -1295,7 +1302,7 @@ class TestBufferOverrun : public TestFixture {
               "  char *p; p = (char *)malloc(10);\n"
               "  p[10] = 7;\n"
               "  free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'p[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
@@ -1303,7 +1310,7 @@ class TestBufferOverrun : public TestFixture {
               "  float *p; p = (float *)malloc(10 * sizeof(float));\n"
               "  p[10] = 7;\n"
               "  free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'p[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
@@ -1312,7 +1319,7 @@ class TestBufferOverrun : public TestFixture {
               "  p[0] = 0;\n"
               "  p[9] = 9;\n"
               "  free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -1321,7 +1328,7 @@ class TestBufferOverrun : public TestFixture {
               "  p[0] = 0;\n"
               "  p[9] = 9;\n"
               "  delete [] p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -1330,7 +1337,7 @@ class TestBufferOverrun : public TestFixture {
               "  p[0] = 0;\n"
               "  p[9] = 9;\n"
               "  delete [] p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -1341,11 +1348,11 @@ class TestBufferOverrun : public TestFixture {
               "  }\n"
               "  catch(...){\n"
               "  return;\n"
-              "  }"
+              "  }\n"
               "  p[0] = 0;\n"
               "  p[9] = 9;\n"
               "  delete [] p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1362,7 +1369,7 @@ class TestBufferOverrun : public TestFixture {
               "   var[ 0 ].arr[ 2 ] = 2;\n"
               "   y = var[ 0 ].arr[ 3 ];\n" // <-- array access out of bounds
               "   return y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:20]: (error) Array 'var[0].arr[3]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("int f( )\n"
@@ -1376,7 +1383,7 @@ class TestBufferOverrun : public TestFixture {
               "   var[ 0 ].arr[ 2 ] = 2;\n"
               "   y = var[ 0 ].arr[ 2 ];\n"
               "   return y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -1392,7 +1399,7 @@ class TestBufferOverrun : public TestFixture {
               "var.arr[ 3 ] = 3;\n" // <-- array access out of bounds
               "y=var.arr[ 3 ];\n"   // <-- array access out of bounds
               "return y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:8]: (error) Array 'var.arr[3]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\n"
                       "[test.cpp:11:10]: (error) Array 'var.arr[3]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
@@ -1406,7 +1413,7 @@ class TestBufferOverrun : public TestFixture {
               "var[0].var[ 1 ] = 1;\n"
               "var[0].var[ 2 ] = 2;\n"
               "var[0].var[ 4 ] = 4;\n" // <-- array access out of bounds
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:11]: (error) Array 'var[0].var[3]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f( ) {\n"
@@ -1417,7 +1424,7 @@ class TestBufferOverrun : public TestFixture {
               "var[0].var[ 0 ] = 0;\n"
               "var[0].var[ 1 ] = 1;\n"
               "var[0].var[ 2 ] = 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // avoid FPs (modified examples taken from #3838)
@@ -1426,7 +1433,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct AB ab;\n"
               "    int * p = &ab.a[10];\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct AB { int a[10]; int b[10]; };\n"
@@ -1434,7 +1441,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct AB ab[1];\n"
               "    int * p = &ab[0].a[10];\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct AB { int a[10]; int b[10]; };\n"
@@ -1442,7 +1449,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct AB ab[1];\n"
               "    int * p = &ab[10].a[0];\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (error) Array 'ab[1]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -1456,7 +1463,7 @@ class TestBufferOverrun : public TestFixture {
               "    {\n"
               "        buf[i] = 1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -1466,7 +1473,7 @@ class TestBufferOverrun : public TestFixture {
               "    {\n"
               "        buf[i] = 2.;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1479,7 +1486,7 @@ class TestBufferOverrun : public TestFixture {
               "void test() {\n"
               "    CHAR buffer[1024];\n"
               "    f(\"%s\", buffer);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unnamed argument
@@ -1489,7 +1496,7 @@ class TestBufferOverrun : public TestFixture {
               "void test() {\n"
               "    char buffer[1024];\n"
               "    f(buffer);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1501,7 +1508,7 @@ class TestBufferOverrun : public TestFixture {
               "    for(int i=3; i--;) {\n"
               "        printf(\"files(%i): %s\", 3-i, buffer[3-i]);\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Array 'buffer[3]' accessed at index 3, which is out of bounds.\n", "", errout_str());
 
         check("void f() {\n"
@@ -1510,7 +1517,7 @@ class TestBufferOverrun : public TestFixture {
               "    for(i=10; i--;) {\n"
               "        buffer[i] = i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:15]: (error) Array 'buffer[9]' accessed at index 9, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // Correct access limits -> i from 9 to 0
@@ -1519,7 +1526,7 @@ class TestBufferOverrun : public TestFixture {
               "    for(unsigned long int i=10; i--;) {\n"
               "        buffer[i] = i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1529,7 +1536,7 @@ class TestBufferOverrun : public TestFixture {
               "void f() {\n"
               "    for (int i = 2; i < 0; i++)\n"
               "        s[i] = 5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1542,7 +1549,7 @@ class TestBufferOverrun : public TestFixture {
               "        printf(\" %i\", i);\n"
               "        array[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:14]: (error) Array 'array[4]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void test(void)\n"
@@ -1552,7 +1559,7 @@ class TestBufferOverrun : public TestFixture {
               "        scanf(\"%i\", &i);\n"
               "        array[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1566,7 +1573,7 @@ class TestBufferOverrun : public TestFixture {
               "        i++;\n"
               "    }\n"
               "    arr[k];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1578,7 +1585,7 @@ class TestBufferOverrun : public TestFixture {
               "void g() {\n"
               "    f(\"12345678\");\n"
               "    f(\"12345\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1586,7 +1593,7 @@ class TestBufferOverrun : public TestFixture {
         check("void f(void){\n"
               "    int k=0, dd, d[1U] = {1};\n"
               "    for (dd=d[k]; k<10; dd=d[++k]){;}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:29]: (error) Array 'd[1]' accessed at index 1, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -1597,7 +1604,7 @@ class TestBufferOverrun : public TestFixture {
               "    for(int i = 0, j= 11; i < j; ++i)\n"
               "       buf[i] = 0;\n"
               "    return buf[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:11]: (error) Array 'buf[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -1609,7 +1616,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i=0; i < 3; i++)\n"
               "        for (int j = 0; j < 3; j++)\n"
               "             M[i][j]=0.0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:15]: (error) Array 'M[3][1]' accessed at index M[*][2], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -2008,92 +2015,107 @@ class TestBufferOverrun : public TestFixture {
                       errout_str());
     }
 
+    void array_index_77()
+    {
+        check("int f(bool b) {\n" // #6092
+              "    const int a[2] = {};\n"
+              "    int i = 0, s = 0;\n"
+              "    s += a[i++];\n"
+              "    if (b)\n"
+              "        s += a[i++];\n"
+              "    s += a[i++];\n"
+              "    return s + i;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:7:11]: (error) Array 'a[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n",
+                      errout_str());
+    }
+
     void array_index_multidim() {
         check("void f()\n"
               "{\n"
               "  char a[2][2];\n"
               "  a[1][1] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[2][2][2];\n"
               "  a[1][1][1] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[2][2];\n"
               "  a[2][1] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'a[2][2]' accessed at index a[2][1], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[2][2];\n"
               "  a[1][2] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'a[2][2]' accessed at index a[1][2], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[2][2][2];\n"
               "  a[2][1][1] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'a[2][2][2]' accessed at index a[2][1][1], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[2][2][2];\n"
               "  a[1][2][1] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'a[2][2][2]' accessed at index a[1][2][1], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[2][2][2][2];\n"
               "  a[1][2][1][1] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'a[2][2][2][2]' accessed at index a[1][2][1][1], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[2][2][2];\n"
               "  a[1][1][2] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'a[2][2][2]' accessed at index a[1][1][2], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[10][10][10];\n"
               "  a[2*3][4*3][2] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'a[10][10][10]' accessed at index a[6][12][2], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "  char a[10][10][10];\n"
               "  a[6][40][10] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:4]: (error) Array 'a[10][10][10]' accessed at index a[6][40][10], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "  char a[1][1][1];\n"
               "  a[2][2][2] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:4]: (error) Array 'a[1][1][1]' accessed at index a[2][2][2], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "  char a[6][6][6];\n"
               "  a[6][6][2] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:4]: (error) Array 'a[6][6][6]' accessed at index a[6][6][2], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "  int a[2][2];\n"
               "  p = &a[2][0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unknown dim..
@@ -2101,7 +2123,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "  int a[2][countof(x)] = {{1,2},{3,4}};\n"
               "  a[0][0] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void draw_quad(float z)  {\n"
@@ -2123,7 +2145,7 @@ class TestBufferOverrun : public TestFixture {
               "        vertices[i][1][2] = 4.0;\n"
               "        vertices[i][1][3] = 5.0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -2132,7 +2154,7 @@ class TestBufferOverrun : public TestFixture {
                   "  const size_t B = 2;\n"
                   "  extern int stuff[A][B];\n"
                   "  return stuff[0][1];\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
 
             // TODO: better handling of VLAs in symboldatabase. should be
@@ -2142,7 +2164,7 @@ class TestBufferOverrun : public TestFixture {
                   "  const size_t B = 2;\n"
                   "  extern int stuff[A][B];\n"
                   "  return stuff[0][1];\n"
-                  "}");
+                  "}\n");
             TODO_ASSERT_EQUALS("error", "", errout_str());
         }
     }
@@ -2163,7 +2185,7 @@ class TestBufferOverrun : public TestFixture {
               "    break;\n"
               "  };\n"
               " }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -2181,7 +2203,7 @@ class TestBufferOverrun : public TestFixture {
               "    break;\n"
               "  };\n"
               " }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:12]: (error) Array index out of bounds.\n", "", errout_str());
     }
 
@@ -2193,7 +2215,7 @@ class TestBufferOverrun : public TestFixture {
               "            a[i] = 0;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2203,7 +2225,7 @@ class TestBufferOverrun : public TestFixture {
               "void f(int i) {\n"
               "  if (i >= 0 && i < 10) {}\n"
               "  a[i] = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19] -> [test.cpp:4:4]: (warning) Either the condition 'i<10' is redundant or the array 'a[10]' is accessed at index 10, which is out of bounds. [arrayIndexOutOfBoundsCond]\n"
                       "[test.cpp:3:9] -> [test.cpp:4:4]: (warning) Either the condition 'i>=0' is redundant or the array 'a[10]' is accessed at index -1, which is out of bounds. [negativeIndex]\n",
                       errout_str());
@@ -2217,7 +2239,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 19; i < 36; ++i) {\n"
               "        data[i/2] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (error) Array 'data[8]' accessed at index 17, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // #2199 - false negative: array out of bounds in loop when there is calculation
@@ -2227,7 +2249,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i < 5; ++i) {\n"
               "        arr[i + 7] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Array 'arr[5]' accessed at index 11, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -2237,21 +2259,21 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char data[8];\n"
               "    data[-1] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Array 'data[8]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    char data[8][4];\n"
               "    data[5][-1] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Array 'data[8][4]' accessed at index data[*][-1], which is out of bounds. [negativeIndex]\n", errout_str());
 
         // #1614 - negative index is ok for pointers
         check("void foo(char *p)\n"
               "{\n"
               "    p[-1] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -2259,14 +2281,14 @@ class TestBufferOverrun : public TestFixture {
               "    char s[] = \"abc\";\n"
               "    char *p = s + strlen(s);\n"
               "    if (p[-1]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #1850
         check("int f(const std::map<int, std::map<int,int> > &m)\n"
               "{\n"
               "    return m[0][-1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2275,7 +2297,7 @@ class TestBufferOverrun : public TestFixture {
               "void foo() {\n"
               "    TEST test;\n"
               "    test.a[-1] = 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Array 'test.a[10]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
@@ -2291,7 +2313,7 @@ class TestBufferOverrun : public TestFixture {
               "void g(int i) {\n"
               "    if( i == 0 )\n"
               "        return f(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2398,7 +2420,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 10; i > 0; --i) {\n"
               "        data[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (error) Array 'data[8]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
@@ -2407,7 +2429,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (unsigned int i = 3; i < 5; --i) {\n"
               "        val[i+1] = val[i];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -2416,7 +2438,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 3; i < 5; --i) {\n"
               "        val[i+1] = val[i];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Array 'val[5]' accessed at index -9994, which is out of bounds. [negativeIndex]\n"
                       "[test.cpp:5:23]: (error) Array 'val[5]' accessed at index -9995, which is out of bounds. [negativeIndex]\n", errout_str());
     }
@@ -2434,7 +2456,7 @@ class TestBufferOverrun : public TestFixture {
               "    A a;\n"
               "    a.data[3] = 0;\n"
               "    a.b.data[2] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #1586
@@ -2449,7 +2471,7 @@ class TestBufferOverrun : public TestFixture {
               "    A a;\n"
               "    a.data[4] = 0;\n"
               "    a.b.data[3] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:11]: (error) Array 'a.data[4]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n"
                       "[test.cpp:11:13]: (error) Array 'a.b.data[3]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
@@ -2463,7 +2485,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (x = 0; x < 10 && y; x++) {\n"
               "        data[x] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (error) Array 'data[2]' accessed at index 9, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
@@ -2472,7 +2494,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (x = 0; x < 10 || y; x++) {\n"
               "        data[x] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (error) Array 'data[2]' accessed at index 9, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
@@ -2481,7 +2503,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (x = 0; x <= 10 && y; x++) {\n"
               "        data[x] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (error) Array 'data[2]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
@@ -2490,7 +2512,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (x = 0; y && x <= 10; x++) {\n"
               "        data[x] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (error) Array 'data[2]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("int f() {\n" // #9126
@@ -2502,7 +2524,7 @@ class TestBufferOverrun : public TestFixture {
               "            c++;\n"
               "     }\n"
               "    return c;\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2516,7 +2538,7 @@ class TestBufferOverrun : public TestFixture {
               "        }\n"
               "        a[i - 1] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int maybe();
@@ -2528,7 +2550,7 @@ class TestBufferOverrun : public TestFixture {
               "        }\n"
               "        a[i - 1] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:10]: (error) Array 'a[2]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
@@ -2541,7 +2563,7 @@ class TestBufferOverrun : public TestFixture {
               "        }\n"
               "        a[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:10]: (error) Array 'a[10]' accessed at index 19, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // Ticket #2385 - No false positive
@@ -2553,7 +2575,7 @@ class TestBufferOverrun : public TestFixture {
               "            a[i-10] = 0;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #3893 - start value out of bounds
@@ -2563,7 +2585,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 10; maybe(); dostuff()) {\n"
               "        a[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'a[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // #7686
@@ -2597,7 +2619,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i != 10; ++i) {\n"
               "        a[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'a[5]' accessed at index 9, which is out of bounds. [arrayIndexOutOfBounds]\n",
                       errout_str());
     }
@@ -2609,7 +2631,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i != 10; ++i) {\n"
               "        i == 0 ? 0 : a[i-1];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -2617,7 +2639,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i != 10; ++i) {\n"
               "        some_condition ? 0 : a[i-1];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:31]: (error) Array 'a[10]' accessed at index -1, which is out of bounds. [negativeIndex]\n",
                       errout_str());
 
@@ -2627,7 +2649,7 @@ class TestBufferOverrun : public TestFixture {
               "        i==0 ? 0 : a[i-1];\n"
               "        a[i-1] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
@@ -2635,7 +2657,7 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "   char a[10];\n"
               "   for (i=0; i<10; i++);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2646,14 +2668,14 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i=0; i<7; ++i) {\n"
               "        a[0] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_extern() {
         // Ticket #1684. FP when using 'extern'.
         check("extern char arr[15];\n"
-              "char arr[15] = \"abc\";");
+              "char arr[15] = \"abc\";\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2667,7 +2689,7 @@ class TestBufferOverrun : public TestFixture {
               "void f2() {\n"
               "    int x[2];\n"
               "    f1(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Same type => error
@@ -2677,7 +2699,7 @@ class TestBufferOverrun : public TestFixture {
               "void f2() {\n"
               "    char x[2];\n"
               "    f1(x);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:2]: (error) Array 'x[2]' accessed at index 4, which is out of bounds.\n",
                            "",
                            errout_str());
@@ -2687,41 +2709,41 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    const char *str = \"abc\";\n"
               "    bar(str[10]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Array 'str[4]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    const char *str = \"abc\";\n"
               "    bar(str[4]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Array 'str[4]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    const char *str = \"abc\";\n"
               "    bar(str[3]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    const char *str = \"a\tc\";\n"
               "    bar(str[4]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Array 'str[4]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n" // #6973
               "    const char *name = \"\";\n"
               "    if ( name[0] == 'U' ? name[1] : 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int main(int argc, char **argv) {\n"
               "    char str[6] = \"\\0\";\n"
               "    unsigned short port = 65535;\n"
               "    snprintf(str, sizeof(str), \"%hu\", port);\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int x) {\n" // #11020
@@ -2743,7 +2765,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    struct tt *tt=x;\n"
               "    tt->name;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // detect error
@@ -2754,7 +2776,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    struct tt *tt=x;\n"
               "    tt->name[22] = 123;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:13]: (error) Array 'tt->name[21]' accessed at index 22, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -2763,7 +2785,7 @@ class TestBufferOverrun : public TestFixture {
               "    char str[3];\n"
               "    str[i] = 0;\n"
               "    if (i==10) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10] -> [test.cpp:3:8]: (warning) Either the condition 'i==10' is redundant or the array 'str[3]' is accessed at index 10, which is out of bounds. [arrayIndexOutOfBoundsCond]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -2772,31 +2794,31 @@ class TestBufferOverrun : public TestFixture {
               "    switch (i) {\n"
               "    case 10: break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5] -> [test.cpp:3:8]: (warning) Either the switch case 'case 10' is redundant or the array 'str[3]' is accessed at index 10, which is out of bounds. [arrayIndexOutOfBoundsCond]\n", errout_str());
 
         check("void f() {\n"
               "    char str[3];\n"
               "    str[((unsigned char)3) - 1] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"  // #5416 FP
               "    char *str[3];\n"
               "    do_something(&str[0][5]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class X { static const int x[100]; };\n" // #6070
-              "const int X::x[100] = {0};");
+              "const int X::x[100] = {0};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace { class X { static const int x[100]; };\n" // #6232
-              "const int X::x[100] = {0}; }");
+              "const int X::x[100] = {0}; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class ActorSprite { static ImageSet * targetCursorImages[2][10]; };\n"
-              "ImageSet *ActorSprite::targetCursorImages[2][10];");
+              "ImageSet *ActorSprite::targetCursorImages[2][10];\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(const std::size_t s) {\n" // #10130
@@ -2828,7 +2850,7 @@ class TestBufferOverrun : public TestFixture {
               "  int a[10];\n"
               "  int *p = a;\n"
               "  p[20] = 0;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (error) Array 'a[10]' accessed at index 20, which is out of bounds.\n", "", errout_str());
 
         {
@@ -2837,14 +2859,14 @@ class TestBufferOverrun : public TestFixture {
                   "  int a[10];\n"
                   "  int *p = a;\n"
                   "  p[10] = 0;\n"
-                  "}");
+                  "}\n");
             TODO_ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4:6]: (error) Array 'a[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", "", errout_str());
 
             check("void f() {\n"
                   "  int a[10];\n"
                   "  int *p = a;\n"
                   "  dostuff(&p[10]);\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -2852,33 +2874,33 @@ class TestBufferOverrun : public TestFixture {
               "  int a[X];\n" // unknown size
               "  int *p = a;\n"
               "  p[20] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int a[2];\n"
               "  char *p = (char *)a;\n" // cast
               "  p[4] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_function_parameter() {
         check("void f(char a[10]) {\n"
               "  a[20] = 0;\n" // <- cppcheck warn here even though it's not a definite access out of bounds
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:4]: (error) Array 'a[10]' accessed at index 20, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f(char a[10]) {\n" // #6353 - reassign 'a'
               "  a += 4;\n"
               "  a[-1] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char a[10]) {\n"
               "  a[0] = 0;\n"
               "  a[-1] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:4]: (error) Array 'a[10]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
@@ -2887,7 +2909,7 @@ class TestBufferOverrun : public TestFixture {
               "void f() {\n"
               "    E arrE[] = { e1, e2 };\n"
               "    arrE[sizeof(arrE)] = e1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Array 'arrE[2]' accessed at index 8, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -2895,8 +2917,71 @@ class TestBufferOverrun : public TestFixture {
         check("constexpr int blockLen = 10;\n"
               "void foo(std::array<uint8_t, blockLen * 2>& a) {\n"
               "    a[2] = 2;\n"
-              "}");
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void array_index_container_data()
+    {
+        check("void f() {\n"
+              "    std::vector<int> v(3);\n"
+              "    int* p = v.data();\n"
+              "    p[2] = 1;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v(3);\n"
+              "    int* p = v.data();\n"
+              "    p[5] = 1;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:6]: (error) Array 'p[3]' accessed at index 5, which is out of bounds. [arrayIndexOutOfBounds]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v(3);\n"
+              "    memset(v.data(), 0, 12);\n"
+              "    memset(v.data(), 0, 100);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:18]: (error) Buffer is accessed out of bounds: v.data() [bufferAccessOutOfBounds]\n",
+                      errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v(3);\n"
+              "    int* p = v.data();\n"
+              "    memset(p, 0, 100);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:12]: (error) Buffer is accessed out of bounds: p [bufferAccessOutOfBounds]\n",
+                      errout_str());
+
+        // the size is not tracked past changes of the container size
+        check("void f() {\n"
+              "    std::vector<int> v(3);\n"
+              "    v.reserve(100);\n"
+              "    int* p = v.data();\n"
+              "    v.resize(10);\n"
+              "    memset(p, 0, 40);\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        // ..or when the pointer is reassigned
+        check("void f(int* q) {\n"
+              "    std::vector<int> v(3);\n"
+              "    int* p = v.data();\n"
+              "    p = q;\n"
+              "    memset(p, 0, 100);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // the buffer of c_str() includes the null terminator
+        check("void f(char* dst) {\n"
+              "    std::string s = \"abc\";\n"
+              "    memcpy(dst, s.c_str(), 4);\n"
+              "    memcpy(dst, s.c_str(), 5);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:24]: (error) Buffer is accessed out of bounds: s.c_str() [bufferAccessOutOfBounds]\n",
+                      errout_str());
     }
 
     void array_index_two_for_loops() {
@@ -2909,7 +2994,7 @@ class TestBufferOverrun : public TestFixture {
               "        sum += val[i];\n"
               "    if (i < 50)\n"
               "        sum -= val[i];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool b();\n"
@@ -2923,7 +3008,7 @@ class TestBufferOverrun : public TestFixture {
               "        sum -= val[i];\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool b();\n"
@@ -2935,7 +3020,7 @@ class TestBufferOverrun : public TestFixture {
               "        sum += val[i];\n"
               "    for (; i < 50; i++)\n"
               "        sum -= val[i];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3022,7 +3107,7 @@ class TestBufferOverrun : public TestFixture {
               "static void f(struct ABC *abc)\n"
               "{\n"
               "    strcpy( abc->str, \"abcdef\" );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:16]: (error) Buffer is accessed out of bounds: abc->str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("struct ABC\n"
@@ -3034,7 +3119,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    struct ABC abc;\n"
               "    strcpy( abc.str, \"abcdef\" );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:16]: (error) Buffer is accessed out of bounds: abc.str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("struct ABC\n"
@@ -3045,7 +3130,7 @@ class TestBufferOverrun : public TestFixture {
               "static void f(struct ABC &abc)\n"
               "{\n"
               "    strcpy( abc.str, \"abcdef\" );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:16]: (error) Buffer is accessed out of bounds: abc.str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("static void f()\n"
@@ -3055,7 +3140,7 @@ class TestBufferOverrun : public TestFixture {
               "        char str[5];\n"
               "    } abc;\n"
               "    strcpy( abc.str, \"abcdef\" );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:16]: (error) Buffer is accessed out of bounds: abc.str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("static void f()\n"
@@ -3067,7 +3152,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct ABC *abc = malloc(sizeof(struct ABC));\n"
               "    strcpy( abc->str, \"abcdef\" );\n"
               "    free(abc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:16]: (error) Buffer is accessed out of bounds: abc->str [bufferAccessOutOfBounds]\n", errout_str());
     }
 
@@ -3080,7 +3165,7 @@ class TestBufferOverrun : public TestFixture {
               "    int i;\n"
               "    for (i = 0; i <= 10; ++i)\n"
               "        a[i] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:10]: (error) Array 'a[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("struct S { int b; } static e[1];\n" // #11052
@@ -3095,7 +3180,7 @@ class TestBufferOverrun : public TestFixture {
               "    const char *p[2];\n"
               "    for (int i = 0; i < 8; ++i)\n"
               "        p[i] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'p[2]' accessed at index 7, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // No false positive
@@ -3104,7 +3189,7 @@ class TestBufferOverrun : public TestFixture {
               "    const char *p[2];\n"
               "    const char *s = y + p[1];\n"
               "    p[1] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // There is no error here
@@ -3116,7 +3201,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "  char s[3];\n"
               "  f1(s,20);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
 
         check("void f1(char *s,int size)\n"
@@ -3137,7 +3222,7 @@ class TestBufferOverrun : public TestFixture {
               "    char n[5];\n"
               "    sprintf(n, \"d\");\n"
               "    printf(\"hello!\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3147,21 +3232,21 @@ class TestBufferOverrun : public TestFixture {
               "   char n[5];\n"
               "   strcat(n, \"abc\");\n"
               "   strcat(n, \"def\");\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Buffer is accessed out of bounds: n\n", "", errout_str());
 
         check("void f()\n" // #12489
               "{\n"
               "   char d[3] = {};\n"
               "   strcat(d, \"12345678\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Buffer is accessed out of bounds: d [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "   char d[3] = \"ab\"; \n"
               "   strcat(d, \"c\");\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:11]: (error) Buffer is accessed out of bounds: d [bufferAccessOutOfBounds]\n", "", errout_str());
     }
 
@@ -3171,7 +3256,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char a[2];\n"
               "    strcpy(a, \"a\\0\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3184,7 +3269,7 @@ class TestBufferOverrun : public TestFixture {
               "    {\n"
               "        a[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -3194,7 +3279,7 @@ class TestBufferOverrun : public TestFixture {
               "    {\n"
               "        a[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3208,7 +3293,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = 0;\n"
               "        i += 100;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3221,7 +3306,7 @@ class TestBufferOverrun : public TestFixture {
               "    {\n"
               "        char b = a[i];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3232,7 +3317,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (float i=0; i<10.0;i=i+0.1)\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -3241,7 +3326,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (float i=0; i<10.0;i=0.1+i)\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3253,7 +3338,7 @@ class TestBufferOverrun : public TestFixture {
               "void A::f(int i, int ii)\n"
               "{\n"
               "    strcpy(val, \"ab\") ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:12]: (error) Buffer is accessed out of bounds: val [bufferAccessOutOfBounds]\n", errout_str());
     }
 
@@ -3262,20 +3347,20 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    struct Foo foo[5];\n"
               "    memset(foo, 0, sizeof(foo));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"  // ticket #2093
               "    gchar x[3];\n"
               "    strcpy(x, \"12\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("extern char a[10];\n"
               "void f() {\n"
               "    char b[25] = {0};\n"
               "    std::memcpy(b, a, 10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3289,7 +3374,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i=0; i<6; i++) {\n"
               "        b[i] = b[i+1];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
@@ -3301,7 +3386,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i=0; i<7; i++) {\n"
               "        b[i] = b[i+1];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:17]: (error) Array 'b[7]' accessed at index 7, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -3314,7 +3399,7 @@ class TestBufferOverrun : public TestFixture {
               "\n"
               "A::A() {\n"
               "    memset(buf, 0, 10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3325,7 +3410,7 @@ class TestBufferOverrun : public TestFixture {
               "    const char *src = \"AAAAAAAAAAAAAAAAAAAAA\";\n"
               "    for (size_t i = 0; i <= 4; i++)\n"
               "        dst[i] = src[i];\n"
-              "} } }");
+              "} } }\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (error) Array 'dst[4]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -3337,7 +3422,7 @@ class TestBufferOverrun : public TestFixture {
               "   for( int i = 0; i<6; ) {\n"
               "      x += array[i];\n"
               "       i++;  }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         // ticket #4096
@@ -3347,7 +3432,7 @@ class TestBufferOverrun : public TestFixture {
               "   for( int i = 0; i<6; ) {\n"
               "      x += array[i++];\n"
               "   }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
@@ -3357,7 +3442,7 @@ class TestBufferOverrun : public TestFixture {
               "    char inbuf[1000];\n"
               "    char *f[10];\n"
               "    split(inbuf, f, 10, \"\t\t\");\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3367,7 +3452,7 @@ class TestBufferOverrun : public TestFixture {
               "void main() {\n"
               "struct foobar x[5];\n"
               "abc(x);\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3378,7 +3463,7 @@ class TestBufferOverrun : public TestFixture {
               "int main(){\n"
               "  testChar tc1 = \"\";\n"
               "  tc1[5]='a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3388,14 +3473,14 @@ class TestBufferOverrun : public TestFixture {
         check("struct S { int m[9]; };\n"
               "int f(S * s) {\n"
               "    return s->m[sizeof(s->m)];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Array 's->m[9]' accessed at index 36, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void buffer_overrun_31() {
         check("void f(WhereInfo *pWInfo, int *aiCur) {\n"
               "  memcpy(aiCur, pWInfo->aiCurOnePass, sizeof(int)*2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3406,7 +3491,7 @@ class TestBufferOverrun : public TestFixture {
               "    char dest[1] = \"a\";\n"
               "    (void)strxfrm(dest,src,1);\n"
               "    (void)strxfrm(dest,src,2);\n"// <<
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:19]: (error) Buffer is accessed out of bounds: dest [bufferAccessOutOfBounds]\n", errout_str());
         // destination size is too small
         check("void f(void) {\n"
@@ -3415,7 +3500,7 @@ class TestBufferOverrun : public TestFixture {
               "    (void)strxfrm(dest,src,1);\n"
               "    (void)strxfrm(dest,src,2);\n"
               "    (void)strxfrm(dest,src,3);\n" // <<
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:19]: (error) Buffer is accessed out of bounds: dest [bufferAccessOutOfBounds]\n", errout_str());
         // source size is too small
         check("void f(void) {\n"
@@ -3424,16 +3509,8 @@ class TestBufferOverrun : public TestFixture {
               "    (void)strxfrm(dest,src,1);\n"
               "    (void)strxfrm(dest,src,2);\n"
               "    (void)strxfrm(dest,src,3);\n" // <<
-              "}");
-        ASSERT_EQUALS("[test.cpp:6:24]: (error) Buffer is accessed out of bounds: src [bufferAccessOutOfBounds]\n", errout_str());
-        // source size is too small
-        check("void f(void) {\n"
-              "    const char src[1] = \"a\";\n"
-              "    char dest[3] = \"abc\";\n"
-              "    (void)strxfrm(dest,src,1);\n"
-              "    (void)strxfrm(dest,src,2);\n" // <<
-              "}");
-        ASSERT_EQUALS("[test.cpp:5:24]: (error) Buffer is accessed out of bounds: src [bufferAccessOutOfBounds]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void buffer_overrun_33() { // #2019
@@ -3443,7 +3520,7 @@ class TestBufferOverrun : public TestFixture {
               "      for (int j=0; j<20; j++)\n"
               "          z[i] = 0;\n"
               "   return z[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Array 'z[16]' accessed at index 19, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -3496,18 +3573,191 @@ class TestBufferOverrun : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void buffer_overrun_37() { // #14703
+        check("void f() {\n"
+              "    const char *dst[256];\n"
+              "    static const char * const src[] = {\"a\", \"b\", \"c\"};\n"
+              "    memcpy(dst, src, sizeof(src));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void buffer_overrun_38() { // #9173
+        check("void f() {\n"
+              "    int a[10];\n"
+              "    memset(&a[0], 0, 20 * sizeof(int));\n"
+              "}\n"
+              "void g() {\n"
+              "    int a[10];\n"
+              "    memset(&a[0], 0, 10 * sizeof(int));\n"
+              "}\n"
+              "void h() {\n"
+              "    int a[10];\n"
+              "    memset(&a[5], 0, 5 * sizeof(int));\n"
+              "}\n"
+              "void i() {\n"
+              "    int a[10][10];\n"
+              "    memset(&a[0][0], 0, 100 * sizeof(int));\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12]: (error) Buffer is accessed out of bounds: &a[0] [bufferAccessOutOfBounds]\n", errout_str());
+
+        check("void f() {\n"
+              "    int a[10];\n"
+              "    memset(&a[5], 0, 10 * sizeof(int));\n"
+              "}\n"
+              "void g() {\n"
+              "    int a[1][1];\n"
+              "    memset(&a[0][0], 0, 10 * sizeof(int));\n"
+              "}\n");
+        TODO_ASSERT_EQUALS("[test.cpp:3:12]: (error) Buffer is accessed out of bounds: &a[5] [bufferAccessOutOfBounds]\n"
+                           "[test.cpp:7:12]: (error) Buffer is accessed out of bounds: &a[0][0] [bufferAccessOutOfBounds]\n",
+                           "[test.cpp:3:12]: (error) Buffer is accessed out of bounds: &a[5] [bufferAccessOutOfBounds]\n",
+                           errout_str());
+
+        check("void f() {\n" // #14866
+              "    std::vector<char> buf(25);\n"
+              "    std::memset(&buf[0], 0, 25);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n" // #14859
+              "    std::vector<char> buf(25);\n"
+              "    std::memset(&buf[0], 0, 26);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:17]: (error) Buffer is accessed out of bounds: &buf[0] [bufferAccessOutOfBounds]\n", errout_str());
+
+        check("void f(FILE *fp) {\n" // #14929
+              "    std::string s;\n"
+              "    fwrite(&s, 1, 1, fp);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str()); // don't crash
+
+        check("void f() {\n" // #14935
+              "    int a[5];\n"
+              "    for (int i = 0; i < 5; ++i)\n"
+              "        memset(&a[i], 0, sizeof(a));\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:16]: (error) Buffer is accessed out of bounds: &a[i] [bufferAccessOutOfBounds]\n", errout_str());
+
+        check("void f(const std::vector<uint8_t>& s) {\n" // #14948
+              "    if (s.size() < 4)\n"
+              "        return;\n"
+              "    uint32_t u = 0;\n"
+              "    std::memcpy(&u, &s[0], sizeof(u));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void buffer_overrun_39() { // #11765
+        check("void f() {\n"
+              "    char buf[10];\n"
+              "    memcpy(buf, \"abc\", 4);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    char buf[128];\n"
+              "    memcpy(buf, \"abc\", 5);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:17]: (error) Buffer is accessed out of bounds: \"abc\" [bufferAccessOutOfBounds]\n",
+                      errout_str());
+
+        check("void f() {\n"
+              "    char buf[128];\n"
+              "    memcpy(buf, L\"abc\", 4 * sizeof(wchar_t));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    char buf[128];\n"
+              "    memcpy(buf, L\"abc\", 4 * sizeof(wchar_t) + 1);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:17]: (error) Buffer is accessed out of bounds: L\"abc\" [bufferAccessOutOfBounds]\n",
+                      errout_str());
+
+        check("int f(char* s) {\n"
+              "    return memcmp(s, \"\\0\\0\\0\", 3);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(const char16_t* buf) {\n"
+              "    return memcmp(buf, u\"abc\", 4 * sizeof(char16_t));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(const char* buf) {\n"
+              "    return memcmp(buf, &\"abc\"[2], 4 * sizeof(char));\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:24]: (error) Buffer is accessed out of bounds: &\"abc\"[2] [bufferAccessOutOfBounds]\n",
+                      errout_str());
+    }
+
     void buffer_overrun_errorpath() {
         setMultiline();
         Settings s = settings0;
-        s.templateLocation = "{file}:{line}:note:{info}";
+        s.templateLocation = "{file}:{line}:note:{info}\n";
 
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    memset(p, 0, 20);\n"
-              "}", s);
+              "}\n", s);
         ASSERT_EQUALS("[test.cpp:3:12]: error: Buffer is accessed out of bounds: p [bufferAccessOutOfBounds]\n"
                       "[test.cpp:2:13]: note: Assign p, buffer with size 10\n"
                       "[test.cpp:3:12]: note: Buffer overrun\n", errout_str());
+
+        check("void f(const std::vector<uint8_t>& s) {\n"
+              "    if (s.size() == 2) {}\n"
+              "    uint32_t u = 0;\n"
+              "    std::memcpy(&u, &s[0], sizeof(u));\n"
+              "}\n", s);
+        ASSERT_EQUALS("[test.cpp:4:21]: warning: Buffer is accessed out of bounds: &s[0] [bufferAccessOutOfBounds]\n"
+                      "[test.cpp:2:18]: note: Assuming that condition 's.size()==2' is not redundant\n"
+                      "[test.cpp:4:21]: note: Buffer overrun\n", errout_str());
+
+        check("void f(int i) {\n" // #14960
+              "    int a[1];\n"
+              "    if (i != 2) return;\n"
+              "    memset(a, 0, i * sizeof(int));\n"
+              "}"
+              "void g(int i) {\n"
+              "    int a[1];\n"
+              "    if (i != 2) {}\n"
+              "    memset(a, 0, i * sizeof(int));\n"
+              "}", s);
+        ASSERT_EQUALS("[test.cpp:4:12]: warning: Buffer is accessed out of bounds: a [bufferAccessOutOfBounds]\n"
+                      "[test.cpp:3:11]: note: Assuming that condition 'i!=2' is not redundant\n"
+                      "[test.cpp:4:12]: note: Buffer overrun\n"
+                      "[test.cpp:8:12]: warning: Buffer is accessed out of bounds: a [bufferAccessOutOfBounds]\n"
+                      "[test.cpp:7:11]: note: Assuming that condition 'i!=2' is not redundant\n"
+                      "[test.cpp:8:12]: note: Buffer overrun\n", errout_str());
+
+        check("int a[3];\n"
+              "int f1(int i, bool b) {\n"
+              "    int j = b ? i : -1;\n"
+              "    return a[j];\n"
+              "}"
+              "int f2(int i, bool b) {\n"
+              "    int j = b ? -1 : i;\n"
+              "    return a[j];\n"
+              "}"
+              "int f3(int i, bool b) {\n"
+              "    int j = -1;\n"
+              "    if (b)\n"
+              "        j = i;\n"
+              "    return a[j];\n"
+              "}", s);
+        ASSERT_EQUALS("[test.cpp:4:13]: warning: Array 'a[3]' accessed at index -1, which is out of bounds. [negativeIndex]\n"
+                      "[test.cpp:3:13]: note: Assuming condition 'b' is false\n"
+                      "[test.cpp:3:15]: note: Assignment 'j=b?i:-1', assigned value is -1\n"
+                      "[test.cpp:4:13]: note: Negative array index\n"
+                      "[test.cpp:7:13]: warning: Array 'a[3]' accessed at index -1, which is out of bounds. [negativeIndex]\n"
+                      "[test.cpp:6:13]: note: Assuming condition 'b' is true\n"
+                      "[test.cpp:6:15]: note: Assignment 'j=b?-1:i', assigned value is -1\n"
+                      "[test.cpp:7:13]: note: Negative array index\n"
+                      "[test.cpp:12:13]: warning: Array 'a[3]' accessed at index -1, which is out of bounds. [negativeIndex]\n"
+                      "[test.cpp:9:14]: note: Assignment 'j=-1', assigned value is -1\n"
+                      "[test.cpp:10:9]: note: Assuming condition is false\n"
+                      "[test.cpp:12:13]: note: Negative array index\n", errout_str());
     }
 
     void buffer_overrun_bailoutIfSwitch() {
@@ -3519,7 +3769,7 @@ class TestBufferOverrun : public TestFixture {
               "void f2() {\n"
               "    char a[10];\n"
               "    f1(a);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // No false positive
@@ -3531,7 +3781,7 @@ class TestBufferOverrun : public TestFixture {
               "void f2() {\n"
               "    char a[10];\n"
               "    f1(a);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // No false negative
@@ -3543,7 +3793,7 @@ class TestBufferOverrun : public TestFixture {
               "void f2() {\n"
               "    char a[10];\n"
               "    f1(a);"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:3]: (error) Array 'a[10]' accessed at index 100, which is out of bounds.\n", "", errout_str());
     }
 
@@ -3554,7 +3804,7 @@ class TestBufferOverrun : public TestFixture {
               "void g() {\n"
               "    char a[2];\n"
               "    f(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: warning: Buffer 'a' is too small, the function 'f' expects a bigger buffer in 1st argument [argumentSize]\n"
                       "[test.cpp:4:5]: note: Function 'f' is called\n"
                       "[test.cpp:1:13]: note: Declaration of 1st function argument.\n"
@@ -3565,7 +3815,7 @@ class TestBufferOverrun : public TestFixture {
               "void g() {\n"
               "    float a[2][3];\n"
               "    f(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: warning: Buffer 'a' is too small, the function 'f' expects a bigger buffer in 1st argument [argumentSize]\n"
                       "[test.cpp:4:5]: note: Function 'f' is called\n"
                       "[test.cpp:1:14]: note: Declaration of 1st function argument.\n"
@@ -3576,7 +3826,7 @@ class TestBufferOverrun : public TestFixture {
               "void g() {\n"
               "    int a[2];\n"
               "    f(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: warning: Buffer 'a' is too small, the function 'f' expects a bigger buffer in 1st argument [argumentSize]\n"
                       "[test.cpp:4:5]: note: Function 'f' is called\n"
                       "[test.cpp:1:12]: note: Declaration of 1st function argument.\n"
@@ -3598,7 +3848,7 @@ class TestBufferOverrun : public TestFixture {
               "void foo() {\n"
               "  unsigned char(* tree)[2048][4] = new unsigned char[256][2048][4];\n"
               "  CreateLeafTex(tree);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a[10]) {\n" // #10069
@@ -3626,7 +3876,7 @@ class TestBufferOverrun : public TestFixture {
               "    memset(src, 'C', 99);\n"
               "    src[99] = '\\0';\n"
               "    strcat(data, src);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (warning) Possible buffer overflow if strlen(src) is larger than sizeof(data)-strlen(data).\n", "", errout_str());
 
         check("void foo() {\n"
@@ -3635,19 +3885,19 @@ class TestBufferOverrun : public TestFixture {
               "    memset(src, 'C', 99);\n"
               "    src[99] = '\\0';\n"
               "    strcat(data, src);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char src[100]) {\n"
               "    char * data = (char *)alloca(50);\n"
               "    strcat(data, src);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (warning) Possible buffer overflow if strlen(src) is larger than sizeof(data)-strlen(data).\n", "", errout_str());
 
         check("void foo(char src[100]) {\n"
               "    char * data = (char *)alloca(100);\n"
               "    strcat(data, src);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -3656,7 +3906,7 @@ class TestBufferOverrun : public TestFixture {
               "    memset(src, 'C', 99);\n"
               "    src[99] = '\\0';\n"
               "    strcpy(data, src);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (warning) Possible buffer overflow if strlen(src) is larger than or equal to sizeof(data).\n", "", errout_str());
 
         check("void foo() {\n"
@@ -3665,19 +3915,19 @@ class TestBufferOverrun : public TestFixture {
               "    memset(src, 'C', 99);\n"
               "    src[99] = '\\0';\n"
               "    strcpy(data, src);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char src[100]) {\n"
               "    char * data = (char *)alloca(50);\n"
               "    strcpy(data, src);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (warning) Possible buffer overflow if strlen(src) is larger than or equal to sizeof(data).\n", "", errout_str());
 
         check("void foo(char src[100]) {\n"
               "    char * data = (char *)alloca(100);\n"
               "    strcpy(data, src);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3699,26 +3949,26 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "  u8 str[256];\n"
               "  mystrcpy(str, \"abcd\");\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  u8 str[2];\n"
               "  mystrcpy(str, \"abcd\");\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", errout_str());
 
         // The same for structs, where the message comes from a different check
         check("void f() {\n"
               "    struct { u8 str[256]; } ms;\n"
               "    mystrcpy(ms.str, \"abcd\");\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    struct { u8 str[2]; } ms;\n"
               "    mystrcpy(ms.str, \"abcd\");\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Buffer is accessed out of bounds: ms.str [bufferAccessOutOfBounds]\n", errout_str());
     }
 
@@ -3726,32 +3976,32 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "  int i;\n"
               "  memset(i, 0, 1000);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int i;\n"
               "  memset(&i, 0, 1000);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Buffer is accessed out of bounds: &i [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "  int i[2];\n"
               "  memset(&i, 0, 1000);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Buffer is accessed out of bounds: i [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "  int i;\n"
               "  memset(&i, 0, sizeof(i));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int i[10];\n"
               "  memset(&i[1], 0, 1000);\n"
-              "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3:10]: (error) Buffer is accessed out of bounds: &i[1] [bufferAccessOutOfBounds]\n", "", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (error) Buffer is accessed out of bounds: &i[1] [bufferAccessOutOfBounds]\n", errout_str());
 
         check("struct S { int x; };\n" // #8616
               "void f() {\n"
@@ -3779,7 +4029,7 @@ class TestBufferOverrun : public TestFixture {
               "  const char *x = s;\n"
               "  if (cond) x = \"abcde\";\n"
               "  return x[20];\n" // <- array index out of bounds when x is "abcde"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Array 'x[6]' accessed at index 20, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -3789,40 +4039,40 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    char a[10];\n"
               "    char *p = a + 100;\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:17]: (portability) Undefined behaviour, pointer arithmetic 'a+100' is out of bounds. [pointerOutOfBounds]\n", errout_str());
 
         check("char *f() {\n"
               "    char a[10];\n"
               "    return a + 100;\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:14]: (portability) Undefined behaviour, pointer arithmetic 'a+100' is out of bounds. [pointerOutOfBounds]\n", errout_str());
 
         check("void f(int i) {\n"
               "    char x[10];\n"
               "    if (i == 123) {}\n"
               "    dostuff(x+i);\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:4:14]: (portability) Undefined behaviour, when 'i' is 123 the pointer arithmetic 'x+i' is out of bounds. [pointerOutOfBoundsCond]\n", errout_str());
 
         check("void f(int i) {\n"
               "    char x[10];\n"
               "    if (i == -1) {}\n"
               "    dostuff(x+i);\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:4:14]: (portability) Undefined behaviour, when 'i' is -1 the pointer arithmetic 'x+i' is out of bounds. [pointerOutOfBoundsCond]\n", errout_str());
 
         check("void f() {\n" // #6350 - fp when there is cast of buffer
               "  wchar_t buf[64];\n"
               "  p = (unsigned char *) buf + sizeof (buf);\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", settings0_p, false);
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    const char   d[] = \"0123456789\";\n"
               "    char *cp = d + 3;\n"
               "    return cp - d;\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3831,7 +4081,7 @@ class TestBufferOverrun : public TestFixture {
               "    char *p = malloc(10);\n"
               "    p += 100;\n"
               "    free(p);"
-              "}");
+              "}\n", settings0_p);
         TODO_ASSERT_EQUALS("[test.cpp:3]: (portability) Undefined behaviour, pointer arithmetic 'p+100' is out of bounds.\n", "", errout_str());
 
         check("void f() {\n"
@@ -3839,7 +4089,7 @@ class TestBufferOverrun : public TestFixture {
               "    p += 10;\n"
               "    *p = 0;\n"
               "    free(p);"
-              "}");
+              "}\n", settings0_p);
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) p is out of bounds.\n", "", errout_str());
 
         check("void f() {\n"
@@ -3848,7 +4098,7 @@ class TestBufferOverrun : public TestFixture {
               "    p -= 10;\n"
               "    *p = 0;\n"
               "    free(p);"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -3857,7 +4107,7 @@ class TestBufferOverrun : public TestFixture {
               "    p = p - 1;\n"
               "    *p = 0;\n"
               "    free(p);"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3865,7 +4115,7 @@ class TestBufferOverrun : public TestFixture {
         check("struct S { int a[10]; };\n"
               "void f(struct S *s) {\n"
               "    int *p = s->a + 100;\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:19]: (portability) Undefined behaviour, pointer arithmetic 's->a+100' is out of bounds. [pointerOutOfBounds]\n", errout_str());
 
         check("template <class T> class Vector\n"
@@ -3881,36 +4131,36 @@ class TestBufferOverrun : public TestFixture {
               "    const T* P2 = PDat + 1;\n"
               "    const T* P1 = P2 - 1;\n"
               "}\n"
-              "Vector<std::array<long, 2>> Foo;\n");
+              "Vector<std::array<long, 2>> Foo;\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
     }
 
     void pointer_out_of_bounds_4() {
         check("const char* f() {\n"
               "    g(\"Hello\" + 6);\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
 
         check("const char* f() {\n"
               "    g(\"Hello\" + 7);\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:2:15]: (portability) Undefined behaviour, pointer arithmetic '\"Hello\"+7' is out of bounds. [pointerOutOfBounds]\n", errout_str());
 
         check("const char16_t* f() {\n"
               "    g(u\"Hello\" + 6);\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
 
         check("const char16_t* f() {\n"
               "    g(u\"Hello\" + 7);\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:2:16]: (portability) Undefined behaviour, pointer arithmetic 'u\"Hello\"+7' is out of bounds. [pointerOutOfBounds]\n", errout_str());
 
         check("void f() {\n" // #4647
               "    int val = 5;\n"
               "    std::string hi = \"hi\" + val;\n"
               "    std::cout << hi << std::endl;\n"
-              "}\n");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:27]: (portability) Undefined behaviour, pointer arithmetic '\"hi\"+val' is out of bounds. [pointerOutOfBounds]\n", errout_str());
 
         check("void f(const char* s, int len) {\n" // #11026
@@ -3920,7 +4170,7 @@ class TestBufferOverrun : public TestFixture {
               "void g() {\n"
               "    f(\"a\", 1);\n"
               "    f(\"bbb\", 3);\n"
-              "}\n");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int i, const char* a) {\n" // #11140
@@ -3933,14 +4183,14 @@ class TestBufferOverrun : public TestFixture {
               "void h() {\n"
               "    for (int i = 0; \"012\"[i]; ++i)\n"
               "        f(i, \"345\");\n"
-              "}\n");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
     }
 
     void pointer_out_of_bounds_5() { // #10227
         check("int foo(char str[6]) {\n"
               "    return !((0 && *(\"STRING\" + 14) == 0) || memcmp(str, \"STRING\", 6) == 0);\n"
-              "}\n");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3950,26 +4200,26 @@ class TestBufferOverrun : public TestFixture {
         check("char *f() {\n"
               "    char x[10];\n"
               "    return x-1;\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:13]: (portability) Undefined behaviour, pointer arithmetic 'x-1' is out of bounds. [pointerOutOfBounds]\n", errout_str());
 
         check("void f(int i) {\n"
               "    char x[10];\n"
               "    if (i == 123) {}\n"
               "    dostuff(x-i);\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:4:14]: (portability) Undefined behaviour, when 'i' is 123 the pointer arithmetic 'x-i' is out of bounds. [pointerOutOfBoundsCond]\n", errout_str());
 
         check("void f(int i) {\n"
               "    char x[10];\n"
               "    if (i == -20) {}\n"
               "    dostuff(x-i);\n"
-              "}");
+              "}\n", settings0_p);
         TODO_ASSERT_EQUALS("[test.cpp:4]: (portability) Undefined behaviour, when 'i' is -20 the pointer arithmetic 'x-i' is out of bounds.\n", "", errout_str());
 
         check("void f(const char *x[10]) {\n"
               "    return x-4;\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3979,7 +4229,7 @@ class TestBufferOverrun : public TestFixture {
               "  struct Foo x = {0};\n"
               "  strcat(x.a, \"aa\");\n"
               "  strcat(x.a, \"aa\");\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
     }
 
@@ -3992,7 +4242,7 @@ class TestBufferOverrun : public TestFixture {
               "        char str[50];\n"
               "        str[30] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4000,7 +4250,7 @@ class TestBufferOverrun : public TestFixture {
         check("struct foo {\n"
               "  void bar() { return; }\n"
               "  type<> member[1];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4010,7 +4260,7 @@ class TestBufferOverrun : public TestFixture {
               "void foo()\n"
               "{\n"
               "    str[3] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:8]: (error) Array 'str[3]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -4019,7 +4269,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char *s; s = new char[10];\n"
               "    s[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 's[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // ticket #1670 - false negative when using return
@@ -4027,7 +4277,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    int *s; s = new int[10];\n"
               "    return s[10];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Array 's[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("struct Fred { char c[10]; };\n"
@@ -4035,12 +4285,12 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    Fred *f; f = new Fred;\n"
               "    return f->c[10];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:16]: (error) Array 'f->c[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("static const size_t MAX_SIZE = UNAVAILABLE_TO_CPPCHECK;\n"
               "struct Thing { char data[MAX_SIZE]; };\n"
-              "char f4(const Thing& t) { return !t.data[0]; }");
+              "char f4(const Thing& t) { return !t.data[0]; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -4050,7 +4300,7 @@ class TestBufferOverrun : public TestFixture {
               "  buf = new char[9];\n"
               "  buf[8] = 0;\n"
               "  delete [] buf;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -4060,7 +4310,7 @@ class TestBufferOverrun : public TestFixture {
               "  buf = new char[9];\n"
               "  buf[9] = 0;\n"
               "  delete [] buf;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:6]: (error) Array 'buf[9]' accessed at index 9, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void foo()\n"
@@ -4068,7 +4318,7 @@ class TestBufferOverrun : public TestFixture {
               "    enum E { Size = 10 };\n"
               "    char *s; s = new char[Size];\n"
               "    s[Size] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:6]: (error) Array 's[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void foo()\n"
@@ -4076,7 +4326,7 @@ class TestBufferOverrun : public TestFixture {
               "    enum E { ZERO };\n"
               "    E *e; e = new E[10];\n"
               "    e[10] = ZERO;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:6]: (error) Array 'e[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -4086,14 +4336,14 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char *s; s = (char *)malloc(10);\n"
               "    s[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 's[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // ticket #842
         check("void f() {\n"
               "    int *tab4 = (int *)malloc(20 * sizeof(int));\n"
               "    tab4[20] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Array 'tab4[20]' accessed at index 20, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // ticket #1478
@@ -4102,7 +4352,7 @@ class TestBufferOverrun : public TestFixture {
               "    free(p);\n"
               "    p = (char *)malloc(10);\n"
               "    p[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:6]: (error) Array 'p[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // ticket #1134
@@ -4110,7 +4360,7 @@ class TestBufferOverrun : public TestFixture {
               "    int *x, i;\n"
               "    x = (int *)malloc(10 * sizeof(int));\n"
               "    x[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 'x[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
@@ -4120,7 +4370,7 @@ class TestBufferOverrun : public TestFixture {
               "  tab4 = malloc(21 * sizeof(int));\n"
               "  tab4[20] = 0;\n"
               "  free(tab4);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -4129,50 +4379,59 @@ class TestBufferOverrun : public TestFixture {
               "  tab4 = realloc(tab4,21 * sizeof(int));\n"
               "  tab4[20] = 0;\n"
               "  free(tab4);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    enum E { Size = 20 };\n"
               "    E *tab4 = (E *)malloc(Size * 4);\n"
               "    tab4[Size] = Size;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Array 'tab4[20]' accessed at index 20, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "    enum E { Size = 20 };\n"
               "    E *tab4 = (E *)malloc(4 * Size);\n"
               "    tab4[Size] = Size;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Array 'tab4[20]' accessed at index 20, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "    enum E { ZERO };\n"
               "    E *tab4 = (E *)malloc(20 * sizeof(E));\n"
               "    tab4[20] = ZERO;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Array 'tab4[20]' accessed at index 20, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n" // #8721
               "  unsigned char **cache = malloc(32);\n"
               "  cache[i] = malloc(65536);\n"
               "  cache[i][0xFFFF] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int **a = malloc(2 * sizeof(int*));\n"
               "  for (int i = 0; i < 3; i++)\n"
               "    a[i] = NULL;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 'a[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "  int **a = new int*[2];\n"
               "  for (int i = 0; i < 3; i++)\n"
               "    a[i] = NULL;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 'a[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
+
+        check("void f(const uint8_t* a) {\n" // 10421
+              "    uint8_t* p = (uint8_t*)malloc(20U * sizeof(uint8_t));\n"
+              "    if (!p) return false;\n"
+              "    for (uint8_t i = 1; i < 30; ++i)\n"
+              "        p[i] = a[i];\n"
+              "    free(p);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'p[20]' accessed at index 29, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     // statically allocated buffer
@@ -4181,21 +4440,21 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    const char *s = \"123\";\n"
               "    s[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 's[4]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void foo()\n"
               "{\n"
               "    char *s; s = \"\";\n"
               "    s[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 's[1]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void foo() {\n"
               "    const char *s = \"\";\n"
               "    s = y();\n"
               "    s[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n" // #7718
@@ -4203,7 +4462,7 @@ class TestBufferOverrun : public TestFixture {
               "    std::string s = \"123\";\n"
               "    s.resize(100);\n"
               "    s[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4213,7 +4472,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char *s = (char *)alloca(10);\n"
               "    s[10] = 0;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 's[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", "", errout_str());
     }
     /*
@@ -4310,13 +4569,13 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    char c[10];\n"
               "    mymemset(c, 0, 10);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char c[10];\n"
               "    mymemset(c, 0, 11);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Buffer is accessed out of bounds: c [bufferAccessOutOfBounds]\n", errout_str());
 
         check("struct S {\n"
@@ -4325,13 +4584,13 @@ class TestBufferOverrun : public TestFixture {
               "void f() {\n"
               "    S s;\n"
               "    mymemset(s.a, 0, 10);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:6:15]: (error) Buffer is accessed out of bounds: s.a [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void foo() {\n"
               "    char s[10];\n"
               "    mymemset(s, 0, '*');\n"
-              "}", settings);
+              "}\n", settings);
         TODO_ASSERT_EQUALS("[test.cpp:3]: (warning) The size argument is given as a char constant.\n"
                            "[test.cpp:3:14]: (error) Buffer is accessed out of bounds: s [bufferAccessOutOfBounds]\n", "[test.cpp:3:14]: (error) Buffer is accessed out of bounds: s [bufferAccessOutOfBounds]\n", errout_str());
 
@@ -4339,65 +4598,65 @@ class TestBufferOverrun : public TestFixture {
         check("void f(void) {\n"
               "  char a[10];\n"
               "  mymemset(a+5, 0, 10);\n"
-              "}", settings);
+              "}\n", settings);
         TODO_ASSERT_EQUALS("[test.cpp:3:13]: (error) Buffer is accessed out of bounds: a [bufferAccessOutOfBounds]\n", "", errout_str());
 
         // Ticket #909
         check("void f(void) {\n"
               "    char str[] = \"abcd\";\n"
               "    mymemset(str, 0, 6);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f(void) {\n"
               "    char str[] = \"abcd\";\n"
               "    mymemset(str, 0, 5);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void) {\n"
               "    wchar_t str[] = L\"abcd\";\n"
               "    mymemset(str, 0, 21);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f(void) {\n"
               "    wchar_t str[] = L\"abcd\";\n"
               "    mymemset(str, 0, 20);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         // ticket #1659 - overflowing variable when using memcpy
         check("void f(void) {\n"
               "  char c;\n"
               "  mymemset(&c, 0, 4);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Buffer is accessed out of bounds: &c [bufferAccessOutOfBounds]\n", errout_str());
 
         // ticket #2121 - buffer access out of bounds when using uint32_t
         check("void f(void) {\n"
               "    unknown_type_t buf[4];\n"
               "    mymemset(buf, 0, 100);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         // #3124 - multidimensional array
         check("int main() {\n"
               "    char b[5][6];\n"
               "    mymemset(b, 0, 5 * 6);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("int main() {\n"
               "    char b[5][6];\n"
               "    mymemset(b, 0, 6 * 6);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Buffer is accessed out of bounds: b [bufferAccessOutOfBounds]\n", errout_str());
 
         check("int main() {\n"
               "    char b[5][6];\n"
               "    mymemset(b, 0, 31);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Buffer is accessed out of bounds: b [bufferAccessOutOfBounds]\n", errout_str());
 
         // #4968 - not standard function
@@ -4406,26 +4665,25 @@ class TestBufferOverrun : public TestFixture {
               "    foo.mymemset(str, 0, 100);\n"
               "    foo::mymemset(str, 0, 100);\n"
               "    std::mymemset(str, 0, 100);\n"
-              "}", settings);
+              "}\n", settings);
         TODO_ASSERT_EQUALS("[test.cpp:5:15]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", "", errout_str());
 
         // #5257 - check strings
         check("void f() {\n"
               "  mymemset(\"abc\", 0, 20);\n"
-              "}", settings);
-        TODO_ASSERT_EQUALS("[test.cpp:2]: (error) Buffer is accessed out of bounds.\n",
-                           "",
-                           errout_str());
+              "}\n", settings);
+        ASSERT_EQUALS("[test.cpp:2:12]: (error) Buffer is accessed out of bounds: \"abc\" [bufferAccessOutOfBounds]\n",
+                      errout_str());
 
         check("void f() {\n"
               "  mymemset(temp, \"abc\", 4);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #6816 - fp when array has known string value
               "    char c[10] = \"c\";\n"
               "    mymemset(c, 0, 10);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4447,43 +4705,43 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    char c[7];\n"
               "    mystrncpy(c, \"hello\", 7);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               " char c[6];\n"
               " mystrncpy(c,\"hello\",6);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               " char c[5];\n"
               " mystrncpy(c,\"hello\",6);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Buffer is accessed out of bounds: c [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "    char c[6];\n"
               "    mystrncpy(c,\"hello!\",7);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Buffer is accessed out of bounds: c [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f(unsigned int addr) {\n"
               "    memset((void *)addr, 0, 1000);\n"
-              "}", settings0); // TODO: use settings?
+              "}\n", settings0); // TODO: use settings?
         ASSERT_EQUALS("", errout_str());
 
         check("struct AB { char a[10]; };\n"
               "void foo(AB *ab) {\n"
               "    mystrncpy(x, ab->a, 100);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void a(char *p) { mystrncpy(p,\"hello world!\",10); }\n" // #3168
               "void b() {\n"
               "    char buf[5];\n"
               "    a(buf);"
-              "}", settings);
+              "}\n", settings);
         TODO_ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:1]: (error) Buffer is accessed out of bounds: buf\n",
                            "",
                            errout_str());
@@ -4509,13 +4767,13 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    char str[3];\n"
               "    mysprintf(str, \"test\");\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "    char str[5];\n"
               "    mysprintf(str, \"%s\", \"abcde\");\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("int getnumber();\n"
@@ -4523,51 +4781,51 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char str[5];\n"
               "    mysprintf(str, \"%d: %s\", getnumber(), \"abcde\");\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:5:15]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "    char str[5];\n"
               "    mysprintf(str, \"test%s\", \"\");\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char *str = new char[5];\n"
               "    mysprintf(str, \"abcde\");\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f(int condition) {\n"
               "    char str[5];\n"
               "    mysprintf(str, \"test%s\", condition ? \"12\" : \"34\");\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int condition) {\n"
               "    char str[5];\n"
               "    mysprintf(str, \"test%s\", condition ? \"12\" : \"345\");\n"
-              "}", settings);
+              "}\n", settings);
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         check("struct Foo { char a[1]; };\n"
               "void f() {\n"
               "  struct Foo x;\n"
               "  mysprintf(x.a, \"aa\");\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:4:14]: (error) Buffer is accessed out of bounds: x.a [bufferAccessOutOfBounds]\n", errout_str());
 
         // ticket #900
         check("void f() {\n"
               "  char *a = new char(30);\n"
               "  mysprintf(a, \"a\");\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Buffer is accessed out of bounds: a [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f(char value) {\n"
               "  char *a = new char(value);\n"
               "  mysprintf(a, \"a\");\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Buffer is accessed out of bounds: a [bufferAccessOutOfBounds]\n", errout_str());
 
         // This is out of bounds if 'sizeof(ABC)' is 1 (No padding)
@@ -4575,21 +4833,21 @@ class TestBufferOverrun : public TestFixture {
               "void f() {\n"
               "  struct Foo *x = malloc(sizeof(Foo));\n"
               "  mysprintf(x->a, \"aa\");\n"
-              "}", settings);
+              "}\n", settings);
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error, inconclusive) Buffer is accessed out of bounds: x.a\n", "", errout_str());
 
         check("struct Foo { char a[1]; };\n"
               "void f() {\n"
               "  struct Foo *x = malloc(sizeof(Foo) + 10);\n"
               "  mysprintf(x->a, \"aa\");\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo { char a[1]; };\n"
               "void f() {\n"
               "  struct Foo x;\n"
               "  mysprintf(x.a, \"aa\");\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:4:14]: (error) Buffer is accessed out of bounds: x.a [bufferAccessOutOfBounds]\n", errout_str());
 
         check("struct Foo {\n" // #6668 - unknown size
@@ -4598,8 +4856,43 @@ class TestBufferOverrun : public TestFixture {
               "};"
               "void Foo::f() {\n"
               "  mysprintf(a, \"abcd\");\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n" // #901
+              "    const char b[] = \"b\";\n"
+              "    char a[1];\n"
+              "    sprintf(a, \"%s\", b);\n"
+              "}\n"
+              "void g() {\n"
+              "    const char* b = \"b\";\n"
+              "    char a[1];\n"
+              "    sprintf(a, \"%s\", b);\n"
+              "}\n"
+              "void h() {\n"
+              "    const std::string b = \"b\";\n"
+              "    char a[1];\n"
+              "    sprintf(a, \"%s\", b.c_str());\n"
+              "}\n"
+              "void i() {\n"
+              "    const char b[] = \"b\";\n"
+              "    char a[2];\n"
+              "    sprintf(a, \"%s\", b);\n"
+              "}\n"
+              "void j() {\n"
+              "    const char* b = \"b\";\n"
+              "    char a[2];\n"
+              "    sprintf(a, \"%s\", b);\n"
+              "}\n"
+              "void k() {\n"
+              "    const std::string b = \"b\";\n"
+              "    char a[2];\n"
+              "    sprintf(a, \"%s\", b.c_str());\n"
+              "}\n", settings0);
+        ASSERT_EQUALS("[test.cpp:4:13]: (error) Buffer is accessed out of bounds: a [bufferAccessOutOfBounds]\n"
+                      "[test.cpp:9:13]: (error) Buffer is accessed out of bounds: a [bufferAccessOutOfBounds]\n"
+                      "[test.cpp:14:13]: (error) Buffer is accessed out of bounds: a [bufferAccessOutOfBounds]\n",
+                      errout_str());
     }
 
     void minsize_mul() {
@@ -4619,23 +4912,50 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    char c[5];\n"
               "    myfread(c, 1, 5, stdin);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char c[5];\n"
               "    myfread(c, 1, 6, stdin);\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Buffer is accessed out of bounds: c [bufferAccessOutOfBounds]\n", errout_str());
     }
 
+    void minsize_overflow() {
+        // the computed minimum size must not wrap around
+        check("void f() {\n"
+              "    char buf[10];\n"
+              "    sprintf(buf, \"%2000000000d%2000000000d\", 1, 2);\n"
+              "}\n", settings0);
+        ASSERT_EQUALS("[test.cpp:3:13]: (error) Buffer is accessed out of bounds: buf [bufferAccessOutOfBounds]\n", errout_str());
+
+        check("void f() {\n"
+              "    char buf[10];\n"
+              "    sprintf(buf, \"%4294967296d\", 1);\n"
+              "}\n", settings0);
+        ASSERT_EQUALS("[test.cpp:3:13]: (error) Buffer is accessed out of bounds: buf [bufferAccessOutOfBounds]\n", errout_str());
+
+        check("void f(FILE *fp) {\n"
+              "    char buf[10];\n"
+              "    fread(buf, 0x100000000LL, 0x100000000LL, fp);\n"
+              "}\n", settings0);
+        ASSERT_EQUALS("[test.cpp:3:11]: (error) Buffer is accessed out of bounds: buf [bufferAccessOutOfBounds]\n", errout_str());
+
+        check("void f() {\n"
+              "    wchar_t buf[10];\n"
+              "    (void)wmemchr(buf, L'a', 0x4000000000000000LL);\n"
+              "}\n", settings0);
+        ASSERT_EQUALS("[test.cpp:3:19]: (error) Buffer is accessed out of bounds: buf [bufferAccessOutOfBounds]\n", errout_str());
+    }
+
     // extracttests.enable
 
     void unknownType() {
         check("void f()\n"
               "{\n"
               " UnknownType *a = malloc(4);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
     // extracttests.disable
@@ -4647,26 +4967,26 @@ class TestBufferOverrun : public TestFixture {
               "    baz[99] = 0;\n"
               "    strncpy(baz, bar, 100);\n"
               "    baz[99] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo ( char *bar ) {\n"
               "    char baz[100];\n"
               "    strncpy(baz, bar, 100);\n"
               "    baz[99] = '\\0';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo ( char *bar ) {\n"
               "    char baz[100];\n"
               "    strncpy(baz, bar, 100);\n"
               "    baz[x+1] = '\\0';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Test with invalid code that there is no segfault
         check("char baz[100];\n"
-              "strncpy(baz, \"var\", 100)");
+              "strncpy(baz, \"var\", 100)\n");
         ASSERT_EQUALS("", errout_str());
 
         // Test that there are no duplicate error messages
@@ -4675,7 +4995,7 @@ class TestBufferOverrun : public TestFixture {
               "    strncpy(baz, bar, 100);\n"
               "    foo(baz);\n"
               "    foo(baz);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning, inconclusive) The buffer 'baz' may not be null-terminated after the call to strncpy(). [terminateStrncpy]\n", errout_str());
     }
 
@@ -4685,7 +5005,7 @@ class TestBufferOverrun : public TestFixture {
               "    strncpy(baz, bar, 100);\n"
               "    bar[99] = 0;\n"
               "    return strdup(baz);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning, inconclusive) The buffer 'baz' may not be null-terminated after the call to strncpy(). [terminateStrncpy]\n", errout_str());
     }
 
@@ -4708,13 +5028,13 @@ class TestBufferOverrun : public TestFixture {
         check("void bar() {\n"
               "    char buf[4];\n"
               "    strncpy(buf, \"ab\", 4);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void bar() {\n"
               "    char buf[4];\n"
               "    strncpy(buf, \"abcde\", 4);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning, inconclusive) The buffer 'buf' may not be null-terminated after the call to strncpy(). [terminateStrncpy]\n", errout_str());
     }
 
@@ -4740,13 +5060,13 @@ class TestBufferOverrun : public TestFixture {
         check("void foo() {\n"
               "  char c[6];\n"
               "  strncpy(&c, \"hello!\", 6);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (warning, inconclusive) The buffer 'c' may not be null-terminated after the call to strncpy(). [terminateStrncpy]\n", errout_str());
 
         check("void foo() {\n"
               "  char c[6];\n"
               "  strncpy(&c, \"hello\\0\", 6);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4774,7 +5094,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char a[10];\n"
               "    f2(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4790,7 +5110,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    struct A *str;\n"
               "    str = malloc(4);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4802,12 +5122,12 @@ class TestBufferOverrun : public TestFixture {
               "void b() {\n"
               "    char arr[64];\n"
               "    a(arr);\n"
-              "}");
+              "}\n");
     }
 
     void crash3() {
         check("struct b { unknown v[0]; };\n"
-              "void d() { struct b *f; f = malloc(108); }");
+              "void d() { struct b *f; f = malloc(108); }\n");
     }
 
     void crash4() { // #8679
@@ -4815,13 +5135,13 @@ class TestBufferOverrun : public TestFixture {
               "int main() { "
               "  thread_local_var = malloc(1337); "
               "  return 0; "
-              "}");
+              "}\n");
 
         check("thread_local void *thread_local_var; "
               "int main() { "
               "  thread_local_var = malloc(1337); "
               "  return 0; "
-              "}");
+              "}\n");
     }
 
     void crash5() { // 8644 - token has varId() but variable() is null
@@ -4829,19 +5149,19 @@ class TestBufferOverrun : public TestFixture {
               "    void b(char **dst) {\n"
               "        *dst = malloc(50);\n"
               "    }\n"
-              "}");
+              "}\n");
     }
 
     void crash6() {
         check("void start(char* name) {\n"
               "char snapname[64] = { 0 };\n"
               "strncpy(snapname, \"snapshot\", arrayLength(snapname));\n"
-              "}");
+              "}\n");
     }
 
     void crash7() { // 9073 - [ has no astParent
         check("char x[10];\n"
-              "void f() { x[10]; }");
+              "void f() { x[10]; }\n");
     }
 
     void insecureCmdLineArgs() {
@@ -4855,7 +5175,7 @@ class TestBufferOverrun : public TestFixture {
               "        free(p);\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:7]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char *argv[])\n"
@@ -4868,112 +5188,112 @@ class TestBufferOverrun : public TestFixture {
               "        free(p);\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:7]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(const int argc, char* argv[])\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, const char* argv[])\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(const int argc, const char* argv[])\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char* argv[])\n"
               "{\n"
               "    char prog[10] = {'\\0'};\n"
               "    strcat(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char **argv, char **envp)\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, const char *const *const argv, char **envp)\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(const int argc, const char *const *const argv, const char *const *const envp)\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char **argv, char **envp)\n"
               "{\n"
               "    char prog[10] = {'\\0'};\n"
               "    strcat(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(const int argc, const char **argv, char **envp)\n"
               "{\n"
               "    char prog[10] = {'\\0'};\n"
               "    strcat(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, const char **argv, char **envp)\n"
               "{\n"
               "    char prog[10] = {'\\0'};\n"
               "    strcat(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(const int argc, char **argv, char **envp)\n"
               "{\n"
               "    char prog[10] = {'\\0'};\n"
               "    strcat(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char **options)\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog, options[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char **options)\n"
               "{\n"
               "    char prog[10] = {'\\0'};\n"
               "    strcat(prog, options[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char **options)\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog, *options);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char **options)\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog+3, *options);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char **argv, char **envp)\n"
@@ -4981,7 +5301,7 @@ class TestBufferOverrun : public TestFixture {
               "    char prog[10];\n"
               "    if (strlen(argv[0]) < 10)\n"
               "        strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int main(int argc, char **argv, char **envp)\n"
@@ -4989,7 +5309,7 @@ class TestBufferOverrun : public TestFixture {
               "    char prog[10] = {'\\0'};\n"
               "    if (10 > strlen(argv[0]))\n"
               "        strcat(prog, argv[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int main(int argc, char **argv, char **envp)\n"
@@ -4997,7 +5317,7 @@ class TestBufferOverrun : public TestFixture {
               "    char prog[10];\n"
               "    argv[0][0] = '\\0';\n"
               "    strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5835
@@ -5005,18 +5325,18 @@ class TestBufferOverrun : public TestFixture {
               "    char prog[10];\n"
               "    strcpy(prog, argv[0]);\n"
               "    strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer overrun possible for long command line arguments.\n"
                            "[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         // #7964
         check("int main(int argc, char *argv[]) {\n"
               "  char *strcpy();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("int main(int argc, char *argv[]) {\n"
               "  char *strcat();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5024,33 +5344,33 @@ class TestBufferOverrun : public TestFixture {
         check("void f(char *a) {\n"
               "  char *b = new char[strlen(a)];\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
 
         check("void f(char *a) {\n"
               "  char *b = new char[strlen(a) + 1];\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *a) {\n"
               "  char *b = new char[strlen(a)];\n"
               "  a[0] = '\\0';\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *a) {\n"
               "  char *b = (char *)malloc(strlen(a));\n"
               "  b = realloc(b, 10000);\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *a) {\n"
               "  char *b = (char *)malloc(strlen(a));\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
 
         check("void f(char *a) {\n"
@@ -5058,31 +5378,31 @@ class TestBufferOverrun : public TestFixture {
               "  {\n"
               "    strcpy(b, a);\n"
               "  }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
 
         check("void f(char *a) {\n"
               "  char *b = (char *)malloc(strlen(a) + 1);\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *a, char *c) {\n"
               "  char *b = (char *)realloc(c, strlen(a));\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
 
         check("void f(char *a, char *c) {\n"
               "  char *b = (char *)realloc(c, strlen(a) + 1);\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *a) {\n"
               "  char *b = (char *)malloc(strlen(a));\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
     }
 
@@ -5096,7 +5416,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    X x;\n"
               "    x.buf[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
@@ -5108,14 +5428,15 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    A::X x;\n"
               "    x.buf[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:10]: (error) Array 'x.buf[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void getErrorMessages() {
         // Ticket #2292: segmentation fault when using --errorlist
-        const Check& c = getCheck<CheckBufferOverrun>();
-        c.getErrorMessages(this, nullptr);
+        CheckBufferOverrun check;
+        const Check& c = getCheck(check);
+        c.getErrorMessages(*this, settingsDefault);
         // we are not interested in the output - just consume it
         ignore_errout();
     }
@@ -5126,68 +5447,68 @@ class TestBufferOverrun : public TestFixture {
         check("void f(const char s[]) {\n"
               "    if (s[i] == 'x' && i < y) {\n"
               "    }"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // No message because i is unknown and thus gets no varid. Avoid an internalError here.
 
         check("void f(const char s[], int i) {\n"
               "    if (s[i] == 'x' && i < y) {\n"
               "    }"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Array index 'i' is used before limits check. [arrayIndexThenCheck]\n", errout_str());
 
         check("void f(const char s[]) {\n"
               "    for (int i = 0; s[i] == 'x' && i < y; ++i) {\n"
               "    }"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (style) Array index 'i' is used before limits check. [arrayIndexThenCheck]\n", errout_str());
 
         check("void f(const int a[], unsigned i) {\n"
               "    if((a[i] < 2) && (i <= 42)) {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Array index 'i' is used before limits check. [arrayIndexThenCheck]\n", errout_str());
 
         check("void f(const int a[], unsigned i) {\n"
               "    if((a[i] < 2) && (42 >= i)) {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Array index 'i' is used before limits check. [arrayIndexThenCheck]\n", errout_str());
 
         // extracttests.start: int elen;
         check("void f(char* e, int y) {\n"
               "    if (e[y] == '/' && elen > y + 1 && e[y + 1] == '?') {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int foo(int); int func(int);
         check("void f(const int a[], unsigned i) {\n"
               "    if(a[i] < func(i) && i <= 42) {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Array index 'i' is used before limits check. [arrayIndexThenCheck]\n", errout_str());
 
         check("void f(const int a[], unsigned i) {\n"
               "    if (i <= 42 && a[i] < func(i)) {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const int a[], unsigned i) {\n"
               "    if (foo(a[i] + 3) < func(i) && i <= 42) {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Array index 'i' is used before limits check. [arrayIndexThenCheck]\n", errout_str());
 
         check("void f(int i) {\n" // sizeof
               "  sizeof(a)/sizeof(a[i]) && i < 10;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: extern int buf[];
         check("void f(int i) {\n" // ?:
               "  if ((i < 10 ? buf[i] : 1) && (i < 5 ? buf[i] : 5)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5210,19 +5531,19 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    char c[6];\n"
               "    strncpy(c,\"hello!\",6);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning, inconclusive) The buffer 'c' may not be null-terminated after the call to strncpy(). [terminateStrncpy]\n", errout_str());
 
         check("void f() {\n"
               "    char c[6];\n"
               "    memcpy(c,\"hello!\",6);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) The buffer 'c' may not be null-terminated after the call to memcpy().\n", "", errout_str());
 
         check("void f() {\n"
               "    char c[6];\n"
               "    memmove(c,\"hello!\",6);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) The buffer 'c' may not be null-terminated after the call to memmove().\n", "", errout_str());
     }
 
@@ -5232,7 +5553,7 @@ class TestBufferOverrun : public TestFixture {
               "   int *a;\n"
               "   a = new int[-1];\n"
               "   delete [] a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (error) Memory allocation size is negative. [negativeMemoryAllocationSize]\n", errout_str());
 
         check("void f()\n"
@@ -5240,7 +5561,7 @@ class TestBufferOverrun : public TestFixture {
               "   int *a;\n"
               "   a = (int *)malloc( -10 );\n"
               "   free(a);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:8]: (error) Memory allocation size is negative. [negativeMemoryAllocationSize]\n", "", errout_str());
 
         check("void f()\n"
@@ -5248,14 +5569,14 @@ class TestBufferOverrun : public TestFixture {
               "   int *a;\n"
               "   a = (int *)malloc( -10);\n"
               "   free(a);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:8]: (error) Memory allocation size is negative. [negativeMemoryAllocationSize]\n", "", errout_str());
 
         check("void f()\n"
               "{\n"
               "   int *a;\n"
               "   a = (int *)alloca( -10 );\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:8]: (error) Memory allocation size is negative. [negativeMemoryAllocationSize]\n", "", errout_str());
 
         check("int* f(int n) {\n" // #11145
@@ -5272,14 +5593,14 @@ class TestBufferOverrun : public TestFixture {
         check("void f(int sz) {\n" // #1760 - VLA
               "   int a[sz];\n"
               "}\n"
-              "void x() { f(-100); }");
+              "void x() { f(-100); }\n");
         ASSERT_EQUALS("[test.cpp:2:8]: (error) Declaration of array 'a' with negative size is undefined behaviour [negativeArraySize]\n", errout_str());
 
         // don't warn for constant sizes -> this is a compiler error so this is used for static assertions for instance
         check("int x, y;\n"
               "int a[-1];\n"
               "int b[x?1:-1];\n"
-              "int c[x?y:-1];");
+              "int c[x?y:-1];\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5287,14 +5608,14 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    char arr[10];\n"
               "    char *p = arr + 20;\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:19]: (portability) Undefined behaviour, pointer arithmetic 'arr+20' is out of bounds. [pointerOutOfBounds]\n", errout_str());
 
         check("char(*g())[1];\n" // #7950
               "void f() {\n"
               "    int a[2];\n"
               "    int* b = a + sizeof(*g());\n"
-              "}\n");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5305,11 +5626,11 @@ class TestBufferOverrun : public TestFixture {
         SimpleTokenizer tokenizer(settings0, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
+        const CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
 
-        // Check code..
-        std::list<Check::FileInfo*> fileInfo;
-        Check& c = getCheck<CheckBufferOverrun>();
+        std::list<const Check::FileInfo*> fileInfo;
+        CheckBufferOverrun check;
+        Check& c = getCheck(check);
         fileInfo.push_back(c.getFileInfo(tokenizer, settings0, ""));
         c.analyseWholeProgram(*ctu, fileInfo, settings0, *this); // TODO: check result
         while (!fileInfo.empty()) {
@@ -5327,7 +5648,7 @@ class TestBufferOverrun : public TestFixture {
             "int main() {\n"
             "  char *s = malloc(4);\n"
             "  dostuff(s);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:6:11] -> [test.cpp:7:10] -> [test.cpp:2:3]: (error) Array index out of bounds; buffer 'p' is accessed at offset -3. [ctuArrayIndex]\n", errout_str());
 
         ctu("void dostuff(char *p) {\n"
@@ -5337,7 +5658,7 @@ class TestBufferOverrun : public TestFixture {
             "int main() {\n"
             "  char *s = malloc(4);\n"
             "  dostuff(s);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:6:11] -> [test.cpp:7:10] -> [test.cpp:2:3]: (error) Array index out of bounds; 'p' buffer size is 4 and it is accessed at offset 4. [ctuArrayIndex]\n", errout_str());
 
         ctu("void f(int* p) {\n" // #10415
@@ -5351,6 +5672,15 @@ class TestBufferOverrun : public TestFixture {
             "    f(a);\n"
             "}\n");
         ASSERT_EQUALS("[test.cpp:7:12] -> [test.cpp:9:6] -> [test.cpp:3:12]: (error) Array index out of bounds; 'p' buffer size is 4 and it is accessed at offset 20. [ctuArrayIndex]\n", errout_str());
+
+        ctu("void bar(int *p) { p[4] = 42; }\n" // #13403
+            "void f() {\n"
+            "    int *p = (int*)malloc(4 * sizeof(int));\n"
+            "    if (!p) return;\n"
+            "    bar(p);\n"
+            "    free(p);\n"
+            "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12] -> [test.cpp:4:9] -> [test.cpp:5:8] -> [test.cpp:1:20]: (error) Array index out of bounds; 'p' buffer size is 16 and it is accessed at offset 16. [ctuArrayIndex]\n", errout_str());
     }
 
     void ctu_array() {
@@ -5360,7 +5690,7 @@ class TestBufferOverrun : public TestFixture {
             "int main() {\n"
             "  char str[4];\n"
             "  dostuff(str);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:6:10] -> [test.cpp:2:5]: (error) Array index out of bounds; 'p' buffer size is 4 and it is accessed at offset 10. [ctuArrayIndex]\n", errout_str());
 
         ctu("static void memclr( char *data )\n"
@@ -5372,7 +5702,7 @@ class TestBufferOverrun : public TestFixture {
             "{\n"
             "    char str[5];\n"
             "    memclr( str );\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:9:11] -> [test.cpp:3:5]: (error) Array index out of bounds; 'data' buffer size is 5 and it is accessed at offset 10. [ctuArrayIndex]\n", errout_str());
 
         ctu("static void memclr( int i, char *data )\n"
@@ -5384,7 +5714,7 @@ class TestBufferOverrun : public TestFixture {
             "{\n"
             "    char str[5];\n"
             "    memclr( 0, str );\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:9:11] -> [test.cpp:3:5]: (error) Array index out of bounds; 'data' buffer size is 5 and it is accessed at offset 10. [ctuArrayIndex]\n", errout_str());
 
         ctu("static void memclr( int i, char *data )\n"
@@ -5396,7 +5726,7 @@ class TestBufferOverrun : public TestFixture {
             "{\n"
             "    char str[5];\n"
             "    memclr( 10, str );\n"
-            "}");
+            "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:9] -> [test.cpp:3]: (possible error) Array index out of bounds.\n",
                            "", errout_str());
 
@@ -5411,7 +5741,7 @@ class TestBufferOverrun : public TestFixture {
             "{\n"
             "    char str[5];\n"
             "    memclr( str, 5 );\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #2097
@@ -5425,7 +5755,7 @@ class TestBufferOverrun : public TestFixture {
             "{\n"
             "    int p[3];\n"
             "    foo(p+1);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9112
@@ -5438,7 +5768,7 @@ class TestBufferOverrun : public TestFixture {
             "{\n"
             "    u8 macstrbuf[17] = { 0 };\n"
             "    get_mac_address(macstrbuf);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9788
@@ -5495,7 +5825,7 @@ class TestBufferOverrun : public TestFixture {
             "int main() {\n"
             "  int x = 4;\n"
             "  dostuff(&x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:6:10] -> [test.cpp:2:5]: (error) Array index out of bounds; 'p' buffer size is 4 and it is accessed at offset 40. [ctuArrayIndex]\n", errout_str());
     }
 
@@ -5504,7 +5834,7 @@ class TestBufferOverrun : public TestFixture {
             "int main() {\n"
             "  int x[3];\n"
             "  dostuff(x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:4:10] -> [test.cpp:1:28]: (error) Pointer arithmetic overflow; 'p' buffer size is 12 [ctuPointerArith]\n", errout_str());
 
         ctu("void f(const char *p) {\n" // #11361
@@ -5515,13 +5845,26 @@ class TestBufferOverrun : public TestFixture {
             "    f(s);\n"
             "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        setMultiline();
+        ctu("void g(char* p) {\n"
+            "    memset(p + 10, 0, 10);\n"
+            "}\n"
+            "void f() {\n"
+            "    char a[10] = {};\n"
+            "    g(a);\n"
+            "}\n");
+        ASSERT_EQUALS("[test.cpp:2:12]: error: Pointer arithmetic overflow; 'p' buffer size is 10 [ctuPointerArith]\n"
+                      "[test.cpp:6:6]: note: Calling function g, 1st argument is accessed out of bounds\n"
+                      "[test.cpp:2:12]: note: Using argument p\n",
+                      errout_str());
     }
 
     void objectIndex() {
         check("int f() {\n"
               "    int i;\n"
               "    return (&i)[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:13] -> [test.cpp:3:16]: (error) The address of variable 'i' is accessed at non-zero index. [objectIndex]\n",
             errout_str());
@@ -5529,7 +5872,7 @@ class TestBufferOverrun : public TestFixture {
         check("int f(int j) {\n"
               "    int i;\n"
               "    return (&i)[j];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:13] -> [test.cpp:3:16]: (warning) The address of variable 'i' might be accessed at non-zero index. [objectIndex]\n",
             errout_str());
@@ -5537,34 +5880,34 @@ class TestBufferOverrun : public TestFixture {
         check("int f() {\n"
               "    int i;\n"
               "    return (&i)[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int * i) {\n"
               "    return i[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(std::vector<int> i) {\n"
               "    return i[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(std::vector<int> i) {\n"
               "    return i.data()[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int* f(std::vector<int>& i) {\n"
               "    return &(i[1]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int i; int j; };\n"
               "int f() {\n"
               "    A x;\n"
               "    return (&x.i)[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int i; int j; };\n"
@@ -5572,7 +5915,7 @@ class TestBufferOverrun : public TestFixture {
               "    A x;\n"
               "    int * i = &x.i;\n"
               "    return i[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -5580,7 +5923,7 @@ class TestBufferOverrun : public TestFixture {
               "  std::map<int, int*> m;\n"
               "  m[0] = &x;\n"
               "  m[1] = &x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
@@ -5588,7 +5931,7 @@ class TestBufferOverrun : public TestFixture {
               "  std::map<int, int*> m;\n"
               "  m[0] = &x;\n"
               "  return m[0][1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:10] -> [test.cpp:5:14]: (error) The address of variable 'x' is accessed at non-zero index. [objectIndex]\n",
             errout_str());
@@ -5598,7 +5941,7 @@ class TestBufferOverrun : public TestFixture {
               "  std::map<int, int*> m;\n"
               "  m[0] = &x;\n"
               "  return m[0][1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:10] -> [test.cpp:5:14]: (error) The address of variable 'x' is accessed at non-zero index. [objectIndex]\n",
             errout_str());
@@ -5609,7 +5952,7 @@ class TestBufferOverrun : public TestFixture {
               "  m[0] = &x;\n"
               "  m[1] = y;\n"
               "  return m[1][1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void print(char** test);\n"
@@ -5679,7 +6022,7 @@ class TestBufferOverrun : public TestFixture {
               "void h() {\n"
               "    const uint8_t u = 4;\n"
               "    f(&u, N);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("uint32_t f(uint32_t u) {\n" // #10154
@@ -5739,7 +6082,29 @@ class TestBufferOverrun : public TestFixture {
               "    (void)y[1];\n"
               "    (void)y[2];\n"
               "}\n");
-        TODO_ASSERT_EQUALS("error", "", errout_str());
+        ASSERT_EQUALS("[test.cpp:7:20] -> [test.cpp:9:12]: (error) The address of variable 's.a' is accessed at non-zero index. [objectIndex]\n"
+                      "[test.cpp:7:20] -> [test.cpp:10:12]: (error) The address of variable 's.a' is accessed at non-zero index. [objectIndex]\n",
+                      errout_str());
+
+        check("const int N = 12;\n" // #14887
+              "struct S {\n"
+              "    void f() const;\n"
+              "    int a[N];\n"
+              "};\n"
+              "struct T {\n"
+              "    void f() const;\n"
+              "    S s;\n"
+              "};\n"
+              "int g(const int* p) { return p[5]; }\n"
+              "void S::f() const {\n"
+              "    const int* q = a;\n"
+              "    g(q);\n"
+              "}\n"
+              "void T::f() const {\n"
+              "    const int* q = s.a;\n"
+              "    g(q);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkPipeParameterSize() { // #3521
@@ -5751,7 +6116,7 @@ class TestBufferOverrun : public TestFixture {
               "if (pipe(pipefd) == -1) {\n"
               "    return;\n"
               "  }\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Buffer is accessed out of bounds: pipefd [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f(){\n"
@@ -5759,7 +6124,7 @@ class TestBufferOverrun : public TestFixture {
               "if (pipe(pipefd) == -1) {\n"
               "    return;\n"
               "  }\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(){\n"
@@ -5767,7 +6132,7 @@ class TestBufferOverrun : public TestFixture {
               "if (pipe((int*)pipefd) == -1) {\n"
               "    return;\n"
               "  }\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Buffer is accessed out of bounds: (int*)pipefd [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f(){\n"
@@ -5775,7 +6140,7 @@ class TestBufferOverrun : public TestFixture {
               "if (pipe((int*)pipefd) == -1) {\n"
               "    return;\n"
               "  }\n"
-              "}", settings);
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
     }
 };
diff --git a/test/testcharvar.cpp b/test/testcharvar.cpp
index 624efcff539..0c9c8dd4b5b 100644
--- a/test/testcharvar.cpp
+++ b/test/testcharvar.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@ class TestCharVar : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check char variable usage..
-        CheckOther checkOther(&tokenizer, &settings, this);
+        CheckOtherImpl checkOther(&tokenizer, settings, *this);
         checkOther.checkCharVariable();
     }
 
@@ -57,7 +57,7 @@ class TestCharVar : public TestFixture {
               "{\n"
               "    unsigned char ch = 0x80;\n"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int buf[256];\n"
@@ -65,7 +65,7 @@ class TestCharVar : public TestFixture {
               "{\n"
               "    char ch = 0x80;\n"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (portability) 'char' type used as array index. [unknownSignCharArrayIndex]\n", errout_str());
 
         check("int buf[256];\n"
@@ -73,7 +73,7 @@ class TestCharVar : public TestFixture {
               "{\n"
               "    char ch = 0;\n"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int buf[256];\n"
@@ -81,7 +81,7 @@ class TestCharVar : public TestFixture {
               "{\n"
               "    signed char ch = 0;\n"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int buf[256];\n"
@@ -89,67 +89,67 @@ class TestCharVar : public TestFixture {
               "{\n"
               "    char ch = 0x80;\n"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (portability) 'char' type used as array index. [unknownSignCharArrayIndex]\n", errout_str());
 
         check("int buf[256];\n"
               "void foo(signed char ch)\n"
               "{\n"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int buf[256];\n"
               "void foo(char ch)\n"
               "{\n"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* buf)\n"
               "{\n"
               "    char ch = 0x80;"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:24]: (portability) 'char' type used as array index. [unknownSignCharArrayIndex]\n", errout_str());
 
         check("void foo(char* buf)\n"
               "{\n"
               "    char ch = 0;"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* buf)\n"
               "{\n"
               "    buf['A'] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* buf, char ch)\n"
               "{\n"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int flags[256];\n"
               "void foo(const char* str)\n"
               "{\n"
               "    flags[*str] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int flags[256];\n"
               "void foo(const char* str)\n"
               "{\n"
               "    flags[(unsigned char)*str] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const char str[])\n"
               "{\n"
               "    map[str] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -159,7 +159,7 @@ class TestCharVar : public TestFixture {
               "void bar(int i) {\n"
               "    const char *s = \"abcde\";\n"
               "    foo(s[i]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -167,32 +167,32 @@ class TestCharVar : public TestFixture {
         check("void foo(int *result) {\n"
               "    signed char ch = -1;\n"
               "    *result = a | ch;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (warning) When using 'char' variables in bit operations, sign extension can generate unexpected results. [charBitOp]\n", errout_str());
 
         check("void foo(int *result) {\n"
               "    unsigned char ch = -1;\n"
               "    *result = a | ch;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *result) {\n"
               "    signed char ch = -1;\n"
               "    *result = a | ch;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // 0x03 & ..
         check("void foo(int *result) {\n"
               "    signed char ch = -1;\n"
               "    *result = 0x03 | ch;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:20]: (warning) When using 'char' variables in bit operations, sign extension can generate unexpected results. [charBitOp]\n", errout_str());
 
         check("void foo(int *result) {\n"
               "    signed char ch = -1;\n"
               "    *result = 0x03 & ch;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 };
diff --git a/test/testcheck.cpp b/test/testcheck.cpp
index 8ea4cef38d8..254519da2eb 100644
--- a/test/testcheck.cpp
+++ b/test/testcheck.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
  */
 
 #include "check.h"
+#include "checks.h"
 #include "fixture.h"
 
 #include <list>
@@ -28,23 +29,12 @@ class TestCheck : public TestFixture {
 
 private:
     void run() override {
-        TEST_CASE(instancesSorted);
         TEST_CASE(classInfoFormat);
     }
 
-    void instancesSorted() const {
-        for (auto i = Check::instances().cbegin(); i != Check::instances().cend(); ++i) {
-            auto j = i;
-            ++j;
-            if (j != Check::instances().cend()) {
-                ASSERT_EQUALS(true, (*i)->name() < (*j)->name());
-            }
-        }
-    }
-
     void classInfoFormat() const {
-        for (auto i = Check::instances().cbegin(); i != Check::instances().cend(); ++i) {
-            const std::string info = (*i)->classInfo();
+        for (const Check * const c : CheckInstances::get()) {
+            const std::string info = c->classInfo();
             if (!info.empty()) {
                 ASSERT('\n' != info[0]);         // No \n in the beginning
                 ASSERT('\n' == info.back());     // \n at end
diff --git a/test/testcheckersreport.cpp b/test/testcheckersreport.cpp
new file mode 100644
index 00000000000..39a6f2a9997
--- /dev/null
+++ b/test/testcheckersreport.cpp
@@ -0,0 +1,56 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 Cppcheck team.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "addoninfo.h"
+#include "checkersreport.h"
+#include "fixture.h"
+#include "settings.h"
+
+class TestCheckersReport : public TestFixture {
+public:
+    TestCheckersReport() : TestFixture("TestCheckersReport") {}
+
+private:
+    void run() final {
+        // AddonInfo::checkers
+        TEST_CASE(addonInfoCheckers);
+    }
+
+    void addonInfoCheckers() const {
+        AddonInfo a;
+        a.name = "test";
+        a.checkers["abcdefghijklmnopqrstuvwxyz::abcdefghijklmnopqrstuvwxyz"] = "123";
+        Settings s;
+        s.addonInfos.emplace_back(a);
+        const std::set<std::string> activeCheckers;
+        CheckersReport r(s, activeCheckers);
+        const std::string report = r.getReport("");
+        const auto pos = report.rfind("\n\n");
+        ASSERT(pos != std::string::npos);
+
+        const char expected[] =
+            "test checkers\n"
+            "-------------\n"
+            "No   abcdefghijklmnopqrstuvwxyz::abcdefghijklmnopqrstuvwxyz    require:123\n";
+
+        ASSERT_EQUALS(expected, report.substr(pos+2));
+    }
+};
+
+REGISTER_TEST(TestCheckersReport)
diff --git a/test/testclangimport.cpp b/test/testclangimport.cpp
index c67767db0ba..a22f901a261 100644
--- a/test/testclangimport.cpp
+++ b/test/testclangimport.cpp
@@ -1,5 +1,5 @@
 // Cppcheck - A tool for static C/C++ code analysis
-// Copyright (C) 2007-2025 Cppcheck team.
+// Copyright (C) 2007-2026 Cppcheck team.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -116,6 +116,8 @@ class TestClangImport : public TestFixture {
         TEST_CASE(vardecl5);
         TEST_CASE(vardecl6);
         TEST_CASE(vardecl7);
+        TEST_CASE(vardeclInHeader);
+        TEST_CASE(vardeclBuiltinLocation);
         TEST_CASE(whileStmt1);
         TEST_CASE(whileStmt2);
 
@@ -139,6 +141,10 @@ class TestClangImport : public TestFixture {
         TEST_CASE(valueType2);
 
         TEST_CASE(crash);
+        TEST_CASE(crash2);
+        TEST_CASE(crash3);
+        TEST_CASE(nullNodeInvalidLevel);
+        TEST_CASE(invalidExtTokens);
     }
 
     std::string parse(const char clang[]) {
@@ -1039,6 +1045,45 @@ class TestClangImport : public TestFixture {
         ASSERT_EQUALS("void * * start@1 ;", parse(clang));
     }
 
+    void vardeclInHeader() {
+        // a new file is seen after tokens have been created
+        const char clang[] = "|-VarDecl 0x32b8aa0 <1.c:1:1, col:5> col:5 a 'int'\n"
+                             "`-VarDecl 0x32b8b78 <1.h:1:1, col:5> col:5 b 'int'";
+
+        ASSERT_EQUALS("int a@1 ; int b@2 ;",
+                      parse(clang));
+    }
+
+    void vardeclBuiltinLocation() {
+        // #15100 - the location starts in a buffer that is generated by clang
+        const char clang[] = "|-VarDecl 0x32b8aa0 <1.c:1:1, col:5> col:5 a 'int'\n"
+                             "|-VarDecl 0x32b8b78 <<built-in>:115:23, 1.h:18:19> col:19 b 'unsigned int'\n"
+                             "|-VarDecl 0x32b8c50 <<scratch space>:2:1, col:5> col:5 c 'int'\n"
+                             "`-VarDecl 0x32b8d28 <<scratch space>:41:1> col:5 d 'int'";
+
+        ASSERT_EQUALS("int a@1 ; unsigned int b@2 ; int c@3 ; int d@4 ;",
+                      parse(clang));
+
+        const Settings settings = settingsBuilder().clang().build();
+        TokenList tokenlist{settings, Standards::Language::C};
+        Tokenizer tokenizer(std::move(tokenlist), *this);
+        std::istringstream istr(clang);
+        clangimport::parseClangAstDump(tokenizer, istr);
+
+        // the end of the range is used for "b", the location is unchanged for "c" and "d"
+        ASSERT_EQUALS(2, tokenizer.list.getFiles().size());
+        ASSERT_EQUALS("1.c", tokenizer.list.getFiles()[0]);
+        ASSERT_EQUALS("1.h", tokenizer.list.getFiles()[1]);
+        const Token *tok = Token::findsimplematch(tokenizer.tokens(), "b");
+        ASSERT(tok);
+        ASSERT_EQUALS(1, tok->fileIndex());
+        ASSERT_EQUALS(18, tok->linenr());
+        tok = Token::findsimplematch(tokenizer.tokens(), "d");
+        ASSERT(tok);
+        ASSERT_EQUALS(1, tok->fileIndex());
+        ASSERT_EQUALS(18, tok->linenr());
+    }
+
     void whileStmt1() {
         const char clang[] = "`-FunctionDecl 0x3d45b18 <1.c:1:1, line:3:1> line:1:6 foo 'void ()'\n"
                              "  `-CompoundStmt 0x3d45c48 <col:12, line:3:1>\n"
@@ -1328,7 +1373,7 @@ class TestClangImport : public TestFixture {
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), "\"hello\"");
         ASSERT(!!tok);
         ASSERT(!!tok->valueType());
-        ASSERT_EQUALS("const signed char *", tok->valueType()->str());
+        ASSERT_EQUALS("const char *", tok->valueType()->str());
     }
 
     void stdinLoc() {
@@ -1372,6 +1417,55 @@ class TestClangImport : public TestFixture {
                             "  `-CompoundStmt 0x5603791b5700 <col:54, col:55>\n";
         (void)parse(clang); // don't crash
     }
+
+    void crash2() {
+        // getSpelling() indexed mExtTokens[typeIndex - 1] without a lower-bound
+        // check, so a node whose line carries no ext tokens (typeIndex <= 0) read
+        // out of bounds.
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-RecordDecl "), AST, "invalid AST node: RecordDecl");
+    }
+
+    void nullNodeInvalidLevel() {
+        // a "<<<NULL>>>" line whose indentation maps to level 0 must not index tree[-1]
+        const char* clang = "`-FunctionDecl 0x1 <a.cpp:1:1, col:34> col:6 foo 'void ()'\n"
+                            "`-<<<NULL>>>\n";
+        ASSERT_EQUALS("void foo ( ) ;", parse(clang));
+    }
+
+    void crash3() {
+        // GotoStmt, NamespaceDecl and CXXRecordDecl read mExtTokens[size() - 2]
+        // without checking the node has two ext tokens, so a crafted node with
+        // fewer tokens indexed out of bounds.
+        (void)parse("`-FunctionDecl 0x1 <a.cpp:1:1, col:34> col:6 foo 'void ()'\n"
+                    "  `-CompoundStmt 0x2 <col:12, col:34>\n"
+                    "    `-GotoStmt 0x3\n"); // don't crash
+        (void)parse("`-NamespaceDecl 0x1\n"
+                    "  `-CXXRecordDecl 0x2\n"); // don't crash
+        (void)parse("`-CXXRecordDecl 0x1"); // don't crash
+    }
+
+    void invalidExtTokens() {
+        // nodes without the ext tokens the handlers read must not index out of bounds
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-FunctionDecl 0x1 <a.cpp:1:1, col:20> col:5 f 'int ()'\n"
+                                           "  `-CompoundStmt 0x2 <col:9, col:20>\n"
+                                           "    `-ReturnStmt 0x3 <col:11, col:18>\n"
+                                           "      `-IntegerLiteral \n"), AST, "invalid AST node: IntegerLiteral");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-EnumDecl "), AST, "invalid AST node: EnumDecl");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-VarDecl 0x1"), AST, "invalid AST node: VarDecl");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-VarDecl 0x1 'int'"), AST, "invalid AST node: VarDecl");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-VarDecl 0x1 <col:1>"), AST, "invalid AST node: VarDecl");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-FieldDecl 0x1 'int'"), AST, "invalid AST node: FieldDecl");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-FunctionDecl 0x1 <a.cpp:1:1, col:20> col:5 f 'int ()' prev"), AST, "invalid AST node: FunctionDecl");
+        // address-only declarations: getSpelling() is empty, addtoken() adds nothing and back() is null
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-FunctionDecl 0x1"), AST, "invalid AST node: FunctionDecl");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-CXXConstructorDecl 0x1"), AST, "invalid AST node: CXXConstructorDecl");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-CXXMethodDecl 0x1"), AST, "invalid AST node: CXXMethodDecl");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-EnumConstantDecl 0x1"), AST, "invalid AST node: EnumConstantDecl");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-FunctionDecl 0x1 <a.cpp:1:1, col:20> col:5 f 'int ()'\n"
+                                           "  `-ParmVarDecl 0x2 <col:1>\n"), AST, "invalid AST node: ParmVarDecl");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-FunctionDecl 0x1 <a.cpp:1:1, col:20> col:5 f 'int ()'\n"
+                                           "  `-ParmVarDecl 0x2 'int'\n"), AST, "invalid AST node: ParmVarDecl");
+    }
 };
 
 REGISTER_TEST(TestClangImport)
diff --git a/test/testclass.cpp b/test/testclass.cpp
index 21457f15bfc..4449e368561 100644
--- a/test/testclass.cpp
+++ b/test/testclass.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ class TestClass : public TestFixture {
     const Settings settings0_i = settingsBuilder(settings0).certainty(Certainty::inconclusive).build();
     const Settings settings1 = settingsBuilder().severity(Severity::warning).library("std.cfg").build();
     const Settings settings2 = settingsBuilder().severity(Severity::style).library("std.cfg").certainty(Certainty::inconclusive).build();
-    const Settings settings3 = settingsBuilder().severity(Severity::style).library("std.cfg").severity(Severity::warning).build();
+    const Settings settings3 = settingsBuilder().severity(Severity::style).library("std.cfg").severity(Severity::warning).library("posix.cfg").build();
     const Settings settings3_i = settingsBuilder(settings3).certainty(Certainty::inconclusive).build();
     const Settings settings4 = settingsBuilder().severity(Severity::warning).severity(Severity::portability).library("std.cfg").library("posix.cfg").build();
 
@@ -62,6 +62,8 @@ class TestClass : public TestFixture {
         TEST_CASE(copyConstructor4); // base class with private constructor
         TEST_CASE(copyConstructor5); // multiple inheritance
         TEST_CASE(copyConstructor6); // array of pointers
+        TEST_CASE(copyConstructor7); // ticket #14954
+        TEST_CASE(copyConstructor8);
         TEST_CASE(deletedMemberPointer); // deleted member pointer in destructor
         TEST_CASE(noOperatorEq); // class with memory management should have operator eq
         TEST_CASE(noDestructor); // class with memory management should have destructor
@@ -82,6 +84,7 @@ class TestClass : public TestFixture {
         TEST_CASE(operatorEqToSelf7);
         TEST_CASE(operatorEqToSelf8);   // ticket #2179
         TEST_CASE(operatorEqToSelf9);   // ticket #2592
+        TEST_CASE(operatorEqToSelf10);  // ticket #15156
 
         TEST_CASE(memsetOnStruct);
         TEST_CASE(memsetVector);
@@ -195,6 +198,10 @@ class TestClass : public TestFixture {
         TEST_CASE(const98);
         TEST_CASE(const99);
         TEST_CASE(const100);
+        TEST_CASE(const101);
+        TEST_CASE(const102);
+        TEST_CASE(const103);
+        TEST_CASE(const104); // #15104
 
         TEST_CASE(const_handleDefaultParameters);
         TEST_CASE(const_passThisToMemberOfOtherClass);
@@ -269,7 +276,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         (checkClass.checkCopyCtorAndEqOperator)();
     }
 
@@ -278,25 +285,25 @@ class TestClass : public TestFixture {
                                    "{\n"
                                    "    A(const A& other) { }\n"
                                    "    A& operator=(const A& other) { return *this; }\n"
-                                   "};");
+                                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
         checkCopyCtorAndEqOperator("class A\n"
                                    "{\n"
-                                   "};");
+                                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyCtorAndEqOperator("class A\n"
                                    "{\n"
                                    "    A(const A& other) { }\n"
-                                   "};");
+                                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyCtorAndEqOperator("class A\n"
                                    "{\n"
                                    "    A& operator=(const A& other) { return *this; }\n"
-                                   "};");
+                                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -304,7 +311,7 @@ class TestClass : public TestFixture {
                                    "{\n"
                                    "    A(const A& other) { }\n"
                                    "    int x;\n"
-                                   "};");
+                                   "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:1]: (warning) The class 'A' has 'copy constructor' but lack of 'operator='.\n", "", errout_str());
         // TODO the error message should be clarified. It should say something like 'copy constructor is empty and will not assign i and therefore the behaviour is different to the default assignment operator'
 
@@ -312,7 +319,7 @@ class TestClass : public TestFixture {
                                    "{\n"
                                    "    A& operator=(const A& other) { return *this; }\n"
                                    "    int x;\n"
-                                   "};");
+                                   "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:1]: (warning) The class 'A' has 'operator=' but lack of 'copy constructor'.\n", "", errout_str());
         // TODO the error message should be clarified. It should say something like 'assignment operator does not assign i and therefore the behaviour is different to the default copy constructor'
 
@@ -320,7 +327,7 @@ class TestClass : public TestFixture {
                                    "{\n"
                                    "    A& operator=(const int &x) { this->x = x; return *this; }\n"
                                    "    int x;\n"
-                                   "};");
+                                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyCtorAndEqOperator("class A {\n"
@@ -340,7 +347,7 @@ class TestClass : public TestFixture {
                                    "    B(const B & b) :A(b) { }\n"
                                    "private:\n"
                                    "    static int i;\n"
-                                   "};");
+                                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7987 - Don't show warning when there is a move constructor
@@ -351,14 +358,14 @@ class TestClass : public TestFixture {
                                    "    test = std::move(s.test);\n"
                                    "    return *this;\n"
                                    "  }\n"
-                                   "};");
+                                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8337 - False positive in copy constructor detection
         checkCopyCtorAndEqOperator("struct StaticListNode {\n"
                                    "  StaticListNode(StaticListNode*& prev) : m_next(0) {}\n"
                                    "  StaticListNode* m_next;\n"
-                                   "};");
+                                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -370,7 +377,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings0, this);
+        CheckClassImpl checkClass(&tokenizer, settings0, *this);
         (checkClass.checkExplicitConstructors)();
     }
 
@@ -382,7 +389,7 @@ class TestClass : public TestFixture {
                                   "    explicit Class(int i) { }\n"
                                   "    explicit Class(const std::string&) { }\n"
                                   "    Class(int a, int b) { }\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Class {\n"
@@ -390,7 +397,7 @@ class TestClass : public TestFixture {
                                   "    explicit Class(const Class& other) { }\n"
                                   "    explicit Class(Class&& other) { }\n"
                                   "    virtual int i() = 0;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Class {\n"
@@ -398,37 +405,37 @@ class TestClass : public TestFixture {
                                   "    Class(const Class& other) = delete;\n"
                                   "    Class(Class&& other) = delete;\n"
                                   "    virtual int i() = 0;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Class {\n"
                                   "    Class(int i) { }\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Class 'Class' has a constructor with 1 argument that is not explicit. [noExplicitConstructor]\n", errout_str());
 
         checkExplicitConstructors("class Class {\n"
                                   "    Class(const Class& other) { }\n"
                                   "    virtual int i() = 0;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Class {\n"
                                   "    Class(Class&& other) { }\n"
                                   "    virtual int i() = 0;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6585
         checkExplicitConstructors("class Class {\n"
                                   "    private: Class(const Class&);\n"
                                   "    virtual int i() = 0;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Class {\n"
                                   "    public: Class(const Class&);\n"
                                   "    virtual int i() = 0;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7465: Error properly reported in templates
@@ -439,7 +446,7 @@ class TestClass : public TestFixture {
                                   "int main() {\n"
                                   "  Test <int> test;\n"
                                   "  return 0;\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (style) Struct 'Test < int >' has a constructor with 1 argument that is not explicit. [noExplicitConstructor]\n", errout_str());
 
         // #7465: No error for copy or move constructors
@@ -452,7 +459,7 @@ class TestClass : public TestFixture {
                                   "int main() {\n"
                                   "  Test <int> test;\n"
                                   "  return 0;\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8600
@@ -460,12 +467,12 @@ class TestClass : public TestFixture {
                                   "struct A::B {\n"
                                   "    B() = default;\n"
                                   "    B(const B&) {}\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("struct A{"
-                                  "    A(int, int y=2) {}"
-                                  "};");
+                                  "    A(int, int y=2) {}\n"
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:1:14]: (style) Struct 'A' has a constructor with 1 argument that is not explicit. [noExplicitConstructor]\n", errout_str());
 
         checkExplicitConstructors("struct Foo {\n" // #10515
@@ -527,7 +534,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings1, this);
+        CheckClassImpl checkClass(&tokenizer, settings1, *this);
         (checkClass.checkDuplInheritedMembers)();
     }
 
@@ -537,7 +544,7 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "struct Derived : Base {\n"
                                   "   int x;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkDuplInheritedMembers("class Base {\n"
@@ -546,7 +553,7 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "struct Derived : Base {\n"
                                   "   int x;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:6:8]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base'. [duplInheritedMember]\n", errout_str());
 
         checkDuplInheritedMembers("class Base {\n"
@@ -555,7 +562,7 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "struct Derived : public Base {\n"
                                   "   int x;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:6:8]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base'. [duplInheritedMember]\n", errout_str());
 
         checkDuplInheritedMembers("class Base0 {\n"
@@ -566,7 +573,7 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "struct Derived : Base0, Base1 {\n"
                                   "   int x;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkDuplInheritedMembers("class Base0 {\n"
@@ -578,7 +585,7 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "struct Derived : Base0, Base1 {\n"
                                   "   int x;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:9:8]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base0'. [duplInheritedMember]\n", errout_str());
 
         checkDuplInheritedMembers("class Base0 {\n"
@@ -591,7 +598,7 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "struct Derived : Base0, Base1 {\n"
                                   "   int x;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:10:8]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base0'. [duplInheritedMember]\n"
                       "[test.cpp:7:8] -> [test.cpp:10:8]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base1'. [duplInheritedMember]\n", errout_str());
 
@@ -600,7 +607,7 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "struct Derived : Base {\n"
                                   "   int y;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkDuplInheritedMembers("class A {\n"
@@ -608,20 +615,20 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "struct B {\n"
                                   "   int x;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown 'Base' class
         checkDuplInheritedMembers("class Derived : public UnknownBase {\n"
                                   "  int x;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkDuplInheritedMembers("class Base {\n"
                                   "   int x;\n"
                                   "};\n"
                                   "class Derived : public Base {\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6692
@@ -633,7 +640,7 @@ class TestClass : public TestFixture {
                                   "   struct SWibble : public test1::wibble {\n"
                                   "   int Value;\n"
                                   "   };\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9957
@@ -647,12 +654,12 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "class Derived2 : public Derived1 {\n"
                                   "    int i;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:3:13] -> [test.cpp:10:9]: (warning) The class 'Derived2' defines member variable with name 'i' also defined in its parent class 'Base'. [duplInheritedMember]\n", errout_str());
 
         // don't crash on recursive template
         checkDuplInheritedMembers("template<size_t N>\n"
-                                  "struct BitInt : public BitInt<N+1> { };");
+                                  "struct BitInt : public BitInt<N+1> { };\n");
         ASSERT_EQUALS("", errout_str());
 
         // don't crash on recursive template
@@ -667,7 +674,7 @@ class TestClass : public TestFixture {
                                   "    template <typename T>\n"
                                   "    struct fn_traits<decltype(void(&T::operator())), T>\n"
                                   "        : public fn_traits<void, decltype(&T::operator())> {};\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10594
@@ -734,6 +741,13 @@ class TestClass : public TestFixture {
                                   "    void Two() = delete;\n"
                                   "};\n");
         ASSERT_EQUALS("", errout_str());
+
+        checkDuplInheritedMembers("struct B { void f(); };\n" // #14583
+                                  "struct D : B {\n"
+                                  "    template <typename>\n"
+                                  "    void f();\n"
+                                  "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
 #define checkCopyConstructor(...) checkCopyConstructor_( __FILE__, __LINE__, __VA_ARGS__)
@@ -744,7 +758,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings3, this);
+        CheckClassImpl checkClass(&tokenizer, settings3, *this);
         checkClass.copyconstructors();
     }
 
@@ -765,7 +779,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   F&operator=(const F&);\n"
                              "   ~F();\n"
-                             "};");
+                             "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (warning) Value of pointer 'p', which points to allocated memory, is copied in copy constructor instead of allocating new memory.\n", "", errout_str());
 
         checkCopyConstructor("class F {\n"
@@ -778,7 +792,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:7]: (warning) Value of pointer 'p', which points to allocated memory, is copied in copy constructor instead of allocating new memory. [copyCtorPointerCopying]\n"
                            "[test.cpp:3] -> [test.cpp:7]: (warning) Copy constructor does not allocate memory for member 'p' although memory has been allocated in other constructors.\n",
                            "[test.cpp:4:7]: (warning) Value of pointer 'p', which points to allocated memory, is copied in copy constructor instead of allocating new memory. [copyCtorPointerCopying]\n"
@@ -798,7 +812,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (warning) Value of pointer 'p', which points to allocated memory, is copied in copy constructor instead of allocating new memory.\n"
                            "[test.cpp:5] -> [test.cpp:10]: (warning) Copy constructor does not allocate memory for member 'p' although memory has been allocated in other constructors.\n",
                            ""
@@ -828,7 +842,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~kalci();\n"
                              "   kalci& operator=(const kalci&kalci);\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class F\n"
@@ -853,7 +867,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:14] -> [test.cpp:11]: (warning) Copy constructor does not allocate memory for member 'd' although memory has been allocated in other constructors.\n", "", errout_str());
 
         checkCopyConstructor("class F {\n"
@@ -867,7 +881,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class F {\n"
@@ -881,7 +895,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:4]: (warning) Copy constructor does not allocate memory for member 'd' although memory has been allocated in other constructors.\n", "", errout_str());
 
         checkCopyConstructor("class F\n"
@@ -896,7 +910,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:8]: (warning) Class 'F' does not have a copy constructor which is recommended since it has dynamic memory/resource management.\n", "", errout_str());
 
         checkCopyConstructor("class F\n"
@@ -920,7 +934,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class F : E\n"
@@ -931,7 +945,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class E { E(E&); };\n" // non-copyable
@@ -943,7 +957,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class E {};\n"
@@ -954,7 +968,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:5:7]: (warning) Class 'F' does not have a copy constructor which is recommended since it has dynamic memory/resource management. [noCopyConstructor]\n", errout_str());
 
         checkCopyConstructor("class F {\n"
@@ -965,7 +979,7 @@ class TestClass : public TestFixture {
                              "   F(F& f);\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class F {\n"
@@ -973,7 +987,7 @@ class TestClass : public TestFixture {
                              "   F() : p(malloc(100)) {}\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (warning) Class 'F' does not have a copy constructor which is recommended since it has dynamic memory/resource management. [noCopyConstructor]\n", errout_str());
 
         // #7198
@@ -982,7 +996,7 @@ class TestClass : public TestFixture {
                              "   F() {\n"
                              "      p = malloc(100);\n"
                              "   }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -999,7 +1013,7 @@ class TestClass : public TestFixture {
                              "     ~Vector();\n"
                              "     Vector& operator=(const Vector&v);\n"
                              "    _Tp* _M_finish;\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1010,7 +1024,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f) = delete;\n"
                              "   F&operator=(const F &f);\n"
                              "   ~F();\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("struct F {\n"
@@ -1019,7 +1033,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f) = default;\n"
                              "   F&operator=(const F &f);\n"
                              "   ~F();\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (warning) Struct 'F' has dynamic memory/resource allocation(s). The copy constructor is explicitly defaulted but the default copy constructor does not work well. It is recommended to define or delete the copy constructor. [noCopyConstructor]\n", errout_str());
     }
 
@@ -1042,7 +1056,7 @@ class TestClass : public TestFixture {
                              "    ~Foo() { delete m_ptr; }\n"
                              "private:\n"
                              "    int* m_ptr;\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1055,7 +1069,7 @@ class TestClass : public TestFixture {
                              "    ~Foo() { delete m_ptr; }\n"
                              "private:\n"
                              "    int* m_ptr;\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class Copyable {};\n"
@@ -1066,7 +1080,7 @@ class TestClass : public TestFixture {
                              "    ~Foo() { delete m_ptr; }\n"
                              "private:\n"
                              "    int* m_ptr;\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1085,6 +1099,25 @@ class TestClass : public TestFixture {
                            errout_str());
     }
 
+    void copyConstructor7() { // ticket #14954
+        checkCopyConstructor("struct S {\n"
+                             "    explicit S(char *name) { m_fd = mkstemp(name); }\n"
+                             "    ~S() { /* close(m_fd); */ }\n"
+                             "    S &operator =(const S&);\n"
+                             "    int m_fd;\n"
+                             "};\n");
+        ASSERT_EQUALS("[test.cpp:2:30]: (warning) Struct 'S' does not have a copy constructor which is recommended since it has dynamic memory/resource management. [noCopyConstructor]\n", errout_str());
+    }
+
+    void copyConstructor8() {
+        checkCopyConstructor("struct S {\n"
+                             "    S() : m_ptr(new int) {}\n"
+                             "    ~S();\n"
+                             "    std::unique_ptr<int> m_ptr;\n"
+                             "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void deletedMemberPointer() {
 
         // delete ...
@@ -1118,7 +1151,7 @@ class TestClass : public TestFixture {
                              "   F() { c = malloc(100); }\n"
                              "   F(const F &f);\n"
                              "   ~F();\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (warning) Struct 'F' does not have a operator= which is recommended since it has dynamic memory/resource management. [noOperatorEq]\n", errout_str());
 
         // defaulted operator=
@@ -1128,7 +1161,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f);\n"
                              "   F &operator=(const F &f) = default;\n"
                              "   ~F();\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (warning) Struct 'F' has dynamic memory/resource allocation(s). The operator= is explicitly defaulted but the default operator= does not work well. It is recommended to define or delete the operator=. [noOperatorEq]\n", errout_str());
 
         // deleted operator=
@@ -1138,7 +1171,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f);\n"
                              "   F &operator=(const F &f) = delete;\n"
                              "   ~F();\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // base class deletes operator=
@@ -1147,8 +1180,17 @@ class TestClass : public TestFixture {
                              "   F() { c = malloc(100); }\n"
                              "   F(const F &f);\n"
                              "   ~F();\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
+
+        checkCopyConstructor("struct S {\n"
+                             "    explicit S(char *name) { m_fd = mkstemp(name); }\n"
+                             "    S(const S&);\n"
+                             "    ~S() { /* close(m_fd); */ }\n"
+                             "    int m_fd;\n"
+                             "};\n");
+        ASSERT_EQUALS("[test.cpp:2:30]: (warning) Struct 'S' does not have a operator= which is recommended since it has dynamic memory/resource management. [noOperatorEq]\n", errout_str());
+
     }
 
     void noDestructor() {
@@ -1157,7 +1199,7 @@ class TestClass : public TestFixture {
                              "   F() { c = malloc(100); }\n"
                              "   F(const F &f);\n"
                              "   F&operator=(const F&);"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (warning) Struct 'F' does not have a destructor which is recommended since it has dynamic memory/resource management. [noDestructor]\n", errout_str());
 
         checkCopyConstructor("struct F {\n"
@@ -1165,7 +1207,7 @@ class TestClass : public TestFixture {
                              "   F() { c = new C; }\n"
                              "   F(const F &f);\n"
                              "   F&operator=(const F&);"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("struct F {\n"
@@ -1173,7 +1215,7 @@ class TestClass : public TestFixture {
                              "   F() { i = new int(); }\n"
                              "   F(const F &f);\n"
                              "   F& operator=(const F&);"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (warning) Struct 'F' does not have a destructor which is recommended since it has dynamic memory/resource management. [noDestructor]\n", errout_str());
 
         checkCopyConstructor("struct Data { int x; int y; };\n"
@@ -1182,7 +1224,7 @@ class TestClass : public TestFixture {
                              "   F() { c = new Data; }\n"
                              "   F(const F &f);\n"
                              "   F&operator=(const F&);"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (warning) Struct 'F' does not have a destructor which is recommended since it has dynamic memory/resource management. [noDestructor]\n", errout_str());
 
         // defaulted destructor
@@ -1192,7 +1234,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f);\n"
                              "   F &operator=(const F &f);\n"
                              "   ~F() = default;\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (warning) Struct 'F' has dynamic memory/resource allocation(s). The destructor is explicitly defaulted but the default destructor does not work well. It is recommended to define the destructor. [noDestructor]\n", errout_str());
 
         // deleted destructor
@@ -1202,7 +1244,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f);\n"
                              "   F &operator=(const F &f);\n"
                              "   ~F() = delete;\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1215,7 +1257,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings0, this);
+        CheckClassImpl checkClass(&tokenizer, settings0, *this);
         checkClass.operatorEqRetRefThis();
     }
 
@@ -1225,7 +1267,7 @@ class TestClass : public TestFixture {
             "{\n"
             "public:\n"
             "    A & operator=(const A &a) { return *this; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1233,7 +1275,7 @@ class TestClass : public TestFixture {
             "{\n"
             "public:\n"
             "    A & operator=(const A &a) { return a; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1242,7 +1284,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &);\n"
             "};\n"
-            "A & A::operator=(const A &a) { return *this; }");
+            "A & A::operator=(const A &a) { return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1251,7 +1293,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &a);\n"
             "};\n"
-            "A & A::operator=(const A &a) { return *this; }");
+            "A & A::operator=(const A &a) { return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1260,7 +1302,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &);\n"
             "};\n"
-            "A & A::operator=(const A &a) { return a; }");
+            "A & A::operator=(const A &a) { return a; }\n");
         ASSERT_EQUALS("[test.cpp:6:8]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1269,7 +1311,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &a);\n"
             "};\n"
-            "A & A::operator=(const A &a) { return a; }");
+            "A & A::operator=(const A &a) { return a; }\n");
         ASSERT_EQUALS("[test.cpp:6:8]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1281,7 +1323,7 @@ class TestClass : public TestFixture {
             "    public:\n"
             "        B & operator=(const B &b) { return *this; }\n"
             "    };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1293,7 +1335,7 @@ class TestClass : public TestFixture {
             "    public:\n"
             "        B & operator=(const B &b) { return b; }\n"
             "    };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:7:13]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1306,7 +1348,7 @@ class TestClass : public TestFixture {
             "        B & operator=(const B &);\n"
             "    };\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B &b) { return *this; }");
+            "A::B & A::B::operator=(const A::B &b) { return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1319,7 +1361,7 @@ class TestClass : public TestFixture {
             "        B & operator=(const B &);\n"
             "    };\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B &b) { return b; }");
+            "A::B & A::B::operator=(const A::B &b) { return b; }\n");
         ASSERT_EQUALS("[test.cpp:10:14]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1329,7 +1371,7 @@ class TestClass : public TestFixture {
             "class A::B\n"
             "{\n"
             "  B & operator=(const B & b) { return b; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1340,7 +1382,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  B & operator=(const B &);\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B & b) { return b; }");
+            "A::B & A::B::operator=(const A::B & b) { return b; }\n");
         ASSERT_EQUALS("[test.cpp:8:14]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1350,7 +1392,7 @@ class TestClass : public TestFixture {
             "class A::B\n"
             "{\n"
             "  A::B & operator=(const A::B & b) { return b; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:6:10]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1361,7 +1403,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  A::B & operator=(const A::B &);\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B & b) { return b; }");
+            "A::B & A::B::operator=(const A::B & b) { return b; }\n");
         ASSERT_EQUALS("[test.cpp:8:14]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1371,7 +1413,7 @@ class TestClass : public TestFixture {
             "class A::B\n"
             "{\n"
             "  B & operator=(const B & b) { return b; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1382,7 +1424,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  B & operator=(const B &);\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B & b) { return b; }");
+            "A::B & A::B::operator=(const A::B & b) { return b; }\n");
         ASSERT_EQUALS("[test.cpp:8:14]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1392,7 +1434,7 @@ class TestClass : public TestFixture {
             "class A::B\n"
             "{\n"
             "  A::B & operator=(const A::B & b) { return b; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:6:10]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1403,7 +1445,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  A::B & operator=(const A::B &);\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B & b) { return b; }");
+            "A::B & A::B::operator=(const A::B & b) { return b; }\n");
         ASSERT_EQUALS("[test.cpp:8:14]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis( // #11380
@@ -1423,7 +1465,7 @@ class TestClass : public TestFixture {
             "class szp\n"
             "{\n"
             "  szp &operator =(int *other) {}\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:3:8]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1431,7 +1473,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  szp &operator =(int *other);\n"
             "};\n"
-            "szp &szp::operator =(int *other) {}");
+            "szp &szp::operator =(int *other) {}\n");
         ASSERT_EQUALS("[test.cpp:5:11]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1441,7 +1483,7 @@ class TestClass : public TestFixture {
             "class NS::szp\n"
             "{\n"
             "  szp &operator =(int *other) {}\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:6:8]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1452,7 +1494,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  szp &operator =(int *other);\n"
             "};\n"
-            "NS::szp &NS::szp::operator =(int *other) {}");
+            "NS::szp &NS::szp::operator =(int *other) {}\n");
         ASSERT_EQUALS("[test.cpp:8:19]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1462,7 +1504,7 @@ class TestClass : public TestFixture {
             "class NS::szp\n"
             "{\n"
             "  NS::szp &operator =(int *other) {}\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1473,7 +1515,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  NS::szp &operator =(int *other);\n"
             "};\n"
-            "NS::szp &NS::szp::operator =(int *other) {}");
+            "NS::szp &NS::szp::operator =(int *other) {}\n");
         ASSERT_EQUALS("[test.cpp:8:19]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1483,7 +1525,7 @@ class TestClass : public TestFixture {
             "class A::szp\n"
             "{\n"
             "  szp &operator =(int *other) {}\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:6:8]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1494,7 +1536,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  szp &operator =(int *other);\n"
             "};\n"
-            "A::szp &A::szp::operator =(int *other) {}");
+            "A::szp &A::szp::operator =(int *other) {}\n");
         ASSERT_EQUALS("[test.cpp:8:17]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1504,7 +1546,7 @@ class TestClass : public TestFixture {
             "class A::szp\n"
             "{\n"
             "  A::szp &operator =(int *other) {}\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:6:11]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1515,7 +1557,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  A::szp &operator =(int *other);\n"
             "};\n"
-            "A::szp &A::szp::operator =(int *other) {}");
+            "A::szp &A::szp::operator =(int *other) {}\n");
         ASSERT_EQUALS("[test.cpp:8:17]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
     }
 
@@ -1526,7 +1568,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "  inline A &operator =(int *other) { return (*this); };\n"
             "  inline A &operator =(long *other) { return (*this = 0); };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1536,7 +1578,7 @@ class TestClass : public TestFixture {
             "  A &operator =(long *other);\n"
             "};\n"
             "A &A::operator =(int *other) { return (*this); };\n"
-            "A &A::operator =(long *other) { return (*this = 0); };");
+            "A &A::operator =(long *other) { return (*this = 0); };\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1544,7 +1586,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "  inline A &operator =(int *other) { return (*this); };\n"
             "  inline A &operator =(long *other) { return operator = (*(int *)other); };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1554,7 +1596,7 @@ class TestClass : public TestFixture {
             "  A &operator =(long *other);\n"
             "};\n"
             "A &A::operator =(int *other) { return (*this); };\n"
-            "A &A::operator =(long *other) { return operator = (*(int *)other); };");
+            "A &A::operator =(long *other) { return operator = (*(int *)other); };\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1564,7 +1606,7 @@ class TestClass : public TestFixture {
             "  A &operator =(long *other);\n"
             "};\n"
             "A &A::operator =(int *other) { return (*this); };\n"
-            "A &A::operator =(long *other) { return this->operator = (*(int *)other); };");
+            "A &A::operator =(long *other) { return this->operator = (*(int *)other); };\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis( // #9045
@@ -1576,7 +1618,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1586,7 +1628,7 @@ class TestClass : public TestFixture {
             "P& P::operator = (const P& pc)\n"
             "{\n"
             "  return (P&)(*this += pc);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1596,21 +1638,21 @@ class TestClass : public TestFixture {
             "class A {\n"
             "public:\n"
             "    A & operator=(const A &a) { }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
             "protected:\n"
             "    A & operator=(const A &a) {}\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
             "private:\n"
             "    A & operator=(const A &a) {}\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1620,7 +1662,7 @@ class TestClass : public TestFixture {
             "        rand();\n"
             "        throw std::exception();\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) 'operator=' should either return reference to 'this' instance or be declared private and left unimplemented. [operatorEqShouldBeLeftUnimplemented]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1630,7 +1672,7 @@ class TestClass : public TestFixture {
             "        rand();\n"
             "        abort();\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) 'operator=' should either return reference to 'this' instance or be declared private and left unimplemented. [operatorEqShouldBeLeftUnimplemented]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1638,7 +1680,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &a);\n"
             "};\n"
-            "A & A :: operator=(const A &a) { }");
+            "A & A :: operator=(const A &a) { }\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
     }
 
@@ -1655,7 +1697,7 @@ class TestClass : public TestFixture {
             "}\n"
             "UString& UString::operator=( const UString& s ) {\n"
             "    return assign( s );\n"
-            "}");
+            "}\n");
     }
 
     void operatorEqRetRefThis7() { // ticket #5782 Endless recursion in CheckClass::checkReturnPtrThis()
@@ -1673,7 +1715,7 @@ class TestClass : public TestFixture {
             "  basic_fbstring& replace() {\n"
             "    return replaceImplDiscr();\n"
             "  }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1686,7 +1728,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings1, this);
+        CheckClassImpl checkClass(&tokenizer, settings1, *this);
         checkClass.operatorEqToSelf();
     }
 
@@ -1697,7 +1739,7 @@ class TestClass : public TestFixture {
             "{\n"
             "public:\n"
             "    A & operator=(const A &a) { if (&a != this) { } return *this; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test doesn't have an assignment test but it is not needed
@@ -1706,7 +1748,7 @@ class TestClass : public TestFixture {
             "{\n"
             "public:\n"
             "    A & operator=(const A &a) { return *this; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test and has it
@@ -1724,7 +1766,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this class needs an assignment test but doesn't have it
@@ -1739,7 +1781,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // this test has an assignment test but doesn't need it
@@ -1749,7 +1791,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &);\n"
             "};\n"
-            "A & A::operator=(const A &a) { if (&a != this) { } return *this; }");
+            "A & A::operator=(const A &a) { if (&a != this) { } return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test doesn't have an assignment test but doesn't need it
@@ -1759,7 +1801,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &);\n"
             "};\n"
-            "A & A::operator=(const A &a) { return *this; }");
+            "A & A::operator=(const A &a) { return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test and has it
@@ -1778,7 +1820,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test and has the inverse test
@@ -1797,7 +1839,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // this test needs an assignment test and has the inverse test
@@ -1816,7 +1858,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // this test needs an assignment test and has the inverse test
@@ -1835,7 +1877,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // this test needs an assignment test and has the inverse test
@@ -1854,7 +1896,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // this test needs an assignment test and has the inverse test
@@ -1873,7 +1915,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // this test needs an assignment test and has the inverse test
@@ -1895,7 +1937,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // this test needs an assignment test and has the inverse test
@@ -1916,7 +1958,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
 
@@ -1933,7 +1975,7 @@ class TestClass : public TestFixture {
             "    free(s);\n"
             "    s = strdup(a.s);\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // ticket #1224
@@ -1951,7 +1993,7 @@ class TestClass : public TestFixture {
             "    tree = new CodeTree(b);\n"
             "    delete oldtree;\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
     }
@@ -1967,7 +2009,7 @@ class TestClass : public TestFixture {
             "    public:\n"
             "        B & operator=(const B &b) { if (&b != this) { } return *this; }\n"
             "    };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test doesn't have an assignment test but doesn't need it
@@ -1980,7 +2022,7 @@ class TestClass : public TestFixture {
             "    public:\n"
             "        B & operator=(const B &b) { return *this; }\n"
             "    };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test but has it
@@ -2000,7 +2042,7 @@ class TestClass : public TestFixture {
             "            return *this;\n"
             "        }\n"
             "    };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test but doesn't have it
@@ -2019,7 +2061,7 @@ class TestClass : public TestFixture {
             "            return *this;\n"
             "        }\n"
             "    };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:8:13]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // this test has an assignment test but doesn't need it
@@ -2033,7 +2075,7 @@ class TestClass : public TestFixture {
             "        B & operator=(const B &);\n"
             "    };\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B &b) { if (&b != this) { } return *this; }");
+            "A::B & A::B::operator=(const A::B &b) { if (&b != this) { } return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test doesn't have an assignment test but doesn't need it
@@ -2047,7 +2089,7 @@ class TestClass : public TestFixture {
             "        B & operator=(const B &);\n"
             "    };\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B &b) { return *this; }");
+            "A::B & A::B::operator=(const A::B &b) { return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test and has it
@@ -2070,7 +2112,7 @@ class TestClass : public TestFixture {
             "        s = strdup(b.s);\n"
             "    }\n"
             "    return *this;\n"
-            " }");
+            " }\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test but doesn't have it
@@ -2090,7 +2132,7 @@ class TestClass : public TestFixture {
             "    free(s);\n"
             "    s = strdup(b.s);\n"
             "    return *this;\n"
-            " }");
+            " }\n");
         ASSERT_EQUALS("[test.cpp:11:14]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
     }
 
@@ -2101,7 +2143,7 @@ class TestClass : public TestFixture {
             "{\n"
             "public:\n"
             "    A & operator=(const A &a) { return *this; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test has multiple inheritance and needs an assignment test but there is no trivial way to test for it
@@ -2116,7 +2158,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test has multiple inheritance so there is no trivial way to test for self assignment but doesn't need it
@@ -2126,7 +2168,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &);\n"
             "};\n"
-            "A & A::operator=(const A &a) { return *this; }");
+            "A & A::operator=(const A &a) { return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test has multiple inheritance and needs an assignment test but there is no trivial way to test for it
@@ -2142,7 +2184,7 @@ class TestClass : public TestFixture {
             "    free(s);\n"
             "    s = strdup(a.s);\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2157,7 +2199,7 @@ class TestClass : public TestFixture {
             "    public:\n"
             "        B & operator=(const B &b) { return *this; }\n"
             "    };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test has multiple inheritance and needs an assignment test but there is no trivial way to test for it
@@ -2176,7 +2218,7 @@ class TestClass : public TestFixture {
             "            return *this;\n"
             "        }\n"
             "    };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test has multiple inheritance so there is no trivial way to test for self assignment but doesn't need it
@@ -2190,7 +2232,7 @@ class TestClass : public TestFixture {
             "        B & operator=(const B &);\n"
             "    };\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B &b) { return *this; }");
+            "A::B & A::B::operator=(const A::B &b) { return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test has multiple inheritance and needs an assignment test but there is no trivial way to test for it
@@ -2210,7 +2252,7 @@ class TestClass : public TestFixture {
             "    free(s);\n"
             "    s = strdup(b.s);\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2230,7 +2272,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2247,7 +2289,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2264,7 +2306,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2281,7 +2323,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2298,7 +2340,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2315,7 +2357,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2332,7 +2374,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2349,7 +2391,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2367,7 +2409,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2385,7 +2427,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2403,7 +2445,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2421,7 +2463,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2439,7 +2481,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2457,7 +2499,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2475,7 +2517,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2493,7 +2535,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2505,7 +2547,7 @@ class TestClass : public TestFixture {
             "    free(s);\n"
             "    s = strdup(a.s);\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2524,7 +2566,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "private:\n"
             "    char * data;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         checkOpertorEqToSelf(
@@ -2541,7 +2583,7 @@ class TestClass : public TestFixture {
             "    data = new char[strlen(a.data) + 1];\n"
             "    strcpy(data, a.data);\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:8:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         checkOpertorEqToSelf(
@@ -2557,7 +2599,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "private:\n"
             "    char * data;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         checkOpertorEqToSelf(
@@ -2574,7 +2616,7 @@ class TestClass : public TestFixture {
             "    data = new char;\n"
             "    *data = *a.data;\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:8:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
     }
 
@@ -2591,7 +2633,7 @@ class TestClass : public TestFixture {
             "    {\n"
             "        return assign(a);\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2610,7 +2652,7 @@ class TestClass : public TestFixture {
             "FMat& FMat::operator=(const FMat& in)\n"
             "{\n"
             "    return copy(in);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2629,10 +2671,27 @@ class TestClass : public TestFixture {
             "Foo& Foo::operator=(Foo& other)\n"
             "{\n"
             "    return Foo::operator=(&other);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
+    void operatorEqToSelf10() {
+        checkOpertorEqToSelf(
+            "class Foo\n"
+            "{\n"
+            "    int32_t * p;\n"
+            "public:\n"
+            "    Foo& operator=( Foo && o ) noexcept\n"
+            "    {\n"
+            "        delete p;\n"
+            "        p = o.p;\n"
+            "        o.p = nullptr;\n"
+            "        return *this;\n"
+            "    }\n"
+            "};\n");
+        ASSERT_EQUALS("[test.cpp:5:10]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
+    }
+
     struct CheckVirtualDestructorOptions
     {
         bool inconclusive = false;
@@ -2649,7 +2708,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &s, this);
+        CheckClassImpl checkClass(&tokenizer, s, *this);
         checkClass.virtualDestructor();
     }
 
@@ -2658,12 +2717,12 @@ class TestClass : public TestFixture {
 
         checkVirtualDestructor("class Derived : public Base { };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("", errout_str());
 
         checkVirtualDestructor("class Derived : Base { };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2671,27 +2730,27 @@ class TestClass : public TestFixture {
         // Base class doesn't have a destructor
 
         checkVirtualDestructor("class Base { };\n"
-                               "class Derived : public Base { public: ~Derived() { (void)11; } };"
+                               "class Derived : public Base { public: ~Derived() { (void)11; } };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
 
         checkVirtualDestructor("class Base { };\n"
-                               "class Derived : protected Base { public: ~Derived() { (void)11; } };"
+                               "class Derived : protected Base { public: ~Derived() { (void)11; } };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
 
         checkVirtualDestructor("class Base { };\n"
-                               "class Derived : private Base { public: ~Derived() { (void)11; } };"
+                               "class Derived : private Base { public: ~Derived() { (void)11; } };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("", errout_str());
 
         checkVirtualDestructor("class Base { };\n"
-                               "class Derived : Base { public: ~Derived() { (void)11; } };"
+                               "class Derived : Base { public: ~Derived() { (void)11; } };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9104
@@ -2712,7 +2771,7 @@ class TestClass : public TestFixture {
                                "{\n"
                                "    Base* p = new Derived();\n"
                                "    delete p;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("[test.cpp:7:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
 
         checkVirtualDestructor("using namespace std;\n"
@@ -2733,7 +2792,7 @@ class TestClass : public TestFixture {
                                "{\n"
                                "    Base* p = new Derived();\n"
                                "    delete p;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("[test.cpp:8:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
     }
 
@@ -2741,21 +2800,21 @@ class TestClass : public TestFixture {
         // Base class has a destructor, but it's not virtual
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
-                               "class Derived : public Base { public: ~Derived() { (void)11; } };"
+                               "class Derived : public Base { public: ~Derived() { (void)11; } };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
-                               "class Derived : protected Base { public: ~Derived() { (void)11; } };"
+                               "class Derived : protected Base { public: ~Derived() { (void)11; } };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
-                               "class Derived : private Fred, public Base { public: ~Derived() { (void)11; } };"
+                               "class Derived : private Fred, public Base { public: ~Derived() { (void)11; } };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
     }
 
@@ -2763,15 +2822,15 @@ class TestClass : public TestFixture {
         // Derived class doesn't have a destructor => undefined behaviour according to paragraph 3 in [expr.delete]
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
-                               "class Derived : public Base { };"
+                               "class Derived : public Base { };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
-                               "class Derived : private Fred, public Base { };"
+                               "class Derived : private Fred, public Base { };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
     }
 
@@ -2779,15 +2838,15 @@ class TestClass : public TestFixture {
         // Derived class has empty destructor => undefined behaviour according to paragraph 3 in [expr.delete]
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
-                               "class Derived : public Base { public: ~Derived() {} };"
+                               "class Derived : public Base { public: ~Derived() {} };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
-                               "class Derived : public Base { public: ~Derived(); }; Derived::~Derived() {}"
+                               "class Derived : public Base { public: ~Derived(); }; Derived::~Derived() {}\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
     }
 
@@ -2796,8 +2855,38 @@ class TestClass : public TestFixture {
         // points at derived class
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
-                               "class Derived : public Base { public: ~Derived() { (void)11; } };");
+                               "class Derived : public Base { public: ~Derived() { (void)11; } };\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // the pointer is deleted before it points at the derived class, or another pointer is deleted
+        checkVirtualDestructor("class Base { public: ~Base(); };\n"
+                               "class Derived : public Base { public: ~Derived() { (void)11; } };\n"
+                               "void f(Base *p, Base *q) {\n"
+                               "    delete p;\n"
+                               "    p = new Derived;\n"
+                               "    delete q;\n"
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        // only the derived class that the deleted pointer points at
+        checkVirtualDestructor("class Base { public: ~Base(); };\n"
+                               "class Derived1 : public Base { public: ~Derived1() { (void)11; } };\n"
+                               "class Derived2 : public Base { public: ~Derived2() { (void)11; } };\n"
+                               "void f(Base *p, Base *q) {\n"
+                               "    p = new Derived1;\n"
+                               "    q = new Derived2;\n"
+                               "    delete q;\n"
+                               "}\n");
+        ASSERT_EQUALS("[test.cpp:1:23]: (error) Class 'Base' which is inherited by class 'Derived2' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
+
+        // the derived class is a template instantiation, its name contains spaces
+        checkVirtualDestructor("class Base { public: ~Base(); };\n"
+                               "template<class T> class Derived : public Base { public: ~Derived() { (void)11; } };\n"
+                               "void f(Base *p) {\n"
+                               "    p = new Derived<unsigned int>;\n"
+                               "    delete p;\n"
+                               "}\n");
+        ASSERT_EQUALS("[test.cpp:1:23]: (error) Class 'Base' which is inherited by class 'Derived < unsigned int >' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
     }
 
     void virtualDestructorProtected() {
@@ -2813,7 +2902,7 @@ class TestClass : public TestFixture {
                                "{\n"
                                "public:\n"
                                "    ~B() { int a; }\n"
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2834,7 +2923,7 @@ class TestClass : public TestFixture {
                                "{\n"
                                "public:\n"
                                "    ~B() { int a; }\n"
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // class A inherits virtual destructor from struct Base -> no error
@@ -2852,7 +2941,7 @@ class TestClass : public TestFixture {
                                "{\n"
                                "public:\n"
                                "    ~B() { int a; }\n"
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown Base class -> it could have virtual destructor, so ignore
@@ -2866,7 +2955,7 @@ class TestClass : public TestFixture {
                                "{\n"
                                "public:\n"
                                "    ~B() { int a; }\n"
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // Virtual destructor is inherited -> no error
@@ -2887,7 +2976,7 @@ class TestClass : public TestFixture {
                                "{\n"
                                "public:\n"
                                "    ~B() { int a; }\n"
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // class A doesn't inherit virtual destructor from class Base -> error
@@ -2906,7 +2995,7 @@ class TestClass : public TestFixture {
                                "{\n"
                                "public:\n"
                                "    ~B() { int a; }\n"
-                               "};");
+                               "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:7]: (error) Class 'Base' which is inherited by class 'B' does not have a virtual destructor.\n",
                            "", errout_str());
     }
@@ -2928,7 +3017,7 @@ class TestClass : public TestFixture {
                                " ~B(){int a;}\n"
                                "};\n"
                                "\n"
-                               "AA<double> *p = new B; delete p;");
+                               "AA<double> *p = new B; delete p;\n");
         ASSERT_EQUALS("[test.cpp:9:3]: (error) Class 'AA < double >' which is inherited by class 'B' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
     }
 
@@ -2986,7 +3075,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         checkClass.checkMemset();
     }
 
@@ -2998,7 +3087,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3009,7 +3098,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3020,7 +3109,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3031,7 +3120,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3042,7 +3131,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred {\n"
@@ -3051,7 +3140,7 @@ class TestClass : public TestFixture {
                       "};\n"
                       "void Fred::f() {\n"
                       "    memset(this, 0, sizeof(*this));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3061,7 +3150,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3072,7 +3161,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3084,7 +3173,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Pebbles pebbles;\n"
                       "    memset(&pebbles, 0, sizeof(pebbles));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:9:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3095,7 +3184,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on class that contains a virtual function. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3106,7 +3195,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    static Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on class that contains a virtual function. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3121,7 +3210,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Pebbles pebbles;\n"
                       "    memset(&pebbles, 0, sizeof(pebbles));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:12:5]: (error) Using 'memset' on class that contains a virtual function. [memsetClass]\n", errout_str());
 
         // Fred not defined in scope
@@ -3135,7 +3224,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Fred with namespace qualifier
@@ -3149,7 +3238,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    n1::Fred fred;\n"
                       "    memset(&fred, 0, sizeof(n1::Fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:10:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         // Fred with namespace qualifier
@@ -3163,7 +3252,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    n1::Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:10:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class A {\n"
@@ -3174,7 +3263,7 @@ class TestClass : public TestFixture {
                       "  const int N = 10;\n"
                       "  A** arr = new A*[N];\n"
                       "  memset(arr, 0, N * sizeof(A*));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class A {\n" // #5116 - nested class data is mixed in the SymbolDatabase
@@ -3183,7 +3272,7 @@ class TestClass : public TestFixture {
                       "};\n"
                       "void f(A::B *b) {\n"
                       "  memset(b,0,4);\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4461 Warn about memset/memcpy on class with references as members
@@ -3193,7 +3282,7 @@ class TestClass : public TestFixture {
                       "void f() {\n"
                       "  A a;\n"
                       "  memset(&a, 0, sizeof(a));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:6:3]: (error) Using 'memset' on class that contains a reference. [memsetClassReference]\n", errout_str());
         checkNoMemset("class A {\n"
                       "  const B&b;\n"
@@ -3201,7 +3290,7 @@ class TestClass : public TestFixture {
                       "void f() {\n"
                       "  A a;\n"
                       "  memset(&a, 0, sizeof(a));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:6:3]: (error) Using 'memset' on class that contains a reference. [memsetClassReference]\n", errout_str());
 
         // #7456
@@ -3215,7 +3304,7 @@ class TestClass : public TestFixture {
                       "void func() {\n"
                       "  B b[4];\n"
                       "  memset(b, 0, sizeof(b));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8619
@@ -3270,11 +3359,11 @@ class TestClass : public TestFixture {
                       "      } vid;\n"
                       "    };\n"
                       "  } hdr;\n"
-                      "};"
+                      "};\n"
                       "void parseHeader() {\n"
                       "  ASFStreamHeader strhdr;\n"
                       "  memset(&strhdr, 0, sizeof(strhdr));\n"
-                      "}");
+                      "}\n");
     }
 
     void memsetOnStruct() {
@@ -3285,7 +3374,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3295,7 +3384,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    struct A a;\n"
                       "    memset(&a, 0, sizeof(struct A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3305,14 +3394,14 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    struct A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("void f()\n"
                       "{\n"
                       "    struct sockaddr_in6 fail;\n"
                       "    memset(&fail, 0, sizeof(struct sockaddr_in6));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3325,7 +3414,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       " struct A fail;\n"
                       " memset(&fail, 0, sizeof(struct A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:10:2]: (error) Using 'memset' on struct that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct Fred\n"
@@ -3336,7 +3425,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on struct that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct Stringy {\n"
@@ -3348,7 +3437,7 @@ class TestClass : public TestFixture {
                       "int main() {\n"
                       "    Foo foo;\n"
                       "    memset(&foo, 0, sizeof(Foo));\n"
-                      "}");
+                      "}\n");
 
         ASSERT_EQUALS("[test.cpp:9:5]: (error) Using 'memset' on struct that contains a 'std::string'. [memsetClass]\n", errout_str());
     }
@@ -3361,7 +3450,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on class that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3371,7 +3460,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3381,7 +3470,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(struct A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3391,7 +3480,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(a));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class A\n"
@@ -3401,7 +3490,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on class that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3411,7 +3500,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3421,7 +3510,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(a));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3431,7 +3520,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A {\n"
@@ -3441,7 +3530,7 @@ class TestClass : public TestFixture {
                       "void f() {\n"
                       "    A a;\n"
                       "    memset(a, 0, 100);\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str()); // #4460
 
         checkNoMemset("struct C {\n"
@@ -3459,7 +3548,7 @@ class TestClass : public TestFixture {
                       "    memset(*c4, 0, 10);\n"
                       "    memset(c2, 0, 10);\n"
                       "    memset(c3, 0, 10);\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:9:5]: (error) Using 'memset' on struct that contains a 'std::string'. [memsetClass]\n"
                       "[test.cpp:11:5]: (error) Using 'memset' on struct that contains a 'std::string'. [memsetClass]\n"
                       "[test.cpp:12:5]: (error) Using 'memset' on struct that contains a 'std::string'. [memsetClass]\n"
@@ -3475,7 +3564,7 @@ class TestClass : public TestFixture {
                       "  multilevel_data *d = (multilevel_data *) malloc(sizeof(multilevel_data));\n"
                       "  memset(d, 0, sizeof(multilevel_data));\n"
                       "  return (void*) d;\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:8:3]: (portability) Using memset() on struct which contains a floating point number. [memsetClassFloat]\n", errout_str());
     }
 
@@ -3493,7 +3582,7 @@ class TestClass : public TestFixture {
                       "void f() {\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str()); // std::array is POD (#5481)
 
         checkNoMemset("struct st {\n"
@@ -3504,7 +3593,7 @@ class TestClass : public TestFixture {
                       "void f() {\n"
                       "  st s;\n"
                       "  std::memset(&s, 0, sizeof(st));\n"
-                      "}", settings);
+                      "}\n", settings);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3515,7 +3604,7 @@ class TestClass : public TestFixture {
                       "void f() {\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (portability) Using memset() on struct which contains a floating point number. [memsetClassFloat]\n", errout_str());
 
         checkNoMemset("struct A {\n"
@@ -3524,7 +3613,7 @@ class TestClass : public TestFixture {
                       "void f() {\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (portability) Using memset() on struct which contains a floating point number. [memsetClassFloat]\n", errout_str());
 
         checkNoMemset("struct A {\n"
@@ -3533,7 +3622,7 @@ class TestClass : public TestFixture {
                       "void f(const A& b) {\n"
                       "    A a;\n"
                       "    memcpy(&a, &b, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct A {\n"
@@ -3542,7 +3631,7 @@ class TestClass : public TestFixture {
                       "void f() {\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3550,7 +3639,7 @@ class TestClass : public TestFixture {
         checkNoMemset("void clang_tokenize(CXToken **Tokens) {\n"
                       "  *Tokens = (CXToken *)malloc(sizeof(CXToken) * CXTokens.size());\n"
                       "  memmove(*Tokens, CXTokens.data(), sizeof(CXToken) * CXTokens.size());\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3558,49 +3647,49 @@ class TestClass : public TestFixture {
         checkNoMemset("class C { C() {} };\n"
                       "void foo(C*& p) {\n"
                       "    p = malloc(sizeof(C));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:3:5] -> [test.cpp:1:1]: (warning) Memory for class instance allocated with malloc(), but class provides constructors. [mallocOnClassWarning]\n", errout_str());
 
         checkNoMemset("class C { C(int z, Foo bar) { bar(); } };\n"
                       "void foo(C*& p) {\n"
                       "    p = malloc(sizeof(C));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:3:5] -> [test.cpp:1:1]: (warning) Memory for class instance allocated with malloc(), but class provides constructors. [mallocOnClassWarning]\n", errout_str());
 
         checkNoMemset("struct C { C() {} };\n"
                       "void foo(C*& p) {\n"
                       "    p = realloc(p, sizeof(C));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:3:5] -> [test.cpp:1:1]: (warning) Memory for class instance allocated with realloc(), but class provides constructors. [mallocOnClassWarning]\n", errout_str());
 
         checkNoMemset("struct C { virtual void bar(); };\n"
                       "void foo(C*& p) {\n"
                       "    p = malloc(sizeof(C));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:1:1]: (error) Memory for class instance allocated with malloc(), but class contains a virtual function. [mallocOnClassError]\n", errout_str());
 
         checkNoMemset("struct C { std::string s; };\n"
                       "void foo(C*& p) {\n"
                       "    p = malloc(sizeof(C));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:1:1]: (error) Memory for class instance allocated with malloc(), but class contains a 'std::string'. [mallocOnClassError]\n", errout_str());
 
         checkNoMemset("class C { };\n" // C-Style class/struct
                       "void foo(C*& p) {\n"
                       "    p = malloc(sizeof(C));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct C { C() {} };\n"
                       "void foo(C*& p) {\n"
                       "    p = new C();\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class C { C() {} };\n"
                       "void foo(D*& p) {\n" // Unknown type
                       "    p = malloc(sizeof(C));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class AutoCloseFD {\n"
@@ -3611,7 +3700,7 @@ class TestClass : public TestFixture {
                       "};\n"
                       "void f() {\n"
                       "    AutoCloseFD fd = open(\"abc\", O_RDONLY | O_CLOEXEC);\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct C {\n" // #12313
@@ -3620,7 +3709,7 @@ class TestClass : public TestFixture {
                       "};\n"
                       "void f() {\n"
                       "    C c = strdup(\"abc\");\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3632,24 +3721,24 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings1, this);
+        CheckClassImpl checkClass(&tokenizer, settings1, *this);
         checkClass.thisSubtraction();
     }
 
     void this_subtraction() {
-        checkThisSubtraction("; this-x ;");
+        checkThisSubtraction("; this-x ;\n");
         ASSERT_EQUALS("[test.cpp:1:3]: (warning) Suspicious pointer subtraction. Did you intend to write '->'? [thisSubtraction]\n", errout_str());
 
-        checkThisSubtraction("; *this = *this-x ;");
+        checkThisSubtraction("; *this = *this-x ;\n");
         ASSERT_EQUALS("", errout_str());
 
         checkThisSubtraction("; *this = *this-x ;\n"
-                             "this-x ;");
+                             "this-x ;\n");
         ASSERT_EQUALS("[test.cpp:2:1]: (warning) Suspicious pointer subtraction. Did you intend to write '->'? [thisSubtraction]\n", errout_str());
 
         checkThisSubtraction("; *this = *this-x ;\n"
                              "this-x ;\n"
-                             "this-x ;");
+                             "this-x ;\n");
         ASSERT_EQUALS("[test.cpp:2:1]: (warning) Suspicious pointer subtraction. Did you intend to write '->'? [thisSubtraction]\n"
                       "[test.cpp:3:1]: (warning) Suspicious pointer subtraction. Did you intend to write '->'? [thisSubtraction]\n", errout_str());
     }
@@ -3672,7 +3761,7 @@ class TestClass : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         (checkClass.checkConst)();
     }
 
@@ -3680,18 +3769,18 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    int getA() { return a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style, inconclusive) Technically the member function 'Fred::getA' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Fred {\n"
                    "    const std::string foo() { return \"\"; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (style) The member function 'Fred::foo' can be static. [functionStatic]\n", errout_str());
 
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    const std::string & foo() { return \"\"; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:25]: (style) The member function 'Fred::foo' can be static. [functionStatic]\n", errout_str());
 
         // constructors can't be const..
@@ -3699,14 +3788,14 @@ class TestClass : public TestFixture {
                    "    int a;\n"
                    "public:\n"
                    "    Fred() { }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment through |=..
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    int setA() { a |= true; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // functions with a call to a member function can only be const, if that member function is const, too.. (#1305)
@@ -3715,7 +3804,7 @@ class TestClass : public TestFixture {
                    "    int x;\n"
                    "    void a() { x = 1; }\n"
                    "    void b() { a(); }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
@@ -3723,14 +3812,14 @@ class TestClass : public TestFixture {
                    "    int x;\n"
                    "    int a() const { return x; }\n"
                    "    void b() { a(); }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (style, inconclusive) Technically the member function 'Fred::b' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Fred {\n"
                    "public:\n"
                    "    int x;\n"
                    "    void b() { a(); }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) The member function 'Fred::b' can be static. [functionStatic]\n", errout_str());
 
         // static functions can't be const..
@@ -3739,12 +3828,12 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    static unsigned get()\n"
                    "    { return 0; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    const std::string foo() const throw() { return \"\"; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (style) The member function 'Fred::foo' can be static. [functionStatic]\n", errout_str());
     }
 
@@ -3754,49 +3843,49 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo() { s = \"\"; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument reference can be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string & a) { a = s; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // assignment to variable can't be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string & a) { s = a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument references can be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string & a, std::string & b) { a = s; b = s; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string & a, std::string & b) { s = a; s = b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string & a, std::string & b) { s = a; b = a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string & a, std::string & b) { a = s; s = b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3805,42 +3894,42 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int s;\n"
                    "    void foo(int * a) { *a = s; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
                    "    int s;\n"
                    "    void foo(int * a) { s = *a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument pointers can be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string * a, std::string * b) { *a = s; *b = s; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string * a, std::string * b) { s = *a; s = *b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string * a, std::string * b) { s = *a; *b = s; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string * a, std::string * b) { *a = s; s = b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3849,14 +3938,14 @@ class TestClass : public TestFixture {
                    "    int a;\n"
                    "    int getA();\n"
                    "};\n"
-                   "int Fred::getA() { return a; }");
+                   "int Fred::getA() { return a; }\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:5:11]: (style, inconclusive) Technically the member function 'Fred::getA' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    const std::string & foo();\n"
                    "};\n"
-                   "const std::string & Fred::foo() { return \"\"; }");
+                   "const std::string & Fred::foo() { return \"\"; }\n");
         ASSERT_EQUALS("[test.cpp:3:25] -> [test.cpp:5:27]: (style) The member function 'Fred::foo' can be static. [functionStatic]\n", errout_str());
 
         // functions with a function call to a non-const member can't be const.. (#1305)
@@ -3867,7 +3956,7 @@ class TestClass : public TestFixture {
                    "    void a() { x = 1; }\n"
                    "    void b();\n"
                    "};\n"
-                   "void Fred::b() { a(); }");
+                   "void Fred::b() { a(); }\n");
         ASSERT_EQUALS("", errout_str());
 
         // static functions can't be const..
@@ -3876,7 +3965,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    static unsigned get();\n"
                    "};\n"
-                   "static unsigned Fred::get() { return 0; }");
+                   "static unsigned Fred::get() { return 0; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable can't be const
@@ -3884,7 +3973,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo();\n"
                    "};\n"
-                   "void Fred::foo() { s = \"\"; }");
+                   "void Fred::foo() { s = \"\"; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument reference can be const
@@ -3892,7 +3981,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string & a);\n"
                    "};\n"
-                   "void Fred::foo(std::string & a) { a = s; }");
+                   "void Fred::foo(std::string & a) { a = s; }\n");
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:5:12]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // assignment to variable can't be const
@@ -3900,7 +3989,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string & a);\n"
                    "};\n"
-                   "void Fred::foo(std::string & a) { s = a; }");
+                   "void Fred::foo(std::string & a) { s = a; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument references can be const
@@ -3908,7 +3997,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string & a, std::string & b);\n"
                    "};\n"
-                   "void Fred::foo(std::string & a, std::string & b) { a = s; b = s; }");
+                   "void Fred::foo(std::string & a, std::string & b) { a = s; b = s; }\n");
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:5:12]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // assignment to variable, can't be const
@@ -3916,7 +4005,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string & a, std::string & b);\n"
                    "};\n"
-                   "void Fred::foo(std::string & a, std::string & b) { s = a; s = b; }");
+                   "void Fred::foo(std::string & a, std::string & b) { s = a; s = b; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
@@ -3924,7 +4013,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string & a, std::string & b);\n"
                    "};\n"
-                   "void Fred::foo(std::string & a, std::string & b) { s = a; b = a; }");
+                   "void Fred::foo(std::string & a, std::string & b) { s = a; b = a; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
@@ -3932,7 +4021,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string & a, std::string & b);\n"
                    "};\n"
-                   "void Fred::foo(std::string & a, std::string & b) { a = s; s = b; }");
+                   "void Fred::foo(std::string & a, std::string & b) { a = s; s = b; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument pointer can be const
@@ -3940,7 +4029,7 @@ class TestClass : public TestFixture {
                    "    int s;\n"
                    "    void foo(int * a);\n"
                    "};\n"
-                   "void Fred::foo(int * a) { *a = s; }");
+                   "void Fred::foo(int * a) { *a = s; }\n");
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:5:12]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // assignment to variable, can't be const
@@ -3948,7 +4037,7 @@ class TestClass : public TestFixture {
                    "    int s;\n"
                    "    void foo(int * a);\n"
                    "};\n"
-                   "void Fred::foo(int * a) { s = *a; }");
+                   "void Fred::foo(int * a) { s = *a; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument pointers can be const
@@ -3956,7 +4045,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string * a, std::string * b);\n"
                    "};\n"
-                   "void Fred::foo(std::string * a, std::string * b) { *a = s; *b = s; }");
+                   "void Fred::foo(std::string * a, std::string * b) { *a = s; *b = s; }\n");
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:5:12]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // assignment to variable, can't be const
@@ -3964,7 +4053,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string * a, std::string * b);\n"
                    "};\n"
-                   "void Fred::foo(std::string * a, std::string * b) { s = *a; s = *b; }");
+                   "void Fred::foo(std::string * a, std::string * b) { s = *a; s = *b; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
@@ -3972,7 +4061,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string * a, std::string * b);\n"
                    "};\n"
-                   "void Fred::foo(std::string * a, std::string * b) { s = *a; *b = s; }");
+                   "void Fred::foo(std::string * a, std::string * b) { s = *a; *b = s; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
@@ -3980,7 +4069,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string * a, std::string * b);\n"
                    "};\n"
-                   "void Fred::foo(std::string * a, std::string * b) { *a = s; s = b; }");
+                   "void Fred::foo(std::string * a, std::string * b) { *a = s; s = b; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // check functions with same name
@@ -3990,11 +4079,11 @@ class TestClass : public TestFixture {
                    "    void foo(std::string & a);\n"
                    "    void foo(const std::string & a);\n"
                    "};\n"
-                   "void Fred::foo() { }"
-                   "void Fred::foo(std::string & a) { a = s; }"
-                   "void Fred::foo(const std::string & a) { s = a; }");
+                   "void Fred::foo() { }\n"
+                   "void Fred::foo(std::string & a) { a = s; }\n"
+                   "void Fred::foo(const std::string & a) { s = a; }\n");
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:7:12]: (style) The member function 'Fred::foo' can be static. [functionStatic]\n"
-                      "[test.cpp:4:10] -> [test.cpp:7:32]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
+                      "[test.cpp:4:10] -> [test.cpp:8:12]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // check functions with different or missing parameter names
         checkConst("class Fred {\n"
@@ -4009,7 +4098,7 @@ class TestClass : public TestFixture {
                    "void Fred::foo2(int c, int d) { }\n"
                    "void Fred::foo3(int a, int b) { }\n"
                    "void Fred::foo4(int a, int b) { }\n"
-                   "void Fred::foo5(int, int) { }");
+                   "void Fred::foo5(int, int) { }\n");
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:9:12]: (style) The member function 'Fred::foo1' can be static. [functionStatic]\n"
                       "[test.cpp:4:10] -> [test.cpp:10:12]: (style) The member function 'Fred::foo2' can be static. [functionStatic]\n"
                       "[test.cpp:5:10] -> [test.cpp:11:12]: (style) The member function 'Fred::foo3' can be static. [functionStatic]\n"
@@ -4022,7 +4111,7 @@ class TestClass : public TestFixture {
                    "        int a;\n"
                    "        int getA() { return a; }\n"
                    "    };\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style, inconclusive) Technically the member function 'Fred::A::getA' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Fred {\n"
@@ -4031,7 +4120,7 @@ class TestClass : public TestFixture {
                    "        int getA();\n"
                    "    };\n"
                    "    int A::getA() { return a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:13] -> [test.cpp:6:12]: (style, inconclusive) Technically the member function 'Fred::A::getA' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Fred {\n"
@@ -4040,7 +4129,7 @@ class TestClass : public TestFixture {
                    "        int getA();\n"
                    "    };\n"
                    "};\n"
-                   "int Fred::A::getA() { return a; }");
+                   "int Fred::A::getA() { return a; }\n");
         ASSERT_EQUALS("[test.cpp:4:13] -> [test.cpp:7:14]: (style, inconclusive) Technically the member function 'Fred::A::getA' can be const. [functionConst]\n", errout_str());
 
         // check deeply nested classes
@@ -4053,7 +4142,7 @@ class TestClass : public TestFixture {
                    "            int getA() { return a; }\n"
                    "        };\n"
                    "    };\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style, inconclusive) Technically the member function 'Fred::B::getB' can be const. [functionConst]\n"
                       "[test.cpp:7:17]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const. [functionConst]\n"
                       , errout_str());
@@ -4069,7 +4158,7 @@ class TestClass : public TestFixture {
                    "        int A::getA() { return a; }\n"
                    "    };\n"
                    "    int B::getB() { return b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:13] -> [test.cpp:11:12]: (style, inconclusive) Technically the member function 'Fred::B::getB' can be const. [functionConst]\n"
                       "[test.cpp:7:17] -> [test.cpp:9:16]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const. [functionConst]\n", errout_str());
 
@@ -4084,7 +4173,7 @@ class TestClass : public TestFixture {
                    "    };\n"
                    "    int B::A::getA() { return a; }\n"
                    "    int B::getB() { return b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:13] -> [test.cpp:11:12]: (style, inconclusive) Technically the member function 'Fred::B::getB' can be const. [functionConst]\n"
                       "[test.cpp:7:17] -> [test.cpp:10:15]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const. [functionConst]\n", errout_str());
 
@@ -4099,7 +4188,7 @@ class TestClass : public TestFixture {
                    "    };\n"
                    "};\n"
                    "int Fred::B::A::getA() { return a; }\n"
-                   "int Fred::B::getB() { return b; }");
+                   "int Fred::B::getB() { return b; }\n");
         ASSERT_EQUALS("[test.cpp:4:13] -> [test.cpp:12:14]: (style, inconclusive) Technically the member function 'Fred::B::getB' can be const. [functionConst]\n"
                       "[test.cpp:7:17] -> [test.cpp:11:17]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const. [functionConst]\n", errout_str());
     }
@@ -4109,7 +4198,7 @@ class TestClass : public TestFixture {
         checkConst("struct Fred {\n"
                    "    int a;\n"
                    "    bool operator<(const Fred &f) { return a < f.a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'Fred::operator<' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4124,7 +4213,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        foo << 123;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct Foo {\n"
@@ -4136,7 +4225,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        std::cout << foo << 123;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:6:10]: (style, inconclusive) Technically the member function 'Fred::x' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4145,13 +4234,13 @@ class TestClass : public TestFixture {
                    "    int array[10];\n"
                    "    int const & operator [] (unsigned int index) const { return array[index]; }\n"
                    "    int & operator [] (unsigned int index) { return array[index]; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct Fred {\n"
                    "    int array[10];\n"
                    "    int const & operator [] (unsigned int index) { return array[index]; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style, inconclusive) Technically the member function 'Fred::operator[]' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4161,14 +4250,14 @@ class TestClass : public TestFixture {
                    "    int c;\n"
                    "public:\n"
                    "    operator int*() { return &c; };\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
                    "    int c;\n"
                    "public:\n"
                    "    operator const int*() { return &c; };\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (style, inconclusive) Technically the member function 'A::operatorconstint*' can be const. [functionConst]\n", errout_str());
 
         // #2375
@@ -4176,14 +4265,14 @@ class TestClass : public TestFixture {
                    "    int array[10];\n"
                    "    typedef int* (Fred::*UnspecifiedBoolType);\n"
                    "    operator UnspecifiedBoolType() { };\n"
-                   "};");
+                   "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::operatorint**' can be const.\n", "", errout_str());
 
         checkConst("struct Fred {\n"
                    "    int array[10];\n"
                    "    typedef int* (Fred::*UnspecifiedBoolType);\n"
                    "    operator UnspecifiedBoolType() { array[0] = 0; };\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4192,21 +4281,21 @@ class TestClass : public TestFixture {
                    "    int c;\n"
                    "public:\n"
                    "    operator int& () {return c}\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
                    "    int c;\n"
                    "public:\n"
                    "    operator const int& () {return c}\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (style, inconclusive) Technically the member function 'A::operatorconstint&' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
                    "    int c;\n"
                    "public:\n"
                    "    operator int () {return c}\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (style, inconclusive) Technically the member function 'A::operatorint' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4214,7 +4303,7 @@ class TestClass : public TestFixture {
         checkConst("class A {\n"
                    "    int c;\n"
                    "    void f() { os >> *this; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4228,7 +4317,7 @@ class TestClass : public TestFixture {
                    "        same = (i == a);\n"
                    "        return same;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'A::foo' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4237,14 +4326,14 @@ class TestClass : public TestFixture {
         checkConst("class foo {\n"
                    "public:\n"
                    "};\n"
-                   "void bar() {}");
+                   "void bar() {}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred\n"
                    "{\n"
                    "public:\n"
                    "    void foo() { }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) The member function 'Fred::foo' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct fast_string\n"
@@ -4258,7 +4347,7 @@ class TestClass : public TestFixture {
                    "inline void fast_string::set_type(char t)\n"
                    "{\n"
                    "    buff[10] = t;\n"
-                   "}");
+                   "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4269,7 +4358,7 @@ class TestClass : public TestFixture {
                    "    void set(int i) { a = i; }\n"
                    "    void set(const foo & f) { *this = f; }\n"
                    "};\n"
-                   "void bar() {}");
+                   "void bar() {}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4281,7 +4370,7 @@ class TestClass : public TestFixture {
                    "    std::string strGetString() { return m_strValue; }\n"
                    "private:\n"
                    "    std::string m_strValue;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:17]: (style, inconclusive) Technically the member function 'A::strGetString' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4292,7 +4381,7 @@ class TestClass : public TestFixture {
                    "    void SetExitCode(wxThread::ExitCode exitcode) { m_exitcode = exitcode; }\n"
                    "private:\n"
                    "    wxThread::ExitCode m_exitcode;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4303,7 +4392,7 @@ class TestClass : public TestFixture {
                    "    int foo() { return x = 0; }\n"
                    "private:\n"
                    "    int x;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
@@ -4311,7 +4400,7 @@ class TestClass : public TestFixture {
                    "    int foo() { return x ? x : x = 0; }\n"
                    "private:\n"
                    "    int x;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
@@ -4319,7 +4408,7 @@ class TestClass : public TestFixture {
                    "    int foo() { return x ? x = 0 : x; }\n"
                    "private:\n"
                    "    int x;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4330,7 +4419,7 @@ class TestClass : public TestFixture {
                    "    void set(struct tm time) { m_time = time; }\n"
                    "private:\n"
                    "    struct tm m_time;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4341,7 +4430,7 @@ class TestClass : public TestFixture {
                    "    int foo() { x = 0; }\n"
                    "private:\n"
                    "    mutable int x;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style, inconclusive) Technically the member function 'A::foo' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4355,7 +4444,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::vector<int> m_vec;\n"
                    "    std::pair<int,double> m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:22]: (style, inconclusive) Technically the member function 'A::GetVec' can be const. [functionConst]\n"
                       "[test.cpp:5:27]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
@@ -4367,7 +4456,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::vector<int> m_vec;\n"
                    "    std::pair<int,double> m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:30]: (style, inconclusive) Technically the member function 'A::GetVec' can be const. [functionConst]\n"
                       "[test.cpp:5:35]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
     }
@@ -4380,7 +4469,7 @@ class TestClass : public TestFixture {
                    "    std::pair<std::vector<int>,double> GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair<std::vector<int>,double> m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:40]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4389,7 +4478,7 @@ class TestClass : public TestFixture {
                    "    const std::pair<std::vector<int>,double>& GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair<std::vector<int>,double> m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:47]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4398,7 +4487,7 @@ class TestClass : public TestFixture {
                    "    std::pair<std::vector<int>,double>& GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair<std::vector<int>,double> m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4409,7 +4498,7 @@ class TestClass : public TestFixture {
                    "    pair<int ,double> GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    pair<int ,double> m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:23]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("using namespace std;"
@@ -4419,7 +4508,7 @@ class TestClass : public TestFixture {
                    "    const pair<int ,double> & GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    pair<int ,double> m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:31]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("using namespace std;"
@@ -4429,7 +4518,7 @@ class TestClass : public TestFixture {
                    "    pair<int ,double> & GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    pair<int ,double> m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4439,7 +4528,7 @@ class TestClass : public TestFixture {
                    "    std::pair< int,std::vector<int> >  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< int,std::vector<int> >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:40]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4448,7 +4537,7 @@ class TestClass : public TestFixture {
                    "    const std::pair< int,std::vector<int> >&  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< int,std::vector<int> >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:47]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4457,7 +4546,7 @@ class TestClass : public TestFixture {
                    "    std::pair< int,std::vector<int> >&  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< int,std::vector<int> >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4468,7 +4557,7 @@ class TestClass : public TestFixture {
                    "    pair< vector<int>, int >  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    pair< vector<int>, int >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:31]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("using namespace std;"
@@ -4478,7 +4567,7 @@ class TestClass : public TestFixture {
                    "    const pair< vector<int>, int >&  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    pair< vector<int>, int >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:38]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("using namespace std;"
@@ -4488,7 +4577,7 @@ class TestClass : public TestFixture {
                    "    pair< vector<int>, int >&  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    pair< vector<int>, int >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
@@ -4497,7 +4586,7 @@ class TestClass : public TestFixture {
                    "    std::pair< std::vector<int>,std::vector<int> >  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< std::vector<int>,std::vector<int> >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:53]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4506,7 +4595,7 @@ class TestClass : public TestFixture {
                    "    const std::pair< std::vector<int>,std::vector<int> >&  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< std::vector<int>,std::vector<int> >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:60]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4515,7 +4604,7 @@ class TestClass : public TestFixture {
                    "    std::pair< std::vector<int>,std::vector<int> >&  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< std::vector<int>,std::vector<int> >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4526,7 +4615,7 @@ class TestClass : public TestFixture {
                    "    std::pair< std::pair < int, char > , int >  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< std::pair < int, char > , int >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:49]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4535,7 +4624,7 @@ class TestClass : public TestFixture {
                    "    const std::pair< std::pair < int, char > , int > & GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< std::pair < int, char > , int >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:56]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4544,7 +4633,7 @@ class TestClass : public TestFixture {
                    "    std::pair< std::pair < int, char > , int > & GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< std::pair < int, char > , int >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4554,7 +4643,7 @@ class TestClass : public TestFixture {
                    "    std::pair< int , std::pair < int, char > >  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< int , std::pair < int, char > >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:49]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4563,7 +4652,7 @@ class TestClass : public TestFixture {
                    "    const std::pair< int , std::pair < int, char > >&  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< int , std::pair < int, char > >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:56]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4572,7 +4661,7 @@ class TestClass : public TestFixture {
                    "    std::pair< int , std::pair < int, char > >&  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< int , std::pair < int, char > >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4583,7 +4672,7 @@ class TestClass : public TestFixture {
                    "    vector<int>  GetVec() {return m_Vec;}\n"
                    "private:\n"
                    "    vector<int>  m_Vec;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (style, inconclusive) Technically the member function 'A::GetVec' can be const. [functionConst]\n", errout_str());
 
         checkConst("using namespace std;"
@@ -4593,7 +4682,7 @@ class TestClass : public TestFixture {
                    "    const vector<int>&  GetVec() {return m_Vec;}\n"
                    "private:\n"
                    "    vector<int>  m_Vec;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:25]: (style, inconclusive) Technically the member function 'A::GetVec' can be const. [functionConst]\n", errout_str());
 
         checkConst("using namespace std;"
@@ -4603,7 +4692,7 @@ class TestClass : public TestFixture {
                    "    vector<int>&  GetVec() {return m_Vec;}\n"
                    "private:\n"
                    "    vector<int>  m_Vec;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4612,7 +4701,7 @@ class TestClass : public TestFixture {
                    "    int * * foo() { return &x; }\n"
                    "private:\n"
                    "    const int * x;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
@@ -4620,7 +4709,7 @@ class TestClass : public TestFixture {
                    "    const int ** foo() { return &x; }\n"
                    "private:\n"
                    "    const int * x;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (style, inconclusive) Technically the member function 'A::foo' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4628,7 +4717,7 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    unsigned long long int a;\n"
                    "    unsigned long long int getA() { return a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:28]: (style, inconclusive) Technically the member function 'Fred::getA' can be const. [functionConst]\n", errout_str());
 
         // constructors can't be const..
@@ -4636,14 +4725,14 @@ class TestClass : public TestFixture {
                    "    unsigned long long int a;\n"
                    "public:\n"
                    "    Fred() { }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment through |=..
         checkConst("class Fred {\n"
                    "    unsigned long long int a;\n"
                    "    unsigned long long int setA() { a |= true; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // static functions can't be const..
@@ -4652,7 +4741,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    static unsigned long long int get()\n"
                    "    { return 0; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4661,7 +4750,7 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void set(int i) { Fred::a = i; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4672,7 +4761,7 @@ class TestClass : public TestFixture {
                    "    void set(int i, int j) { a[i].k = i; }\n"
                    "private:\n"
                    "    struct { int k; } a[4];\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4681,7 +4770,7 @@ class TestClass : public TestFixture {
                    "static int x;\n"
                    "public:\n"
                    "    void set(int i) { x = i; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) The member function 'Fred::set' can be static. [functionStatic]\n", errout_str());
     }
 
@@ -4693,7 +4782,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "public:\n"
                    "    void set(std::string ss) { s = ss; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4703,35 +4792,35 @@ class TestClass : public TestFixture {
                    "    int x : 3;\n"
                    "public:\n"
                    "    void set(int i) { x = i; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    list<int *> x;\n"
                    "public:\n"
                    "    list<int *> get() { return x; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    list<const int *> x;\n"
                    "public:\n"
                    "    list<const int *> get() { return x; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:23]: (style, inconclusive) Technically the member function 'Fred::get' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Fred {\n"
                    "    std::list<std::string &> x;\n"
                    "public:\n"
                    "    std::list<std::string &> get() { return x; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    std::list<const std::string &> x;\n"
                    "public:\n"
                    "    std::list<const std::string &> get() { return x; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:36]: (style, inconclusive) Technically the member function 'Fred::get' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4747,7 +4836,7 @@ class TestClass : public TestFixture {
                    "        for (int i = 0 ; i < 10; l1[i] = NULL, i++);\n"
                    "    }\n"
                    "    void f1() { l1[0] = \"Hello\"; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4758,7 +4847,7 @@ class TestClass : public TestFixture {
                    "    B::C * v1;\n"
                    "public:\n"
                    "    void f1() { v1 = 0; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A\n"
@@ -4767,7 +4856,7 @@ class TestClass : public TestFixture {
                    "    B::C * v1[0];\n"
                    "public:\n"
                    "    void f1() { v1[0] = 0; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4779,7 +4868,7 @@ class TestClass : public TestFixture {
                    "    void set_member(Type2 m) { _m = m; }\n"
                    "private:\n"
                    "    Type2 _m;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4792,7 +4881,7 @@ class TestClass : public TestFixture {
                    "}\n"
                    "private:\n"
                    "    std::map<QString, QString> *m_pSettings;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4807,7 +4896,7 @@ class TestClass : public TestFixture {
                    "{return m_strVal.c_str();}\n"
                    "private:\n"
                    "std::string m_strVal;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A{\n"
@@ -4817,7 +4906,7 @@ class TestClass : public TestFixture {
                    "{return m_strVal.c_str();}\n"
                    "private:\n"
                    "std::string m_strVal;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style, inconclusive) Technically the member function 'A::strGetString' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A{\n"
@@ -4827,7 +4916,7 @@ class TestClass : public TestFixture {
                    "{return m_strVal.c_str();}\n"
                    "private:\n"
                    "std::string m_strVal;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:19]: (style, inconclusive) Technically the member function 'A::strGetString1' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A{\n"
@@ -4837,7 +4926,7 @@ class TestClass : public TestFixture {
                    "{return m_strVec.size();}\n"
                    "private:\n"
                    "std::vector<std::string> m_strVec;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (style, inconclusive) Technically the member function 'A::strGetSize' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A{\n"
@@ -4847,7 +4936,7 @@ class TestClass : public TestFixture {
                    "{return m_strVec.empty();}\n"
                    "private:\n"
                    "std::vector<std::string> m_strVec;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (style, inconclusive) Technically the member function 'A::strGetEmpty' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4858,7 +4947,7 @@ class TestClass : public TestFixture {
                    "    std::swap<float>(delays_[index1], delays_[index2]);\n"
                    "}\n"
                    "float delays_[4];\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct DelayBase {\n"
@@ -4866,7 +4955,7 @@ class TestClass : public TestFixture {
                    "        return delays_[index1];\n"
                    "    }\n"
                    "    float delays_[4];\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style, inconclusive) Technically the member function 'DelayBase::swapSpecificDelays' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4884,7 +4973,7 @@ class TestClass : public TestFixture {
                    "    if( m_d != 0 )\n"
                    "        return m_iRealVal / m_d;\n"
                    "    return dRet;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:12] -> [test.cpp:9:12]: (style, inconclusive) Technically the member function 'A::dGetValue' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4901,7 +4990,7 @@ class TestClass : public TestFixture {
                    "        x=xPos;\n"
                    "        y=yPos;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class AA : public P {\n"
@@ -4911,7 +5000,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        UnknownScope::x = x_;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class AA {\n"
@@ -4921,7 +5010,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        UnknownScope::x = x_;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:17]: (style) The member function 'AA::vSetXPos' can be static. [functionStatic]\n", errout_str());
 
     }
@@ -4946,7 +5035,7 @@ class TestClass : public TestFixture {
                    "char* test::get()\n"
                    "{\n"
                    "  return value_;\n"
-                   "}");
+                   "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4961,7 +5050,7 @@ class TestClass : public TestFixture {
                    "    int get() {\n"
                    "        return a;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:7:9]: (style, inconclusive) Technically the member function 'Derived::get' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Base1 {\n"
@@ -4980,7 +5069,7 @@ class TestClass : public TestFixture {
                    "    int getB() {\n"
                    "        return b;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:11:9]: (style, inconclusive) Technically the member function 'Derived::getA' can be const. [functionConst]\n"
                       "[test.cpp:14:9]: (style, inconclusive) Technically the member function 'Derived::getB' can be const. [functionConst]\n", errout_str());
 
@@ -4994,7 +5083,7 @@ class TestClass : public TestFixture {
                    "    int get() {\n"
                    "        return a;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:8:9]: (style, inconclusive) Technically the member function 'Derived2::get' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Base {\n"
@@ -5009,7 +5098,7 @@ class TestClass : public TestFixture {
                    "    int get() {\n"
                    "        return a;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:10:9]: (style, inconclusive) Technically the member function 'Derived4::get' can be const. [functionConst]\n", errout_str());
 
         // check for false positives
@@ -5022,7 +5111,7 @@ class TestClass : public TestFixture {
                    "    int get() const {\n"
                    "        return a;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Base1 {\n"
@@ -5041,7 +5130,7 @@ class TestClass : public TestFixture {
                    "    int getB() const {\n"
                    "        return b;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Base {\n"
@@ -5054,7 +5143,7 @@ class TestClass : public TestFixture {
                    "    int get() const {\n"
                    "        return a;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Base {\n"
@@ -5069,7 +5158,7 @@ class TestClass : public TestFixture {
                    "    int get() const {\n"
                    "        return a;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5079,7 +5168,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    int a;\n"
                    "    int get() { return a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (style, inconclusive) Technically the member function 'Fred::get' can be const. [functionConst]\n", errout_str());
     }
 
@@ -5088,7 +5177,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    std::string a[10];\n"
                    "    void seta() { a[0] = \"\"; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5096,7 +5185,7 @@ class TestClass : public TestFixture {
         checkConst("class derived : public base {\n"
                    "public:\n"
                    "    void f(){}\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Either there is a missing 'override', or the member function 'derived::f' can be static. [functionStatic]\n", errout_str());
     }
 
@@ -5105,7 +5194,7 @@ class TestClass : public TestFixture {
                    "    void init(Foo * foo) {\n"
                    "        foo.bar = this;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5124,7 +5213,7 @@ class TestClass : public TestFixture {
                    "                int getResourceName() { return var; }\n"
                    "                int var;\n"
                    "        };\n"
-                   "}");
+                   "}\n");
         ASSERT_EQUALS("[test.cpp:12:21]: (style, inconclusive) Technically the member function 'N::Derived::getResourceName' can be const. [functionConst]\n", errout_str());
 
         checkConst("namespace N\n"
@@ -5136,7 +5225,7 @@ class TestClass : public TestFixture {
                    "                int var;\n"
                    "        };\n"
                    "}\n"
-                   "int N::Base::getResourceName() { return var; }");
+                   "int N::Base::getResourceName() { return var; }\n");
         ASSERT_EQUALS("[test.cpp:6:21] -> [test.cpp:10:14]: (style, inconclusive) Technically the member function 'N::Base::getResourceName' can be const. [functionConst]\n", errout_str());
 
         checkConst("namespace N\n"
@@ -5151,7 +5240,7 @@ class TestClass : public TestFixture {
                    "namespace N\n"
                    "{\n"
                    "        int Base::getResourceName() { return var; }\n"
-                   "}");
+                   "}\n");
         ASSERT_EQUALS("[test.cpp:6:21] -> [test.cpp:12:19]: (style, inconclusive) Technically the member function 'N::Base::getResourceName' can be const. [functionConst]\n", errout_str());
 
         checkConst("namespace N\n"
@@ -5164,7 +5253,7 @@ class TestClass : public TestFixture {
                    "        };\n"
                    "}\n"
                    "using namespace N;\n"
-                   "int Base::getResourceName() { return var; }");
+                   "int Base::getResourceName() { return var; }\n");
         ASSERT_EQUALS("[test.cpp:6:21] -> [test.cpp:11:11]: (style, inconclusive) Technically the member function 'N::Base::getResourceName' can be const. [functionConst]\n", errout_str());
     }
 
@@ -5176,7 +5265,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        m_MaxQueueSize = a_MaxQueueSize;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5191,7 +5280,7 @@ class TestClass : public TestFixture {
                    "    }\n"
                    "private:\n"
                    "    std::string m_str;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:5:17]: (style, inconclusive) Technically the member function 'A::operator+' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Fred\n"
@@ -5205,7 +5294,7 @@ class TestClass : public TestFixture {
                    "    bool isValid() {\n"
                    "        return (x == 0x11224488);\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:9:10]: (style, inconclusive) Technically the member function 'Fred::isValid' can be const. [functionConst]\n", errout_str());
     }
 
@@ -5221,7 +5310,7 @@ class TestClass : public TestFixture {
                    "void Foo::MyMethod()\n"
                    "{\n"
                    "    (*oArq) << \"</table>\";\n"
-                   "}");
+                   "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5241,7 +5330,7 @@ class TestClass : public TestFixture {
                    "int * Foo::f()\n"
                    "{\n"
                    "    return p;\n"
-                   "}");
+                   "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -5258,7 +5347,7 @@ class TestClass : public TestFixture {
                    "   {\n"
                    "      pView = aView;\n"
                    "   }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -5272,7 +5361,7 @@ class TestClass : public TestFixture {
                    "   {\n"
                    "      m_name = name;\n"
                    "   }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -5284,7 +5373,7 @@ class TestClass : public TestFixture {
                    "   {\n"
                    "      pNum = apNum;\n"
                    "   }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -5299,7 +5388,7 @@ class TestClass : public TestFixture {
                    "   {\n"
                    "      pNum = apNum;\n"
                    "   }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -5316,7 +5405,7 @@ class TestClass : public TestFixture {
                    "   {\n"
                    "      pNum = apNum;\n"
                    "   }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -5334,7 +5423,7 @@ class TestClass : public TestFixture {
                    "   {\n"
                    "      pNum = apNum;\n"
                    "   }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -5348,7 +5437,7 @@ class TestClass : public TestFixture {
                    "};\n"
                    "bool Fred::f(Fred::AB * ab)\n"
                    "{\n"
-                   "}");
+                   "}\n");
 
         ASSERT_EQUALS("[test.cpp:5:10] -> [test.cpp:7:12]: (style) The member function 'Fred::f' can be static. [functionStatic]\n", errout_str());
 
@@ -5362,7 +5451,7 @@ class TestClass : public TestFixture {
                    "};\n"
                    "bool Fred::f(Fred::AB::CD * cd)\n"
                    "{\n"
-                   "}");
+                   "}\n");
 
         ASSERT_EQUALS("[test.cpp:7:10] -> [test.cpp:9:12]: (style) The member function 'Fred::f' can be static. [functionStatic]\n", errout_str());
 
@@ -5378,7 +5467,7 @@ class TestClass : public TestFixture {
                    "    bool Fred::f(Fred::AB::CD * cd)\n"
                    "    {\n"
                    "    }\n"
-                   "}");
+                   "}\n");
 
         ASSERT_EQUALS("[test.cpp:8:14] -> [test.cpp:10:16]: (style) The member function 'NS::Fred::f' can be static. [functionStatic]\n", errout_str());
 
@@ -5394,7 +5483,7 @@ class TestClass : public TestFixture {
                    "}\n"
                    "bool NS::Fred::f(NS::Fred::AB::CD * cd)\n"
                    "{\n"
-                   "}");
+                   "}\n");
 
         ASSERT_EQUALS("[test.cpp:8:14] -> [test.cpp:11:16]: (style) The member function 'NS::Fred::f' can be static. [functionStatic]\n", errout_str());
 
@@ -5410,7 +5499,7 @@ class TestClass : public TestFixture {
                    "};\n"
                    "bool Foo::Fred::f(Foo::Fred::AB::CD * cd)\n"
                    "{\n"
-                   "}");
+                   "}\n");
 
         ASSERT_EQUALS("[test.cpp:8:14] -> [test.cpp:11:17]: (style) The member function 'Foo::Fred::f' can be static. [functionStatic]\n", errout_str());
     }
@@ -5425,7 +5514,7 @@ class TestClass : public TestFixture {
                    "void A::foo( AA::BB::CC::DD b )\n"
                    "{\n"
                    "    a = b;\n"
-                   "}");
+                   "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -5449,7 +5538,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        a = b;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -5469,7 +5558,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        a = b;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5482,7 +5571,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        return 0 != (bOn = bOn);\n"
                    "    }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -5499,7 +5588,7 @@ class TestClass : public TestFixture {
                    "        {\n"
                    "        }\n"
                    "    };\n"
-                   "}");
+                   "}\n");
 
         ASSERT_EQUALS("[test.cpp:8:13]: (style) The member function 'tools::WorkspaceControl::toGrid' can be static. [functionStatic]\n", errout_str());
     }
@@ -5514,7 +5603,7 @@ class TestClass : public TestFixture {
                    "    int fun2() {\n"
                    "        b++;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("[test.cpp:3:9]: (style) The member function 'Altren::fun1' can be static. [functionStatic]\n"
                       "[test.cpp:7:9]: (style) The member function 'Altren::fun2' can be static. [functionStatic]\n", errout_str());
@@ -5526,7 +5615,7 @@ class TestClass : public TestFixture {
                    "  void foo() { delete this; }\n"
                    "  void foo(int i) const { }\n"
                    "  void bar() { foo(); }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("[test.cpp:4:8]: (style) The member function 'Altren::foo' can be static. [functionStatic]\n", errout_str());
 
@@ -5535,7 +5624,7 @@ class TestClass : public TestFixture {
                    "  void foo() { delete this; }\n"
                    "  void foo(int i) const { }\n"
                    "  void bar() { foo(1); }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("[test.cpp:4:8]: (style) The member function 'Altren::foo' can be static. [functionStatic]\n"
                       "[test.cpp:5:8]: (style, inconclusive) Technically the member function 'Altren::bar' can be const. [functionConst]\n", errout_str());
@@ -5558,7 +5647,7 @@ class TestClass : public TestFixture {
                    "};\n"
                    "bool TextIterator::setTagColour() {\n"
                    "    mSave = mCurrent;\n"
-                   "}");
+                   "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -5573,7 +5662,7 @@ class TestClass : public TestFixture {
                    "         {\n"
                    "             return _hash[key];\n"
                    "         }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5588,7 +5677,7 @@ class TestClass : public TestFixture {
                    "{\n"
                    "        if (mTileSize.height > 0) return;\n"
                    "        if (mEmptyView) return;\n"
-                   "}");
+                   "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -5602,7 +5691,7 @@ class TestClass : public TestFixture {
                    "    void SetSection(uint num) { pesdata()[6] = num; }\n"
                    "private:\n"
                    "    unsigned char *_pesdata;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class PESPacket {\n"
@@ -5617,7 +5706,7 @@ class TestClass : public TestFixture {
                    "{\n"
                    "public:\n"
                    "    void SetSection(uint num) { pesdata()[6] = num; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5627,7 +5716,7 @@ class TestClass : public TestFixture {
                    "    void DoSomethingElse() { DoSomething(bar); }\n"
                    "private:\n"
                    "    int bar;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) The member function 'foo::DoSomething' can be static. [functionStatic]\n", errout_str());
     }
 
@@ -5643,7 +5732,7 @@ class TestClass : public TestFixture {
                    "  public:\n"
                    "    B() {};\n"
                    "    bool One(bool b = false) { return false; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5651,7 +5740,7 @@ class TestClass : public TestFixture {
         checkConst("class Example {\n"
                    "  public:\n"
                    "    void Clear(void) { Example tmp; (*this) = tmp; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5661,7 +5750,7 @@ class TestClass : public TestFixture {
                    "    MyObject() : tmp(0) {}\n"
                    "public:\n"
                    "    void set(std::stringstream &in) { in >> tmp; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5671,7 +5760,7 @@ class TestClass : public TestFixture {
                    "    void foo(int x) {\n"
                    "    switch (x) { }\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'MyObject::foo' can be static. [functionStatic]\n", errout_str());
 
         checkConst("class A\n"
@@ -5711,7 +5800,7 @@ class TestClass : public TestFixture {
                    "    }\n"
                    "\n"
                    "    return RET_NOK;\n"
-                   "}");
+                   "}\n");
         ASSERT_EQUALS("[test.cpp:4:24] -> [test.cpp:9:19]: (style) The member function 'A::f' can be static. [functionStatic]\n", errout_str());
 
         checkConst("class MyObject {\n"
@@ -5719,7 +5808,7 @@ class TestClass : public TestFixture {
                    "    void foo(int x) {\n"
                    "    for (int i = 0; i < 5; i++) { }\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'MyObject::foo' can be static. [functionStatic]\n", errout_str());
     }
 
@@ -5744,7 +5833,7 @@ class TestClass : public TestFixture {
                    "  }\n"
                    "private:\n"
                    "  MyGUI::IntCoord mCoordValue;\n"
-                   "};");
+                   "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:7:13]: (style) The member function 'MyGUI::types::TCoord::size' can be static. [functionStatic]\n"
                            "[test.cpp:15]: (style, inconclusive) Technically the member function 'SelectorControl::getSize' can be const.\n",
                            "[test.cpp:7:13]: (style) The member function 'MyGUI::types::TCoord::size' can be static. [functionStatic]\n", errout_str());
@@ -5754,7 +5843,7 @@ class TestClass : public TestFixture {
                    "    void foo(Foo f) {\n"
                    "        b.run();\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct Bar {\n"
@@ -5766,7 +5855,7 @@ class TestClass : public TestFixture {
                    "    void foo(Foo f) {\n"
                    "        b.run();\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct Bar {\n"
@@ -5777,7 +5866,7 @@ class TestClass : public TestFixture {
                    "    void foo(Foo f) {\n"
                    "        b.run();\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) The member function 'Bar::run' can be static. [functionStatic]\n"
                       "[test.cpp:6:10]: (style, inconclusive) Technically the member function 'Foo::foo' can be const. [functionConst]\n", errout_str());
     }
@@ -5787,14 +5876,14 @@ class TestClass : public TestFixture {
                    "    void foo(Foo f) {\n"
                    "        f.clear();\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) The member function 'MyObject::foo' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct MyObject {\n"
                    "    int foo(Foo f) {\n"
                    "        return f.length();\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) The member function 'MyObject::foo' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct MyObject {\n"
@@ -5802,7 +5891,7 @@ class TestClass : public TestFixture {
                    "    int foo() {\n"
                    "        return f.length();\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct MyObject {\n"
@@ -5810,7 +5899,7 @@ class TestClass : public TestFixture {
                    "    int foo() {\n"
                    "        return f.length();\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style, inconclusive) Technically the member function 'MyObject::foo' can be const. [functionConst]\n", errout_str());
     }
 
@@ -5822,7 +5911,7 @@ class TestClass : public TestFixture {
                    "protected:\n"
                    "    int   re;\n"
                    "    int   im;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5837,7 +5926,7 @@ class TestClass : public TestFixture {
                    "    MyString append( const MyString& str )\n"
                    "    {       return operator+=( str ); }\n"
                    "    char *m_ptr;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
         checkConst("class MyString {\n"
                    "public:\n"
@@ -5846,7 +5935,7 @@ class TestClass : public TestFixture {
                    "    MyString append( const MyString& str )\n"
                    "    {       return operator+=( str ); }\n"
                    "    char *m_ptr;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5857,14 +5946,14 @@ class TestClass : public TestFixture {
                    "};\n"
                    "int MixerParticipant::GetAudioFrame() {\n"
                    "    return 0;\n"
-                   "}");
+                   "}\n");
 
         // this code is invalid so a false negative is OK
         checkConst("class MixerParticipant : public MixerParticipant {\n"
                    "    bool InitializeFileReader() {\n"
                    "       printf(\"music\");\n"
                    "    }\n"
-                   "};");
+                   "};\n");
 
         // Based on an example from SVN source code causing an endless recursion within CheckClass::isConstMemberFunc()
         // A more complete example including a template declaration like
@@ -5897,7 +5986,7 @@ class TestClass : public TestFixture {
                    "         {\n"
                    "             return _hash[key];\n"
                    "         }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5908,7 +5997,7 @@ class TestClass : public TestFixture {
                    "         std::string* p = &s;\n"
                    "         p->clear();\n"
                    "     }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A {\n"
@@ -5917,7 +6006,7 @@ class TestClass : public TestFixture {
                    "         std::string& r = s;\n"
                    "         r.clear();\n"
                    "     }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A {\n"
@@ -5926,7 +6015,7 @@ class TestClass : public TestFixture {
                    "         std::string& r = sth; r = s;\n"
                    "         r.clear();\n"
                    "     }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'A::clear' can be const. [functionConst]\n", errout_str());
 
         checkConst("struct A {\n"
@@ -5935,7 +6024,7 @@ class TestClass : public TestFixture {
                    "         const std::string* p = &s;\n"
                    "         p->somefunction();\n"
                    "     }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'A::clear' can be const. [functionConst]\n", errout_str());
 
         checkConst("struct A {\n"
@@ -5944,7 +6033,7 @@ class TestClass : public TestFixture {
                    "         const std::string& r = s;\n"
                    "         r.somefunction();\n"
                    "     }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'A::clear' can be const. [functionConst]\n", errout_str());
     }
 
@@ -5959,7 +6048,7 @@ class TestClass : public TestFixture {
                    "        }\n"
                    "        ::B::D::DKIPtr membervariable;\n"
                    "    };\n"
-                   "}");
+                   "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5978,7 +6067,7 @@ class TestClass : public TestFixture {
                    "    TemplateClass<int> a;\n"
                    "    TemplateClass<float> b;\n"
                    "    return 0;\n"
-                   "}");
+                   "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5988,7 +6077,7 @@ class TestClass : public TestFixture {
                    "    void f(int v) { g((char *) &v); }\n"
                    "    void g(char *) { n++; }\n"
                    "    int n;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6002,7 +6091,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    const std::list<std::shared_ptr<int>>& get() { return m_test.m_list; }\n"
                    "    TestList<std::shared_ptr<int>> m_test;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:8:44]: (style, inconclusive) Technically the member function 'Test::get' can be const. [functionConst]\n", errout_str());
     }
 
@@ -6032,7 +6121,7 @@ class TestClass : public TestFixture {
                    "        call();\n"
                    "        call<int>(1, 2, 3);\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6045,7 +6134,7 @@ class TestClass : public TestFixture {
                    "    void test() {\n"
                    "        call(1, 2);\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6180,7 +6269,7 @@ class TestClass : public TestFixture {
                    "    void bar(void) {\n"
                    "        for(std::vector<std::string>::const_iterator it = m_str.begin(); it != m_str.end(); ++it) {;}\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (style, inconclusive) Technically the member function 'A::bar' can be const. [functionConst]\n", errout_str());
 
         // Don't crash
@@ -6731,6 +6820,7 @@ class TestClass : public TestFixture {
                    "struct S<0> {};\n"
                    "struct D : S<150> {};\n");
         // don't hang
+        ignore_errout();
     }
 
     void const93() { // #12162
@@ -6785,6 +6875,52 @@ class TestClass : public TestFixture {
                    "    B::g(0);\n"
                    "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        checkConst("struct S {\n" // #14366
+                   "    void f();\n"
+                   "};\n"
+                   "struct T : U {\n"
+                   "    void g(S* s) {\n"
+                   "        s->f();\n"
+                   "    }\n"
+                   "    void h() {\n"
+                   "        S s;\n"
+                   "        s.f();\n"
+                   "    }\n"
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:5:10]: (style) Either there is a missing 'override', or the member function 'T::g' can be static. [functionStatic]\n"
+                      "[test.cpp:8:10]: (style) Either there is a missing 'override', or the member function 'T::h' can be static. [functionStatic]\n",
+                      errout_str());
+
+        checkConst("enum E { E0 };\n"
+                   "int f();\n"
+                   "struct S : U {\n"
+                   "    E g() {\n"
+                   "        return E0;\n"
+                   "    }\n"
+                   "    int h() {\n"
+                   "        return f();\n"
+                   "    }\n"
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:4:7]: (style) Either there is a missing 'override', or the member function 'S::g' can be static. [functionStatic]\n"
+                      "[test.cpp:7:9]: (style) Either there is a missing 'override', or the member function 'S::h' can be static. [functionStatic]\n",
+                      errout_str());
+
+        checkConst("namespace N {\n" // #14391
+                   "    void f();\n"
+                   "}\n"
+                   "struct S : U {\n"
+                   "    void g() { N::f(); }\n"
+                   "    void h() { ::N::f(); }\n"
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:5:10]: (style) Either there is a missing 'override', or the member function 'S::g' can be static. [functionStatic]\n"
+                      "[test.cpp:6:10]: (style) Either there is a missing 'override', or the member function 'S::h' can be static. [functionStatic]\n",
+                      errout_str());
+
+        checkConst("struct S : U {\n" // #14425
+                   "    void f() { this->g(); }\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const97() { // #13301
@@ -6918,6 +7054,83 @@ class TestClass : public TestFixture {
         ASSERT_EQUALS("", errout_str()); // don't crash
     }
 
+    void const101() {
+        checkConst("struct error {\n" // #14450
+                   "    error() = default;\n"
+                   "};\n"
+                   "struct S : U {\n"
+                   "    int f() { return this->error(); }\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkConst("struct S {\n" // #14702
+                   "    int i;\n"
+                   "    void f() {\n"
+                   "        S& r = *this;\n"
+                   "        r.i = 0;\n"
+                   "    }\n"
+                   "};\n"
+                   "struct T : std::array<int, 5> {\n"
+                   "    void g() {\n"
+                   "        for (int& r : *this)\n"
+                   "            r = 0;\n"
+                   "    }\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkConst("struct A {\n" // #9981
+                   "    int a = 0;\n"
+                   "    auto operator[](int x) -> int& {\n"
+                   "        a = 1;\n"
+                   "        return a;\n"
+                   "    }\n"
+                   "    int f() {\n"
+                   "        return (*this)[0];\n"
+                   "    }\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void const102() {
+        checkConst("struct S {\n" // #14888
+                   "    void f() {\n"
+                   "        int *p = a;\n"
+                   "        *p = 0;\n"
+                   "    }\n"
+                   "    void g() {\n"
+                   "        const int *p = a;\n"
+                   "        if (*p) {}\n"
+                   "    }\n"
+                   "    int a[3];\n"
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:6:10]: (style, inconclusive) Technically the member function 'S::g' can be const. [functionConst]\n",
+                      errout_str());
+    }
+
+    void const103() {
+        checkConst("constexpr int BITS{4};\n"
+                   "struct Struct {\n"
+                   "  unsigned int data() const { return m_data; }\n"
+                   "  unsigned int m_data : BITS;\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void const104() { // #15104
+        checkConst("struct DS;\n"
+                   "void select(int a, int b);\n"
+                   "class Query {\n"
+                   "    int m = 0;\n"
+                   "public:\n"
+                   "    template <typename Callback>\n"
+                   "    int select(DS &ds, Callback cb) { cb(m); return 0; }\n"
+                   "    template <typename Callback>\n"
+                   "    int select(DS *ds, Callback cb) { return select(*ds, cb); }\n"
+                   "    int select(DS &ds) { return select(ds, [](int) {}); }\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void const_handleDefaultParameters() {
         checkConst("struct Foo {\n"
                    "    void foo1(int i, int j = 0) {\n"
@@ -6947,7 +7160,7 @@ class TestClass : public TestFixture {
                    "    int bar6() {\n"
                    "        return foo3();\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:11:9]: (style) The member function 'Foo::bar3' can be static. [functionStatic]\n"
                       "[test.cpp:14:9]: (style) The member function 'Foo::bar4' can be static. [functionStatic]\n", errout_str());
     }
@@ -6958,7 +7171,7 @@ class TestClass : public TestFixture {
                    "        Bar b;\n"
                    "        b.takeFoo(this);\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct Foo {\n"
@@ -6966,7 +7179,7 @@ class TestClass : public TestFixture {
                    "        Foo f;\n"
                    "        f.foo();\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) The member function 'Foo::foo' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct A;\n" // #5839 - operator()
@@ -6977,7 +7190,7 @@ class TestClass : public TestFixture {
                    "    void dostuff() {\n"
                    "        B()(this);\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6989,7 +7202,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        v = 0;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7001,7 +7214,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        v[0] = \"Happy new year!\";\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7010,49 +7223,49 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return ++a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return --a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a++; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a--; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return ++a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return --a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return a++; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return a--; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct S {\n" // #10077
@@ -7068,61 +7281,61 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a-=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a+=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a*=-1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a/=-2; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return a=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return a-=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return a+=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return a*=-1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return a/=-2; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
     }
 
@@ -7130,90 +7343,90 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    struct A { int a; } s;\n"
                    "    void nextA() { return s.a=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    struct A { int a; } s;\n"
                    "    void nextA() { return s.a-=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    struct A { int a; } s;\n"
                    "    void nextA() { return s.a+=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    struct A { int a; } s;\n"
                    "    void nextA() { return s.a*=-1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A { int a; } s;\n"
                    "class Fred {\n"
                    "    void nextA() { return s.a=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct A { int a; } s;\n"
                    "class Fred {\n"
                    "    void nextA() { return s.a-=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct A { int a; } s;\n"
                    "class Fred {\n"
                    "    void nextA() { return s.a+=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct A { int a; } s;\n"
                    "class Fred {\n"
                    "    void nextA() { return s.a*=-1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct A { int a; } s;\n"
                    "class Fred {\n"
                    "    void nextA() { return s.a/=-2; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct A { int a; };\n"
                    "class Fred {\n"
                    "    A s;\n"
                    "    void nextA() { return s.a=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A { int a; };\n"
                    "class Fred {\n"
                    "    A s;\n"
                    "    void nextA() { return s.a-=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A { int a; };\n"
                    "class Fred {\n"
                    "    A s;\n"
                    "    void nextA() { return s.a+=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A { int a; };\n"
                    "class Fred {\n"
                    "    A s;\n"
                    "    void nextA() { return s.a*=-1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A { int a; };\n"
                    "class Fred {\n"
                    "    A s;\n"
                    "    void nextA() { return s.a/=-2; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7222,49 +7435,49 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return ++a[0]; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return --a[0]; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]++; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]--; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return ++a[0]; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return --a[0]; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return a[0]++; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return a[0]--; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
     }
 
@@ -7272,61 +7485,61 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]-=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]+=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]*=-1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]/=-2; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return a[0]=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return a[0]-=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return a[0]+=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return a[0]*=-1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return a[0]/=-2; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
     }
 
@@ -7335,8 +7548,8 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    int &getR() { return a; }\n"
-                   "    int *getP() { return &a; }"
-                   "};");
+                   "    int *getP() { return &a; }\n"
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7345,7 +7558,7 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int *a;\n"
                    "    void clean() { delete a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7353,14 +7566,14 @@ class TestClass : public TestFixture {
     void constLPVOID() {
         checkConst("class Fred {\n"
                    "    UNKNOWN a() { return 0; };\n"
-                   "};");
+                   "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:2]: (style) The member function 'Fred::a' can be static.\n", "", errout_str());
 
         // #1579 - HDC
         checkConst("class Fred {\n"
                    "    foo bar;\n"
                    "    UNKNOWN a() { return b; };\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7369,7 +7582,7 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    void f() const { };\n"
                    "    void a() { f(); };\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) The member function 'Fred::f' can be static. [functionStatic]\n"
                       "[test.cpp:3:10]: (style, inconclusive) Technically the member function 'Fred::a' can be const. [functionConst]\n", errout_str());
 
@@ -7380,7 +7593,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "   A(){}\n"
                    "   unsigned int GetVecSize()  {return m_v.size();}\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:6:17]: (style, inconclusive) Technically the member function 'A::GetVecSize' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A\n"
@@ -7389,7 +7602,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "   A(){}\n"
                    "   bool GetVecEmpty()  {return m_v.empty();}\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:6:9]: (style, inconclusive) Technically the member function 'A::GetVecEmpty' can be const. [functionConst]\n", errout_str());
     }
 
@@ -7401,7 +7614,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "   B() : b(0) { }\n"
                    "   int func() { return b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:6:8]: (style, inconclusive) Technically the member function 'B::func' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A { };\n"
@@ -7411,7 +7624,7 @@ class TestClass : public TestFixture {
                    "   B() : b(0) { }\n"
                    "   int func();\n"
                    "};\n"
-                   "int B::func() { return b; }");
+                   "int B::func() { return b; }\n");
         ASSERT_EQUALS("[test.cpp:6:8] -> [test.cpp:8:8]: (style, inconclusive) Technically the member function 'B::func' can be const. [functionConst]\n", errout_str());
 
         // base class has no virtual function
@@ -7424,7 +7637,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    B() : b(0) { }\n"
                    "    int func() { return b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:9:9]: (style, inconclusive) Technically the member function 'B::func' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -7437,7 +7650,7 @@ class TestClass : public TestFixture {
                    "    B() : b(0) { }\n"
                    "    int func();\n"
                    "};\n"
-                   "int B::func() { return b; }");
+                   "int B::func() { return b; }\n");
         ASSERT_EQUALS("[test.cpp:9:9] -> [test.cpp:11:8]: (style, inconclusive) Technically the member function 'B::func' can be const. [functionConst]\n", errout_str());
 
         // base class has virtual function
@@ -7450,7 +7663,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    B() : b(0) { }\n"
                    "    int func() { return b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
@@ -7463,7 +7676,7 @@ class TestClass : public TestFixture {
                    "    B() : b(0) { }\n"
                    "    int func();\n"
                    "};\n"
-                   "int B::func() { return b; }");
+                   "int B::func() { return b; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
@@ -7476,7 +7689,7 @@ class TestClass : public TestFixture {
                    "    B() : b(0) { }\n"
                    "    int func();\n"
                    "};\n"
-                   "int B::func() { return b; }");
+                   "int B::func() { return b; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // base class has no virtual function
@@ -7497,7 +7710,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    C() : c(0) { }\n"
                    "    int func() { return c; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (style, inconclusive) Technically the member function 'A::func' can be const. [functionConst]\n"
                       "[test.cpp:11:9]: (style, inconclusive) Technically the member function 'B::func' can be const. [functionConst]\n"
                       "[test.cpp:17:9]: (style, inconclusive) Technically the member function 'C::func' can be const. [functionConst]\n", errout_str());
@@ -7522,7 +7735,7 @@ class TestClass : public TestFixture {
                    "    C() : c(0) { }\n"
                    "    int func();\n"
                    "};\n"
-                   "int C::func() { return c; }");
+                   "int C::func() { return c; }\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:7:8]: (style, inconclusive) Technically the member function 'A::func' can be const. [functionConst]\n"
                       "[test.cpp:12:9] -> [test.cpp:14:8]: (style, inconclusive) Technically the member function 'B::func' can be const. [functionConst]\n"
                       "[test.cpp:19:9] -> [test.cpp:21:8]: (style, inconclusive) Technically the member function 'C::func' can be const. [functionConst]\n", errout_str());
@@ -7545,7 +7758,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    C() : c(0) { }\n"
                    "    int func() { return c; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
@@ -7568,7 +7781,7 @@ class TestClass : public TestFixture {
                    "    C() : c(0) { }\n"
                    "    int func();\n"
                    "};\n"
-                   "int C::func() { return c; }");
+                   "int C::func() { return c; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #1311
@@ -7589,7 +7802,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    Z(int x, int y, int z) : Y(x, y), z(z) { }\n"
                    "    int getZ() { return z; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (style, inconclusive) Technically the member function 'X::getX' can be const. [functionConst]\n"
                       "[test.cpp:11:9]: (style, inconclusive) Technically the member function 'Y::getY' can be const. [functionConst]\n"
                       "[test.cpp:17:9]: (style, inconclusive) Technically the member function 'Z::getZ' can be const. [functionConst]\n", errout_str());
@@ -7614,7 +7827,7 @@ class TestClass : public TestFixture {
                    "    Z(int x, int y, int z) : Y(x, y), z(z) { }\n"
                    "    int getZ();\n"
                    "};\n"
-                   "int Z::getZ() { return z; }");
+                   "int Z::getZ() { return z; }\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:7:8]: (style, inconclusive) Technically the member function 'X::getX' can be const. [functionConst]\n"
                       "[test.cpp:12:9] -> [test.cpp:14:8]: (style, inconclusive) Technically the member function 'Y::getY' can be const. [functionConst]\n"
                       "[test.cpp:19:9] -> [test.cpp:21:8]: (style, inconclusive) Technically the member function 'Z::getZ' can be const. [functionConst]\n", errout_str());
@@ -7628,7 +7841,7 @@ class TestClass : public TestFixture {
                             //"        i = 4;\n"
                             //"endif\n"
                             "    }\n"
-                            "};";
+                            "};\n";
 
         checkConst(code);
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'foo::f' can be static. [functionStatic]\n", errout_str());
@@ -7640,7 +7853,7 @@ class TestClass : public TestFixture {
     void constFriend() { // ticket #1921
         const char code[] = "class foo {\n"
                             "    friend void f() { }\n"
-                            "};";
+                            "};\n";
         checkConst(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -7655,7 +7868,7 @@ class TestClass : public TestFixture {
                    "    void setf(float x) {\n"
                    "        d.f = x;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7672,7 +7885,7 @@ class TestClass : public TestFixture {
                    "    T c() {\n"
                    "        return y[1][6];\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:10:7]: (style, inconclusive) Technically the member function 'foo::c' can be const. [functionConst]\n", errout_str());
     }
 
@@ -7692,8 +7905,21 @@ class TestClass : public TestFixture {
                    "        for (decltype(auto) e : array)\n"
                    "            foo(e);\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:8:10]: (style, inconclusive) Technically the member function 'Fred::f2' can be const. [functionConst]\n", errout_str());
+
+        checkConst("struct T {\n" // #14390
+                   "    std::vector<int*> v;\n"
+                   "    void f() {\n"
+                   "        for (const auto& p : v)\n"
+                   "            *p = 0;\n"
+                   "    }\n"
+                   "    void g() {\n"
+                   "        for (auto* p : v)\n"
+                   "            *p = 0;\n"
+                   "    }\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const_shared_ptr() { // #8674
@@ -7704,7 +7930,7 @@ class TestClass : public TestFixture {
                    "     std::shared_ptr<Data> data;\n"
                    "};\n"
                    "\n"
-                   "std::shared_ptr<Data> Fred::getData() { return data; }");
+                   "std::shared_ptr<Data> Fred::getData() { return data; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7712,7 +7938,7 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "public:\n"
                    "    const char *const *data;\n"
-                   "    const char *const *getData() { return data; }\n}");
+                   "    const char *const *getData() { return data; }\n}\n");
         ASSERT_EQUALS("[test.cpp:4:24]: (style, inconclusive) Technically the member function 'Fred::getData' can be const. [functionConst]\n", errout_str());
     }
 
@@ -7720,7 +7946,7 @@ class TestClass : public TestFixture {
         checkConst("struct A {\n"
                    "    int x = 1;\n"
                    "    auto get() -> int & { return x; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7770,7 +7996,7 @@ class TestClass : public TestFixture {
         SimpleTokenizer tokenizer(settings2, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CheckClass checkClass(&tokenizer, &settings2, this);
+        CheckClassImpl checkClass(&tokenizer, settings2, *this);
         checkClass.initializerListOrder();
     }
 
@@ -7779,7 +8005,7 @@ class TestClass : public TestFixture {
                                   "    int a, b, c;\n"
                                   "public:\n"
                                   "    Fred() : c(0), b(0), a(0) { }\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:4:20] -> [test.cpp:2:12]: (style, inconclusive) Member variable 'Fred::b' is in the wrong place in the initializer list. [initializerList]\n"
                       "[test.cpp:4:26] -> [test.cpp:2:9]: (style, inconclusive) Member variable 'Fred::a' is in the wrong place in the initializer list. [initializerList]\n", errout_str());
 
@@ -7787,14 +8013,14 @@ class TestClass : public TestFixture {
                                   "    int a, b, c;\n"
                                   "public:\n"
                                   "    Fred() : c{0}, b{0}, a{0} { }\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:4:20] -> [test.cpp:2:12]: (style, inconclusive) Member variable 'Fred::b' is in the wrong place in the initializer list. [initializerList]\n"
                       "[test.cpp:4:26] -> [test.cpp:2:9]: (style, inconclusive) Member variable 'Fred::a' is in the wrong place in the initializer list. [initializerList]\n", errout_str());
 
         checkInitializerListOrder("struct S {\n"
                                   "    S() : b(a = 1) {}\n"
                                   "    int a, b;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("struct S {\n"
@@ -7817,7 +8043,7 @@ class TestClass : public TestFixture {
                                   "        : B(\"abc\", s.nRows(), s.nCols())\n"
                                   "        , m_i(_i)\n"
                                   "    {}\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7828,41 +8054,41 @@ class TestClass : public TestFixture {
                                   "    C() : b(&a) {}\n"
                                   "    B b;\n"
                                   "    const A a;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:4:11] -> [test.cpp:5:7]: (style, inconclusive) Member variable 'C::b' uses an uninitialized argument 'a' due to the order of declarations. [initializerList]\n",
                       errout_str());
 
         checkInitializerListOrder("struct S {\n"
                                   "    S(const std::string& f, std::string i, int b, int c) : a(0), b(b), c(c) {}\n"
                                   "    int a, b, c;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("struct S {\n"
                                   "    S() : p(a) {}\n"
                                   "    int* p;\n"
                                   "    int a[1];\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("struct S {\n"
                                   "    S() : p(&i) {}\n"
                                   "    int* p;\n"
                                   "    int i;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("struct S {\n"
                                   "    S() : a(b = 1) {}\n"
                                   "    int a, b;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("struct S {\n"
                                   "    S() : r(i) {}\n"
                                   "    int& r;\n"
                                   "    int i{};\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("struct B {\n"
@@ -7871,7 +8097,7 @@ class TestClass : public TestFixture {
                                   "struct D : B {\n"
                                   "    D() : B(), j(b) {}\n"
                                   "    int j;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("struct S {\n"
@@ -7879,13 +8105,13 @@ class TestClass : public TestFixture {
                                   "    int a;\n"
                                   "    static int i;\n"
                                   "};\n"
-                                  "int S::i = 0;");
+                                  "int S::i = 0;\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("struct S {\n"
                                   "    S(int b) : a(b) {}\n"
                                   "    int a, b{};\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("class Foo {\n" // #3524
@@ -7924,7 +8150,7 @@ class TestClass : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         checkClass.initializationListUsage();
     }
 
@@ -7935,113 +8161,113 @@ class TestClass : public TestFixture {
                                      "    int* b;\n" // No message for pointers: No performance gain
                                      "    Enum c;\n" // No message for enums: No performance gain
                                      "    Fred() { a = 0; b = 0; c = C; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::string s;\n"
                                      "    Fred() { a = 0; s = \"foo\"; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("[test.cpp:3:21]: (performance) Variable 's' is assigned in constructor body. Consider performing initialization in initialization list. [useInitializationList]\n", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::string& s;\n" // Message is invalid for references, since their initialization in initializer list is required anyway and behaves different from assignment (#5004)
                                      "    Fred(const std::string& s_) : s(s_) { s = \"foo\"; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::vector<int> v;\n"
                                      "    Fred() { v = unknown; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (performance) Variable 'v' is assigned in constructor body. Consider performing initialization in initialization list. [useInitializationList]\n", errout_str());
 
         checkInitializationListUsage("class C { std::string s; };\n"
                                      "class Fred {\n"
                                      "    C c;\n"
                                      "    Fred() { c = unknown; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (performance) Variable 'c' is assigned in constructor body. Consider performing initialization in initialization list. [useInitializationList]\n", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C c;\n"
                                      "    Fred() { c = unknown; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (performance) Variable 'c' is assigned in constructor body. Consider performing initialization in initialization list. [useInitializationList]\n", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C c;\n"
                                      "    Fred(Fred const & other) { c = other.c; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("[test.cpp:4:32]: (performance) Variable 'c' is assigned in constructor body. Consider performing initialization in initialization list. [useInitializationList]\n", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C c;\n"
                                      "    Fred(Fred && other) { c = other.c; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("[test.cpp:4:27]: (performance) Variable 'c' is assigned in constructor body. Consider performing initialization in initialization list. [useInitializationList]\n", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C a;\n"
                                      "    Fred() { initB(); a = b; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C a;\n"
                                      "    Fred() : a(0) { if(b) a = 0; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C a[5];\n"
                                      "    Fred() { for(int i = 0; i < 5; i++) a[i] = 0; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C a; int b;\n"
                                      "    Fred() : b(5) { a = b; }\n" // Don't issue a message here: You actually could move it to the initialization list, but it would cause problems if you change the order of the variable declarations.
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C a;\n"
                                      "    Fred() { try { a = new int; } catch(...) {} }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::string s;\n"
                                      "    Fred() { s = toString((size_t)this); }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::string a;\n"
                                      "    std::string foo();\n"
                                      "    Fred() { a = foo(); }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::string a;\n"
                                      "    Fred() { a = foo(); }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (performance) Variable 'a' is assigned in constructor body. Consider performing initialization in initialization list. [useInitializationList]\n", errout_str());
 
         checkInitializationListUsage("class Fred {\n" // #4332
                                      "    static std::string s;\n"
                                      "    Fred() { s = \"foo\"; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n" // #5640
@@ -8052,7 +8278,7 @@ class TestClass : public TestFixture {
                                      "        str[1] = 0;\n"
                                      "        s = str;\n"
                                      "    }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class B {\n" // #5640
@@ -8060,7 +8286,7 @@ class TestClass : public TestFixture {
                                      "    B(const B& other) : _d(std::make_shared<A>()) {\n"
                                      "        *_d = *other._d;\n"
                                      "    }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Bar {\n" // #8466
@@ -8069,7 +8295,7 @@ class TestClass : public TestFixture {
                                      "    explicit Bar(const char s) : s{s} {}\n"
                                      "private:\n"
                                      "    char s;\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("unsigned bar(std::string);\n" // #8291
@@ -8078,7 +8304,7 @@ class TestClass : public TestFixture {
                                      "    int a_, b_;\n"
                                      "    Foo(int a, int b) : a_(a), b_(b) {}\n"
                                      "    Foo(int a, const std::string& b) : Foo(a, bar(b)) {}\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n" // #8111
@@ -8088,7 +8314,7 @@ class TestClass : public TestFixture {
                                      "        ostr << x;\n"
                                      "        a = ostr.str();\n"
                                      "    }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // bailout: multi line lambda in rhs => do not warn
@@ -8099,7 +8325,7 @@ class TestClass : public TestFixture {
                                      "            return 1;\n"
                                      "        };\n"
                                      "    }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // don't warn if some other instance's members are assigned to
@@ -8108,7 +8334,7 @@ class TestClass : public TestFixture {
                                      "    C(C& c) : m_i(c.m_i) { c.m_i = (Foo)-1; }\n"
                                      "private:\n"
                                      "    Foo m_i;\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class A {\n" // #9821 - delegate constructor
@@ -8121,7 +8347,7 @@ class TestClass : public TestFixture {
                                      "\n"
                                      "private:\n"
                                      "    std::string st;\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("struct S {\n" // #14189
@@ -8136,7 +8362,7 @@ class TestClass : public TestFixture {
                                      "        p = std::make_unique<T>(s);\n"
                                      "    }\n"
                                      "    std::unique_ptr<T> p;\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -8148,7 +8374,7 @@ class TestClass : public TestFixture {
         SimpleTokenizer tokenizer(settings0, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CheckClass checkClass(&tokenizer, &settings0, this);
+        CheckClassImpl checkClass(&tokenizer, settings0, *this);
         (checkClass.checkSelfInitialization)();
     }
 
@@ -8157,14 +8383,14 @@ class TestClass : public TestFixture {
                                 "    int i;\n"
                                 "    Fred() : i(i) {\n"
                                 "    }\n"
-                                "};");
+                                "};\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Member variable 'i' is initialized by itself. [selfInitialization]\n", errout_str());
 
         checkSelfInitialization("class Fred {\n"
                                 "    int i;\n"
                                 "    Fred() : i{i} {\n"
                                 "    }\n"
-                                "};");
+                                "};\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Member variable 'i' is initialized by itself. [selfInitialization]\n", errout_str());
 
         checkSelfInitialization("class Fred {\n"
@@ -8172,7 +8398,7 @@ class TestClass : public TestFixture {
                                 "    Fred();\n"
                                 "};\n"
                                 "Fred::Fred() : i(i) {\n"
-                                "}");
+                                "}\n");
         ASSERT_EQUALS("[test.cpp:5:14]: (error) Member variable 'i' is initialized by itself. [selfInitialization]\n", errout_str());
 
         checkSelfInitialization("class A {\n" // #10427
@@ -8195,56 +8421,56 @@ class TestClass : public TestFixture {
                                 "    std::string s;\n"
                                 "    Fred() : s(s) {\n"
                                 "    }\n"
-                                "};");
+                                "};\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Member variable 's' is initialized by itself. [selfInitialization]\n", errout_str());
 
         checkSelfInitialization("class Fred {\n"
                                 "    int x;\n"
                                 "    Fred(int x);\n"
                                 "};\n"
-                                "Fred::Fred(int x) : x(x) { }");
+                                "Fred::Fred(int x) : x(x) { }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("class Fred {\n"
                                 "    int x;\n"
                                 "    Fred(int x);\n"
                                 "};\n"
-                                "Fred::Fred(int x) : x{x} { }");
+                                "Fred::Fred(int x) : x{x} { }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("class Fred {\n"
                                 "    std::string s;\n"
                                 "    Fred(const std::string& s) : s(s) {\n"
                                 "    }\n"
-                                "};");
+                                "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("class Fred {\n"
                                 "    std::string s;\n"
                                 "    Fred(const std::string& s) : s{s} {\n"
                                 "    }\n"
-                                "};");
+                                "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("struct Foo : Bar {\n"
                                 "    int i;\n"
                                 "    Foo(int i)\n"
                                 "        : Bar(\"\"), i(i) {}\n"
-                                "};");
+                                "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("struct Foo : std::Bar {\n" // #6073
                                 "    int i;\n"
                                 "    Foo(int i)\n"
                                 "        : std::Bar(\"\"), i(i) {}\n"
-                                "};");
+                                "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("struct Foo : std::Bar {\n" // #6073
                                 "    int i;\n"
                                 "    Foo(int i)\n"
                                 "        : std::Bar(\"\"), i{i} {}\n"
-                                "};");
+                                "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -8258,7 +8484,7 @@ class TestClass : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         checkClass.checkVirtualFunctionCallInConstructor();
     }
 
@@ -8269,21 +8495,21 @@ class TestClass : public TestFixture {
                                  "    A();\n"
                                  "};\n"
                                  "A::A()\n"
-                                 "{f();}");
+                                 "{f();}\n");
         ASSERT_EQUALS("[test.cpp:7:2] -> [test.cpp:3:17]: (style) Virtual function 'f' is called from constructor 'A()' at line 7. Dynamic binding is not used. [virtualCallInConstructor]\n", errout_str());
 
         checkVirtualFunctionCall("class A {\n"
                                  "    virtual int f();\n"
                                  "    A() {f();}\n"
                                  "};\n"
-                                 "int A::f() { return 1; }");
+                                 "int A::f() { return 1; }\n");
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:2:17]: (style) Virtual function 'f' is called from constructor 'A()' at line 3. Dynamic binding is not used. [virtualCallInConstructor]\n", errout_str());
 
         checkVirtualFunctionCall("class A : B {\n"
                                  "    int f() override;\n"
                                  "    A() {f();}\n"
                                  "};\n"
-                                 "int A::f() { return 1; }");
+                                 "int A::f() { return 1; }\n");
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:2:9]: (style) Virtual function 'f' is called from constructor 'A()' at line 3. Dynamic binding is not used. [virtualCallInConstructor]\n", errout_str());
 
         checkVirtualFunctionCall("class B {\n"
@@ -8293,14 +8519,14 @@ class TestClass : public TestFixture {
                                  "    int f();\n" // <- not explicitly virtual
                                  "    A() {f();}\n"
                                  "};\n"
-                                 "int A::f() { return 1; }");
+                                 "int A::f() { return 1; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A\n"
                                  "{\n"
                                  "    A() { A::f(); }\n"
                                  "    virtual void f() {}\n"
-                                 "};");
+                                 "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A : B {\n"
@@ -8386,7 +8612,7 @@ class TestClass : public TestFixture {
                                  "    A();\n"
                                  "};\n"
                                  "A::A()\n"
-                                 "{pure();}");
+                                 "{pure();}\n");
         ASSERT_EQUALS("[test.cpp:7:2] -> [test.cpp:3:18]: (warning) Call of pure virtual function 'pure' in constructor. [pureVirtualCall]\n", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8396,7 +8622,7 @@ class TestClass : public TestFixture {
                                  "    int m;\n"
                                  "};\n"
                                  "A::A():m(A::pure())\n"
-                                 "{}");
+                                 "{}\n");
         ASSERT_EQUALS("[test.cpp:7:13] -> [test.cpp:3:17]: (warning) Call of pure virtual function 'pure' in constructor. [pureVirtualCall]\n", errout_str());
 
         checkVirtualFunctionCall("namespace N {\n"
@@ -8417,7 +8643,7 @@ class TestClass : public TestFixture {
                                  "    int m;\n"
                                  "};\n"
                                  "A::~A()\n"
-                                 "{pure();}");
+                                 "{pure();}\n");
         ASSERT_EQUALS("[test.cpp:8:2] -> [test.cpp:3:18]: (warning) Call of pure virtual function 'pure' in destructor. [pureVirtualCall]\n", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8428,7 +8654,7 @@ class TestClass : public TestFixture {
                                  "    A();\n"
                                  "};\n"
                                  "A::A()\n"
-                                 "{nonpure();}");
+                                 "{nonpure();}\n");
         ASSERT_EQUALS("[test.cpp:9:2] -> [test.cpp:5:6] -> [test.cpp:3:18]: (warning) Call of pure virtual function 'pure' in constructor. [pureVirtualCall]\n", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8440,7 +8666,7 @@ class TestClass : public TestFixture {
                                  "    int m;\n"
                                  "};\n"
                                  "A::A():m(nonpure())\n"
-                                 "{}");
+                                 "{}\n");
         TODO_ASSERT_EQUALS("[test.cpp:9:2] -> [test.cpp:5:6] -> [test.cpp:3:18]: (warning) Call of pure virtual function 'pure' in constructor. [pureVirtualCall]\n", "", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8452,7 +8678,7 @@ class TestClass : public TestFixture {
                                  "    int m;\n"
                                  "};\n"
                                  "A::~A()\n"
-                                 "{nonpure();}");
+                                 "{nonpure();}\n");
         ASSERT_EQUALS("[test.cpp:10:2] -> [test.cpp:5:6] -> [test.cpp:3:18]: (warning) Call of pure virtual function 'pure' in destructor. [pureVirtualCall]\n", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8461,7 +8687,7 @@ class TestClass : public TestFixture {
                                  "    A(bool b);\n"
                                  "};\n"
                                  "A::A(bool b)\n"
-                                 "{if (b) pure();}");
+                                 "{if (b) pure();}\n");
         ASSERT_EQUALS("[test.cpp:7:9] -> [test.cpp:3:18]: (warning) Call of pure virtual function 'pure' in constructor. [pureVirtualCall]\n", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8471,7 +8697,7 @@ class TestClass : public TestFixture {
                                  "    int m;\n"
                                  "};\n"
                                  "A::~A()\n"
-                                 "{if (b) pure();}");
+                                 "{if (b) pure();}\n");
         ASSERT_EQUALS("[test.cpp:8:9] -> [test.cpp:3:18]: (warning) Call of pure virtual function 'pure' in destructor. [pureVirtualCall]\n", errout_str());
 
         // #5831
@@ -8479,7 +8705,7 @@ class TestClass : public TestFixture {
                                  "public:\n"
                                  "  virtual ~abc() throw() {}\n"
                                  "  virtual void def(void* g) throw () = 0;\n"
-                                 "};");
+                                 "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4992
@@ -8490,7 +8716,7 @@ class TestClass : public TestFixture {
                                  "        m_callback = [this]() { return VirtualMethod(); };\n"
                                  "    }\n"
                                  "    virtual void VirtualMethod() = 0;\n"
-                                 "};");
+                                 "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10559
@@ -8509,7 +8735,7 @@ class TestClass : public TestFixture {
                                  "    A(const A & a);\n"
                                  "};\n"
                                  "A::A(const A & a)\n"
-                                 "{a.pure();}");
+                                 "{a.pure();}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8522,7 +8748,7 @@ class TestClass : public TestFixture {
                                  "    virtual void pure()=0;\n"
                                  "};\n"
                                  "A::A()\n"
-                                 "{B b; b.pure();}");
+                                 "{B b; b.pure();}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -8535,7 +8761,7 @@ class TestClass : public TestFixture {
                                  "A::A()\n"
                                  "{pureWithBody();}\n"
                                  "void A::pureWithBody()\n"
-                                 "{}");
+                                 "{}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8548,7 +8774,7 @@ class TestClass : public TestFixture {
                                  "A::A()\n"
                                  "{nonpure();}\n"
                                  "void A::pureWithBody()\n"
-                                 "{}");
+                                 "{}\n");
         ASSERT_EQUALS("", errout_str());
 
     }
@@ -8562,7 +8788,7 @@ class TestClass : public TestFixture {
                                  "    A();\n"
                                  "};\n"
                                  "A::A()\n"
-                                 "{nonpure(false);}");
+                                 "{nonpure(false);}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8573,7 +8799,7 @@ class TestClass : public TestFixture {
                                  "    A();\n"
                                  "};\n"
                                  "A::A()\n"
-                                 "{nonpure(false);}");
+                                 "{nonpure(false);}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8588,7 +8814,7 @@ class TestClass : public TestFixture {
                                  "    A();\n"
                                  "};\n"
                                  "A::A()\n"
-                                 "{nonpure(false);}");
+                                 "{nonpure(false);}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -8603,21 +8829,21 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         (checkClass.checkOverride)();
     }
 
     void override1() {
         checkOverride("class Base { virtual void f(); };\n"
-                      "class Derived : Base { virtual void f(); };");
+                      "class Derived : Base { virtual void f(); };\n");
         ASSERT_EQUALS("[test.cpp:1:27] -> [test.cpp:2:37]: (style) The function 'f' overrides a function in a base class but is not marked with a 'override' specifier. [missingOverride]\n", errout_str());
 
         checkOverride("class Base { virtual void f(); };\n"
-                      "class Derived : Base { virtual void f() override; };");
+                      "class Derived : Base { virtual void f() override; };\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOverride("class Base { virtual void f(); };\n"
-                      "class Derived : Base { virtual void f() final; };");
+                      "class Derived : Base { virtual void f() final; };\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOverride("class Base {\n"
@@ -8629,7 +8855,7 @@ class TestClass : public TestFixture {
                       "public :\n"
                       "    auto foo( ) const -> size_t { return 0; }\n"
                       "    auto bar( ) const -> size_t override { return 0; }\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS("[test.cpp:3:18] -> [test.cpp:8:10]: (style) The function 'foo' overrides a function in a base class but is not marked with a 'override' specifier. [missingOverride]\n", errout_str());
 
         checkOverride("namespace Test {\n"
@@ -8641,7 +8867,7 @@ class TestClass : public TestFixture {
                       "class C : Test::C {\n"
                       "public:\n"
                       "    ~C();\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS("[test.cpp:4:18] -> [test.cpp:9:6]: (style) The destructor '~C' overrides a destructor in a base class but is not marked with a 'override' specifier. [missingOverride]\n", errout_str());
 
         checkOverride("struct Base {\n"
@@ -8651,7 +8877,7 @@ class TestClass : public TestFixture {
                       "struct Derived: public Base {\n"
                       "   void foo() override;\n"
                       "   void foo(int);\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOverride("struct B {\n" // #9092
@@ -8775,23 +9001,33 @@ class TestClass : public TestFixture {
                       "};\n");
         ASSERT_EQUALS("[test.cpp:2:14] -> [test.cpp:5:6]: (style) The destructor '~D' overrides a destructor in a base class but is not marked with a 'override' specifier. [missingOverride]\n",
                       errout_str());
+
+        checkOverride("struct B {\n" // #14581
+                      "    virtual void f();\n"
+                      "};\n"
+                      "struct D : B {\n"
+                      "    void f() override;\n"
+                      "    template <typename T>\n"
+                      "    void f();\n"
+                      "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void overrideCVRefQualifiers() {
         checkOverride("class Base { virtual void f(); };\n"
-                      "class Derived : Base { void f() const; }");
+                      "class Derived : Base { void f() const; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOverride("class Base { virtual void f(); };\n"
-                      "class Derived : Base { void f() volatile; }");
+                      "class Derived : Base { void f() volatile; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOverride("class Base { virtual void f(); };\n"
-                      "class Derived : Base { void f() &; }");
+                      "class Derived : Base { void f() &; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOverride("class Base { virtual void f(); };\n"
-                      "class Derived : Base { void f() &&; }");
+                      "class Derived : Base { void f() &&; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -8805,7 +9041,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         (checkClass.checkUselessOverride)();
     }
 
@@ -8813,51 +9049,51 @@ class TestClass : public TestFixture {
         checkUselessOverride("struct B { virtual int f() { return 5; } };\n" // #11757
                              "struct D : B {\n"
                              "    int f() override { return B::f(); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:1:24] -> [test.cpp:3:9]: (style) The function 'f' overrides a function in a base class but just delegates back to the base class. [uselessOverride]\n", errout_str());
 
         checkUselessOverride("struct B { virtual void f(); };\n"
                              "struct D : B {\n"
                              "    void f() override { B::f(); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:1:25] -> [test.cpp:3:10]: (style) The function 'f' overrides a function in a base class but just delegates back to the base class. [uselessOverride]\n", errout_str());
 
         checkUselessOverride("struct B { virtual int f() = 0; };\n"
                              "int B::f() { return 5; }\n"
                              "struct D : B {\n"
                              "    int f() override { return B::f(); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B { virtual int f(int i); };\n"
                              "struct D : B {\n"
                              "    int f(int i) override { return B::f(i); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:1:24] -> [test.cpp:3:9]: (style) The function 'f' overrides a function in a base class but just delegates back to the base class. [uselessOverride]\n", errout_str());
 
         checkUselessOverride("struct B { virtual int f(int i); };\n"
                              "struct D : B {\n"
                              "    int f(int i) override { return B::f(i + 1); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B { virtual int f(int i, int j); };\n"
                              "struct D : B {\n"
                              "    int f(int i, int j) override { return B::f(j, i); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B { virtual int f(); };\n"
                              "struct I { virtual int f() = 0; };\n"
                              "struct D : B, I {\n"
                              "    int f() override { return B::f(); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct S { virtual void f(); };\n"
                              "struct D : S {\n"
                              "    void f() final { S::f(); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct S {\n"
@@ -8867,7 +9103,7 @@ class TestClass : public TestFixture {
                              "struct D : S {\n"
                              "public:\n"
                              "    void f() override { S::f(); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B { virtual void f(int, int, int) const; };\n" // #11799
@@ -8877,7 +9113,7 @@ class TestClass : public TestFixture {
                              "};\n"
                              "void D::f(int a, int b, int c) const {\n"
                              "    B::f(a, b, m);\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B {\n" // #11803
@@ -8888,7 +9124,7 @@ class TestClass : public TestFixture {
                              "    void f() override { B::f(); }\n"
                              "    void f(int i) override;\n"
                              "    void g() { f(); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B { virtual void f(); };\n" // #11808
@@ -8897,7 +9133,7 @@ class TestClass : public TestFixture {
                              "    void f() override {\n"
                              "        B::f();\n"
                              "    }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B {\n"
@@ -8911,7 +9147,7 @@ class TestClass : public TestFixture {
                              "    int g() override { return 7; }\n"
                              "    int h(int j, int i) override { return i + j; }\n"
                              "    int j(int i, int j) override { return i + j; }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:3:17] -> [test.cpp:9:9]: (style) The function 'g' overrides a function in a base class but is identical to the overridden function [uselessOverride]\n"
                       "[test.cpp:5:17] -> [test.cpp:11:9]: (style) The function 'j' overrides a function in a base class but is identical to the overridden function [uselessOverride]\n",
                       errout_str());
@@ -8995,12 +9231,12 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         (checkClass.checkUnsafeClassRefMember)();
     }
 
     void unsafeClassRefMember() {
-        checkUnsafeClassRefMember("class C { C(const std::string &s) : s(s) {} const std::string &s; };");
+        checkUnsafeClassRefMember("class C { C(const std::string &s) : s(s) {} const std::string &s; };\n");
         ASSERT_EQUALS("[test.cpp:1:37]: (warning) Unsafe class: The const reference member 'C::s' is initialized by a const reference constructor argument. You need to be careful about lifetime issues. [unsafeClassRefMember]\n", errout_str());
     }
 
@@ -9013,7 +9249,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings1, this);
+        CheckClassImpl checkClass(&tokenizer, settings1, *this);
         (checkClass.checkThisUseAfterFree)();
     }
 
@@ -9027,7 +9263,7 @@ class TestClass : public TestFixture {
                               "private:\n"
                               "  static C *mInstance;\n"
                               "  void hello() {}\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("[test.cpp:3:38]: warning: Calling method 'hello()' when 'this' might be invalid [thisUseAfterFree]\n"
                       "[test.cpp:5:13]: note: Assuming 'mInstance' is used as 'this'\n"
                       "[test.cpp:3:20]: note: Delete 'mInstance', invalidating 'this'\n"
@@ -9040,7 +9276,7 @@ class TestClass : public TestFixture {
                               "private:\n"
                               "  static std::shared_ptr<C> mInstance;\n"
                               "  void hello() {}\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("[test.cpp:3:39]: warning: Calling method 'hello()' when 'this' might be invalid [thisUseAfterFree]\n"
                       "[test.cpp:5:29]: note: Assuming 'mInstance' is used as 'this'\n"
                       "[test.cpp:3:20]: note: Delete 'mInstance', invalidating 'this'\n"
@@ -9054,7 +9290,7 @@ class TestClass : public TestFixture {
                               "  static std::shared_ptr<C> mInstance;\n"
                               "  void hello();\n"
                               "  void reset() { mInstance.reset(); }\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("[test.cpp:3:29]: warning: Calling method 'hello()' when 'this' might be invalid [thisUseAfterFree]\n"
                       "[test.cpp:5:29]: note: Assuming 'mInstance' is used as 'this'\n"
                       "[test.cpp:7:18]: note: Delete 'mInstance', invalidating 'this'\n"
@@ -9068,7 +9304,7 @@ class TestClass : public TestFixture {
                               "private:\n"
                               "  static C *self;\n"
                               "  int x;\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("[test.cpp:3:33]: warning: Using member 'x' when 'this' might be invalid [thisUseAfterFree]\n"
                       "[test.cpp:5:13]: note: Assuming 'self' is used as 'this'\n"
                       "[test.cpp:3:20]: note: Delete 'self', invalidating 'this'\n"
@@ -9081,7 +9317,7 @@ class TestClass : public TestFixture {
                               "private:\n"
                               "  static C *self;\n"
                               "  std::map<int,int> x;\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("[test.cpp:3:33]: warning: Using member 'x' when 'this' might be invalid [thisUseAfterFree]\n"
                       "[test.cpp:5:13]: note: Assuming 'self' is used as 'this'\n"
                       "[test.cpp:3:20]: note: Delete 'self', invalidating 'this'\n"
@@ -9096,7 +9332,7 @@ class TestClass : public TestFixture {
                               "private:\n"
                               "  std::shared_ptr<C> mInstance;\n"
                               "  void hello() {}\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("[test.cpp:4:39]: warning: Calling method 'hello()' when 'this' might be invalid [thisUseAfterFree]\n"
                       "[test.cpp:6:22]: note: Assuming 'mInstance' is used as 'this'\n"
                       "[test.cpp:4:20]: note: Delete 'mInstance', invalidating 'this'\n"
@@ -9110,7 +9346,7 @@ class TestClass : public TestFixture {
                               "private:\n"
                               "  C *self;\n"
                               "  int x;\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkThisUseAfterFree("class C {\n"
@@ -9120,7 +9356,7 @@ class TestClass : public TestFixture {
                               "private:\n"
                               "  std::shared_ptr<C> mInstance;\n"
                               "  void hello() {}\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkThisUseAfterFree("class C\n"
@@ -9137,7 +9373,7 @@ class TestClass : public TestFixture {
                               "    static C* instanceSingleton;\n"
                               "};\n"
                               "\n"
-                              "C* C::instanceSingleton;");
+                              "C* C::instanceSingleton;\n");
         ASSERT_EQUALS("", errout_str());
 
         // Avoid false positive when pointer is deleted in lambda
@@ -9153,7 +9389,7 @@ class TestClass : public TestFixture {
                               "    auto done = [this] () { delete p; };\n"
                               "    dostuff();\n"
                               "    done();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkThisUseAfterFree("class C {\n" // #13311
@@ -9169,16 +9405,17 @@ class TestClass : public TestFixture {
                               "    if (self)\n"
                               "        delete self;\n"
                               "    self = new C();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
 
     void ctu(const std::vector<std::string> &code) {
-        Check &check = getCheck<CheckClass>();
+        CheckClass checkClass;
+        Check &check = getCheck(checkClass);
 
         // getFileInfo
-        std::list<Check::FileInfo*> fileInfo;
+        std::list<const Check::FileInfo*> fileInfo;
         for (const std::string& c: code) {
             const std::string filename = std::to_string(fileInfo.size()) + ".cpp";
             SimpleTokenizer tokenizer{settingsDefault, *this, filename};
@@ -9197,19 +9434,19 @@ class TestClass : public TestFixture {
     }
 
     void ctuOneDefinitionRule() {
-        ctu({"class C { C() { std::cout << 0; } };", "class C { C() { std::cout << 1; } };"});
+        ctu({"class C { C() { std::cout << 0; } };\n", "class C { C() { std::cout << 1; } };\n"});
         ASSERT_EQUALS("[1.cpp:1:1] -> [0.cpp:1:1]: (error) The one definition rule is violated, different classes/structs have the same name 'C' [ctuOneDefinitionRuleViolation]\n", errout_str());
 
-        ctu({"class C { C(); }; C::C() { std::cout << 0; }", "class C { C(); }; C::C() { std::cout << 1; }"});
+        ctu({"class C { C(); }; C::C() { std::cout << 0; }\n", "class C { C(); }; C::C() { std::cout << 1; }\n"});
         ASSERT_EQUALS("[1.cpp:1:1] -> [0.cpp:1:1]: (error) The one definition rule is violated, different classes/structs have the same name 'C' [ctuOneDefinitionRuleViolation]\n", errout_str());
 
         ctu({"class C { C() {} };\n", "class C { C() {} };\n"});
         ASSERT_EQUALS("", errout_str());
 
-        ctu({"class C { C(); }; C::C(){}", "class C { C(); }; C::C(){}"});
+        ctu({"class C { C(); }; C::C(){}\n", "class C { C(); }; C::C(){}\n"});
         ASSERT_EQUALS("", errout_str());
 
-        ctu({"class A::C { C() { std::cout << 0; } };", "class B::C { C() { std::cout << 1; } };"});
+        ctu({"class A::C { C() { std::cout << 0; } };\n", "class B::C { C() { std::cout << 1; } };\n"});
         ASSERT_EQUALS("", errout_str());
 
         // 11435 - template specialisations
@@ -9227,16 +9464,16 @@ class TestClass : public TestFixture {
         SimpleTokenizer tokenizer(settings1, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        const Check& c = getCheck<CheckClass>();
-        Check::FileInfo * fileInfo = (c.getFileInfo)(tokenizer, settings1, "");
+        CheckClass check;
+        const Check& c = getCheck(check);
+        const Check::FileInfo * fileInfo = (c.getFileInfo)(tokenizer, settings1, "");
 
         delete fileInfo;
     }
 
     void testGetFileInfo() {
-        getFileInfo("void foo() { union { struct { }; }; }"); // don't crash
-        getFileInfo("struct sometype { sometype(); }; sometype::sometype() = delete;"); // don't crash
+        getFileInfo("void foo() { union { struct { }; }; }\n"); // don't crash
+        getFileInfo("struct sometype { sometype(); }; sometype::sometype() = delete;\n"); // don't crash
     }
 
 #define checkReturnByReference(...) checkReturnByReference_(__FILE__, __LINE__, __VA_ARGS__)
@@ -9249,7 +9486,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         (checkClass.checkReturnByReference)();
     }
 
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
index 038d1ea0b01..6f963e07212 100644
--- a/test/testcmdlineparser.cpp
+++ b/test/testcmdlineparser.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,9 +31,13 @@
 #include "settings.h"
 #include "standards.h"
 #include "suppressions.h"
-#include "timer.h"
 #include "utils.h"
 
+#ifdef HAVE_RULES
+#include "regex.h"
+#include "rule.h"
+#endif
+
 #include <cstdio>
 #include <list>
 #include <memory>
@@ -49,7 +53,7 @@ class TestCmdlineParser : public TestFixture {
     {}
 
 private:
-    class CmdLineLoggerTest : public CmdLineLogger
+    class CmdLineLoggerTest final : public CmdLineLogger
     {
     public:
         CmdLineLoggerTest() = default;
@@ -91,7 +95,7 @@ class TestCmdlineParser : public TestFixture {
         std::string buf;
     };
 
-    class CmdLineParserTest : public CmdLineParser
+    class CmdLineParserTest final : public CmdLineParser
     {
         friend class TestCmdlineParser;
     public:
@@ -258,6 +262,7 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(premiumOptionsMetrics);
         TEST_CASE(premiumOptionsCertCIntPrecision);
         TEST_CASE(premiumOptionsLicenseFile);
+        TEST_CASE(premiumOptionsLicenseFilePathWithSpace);
         TEST_CASE(premiumOptionsInvalid1);
         TEST_CASE(premiumOptionsInvalid2);
         TEST_CASE(premiumSafety);
@@ -300,10 +305,14 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(suppressionsNoFile1);
         TEST_CASE(suppressionsNoFile2);
         TEST_CASE(suppressionsNoFile3);
-        TEST_CASE(suppressionSingle);
-        TEST_CASE(suppressionSingleFile);
-        TEST_CASE(suppressionTwo);
-        TEST_CASE(suppressionTwoSeparate);
+        TEST_CASE(suppressSingle);
+        TEST_CASE(suppressSingleFile);
+        TEST_CASE(suppressTwo);
+        TEST_CASE(suppressTwoSeparate);
+        TEST_CASE(exitcodeSuppressSingle);
+        TEST_CASE(exitcodeSuppressSingleFile);
+        TEST_CASE(exitcodeSuppressTwo);
+        TEST_CASE(exitcodeSuppressTwoSeparate);
         TEST_CASE(templates);
         TEST_CASE(templatesGcc);
         TEST_CASE(templatesVs);
@@ -414,6 +423,7 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(ruleFileInvalidSeverity1);
         TEST_CASE(ruleFileInvalidSeverity2);
         TEST_CASE(ruleFileInvalidPattern);
+        TEST_CASE(ruleFileInvalidEngine);
 #else
         TEST_CASE(ruleFileNotSupported);
 #endif
@@ -493,6 +503,8 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(safetyOverride);
         TEST_CASE(noSafety);
         TEST_CASE(noSafetyOverride);
+        TEST_CASE(debugAnalyzerinfo);
+        TEST_CASE(debugIpc);
 
         TEST_CASE(ignorepaths1);
         TEST_CASE(ignorepaths2);
@@ -538,6 +550,8 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(reportTypeMisraCpp2023);
         TEST_CASE(invalidReportType);
         TEST_CASE(defaultReportType);
+        TEST_CASE(keepComments);
+        TEST_CASE(keepCommentsNoDashE);
     }
 
     void nooptions() {
@@ -551,7 +565,8 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
                         "{\n"
-                        "\"productName\": \"Cppcheck Premium\""
+                        "\"productName\": \"Cppcheck Premium\","
+                        "\"manualUrl\": \"https://docs.notcppcheck.com/manual.pdf\""
                         "}\n");
         const char * const argv[] = {"cppcheck"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
@@ -559,7 +574,7 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS(file.path(), *settings->settingsFiles.cbegin());
         const std::string log_str = logger->str();
         ASSERT_MSG(startsWith(log_str, "Cppcheck - A tool for static C/C++ code analysis"), "header");
-        ASSERT_MSG(log_str.find("https://files.cppchecksolutions.com/manual.pdf") != std::string::npos, "help url");
+        ASSERT_MSG(log_str.find("https://docs.notcppcheck.com/manual.pdf") != std::string::npos, "help url");
     }
 
     void nooptionsWithInvalidCfg() {
@@ -589,7 +604,8 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
                         "{\n"
-                        "\"productName\": \"Cppcheck Premium\""
+                        "\"productName\": \"Cppcheck Premium\","
+                        "\"manualUrl\": \"https://docs.notcppcheck.com/manual.pdf\""
                         "}\n");
         const char * const argv[] = {"cppcheck", "-h"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
@@ -597,7 +613,7 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS(file.path(), *settings->settingsFiles.cbegin());
         const std::string log_str = logger->str();
         ASSERT_MSG(startsWith(log_str, "Cppcheck - A tool for static C/C++ code analysis"), "header");
-        ASSERT_MSG(log_str.find("https://files.cppchecksolutions.com/manual.pdf") != std::string::npos, "help url");
+        ASSERT_MSG(log_str.find("https://docs.notcppcheck.com/manual.pdf") != std::string::npos, "help url");
     }
 
     void helplong() {
@@ -618,7 +634,8 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
                         "{\n"
-                        "\"productName\": \"Cppcheck Premium\""
+                        "\"productName\": \"Cppcheck Premium\","
+                        "\"manualUrl\": \"https://docs.notcppcheck.com/manual.pdf\""
                         "}\n");
         const char * const argv[] = {"cppcheck", "--help"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
@@ -626,7 +643,7 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS(file.path(), *settings->settingsFiles.cbegin());
         const std::string log_str = logger->str();
         ASSERT_MSG(startsWith(log_str, "Cppcheck - A tool for static C/C++ code analysis"), "header");
-        ASSERT_MSG(log_str.find("https://files.cppchecksolutions.com/manual.pdf") != std::string::npos, "help url");
+        ASSERT_MSG(log_str.find("https://docs.notcppcheck.com/manual.pdf") != std::string::npos, "help url");
     }
 
     void version() {
@@ -1227,7 +1244,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "--error-exitcode=", "file.cpp"};
         // Fails since exit code not given
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--error-exitcode=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--error-exitcode=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void errorExitcodeStr() {
@@ -1235,7 +1252,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "--error-exitcode=foo", "file.cpp"};
         // Fails since invalid exit code
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--error-exitcode=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--error-exitcode=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void exitcodeSuppressionsOld() {
@@ -1386,7 +1403,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "-j", "file.cpp"};
         // Fails since -j is missing thread count
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void jobsInvalid() {
@@ -1394,7 +1411,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "-j", "e", "file.cpp"};
         // Fails since invalid count given for -j
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void jobsNoJobs() {
@@ -1424,7 +1441,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "--max-configs=", "file.cpp"};
         // Fails since --max-configs= is missing limit
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void maxConfigsInvalid() {
@@ -1432,7 +1449,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "--max-configs=e", "file.cpp"};
         // Fails since invalid count given for --max-configs=
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void maxConfigsTooSmall() {
@@ -1612,6 +1629,14 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("--cert-c-int-precision=12", settings->premiumArgs);
     }
 
+    void premiumOptionsCertCIntPrecisionInvalid() {
+        REDIRECT;
+        asPremium();
+        const char * const argv[] = {"cppcheck", "--premium-cert-c-int-precision=abc", "file.c"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '--premium-cert-c-int-precision=' is not valid - not an integer (invalid_argument).\n", logger->str());
+    }
+
     void premiumOptionsLicenseFile() {
         REDIRECT;
         asPremium();
@@ -1620,6 +1645,14 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("--license-file=file.lic", settings->premiumArgs);
     }
 
+    void premiumOptionsLicenseFilePathWithSpace() {
+        REDIRECT;
+        asPremium();
+        const char * const argv[] = {"cppcheck", "--premium-license-file=license folder/file.lic", "file.c"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("\"--license-file=license folder/file.lic\"", settings->premiumArgs);
+    }
+
     void premiumOptionsInvalid1() {
         REDIRECT;
         asPremium();
@@ -1663,7 +1696,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--report-progress=", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--report-progress=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--report-progress=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void reportProgress3() {
@@ -1952,30 +1985,28 @@ class TestCmdlineParser : public TestFixture {
         return e;
     }
 
-    void suppressionSingle() {
+    void suppressSingle() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--suppress=uninitvar", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS(true, supprs->nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1)));
     }
 
-    void suppressionSingleFile() {
+    void suppressSingleFile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--suppress=uninitvar:file.cpp", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS(true, supprs->nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
     }
 
-    void suppressionTwo() {
+    void suppressTwo() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--suppress=uninitvar,noConstructor", "file.cpp"};
-        TODO_ASSERT_EQUALS(static_cast<int>(CmdLineParser::Result::Success), static_cast<int>(CmdLineParser::Result::Fail), static_cast<int>(parseFromArgs(argv)));
-        TODO_ASSERT_EQUALS(true, false, supprs->nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
-        TODO_ASSERT_EQUALS(true, false, supprs->nomsg.isSuppressed(errorMessage("noConstructor", "file.cpp", 1U)));
-        TODO_ASSERT_EQUALS("", "cppcheck: error: Failed to add suppression. Invalid id \"uninitvar,noConstructor\"\n", logger->str());
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: Failed to add suppression. Invalid id \"uninitvar,noConstructor\"\n", logger->str());
     }
 
-    void suppressionTwoSeparate() {
+    void suppressTwoSeparate() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--suppress=uninitvar", "--suppress=noConstructor", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
@@ -1983,6 +2014,35 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS(true, supprs->nomsg.isSuppressed(errorMessage("noConstructor", "file.cpp", 1U)));
     }
 
+    void exitcodeSuppressSingle() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--exitcode-suppress=uninitvar", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, supprs->nofail.isSuppressed(errorMessage("uninitvar", "file.cpp", 1)));
+    }
+
+    void exitcodeSuppressSingleFile() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--exitcode-suppress=uninitvar:file.cpp", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, supprs->nofail.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
+    }
+
+    void exitcodeSuppressTwo() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--exitcode-suppress=uninitvar,noConstructor", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: Failed to add suppression. Invalid id \"uninitvar,noConstructor\"\n", logger->str());
+    }
+
+    void exitcodeSuppressTwoSeparate() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--exitcode-suppress=uninitvar", "--exitcode-suppress=noConstructor", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, supprs->nofail.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
+        ASSERT_EQUALS(true, supprs->nofail.isSuppressed(errorMessage("noConstructor", "file.cpp", 1U)));
+    }
+
     void templates() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--template={file}:{line},{severity},{id},{message}", "--template-location={file}:{line}:{column} {info}", "file.cpp"};
@@ -2136,7 +2196,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "--xml", "--xml-version=a", "file.cpp"};
         // FAils since unknown XML format version
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--xml-version=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--xml-version=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void doc() {
@@ -2157,21 +2217,21 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=summary", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT(settings->showtime == ShowTime::SUMMARY);
+        ASSERT_EQUALS_ENUM(Settings::ShowTime::SUMMARY, settings->showtime);
     }
 
     void showtimeFile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=file", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT(settings->showtime == ShowTime::FILE);
+        ASSERT_EQUALS_ENUM(Settings::ShowTime::FILE, settings->showtime);
     }
 
     void showtimeFileTotal() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=file-total", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT(settings->showtime == ShowTime::FILE_TOTAL);
+        ASSERT_EQUALS_ENUM(Settings::ShowTime::FILE_TOTAL, settings->showtime);
     }
 
     void showtimeTop5() {
@@ -2185,21 +2245,21 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=top5_file", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT(settings->showtime == ShowTime::TOP5_FILE);
+        ASSERT_EQUALS_ENUM(Settings::ShowTime::TOP5_FILE, settings->showtime);
     }
 
     void showtimeTop5Summary() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=top5_summary", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT(settings->showtime == ShowTime::TOP5_SUMMARY);
+        ASSERT_EQUALS_ENUM(Settings::ShowTime::TOP5_SUMMARY, settings->showtime);
     }
 
     void showtimeNone() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=none", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT(settings->showtime == ShowTime::NONE);
+        ASSERT_EQUALS_ENUM(Settings::ShowTime::NONE, settings->showtime);
     }
 
     void showtimeEmpty() {
@@ -2359,7 +2419,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=seven"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--valueflow-max-iterations=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--valueflow-max-iterations=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void valueFlowMaxIterationsInvalid3() {
@@ -2387,7 +2447,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--checks-max-time=one", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--checks-max-time=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--checks-max-time=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
 #ifdef HAS_THREADING_MODEL_FORK
@@ -2409,7 +2469,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-l", "one", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-l' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '-l' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 #else
     void loadAverageNotSupported() {
@@ -2446,7 +2506,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--max-ctu-depth=one", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--max-ctu-depth=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--max-ctu-depth=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void performanceValueflowMaxTime() {
@@ -2460,7 +2520,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--performance-valueflow-max-time=one", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--performance-valueflow-max-time=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--performance-valueflow-max-time=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void performanceValueFlowMaxIfCount() {
@@ -2474,7 +2534,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--performance-valueflow-max-if-count=one", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--performance-valueflow-max-if-count=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--performance-valueflow-max-if-count=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void templateMaxTime() {
@@ -2488,7 +2548,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--template-max-time=one", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--template-max-time=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--template-max-time=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void templateMaxTimeInvalid2() {
@@ -2509,7 +2569,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--typedef-max-time=one", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--typedef-max-time=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--typedef-max-time=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void typedefMaxTimeInvalid2() {
@@ -2644,7 +2704,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--rule=.*\\", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parser->parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: failed to compile rule pattern '.*\\' (pcre_compile failed: \\ at end of pattern).\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: failed to compile rule pattern '.*\\' (\\ at end of pattern).\n", logger->str());
     }
 #else
     void ruleNotSupported() {
@@ -2661,6 +2721,7 @@ class TestCmdlineParser : public TestFixture {
         ScopedFile file("rule.xml",
                         "<rules>\n"
                         "<rule>\n"
+                        "<engine>pcre</engine>\n"
                         "<tokenlist>raw</tokenlist>\n"
                         "<pattern>.+</pattern>\n"
                         "<message>\n"
@@ -2683,12 +2744,14 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS(2, settings->rules.size());
         auto it = settings->rules.cbegin();
+        ASSERT_EQUALS_ENUM(Regex::Engine::Pcre, it->regex->engine());
         ASSERT_EQUALS("raw", it->tokenlist);
         ASSERT_EQUALS(".+", it->pattern);
         ASSERT_EQUALS_ENUM(Severity::error, it->severity);
         ASSERT_EQUALS("ruleId1", it->id);
         ASSERT_EQUALS("ruleSummary1", it->summary);
         ++it;
+        ASSERT_EQUALS_ENUM(Regex::Engine::Pcre, it->regex->engine());
         ASSERT_EQUALS("define", it->tokenlist);
         ASSERT_EQUALS(".*", it->pattern);
         ASSERT_EQUALS_ENUM(Severity::warning, it->severity);
@@ -2712,6 +2775,7 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS(1, settings->rules.size());
         auto it = settings->rules.cbegin();
+        ASSERT_EQUALS_ENUM(Regex::Engine::Pcre, it->regex->engine());
         ASSERT_EQUALS("define", it->tokenlist);
         ASSERT_EQUALS(".+", it->pattern);
         ASSERT_EQUALS_ENUM(Severity::error, it->severity);
@@ -2879,7 +2943,19 @@ class TestCmdlineParser : public TestFixture {
                         "</rule>\n");
         const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parser->parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - pattern '.+\\' failed to compile (pcre_compile failed: \\ at end of pattern).\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - pattern '.+\\' failed to compile (\\ at end of pattern).\n", logger->str());
+    }
+
+    void ruleFileInvalidEngine() {
+        REDIRECT;
+        ScopedFile file("rule.xml",
+                        "<rule>\n"
+                        "<engine>llvm</engine>\n"
+                        "<pattern>.+</pattern>\n"
+                        "</rule>\n");
+        const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unknown regex engine 'llvm'.\n", logger->str());
     }
 #else
     void ruleFileNotSupported() {
@@ -3183,7 +3259,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--max-template-recursion=", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--max-template-recursion=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--max-template-recursion=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void emitDuplicates() {
@@ -3421,6 +3497,20 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS(false, settings->safety);
     }
 
+    void debugAnalyzerinfo() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-analyzerinfo", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugainfo);
+    }
+
+    void debugIpc() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-ipc", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugipc);
+    }
+
     void ignorepaths1() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-isrc", "file.cpp"};
@@ -3743,6 +3833,20 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS_ENUM(ReportType::normal, settings->reportType);
     }
+
+    void keepComments() {
+        REDIRECT;
+        const char *const argv[] = { "cppcheck", "-E", "-CC", "file.cpp" };
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->keepComments);
+    }
+
+    void keepCommentsNoDashE() {
+        REDIRECT;
+        const char *const argv[] = { "cppcheck", "-CC", "file.cpp" };
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: -CC may only be used on conjunciton with -E\n", logger->str());
+    }
 };
 
 REGISTER_TEST(TestCmdlineParser)
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
index ffeca5c5be7..37efa4f8091 100644
--- a/test/testcondition.cpp
+++ b/test/testcondition.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 #include "settings.h"
 
 #include <cstddef>
-#include <limits>
 #include <string>
 
 class TestCondition : public TestFixture {
@@ -70,6 +69,7 @@ class TestCondition : public TestFixture {
         TEST_CASE(incorrectLogicOperator15);
         TEST_CASE(incorrectLogicOperator16); // #10070
         TEST_CASE(incorrectLogicOperator17);
+        TEST_CASE(incorrectLogicOperator18); // #12282
         TEST_CASE(secondAlwaysTrueFalseWhenFirstTrueError);
         TEST_CASE(incorrectLogicOp_condSwapping);
         TEST_CASE(testBug5895);
@@ -95,6 +95,8 @@ class TestCondition : public TestFixture {
         TEST_CASE(identicalConditionAfterEarlyExit);
         TEST_CASE(innerConditionModified);
 
+        TEST_CASE(overlappingInnerCondition);
+
         TEST_CASE(clarifyCondition1);     // if (a = b() < 0)
         TEST_CASE(clarifyCondition2);     // if (a & b == c)
         TEST_CASE(clarifyCondition3);     // if (! a & b)
@@ -110,6 +112,8 @@ class TestCondition : public TestFixture {
         TEST_CASE(alwaysTrueContainer);
         TEST_CASE(alwaysTrueLoop);
         TEST_CASE(alwaysTrueTryCatch);
+        TEST_CASE(alwaysTrueSideEffect);
+        TEST_CASE(alwaysTruePremiumMisra);
         TEST_CASE(multiConditionAlwaysTrue);
         TEST_CASE(duplicateCondition);
 
@@ -146,8 +150,8 @@ class TestCondition : public TestFixture {
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Run checks..
-        runChecks<CheckCondition>(tokenizer, this);
+        CheckCondition check;
+        runChecks(check, tokenizer, *this);
     }
 
 #define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
@@ -159,8 +163,8 @@ class TestCondition : public TestFixture {
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Run checks..
-        runChecks<CheckCondition>(tokenizer, this);
+        CheckCondition check;
+        runChecks(check, tokenizer, *this);
     }
 
     void assignAndCompare() {
@@ -169,59 +173,59 @@ class TestCondition : public TestFixture {
               "{\n"
               "    int y = x & 4;\n"
               "    if (y == 3);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:4:8]: (style) Mismatching assignment and comparison, comparison 'y==3' is always false. [assignIfError]\n", errout_str());
 
         check("void foo(int x)\n"
               "{\n"
               "    int y = x & 4;\n"
               "    if (y != 3);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:4:8]: (style) Mismatching assignment and comparison, comparison 'y!=3' is always true. [assignIfError]\n", errout_str());
 
         // |
         check("void foo(int x) {\n"
               "    int y = x | 0x14;\n"
               "    if (y == 0x710);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:8]: (style) Mismatching assignment and comparison, comparison 'y==0x710' is always false. [assignIfError]\n", errout_str());
 
         check("void foo(int x) {\n"
               "    int y = x | 0x14;\n"
               "    if (y == 0x71f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // various simple assignments
         check("void foo(int x) {\n"
               "    int y = (x+1) | 1;\n"
               "    if (y == 2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:8]: (style) Mismatching assignment and comparison, comparison 'y==2' is always false. [assignIfError]\n", errout_str());
 
         check("void foo() {\n"
               "    int y = 1 | x();\n"
               "    if (y == 2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:8]: (style) Mismatching assignment and comparison, comparison 'y==2' is always false. [assignIfError]\n", errout_str());
 
         // multiple conditions
         check("void foo(int x) {\n"
               "    int y = x & 4;\n"
               "    if ((y == 3) && (z == 1));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:9]: (style) Mismatching assignment and comparison, comparison 'y==3' is always false. [assignIfError]\n", errout_str());
 
         check("void foo(int x) {\n"
               "    int y = x & 4;\n"
               "    if ((x==123) || ((y == 3) && (z == 1)));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:22]: (style) Mismatching assignment and comparison, comparison 'y==3' is always false. [assignIfError]\n", errout_str());
 
         check("void f(int x) {\n"
               "    int y = x & 7;\n"
               "    if (setvalue(&y) && y != 8);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // recursive checking into scopes
@@ -229,20 +233,20 @@ class TestCondition : public TestFixture {
               "    int y = x & 7;\n"
               "    if (z) y=0;\n"
               "    else { if (y==8); }\n" // always false
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:4:15]: (style) Mismatching assignment and comparison, comparison 'y==8' is always false. [assignIfError]\n", errout_str());
 
         // while
         check("void f(int x) {\n"
               "    int y = x & 7;\n"
               "    while (y==8);\n" // local variable => always false
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:11]: (style) Mismatching assignment and comparison, comparison 'y==8' is always false. [assignIfError]\n", errout_str());
 
         check("void f(int x) {\n"
               "    extern int y; y = x & 7;\n"
               "    while (y==8);\n" // non-local variable => no error
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
@@ -251,7 +255,7 @@ class TestCondition : public TestFixture {
               "        int y = 16 | a;\n"
               "        while (y != 0) y--;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int x);\n"
@@ -261,7 +265,7 @@ class TestCondition : public TestFixture {
               "        int y = 16 | a;\n"
               "        while (y != 0) g(y);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:5:15] -> [test.cpp:6:15]: (style) Mismatching assignment and comparison, comparison 'y!=0' is always true. [assignIfError]\n",
             errout_str());
@@ -273,7 +277,7 @@ class TestCondition : public TestFixture {
               "        int y = 16 | a;\n"
               "        while (y != 0) g(y);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // calling function
@@ -281,14 +285,14 @@ class TestCondition : public TestFixture {
               "    int y = x & 7;\n"
               "    do_something();\n"
               "    if (y==8);\n" // local variable => always false
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:4:8]: (style) Mismatching assignment and comparison, comparison 'y==8' is always false. [assignIfError]\n", errout_str());
 
         check("void f(int x) {\n"
               "    int y = x & 7;\n"
               "    do_something(&y);\n" // passing variable => no error
               "    if (y==8);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void do_something(int);\n"
@@ -296,14 +300,14 @@ class TestCondition : public TestFixture {
               "    int y = x & 7;\n"
               "    do_something(y);\n"
               "    if (y==8);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:5:8]: (style) Mismatching assignment and comparison, comparison 'y==8' is always false. [assignIfError]\n", errout_str());
 
         check("void f(int x) {\n"
               "    extern int y; y = x & 7;\n"
               "    do_something();\n"
               "    if (y==8);\n" // non-local variable => no error
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4434 : false positive: ?:
@@ -311,28 +315,28 @@ class TestCondition : public TestFixture {
               "    x = x & 1;\n"
               "    x = x & 1 ? 1 : -1;\n"
               "    if(x != -1) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4735
         check("void f() {\n"
               "    int x = *(char*)&0x12345678;\n"
               "    if (x==18) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // bailout: no variable info
         check("void foo(int x) {\n"
               "    y = 2 | x;\n"  // y not declared => no error
               "    if(y == 1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // bailout: negative number
         check("void foo(int x) {\n"
               "    int y = -2 | x;\n" // negative number => no error
               "    if (y==1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // bailout: pass variable to function
@@ -340,7 +344,7 @@ class TestCondition : public TestFixture {
               "    int y = 2 | x;\n"
               "    bar(&y);\n"  // pass variable to function => no error
               "    if (y==1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // no crash on unary operator& (#5643)
@@ -348,7 +352,7 @@ class TestCondition : public TestFixture {
         check("SdrObject* ApplyGraphicToObject() {\n"
               "    if (&rHitObject) {}\n"
               "    else if (rHitObject.IsClosedObj() && !&rHitObject) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Condition '&rHitObject' is always true [knownConditionTrueFalse]\n"
                       "[test.cpp:3:42]: (style) Condition '!&rHitObject' is always false [knownConditionTrueFalse]\n",
                       errout_str());
@@ -361,7 +365,7 @@ class TestCondition : public TestFixture {
               "    if (c == 4)\n"
               "      c  = 0;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a) {\n" // #6662
@@ -369,7 +373,7 @@ class TestCondition : public TestFixture {
               "  while (x <= 4) {\n"
               "    if (x != 5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:8]: (style) Mismatching assignment and comparison, comparison 'x!=5' is always true. [assignIfError]\n", errout_str());
 
         check("void f(int a) {\n" // #6662
@@ -377,7 +381,7 @@ class TestCondition : public TestFixture {
               "  while ((x += 4) < 10) {\n"
               "    if (x != 5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -385,7 +389,7 @@ class TestCondition : public TestFixture {
               "    while (x) {\n"
               "        g(x);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int x);\n"
@@ -394,7 +398,7 @@ class TestCondition : public TestFixture {
               "    while (x) {\n"
               "        g(x);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Condition 'x' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void g(int & x);\n"
@@ -403,7 +407,7 @@ class TestCondition : public TestFixture {
               "    while (x) {\n"
               "        g(x);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
     }
@@ -412,13 +416,13 @@ class TestCondition : public TestFixture {
         check("void f(int a) {\n"
               "    int b = a & 0xf0;\n"
               "    b &= 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:5]: (style) Mismatching bitmasks. Result is always 0 (X = Y & 0xf0; Z = X & 0x1; => Z=0). [mismatchingBitAnd]\n", errout_str());
 
         check("void f(int a) {\n"
               "    int b = a & 0xf0;\n"
               "    int c = b & 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:9]: (style) Mismatching bitmasks. Result is always 0 (X = Y & 0xf0; Z = X & 0x1; => Z=0). [mismatchingBitAnd]\n", errout_str());
 
         check("void f(int a) {\n"
@@ -427,67 +431,67 @@ class TestCondition : public TestFixture {
               "    case 1: b &= 1; break;\n"
               "    case 2: b &= 2; break;\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void comparison() {
         // CheckCondition::comparison test cases
         // '=='
-        check("void f(int a) {\n assert( (a & 0x07) == 8U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) == 8U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X & 0x7) == 0x8' is always false. [comparisonError]\n",errout_str());
-        check("void f(int a) {\n assert( (a & b & 4 & c ) == 3 );\n}");
+        check("void f(int a) {\n assert( (a & b & 4 & c ) == 3 );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:21]: (style) Expression '(X & 0x4) == 0x3' is always false. [comparisonError]\n", errout_str());
-        check("void f(int a) {\n assert( (a | 0x07) == 8U );\n}");
+        check("void f(int a) {\n assert( (a | 0x07) == 8U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X | 0x7) == 0x8' is always false. [comparisonError]\n",errout_str());
-        check("void f(int a) {\n assert( (a & 0x07) == 7U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) == 7U );\n}\n");
         ASSERT_EQUALS("", errout_str());
-        check("void f(int a) {\n assert( (a | 0x01) == -15 );\n}");
+        check("void f(int a) {\n assert( (a | 0x01) == -15 );\n}\n");
         ASSERT_EQUALS("", errout_str());
         // '!='
-        check("void f(int a) {\n assert( (a & 0x07) != 8U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) != 8U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X & 0x7) != 0x8' is always true. [comparisonError]\n",errout_str());
-        check("void f(int a) {\n assert( (a | 0x07) != 8U );\n}");
+        check("void f(int a) {\n assert( (a | 0x07) != 8U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X | 0x7) != 0x8' is always true. [comparisonError]\n",errout_str());
-        check("void f(int a) {\n assert( (a & 0x07) != 7U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) != 7U );\n}\n");
         ASSERT_EQUALS("", errout_str());
-        check("void f(int a) {\n assert( (a | 0x07) != 7U );\n}");
+        check("void f(int a) {\n assert( (a | 0x07) != 7U );\n}\n");
         ASSERT_EQUALS("", errout_str());
         // '>='
-        check("void f(int a) {\n assert( (a & 0x07) >= 8U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) >= 8U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X & 0x7) >= 0x8' is always false. [comparisonError]\n",errout_str());
-        check("void f(unsigned int a) {\n assert( (a | 0x7) >= 7U );\n}");
+        check("void f(unsigned int a) {\n assert( (a | 0x7) >= 7U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X | 0x7) >= 0x7' is always true. [comparisonError]\n",errout_str());
-        check("void f(int a) {\n assert( (a & 0x07) >= 7U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) >= 7U );\n}\n");
         ASSERT_EQUALS("",errout_str());
-        check("void f(int a) {\n assert( (a | 0x07) >= 8U );\n}");
+        check("void f(int a) {\n assert( (a | 0x07) >= 8U );\n}\n");
         ASSERT_EQUALS("",errout_str()); //correct for negative 'a'
         // '>'
-        check("void f(int a) {\n assert( (a & 0x07) > 7U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) > 7U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X & 0x7) > 0x7' is always false. [comparisonError]\n",errout_str());
-        check("void f(unsigned int a) {\n assert( (a | 0x7) > 6U );\n}");
+        check("void f(unsigned int a) {\n assert( (a | 0x7) > 6U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X | 0x7) > 0x6' is always true. [comparisonError]\n",errout_str());
-        check("void f(int a) {\n assert( (a & 0x07) > 6U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) > 6U );\n}\n");
         ASSERT_EQUALS("",errout_str());
-        check("void f(int a) {\n assert( (a | 0x07) > 7U );\n}");
+        check("void f(int a) {\n assert( (a | 0x07) > 7U );\n}\n");
         ASSERT_EQUALS("",errout_str()); //correct for negative 'a'
         // '<='
-        check("void f(int a) {\n assert( (a & 0x07) <= 7U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) <= 7U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X & 0x7) <= 0x7' is always true. [comparisonError]\n",errout_str());
-        check("void f(unsigned int a) {\n assert( (a | 0x08) <= 7U );\n}");
+        check("void f(unsigned int a) {\n assert( (a | 0x08) <= 7U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X | 0x8) <= 0x7' is always false. [comparisonError]\n",errout_str());
-        check("void f(int a) {\n assert( (a & 0x07) <= 6U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) <= 6U );\n}\n");
         ASSERT_EQUALS("",errout_str());
-        check("void f(int a) {\n assert( (a | 0x08) <= 7U );\n}");
+        check("void f(int a) {\n assert( (a | 0x08) <= 7U );\n}\n");
         ASSERT_EQUALS("",errout_str()); //correct for negative 'a'
         // '<'
-        check("void f(int a) {\n assert( (a & 0x07) < 8U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) < 8U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X & 0x7) < 0x8' is always true. [comparisonError]\n",errout_str());
-        check("void f(unsigned int a) {\n assert( (a | 0x07) < 7U );\n}");
+        check("void f(unsigned int a) {\n assert( (a | 0x07) < 7U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X | 0x7) < 0x7' is always false. [comparisonError]\n",errout_str());
-        check("void f(int a) {\n assert( (a & 0x07) < 3U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) < 3U );\n}\n");
         ASSERT_EQUALS("",errout_str());
-        check("void f(int a) {\n assert( (a | 0x07) < 7U );\n}");
+        check("void f(int a) {\n assert( (a | 0x07) < 7U );\n}\n");
         ASSERT_EQUALS("",errout_str()); //correct for negative 'a'
 
         check("void f(int i) {\n" // #11998
@@ -524,7 +528,8 @@ class TestCondition : public TestFixture {
         SimpleTokenizer tokenizer(settings1, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        runChecks<CheckCondition>(tokenizer, this);
+        CheckCondition check;
+        runChecks(check, tokenizer, *this);
     }
 
     void multicompare() {
@@ -532,14 +537,14 @@ class TestCondition : public TestFixture {
               "{\n"
               "    if (x & 7);\n"
               "    else { if (x == 1); }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (style) Expression is always false because 'else if' condition matches previous condition at line 3. [multiCondition]\n", errout_str());
 
         check("void foo(int x)\n"
               "{\n"
               "    if (x & 7);\n"
               "    else { if (x & 1); }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (style) Expression is always false because 'else if' condition matches previous condition at line 3. [multiCondition]\n", errout_str());
 
         check("extern int bar() __attribute__((pure));\n"
@@ -547,7 +552,7 @@ class TestCondition : public TestFixture {
               "{\n"
               "    if ( bar() >1 && b) {}\n"
               "    else if (bar() >1 && b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (style) Expression is always false because 'else if' condition matches previous condition at line 4. [multiCondition]\n", errout_str());
 
         checkPureFunction("extern int bar();\n"
@@ -555,14 +560,14 @@ class TestCondition : public TestFixture {
                           "{\n"
                           "    if ( bar() >1 && b) {}\n"
                           "    else if (bar() >1 && b) {}\n"
-                          "}");
+                          "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (style) Expression is always false because 'else if' condition matches previous condition at line 4. [multiCondition]\n", errout_str());
 
         // 7284
         check("void foo() {\n"
               "    if (a) {}\n"
               "    else if (!!a) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         // #11059
@@ -589,53 +594,53 @@ class TestCondition : public TestFixture {
         check("void f(int a, int &b) {\n"
               "    if (a) { b = 1; }\n"
               "    else { if (a) { b = 2; } }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(int a, int &b) {\n"
               "    if (a) { b = 1; }\n"
               "    else { if (a) { b = 2; } }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(int a, int &b) {\n"
               "    if (a == 1) { b = 1; }\n"
               "    else { if (a == 2) { b = 2; }\n"
               "    else { if (a == 1) { b = 3; } } }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(int a, int &b) {\n"
               "    if (a == 1) { b = 1; }\n"
               "    else { if (a == 2) { b = 2; }\n"
               "    else { if (a == 2) { b = 3; } } }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (style) Expression is always false because 'else if' condition matches previous condition at line 3. [multiCondition]\n", errout_str());
 
         check("void f(int a, int &b) {\n"
               "    if (a++) { b = 1; }\n"
               "    else { if (a++) { b = 2; }\n"
               "    else { if (a++) { b = 3; } } }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int &b) {\n"
               "    if (!strtok(NULL, \" \")) { b = 1; }\n"
               "    else { if (!strtok(NULL, \" \")) { b = 2; } }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
             check("void f(Class &c) {\n"
                   "    if (c.dostuff() == 3) {}\n"
                   "    else { if (c.dostuff() == 3) {} }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
 
             check("void f(const Class &c) {\n"
                   "    if (c.dostuff() == 3) {}\n"
                   "    else { if (c.dostuff() == 3) {} }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("[test.cpp:3:28]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
         }
 
@@ -643,13 +648,13 @@ class TestCondition : public TestFixture {
               "   x = x / 2;\n"
               "   if (x < 100) { b = 1; }\n"
               "   else { x = x / 2; if (x < 100) { b = 2; } }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int64_t i) {\n"
               "   if(i == 0x02e2000000 || i == 0xa0c6000000)\n"
               "       foo(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket 3689 ( avoid false positive )
@@ -671,13 +676,13 @@ class TestCondition : public TestFixture {
               "            return -1;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(WIDGET *widget) {\n"
               "  if (dynamic_cast<BUTTON*>(widget)){}\n"
               "  else if (dynamic_cast<LABEL*>(widget)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class B { virtual void v() {} };\n" // #11037
@@ -694,67 +699,67 @@ class TestCondition : public TestFixture {
         check("void f(int x) {\n" // #6482
               "  if (x & 1) {}\n"
               "  else if (x == 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "  if (x & 15) {}\n"
               "  else if (x == 40) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(int x) {\n"
               "  if (x == sizeof(double)) {}\n"
-              "  else { if (x == sizeof(long double)) {} }"
-              "}");
+              "  else { if (x == sizeof(long double)) {} }\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "  if (x & 0x08) {}\n"
               "  else if (x & 0xF8) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "  if (x & 0xF8) {}\n"
               "  else if (x & 0x08) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "   if(a && b){}\n"
               "   else if( !!b && !!a){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "   if(a && b){}\n"
               "   else if( !!b && a){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "   if(a && b){}\n"
               "   else if( b && !!a){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "   if(a && b){}\n"
               "   else if( b && !(!a)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "   if(a && b){}\n"
               "   else if( !!b && !(!a)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "   if(a && b){}\n"
               "   else if( !!(b) && !!(a+b)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8168
@@ -766,7 +771,7 @@ class TestCondition : public TestFixture {
               "void TestFunction(int value) {\n"
               "    if ( value & (int)Value1 ) {}\n"
               "    else if ( value & (int)Value2 ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(size_t x) {\n"
@@ -788,7 +793,7 @@ class TestCondition : public TestFixture {
         check("void f(int x) {\n"
               "    if (x) {}\n"
               "    else if (!x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: style: Expression is always true because 'else if' condition is opposite to previous condition at line 2. [multiCondition]\n"
                       "[test.cpp:2:9]: note: first condition\n"
                       "[test.cpp:3:14]: note: else if condition is opposite to first condition\n", errout_str());
@@ -797,7 +802,7 @@ class TestCondition : public TestFixture {
               "    int y = x;\n"
               "    if (x) {}\n"
               "    else if (!y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: style: Expression is always true because 'else if' condition is opposite to previous condition at line 3. [multiCondition]\n"
                       "[test.cpp:2:13]: note: 'y' is assigned value 'x' here.\n"
                       "[test.cpp:3:9]: note: first condition\n"
@@ -808,31 +813,31 @@ class TestCondition : public TestFixture {
         check("bool f(int x) {\n"
               "    bool b = x | 0x02;\n"
               "    return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("bool f(int x) {\n"
               "    bool b = 0x02 | x;\n"
               "    return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:19]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("int f(int x) {\n"
               "    int b = x | 0x02;\n"
               "    return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x) {\n"
               "    bool b = x & 0x02;\n"
               "    return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x) {\n"
               "    if(x | 0x02)\n"
               "        return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("bool f(int x) {\n"
@@ -840,27 +845,27 @@ class TestCondition : public TestFixture {
               "    if(b) y = 0;\n"
               "    if(x | y)\n"
               "        return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x) {\n"
               "    foo(a && (x | 0x02));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("int f(int x) {\n"
               "    return (x | 0x02) ? 0 : 5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("int f(int x) {\n"
               "    return x ? (x | 0x02) : 5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x) {\n"
               "    return x | 0x02;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("bool f(int x) {\n"
@@ -868,19 +873,19 @@ class TestCondition : public TestFixture {
               "    return x | 0x02;\n"
               "  }\n"
               "  return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("const bool f(int x) {\n"
               "    return x | 0x02;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("struct F {\n"
               "  static const bool f(int x) {\n"
               "      return x | 0x02;\n"
               "  }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("struct F {\n"
@@ -888,12 +893,12 @@ class TestCondition : public TestFixture {
               "};\n"
               "F::b_t f(int x) {\n"
               "  return x | 0x02;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("int f(int x) {\n"
               "    return x | 0x02;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void create_rop_masks_4( rop_mask_bits *bits) {\n"
@@ -901,7 +906,7 @@ class TestCondition : public TestFixture {
               "BYTE *and_bits = bits->and;\n"
               "rop_mask *rop_mask;\n"
               "and_bits[mask_offset] |= (rop_mask->and & 0x0f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(unsigned a, unsigned b) {\n"
@@ -909,7 +914,7 @@ class TestCondition : public TestFixture {
               "  if (cmd1 | a) {\n"
               "    if (b == 0x0C) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int i) {\n" // #11082
@@ -937,7 +942,7 @@ class TestCondition : public TestFixture {
               "#if BAR_ENABLED\n"
               "    FEATURE_BAR |\n"
               "#endif\n"
-              "    0;");
+              "    0;\n");
         ASSERT_EQUALS("", errout_str());
 
         check("enum precedence { PC0, UNARY };\n"
@@ -956,84 +961,84 @@ class TestCondition : public TestFixture {
         check("void f(int x) {\n"
               "    if ((x != 1) || (x != 3))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Logical disjunction always evaluates to true: x != 1 || x != 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (1 != x || 3 != x)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical disjunction always evaluates to true: x != 1 || x != 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "  if (x<0 && !x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Logical conjunction always evaluates to false: x < 0 && !x. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "  if (x==0 && x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Logical conjunction always evaluates to false: x == 0 && x. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n" // ast..
               "    if (y == 1 && x == 1 && x == 7) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:26]: (warning) Logical conjunction always evaluates to false: x == 1 && x == 7. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if (x != 1 || y != 1)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if ((y == 1) && (x != 1) || (x != 3))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if ((x != 1) || (x != 3) && (y == 1))\n"
               "        a++;\n"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:2:24]: (style) Condition 'x!=3' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x != 1) && (x != 3))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x == 1) || (x == 3))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if ((x != 1) || (y != 3))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if ((x != hotdog) || (y != hotdog))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if ((x != 5) || (y != 5))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
         check("void f(int x) {\n"
               "    if ((x != 5) || (x != 6))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Logical disjunction always evaluates to true: x != 5 || x != 6. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(unsigned int a, unsigned int b, unsigned int c) {\n"
@@ -1042,7 +1047,7 @@ class TestCondition : public TestFixture {
               "        return true;\n"
               "    }\n"
               "    return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23] -> [test.cpp:2:35]: (style) Condition 'c!=a' is always false [knownConditionTrueFalse]\n", errout_str());
     }
 
@@ -1050,224 +1055,224 @@ class TestCondition : public TestFixture {
         check("void f(float x) {\n"
               "    if ((x == 1) && (x == 1.0))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x == 1) && (x == 0x00000001))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:2:24]: (style) Condition 'x==0x00000001' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x == 1 && x == 3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical conjunction always evaluates to false: x == 1 && x == 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x == 1.0 && x == 3.0)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // float comparisons with == and != are not checked right now - such comparison is a bad idea
 
         check("void f(float x) {\n"
               "    if (x == 1 && x == 1.0)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void bar(float f) {\n" // #5246
               "    if ((f > 0) && (f < 1)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x < 1 && x > 1)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 1. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x < 1.0 && x > 1.0)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Logical conjunction always evaluates to false: x < 1.0 && x > 1.0. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x < 1 && x > 1.0)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 1.0. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x >= 1.0 && x <= 1.001)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x < 1 && x > 3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(float x) {\n"
               "    if (x < 1.0 && x > 3.0)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Logical conjunction always evaluates to false: x < 1.0 && x > 3.0. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (1 > x && 3 < x)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x < 3 && x > 1)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 3 || x < 10)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical disjunction always evaluates to true: x > 3 || x < 10. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x >= 3 || x <= 10)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical disjunction always evaluates to true: x >= 3 || x <= 10. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x >= 3 || x < 10)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical disjunction always evaluates to true: x >= 3 || x < 10. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 3 || x <= 10)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical disjunction always evaluates to true: x > 3 || x <= 10. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 3 || x < 3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x >= 3 || x <= 3)\n"
               "        a++;\n"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical disjunction always evaluates to true: x >= 3 || x <= 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x >= 3 || x < 3)\n"
               "        a++;\n"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical disjunction always evaluates to true: x >= 3 || x < 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 3 || x <= 3)\n"
               "        a++;\n"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical disjunction always evaluates to true: x > 3 || x <= 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "   if((x==3) && (x!=4))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Redundant condition: The condition 'x != 4' is redundant since 'x == 3' is sufficient. [redundantCondition]\n", errout_str());
 
         check("void f(const std::string &s) {\n" // #8860
               "    const std::size_t p = s.find(\"42\");\n"
               "    const std::size_t * const ptr = &p;\n"
               "    if(p != std::string::npos && p == 0 && *ptr != 1){;}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:36] -> [test.cpp:4:49]: (style) Condition '*ptr!=1' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x!=4) && (x==3))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (style) Redundant condition: The condition 'x != 4' is redundant since 'x == 3' is sufficient. [redundantCondition]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x==3) || (x!=4))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (style) Redundant condition: The condition 'x == 3' is redundant since 'x != 4' is sufficient. [redundantCondition]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x!=4) || (x==3))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (style) Redundant condition: The condition 'x == 3' is redundant since 'x != 4' is sufficient. [redundantCondition]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x==3) && (x!=3))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical conjunction always evaluates to false: x == 3 && x != 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x==6) || (x!=6))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical disjunction always evaluates to true: x == 6 || x != 6. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 10 || x < 3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 5 && x == 1)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x > 5 && x == 1. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 5 && x == 6)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Redundant condition: The condition 'x > 5' is redundant since 'x == 6' is sufficient. [redundantCondition]\n", errout_str());
 
         // #3419
         check("void f() {\n"
               "    if ( &q != &a && &q != &b ) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3676
         check("void f(int m_x2, int w, int x) {\n"
               "    if (x + w - 1 > m_x2 || m_x2 < 0 )\n"
               "        m_x2 = x + w - 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(float x) {\n" // x+1 => x
               "  if (x <= 1.0e20 && x >= -1.0e20) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(float x) {\n" // x+1 => x
               "  if (x >= 1.0e20 && x <= 1.0e21) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(float x) {\n" // x+1 => x
               "  if (x <= -1.0e20 && x >= -1.0e21) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1277,7 +1282,7 @@ class TestCondition : public TestFixture {
               "    c = x < 1 && x == 3;\n"
               "    d = x >= 5 && x == 1;\n"
               "    e = x <= 1 && x == 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x > 5 && x == 1. [incorrectLogicOperator]\n"
                       "[test.cpp:3:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x == 3. [incorrectLogicOperator]\n"
                       "[test.cpp:4:16]: (warning) Logical conjunction always evaluates to false: x >= 5 && x == 1. [incorrectLogicOperator]\n"
@@ -1288,7 +1293,7 @@ class TestCondition : public TestFixture {
         check("#define ZERO 0\n"
               "void f(int x) {\n"
               "  if (x && x != ZERO) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int N) {\n" // #9789
@@ -1303,7 +1308,7 @@ class TestCondition : public TestFixture {
     void incorrectLogicOperator5() { // complex expressions
         check("void f(int x) {\n"
               "  if (x+3 > 2 || x+3 < 10) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical disjunction always evaluates to true: x+3 > 2 || x+3 < 10. [incorrectLogicOperator]\n", errout_str());
     }
 
@@ -1311,51 +1316,51 @@ class TestCondition : public TestFixture {
         const Settings s = settingsBuilder(settings0).certainty(Certainty::inconclusive).build();
         check("void f(char x) {\n"
               "  if (x == '1' || x == '2') {}\n"
-              "}", s);
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char x) {\n"
               "  if (x == '1' && x == '2') {}\n"
-              "}", s);
+              "}\n", s);
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical conjunction always evaluates to false: x == '1' && x == '2'. [incorrectLogicOperator]\n", errout_str());
 
         check("int f(char c) {\n"
               "  return (c >= 'a' && c <= 'z');\n"
-              "}", s);
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("int f(char c) {\n"
               "  return (c <= 'a' && c >= 'z');\n"
-              "}", s);
+              "}\n", s);
         ASSERT_EQUALS("[test.cpp:2:20]: (warning, inconclusive) Logical conjunction always evaluates to false: c <= 'a' && c >= 'z'. [incorrectLogicOperator]\n", errout_str());
 
         check("int f(char c) {\n"
               "  return (c <= 'a' && c >= 'z');\n"
-              "}"); // TODO: use s?
-        ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:2:25]: (style) Return value 'c>='z'' is always false [knownConditionTrueFalse]\n", errout_str());
+              "}\n"); // TODO: use s?
+        ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:2:25]: (style) Condition 'c>='z'' is always false [knownConditionTrueFalse]\n", errout_str());
     }
 
     void incorrectLogicOperator7() { // opposite expressions
         check("void f(int i) {\n"
               "  if (i || !i) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (warning) Logical disjunction always evaluates to true: i || !(i). [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int a, int b) {\n"
               "  if (a>b || a<=b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Logical disjunction always evaluates to true: a > b || a <= b. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int a, int b) {\n"
               "  if (a>b || a<b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6064 False positive incorrectLogicOperator - invalid assumption about template type?
         check("template<typename T> T icdf( const T uniform ) {\n"
               "   if ((0<uniform) && (uniform<1))\n"
               "     {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6081 False positive: incorrectLogicOperator, with close negative comparisons
@@ -1365,14 +1370,14 @@ class TestCondition : public TestFixture {
               "        return;\n"
               "    else\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void incorrectLogicOperator8() { // opposite expressions
         check("void f(int i) {\n"
               "  if (!(i!=10) && !(i!=20)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical conjunction always evaluates to false: !(i != 10) && !(i != 20). [incorrectLogicOperator]\n", errout_str());
     }
 
@@ -1381,7 +1386,7 @@ class TestCondition : public TestFixture {
               "class OtherType;\n"
               "void foo (OtherType* obj) {\n"
               "    assert((!obj) || dynamic_cast<MyType*>(obj));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1390,21 +1395,21 @@ class TestCondition : public TestFixture {
               "void f(Type_t t) {\n"
               "    if ((t == A) && (t == B))\n"
               "    {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (warning) Logical conjunction always evaluates to false: t == 0 && t == 1. [incorrectLogicOperator]\n", errout_str());
     }
 
     void incorrectLogicOperator11() {
-        check("void foo(int i, const int n) { if ( i < n && i == n ) {} }");
+        check("void foo(int i, const int n) { if ( i < n && i == n ) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:43]: (warning) Logical conjunction always evaluates to false: i < n && i == n. [incorrectLogicOperator]\n", errout_str());
 
-        check("void foo(int i, const int n) { if ( i > n && i == n ) {} }");
+        check("void foo(int i, const int n) { if ( i > n && i == n ) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:43]: (warning) Logical conjunction always evaluates to false: i > n && i == n. [incorrectLogicOperator]\n", errout_str());
 
-        check("void foo(int i, const int n) { if ( i == n && i > n ) {} }");
+        check("void foo(int i, const int n) { if ( i == n && i > n ) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:44]: (warning) Logical conjunction always evaluates to false: i == n && i > n. [incorrectLogicOperator]\n", errout_str());
 
-        check("void foo(int i, const int n) { if ( i == n && i < n ) {} }");
+        check("void foo(int i, const int n) { if ( i == n && i < n ) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:44]: (warning) Logical conjunction always evaluates to false: i == n && i < n. [incorrectLogicOperator]\n", errout_str());
     }
 
@@ -1418,7 +1423,7 @@ class TestCondition : public TestFixture {
               "  y.f();\n"
               "  if (a > x && a < y)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:5:9] -> [test.cpp:6:9] -> [test.cpp:8:13]: (warning) Logical conjunction always evaluates to false: a > x && a < y. [incorrectLogicOperator]\n",
             errout_str());
@@ -1432,7 +1437,7 @@ class TestCondition : public TestFixture {
               "  y.f();\n"
               "  if (a > x && a < y)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(A a, A b) {\n"
@@ -1441,7 +1446,7 @@ class TestCondition : public TestFixture {
               "  y.f();\n"
               "  if (a > x && a < y)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(A a, A b) {\n"
@@ -1450,7 +1455,7 @@ class TestCondition : public TestFixture {
               "  y.f();\n"
               "  if (a > x && a < y)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:15] -> [test.cpp:3:15] -> [test.cpp:5:13]: (warning) Logical conjunction always evaluates to false: a > x && a < y. [incorrectLogicOperator]\n",
             errout_str());
@@ -1464,7 +1469,7 @@ class TestCondition : public TestFixture {
               "  y.f();\n"
               "  if (a > x && a < y)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:9]: (style) Condition 'a>x' is always false [knownConditionTrueFalse]\n"
                       "[test.cpp:8:18]: (style) Condition 'a<y' is always false [knownConditionTrueFalse]\n",
                       errout_str());
@@ -1478,7 +1483,7 @@ class TestCondition : public TestFixture {
               "  y.f();\n"
               "  if (a > x && a < y)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:9]: (style) Condition 'a>x' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void foo(A a) {\n"
@@ -1487,7 +1492,7 @@ class TestCondition : public TestFixture {
               "  y.f();\n"
               "  if (a > x && a < y)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (style) Condition 'a>x' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void foo(A a) {\n"
@@ -1496,7 +1501,7 @@ class TestCondition : public TestFixture {
               "  y.f();\n"
               "  if (a > x && a < y)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (style) Condition 'a>x' is always false [knownConditionTrueFalse]\n"
                       "[test.cpp:5:18]: (style) Condition 'a<y' is always false [knownConditionTrueFalse]\n",
                       errout_str());
@@ -1507,13 +1512,13 @@ class TestCondition : public TestFixture {
         check("void f(const int &v) {\n"
               "    const int x=v;\n"
               "    if ((v == 1) && (x == 2)) {;}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17] -> [test.cpp:3:18]: (warning) Logical conjunction always evaluates to false: v == 1 && x == 2. [incorrectLogicOperator]\n", errout_str());
 
         check("void f2(const int *v) {\n"
               "    const int *x=v;\n"
               "    if ((*v == 1) && (*x == 2)) {;}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18] -> [test.cpp:3:19]: (warning) Logical conjunction always evaluates to false: *(v) == 1 && *(x) == 2. [incorrectLogicOperator]\n", errout_str());
     }
 
@@ -1720,7 +1725,7 @@ class TestCondition : public TestFixture {
               "      if (f && g)\n"
               "        ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:200:11] -> [test.cpp:200:16]: (style) Condition 'g' is always true [knownConditionTrueFalse]\n", errout_str());
     }
 
@@ -1754,6 +1759,17 @@ class TestCondition : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void incorrectLogicOperator18() { // #12282
+        // long double literals out of the range of double are different values
+        check("int f(long double x) {\n"
+              "    return x > 1e400L && x < 1e500L;\n"
+              "}\n"
+              "int g() {\n"
+              "    return 1e400L < 1e500L;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void incorrectLogicOperator17() { // #12471
         check("struct R {\n"
               "    void set() { i = 1; }\n"
@@ -1776,31 +1792,31 @@ class TestCondition : public TestFixture {
         check("void f(void) {\n" // #8892
               "    const char c[1] = { \'x\' }; \n"
               "    if(c[0] == \'x\'){;}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (style) Condition 'c[0]=='x'' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 5 && x != 1)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Redundant condition: The condition 'x != 1' is redundant since 'x > 5' is sufficient. [redundantCondition]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 5 && x != 6)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x > 5) && (x != 1))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Redundant condition: The condition 'x != 1' is redundant since 'x > 5' is sufficient. [redundantCondition]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x > 5) && (x != 6))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, bool& b) {\n"
@@ -1808,7 +1824,7 @@ class TestCondition : public TestFixture {
               "    c = x < 5 || x == 4;\n"
               "    d = x >= 3 || x == 4;\n"
               "    e = x <= 5 || x == 4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Redundant condition: The condition 'x == 4' is redundant since 'x > 3' is sufficient. [redundantCondition]\n"
                       "[test.cpp:3:15]: (style) Redundant condition: The condition 'x == 4' is redundant since 'x < 5' is sufficient. [redundantCondition]\n"
                       "[test.cpp:4:16]: (style) Redundant condition: The condition 'x == 4' is redundant since 'x >= 3' is sufficient. [redundantCondition]\n"
@@ -1820,7 +1836,7 @@ class TestCondition : public TestFixture {
               "    c = x < 1 || x != 3;\n"
               "    d = x >= 5 || x != 1;\n"
               "    e = x <= 1 || x != 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Redundant condition: The condition 'x > 5' is redundant since 'x != 1' is sufficient. [redundantCondition]\n"
                       "[test.cpp:3:15]: (style) Redundant condition: The condition 'x < 1' is redundant since 'x != 3' is sufficient. [redundantCondition]\n"
                       "[test.cpp:4:16]: (style) Redundant condition: The condition 'x >= 5' is redundant since 'x != 1' is sufficient. [redundantCondition]\n"
@@ -1832,7 +1848,7 @@ class TestCondition : public TestFixture {
               "    c = x > 5 || x > 6;\n"
               "    d = x < 6 && x < 5;\n"
               "    e = x < 5 || x < 6;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Redundant condition: The condition 'x > 5' is redundant since 'x > 6' is sufficient. [redundantCondition]\n"
                       "[test.cpp:3:15]: (style) Redundant condition: The condition 'x > 6' is redundant since 'x > 5' is sufficient. [redundantCondition]\n"
                       "[test.cpp:4:15]: (style) Redundant condition: The condition 'x < 6' is redundant since 'x < 5' is sufficient. [redundantCondition]\n"
@@ -1844,7 +1860,7 @@ class TestCondition : public TestFixture {
               "    c = x > 5.5 || x > 6.5;\n"
               "    d = x < 6.5 && x < 5.5;\n"
               "    e = x < 5.5 || x < 6.5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Redundant condition: The condition 'x > 5.5' is redundant since 'x > 6.5' is sufficient. [redundantCondition]\n"
                       "[test.cpp:3:17]: (style) Redundant condition: The condition 'x > 6.5' is redundant since 'x > 5.5' is sufficient. [redundantCondition]\n"
                       "[test.cpp:4:17]: (style) Redundant condition: The condition 'x < 6.5' is redundant since 'x < 5.5' is sufficient. [redundantCondition]\n"
@@ -1862,49 +1878,49 @@ class TestCondition : public TestFixture {
         check("void f(int x) {\n"
               "    if (x < 1 && x > 3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (1 > x && x > 3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x < 1 && 3 < x)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (1 > x && 3 < x)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 3 && x < 1)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x > 3 && x < 1. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (3 < x && x < 1)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x > 3 && x < 1. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 3 && 1 > x)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x > 3 && x < 1. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (3 < x && 1 > x)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x > 3 && x < 1. [incorrectLogicOperator]\n", errout_str());
     }
 
@@ -1914,7 +1930,7 @@ class TestCondition : public TestFixture {
               "    b2 = a % c == 100000;\n"
               "    b3 = a % 5 == c;\n"
               "    return a % 5 == 5-p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(bool& b1, bool& b2, bool& b3, bool& b4, bool& b5) {\n"
@@ -1924,7 +1940,7 @@ class TestCondition : public TestFixture {
               "    b4 = a % 5 != 5;\n"
               "    b5 = a % 5 >= 5;\n"
               "    return a % 5 > 5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:16]: (warning) Comparison of modulo result is predetermined, because it is always less than 5. [moduloAlwaysTrueFalse]\n"
             "[test.cpp:3:16]: (warning) Comparison of modulo result is predetermined, because it is always less than 5. [moduloAlwaysTrueFalse]\n"
@@ -1938,7 +1954,7 @@ class TestCondition : public TestFixture {
               "    b1 = bar() % 5 < 889;\n"
               "    if(x[593] % 5 <= 5)\n"
               "        b2 = x.a % 5 == 5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:20]: (warning) Comparison of modulo result is predetermined, because it is always less than 5. [moduloAlwaysTrueFalse]\n"
             "[test.cpp:3:19]: (warning) Comparison of modulo result is predetermined, because it is always less than 5. [moduloAlwaysTrueFalse]\n"
@@ -1948,7 +1964,7 @@ class TestCondition : public TestFixture {
         check("void f() {\n"
               "    if (a % 2 + b % 2 == 2)\n"
               "        foo();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1957,21 +1973,21 @@ class TestCondition : public TestFixture {
               "    if(a==b)\n"
               "        if(a!=b)\n"
               "            cout << a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:13]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("bool foo(int a, int b) {\n"
               "    if(a==b)\n"
               "        return a!=b;\n"
               "    return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:17]: (warning) Opposite inner 'return' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("void foo(int a, int b) {\n"
               "    if(a==b)\n"
               "        if(b!=a)\n"
               "            cout << a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:13]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("void foo(int a) {\n"
@@ -1981,7 +1997,7 @@ class TestCondition : public TestFixture {
               "        else\n"
               "            cout << 100;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10] -> [test.cpp:3:14]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         // #4186
@@ -1992,7 +2008,7 @@ class TestCondition : public TestFixture {
               "        else\n"
               "            cout << 100;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // 4170
@@ -2011,7 +2027,7 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    void next();\n"
               "    const char *tok;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int i)\n"
@@ -2022,7 +2038,7 @@ class TestCondition : public TestFixture {
               "           cout << a;\n"
               "       }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int& i) {\n"
@@ -2034,7 +2050,7 @@ class TestCondition : public TestFixture {
               "        if(i<5) {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int& i);\n"
@@ -2045,7 +2061,7 @@ class TestCondition : public TestFixture {
               "        if(i<5) {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int i);\n"
@@ -2055,7 +2071,7 @@ class TestCondition : public TestFixture {
               "        if(i<5) {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:5:13]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("void foo(const int &i);\n"
@@ -2065,7 +2081,7 @@ class TestCondition : public TestFixture {
               "        if(i<5) {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:5:13]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("void foo(int i);\n"
@@ -2076,7 +2092,7 @@ class TestCondition : public TestFixture {
               "        if(i<5) {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:6:13]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("class C { void f(int &i) const; };\n" // #7028 - variable is changed by const method
@@ -2085,7 +2101,7 @@ class TestCondition : public TestFixture {
               "    c.f(i);\n"
               "    if (i != 5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // see linux revision 1f80c0cc
@@ -2099,7 +2115,7 @@ class TestCondition : public TestFixture {
               "           err = rc;\n"
               "       }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:11] -> [test.cpp:7:14]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
 
@@ -2110,7 +2126,7 @@ class TestCondition : public TestFixture {
               "    array[0] += 5;\n"
               "    if (array[0] > 2) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6227 - FP caused by simplifications of casts and known variables
@@ -2119,7 +2135,7 @@ class TestCondition : public TestFixture {
               "       B *b = dynamic_cast<B*>(a);\n"
               "       if(!b) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a) {\n"
@@ -2127,7 +2143,7 @@ class TestCondition : public TestFixture {
               "       int b = a;\n"
               "       if(!b) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16] -> [test.cpp:2:7] -> [test.cpp:4:11]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("void foo(unsigned u) {\n"
@@ -2137,7 +2153,7 @@ class TestCondition : public TestFixture {
               "      u = x;\n"
               "    }\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8186
@@ -2145,7 +2161,7 @@ class TestCondition : public TestFixture {
               "  for (int i=0;i<4;i++) {\n"
               "    if (i==5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17] -> [test.cpp:3:10]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         // #8938
@@ -2154,7 +2170,7 @@ class TestCondition : public TestFixture {
               "        GetActiveCell(&(upperleft.Col), &(upperleft.Row));\n"
               "        if (upperleft.Row == -1) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9702
@@ -2167,7 +2183,7 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    bool IsSet() const { return m_value; }\n"
               "    bool m_value = false;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #12725
@@ -2177,7 +2193,7 @@ class TestCondition : public TestFixture {
               "    b = g();\n"
               "    return b;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:16]: (style) Return value '!b' is always false [knownConditionTrueFalse]\n", errout_str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void oppositeInnerConditionPointers() {
@@ -2189,7 +2205,7 @@ class TestCondition : public TestFixture {
               "           err = rc;\n"
               "       }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void Fred::f() {\n" // daca: ace
@@ -2197,7 +2213,7 @@ class TestCondition : public TestFixture {
               "    this->next_ = n;\n"
               "    if (this->next_ != map_man_->table_) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test(float *f) {\n" // #7405
@@ -2205,13 +2221,13 @@ class TestCondition : public TestFixture {
               "    (*f) += 0.1f;\n"
               "    if(*f<10) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int * f(int * x, int * y) {\n"
               "    if(!x) return x;\n"
               "    return y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2223,7 +2239,7 @@ class TestCondition : public TestFixture {
               "    fred.dostuff();\n"
               "    if (!fred.isValid()) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19] -> [test.cpp:5:9]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("class Fred { public: bool isValid() const; void dostuff() const; };\n"
@@ -2233,7 +2249,7 @@ class TestCondition : public TestFixture {
               "    fred.dostuff();\n" // <- dostuff() is const, warn
               "    if (!fred.isValid()) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:19] -> [test.cpp:6:9]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("void f() {\n"
@@ -2242,7 +2258,7 @@ class TestCondition : public TestFixture {
               "    fred.dostuff();\n"
               "    if (!fred.isValid()) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6385 "crash in Variable::getFlag()"
@@ -2253,14 +2269,14 @@ class TestCondition : public TestFixture {
               "             qApp->removeTranslator(mTranslator);\n"
               "        }\n"
               "   }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str()); // just don't crash...
 
         check("bool f(std::ofstream &CFileStream) {\n" // #8198
               "  if(!CFileStream.good()) { return; }\n"
               "  CFileStream << \"abc\";\n"
               "  if (!CFileStream.good()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2271,7 +2287,7 @@ class TestCondition : public TestFixture {
               "       x = do_something();\n"
               "       if (x != -1) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5750 - another fp when undeclared variable is used
@@ -2280,7 +2296,7 @@ class TestCondition : public TestFixture {
               "       r += 3;\n"
               "       if (r > w) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6574 - another fp when undeclared variable is used
@@ -2289,7 +2305,7 @@ class TestCondition : public TestFixture {
               "       i++;\n"
               "       if(!i) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // undeclared array
@@ -2298,7 +2314,7 @@ class TestCondition : public TestFixture {
               "    a[x] -= dt;\n"
               "    if (a[x] < 0) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6313 - false positive: opposite conditions in nested if blocks when condition changed
@@ -2308,7 +2324,7 @@ class TestCondition : public TestFixture {
               "      if(!var){}\n"
               "      else {}\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // daca hyphy
@@ -2317,7 +2333,7 @@ class TestCondition : public TestFixture {
               "    rec.Delete(i);\n"
               "    if (rec.lLength!=0) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2331,7 +2347,7 @@ class TestCondition : public TestFixture {
               "    doStuff(&s);\n"
               "    if (hasFailed) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (style) Condition '!hasFailed' is always true [knownConditionTrueFalse]\n", errout_str());
     }
 
@@ -2342,7 +2358,7 @@ class TestCondition : public TestFixture {
               "  if (x<4) {\n"
               "    if (x==5) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n",
                       errout_str());
         check("void f(int x) {\n"
@@ -2350,14 +2366,14 @@ class TestCondition : public TestFixture {
               "  if (x<4) {\n"
               "    if (x!=5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x!=5' is always true [knownConditionTrueFalse]\n", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<4) {\n"
               "    if (x>5) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n",
                       errout_str());
         check("void f(int x) {\n"
@@ -2365,7 +2381,7 @@ class TestCondition : public TestFixture {
               "  if (x<4) {\n"
               "    if (x>=5) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n",
                       errout_str());
         check("void f(int x) {\n"
@@ -2373,14 +2389,14 @@ class TestCondition : public TestFixture {
               "  if (x<4) {\n"
               "    if (x<5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x<5' is always true [knownConditionTrueFalse]\n", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<4) {\n"
               "    if (x<=5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x<=5' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x) {\n"
@@ -2388,49 +2404,49 @@ class TestCondition : public TestFixture {
               "  if (x<5) {\n"
               "    if (x==4) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<5) {\n"
               "    if (x!=4) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<5) {\n"
               "    if (x!=6) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x!=6' is always true [knownConditionTrueFalse]\n", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<5) {\n"
               "    if (x>4) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x>4' is always false [knownConditionTrueFalse]\n", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<5) {\n"
               "    if (x>=4) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<5) {\n"
               "    if (x<4) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<5) {\n"
               "    if (x<=4) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x<=4' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // first comparison: >
@@ -2439,35 +2455,35 @@ class TestCondition : public TestFixture {
               "  if (x>4) {\n"
               "    if (x==5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x>4) {\n"
               "    if (x>5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x>4) {\n"
               "    if (x>=5) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x>=5' is always true [knownConditionTrueFalse]\n", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x>4) {\n"
               "    if (x<5) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x<5' is always false [knownConditionTrueFalse]\n", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x>4) {\n"
               "    if (x<=5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
@@ -2475,7 +2491,7 @@ class TestCondition : public TestFixture {
               "  if (x>5) {\n"
               "    if (x==4) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n",
                       errout_str());
         check("void f(int x) {\n"
@@ -2483,21 +2499,21 @@ class TestCondition : public TestFixture {
               "  if (x>5) {\n"
               "    if (x>4) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x>4' is always true [knownConditionTrueFalse]\n", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x>5) {\n"
               "    if (x>=4) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x>=4' is always true [knownConditionTrueFalse]\n", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x>5) {\n"
               "    if (x<4) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n",
                       errout_str());
         check("void f(int x) {\n"
@@ -2505,7 +2521,7 @@ class TestCondition : public TestFixture {
               "  if (x>5) {\n"
               "    if (x<=4) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n",
                       errout_str());
 
@@ -2513,62 +2529,62 @@ class TestCondition : public TestFixture {
               "  if (x < 4) {\n"
               "    if (10 < x) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:12]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
     }
 
     void oppositeInnerCondition3() {
-        check("void f3(char c) { if(c=='x') if(c=='y') {}}");
+        check("void f3(char c) { if(c=='x') if(c=='y') {}}\n");
         ASSERT_EQUALS("[test.cpp:1:23] -> [test.cpp:1:34]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f4(char *p) { if(*p=='x') if(*p=='y') {}}");
+        check("void f4(char *p) { if(*p=='x') if(*p=='y') {}}\n");
         ASSERT_EQUALS("[test.cpp:1:25] -> [test.cpp:1:37]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f5(const char * const p) { if(*p=='x') if(*p=='y') {}}");
+        check("void f5(const char * const p) { if(*p=='x') if(*p=='y') {}}\n");
         ASSERT_EQUALS("[test.cpp:1:38] -> [test.cpp:1:50]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f5(const char * const p) { if('x'==*p) if('y'==*p) {}}");
+        check("void f5(const char * const p) { if('x'==*p) if('y'==*p) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:39] -> [test.cpp:1:51]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f6(char * const p) { if(*p=='x') if(*p=='y') {}}");
+        check("void f6(char * const p) { if(*p=='x') if(*p=='y') {}}\n");
         ASSERT_EQUALS("[test.cpp:1:32] -> [test.cpp:1:44]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f7(const char * p) { if(*p=='x') if(*p=='y') {}}");
+        check("void f7(const char * p) { if(*p=='x') if(*p=='y') {}}\n");
         ASSERT_EQUALS("[test.cpp:1:32] -> [test.cpp:1:44]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f8(int i) { if(i==4) if(i==2) {}}");
+        check("void f8(int i) { if(i==4) if(i==2) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:22] -> [test.cpp:1:31]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f9(int *p) { if (*p==4) if(*p==2) {}}");
+        check("void f9(int *p) { if (*p==4) if(*p==2) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:25] -> [test.cpp:1:35]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f10(int * const p) { if (*p==4) if(*p==2) {}}");
+        check("void f10(int * const p) { if (*p==4) if(*p==2) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:33] -> [test.cpp:1:43]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f11(const int *p) { if (*p==4) if(*p==2) {}}");
+        check("void f11(const int *p) { if (*p==4) if(*p==2) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:32] -> [test.cpp:1:42]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f12(const int * const p) { if (*p==4) if(*p==2) {}}");
+        check("void f12(const int * const p) { if (*p==4) if(*p==2) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:39] -> [test.cpp:1:49]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("struct foo {\n"
               "    int a;\n"
               "    int b;\n"
               "};\n"
-              "void f(foo x) { if(x.a==4) if(x.b==2) {}}");
+              "void f(foo x) { if(x.a==4) if(x.b==2) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct foo {\n"
               "    int a;\n"
               "    int b;\n"
               "};\n"
-              "void f(foo x) { if(x.a==4) if(x.b==4) {}}");
+              "void f(foo x) { if(x.a==4) if(x.b==4) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f3(char a, char b) { if(a==b) if(a==0) {}}");
+        check("void f3(char a, char b) { if(a==b) if(a==0) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int x) { if (x == 1) if (x != 1) {} }");
+        check("void f(int x) { if (x == 1) if (x != 1) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:23] -> [test.cpp:1:35]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
     }
 
@@ -2576,8 +2592,8 @@ class TestCondition : public TestFixture {
         check("void f(int x) {\n"
               "  if (a>3 && x > 100) {\n"
               "    if (x < 10) {}\n"
-              "  }"
-              "}");
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16] -> [test.cpp:3:11]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("void f(bool x, const int a, const int b) {\n"
@@ -2628,57 +2644,69 @@ class TestCondition : public TestFixture {
     }
 
     void oppositeInnerConditionEmpty() {
-        check("void f1(const std::string &s) { if(s.size() > 42) if(s.empty()) {}}");
+        check("void f1(const std::string &s) { if(s.size() > 42) if(s.empty()) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:45] -> [test.cpp:1:61]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f1(const std::string &s) { if(s.size() > 0) if(s.empty()) {}}");
+        check("void f1(const std::string &s) { if(s.size() > 0) if(s.empty()) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:45] -> [test.cpp:1:60]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f1(const std::string &s) { if(s.size() < 0) if(s.empty()) {}} "); // <- CheckOther reports: checking if unsigned expression is less than zero
+        check("void f1(const std::string &s) { if(s.size() < 0) if(s.empty()) {}} \n"); // <- CheckOther reports: checking if unsigned expression is less than zero
         ASSERT_EQUALS("[test.cpp:1:45] -> [test.cpp:1:60]: (style) Condition 's.empty()' is always false [knownConditionTrueFalse]\n", errout_str());
 
-        check("void f1(const std::string &s) { if(s.empty()) if(s.size() > 42) {}}");
+        check("void f1(const std::string &s) { if(s.empty()) if(s.size() > 42) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:43] -> [test.cpp:1:59]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("template<class T> void f1(const T &s) { if(s.size() > 42) if(s.empty()) {}}");
+        check("template<class T> void f1(const T &s) { if(s.size() > 42) if(s.empty()) {}}\n");
         ASSERT_EQUALS("", errout_str()); //We don't know the type of T so we don't know the relationship between size() and empty(). e.g. s might be a 50 tonne truck with nothing in it.
 
-        check("void f2(const std::wstring &s) { if(s.empty()) if(s.size() > 42) {}}");
+        check("void f2(const std::wstring &s) { if(s.empty()) if(s.size() > 42) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:44] -> [test.cpp:1:60]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f1(QString s) { if(s.isEmpty()) if(s.length() > 42) {}}");
+        check("void f1(QString s) { if(s.isEmpty()) if(s.length() > 42) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:34] -> [test.cpp:1:52]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f1(const std::string &s, bool b) { if(s.empty() || ((s.size() == 1) && b)) {}}");
+        check("void f1(const std::string &s, bool b) { if(s.empty() || ((s.size() == 1) && b)) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f1(const std::string &x, const std::string &y) { if(x.size() > 42) if(y.empty()) {}}");
+        check("void f1(const std::string &x, const std::string &y) { if(x.size() > 42) if(y.empty()) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f1(const std::string &x, const std::string &y) { if(y.empty()) if(x.size() > 42) {}}");
+        check("void f1(const std::string &x, const std::string &y) { if(y.empty()) if(x.size() > 42) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f1(const std::string v[10]) { if(v[0].size() > 42) if(v[1].empty()) {}}");
+        check("void f1(const std::string v[10]) { if(v[0].size() > 42) if(v[1].empty()) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f1(const std::string &s) { if(s.size() <= 1) if(s.empty()) {}}");
+        check("void f1(const std::string &s) { if(s.size() <= 1) if(s.empty()) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f1(const std::string &s) { if(s.size() <= 2) if(s.empty()) {}}");
+        check("void f1(const std::string &s) { if(s.size() <= 2) if(s.empty()) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f1(const std::string &s) { if(s.size() < 2) if(s.empty()) {}}");
+        check("void f1(const std::string &s) { if(s.size() < 2) if(s.empty()) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f1(const std::string &s) { if(s.size() >= 0) if(s.empty()) {}} "); // CheckOther says: Unsigned expression 's.size()' can't be negative so it is unnecessary to test it. [unsignedPositive]
+        check("void f1(const std::string &s) { if(s.size() >= 0) if(s.empty()) {}} \n"); // CheckOther says: Unsigned expression 's.size()' can't be negative so it is unnecessary to test it. [unsignedPositive]
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f1(const std::string &s) { if(42 < s.size()) if(s.empty()) {}}\n");
+        ASSERT_EQUALS("[test.cpp:1:39] -> [test.cpp:1:61]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
+
+        check("void f1(const std::string &s) { if(s.empty()) if(42 < s.size()) {}}\n");
+        ASSERT_EQUALS("[test.cpp:1:43] -> [test.cpp:1:53]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
+
+        check("void f(const std::string& s, int n) {\n" // #14716
+              "    if (s.size() < n)\n"
+              "        if (s.empty()) {}\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // TODO: These are identical condition since size cannot be negative
-        check("void f1(const std::string &s) { if(s.size() <= 0) if(s.empty()) {}}");
+        check("void f1(const std::string &s) { if(s.size() <= 0) if(s.empty()) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
         // TODO: These are identical condition since size cannot be negative
-        check("void f1(const std::string &s) { if(s.size() < 1) if(s.empty()) {}}");
+        check("void f1(const std::string &s) { if(s.size() < 1) if(s.empty()) {}}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2693,7 +2721,7 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    void bar();\n"
               "    int get() const;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct CD {\n"
@@ -2721,7 +2749,7 @@ class TestCondition : public TestFixture {
               "  bool b = f();\n"
               "  x += 1;\n"
               "  if (!b && f()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(double d) {\n"
@@ -2750,10 +2778,10 @@ class TestCondition : public TestFixture {
     }
 
     void identicalInnerCondition() {
-        check("void f1(int a, int b) { if(a==b) if(a==b) {}}");
+        check("void f1(int a, int b) { if(a==b) if(a==b) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:29] -> [test.cpp:1:38]: (warning) Identical inner 'if' condition is always true. [identicalInnerCondition]\n", errout_str());
 
-        check("void f2(int a, int b) { if(a!=b) if(a!=b) {}}");
+        check("void f2(int a, int b) { if(a!=b) if(a!=b) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:29] -> [test.cpp:1:38]: (warning) Identical inner 'if' condition is always true. [identicalInnerCondition]\n", errout_str());
 
         // #6645 false negative: condition is always false
@@ -2762,38 +2790,38 @@ class TestCondition : public TestFixture {
               "     if(a) {}\n"
               "     else  {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6] -> [test.cpp:3:9]: (warning) Identical inner 'if' condition is always true. [identicalInnerCondition]\n", errout_str());
 
         check("bool f(int a, int b) {\n"
               "    if(a == b) { return a == b; }\n"
               "    return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10] -> [test.cpp:2:27]: (warning) Identical inner 'return' condition is always true. [identicalInnerCondition]\n", errout_str());
 
         check("bool f(bool a) {\n"
               "    if(a) { return a; }\n"
               "    return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int* f(int* a, int * b) {\n"
               "    if(a) { return a; }\n"
               "    return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int* f(std::shared_ptr<int> a, std::shared_ptr<int> b) {\n"
               "    if(a.get()) { return a.get(); }\n"
               "    return b.get();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int * x; };\n"
               "int* f(A a, int * b) {\n"
               "    if(a.x) { return a.x; }\n"
               "    return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -2805,7 +2833,7 @@ class TestCondition : public TestFixture {
               "        get_value (&value);\n"
               "        if ((value >> 28) & 1) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkP("#define TYPE_1 \"a\"\n" // #13202
@@ -2817,61 +2845,85 @@ class TestCondition : public TestFixture {
                "        if (s == TYPE_2) {}\n"
                "        else if (s == TYPE_3) {}\n"
                "    }\n"
-               "}");
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(const int* p, const int* e) {\n" // #14595
+              "    for (; p;) {\n"
+              "        if (p == e) {}\n"
+              "        if (p) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:4:13]: (warning) Identical inner 'if' condition is always true. [identicalInnerCondition]\n", errout_str());
+
+        check("int f(const int *q, const int *s) {\n" // #14711
+              "    if (*q && *s)\n"
+              "        return *q;\n"
+              "    return 0;\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(int x, int y) {\n"
+              "    int a[] = { x, y };\n"
+              "    if (a[0] == 1) {\n"
+              "        if (a[0] == 1) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:14] -> [test.cpp:4:18]: (warning) Identical inner 'if' condition is always true. [identicalInnerCondition]\n",
+                      errout_str());
     }
 
     void identicalConditionAfterEarlyExit() {
         check("void f(int x) {\n" // #8137
               "  if (x > 100) { return; }\n"
               "  if (x > 100) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:9]: (warning) Identical condition 'x>100', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         check("bool f(int x) {\n"
               "  if (x > 100) { return false; }\n"
               "  return x > 100;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:12]: (warning) Identical condition and return expression 'x>100', return value is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         check("void f(int x) {\n"
               "  if (x > 100) { return; }\n"
               "  if (x > 100 || y > 100) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:9]: (warning) Identical condition 'x>100', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         check("void f(int x) {\n"
               "  if (x > 100) { return; }\n"
               "  if (x > 100 && y > 100) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:9]: (warning) Identical condition 'x>100', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         check("void f(int x) {\n"
               "  if (x > 100) { return; }\n"
               "  if (abc) {}\n"
               "  if (x > 100) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:9]: (warning) Identical condition 'x>100', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         check("void f(int x) {\n"
               "  if (x > 100) { return; }\n"
               "  while (abc) { y = x; }\n"
               "  if (x > 100) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:9]: (warning) Identical condition 'x>100', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         ASSERT_THROW_INTERNAL(check("void f(int x) {\n"  // #8217 - crash for incomplete code
                                     "  if (x > 100) { return; }\n"
                                     "  X(do);\n"
                                     "  if (x > 100) {}\n"
-                                    "}"),
+                                    "}\n"),
                               SYNTAX);
 
         check("void f(const int *i) {\n"
               "  if (!i) return;\n"
               "  if (!num1tok) { *num1 = *num2; }\n"
               "  if (!i) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7] -> [test.cpp:4:7]: (warning) Identical condition '!i', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         check("void C::f(Tree &coreTree) {\n" // daca
@@ -2879,7 +2931,7 @@ class TestCondition : public TestFixture {
               "    return;\n"
               "  coreTree.dostuff();\n"
               "  if(!coreTree.build()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C { void f(const Tree &coreTree); };\n"
@@ -2888,7 +2940,7 @@ class TestCondition : public TestFixture {
               "    return;\n"
               "  coreTree.dostuff();\n"
               "  if(!coreTree.build()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6] -> [test.cpp:6:6]: (warning) Identical condition '!coreTree.build()', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         check("void f(int x) {\n" // daca: labplot
@@ -2901,7 +2953,7 @@ class TestCondition : public TestFixture {
               "    else return 4;\n"
               "  }\n"
               "  return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static int failed = 0;\n"
@@ -2909,14 +2961,14 @@ class TestCondition : public TestFixture {
               "  if (failed) return;\n"
               "  checkBuffer();\n"
               "  if (failed) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // daca icu
         check("void f(const uint32_t *section, int32_t  start) {\n"
               "  if(10<=section[start]) { return; }\n"
               "  if(++start<100 && 10<=section[start]) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // daca iqtree
@@ -2926,7 +2978,7 @@ class TestCondition : public TestFixture {
               "  if (ch != '|') return;\n"
               "  in >> ch;\n"
               "  if (ch != '|') {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8924
@@ -2937,7 +2989,7 @@ class TestCondition : public TestFixture {
               "        if (this->FileIndex < 0) return;\n"
               "    }\n"
               "    int FileIndex;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:29]: (style) Condition 'this->FileIndex<0' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #8858 - #if
@@ -2949,7 +3001,7 @@ class TestCondition : public TestFixture {
               "    ret = bar2();\n"
               "#endif\n"
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10456
@@ -2987,7 +3039,7 @@ class TestCondition : public TestFixture {
               "    x += y;\n"
               "    if (x == 0) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
@@ -2995,7 +3047,7 @@ class TestCondition : public TestFixture {
               "    x += y;\n"
               "    if (x == 1) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int * x, int * y) {\n"
@@ -3003,7 +3055,32 @@ class TestCondition : public TestFixture {
               "    (*y)++;\n"
               "    if (x[*y] == 0) {}\n"
               "  }\n"
-              "}");
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void g(int[]);\n" // #14724
+              "void f(int a[]) {\n"
+              "    if (a[0] == 1) {\n"
+              "        g(a);\n"
+              "        if (a[0] == 1) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void overlappingInnerCondition() {
+        check("void f(int x) {\n"
+              "    if (x == 1) {\n"
+              "        if (x & 7) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:15]: (warning) Overlapping inner 'if' condition is always true. [overlappingInnerCondition]\n", errout_str());
+
+        check("void f(int x) {\n"
+              "    if (x & 7) {\n"
+              "        if (x == 1) {}\n"
+              "    }\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3011,102 +3088,102 @@ class TestCondition : public TestFixture {
     void clarifyCondition1() {
         check("void f() {\n"
               "    if (x = b() < 0) {}\n" // don't simplify and verify this code
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:8]: (style) Suspicious condition (assignment + comparison); Clarify expression with parentheses. [clarifyCondition]\n", errout_str());
 
         check("void f(int i) {\n"
               "    for (i = 0; i < 10; i++) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    x = a<int>(); if (x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    if (x = b < 0 ? 1 : 2) {}\n" // don't simplify and verify this code
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int y = rand(), z = rand();\n"
               "    if (y || (!y && z));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Redundant condition: !y. 'y || (!y && z)' is equivalent to 'y || z' [redundantCondition]\n", errout_str());
 
         check("void f() {\n"
               "    int y = rand(), z = rand();\n"
               "    if (y || !y && z);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Redundant condition: !y. 'y || (!y && z)' is equivalent to 'y || z' [redundantCondition]\n", errout_str());
 
         check("void f() {\n"
               "    if (!a || a && b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (style) Redundant condition: a. '!a || (a && b)' is equivalent to '!a || b' [redundantCondition]\n", errout_str());
 
 
         check("void f(const Token *tok) {\n"
               "    if (!tok->next()->function() ||\n"
               "        (tok->next()->function() && tok->next()->function()->isConstructor()));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:34]: (style) Redundant condition: tok->next()->function(). '!A || (A && B)' is equivalent to '!A || B' [redundantCondition]\n", errout_str());
 
         check("void f() {\n"
               "    if (!tok->next()->function() ||\n"
               "        (!tok->next()->function() && tok->next()->function()->isConstructor()));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    if (!tok->next()->function() ||\n"
               "        (!tok2->next()->function() && tok->next()->function()->isConstructor()));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const Token *tok) {\n"
               "    if (!tok->next(1)->function(1) ||\n"
               "        (tok->next(1)->function(1) && tok->next(1)->function(1)->isConstructor()));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:36]: (style) Redundant condition: tok->next(1)->function(1). '!A || (A && B)' is equivalent to '!A || B' [redundantCondition]\n", errout_str());
 
         check("void f() {\n"
               "    if (!tok->next()->function(1) ||\n"
               "        (tok->next()->function(2) && tok->next()->function()->isConstructor()));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   int y = rand(), z = rand();\n"
               "   if (y==0 || y!=0 && z);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (style) Redundant condition: y!=0. 'y==0 || (y!=0 && z)' is equivalent to 'y==0 || z' [redundantCondition]\n", errout_str());
 
         check("void f() {\n"
               "  if (x>0 || (x<0 && y)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Test Token::expressionString, TODO move this test
         check("void f() {\n"
               "  if (!dead || (dead && (*it).ticks > 0)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Redundant condition: dead. '!dead || (dead && (*it).ticks>0)' is equivalent to '!dead || (*it).ticks>0' [redundantCondition]\n", errout_str());
 
         check("void f() {\n"
               "  if (!x || (x && (2>(y-1)))) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Redundant condition: x. '!x || (x && 2>(y-1))' is equivalent to '!x || 2>(y-1)' [redundantCondition]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "    if (a || (a && b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Redundant condition: a. 'a || (a && b)' is equivalent to 'a' [redundantCondition]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "    if (a && (a || b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Redundant condition: a. 'a && (a || b)' is equivalent to 'a' [redundantCondition]\n", errout_str());
     }
 
@@ -3114,14 +3191,14 @@ class TestCondition : public TestFixture {
     void clarifyCondition2() {
         check("void f() {\n"
               "    if (x & 3 == 2) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:8]: (style) Suspicious condition (bitwise operator + comparison); Clarify expression with parentheses. [clarifyCondition]\n"
                       "[test.cpp:2:11]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses. [clarifyCondition]\n"
                       "[test.cpp:2:11]: (style) Condition 'x&3==2' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    if (a & fred1.x == fred2.y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:8]: (style) Suspicious condition (bitwise operator + comparison); Clarify expression with parentheses. [clarifyCondition]\n"
                       "[test.cpp:2:11]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses. [clarifyCondition]\n"
                       , errout_str());
@@ -3131,50 +3208,50 @@ class TestCondition : public TestFixture {
     void clarifyCondition3() {
         check("void f(int w) {\n"
               "    if(!w & 0x8000) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses. [clarifyCondition]\n", errout_str());
 
         check("void f(int w) {\n"
               "    if((!w) & 0x8000) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    if (x == foo() & 2) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses. [clarifyCondition]\n", errout_str());
 
         check("void f() {\n"
               "    if (2 & x == foo()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses. [clarifyCondition]\n", errout_str());
 
         check("void f() {\n"
               "    if (2 & (x == foo())) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(std::list<int> &ints) { }");
+        check("void f(std::list<int> &ints) { }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { A<x &> a; }");
+        check("void f() { A<x &> a; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { a(x<y|z,0); }", dinit(CheckOptions, $.cpp = false));  // language is c => there are never templates
+        check("void f() { a(x<y|z,0); }\n", dinit(CheckOptions, $.cpp = false));  // language is c => there are never templates
         ASSERT_EQUALS("[test.c:1:17]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses. [clarifyCondition]\n", errout_str());
 
-        check("class A<B&,C>;");
+        check("class A<B&,C>;\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    if (result != (char *)&inline_result) { }\n" // don't simplify and verify cast
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8495
         check("void f(bool a, bool b) {\n"
               "    C & a & b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3189,13 +3266,13 @@ class TestCondition : public TestFixture {
               "     {\n"
               "         return left.first < right.first;\n"
               "     }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void clarifyCondition5() { // ticket #3609 (using | in template instantiation)
         check("template<bool B> struct CWinTraits;\n"
-              "CWinTraits<WS_CHILD|WS_VISIBLE>::GetWndStyle(0);");
+              "CWinTraits<WS_CHILD|WS_VISIBLE>::GetWndStyle(0);\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3204,7 +3281,7 @@ class TestCondition : public TestFixture {
               "SharedPtr& operator=( SharedPtr<Y> const & r ) {\n"
               "    px = r.px;\n"
               "    return *this;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3213,7 +3290,7 @@ class TestCondition : public TestFixture {
         check("void f(bool error) {\n"
               "    bool & withoutSideEffects=found.first->second;\n" // Declaring a reference to a boolean; & is no operator at all
               "    execute(secondExpression, &programMemory, &result, &error);\n" // Unary &
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3223,24 +3300,24 @@ class TestCondition : public TestFixture {
         check("bool a();\n"
               "bool f(bool b) {\n"
               "    return (a() & b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(bool *a, bool b) {\n"
               "    return (a[10] & b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { bool a; };\n"
               "bool f(struct A a, bool b) {\n"
               "    return (a.a & b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { bool a; };\n"
               "bool f(struct A a, bool b) {\n"
               "    return (A::a & b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3248,7 +3325,7 @@ class TestCondition : public TestFixture {
         check("void png_parse(uint64_t init, int buf_size) {\n"
               "    if (init == 0x89504e470d0a1a0a || init == 0x8a4d4e470d0a1a0a)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3257,7 +3334,7 @@ class TestCondition : public TestFixture {
               "void foo() {\n"
               "    if( ( value >= 0x7ff0000000000001ULL )\n"
               "            && ( value <= 0x7fffffffffffffffULL ) );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3267,7 +3344,7 @@ class TestCondition : public TestFixture {
               "  int x1 = s->x;\n"
               "  int x2 = s->x;\n"
               "  if (x1 == 10 && x2 == 10) {}\n" // <<
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10] -> [test.cpp:4:22]: (style) Condition 'x2==10' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f ()\n"// #8220
@@ -3283,30 +3360,35 @@ class TestCondition : public TestFixture {
               "        a ++;\n"
               "    }\n"
               "    ret = b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:27] -> [test.cpp:8:40]: (style) Condition '8<a' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n" // #4842
               "  int x = 0;\n"
               "  if (a) { return; }\n" // <- this is just here to fool simplifyKnownVariabels
               "  if (!x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Condition '!x' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("bool f(int x) {\n"
               "  if(x == 0) { x++; return x == 0; }\n"
               "  return false;\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:2:8] -> [test.cpp:2:30]: (style) Return value 'x==0' is always false [knownConditionTrueFalse]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #6898 (Token::expressionString)
               "  int x = 0;\n"
               "  A(x++ == 1);\n"
               "  A(x++ == 2);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:3:9]: (style) Condition 'x++==1' is always false [knownConditionTrueFalse]\n"
-                      "[test.cpp:4:9]: (style) Condition 'x++==2' is always false [knownConditionTrueFalse]\n",
-                      errout_str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "  int x = 0;\n"
+              "  if (x++ == 1) {}\n" // <- no warning as there is a side effect
+              "  if (x++ == 2) {}\n" // <- no warning as there is a side effect
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
         check("bool foo(int bar) {\n"
               "  bool ret = false;\n"
@@ -3315,77 +3397,83 @@ class TestCondition : public TestFixture {
               "  if (bar == 2)\n"
               "    ret = true;\n"
               "  return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f1(const std::string &s) { if(s.empty()) if(s.size() == 0) {}}");
+        check("void f1(const std::string &s) { if(s.empty()) if(s.size() == 0) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:43] -> [test.cpp:1:59]: (style) Condition 's.size()==0' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "   int buf[42];\n"
               "   if( buf != 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (style) Condition 'buf!=0' is always true [knownConditionTrueFalse]\n", errout_str()); // #8924
 
         check("void f() {\n"
               "   int buf[42];\n"
               "   if( !buf ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8]: (style) Condition '!buf' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "   int buf[42];\n"
               "   bool b = buf;\n"
               "   if( b ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (style) Condition 'b' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "   int buf[42];\n"
               "   bool b = buf;\n"
               "   if( !b ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (style) Condition '!b' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "   int buf[42];\n"
               "   int * p = nullptr;\n"
               "   if( buf == p ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Condition 'buf==p' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(bool x) {\n"
               "   int buf[42];\n"
               "   if( buf || x ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8]: (style) Condition 'buf' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int * p) {\n"
               "   int buf[42];\n"
               "   if( buf == p ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   int buf[42];\n"
               "   int p[42];\n"
               "   if( buf == p ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   int buf[42];\n"
               "   if( buf == 1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
+        check("std::string a[3];\n" // #15065
+              "void f() {\n"
+              "   if (a) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:8]: (style) Condition 'a' is always true [knownConditionTrueFalse]\n", errout_str());
+
         // Avoid FP when condition comes from macro
         check("#define NOT !\n"
               "void f() {\n"
               "  int x = 0;\n"
               "  if (a) { return; }\n" // <- this is just here to fool simplifyKnownVariabels
               "  if (NOT x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("#define M  x != 0\n"
@@ -3393,27 +3481,27 @@ class TestCondition : public TestFixture {
               "  int x = 0;\n"
               "  if (a) { return; }\n" // <- this is just here to fool simplifyKnownVariabels
               "  if (M) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("#define IF(X)  if (X && x())\n"
               "void f() {\n"
               "  IF(1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Avoid FP for sizeof condition
         check("void f() {\n"
               "  if (sizeof(char) != 123) {}\n"
               "  if (123 != sizeof(char)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int x = 123;\n"
               "  if (sizeof(char) != x) {}\n"
               "  if (x != sizeof(char)) {}\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'sizeof(char)!=x' is always true\n"
                            "[test.cpp:4]: (style) Condition 'x!=sizeof(char)' is always true\n", "", errout_str());
 
@@ -3422,7 +3510,7 @@ class TestCondition : public TestFixture {
         check("void f() {\n"
               "  int x = 0;\n"
               "  assert(x == 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9363 - do not warn about value passed to function
@@ -3430,7 +3518,7 @@ class TestCondition : public TestFixture {
               "    if (b) {\n"
               "        if (bar(!b)) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -3445,7 +3533,7 @@ class TestCondition : public TestFixture {
               "        assert((int)(0==0));\n"
               "        assert((int)(0==0) && \"bla\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7750 char literals in boolean expressions
@@ -3454,7 +3542,7 @@ class TestCondition : public TestFixture {
               "  if(L'b'){}\n"
               "  if(1 && 'c'){}\n"
               "  int x = 'd' ? 1 : 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8206 - knownCondition always false
@@ -3462,26 +3550,26 @@ class TestCondition : public TestFixture {
               "{\n"
               "        if(i > 4)\n"
               "          for( int x = 0; i < 3; ++x){}\n" // <<
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14] -> [test.cpp:4:29]: (style) Condition 'i<3' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // Skip literals
-        check("void f() { if(true) {} }");
+        check("void f() { if(true) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { if(false) {} }");
+        check("void f() { if(false) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { if(!true) {} }");
+        check("void f() { if(!true) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { if(!false) {} }");
+        check("void f() { if(!false) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { if(0) {} }");
+        check("void f() { if(0) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { if(1) {} }");
+        check("void f() { if(1) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int i) {\n"
@@ -3490,37 +3578,37 @@ class TestCondition : public TestFixture {
               "    else if (!b && i == 1) {}\n"
               "    if (b)\n"
               "    {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (style) Condition '!b' is always true [knownConditionTrueFalse]\n", errout_str());
 
-        check("bool f() { return nullptr; }");
+        check("bool f() { return nullptr; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("enum E { A };\n"
-              "bool f() { return A; }");
+              "bool f() { return A; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    const int x = 0;\n"
               "    return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f(void){return 1/abs(10);}");
+        check("int f(void){return 1/abs(10);}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    int x = 0;\n"
               "    return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    const int a = 50;\n"
               "    const int b = 52;\n"
               "    return a+b;\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:4:13]: (style) Return value 'a+b' is always true [knownConditionTrueFalse]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    int a = 50;\n"
@@ -3528,7 +3616,7 @@ class TestCondition : public TestFixture {
               "    a++;\n"
               "    b++;\n"
               "    return a+b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool& g();\n"
@@ -3536,7 +3624,7 @@ class TestCondition : public TestFixture {
               "    bool & b = g();\n"
               "    b = false;\n"
               "    return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -3545,13 +3633,13 @@ class TestCondition : public TestFixture {
               "        b = false;\n"
               "        return b;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(long maxtime) {\n"
               "  if (std::time(0) > maxtime)\n"
               "    return std::time(0) > maxtime;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(double param) {\n"
@@ -3561,7 +3649,7 @@ class TestCondition : public TestFixture {
               "  }\n"
               "  if (param<0.)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int i) {\n"
@@ -3571,7 +3659,7 @@ class TestCondition : public TestFixture {
               "  }\n"
               "  if (cond && (42==i))\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // 8842 crash
@@ -3581,15 +3669,15 @@ class TestCondition : public TestFixture {
               "  void f() {\n"
               "    if (b) return;\n"
               "  }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const char* x, const char* t) {\n"
               "    if (!(strcmp(x, y) == 0)) { return; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(const int a[]){ if (a == 0){} }");
+        check("void f(const int a[]){ if (a == 0){} }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -3600,52 +3688,70 @@ class TestCondition : public TestFixture {
               "  bool c = s<s;\n"
               "  if (c) return 0;\n"
               "  else return 42;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("long X::g(bool unknown, int& result) {\n"
+        check("long g(bool unknown, int& result) {\n"
               "    long ret = 0;\n"
               "    bool f = false;\n"
               "    f = f || unknown;\n"
               "    f ? result = 42 : ret = -1;\n"
               "    return ret;\n"
-              "}");
-        ASSERT_EQUALS("", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) Condition 'f' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("int f(void *handle) {\n"
               "    if (!handle) return 0;\n"
               "    if (handle) return 1;\n"
               "    else return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:9]: (style) Condition 'handle' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("int f(void *handle) {\n"
               "    if (handle == 0) return 0;\n"
               "    if (handle) return 1;\n"
               "    else return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Condition 'handle' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("int f(void *handle) {\n"
               "    if (handle != 0) return 0;\n"
               "    if (handle) return 1;\n"
               "    else return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16] -> [test.cpp:3:9]: (warning) Identical condition 'handle!=0', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         check("int f(void *handle) {\n"
               "    if (handle != nullptr) return 0;\n"
               "    if (handle) return 1;\n"
               "    else return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16] -> [test.cpp:3:9]: (warning) Identical condition 'handle!=nullptr', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
+        check("void f(const char* p) {\n" // #13716
+              "    if (!p) {}\n"
+              "    if (p == NULL) {}\n"
+              "    if (p == nullptr) {}\n"
+              "    if (p == 0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:11]: (style) The if condition is the same as the previous if condition [duplicateCondition]\n",
+                      errout_str());
+
+        check("int f(const char* p) {\n" // #13717
+              "    if (p) {}\n"
+              "    else if (!p) {}\n"
+              "    else if (p == NULL) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:14]: (style) Expression is always true because 'else if' condition is opposite to previous condition at line 2. [multiCondition]\n"
+                      "[test.cpp:4:16]: (style) Expression is always false because 'else if' condition matches previous condition at line 3. [multiCondition]\n",
+                      errout_str());
+
         check("void f(void* x, void* y) {\n"
               "    if (x == nullptr && y == nullptr)\n"
               "        return;\n"
               "    if (x == nullptr || y == nullptr)\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void* g();\n"
@@ -3656,7 +3762,7 @@ class TestCondition : public TestFixture {
               "            break;\n"
               "    }\n"
               "    if (a) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void* g();\n"
@@ -3665,26 +3771,26 @@ class TestCondition : public TestFixture {
               "        a = g();\n"
               "    }\n"
               "    if (a) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12] -> [test.cpp:6:9]: (style) Condition 'a' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int * x, bool b) {\n"
               "    if (!x && b) {}\n"
               "    else if (x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const std::string x=\"xyz\";\n"
               "    if(!x.empty()){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8]: (style) Condition '!x.empty()' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("std::string g();\n"
               "void f() {\n"
               "    const std::string msg = g();\n"
               "    if(!msg.empty()){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *array, int size ) {\n"
@@ -3693,7 +3799,7 @@ class TestCondition : public TestFixture {
               "            continue;\n"
               "        if(array){}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (style) Condition 'array' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int *array, int size ) {\n"
@@ -3702,7 +3808,7 @@ class TestCondition : public TestFixture {
               "            continue;\n"
               "        else if(array){}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:17]: (style) Condition 'array' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #9277
@@ -3712,7 +3818,7 @@ class TestCondition : public TestFixture {
               "        return 0;\n"
               "    else\n"
               "        return 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9954
@@ -3734,7 +3840,7 @@ class TestCondition : public TestFixture {
               "  bool x = false;\n"
               "  g({0, 1}, x);\n"
               "  if (x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9318
@@ -3745,7 +3851,7 @@ class TestCondition : public TestFixture {
               "    return;\n"
               "  auto b = dynamic_cast<B*>(x);\n"
               "  if (b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
@@ -3763,7 +3869,7 @@ class TestCondition : public TestFixture {
         check("bool g();\n"
               "void f(bool x) {\n"
               "    if (x) while(x) x = g();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // isLikelyStream
@@ -3773,7 +3879,7 @@ class TestCondition : public TestFixture {
               "       iss >> x;\n"
               "       if (!iss) break;\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9332
@@ -3785,14 +3891,14 @@ class TestCondition : public TestFixture {
               "    void* c = a.g();\n"
               "    if (!c) return;\n"
               "    bool compare = c == b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9361
         check("void f(char c) {\n"
               "    if (c == '.') {}\n"
               "    else if (isdigit(c) != 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9351
@@ -3800,7 +3906,7 @@ class TestCondition : public TestFixture {
               "    const bool b = x < 42;\n"
               "    if(b) return b?0:-1;\n"
               "    return 42;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:3:18]: (style) Condition 'b' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #9362
@@ -3810,7 +3916,7 @@ class TestCondition : public TestFixture {
               "    if((v != 0x00)) {\n"
               "        if( (v & 0x01) == 0x00) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9367
@@ -3819,25 +3925,25 @@ class TestCondition : public TestFixture {
               "        return;\n"
               "    if (x % 360L == 0)\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int a, int b) {\n"
               "    static const int x = 10;\n"
               "    return x == 1 ? a : b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const bool x = false;\n"
               "void f() {\n"
               "    if (x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const bool x = false;\n"
               "void f() {\n"
               "    if (!x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9709
@@ -3848,7 +3954,7 @@ class TestCondition : public TestFixture {
               "    if (r != nullptr)\n"
               "        ok = a != 0;\n"
               "    if (ok) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9816
@@ -4037,7 +4143,7 @@ class TestCondition : public TestFixture {
         check("void foo(unsigned int max) {\n"
               "    unsigned int num = max - 1;\n"
               "    if (num < 0) {}\n" // <- do not report knownConditionTrueFalse
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10297
@@ -4092,7 +4198,7 @@ class TestCondition : public TestFixture {
         check("bool f(bool a, bool b) {\n"
               "    return a || ! b || ! a;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:2:24]: (style) Return value '!a' is always true [knownConditionTrueFalse]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:2:24]: (style) Condition '!a' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #10148
         check("void f(int i) {\n"
@@ -4319,8 +4425,7 @@ class TestCondition : public TestFixture {
               "		if (w) {}\n"
               "	}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4:24]: (style) Condition 'v<2' is always true [knownConditionTrueFalse]\n"
-                      "[test.cpp:5:7]: (style) Condition 'w' is always true [knownConditionTrueFalse]\n",
+        ASSERT_EQUALS("[test.cpp:5:7]: (style) Condition 'w' is always true [knownConditionTrueFalse]\n",
                       errout_str());
 
         check("void f(double d) {\n" // #10792
@@ -4376,7 +4481,7 @@ class TestCondition : public TestFixture {
         ASSERT_EQUALS("", errout_str());
 
         // #8358
-        check("void f(double d) { if ((d * 0) != 0) {} }");
+        check("void f(double d) { if ((d * 0) != 0) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6870
@@ -4423,9 +4528,12 @@ class TestCondition : public TestFixture {
               "void foo() {\n"
               "    if (bar(1) == 0 && bar(1) > 0) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3:16]: (style) Condition 'bar(1)==0' is always false [knownConditionTrueFalse]\n"
-                      "[test.cpp:3:31]: (style) Condition 'bar(1)>0' is always true [knownConditionTrueFalse]\n",
-                      errout_str());
+        // TODO handle function calls without side effects better
+        // these warnings are shown if isConstExpression is removed from the checker
+        TODO_ASSERT_EQUALS("[test.cpp:3:16]: (style) Condition 'bar(1)==0' is always false [knownConditionTrueFalse]\n"
+                           "[test.cpp:3:31]: (style) Condition 'bar(1)>0' is always true [knownConditionTrueFalse]\n",
+                           "",
+                           errout_str());
 
         check("struct S { int bar(int i) const; };\n"
               "void foo(const S& s) {\n"
@@ -4500,9 +4608,12 @@ class TestCondition : public TestFixture {
               "void f() {\n"
               "    if (g() == 1 && g() == -1) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3:13]: (style) Condition 'g()==1' is always false [knownConditionTrueFalse]\n"
-                      "[test.cpp:3:25]: (style) Condition 'g()==-1' is always true [knownConditionTrueFalse]\n",
-                      errout_str());
+        // TODO handle function calls without side effects better
+        // these warnings are shown if isConstExpression is removed from the checker
+        TODO_ASSERT_EQUALS("[test.cpp:3:13]: (style) Condition 'g()==1' is always false [knownConditionTrueFalse]\n"
+                           "[test.cpp:3:25]: (style) Condition 'g()==-1' is always true [knownConditionTrueFalse]\n",
+                           "",
+                           errout_str());
 
         // #9817
         check("void f(float x) {\n"
@@ -4523,8 +4634,7 @@ class TestCondition : public TestFixture {
         ASSERT_EQUALS("[test.cpp:3:12]: (style) Condition '!s.empty()' is always false [knownConditionTrueFalse]\n"
                       "[test.cpp:4:19]: (style) Condition 's.empty()' is always true [knownConditionTrueFalse]\n"
                       "[test.cpp:5:16]: (style) Condition 's.empty()' is always true [knownConditionTrueFalse]\n"
-                      "[test.cpp:6:9]: (style) Condition '(bool)0' is always false [knownConditionTrueFalse]\n"
-                      "[test.cpp:7:19]: (style) Return value 's.empty()' is always true [knownConditionTrueFalse]\n",
+                      "[test.cpp:6:9]: (style) Condition '(bool)0' is always false [knownConditionTrueFalse]\n",
                       errout_str());
 
         check("int f(bool b) {\n"
@@ -4535,17 +4645,17 @@ class TestCondition : public TestFixture {
               "    if (b) return static_cast<int>(1);\n"
               "    return (int)0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:6:35]: (style) Return value 'static_cast<int>(1)' is always true [knownConditionTrueFalse]\n"
-                      "[test.cpp:7:12]: (style) Return value '(int)0' is always false [knownConditionTrueFalse]\n",
-                      errout_str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() { return 3; }\n"
               "int g() { return f(); }\n"
               "int h() { if (f()) {} }\n"
               "int i() { return f() == 3; }\n");
-        ASSERT_EQUALS("[test.cpp:3:16]: (style) Condition 'f()' is always true [knownConditionTrueFalse]\n"
-                      "[test.cpp:4:22]: (style) Return value 'f()==3' is always true [knownConditionTrueFalse]\n",
-                      errout_str());
+        // TODO handle function calls without side effects better
+        // if the isConstExpression is removed from the checker then this warning is shown
+        TODO_ASSERT_EQUALS("[test.cpp:3:16]: (style) Condition 'f()' is always true [knownConditionTrueFalse]\n",
+                           "",
+                           errout_str());
 
         check("int f() {\n"
               "    const char *n;\n"
@@ -4582,11 +4692,7 @@ class TestCondition : public TestFixture {
               "        if (o[1] == '\\0') {}\n"
               "    }\n"
               "}\n");
-        if (std::numeric_limits<char>::is_signed) {
-            ASSERT_EQUALS("[test.cpp:6:18]: (style) Condition 'o[1]=='\\0'' is always false [knownConditionTrueFalse]\n", errout_str());
-        } else {
-            ASSERT_EQUALS("[test.cpp:4:25] -> [test.cpp:6:18]: (style) Condition 'o[1]=='\\0'' is always false [knownConditionTrueFalse]\n", errout_str());
-        }
+        ASSERT_EQUALS("[test.cpp:6:18]: (style) Condition 'o[1]=='\\0'' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x) {\n" // #11449
               "    int i = x;\n"
@@ -4616,12 +4722,10 @@ class TestCondition : public TestFixture {
               "void f() {\n"
               "    int i = 5;\n"
               "    int* p = &i;\n"
-              "    g(i == 7);\n"
-              "    g(p == nullptr);\n"
+              "    g(i == 7);\n" // <- argument is always false but cannot be removed therefore warning should NOT be written
+              "    g(p == nullptr);\n" // <- argument is always false but cannot be removed therefore warning should NOT be written
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5:9]: (style) Condition 'i==7' is always false [knownConditionTrueFalse]\n"
-                      "[test.cpp:6:9]: (style) Condition 'p==nullptr' is always false [knownConditionTrueFalse]\n",
-                      errout_str());
+        ASSERT_EQUALS("", errout_str());
 
         check("enum E { E0, E1 };\n"
               "void f() {\n"
@@ -4660,13 +4764,14 @@ class TestCondition : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5:18]: (style) Condition 'S::s' is always true [knownConditionTrueFalse]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:5:18]: (warning) Identical inner 'if' condition is always true. [identicalInnerCondition]\n", errout_str());
 
         check("void f() {\n" // #10811
               "    int i = 0;\n"
               "    if ((i = g(), 1) != 0) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3:22]: (style) Condition '(i=g(),1)!=0' is always true [knownConditionTrueFalse]\n", errout_str());
+        // the condition is always true but we can't remove the condition therefore no warning is expected
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(unsigned i) {\n"
               "    const int a[2] = {};\n"
@@ -4740,7 +4845,7 @@ class TestCondition : public TestFixture {
               "        return 9;\n"
               " \n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int g();\n" // #10561
@@ -4755,7 +4860,7 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    catch (...) {}\n"
               "    return b ? 1 : 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -4787,6 +4892,133 @@ class TestCondition : public TestFixture {
               "    }\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #14392
+              "    bool g() const { return m; }\n"
+              "    bool m{};\n"
+              "};\n"
+              "bool f(S s) {\n"
+              "    if (s.g()) {\n"
+              "        bool b = s.g();\n"
+              "        return b;\n"
+              "    }\n"
+              "    return false;\n"
+              "}\n");
+        TODO_ASSERT_EQUALS("[test.cpp:6:12] -> [test.cpp:7:21]: (style) Assigned value 's.g()' is always true [knownConditionTrueFalse]\n", "", errout_str());
+
+        check("static bool parse(int r) {\n" // #15031
+              "    bool res = false;\n"
+              "    return res;\n"
+              "}\n"
+              "\n"
+              "int main (void) {\n"
+              "    bool res = parse(1101);\n"
+              "    return res;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(const void* p) {\n" // #11519
+              "    bool b = false;\n"
+              "    if (!p && !b) {}\n"
+              "    if (!b) {}\n"
+              "    (void)b;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:15]: (style) Condition '!b' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:4:9]: (style) Condition '!b' is always true [knownConditionTrueFalse]\n",
+                      errout_str());
+
+        check("struct C {\n" // #12532
+              "    void f() const;\n"
+              "    int a, b;\n"
+              "};\n"
+              "void C::f() const {\n"
+              "    if (a)\n"
+              "        return;\n"
+              "    if (!b) {}\n"
+              "    if (a) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:9] -> [test.cpp:9:9]: (warning) Identical condition 'a', second condition is always false [identicalConditionAfterEarlyExit]\n",
+                      errout_str());
+
+        check("bool b() { return false; }\n" // #10452
+              "void f() {\n"
+              "    if (b()) {}\n"
+              "    if (!b()) {}\n"
+              "}\n");
+        // TODO handle function calls without side effects better
+        // these warnings are shown if isConstExpression is removed from the checker
+        TODO_ASSERT_EQUALS("[test.cpp:3:10]: (style) Condition 'b()' is always false [knownConditionTrueFalse]\n"
+                           "[test.cpp:4:9]: (style) Condition '!b()' is always true [knownConditionTrueFalse]\n",
+                           "",
+                           errout_str());
+
+        check("int g();\n" // a value modified inside a nested branch must be lowered to possible
+              "void f(int outer, int inner) {\n"
+              "    int bits = 0;\n"
+              "    if (outer) {\n"
+              "        if (inner == 1)\n"
+              "            bits = g();\n"
+              "    }\n"
+              "    if (bits > 0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int g();\n" // the modifying branch has an escaping sibling - still must be lowered
+              "void f(int t, int u) {\n"
+              "    int v = 0;\n"
+              "    if (t) {\n"
+              "        if (u == 2)\n"
+              "            v = g();\n"
+              "        else\n"
+              "            return;\n"
+              "    }\n"
+              "    if (v > 0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("bool f(int x) {\n" // only the innermost else escapes - x is 0 or >1 afterwards, not known
+              "    if (!x) {}\n"
+              "    else if (x > 1) {}\n"
+              "    else return false;\n"
+              "    return x ? false : true;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("bool f(int x) {\n" // the branch's fall-through path must clear the escape
+              "    if (x) { if (x > 1) {} else return false; }\n"
+              "    return x ? false : true;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    if (42) {}\n"
+              "    if (42U) {}\n"
+              "    if (42L) {}\n"
+              "    if (42UL) {}\n"
+              "    if (42LL) {}\n"
+              "    if (042) {}\n"
+              "    if (0x42) {}\n"
+              "    if (0b101010) {}\n"
+              "    if (!42) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9]: (style) Condition '42' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:3:9]: (style) Condition '42U' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:4:9]: (style) Condition '42L' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:5:9]: (style) Condition '42UL' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:6:9]: (style) Condition '42LL' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:7:9]: (style) Condition '042' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:8:9]: (style) Condition '0x42' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:9:9]: (style) Condition '0b101010' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:10:9]: (style) Condition '!42' is always false [knownConditionTrueFalse]\n",
+                      errout_str());
+
+        check("bool g(int = 1) __attribute__((pure));\n"
+              "void f() {\n"
+              "    int n = 0;\n"
+              "    if (g(), n) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:12]: (style) Condition 'g(),n' is always false [knownConditionTrueFalse]\n",
+                      errout_str());
     }
 
     void alwaysTrueSymbolic()
@@ -4806,10 +5038,10 @@ class TestCondition : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:2:10] -> [test.cpp:4:14]: (style) Condition 'x==y' is always false [knownConditionTrueFalse]\n", errout_str());
 
-        check("void f(bool a, bool b) {  if (a == b && a && !b){} }");
+        check("void f(bool a, bool b) {  if (a == b && a && !b){} }\n");
         ASSERT_EQUALS("[test.cpp:1:41] -> [test.cpp:1:46]: (style) Condition '!b' is always false [knownConditionTrueFalse]\n", errout_str());
 
-        check("bool f(bool a, bool b) { if(a && b && (!a)){} }");
+        check("bool f(bool a, bool b) { if(a && b && (!a)){} }\n");
         ASSERT_EQUALS("[test.cpp:1:29] -> [test.cpp:1:40]: (style) Condition '!a' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x, int y) {\n"
@@ -4828,7 +5060,7 @@ class TestCondition : public TestFixture {
               "        return (index++) >= s;\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:15] -> [test.cpp:6:26]: (style) Return value '(index++)>=s' is always false [knownConditionTrueFalse]\n", errout_str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
               "  a *b() const;\n"
@@ -5020,6 +5252,52 @@ class TestCondition : public TestFixture {
               "    if (i < 0) {}\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("struct A { int x; int y; };\n"
+              "void use(int);\n"
+              "void test(A a) {\n"
+              "    int i = a.x;\n"
+              "    int j = a.x;\n"
+              "    use(j);\n"
+              "    if (i == j) {}\n"
+              "    if (i == a.x) {}\n"
+              "    if (j == a.x) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:7:11]: (style) Condition 'i==j' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:8:11]: (style) Condition 'i==a.x' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:9:11]: (style) Condition 'j==a.x' is always true [knownConditionTrueFalse]\n",
+                      errout_str());
+
+        check("struct S { int i; };\n" // #12795
+              "struct T {\n"
+              "    std::map<std::string, S*> m;\n"
+              "    S* get(const std::string& s) { return m[s]; }\n"
+              "    void modify() { for (const auto& e : m) e.second->i = 0; }\n"
+              "};\n"
+              "void f(T& t) {\n"
+              "    const S* p = t.get(\"abc\");\n"
+              "    const int o = p->i;\n"
+              "    t.modify();\n"
+              "    if (p->i == o) {}\n"
+              "}\n");
+        TODO_ASSERT_EQUALS("",
+                           "[test.cpp:11:14]: (style) Condition 'p->i==o' is always true [knownConditionTrueFalse]\n",
+                           errout_str());
+
+        check("void f(int x) {\n" // #12320
+              "    int a = 0, b = 0, c = 0;\n"
+              "    a = x;\n"
+              "    if (a) b = x;\n"
+              "    if (b) c = x;\n"
+              "    if (c) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(int a, int b) {\n" // #11437
+              "    a = a < b ? b : a;\n"
+              "    if (a != b) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void alwaysTrueInfer() {
@@ -5028,7 +5306,7 @@ class TestCondition : public TestFixture {
               "        x++;\n"
               "        if (x == 1) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:4:15]: (style) Condition 'x==1' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x) {\n"
@@ -5036,7 +5314,7 @@ class TestCondition : public TestFixture {
               "        x++;\n"
               "        if (x != 1) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:4:15]: (style) Condition 'x!=1' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #6890
@@ -5048,7 +5326,7 @@ class TestCondition : public TestFixture {
               "        if (x == -1) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:6:15]: (style) Condition 'x==-1' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -5059,7 +5337,7 @@ class TestCondition : public TestFixture {
               "        if (x != -1) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:6:15]: (style) Condition 'x!=-1' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -5070,7 +5348,7 @@ class TestCondition : public TestFixture {
               "        if (x >= -1) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:6:15]: (style) Condition 'x>=-1' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -5081,7 +5359,7 @@ class TestCondition : public TestFixture {
               "        if (x > -1) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:6:15]: (style) Condition 'x>-1' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -5092,7 +5370,7 @@ class TestCondition : public TestFixture {
               "        if (x < -1) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:6:15]: (style) Condition 'x<-1' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -5103,7 +5381,7 @@ class TestCondition : public TestFixture {
               "        if (x <= -1) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:6:15]: (style) Condition 'x<=-1' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -5114,7 +5392,7 @@ class TestCondition : public TestFixture {
               "        if (x > 7) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:6:15]: (style) Condition 'x>7' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -5125,7 +5403,7 @@ class TestCondition : public TestFixture {
               "        if (x > 9) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int i) {\n"
@@ -5136,7 +5414,7 @@ class TestCondition : public TestFixture {
               "        if (x > 10) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #11100
@@ -5161,7 +5439,7 @@ class TestCondition : public TestFixture {
               "        if(pos > 0)\n"
               "            --pos;\n"
               "    return pos;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:5:16]: (style) Condition 'pos>0' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #9721
@@ -5170,7 +5448,7 @@ class TestCondition : public TestFixture {
               "        if ( (x>255) || (-128>x) )\n"
               "            return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:30]: (style) Condition '-128>x' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #8778
@@ -5184,7 +5462,7 @@ class TestCondition : public TestFixture {
         check("void f() {\n"
               "    for(int x = 0; x < 3; ++x)\n"
               "        if(x == -5) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (style) Condition 'x==-5' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #8407
@@ -5193,7 +5471,7 @@ class TestCondition : public TestFixture {
               "        if(i == 0) return 1; \n" // <<
               "        else return 0;\n"
               "    return -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (style) Condition 'i==0' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(unsigned int u1, unsigned int u2) {\n"
@@ -5219,7 +5497,7 @@ class TestCondition : public TestFixture {
         check("bool f(const int *p, const int *q) {\n"
               "    return p != NULL && q != NULL && p == NULL;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:40]: (style) Return value 'p==NULL' is always false [knownConditionTrueFalse]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:40]: (style) Condition 'p==NULL' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("struct S {\n" // #11789
               "    std::vector<int> v;\n"
@@ -5251,6 +5529,21 @@ class TestCondition : public TestFixture {
               "    std::size_t x;\n"
               "};\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("int g();\n" // #13441
+              "void f() {\n"
+              "    int (*p)() = g;\n"
+              "    if (p == nullptr) {}\n"
+              "    if (g == nullptr) {}\n"
+              "    auto q = g;\n"
+              "    if (q == nullptr) {}\n"
+              "};\n");
+        TODO_ASSERT_EQUALS("[test.cpp:4:11]: (style) Condition 'p==nullptr' is always false [knownConditionTrueFalse]\n"
+                           "[test.cpp:5:11]: (style) Condition 'g==nullptr' is always false [knownConditionTrueFalse]\n"
+                           "[test.cpp:7:11]: (style) Condition 'q==nullptr' is always false [knownConditionTrueFalse]\n",
+                           "[test.cpp:4:11]: (style) Condition 'p==nullptr' is always false [knownConditionTrueFalse]\n"
+                           "[test.cpp:5:11]: (style) Condition 'g==nullptr' is always false [knownConditionTrueFalse]\n",
+                           errout_str());
     }
 
     void alwaysTrueContainer() {
@@ -5265,7 +5558,7 @@ class TestCondition : public TestFixture {
               "        c2(g );\n"
               "    if ( !g.empty() )\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int flag) {\n"
@@ -5276,7 +5569,7 @@ class TestCondition : public TestFixture {
               "        c2(g );\n"
               "    if ( !g.empty() )\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -5322,11 +5615,7 @@ class TestCondition : public TestFixture {
               "       buffer.back() == '\\n' ||\n"
               "       buffer.back() == '\\0') {}\n"
               "}\n");
-        if (std::numeric_limits<char>::is_signed) {
-            ASSERT_EQUALS("[test.cpp:5:22]: (style) Condition 'buffer.back()=='\\0'' is always false [knownConditionTrueFalse]\n", errout_str());
-        } else {
-            ASSERT_EQUALS("[test.cpp:3:22] -> [test.cpp:5:22]: (style) Condition 'buffer.back()=='\\0'' is always false [knownConditionTrueFalse]\n", errout_str());
-        }
+        ASSERT_EQUALS("[test.cpp:5:22]: (style) Condition 'buffer.back()=='\\0'' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #9353
         check("struct X { std::string s; };\n"
@@ -5351,7 +5640,7 @@ class TestCondition : public TestFixture {
         check("bool f(const std::string& a, const std::string& b) {\n"
               "    return a.empty() || (b.empty() && a.empty());\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:19] -> [test.cpp:2:46]: (style) Return value 'a.empty()' is always false [knownConditionTrueFalse]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:19] -> [test.cpp:2:46]: (style) Condition 'a.empty()' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("struct A {\n"
               "    struct iterator;\n"
@@ -5491,7 +5780,7 @@ class TestCondition : public TestFixture {
               "            {;}\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:20] -> [test.cpp:7:27]: (style) Condition 'i==1' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #10863
@@ -5520,7 +5809,7 @@ class TestCondition : public TestFixture {
         check("void f() {\n" // #8192
               "    for (int i = 0; i > 10; ++i) {}\n"
               "}\n");
-        TODO_ASSERT_EQUALS("[test.cpp:2]: (style) Condition 'i>10' is always false\n", "", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:23]: (style) Condition 'i>10' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    for (int i = 1000; i < 20; ++i) {}\n"
@@ -5590,12 +5879,38 @@ class TestCondition : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void alwaysTrueSideEffect() {
+        check("bool check(const char* const);\n" // #14416
+              "void create(const char*);\n"
+              "void f(const char* n) {\n"
+              "    if (!check(n)) {\n"
+              "        create(n);\n"
+              "        if (check(n)) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void alwaysTruePremiumMisra() {
+        const char code[] = "void f() {\n"
+                            "  if (3 > 2) {}\n"
+                            "}\n";
+
+        check(code);
+        ASSERT_EQUALS("", errout_str());
+
+        Settings misraSettings;
+        misraSettings.premiumArgs = "--misra-c-2012";
+        check(code, misraSettings);
+        ASSERT_EQUALS("[test.cpp:2:9]: (style) Condition '3>2' is always true [knownConditionTrueFalse]\n", errout_str());
+    }
+
     void multiConditionAlwaysTrue() {
         check("void f() {\n"
               "  int val = 0;\n"
               "  if (val < 0) continue;\n"
               "  if (val > 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -5603,7 +5918,7 @@ class TestCondition : public TestFixture {
               "  if (val < 0) {\n"
               "    if (val > 0) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -5611,7 +5926,7 @@ class TestCondition : public TestFixture {
               "  if (val < 0) {\n"
               "    if (val < 0) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -5619,7 +5934,7 @@ class TestCondition : public TestFixture {
               "  int foo = 0;\n"
               "  if (activate) {}\n"
               "  else if (foo) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Condition 'activate' is always false [knownConditionTrueFalse]\n"
                       "[test.cpp:5:12]: (style) Condition 'foo' is always false [knownConditionTrueFalse]\n", errout_str());
 
@@ -5627,7 +5942,7 @@ class TestCondition : public TestFixture {
         check("void f() {\n"
               "  const int b[2] = { 1,0 };\n"
               "  if(b[1] == 2) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Condition 'b[1]==2' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #9878
@@ -5644,40 +5959,40 @@ class TestCondition : public TestFixture {
         check("void f(bool x) {\n"
               "    if(x) {}\n"
               "    if(x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:8] -> [test.cpp:3:8]: (style) The if condition is the same as the previous if condition [duplicateCondition]\n",
                       errout_str());
 
         check("void f(int x) {\n"
               "    if(x == 1) {}\n"
               "    if(x == 1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10] -> [test.cpp:3:10]: (style) The if condition is the same as the previous if condition [duplicateCondition]\n",
                       errout_str());
 
         check("void f(int x) {\n"
               "    if(x == 1) {}\n"
               "    if(x == 2) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if(x == 1) {}\n"
               "    if(x != 1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool x) {\n"
               "    if(x) {}\n"
               "    g();\n"
               "    if(x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if(x == 1) { x++; }\n"
               "    if(x == 1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8996
@@ -5689,7 +6004,7 @@ class TestCondition : public TestFixture {
               "  g(d);\n"
               "  if (a) {}\n"
               "  if (b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9311
@@ -5704,7 +6019,7 @@ class TestCondition : public TestFixture {
               "  g(d);\n"
               "  if (a) {}\n"
               "  if (b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8993
@@ -5712,7 +6027,7 @@ class TestCondition : public TestFixture {
               "  auto y = x;\n"
               "  if (x.empty()) y = \"1\";\n"
               "  if (y.empty()) return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9106
@@ -5720,7 +6035,7 @@ class TestCondition : public TestFixture {
               "void f(A a, int c) {\n"
               "    if (a.b) a.b = c;\n"
               "    if (a.b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -5842,7 +6157,7 @@ class TestCondition : public TestFixture {
               "        ;\n"
               "    if (other.mPA.cols > 0 && other.mPA.rows > 0)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // #11202
@@ -5864,32 +6179,54 @@ class TestCondition : public TestFixture {
               "    if (strlen(s2) > 0) {}\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void g(int*);\n" // #14428
+              "int f(int* const p) {\n"
+              "    int i = 0;\n"
+              "    if (*p == 0)\n"
+              "        g(p);\n"
+              "    if (*p == 0)\n"
+              "        i = 1;\n"
+              "    return i;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void g(const int*);\n"
+              "int f(const int* const p) {\n"
+              "    int i = 0;\n"
+              "    if (*p == 0)\n"
+              "        g(p);\n"
+              "    if (*p == 0)\n"
+              "        i = 1;\n"
+              "    return i;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:12] -> [test.cpp:6:12]: (style) The if condition is the same as the previous if condition [duplicateCondition]\n", errout_str());
     }
 
     void checkInvalidTestForOverflow() {
         check("void f(char *p, unsigned int x) {\n"
               "    assert((p + x) < p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (warning) Invalid test for overflow '(p+x)<p'; pointer overflow is undefined behavior. Some mainstream compilers remove such overflow tests when optimising the code and assume it's always false. [invalidTestForOverflow]\n", errout_str());
 
         check("void f(char *p, unsigned int x) {\n"
               "    assert((p + x) >= p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (warning) Invalid test for overflow '(p+x)>=p'; pointer overflow is undefined behavior. Some mainstream compilers remove such overflow tests when optimising the code and assume it's always true. [invalidTestForOverflow]\n", errout_str());
 
         check("void f(char *p, unsigned int x) {\n"
               "    assert(p > (p + x));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning) Invalid test for overflow 'p>(p+x)'; pointer overflow is undefined behavior. Some mainstream compilers remove such overflow tests when optimising the code and assume it's always false. [invalidTestForOverflow]\n", errout_str());
 
         check("void f(char *p, unsigned int x) {\n"
               "    assert(p <= (p + x));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning) Invalid test for overflow 'p<=(p+x)'; pointer overflow is undefined behavior. Some mainstream compilers remove such overflow tests when optimising the code and assume it's always true. [invalidTestForOverflow]\n", errout_str());
 
         check("void f(signed int x) {\n" // unsigned overflow => don't warn
               "    assert(x + 100U < x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -5897,57 +6234,57 @@ class TestCondition : public TestFixture {
 
 #define MSG(EXPR, RESULT)   "[test.cpp:1:30]: (warning) Invalid test for overflow '" EXPR "'; signed integer overflow is undefined behavior. Some mainstream compilers remove such overflow tests when optimising the code and assume it's always " RESULT ". [invalidTestForOverflow]\n"
 
-        check("int f(int x) { return x + 10 > x; }");
+        check("int f(int x) { return x + 10 > x; }\n");
         ASSERT_EQUALS(MSG("x+10>x", "true"), errout_str());
 
-        check("int f(int x) { return x + 10 >= x; }");
+        check("int f(int x) { return x + 10 >= x; }\n");
         ASSERT_EQUALS(MSG("x+10>=x", "true"), errout_str());
 
-        check("int f(int x) { return x + 10 < x; }");
+        check("int f(int x) { return x + 10 < x; }\n");
         ASSERT_EQUALS(MSG("x+10<x", "false"), errout_str());
 
-        check("int f(int x) { return x + 10 <= x; }");
+        check("int f(int x) { return x + 10 <= x; }\n");
         ASSERT_EQUALS(MSG("x+10<=x", "false"), errout_str());
 
-        check("int f(int x) { return x - 10 > x; }");
+        check("int f(int x) { return x - 10 > x; }\n");
         ASSERT_EQUALS(MSG("x-10>x", "false"), errout_str());
 
-        check("int f(int x) { return x - 10 >= x; }");
+        check("int f(int x) { return x - 10 >= x; }\n");
         ASSERT_EQUALS(MSG("x-10>=x", "false"), errout_str());
 
-        check("int f(int x) { return x - 10 < x; }");
+        check("int f(int x) { return x - 10 < x; }\n");
         ASSERT_EQUALS(MSG("x-10<x", "true"), errout_str());
 
-        check("int f(int x) { return x - 10 <= x; }");
+        check("int f(int x) { return x - 10 <= x; }\n");
         ASSERT_EQUALS(MSG("x-10<=x", "true"), errout_str());
 
         // x + y < x
 #undef MSG
 #define MSG(EXPR, RESULT)   "[test.cpp:1:36]: (warning) Invalid test for overflow '" EXPR "'; signed integer overflow is undefined behavior. Some mainstream compilers removes handling of overflows when optimising the code and change the code to '" RESULT "'. [invalidTestForOverflow]\n"
 
-        check("int f(int x, int y) { return x + y < x; }");
+        check("int f(int x, int y) { return x + y < x; }\n");
         ASSERT_EQUALS(MSG("x+y<x", "y<0"), errout_str());
 
-        check("int f(int x, int y) { return x + y <= x; }");
+        check("int f(int x, int y) { return x + y <= x; }\n");
         ASSERT_EQUALS(MSG("x+y<=x", "y<=0"), errout_str());
 
-        check("int f(int x, int y) { return x + y > x; }");
+        check("int f(int x, int y) { return x + y > x; }\n");
         ASSERT_EQUALS(MSG("x+y>x", "y>0"), errout_str());
 
-        check("int f(int x, int y) { return x + y >= x; }");
+        check("int f(int x, int y) { return x + y >= x; }\n");
         ASSERT_EQUALS(MSG("x+y>=x", "y>=0"), errout_str());
 
         // x - y < x
-        check("int f(int x, int y) { return x - y < x; }");
+        check("int f(int x, int y) { return x - y < x; }\n");
         ASSERT_EQUALS(MSG("x-y<x", "y>0"), errout_str());
 
-        check("int f(int x, int y) { return x - y <= x; }");
+        check("int f(int x, int y) { return x - y <= x; }\n");
         ASSERT_EQUALS(MSG("x-y<=x", "y>=0"), errout_str());
 
-        check("int f(int x, int y) { return x - y > x; }");
+        check("int f(int x, int y) { return x - y > x; }\n");
         ASSERT_EQUALS(MSG("x-y>x", "y<0"), errout_str());
 
-        check("int f(int x, int y) { return x - y >= x; }");
+        check("int f(int x, int y) { return x - y >= x; }\n");
         ASSERT_EQUALS(MSG("x-y>=x", "y<=0"), errout_str());
     }
 
@@ -5956,62 +6293,62 @@ class TestCondition : public TestFixture {
               "    enum states {A,B,C};\n"
               "    const unsigned g_flags = B|C;\n"
               "    if(g_flags & A) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (style) Condition 'g_flags&A' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    int a = 5;"
               "    if(a) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (style) Condition 'a' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    int a = 5;"
               "    while(a + 1) { a--; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a = 5;"
               "    while(a + 1) { return; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:27]: (style) Condition 'a+1' is always true [knownConditionTrueFalse]\n", errout_str());
     }
 
     void alwaysTrueFalseInLogicalOperators() {
         check("bool f();\n"
-              "void foo() { bool x = true; if(x||f()) {}}");
+              "void foo() { bool x = true; if(x||f()) {}}\n");
         ASSERT_EQUALS("[test.cpp:2:32]: (style) Condition 'x' is always true [knownConditionTrueFalse]\n", errout_str());
 
-        check("void foo(bool b) { bool x = true; if(x||b) {}}");
+        check("void foo(bool b) { bool x = true; if(x||b) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:38]: (style) Condition 'x' is always true [knownConditionTrueFalse]\n", errout_str());
 
-        check("void foo(bool b) { if(true||b) {}}");
+        check("void foo(bool b) { if(true||b) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f();\n"
-              "void foo() { bool x = false; if(x||f()) {}}");
+              "void foo() { bool x = false; if(x||f()) {}}\n");
         ASSERT_EQUALS("[test.cpp:2:33]: (style) Condition 'x' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("bool f();\n"
-              "void foo() { bool x = false; if(x&&f()) {}}");
+              "void foo() { bool x = false; if(x&&f()) {}}\n");
         ASSERT_EQUALS("[test.cpp:2:33]: (style) Condition 'x' is always false [knownConditionTrueFalse]\n", errout_str());
 
-        check("void foo(bool b) { bool x = false; if(x&&b) {}}");
+        check("void foo(bool b) { bool x = false; if(x&&b) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:39]: (style) Condition 'x' is always false [knownConditionTrueFalse]\n", errout_str());
 
-        check("void foo(bool b) { if(false&&b) {}}");
+        check("void foo(bool b) { if(false&&b) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f();\n"
-              "void foo() { bool x = true; if(x&&f()) {}}");
+              "void foo() { bool x = true; if(x&&f()) {}}\n");
         ASSERT_EQUALS("[test.cpp:2:32]: (style) Condition 'x' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #9578
         check("bool f(const std::string &s) {\n"
               "        return s.size()>2U && s[0]=='4' && s[0]=='2';\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:35] -> [test.cpp:2:48]: (style) Return value 's[0]=='2'' is always false [knownConditionTrueFalse]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:35] -> [test.cpp:2:48]: (style) Condition 's[0]=='2'' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) { if (i == 1 || 2) {} }\n"); // #12487
         ASSERT_EQUALS("[test.cpp:1:28]: (style) Condition 'i==1||2' is always true [knownConditionTrueFalse]\n", errout_str());
@@ -6019,12 +6356,26 @@ class TestCondition : public TestFixture {
         check("enum E { E1 = 1, E2 = 2 };\n"
               "void f(int i) { if (i == E1 || E2) {} }\n");
         ASSERT_EQUALS("[test.cpp:2:29]: (style) Condition 'i==E1||E2' is always true [knownConditionTrueFalse]\n", errout_str());
+
+        check("void f(bool a, bool b) {\n" // #11614
+              "    if (b) {\n"
+              "        bool x = !b || a;\n"
+              "    }\n"
+              "}\n"
+              "void g(bool a, bool b) {\n"
+              "    if (!b) {\n"
+              "        bool x = a || b;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:18]: (style) Condition '!b' is always false [knownConditionTrueFalse]\n"
+                      "[test.cpp:7:9] -> [test.cpp:8:23]: (style) Condition 'b' is always false [knownConditionTrueFalse]\n",
+                      errout_str());
     }
 
     void pointerAdditionResultNotNull() {
         check("void f(char *ptr) {\n"
               "  if (ptr + 1 != 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Comparison is wrong. Result of 'ptr+1' can't be 0 unless there is pointer overflow, and pointer overflow is undefined behaviour. [pointerAdditionResultNotNull]\n", errout_str());
     }
 
@@ -6034,7 +6385,7 @@ class TestCondition : public TestFixture {
         check("void f(int& x, int y) {\n"
               "    if (x == y)\n"
               "        x = y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: style: Assignment 'x=y' is redundant with condition 'x==y'. [duplicateConditionalAssign]\n"
                       "[test.cpp:2:11]: note: Condition 'x==y'\n"
                       "[test.cpp:3:11]: note: Assignment 'x=y' is redundant\n", errout_str());
@@ -6042,7 +6393,7 @@ class TestCondition : public TestFixture {
         check("void f(int& x, int y) {\n"
               "    if (x != y)\n"
               "        x = y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: style: The statement 'if (x!=y) x=y' is logically equivalent to 'x=y'. [duplicateConditionalAssign]\n"
                       "[test.cpp:3:11]: note: Assignment 'x=y'\n"
                       "[test.cpp:2:11]: note: Condition 'x!=y' is redundant\n", errout_str());
@@ -6052,7 +6403,7 @@ class TestCondition : public TestFixture {
               "        x = y;\n"
               "    else\n"
               "        x = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: style: Assignment 'x=y' is redundant with condition 'x==y'. [duplicateConditionalAssign]\n"
                       "[test.cpp:2:11]: note: Condition 'x==y'\n"
                       "[test.cpp:3:11]: note: Assignment 'x=y' is redundant\n", errout_str());
@@ -6062,13 +6413,13 @@ class TestCondition : public TestFixture {
               "        x = y;\n"
               "    else\n"
               "        x = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int& x, int y) {\n"
               "    if (x == y)\n"
               "        x = y + 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g();\n"
@@ -6077,7 +6428,7 @@ class TestCondition : public TestFixture {
               "        x = y;\n"
               "        g();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(bool b) {\n"
@@ -6118,25 +6469,69 @@ class TestCondition : public TestFixture {
                       "[test.cpp:7:19]: note: Assignment 'b=false'\n"
                       "[test.cpp:7:13]: note: Condition '!b' is redundant\n",
                       errout_str());
+
+        check("void f(bool& b) {\n" // #14915
+              "    if (b == true)\n"
+              "        b = false;\n"
+              "}\n"
+              "void g(bool& b) {\n"
+              "    if (b == false)\n"
+              "        b = false;\n"
+              "}\n"
+              "void h(bool& b) {\n"
+              "    if (b != true)\n"
+              "        b = false;\n"
+              "}\n"
+              "void i(bool& b) {\n"
+              "    if (b != false)\n"
+              "        b = false;\n"
+              "}\n"
+              "void j(bool& b) {\n"
+              "    if (b == true)\n"
+              "        b = true;\n"
+              "}\n"
+              "void k(bool& b) {\n"
+              "    if (true == b)\n"
+              "        b = false;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:11]: style: The statement 'if (b==true) b=false' is logically equivalent to 'b=false'. [duplicateConditionalAssign]\n"
+                      "[test.cpp:3:11]: note: Assignment 'b=false'\n"
+                      "[test.cpp:2:11]: note: Condition 'b==true' is redundant\n"
+                      "[test.cpp:6:11]: style: The statement 'if (b==false) b=false' is redundant. [duplicateConditionalAssign]\n"
+                      "[test.cpp:7:11]: note: Assignment 'b=false'\n"
+                      "[test.cpp:6:11]: note: Condition 'b==false' is redundant\n"
+                      "[test.cpp:10:11]: style: The statement 'if (b!=true) b=false' is redundant. [duplicateConditionalAssign]\n"
+                      "[test.cpp:11:11]: note: Assignment 'b=false'\n"
+                      "[test.cpp:10:11]: note: Condition 'b!=true' is redundant\n"
+                      "[test.cpp:14:11]: style: The statement 'if (b!=false) b=false' is logically equivalent to 'b=false'. [duplicateConditionalAssign]\n"
+                      "[test.cpp:15:11]: note: Assignment 'b=false'\n"
+                      "[test.cpp:14:11]: note: Condition 'b!=false' is redundant\n"
+                      "[test.cpp:18:11]: style: The statement 'if (b==true) b=true' is redundant. [duplicateConditionalAssign]\n"
+                      "[test.cpp:19:11]: note: Assignment 'b=true'\n"
+                      "[test.cpp:18:11]: note: Condition 'b==true' is redundant\n"
+                      "[test.cpp:22:14]: style: The statement 'if (true==b) b=false' is logically equivalent to 'b=false'. [duplicateConditionalAssign]\n"
+                      "[test.cpp:23:11]: note: Assignment 'b=false'\n"
+                      "[test.cpp:22:14]: note: Condition 'true==b' is redundant\n",
+                      errout_str());
     }
 
     void checkAssignmentInCondition() {
         check("void f(std::string s) {\n"
               "    if (s=\"123\"){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Suspicious assignment in condition. Condition 's=\"123\"' is always true. [assignmentInCondition]\n", errout_str());
 
         check("void f(std::string *p) {\n"
               "    if (p=foo()){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
+        // the assignments are always false/true.. but "assignment in condition" would be a different checker
+        // knownConditionTrueFalse should only warn if code can be removed.
         check("void f(uint32_t u) {\n" // #2490
               "    if ((u = 0x00000000) || (u = 0xffffffff)) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:12]: (style) Condition 'u=0x00000000' is always false [knownConditionTrueFalse]\n"
-                      "[test.cpp:2:32]: (style) Condition 'u=0xffffffff' is always true [knownConditionTrueFalse]\n",
-                      errout_str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void compareOutOfTypeRange() {
@@ -6144,65 +6539,65 @@ class TestCondition : public TestFixture {
 
         check("void f(unsigned char c) {\n"
               "  if (c == 256) {}\n"
-              "}", settingsUnix64);
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("[test.cpp:2:12]: (style) Comparing expression of type 'unsigned char' against value 256. Condition is always false. [compareValueOutOfTypeRangeError]\n", errout_str());
 
         check("void f(unsigned char* b, int i) {\n" // #6372
               "  if (b[i] == 256) {}\n"
-              "}", settingsUnix64);
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Comparing expression of type 'unsigned char' against value 256. Condition is always false. [compareValueOutOfTypeRangeError]\n", errout_str());
 
         check("void f(unsigned char c) {\n"
               "  if (c == 255) {}\n"
-              "}", settingsUnix64);
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
               "  if (b == true) {}\n"
-              "}", settingsUnix64);
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("", errout_str());
 
         // #10372
         check("void f(signed char x) {\n"
               "  if (x == 0xff) {}\n"
-              "}", settingsUnix64);
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("[test.cpp:2:12]: (style) Comparing expression of type 'signed char' against value 255. Condition is always false. [compareValueOutOfTypeRangeError]\n", errout_str());
 
         check("void f(short x) {\n"
               "  if (x == 0xffff) {}\n"
-              "}", settingsUnix64);
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("[test.cpp:2:12]: (style) Comparing expression of type 'signed short' against value 65535. Condition is always false. [compareValueOutOfTypeRangeError]\n", errout_str());
 
         check("void f(int x) {\n"
               "  if (x == 0xffffffff) {}\n"
-              "}", settingsUnix64);
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(long x) {\n"
               "  if (x == ~0L) {}\n"
-              "}", settingsUnix64);
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(long long x) {\n"
               "  if (x == ~0LL) {}\n"
-              "}", settingsUnix64);
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int x) {\n"
               "    const int i = 0xFFFFFFFF;\n"
               "    if (x == i) {}\n"
-              "}", settingsUnix64);
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  char c;\n"
               "  if ((c = foo()) != -1) {}\n"
-              "}", settingsUnix64);
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "  if (x < 3000000000) {}\n"
-              "}", settingsUnix64);
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Comparing expression of type 'signed int' against value 3000000000. Condition is always true. [compareValueOutOfTypeRangeError]\n", errout_str());
 
         check("void f(const signed char i) {\n" // #8545
@@ -6221,28 +6616,24 @@ class TestCondition : public TestFixture {
 
         check("void f(const unsigned char u) {\n"
               "    if (u >  0) {}\n"
-              "    if (u <  0) {}\n" // warn
-              "    if (u >= 0) {}\n" // warn
+              "    if (u <  0) {}\n"
+              "    if (u >= 0) {}\n"
               "    if (u <= 0) {}\n"
               "    if (u >  255) {}\n" // warn
               "    if (u <  255) {}\n"
               "    if (u >= 255) {}\n"
               "    if (u <= 255) {}\n" // warn
               "    if (0   <  u) {}\n"
-              "    if (0   >  u) {}\n" // warn
-              "    if (0   <= u) {}\n" // warn
+              "    if (0   >  u) {}\n"
+              "    if (0   <= u) {}\n"
               "    if (0   >= u) {}\n"
               "    if (255 <  u) {}\n" // warn
               "    if (255 >  u) {}\n"
               "    if (255 <= u) {}\n"
               "    if (255 >= u) {}\n" // warn
               "}\n", settingsUnix64);
-        ASSERT_EQUALS("[test.cpp:3:14]: (style) Comparing expression of type 'const unsigned char' against value 0. Condition is always false. [compareValueOutOfTypeRangeError]\n"
-                      "[test.cpp:4:14]: (style) Comparing expression of type 'const unsigned char' against value 0. Condition is always true. [compareValueOutOfTypeRangeError]\n"
-                      "[test.cpp:6:14]: (style) Comparing expression of type 'const unsigned char' against value 255. Condition is always false. [compareValueOutOfTypeRangeError]\n"
+        ASSERT_EQUALS("[test.cpp:6:14]: (style) Comparing expression of type 'const unsigned char' against value 255. Condition is always false. [compareValueOutOfTypeRangeError]\n"
                       "[test.cpp:9:14]: (style) Comparing expression of type 'const unsigned char' against value 255. Condition is always true. [compareValueOutOfTypeRangeError]\n"
-                      "[test.cpp:11:9]: (style) Comparing expression of type 'const unsigned char' against value 0. Condition is always false. [compareValueOutOfTypeRangeError]\n"
-                      "[test.cpp:12:9]: (style) Comparing expression of type 'const unsigned char' against value 0. Condition is always true. [compareValueOutOfTypeRangeError]\n"
                       "[test.cpp:14:9]: (style) Comparing expression of type 'const unsigned char' against value 255. Condition is always false. [compareValueOutOfTypeRangeError]\n"
                       "[test.cpp:17:9]: (style) Comparing expression of type 'const unsigned char' against value 255. Condition is always true. [compareValueOutOfTypeRangeError]\n",
                       errout_str());
@@ -6252,6 +6643,41 @@ class TestCondition : public TestFixture {
               "}\n", settingsUnix64);
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Comparing expression of type 'bool' against value 2. Condition is always true. [compareValueOutOfTypeRangeError]\n",
                       errout_str());
+
+        check("void f(const std::uint32_t& u) {\n" // #9078
+              "    if (u >= UINT32_MAX) {}\n"
+              "    if (u <= UINT32_MAX) {}\n"
+              "    if (u > UINT32_MAX) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:14]: (style) Comparing expression of type 'const unsigned int &' against value 4294967295. Condition is always true. [compareValueOutOfTypeRangeError]\n"
+                      "[test.cpp:4:13]: (style) Comparing expression of type 'const unsigned int &' against value 4294967295. Condition is always false. [compareValueOutOfTypeRangeError]\n",
+                      errout_str());
+
+        check("void f() {\n"
+              "    long long ll = 1024 * 1024 * 1024;\n"
+              "    if (ll * 8 < INT_MAX) {}\n"
+              "    if (INT_MAX > ll * 8) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("bool f(int a, int b) {\n" // #12896
+              "    if (a < INT_MIN && b > INT_MAX)\n"
+              "        return true;\n"
+              "    return false;\n"
+              "}\n"
+              "bool g(int x) {\n" // #6796
+              "    return (x > INT_MAX) ? true : false;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:13]: (style) Comparing expression of type 'signed int' against value -2147483648. Condition is always false. [compareValueOutOfTypeRangeError]\n"
+                      "[test.cpp:2:28]: (style) Comparing expression of type 'signed int' against value 2147483647. Condition is always false. [compareValueOutOfTypeRangeError]\n"
+                      "[test.cpp:7:17]: (style) Comparing expression of type 'signed int' against value 2147483647. Condition is always false. [compareValueOutOfTypeRangeError]\n",
+                      errout_str());
+
+        check("void f(char c) {\n" // #11592
+              "    if (c == 128) {}\n"
+              "}\n", settingsUnix64);
+        ASSERT_EQUALS("[test.cpp:2:14]: (style) Comparing expression of type 'char' against value 128. Condition is always false. [compareValueOutOfTypeRangeError]\n",
+                      errout_str());
     }
 
     void knownConditionCast() {
@@ -6311,7 +6737,7 @@ class TestCondition : public TestFixture {
             "  }\n"
             "\n"
             "  S1 mS;\n"
-            "};"
+            "};\n"
             );
         ASSERT_EQUALS("[test.cpp:13:11] -> [test.cpp:18:13]: (style) Condition 'mS.b' is always false [knownConditionTrueFalse]\n", errout_str());
     }
diff --git a/test/testconstructors.cpp b/test/testconstructors.cpp
index 54af2d0a1c3..47a5512fc79 100644
--- a/test/testconstructors.cpp
+++ b/test/testconstructors.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,7 +52,7 @@ class TestConstructors : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check class constructors..
-        CheckClass checkClass(&tokenizer, &settings1, this);
+        CheckClassImpl checkClass(&tokenizer, settings1, *this);
         checkClass.constructors();
     }
 
@@ -92,6 +92,7 @@ class TestConstructors : public TestFixture {
         TEST_CASE(noConstructor13); // #9998
         TEST_CASE(noConstructor14); // #10770
         TEST_CASE(noConstructor15); // #5499
+        TEST_CASE(noConstructor16);
 
         TEST_CASE(forwardDeclaration); // ticket #4290/#3190
 
@@ -231,6 +232,18 @@ class TestConstructors : public TestFixture {
         TEST_CASE(uninitTemplate1); // ticket #7372
 
         TEST_CASE(unknownTemplateType);
+
+        TEST_CASE(inheritedCtor1);
+        TEST_CASE(inheritedCtor2);
+        TEST_CASE(inheritedCtor3);
+        TEST_CASE(inheritedCtor4);
+        TEST_CASE(inheritedCtor5);
+        TEST_CASE(inheritedCtor6);
+        TEST_CASE(inheritedCtor7);
+        TEST_CASE(inheritedCtor8);
+        TEST_CASE(inheritedCtor9);
+        TEST_CASE(inheritedCtor10);
+        TEST_CASE(inheritedCtor11);
     }
 
 
@@ -239,21 +252,21 @@ class TestConstructors : public TestFixture {
               "{\n"
               "public:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
               "{\n"
               "private:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:1:1]: (style) The class 'Fred' does not declare a constructor although it has private member variables which likely require initialization. [noConstructor]\n", errout_str());
 
         check("struct Fred\n"
               "{\n"
               "private:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:1:1]: (style) The struct 'Fred' does not declare a constructor although it has private member variables which likely require initialization. [noConstructor]\n", errout_str());
     }
 
@@ -266,7 +279,7 @@ class TestConstructors : public TestFixture {
               "    Fred(Fred const & other) : i(other.i) {}\n"
               "    Fred(Fred && other) : i(other.i) {}\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -276,7 +289,7 @@ class TestConstructors : public TestFixture {
               "    Fred(Fred const & other) {i=other.i}\n"
               "    Fred(Fred && other) {i=other.i}\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -286,7 +299,7 @@ class TestConstructors : public TestFixture {
               "    Fred(Fred const & other) {}\n"
               "    Fred(Fred && other) {}\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:5:5]: (warning) Member variable 'Fred::i' is not initialized in the copy constructor. [uninitMemberVar]\n"
                       "[test.cpp:6:5]: (warning) Member variable 'Fred::i' is not initialized in the move constructor. [uninitMemberVar]\n", errout_str());
@@ -297,7 +310,7 @@ class TestConstructors : public TestFixture {
               "    Fred(Fred const & other) {}\n"
               "    Fred(Fred && other) {}\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:4:5]: (warning) Member variable 'Fred::i' is not initialized in the copy constructor. [uninitMemberVar]\n"
                       "[test.cpp:5:5]: (warning) Member variable 'Fred::i' is not initialized in the move constructor. [uninitMemberVar]\n", errout_str());
@@ -311,7 +324,7 @@ class TestConstructors : public TestFixture {
               "    int i;\n"
               "};\n"
               "Fred::Fred() :i(0)\n"
-              "{ }");
+              "{ }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Fred\n"
@@ -320,7 +333,7 @@ class TestConstructors : public TestFixture {
               "    int i;\n"
               "};\n"
               "Fred::Fred()\n"
-              "{ i = 0; }");
+              "{ i = 0; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Fred\n"
@@ -329,7 +342,7 @@ class TestConstructors : public TestFixture {
               "    int i;\n"
               "};\n"
               "Fred::Fred()\n"
-              "{ }");
+              "{ }\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -364,7 +377,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "private:\n"
               "    int mValue;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -374,7 +387,7 @@ class TestConstructors : public TestFixture {
               "    A<T>(const T & t) { x = t.x; }\n"
               "private:\n"
               "    int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template <class T> struct A {\n"
@@ -382,7 +395,7 @@ class TestConstructors : public TestFixture {
               "    A<T>(const T & t) : x(t.x) { }\n"
               "private:\n"
               "    int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template <class T> struct A {\n"
@@ -391,7 +404,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int x;\n"
               "    int y;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) Member variable 'A::y' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:3:5]: (warning) Member variable 'A::y' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
@@ -400,14 +413,14 @@ class TestConstructors : public TestFixture {
         check("class Fred;\n"
               "struct Fred {\n"
               "    int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void simple8() {
         check("struct Fred { int x; };\n"
               "class Barney { Fred fred; };\n"
-              "class Wilma { struct Betty { int x; } betty; };");
+              "class Wilma { struct Betty { int x; } betty; };\n");
         ASSERT_EQUALS("[test.cpp:2:1]: (style) The class 'Barney' does not declare a constructor although it has private member variables which likely require initialization. [noConstructor]\n"
                       "[test.cpp:3:1]: (style) The class 'Wilma' does not declare a constructor although it has private member variables which likely require initialization. [noConstructor]\n", errout_str());
     }
@@ -418,7 +431,7 @@ class TestConstructors : public TestFixture {
               "    Fred() : x(0) { }\n"
               "private:\n"
               "    int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -428,7 +441,7 @@ class TestConstructors : public TestFixture {
               "    Fred() = default;\n"
               "private:\n"
               "    int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'Fred::x' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct S {\n" // #9391
@@ -456,7 +469,7 @@ class TestConstructors : public TestFixture {
               "    int b{1}, c{2};\n"
               "    int d, e{3};\n"
               "    int f{4}, g;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'Fred::d' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:3:5]: (warning) Member variable 'Fred::g' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
@@ -468,7 +481,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { Init(); }\n"
               "    void Init(int i = 0);\n"
               "};\n"
-              "void Fred::Init(int i) { x = i; }");
+              "void Fred::Init(int i) { x = i; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred {\n"
@@ -478,7 +491,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { Init(0); }\n"
               "    void Init(int i, int j = 0);\n"
               "};\n"
-              "void Fred::Init(int i, int j) { x = i; y = j; }");
+              "void Fred::Init(int i, int j) { x = i; y = j; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -486,7 +499,7 @@ class TestConstructors : public TestFixture {
         check("class Fred {\n"
               "    int x=1;\n"
               "    int *y=0;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -499,7 +512,7 @@ class TestConstructors : public TestFixture {
               "    {}\n"
               "private:\n"
               "    int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred : public Base<A, B> {"
@@ -510,7 +523,7 @@ class TestConstructors : public TestFixture {
               "    {}\n"
               "private:\n"
               "    int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -589,7 +602,7 @@ class TestConstructors : public TestFixture {
         check("class Fred\n"
               "{\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:1:1]: (style) The class 'Fred' does not declare a constructor although it has private member variables which likely require initialization. [noConstructor]\n", errout_str());
     }
 
@@ -601,7 +614,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "\n"
               "void Fred::foobar()\n"
-              "{ }");
+              "{ }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -610,7 +623,7 @@ class TestConstructors : public TestFixture {
               "{\n"
               "private:\n"
               "    static int foobar;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -619,7 +632,7 @@ class TestConstructors : public TestFixture {
               "{\n"
               "public:\n"
               "    int foobar;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -627,7 +640,7 @@ class TestConstructors : public TestFixture {
         check("namespace Foo\n"
               "{\n"
               "    int i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -641,14 +654,14 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    cpucyclesT m_v;\n"
               "    bool m_b;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void noConstructor7() {
         // ticket #4391
         check("short bar;\n"
-              "class foo;");
+              "class foo;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -656,7 +669,7 @@ class TestConstructors : public TestFixture {
         // ticket #4404
         check("class LineSegment;\n"
               "class PointArray  { };\n"
-              "void* tech_ = NULL;");
+              "void* tech_ = NULL;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -667,7 +680,7 @@ class TestConstructors : public TestFixture {
               " CGreeting() : CGreetingBase<char>(), MessageSet(false) {}\n"
               "private:\n"
               " bool MessageSet;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -687,28 +700,28 @@ class TestConstructors : public TestFixture {
               "    virtual ~A();\n"
               "private:\n"
               "    wxTimer *WxTimer1;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
 
     void noConstructor11() { // #3552
         check("class Fred { int x; };\n"
-              "union U { int y; Fred fred; };");
+              "union U { int y; Fred fred; };\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void noConstructor12() { // #8951
-        check("class Fred { int x{0}; };");
+        check("class Fred { int x{0}; };\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("class Fred { int x=0; };");
+        check("class Fred { int x=0; };\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("class Fred { int x[1]={0}; };"); // #8850
+        check("class Fred { int x[1]={0}; };\n"); // #8850
         ASSERT_EQUALS("", errout_str());
 
-        check("class Fred { int x[1]{0}; };");
+        check("class Fred { int x[1]{0}; };\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -758,19 +771,190 @@ class TestConstructors : public TestFixture {
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'C::i2' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
+    void noConstructor16() {
+        check("struct S {\n" // #14546
+              "    int a = 0, b;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:2:16]: (warning) Member variable 'S::b' has no initializer. [uninitMemberVarNoCtor]\n", errout_str());
+
+        check("struct S {\n"
+              "    int a, b;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n"
+              "    explicit S(int);\n"
+              "    S(const S&);\n"
+              "    int i;\n"
+              "};\n"
+              "struct T {\n"
+              "    S s;\n"
+              "    int j{};\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        const char code[] = "struct S { int i = 0; };\n" // #14697
+                            "struct T {\n"
+                            "    S s;\n"
+                            "    int j;\n"
+                            "};\n"
+                            "struct U {\n"
+                            "    std::string a;\n"
+                            "    int k;\n"
+                            "};\n";
+        const Settings s = settingsBuilder(settings).cpp(Standards::CPP11).build();
+        check(code, s);
+        ASSERT_EQUALS("", errout_str());
+        check(code);
+        ASSERT_EQUALS("[test.cpp:4:9]: (warning) Member variable 'T::j' has no initializer. [uninitMemberVarNoCtor]\n"
+                      "[test.cpp:8:9]: (warning) Member variable 'U::k' has no initializer. [uninitMemberVarNoCtor]\n",
+                      errout_str());
+
+        check("struct S {\n" // #15080
+              "    int a = 0;\n"
+              "    const int b;\n"
+              "    int k;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n"
+              "    int a = 0;\n"
+              "    int& c;\n"
+              "    int k;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n"
+              "    int a = 0;\n"
+              "    const int* d;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:3:16]: (warning) Member variable 'S::d' has no initializer. [uninitMemberVarNoCtor]\n", errout_str());
+
+        check("struct S {\n"
+              "    int a = 0;\n"
+              "    int* const p;\n"
+              "    int k;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // static members don't affect the default constructor
+              "    int a = 0;\n"
+              "    static const int N;\n"
+              "    static int& r;\n"
+              "    int k;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:5:9]: (warning) Member variable 'S::k' has no initializer. [uninitMemberVarNoCtor]\n", errout_str());
+
+        check("struct S {\n" // function pointers returning a reference are no references
+              "    int a = 0;\n"
+              "    std::string& (*f)(int, int);\n"
+              "    int& (*g[2])();\n"
+              "    int k;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:3:20]: (warning) Member variable 'S::f' has no initializer. [uninitMemberVarNoCtor]\n"
+                      "[test.cpp:4:12]: (warning) Member variable 'S::g' has no initializer. [uninitMemberVarNoCtor]\n"
+                      "[test.cpp:5:9]: (warning) Member variable 'S::k' has no initializer. [uninitMemberVarNoCtor]\n",
+                      errout_str());
+
+        check("struct S {\n"
+              "    int a = 0;\n"
+              "    int (*&f)();\n"
+              "    int k;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n"
+              "    int a = 0;\n"
+              "    int (&arr)[2];\n"
+              "    int k;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("typedef const unsigned int Mode;\n"
+              "struct S {\n"
+              "    std::vector<int> v;\n"
+              "    Mode m;\n"
+              "    int k;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n"
+              "    std::string a;\n"
+              "    const std::string s;\n"
+              "    int k;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:4:9]: (warning) Member variable 'S::k' has no initializer. [uninitMemberVarNoCtor]\n", errout_str());
+
+        check("struct S {\n"
+              "    const std::array<std::uint8_t, 2> a;\n"
+              "    const std::vector<std::uint8_t>::const_iterator it;\n"
+              "};\n"
+              "S f(const std::vector<std::uint8_t>& v) {\n"
+              "    return S{ {}, v.cbegin() };\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        const char code2[] = "struct S {\n" // #15177
+                             "    int i = 0;\n"
+                             "    unsigned u : 1;\n"
+                             "    int a[];\n"
+                             "    int b[0];\n"
+                             "};\n";
+        const Settings s17 = settingsBuilder(settings).cpp(Standards::CPP17).build();
+        check(code2, s17);
+        ASSERT_EQUALS("", errout_str());
+        check(code2);
+        ASSERT_EQUALS("[test.cpp:3:14]: (warning) Member variable 'S::u' has no initializer. [uninitMemberVarNoCtor]\n",
+                      errout_str());
+
+        const char code3[] = "struct S {\n"
+                             "    S() = default;\n"
+                             "    unsigned u : 1;\n"
+                             "};\n";
+        check(code3, s17);
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) Member variable 'S::u' is not initialized in the constructor. [uninitMemberVar]\n",
+                      errout_str());
+        check(code3);
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) Member variable 'S::u' is not initialized in the constructor. [uninitMemberVar]\n",
+                      errout_str());
+
+        check("struct S {\n"
+              "    int i = 0;\n"
+              "    int a[];\n"
+              "};\n"
+              "struct T {\n"
+              "    T() : i(0) {} \n"
+              "    int i;\n"
+              "    int a[];\n"
+              "};");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n"
+              "    static std::string s;\n"
+              "    int x;\n"
+              "};\n"
+              "struct T {\n"
+              "    static const int i = 0;\n"
+              "    int x;\n"
+              "};");
+        ASSERT_EQUALS("[test.cpp:3:9]: (warning) Member variable 'S::x' has no initializer. [uninitMemberVarNoCtor]\n"
+                      "[test.cpp:7:9]: (warning) Member variable 'T::x' has no initializer. [uninitMemberVarNoCtor]\n",
+                      errout_str());
+    }
+
     // ticket #4290 "False Positive: style (noConstructor): The class 'foo' does not have a constructor."
     // ticket #3190 "SymbolDatabase: Parse of sub class constructor fails"
     void forwardDeclaration() {
         check("class foo;\n"
-              "int bar;");
+              "int bar;\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class foo;\n"
-              "class foo;");
+              "class foo;\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class foo{};\n"
-              "class foo;");
+              "class foo;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -780,7 +964,7 @@ class TestConstructors : public TestFixture {
               "    Fred()\n"
               "    { this->i = 0; }\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -795,7 +979,7 @@ class TestConstructors : public TestFixture {
               "            i = 1;\n"
               "    }\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -814,7 +998,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    const Fred & operator=(const Fred &fred)\n"
               "    { i = fred.i; return *this; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Fred {\n"
@@ -825,7 +1009,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    const Fred & operator=(const Fred &fred)\n"
               "    { i = fred.i; return *this; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A\n"
@@ -840,7 +1024,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "  int i;\n"
               "  int j;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -851,7 +1035,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { i = 0; }\n"
               "    void operator=(const Fred &fred) { }\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (warning) Member variable 'Fred::i' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
     }
 
@@ -863,7 +1047,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    void Init() { i = 0; }\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -880,7 +1064,7 @@ class TestConstructors : public TestFixture {
               "        }\n"
               "        return *this\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (warning) Member variable 'Fred::i' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
 
         check("class Fred\n"
@@ -895,7 +1079,7 @@ class TestConstructors : public TestFixture {
               "        }\n"
               "        return *this\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (warning) Member variable 'Fred::i' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
 
         check("class Fred\n"
@@ -910,7 +1094,7 @@ class TestConstructors : public TestFixture {
               "        }\n"
               "        return *this\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (warning) Member variable 'Fred::i' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
 
         check("class Fred\n"
@@ -925,7 +1109,7 @@ class TestConstructors : public TestFixture {
               "        }\n"
               "        return *this\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -940,7 +1124,7 @@ class TestConstructors : public TestFixture {
               "        Fred(rhs).swap(*this);\n"
               "        return *this;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -950,7 +1134,7 @@ class TestConstructors : public TestFixture {
               "    Fred & operator=(const Fred &rhs) {\n"
               "        return *this;\n"
               "    }\n"
-              "};",dinit(CheckOptions, $.inconclusive = true));
+              "};\n",dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:3:12]: (warning, inconclusive) Member variable 'Fred::data' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
 
         check("struct Fred {\n"
@@ -958,7 +1142,7 @@ class TestConstructors : public TestFixture {
               "    Fred & operator=(const Fred &rhs) {\n"
               "        return *this;\n"
               "    }\n"
-              "};",dinit(CheckOptions, $.inconclusive = true));
+              "};\n",dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:3:12]: (warning, inconclusive) Member variable 'Fred::ints' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
 
         check("struct Fred {\n"
@@ -966,7 +1150,7 @@ class TestConstructors : public TestFixture {
               "    Fred & operator=(const Fred &rhs) {\n"
               "        return *this;\n"
               "    }\n"
-              "};",dinit(CheckOptions, $.inconclusive = true));
+              "};\n",dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:3:12]: (warning, inconclusive) Member variable 'Fred::data' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
     }
 
@@ -1072,7 +1256,7 @@ class TestConstructors : public TestFixture {
               "        int b;\n"
               "        Fred() { b = 0; }\n"
               "    };\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -1092,7 +1276,7 @@ class TestConstructors : public TestFixture {
               "        int b;\n"
               "        Fred() { b = 0; }\n"
               "    };\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -1112,7 +1296,7 @@ class TestConstructors : public TestFixture {
               "        int b;\n"
               "        Fred() { b = 0; }\n"
               "    };\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -1134,7 +1318,7 @@ class TestConstructors : public TestFixture {
               "            Fred() { b = 0; }\n"
               "        };\n"
               "    }\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -1156,7 +1340,7 @@ class TestConstructors : public TestFixture {
               "            Fred() { }\n"
               "        };\n"
               "    }\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("[test.cpp:7:13]: (warning) Member variable 'Fred::a' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:16:13]: (warning) Member variable 'Fred::b' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
@@ -1176,7 +1360,7 @@ class TestConstructors : public TestFixture {
               "c::c()\n"
               "{\n"
               "    m_iMyInt1 = m_iMyInt2 = 0;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -1209,7 +1393,7 @@ class TestConstructors : public TestFixture {
               "void c::InitInt()\n"
               "{\n"
               "    m_iMyInt = 0;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -1222,7 +1406,7 @@ class TestConstructors : public TestFixture {
               "    Fred();\n"
               "};\n"
               "Fred::Fred() : s(NULL)\n"
-              "{ }");
+              "{ }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Fred\n"
@@ -1231,7 +1415,7 @@ class TestConstructors : public TestFixture {
               "    Fred();\n"
               "};\n"
               "Fred::Fred()\n"
-              "{ s = NULL; }");
+              "{ s = NULL; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Fred\n"
@@ -1240,7 +1424,7 @@ class TestConstructors : public TestFixture {
               "    Fred();\n"
               "};\n"
               "Fred::Fred()\n"
-              "{ }");
+              "{ }\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (warning) Member variable 'Fred::s' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -1252,7 +1436,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    void update() const;\n"
               "    mutable int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1263,7 +1447,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred() { }\n"
               "    static void *p;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1276,7 +1460,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "private:\n"
               "  std::map<int, double> * values_{};\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1294,7 +1478,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "        U.a = 0;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -1308,7 +1492,7 @@ class TestConstructors : public TestFixture {
               "    Fred()\n"
               "    {\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:9:5]: (warning) Member variable 'Fred::U' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -1319,7 +1503,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int n) { }\n"
               "    A() : A(42) {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'A::number' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:5:5]: (warning) Member variable 'A::number' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
@@ -1328,7 +1512,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int n) { number = n; }\n"
               "    A() : A(42) {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
@@ -1336,7 +1520,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int n) : A() { }\n"
               "    A() {}\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'A::number' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:5:5]: (warning, inconclusive) Member variable 'A::number' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
@@ -1345,7 +1529,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int n) : A() { }\n"
               "    A() { number = 42; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
@@ -1353,7 +1537,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int n) { }\n"
               "    A() : A{42} {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'A::number' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:5:5]: (warning) Member variable 'A::number' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
@@ -1362,7 +1546,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int n) { number = n; }\n"
               "    A() : A{42} {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
@@ -1370,7 +1554,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int n) : A{} { }\n"
               "    A() {}\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'A::number' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:5:5]: (warning, inconclusive) Member variable 'A::number' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
@@ -1379,7 +1563,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int n) : A{} { }\n"
               "    A() { number = 42; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #6675
@@ -1389,7 +1573,7 @@ class TestConstructors : public TestFixture {
               "  int foo_;\n"
               "};\n"
               "Foo::Foo() : Foo(0) {}\n"
-              "Foo::Foo(int foo) : foo_(foo) {}");
+              "Foo::Foo(int foo) : foo_(foo) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Noexcept ctors
@@ -1401,7 +1585,7 @@ class TestConstructors : public TestFixture {
               "    A() noexcept;\n"
               "};\n"
               "\n"
-              "A::A() noexcept: A(0) {}");
+              "A::A() noexcept: A(0) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #8581
@@ -1411,7 +1595,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int a) : _a(a) {}\n"
               "    A(float a) : A(int(a)) {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #8258
@@ -1423,7 +1607,7 @@ class TestConstructors : public TestFixture {
               "    int _a;\n"
               "    int _b;\n"
               "    F _f;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1447,7 +1631,7 @@ class TestConstructors : public TestFixture {
               "    : a(true)\n"
               "    , b(0)\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1462,7 +1646,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "  Derived() {}\n"
               "  void foo() override;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:9:3]: (warning) Member variable 'Base::x' is not initialized in the constructor. Maybe it should be initialized directly in the class Base? [uninitDerivedMemberVar]\n", errout_str());
 
         check("struct A {\n" // #3462
@@ -1549,7 +1733,7 @@ class TestConstructors : public TestFixture {
               "class C : public S {\n"
               "public:\n"
               "    C() { all = 0; tick = 0; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -1565,7 +1749,7 @@ class TestConstructors : public TestFixture {
               "class C : public S {\n"
               "public:\n"
               "    C() { flag1 = flag2 = 0; tick = 0; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -1581,7 +1765,7 @@ class TestConstructors : public TestFixture {
               "class C : public S {\n"
               "public:\n"
               "    C() {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:13:5]: (warning) Member variable 'S::all' is not initialized in the constructor. Maybe it should be initialized directly in the class S? [uninitDerivedMemberVar]\n"
                       "[test.cpp:13:5]: (warning) Member variable 'S::flag1' is not initialized in the constructor. Maybe it should be initialized directly in the class S? [uninitDerivedMemberVar]\n"
                       "[test.cpp:13:5]: (warning) Member variable 'S::flag2' is not initialized in the constructor. Maybe it should be initialized directly in the class S? [uninitDerivedMemberVar]\n", errout_str());
@@ -1597,7 +1781,7 @@ class TestConstructors : public TestFixture {
                   "    Fred();\n"
                   "};\n"
                   "Fred::Fred()\n"
-                  "{ }", s);
+                  "{ }\n", s);
             ASSERT_EQUALS("[test.cpp:7:7]: (warning) Member variable 'Fred::var' is not initialized in the constructor. [uninitMemberVarPrivate]\n", errout_str());
         }
 
@@ -1610,7 +1794,7 @@ class TestConstructors : public TestFixture {
                   "    Fred();\n"
                   "};\n"
                   "Fred::Fred()\n"
-                  "{ }", s);
+                  "{ }\n", s);
             ASSERT_EQUALS("", errout_str());
         }
     }
@@ -1632,7 +1816,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred() { };\n"
               "    Fred(const Fred &) { };\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -1642,7 +1826,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred() { };\n"
               "    Fred(const Fred &) { };\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:7:5]: (warning, inconclusive) Member variable 'Fred::var' is not assigned in the copy constructor. Should it be copied? [missingMemberCopy]\n", errout_str());
 
         check("class Fred\n"
@@ -1690,7 +1874,7 @@ class TestConstructors : public TestFixture {
               "A::A(){}\n"
               "A::B::B(int x){}\n"
               "A::B::C::C(int y){}\n"
-              "A::B::C::D::D(int z){}");
+              "A::B::C::D::D(int z){}\n");
         // Note that the example code is not compilable. The A constructor must
         // explicitly initialize A::b. A warning for A::b is not necessary.
         ASSERT_EQUALS("[test.cpp:20:4]: (warning) Member variable 'A::a' is not initialized in the constructor. [uninitMemberVar]\n"
@@ -1720,7 +1904,7 @@ class TestConstructors : public TestFixture {
               "A::A(){}\n"
               "A::B::B(int x){}\n"
               "A::B::C::C(int y){}\n"
-              "A::B::C::D::D(const A::B::C::D & d){}");
+              "A::B::C::D::D(const A::B::C::D & d){}\n");
         // Note that the example code is not compilable. The A constructor must
         // explicitly initialize A::b. A warning for A::b is not necessary.
         ASSERT_EQUALS("[test.cpp:20:4]: (warning) Member variable 'A::a' is not initialized in the constructor. [uninitMemberVar]\n"
@@ -1751,7 +1935,7 @@ class TestConstructors : public TestFixture {
               "A::A(){}\n"
               "A::B::B(int x){}\n"
               "A::B::C::C(int y){}\n"
-              "A::B::C::D::D(const A::B::C::D::E & e){}");
+              "A::B::C::D::D(const A::B::C::D::E & e){}\n");
         // Note that the example code is not compilable. The A constructor must
         // explicitly initialize A::b. A warning for A::b is not necessary.
         ASSERT_EQUALS("[test.cpp:21:4]: (warning) Member variable 'A::a' is not initialized in the constructor. [uninitMemberVar]\n"
@@ -1773,7 +1957,7 @@ class TestConstructors : public TestFixture {
               "    A(const A&){}\n"
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class B\n"
@@ -1788,7 +1972,7 @@ class TestConstructors : public TestFixture {
               "    A(const A&){}\n"
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class B\n"
@@ -1805,7 +1989,7 @@ class TestConstructors : public TestFixture {
               "    A(const A&){}\n"
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class B\n"
@@ -1821,7 +2005,7 @@ class TestConstructors : public TestFixture {
               "    A(const A&){}\n"
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A : public std::vector<int>\n"
@@ -1837,7 +2021,7 @@ class TestConstructors : public TestFixture {
               "    B(const B&){}\n"
               "    B(B &&){}\n"
               "    const B& operator=(const B&){return *this;}\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:11:5]: (warning, inconclusive) Member variable 'B::a' is not assigned in the copy constructor. Should it be copied? [missingMemberCopy]\n"
                       "[test.cpp:12:5]: (warning, inconclusive) Member variable 'B::a' is not assigned in the move constructor. Should it be moved? [missingMemberCopy]\n"
                       "[test.cpp:13:14]: (warning, inconclusive) Member variable 'B::a' is not assigned a value in 'B::operator='. [operatorEqVarError]\n",
@@ -1857,7 +2041,7 @@ class TestConstructors : public TestFixture {
               "    A(const A&){}\n"
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:13:5]: (warning) Member variable 'A::m_SemVar' is not initialized in the move constructor. [uninitMemberVar]\n", errout_str());
 
         check("class B\n"
@@ -1875,7 +2059,7 @@ class TestConstructors : public TestFixture {
               "    A(const A&){}\n"
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
@@ -1885,7 +2069,7 @@ class TestConstructors : public TestFixture {
               "    A(){}\n"
               "    A(const A&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1903,7 +2087,7 @@ class TestConstructors : public TestFixture {
               "    A(){}\n"
               "    A(const A&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("class B\n"
@@ -1920,7 +2104,7 @@ class TestConstructors : public TestFixture {
               "    A(){}\n"
               "    A(const A&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:12:5]: (warning) Member variable 'A::m_SemVar' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:13:5]: (warning) Member variable 'A::m_SemVar' is not initialized in the copy constructor. [uninitMemberVar]\n"
                       "[test.cpp:14:14]: (warning) Member variable 'A::m_SemVar' is not assigned a value in 'A::operator='. [operatorEqVarError]\n", errout_str());
@@ -1931,14 +2115,14 @@ class TestConstructors : public TestFixture {
               "    B b;\n"
               "    A() {}\n"
               "    A(const A& rhs) {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    B b;\n"
               "    A() {}\n"
               "    A(const A& rhs) {}\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:4:5]: (warning, inconclusive) Member variable 'A::b' is not assigned in the copy constructor. Should it be copied? [missingMemberCopy]\n", errout_str());
     }
 
@@ -1954,7 +2138,7 @@ class TestConstructors : public TestFixture {
               "}\n"
               "void S::Set(const T& val) {\n"
               "    t = val;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1963,7 +2147,7 @@ class TestConstructors : public TestFixture {
               "  Foo(int m) { this->setMember(m); }\n"
               "  void setMember(int m) { member = m; }\n"
               "  int member;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1975,7 +2159,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred() : var(0) {}\n"
               "    ~Fred() {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1983,7 +2167,7 @@ class TestConstructors : public TestFixture {
         check("class something {\n"
               "    int * ( something :: * process()) () { return 0; }\n"
               "    something() { process(); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1994,7 +2178,7 @@ class TestConstructors : public TestFixture {
               "        int& pa = a;\n"
               "        pa = 4;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -2003,7 +2187,7 @@ class TestConstructors : public TestFixture {
               "        int* pa = &a;\n"
               "        *pa = 4;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -2013,7 +2197,7 @@ class TestConstructors : public TestFixture {
               "        for (int i = 0; i < 2; i++)\n"
               "            *pa++ = i;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -2022,7 +2206,7 @@ class TestConstructors : public TestFixture {
               "        int* pa = a[1];\n"
               "        *pa = 0;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'S::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct S {\n"
@@ -2031,7 +2215,7 @@ class TestConstructors : public TestFixture {
               "        int pa = a;\n"
               "        pa = 4;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'S::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2050,7 +2234,7 @@ class TestConstructors : public TestFixture {
               "    A() {\n"
               "        Wrapper<dim>::foo(x);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2068,7 +2252,7 @@ class TestConstructors : public TestFixture {
               "        d = rhs.get();\n"
               "    }\n"
               "    double d;\n"
-              "};", s);
+              "};\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #8485
@@ -2095,7 +2279,7 @@ class TestConstructors : public TestFixture {
               "{ }\n"
               "\n"
               "void Fred::operator=(const Fred &f)\n"
-              "{ }", dinit(CheckOptions, $.inconclusive = true));
+              "{ }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:13:12]: (warning, inconclusive) Member variable 'Fred::ints' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
 
         const Settings s = settingsBuilder().certainty(Certainty::inconclusive).severity(Severity::style).severity(Severity::warning).library("std.cfg").build();
@@ -2120,7 +2304,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "private:\n"
               "    ECODES _code;\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("[test.cpp:10:5]: (warning) Member variable 'Fred::_code' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
@@ -2133,7 +2317,7 @@ class TestConstructors : public TestFixture {
               "  B() {}\n"
               "private:\n"
               "  float f;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:3]: (warning) Member variable 'B::f' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("class C\n"
@@ -2146,7 +2330,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "C::C(FILE *fp) {\n"
               "    C::fp = fp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2157,7 +2341,7 @@ class TestConstructors : public TestFixture {
               "    John() { (*this).i = 0; }\n"
               "private:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2172,7 +2356,7 @@ class TestConstructors : public TestFixture {
               "        Bar();\n"
               "    };\n"
               "    Bar bars[2];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // Using struct that doesn't have constructor
@@ -2185,7 +2369,7 @@ class TestConstructors : public TestFixture {
               "        int x;\n"
               "    };\n"
               "    Bar bars[2];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Foo::bars' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2199,7 +2383,7 @@ class TestConstructors : public TestFixture {
               "        int x;\n"
               "    };\n"
               "    struct Bar bar;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2211,7 +2395,7 @@ class TestConstructors : public TestFixture {
               "    Foo &operator=(const Foo &)\n"
               "    { return *this; }\n"
               "    static int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2222,7 +2406,7 @@ class TestConstructors : public TestFixture {
               "    explicit Foo(int i) : Bar(mi=i) { }\n"
               "private:\n"
               "    int mi;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Foo : public Bar\n"
@@ -2231,7 +2415,7 @@ class TestConstructors : public TestFixture {
               "    explicit Foo(int i) : Bar{mi=i} { }\n"
               "private:\n"
               "    int mi;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2252,7 +2436,7 @@ class TestConstructors : public TestFixture {
               "    Foo copy(rhs);\n"
               "    copy.Swap(*this);\n"
               "    return *this;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2269,7 +2453,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "    }\n"
               "    return *this;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:11]: (warning) Member variable 'Foo::a' is not assigned a value in 'Foo::operator='. [operatorEqVarError]\n", errout_str());
     }
 
@@ -2283,7 +2467,7 @@ class TestConstructors : public TestFixture {
               "Prefs::Prefs(wxSize size)\n"
               "{\n"
               "    SetMinSize( wxSize( 48,48 ) );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) Member variable 'Prefs::xasd' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2295,7 +2479,7 @@ class TestConstructors : public TestFixture {
               "        int var1;\n"
               "        int var2;\n"
               "};\n"
-              "A::A() : var1(0) { }");
+              "A::A() : var1(0) { }\n");
         ASSERT_EQUALS("[test.cpp:8:4]: (warning) Member variable 'A::var2' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2306,7 +2490,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "        int var;\n"
               "};\n"
-              "A::A(int a) { }");
+              "A::A(int a) { }\n");
         ASSERT_EQUALS("[test.cpp:7:4]: (warning) Member variable 'A::var' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2322,7 +2506,7 @@ class TestConstructors : public TestFixture {
               "        : x(x), y(y)\n"
               "    {}\n"
               "    int x, y;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Point::x' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:4:5]: (warning) Member variable 'Point::y' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
@@ -2334,7 +2518,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A()\n"
               "    {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (warning) Member variable 'A::ints' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2349,7 +2533,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "Foo::Foo()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:6]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // single namespace
@@ -2365,7 +2549,7 @@ class TestConstructors : public TestFixture {
               "    Foo::Foo()\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:10]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // constructor outside namespace
@@ -2381,7 +2565,7 @@ class TestConstructors : public TestFixture {
               "}\n"
               "Foo::Foo()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // constructor outside namespace
@@ -2397,7 +2581,7 @@ class TestConstructors : public TestFixture {
               "}\n"
               "Output::Foo::Foo()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:11:14]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // constructor outside namespace with using, #4792
@@ -2414,7 +2598,7 @@ class TestConstructors : public TestFixture {
               "using namespace Output;"
               "Foo::Foo()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:11:29]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // constructor in separate namespace
@@ -2433,7 +2617,7 @@ class TestConstructors : public TestFixture {
               "    Foo::Foo()\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:13:10]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // constructor in different separate namespace
@@ -2452,7 +2636,7 @@ class TestConstructors : public TestFixture {
               "    Foo::Foo()\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // constructor in different separate namespace (won't compile)
@@ -2471,7 +2655,7 @@ class TestConstructors : public TestFixture {
               "    Output::Foo::Foo()\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // constructor in nested separate namespace
@@ -2493,7 +2677,7 @@ class TestConstructors : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:15:14]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // constructor in nested different separate namespace
@@ -2515,7 +2699,7 @@ class TestConstructors : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // constructor in nested different separate namespace
@@ -2537,7 +2721,7 @@ class TestConstructors : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2551,7 +2735,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "Fred::~Fred()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2569,7 +2753,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "        foo.set(0);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo\n"
@@ -2584,7 +2768,7 @@ class TestConstructors : public TestFixture {
               "    Bar()\n"
               "    {\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:10:5]: (warning) Member variable 'Bar::foo' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2601,7 +2785,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "        foo[0].a = 0;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo\n"
@@ -2615,7 +2799,7 @@ class TestConstructors : public TestFixture {
               "    Bar()\n"
               "    {\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:9:5]: (warning) Member variable 'Bar::foo' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2631,7 +2815,7 @@ class TestConstructors : public TestFixture {
               "    A() { }\n"
               "private:\n"
               "    Altren value;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2655,7 +2839,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "        free(m_str);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2667,7 +2851,7 @@ class TestConstructors : public TestFixture {
               "        std::streamsize dataLength_;\n"
               "        double bitsInData_;\n"
               "    } obj;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (warning) Member variable 'LocalClass::bitsInData_' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct copy_protected;\n"
@@ -2678,7 +2862,7 @@ class TestConstructors : public TestFixture {
               "        std::streamsize dataLength_;\n"
               "        double bitsInData_;\n"
               "    } obj;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS(
             "[test.cpp:5:9]: (warning) Member variable 'LocalClass::bitsInData_' is not initialized in the constructor. [uninitMemberVar]\n",
             errout_str());
@@ -2691,7 +2875,7 @@ class TestConstructors : public TestFixture {
               "        std::streamsize dataLength_;\n"
               "        double bitsInData_;\n"
               "    } obj;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS(
             "[test.cpp:5:9]: (warning) Member variable 'LocalClass::bitsInData_' is not initialized in the constructor. [uninitMemberVar]\n",
             errout_str());
@@ -2706,7 +2890,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "Fred::Fred() {\n"
               "    a[x::y] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2723,7 +2907,7 @@ class TestConstructors : public TestFixture {
               "Fred & Fred::clone(const Fred & other) {\n"
               "    x = 0;\n"
               "    return *this;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred {\n"
@@ -2737,7 +2921,7 @@ class TestConstructors : public TestFixture {
               "}\n"
               "Fred & Fred::clone(const Fred & other) {\n"
               "    return *this;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:14]: (warning) Member variable 'Fred::x' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
     }
 
@@ -2755,7 +2939,7 @@ class TestConstructors : public TestFixture {
               "Fred::Fred(struct C c, D d) { }\n"
               "Fred::Fred(E e, struct F f) { }\n"
               "Fred::Fred(G g, H h) { }\n"
-              "Fred::Fred(struct I i, struct J j) { }");
+              "Fred::Fred(struct I i, struct J j) { }\n");
         ASSERT_EQUALS("[test.cpp:10:7]: (warning) Member variable 'Fred::x' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:11:7]: (warning) Member variable 'Fred::x' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:12:7]: (warning) Member variable 'Fred::x' is not initialized in the constructor. [uninitMemberVar]\n"
@@ -2864,7 +3048,7 @@ class TestConstructors : public TestFixture {
               "    A(int s) {\n"
               "        v = new int [sz = s];\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2875,7 +3059,7 @@ class TestConstructors : public TestFixture {
               "    A() {\n"
               "        rtl::math::setNan(&d);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
         check("class A {\n"
               "    double d;\n"
@@ -2883,7 +3067,7 @@ class TestConstructors : public TestFixture {
               "    A() {\n"
               "        ::rtl::math::setNan(&d);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2898,7 +3082,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    void foo(int a) { i = a; }\n"
               "    void foo(float a) { f = a; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2930,7 +3114,7 @@ class TestConstructors : public TestFixture {
               "    D() { foo(); }\n"
               "	void foo() { }\n"
               "	void foo() const { i = 0; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:18:5]: (warning) Member variable 'C::i' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:25:5]: (warning) Member variable 'D::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
@@ -2947,7 +3131,7 @@ class TestConstructors : public TestFixture {
               "}\n"
               "using namespace NS;\n"
               "MyClass::~MyClass() { }\n"
-              "MyClass::MyClass() : SomeVar(false) { }");
+              "MyClass::MyClass() : SomeVar(false) { }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2965,7 +3149,7 @@ class TestConstructors : public TestFixture {
               "}\n"
               "void MyClass::Restart() {\n"
               "    m_retCode = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2978,7 +3162,7 @@ class TestConstructors : public TestFixture {
               "   {\n"
               "      if (1) {}\n"
               "   }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:4]: (warning) Member variable 'Foo::member' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
         check("class Foo {\n"
               "   friend class Bar;\n"
@@ -2988,7 +3172,7 @@ class TestConstructors : public TestFixture {
               "   {\n"
               "      while (1) {}\n"
               "   }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:4]: (warning) Member variable 'Foo::member' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
         check("class Foo {\n"
               "   friend class Bar;\n"
@@ -2998,7 +3182,7 @@ class TestConstructors : public TestFixture {
               "   {\n"
               "      for (;;) {}\n"
               "   }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:4]: (warning) Member variable 'Foo::member' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -3010,7 +3194,7 @@ class TestConstructors : public TestFixture {
               "        int x;\n"
               "    };\n"
               "};\n"
-              "app::B::B(void){}");
+              "app::B::B(void){}\n");
         ASSERT_EQUALS("[test.cpp:8:9]: (warning) Member variable 'B::x' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -3062,7 +3246,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "private:\n"
               "    char name[255];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'John::name' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("class John\n"
@@ -3072,7 +3256,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "private:\n"
               "    char name[255];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class John\n"
@@ -3082,7 +3266,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "private:\n"
               "    char name[255];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class John\n"
@@ -3091,7 +3275,7 @@ class TestConstructors : public TestFixture {
               "    John() { }\n"
               "\n"
               "    double  operator[](const unsigned long i);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A;\n"
@@ -3100,7 +3284,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    John() { }\n"
               "    A a[5];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A;\n"
@@ -3109,7 +3293,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    John() { }\n"
               "    A (*a)[5];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (warning) Member variable 'John::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -3121,7 +3305,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "private:\n"
               "    char name[255];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5754
@@ -3132,7 +3316,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "private:\n"
               "    char name[255];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3149,7 +3333,7 @@ class TestConstructors : public TestFixture {
               "        memset(a,0,sizeof(a));\n"
               "        memset(b,0,sizeof(b));\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3166,7 +3350,7 @@ class TestConstructors : public TestFixture {
               "        if (snprintf(a,10,\"a\")) { }\n"
               "        if (snprintf(b,10,\"b\")) { }\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3178,7 +3362,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Foo()\n"
               "    { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3190,7 +3374,7 @@ class TestConstructors : public TestFixture {
               "    static const char STR[];\n"
               "};\n"
               "const char Foo::STR[] = \"abc\";\n"
-              "Foo::Foo() { }");
+              "Foo::Foo() { }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3200,7 +3384,7 @@ class TestConstructors : public TestFixture {
               "    int array[10];\n"
               "public:\n"
               "    Foo() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (warning) Member variable 'Foo::array' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("class Foo\n"
@@ -3208,7 +3392,7 @@ class TestConstructors : public TestFixture {
               "    int array[10];\n"
               "public:\n"
               "    Foo() { memset(array, 0, sizeof(array)); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Foo\n"
@@ -3216,7 +3400,7 @@ class TestConstructors : public TestFixture {
               "    int array[10];\n"
               "public:\n"
               "    Foo() { ::memset(array, 0, sizeof(array)); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3225,7 +3409,7 @@ class TestConstructors : public TestFixture {
               "    char a[10];\n"
               "public:\n"
               "    Foo() { ::ZeroMemory(a); }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3236,7 +3420,7 @@ class TestConstructors : public TestFixture {
               "    BaseGDL* eArr[3];\n"
               "public:\n"
               "    IxExprListT() {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (warning) Member variable 'IxExprListT::eArr' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
         check("struct sRAIUnitDefBL {\n"
               "  sRAIUnitDefBL();\n"
@@ -3245,7 +3429,7 @@ class TestConstructors : public TestFixture {
               "struct sRAIUnitDef {\n"
               "  sRAIUnitDef() {}\n"
               "  sRAIUnitDefBL *List[35];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:3]: (warning) Member variable 'sRAIUnitDef::List' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -3292,7 +3476,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "private:\n"
               "    char a[2][2];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3303,7 +3487,7 @@ class TestConstructors : public TestFixture {
               "    char a[2][2][2];\n"
               "public:\n"
               "    John() { a[0][0][0] = 0; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3314,7 +3498,7 @@ class TestConstructors : public TestFixture {
               "    Foo()\n"
               "        : bar({\"a\", \"b\"})\n"
               "    {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3330,7 +3514,7 @@ class TestConstructors : public TestFixture {
               "    Fred() : f{0, true} { }\n"
               "    float get() const;\n"
               "};\n"
-              "float Fred::get() const { return g; }");
+              "float Fred::get() const { return g; }\n");
         ASSERT_EQUALS("[test.cpp:9:5]: (warning) Member variable 'Fred::g' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -3346,7 +3530,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A() {\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
@@ -3360,7 +3544,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A() {\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:10:5]: (warning) Member variable 'A::b' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("class A\n"
@@ -3375,7 +3559,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A() {\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3392,7 +3576,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred()\n"
               "    { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:11:5]: (warning) Member variable 'Fred::p' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct POINT\n"
@@ -3408,7 +3592,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred()\n"
               "    { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct POINT\n"
@@ -3424,7 +3608,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred()\n"
               "    { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // non static data-member initialization
@@ -3440,7 +3624,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred()\n"
               "    { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3452,13 +3636,13 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred()\n"
               "    { a = 0; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred {\n"
               "private:\n"
               "    union { int a{}; int b; };\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3472,7 +3656,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred() : data_type(0)\n"
               "    { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (warning) Member variable 'Fred::data' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -3485,7 +3669,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    void Init();"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown non-member function (friend class)
@@ -3496,7 +3680,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    friend ABC;\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown non-member function (is Init a virtual function?)
@@ -3506,7 +3690,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { Init(); }\n"
               "private:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // Unknown non-member function
@@ -3516,7 +3700,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { Init(); }\n"
               "private:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // Unknown non-member function
@@ -3527,7 +3711,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { Init(); }\n"
               "private:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // Unknown member functions and unknown static functions
@@ -3547,7 +3731,7 @@ class TestConstructors : public TestFixture {
               "    static void static_f();\n"
               "private:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // Unknown overloaded member functions
@@ -3560,7 +3744,7 @@ class TestConstructors : public TestFixture {
               "    void func();\n"
               "private:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3572,7 +3756,7 @@ class TestConstructors : public TestFixture {
               "    Fred() {}\n"
               "private:\n"
               "    unsigned int i;\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("[test.cpp:5:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
@@ -3583,7 +3767,7 @@ class TestConstructors : public TestFixture {
               "struct Y {\n"
               "    Y() {}\n"
               "    X x;\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3599,7 +3783,7 @@ class TestConstructors : public TestFixture {
               "        if(!(in >> foo))\n"
               "            throw 0;\n"
               "    }\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3611,7 +3795,7 @@ class TestConstructors : public TestFixture {
               "    typedef int * pointer;\n"
               "    Foo() : a(0) {}\n"
               "    pointer a;\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3622,7 +3806,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    int * pointer;\n"
               "    Foo() { memset(this, 0, sizeof(*this)); }\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -3631,7 +3815,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    int * pointer;\n"
               "    Foo() { ::memset(this, 0, sizeof(*this)); }\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -3640,13 +3824,13 @@ class TestConstructors : public TestFixture {
               "    int * p;\n"
               "    char c;\n"
               "    Foo() { memset(p, 0, sizeof(int)); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Foo::c' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
         check("struct Foo {\n"
               "    int i;\n"
               "    char c;\n"
               "    Foo() { memset(&i, 0, sizeof(int)); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Foo::c' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
         check("struct Foo { int f; };\n"
               "struct Bar { int b; };\n"
@@ -3660,7 +3844,7 @@ class TestConstructors : public TestFixture {
               "int main() {\n"
               "  FooBar foobar;\n"
               "  return foobar.foo.f + foobar.bar.b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:3]: (warning) Member variable 'FooBar::bar' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
         check("struct Foo { int f; };\n"
               "struct Bar { int b; };\n"
@@ -3674,7 +3858,7 @@ class TestConstructors : public TestFixture {
               "int main() {\n"
               "  FooBar foobar;\n"
               "  return foobar.foo.f + foobar.bar.b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:3]: (warning) Member variable 'FooBar::bar' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // #7755
@@ -3683,7 +3867,7 @@ class TestConstructors : public TestFixture {
               "    memset(this->data, 0, 42);\n"
               "  }\n"
               "  char data[42];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3693,7 +3877,7 @@ class TestConstructors : public TestFixture {
             check("class Foo {\n"
                   "    int foo;\n"
                   "    Foo() { }\n"
-                  "};", s);
+                  "};\n", s);
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -3702,7 +3886,7 @@ class TestConstructors : public TestFixture {
             check("class Foo {\n"
                   "    int foo;\n"
                   "    Foo() { }\n"
-                  "};", s);
+                  "};\n", s);
             ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'Foo::foo' is not initialized in the constructor. [uninitMemberVarPrivate]\n", errout_str());
         }
     }
@@ -3715,7 +3899,7 @@ class TestConstructors : public TestFixture {
               "    Foo() { }\n"
               "public:\n"
               "    explicit Foo(int _i) { }\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("[test.cpp:7:14]: (warning) Member variable 'Foo::foo' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
@@ -3736,7 +3920,7 @@ class TestConstructors : public TestFixture {
               "int* A::f(int* p)\n"
               "{\n"
               "    return p;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3750,7 +3934,7 @@ class TestConstructors : public TestFixture {
               "    int *i;\n"
               "public:\n"
               "    Fred() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3764,7 +3948,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { }\n"
               "private:\n"
               "    int x;\n"
-              "};", s);
+              "};\n", s);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3774,7 +3958,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred() { }\n"
               "    int *operator [] (int index) { return 0; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3788,7 +3972,7 @@ class TestConstructors : public TestFixture {
               "    { f.d = 0; }\n"
               "\n"
               "    double d;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -3800,7 +3984,7 @@ class TestConstructors : public TestFixture {
               "    { }\n"
               "\n"
               "    double d;\n"
-              "};");
+              "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::d' is not initialized in the constructor. [uninitMemberVar]\n", "", errout_str());
     }
 
@@ -3814,7 +3998,7 @@ class TestConstructors : public TestFixture {
               "    { f.d = 0; return true; }\n"
               "\n"
               "    double d;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -3826,7 +4010,7 @@ class TestConstructors : public TestFixture {
               "    { return true; }\n"
               "\n"
               "    double d;\n"
-              "};");
+              "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::d' is not initialized in the constructor. [uninitMemberVar]\n", "",  errout_str());
     }
 
@@ -3840,7 +4024,7 @@ class TestConstructors : public TestFixture {
               "    { d = 0; return true; }\n"
               "\n"
               "    double d;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -3852,7 +4036,7 @@ class TestConstructors : public TestFixture {
               "    { return true; }\n"
               "\n"
               "    double d;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::d' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -3866,7 +4050,7 @@ class TestConstructors : public TestFixture {
               "    { f.d = 0; }\n"
               "\n"
               "    double d;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -3878,7 +4062,7 @@ class TestConstructors : public TestFixture {
               "    { }\n"
               "\n"
               "    double d;\n"
-              "};");
+              "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::d' is not initialized in the constructor. [uninitMemberVar]\n", "", errout_str());
     }
 
@@ -3892,7 +4076,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A() { Init( B ); };\n"
               "    void Init( Structure& S ) { S.C = 0; };\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Structure {\n"
@@ -3904,7 +4088,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A() { Init( B ); };\n"
               "    void Init(const Structure& S) { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (warning) Member variable 'A::B' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -3929,7 +4113,7 @@ class TestConstructors : public TestFixture {
               "A::B::B()\n"
               "{\n"
               "    i = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class B\n"
@@ -3955,7 +4139,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "A::B::B()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:18:4]: (warning) Member variable 'B::j' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:22:7]: (warning) Member variable 'B::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
@@ -3976,7 +4160,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Foo() { }\n"
               "};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace n1\n"
@@ -3998,7 +4182,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Foo() { }\n"
               "};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:11:10]: (warning) Member variable 'Foo::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("namespace n1\n"
@@ -4020,7 +4204,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Foo() { }\n"
               "};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4041,7 +4225,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    void init(int value)\n"
               "    { i = value; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
@@ -4059,7 +4243,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    void init(int value)\n"
               "    { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (warning) Member variable 'A::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("class bar {\n" // #9887
@@ -4080,7 +4264,7 @@ class TestConstructors : public TestFixture {
               "    int a;\n"
               "    A() { a=0; }\n"
               "    A(A const &a) { operator=(a); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -4091,7 +4275,7 @@ class TestConstructors : public TestFixture {
               "        a = rhs.a;\n"
               "        return *this;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -4101,7 +4285,7 @@ class TestConstructors : public TestFixture {
               "    A & operator = (const A & rhs) {\n"
               "        return *this;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'A::a' is not initialized in the copy constructor. [uninitMemberVar]\n"
                       "[test.cpp:5:9]: (warning) Member variable 'A::a' is not assigned a value in 'A::operator='. [operatorEqVarError]\n", errout_str());
     }
@@ -4113,28 +4297,28 @@ class TestConstructors : public TestFixture {
               "struct B {\n"
               "    A* a;\n"
               "    B() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (warning) Member variable 'B::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct A;\n"
               "struct B {\n"
               "    A* a;\n"
               "    B() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'B::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct A;\n"
               "struct B {\n"
               "    const A* a;\n"
               "    B() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'B::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct A;\n"
               "struct B {\n"
               "    A* const a;\n"
               "    B() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'B::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("class Test {\n" // #8498
@@ -4185,7 +4369,7 @@ class TestConstructors : public TestFixture {
               "    A* const a;\n"
               "    B() { }\n"
               "    B(B& b) { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'B::a' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:5:5]: (warning) Member variable 'B::a' is not initialized in the copy constructor. [uninitMemberVar]\n", errout_str());
 
@@ -4193,21 +4377,21 @@ class TestConstructors : public TestFixture {
               "struct B {\n"
               "    A* const a;\n"
               "    B& operator=(const B& r) { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str()); // #3804
 
         check("struct B {\n"
               "    const int a;\n"
               "    B() { }\n"
               "    B(B& b) { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'B::a' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:4:5]: (warning) Member variable 'B::a' is not initialized in the copy constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct B {\n"
               "    const int a;\n"
               "    B& operator=(const B& r) { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4217,7 +4401,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "  C() _STLP_NOTHROW {}\n"
               "  C(const C&) _STLP_NOTHROW {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4226,7 +4410,7 @@ class TestConstructors : public TestFixture {
               "  int mValue;\n"
               "public:\n"
               "  operatorX() : mValue(0) {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4236,7 +4420,7 @@ class TestConstructors : public TestFixture {
               "  T* mElements;\n"
               "};\n"
               "template <class T> Container<T>::Container() : mElements(nullptr) {}\n"
-              "Container<int> intContainer;");
+              "Container<int> intContainer;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4246,7 +4430,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    SelectionPosition() {}\n"
               "    const rvec &x() const;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4261,7 +4445,7 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         TODO_ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) Member variable 'C::x' is not initialized in the constructor.\n",
                            "[test.cpp:3:5]: (warning) Member variable 'C::x' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
@@ -4275,7 +4459,7 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         TODO_ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) Member variable 'C::x' is not initialized in the constructor.\n",
                            "[test.cpp:3:5]: (warning) Member variable 'C::x' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
@@ -4289,7 +4473,7 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4302,7 +4486,7 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4312,7 +4496,7 @@ class TestConstructors : public TestFixture {
               "        i = i * SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4322,7 +4506,7 @@ class TestConstructors : public TestFixture {
               "        i = i / SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4332,7 +4516,7 @@ class TestConstructors : public TestFixture {
               "        i = i % SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4342,7 +4526,7 @@ class TestConstructors : public TestFixture {
               "        i = i + SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4352,7 +4536,7 @@ class TestConstructors : public TestFixture {
               "        i = i - SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4362,7 +4546,7 @@ class TestConstructors : public TestFixture {
               "        i = i << SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4372,7 +4556,7 @@ class TestConstructors : public TestFixture {
               "        i = i >> SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4382,7 +4566,7 @@ class TestConstructors : public TestFixture {
               "        i = i ^ SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4397,7 +4581,7 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4410,7 +4594,7 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4420,7 +4604,7 @@ class TestConstructors : public TestFixture {
               "        i *= SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4430,7 +4614,7 @@ class TestConstructors : public TestFixture {
               "        i /= SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4440,7 +4624,7 @@ class TestConstructors : public TestFixture {
               "        i %= SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4450,7 +4634,7 @@ class TestConstructors : public TestFixture {
               "        i += SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4460,7 +4644,7 @@ class TestConstructors : public TestFixture {
               "        i -= SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4470,7 +4654,7 @@ class TestConstructors : public TestFixture {
               "        i <<= SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4480,7 +4664,7 @@ class TestConstructors : public TestFixture {
               "        i >>= SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4490,7 +4674,7 @@ class TestConstructors : public TestFixture {
               "        i ^= SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4505,7 +4689,7 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4518,7 +4702,7 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4527,7 +4711,7 @@ class TestConstructors : public TestFixture {
               "        bool b = (0 < SetValue());\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4536,7 +4720,7 @@ class TestConstructors : public TestFixture {
               "        bool b = (0 <= SetValue());\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4545,7 +4729,7 @@ class TestConstructors : public TestFixture {
               "        bool b = (0 > SetValue());\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4554,7 +4738,7 @@ class TestConstructors : public TestFixture {
               "        bool b = (0 >= SetValue());\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4572,7 +4756,7 @@ class TestConstructors : public TestFixture {
               "class C {\n"
               "  private:\n"
               "    A* b;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<class T> class A{};\n"
@@ -4584,7 +4768,7 @@ class TestConstructors : public TestFixture {
               "    bool m_value;\n"
               "};\n"
               "template<class T1, class T2>\n"
-              "A<B<T1, T2>>::A() : m_value(false) {}");
+              "A<B<T1, T2>>::A() : m_value(false) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template <typename T> struct S;\n" // #11177
@@ -4603,8 +4787,146 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A& operator=() { return *this; }\n"
               "};\n"
-              "A<decltype(SOMETHING)> a;");
+              "A<decltype(SOMETHING)> a;\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void inheritedCtor1() {
+        check("struct Base { Base(int); };\n"
+              "struct Derived : Base {\n"
+              "    using Base::Base;\n"
+              "    int x;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:3:17]: (warning) Member variable 'Derived::x' is not initialized in the constructor inherited from 'Base'. [uninitMemberVar]\n", errout_str());
+    }
+
+    void inheritedCtor2() {
+        check("struct Base { Base(int); };\n"
+              "struct Derived : Base {\n"
+              "    using Base::Base;\n"
+              "    int x = 0;\n"
+              "    int y{};\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void inheritedCtor3() {
+        check("struct Base { Base(int); };\n"
+              "struct S { S(); int i; };\n"
+              "struct Derived : Base {\n"
+              "    using Base::Base;\n"
+              "    S s;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void inheritedCtor4() {
+        check("struct Base { Base(int); };\n"
+              "struct Derived : Base {\n"
+              "    using Base::Base;\n"
+              "    int x = 0;\n"
+              "    int y;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:3:17]: (warning) Member variable 'Derived::y' is not initialized in the constructor inherited from 'Base'. [uninitMemberVar]\n", errout_str());
+    }
+
+    void inheritedCtor5() {
+        check("struct Base { Base(int); };\n"
+              "struct Derived : Base {\n"
+              "    using Base::Base;\n"
+              "    Derived() : x(0) {}\n"
+              "    int x;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:3:17]: (warning) Member variable 'Derived::x' is not initialized in the constructor inherited from 'Base'. [uninitMemberVar]\n", errout_str());
+    }
+
+    void inheritedCtor6() {
+        check("struct A { A(int); };\n"
+              "struct B { B(double); };\n"
+              "struct D : A, B {\n"
+              "    using A::A;\n"
+              "    using B::B;\n"
+              "    int x;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:4:14]: (warning) Member variable 'D::x' is not initialized in the constructor inherited from 'A'. [uninitMemberVar]\n"
+                      "[test.cpp:5:14]: (warning) Member variable 'D::x' is not initialized in the constructor inherited from 'B'. [uninitMemberVar]\n",
+                      errout_str());
+    }
+
+    void inheritedCtor7() {
+        check("struct Base { void f(); };\n"
+              "struct Derived : Base {\n"
+              "    using Base::f;\n"
+              "    int x = 0;\n"
+              "    int y;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:5:9]: (warning) Member variable 'Derived::y' has no initializer. [uninitMemberVarNoCtor]\n", errout_str());
+    }
+
+    void inheritedCtor8() {
+        check("struct Base { Base(int); };\n"
+              "struct Derived : Base {\n"
+              "    using Base::Base;\n"
+              "    Derived(int i) : Base(i), x(0) {}\n"
+              "    int x;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct Base { Base(int); Base(double); };\n"
+              "struct Derived : Base {\n"
+              "    using Base::Base;\n"
+              "    Derived(int i) : Base(i), x(0) {}\n"
+              "    int x;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:3:17]: (warning) Member variable 'Derived::x' is not initialized in the constructor inherited from 'Base'. [uninitMemberVar]\n", errout_str());
+    }
+
+    void inheritedCtor9() {
+        check("struct Base { Base(); };\n"
+              "struct Derived : Base {\n"
+              "    using Base::Base;\n"
+              "    int x;\n"
+              "};\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("struct Base {};\n"
+              "struct Derived : Base {\n"
+              "    using Base::Base;\n"
+              "    int x;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct Base { Base(const Base&); Base(Base&&); };\n"
+              "struct Derived : Base {\n"
+              "    using Base::Base;\n"
+              "    int x;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void inheritedCtor10() {
+        check("struct Base { Base(int) = delete; };\n"
+              "struct Derived : Base {\n"
+              "    using Base::Base;\n"
+              "    int x;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("class Base { Base(int); };\n"
+              "struct Derived : Base {\n"
+              "    using Base::Base;\n"
+              "    int x;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void inheritedCtor11() {
+        check("namespace X { struct Base { Base(int); }; }\n"
+              "struct Derived : X::Base {\n"
+              "    using X::Base::Base;\n"
+              "    int x;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:3:20]: (warning) Member variable 'Derived::x' is not initialized in the constructor inherited from 'Base'. [uninitMemberVar]\n", errout_str());
     }
 
 };
diff --git a/test/testcppcheck.cpp b/test/testcppcheck.cpp
index 35b25175023..d88daceb0d9 100644
--- a/test/testcppcheck.cpp
+++ b/test/testcppcheck.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
  */
 
 #include "addoninfo.h"
+#include "analyzerinfo.h"
 #include "color.h"
 #include "cppcheck.h"
 #include "errorlogger.h"
@@ -42,6 +43,22 @@
 
 #include <simplecpp.h>
 
+namespace {
+    class FilesDeleter {
+    public:
+        FilesDeleter() = default;
+        ~FilesDeleter() {
+            for (const std::string& fileName: mFilenames)
+                std::remove(fileName.c_str());
+        }
+        void addFile(const std::string& fileName) {
+            mFilenames.push_back(fileName);
+        }
+    private:
+        std::vector<std::string> mFilenames;
+    };
+}
+
 class TestCppcheck : public TestFixture {
 public:
     TestCppcheck() : TestFixture("TestCppcheck") {}
@@ -84,6 +101,7 @@ class TestCppcheck : public TestFixture {
         TEST_CASE(checkPlistOutput);
         TEST_CASE(premiumResultsCache);
         TEST_CASE(purgedConfiguration);
+        TEST_CASE(recheckInclude);
     }
 
     void getErrorMessages() const {
@@ -175,7 +193,7 @@ class TestCppcheck : public TestFixture {
                         "void f()\n"
                         "{\n"
                         "  (void)(*((int*)0));\n"
-                        "}");
+                        "}\n");
 
         int called = 0;
         std::unordered_set<std::string> addons;
@@ -196,7 +214,7 @@ class TestCppcheck : public TestFixture {
         if (tools && !nocmd) {
             f = getExecuteCommand(fname, called);
         }
-        CppCheck cppcheck(s, supprs, errorLogger, false, f);
+        CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, f);
         ASSERT_EQUALS(1, cppcheck.check(FileWithDetails(file.path(), Path::identify(file.path(), false), 0)));
         // TODO: how to properly disable these warnings?
         errorLogger.ids.erase(std::remove_if(errorLogger.ids.begin(), errorLogger.ids.end(), [](const std::string& id) {
@@ -259,7 +277,7 @@ class TestCppcheck : public TestFixture {
                         "void f()\n"
                         "{\n"
                         "  (void)(*((int*)0));\n"
-                        "}");
+                        "}\n");
 
         int called = 0;
         std::unordered_set<std::string> addons;
@@ -280,7 +298,7 @@ class TestCppcheck : public TestFixture {
         if (tools && !nocmd) {
             f = getExecuteCommand(fname, called);
         }
-        CppCheck cppcheck(s, supprs, errorLogger, false, f);
+        CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, f);
         FileSettings fs{file.path(), Path::identify(file.path(), false), 0};
         ASSERT_EQUALS(1, cppcheck.check(fs));
         // TODO: how to properly disable these warnings?
@@ -342,13 +360,13 @@ class TestCppcheck : public TestFixture {
                         "void f()\n"
                         "{\n"
                         "  (void)(*((int*)0));\n"
-                        "}");
+                        "}\n");
 
         const char xmldata[] = R"(<def format="2"><markup ext=".c" reporterrors="false"/></def>)";
         const Settings s = settingsBuilder().libraryxml(xmldata).build();
         Suppressions supprs;
         ErrorLogger2 errorLogger;
-        CppCheck cppcheck(s, supprs, errorLogger, false, {});
+        CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
         ASSERT_EQUALS(0, cppcheck.check(FileWithDetails(file.path(), Path::identify(file.path(), false), 0)));
         // TODO: how to properly disable these warnings?
         errorLogger.ids.erase(std::remove_if(errorLogger.ids.begin(), errorLogger.ids.end(), [](const std::string& id) {
@@ -364,17 +382,17 @@ class TestCppcheck : public TestFixture {
                         "inline void f()\n"
                         "{\n"
                         "  (void)(*((int*)0));\n"
-                        "}");
+                        "}\n");
         ScopedFile test_file_a("a.c",
-                               "#include \"inc.h\"");
+                               "#include \"inc.h\"\n");
         ScopedFile test_file_b("b.c",
-                               "#include \"inc.h\"");
+                               "#include \"inc.h\"\n");
 
         // this is the "simple" format
         const auto s = dinit(Settings, $.templateFormat = templateFormat); // TODO: remove when we only longer rely on toString() in unique message handling
         Suppressions supprs;
         ErrorLogger2 errorLogger;
-        CppCheck cppcheck(s, supprs, errorLogger, false, {});
+        CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
         ASSERT_EQUALS(1, cppcheck.check(FileWithDetails(test_file_a.path(), Path::identify(test_file_a.path(), false), 0)));
         ASSERT_EQUALS(1, cppcheck.check(FileWithDetails(test_file_b.path(), Path::identify(test_file_b.path(), false), 0)));
         // TODO: how to properly disable these warnings?
@@ -400,13 +418,13 @@ class TestCppcheck : public TestFixture {
                              "long a=m[9], b=m[9];\n"
                              "(void)a;\n"
                              "(void)b;\n"
-                             "}");
+                             "}\n");
 
         // this is the "simple" format
         const auto s = dinit(Settings, $.templateFormat = templateFormat); // TODO: remove when we only longer rely on toString() in unique message handling?
         Suppressions supprs;
         ErrorLogger2 errorLogger;
-        CppCheck cppcheck(s, supprs, errorLogger, false, {});
+        CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
         ASSERT_EQUALS(1, cppcheck.check(FileWithDetails(test_file.path(), Path::identify(test_file.path(), false), 0)));
         // TODO: how to properly disable these warnings?
         errorLogger.errmsgs.erase(std::remove_if(errorLogger.errmsgs.begin(), errorLogger.errmsgs.end(), [](const ErrorMessage& msg) {
@@ -440,7 +458,7 @@ class TestCppcheck : public TestFixture {
 
         {
             const auto s = dinit(Settings, $.premiumArgs = "");
-            CppCheck cppcheck(s, supprs, errorLogger, false, {});
+            CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
 
             ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("misra-c2012-0.0"));
             ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("misra-c2023-0.0"));
@@ -457,7 +475,7 @@ class TestCppcheck : public TestFixture {
         {
             const auto s = dinit(Settings, $.premiumArgs = "--misra-c-2012 --cert-c++-2016 --autosar");
 
-            CppCheck cppcheck(s, supprs, errorLogger, false, {});
+            CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
 
             ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("misra-c2012-0.0"));
             ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-misra-c-2012-0.0"));
@@ -477,7 +495,7 @@ class TestCppcheck : public TestFixture {
         s.basePaths.emplace_back("/some/path");
         Suppressions supprs;
         ErrorLogger2 errorLogger;
-        CppCheck cppcheck(s, supprs, errorLogger, false, {});
+        CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
         std::vector<std::string> files{"/some/path/test.c"};
         simplecpp::TokenList tokens1(files);
         const std::string expected = "  <rawtokens>\n"
@@ -490,7 +508,7 @@ class TestCppcheck : public TestFixture {
                             ";\n";
 
         simplecpp::OutputList outputList;
-        const simplecpp::TokenList tokens2(code, files, "", &outputList);
+        const simplecpp::TokenList tokens2(code, files, "", {}, &outputList);
         const std::string expected2 = "  <rawtokens>\n"
                                       "    <file index=\"0\" name=\"test.c\"/>\n"
                                       "    <file index=\"1\" name=\"\"/>\n"
@@ -508,7 +526,7 @@ class TestCppcheck : public TestFixture {
         {
             Settings s;
             s.libraries.emplace_back("std.cfg");
-            CppCheck cppcheck(s, supprs, errorLogger, false, {});
+            CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
             //std::vector<std::string> files{ "/some/path/test.c" };
             const std::string expected = "  <library lib=\"std.cfg\"/>\n";
             ASSERT_EQUALS(expected, cppcheck.getLibraryDumpData());
@@ -518,7 +536,7 @@ class TestCppcheck : public TestFixture {
             Settings s;
             s.libraries.emplace_back("std.cfg");
             s.libraries.emplace_back("posix.cfg");
-            CppCheck cppcheck(s, supprs, errorLogger, false, {});
+            CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
             const std::string expected = "  <library lib=\"std.cfg\"/>\n  <library lib=\"posix.cfg\"/>\n";
             ASSERT_EQUALS(expected, cppcheck.getLibraryDumpData());
         }
@@ -527,15 +545,14 @@ class TestCppcheck : public TestFixture {
     void checkPlistOutput() const {
         Suppressions supprs;
         ErrorLogger2 errorLogger;
-        std::vector<std::string> files = {"textfile.txt"};
 
         {
             const auto s = dinit(Settings, $.templateFormat = templateFormat, $.plistOutput = "output");
             const ScopedFile file("file", "");
-            CppCheck cppcheck(s, supprs, errorLogger, false, {});
+            CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
             const FileWithDetails fileWithDetails {file.path(), Path::identify(file.path(), false), 0};
 
-            cppcheck.checkPlistOutput(fileWithDetails, files);
+            cppcheck.checkPlistOutput(fileWithDetails);
             const std::string outputFile {"outputfile_" + std::to_string(std::hash<std::string> {}(fileWithDetails.spath())) + ".plist"};
             ASSERT(Path::exists(outputFile));
             std::remove(outputFile.c_str());
@@ -544,10 +561,10 @@ class TestCppcheck : public TestFixture {
         {
             const auto s = dinit(Settings, $.plistOutput = "output");
             const ScopedFile file("file.c", "");
-            CppCheck cppcheck(s, supprs, errorLogger, false, {});
+            CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
             const FileWithDetails fileWithDetails {file.path(), Path::identify(file.path(), false), 0};
 
-            cppcheck.checkPlistOutput(fileWithDetails, files);
+            cppcheck.checkPlistOutput(fileWithDetails);
             const std::string outputFile {"outputfile_" + std::to_string(std::hash<std::string> {}(fileWithDetails.spath())) + ".plist"};
             ASSERT(Path::exists(outputFile));
             std::remove(outputFile.c_str());
@@ -556,8 +573,8 @@ class TestCppcheck : public TestFixture {
         {
             Settings s;
             const ScopedFile file("file.c", "");
-            CppCheck cppcheck(s, supprs, errorLogger, false, {});
-            cppcheck.checkPlistOutput(FileWithDetails(file.path(), Path::identify(file.path(), false), 0), files);
+            CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
+            cppcheck.checkPlistOutput(FileWithDetails(file.path(), Path::identify(file.path(), false), 0));
         }
     }
 
@@ -574,7 +591,7 @@ class TestCppcheck : public TestFixture {
         simplecpp::TokenList tokens(code, files, "m1.c");
 
         Preprocessor preprocessor(tokens, settings, errorLogger, Standards::Language::C);
-        ASSERT(preprocessor.loadFiles(files));
+        ASSERT(preprocessor.loadAllIncludes(files));
 
         AddonInfo premiumaddon;
         premiumaddon.name = "premiumaddon.json";
@@ -585,7 +602,7 @@ class TestCppcheck : public TestFixture {
         settings.addonInfos.push_back(premiumaddon);
 
         settings.premiumArgs = "misra-c-2012";
-        CppCheck check(settings, supprs, errorLogger, false, {});
+        CppCheck check(settings, supprs, errorLogger, nullptr, false, {});
         const size_t hash1 = check.calculateHash(preprocessor);
 
         settings.premiumArgs = "";
@@ -609,7 +626,7 @@ class TestCppcheck : public TestFixture {
                              $.debugwarnings = true);
         Suppressions supprs;
         ErrorLogger2 errorLogger;
-        CppCheck cppcheck(s, supprs, errorLogger, false, {});
+        CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
         ASSERT_EQUALS(1, cppcheck.check(FileWithDetails(test_file.path(), Path::identify(test_file.path(), false), 0)));
         // TODO: how to properly disable these warnings?
         errorLogger.errmsgs.erase(std::remove_if(errorLogger.errmsgs.begin(), errorLogger.errmsgs.end(), [](const ErrorMessage& msg) {
@@ -618,10 +635,128 @@ class TestCppcheck : public TestFixture {
         // the internal errorlist is cleared after each check() call
         ASSERT_EQUALS(1, errorLogger.errmsgs.size());
         auto it = errorLogger.errmsgs.cbegin();
-        ASSERT_EQUALS("test.cpp:0:0: information: The configuration 'X' was not checked because its code equals another one. [purgedConfiguration]",
+        ASSERT_EQUALS("test.cpp:0:0: information: The configuration 'X=X' was not checked because its code equals another one. [purgedConfiguration]",
                       it->toString(false, templateFormat, ""));
     }
 
+    void recheckInclude() const
+    {
+        const auto settings = dinit(Settings,
+                                    $.templateFormat = templateFormat,
+                                        $.debugainfo = true,
+                                        $.buildDir = "test-build-dir");
+
+        ScopedFile build_dir("empty", "", "test-build-dir");
+
+        FilesDeleter filesDeleter;
+        filesDeleter.addFile("test-build-dir/files.txt");
+        filesDeleter.addFile("test-build-dir/test.a1");
+        filesDeleter.addFile("test-build-dir/test.s1");
+
+        AnalyzerInformation::writeFilesTxt(settings.buildDir, {"test.cpp"}, {});
+
+        // First check
+        {
+            REDIRECT;
+
+            ScopedFile source_file("test.cpp",
+                                   "#include \"test1.h\"\n"
+                                   "#include \"test2.h\"\n");
+            ScopedFile header1_file("test1.h",
+                                    "class TestClass1 {};\n");
+            ScopedFile header2_file("test2.h",
+                                    "class TestClass2 {};\n");
+
+            Suppressions suppressions;
+            ErrorLogger2 errorLogger;
+            CppCheck cppcheck(settings, suppressions, errorLogger, nullptr, false, {});
+
+            const auto ret = cppcheck.check(FileWithDetails(source_file.path(), Standards::Language::CPP, 0));
+            const auto out = GET_REDIRECT_OUTPUT;
+
+            ASSERT_EQUALS(0, ret);
+            ASSERT_EQUALS("no cached result 'test-build-dir/test.a1' for 'test.cpp' found\n", out);
+        }
+
+        // No change, don't recheck
+        {
+            REDIRECT;
+
+            ScopedFile source_file("test.cpp",
+                                   "#include \"test1.h\"\n"
+                                   "#include \"test2.h\"\n");
+            ScopedFile header1_file("test1.h",
+                                    "class TestClass1 {};\n");
+            ScopedFile header2_file("test2.h",
+                                    "class TestClass2 {};\n");
+
+            Suppressions suppressions;
+            ErrorLogger2 errorLogger;
+            CppCheck cppcheck(settings, suppressions, errorLogger, nullptr, false, {});
+
+            const auto ret = cppcheck.check(FileWithDetails(source_file.path(), Standards::Language::CPP, 0));
+            const auto out = GET_REDIRECT_OUTPUT;
+
+            ASSERT_EQUALS(0, ret);
+            ASSERT_EQUALS("skipping analysis - loaded 0 cached finding(s) from 'test-build-dir/test.a1' for 'test.cpp'\n", out);
+        }
+
+        // Header changed, recheck
+        {
+            REDIRECT;
+
+            ScopedFile source_file("test.cpp",
+                                   "#include \"test1.h\"\n"
+                                   "#include \"test2.h\"\n");
+            ScopedFile header1_file("test1.h",
+                                    "class TestClass1 {};\n");
+            ScopedFile header2_file("test2.h",
+                                    "class TestClass2 { int a; };\n");
+
+            Suppressions suppressions;
+            ErrorLogger2 errorLogger;
+            CppCheck cppcheck(settings, suppressions, errorLogger, nullptr, false, {});
+
+            const auto ret = cppcheck.check(FileWithDetails(source_file.path(), Standards::Language::CPP, 0));
+            const auto out = GET_REDIRECT_OUTPUT;
+
+            ASSERT_EQUALS(0, ret);
+            ASSERT_EQUALS("discarding cached result from 'test-build-dir/test.a1' for 'test.cpp' - hash mismatch\n", out);
+        }
+
+        // Source changed, recheck
+        {
+            REDIRECT;
+
+            // Inclusion removed
+            ScopedFile source_file("test.cpp",
+                                   "#include \"test1.h\"\n");
+            ScopedFile header1_file("test1.h",
+                                    "class TestClass1 {};\n");
+            ScopedFile header2_file("test2.h",
+                                    "class TestClass2 { int a; };\n");
+
+            Suppressions suppressions;
+            ErrorLogger2 errorLogger;
+            CppCheck cppcheck(settings, suppressions, errorLogger, nullptr, false, {});
+
+            const auto ret = cppcheck.check(FileWithDetails(source_file.path(), Standards::Language::CPP, 0));
+            const auto out = GET_REDIRECT_OUTPUT;
+
+            ASSERT_EQUALS(0, ret);
+            ASSERT_EQUALS("discarding cached result from 'test-build-dir/test.a1' for 'test.cpp' - hash mismatch\n", out);
+        }
+
+        // Inclusion removed from source, check that it's removed from analyzer info
+        {
+            AnalyzerInformation analyzerInfo;
+            const auto includes = analyzerInfo.getIncludes("test-build-dir", "test.cpp", "", 0);
+
+            ASSERT_EQUALS(1, includes.size());
+            ASSERT_EQUALS("test1.h", *includes.begin());
+        }
+    }
+
     // TODO: test suppressions
     // TODO: test all with FS
 };
diff --git a/test/testerrorlogger.cpp b/test/testerrorlogger.cpp
index 42537ca36fb..68d473420b9 100644
--- a/test/testerrorlogger.cpp
+++ b/test/testerrorlogger.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,9 +49,14 @@ class TestErrorLogger : public TestFixture {
         TEST_CASE(FileLocationSetFile2);
         TEST_CASE(ErrorMessageConstruct);
         TEST_CASE(ErrorMessageConstructLocations);
+        TEST_CASE(ErrorMessageHashFallback);
         TEST_CASE(ErrorMessageVerbose);
         TEST_CASE(ErrorMessageVerboseLocations);
+        TEST_CASE(ErrorMessageVerboseSymbol);
+        TEST_CASE(ErrorMessageVerboseNewline);
         TEST_CASE(ErrorMessageFromInternalError);
+        TEST_CASE(ErrorMessageCode);
+        TEST_CASE(ErrorMessageNoCode);
         TEST_CASE(CustomFormat);
         TEST_CASE(CustomFormat2);
         TEST_CASE(CustomFormatLocations);
@@ -137,7 +142,7 @@ class TestErrorLogger : public TestFixture {
             ASSERT_EQUALS("info", loc.getinfo());
         }
         {
-            const SimpleTokenList tokenlist("a", "dir/a.cpp");
+            const SimpleTokenList tokenlist("a\n", "dir/a.cpp");
             {
                 const ErrorMessage::FileLocation loc(tokenlist.front(), &tokenlist.get());
                 ASSERT_EQUALS("dir/a.cpp", loc.getOrigFile(false));
@@ -170,7 +175,7 @@ class TestErrorLogger : public TestFixture {
             }
         }
         {
-            const SimpleTokenList tokenlist("a", "dir\\a.cpp");
+            const SimpleTokenList tokenlist("a\n", "dir\\a.cpp");
             {
                 const ErrorMessage::FileLocation loc(tokenlist.front(), &tokenlist.get());
                 ASSERT_EQUALS("dir\\a.cpp", loc.getOrigFile(false));
@@ -210,12 +215,12 @@ class TestErrorLogger : public TestFixture {
         ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation("dir/a.cpp", "info", 1, 1).getfile(false));
         ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation("dir\\a.cpp", "info", 1, 1).getfile(false));
         {
-            const SimpleTokenList tokenlist("a", "dir/a.cpp");
+            const SimpleTokenList tokenlist("a\n", "dir/a.cpp");
             ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation(tokenlist.front(), &tokenlist.get()).getfile(false));
             ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation(tokenlist.front(), "info", &tokenlist.get()).getfile(false));
         }
         {
-            const SimpleTokenList tokenlist("a", "dir\\a.cpp");
+            const SimpleTokenList tokenlist("a\n", "dir\\a.cpp");
             ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation(tokenlist.front(), &tokenlist.get()).getfile(false));
             ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation(tokenlist.front(), "info", &tokenlist.get()).getfile(false));
         }
@@ -264,6 +269,77 @@ class TestErrorLogger : public TestFixture {
         ASSERT_EQUALS("[foo.cpp:5] -> [bar.cpp:8]: (error) Programming error.", msg.toString(true, templateFormat, ""));
     }
 
+    // unusedFunction/staticFunction/ctu* warnings carry no token information, so
+    // ErrorMessage::calculateWarningHash() (which needs tokens) can't compute a
+    // hash for them. calculateWarningHashFromLocations() is the fallback used
+    // instead - it hashes the id, message and all location filenames/notes.
+    void ErrorMessageHashFallback() const {
+        // ids that don't need a fallback hash still get none
+        {
+            std::list<ErrorMessage::FileLocation> locs(1, fooCpp5);
+            ErrorMessage msg(std::move(locs), "", Severity::style, "Some warning.", "someOtherId", Certainty::normal);
+            ASSERT_EQUALS(0, msg.hash);
+        }
+
+        // unusedFunction, staticFunction and any ctu* id get a non-zero fallback hash
+        for (const std::string& id : { std::string("unusedFunction"), std::string("staticFunction"), std::string("ctuOneDefinitionRuleViolation") }) {
+            std::list<ErrorMessage::FileLocation> locs(1, fooCpp5);
+            ErrorMessage msg(std::move(locs), "", Severity::style, "Some warning.", id, Certainty::normal);
+            ASSERT(msg.hash != 0);
+        }
+
+        // same id/message/locations => same hash
+        {
+            std::list<ErrorMessage::FileLocation> locs1(1, fooCpp5);
+            ErrorMessage msg1(std::move(locs1), "", Severity::style, "Some warning.", "unusedFunction", Certainty::normal);
+
+            std::list<ErrorMessage::FileLocation> locs2(1, fooCpp5);
+            ErrorMessage msg2(std::move(locs2), "", Severity::style, "Some warning.", "unusedFunction", Certainty::normal);
+
+            ASSERT_EQUALS(msg1.hash, msg2.hash);
+        }
+
+        // different message => different hash
+        {
+            std::list<ErrorMessage::FileLocation> locs1(1, fooCpp5);
+            ErrorMessage msg1(std::move(locs1), "", Severity::style, "Some warning.", "unusedFunction", Certainty::normal);
+
+            std::list<ErrorMessage::FileLocation> locs2(1, fooCpp5);
+            ErrorMessage msg2(std::move(locs2), "", Severity::style, "Some other warning.", "unusedFunction", Certainty::normal);
+
+            ASSERT(msg1.hash != msg2.hash);
+        }
+
+        // different location filename => different hash
+        {
+            std::list<ErrorMessage::FileLocation> locs1(1, fooCpp5);
+            ErrorMessage msg1(std::move(locs1), "", Severity::style, "Some warning.", "unusedFunction", Certainty::normal);
+
+            std::list<ErrorMessage::FileLocation> locs2(1, barCpp8);
+            ErrorMessage msg2(std::move(locs2), "", Severity::style, "Some warning.", "unusedFunction", Certainty::normal);
+
+            ASSERT(msg1.hash != msg2.hash);
+        }
+
+        // different location note (info) => different hash
+        {
+            std::list<ErrorMessage::FileLocation> locs1(1, barCpp8);
+            ErrorMessage msg1(std::move(locs1), "", Severity::error, "Some warning.", "ctuOneDefinitionRuleViolation", Certainty::normal);
+
+            std::list<ErrorMessage::FileLocation> locs2(1, barCpp8_i);
+            ErrorMessage msg2(std::move(locs2), "", Severity::error, "Some warning.", "ctuOneDefinitionRuleViolation", Certainty::normal);
+
+            ASSERT(msg1.hash != msg2.hash);
+        }
+
+        // hash shows up in the XML output
+        {
+            std::list<ErrorMessage::FileLocation> locs(1, fooCpp5);
+            ErrorMessage msg(std::move(locs), "", Severity::style, "Some warning.", "unusedFunction", Certainty::normal);
+            ASSERT(msg.toXML().find(" hash=\"") != std::string::npos);
+        }
+    }
+
     void ErrorMessageVerbose() const {
         std::list<ErrorMessage::FileLocation> locs(1, fooCpp5);
         ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error.\nVerbose error", "errorId", Certainty::normal);
@@ -284,6 +360,27 @@ class TestErrorLogger : public TestFixture {
         ASSERT_EQUALS("[foo.cpp:5] -> [bar.cpp:8]: (error) Verbose error", msg.toString(true, templateFormat, ""));
     }
 
+    void ErrorMessageVerboseSymbol() const {
+        std::list<ErrorMessage::FileLocation> locs(1, fooCpp5);
+        ErrorMessage msg(std::move(locs), "", Severity::error, "$symbol:sym\nProgramming error with $symbol.\nVerbose error about $symbol", "errorId", Certainty::normal);
+        ASSERT_EQUALS(1, msg.callStack.size());
+        ASSERT_EQUALS("Programming error with sym.", msg.shortMessage());
+        ASSERT_EQUALS("Verbose error about sym", msg.verboseMessage());
+        ASSERT_EQUALS("[foo.cpp:5]: (error) Programming error with sym.", msg.toString(false, templateFormat, ""));
+        ASSERT_EQUALS("[foo.cpp:5]: (error) Verbose error about sym", msg.toString(true, templateFormat, ""));
+        ASSERT_EQUALS("sym\n", msg.symbolNames());
+    }
+
+    void ErrorMessageVerboseNewline() const {
+        std::list<ErrorMessage::FileLocation> locs(1, fooCpp5);
+        ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error.\nVerbose error\nEven more verbose", "errorId", Certainty::normal);
+        ASSERT_EQUALS(1, msg.callStack.size());
+        ASSERT_EQUALS("Programming error.", msg.shortMessage());
+        ASSERT_EQUALS("Verbose error\nEven more verbose", msg.verboseMessage());
+        ASSERT_EQUALS("[foo.cpp:5]: (error) Programming error.", msg.toString(false, templateFormat, ""));
+        ASSERT_EQUALS("[foo.cpp:5]: (error) Verbose error\nEven more verbose", msg.toString(true, templateFormat, ""));
+    }
+
     void ErrorMessageFromInternalError() const {
         // TODO: test with token
         {
@@ -337,10 +434,47 @@ class TestErrorLogger : public TestFixture {
         testReportType(ReportType::misraCpp2023, Severity::style, "premium-misra-cpp-2023-dir-0.3.2", "Required", "Dir 0.3.2");
         testReportType(ReportType::misraCpp2008, Severity::style, "premium-misra-cpp-2008-3-4-1", "Required", "3-4-1");
         testReportType(ReportType::misraC2012, Severity::style, "premium-misra-c-2012-dir-4.6", "Advisory", "Dir 4.6");
+        testReportType(ReportType::misraC2012, Severity::style, "premium-misra-c-2012-10.4-positive-number", "Required", "10.4");
+        testReportType(ReportType::misraC2012, Severity::style, "premium-misra-c-2012-10.4", "Required", "10.4");
         testReportType(ReportType::misraC2012, Severity::style, "misra-c2012-dir-4.6", "Advisory", "Dir 4.6");
         testReportType(ReportType::certC, Severity::error, "resourceLeak", "L3", "FIO42-C");
     }
 
+    void ErrorMessageCode() const {
+        ScopedFile file("code.cpp",
+                        "int i;\n"
+                        "int i2;\n"
+                        "int i3;\n"
+                        );
+
+        ErrorMessage::FileLocation codeCpp3_5{"code.cpp", 3, 5};
+        std::list<ErrorMessage::FileLocation> locs = { codeCpp3_5 };
+        ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error.\nVerbose error", "errorId", Certainty::normal);
+        ASSERT_EQUALS(1, msg.callStack.size());
+        ASSERT_EQUALS("Programming error.", msg.shortMessage());
+        ASSERT_EQUALS("Verbose error", msg.verboseMessage());
+        ASSERT_EQUALS("code.cpp:3:5: error: Programming error. [errorId]\n"
+                      "int i3;\n"
+                      "    ^",
+                      msg.toString(false, "{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\n{code}", ""));
+    }
+
+    void ErrorMessageNoCode() const {
+        ScopedFile file("code.cpp",
+                        "int i;\n"
+                        "int i2;\n"
+                        "int i3;\n"
+                        );
+
+        ErrorMessage::FileLocation code{"code.cpp", 3, 5};
+        std::list<ErrorMessage::FileLocation> locs = { code };
+        ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error.\nVerbose error", "errorId", Certainty::normal);
+        ASSERT_EQUALS(1, msg.callStack.size());
+        const bool noCode = true;
+        ASSERT_EQUALS("code.cpp:3:5: error: Programming error. [errorId]\n",
+                      msg.toString(false, "{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\n{code}", "", noCode));
+    }
+
     void CustomFormat() const {
         std::list<ErrorMessage::FileLocation> locs(1, fooCpp5);
         ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error.\nVerbose error", "errorId", Certainty::normal);
@@ -554,7 +688,7 @@ class TestErrorLogger : public TestFixture {
                                "0 "
                                "0 ";
             ErrorMessage msg;
-            ASSERT_THROW_INTERNAL_EQUALS(msg.deserialize(str), INTERNAL, "Internal Error: Deserialization of error message failed - invalid CWE ID - not an integer");
+            ASSERT_THROW_INTERNAL_EQUALS(msg.deserialize(str), INTERNAL, "Internal Error: Deserialization of error message failed - invalid CWE ID - not an integer (invalid_argument)");
         }
         {
             // invalid hash
@@ -570,7 +704,7 @@ class TestErrorLogger : public TestFixture {
                                "0 "
                                "0 ";
             ErrorMessage msg;
-            ASSERT_THROW_INTERNAL_EQUALS(msg.deserialize(str), INTERNAL, "Internal Error: Deserialization of error message failed - invalid hash - not an integer");
+            ASSERT_THROW_INTERNAL_EQUALS(msg.deserialize(str), INTERNAL, "Internal Error: Deserialization of error message failed - invalid hash - not an integer (invalid_argument)");
         }
         {
             // out-of-range CWE ID
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
index 753a1ddd454..7e3de4405b0 100644
--- a/test/testexceptionsafety.cpp
+++ b/test/testexceptionsafety.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -75,8 +75,8 @@ class TestExceptionSafety : public TestFixture {
         SimpleTokenizer tokenizer(settings1, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check char variable usage..
-        runChecks<CheckExceptionSafety>(tokenizer, this);
+        CheckExceptionSafety check;
+        runChecks(check, tokenizer, *this);
     }
 
     void destructors() {
@@ -84,7 +84,7 @@ class TestExceptionSafety : public TestFixture {
               "    ~x() {\n"
               "        throw e;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (warning) Class x is not safe, destructor throws exception [exceptThrowInDestructor]\n"
                       "[test.cpp:3:9]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
 
@@ -93,7 +93,7 @@ class TestExceptionSafety : public TestFixture {
               "};\n"
               "x::~x() {\n"
               "    throw e;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (warning) Class x is not safe, destructor throws exception [exceptThrowInDestructor]\n"
                       "[test.cpp:5:5]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
 
@@ -105,7 +105,7 @@ class TestExceptionSafety : public TestFixture {
               "        } catch (...) {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class x {\n"
@@ -114,7 +114,7 @@ class TestExceptionSafety : public TestFixture {
               "            throw e;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
 
         // #11031 should not warn when noexcept false
@@ -123,7 +123,7 @@ class TestExceptionSafety : public TestFixture {
               "    ~A() noexcept(false) {\n"
               "        throw 30;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -134,7 +134,7 @@ class TestExceptionSafety : public TestFixture {
               "    if (x)\n"
               "        throw 123;\n"
               "    p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (warning) Exception thrown in invalid state, 'p' points at deallocated memory. [exceptDeallocThrow]\n", errout_str());
 
         check("void f() {\n"
@@ -143,7 +143,7 @@ class TestExceptionSafety : public TestFixture {
               "    if (foo)\n"
               "        throw 1;\n"
               "    p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (warning) Exception thrown in invalid state, 'p' points at deallocated memory. [exceptDeallocThrow]\n", errout_str());
     }
 
@@ -154,7 +154,7 @@ class TestExceptionSafety : public TestFixture {
               "    if (foo)\n"
               "        throw 1;\n"
               "    p = new int;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -162,7 +162,7 @@ class TestExceptionSafety : public TestFixture {
               "    delete p;\n"
               "    reset(p);\n"
               "    throw 1;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -171,14 +171,14 @@ class TestExceptionSafety : public TestFixture {
               "    static int* p = 0;\n"
               "    delete p;\n"
               "    throw 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    static int* p = 0;\n"
               "    delete p;\n"
               "    throw 1;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Exception thrown in invalid state, 'p' points at deallocated memory. [exceptDeallocThrow]\n", errout_str());
     }
 
@@ -192,7 +192,7 @@ class TestExceptionSafety : public TestFixture {
               "    {\n"
               "        throw err;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:9]: (style) Throwing a copy of the caught exception instead of rethrowing the original exception. [exceptRethrowCopy]\n", errout_str());
     }
 
@@ -206,7 +206,7 @@ class TestExceptionSafety : public TestFixture {
               "    {\n"
               "        throw err;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:9]: (style) Throwing a copy of the caught exception instead of rethrowing the original exception. [exceptRethrowCopy]\n", errout_str());
     }
 
@@ -218,7 +218,7 @@ class TestExceptionSafety : public TestFixture {
               "    catch(std::runtime_error& err) {\n"
               "        throw err;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:9]: (style) Throwing a copy of the caught exception instead of rethrowing the original exception. [exceptRethrowCopy]\n", errout_str());
     }
 
@@ -233,7 +233,7 @@ class TestExceptionSafety : public TestFixture {
               "        exception err2;\n"
               "        throw err2;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -250,7 +250,7 @@ class TestExceptionSafety : public TestFixture {
               "            throw inner;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:13]: (style) Throwing a copy of the caught exception instead of rethrowing the original exception. [exceptRethrowCopy]\n", errout_str());
 
         check("void f() {\n"
@@ -265,7 +265,7 @@ class TestExceptionSafety : public TestFixture {
               "            throw outer;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -277,7 +277,7 @@ class TestExceptionSafety : public TestFixture {
               "    catch( ::std::exception err) {\n"
               "        foo(err);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (style) Exception should be caught by reference. [catchExceptionByValue]\n", errout_str());
 
         check("void f() {\n"
@@ -287,7 +287,7 @@ class TestExceptionSafety : public TestFixture {
               "    catch(const exception err) {\n"
               "        foo(err);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (style) Exception should be caught by reference. [catchExceptionByValue]\n", errout_str());
 
         check("void f() {\n"
@@ -297,7 +297,7 @@ class TestExceptionSafety : public TestFixture {
               "    catch( ::std::exception& err) {\n"
               "        foo(err);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -307,7 +307,7 @@ class TestExceptionSafety : public TestFixture {
               "    catch(exception* err) {\n"
               "        foo(err);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -317,7 +317,7 @@ class TestExceptionSafety : public TestFixture {
               "    catch(const exception& err) {\n"
               "        foo(err);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -327,7 +327,7 @@ class TestExceptionSafety : public TestFixture {
               "    catch(int err) {\n"
               "        foo(err);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -337,7 +337,7 @@ class TestExceptionSafety : public TestFixture {
               "    catch(exception* const err) {\n"
               "        foo(err);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -347,15 +347,30 @@ class TestExceptionSafety : public TestFixture {
               "void func3() noexcept(true) { throw 1; }\n"
               "void func4() noexcept(false) { throw 1; }\n"
               "void func5() noexcept(true) { func1(); }\n"
-              "void func6() noexcept(false) { func1(); }");
+              "void func6() noexcept(false) { func1(); }\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
                       "[test.cpp:3:31]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
                       "[test.cpp:5:31]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
 
         // avoid false positives
         check("const char *func() noexcept { return 0; }\n"
-              "const char *func1() noexcept { try { throw 1; } catch(...) {} return 0; }");
+              "const char *func1() noexcept { try { throw 1; } catch(...) {} return 0; }\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("struct A {\n" // #14526
+              "    void f(int = 0, int = 1) { throw 0; }\n"
+              "};\n"
+              "void g() noexcept {\n"
+              "    A a;\n"
+              "    a.f();\n"
+              "}\n"
+              "void h() noexcept {\n"
+              "    A a;\n"
+              "    a.f(1, 3);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:7]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
+                      "[test.cpp:10:7]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n",
+                      errout_str());
     }
 
     void nothrowThrow() {
@@ -363,12 +378,12 @@ class TestExceptionSafety : public TestFixture {
               "void func2() throw() { throw 1; }\n"
               "void func3() throw(int) { throw 1; }\n"
               "void func4() throw() { func1(); }\n"
-              "void func5() throw(int) { func1(); }");
+              "void func5() throw(int) { func1(); }\n");
         ASSERT_EQUALS("[test.cpp:2:24]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
                       "[test.cpp:4:24]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
 
         // avoid false positives
-        check("const char *func() throw() { return 0; }");
+        check("const char *func() throw() { return 0; }\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -436,12 +451,12 @@ class TestExceptionSafety : public TestFixture {
     void nothrowAttributeThrow() {
         check("void func1() throw(int) { throw 1; }\n"
               "void func2() __attribute((nothrow)); void func2() { throw 1; }\n"
-              "void func3() __attribute((nothrow)); void func3() { func1(); }");
+              "void func3() __attribute((nothrow)); void func3() { func1(); }\n");
         ASSERT_EQUALS("[test.cpp:2:53]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
                       "[test.cpp:3:53]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
 
         // avoid false positives
-        check("const char *func() __attribute((nothrow)); void func1() { return 0; }");
+        check("const char *func() __attribute((nothrow)); void func1() { return 0; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -450,30 +465,30 @@ class TestExceptionSafety : public TestFixture {
               "  void copyMemberValues() throw () {\n"
               "      copyMemberValues();\n"
               "   }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void nothrowDeclspecThrow() {
         check("void func1() throw(int) { throw 1; }\n"
               "void __declspec(nothrow) func2() { throw 1; }\n"
-              "void __declspec(nothrow) func3() { func1(); }");
+              "void __declspec(nothrow) func3() { func1(); }\n");
         ASSERT_EQUALS("[test.cpp:2:36]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
                       "[test.cpp:3:36]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
 
         // avoid false positives
-        check("const char *func() __attribute((nothrow)); void func1() { return 0; }");
+        check("const char *func() __attribute((nothrow)); void func1() { return 0; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void rethrowNoCurrentException1() {
-        check("void func1(const bool flag) { try{ if(!flag) throw; } catch (int&) { ; } }");
+        check("void func1(const bool flag) { try{ if(!flag) throw; } catch (int&) { ; } }\n");
         ASSERT_EQUALS("[test.cpp:1:46]: (error) Rethrowing current exception with 'throw;', it seems there is no current exception to rethrow."
                       " If there is no current exception this calls std::terminate(). More: https://isocpp.org/wiki/faq/exceptions#throw-without-an-object [rethrowNoCurrentException]\n", errout_str());
     }
 
     void rethrowNoCurrentException2() {
-        check("void func1() { try{ ; } catch (...) { ; } throw; }");
+        check("void func1() { try{ ; } catch (...) { ; } throw; }\n");
         ASSERT_EQUALS("[test.cpp:1:43]: (error) Rethrowing current exception with 'throw;', it seems there is no current exception to rethrow."
                       " If there is no current exception this calls std::terminate(). More: https://isocpp.org/wiki/faq/exceptions#throw-without-an-object [rethrowNoCurrentException]\n", errout_str());
     }
@@ -481,7 +496,7 @@ class TestExceptionSafety : public TestFixture {
     void rethrowNoCurrentException3() {
         check("void on_error() { try { throw; } catch (const int &) { ; } catch (...) { ; } }\n"      // exception dispatcher idiom
               "void func2() { try{ ; } catch (const int&) { throw; } ; }\n"
-              "void func3() { throw 0; }");
+              "void func3() { throw 0; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -518,6 +533,15 @@ class TestExceptionSafety : public TestFixture {
               "    }\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(int i) {\n" // #9380
+              "    throw i;\n"
+              "}\n"
+              "int main() {\n"
+              "    f(123);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Unhandled exception thrown in function that is an entry point. [throwInEntryPoint]\n",
+                      errout_str());
     }
 };
 
diff --git a/test/testexecutor.cpp b/test/testexecutor.cpp
index 9e495640523..30b2b834834 100644
--- a/test/testexecutor.cpp
+++ b/test/testexecutor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@ class DummyExecutor : public Executor
 {
 public:
     DummyExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger)
-        : Executor(files, fileSettings, settings, suppressions, errorLogger)
+        : Executor(files, fileSettings, settings, suppressions, errorLogger, nullptr)
     {}
 
     NORETURN unsigned int check() override
diff --git a/test/testfilelister.cpp b/test/testfilelister.cpp
index 13057735513..b90a8cb55e7 100644
--- a/test/testfilelister.cpp
+++ b/test/testfilelister.cpp
@@ -36,6 +36,7 @@ class TestFileLister : public TestFixture {
     void run() override {
         TEST_CASE(recursiveAddFiles);
         TEST_CASE(recursiveAddFilesEmptyPath);
+        TEST_CASE(recursiveAddFilesNulInPath);
         TEST_CASE(excludeFile1);
         TEST_CASE(excludeFile2);
         TEST_CASE(excludeDir);
@@ -110,6 +111,13 @@ class TestFileLister : public TestFixture {
         ASSERT_EQUALS("no path specified", err);
     }
 
+    void recursiveAddFilesNulInPath() const {
+        std::list<FileWithDetails> files;
+        const std::string err = FileLister::recursiveAddFiles(files, std::string("lib\0", 4), {}, PathMatch());
+        ASSERT_EQUALS("path 'lib' contains a NUL character", err);
+        ASSERT(files.empty());
+    }
+
     void excludeFile1() const {
         const std::string basedir = findBaseDir();
 
diff --git a/test/testfunctions.cpp b/test/testfunctions.cpp
index da589c765fe..58228b58b07 100644
--- a/test/testfunctions.cpp
+++ b/test/testfunctions.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,6 +59,7 @@ class TestFunctions : public TestFixture {
 
         // Invalid function argument
         TEST_CASE(invalidFunctionArg1);
+        TEST_CASE(invalidFunctionArgErrorPath);
 
         // Math function usage
         TEST_CASE(mathfunctionCall_fmod);
@@ -85,6 +86,10 @@ class TestFunctions : public TestFixture {
         TEST_CASE(checkMissingReturn4);
         TEST_CASE(checkMissingReturn5);
         TEST_CASE(checkMissingReturn6); // #13180
+        TEST_CASE(checkMissingReturn7); // #14370 - FN try/catch
+        TEST_CASE(checkMissingReturn8);
+        TEST_CASE(checkMissingReturn9);
+        TEST_CASE(checkMissingReturnStdInt); // #14482 - FN std::int32_t
 
         // std::move for locar variable
         TEST_CASE(returnLocalStdMove1);
@@ -130,21 +135,22 @@ class TestFunctions : public TestFixture {
         SimpleTokenizer tokenizer(s, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        runChecks<CheckFunctions>(tokenizer, this);
+        CheckFunctions check;
+        runChecks(check, tokenizer, *this);
     }
 
     void prohibitedFunctions_posix() {
         check("void f()\n"
               "{\n"
               "    bsd_signal(SIGABRT, SIG_IGN);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Obsolescent function 'bsd_signal' called. It is recommended to use 'sigaction' instead. [bsd_signalCalled]\n", errout_str());
 
         check("int f()\n"
               "{\n"
               "    int bsd_signal(0);\n"
               "    return bsd_signal;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -153,7 +159,7 @@ class TestFunctions : public TestFixture {
               "    if(!hp = gethostbyname(\"127.0.0.1\")) {\n"
               "        exit(1);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (style) Obsolescent function 'gethostbyname' called. It is recommended to use 'getaddrinfo' instead. [gethostbynameCalled]\n", errout_str());
 
         check("void f()\n"
@@ -163,13 +169,13 @@ class TestFunctions : public TestFixture {
               "    if(!hp = gethostbyaddr((char *) &addr, sizeof(addr), AF_INET)) {\n"
               "        exit(1);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:14]: (style) Obsolescent function 'gethostbyaddr' called. It is recommended to use 'getnameinfo' instead. [gethostbyaddrCalled]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    usleep( 1000 );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Obsolescent function 'usleep' called. It is recommended to use 'nanosleep' or 'setitimer' instead. [usleepCalled]\n", errout_str());
     }
 
@@ -181,7 +187,7 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    n1::index();\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::size_t f()\n"
@@ -189,19 +195,19 @@ class TestFunctions : public TestFixture {
               "    std::size_t index(0);\n"
               "    index++;\n"
               "    return index;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f()\n"
               "{\n"
               "    return this->index();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    int index( 0 );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const char f()\n"
@@ -209,7 +215,7 @@ class TestFunctions : public TestFixture {
               "    const char var[6] = \"index\";\n"
               "    const char i = index(var, 0);\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:20]: (style) Obsolescent function 'index' called. It is recommended to use 'strchr' instead. [indexCalled]\n",
                       errout_str());
     }
@@ -217,10 +223,10 @@ class TestFunctions : public TestFixture {
     void prohibitedFunctions_qt_index() {
         check("void TDataModel::forceRowRefresh(int row) {\n"
               "    emit dataChanged(index(row, 0), index(row, columnCount() - 1));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:22]: (style) Obsolescent function 'index' called. It is recommended to use 'strchr' instead. [indexCalled]\n"
-            "[test.cpp:2:37]: (style) Obsolescent function 'index' called. It is recommended to use 'strchr' instead. [indexCalled]\n",   // duplicate
+            "[test.cpp:2:37]: (style) Obsolescent function 'index' called. It is recommended to use 'strchr' instead. [indexCalled]\n",
             errout_str());
     }
 
@@ -228,14 +234,14 @@ class TestFunctions : public TestFixture {
         check("void f()\n"
               "{\n"
               "    int rindex( 0 );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    const char var[7] = \"rindex\";\n"
               "    print(rindex(var, 0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Obsolescent function 'rindex' called. It is recommended to use 'strrchr' instead. [rindexCalled]\n", errout_str());
     }
 
@@ -245,7 +251,7 @@ class TestFunctions : public TestFixture {
               "public:\n"
               "    Fred() : index(0) { }\n"
               "    int index;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -253,13 +259,13 @@ class TestFunctions : public TestFixture {
         check("void f()\n"
               "{\n"
               "    char *x = gets(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead. [getsCalled]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    foo(x, gets(a));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead. [getsCalled]\n", errout_str());
     }
 
@@ -267,32 +273,32 @@ class TestFunctions : public TestFixture {
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}");  // #4382 - there are no VLAs in C++
+              "}\n");  // #4382 - there are no VLAs in C++
         ASSERT_EQUALS("[test.cpp:3:15]: (warning) Obsolete function 'alloca' called. [allocaCalled]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:15]: (warning) Obsolete function 'alloca' called. In C99 and later it is recommended to use a variable length array instead. [allocaCalled]\n", errout_str());
 
         const Settings s = settingsBuilder(settings).c(Standards::C89).cpp(Standards::CPP03).build();
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}", s);  // #4382 - there are no VLAs in C++
+              "}\n", s);  // #4382 - there are no VLAs in C++
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}", s, false); // #7558 - no alternative to alloca in C89
+              "}\n", s, false); // #7558 - no alternative to alloca in C89
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}", s, false);
+              "}\n", s, false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -306,7 +312,7 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    int b ; b = ftime ( 1 ) ;\n"
               "    return 0 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -316,7 +322,7 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    char *x = std::gets(str);\n"
               "    char *y = gets(str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:20]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead. [getsCalled]\n"
                       "[test.cpp:4:15]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead. [getsCalled]\n", errout_str());
     }
@@ -327,7 +333,7 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    char *x = std::gets(str);\n"
               "    usleep( 1000 );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:20]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead. [getsCalled]\n"
                       "[test.cpp:4:5]: (style) Obsolescent function 'usleep' called. It is recommended to use 'nanosleep' or 'setitimer' instead. [usleepCalled]\n", errout_str());
     }
@@ -339,14 +345,14 @@ class TestFunctions : public TestFixture {
               "    char s [ 10 ] ;\n"
               "    gets ( s ) ;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead. [getsCalled]\n", errout_str());
 
         check("int getcontext(ucontext_t *ucp);\n"
               "void f (ucontext_t *ucp)\n"
               "{\n"
               "    getcontext ( ucp ) ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (portability) Obsolescent function 'getcontext' called. Applications are recommended to be rewritten to use POSIX threads. [getcontextCalled]\n", errout_str());
     }
 
@@ -357,7 +363,7 @@ class TestFunctions : public TestFixture {
               "    char s [ 10 ] ;\n"
               "    gets ( s ) ;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -366,7 +372,7 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    char *cpwd;"
               "    crypt(pwd, cpwd);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:20]: (warning) Return value of function crypt() is not used. [ignoredReturnValue]\n"
                       "[test.cpp:3:20]: (portability) Non reentrant function 'crypt' called. For threadsafe applications it is recommended to use the reentrant replacement function 'crypt_r'. [cryptCalled]\n", errout_str());
 
@@ -375,7 +381,7 @@ class TestFunctions : public TestFixture {
               "    char *pwd = getpass(\"Password:\");"
               "    char *cpwd;"
               "    crypt(pwd, cpwd);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:57]: (warning) Return value of function crypt() is not used. [ignoredReturnValue]\n"
                       "[test.cpp:3:57]: (portability) Non reentrant function 'crypt' called. For threadsafe applications it is recommended to use the reentrant replacement function 'crypt_r'. [cryptCalled]\n", errout_str());
 
@@ -383,7 +389,7 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    int crypt = 0;"
               "    return crypt;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -392,14 +398,14 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    time_t t = 0;"
               "    auto lt = std::localtime(&t);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:37]: (portability) Non reentrant function 'localtime' called. For threadsafe applications it is recommended to use the reentrant replacement function 'localtime_r'. [localtimeCalled]\n", errout_str());
 
         // Passed as function argument
         check("void f()\n"
               "{\n"
               "    printf(\"Magic guess: %d\", getpwent());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:31]: (portability) Non reentrant function 'getpwent' called. For threadsafe applications it is recommended to use the reentrant replacement function 'getpwent_r'. [getpwentCalled]\n", errout_str());
 
         // Pass return value
@@ -407,14 +413,14 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    time_t t = 0;"
               "    struct tm *foo = localtime(&t);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:39]: (portability) Non reentrant function 'localtime' called. For threadsafe applications it is recommended to use the reentrant replacement function 'localtime_r'. [localtimeCalled]\n", errout_str());
 
         // Access via global namespace
         check("void f()\n"
               "{\n"
               "    ::getpwent();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (warning) Return value of function ::getpwent() is not used. [ignoredReturnValue]\n"
                       "[test.cpp:3:7]: (portability) Non reentrant function 'getpwent' called. For threadsafe applications it is recommended to use the reentrant replacement function 'getpwent_r'. [getpwentCalled]\n", errout_str());
 
@@ -422,68 +428,68 @@ class TestFunctions : public TestFixture {
         check("int getpwent()\n"
               "{\n"
               "    return 123;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Be quiet on other namespaces
         check("void f()\n"
               "{\n"
               "    foobar::getpwent();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Be quiet on class member functions
         check("void f()\n"
               "{\n"
               "    foobar.getpwent();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void invalidFunctionUsage1() {
-        check("void f() { memset(a,b,sizeof(a)!=12); }");
+        check("void f() { memset(a,b,sizeof(a)!=12); }\n");
         ASSERT_EQUALS("[test.cpp:1:32]: (error) Invalid memset() argument nr 3. A non-boolean value is required. [invalidFunctionArgBool]\n", errout_str());
 
-        check("void f() { memset(a,b,sizeof(a)!=0); }");
+        check("void f() { memset(a,b,sizeof(a)!=0); }\n");
         ASSERT_EQUALS("[test.cpp:1:32]: (error) Invalid memset() argument nr 3. A non-boolean value is required. [invalidFunctionArgBool]\n", errout_str());
 
-        check("void f() { memset(a,b,!c); }");
+        check("void f() { memset(a,b,!c); }\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Invalid memset() argument nr 3. A non-boolean value is required. [invalidFunctionArgBool]\n", errout_str());
 
         // Ticket #6990
-        check("void f(bool c) { memset(a,b,c); }");
+        check("void f(bool c) { memset(a,b,c); }\n");
         ASSERT_EQUALS("[test.cpp:1:29]: (error) Invalid memset() argument nr 3. A non-boolean value is required. [invalidFunctionArgBool]\n", errout_str());
-        check("void f() { memset(a,b,true); }");
+        check("void f() { memset(a,b,true); }\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Invalid memset() argument nr 3. A non-boolean value is required. [invalidFunctionArgBool]\n", errout_str());
 
         // Ticket #6588 (c mode)
         check("void record(char* buf, int n) {\n"
               "  memset(buf, 0, n < 255);\n"           /* KO */
               "  memset(buf, 0, n < 255 ? n : 255);\n" /* OK */
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:2:20]: (error) Invalid memset() argument nr 3. A non-boolean value is required. [invalidFunctionArgBool]\n", errout_str());
 
         // Ticket #6588 (c++ mode)
         check("void record(char* buf, int n) {\n"
               "  memset(buf, 0, n < 255);\n"           /* KO */
               "  memset(buf, 0, n < 255 ? n : 255);\n" /* OK */
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (error) Invalid memset() argument nr 3. A non-boolean value is required. [invalidFunctionArgBool]\n", errout_str());
 
         check("int boolArgZeroIsInvalidButOneIsValid(int a, int param) {\n"
               "  return div(a, param > 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (error) Invalid div() argument nr 2. The value is 0 or 1 (boolean) but the valid values are ':-1,1:'. [invalidFunctionArg]\n", errout_str());
 
         check("void boolArgZeroIsValidButOneIsInvalid(int param) {\n"
               "  strtol(a, b, param > 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (error) Invalid strtol() argument nr 3. The value is 0 or 1 (boolean) but the valid values are '0,2:36'. [invalidFunctionArg]\n", errout_str());
 
-        check("void f() { strtol(a,b,1); }");
+        check("void f() { strtol(a,b,1); }\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Invalid strtol() argument nr 3. The value is 1 but the valid values are '0,2:36'. [invalidFunctionArg]\n", errout_str());
 
-        check("void f() { strtol(a,b,10); }");
+        check("void f() { strtol(a,b,10); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int>& v) {\n" //  #10754
@@ -526,16 +532,16 @@ class TestFunctions : public TestFixture {
     }
 
     void invalidFunctionUsageStrings() {
-        check("size_t f() { char x = 'x'; return strlen(&x); }");
+        check("size_t f() { char x = 'x'; return strlen(&x); }\n");
         ASSERT_EQUALS("[test.cpp:1:42]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
-        check("size_t f() { return strlen(&x); }");
+        check("size_t f() { return strlen(&x); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("size_t f(char x) { return strlen(&x); }");
+        check("size_t f(char x) { return strlen(&x); }\n");
         ASSERT_EQUALS("[test.cpp:1:34]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
-        check("size_t f() { char x = '\\0'; return strlen(&x); }");
+        check("size_t f() { char x = '\\0'; return strlen(&x); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("size_t f() {\n"
@@ -545,41 +551,41 @@ class TestFunctions : public TestFixture {
               "  else\n"
               "    x = 'a';\n"
               "  return strlen(&x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:17]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
-        check("int f() { char x = '\\0'; return strcmp(\"Hello world\", &x); }");
+        check("int f() { char x = '\\0'; return strcmp(\"Hello world\", &x); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f() { char x = 'x'; return strcmp(\"Hello world\", &x); }");
+        check("int f() { char x = 'x'; return strcmp(\"Hello world\", &x); }\n");
         ASSERT_EQUALS("[test.cpp:1:54]: (error) Invalid strcmp() argument nr 2. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
-        check("size_t f(char x) { char * y = &x; return strlen(y); }");
+        check("size_t f(char x) { char * y = &x; return strlen(y); }\n");
         TODO_ASSERT_EQUALS("[test.cpp:1:42]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", "", errout_str());
 
-        check("size_t f(char x) { char * y = &x; char *z = y; return strlen(z); }");
+        check("size_t f(char x) { char * y = &x; char *z = y; return strlen(z); }\n");
         TODO_ASSERT_EQUALS("[test.cpp:1:42]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", "", errout_str());
 
-        check("size_t f() { char x = 'x'; char * y = &x; char *z = y; return strlen(z); }");
+        check("size_t f() { char x = 'x'; char * y = &x; char *z = y; return strlen(z); }\n");
         TODO_ASSERT_EQUALS("[test.cpp:1:42]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", "", errout_str());
 
-        check("size_t f() { char x = '\\0'; char * y = &x; char *z = y; return strlen(z); }");
+        check("size_t f() { char x = '\\0'; char * y = &x; char *z = y; return strlen(z); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("size_t f() { char x[] = \"Hello world\"; return strlen(x); }");
+        check("size_t f() { char x[] = \"Hello world\"; return strlen(x); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("size_t f(char x[]) { return strlen(x); }");
+        check("size_t f(char x[]) { return strlen(x); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f(char x, char y) { return strcmp(&x, &y); }");
+        check("int f(char x, char y) { return strcmp(&x, &y); }\n");
         ASSERT_EQUALS("[test.cpp:1:39]: (error) Invalid strcmp() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n"
                       "[test.cpp:1:43]: (error) Invalid strcmp() argument nr 2. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
-        check("size_t f() { char x[] = \"Hello world\"; return strlen(&x[0]); }");
+        check("size_t f() { char x[] = \"Hello world\"; return strlen(&x[0]); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("size_t f() { char* x = \"Hello world\"; return strlen(&x[0]); }");
+        check("size_t f() { char* x = \"Hello world\"; return strlen(&x[0]); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -592,11 +598,11 @@ class TestFunctions : public TestFixture {
               "  size_t l1 = strlen(&s1.x);\n"
               "  size_t l2 = strlen(&s2.x);\n"
               "  return l1 + l2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:22]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n"
                       "[test.cpp:9:22]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
-        check("const char x = 'x'; size_t f() { return strlen(&x); }");
+        check("const char x = 'x'; size_t f() { return strlen(&x); }\n");
         ASSERT_EQUALS("[test.cpp:1:48]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
         check("struct someStruct {\n"
@@ -611,7 +617,7 @@ class TestFunctions : public TestFixture {
               "int f(struct someStruct * const tp, const int k)\n"
               "{\n"
               "    return strcmp(&tp->x.buf[k], \"needle\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct someStruct {\n"
@@ -620,29 +626,29 @@ class TestFunctions : public TestFixture {
               "int f(struct someStruct * const tp, const int k)\n"
               "{\n"
               "    return strcmp(&tp->buf[k], \"needle\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("const char x = 'x'; size_t f() { char y = x; return strlen(&y); }");
+        check("const char x = 'x'; size_t f() { char y = x; return strlen(&y); }\n");
         ASSERT_EQUALS("[test.cpp:1:60]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
-        check("const char x = '\\0'; size_t f() { return strlen(&x); }");
+        check("const char x = '\\0'; size_t f() { return strlen(&x); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("const char x = '\\0'; size_t f() { char y = x; return strlen(&y); }");
+        check("const char x = '\\0'; size_t f() { char y = x; return strlen(&y); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("size_t f() {\n"
               "  char * a = \"Hello world\";\n"
               "  char ** b = &a;\n"
               "  return strlen(&b[0][0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("size_t f() {\n"
               "  char ca[] = \"asdf\";\n"
               "  return strlen((char*) &ca);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5225
@@ -653,67 +659,67 @@ class TestFunctions : public TestFixture {
               "  strcat(str, &d);\n"
               "  puts(str);\n"
               "  return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:15]: (error) Invalid strcat() argument nr 2. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[1] = { \'x\' };\n"
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Invalid fopen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[2] = { \'x\', \'y\' };\n"
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Invalid fopen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[3] = { \'x\', \'y\' ,\'\\0\' };\n"
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[3] = { \'x\', \'\\0\' ,\'y\' };\n"
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[3] = { \'x\', \'y\' };\n" // implicit '\0' added at the end
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[] = { \'\\0\' };\n"
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[] = { \'0\' + 42 };\n" // no size is explicitly defined, no implicit '\0' is added
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Invalid fopen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[] = { \'0\' + 42, \'x\' };\n" // no size is explicitly defined, no implicit '\0' is added
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Invalid fopen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[2] = { \'0\' + 42 };\n" // implicitly '\0' added at the end because size is set to 2
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[] = { };\n"
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void scanMetaTypes()\n" // don't crash
@@ -724,7 +730,7 @@ class TestFunctions : public TestFixture {
               "        if (strstr(name, \"GammaRay::\") != name)\n"
               "            metaTypes.push_back(mtId);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
@@ -759,10 +765,17 @@ class TestFunctions : public TestFixture {
               "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("size_t f() { wchar_t x = L'x'; return wcslen(&x); }");
+        check("char* f() {\n" // #14715
+              "    char a[3] = { 'a', 'b', 'c' };\n"
+              "    *a = 0;\n"
+              "    return strdup(a);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("size_t f() { wchar_t x = L'x'; return wcslen(&x); }\n");
         ASSERT_EQUALS("[test.cpp:1:46]: (error) Invalid wcslen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
-        check("void f() { char a[10] = \"1234567890\"; puts(a); }", dinit(CheckOptions, $.cpp = false)); // #1770
+        check("void f() { char a[10] = \"1234567890\"; puts(a); }\n", dinit(CheckOptions, $.cpp = false)); // #1770
         ASSERT_EQUALS("[test.c:1:44]: (error) Invalid puts() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
     }
 
@@ -781,6 +794,22 @@ class TestFunctions : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void invalidFunctionArgErrorPath() {
+        setMultiline();
+        Settings s = settings;
+        s.templateLocation = "{file}:{line}:note:{info}\n";
+        check("double f(bool b) {\n"
+              "    double d = -1.0;\n"
+              "    if (b)\n"
+              "        return d;\n"
+              "    return std::log(d);\n"
+              "}\n", s);
+        ASSERT_EQUALS("[test.cpp:5:21]: warning: Invalid std::log() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:2:18]: note: Assignment 'd=-1.0', assigned value is -1.0\n"
+                      "[test.cpp:3:9]: note: Assuming condition is false\n"
+                      "[test.cpp:5:21]: note: Invalid argument\n", errout_str());
+    }
+
     void mathfunctionCall_sqrt() {
         // sqrt, sqrtf, sqrtl
         check("void foo()\n"
@@ -788,7 +817,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  sqrt(-1) << std::endl;\n"
               "    std::cout <<  sqrtf(-1) << std::endl;\n"
               "    std::cout <<  sqrtl(-1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25]: (error) Invalid sqrt() argument nr 1. The value is -1 but the valid values are '0.0:'. [invalidFunctionArg]\n"
                       "[test.cpp:4:26]: (error) Invalid sqrtf() argument nr 1. The value is -1 but the valid values are '0.0:'. [invalidFunctionArg]\n"
                       "[test.cpp:5:26]: (error) Invalid sqrtl() argument nr 1. The value is -1 but the valid values are '0.0:'. [invalidFunctionArg]\n", errout_str());
@@ -799,7 +828,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  sqrt(-0.) << std::endl;\n"
               "    std::cout <<  sqrtf(-0.) << std::endl;\n"
               "    std::cout <<  sqrtl(-0.) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -807,7 +836,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  sqrt(1) << std::endl;\n"
               "    std::cout <<  sqrtf(1) << std::endl;\n"
               "    std::cout <<  sqrtl(1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -827,7 +856,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1p(-3) << std::endl;\n"
               "    std::cout <<  log1pf(-3) << std::endl;\n"
               "    std::cout <<  log1pl(-3) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:24]: (error) Invalid log() argument nr 1. The value is -2 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
                       "[test.cpp:4:25]: (error) Invalid logf() argument nr 1. The value is -2 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
                       "[test.cpp:5:25]: (error) Invalid logl() argument nr 1. The value is -2 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
@@ -864,7 +893,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1p(-2) << std::endl;\n"
               "    std::cout <<  log1pf(-2) << std::endl;\n"
               "    std::cout <<  log1pl(-2) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:24]: (error) Invalid log() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
                       "[test.cpp:4:25]: (error) Invalid logf() argument nr 1. The value is -1 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
                       "[test.cpp:5:25]: (error) Invalid logl() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
@@ -901,7 +930,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1p(-2.0) << std::endl;\n"
               "    std::cout <<  log1pf(-2.0) << std::endl;\n"
               "    std::cout <<  log1pl(-2.0) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25]: (error) Invalid log() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
                       "[test.cpp:4:26]: (error) Invalid logf() argument nr 1. The value is -1 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
                       "[test.cpp:5:26]: (error) Invalid logl() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
@@ -938,7 +967,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1p(-1.1) << std::endl;\n"
               "    std::cout <<  log1pf(-1.1) << std::endl;\n"
               "    std::cout <<  log1pl(-1.1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25]: (error) Invalid log() argument nr 1. The value is -0.1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
                       "[test.cpp:4:26]: (error) Invalid logf() argument nr 1. The value is -0.1 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
                       "[test.cpp:5:26]: (error) Invalid logl() argument nr 1. The value is -0.1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
@@ -975,7 +1004,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1p(-1.) << std::endl;\n"
               "    std::cout <<  log1pf(-1.0) << std::endl;\n"
               "    std::cout <<  log1pl(-1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (error) Invalid log() argument nr 1. The value is 0 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
                       "[test.cpp:4:25]: (error) Invalid logf() argument nr 1. The value is 0 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
                       "[test.cpp:5:25]: (error) Invalid logl() argument nr 1. The value is 0 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
@@ -1048,21 +1077,21 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1p(2.0)        << std::endl;\n"
               "    std::cout <<  log1pf(2.0)       << std::endl;\n"
               "    std::cout <<  log1pf(2.0f)      << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
               "    std::string *log(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3473 - no warning if "log" is a variable
-        check("Fred::Fred() : log(0) { }");
+        check("Fred::Fred() : log(0) { }\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5748
-        check("void f() { foo.log(0); }");
+        check("void f() { foo.log(0); }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1100,7 +1129,7 @@ class TestFunctions : public TestFixture {
               "    + acosl(0.1E-1)  \n"
               "    + acosl(+0.1E-1) \n"
               "    + acosl(-0.1E-1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -1108,7 +1137,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  acos(1.1) << std::endl;\n"
               "    std::cout <<  acosf(1.1) << std::endl;\n"
               "    std::cout <<  acosl(1.1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25]: (error) Invalid acos() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n"
                       "[test.cpp:4:26]: (error) Invalid acosf() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n"
                       "[test.cpp:5:26]: (error) Invalid acosl() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n", errout_str());
@@ -1118,7 +1147,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  acos(-1.1) << std::endl;\n"
               "    std::cout <<  acosf(-1.1) << std::endl;\n"
               "    std::cout <<  acosl(-1.1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:26]: (error) Invalid acos() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n"
                       "[test.cpp:4:27]: (error) Invalid acosf() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n"
                       "[test.cpp:5:27]: (error) Invalid acosl() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n", errout_str());
@@ -1161,7 +1190,7 @@ class TestFunctions : public TestFixture {
               "    + asinl(0.1E-1)  \n"
               "    + asinl(+0.1E-1) \n"
               "    + asinl(-0.1E-1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -1169,7 +1198,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  asin(1.1) << std::endl;\n"
               "    std::cout <<  asinf(1.1) << std::endl;\n"
               "    std::cout <<  asinl(1.1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25]: (error) Invalid asin() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n"
                       "[test.cpp:4:26]: (error) Invalid asinf() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n"
                       "[test.cpp:5:26]: (error) Invalid asinl() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n", errout_str());
@@ -1179,7 +1208,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  asin(-1.1) << std::endl;\n"
               "    std::cout <<  asinf(-1.1) << std::endl;\n"
               "    std::cout <<  asinl(-1.1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:26]: (error) Invalid asin() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n"
                       "[test.cpp:4:27]: (error) Invalid asinf() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n"
                       "[test.cpp:5:27]: (error) Invalid asinl() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n", errout_str());
@@ -1192,7 +1221,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  pow(0,-10) << std::endl;\n"
               "    std::cout <<  powf(0,-10) << std::endl;\n"
               "    std::cout <<  powl(0,-10) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (warning) Passing values 0 and -10 to pow() leads to implementation-defined result. [wrongmathcall]\n"
                       "[test.cpp:4:19]: (warning) Passing values 0 and -10 to powf() leads to implementation-defined result. [wrongmathcall]\n"
                       "[test.cpp:5:19]: (warning) Passing values 0 and -10 to powl() leads to implementation-defined result. [wrongmathcall]\n", errout_str());
@@ -1202,7 +1231,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  pow(0,10) << std::endl;\n"
               "    std::cout <<  powf(0,10) << std::endl;\n"
               "    std::cout <<  powl(0,10) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1243,7 +1272,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  atan2l(0.1E-1,3)   ;\n"
               "    std::cout <<  atan2l(+0.1E-1,1)  ;\n"
               "    std::cout <<  atan2l(-0.1E-1,8)  ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -1251,7 +1280,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  atan2(0,0) << std::endl;\n"
               "    std::cout <<  atan2f(0,0) << std::endl;\n"
               "    std::cout <<  atan2l(0,0) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (warning) Passing values 0 and 0 to atan2() leads to implementation-defined result. [wrongmathcall]\n"
                       "[test.cpp:4:19]: (warning) Passing values 0 and 0 to atan2f() leads to implementation-defined result. [wrongmathcall]\n"
                       "[test.cpp:5:19]: (warning) Passing values 0 and 0 to atan2l() leads to implementation-defined result. [wrongmathcall]\n", errout_str());
@@ -1264,7 +1293,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  fmod(1.0,0) << std::endl;\n"
               "    std::cout <<  fmodf(1.0,0) << std::endl;\n"
               "    std::cout <<  fmodl(1.0,0) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:28]: (error) Invalid fmod() argument nr 2. The value is 0 but the valid values are '!0.0'. [invalidFunctionArg]\n"
                       "[test.cpp:4:29]: (error) Invalid fmodf() argument nr 2. The value is 0 but the valid values are '!0.0'. [invalidFunctionArg]\n"
                       "[test.cpp:5:29]: (error) Invalid fmodl() argument nr 2. The value is 0 but the valid values are '!0.0'. [invalidFunctionArg]\n"
@@ -1277,7 +1306,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  fmod(1.0,1) << std::endl;\n"
               "    std::cout <<  fmodf(1.0,1) << std::endl;\n"
               "    std::cout <<  fmodl(1.0,1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1286,7 +1315,7 @@ class TestFunctions : public TestFixture {
               "    print(exp(x) - 1);\n"
               "    print(log(1 + x));\n"
               "    print(1 - erf(x));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Expression 'exp(x) - 1' can be replaced by 'expm1(x)' to avoid loss of precision. [unpreciseMathCall]\n"
                       "[test.cpp:3:11]: (style) Expression 'log(1 + x)' can be replaced by 'log1p(x)' to avoid loss of precision. [unpreciseMathCall]\n"
                       "[test.cpp:4:11]: (style) Expression '1 - erf(x)' can be replaced by 'erfc(x)' to avoid loss of precision. [unpreciseMathCall]\n", errout_str());
@@ -1295,7 +1324,7 @@ class TestFunctions : public TestFixture {
               "    print(exp(x) - 1.0);\n"
               "    print(log(1.0 + x));\n"
               "    print(1.0 - erf(x));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Expression 'exp(x) - 1' can be replaced by 'expm1(x)' to avoid loss of precision. [unpreciseMathCall]\n"
                       "[test.cpp:3:11]: (style) Expression 'log(1 + x)' can be replaced by 'log1p(x)' to avoid loss of precision. [unpreciseMathCall]\n"
                       "[test.cpp:4:12]: (style) Expression '1 - erf(x)' can be replaced by 'erfc(x)' to avoid loss of precision. [unpreciseMathCall]\n", errout_str());
@@ -1304,7 +1333,7 @@ class TestFunctions : public TestFixture {
               "    print(exp(3 + x*f(a)) - 1);\n"
               "    print(log(x*4 + 1));\n"
               "    print(1 - erf(34*x + f(x) - c));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Expression 'exp(x) - 1' can be replaced by 'expm1(x)' to avoid loss of precision. [unpreciseMathCall]\n"
                       "[test.cpp:3:11]: (style) Expression 'log(1 + x)' can be replaced by 'log1p(x)' to avoid loss of precision. [unpreciseMathCall]\n"
                       "[test.cpp:4:11]: (style) Expression '1 - erf(x)' can be replaced by 'erfc(x)' to avoid loss of precision. [unpreciseMathCall]\n", errout_str());
@@ -1312,7 +1341,7 @@ class TestFunctions : public TestFixture {
         check("void foo() {\n"
               "    print(2*exp(x) - 1);\n"
               "    print(1 - erf(x)/2.0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1329,67 +1358,67 @@ class TestFunctions : public TestFixture {
 
         check("void foo() {\n"
               "  mystrcmp(a, b);\n"
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("[test.cpp:2:3]: (warning) Return value of function mystrcmp() is not used. [ignoredReturnValue]\n", errout_str());
 
         check("void foo() {\n"
               "  foo::mystrcmp(a, b);\n"
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("[test.cpp:2:8]: (warning) Return value of function foo::mystrcmp() is not used. [ignoredReturnValue]\n", errout_str());
 
         check("void f() {\n"
               "  foo x;\n"
               "  x.mystrcmp(a, b);\n"
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Return value of function x.mystrcmp() is not used. [ignoredReturnValue]\n", errout_str());
 
         check("bool mystrcmp(char* a, char* b);\n" // cppcheck sees a custom strcmp definition, but it returns a value. Assume it is the one specified in the library.
               "void foo() {\n"
               "    mystrcmp(a, b);\n"
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Return value of function mystrcmp() is not used. [ignoredReturnValue]\n", errout_str());
 
         check("void mystrcmp(char* a, char* b);\n" // cppcheck sees a custom strcmp definition which returns void!
               "void foo() {\n"
               "    mystrcmp(a, b);\n"
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    class mystrcmp { mystrcmp() {} };\n" // strcmp is a constructor definition here
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    return mystrcmp(a, b);\n"
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    return foo::mystrcmp(a, b);\n"
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if(mystrcmp(a, b));\n"
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    bool b = mystrcmp(a, b);\n"
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         // #6194
         check("void foo() {\n"
               "    MyStrCmp mystrcmp(x, y);\n"
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         // #6197
         check("void foo() {\n"
               "    abc::def.mystrcmp(a,b);\n"
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         // #6233
@@ -1400,30 +1429,30 @@ class TestFunctions : public TestFixture {
               "    };\n"
               "    lambda(13.3);\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // TODO: use settings2?
 
         // #6669
         check("void foo(size_t size) {\n"
               "   void * res{malloc(size)};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // TODO: use settings2?
 
         // #7447
         check("void foo() {\n"
               "   int x{mystrcmp(a,b)};\n"
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         // #7905
         check("void foo() {\n"
               "   int x({mystrcmp(a,b)});\n"
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // don't crash
               "  DEBUG(123)(mystrcmp(a,b))(fd);\n"
-              "}", settings2);
+              "}\n", settings2);
         check("struct teststruct {\n"
               "    int testfunc1() __attribute__ ((warn_unused_result)) { return 1; }\n"
               "    [[nodiscard]] int testfunc2() { return 1; }\n"
@@ -1434,7 +1463,7 @@ class TestFunctions : public TestFixture {
               "    TestStruct1.testfunc1();\n"
               "    TestStruct1.testfunc2();\n"
               "    return 0;\n"
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("[test.cpp:4:18]: (warning) Return value of function testfunc1() is not used. [ignoredReturnValue]\n"
                       "[test.cpp:4:31]: (warning) Return value of function testfunc2() is not used. [ignoredReturnValue]\n"
                       "[test.cpp:8:17]: (warning) Return value of function TestStruct1.testfunc1() is not used. [ignoredReturnValue]\n"
@@ -1444,7 +1473,7 @@ class TestFunctions : public TestFixture {
         check("template <typename... a> uint8_t b(std::tuple<uint8_t> d) {\n"
               "  std::tuple<a...> c{std::move(d)};\n"
               "  return std::get<0>(c);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // TODO: use settings2?
 
         check("struct A { int x; };\n"
@@ -1452,13 +1481,13 @@ class TestFunctions : public TestFixture {
               "A f(int x, Ts... xs) {\n"
               "    return {std::move(x), static_cast<int>(xs)...};\n"
               "}\n"
-              "A g() { return f(1); }");
+              "A g() { return f(1); }\n");
         ASSERT_EQUALS("", errout_str()); // TODO: use settings2?
 
         // #8412 - unused operator result
         check("void foo() {\n"
               "  !mystrcmp(a, b);\n"
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("[test.cpp:2:4]: (warning) Return value of function mystrcmp() is not used. [ignoredReturnValue]\n", errout_str());
 
         check("void f(std::vector<int*> v) {\n"
@@ -1490,24 +1519,24 @@ class TestFunctions : public TestFixture {
 
         check("void foo() {\n"
               "  mystrcmp(a, b);\n"
-              "}", settings2);
+              "}\n", settings2);
         ASSERT_EQUALS("[test.cpp:2:3]: (style) Error code from the return value of function mystrcmp() is not used. [ignoredReturnErrorCode]\n", errout_str());
     }
 
     void memsetZeroBytes() {
         check("void f() {\n"
               "    memset(p, 10, 0x0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) memset() called to fill 0 bytes. [memsetZeroBytes]\n", errout_str());
 
         check("void f() {\n"
               "    memset(p, sizeof(p), 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) memset() called to fill 0 bytes. [memsetZeroBytes]\n", errout_str());
 
         check("void f() {\n"
               "    memset(p, sizeof(p), i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6269 false positives in case of overloaded standard library functions
@@ -1516,13 +1545,13 @@ class TestFunctions : public TestFixture {
               "  void f( void )   {\n"
               "     memset( 0 );\n"
               "  }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7285
         check("void f() {\n"
               "    memset(&tm, sizeof(tm), 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) memset() called to fill 0 bytes. [memsetZeroBytes]\n", errout_str());
 
     }
@@ -1533,7 +1562,7 @@ class TestFunctions : public TestFixture {
               "    memset(is, 1.0f, 40);\n"
               "    int* is2 = new int[10];\n"
               "    memset(is2, 0.1f, 40);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (portability) The 2nd memset() argument '1.0f' is a float, its representation is implementation defined. [memsetFloat]\n"
                       "[test.cpp:5:18]: (portability) The 2nd memset() argument '0.1f' is a float, its representation is implementation defined. [memsetFloat]\n", errout_str());
 
@@ -1541,19 +1570,19 @@ class TestFunctions : public TestFixture {
               "    int* is = new int[10];\n"
               "    float g = computeG();\n"
               "    memset(is, g, 40);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (portability) The 2nd memset() argument 'g' is a float, its representation is implementation defined. [memsetFloat]\n", errout_str());
 
         check("void f() {\n"
               "    int* is = new int[10];\n"
               "    memset(is, 0.0f, 40);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // FP
               "    float x = 2.3f;\n"
               "    memset(a, (x?64:0), 40);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -1561,7 +1590,7 @@ class TestFunctions : public TestFixture {
               "    memset(ss, 256, 4);\n"
               "    short ss2[2];\n"
               "    memset(ss2, -129, 4);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (warning) The 2nd memset() argument '256' doesn't fit into an 'unsigned char'. [memsetValueOutOfRange]\n"
                       "[test.cpp:5:18]: (warning) The 2nd memset() argument '-129' doesn't fit into an 'unsigned char'. [memsetValueOutOfRange]\n", errout_str());
 
@@ -1576,23 +1605,23 @@ class TestFunctions : public TestFixture {
               "    memset(cs2, 255, 30);\n"
               "    char cs3[30];\n"
               "    memset(cs3, 0, 30);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int is[10];\n"
               "    const int i = g();\n"
               "    memset(is, 1.0f + i, 40);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:21]: (portability) The 2nd memset() argument '1.0f+i' is a float, its representation is implementation defined. [memsetFloat]\n", errout_str());
     }
 
     void checkMissingReturn1() {
-        check("int f() {}");
+        check("int f() {}\n");
         ASSERT_EQUALS("[test.cpp:1:10]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
 
         {
-            const char code[] = "int main(void) {}";
+            const char code[] = "int main(void) {}\n";
             {
                 const Settings s = settingsBuilder().c(Standards::C89).build();
 
@@ -1610,16 +1639,16 @@ class TestFunctions : public TestFixture {
             }
         }
 
-        check("F(A,B) { x=1; }");
+        check("F(A,B) { x=1; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("auto foo4() -> void {}");
+        check("auto foo4() -> void {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void STDCALL foo() {}");
+        check("void STDCALL foo() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void operator=(int y) { x=y; }");
+        check("void operator=(int y) { x=y; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
@@ -1635,14 +1664,14 @@ class TestFunctions : public TestFixture {
         check("int foo(int x) {\n"
               "  return 1;\n"
               "  (void)x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(int x) {\n"
               "  if (x) goto out;\n"
               "  return 1;\n"
               "out:\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
 
         // switch
@@ -1651,7 +1680,7 @@ class TestFunctions : public TestFixture {
               "        case 1: break;\n" // <- error
               "        case 2: return 1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
 
         check("int f() {\n"
@@ -1659,7 +1688,7 @@ class TestFunctions : public TestFixture {
               "        case 1: return 2; break;\n"
               "        default: return 1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool test(unsigned char v1, int v2) {\n"
@@ -1673,7 +1702,7 @@ class TestFunctions : public TestFixture {
               "        default:\n"
               "            return true;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // if/else
@@ -1681,7 +1710,7 @@ class TestFunctions : public TestFixture {
               "    if (x) {\n"
               "        return 1;\n"
               "    }\n" // <- error (missing else)
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
 
         check("int f(int x) {\n"
@@ -1690,19 +1719,19 @@ class TestFunctions : public TestFixture {
               "    } else {\n"
               "        return 1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
 
         check("int f() {\n"
               "    if (!0) {\n"
               "        return 1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    if (!0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
 
         // loop
@@ -1710,7 +1739,7 @@ class TestFunctions : public TestFixture {
               "    while (1) {\n"
               "        dostuff();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return {..}
@@ -1719,20 +1748,20 @@ class TestFunctions : public TestFixture {
               "        return {};\n"
               "    else\n"
               "        return {1, 2};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // noreturn function
-        check("int f(int x) { exit(0); }");
+        check("int f(int x) { exit(0); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f(int x) { assert(0); }");
+        check("int f(int x) { assert(0); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f(int x) { if (x) return 1; else return bar({1}, {}); }");
+        check("int f(int x) { if (x) return 1; else return bar({1}, {}); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("auto f() -> void {}"); // #10342
+        check("auto f() -> void {}\n"); // #10342
         ASSERT_EQUALS("", errout_str());
 
         check("struct S1 {\n" // #7433
@@ -1752,36 +1781,36 @@ class TestFunctions : public TestFixture {
                       errout_str());
 
         // #11171
-        check("std::enable_if_t<sizeof(uint64_t) == 8> f() {}");
+        check("std::enable_if_t<sizeof(uint64_t) == 8> f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("std::enable_if_t<sizeof(uint64_t) == 8, int> f() {}");
+        check("std::enable_if_t<sizeof(uint64_t) == 8, int> f() {}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:51]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n",
             errout_str());
 
-        check("template<class T> std::enable_if_t<std::is_same<T, int>{}, int> f(T) {}");
+        check("template<class T> std::enable_if_t<std::is_same<T, int>{}, int> f(T) {}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:71]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n",
             errout_str());
 
-        check("template<class T> std::enable_if_t<std::is_same<T, int>{}> f(T) {}");
+        check("template<class T> std::enable_if_t<std::is_same<T, int>{}> f(T) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("typename std::enable_if<sizeof(uint64_t) == 8>::type f() {}");
+        check("typename std::enable_if<sizeof(uint64_t) == 8>::type f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("typename std::enable_if<sizeof(uint64_t) == 8, int>::type f() {}");
+        check("typename std::enable_if<sizeof(uint64_t) == 8, int>::type f() {}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:64]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n",
             errout_str());
 
-        check("template<class T> typename std::enable_if<std::is_same<T, int>{}, int>::type f(T) {}");
+        check("template<class T> typename std::enable_if<std::is_same<T, int>{}, int>::type f(T) {}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:84]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n",
             errout_str());
 
-        check("template<class T> typename std::enable_if<std::is_same<T, int>{}>::type f(T) {}");
+        check("template<class T> typename std::enable_if<std::is_same<T, int>{}>::type f(T) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -1880,37 +1909,97 @@ class TestFunctions : public TestFixture {
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
     }
 
+    void checkMissingReturn7() {// #14370 FN try/catch
+        check("int foo(void) {\n"
+              "    try { return readData(); }\n"
+              "    catch (...) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:18]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
+
+        check("int foo(void) {\n"
+              "    try { return readData(); }\n"
+              "    catch (const E& e) {}\n"
+              "    catch (...) { return 2; }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:25]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
+
+        check("int foo(void) {\n"
+              "    try { x=1; }\n"
+              "    catch (...) { return 2; }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:11]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
+
+        check("int foo(void) {\n"
+              "    try { return readData(); }\n"
+              "    catch (...) { return 0; }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int foo(void)\n"
+              "    try { x=1; }\n"
+              "    catch (...) { return 2; }\n");
+        ASSERT_EQUALS("[test.cpp:2:11]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
+
+        check("int foo(void)\n"
+              "    try { return readData(); }\n"
+              "    catch (...) { }\n");
+        ASSERT_EQUALS("[test.cpp:3:19]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
+    }
+
+    void checkMissingReturn8() {
+        const Settings s = settingsBuilder(settings).cpp(Standards::CPP20).build();
+        check("boost::asio::awaitable<void> test() {\n"
+              "        co_return;\n"
+              "}\n",s);
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void checkMissingReturn9() {
+        check("struct S { int v; };\n"
+              " S operator/(S x, S y) { return { x.v / y.v }; }\n"
+              " S f(int a, int b) {\n"
+              "    if (b) { return S{ a } / S{ b }; }\n"
+              "    else { return {}; }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void checkMissingReturnStdInt() {// #14482 - FN
+        check("std::int32_t f() {}\n");
+        ASSERT_EQUALS("[test.cpp:1:19]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
+    }
+
     // NRVO check
     void returnLocalStdMove1() {
-        check("struct A{}; A f() { A var; return std::move(var); }");
+        check("struct A{}; A f() { A var; return std::move(var); }\n");
         ASSERT_EQUALS("[test.cpp:1:45]: (performance) Using std::move for returning object by-value from function will affect copy elision optimization."
                       " More: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rf-return-move-local [returnStdMoveLocal]\n", errout_str());
     }
 
     // RVO, C++03 ctor style
     void returnLocalStdMove2() {
-        check("struct A{}; A f() { return std::move( A() ); }");
+        check("struct A{}; A f() { return std::move( A() ); }\n");
         ASSERT_EQUALS("[test.cpp:1:40]: (performance) Using std::move for returning object by-value from function will affect copy elision optimization."
                       " More: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rf-return-move-local [returnStdMoveLocal]\n", errout_str());
     }
 
     // RVO, new ctor style
     void returnLocalStdMove3() {
-        check("struct A{}; A f() { return std::move(A{}); }");
+        check("struct A{}; A f() { return std::move(A{}); }\n");
         ASSERT_EQUALS("[test.cpp:1:39]: (performance) Using std::move for returning object by-value from function will affect copy elision optimization."
                       " More: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rf-return-move-local [returnStdMoveLocal]\n", errout_str());
     }
 
     // Function argument
     void returnLocalStdMove4() {
-        check("struct A{}; A f(A a) { return std::move(A{}); }");
+        check("struct A{}; A f(A a) { return std::move(A{}); }\n");
         ASSERT_EQUALS("[test.cpp:1:42]: (performance) Using std::move for returning object by-value from function will affect copy elision optimization."
                       " More: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rf-return-move-local [returnStdMoveLocal]\n", errout_str());
     }
 
     void returnLocalStdMove5() {
         check("struct A{} a; A f1() { return std::move(a); }\n"
-              "A f2() { volatile A var; return std::move(var); }");
+              "A f2() { volatile A var; return std::move(var); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S { std::string msg{ \"abc\" }; };\n"
@@ -1937,14 +2026,14 @@ class TestFunctions : public TestFixture {
               "   int *a;\n"
               "   a = malloc( -10 );\n"
               "   free(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (error) Invalid malloc() argument nr 1. The value is -10 but the valid values are '0:'. [invalidFunctionArg]\n", errout_str());
 
         check("void f() {\n"
               "   int *a;\n"
               "   a = alloca( -10 );\n"
               "   free(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8]: (warning) Obsolete function 'alloca' called. [allocaCalled]\n"
                       "[test.cpp:3:17]: (error) Invalid alloca() argument nr 1. The value is -10 but the valid values are '0:'. [invalidFunctionArg]\n", errout_str());
     }
@@ -1955,12 +2044,12 @@ class TestFunctions : public TestFixture {
 
         check("void f() {\n"
               "    lib_func();"
-              "}", s);
+              "}\n", s);
         ASSERT_EQUALS("[test.cpp:2:5]: (information) --check-library: There is no matching configuration for function lib_func() [checkLibraryFunction]\n", errout_str());
 
         check("void f(void* v) {\n"
               "    lib_func(v);"
-              "}", s);
+              "}\n", s);
         ASSERT_EQUALS("[test.cpp:2:5]: (information) --check-library: There is no matching configuration for function lib_func() [checkLibraryFunction]\n", errout_str());
 
         // #10105
@@ -1976,7 +2065,7 @@ class TestFunctions : public TestFixture {
               "\n"
               "        void testFunctionReturnType() {\n"
               "        }\n"
-              "};", s);
+              "};\n", s);
         ASSERT_EQUALS("", errout_str());
 
         // #11183
@@ -1986,7 +2075,7 @@ class TestFunctions : public TestFixture {
               "\n"
               "void f() {\n"
               "    cb(std::string(\"\"));\n"
-              "}", s);
+              "}\n", s);
         TODO_ASSERT_EQUALS("", "[test.cpp:6:5]: (information) --check-library: There is no matching configuration for function cb() [checkLibraryFunction]\n", errout_str());
 
         // #7375
@@ -2176,6 +2265,12 @@ class TestFunctions : public TestFixture {
               "    return b;\n"
               "}\n", s);
         TODO_ASSERT_EQUALS("", "[test.cpp:6:5]: (debug) auto token with no type. [autoNoType]\n", errout_str());
+
+        check("template <typename T>\n" // #13509
+              "void f(const T& t) {\n"
+              "    t.g();\n"
+              "}\n", s);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkUseStandardLibrary1() {
diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
index 2bfb1283587..c798950b8e3 100644
--- a/test/testgarbage.cpp
+++ b/test/testgarbage.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
  */
 
 #include "check.h"
+#include "checks.h"
 #include "errortypes.h"
 #include "fixture.h"
 #include "helpers.h"
@@ -258,6 +259,8 @@ class TestGarbage : public TestFixture {
         TEST_CASE(garbageCode227);
         TEST_CASE(garbageCode228);
         TEST_CASE(garbageCode229);
+        TEST_CASE(garbageCode230);
+        TEST_CASE(garbageCode231);
 
         TEST_CASE(garbageCodeFuzzerClientMode1); // test cases created with the fuzzer client, mode 1
 
@@ -283,8 +286,8 @@ class TestGarbage : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // call all "runChecks" in all registered Check classes
-        for (auto it = Check::instances().cbegin(); it != Check::instances().cend(); ++it) {
-            (*it)->runChecks(tokenizer, this);
+        for (Check * const c : CheckInstances::get()) {
+            c->runChecks(tokenizer, *this);
         }
 
         return tokenizer.tokens()->stringifyList(false, false, false, true, false, nullptr, nullptr);
@@ -318,8 +321,7 @@ class TestGarbage : public TestFixture {
 
 
     void final_class_x() {
-
-        const char code[] = "class __declspec(dllexport) x final { };";
+        const char code[] = "class __declspec(dllexport) x final { };\n";
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT(tokenizer.tokenize(code));
         ASSERT_EQUALS("", errout_str());
@@ -327,18 +329,18 @@ class TestGarbage : public TestFixture {
 
     void wrong_syntax1() {
         {
-            const char code[] ="TR(kvmpio, PROTO(int rw), ARGS(rw), TP_(aa->rw;))";
+            const char code[] ="TR(kvmpio, PROTO(int rw), ARGS(rw), TP_(aa->rw;))\n";
             ASSERT_THROW_INTERNAL(checkCode(code), UNKNOWN_MACRO);
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] ="struct A { template<int> struct { }; };";
+            const char code[] ="struct A { template<int> struct { }; };\n";
             ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
         }
 
         {
-            const char code[] ="enum ABC { A,B, typedef enum { C } };";
+            const char code[] ="enum ABC { A,B, typedef enum { C } };\n";
             ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
         }
     }
@@ -349,7 +351,7 @@ class TestGarbage : public TestFixture {
                             "    Y<int, int, int, int, int, char> y;\n"
                             "}\n"
                             "\n"
-                            "void G( template <typename T> class (j) ) {}";
+                            "void G( template <typename T> class (j) ) {}\n";
 
         // don't segfault..
         ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
@@ -364,7 +366,7 @@ class TestGarbage : public TestFixture {
                             "  for(  #endif typedef typedef cb[N] )\n"
                             "        ca[N]; =  cb[i]\n"
                             " )\n"
-                            "}";
+                            "}\n";
 
         SimpleTokenizer tokenizer(settings, *this);
         try {
@@ -378,25 +380,25 @@ class TestGarbage : public TestFixture {
     }
 
     void wrong_syntax4() {   // #3618
-        const char code[] = "typedef void (x) (int);    return x&";
+        const char code[] = "typedef void (x) (int);    return x&\n";
 
         ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
     }
 
     void wrong_syntax_if_macro() {
         // #2518 #4171
-        ASSERT_THROW_INTERNAL(checkCode("void f() { if MACRO(); }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { if MACRO(); }\n"), SYNTAX);
 
         // #4668 - note there is no semicolon after MACRO()
-        ASSERT_THROW_INTERNAL(checkCode("void f() { if (x) MACRO() {} }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { if (x) MACRO() {} }\n"), SYNTAX);
 
         // #4810 - note there is no semicolon after MACRO()
-        ASSERT_THROW_INTERNAL(checkCode("void f() { if (x) MACRO() else ; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { if (x) MACRO() else ; }\n"), SYNTAX);
     }
 
     void wrong_syntax_class_x_y() {
         // #3585
-        const char code[] = "class x y { };";
+        const char code[] = "class x y { };\n";
 
         {
             SimpleTokenizer tokenizer(settings, *this, false);
@@ -411,65 +413,65 @@ class TestGarbage : public TestFixture {
     }
 
     void wrong_syntax_anonymous_struct() {
-        ASSERT_THROW_INTERNAL(checkCode("struct { int x; } = {0};"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("struct { int x; } * = {0};"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("struct { int x; } = {0};\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("struct { int x; } * = {0};\n"), SYNTAX);
     }
 
     void syntax_case_default() {
-        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case: z(); break;}}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case: z(); break;}}\n"), SYNTAX);
 
-        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case;: z(); break;}}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case;: z(); break;}}\n"), SYNTAX);
 
-        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case {}: z(); break;}}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case {}: z(); break;}}\n"), SYNTAX);
 
-        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case 0?{1}:{2} : z(); break;}}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case 0?{1}:{2} : z(); break;}}\n"), SYNTAX);
 
-        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case 0?1;:{2} : z(); break;}}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case 0?1;:{2} : z(); break;}}\n"), SYNTAX);
 
-        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case 0?(1?{3:4}):2 : z(); break;}}"), AST);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case 0?(1?{3:4}):2 : z(); break;}}\n"), AST);
 
         //ticket #4234
-        ASSERT_THROW_INTERNAL(checkCode("( ) { switch break ; { switch ( x ) { case } y break ; : } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( ) { switch break ; { switch ( x ) { case } y break ; : } }\n"), SYNTAX);
 
         //ticket #4267
-        ASSERT_THROW_INTERNAL(checkCode("f ( ) { switch break; { switch ( x ) { case } case break; -6: ( ) ; } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("f ( ) { switch break; { switch ( x ) { case } case break; -6: ( ) ; } }\n"), SYNTAX);
 
         // Missing semicolon
-        ASSERT_THROW_INTERNAL(checkCode("void foo () { switch(0) case 0 : default : }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void foo () { switch(0) case 0 : default : }\n"), SYNTAX);
     }
 
     void garbageCode1() {
-        (void)checkCode("struct x foo_t; foo_t typedef y;");
+        (void)checkCode("struct x foo_t; foo_t typedef y;\n");
     }
 
     void garbageCode2() { //#4300 (segmentation fault)
-        TODO_ASSERT_THROW(checkCode("enum { D = 1  struct  { } ; }  s.b = D;"), InternalError);
+        TODO_ASSERT_THROW(checkCode("enum { D = 1  struct  { } ; }  s.b = D;\n"), InternalError);
     }
 
     void garbageCode3() { //#4849 (segmentation fault in Tokenizer::simplifyStructDecl (invalid code))
-        TODO_ASSERT_THROW(checkCode("enum {  D = 2 s ; struct y  { x } ; } { s.a = C ; s.b = D ; }"), InternalError);
+        TODO_ASSERT_THROW(checkCode("enum {  D = 2 s ; struct y  { x } ; } { s.a = C ; s.b = D ; }\n"), InternalError);
     }
 
     void garbageCode4() { // #4887
-        ASSERT_THROW_INTERNAL(checkCode("void f ( ) { = a ; if ( 1 ) if = ( 0 ) ; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f ( ) { = a ; if ( 1 ) if = ( 0 ) ; }\n"), SYNTAX);
     }
 
     void garbageCode5() { // #5168 (segmentation fault)
-        ASSERT_THROW_INTERNAL(checkCode("( asm : ; void : );"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( asm : ; void : );\n"), SYNTAX);
     }
 
     void garbageCode6() { // #5214
-        ASSERT_THROW_INTERNAL(checkCode("int b = ( 0 ? ? ) 1 : 0 ;"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("int a = int b = ( 0 ? ? ) 1 : 0 ;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int b = ( 0 ? ? ) 1 : 0 ;\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int a = int b = ( 0 ? ? ) 1 : 0 ;\n"), SYNTAX);
     }
 
     void garbageCode7() {
-        ASSERT_THROW_INTERNAL(checkCode("1 (int j) { return return (c) * sizeof } y[1];"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("foo(Args&&...) fn void = { } auto template<typename... bar(Args&&...)"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("1 (int j) { return return (c) * sizeof } y[1];\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("foo(Args&&...) fn void = { } auto template<typename... bar(Args&&...)\n"), SYNTAX);
     }
 
     void garbageCode8() { // #5604
-        TODO_ASSERT_THROW(checkCode("{ enum struct : };"), InternalError);
+        TODO_ASSERT_THROW(checkCode("{ enum struct : };\n"), InternalError);
         TODO_ASSERT_THROW(checkCode("int ScopedEnum{ template<typename T> { { e = T::error }; };\n"
                                     "ScopedEnum1<int> se1; { enum class E : T { e = 0 = e ScopedEnum2<void*> struct UnscopedEnum3 { T{ e = 4 }; };\n"
                                     "arr[(int) E::e]; }; UnscopedEnum3<int> e2 = f()\n"
@@ -477,48 +479,48 @@ class TestGarbage : public TestFixture {
                                     "namespace UnscopedEnum { template<typename T> struct UnscopedEnum1 { E{ e = T::error }; }; UnscopedEnum1<int> { enum E : { e = 0 }; };\n"
                                     "UnscopedEnum2<void*> ue3; template<typename T> struct UnscopedEnum3 { enum { }; }; int arr[E::e]; };\n"
                                     "UnscopedEnum3<int> namespace template<typename T> int f() { enum E { e }; T::error }; return (int) E(); } int test1 int g() { enum E { e = E };\n"
-                                    "E::e; } int test2 = g<int>(); }"), InternalError);
+                                    "E::e; } int test2 = g<int>(); }\n"), InternalError);
     }
 
     void garbageCode9() {
-        TODO_ASSERT_THROW(checkCode("enum { e = { } } ( ) { { enum { } } } { e } "), InternalError);
+        TODO_ASSERT_THROW(checkCode("enum { e = { } } ( ) { { enum { } } } { e } \n"), InternalError);
     }
 
     void garbageCode10() { // #6127
-        ASSERT_THROW_INTERNAL(checkCode("for( rl=reslist; rl!=NULL; rl=rl->next )"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("for( rl=reslist; rl!=NULL; rl=rl->next )\n"), SYNTAX);
     }
 
     void garbageCode12() { // do not crash
-        (void)checkCode("{ g; S (void) { struct } { } int &g; }");
+        (void)checkCode("{ g; S (void) { struct } { } int &g; }\n");
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode13() { // Ticket #2607 - crash
-        (void)checkCode("struct C {} {} x");
+        (void)checkCode("struct C {} {} x\n");
     }
 
     void garbageCode15() { // Ticket #5203
-        ASSERT_THROW_INTERNAL(checkCode("int f ( int* r ) { {  int s[2] ; f ( s ) ; if ( ) } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int f ( int* r ) { {  int s[2] ; f ( s ) ; if ( ) } }\n"), SYNTAX);
     }
 
     void garbageCode16() { // #6080 (segmentation fault)
-        (void)checkCode("{ } A() { delete }"); // #6080
+        (void)checkCode("{ } A() { delete }\n"); // #6080
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode17() {
         ASSERT_THROW_INTERNAL(checkCode("void h(int l) {\n"
                                         "    while\n" // Don't crash (#3870)
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode18() {
-        ASSERT_THROW_INTERNAL(checkCode("switch(){case}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("switch(){case}\n"), SYNTAX);
     }
 
     void garbageCode20() {
         // #3953 (valgrind errors on garbage code)
-        ASSERT_EQUALS("void f ( 0 * ) ;", checkCode("void f ( 0 * ) ;"));
+        ASSERT_EQUALS("void f ( 0 * ) ;", checkCode("void f ( 0 * ) ;\n"));
     }
 
     void garbageCode21() {
@@ -529,7 +531,7 @@ class TestGarbage : public TestFixture {
                                         "    x;\n"
                                         "    int a, a2, a2*x; if () ;\n"
                                         "  )\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode22() {
@@ -537,7 +539,7 @@ class TestGarbage : public TestFixture {
         ASSERT_THROW_INTERNAL(checkCode("int f()\n"
                                         "{\n"
                                         "    return if\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode23() {
@@ -545,7 +547,7 @@ class TestGarbage : public TestFixture {
         ASSERT_THROW_INTERNAL_EQUALS(checkCode("{\n"
                                                "    if (1) = x\n"
                                                "    else abort s[2]\n"
-                                               "}"),
+                                               "}\n"),
                                      SYNTAX,
                                      "syntax error");
     }
@@ -568,7 +570,7 @@ class TestGarbage : public TestFixture {
                                         "    switch ( x ) {\n"
                                         "        case struct Tree : break;\n"
                                         "    }\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
         ignore_errout(); // we do not care about the output
     }
 
@@ -580,13 +582,13 @@ class TestGarbage : public TestFixture {
                                         "    case 0:\n"
                                         "        return;\n"
                                         "    }\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode27() {
         ASSERT_THROW_INTERNAL(checkCode("int f() {\n"
                                         "    return if\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode28() { // #5702 (segmentation fault)
@@ -594,7 +596,7 @@ class TestGarbage : public TestFixture {
         (void)checkCode("struct R1 {\n"
                         "  int a;\n"
                         "  R1 () : a { }\n"
-                        "};");
+                        "};\n");
         ignore_errout(); // we do not care about the output
     }
 
@@ -602,16 +604,16 @@ class TestGarbage : public TestFixture {
         // simply survive - a syntax error would be even better (#5867)
         (void)checkCode("void f(int x) {\n"
                         " x = 42\n"
-                        "}");
+                        "}\n");
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode31() {
-        ASSERT_THROW_INTERNAL(checkCode("typedef struct{}x[([],)]typedef e y;(y,x 0){}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("typedef struct{}x[([],)]typedef e y;(y,x 0){}\n"), SYNTAX);
     }
 
     void garbageCode33() { // #6613 (segmentation fault)
-        (void)checkCode("main(()B{});");
+        (void)checkCode("main(()B{});\n");
     }
 
     // Bug #6626 crash: Token::astOperand2() const ( do while )
@@ -619,13 +621,13 @@ class TestGarbage : public TestFixture {
         const char code[] = "void foo(void) {\n"
                             " do\n"
                             " while (0);\n"
-                            "}";
+                            "}\n";
         ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
     }
 
     void garbageCode35() {
         // ticket #2604 segmentation fault
-        ASSERT_THROW_INTERNAL(checkCode("sizeof <= A"), AST);
+        ASSERT_THROW_INTERNAL(checkCode("sizeof <= A\n"), AST);
     }
 
     void garbageCode36() { // #6334
@@ -639,311 +641,311 @@ class TestGarbage : public TestFixture {
 
     void garbageCode37() {
         // #5166 segmentation fault (invalid code) in lib/checkother.cpp:329 ( void * f { } void b ( ) { * f } )
-        (void)checkCode("void * f { } void b ( ) { * f }");
+        (void)checkCode("void * f { } void b ( ) { * f }\n");
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode38() { // Ticket #6666 (segmentation fault)
-        (void)checkCode("{ f2 { } } void f3 () { delete[] } { }");
+        (void)checkCode("{ f2 { } } void f3 () { delete[] } { }\n");
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode40() { // #6620 (segmentation fault)
-        (void)checkCode("{ ( ) () { virtual } ; { } E } A { : { } ( ) } * const ( ) const { }");
+        (void)checkCode("{ ( ) () { virtual } ; { } E } A { : { } ( ) } * const ( ) const { }\n");
         // test doesn't seem to work on any platform: ASSERT_THROW(checkCode("{ ( ) () { virtual } ; { } E } A { : { } ( ) } * const ( ) const { }", "test.c"), InternalError);
     }
 
     void garbageCode41() { // #6685 (segmentation fault)
-        (void)checkCode(" { } { return } *malloc(__SIZE_TYPE__ size); *memcpy(void n); static * const () { memcpy (*slot, 3); } { (); } { }");
+        (void)checkCode(" { } { return } *malloc(__SIZE_TYPE__ size); *memcpy(void n); static * const () { memcpy (*slot, 3); } { (); } { }\n");
     }
 
     void garbageCode42() { // #5760 (segmentation fault)
-        (void)checkCode("{  } * const ( ) { }");
+        (void)checkCode("{  } * const ( ) { }\n");
     }
 
     void garbageCode43() { // #6703 (segmentation fault)
-        (void)checkCode("int { }; struct A<void> a = { }");
+        (void)checkCode("int { }; struct A<void> a = { }\n");
     }
 
     void garbageCode44() { // #6704
-        ASSERT_THROW_INTERNAL(checkCode("{ { }; }; { class A : }; public typedef b;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ { }; }; { class A : }; public typedef b;\n"), SYNTAX);
     }
 
     void garbageCode45() { // #6608
-        ASSERT_THROW_INTERNAL(checkCode("struct true template < > { = } > struct Types \"s\" ; static_assert < int > ;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("struct true template < > { = } > struct Types \"s\" ; static_assert < int > ;\n"), SYNTAX);
     }
 
     void garbageCode46() { // #6705 (segmentation fault)
-        (void)checkCode(" { bar(char *x); void foo (int ...) { struct } va_list ap; va_start(ap, size); va_arg(ap, (d)); }");
+        (void)checkCode(" { bar(char *x); void foo (int ...) { struct } va_list ap; va_start(ap, size); va_arg(ap, (d)); }\n");
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode47() { // #6706 (segmentation fault)
-        (void)checkCode(" { { }; }; * new private: B: B;");
+        (void)checkCode(" { { }; }; * new private: B: B;\n");
     }
 
     void garbageCode48() { // #6712 (segmentation fault)
-        ASSERT_THROW_INTERNAL(checkCode(" { d\" ) d ...\" } int main ( ) { ( ) catch ( A a ) { { } catch ( ) \"\" } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode(" { d\" ) d ...\" } int main ( ) { ( ) catch ( A a ) { { } catch ( ) \"\" } }\n"), SYNTAX);
     }
 
     void garbageCode49() { // #6715
-        ASSERT_THROW_INTERNAL(checkCode(" ( ( ) ) { } ( { ( __builtin_va_arg_pack ( ) ) ; } ) { ( int { ( ) ( ( ) ) } ( ) { } ( ) ) += ( ) }"), AST);
+        ASSERT_THROW_INTERNAL(checkCode(" ( ( ) ) { } ( { ( __builtin_va_arg_pack ( ) ) ; } ) { ( int { ( ) ( ( ) ) } ( ) { } ( ) ) += ( ) }\n"), AST);
     }
 
     void garbageCode51() { // #6719
-        ASSERT_THROW_INTERNAL(checkCode(" (const \"C\" ...); struct base { int f2; base (int arg1, int arg2); }; global_base(0x55, 0xff); { ((global_base.f1 0x55) (global_base.f2 0xff)) { } } base::base(int arg1, int arg2) { f2 = }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode(" (const \"C\" ...); struct base { int f2; base (int arg1, int arg2); }; global_base(0x55, 0xff); { ((global_base.f1 0x55) (global_base.f2 0xff)) { } } base::base(int arg1, int arg2) { f2 = }\n"), SYNTAX);
     }
 
     void garbageCode53() { // #6721
-        ASSERT_THROW_INTERNAL(checkCode("{ { } }; void foo (struct int i) { x->b[i] = = }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ { } }; void foo (struct int i) { x->b[i] = = }\n"), SYNTAX);
     }
 
     void garbageCode54() { // #6722
-        ASSERT_THROW_INTERNAL(checkCode("{ typedef long ((pf) p) (); }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ typedef long ((pf) p) (); }\n"), SYNTAX);
     }
 
     void garbageCode55() { // #6724
-        ASSERT_THROW_INTERNAL(checkCode("() __attribute__((constructor)); { } { }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("() __attribute__((constructor)); { } { }\n"), SYNTAX);
     }
 
     void garbageCode56() { // #6713
-        ASSERT_THROW_INTERNAL(checkCode("void foo() { int a = 0; int b = ???; }"), AST);
+        ASSERT_THROW_INTERNAL(checkCode("void foo() { int a = 0; int b = ???; }\n"), AST);
     }
 
     void garbageCode57() { // #6731
-        ASSERT_THROW_INTERNAL(checkCode("{ } if () try { } catch (...) B::~B { }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } if () try { } catch (...) B::~B { }\n"), SYNTAX);
     }
 
     void garbageCode58() { // #6732, #6762
-        ASSERT_THROW_INTERNAL(checkCode("{ }> {= ~A()^{} }P { }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("{= ~A()^{} }P { } { }> is"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ }> {= ~A()^{} }P { }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{= ~A()^{} }P { } { }> is\n"), SYNTAX);
     }
 
     void garbageCode59() { // #6735
-        ASSERT_THROW_INTERNAL(checkCode("{ { } }; char font8x8[256][8]"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ { } }; char font8x8[256][8]\n"), SYNTAX);
     }
 
     void garbageCode60() { // #6736
-        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef int int_array[]; int_array &right ="), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef int int_array[]; int_array &right =\n"), SYNTAX);
     }
 
     void garbageCode61() { // #6737
-        ASSERT_THROW_INTERNAL(checkCode("{ (const U&) }; { }; { }; struct U : virtual public"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ (const U&) }; { }; { }; struct U : virtual public\n"), SYNTAX);
     }
 
     void garbageCode63() { // #6739
-        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef int u_array[]; typedef u_array &u_array_ref; (u_array_ref arg) { } u_array_ref u_array_ref_gbl_obj0"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef int u_array[]; typedef u_array &u_array_ref; (u_array_ref arg) { } u_array_ref u_array_ref_gbl_obj0\n"), SYNTAX);
     }
 
     void garbageCode64() { // #6740
-        ASSERT_THROW_INTERNAL(checkCode("{ } foo(void (*bar)(void))"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } foo(void (*bar)(void))\n"), SYNTAX);
     }
 
     void garbageCode65() { // #6741 (segmentation fault)
         // TODO write some syntax error
-        (void)checkCode("{ } { } typedef int u_array[]; typedef u_array &u_array_ref; (u_array_ref arg) { } u_array_ref");
+        (void)checkCode("{ } { } typedef int u_array[]; typedef u_array &u_array_ref; (u_array_ref arg) { } u_array_ref\n");
     }
 
     void garbageCode66() { // #6742
-        ASSERT_THROW_INTERNAL(checkCode("{ { } }; { { } }; { }; class bar : public virtual"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ { } }; { { } }; { }; class bar : public virtual\n"), SYNTAX);
     }
 
     void garbageCode68() { // #6745 (segmentation fault)
-        (void)checkCode("(int a[3]); typedef void (*fp) (void); fp");
+        (void)checkCode("(int a[3]); typedef void (*fp) (void); fp\n");
     }
 
     void garbageCode69() { // #6746
-        ASSERT_THROW_INTERNAL(checkCode("{ (make_mess, aux); } typedef void F(void); aux(void (*x)()) { } (void (*y)()) { } F*"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ (make_mess, aux); } typedef void F(void); aux(void (*x)()) { } (void (*y)()) { } F*\n"), SYNTAX);
     }
 
     void garbageCode70() { // #6747
-        ASSERT_THROW_INTERNAL(checkCode("{ } __attribute__((constructor)) void"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } __attribute__((constructor)) void\n"), SYNTAX);
     }
 
     void garbageCode71() { // #6748
-        ASSERT_THROW_INTERNAL(checkCode("( ) { } typedef void noattr_t ( ) ; noattr_t __attribute__ ( )"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( ) { } typedef void noattr_t ( ) ; noattr_t __attribute__ ( )\n"), SYNTAX);
     }
 
     void garbageCode72() { // #6749
-        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef void voidfn(void); <voidfn&"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef void voidfn(void); <voidfn&\n"), SYNTAX);
     }
 
     void garbageCode73() { // #6750
-        ASSERT_THROW_INTERNAL(checkCode("typedef int IRT[2]; IRT&"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("typedef int IRT[2]; IRT&\n"), SYNTAX);
     }
 
     void garbageCode74() { // #6751
-        ASSERT_THROW_INTERNAL(checkCode("_lenraw(const char* digits) { } typedef decltype(sizeof(0)) { } operator"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("_lenraw(const char* digits) { } typedef decltype(sizeof(0)) { } operator\n"), SYNTAX);
     }
 
     void garbageCode76() { // #6754
-        ASSERT_THROW_INTERNAL(checkCode(" ( ) ( ) { ( ) [ ] } TEST ( ) { ( _broadcast_f32x4 ) ( ) ( ) ( ) ( ) if ( ) ( ) ; } E mask = ( ) [ ] ( ) res1.x ="), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode(" ( ) ( ) { ( ) [ ] } TEST ( ) { ( _broadcast_f32x4 ) ( ) ( ) ( ) ( ) if ( ) ( ) ; } E mask = ( ) [ ] ( ) res1.x =\n"), SYNTAX);
     }
 
     void garbageCode77() { // #6755
-        ASSERT_THROW_INTERNAL(checkCode("void foo (int **p) { { { };>= } } unsigned *d = (b b--) --*d"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void foo (int **p) { { { };>= } } unsigned *d = (b b--) --*d\n"), SYNTAX);
     }
 
     void garbageCode78() { // #6756
-        ASSERT_THROW_INTERNAL(checkCode("( ) { [ ] } ( ) { } const_array_of_int ( ) { } typedef int A [ ] [ ] ; A a = { { } { } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( ) { [ ] } ( ) { } const_array_of_int ( ) { } typedef int A [ ] [ ] ; A a = { { } { } }\n"), SYNTAX);
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode79() { // #6757
-        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef void ( func_type ) ( ) ; func_type & ( )"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef void ( func_type ) ( ) ; func_type & ( )\n"), SYNTAX);
     }
 
     void garbageCode80() { // #6759
-        ASSERT_THROW_INTERNAL(checkCode("( ) { ; ( ) ; ( * ) [ ] ; [ ] = ( ( ) ( ) h ) ! ( ( ) ) } { ; } { } head heads [ ] = ; = & heads [ 2 ]"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( ) { ; ( ) ; ( * ) [ ] ; [ ] = ( ( ) ( ) h ) ! ( ( ) ) } { ; } { } head heads [ ] = ; = & heads [ 2 ]\n"), SYNTAX);
     }
 
     void garbageCode81() { // #6760
-        ASSERT_THROW_INTERNAL(checkCode("{ } [ ] { ( ) } { } typedef void ( *fptr1 ) ( ) const"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } [ ] { ( ) } { } typedef void ( *fptr1 ) ( ) const\n"), SYNTAX);
     }
 
     void garbageCode82() { // #6761
-        ASSERT_THROW_INTERNAL(checkCode("p(\"Hello \" 14) _yn(const size_t) typedef bool pfunk (*pfunk)(const size_t)"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("p(\"Hello \" 14) _yn(const size_t) typedef bool pfunk (*pfunk)(const size_t)\n"), SYNTAX);
     }
 
     void garbageCode83() { // #6771
-        ASSERT_THROW_INTERNAL(checkCode("namespace A { class } class A { friend C ; } { } ;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("namespace A { class } class A { friend C ; } { } ;\n"), SYNTAX);
     }
 
     void garbageCode84() { // #6780
-        ASSERT_THROW_INTERNAL(checkCode("int main ( [ ] ) { " " [ ] ; int i = 0 ; do { } ; } ( [ ] ) { }"), SYNTAX); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("int main ( [ ] ) { " " [ ] ; int i = 0 ; do { } ; } ( [ ] ) { }\n"), SYNTAX); // do not crash
     }
 
     void garbageCode85() { // #6784 (segmentation fault)
-        (void)checkCode("{ } { } typedef void ( *VoidFunc() ) ( ) ; VoidFunc"); // do not crash
+        (void)checkCode("{ } { } typedef void ( *VoidFunc() ) ( ) ; VoidFunc\n"); // do not crash
     }
 
     void garbageCode86() { // #6785
-        ASSERT_THROW_INTERNAL(checkCode("{ } typedef char ( *( X ) ( void) , char ) ;"), SYNTAX); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("{ } typedef char ( *( X ) ( void) , char ) ;\n"), SYNTAX); // do not crash
     }
 
     void garbageCode87() { // #6788
-        ASSERT_THROW_INTERNAL(checkCode("((X (128))) (int a) { v[ = {} (x 42) a] += }"), SYNTAX); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("((X (128))) (int a) { v[ = {} (x 42) a] += }\n"), SYNTAX); // do not crash
     }
 
     void garbageCode88() { // #6786
-        ASSERT_THROW_INTERNAL(checkCode("( ) { ( 0 ) { ( ) } } g ( ) { i( ( false ?) ( ) : 1 ) ; } ;"), SYNTAX); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("( ) { ( 0 ) { ( ) } } g ( ) { i( ( false ?) ( ) : 1 ) ; } ;\n"), SYNTAX); // do not crash
     }
 
     void garbageCode90() { // #6790
-        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef int u_array [[ ] ; typedef u_array & u_array_ref] ( ) { } u_array_ref_gbl_obj0"), SYNTAX); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef int u_array [[ ] ; typedef u_array & u_array_ref] ( ) { } u_array_ref_gbl_obj0\n"), SYNTAX); // do not crash
     }
 
     void garbageCode91() { // #6791
-        ASSERT_THROW_INTERNAL(checkCode("typedef __attribute__((vector_size (16))) { return[ (v2df){ } ;] }"), SYNTAX); // throw syntax error
+        ASSERT_THROW_INTERNAL(checkCode("typedef __attribute__((vector_size (16))) { return[ (v2df){ } ;] }\n"), SYNTAX); // throw syntax error
     }
 
     void garbageCode92() { // #6792
-        ASSERT_THROW_INTERNAL(checkCode("template < typename _Tp ( ( ) ; _Tp ) , decltype > { } { ( ) ( ) }"), SYNTAX); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("template < typename _Tp ( ( ) ; _Tp ) , decltype > { } { ( ) ( ) }\n"), SYNTAX); // do not crash
     }
 
     void garbageCode94() { // #6803
         //checkCode("typedef long __m256i __attribute__ ( ( ( ) ) )[ ; ( ) { } typedef __m256i __attribute__ ( ( ( ) ) ) < ] ( ) { ; }");
-        ASSERT_THROW_INTERNAL(checkCode("typedef long __m256i __attribute__ ( ( ( ) ) )[ ; ( ) { } typedef __m256i __attribute__ ( ( ( ) ) ) < ] ( ) { ; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("typedef long __m256i __attribute__ ( ( ( ) ) )[ ; ( ) { } typedef __m256i __attribute__ ( ( ( ) ) ) < ] ( ) { ; }\n"), SYNTAX);
     }
 
     void garbageCode95() { // #6804
-        ASSERT_THROW_INTERNAL(checkCode("{ } x x ; { } h h [ ] ( ) ( ) { struct x ( x ) ; int __attribute__ ( ) f ( ) { h - > first = & x ; struct x * n = h - > first ; ( ) n > } }"), AST); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("{ } x x ; { } h h [ ] ( ) ( ) { struct x ( x ) ; int __attribute__ ( ) f ( ) { h - > first = & x ; struct x * n = h - > first ; ( ) n > } }\n"), SYNTAX); // do not crash
     }
 
     void garbageCode96() { // #6807
-        ASSERT_THROW_INTERNAL(checkCode("typedef J J[ ; typedef ( ) ( ) { ; } typedef J J ;] ( ) ( J cx ) { n } ;"), SYNTAX); // throw syntax error
+        ASSERT_THROW_INTERNAL(checkCode("typedef J J[ ; typedef ( ) ( ) { ; } typedef J J ;] ( ) ( J cx ) { n } ;\n"), SYNTAX); // throw syntax error
     }
 
     void garbageCode97() { // #6808
-        ASSERT_THROW_INTERNAL(checkCode("namespace A {> } class A{ { }} class A : T< ;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("namespace A {> } class A{ { }} class A : T< ;\n"), SYNTAX);
     }
 
     void garbageCode98() { // #6838
         ASSERT_THROW_INTERNAL(checkCode("for (cocon To::ta@Taaaaaforconst oken aaaaaaaaaaaa5Dl()\n"
                                         "const unsigned in;\n"
-                                        "fon *tok = f);.s(Token i = d-)L;"), SYNTAX);
+                                        "fon *tok = f);.s(Token i = d-)L;\n"), SYNTAX);
     }
 
     void garbageCode99() { // #6726
         ASSERT_THROW_INTERNAL_EQUALS(checkCode("{ xs :: i(:) ! ! x/5 ! !\n"
                                                "i, :: a :: b integer, } foo2(x) :: j(:)\n"
                                                "b type(*), d(:), a x :: end d(..), foo end\n"
-                                               "foo4 b d(..), a a x type(*), b foo2 b"), SYNTAX, "syntax error");
+                                               "foo4 b d(..), a a x type(*), b foo2 b\n"), SYNTAX, "syntax error");
     }
 
     void garbageCode100() { // #6840
-        ASSERT_THROW_INTERNAL(checkCode("( ) { ( i< ) } int foo ( ) { int i ; ( for ( i => 1 ) ; ) }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( ) { ( i< ) } int foo ( ) { int i ; ( for ( i => 1 ) ; ) }\n"), SYNTAX);
     }
 
     void garbageCode101() { // #6835
         // Reported case
-        ASSERT_THROW_INTERNAL(checkCode("template < class , =( , int) X = 1 > struct A { } ( ) { = } [ { } ] ( ) { A < void > 0 }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("template < class , =( , int) X = 1 > struct A { } ( ) { = } [ { } ] ( ) { A < void > 0 }\n"), SYNTAX);
         // Reduced case
-        ASSERT_THROW_INTERNAL(checkCode("template < class =( , ) X = 1> struct A {}; A<void> a;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("template < class =( , ) X = 1> struct A {}; A<void> a;\n"), SYNTAX);
     }
 
     void garbageCode102() { // #6846 (segmentation fault)
-        ASSERT_THROW_INTERNAL(checkCode("struct Object { ( ) ; Object & operator= ( Object ) { ( ) { } if ( this != & b ) } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("struct Object { ( ) ; Object & operator= ( Object ) { ( ) { } if ( this != & b ) } }\n"), SYNTAX);
     }
 
     void garbageCode103() { // #6824
-        ASSERT_THROW_INTERNAL(checkCode("a f(r) int * r; { { int s[2]; [f(s); if () ]  } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("a f(r) int * r; { { int s[2]; [f(s); if () ]  } }\n"), SYNTAX);
     }
 
     void garbageCode104() { // #6847
-        ASSERT_THROW_INTERNAL(checkCode("template < Types > struct S {> ( S < ) S >} { ( ) { } } ( ) { return S < void > ( ) } { ( )> >} { ( ) { } } ( ) { ( ) }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("template < Types > struct S {> ( S < ) S >} { ( ) { } } ( ) { return S < void > ( ) } { ( )> >} { ( ) { } } ( ) { ( ) }\n"), SYNTAX);
     }
 
     void garbageCode105() { // #6859
-        ASSERT_THROW_INTERNAL(checkCode("void foo (int i) { int a , for (a 1; a( < 4; a++) if (a) (b b++) (b);) n++; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void foo (int i) { int a , for (a 1; a( < 4; a++) if (a) (b b++) (b);) n++; }\n"), SYNTAX);
     }
 
     void garbageCode106() { // #6880
-        ASSERT_THROW_INTERNAL(checkCode("[ ] typedef typedef b_array b_array_ref [ ; ] ( ) b_array_ref b_array_ref_gbl_obj0 { ; { b_array_ref b_array_ref_gbl_obj0 } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("[ ] typedef typedef b_array b_array_ref [ ; ] ( ) b_array_ref b_array_ref_gbl_obj0 { ; { b_array_ref b_array_ref_gbl_obj0 } }\n"), SYNTAX);
     }
 
     void garbageCode107() { // #6881
-        TODO_ASSERT_THROW(checkCode("enum { val = 1{ }; { const} }; { } Bar { const int A = val const } ;"), InternalError);
+        TODO_ASSERT_THROW(checkCode("enum { val = 1{ }; { const} }; { } Bar { const int A = val const } ;\n"), InternalError);
     }
 
     void garbageCode108() { //  #6895 "segmentation fault (invalid code) in CheckCondition::isOppositeCond"
-        ASSERT_THROW_INTERNAL(checkCode("A( ) { } bool f( ) { ( ) F; ( ) { ( == ) if ( !=< || ( !A( ) && r[2] ) ) ( !A( ) ) ( ) } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("A( ) { } bool f( ) { ( ) F; ( ) { ( == ) if ( !=< || ( !A( ) && r[2] ) ) ( !A( ) ) ( ) } }\n"), SYNTAX);
     }
 
     void garbageCode109() { //  #6900 "segmentation fault (invalid code) in CheckStl::runSimplifiedChecks"
-        (void)checkCode("( *const<> (( ) ) { } ( *const ( ) ( ) ) { } ( * const<> ( size_t )) ) { } ( * const ( ) ( ) ) { }");
+        (void)checkCode("( *const<> (( ) ) { } ( *const ( ) ( ) ) { } ( * const<> ( size_t )) ) { } ( * const ( ) ( ) ) { }\n");
     }
 
     void garbageCode110() { //  #6902 "segmentation fault (invalid code) in CheckStl::string_c_str"
-        ASSERT_THROW_INTERNAL(checkCode("( *const<> ( size_t ) ; foo ) { } * ( *const ( size_t ) ( ) ;> foo )< { }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( *const<> ( size_t ) ; foo ) { } * ( *const ( size_t ) ( ) ;> foo )< { }\n"), SYNTAX);
     }
 
     void garbageCode111() { //  #6907
-        TODO_ASSERT_THROW(checkCode("enum { FOO = 1( ,) } {{ FOO }} ;"), InternalError);
+        TODO_ASSERT_THROW(checkCode("enum { FOO = 1( ,) } {{ FOO }} ;\n"), InternalError);
     }
 
     void garbageCode112() { //  #6909
-        TODO_ASSERT_THROW(checkCode("enum { FOO = ( , ) } {{ }}>> enum { FOO< = ( ) } { { } } ;"), InternalError);
+        TODO_ASSERT_THROW(checkCode("enum { FOO = ( , ) } {{ }}>> enum { FOO< = ( ) } { { } } ;\n"), InternalError);
     }
 
     void garbageCode114() { // #2118
         ASSERT_NO_THROW(checkCode("Q_GLOBAL_STATIC_WITH_INITIALIZER(Qt4NodeStaticData, qt4NodeStaticData, {\n"
                                   "    for (unsigned i = 0 ; i < count; i++) {\n"
                                   "    }\n"
-                                  "});"));
+                                  "});\n"));
     }
 
     void garbageCode115() { // #5506
-        ASSERT_THROW_INTERNAL(checkCode("A template < int { int = -1 ; } template < int N > struct B { int [ A < N > :: zero ] ;  } ; B < 0 > b ;"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(checkCode("A template < int { int = -1 ; } template < int N > struct B { int [ A < N > :: zero ] ;  } ; B < 0 > b ;\n"), UNKNOWN_MACRO);
     }
 
     void garbageCode116() { // #5356
-        ASSERT_THROW_INTERNAL(checkCode("struct template<int { = }; > struct B { }; B < 0 > b;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("struct template<int { = }; > struct B { }; B < 0 > b;\n"), SYNTAX);
     }
 
     void garbageCode117() { // #6121
         TODO_ASSERT_THROW(checkCode("enum E { f = {} };\n"
-                                    "int a = f;"), InternalError);
+                                    "int a = f;\n"), InternalError);
     }
 
     void garbageCode118() { // #5600 - missing include causes invalid enum
@@ -953,32 +955,32 @@ class TestGarbage : public TestFixture {
                                         "};\n"
                                         "struct bytecode {};\n"
                                         "jv jq_next() { opcode = ((opcode) +NUM_OPCODES);\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode119() { // #5598 (segmentation fault)
-        (void)checkCode("{ { void foo() { struct }; template <typename> struct S { Used x; void bar() } auto f = [this] { }; } };");
+        (void)checkCode("{ { void foo() { struct }; template <typename> struct S { Used x; void bar() } auto f = [this] { }; } };\n");
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode120() { // #4927 (segmentation fault)
         (void)checkCode("int main() {\n"
                         "   return 0\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void garbageCode121() { // #2585
         ASSERT_THROW_INTERNAL(checkCode("abcdef?" "?<"
                                         "123456?" "?>"
-                                        "+?" "?="), SYNTAX);
+                                        "+?" "?=\n"), SYNTAX);
     }
 
     void garbageCode122() { // #6303 (segmentation fault)
         (void)checkCode("void foo() {\n"
                         "char *a = malloc(10);\n"
                         "a[0]\n"
-                        "}");
+                        "}\n");
         ignore_errout(); // we do not care about the output
     }
 
@@ -987,18 +989,18 @@ class TestGarbage : public TestFixture {
                         "    class C {\n"
                         "        C tpl_mem(T *) { return }\n"
                         "    };\n"
-                        "}");
+                        "}\n");
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode125() {
-        ASSERT_THROW_INTERNAL(checkCode("{ T struct B : T valueA_AA ; } T : [ T > ( ) { B } template < T > struct A < > : ] { ( ) { return valueA_AC struct { : } } b A < int > AC ( ) a_aa.M ; ( ) ( ) }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("template < Types > struct S :{ ( S < ) S >} { ( ) { } } ( ) { return S < void > ( ) }"),
+        ASSERT_THROW_INTERNAL(checkCode("{ T struct B : T valueA_AA ; } T : [ T > ( ) { B } template < T > struct A < > : ] { ( ) { return valueA_AC struct { : } } b A < int > AC ( ) a_aa.M ; ( ) ( ) }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("template < Types > struct S :{ ( S < ) S >} { ( ) { } } ( ) { return S < void > ( ) }\n"),
                               SYNTAX);
     }
 
     void garbageCode126() {
-        ASSERT_THROW_INTERNAL(checkCode("{ } float __ieee754_sinhf ( float x ) { float t , , do { gf_u ( jx ) { } ( 0 ) return ; ( ) { } t } ( 0x42b17180 ) { } }"),
+        ASSERT_THROW_INTERNAL(checkCode("{ } float __ieee754_sinhf ( float x ) { float t , , do { gf_u ( jx ) { } ( 0 ) return ; ( ) { } t } ( 0x42b17180 ) { } }\n"),
                               SYNTAX);
     }
 
@@ -1011,38 +1013,38 @@ class TestGarbage : public TestFixture {
                         "  ~A() { printf(\"A d'tor\\n\"); }\n"
                         "};\n"
                         " const A& foo(const A& arg) { return arg; }\n"
-                        " foo(A(12)).Var");
+                        " foo(A(12)).Var\n");
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode128() {
-        TODO_ASSERT_THROW(checkCode("enum { FOO = ( , ) } {{ }} enum {{ FOO << = } ( ) } {{ }} ;"),
+        TODO_ASSERT_THROW(checkCode("enum { FOO = ( , ) } {{ }} enum {{ FOO << = } ( ) } {{ }} ;\n"),
                           InternalError);
     }
 
     void garbageCode129() {
-        ASSERT_THROW_INTERNAL(checkCode("operator - ( { } typedef typename x ; ( ) ) { ( { { ( ( ) ) } ( { } ) } ) }"),
+        ASSERT_THROW_INTERNAL(checkCode("operator - ( { } typedef typename x ; ( ) ) { ( { { ( ( ) ) } ( { } ) } ) }\n"),
                               SYNTAX);
     }
 
     void garbageCode130() {
-        TODO_ASSERT_THROW(checkCode("enum { FOO = ( , ){ } { { } } { { FOO} = } ( ) } { { } } enumL\" ( enumL\" { { FOO } ( ) } { { } } ;"),
+        TODO_ASSERT_THROW(checkCode("enum { FOO = ( , ){ } { { } } { { FOO} = } ( ) } { { } } enumL\" ( enumL\" { { FOO } ( ) } { { } } ;\n"),
                           InternalError);
     }
 
     void garbageCode131() {
-        ASSERT_THROW_INTERNAL(checkCode("( void ) { ( ) } ( ) / { ( ) }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( void ) { ( ) } ( ) / { ( ) }\n"), SYNTAX);
         // actually the invalid code should trigger an syntax error...
     }
 
     void garbageCode132() { // #7022
-        ASSERT_THROW_INTERNAL(checkCode("() () { } { () () ({}) i() } void i(void(*ptr) ()) { ptr(!) () }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("() () { } { () () ({}) i() } void i(void(*ptr) ()) { ptr(!) () }\n"), SYNTAX);
     }
 
     void garbageCode133() {
-        ASSERT_THROW_INTERNAL(checkCode("void f() {{}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {{}\n"), SYNTAX);
 
-        ASSERT_THROW_INTERNAL(checkCode("void f()) {}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f()) {}\n"), SYNTAX);
 
         ASSERT_THROW_INTERNAL(checkCode("void f()\n"
                                         "{\n"
@@ -1093,32 +1095,32 @@ class TestGarbage : public TestFixture {
 
     void garbageCode134() {
         // Ticket #5605, #5759, #5762, #5774, #5823, #6059
-        ASSERT_THROW_INTERNAL(checkCode("foo() template<typename T1 = T2 = typename = unused, T5 = = unused> struct tuple Args> tuple<Args...> { } main() { foo<int,int,int,int,int,int>(); }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("( ) template < T1 = typename = unused> struct Args { } main ( ) { foo < int > ( ) ; }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("() template < T = typename = x > struct a {} { f <int> () }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("template < T = typename = > struct a { f <int> }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("foo() template<typename T1 = T2 = typename = unused, T5 = = unused> struct tuple Args> tuple<Args...> { } main() { foo<int,int,int,int,int,int>(); }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( ) template < T1 = typename = unused> struct Args { } main ( ) { foo < int > ( ) ; }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("() template < T = typename = x > struct a {} { f <int> () }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("template < T = typename = > struct a { f <int> }\n"), SYNTAX);
         (void)checkCode("struct S { int i, j; }; "
                         "template<int S::*p, typename U> struct X {}; "
                         "X<&S::i, int> x = X<&S::i, int>(); "
-                        "X<&S::j, int> y = X<&S::j, int>();");
+                        "X<&S::j, int> y = X<&S::j, int>();\n");
         ignore_errout(); // we are not interested in the output
         (void)checkCode("template <typename T> struct A {}; "
                         "template <> struct A<void> {}; "
-                        "void foo(const void* f = 0) {}");
+                        "void foo(const void* f = 0) {}\n");
         (void)checkCode("template<typename... T> struct A { "
                         "  static const int s = 0; "
                         "}; "
-                        "A<int> a;");
+                        "A<int> a;\n");
         (void)checkCode("template<class T, class U> class A {}; "
                         "template<class T = A<int, int> > class B {}; "
                         "template<class T = B<int> > class C { "
                         "    C() : _a(0), _b(0) {} "
                         "    int _a, _b; "
-                        "};");
+                        "};\n");
         (void)checkCode("template<class... T> struct A { "
                         "  static int i; "
                         "}; "
-                        "void f() { A<int>::i = 0; }");
+                        "void f() { A<int>::i = 0; }\n");
         ignore_errout(); // we are not interested in the output
     }
 
@@ -1127,17 +1129,17 @@ class TestGarbage : public TestFixture {
                         "  return a >> extern\n"
                         "}\n"
                         "long a = 1 ;\n"
-                        "long b = 2 ;");
+                        "long b = 2 ;\n");
         ignore_errout(); // we are not interested in the output
     }
 
     void garbageCode136() { // #7033
-        ASSERT_THROW_INTERNAL(checkCode("{ } () { void f() { node_t * n; for (; -n) {} } } { }"),
+        ASSERT_THROW_INTERNAL(checkCode("{ } () { void f() { node_t * n; for (; -n) {} } } { }\n"),
                               SYNTAX);
     }
 
     void garbageCode137() { // #7034
-        ASSERT_THROW_INTERNAL(checkCode("\" \" typedef signed char f; \" \"; void a() { f * s = () &[]; (; ) (; ) }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("\" \" typedef signed char f; \" \"; void a() { f * s = () &[]; (; ) (; ) }\n"), SYNTAX);
     }
 
     void garbageCode138() { // #6660 (segmentation fault)
@@ -1149,7 +1151,7 @@ class TestGarbage : public TestFixture {
                         "      {};\n"
                         "    } halo;\n"
                         "}\n"
-                        "CS_PLUGIN_NAMESPACE_END(csparser)");
+                        "CS_PLUGIN_NAMESPACE_END(csparser)\n");
         ignore_errout(); // we are not interested in the output
     }
 
@@ -1158,19 +1160,19 @@ class TestGarbage : public TestFixture {
                                         "   de_ctrl = (nDirection == RIGHT_TO_LEFT) ?\n"
                                         "    ( (0 & ~(((1 << (1 - (0 ? DE_CONTROL_DIRECTION))) - 1) << (0 ? DE_CONTROL_DIRECTION))) )\n"
                                         "    : 42;\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode140() { // #7035
-        ASSERT_THROW_INTERNAL(checkCode("int foo(int align) { int off(= 0 % align;  return off) ? \\ align - off  :  0;  \\ }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int foo(int align) { int off(= 0 % align;  return off) ? \\ align - off  :  0;  \\ }\n"), SYNTAX);
     }
 
     void garbageCode141() { // #7043
-        TODO_ASSERT_THROW(checkCode("enum { X = << { X } } enum { X = X } = X ;"), InternalError);
+        TODO_ASSERT_THROW(checkCode("enum { X = << { X } } enum { X = X } = X ;\n"), InternalError);
     }
 
     void garbageCode142() { // #7050
-        ASSERT_THROW_INTERNAL(checkCode("{ } (  ) { void mapGraphs ( ) { node_t * n ; for (!oid n ) { } } } { }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } (  ) { void mapGraphs ( ) { node_t * n ; for (!oid n ) { } } } { }\n"), SYNTAX);
     }
 
     void garbageCode143() { // #6922
@@ -1184,18 +1186,18 @@ class TestGarbage : public TestFixture {
                                         "            VGAwCR(0x64,0x?? );\n"
                                         "        }\n"
                                         "    }\n"
-                                        "}"), AST);
+                                        "}\n"), AST);
     }
 
     void garbageCode144() { // #6865
-        ASSERT_THROW_INTERNAL(checkCode("template < typename > struct A { } ; template < typename > struct A < INVALID > : A < int[ > { }] ;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("template < typename > struct A { } ; template < typename > struct A < INVALID > : A < int[ > { }] ;\n"), SYNTAX);
     }
 
     void garbageCode146() { // #7081
         ASSERT_THROW_INTERNAL(checkCode("void foo() {\n"
                                         "    ? std::cout << pow((, 1) << std::endl;\n"
                                         "    double <ip = NUO ip) << std::end;\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode147() { // #7082
@@ -1209,9 +1211,9 @@ class TestGarbage : public TestFixture {
                                         "void est2() {\n"
                                         "    for (int ui = 0; ui < 1z; ui++)\n"
                                         "        ;\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
 
-        ASSERT_THROW_INTERNAL(checkCode("; void f ^ { return } int main ( ) { }"), SYNTAX); // #4941
+        ASSERT_THROW_INTERNAL(checkCode("; void f ^ { return } int main ( ) { }\n"), SYNTAX); // #4941
     }
 
     void garbageCode148() { // #7090
@@ -1219,14 +1221,14 @@ class TestGarbage : public TestFixture {
                                         "    typedef S0 b[][1][1] != 0\n"
                                         "};\n"
                                         "b[K][0] S0 b[][1][1] != 4{ 0 };\n"
-                                        "b[0][0]"), UNKNOWN_MACRO);
+                                        "b[0][0]\n"), UNKNOWN_MACRO);
     }
 
     void garbageCode149() { // #7085 (segmentation fault)
         (void)checkCode("int main() {\n"
                         "    for (j = 0; j < 1; j)\n"
                         "        j6;\n"
-                        "}");
+                        "}\n");
         ignore_errout(); // we do not care about the output
     }
 
@@ -1243,7 +1245,7 @@ class TestGarbage : public TestFixture {
         (void)checkCode("void f() {\n"
                         "    int a;\n"
                         "    do { a=do_something() } while (a);\n"
-                        "}");
+                        "}\n");
     }
 
     void garbageCode152() { // happened in travis, originally from llvm clang code (segmentation fault)
@@ -1254,15 +1256,15 @@ class TestGarbage : public TestFixture {
     }
 
     void garbageCode153() {
-        TODO_ASSERT_THROW(checkCode("enum { X = << { X } } { X X } enum { X = << { ( X ) } } { } X */"), InternalError);
+        TODO_ASSERT_THROW(checkCode("enum { X = << { X } } { X X } enum { X = << { ( X ) } } { } X */\n"), InternalError);
     }
 
     void garbageCode154() { // #7112 (segmentation fault)
-        (void)checkCode("\"abc\"[];");
+        (void)checkCode("\"abc\"[];\n");
     }
 
     void garbageCode156() { // #7120
-        ASSERT_THROW_INTERNAL(checkCode("struct {}a; d f() { c ? : } {}a.p"), AST);
+        ASSERT_THROW_INTERNAL(checkCode("struct {}a; d f() { c ? : } {}a.p\n"), AST);
     }
 
     void garbageCode157() { // #7131
@@ -1274,24 +1276,24 @@ class TestGarbage : public TestFixture {
     }
 
     void garbageCode158() { // #3238 (segmentation fault)
-        (void)checkCode("__FBSDID(\"...\");");
+        (void)checkCode("__FBSDID(\"...\");\n");
     }
 
     void garbageCode159() { // #7119
-        ASSERT_THROW_INTERNAL(checkCode("({}typedef typename x;typename x!){({{}()})}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("({}typedef typename x;typename x!){({{}()})}\n"), SYNTAX);
     }
 
     void garbageCode160() { // #7190
-        ASSERT_THROW_INTERNAL(checkCode("f(a,b,c,d)float [  a[],d;int ]  b[],c;{} "), SYNTAX); // don't hang
+        ASSERT_THROW_INTERNAL(checkCode("f(a,b,c,d)float [  a[],d;int ]  b[],c;{} \n"), SYNTAX); // don't hang
     }
 
 
     void garbageCodeFuzzerClientMode1() {
-        ASSERT_THROW_INTERNAL(checkCode("void f() { x= name2 & name3 name2 = | 0.1 , | 0.1 , | 0.1 name4 <= >( ); }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f() { x = , * [ | + 0xff | > 0xff]; }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f() {  x = , | 0xff , 0.1 < ; }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f() { x = [ 1 || ] ; }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f1() { x = name6 1 || ? name3 [  ( 1 || +) ] ; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { x= name2 & name3 name2 = | 0.1 , | 0.1 , | 0.1 name4 <= >( ); }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { x = , * [ | + 0xff | > 0xff]; }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {  x = , | 0xff , 0.1 < ; }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { x = [ 1 || ] ; }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f1() { x = name6 1 || ? name3 [  ( 1 || +) ] ; }\n"), SYNTAX);
     }
 
     void garbageValueFlow() {
@@ -1304,44 +1306,46 @@ class TestGarbage : public TestFixture {
         }
 
         { // 6122 survive garbage code
-            const char code[] = "; { int i ; for ( i = 0 ; = 123 ; ) - ; }";
+            const char code[] = "; { int i ; for ( i = 0 ; = 123 ; ) - ; }\n";
             ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
         }
 
         {
-            const char code[] = "void f1() { for (int n = 0 n < 10 n++); }";
+            const char code[] = "void f1() { for (int n = 0 n < 10 n++); }\n";
             ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
         }
     }
 
     void garbageSymbolDatabase() {
-        (void)checkCode("void f( { u = 1 ; } ) { }");
+        (void)checkCode("void f( { u = 1 ; } ) { }\n");
 
-        ASSERT_THROW_INTERNAL(checkCode("{ }; void namespace A::f; { g() { int } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ }; void namespace A::f; { g() { int } }\n"), SYNTAX);
 
-        ASSERT_THROW_INTERNAL(checkCode("class Foo {}; class Bar : public Foo"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("class Foo {}; class Bar : public Foo\n"), SYNTAX);
 
         // #5663 (segmentation fault)
         (void)checkCode("YY_DECL { switch (yy_act) {\n"
                         "    case 65: YY_BREAK\n"
                         "    case YY_STATE_EOF(block):\n"
                         "        yyterminate();\n"
-                        "} }");
+                        "} }\n");
         ignore_errout(); // we are not interested in the output
     }
 
     void garbageAST() {
         ASSERT_THROW_INTERNAL(checkCode("N 1024 float a[N], b[N + 3], c[N]; void N; (void) i;\n"
                                         "int #define for (i = avx_test i < c[i]; i++)\n"
-                                        "b[i + 3] = a[i] * {}"), SYNTAX); // Don't hang (#5787)
+                                        "b[i + 3] = a[i] * {}\n"), SYNTAX); // Don't hang (#5787)
 
-        (void)checkCode("START_SECTION([EXTRA](bool isValid(const String &filename)))"); // Don't crash (#5991)
+        (void)checkCode("START_SECTION([EXTRA](bool isValid(const String &filename)))\n"); // Don't crash (#5991)
 
         // #8352
         ASSERT_THROW_INTERNAL(checkCode("else return % name5 name2 - =name1 return enum | { - name3 1 enum != >= 1 >= ++ { { || "
-                                        "{ return return { | { - name3 1 enum != >= 1 >= ++ { name6 | ; ++}}}}}}}"), UNKNOWN_MACRO);
+                                        "{ return return { | { - name3 1 enum != >= 1 >= ++ { name6 | ; ++}}}}}}}\n"), UNKNOWN_MACRO);
         ASSERT_THROW_INTERNAL(checkCode("else return % name5 name2 - =name1 return enum | { - name3 1 enum != >= 1 >= ++ { { || "
-                                        "{ return return { | { - name3 1 enum != >= 1 >= ++ { { || ; ++}}}}}}}}"), UNKNOWN_MACRO);
+                                        "{ return return { | { - name3 1 enum != >= 1 >= ++ { { || ; ++}}}}}}}}\n"), UNKNOWN_MACRO);
+
+        ASSERT_THROW_INTERNAL(checkCode("f(*p, requires(x));\n"), AST); // #14740
     }
 
     void templateSimplifierCrashes() {
@@ -1365,7 +1369,7 @@ class TestGarbage : public TestFixture {
             "  void f() {\n"
             "    s.operator A<A<int> >();\n"
             "  }\n"
-            "}");
+            "}\n");
 
         ASSERT_NO_THROW(checkCode( // #6034
                             "template<template<typename...> class T, typename... Args>\n"
@@ -1379,7 +1383,7 @@ class TestGarbage : public TestFixture {
                             "\n"
                             "int main() {\n"
                             "  foo<int_<0> >::value;\n"
-                            "}"));
+                            "}\n"));
 
         (void)checkCode( // #6117 (segmentation fault)
             "template <typename ...> struct something_like_tuple\n"
@@ -1397,7 +1401,7 @@ class TestGarbage : public TestFixture {
             "\n"
             "typedef something_like_tuple<char, int, float> something_like_tuple_t;\n"
             "SA ((is_last<float, something_like_tuple_t>::value == false));\n"
-            "SA ((is_last<int, something_like_tuple_t>::value == false));");
+            "SA ((is_last<int, something_like_tuple_t>::value == false));\n");
         ignore_errout(); // we are not interested in the output
 
         (void)checkCode( // #6225 (use-after-free)
@@ -1408,7 +1412,7 @@ class TestGarbage : public TestFixture {
             "        template <typename T>\n"
             "        struct A {};\n"
             "        using AliasA = A<T>;\n"
-            "}");
+            "}\n");
 
         // #3449
         ASSERT_EQUALS("template < typename T > struct A ;\n"
@@ -1416,72 +1420,72 @@ class TestGarbage : public TestFixture {
                       "{ } ;",
                       checkCode("template<typename T> struct A;\n"
                                 "struct B { template<typename T> struct C };\n"
-                                "{};"));
+                                "{};\n"));
     }
     void garbageCode161() {
         //7200
-        ASSERT_THROW_INTERNAL(checkCode("{ }{ if () try { } catch (...)} B : : ~B { }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ }{ if () try { } catch (...)} B : : ~B { }\n"), SYNTAX);
     }
 
     void garbageCode162() {
         //7208
-        ASSERT_THROW_INTERNAL(checkCode("return <<  >>  x return <<  >>  x ", false), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(checkCode("return <<  >>  x return <<  >>  x \n", false), UNKNOWN_MACRO);
     }
 
     void garbageCode163() {
         //7228
-        ASSERT_THROW_INTERNAL(checkCode("typedef s f[](){typedef d h(;f)}", false), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("typedef s f[](){typedef d h(;f)}\n", false), SYNTAX);
     }
 
     void garbageCode164() {
         //7234
-        ASSERT_THROW_INTERNAL(checkCode("class d{k p;}(){d::d():B<()}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("class d{k p;}(){d::d():B<()}\n"), SYNTAX);
     }
 
     void garbageCode165() {
         //7235
-        ASSERT_THROW_INTERNAL(checkCode("for(;..)", false),SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("for(;..)\n", false),SYNTAX);
     }
 
     void garbageCode167() {
         //7237
-        ASSERT_THROW_INTERNAL(checkCode("class D00i000{:D00i000::}i"),SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("class D00i000{:D00i000::}i\n"),SYNTAX);
     }
 
     void garbageCode168() {
         // #7246 (segmentation fault)
-        (void)checkCode("long foo(void) { return *bar; }", false);
+        (void)checkCode("long foo(void) { return *bar; }\n", false);
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode169() {
         // 6713
         ASSERT_THROW_INTERNAL(checkCode("( ) { ( ) ; { return } switch ( ) i\n"
-                                        "set case break ; default: ( ) }", false), SYNTAX);
+                                        "set case break ; default: ( ) }\n", false), SYNTAX);
     }
 
     void garbageCode170() {
         // 7255
-        ASSERT_THROW_INTERNAL(checkCode("d i(){{f*s=typeid(()0,)}}", false), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("d i(){{f*s=typeid(()0,)}}\n", false), SYNTAX);
     }
 
     void garbageCode171() {
         // 7270
-        ASSERT_THROW_INTERNAL(checkCode("(){case()?():}:", false), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("(){case()?():}:\n", false), SYNTAX);
     }
 
     void garbageCode172() {
         // #7357
-        ASSERT_THROW_INTERNAL(checkCode("p<e T=l[<]<>>,"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("p<e T=l[<]<>>,\n"), SYNTAX);
     }
 
     void garbageCode173() {
         // #6781  heap corruption ;  TemplateSimplifier::simplifyTemplateInstantiations
-        ASSERT_THROW_INTERNAL(checkCode(" template < Types > struct S : >( S < ...Types... > S <) > { ( ) { } } ( ) { return S < void > ( ) }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode(" template < Types > struct S : >( S < ...Types... > S <) > { ( ) { } } ( ) { return S < void > ( ) }\n"), SYNTAX);
     }
 
     void garbageCode174() { // #7356
-        ASSERT_THROW_INTERNAL(checkCode("{r e() { w*constD = (())D = cast< }}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{r e() { w*constD = (())D = cast< }}\n"), SYNTAX);
     }
 
     void garbageCode175() { // #7027
@@ -1490,32 +1494,32 @@ class TestGarbage : public TestFixture {
                                         "  for ( i = t3 , i < t1 ; i++ )\n"
                                         "    for ( j = 0 ; j < = j++ )\n"
                                         "        return t1 ,\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode176() { // #7257 (segmentation fault)
-        (void)checkCode("class t { { struct } enum class f : unsigned { q } b ; operator= ( T ) { switch ( b ) { case f::q: } } { assert ( b ) ; } } { ; & ( t ) ( f::t ) ; } ;");
+        (void)checkCode("class t { { struct } enum class f : unsigned { q } b ; operator= ( T ) { switch ( b ) { case f::q: } } { assert ( b ) ; } } { ; & ( t ) ( f::t ) ; } ;\n");
         ignore_errout(); // we are not interested in the output
     }
 
     void garbageCode181() {
-        ASSERT_THROW_INTERNAL(checkCode("int test() { int +; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int test() { int +; }\n"), SYNTAX);
     }
 
     // #4195 - segfault for "enum { int f ( ) { return = } r = f ( ) ; }"
     void garbageCode182() {
-        ASSERT_THROW_INTERNAL(checkCode("enum { int f ( ) { return = } r = f ( ) ; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("enum { int f ( ) { return = } r = f ( ) ; }\n"), SYNTAX);
     }
     // #7505 - segfault
     void garbageCode183() {
-        ASSERT_THROW_INTERNAL(checkCode("= { int } enum return { r = f() f(); }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("= { int } enum return { r = f() f(); }\n"), SYNTAX);
     }
 
     void garbageCode184() { // #7699
         ASSERT_THROW_INTERNAL(checkCode("unsigned int AquaSalSystem::GetDisplayScreenCount() {\n"
                                         "    NSArray* pScreens = [NSScreen screens];\n"
                                         "    return pScreens ? [pScreens count] : 1;\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode185() { // #6011 crash in libreoffice failure to create proper AST
@@ -1527,29 +1531,29 @@ class TestGarbage : public TestFixture {
             "               pOut->CreateObject( nIndex, GDI_BRUSH, new WinMtfFillStyle( ReadColor(), ( nStyle == BS_HOLLOW ) ? TRUE : FALSE ) );\n"
             "               return bStatus;\n"
             "       };\n"
-            "}");
+            "}\n");
         ignore_errout(); // we are not interested in the output
     }
 
     // #8151 - segfault due to incorrect template syntax
     void garbageCode186() {
-        ASSERT_THROW_INTERNAL(checkCode("A<B<><>C"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("A<B<><>C\n"), SYNTAX);
     }
 
     void garbageCode187() { // # 8152 - segfault in handling
         const char inp[] = "0|\0|0>;\n";
         ASSERT_THROW_INTERNAL(checkCode(inp), SYNTAX);
 
-        (void)checkCode("template<class T> struct S : A< B<T> || C<T> > {};"); // No syntax error: #8390
-        (void)checkCode("static_assert(A<x> || B<x>, ab);");
+        (void)checkCode("template<class T> struct S : A< B<T> || C<T> > {};\n"); // No syntax error: #8390
+        (void)checkCode("static_assert(A<x> || B<x>, ab);\n");
     }
 
     void garbageCode188() { // #8255
-        ASSERT_THROW_INTERNAL(checkCode("{z r(){(){for(;<(x);){if(0==0)}}}}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{z r(){(){for(;<(x);){if(0==0)}}}}\n"), SYNTAX);
     }
 
     void garbageCode189() { // #8317 (segmentation fault)
-        (void)checkCode("t&n(){()()[](){()}}$");
+        (void)checkCode("t&n(){()()[](){()}}$\n");
     }
 
     void garbageCode190() { // #8307
@@ -1557,31 +1561,31 @@ class TestGarbage : public TestFixture {
                                         "    int i;\n"
                                         "    i *= 0;\n"
                                         "    !i <;\n"
-                                        "}"),
+                                        "}\n"),
                               AST);
     }
 
     void garbageCode191() { // #8333
-        ASSERT_THROW_INTERNAL(checkCode("struct A { int f(const); };"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("struct A { int f(int, const, char); };"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("struct A { int f(struct); };"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("struct A { int f(const); };\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("struct A { int f(int, const, char); };\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("struct A { int f(struct); };\n"), SYNTAX);
 
         // The following code is valid and should not trigger any error
-        ASSERT_NO_THROW(checkCode("struct A { int f ( char ) ; } ;"));
+        ASSERT_NO_THROW(checkCode("struct A { int f ( char ) ; } ;\n"));
     }
 
     void garbageCode192() { // #8386 (segmentation fault)
-        ASSERT_THROW_INTERNAL(checkCode("{(()[((0||0xf||))]0[])}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{(()[((0||0xf||))]0[])}\n"), SYNTAX);
     }
 
     // #8740
     void garbageCode193() {
-        ASSERT_THROW_INTERNAL(checkCode("d f(){!=[]&&0()!=0}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("d f(){!=[]&&0()!=0}\n"), SYNTAX);
     }
 
     // #8384
     void garbageCode194() {
-        ASSERT_THROW_INTERNAL(checkCode("{((()))(return 1||);}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{((()))(return 1||);}\n"), SYNTAX);
     }
 
     // #8709 - no garbage but to avoid stability regression (segmentation fault)
@@ -1591,19 +1595,19 @@ class TestGarbage : public TestFixture {
                         "  switch (d) { case b:; }\n"
                         "  double e(b);\n"
                         "  if(e <= 0) {}\n"
-                        "}");
+                        "}\n");
         ignore_errout(); // we do not care about the output
     }
 
     // #8265
     void garbageCode196() {
-        ASSERT_THROW_INTERNAL(checkCode("0|,0<<V"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode(";|4|<0;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("0|,0<<V\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode(";|4|<0;\n"), SYNTAX);
     }
 
     // #8385
     void garbageCode197() {
-        ASSERT_THROW_INTERNAL(checkCode("(){e break,{(case)|{e:[()]}}}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("(){e break,{(case)|{e:[()]}}}\n"), SYNTAX);
     }
 
     // #8383
@@ -1613,38 +1617,38 @@ class TestGarbage : public TestFixture {
                                         "ame5 ( name5 struct ( name5 name5 < ) ) ( default ) { name4 != name5 name5 name5\n"
                                         " ( name5 name5 name5 ( { 1 >= void { ( ()) } 1 name3 return >= >= ( ) >= name5 (\n"
                                         " name5 name6 :nam00 [ ()])}))})})})};\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     // #8752 (segmentation fault)
     void garbageCode199() {
-        ASSERT_THROW_INTERNAL(checkCode("d f(){e n00e0[]n00e0&" "0+f=0}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("d f(){e n00e0[]n00e0&" "0+f=0}\n"), SYNTAX);
     }
 
     // #8757
     void garbageCode200() {
-        ASSERT_THROW_INTERNAL(checkCode("(){e break,{(case)!{e:[]}}}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("(){e break,{(case)!{e:[]}}}\n"), SYNTAX);
     }
 
     // #8873
     void garbageCode201() {
-        ASSERT_THROW_INTERNAL(checkCode("void f() { std::string s=\"abc\"; return s + }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { std::string s=\"abc\"; return s + }\n"), SYNTAX);
     }
 
     // #8907
     void garbageCode202() {
-        ASSERT_THROW_INTERNAL(checkCode("void f() { UNKNOWN_MACRO(return); }"), UNKNOWN_MACRO);
-        ASSERT_THROW_INTERNAL(checkCode("void f() { UNKNOWN_MACRO(throw); }"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { UNKNOWN_MACRO(return); }\n"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { UNKNOWN_MACRO(throw); }\n"), UNKNOWN_MACRO);
         ignore_errout();
     }
 
     void garbageCode203() { // #8972 (segmentation fault)
-        ASSERT_THROW_INTERNAL(checkCode("{ > () {} }"), SYNTAX);
-        (void)checkCode("template <> a > ::b();");
+        ASSERT_THROW_INTERNAL(checkCode("{ > () {} }\n"), SYNTAX);
+        (void)checkCode("template <> a > ::b();\n");
     }
 
     void garbageCode204() {
-        ASSERT_THROW_INTERNAL(checkCode("template <a, = b<>()> c; template <a> a as() {} as<c<>>();"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("template <a, = b<>()> c; template <a> a as() {} as<c<>>();\n"), SYNTAX);
     }
 
     void garbageCode205() {
@@ -1663,55 +1667,55 @@ class TestGarbage : public TestFixture {
                                         "CodeSnippetsEvent :: CodeSnippetsEvent ( const CodeSnippetsEvent & Event )\n"
                                         ": wxCommandEvent ( Event )\n"
                                         ", m_SnippetID ( 0 ) {\n"
-                                        "}"),
+                                        "}\n"),
                               INTERNAL);
     }
 
     void garbageCode206() {
-        ASSERT_EQUALS("[test.cpp:1] syntax error: operator", getSyntaxError("void foo() { for (auto operator new : int); }"));
-        ASSERT_EQUALS("[test.cpp:1] syntax error", getSyntaxError("void foo() { for (a operator== :) }"));
+        ASSERT_EQUALS("[test.cpp:1] syntax error: operator", getSyntaxError("void foo() { for (auto operator new : int); }\n"));
+        ASSERT_EQUALS("[test.cpp:1] syntax error", getSyntaxError("void foo() { for (a operator== :) }\n"));
     }
 
     void garbageCode207() { // #8750
-        ASSERT_THROW_INTERNAL(checkCode("d f(){(.n00e0(return%n00e0''('')));}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("d f(){(.n00e0(return%n00e0''('')));}\n"), SYNTAX);
     }
 
     void garbageCode208() { // #8753
-        ASSERT_THROW_INTERNAL(checkCode("d f(){(for(((((0{t b;((((((((()))))))))}))))))}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("d f(){(for(((((0{t b;((((((((()))))))))}))))))}\n"), SYNTAX);
     }
 
     void garbageCode209() { // #8756
-        ASSERT_THROW_INTERNAL(checkCode("{(- -##0xf/-1 0)[]}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{(- -##0xf/-1 0)[]}\n"), SYNTAX);
     }
 
     void garbageCode210() { // #8762
-        ASSERT_THROW_INTERNAL(checkCode("{typedef typedef c n00e0[]c000(;n00e0&c000)}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{typedef typedef c n00e0[]c000(;n00e0&c000)}\n"), SYNTAX);
     }
 
     void garbageCode211() { // #8764
-        ASSERT_THROW_INTERNAL(checkCode("{typedef f typedef[]({typedef e e,>;typedef(((typedef<typedef|)))})}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{typedef f typedef[]({typedef e e,>;typedef(((typedef<typedef|)))})}\n"), SYNTAX);
     }
 
     void garbageCode212() { // #8765
-        ASSERT_THROW_INTERNAL(checkCode("{(){}[]typedef r n00e0[](((n00e0 0((;()))))){(0 typedef n00e0 bre00 n00e0())}[]();typedef n n00e0()[],(bre00)}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{(){}[]typedef r n00e0[](((n00e0 0((;()))))){(0 typedef n00e0 bre00 n00e0())}[]();typedef n n00e0()[],(bre00)}\n"), SYNTAX);
     }
 
     void garbageCode213() { // #8758
-        ASSERT_THROW_INTERNAL(checkCode("{\"\"[(1||)];}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{\"\"[(1||)];}\n"), SYNTAX);
     }
 
     void garbageCode214() { // segmentation fault
-        (void)checkCode("THIS FILE CONTAINS VARIOUS TEXT");
+        (void)checkCode("THIS FILE CONTAINS VARIOUS TEXT\n");
     }
 
     void garbageCode215() { // daca@home script with extension .c
-        ASSERT_THROW_INTERNAL(checkCode("a = [1,2,3];"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("a = [1,2,3];\n"), SYNTAX);
     }
 
     void garbageCode216() { // #7884 (out-of-memory)
         (void)checkCode("template<typename> struct A {};\n"
                         "template<typename...T> struct A<T::T...> {}; \n"
-                        "A<int> a;");
+                        "A<int> a;\n");
     }
 
     void garbageCode217() { // #10011
@@ -1719,11 +1723,11 @@ class TestGarbage : public TestFixture {
                                         "    auto p;\n"
                                         "    if (g(p)) {}\n"
                                         "    assert();\n"
-                                        "}"), AST);
+                                        "}\n"), AST);
     }
 
     void garbageCode218() { // #8763
-        ASSERT_THROW_INTERNAL(checkCode("d f(){t n0000 const[]n0000+0!=n0000,(0)}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("d f(){t n0000 const[]n0000+0!=n0000,(0)}\n"), SYNTAX);
     }
     void garbageCode219() { // #10101
         (void)checkCode("typedef void (*func) (addr) ;\n"
@@ -1743,105 +1747,111 @@ class TestGarbage : public TestFixture {
         ASSERT_THROW_INTERNAL(checkCode("template<template<class>\n"), SYNTAX);  // don't crash
     }
     void garbageCode223() { // #11639
-        ASSERT_THROW_INTERNAL(checkCode("struct{}*"), SYNTAX);  // don't crash
+        ASSERT_THROW_INTERNAL(checkCode("struct{}*\n"), SYNTAX);  // don't crash
     }
     void garbageCode224() {
-        ASSERT_THROW_INTERNAL(checkCode("void f(){ auto* b = dynamic_cast<const }"), SYNTAX);  // don't crash
+        ASSERT_THROW_INTERNAL(checkCode("void f(){ auto* b = dynamic_cast<const }\n"), SYNTAX);  // don't crash
         ASSERT_EQUALS("", errout_str());
-        ASSERT_THROW_INTERNAL(checkCode("void f(){ auto* b = dynamic_cast x; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f(){ auto* b = dynamic_cast x; }\n"), SYNTAX);
         ignore_errout();
     }
     void garbageCode225() {
-        ASSERT_THROW_INTERNAL(checkCode("int n() { c * s0, 0 s0 = c(sizeof = ) }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("int n() { c * s0, 0 s0 = c(sizeof |= ) }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int n() { c * s0, 0 s0 = c(sizeof = ) }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int n() { c * s0, 0 s0 = c(sizeof |= ) }\n"), SYNTAX);
     }
     void garbageCode226() {
-        ASSERT_THROW_INTERNAL(checkCode("int a() { (b((c)`)) } {}"), SYNTAX); // #11638
-        ASSERT_THROW_INTERNAL(checkCode("int a() { (b((c)\\)) } {}"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("int a() { (b((c)@)) } {}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int a() { (b((c)`)) } {}\n"), SYNTAX); // #11638
+        ASSERT_THROW_INTERNAL(checkCode("int a() { (b((c)\\)) } {}\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int a() { (b((c)@)) } {}\n"), SYNTAX);
     }
     void garbageCode227() { // #12615
-        ASSERT_NO_THROW(checkCode("f(&S::operator=);"));
+        ASSERT_NO_THROW(checkCode("f(&S::operator=);\n"));
     }
     void garbageCode228() {
-        ASSERT_NO_THROW(checkCode("void f() { enum { A = [=]() mutable { return 0; }() }; }"));
-        ASSERT_NO_THROW(checkCode("enum { A = [=](void) mutable -> int { return 0; }() };"));
+        ASSERT_NO_THROW(checkCode("void f() { enum { A = [=]() mutable { return 0; }() }; }\n"));
+        ASSERT_NO_THROW(checkCode("enum { A = [=](void) mutable -> int { return 0; }() };\n"));
     }
     void garbageCode229() { // #14126
-        ASSERT_THROW_INTERNAL(checkCode("void f() {} [[maybe_unused]]"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f() {} [[unused]]"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {} [[maybe_unused]]\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {} [[unused]]\n"), SYNTAX);
+    }
+    void garbageCode230() { // #14432
+        ASSERT_THROW_INTERNAL(checkCode("e U U,i\n"), SYNTAX);
+    }
+    void garbageCode231() {
+        ASSERT_THROW_INTERNAL(checkCode("char char* [] = {\"a\" \"b\"}\n"), SYNTAX);
     }
 
 
     void syntaxErrorFirstToken() {
-        ASSERT_THROW_INTERNAL(checkCode("&operator(){[]};"), SYNTAX); // #7818
-        ASSERT_THROW_INTERNAL(checkCode("*(*const<> (size_t); foo) { } *(*const (size_t)() ; foo) { }"), SYNTAX); // #6858
-        ASSERT_THROW_INTERNAL(checkCode(">{ x while (y) z int = }"), SYNTAX); // #4175
-        ASSERT_THROW_INTERNAL(checkCode("&p(!{}e x){({(0?:?){({})}()})}"), SYNTAX); // #7118
-        ASSERT_THROW_INTERNAL(checkCode("<class T> { struct { typename D4:typename Base<T*> }; };"), SYNTAX); // #3533
+        ASSERT_THROW_INTERNAL(checkCode("&operator(){[]};\n"), SYNTAX); // #7818
+        ASSERT_THROW_INTERNAL(checkCode("*(*const<> (size_t); foo) { } *(*const (size_t)() ; foo) { }\n"), SYNTAX); // #6858
+        ASSERT_THROW_INTERNAL(checkCode(">{ x while (y) z int = }\n"), SYNTAX); // #4175
+        ASSERT_THROW_INTERNAL(checkCode("&p(!{}e x){({(0?:?){({})}()})}\n"), SYNTAX); // #7118
+        ASSERT_THROW_INTERNAL(checkCode("<class T> { struct { typename D4:typename Base<T*> }; };\n"), SYNTAX); // #3533
         ASSERT_THROW_INTERNAL(checkCode(" > template < . > struct Y < T > { = } ;\n"), SYNTAX); // #6108
     }
 
     void syntaxErrorLastToken() {
-        ASSERT_THROW_INTERNAL(checkCode("int *"), SYNTAX); // #7821
-        ASSERT_THROW_INTERNAL(checkCode("x[y]"), SYNTAX); // #2986
-        ASSERT_THROW_INTERNAL(checkCode("( ) &"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("|| #if #define <="), SYNTAX); // #2601
-        ASSERT_THROW_INTERNAL(checkCode("f::y:y : <x::"), SYNTAX); // #6613
-        ASSERT_THROW_INTERNAL(checkCode("a \"b\" not_eq \"c\""), SYNTAX); // #6720
-        ASSERT_THROW_INTERNAL(checkCode("(int arg2) { } { } typedef void (func_type) (int, int); typedef func_type&"), SYNTAX); // #6738
-        ASSERT_THROW_INTERNAL(checkCode("&g[0]; { (g[0] 0) } =", false), SYNTAX); // #6744
-        ASSERT_THROW_INTERNAL(checkCode("{ { void foo() { struct }; { }; } }; struct S { } f =", false), SYNTAX); // #6753
-        ASSERT_THROW_INTERNAL(checkCode("{ { ( ) } P ( ) ^ { } { } { } ( ) } 0"), SYNTAX); // #6772
-        ASSERT_THROW_INTERNAL(checkCode("+---+"), SYNTAX); // #6948
+        ASSERT_THROW_INTERNAL(checkCode("int *\n"), SYNTAX); // #7821
+        ASSERT_THROW_INTERNAL(checkCode("x[y]\n"), SYNTAX); // #2986
+        ASSERT_THROW_INTERNAL(checkCode("( ) &\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("|| #if #define <=\n"), SYNTAX); // #2601
+        ASSERT_THROW_INTERNAL(checkCode("f::y:y : <x::\n"), SYNTAX); // #6613
+        ASSERT_THROW_INTERNAL(checkCode("a \"b\" not_eq \"c\"\n"), SYNTAX); // #6720
+        ASSERT_THROW_INTERNAL(checkCode("(int arg2) { } { } typedef void (func_type) (int, int); typedef func_type&\n"), SYNTAX); // #6738
+        ASSERT_THROW_INTERNAL(checkCode("&g[0]; { (g[0] 0) } =\n", false), SYNTAX); // #6744
+        ASSERT_THROW_INTERNAL(checkCode("{ { void foo() { struct }; { }; } }; struct S { } f =\n", false), SYNTAX); // #6753
+        ASSERT_THROW_INTERNAL(checkCode("{ { ( ) } P ( ) ^ { } { } { } ( ) } 0\n"), SYNTAX); // #6772
+        ASSERT_THROW_INTERNAL(checkCode("+---+\n"), SYNTAX); // #6948
         ASSERT_THROW_INTERNAL(checkCode("template<>\n"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("++4++ +  + E++++++++++ + ch " "tp.oed5[.]"), SYNTAX); // #7074
-        ASSERT_THROW_INTERNAL(checkCode("d a(){f s=0()8[]s?():0}*()?:0", false), SYNTAX); // #7236
-        ASSERT_THROW_INTERNAL(checkCode("!2 : #h2 ?:", false), SYNTAX); // #7769
-        ASSERT_THROW_INTERNAL(checkCode("--"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("volatile true , test < test < #ifdef __ppc__ true ,"), SYNTAX); // #4169
+        ASSERT_THROW_INTERNAL(checkCode("++4++ +  + E++++++++++ + ch " "tp.oed5[.]\n"), SYNTAX); // #7074
+        ASSERT_THROW_INTERNAL(checkCode("d a(){f s=0()8[]s?():0}*()?:0\n", false), SYNTAX); // #7236
+        ASSERT_THROW_INTERNAL(checkCode("!2 : #h2 ?:\n", false), SYNTAX); // #7769
+        ASSERT_THROW_INTERNAL(checkCode("--\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("volatile true , test < test < #ifdef __ppc__ true ,\n"), SYNTAX); // #4169
         ASSERT_THROW_INTERNAL(checkCode("a,b--\n"), SYNTAX); // #2847
-        ASSERT_THROW_INTERNAL(checkCode("x a[0] ="), SYNTAX); // #2682
+        ASSERT_THROW_INTERNAL(checkCode("x a[0] =\n"), SYNTAX); // #2682
         ASSERT_THROW_INTERNAL(checkCode("auto_ptr<x>\n"), SYNTAX); // #2967
         ASSERT_THROW_INTERNAL(checkCode("char a[1]\n"), SYNTAX); // #2865
-        ASSERT_THROW_INTERNAL(checkCode("<><<"), SYNTAX); // #2612
-        ASSERT_THROW_INTERNAL(checkCode("z<y<x>"), SYNTAX); // #2831
-        ASSERT_THROW_INTERNAL(checkCode("><,f<i,"), SYNTAX); // #2835
-        ASSERT_THROW_INTERNAL(checkCode("0; (a) < (a)"), SYNTAX); // #2875
-        ASSERT_THROW_INTERNAL(checkCode(" ( * const ( size_t ) ; foo )"), SYNTAX); // #6135
-        ASSERT_THROW_INTERNAL(checkCode("({ (); strcat(strcat(() ()) ()) })"), SYNTAX); // #6686
-        ASSERT_THROW_INTERNAL(checkCode("%: return ; ()"), SYNTAX); // #3441
-        ASSERT_THROW_INTERNAL(checkCode("__attribute__((destructor)) void"), SYNTAX); // #7816
-        ASSERT_THROW_INTERNAL(checkCode("1 *p = const"), SYNTAX); // #3512
-        ASSERT_THROW_INTERNAL(checkCode("sizeof"), SYNTAX); // #2599
-        ASSERT_THROW_INTERNAL(checkCode(" enum struct"), SYNTAX); // #6718
-        ASSERT_THROW_INTERNAL(checkCode("{(){(())}}r&const"), SYNTAX); // #7321
-        ASSERT_THROW_INTERNAL(checkCode("int"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("<><<\n"), SYNTAX); // #2612
+        ASSERT_THROW_INTERNAL(checkCode("z<y<x>\n"), SYNTAX); // #2831
+        ASSERT_THROW_INTERNAL(checkCode("><,f<i,\n"), SYNTAX); // #2835
+        ASSERT_THROW_INTERNAL(checkCode("0; (a) < (a)\n"), SYNTAX); // #2875
+        ASSERT_THROW_INTERNAL(checkCode(" ( * const ( size_t ) ; foo )\n"), SYNTAX); // #6135
+        ASSERT_THROW_INTERNAL(checkCode("({ (); strcat(strcat(() ()) ()) })\n"), SYNTAX); // #6686
+        ASSERT_THROW_INTERNAL(checkCode("%: return ; ()\n"), SYNTAX); // #3441
+        ASSERT_THROW_INTERNAL(checkCode("__attribute__((destructor)) void\n"), SYNTAX); // #7816
+        ASSERT_THROW_INTERNAL(checkCode("1 *p = const\n"), SYNTAX); // #3512
+        ASSERT_THROW_INTERNAL(checkCode("sizeof\n"), SYNTAX); // #2599
+        ASSERT_THROW_INTERNAL(checkCode(" enum struct\n"), SYNTAX); // #6718
+        ASSERT_THROW_INTERNAL(checkCode("{(){(())}}r&const\n"), SYNTAX); // #7321
+        ASSERT_THROW_INTERNAL(checkCode("int\n"), SYNTAX);
         ASSERT_THROW_INTERNAL(checkCode("struct A :\n"), SYNTAX); // #2591
         ASSERT_THROW_INTERNAL(checkCode("{} const const\n"), SYNTAX); // #2637
-        ASSERT_THROW_INTERNAL(checkCode("re2c: error: line 14, column 4: can only difference char sets"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("re2c: error: line 14, column 4: can only difference char sets\n"), SYNTAX);
 
         // ASSERT_THROW(  , InternalError)
     }
 
     void syntaxErrorCase() {
         // case must be inside switch block
-        ASSERT_THROW_INTERNAL(checkCode("void f() { switch (a) {}; case 1: }"), SYNTAX); // #8184
-        ASSERT_THROW_INTERNAL(checkCode("struct V : { public case {} ; struct U : U  void { V *f (int x) (x) } }"), SYNTAX); // #5120
-        ASSERT_THROW_INTERNAL(checkCode("void f() { 0 0; }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f() { true 0; }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f() { 'a' 0; }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f() { 1 \"\"; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { switch (a) {}; case 1: }\n"), SYNTAX); // #8184
+        ASSERT_THROW_INTERNAL(checkCode("struct V : { public case {} ; struct U : U  void { V *f (int x) (x) } }\n"), SYNTAX); // #5120
+        ASSERT_THROW_INTERNAL(checkCode("void f() { 0 0; }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { true 0; }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { 'a' 0; }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { 1 \"\"; }\n"), SYNTAX);
     }
 
     void syntaxErrorFuzzerCliType1() {
-        ASSERT_THROW_INTERNAL(checkCode("void f(){x=0,return return''[]()}"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f(){x='0'++'0'(return)[];}"), SYNTAX); // #9063
-        (void)checkCode("void f(){*(int *)42=0;}"); // no syntax error
+        ASSERT_THROW_INTERNAL(checkCode("void f(){x=0,return return''[]()}\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f(){x='0'++'0'(return)[];}\n"), SYNTAX); // #9063
+        (void)checkCode("void f(){*(int *)42=0;}\n"); // no syntax error
         ignore_errout(); // we are not interested in the output
-        ASSERT_THROW_INTERNAL(checkCode("void f() { x= 'x' > typedef name5 | ( , ;){ } (); }"), SYNTAX); // #9067
-        ASSERT_THROW_INTERNAL(checkCode("void f() { x= {}( ) ( 'x')[ ] (); }"), SYNTAX); // #9068
-        ASSERT_THROW_INTERNAL(checkCode("void f() { x= y{ } name5 y[ ] + y ^ name5 ^ name5 for ( ( y y y && y y y && name5 ++ int )); }"), SYNTAX); // #9069
+        ASSERT_THROW_INTERNAL(checkCode("void f() { x= 'x' > typedef name5 | ( , ;){ } (); }\n"), SYNTAX); // #9067
+        ASSERT_THROW_INTERNAL(checkCode("void f() { x= {}( ) ( 'x')[ ] (); }\n"), SYNTAX); // #9068
+        ASSERT_THROW_INTERNAL(checkCode("void f() { x= y{ } name5 y[ ] + y ^ name5 ^ name5 for ( ( y y y && y y y && name5 ++ int )); }\n"), SYNTAX); // #9069
     }
 
     void cliCode() {
@@ -1852,12 +1862,12 @@ class TestGarbage : public TestFixture {
                             "bool GetDeviceInformation(String ^ port, LibCECConfiguration ^configuration, uint32_t timeoutMs) {\n"
                             "bool bReturn(false);\n"
                             "}\n"
-                            "};"));
+                            "};\n"));
         ignore_errout(); // we are not interested in the output
     }
 
     void enumTrailingComma() {
-        ASSERT_THROW_INTERNAL(checkCode("enum ssl_shutdown_t {ssl_shutdown_none = 0,ssl_shutdown_close_notify = , } ;"), SYNTAX); // #8079
+        ASSERT_THROW_INTERNAL(checkCode("enum ssl_shutdown_t {ssl_shutdown_none = 0,ssl_shutdown_close_notify = , } ;\n"), SYNTAX); // #8079
     }
 
     void nonGarbageCode1() {
@@ -1870,25 +1880,31 @@ class TestGarbage : public TestFixture {
                                   "template< class T >\n"
                                   "template< class Predicate > int\n"
                                   "List<T>::DeleteIf( const Predicate &pred )\n"
-                                  "{}"));
+                                  "{}\n"));
         ignore_errout(); // we are not interested in the output
 
         // #8749
         ASSERT_NO_THROW(checkCode(
                             "struct A {\n"
                             "    void operator+=(A&) && = delete;\n"
-                            "};"));
+                            "};\n"));
 
         // #8788
         ASSERT_NO_THROW(checkCode(
                             "struct foo;\n"
                             "void f() {\n"
                             "    auto fn = []() -> foo* { return new foo(); };\n"
-                            "}"));
+                            "}\n"));
         ignore_errout(); // we do not care about the output
 
         // #13892
-        ASSERT_NO_THROW(checkCode("void foovm(int x[const *]);"));
+        ASSERT_NO_THROW(checkCode("void foovm(int x[const *]);\n"));
+
+        // #14676
+        ASSERT_NO_THROW(checkCode("int main() {\n"
+                                  "    auto value = m[1 + qRow<>];\n"
+                                  "}\n"));
+        ignore_errout();
     }
 };
 
diff --git a/test/testimportproject.cpp b/test/testimportproject.cpp
index 5e6db0163c8..47d756db563 100644
--- a/test/testimportproject.cpp
+++ b/test/testimportproject.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,26 +18,31 @@
 
 #include "filesettings.h"
 #include "fixture.h"
+#include "helpers.h"
 #include "importproject.h"
 #include "redirect.h"
 #include "settings.h"
 #include "standards.h"
 #include "suppressions.h"
-#include "xml.h"
 
+#include <algorithm>
+#include <cstdlib>
 #include <list>
-#include <map>
 #include <sstream>
+#include <stdexcept>
 #include <string>
 #include <utility>
 #include <vector>
 
-class TestImporter : public ImportProject {
+class TestImporter final : public ImportProject {
 public:
-    using ImportProject::importCompileCommands;
+    using ImportProject::processCompileCommands;
     using ImportProject::importCppcheckGuiProject;
-    using ImportProject::importVcxproj;
-    using ImportProject::SharedItemsProject;
+    using ImportProject::collectArgs;
+    using ImportProject::fsSetDefines;
+    using ImportProject::fsSetIncludePaths;
+    using ImportProject::setRelativePaths;
+    using ImportProject::setProjectPath;
 };
 
 
@@ -52,52 +57,88 @@ class TestImportProject : public TestFixture {
         TEST_CASE(setIncludePaths1);
         TEST_CASE(setIncludePaths2);
         TEST_CASE(setIncludePaths3); // macro names are case insensitive
-        TEST_CASE(importCompileCommands1);
-        TEST_CASE(importCompileCommands2); // #8563, #9567
-        TEST_CASE(importCompileCommands3); // check with existing trailing / in directory
-        TEST_CASE(importCompileCommands4); // only accept certain file types
-        TEST_CASE(importCompileCommands5); // Windows/CMake/Ninja generated compile_commands.json
-        TEST_CASE(importCompileCommands6); // Windows/CMake/Ninja generated compile_commands.json with spaces
-        TEST_CASE(importCompileCommands7); // linux: "/home/danielm/cppcheck 2"
-        TEST_CASE(importCompileCommands8); // Windows: "C:\Users\danielm\cppcheck"
-        TEST_CASE(importCompileCommands9);
-        TEST_CASE(importCompileCommands10); // #10887: include path with space
-        TEST_CASE(importCompileCommands11); // include path order
-        TEST_CASE(importCompileCommands12); // #13040: "directory" is parent directory, relative include paths
-        TEST_CASE(importCompileCommands13); // #13333: duplicate file entries
-        TEST_CASE(importCompileCommands14); // #14156
-        TEST_CASE(importCompileCommands15); // #14306
-        TEST_CASE(importCompileCommandsArgumentsSection); // Handle arguments section
-        TEST_CASE(importCompileCommandsNoCommandSection); // gracefully handles malformed json
-        TEST_CASE(importCompileCommandsDirectoryMissing); // 'directory' field missing
-        TEST_CASE(importCompileCommandsDirectoryInvalid); // 'directory' field not a string
+        TEST_CASE(setIncludePathsUnknownMacro); // unknown macros expand to empty string
+        TEST_CASE(setIncludePathsRootRelative); // \foo takes the project directory's drive
+        TEST_CASE(setRelativePathsInclude); // #14746
+        TEST_CASE(processCompileCommands1);
+        TEST_CASE(processCompileCommands2); // #8563, #9567
+        TEST_CASE(processCompileCommands3); // check with existing trailing / in directory
+        TEST_CASE(processCompileCommands4); // only accept certain file types
+        TEST_CASE(processCompileCommands5); // Windows/CMake/Ninja generated compile_commands.json
+        TEST_CASE(processCompileCommands6); // Windows/CMake/Ninja generated compile_commands.json with spaces
+        TEST_CASE(processCompileCommands7); // linux: "/home/danielm/cppcheck 2"
+        TEST_CASE(processCompileCommands8); // Windows: "C:\Users\danielm\cppcheck"
+        TEST_CASE(processCompileCommands9);
+        TEST_CASE(processCompileCommands10); // #10887: include path with space
+        TEST_CASE(processCompileCommands11); // include path order
+        TEST_CASE(processCompileCommands12); // #13040: "directory" is parent directory, relative include paths
+        TEST_CASE(processCompileCommands13); // #13333: duplicate file entries
+        TEST_CASE(processCompileCommands14); // #14156
+        TEST_CASE(processCompileCommands15); // #14306
+        TEST_CASE(processCompileCommandsForcedInclude); // -include / /FI force-include
+        TEST_CASE(processCompileCommandsArgumentsSection); // Handle arguments section
+        TEST_CASE(processCompileCommandsNoCommandSection); // gracefully handles malformed json
+        TEST_CASE(processCompileCommandsDirectoryMissing); // 'directory' field missing
+        TEST_CASE(processCompileCommandsDirectoryInvalid); // 'directory' field not a string
         TEST_CASE(importCppcheckGuiProject);
+        TEST_CASE(importCppcheckGuiProjectDuplicateSuppressions);
         TEST_CASE(importCppcheckGuiProjectPremiumMisra);
+        TEST_CASE(importCppcheckGuiProjectAbsPath);    // absolute Unix path must not be prepended with mPath
+        TEST_CASE(importCppcheckGuiProjectRelPathWithBase); // relative path must be prepended with mPath
         TEST_CASE(ignorePaths);
-        TEST_CASE(testVcxprojUnicode);
+        TEST_CASE(testCollectArgs1);
+        TEST_CASE(testCollectArgs2);
+        TEST_CASE(testCollectArgs3);
+        TEST_CASE(testCollectArgs4);
+        TEST_CASE(testCollectArgs5);
+        TEST_CASE(testCollectArgs6);
+        TEST_CASE(testCollectArgs7);
+        TEST_CASE(testVcxprojConditions);
+        TEST_CASE(testVcxprojConditionEqualityIsNotVersionComparison);
+        TEST_CASE(testPropertyNameAllowsHyphen);
+        TEST_CASE(testMSBuildStaticFunctions);
+        TEST_CASE(testVcxitemsPathResolution);
+        TEST_CASE(testMissingChildImportNonFatal); // missing child imports must not abort the project
+        TEST_CASE(testCurrentToolsVersionFromProps); // "Current" keyword uses VisualStudioVersion property
+        TEST_CASE(testMetadataSelfReferenceCaseInsensitive);
     }
 
     void setDefines() const {
         FileSettings fs{"test.cpp", Standards::Language::CPP, 0};
 
-        ImportProject::fsSetDefines(fs, "A");
+        TestImporter::fsSetDefines(fs, "A");
         ASSERT_EQUALS("A=1", fs.defines);
 
-        ImportProject::fsSetDefines(fs, "A;B;");
+        TestImporter::fsSetDefines(fs, "A;B;");
         ASSERT_EQUALS("A=1;B=1", fs.defines);
 
-        ImportProject::fsSetDefines(fs, "A;;B;");
+        TestImporter::fsSetDefines(fs, "A;;B;");
         ASSERT_EQUALS("A=1;B=1", fs.defines);
 
-        ImportProject::fsSetDefines(fs, "A;;B");
+        TestImporter::fsSetDefines(fs, "A;;B");
+        ASSERT_EQUALS("A=1;B=1", fs.defines);
+
+        // M-2: %(metadata) tokens at the start of the string must be stripped
+        TestImporter::fsSetDefines(fs, "%(PreprocessorDefinitions)");
+        ASSERT_EQUALS("", fs.defines);
+
+        TestImporter::fsSetDefines(fs, "%(PreprocessorDefinitions);A");
+        ASSERT_EQUALS("A=1", fs.defines);
+
+        TestImporter::fsSetDefines(fs, "%(PreprocessorDefinitions);A;B");
+        ASSERT_EQUALS("A=1;B=1", fs.defines);
+
+        // Leading %(…) followed by a mid-string %(…) — both must be stripped
+        TestImporter::fsSetDefines(fs, "%(PreprocessorDefinitions);A;%(OtherMeta);B");
         ASSERT_EQUALS("A=1;B=1", fs.defines);
     }
 
     void setIncludePaths1() const {
         FileSettings fs{"test.cpp", Standards::Language::CPP, 0};
         std::list<std::string> in(1, "../include");
-        std::map<std::string, std::string, cppcheck::stricmp> variables;
-        ImportProject::fsSetIncludePaths(fs, "abc/def/", in, variables);
+        PropertiesMap properties;
+        TestImporter importer;
+        importer.fsSetIncludePaths(fs, "abc/def/", in, properties);
         ASSERT_EQUALS(1U, fs.includePaths.size());
         ASSERT_EQUALS("abc/include/", fs.includePaths.front());
     }
@@ -105,9 +146,10 @@ class TestImportProject : public TestFixture {
     void setIncludePaths2() const {
         FileSettings fs{"test.cpp", Standards::Language::CPP, 0};
         std::list<std::string> in(1, "$(SolutionDir)other");
-        std::map<std::string, std::string, cppcheck::stricmp> variables;
-        variables["SolutionDir"] = "c:/abc/";
-        ImportProject::fsSetIncludePaths(fs, "/home/fred", in, variables);
+        PropertiesMap properties;
+        properties["SolutionDir"] = "c:/abc/";
+        TestImporter importer;
+        importer.fsSetIncludePaths(fs, "/home/fred", in, properties);
         ASSERT_EQUALS(1U, fs.includePaths.size());
         ASSERT_EQUALS("c:/abc/other/", fs.includePaths.front());
     }
@@ -115,14 +157,69 @@ class TestImportProject : public TestFixture {
     void setIncludePaths3() const { // macro names are case insensitive
         FileSettings fs{"test.cpp", Standards::Language::CPP, 0};
         std::list<std::string> in(1, "$(SOLUTIONDIR)other");
-        std::map<std::string, std::string, cppcheck::stricmp> variables;
-        variables["SolutionDir"] = "c:/abc/";
-        ImportProject::fsSetIncludePaths(fs, "/home/fred", in, variables);
+        PropertiesMap properties;
+        properties["SolutionDir"] = "c:/abc/";
+        TestImporter importer;
+        importer.fsSetIncludePaths(fs, "/home/fred", in, properties);
         ASSERT_EQUALS(1U, fs.includePaths.size());
         ASSERT_EQUALS("c:/abc/other/", fs.includePaths.front());
     }
 
-    void importCompileCommands1() const {
+    void setIncludePathsUnknownMacro() const {
+        // MSBuild/Visual Studio expand an undefined property to the empty string.
+        FileSettings fs{"test.cpp", Standards::Language::CPP, 0};
+        std::list<std::string> in;
+        in.emplace_back("$(UnknownMacro)include");               // -> relative to project dir
+        in.emplace_back("$(SolutionDir)$(UnknownMacro)other");   // -> known part kept
+        in.emplace_back("$(UnknownMacro)");                      // -> dropped
+        in.emplace_back("$(UnknownMacro)\\abs\\dir");            // -> root-relative
+        in.emplace_back("$(Unknown1)$(Unknown2)include");        // duplicate after expansion
+        PropertiesMap properties;
+        properties["SolutionDir"] = "c:/abc/";
+        TestImporter importer;
+        importer.fsSetIncludePaths(fs, "/home/fred/", in, properties);
+        ASSERT_EQUALS(3U, fs.includePaths.size());
+        auto it = fs.includePaths.cbegin();
+        ASSERT_EQUALS("/home/fred/include/", *it++);
+        ASSERT_EQUALS("c:/abc/other/", *it++);
+        ASSERT_EQUALS("/abs/dir/", *it);
+        for (const std::string &p : fs.includePaths)
+            ASSERT(p.find("$(") == std::string::npos);
+    }
+
+    void setIncludePathsRootRelative() const {
+        FileSettings fs{"test.cpp", Standards::Language::CPP, 0};
+        std::list<std::string> in;
+        in.emplace_back("\\inc");                       // root-relative -> project drive
+        in.emplace_back("$(UnknownMacro)\\abs\\dir");   // root-relative after expansion
+        in.emplace_back("D:\\other\\..\\lib");          // drive-absolute, simplified
+        in.emplace_back("\\\\server\\share\\inc");      // UNC kept
+        in.emplace_back("sub\\");                       // relative -> project dir
+        PropertiesMap properties;
+        TestImporter importer;
+        importer.fsSetIncludePaths(fs, "C:/proj/", in, properties);
+        ASSERT_EQUALS(5U, fs.includePaths.size());
+        auto it = fs.includePaths.cbegin();
+        ASSERT_EQUALS("C:/inc/", *it++);
+        ASSERT_EQUALS("C:/abs/dir/", *it++);
+        ASSERT_EQUALS("D:/lib/", *it++);
+        ASSERT_EQUALS("//server/share/inc/", *it++);
+        ASSERT_EQUALS("C:/proj/sub/", *it);
+    }
+
+    void setRelativePathsInclude() const {
+        const std::string cwd = Path::fromNativeSeparators(Path::getCurrentPath());
+        TestImporter importer;
+        FileSettings fs{cwd + "/sub/a.c", Standards::Language::C, 0};
+        fs.includePaths.push_back(cwd + "/");
+        importer.fileSettings.push_back(fs);
+        importer.setRelativePaths("compile_commands.json");
+        fs = importer.fileSettings.front();
+        ASSERT_EQUALS(".", fs.includePaths.front());
+        ASSERT_EQUALS("sub/a.c", fs.filename());
+    }
+
+    void processCompileCommands1() const {
         REDIRECT;
         constexpr char json[] = R"([{
                                    "directory": "/tmp",
@@ -131,12 +228,12 @@ class TestImportProject : public TestFixture {
                                    }])";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
         ASSERT_EQUALS("TEST1=1;TEST2=2", importer.fileSettings.cbegin()->defines);
     }
 
-    void importCompileCommands2() const {
+    void processCompileCommands2() const {
         REDIRECT;
         // Absolute file path
 #ifdef _WIN32
@@ -147,7 +244,7 @@ class TestImportProject : public TestFixture {
                                }])";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
         ASSERT_EQUALS("C:/bar.c", importer.fileSettings.cbegin()->filename());
 #else
@@ -158,13 +255,13 @@ class TestImportProject : public TestFixture {
                                    }])";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
         ASSERT_EQUALS("/bar.c", importer.fileSettings.cbegin()->filename());
 #endif
     }
 
-    void importCompileCommands3() const {
+    void processCompileCommands3() const {
         REDIRECT;
         const char json[] = R"([{
                                     "directory": "/tmp/",
@@ -173,12 +270,12 @@ class TestImportProject : public TestFixture {
                                }])";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
         ASSERT_EQUALS("/tmp/src.c", importer.fileSettings.cbegin()->filename());
     }
 
-    void importCompileCommands4() const {
+    void processCompileCommands4() const {
         REDIRECT;
         constexpr char json[] = R"([{
                                     "directory": "/tmp/",
@@ -187,11 +284,11 @@ class TestImportProject : public TestFixture {
                                    }])";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
         ASSERT_EQUALS(0, importer.fileSettings.size());
     }
 
-    void importCompileCommands5() const {
+    void processCompileCommands5() const {
         REDIRECT;
         constexpr char json[] =
             R"([{
@@ -206,12 +303,12 @@ class TestImportProject : public TestFixture {
              }])";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
         ASSERT_EQUALS(2, importer.fileSettings.size());
         ASSERT_EQUALS("C:/Users/dan/git/test-cppcheck/mylib/src/", importer.fileSettings.cbegin()->includePaths.front());
     }
 
-    void importCompileCommands6() const {
+    void processCompileCommands6() const {
         REDIRECT;
         constexpr char json[] =
             R"([{
@@ -226,14 +323,14 @@ class TestImportProject : public TestFixture {
              }])";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
         ASSERT_EQUALS(2, importer.fileSettings.size());
         ASSERT_EQUALS("C:/Users/dan/git/test-cppcheck/mylib/src/", importer.fileSettings.cbegin()->includePaths.front());
         ASSERT_EQUALS("C:/Users/dan/git/test-cppcheck/mylib/second src/", importer.fileSettings.cbegin()->includePaths.back());
     }
 
 
-    void importCompileCommands7() const {
+    void processCompileCommands7() const {
         REDIRECT;
         // cmake -DFILESDIR="/some/path" ..
         constexpr char json[] =
@@ -244,7 +341,7 @@ class TestImportProject : public TestFixture {
             }])";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
         ASSERT_EQUALS("FILESDIR=\"/some/path\"", importer.fileSettings.cbegin()->defines);
         ASSERT_EQUALS(1, importer.fileSettings.cbegin()->includePaths.size());
@@ -254,7 +351,7 @@ class TestImportProject : public TestFixture {
                            importer.fileSettings.cbegin()->includePaths.back());
     }
 
-    void importCompileCommands8() const {
+    void processCompileCommands8() const {
         REDIRECT;
         // cmake -DFILESDIR="C:\Program Files\Cppcheck" -G"NMake Makefiles" ..
         constexpr char json[] =
@@ -265,10 +362,10 @@ class TestImportProject : public TestFixture {
             }])";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr)); // Do not crash
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr)); // Do not crash
     }
 
-    void importCompileCommands9() const {
+    void processCompileCommands9() const {
         REDIRECT;
         // IAR output (https://sourceforge.net/p/cppcheck/discussion/general/thread/608af51e0a/)
         constexpr char json[] =
@@ -282,10 +379,10 @@ class TestImportProject : public TestFixture {
             }])";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
     }
 
-    void importCompileCommands10() const { // #10887
+    void processCompileCommands10() const { // #10887
         REDIRECT;
         constexpr char json[] =
             R"([{
@@ -299,13 +396,13 @@ class TestImportProject : public TestFixture {
             }])";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
         const FileSettings &fs = importer.fileSettings.front();
         ASSERT_EQUALS("/home/danielm/cppcheck/test folder/", fs.includePaths.front());
     }
 
-    void importCompileCommands11() const { // include path order
+    void processCompileCommands11() const { // include path order
         REDIRECT;
         constexpr char json[] =
             R"([{
@@ -321,14 +418,14 @@ class TestImportProject : public TestFixture {
             }])";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
         const FileSettings &fs = importer.fileSettings.front();
         ASSERT_EQUALS("/x/def/", fs.includePaths.front());
         ASSERT_EQUALS("/x/abc/", fs.includePaths.back());
     }
 
-    void importCompileCommands12() const { // #13040
+    void processCompileCommands12() const { // #13040
         REDIRECT;
         constexpr char json[] =
             R"([{
@@ -338,14 +435,14 @@ class TestImportProject : public TestFixture {
             }])";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
         const FileSettings &fs = importer.fileSettings.front();
         ASSERT_EQUALS(1, fs.includePaths.size());
         ASSERT_EQUALS("/x/", fs.includePaths.front());
     }
 
-    void importCompileCommands13() const { // #13333
+    void processCompileCommands13() const { // #13333
         REDIRECT;
         constexpr char json[] =
             R"([{
@@ -359,15 +456,15 @@ class TestImportProject : public TestFixture {
             }])";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
         ASSERT_EQUALS(2, importer.fileSettings.size());
         const FileSettings &fs1 = importer.fileSettings.front();
         const FileSettings &fs2 = importer.fileSettings.back();
-        ASSERT_EQUALS(0, fs1.fileIndex);
-        ASSERT_EQUALS(1, fs2.fileIndex);
+        ASSERT_EQUALS(0, fs1.file.fsFileId());
+        ASSERT_EQUALS(1, fs2.file.fsFileId());
     }
 
-    void importCompileCommands14() const { // #14156
+    void processCompileCommands14() const { // #14156
         REDIRECT;
         constexpr char json[] =
             R"([{
@@ -384,13 +481,13 @@ class TestImportProject : public TestFixture {
             }])";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
         const FileSettings &fs = importer.fileSettings.front();
         ASSERT_EQUALS("TFS_LINUX_MODULE_NAME=\"tfs_linux\"", fs.defines);
     }
 
-    void importCompileCommands15() const { // #14306
+    void processCompileCommands15() const { // #14306
         REDIRECT;
         constexpr char json[] =
             R"([
@@ -403,55 +500,73 @@ class TestImportProject : public TestFixture {
                ])";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
         const FileSettings &fs = importer.fileSettings.front();
         ASSERT_EQUALS(1, fs.includePaths.size());
         ASSERT_EQUALS("C:/Users/abcd/efg/hijk/path/123/", fs.includePaths.front());
     }
 
-    void importCompileCommandsArgumentsSection() const {
+    void processCompileCommandsForcedInclude() const { // -include / /FI force-include
+        REDIRECT;
+        constexpr char json[] =
+            R"([{
+               "file": "/x/a.c",
+               "directory": "/x",
+               "command": "cc -include prefix.h /FIplatform.h -c a.c"
+            }])";
+        std::istringstream istr(json);
+        TestImporter importer;
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
+        ASSERT_EQUALS(1, importer.fileSettings.size());
+        const FileSettings &fs = importer.fileSettings.front();
+        ASSERT_EQUALS(2, fs.forcedIncludes.size());
+        ASSERT_EQUALS("prefix.h", fs.forcedIncludes.front()); // gcc/clang -include
+        ASSERT_EQUALS("platform.h", fs.forcedIncludes.back()); // MSVC/clang-cl /FI
+    }
+
+    void processCompileCommandsArgumentsSection() const {
         REDIRECT;
         constexpr char json[] = "[ { \"directory\": \"/tmp/\","
                                 "\"arguments\": [\"gcc\", \"-c\", \"src.c\"],"
                                 "\"file\": \"src.c\" } ]";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(true, importer.processCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
         ASSERT_EQUALS("/tmp/src.c", importer.fileSettings.cbegin()->filename());
     }
 
-    void importCompileCommandsNoCommandSection() const {
+    void processCompileCommandsNoCommandSection() const {
         REDIRECT;
         constexpr char json[] = "[ { \"directory\": \"/tmp/\","
                                 "\"file\": \"src.mm\" } ]";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(false, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(false, importer.processCompileCommands(istr));
         ASSERT_EQUALS(0, importer.fileSettings.size());
         ASSERT_EQUALS(1, importer.errors.size());
         ASSERT_EQUALS("no 'arguments' or 'command' field found in compilation database entry", importer.errors[0]);
     }
 
-    void importCompileCommandsDirectoryMissing() const {
+    void processCompileCommandsDirectoryMissing() const {
         REDIRECT;
         constexpr char json[] = "[ { \"file\": \"src.mm\" } ]";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(false, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(false, importer.processCompileCommands(istr));
         ASSERT_EQUALS(0, importer.fileSettings.size());
         ASSERT_EQUALS(1, importer.errors.size());
         ASSERT_EQUALS("'directory' field in compilation database entry missing", importer.errors[0]);
     }
 
-    void importCompileCommandsDirectoryInvalid() const {
+    void processCompileCommandsDirectoryInvalid() const {
         REDIRECT;
         constexpr char json[] = "[ { \"directory\": 123,"
                                 "\"file\": \"src.mm\" } ]";
         std::istringstream istr(json);
         TestImporter importer;
-        ASSERT_EQUALS(false, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(false, importer.processCompileCommands(istr));
         ASSERT_EQUALS(0, importer.fileSettings.size());
         ASSERT_EQUALS(1, importer.errors.size());
         ASSERT_EQUALS("'directory' field in compilation database entry is not a string", importer.errors[0]);
@@ -470,6 +585,7 @@ class TestImportProject : public TestFixture {
                                "    <paths>\n"
                                "        <dir name=\"cli/\"/>\n"
                                "    </paths>\n"
+                               "    <user-include>gcc-macros.h</user-include>\n"
                                "    <exclude>\n"
                                "        <path name=\"gui/temp/\"/>\n"
                                "    </exclude>\n"
@@ -485,9 +601,31 @@ class TestImportProject : public TestFixture {
         ASSERT_EQUALS("cli/", project.guiProject.pathNames[0]);
         ASSERT_EQUALS(1, s.includePaths.size());
         ASSERT_EQUALS("lib/", s.includePaths.front());
+        ASSERT_EQUALS(1, s.userIncludes.size());
+        ASSERT_EQUALS("gcc-macros.h", s.userIncludes.front());
         ASSERT_EQUALS(true, s.inlineSuppressions);
     }
 
+    void importCppcheckGuiProjectDuplicateSuppressions() const {
+        REDIRECT;
+        constexpr char xml[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                               "<project version=\"1\">\n"
+                               "    <root name=\".\"/>\n"
+                               "    <project-name>test test</project-name>\n"
+                               "    <suppressions>\n"
+                               "        <suppression>uninitvar</suppression>\n"
+                               "        <suppression>uninitvar</suppression>\n"
+                               "    </suppressions>\n"
+                               "</project>\n";
+        std::istringstream istr(xml);
+        Settings s;
+        Suppressions supprs;
+        TestImporter project;
+        ASSERT_EQUALS(false, project.importCppcheckGuiProject(istr, s, supprs));
+        ASSERT_EQUALS(1, project.errors.size());
+        ASSERT_EQUALS("suppression 'uninitvar' already exists", project.errors[0]);
+    }
+
     void importCppcheckGuiProjectPremiumMisra() const {
         REDIRECT;
         constexpr char xml[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@ -509,6 +647,51 @@ class TestImportProject : public TestFixture {
         ASSERT(s.addons.empty());
     }
 
+    void importCppcheckGuiProjectAbsPath() const {
+        // Regression test: absolute Unix paths in <paths> must not be prepended with the
+        // project directory (mPath).  Before the fix, joinRelativePath() classified "/foo"
+        // as RootRelative (no drive letter) and prepended mPath, yielding "/proj//foo".
+        REDIRECT;
+        constexpr char xml[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                               "<project version=\"1\">\n"
+                               "    <paths>\n"
+                               "        <dir name=\"/abs/path/file.cpp\"/>\n"
+                               "    </paths>\n"
+                               "</project>\n";
+        std::istringstream istr(xml);
+        Settings s;
+        Suppressions supprs;
+        TestImporter project;
+        project.setProjectPath("/project/dir/");
+        ASSERT_EQUALS(true, project.importCppcheckGuiProject(istr, s, supprs));
+        ASSERT_EQUALS(1, project.guiProject.pathNames.size());
+        ASSERT_EQUALS("/abs/path/file.cpp", project.guiProject.pathNames[0]);
+    }
+
+    void importCppcheckGuiProjectRelPathWithBase() const {
+        // Relative paths in <paths> must be prepended with the project directory (mPath),
+        // matching MSBuild/GUI behaviour where relative entries are project-dir-relative.
+        // Also covers the mixed-CWD scenario: when --project=../foo.cppcheck is used,
+        // mPath is "../", so a relative entry like "src/a.cpp" becomes "../src/a.cpp".
+        REDIRECT;
+        constexpr char xml[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                               "<project version=\"1\">\n"
+                               "    <paths>\n"
+                               "        <dir name=\"/abs/file.cpp\"/>\n"
+                               "        <dir name=\"src/rel.cpp\"/>\n"
+                               "    </paths>\n"
+                               "</project>\n";
+        std::istringstream istr(xml);
+        Settings s;
+        Suppressions supprs;
+        TestImporter project;
+        project.setProjectPath("../");
+        ASSERT_EQUALS(true, project.importCppcheckGuiProject(istr, s, supprs));
+        ASSERT_EQUALS(2, project.guiProject.pathNames.size());
+        ASSERT_EQUALS("/abs/file.cpp", project.guiProject.pathNames[0]);
+        ASSERT_EQUALS("../src/rel.cpp", project.guiProject.pathNames[1]);
+    }
+
     void ignorePaths() const {
         FileSettings fs1{"foo/bar", Standards::Language::CPP, 0};
         FileSettings fs2{"qwe/rty", Standards::Language::CPP, 0};
@@ -526,81 +709,847 @@ class TestImportProject : public TestFixture {
         ASSERT_EQUALS(0, project.fileSettings.size());
     }
 
-    void testVcxprojUnicode() const
+    void testCollectArgs1() const
     {
-        const char vcxproj[] = R"-(
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <!-- Only to test that the last configuration entry overwrites this -->
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
-    <UseOfMfc>Static</UseOfMfc>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-  </ItemGroup>
-</Project>
-)-";
-        tinyxml2::XMLDocument doc;
-        ASSERT_EQUALS(tinyxml2::XML_SUCCESS, doc.Parse(vcxproj, sizeof(vcxproj)));
-        TestImporter project;
-        std::map<std::string, std::string, cppcheck::stricmp> variables;
-        std::vector<TestImporter::SharedItemsProject> cache;
-        ASSERT_EQUALS(project.importVcxproj("test.vcxproj", doc, variables, {}, {}, cache), true);
-        ASSERT_EQUALS(project.fileSettings.size(), 2);
-        ASSERT(project.fileSettings.front().defines.find(";UNICODE=1;") != std::string::npos);
-        ASSERT(project.fileSettings.front().defines.find(";_UNICODE=1") != std::string::npos);
-        ASSERT(project.fileSettings.front().defines.find(";_UNICODE=1;") == std::string::npos); // No duplicates
-        ASSERT_EQUALS(project.fileSettings.front().useMfc, false);
-        ASSERT(project.fileSettings.back().defines.find(";UNICODE=1;") == std::string::npos);
-        ASSERT(project.fileSettings.back().defines.find(";_UNICODE=1") == std::string::npos);
-        ASSERT_EQUALS(project.fileSettings.back().useMfc, true);
+        std::vector<std::string> args;
+        const std::string cmd = "  gcc -o main main.c  ";
+        const std::string error = TestImporter::collectArgs(cmd, args);
+
+        ASSERT_EQUALS("", error);
+        ASSERT_EQUALS(4, args.size());
+        ASSERT_EQUALS("gcc", args[0]);
+        ASSERT_EQUALS("-o", args[1]);
+        ASSERT_EQUALS("main", args[2]);
+        ASSERT_EQUALS("main.c", args[3]);
+    }
+
+    void testCollectArgs2() const
+    {
+        std::vector<std::string> args;
+        const std::string cmd = "gcc -o main \"directory with space\"/main.c";
+        const std::string error = TestImporter::collectArgs(cmd, args);
+
+        ASSERT_EQUALS("", error);
+        ASSERT_EQUALS(4, args.size());
+        ASSERT_EQUALS("gcc", args[0]);
+        ASSERT_EQUALS("-o", args[1]);
+        ASSERT_EQUALS("main", args[2]);
+        ASSERT_EQUALS("directory with space/main.c", args[3]);
+    }
+
+    void testCollectArgs3() const
+    {
+        std::vector<std::string> args;
+        const std::string cmd = "gcc -o main directory\\ with\\ space/main.c";
+        const std::string error = TestImporter::collectArgs(cmd, args);
+
+        ASSERT_EQUALS("", error);
+        ASSERT_EQUALS(4, args.size());
+        ASSERT_EQUALS("gcc", args[0]);
+        ASSERT_EQUALS("-o", args[1]);
+        ASSERT_EQUALS("main", args[2]);
+        ASSERT_EQUALS("directory with space/main.c", args[3]);
+    }
+
+    void testCollectArgs4() const
+    {
+        std::vector<std::string> args;
+        const std::string cmd = "gcc -o main \'directory with space\'/main.c";
+        const std::string error = TestImporter::collectArgs(cmd, args);
+
+        ASSERT_EQUALS("", error);
+        ASSERT_EQUALS(4, args.size());
+        ASSERT_EQUALS("gcc", args[0]);
+        ASSERT_EQUALS("-o", args[1]);
+        ASSERT_EQUALS("main", args[2]);
+        ASSERT_EQUALS("directory with space/main.c", args[3]);
+    }
+
+    void testCollectArgs5() const
+    {
+        std::vector<std::string> args;
+        const std::string cmd = "gcc -o main directory_with_quote\\\"/main.c";
+        const std::string error = TestImporter::collectArgs(cmd, args);
+
+        ASSERT_EQUALS("", error);
+        ASSERT_EQUALS(4, args.size());
+        ASSERT_EQUALS("gcc", args[0]);
+        ASSERT_EQUALS("-o", args[1]);
+        ASSERT_EQUALS("main", args[2]);
+        ASSERT_EQUALS("directory_with_quote\"/main.c", args[3]);
+    }
+
+    void testCollectArgs6() const
+    {
+        std::vector<std::string> args;
+        const std::string cmd = "gcc -o main windows\\\\path\\\\main.c";
+        const std::string error = TestImporter::collectArgs(cmd, args);
+
+        ASSERT_EQUALS("", error);
+        ASSERT_EQUALS(4, args.size());
+        ASSERT_EQUALS("gcc", args[0]);
+        ASSERT_EQUALS("-o", args[1]);
+        ASSERT_EQUALS("main", args[2]);
+        ASSERT_EQUALS("windows\\path\\main.c", args[3]);
+    }
+
+    void testCollectArgs7() const
+    {
+        std::vector<std::string> args;
+        const std::string cmd = "gcc -o main \"non-terminated-quote/main.c";
+        const std::string error = TestImporter::collectArgs(cmd, args);
+
+        ASSERT_EQUALS("Missing closing quote in command string", error);
+    }
+
+    void testVcxprojConditions() const
+    {
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'$(Configuration)'=='Debug'", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'$(Platform)'=='Win32'", "Debug", "Win32"));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'$(Configuration)'=='Release'", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" '$(Configuration)' == 'Debug' ", "Debug", "Win32"));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition(" '$(Configuration)' != 'Debug' ", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'$(Configuration)|$(Platform)' == 'Debug|Win32' ", "Debug", "Win32"));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("!('$(Configuration)|$(Platform)' == 'Debug|Win32' )", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" '$(Configuration)' == 'Debug' And '$(Platform)' == 'Win32'", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" '$(Configuration)' == 'Debug' Or '$(Platform)' == 'Win32'", "Release", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" $(Configuration.StartsWith('Debug'))", "Debug-AddressSanitizer", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" $(Configuration.ToUpper().StartsWith('DEBUG'))", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" $(Configuration.EndsWith('AddressSanitizer'))", "Debug-AddressSanitizer", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" $(Configuration.Contains('Address'))", "Debug-AddressSanitizer", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" $(Configuration.Contains ( 'Address'  ) )", "Debug-AddressSanitizer", "Win32"));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition(" $(Configuration.StartsWith('Release'))", "Debug-AddressSanitizer", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" $(Platform.Contains('32'))", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" $(Configuration.Contains('Address')) And '$(Platform)' == 'Win32'", "Debug-AddressSanitizer", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" ($(Configuration.Contains('Address')) ) And ( '$(Platform)' == 'Win32')", "Debug-AddressSanitizer", "Win32"));
+        // Relational operators - integer
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'14' >= '14'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'15' > '14'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'13' > '14'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'13' < '14'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'15' < '14'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'13' <= '14'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'14' <= '14'", "", ""));
+        // Relational operators - version
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'14.0' >= '14.0'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'14.1' >= '14.0'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'13.0' >= '14.0'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'1.10.0.0' > '1.9.0.0'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'v14.0' >= '14.0'", "", ""));
+        // Version comparison: full 4-part #.#.#.#
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'1.2.3.4' == '1.2.3.4'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'1.2.3.4' == '1.2.3.5'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'1.2.3.5' > '1.2.3.4'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'1.2.3.4' < '1.2.3.5'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'2.0.0.0' > '1.9.9.9'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'1.9.9.9' > '2.0.0.0'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'1.2.3.4' >= '1.2.3.4'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'1.2.3.4' <= '1.2.3.4'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'1.2.3.4' > '1.2.3.4'", "", ""));
+        // Version comparison: more than 4 parts (no truncation)
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'1.2.3.4.5' > '1.2.3.4.4'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'1.2.3.4.4' > '1.2.3.4.5'", "", ""));
+        // == and != are NOT relational operators: real MSBuild documents them
+        // as ordinary equality/inequality (numeric if both sides are plain
+        // numbers, case-insensitive string otherwise), never the zero-padded,
+        // component-wise equality $([MSBuild]::VersionEquals(...)) implements
+        // (see testMSBuildStaticFunctions() for that function's own,
+        // deliberately different, semantics). '1.2.3.4.0' and '1.2.3.4' are
+        // different strings and neither parses as a plain number, so == and
+        // != see them as unequal -- even though relationally (see
+        // '17'/'17.0.0.0' below) MSBuildVersion's own comparator would treat
+        // a shorter version as simply less than a longer one, not equal to it
+        // either.
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'1.2.3.4.0' == '1.2.3.4'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'1.2.3.4.0' != '1.2.3.4'", "", ""));
+        // Relational operators (<, >, <=, >=) DO use MSBuildVersion's
+        // comparator, which treats a version's omitted trailing components as
+        // -1 (see MSBuildVersion::cmp()'s doc comment) -- so a shorter
+        // version string sorts strictly before a longer one, '17' < '17.0.0.0',
+        // rather than comparing equal to it under either == or a relational op.
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'17' == '17.0.0.0'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'17' != '17.0.0.0'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'17' >= '17.0.0.0'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'17' <= '17.0.0.0'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'17' > '17.0.0.0'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'17' < '17.0.0.0'", "", ""));
+        // Same reasoning as '17'/'17.0.0.0' above: == is plain (numeric- or
+        // string-, never version-) comparison, so none of these are equal --
+        // '17.0', '17.0.0.0' and '17.0.0' are all different strings from each
+        // other and from '17', and none of them parses as a plain integer
+        // (they contain '.').
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'17.0' == '17'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'17.0' == '17.0.0.0'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'17.0.0' == '17'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'17.1' > '17.0.0.0'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'16.9' > '17'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'1' < '1.0.0.1'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'1.2.3' < '1.2.3.1'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'1.2.3' > '1.2.2.9'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'2' > '1.9.9.9'", "", ""));
+        // 'Current' on LHS
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'Current' > '14'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'Current' >= '18'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'Current' < '14'", "", ""));
+        // 'Current' on RHS
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'14' < 'Current'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'18' <= 'Current'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'19' < 'Current'", "", ""));
+        // Static property functions in conditions
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$([MSBuild]::Add(1, 2)) == '3'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$([MSBuild]::EnsureTrailingSlash('foo')) == 'foo/'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$([System.String]::IsNullOrEmpty('')) == 'True'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$([System.Math]::Max(1, 2)) == '2'", "", ""));
+        // Unknown variable
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'$(DoesNotExist)' == ''", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'$(PATH)' != ''", "", ""));
+        // Relational operators - error case
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("'14.0' >= ''", "", ""), std::runtime_error, "Cannot compare '14.0' and ''");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("And", "", ""), std::runtime_error, "Invalid condition: 'And'");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("Or", "", ""), std::runtime_error, "Invalid condition: 'Or'");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("!", "", ""), std::runtime_error, "Invalid condition: '!'");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("'' == '' And ", "", ""), std::runtime_error, "Missing operator");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("('' == ''", "", ""), std::runtime_error, "'(' without closing ')'!");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("'' == '')", "", ""), std::runtime_error, "unmatched ')' in condition '' == '')");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("''", "", ""), std::runtime_error, "Invalid condition: ''''");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("'' == '", "", ""), std::runtime_error, "Can not tokenize condition");
+        // ToUpper / ToLower
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.ToUpper()) == 'DEBUG'", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.ToLower()) == 'debug'", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.ToUpper()) == 'debug'", "Debug", "Win32"));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("$(Configuration.ToUpper()) == 'RELEASE'", "Debug", "Win32"));
+        // C-style && is not a valid MSBuild operator — throws rather than silently returning false
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("' ' && ' '", "", ""), std::runtime_error, "Invalid condition: '' ' && ' ''");
+        // case insensitive
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'Debug' == 'DEBUG'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'Debug' != 'DEBUG'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(configuration) == 'Debug'", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(configuration) == 'Debug'", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(CONFIGURATION) == 'Debug'", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration) == 'Debug'", "Debug", "Win32"));
+
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("true", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("TRUE", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("false", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("FALSE", "", ""));
+
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("true And true", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("true Or false", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("true And false", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("false Or false", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("!false", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("!true", "", ""));
+
+        // HasTrailingSlash
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("HasTrailingSlash('foo/')", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("HasTrailingSlash('foo\\')", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("HasTrailingSlash('foo')", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("HasTrailingSlash('')", "", ""));
+
+        // string manipulation
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Trim()) == 'Debug'", "  Debug  ", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.TrimStart()) == 'Debug  '", "  Debug  ", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.TrimEnd()) == '  Debug'", "  Debug  ", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Substring(0, 5)) == 'Debug'", "Debug-Test", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Substring(6)) == 'Test'", "Debug-Test", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Replace('-', '_')) == 'Debug_Test'", "Debug-Test", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition( "$(Configuration.Trim().ToUpper()) == 'DEBUG'", "  Debug  ", "Win32"));
+
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("true", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("false", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("true And false", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("!false", "", ""));
+
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition( "$(Configuration.Substring(5)) == ''", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition( "$(Configuration.Substring(5, 0)) == ''", "Debug", "Win32"));
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Substring(-1)) == ''", "Debug", "Win32"), std::runtime_error, "Substring start index out of range");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition( "$(Configuration.Substring(4, 2)) == ''", "Debug", "Win32"), std::runtime_error, "Substring length out of range");
+
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Trim()) == 'Debug'", " \tDebug\r\n", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.TrimStart()) == 'Debug  '", "  Debug  ", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.TrimEnd()) == '  Debug'", "  Debug  ", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Trim('-')) == 'Debug'", "--Debug--", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.TrimStart('-')) == 'Debug--'", "--Debug--", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.TrimEnd('-')) == '--Debug'", "--Debug--", "Win32"));
+
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Replace('-', '_')) == 'Debug_Test'","Debug-Test", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Replace('Debug', 'Release')) == 'Release-Test'", "Debug-Test", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Replace('x', 'y')) == 'Debug-Test'", "Debug-Test", "Win32"));
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Replace('', 'x')) == 'Debug'", "Debug", "Win32"), std::runtime_error, "Replace search string cannot be empty");
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Replace('Debug', 'Release')) == 'Release-Test'", "Debug-Test", "Win32"));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Replace('debug', 'Release')) == 'Release-Test'", "Debug-Test", "Win32"));
+
+        // Length property access (no parentheses)
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Length) == '5'", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Length) == '0'", "", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Platform.Length) == '5'", "Debug", "Win32"));
+        // Length after a method call in a chain
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.ToUpper().Length) == '5'", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Replace('-', '').Length) == '9'", "Debug-Test", "Win32"));
+        // Length in PropertyValueExpander (non-condition) path
+        ASSERT_EQUALS("5", cppcheck::testing::expandMSBuildProperties("$(Configuration.Length)", "Debug", "Win32"));
+        ASSERT_EQUALS("0", cppcheck::testing::expandMSBuildProperties("$(Configuration.Length)", "", "Win32"));
+        ASSERT_EQUALS("5", cppcheck::testing::expandMSBuildProperties("$(Platform.Length)", "Debug", "Win32"));
+        ASSERT_EQUALS("5", cppcheck::testing::expandMSBuildProperties("$(Configuration.ToUpper().Length)", "Debug", "Win32"));
+
+        // IndexOf / LastIndexOf
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.IndexOf('-')) == '5'", "Debug-Test", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.IndexOf('x')) == '-1'", "Debug-Test", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.IndexOf('e')) == '1'", "Debug-Test", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.IndexOf('e', '3')) == '7'", "Debug-Test", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.LastIndexOf('e')) == '7'", "Debug-Test", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.LastIndexOf('x')) == '-1'", "Debug-Test", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.LastIndexOf('e', '3')) == '1'", "Debug-Test", "Win32"));
+        ASSERT_EQUALS("5",  cppcheck::testing::expandMSBuildProperties("$(Configuration.IndexOf('-'))", "Debug-Test", "Win32"));
+        ASSERT_EQUALS("-1", cppcheck::testing::expandMSBuildProperties("$(Configuration.IndexOf('x'))", "Debug-Test", "Win32"));
+        ASSERT_EQUALS("7",  cppcheck::testing::expandMSBuildProperties("$(Configuration.LastIndexOf('e'))", "Debug-Test", "Win32"));
+
+        // PadLeft / PadRight
+        ASSERT_EQUALS("  hi", cppcheck::testing::expandMSBuildProperties("$(Configuration.PadLeft('4'))", "hi", "Win32"));
+        ASSERT_EQUALS("hi  ", cppcheck::testing::expandMSBuildProperties("$(Configuration.PadRight('4'))", "hi", "Win32"));
+        ASSERT_EQUALS("00hi", cppcheck::testing::expandMSBuildProperties("$(Configuration.PadLeft('4', '0'))", "hi", "Win32"));
+        ASSERT_EQUALS("hi00", cppcheck::testing::expandMSBuildProperties("$(Configuration.PadRight('4', '0'))", "hi", "Win32"));
+        // no padding needed when value already long enough
+        ASSERT_EQUALS("hello", cppcheck::testing::expandMSBuildProperties("$(Configuration.PadLeft('3'))", "hello", "Win32"));
+        ASSERT_EQUALS("hello", cppcheck::testing::expandMSBuildProperties("$(Configuration.PadRight('3'))", "hello", "Win32"));
+        // width exactly equal to value length — no padding
+        ASSERT_EQUALS("hi", cppcheck::testing::expandMSBuildProperties("$(Configuration.PadLeft('2'))", "hi", "Win32"));
+        ASSERT_EQUALS("hi", cppcheck::testing::expandMSBuildProperties("$(Configuration.PadRight('2'))", "hi", "Win32"));
+        // width 0 — no padding
+        ASSERT_EQUALS("hi", cppcheck::testing::expandMSBuildProperties("$(Configuration.PadLeft('0'))", "hi", "Win32"));
+        // chaining: pad then measure length
+        ASSERT_EQUALS("6", cppcheck::testing::expandMSBuildProperties("$(Configuration.PadLeft('6', '0').Length)", "hi", "Win32"));
+        ASSERT_EQUALS("6", cppcheck::testing::expandMSBuildProperties("$(Configuration.PadRight('6', '0').Length)", "hi", "Win32"));
+        // condition evaluation path
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.PadLeft('4', '0')) == '00hi'", "hi", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.PadRight('4', '0')) == 'hi00'", "hi", "Win32"));
+
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(Configuration) == DEBUG", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$(configuration) == 'Debug'", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'0x10' > '0x0F'", "", ""));
+
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'0x0F' < '0x10'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'0x10' < '0x0F'", "", ""));
+
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'0x10' > '0x0F'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'0x0F' < '0x10'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'0x10' < '0x0F'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'010' > '9'", "", ""));
+        // Equality comparison: numeric, Boolean, then string fallback -- NOT
+        // MSBuildVersion's zero-padded comparison (see the '17'/'17.0.0.0'
+        // block above in testVcxprojConditions() for why): '0x10' and '16'
+        // are both plain (hex/decimal) integers, so == compares them
+        // numerically and they're equal; '1.0' is not a plain integer (it
+        // contains '.') and is a different string from '1', so == falls back
+        // to string comparison and they're NOT equal.
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'0x10' == '16'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'1.0' == '1'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'true' == 'TRUE'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'Alpha' == 'alpha'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'Alpha' == 'Beta'", "", ""));
+        // Boolean literals and quoted boolean strings are case-insensitive (H-2)
+        // Unquoted keywords (matchWord is already case-insensitive)
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("true", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("false", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("True", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("False", "", ""));
+        // Quoted boolean strings from property expansion (e.g. <WholeProgramOptimization>true</...>)
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'true'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'false'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'TRUE'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'FALSE'", "", ""));
+        // Composition with mixed-case booleans
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'true' And 'True'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'true' And 'false'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'false' Or 'TRUE'", "", ""));
+        // Equality comparison: numeric, Boolean, then string fallback -- NOT
+        // MSBuildVersion's zero-padded comparison (see the '17'/'17.0.0.0'
+        // block above in testVcxprojConditions() for why): '0x10' and '16'
+        // are both plain (hex/decimal) integers, so == compares them
+        // numerically and they're equal; '1.0' is not a plain integer (it
+        // contains '.') and is a different string from '1', so == falls back
+        // to string comparison and they're NOT equal.
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'0x10' == '16'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'1.0' == '1'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'true' == 'TRUE'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'Alpha' == 'alpha'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'Alpha' == 'Beta'", "", ""));
+    }
+
+    // Regression coverage for compare()'s == / != previously sharing the
+    // same numeric -> Boolean -> Version -> string cascade as the relational
+    // operators <, >, <=, >=. Real MSBuild documents <, >, <=, >= as usable
+    // only with numeric values -- a dotted, multi-component string isn't a
+    // valid number there, which is exactly why the dedicated
+    // $([MSBuild]::VersionGreaterThan(...)) etc. functions exist -- while ==
+    // and != are documented as ordinary equality/inequality: numeric if both
+    // sides are plain numbers, case-insensitive string otherwise. Before the
+    // fix, == and != additionally fell through to MSBuildVersion's own
+    // comparator when both sides parsed as a dotted version string, and that
+    // comparator's own "==" implementation deliberately treats an omitted
+    // trailing component as zero (1 == 1.0 == 1.0.0) -- correct for the
+    // dedicated VersionEquals() function this codebase also exposes (see
+    // testMSBuildStaticFunctions()'s $([MSBuild]::VersionEquals(...))
+    // coverage), but not something a plain == in an ordinary
+    // Condition="..." attribute should ever do. This meant e.g.
+    // Condition="'$(SomeVersion)' == '1.1.0'" could spuriously match
+    // '$(SomeVersion)'=='1.1', a real vcxproj-authoring hazard given how
+    // often toolset/SDK version properties look exactly like this.
+    void testVcxprojConditionEqualityIsNotVersionComparison() const {
+        // The exact shape of bug report: a shorter and a longer dotted
+        // version string must NOT compare equal under == or != , even though
+        // MSBuildVersion's own zero-padded equality (used by
+        // $([MSBuild]::VersionEquals(...)) -- and, before this fix, leaked
+        // into plain ==) would treat them as the same value.
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'1.1' == '1.1.0'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'1.1' != '1.1.0'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'1' == '1.0'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'1' != '1.0'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'1' == '1.0.0'", "", ""));
+
+        // Relationally (<, >, <=, >=), MSBuildVersion's comparator treats an
+        // omitted trailing component as -1, not 0 (matching .NET's
+        // System.Version semantics), so a shorter version sorts strictly
+        // BEFORE a longer one -- neither "equal" under == nor under the
+        // relational operators either, it is simply less.
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'1.1' < '1.1.0'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'1.1' >= '1.1.0'", "", ""));
+
+        // Two identical dotted version strings are still equal under == --
+        // this is ordinary string equality doing its job, not version
+        // comparison; nothing about excluding == from the version-comparison
+        // path should affect the case where both sides are literally the
+        // same text.
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'1.1.0' == '1.1.0'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'1.1.0' != '1.1.0'", "", ""));
+
+        // Genuinely plain numbers (no dots) are still compared numerically
+        // under == -- this really is documented MSBuild behavior for ==,
+        // unlike the dotted-version case above, so leading zeros and the
+        // like still numerically match.
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'01' == '1'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'01' != '1'", "", ""));
+
+        // $([MSBuild]::VersionEquals(...)) is a distinct, dedicated function
+        // with its own, deliberately zero-padding, semantics -- unaffected
+        // by any of the above, since it never goes through compare() at all.
+        // See testMSBuildStaticFunctions() for its general coverage; this is
+        // exactly the '1.1'/'1.1.0' pair that a plain == above now rejects.
+        ASSERT_EQUALS("True", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionEquals('1.1', '1.1.0'))"));
+    }
+
+    // Regression coverage for property-name identifier parsing rejecting '-'.
+    // Microsoft documents a valid MSBuild property name as
+    // [A-Za-z_][A-Za-z0-9_-]* -- '-' IS allowed after the first character,
+    // e.g. <My-Property>foo</My-Property> referenced as $(My-Property) -- but
+    // PropertyValueExpander::parseIdentifier() (used by expandMSBuildVariables(),
+    // the general $(...) expansion path), ConditionParser's property-name
+    // parsing (used by $(...) inside a Condition="..."), and
+    // hasOnlyInvariantItemPathVariables()'s inline scanner (used for ClCompile
+    // item Include/Update/Remove paths, see vcxproj_item_macro_path_hyphen_test.py
+    // for CLI-level coverage of that one) all previously stopped at the first
+    // '-', silently truncating the name -- so $(My-Property) was parsed as a
+    // reference to a property literally named "My" followed by the literal
+    // text "-Property)", which (barring an actual property named exactly
+    // "My") just left the whole expression unexpanded, rather than resolving
+    // "My-Property" as one property name the way real MSBuild does. Method
+    // and member names are NOT affected -- MSBuild's own grammar restricts
+    // those to [A-Za-z_][A-Za-z0-9_]* with no '-' (see
+    // ConditionParser::parseMethodName()'s doc comment and the inline method
+    // scans in PropertyValueExpander::tryParseExpr()) -- so this test also
+    // confirms a hyphen right after a '.' in a method position is correctly
+    // NOT consumed as part of the method name.
+    //
+    // expandMSBuildExpression()/evaluateVcxprojCondition() (the testing hooks
+    // used here) only let a caller set Configuration/Platform in the
+    // properties map directly, so an OS environment variable -- the other
+    // source PropertyValueExpander::lookup() and ConditionParser::getPropertyValue()
+    // already fall back to for any name not in the properties map -- is the
+    // only way to inject an arbitrarily-named property through them.
+    void testPropertyNameAllowsHyphen() const {
+        const char *const envName = "CppcheckTest-Hyphen-Prop";
+#ifdef _WIN32
+        _putenv_s(envName, "hyphen-value");
+#else
+        setenv(envName, "hyphen-value", 1);
+#endif
+
+        // General property expansion (expandMSBuildVariables(), via
+        // PropertyValueExpander::parseIdentifier()).
+        ASSERT_EQUALS("hyphen-value", cppcheck::testing::expandMSBuildExpression("$(CppcheckTest-Hyphen-Prop)"));
+        ASSERT_EQUALS("prefix-hyphen-value-suffix",
+                      cppcheck::testing::expandMSBuildExpression("prefix-$(CppcheckTest-Hyphen-Prop)-suffix"));
+
+        // Condition evaluation (ConditionParser::parsePropertyName(), via
+        // parsePropertyExpression()).
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'$(CppcheckTest-Hyphen-Prop)' == 'hyphen-value'", "", ""));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'$(CppcheckTest-Hyphen-Prop)' == 'wrong-value'", "", ""));
+
+        // A hyphen is still correctly rejected in a METHOD name -- the
+        // property name parses in full ("CppcheckTest-Hyphen-Prop"), but the
+        // method-name scan then stops at the '-' in ".To-Upper", leaving
+        // "To" as an unrecognized no-paren property access (passing `value`
+        // through unchanged, exactly like an unrelated unknown property
+        // accessor would) and "-Upper)" behind as literal, unconsumed text
+        // that the surrounding expansion then copies through verbatim --
+        // rather than treating "-" as part of the method name and matching
+        // some (nonexistent) "To-Upper" method.
+        ASSERT_EQUALS("hyphen-value-Upper)", cppcheck::testing::expandMSBuildExpression("$(CppcheckTest-Hyphen-Prop.To-Upper)"));
+
+#ifdef _WIN32
+        _putenv_s(envName, "");
+#else
+        unsetenv(envName);
+#endif
+    }
+
+    void testMSBuildStaticFunctions() const {
+        // --- $([MSBuild]::...) arithmetic ---
+        ASSERT_EQUALS("3", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::Add(1, 2))"));
+        ASSERT_EQUALS("5", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::Subtract(8, 3))"));
+        ASSERT_EQUALS("12", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::Multiply(3, 4))"));
+        ASSERT_EQUALS("3", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::Divide(9, 3))"));
+        ASSERT_EQUALS("2", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::Modulo(5, 3))"));
+
+        // Overflow wraps around like MSBuild (.NET unchecked arithmetic).
+        ASSERT_EQUALS("-9223372036854775808", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::Add(9223372036854775807, 1))"));
+        ASSERT_EQUALS("9223372036854775807", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::Subtract(-9223372036854775808, 1))"));
+        ASSERT_EQUALS("7766279611452241921", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::Multiply(9999999999, 9999999999))"));
+        // .NET throws OverflowException for LLONG_MIN / -1 and LLONG_MIN % -1.
+        ASSERT_EQUALS("", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::Divide(-9223372036854775808, -1))"));
+        ASSERT_EQUALS("", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::Modulo(-9223372036854775808, -1))"));
+
+        // --- $([MSBuild]::...) path helpers ---
+        ASSERT_EQUALS("foo/", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::EnsureTrailingSlash('foo'))"));
+        ASSERT_EQUALS("foo/", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::EnsureTrailingSlash('foo/'))"));
+        // NormalizePath: join segments, normalise separators, resolve . and ..
+        // Use absolute first segments so results are deterministic (CWD-independent).
+        ASSERT_EQUALS("/a/b/c",    cppcheck::testing::expandMSBuildExpression("$([MSBuild]::NormalizePath('/a', 'b', 'c'))"));
+        ASSERT_EQUALS("/a/b/c",    cppcheck::testing::expandMSBuildExpression("$([MSBuild]::NormalizePath('/a\\b\\c'))"));
+        ASSERT_EQUALS("/a/c",      cppcheck::testing::expandMSBuildExpression("$([MSBuild]::NormalizePath('/a/b/../c'))"));
+        ASSERT_EQUALS("/a/b/c",    cppcheck::testing::expandMSBuildExpression("$([MSBuild]::NormalizePath('/a/b/./c'))"));
+        ASSERT_EQUALS("C:/a/c",    cppcheck::testing::expandMSBuildExpression("$([MSBuild]::NormalizePath('C:\\a\\b\\..\\c'))"));
+        ASSERT_EQUALS("C:/a/b/c",  cppcheck::testing::expandMSBuildExpression("$([MSBuild]::NormalizePath('C:\\a', 'b', 'c'))"));
+        // NormalizeDirectory: same as NormalizePath but always has a trailing slash
+        ASSERT_EQUALS("/a/b/c/",   cppcheck::testing::expandMSBuildExpression("$([MSBuild]::NormalizeDirectory('/a', 'b', 'c'))"));
+        ASSERT_EQUALS("/a/b/c/",   cppcheck::testing::expandMSBuildExpression("$([MSBuild]::NormalizeDirectory('/a\\b\\c'))"));
+        ASSERT_EQUALS("C:/a/b/c/", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::NormalizeDirectory('C:\\a', 'b', 'c'))"));
+        // Regression: space between method name and '(' must not drop the arg list.
+        // Before the fix this produced "" and a "unknown class MSBuild or member
+        // NormalizeDirectory" debug entry because the arg parser never saw '('.
+        ASSERT_EQUALS("/a/b/c/",   cppcheck::testing::expandMSBuildExpression("$([MSBuild]::NormalizeDirectory ('/a', 'b', 'c'))"));
+        ASSERT_EQUALS("/a/b/c",    cppcheck::testing::expandMSBuildExpression("$([MSBuild]::NormalizePath ('/a', 'b', 'c'))"));
+        // $(…) references inside quoted args must be expanded before the function
+        // runs, so that '..' resolution operates on real path components.
+        // expandMSBuildProperties pre-populates Configuration and Platform; use
+        // them here as stand-ins for real path properties.
+        ASSERT_EQUALS("Debug/", cppcheck::testing::expandMSBuildProperties("$([MSBuild]::NormalizeDirectory('$(Configuration)'))", "Debug", "Win32"));
+        ASSERT_EQUALS("Win32/sub/", cppcheck::testing::expandMSBuildProperties("$([MSBuild]::NormalizeDirectory('$(Platform)', 'sub'))", "Debug", "Win32"));
+        // The critical real-world pattern: NormalizeDirectory with an inner
+        // property and '..' segments — must NOT collapse to empty.
+        ASSERT_EQUALS("Debug/", cppcheck::testing::expandMSBuildProperties("$([MSBuild]::NormalizeDirectory('$(Configuration)', 'sub', '..'))", "Debug", "Win32"));
+        // Unquoted $(Var)trailing/text arg: trailing bare-word text must be
+        // concatenated onto the expanded value so that e.g.
+        //   $(MSBuildThisFileDirectory)\..\tools  →  one concatenated arg, not two.
+        // Use $(Configuration) as a stand-in for a real directory property.
+        ASSERT_EQUALS("sub/", cppcheck::testing::expandMSBuildProperties("$([MSBuild]::NormalizeDirectory($(Configuration)\\..\\sub))", "Debug", "Win32"));
+        ASSERT_EQUALS("sub", cppcheck::testing::expandMSBuildProperties("$([MSBuild]::NormalizePath($(Configuration)\\..\\sub))", "Debug", "Win32"));
+        // Multi-arg quoted form with three inner $(…) args
+        ASSERT_EQUALS("Debug/Win32/sub/", cppcheck::testing::expandMSBuildProperties("$([MSBuild]::NormalizeDirectory('$(Configuration)', '$(Platform)', 'sub'))", "Debug", "Win32"));
+        // Version comparison functions (missing trailing components treated as 0)
+        ASSERT_EQUALS("True",  cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionGreaterThan('2.0', '1.9'))"));
+        ASSERT_EQUALS("False", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionGreaterThan('1.9', '2.0'))"));
+        ASSERT_EQUALS("False", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionGreaterThan('1.0', '1.0'))"));
+        ASSERT_EQUALS("True",  cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionGreaterThanOrEquals('1.0', '1.0'))"));
+        ASSERT_EQUALS("True",  cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionGreaterThanOrEquals('2.0', '1.0'))"));
+        ASSERT_EQUALS("False", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionGreaterThanOrEquals('1.0', '2.0'))"));
+        ASSERT_EQUALS("True",  cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionLessThan('1.9', '2.0'))"));
+        ASSERT_EQUALS("False", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionLessThan('2.0', '1.9'))"));
+        ASSERT_EQUALS("True",  cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionLessThanOrEquals('1.0', '1.0'))"));
+        ASSERT_EQUALS("True",  cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionEquals('1.0', '1.0.0'))"));   // missing component = 0
+        ASSERT_EQUALS("True",  cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionEquals('1.2.3', '1.2.3'))"));
+        ASSERT_EQUALS("False", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionEquals('1.0', '1.1'))"));
+        ASSERT_EQUALS("True",  cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionNotEquals('1.0', '1.1'))"));
+        ASSERT_EQUALS("False", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionNotEquals('1.0', '1.0.0'))"));
+        // multi-component: 1.2.3.4 vs 1.2.3.5
+        ASSERT_EQUALS("True",  cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionLessThan('1.2.3.4', '1.2.3.5'))"));
+        ASSERT_EQUALS("False", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::VersionGreaterThan('1.2.3.4', '1.2.3.5'))"));
+        // usable in a condition
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$([MSBuild]::VersionGreaterThan('17.0', '16.9')) == 'True'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$([MSBuild]::VersionEquals('14.0', '14.0.0')) == 'True'", "", ""));
+
+        // ValueOrDefault: return first arg when non-empty, else second
+        ASSERT_EQUALS("x", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::ValueOrDefault('x', 'y'))"));
+        ASSERT_EQUALS("y", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::ValueOrDefault('', 'y'))"));
+        // GetCurrentToolsVersion
+        ASSERT_EQUALS("Current", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::GetCurrentToolsVersion())"));
+
+        // --- $([MSBuild]::...) bitwise ---
+        ASSERT_EQUALS("2", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::BitwiseAnd(6, 3))"));
+        ASSERT_EQUALS("7", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::BitwiseOr(5, 3))"));
+        ASSERT_EQUALS("6", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::BitwiseXor(5, 3))"));
+
+        // --- $([MSBuild]::...) Escape / Unescape ---
+        ASSERT_EQUALS("%3B", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::Escape(';'))"));
+        ASSERT_EQUALS(";", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::Unescape('%3B'))"));
+        ASSERT_EQUALS("%24", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::Escape('$'))"));
+        ASSERT_EQUALS("$", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::Unescape('%24'))"));
+
+        // --- $([System.String]::...) ---
+        ASSERT_EQUALS("True", cppcheck::testing::expandMSBuildExpression("$([System.String]::IsNullOrEmpty(''))"));
+        ASSERT_EQUALS("False", cppcheck::testing::expandMSBuildExpression("$([System.String]::IsNullOrEmpty('x'))"));
+        ASSERT_EQUALS("True", cppcheck::testing::expandMSBuildExpression("$([System.String]::IsNullOrWhiteSpace('  '))"));
+        ASSERT_EQUALS("False", cppcheck::testing::expandMSBuildExpression("$([System.String]::IsNullOrWhiteSpace('x'))"));
+        ASSERT_EQUALS("ab", cppcheck::testing::expandMSBuildExpression("$([System.String]::Concat('a', 'b'))"));
+        ASSERT_EQUALS("a,b", cppcheck::testing::expandMSBuildExpression("$([System.String]::Join(',', 'a', 'b'))"));
+        // String.Format: plain substitution
+        ASSERT_EQUALS("foo and bar", cppcheck::testing::expandMSBuildExpression("$([System.String]::Format('{0} and {1}', 'foo', 'bar'))"));
+        // String.Format: escaped braces
+        ASSERT_EQUALS("{literal}", cppcheck::testing::expandMSBuildExpression("$([System.String]::Format('{{literal}}'))"));
+        // String.Format: D (decimal, optional zero-padding)
+        ASSERT_EQUALS("42",     cppcheck::testing::expandMSBuildExpression("$([System.String]::Format('{0:D}', '42'))"));
+        ASSERT_EQUALS("000042", cppcheck::testing::expandMSBuildExpression("$([System.String]::Format('{0:D6}', '42'))"));
+        ASSERT_EQUALS("-000005", cppcheck::testing::expandMSBuildExpression("$([System.String]::Format('{0:D6}', '-5'))"));
+        // String.Format: X / x (hexadecimal)
+        ASSERT_EQUALS("FF",   cppcheck::testing::expandMSBuildExpression("$([System.String]::Format('{0:X}', '255'))"));
+        ASSERT_EQUALS("00FF", cppcheck::testing::expandMSBuildExpression("$([System.String]::Format('{0:X4}', '255'))"));
+        ASSERT_EQUALS("00ff", cppcheck::testing::expandMSBuildExpression("$([System.String]::Format('{0:x4}', '255'))"));
+        // String.Format: F (fixed-point)
+        ASSERT_EQUALS("3.14",   cppcheck::testing::expandMSBuildExpression("$([System.String]::Format('{0:F2}', '3.14159'))"));
+        ASSERT_EQUALS("3.1416", cppcheck::testing::expandMSBuildExpression("$([System.String]::Format('{0:F4}', '3.14159'))"));
+        // String.Format: non-numeric arg with a numeric specifier — pass through unchanged
+        ASSERT_EQUALS("abc", cppcheck::testing::expandMSBuildExpression("$([System.String]::Format('{0:D6}', 'abc'))"));
+
+        // --- $([System.Math]::...) ---
+        ASSERT_EQUALS("10", cppcheck::testing::expandMSBuildExpression("$([System.Math]::Max(5, 10))"));
+        ASSERT_EQUALS("5", cppcheck::testing::expandMSBuildExpression("$([System.Math]::Min(5, 10))"));
+        ASSERT_EQUALS("5", cppcheck::testing::expandMSBuildExpression("$([System.Math]::Abs(-5))"));
+        ASSERT_EQUALS("5", cppcheck::testing::expandMSBuildExpression("$([System.Math]::Abs(5))"));
+        ASSERT_EQUALS("2", cppcheck::testing::expandMSBuildExpression("$([System.Math]::Floor(2.9))"));
+        ASSERT_EQUALS("3", cppcheck::testing::expandMSBuildExpression("$([System.Math]::Ceiling(2.1))"));
+        ASSERT_EQUALS("2", cppcheck::testing::expandMSBuildExpression("$([System.Math]::Round(2.5))"));
+        ASSERT_EQUALS("4", cppcheck::testing::expandMSBuildExpression("$([System.Math]::Round(3.5))"));
+        ASSERT_EQUALS("-2", cppcheck::testing::expandMSBuildExpression("$([System.Math]::Round(-2.5))"));
+        ASSERT_EQUALS("1000000000000000019884624838656.000000", cppcheck::testing::expandMSBuildExpression("$([System.Math]::Pow(10, 30))"));
+        ASSERT_EQUALS("1000000000000000019884624838656.000000", cppcheck::testing::expandMSBuildExpression("$([System.Math]::Round(1e30))"));
+        ASSERT_EQUALS("-1000000000000000019884624838656.000000", cppcheck::testing::expandMSBuildExpression("$([System.Math]::Floor(-1e30))"));
+
+        // --- $([System.IO.Path]::...) ---
+        ASSERT_EQUALS("bar.cpp", cppcheck::testing::expandMSBuildExpression("$([System.IO.Path]::GetFileName('C:/foo/bar.cpp'))"));
+        ASSERT_EQUALS("bar", cppcheck::testing::expandMSBuildExpression("$([System.IO.Path]::GetFileNameWithoutExtension('C:/foo/bar.cpp'))"));
+        ASSERT_EQUALS("C:/foo", cppcheck::testing::expandMSBuildExpression("$([System.IO.Path]::GetDirectoryName('C:/foo/bar.cpp'))"));
+        ASSERT_EQUALS(".cpp", cppcheck::testing::expandMSBuildExpression("$([System.IO.Path]::GetExtension('bar.cpp'))"));
+        ASSERT_EQUALS("True", cppcheck::testing::expandMSBuildExpression("$([System.IO.Path]::IsPathRooted('C:/foo'))"));
+        ASSERT_EQUALS("True", cppcheck::testing::expandMSBuildExpression("$([System.IO.Path]::IsPathRooted('C:\\\\foo'))"));
+        ASSERT_EQUALS("True", cppcheck::testing::expandMSBuildExpression("$([System.IO.Path]::IsPathRooted('\\\\server\\\\share'))"));
+        ASSERT_EQUALS("True", cppcheck::testing::expandMSBuildExpression("$([System.IO.Path]::IsPathRooted('C:file.cpp'))"));  // drive-relative: .NET returns True (has drive letter)
+        ASSERT_EQUALS("False", cppcheck::testing::expandMSBuildExpression("$([System.IO.Path]::IsPathRooted('foo'))"));
+        // Path.Combine: 1, 2, 3, N args; absolute segment resets path
+        ASSERT_EQUALS("a", cppcheck::testing::expandMSBuildExpression("$([System.IO.Path]::Combine('a'))"));
+        ASSERT_EQUALS("a/b", cppcheck::testing::expandMSBuildExpression("$([System.IO.Path]::Combine('a', 'b'))"));
+        ASSERT_EQUALS("a/b/c", cppcheck::testing::expandMSBuildExpression("$([System.IO.Path]::Combine('a', 'b', 'c'))"));
+        ASSERT_EQUALS("a/b/c/d", cppcheck::testing::expandMSBuildExpression("$([System.IO.Path]::Combine('a', 'b', 'c', 'd'))"));
+        ASSERT_EQUALS("/abs/b", cppcheck::testing::expandMSBuildExpression("$([System.IO.Path]::Combine('a', '/abs', 'b'))"));
+        ASSERT_EQUALS("/abs", cppcheck::testing::expandMSBuildExpression("$([System.IO.Path]::Combine('a', 'b', '/abs'))"));
+        ASSERT_EQUALS(Path::fromNativeSeparators(Path::getCurrentPath()) + "/a/b/c/d", cppcheck::testing::expandMSBuildExpression("$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine('a', 'b', 'c', 'd')))"));
+
+        // --- $([System.IO.FileInfo]::new(...)) / $([System.IO.DirectoryInfo]::new(...)) ---
+        // ::new returns the normalized path; chains resolve on that string.
+        ASSERT_EQUALS("C:/foo/bar.cpp", cppcheck::testing::expandMSBuildExpression("$([System.IO.FileInfo]::new('C:/foo/bar.cpp').FullName)"));
+        ASSERT_EQUALS("C:/foo/", cppcheck::testing::expandMSBuildExpression("$([System.IO.FileInfo]::new('C:/foo/bar.cpp').DirectoryName)"));
+        ASSERT_EQUALS("bar.cpp", cppcheck::testing::expandMSBuildExpression("$([System.IO.FileInfo]::new('C:/foo/bar.cpp').Name)"));
+        ASSERT_EQUALS("C:/foo", cppcheck::testing::expandMSBuildExpression("$([System.IO.DirectoryInfo]::new('C:/foo').FullName)"));
+        // .Method(args) chain after ::new — e.g. replace in the resolved path
+        ASSERT_EQUALS("C:/foo/baz.cpp", cppcheck::testing::expandMSBuildExpression("$([System.IO.FileInfo]::new('C:/foo/bar.cpp').FullName.Replace('bar', 'baz'))"));
+
+        // --- Composite / nesting ---
+        ASSERT_EQUALS("6", cppcheck::testing::expandMSBuildExpression("$([MSBuild]::Add($([MSBuild]::Multiply(2, 2)), 2))"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$([MSBuild]::Add(1, 2)) == '3'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$([System.String]::IsNullOrEmpty('')) == 'True'", "", ""));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("$([System.Math]::Max(10, 5)) == '10'", "", ""));
+    }
+
+    void testVcxitemsPathResolution() const {
+        // importVcxitems must absolutise relative paths relative to ProjectDir,
+        // MSBuild always sets ProjectDir with a trailing slash — use that canonical form.
+        // Path styles differ by platform: Path::isAbsolute requires C:/ on Windows, / on Linux.
+#ifdef _WIN32
+        const std::string projDir    = "C:/proj/";
+        const std::string projSub    = "C:/proj/sub/Shared.vcxitems";
+        const std::string projRoot   = "C:/proj/Shared.vcxitems";
+        const std::string absPath    = "C:/absolute/Shared.vcxitems";
+        const std::string absInput   = "C:/absolute/Shared.vcxitems";
+#else
+        const std::string projDir    = "/proj/";
+        const std::string projSub    = "/proj/sub/Shared.vcxitems";
+        const std::string projRoot   = "/proj/Shared.vcxitems";
+        const std::string absPath    = "/absolute/Shared.vcxitems";
+        const std::string absInput   = "/absolute/Shared.vcxitems";
+#endif
+        // Relative path + ProjectDir → absolutised result
+        ASSERT_EQUALS(projSub,  cppcheck::testing::resolveVcxitemsFilename("sub/Shared.vcxitems", projDir));
+        ASSERT_EQUALS(projRoot, cppcheck::testing::resolveVcxitemsFilename("Shared.vcxitems", projDir));
+
+        // Already-absolute path must pass through unchanged regardless of ProjectDir
+        ASSERT_EQUALS(absPath, cppcheck::testing::resolveVcxitemsFilename(absInput, projDir));
+
+        // No ProjectDir → relative path is returned as-is
+        ASSERT_EQUALS("Shared.vcxitems", cppcheck::testing::resolveVcxitemsFilename("Shared.vcxitems", ""));
+    }
+
+    void testMissingChildImportNonFatal() const {
+        // A .vcxproj that imports a non-existent .props file must still import
+        // successfully.  Before the fix, result > NotResolvable caused errors.emplace_back()
+        // + return false, aborting the whole project.  After the fix it is a debug warning
+        // and the remaining ClCompile items are still collected.
+
+        // Use the current directory (no subdirectory) to avoid ScopedFile throwing
+        // "directory already exists" when the test is re-run without a clean build.
+        const ScopedFile mainCpp("testm3_main.cpp", "");
+        const ScopedFile vcxproj(
+            "testm3.vcxproj",
+            "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+            "<Project DefaultTargets=\"Build\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n"
+            "  <ItemGroup Label=\"ProjectConfigurations\">\n"
+            "    <ProjectConfiguration Include=\"Debug|Win32\">\n"
+            "      <Configuration>Debug</Configuration>\n"
+            "      <Platform>Win32</Platform>\n"
+            "    </ProjectConfiguration>\n"
+            "  </ItemGroup>\n"
+            "  <PropertyGroup Condition=\"'$(Configuration)|$(Platform)'=='Debug|Win32'\" Label=\"Configuration\">\n"
+            "    <ConfigurationType>Application</ConfigurationType>\n"
+            "    <PlatformToolset>v143</PlatformToolset>\n"
+            "  </PropertyGroup>\n"
+            "  <!-- Import a file that does not exist: fix must not abort import -->\n"
+            "  <Import Project=\"nonexistent_m3_missing.props\" />\n"
+            "  <ItemGroup>\n"
+            "    <ClCompile Include=\"testm3_main.cpp\" />\n"
+            "  </ItemGroup>\n"
+            "</Project>\n");
+
+        ImportProject project;
+        const ImportProject::Type result = project.import(vcxproj.path());
+
+        // Must succeed — missing child imports must not abort the project.
+        ASSERT_EQUALS(static_cast<int>(ImportProject::Type::VS_VCXPROJ), static_cast<int>(result));
+
+        // No hard errors — the missing import is demoted to a debug warning.
+        ASSERT(project.errors.empty());
+
+        // The source file must still have been collected despite the missing import.
+        const bool foundMain = std::any_of(project.fileSettings.begin(), project.fileSettings.end(), [](const FileSettings &fs) {
+            return fs.filename().find("main.cpp") != std::string::npos;
+        });
+        ASSERT(foundMain);
+    }
+
+    void testCurrentToolsVersionFromProps() const {
+        // L-3: "Current" keyword in relational conditions must use VisualStudioVersion
+        // from the properties map rather than a hardcoded major version number.
+        //
+        // evaluateVcxprojCondition uses an empty properties map, so VisualStudioVersion
+        // is absent and the fallback value { 18 } applies.  These assertions verify
+        // the comparison logic is correct for the fallback case; an end-to-end
+        // .vcxproj test with <VisualStudioVersion> set would be needed to exercise
+        // the property-lookup path directly.
+
+        // fallback Current = MSBuildVersion::parse("18.0") = {18,0} (VS 2026)
+        // Now that the fallback is a two-component version "18.0", the equal-major
+        // comparisons work correctly without .NET single-component ambiguity.
+        // "Current" >= "18.0" -> {18,0} >= {18,0} -> true
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'Current' >= '18.0'", "Debug", "Win32"));
+        // "Current" <= "18.0" -> {18,0} <= {18,0} -> true
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'Current' <= '18.0'", "Debug", "Win32"));
+        // "Current" > "17.0" -> {18,0} > {17,0} -> true
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'Current' > '17.0'", "Debug", "Win32"));
+        // "17.0" < "Current" -> {17,0} < {18,0} -> true
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'17.0' < 'Current'", "Debug", "Win32"));
+        // "Current" < "19.0" -> {18,0} < {19,0} -> true
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'Current' < '19.0'", "Debug", "Win32"));
+        // "Current" > "19.0" -> {18,0} > {19,0} -> false
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'Current' > '19.0'", "Debug", "Win32"));
+    }
+
+    void testMetadataSelfReferenceCaseInsensitive() const {
+        // MSBuild item metadata names are case-insensitive (MetadataMap already
+        // uses cppcheck::stricmp for exactly this reason). Some .vcxproj/.props
+        // files use property-style accumulation in an ItemDefinitionGroup (e.g.
+        // <PreprocessorDefinitions>$(PreprocessorDefinitions);EXTRA</PreprocessorDefinitions>)
+        // instead of the %(...) item-metadata-reference syntax -- addMetadata()
+        // handles that "$(eName) self-reference" idiom by substituting in the
+        // metadata value accumulated so far. That substitution used to go through
+        // the plain, case-sensitive findAndReplace() instead of
+        // findAndReplaceCaseInsensitive() (used everywhere else in this file for
+        // exactly this kind of property/metadata name comparison), so a
+        // self-reference spelled with different casing than the element's own
+        // tag name -- e.g. $(preprocessordefinitions) inside a
+        // <PreprocessorDefinitions> element -- was not recognized and was left
+        // in the output as literal, unresolved macro text instead of being
+        // replaced by the value accumulated from the preceding
+        // ItemDefinitionGroup.
+        //
+        // Two sequential ItemDefinitionGroup blocks exercise this: the first
+        // establishes the base value; the second references it back via
+        // $(preprocessordefinitions) in a different case than the
+        // <PreprocessorDefinitions> tag itself.
+
+        const ScopedFile mainCpp("testcasemeta_main.cpp", "");
+        const ScopedFile vcxproj(
+            "testcasemeta.vcxproj",
+            "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+            "<Project DefaultTargets=\"Build\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n"
+            "  <ItemGroup Label=\"ProjectConfigurations\">\n"
+            "    <ProjectConfiguration Include=\"Debug|Win32\">\n"
+            "      <Configuration>Debug</Configuration>\n"
+            "      <Platform>Win32</Platform>\n"
+            "    </ProjectConfiguration>\n"
+            "  </ItemGroup>\n"
+            "  <PropertyGroup Condition=\"'$(Configuration)|$(Platform)'=='Debug|Win32'\" Label=\"Configuration\">\n"
+            "    <ConfigurationType>Application</ConfigurationType>\n"
+            "    <PlatformToolset>v143</PlatformToolset>\n"
+            "  </PropertyGroup>\n"
+            "  <ItemDefinitionGroup Condition=\"'$(Configuration)|$(Platform)'=='Debug|Win32'\">\n"
+            "    <ClCompile>\n"
+            "      <PreprocessorDefinitions>BASE_DEFINE</PreprocessorDefinitions>\n"
+            "    </ClCompile>\n"
+            "  </ItemDefinitionGroup>\n"
+            "  <!-- Self-reference spelled in a different case than the element's own\n"
+            "       tag name -- real MSBuild (case-insensitive metadata names) still\n"
+            "       resolves this to the value accumulated by the ItemDefinitionGroup\n"
+            "       above (\"BASE_DEFINE\"). -->\n"
+            "  <ItemDefinitionGroup Condition=\"'$(Configuration)|$(Platform)'=='Debug|Win32'\">\n"
+            "    <ClCompile>\n"
+            "      <PreprocessorDefinitions>$(preprocessordefinitions);EXTRA_DEFINE</PreprocessorDefinitions>\n"
+            "    </ClCompile>\n"
+            "  </ItemDefinitionGroup>\n"
+            "  <ItemGroup>\n"
+            "    <ClCompile Include=\"testcasemeta_main.cpp\" />\n"
+            "  </ItemGroup>\n"
+            "</Project>\n");
+
+        ImportProject project;
+        const ImportProject::Type result = project.import(vcxproj.path());
+        ASSERT_EQUALS(static_cast<int>(ImportProject::Type::VS_VCXPROJ), static_cast<int>(result));
+
+        const auto it = std::find_if(project.fileSettings.begin(), project.fileSettings.end(), [](const FileSettings &fs) {
+            return fs.filename().find("testcasemeta_main.cpp") != std::string::npos;
+        });
+        ASSERT(it != project.fileSettings.end());
+
+        // Must end with the fully-resolved accumulation
+        // "BASE_DEFINE=1;EXTRA_DEFINE=1" -- not a leftover literal
+        // "$(preprocessordefinitions)" macro reference, which would mean the
+        // case-mismatched self-reference was never recognized and substituted.
+        // (fs.defines is prefixed with the toolset's own predefined macros --
+        // e.g. _MSC_VER -- which this test does not otherwise care about.)
+        ASSERT(it->defines.find("$(preprocessordefinitions)") == std::string::npos);
+        const std::string expectedSuffix = ";BASE_DEFINE=1;EXTRA_DEFINE=1";
+        ASSERT(it->defines.size() >= expectedSuffix.size());
+        ASSERT_EQUALS(expectedSuffix, it->defines.substr(it->defines.size() - expectedSuffix.size()));
     }
 
     // TODO: test fsParseCommand()
 
-    // TODO: test vcxproj conditions
-    /*
-        <?xml version="1.0" encoding="utf-8"?>
-        <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-        <ItemGroup Label="ProjectConfigurations">
-        <ProjectConfiguration Include="Debug|x64">
-        <Configuration>Debug</Configuration>
-        <Platform>x64</Platform>
-        </ProjectConfiguration>
-        </ItemGroup>
-        <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-        <ClCompile>
-        <PreprocessorDefinitions>CPPCHECKLIB_IMPORT</PreprocessorDefinitions>
-        </ClCompile>
-        </ItemDefinitionGroup>
-        <ItemGroup>
-        <ClCompile Include="main.c" />
-        </ItemGroup>
-        </Project>
-     */
 };
 
 REGISTER_TEST(TestImportProject)
diff --git a/test/testincompletestatement.cpp b/test/testincompletestatement.cpp
index 7a1fbdb2dab..8e523e3d06e 100644
--- a/test/testincompletestatement.cpp
+++ b/test/testincompletestatement.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ class TestIncompleteStatement : public TestFixture {
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check for incomplete statements..
-        CheckOther checkOther(&tokenizer, &settings1, this);
+        CheckOtherImpl checkOther(&tokenizer, settings1, *this);
         checkOther.checkIncompleteStatement();
     }
 
@@ -93,7 +93,7 @@ class TestIncompleteStatement : public TestFixture {
               "{\n"
               "    const char def[] =\n"
               "    \"abc\";\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -102,7 +102,7 @@ class TestIncompleteStatement : public TestFixture {
         check("void foo()\n"
               "{\n"
               "    \"abc\";\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Redundant code: Found a statement that begins with string constant. [constStatement]\n", errout_str());
     }
@@ -111,7 +111,7 @@ class TestIncompleteStatement : public TestFixture {
         check("void foo()\n"
               "{\n"
               "    const char *str[] = { \"abc\" };\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -125,7 +125,7 @@ class TestIncompleteStatement : public TestFixture {
               "\"more \"\n"
               "\"world\"\n"
               "};\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -134,7 +134,7 @@ class TestIncompleteStatement : public TestFixture {
         check("void foo()\n"
               "{\n"
               "    50;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Redundant code: Found a statement that begins with numeric constant. [constStatement]\n", errout_str());
     }
@@ -145,7 +145,7 @@ class TestIncompleteStatement : public TestFixture {
               "  1 == (two + three);\n"
               "  2 != (two + three);\n"
               "  (one + two) != (two + three);\n"
-              "}");
+              "}\n");
     }
 
     void test7() { // #9335
@@ -160,7 +160,7 @@ class TestIncompleteStatement : public TestFixture {
               "  for (C c(S); ; ) {\n"
               "    (void)c;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -174,22 +174,38 @@ class TestIncompleteStatement : public TestFixture {
               "    {\n"
               "        { 346.1,114.1 }, { 347.1,111.1 }\n"
               "    };\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
 
     void void0() { // #6327
-        check("void f() { (void*)0; }");
+        check("#define assert(x) ((void)0)\n"
+              "void f(int* p) {\n"
+              "    assert(p);\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
+        check("void f() { (void*)0; }\n");
+        ASSERT_EQUALS("[test.cpp:1:12]: (warning) Redundant code: Found unused cast in expression '(void*)0'. [constStatement]\n", errout_str());
+
+        check("void f() {\n" // #13148
+              "    static_cast<void>(1);\n"
+              "    static_cast<void>(nullptr);\n"
+              "    (void)NULL;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:22]: (warning) Redundant code: Found unused cast in expression 'static_cast<void>(1)'. [constStatement]\n"
+                      "[test.cpp:3:22]: (warning) Redundant code: Found unused cast in expression 'static_cast<void>(nullptr)'. [constStatement]\n"
+                      "[test.cpp:4:5]: (warning) Redundant code: Found unused cast in expression '(void)NULL'. [constStatement]\n",
+                      errout_str());
+
         check("#define X  0\n"
-              "void f() { X; }");
+              "void f() { X; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void intarray() {
-        check("int arr[] = { 100/2, 1*100 };");
+        check("int arr[] = { 100/2, 1*100 };\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -197,7 +213,7 @@ class TestIncompleteStatement : public TestFixture {
         check("struct st arr[] = {\n"
               "    { 100/2, 1*100 }\n"
               "    { 90, 70 }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -205,14 +221,14 @@ class TestIncompleteStatement : public TestFixture {
         check("struct st arr[] = {\n"
               "    { 100/2, 1*100 }\n"
               "    { 90, 70 }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void conditionalcall() {
         check("void f() {\n"
               "    0==x ? X() : Y();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -220,7 +236,7 @@ class TestIncompleteStatement : public TestFixture {
         // #2462 - C++11 struct initialization
         check("void f() {\n"
               "    ABC abc{1,2,3};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6260 - C++11 array initialization
@@ -228,30 +244,30 @@ class TestIncompleteStatement : public TestFixture {
               "    static const char* a[][2] {\n"
               "        {\"b\", \"\"},\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #2482 - false positive for empty struct
-        check("struct A {};");
+        check("struct A {};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4387 - C++11 initializer list
-        check("A::A() : abc{0} {}");
+        check("A::A() : abc{0} {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5042 - C++11 initializer list
-        check("A::A() : abc::def<int>{0} {}");
+        check("A::A() : abc::def<int>{0} {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4503 - vector init
-        check("void f() { vector<int> v{1}; }");
+        check("void f() { vector<int> v{1}; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void returnstruct() {
         check("struct s foo() {\n"
               "    return (struct s){0,0};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4754
@@ -260,19 +276,19 @@ class TestIncompleteStatement : public TestFixture {
               "        {\"hi\", \"there\"},\n"
               "        {\"happy\", \"sad\"}\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct s foo() {\n"
               "  return (struct s){0};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void cast() {
         check("void f() {\n"
               "    ((struct foo *)(0x1234))->xy = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(const std::exception& e) {\n" // #10918
@@ -291,14 +307,14 @@ class TestIncompleteStatement : public TestFixture {
         check("void f() {\n"
               "    int x = 1;\n"
               "    x++, x++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void cpp11init() {
         check("void f() {\n"
               "    int x{1};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int> f(int* p) {\n"
@@ -310,7 +326,7 @@ class TestIncompleteStatement : public TestFixture {
     void cpp11init2() {
         check("x<string> handlers{\n"
               "  { \"mode2\", []() { return 2; } },\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -318,33 +334,33 @@ class TestIncompleteStatement : public TestFixture {
         check("struct A { void operator()(int); };\n"
               "void f() {\n"
               "A{}(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<class> struct A { void operator()(int); };\n"
               "void f() {\n"
               "A<int>{}(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void block() {
         check("void f() {\n"
               "    ({ do_something(); 0; });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "out:\n"
               "    ({ do_something(); 0; });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void mapindex() {
         check("void f() {\n"
               "  map[{\"1\",\"2\"}]=0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -352,7 +368,7 @@ class TestIncompleteStatement : public TestFixture {
         check("void foo(int,const char*,int);\n" // #8827
               "void f(int value) {\n"
               "    foo(42,\"test\",42),(value&42);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:22]: (warning) Found suspicious operator ',', result is not used. [constStatement]\n", errout_str());
 
         check("int f() {\n" // #11257
@@ -432,22 +448,22 @@ class TestIncompleteStatement : public TestFixture {
               "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) Redundant code: Found a statement that begins with numeric constant. [constStatement]\n"
                       "[test.cpp:3:6]: (warning) Redundant code: Found a statement that begins with numeric constant. [constStatement]\n"
-                      "[test.cpp:4:5]: (warning) Redundant code: Found a statement that begins with numeric constant. [constStatement]\n"
-                      "[test.cpp:5:6]: (warning) Redundant code: Found a statement that begins with numeric constant. [constStatement]\n"
+                      "[test.cpp:4:5]: (warning) Redundant code: Found unused cast in expression '(char)1'. [constStatement]\n"
+                      "[test.cpp:5:6]: (warning) Redundant code: Found unused cast in expression '(char)1'. [constStatement]\n"
                       "[test.cpp:6:5]: (warning, inconclusive) Found suspicious operator '!', result is not used. [constStatement]\n"
                       "[test.cpp:7:6]: (warning, inconclusive) Found suspicious operator '!', result is not used. [constStatement]\n"
-                      "[test.cpp:8:5]: (warning) Redundant code: Found unused cast of expression '!x'. [constStatement]\n"
+                      "[test.cpp:8:5]: (warning) Redundant code: Found unused cast in expression '(unsigned int)!x'. [constStatement]\n"
                       "[test.cpp:9:5]: (warning, inconclusive) Found suspicious operator '~', result is not used. [constStatement]\n",
                       errout_str());
 
-        check("void f1(int x) { x; }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f1(int x) { x; }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:1:18]: (warning) Unused variable value 'x' [constStatement]\n", errout_str());
 
-        check("void f() { if (Type t; g(t)) {} }"); // #9776
+        check("void f() { if (Type t; g(t)) {} }\n"); // #9776
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int x) { static_cast<unsigned>(x); }");
-        ASSERT_EQUALS("[test.cpp:1:38]: (warning) Redundant code: Found unused cast of expression 'x'. [constStatement]\n", errout_str());
+        check("void f(int x) { static_cast<unsigned>(x); }\n");
+        ASSERT_EQUALS("[test.cpp:1:38]: (warning) Redundant code: Found unused cast in expression 'static_cast<unsigned int>(x)'. [constStatement]\n", errout_str());
 
         check("void f(int x, int* p) {\n"
               "    static_cast<void>(x);\n"
@@ -457,7 +473,7 @@ class TestIncompleteStatement : public TestFixture {
               "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { false; }"); // #10856
+        check("void f() { false; }\n"); // #10856
         ASSERT_EQUALS("[test.cpp:1:12]: (warning) Redundant code: Found a statement that begins with bool constant. [constStatement]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -465,9 +481,9 @@ class TestIncompleteStatement : public TestFixture {
               "    static_cast<float>((char)i);\n"
               "    (char)static_cast<float>(i);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:5]: (warning) Redundant code: Found unused cast of expression 'i'. [constStatement]\n"
-                      "[test.cpp:3:23]: (warning) Redundant code: Found unused cast of expression 'i'. [constStatement]\n"
-                      "[test.cpp:4:5]: (warning) Redundant code: Found unused cast of expression 'i'. [constStatement]\n",
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) Redundant code: Found unused cast in expression '(float)(char)i'. [constStatement]\n"
+                      "[test.cpp:3:23]: (warning) Redundant code: Found unused cast in expression 'static_cast<float>((char)i)'. [constStatement]\n"
+                      "[test.cpp:4:5]: (warning) Redundant code: Found unused cast in expression '(char)static_cast<float>(i)'. [constStatement]\n",
                       errout_str());
 
         check("namespace M {\n"
@@ -476,7 +492,7 @@ class TestIncompleteStatement : public TestFixture {
               "void f(int i) {\n"
               "    (M::N::T)i;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5:5]: (warning) Redundant code: Found unused cast of expression 'i'. [constStatement]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) Redundant code: Found unused cast in expression '(T)i'. [constStatement]\n", errout_str());
 
         check("void f(int (g)(int a, int b)) {\n" // #10873
               "    int p = 0, q = 1;\n"
@@ -528,7 +544,7 @@ class TestIncompleteStatement : public TestFixture {
               "    for (L\"y\"; ;) {}\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Unused variable value 'i' [constStatement]\n"
-                      "[test.cpp:3:10]: (warning) Redundant code: Found unused cast of expression 'i'. [constStatement]\n"
+                      "[test.cpp:3:10]: (warning) Redundant code: Found unused cast in expression '(long)i'. [constStatement]\n"
                       "[test.cpp:4:10]: (warning) Redundant code: Found a statement that begins with numeric constant. [constStatement]\n"
                       "[test.cpp:5:10]: (warning) Redundant code: Found a statement that begins with bool constant. [constStatement]\n"
                       "[test.cpp:6:10]: (warning) Redundant code: Found a statement that begins with character constant. [constStatement]\n"
@@ -696,8 +712,8 @@ class TestIncompleteStatement : public TestFixture {
               "    NULL;\n"
               "    nullptr;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:5]: (warning) Redundant code: Found a statement that begins with NULL constant. [constStatement]\n"
-                      "[test.cpp:3:5]: (warning) Redundant code: Found a statement that begins with NULL constant. [constStatement]\n",
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) Redundant code: Found a statement that begins with null constant. [constStatement]\n"
+                      "[test.cpp:3:5]: (warning) Redundant code: Found a statement that begins with null constant. [constStatement]\n",
                       errout_str());
 
         check("struct S { int i; };\n" // #6504
@@ -750,59 +766,72 @@ class TestIncompleteStatement : public TestFixture {
               "    g<sizeof(wchar_t)>();\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("struct S;\n" // #14664
+              "S* a[1];\n"
+              "void f() {\n"
+              "    a[0];\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:6]: (warning) Redundant code: Found unused array access. [constStatement]\n",
+                      errout_str());
+
+        check("int f(int i) {\n" // #14889
+              "    return i ? 8 : ({ int x = 2; x; });\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void vardecl() {
         // #8984
-        check("void f() { a::b *c = d(); }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f() { a::b *c = d(); }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { std::vector<b> *c; }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f() { std::vector<b> *c; }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { a::b &c = d(); }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f() { a::b &c = d(); }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { std::vector<b> &c; }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f() { std::vector<b> &c; }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { a::b &&c = d(); }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f() { a::b &&c = d(); }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { std::vector<b> &&c; }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f() { std::vector<b> &&c; }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { char * const * a, * const * b; }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f() { char * const * a, * const * b; }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { char * const * a = 0, * volatile restrict * b; }", dinit(CheckOptions, $.inconclusive = true, $.cpp = false));
+        check("void f() { char * const * a = 0, * volatile restrict * b; }\n", dinit(CheckOptions, $.inconclusive = true, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { char * const * a = 0, * volatile const * b; }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f() { char * const * a = 0, * volatile const * b; }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
     void archive() {
         check("void f(Archive &ar) {\n"
               "  ar & x;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int ar) {\n"
               "  ar & x;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2:6]: (warning, inconclusive) Found suspicious operator '&', result is not used. [constStatement]\n", errout_str());
     }
 
     void ast() {
-        check("struct c { void a() const { for (int x=0; x;); } };", dinit(CheckOptions, $.inconclusive = true));
+        check("struct c { void a() const { for (int x=0; x;); } };\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
     void oror() {
         check("void foo() {\n"
               "    params_given (params, \"overrides\") || (overrides = \"1\");\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::ifstream& file) {\n" // #10930
diff --git a/test/testinternal.cpp b/test/testinternal.cpp
index 009129c5dc1..61c36a8e7dd 100644
--- a/test/testinternal.cpp
+++ b/test/testinternal.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@ class TestInternal : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckInternal>(tokenizer, this);
+        CheckInternal check;
+        runChecks(check, tokenizer, *this);
     }
 
     void simplePatternInTokenMatch() {
diff --git a/test/testio.cpp b/test/testio.cpp
index b402f5c0aa1..ad95345e1fd 100644
--- a/test/testio.cpp
+++ b/test/testio.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,13 +44,16 @@ class TestIO : public TestFixture {
         TEST_CASE(fileIOwithoutPositioning);
         TEST_CASE(seekOnAppendedFile);
         TEST_CASE(fflushOnInputStream);
+        TEST_CASE(ftellCompatibility);
         TEST_CASE(incompatibleFileOpen);
+        TEST_CASE(testWrongfeofUsage); // #958
 
         TEST_CASE(testScanf1); // Scanf without field limiters
         TEST_CASE(testScanf2);
         TEST_CASE(testScanf3); // #3494
         TEST_CASE(testScanf4); // #ticket 2553
         TEST_CASE(testScanf5); // #10632
+        TEST_CASE(testScanf6);
 
         mNewTemplate = false;
         TEST_CASE(testScanfArgument);
@@ -109,61 +112,62 @@ class TestIO : public TestFixture {
 
         // Check..
         if (options.onlyFormatStr) {
-            CheckIO checkIO(&tokenizer, &settings1, this);
+            CheckIOImpl checkIO(&tokenizer, settings1, *this);
             checkIO.checkWrongPrintfScanfArguments();
             return;
         }
-        runChecks<CheckIO>(tokenizer, this);
+        CheckIO check;
+        runChecks(check, tokenizer, *this);
     }
 
     void coutCerrMisusage() {
         check(
             "void foo() {\n"
             "  std::cout << std::cout;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (error) Invalid usage of output stream: '<< std::cout'. [coutCerrMisusage]\n", errout_str());
 
         check(
             "void foo() {\n"
             "  std::cout << (std::cout);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (error) Invalid usage of output stream: '<< std::cout'. [coutCerrMisusage]\n", errout_str());
 
         check(
             "void foo() {\n"
             "  std::cout << \"xyz\" << std::cout;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (error) Invalid usage of output stream: '<< std::cout'. [coutCerrMisusage]\n", errout_str());
 
         check(
             "void foo(int i) {\n"
             "  std::cout << i << std::cerr;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (error) Invalid usage of output stream: '<< std::cerr'. [coutCerrMisusage]\n", errout_str());
 
         check(
             "void foo() {\n"
             "  std::cout << \"xyz\";\n"
             "  std::cout << \"xyz\";\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo() {\n"
             "  std::cout << std::cout.good();\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo() {\n"
             "    unknownObject << std::cout;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo() {\n"
             "  MACRO(std::cout <<, << std::cout)\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -176,7 +180,7 @@ class TestIO : public TestFixture {
               "    fread(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
@@ -184,7 +188,7 @@ class TestIO : public TestFixture {
               "    fread(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("[test.cpp:5:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
@@ -192,7 +196,7 @@ class TestIO : public TestFixture {
               "    fread(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:5:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
@@ -200,7 +204,7 @@ class TestIO : public TestFixture {
               "    fread(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("[test.cpp:5:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
@@ -208,7 +212,7 @@ class TestIO : public TestFixture {
               "    fread(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("[test.cpp:5:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
@@ -216,7 +220,7 @@ class TestIO : public TestFixture {
               "    fread(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:5:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
@@ -224,55 +228,55 @@ class TestIO : public TestFixture {
               "    fread(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("[test.cpp:5:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = fopen(name, \"r+\");\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _wfopen(name, L\"r+\");\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _tfopen(name, _T(\"r+\"));\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _tfopen(name, _T(\"r+\"));\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    _wfopen_s(&f, name, L\"r+\");\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    _tfopen_s(&f, name, _T(\"r+\"));\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    _tfopen_s(&f, name, _T(\"r+\"));\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = tmpfile();\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("", errout_str());
 
         // Write mode
@@ -281,19 +285,19 @@ class TestIO : public TestFixture {
               "    fwrite(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (error) Read operation on a file that was opened only for writing. [readWriteOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = fopen(name, \"w+\");\n"
               "    fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = tmpfile();\n"
               "    fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Append mode
@@ -302,14 +306,14 @@ class TestIO : public TestFixture {
               "    fwrite(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Repositioning operation performed on a file opened in append mode has no effect. [seekOnAppendedFile]\n"
                       "[test.cpp:5:5]: (error) Read operation on a file that was opened only for writing. [readWriteOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = fopen(name, \"a+\");\n"
               "    fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Variable declared locally
@@ -317,7 +321,7 @@ class TestIO : public TestFixture {
               "    FILE* f = fopen(name, \"r\");\n"
               "    fwrite(buffer, 5, 6, f);\n"
               "    fclose(f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         // Call unknown function
@@ -326,60 +330,60 @@ class TestIO : public TestFixture {
               "    fwrite(buffer, 5, 6, f);\n"
               "    bar(f);\n"
               "    fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // freopen and tmpfile
         check("void foo(FILE*& f) {\n"
               "    f = freopen(name, \"r\", f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _wfreopen(name, L\"r\", f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _tfreopen(name, _T(\"r\"), f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _tfreopen(name, _T(\"r\"), f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _wfreopen_s(&f, name, L\"r\", f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _tfreopen_s(&f, name, _T(\"r\"), f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _tfreopen_s(&f, name, _T(\"r\"), f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         // Crash tests
         check("void foo(FILE*& f) {\n"
               "    f = fopen(name, mode);\n" // No assertion failure (#3830)
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void fopen(std::string const &filepath, std::string const &mode);"); // #3832
+        check("void fopen(std::string const &filepath, std::string const &mode);\n"); // #3832
     }
 
     void wrongMode_complex() {
@@ -388,7 +392,7 @@ class TestIO : public TestFixture {
               "    else  f = fopen(name, \"r\");\n"
               "    if(a) fwrite(buffer, 5, 6, f);\n"
               "    else  fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -397,14 +401,14 @@ class TestIO : public TestFixture {
               "    else  f = fopen(name, \"r\");\n"
               "    if(a) fwrite(buffer, 5, 6, f);\n"
               "    else  fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    FILE* f = fopen(name, \"w\");\n"
               "    if(a) fwrite(buffer, 5, 6, f);\n"
               "    else  fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Read operation on a file that was opened only for writing. [readWriteOnlyFile]\n", errout_str());
     }
 
@@ -417,7 +421,7 @@ class TestIO : public TestFixture {
               "    ungetc('a', f);\n"
               "    ungetwc(L'a', f);\n"
               "    rewind(f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Used file that is not opened. [useClosedFile]\n"
                       "[test.cpp:4:5]: (error) Used file that is not opened. [useClosedFile]\n"
                       "[test.cpp:5:5]: (error) Used file that is not opened. [useClosedFile]\n"
@@ -431,40 +435,40 @@ class TestIO : public TestFixture {
               "        return;"
               "    }\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    fclose(f);\n"
               "    f = fopen(name, \"r\");\n"
               "    fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = fopen(name, \"r\");\n"
               "    f = g;\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    FILE* f;\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Used file that is not opened. [useClosedFile]\n", errout_str());
 
         check("void foo() {\n"
               "    FILE* f(stdout);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // #3965
               "    FILE* f[3];\n"
               "    f[0] = fopen(name, mode);\n"
               "    fclose(f[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4368: multiple functions
@@ -487,7 +491,7 @@ class TestIO : public TestFixture {
               "  dump();\n"
               "  close();\n"
               "  return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static FILE *fp = NULL;\n"
@@ -501,7 +505,7 @@ class TestIO : public TestFixture {
               "{\n"
               "  fclose(fp);\n"
               "  fprintf(fp, \"Here's the output.\\n\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:11:3]: (error) Used file that is not opened. [useClosedFile]\n", errout_str());
 
         // #4466
@@ -514,7 +518,7 @@ class TestIO : public TestFixture {
               "            fclose(infile);\n"
               "            return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void chdcd_parse_nero(FILE *infile) {\n"
@@ -526,7 +530,7 @@ class TestIO : public TestFixture {
               "            fclose(infile);\n"
               "            return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4649
@@ -536,15 +540,37 @@ class TestIO : public TestFixture {
               "    a.f2 = fopen(name,mode);\n"
               "    fclose(a.f1);\n"
               "    fclose(a.f2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #1473
         check("void foo() {\n"
               "    FILE *a = fopen(\"aa\", \"r\");\n"
               "    while (fclose(a)) {}\n"
-              "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3:5]: (error) Used file that is not opened. [useClosedFile]\n", "", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12]: (warning) fclose() used as loop condition may skip loop body or double-close file handle. [fcloseInLoopCondition]\n", errout_str());
+
+        check("void foo() {\n"
+              "    FILE *a = fopen(\"aa\", \"r\");\n"
+              "    while (fclose(a)) {\n"
+              "         break;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void foo() {\n"
+              "    FILE *a = fopen(\"aa\", \"r\");\n"
+              "    while (fclose(a)) {\n"
+              "        a = fopen(\"aa\", \"r\");\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void foo() {\n"
+              "    FILE *a = fopen(\"aa\", \"r\");\n"
+              "    do {} while (fclose(a));\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:18]: (warning) fclose() used as loop condition may skip loop body or double-close file handle. [fcloseInLoopCondition]\n", errout_str());
 
         // #6823
         check("void foo() {\n"
@@ -553,7 +579,7 @@ class TestIO : public TestFixture {
               "    f[1] = fopen(\"2\", \"w\");\n"
               "    fclose(f[0]);\n"
               "    fclose(f[1]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #12236
@@ -569,13 +595,13 @@ class TestIO : public TestFixture {
         check("void foo(FILE* f) {\n"
               "    fwrite(buffer, 5, 6, f);\n"
               "    fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour. [IOWithoutPositioning]\n", errout_str());
 
         check("void foo(FILE* f) {\n"
               "    fread(buffer, 5, 6, f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour. [IOWithoutPositioning]\n", errout_str());
 
         check("void foo(FILE* f, bool read) {\n"
@@ -583,42 +609,42 @@ class TestIO : public TestFixture {
               "        fread(buffer, 5, 6, f);\n"
               "    else\n"
               "        fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE* f) {\n"
               "    fread(buffer, 5, 6, f);\n"
               "    fflush(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE* f) {\n"
               "    fread(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE* f) {\n"
               "    fread(buffer, 5, 6, f);\n"
               "    fsetpos(f, pos);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE* f) {\n"
               "    fread(buffer, 5, 6, f);\n"
               "    fseek(f, 0, SEEK_SET);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE* f) {\n"
               "    fread(buffer, 5, 6, f);\n"
               "    long pos = ftell(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour. [IOWithoutPositioning]\n", errout_str());
 
         // #6452 - member functions
@@ -631,7 +657,7 @@ class TestIO : public TestFixture {
               "    int bytesRead = fread(aboutToOverwrite.data(), 1, bufferLength, d->file);\n"
               "    seek(writePosition);\n"
               "    fwrite(buffer.data(), sizeof(char), buffer.size(), d->file);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class FileStream {\n"
@@ -642,7 +668,7 @@ class TestIO : public TestFixture {
               "    int bytesRead = fread(aboutToOverwrite.data(), 1, bufferLength, d->file);\n"
               "    unknown(writePosition);\n"
               "    fwrite(buffer.data(), sizeof(char), buffer.size(), d->file);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class FileStream {\n"
@@ -654,7 +680,7 @@ class TestIO : public TestFixture {
               "    int bytesRead = fread(aboutToOverwrite.data(), 1, bufferLength, d->file);\n"
               "    known(writePosition);\n"
               "    fwrite(buffer.data(), sizeof(char), buffer.size(), d->file);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:5]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour. [IOWithoutPositioning]\n", errout_str());
 
         check("class FileStream {\n"
@@ -666,33 +692,50 @@ class TestIO : public TestFixture {
               "    int bytesRead = fread(X::data(), 1, bufferLength, d->file);\n"
               "    known(writePosition);\n"
               "    fwrite(X::data(), sizeof(char), buffer.size(), d->file);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:5]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour. [IOWithoutPositioning]\n", errout_str());
+
+        check("struct MemStream {\n"
+              "    char buf[1024];\n"
+              "    int pos = 0;\n"
+              "    void fwrite(const void *ptr, size_t n) { memcpy(buf + pos, ptr, n); pos += (int)n; }\n"
+              "};\n"
+              "struct FileStream {\n"
+              "    FILE *fp;\n"
+              "    size_t _fread(void *ptr, size_t n) { return ::fread(ptr, 1, n, fp); }\n"
+              "    size_t fread(void *ptr, size_t n) { return _fread(ptr, n); }\n"
+              "    void copy_to(MemStream *dst, size_t n) {\n"
+              "        char tmp[256];\n"
+              "        fread(tmp, n);\n"
+              "        dst->fwrite(tmp, n);\n"
+              "    }\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void seekOnAppendedFile() {
         check("void foo() {\n"
               "    FILE* f = fopen(\"\", \"a+\");\n"
               "    fseek(f, 0, SEEK_SET);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    FILE* f = fopen(\"\", \"w\");\n"
               "    fseek(f, 0, SEEK_SET);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    FILE* f = fopen(\"\", \"a\");\n"
               "    fseek(f, 0, SEEK_SET);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Repositioning operation performed on a file opened in append mode has no effect. [seekOnAppendedFile]\n", errout_str());
 
         check("void foo() {\n"
               "    FILE* f = fopen(\"\", \"a\");\n"
               "    fflush(f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // #5578
 
         check("void foo() {\n"
@@ -700,38 +743,54 @@ class TestIO : public TestFixture {
               "    fclose(f);\n"
               "    f = fopen(\"\", \"r\");\n"
               "    fseek(f, 0, SEEK_SET);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // #6566
     }
 
+    void ftellCompatibility() {
+
+        check("void foo() {\n"
+              "     FILE *f = fopen(\"\", \"rt\");\n"
+              "     if (f)\n"
+              "     {\n"
+              "         extern long position;\n"
+              "         fseek(f, 0, SEEK_END);\n"
+              "         position = ftell(f);\n"
+              "         fclose(f);\n"
+              "     }\n"
+              "}\n", dinit(CheckOptions, $.portability = true));
+        ASSERT_EQUALS("[test.cpp:7:21]: (portability) ftell() result is unspecified when file is opened in mode \"t\" [ftellTextModeFile]\n", errout_str());
+    }
+
+
     void fflushOnInputStream() {
         check("void foo()\n"
               "{\n"
               "    fflush(stdin);\n"
-              "}", dinit(CheckOptions, $.portability = true));
+              "}\n", dinit(CheckOptions, $.portability = true));
         ASSERT_EQUALS("[test.cpp:3:5]: (portability) fflush() called on input stream 'stdin' may result in undefined behaviour on non-linux systems. [fflushOnInputStream]\n", errout_str());
 
         check("void foo()\n"
               "{\n"
               "    fflush(stdout);\n"
-              "}", dinit(CheckOptions, $.portability = true));
+              "}\n", dinit(CheckOptions, $.portability = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = fopen(path, \"r\");\n"
               "    fflush(f);\n"
-              "}", dinit(CheckOptions, $.portability = true));
+              "}\n", dinit(CheckOptions, $.portability = true));
         ASSERT_EQUALS("[test.cpp:3:5]: (portability) fflush() called on input stream 'f' may result in undefined behaviour on non-linux systems. [fflushOnInputStream]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = fopen(path, \"w\");\n"
               "    fflush(f);\n"
-              "}", dinit(CheckOptions, $.portability = true));
+              "}\n", dinit(CheckOptions, $.portability = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    fflush(f);\n"
-              "}", dinit(CheckOptions, $.portability = true));
+              "}\n", dinit(CheckOptions, $.portability = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -739,10 +798,59 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    FILE *f1 = fopen(\"tmp\", \"wt\");\n"
               "    FILE *f2 = fopen(\"tmp\", \"rt\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (warning) The file '\"tmp\"' is opened for read and write access at the same time on different streams [incompatibleFileOpen]\n", errout_str());
     }
 
+    void testWrongfeofUsage() { // ticket #958
+        check("void foo(FILE * fp) {\n"
+              "  while (!feof(fp)) \n"
+              "  {\n"
+              "     char line[100];\n"
+              "     fgets(line, sizeof(line), fp);\n"
+              "     dostuff(line);\n"
+              "  }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (warning) Using feof() as a loop condition causes the last line to be processed twice. [wrongfeofUsage]\n", errout_str());
+
+        check("int foo(FILE *fp) {\n"
+              "  char line[100];\n"
+              "  while (fgets(line, sizeof(line), fp)) {}\n"
+              "  if (!feof(fp))\n"
+              "    return 1;\n"
+              "  return 0;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void foo(FILE *fp){\n"
+              "  char line[100];\n"
+              "  fgets(line, sizeof(line), fp);\n"
+              "  while (!feof(fp)){\n"
+              "    dostuff(line);\n"
+              "    fgets(line, sizeof(line), fp);"
+              "  }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void foo(FILE *fp) {\n"
+              "  char line[100];\n"
+              "  do {\n"
+              "    fgets(line, sizeof(line), fp);\n"
+              "    dostuff(line);\n"
+              "  } while (!feof(fp));\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:12]: (warning) Using feof() as a loop condition causes the last line to be processed twice. [wrongfeofUsage]\n", errout_str());
+
+        check("void foo(FILE *fp) {\n"
+              "  char line[100];\n"
+              "  do {\n"
+              "    dostuff(line);\n"
+              "    fgets(line, sizeof(line), fp);\n"
+              "  } while (!feof(fp));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
 
     void testScanf1() {
         check("void foo() {\n"
@@ -754,7 +862,7 @@ class TestIO : public TestFixture {
               "    sscanf(foo, \"%[^~]\", bar);\n"
               "    scanf(\"%dx%s\", &b, bar);\n"
               "    fclose(file);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (warning) fscanf() without field width limits can crash with huge input data. [invalidscanf]\n"
                       "[test.cpp:5:9]: (warning) scanf() without field width limits can crash with huge input data. [invalidscanf]\n"
                       "[test.cpp:6:9]: (warning) scanf() without field width limits can crash with huge input data. [invalidscanf]\n"
@@ -770,7 +878,7 @@ class TestIO : public TestFixture {
               "    scanf(\"aa%d\", &a);\n" // No %s
               "    scanf(\"aa%ld\", &a);\n" // No %s
               "    scanf(\"%*[^~]\");\n" // Ignore input
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) scanf format string requires 0 parameters but 1 is given. [wrongPrintfScanfArgNum]\n", errout_str());
     }
 
@@ -780,7 +888,7 @@ class TestIO : public TestFixture {
               "  scanf(\"%7c\", str);\n"
               "  scanf(\"%8c\", str);\n"
               "  scanf(\"%9c\", str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:3]: (error) Width 9 given in format string (no. 1) is larger than destination buffer 'str[8]', use %8c to prevent overflowing it. [invalidScanfFormatWidth]\n", errout_str());
     }
 
@@ -789,7 +897,7 @@ class TestIO : public TestFixture {
               "{\n"
               "  char str [8];\n"
               "  scanf (\"%70s\",str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:3]: (error) Width 70 given in format string (no. 1) is larger than destination buffer 'str[8]', use %7s to prevent overflowing it. [invalidScanfFormatWidth]\n", errout_str());
     }
 
@@ -797,14 +905,22 @@ class TestIO : public TestFixture {
         check("char s1[42], s2[42];\n"
               "void test() {\n"
               "    scanf(\"%42s%42[a-z]\", s1, s2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Width 42 given in format string (no. 1) is larger than destination buffer 's1[42]', use %41s to prevent overflowing it. [invalidScanfFormatWidth]\n"
                       "[test.cpp:3:5]: (error) Width 42 given in format string (no. 2) is larger than destination buffer 's2[42]', use %41[a-z] to prevent overflowing it. [invalidScanfFormatWidth]\n", errout_str());
     }
 
+    void testScanf6() {
+        ASSERT_NO_THROW(check("int f(const char *p) {\n"
+                              "        char a[3];\n"
+                              "        return sscanf(p, \"%02s\", a);\n"
+                              "}\n"));
+        ASSERT_EQUALS("", errout_str());
+    }
+
 
 #define TEST_SCANF_CODE(format, type) \
-    "void f(){" type " x; scanf(\"" format "\", &x);}"
+    "void f(){" type " x; scanf(\"" format "\", &x);}\n"
 
 #define TEST_SCANF_ERR(format, formatStr, type) \
     "[test.c:1]: (warning) " format " in format string (no. 1) requires '" formatStr " *' but the argument type is '" type " *'.\n"
@@ -819,7 +935,7 @@ class TestIO : public TestFixture {
     TEST_SCANF_ERR_AKA_("test.cpp", format, formatStr, type, akaType)
 
 #define TEST_PRINTF_CODE(format, type) \
-    "void f(" type " x){printf(\"" format "\", x);}"
+    "void f(" type " x){printf(\"" format "\", x);}\n"
 
 #define TEST_PRINTF_ERR(format, requiredType, actualType) \
     "[test.c:1]: (warning) " format " in format string (no. 1) requires '" requiredType "' but the argument type is '" actualType "'.\n"
@@ -958,7 +1074,7 @@ class TestIO : public TestFixture {
               "    scanf(\"%*1x %1x %29s\", &count, KeyName);\n" // #3373
               "    fscanf(f, \"%7ms\", &ref);\n" // #3461
               "    sscanf(ip_port, \"%*[^:]:%4d\", &port);\n" // #3468
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -966,7 +1082,7 @@ class TestIO : public TestFixture {
               "    scanf(\"%1d\", &foo, &bar);\n"
               "    fscanf(bar, \"%1d\", &foo, &bar);\n"
               "    scanf(\"%*1x %1x %29s\", &count, KeyName, foo);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) scanf format string requires 0 parameters but 1 is given.\n"
                       "[test.cpp:3]: (warning) scanf format string requires 1 parameter but 2 are given.\n"
                       "[test.cpp:4]: (warning) fscanf format string requires 1 parameter but 2 are given.\n"
@@ -977,7 +1093,7 @@ class TestIO : public TestFixture {
               "    scanf(\"%1u%1u\", bar());\n"
               "    sscanf(bar, \"%1d%1d\", &foo);\n"
               "    scanf(\"%*1x %1x %29s\", &count);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (error) scanf format string requires 1 parameter but only 0 are given.\n"
                       "[test.cpp:3]: (error) scanf format string requires 2 parameters but only 1 is given.\n"
                       "[test.cpp:4]: (error) sscanf format string requires 2 parameters but only 1 is given.\n"
@@ -989,7 +1105,7 @@ class TestIO : public TestFixture {
               "    sscanf(input, \"%3s\", output);\n"
               "    sscanf(input, \"%4s\", output);\n"
               "    sscanf(input, \"%5s\", output);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6]: (error) Width 5 given in format string (no. 1) is larger than destination buffer 'output[5]', use %4s to prevent overflowing it.\n", errout_str());
 
         check("void foo() {\n"
@@ -999,7 +1115,7 @@ class TestIO : public TestFixture {
               "    sscanf(input, \"%3s\", output);\n"
               "    sscanf(input, \"%4s\", output);\n"
               "    sscanf(input, \"%5s\", output);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:5]: (warning, inconclusive) Width 3 given in format string (no. 1) is smaller than destination buffer 'output[5]'.\n"
                       "[test.cpp:7]: (error) Width 5 given in format string (no. 1) is larger than destination buffer 'output[5]', use %4s to prevent overflowing it.\n"
                       "[test.cpp:4]: (warning) sscanf() without field width limits can crash with huge input data.\n", errout_str());
@@ -1011,7 +1127,7 @@ class TestIO : public TestFixture {
               "    bufT projectId= {0};\n"
               "    const int scanrc=sscanf(line, \"Project(\\\"{%36s}\\\")\", projectId);\n"
               "    sscanf(input, \"%5s\", output);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:6]: (warning, inconclusive) Width 36 given in format string (no. 1) is smaller than destination buffer 'projectId[2048]'.\n", errout_str());
 
         check("void foo(unsigned int i) {\n"
@@ -1024,7 +1140,7 @@ class TestIO : public TestFixture {
               "  scanf(\"%t\", &i);\n"
               "  scanf(\"%L\", &i);\n"
               "  scanf(\"%I\", &i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) 'h' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
                       "[test.cpp:3]: (warning) 'hh' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
                       "[test.cpp:4]: (warning) 'l' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
@@ -1080,13 +1196,13 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%u\", \"s3\");\n"
               "    scanf(\"%u\", L\"s5W\");\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 1) requires 'unsigned int *' but the argument type is 'const char *'.\n"
                       "[test.cpp:3]: (warning) %u in format string (no. 1) requires 'unsigned int *' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("void foo(long l) {\n"
               "    scanf(\"%u\", l);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 1) requires 'unsigned int *' but the argument type is 'signed long'.\n", errout_str());
 
         TEST_SCANF_WARN("%lu","unsigned long","bool");
@@ -1468,13 +1584,13 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%Ld\", \"s3\");\n"
               "    scanf(\"%Ld\", L\"s5W\");\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %Ld in format string (no. 1) requires 'long long *' but the argument type is 'const char *'.\n"
                       "[test.cpp:3]: (warning) %Ld in format string (no. 1) requires 'long long *' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("void foo(int i) {\n"
               "    scanf(\"%Ld\", i);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %Ld in format string (no. 1) requires 'long long *' but the argument type is 'signed int'.\n", errout_str());
 
         TEST_SCANF_WARN("%ju", "uintmax_t", "bool");
@@ -1945,13 +2061,13 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%d\", \"s3\");\n"
               "    scanf(\"%d\", L\"s5W\");\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 1) requires 'int *' but the argument type is 'const char *'.\n"
                       "[test.cpp:3]: (warning) %d in format string (no. 1) requires 'int *' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("void foo(long l) {\n"
               "    scanf(\"%d\", l);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 1) requires 'int *' but the argument type is 'signed long'.\n", errout_str());
 
         TEST_SCANF_WARN("%x", "unsigned int", "bool");
@@ -1989,13 +2105,13 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%x\", \"s3\");\n"
               "    scanf(\"%x\", L\"s5W\");\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %x in format string (no. 1) requires 'unsigned int *' but the argument type is 'const char *'.\n"
                       "[test.cpp:3]: (warning) %x in format string (no. 1) requires 'unsigned int *' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("void foo(long l) {\n"
               "    scanf(\"%x\", l);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %x in format string (no. 1) requires 'unsigned int *' but the argument type is 'signed long'.\n", errout_str());
 
         TEST_SCANF_WARN("%f", "float", "bool");
@@ -2029,13 +2145,13 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%f\", \"s3\");\n"
               "    scanf(\"%f\", L\"s5W\");\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %f in format string (no. 1) requires 'float *' but the argument type is 'const char *'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 1) requires 'float *' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("void foo(float f) {\n"
               "    scanf(\"%f\", f);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %f in format string (no. 1) requires 'float *' but the argument type is 'float'.\n", errout_str());
 
         TEST_SCANF_WARN("%lf", "double", "bool");
@@ -2125,13 +2241,13 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%n\", \"s3\");\n"
               "    scanf(\"%n\", L\"s5W\");\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %n in format string (no. 1) requires 'int *' but the argument type is 'const char *'.\n"
                       "[test.cpp:3]: (warning) %n in format string (no. 1) requires 'int *' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("void foo(long l) {\n"
               "    scanf(\"%n\", l);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %n in format string (no. 1) requires 'int *' but the argument type is 'signed long'.\n", errout_str());
 
         check("void g() {\n" // #5104
@@ -2145,7 +2261,7 @@ class TestIO : public TestFixture {
               "    scanf(\"%lf\",&v4[0]);\n"
               "    myvector<char *> v5(1);\n"
               "    scanf(\"%10s\",v5[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -2177,7 +2293,7 @@ class TestIO : public TestFixture {
             check("void g() {\n"
                   "    const char c[]=\"42\";\n"
                   "    scanf(\"%s\", c);\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("[test.cpp:3]: (warning) %s in format string (no. 1) requires a 'char *' but the argument type is 'const char *'.\n"
                           "[test.cpp:3]: (warning) scanf() without field width limits can crash with huge input data.\n", errout_str());
         }
@@ -2187,7 +2303,7 @@ class TestIO : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %i in format string (no. 1) requires 'int *' but the argument type is 'const char *'.\n", errout_str());
 
-        check("struct S { unsigned char a[1]; };" // #14302
+        check("struct S { unsigned char a[1]; };\n" // #14302
               "void f(S s) {\n"
               "    scanf(\"%hhu\", s.a);\n"
               "}\n");
@@ -2205,7 +2321,7 @@ class TestIO : public TestFixture {
               "    snprintf(str,10,\"%u%s\");\n"
               "    sprintf(string1, \"%-*.*s\", 32, string2);\n" // #3364
               "    snprintf(a, 9, \"%s%d\", \"11223344\");\n" // #3655
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (error) printf format string requires 1 parameter but only 0 are given.\n"
                       "[test.cpp:3]: (error) printf format string requires 2 parameters but only 1 is given.\n"
                       "[test.cpp:4]: (error) printf format string requires 3 parameters but only 2 are given.\n"
@@ -2220,7 +2336,7 @@ class TestIO : public TestFixture {
               "    printf(\"\", 0);\n"
               "    printf(\"%i\", 123, bar());\n"
               "    printf(\"%i%s\", 0, bar(), 43123);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) printf format string requires 0 parameters but 1 is given.\n"
                       "[test.cpp:3]: (warning) printf format string requires 1 parameter but 2 are given.\n"
                       "[test.cpp:4]: (warning) printf format string requires 2 parameters but 3 are given.\n", errout_str());
@@ -2230,7 +2346,7 @@ class TestIO : public TestFixture {
               "    swprintf(string1, L\"%s%s\", L\"a\", string2);\n" // MSVC implementation
               "    swprintf(string1, 6, L\"%i\", 32, string2);\n" // Standard implementation
               "    swprintf(string1, 6, L\"%i%s\", 32, string2);\n" // Standard implementation
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) swprintf format string requires 1 parameter but 2 are given.\n"
                       "[test.cpp:4]: (warning) swprintf format string requires 1 parameter but 2 are given.\n", errout_str());
 
@@ -2247,7 +2363,7 @@ class TestIO : public TestFixture {
               "    printf(\"string: %.*s\", len, string);\n" // #3311
               "    fprintf(stderr, \"%*cText.\", indent, ' ');\n" // #3313
               "    sprintf(string1, \"%*\", 32);\n" // #3364
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* s, const char* s2, std::string s3, int i) {\n"
@@ -2257,7 +2373,7 @@ class TestIO : public TestFixture {
               "    printf(\"%s\", s3);\n"
               "    printf(\"%s\", \"s4\");\n"
               "    printf(\"%u\", s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %s in format string (no. 1) requires 'char *' but the argument type is 'signed int'.\n"
                       "[test.cpp:4]: (warning) %s in format string (no. 2) requires 'char *' but the argument type is 'signed int'.\n"
                       "[test.cpp:5]: (warning) %s in format string (no. 1) requires 'char *' but the argument type is 'std::string'.\n"
@@ -2270,7 +2386,7 @@ class TestIO : public TestFixture {
               "    printf(\"%jo\", s3);\n"
               "    printf(\"%jx\", i);\n"
               "    printf(\"%jX\", i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %jd in format string (no. 1) requires 'intmax_t' but the argument type is 'char *'.\n"
                       "[test.cpp:3]: (warning) %ji in format string (no. 1) requires 'intmax_t' but the argument type is 'char *'.\n"
                       "[test.cpp:4]: (warning) %ju in format string (no. 1) requires 'uintmax_t' but the argument type is 'const char *'.\n"
@@ -2284,7 +2400,7 @@ class TestIO : public TestFixture {
               "    printf(\"%jd\", ui);\n"
               "    printf(\"%jd\", s3);\n"
               "    printf(\"%jd\", i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %ju in format string (no. 1) requires 'uintmax_t' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:4]: (warning) %jd in format string (no. 1) requires 'intmax_t' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:5]: (warning) %jd in format string (no. 1) requires 'intmax_t' but the argument type is 'std::string'.\n"
@@ -2297,7 +2413,7 @@ class TestIO : public TestFixture {
               "    printf(\"%n\", pi);\n"
               "    printf(\"%n\", s);\n"
               "    printf(\"%n\", \"s4\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %n in format string (no. 1) requires 'int *' but the argument type is 'signed int'.\n"
                       "[test.cpp:4]: (warning) %n in format string (no. 1) requires 'int *' but the argument type is 'signed int'.\n"
                       "[test.cpp:6]: (warning) %n in format string (no. 1) requires 'int *' but the argument type is 'std::string'.\n"
@@ -2305,7 +2421,7 @@ class TestIO : public TestFixture {
 
         check("void foo() {\n"
               "    printf(\"%n\", L\"s5W\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %n in format string (no. 1) requires 'int *' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("class foo {};\n"
@@ -2318,7 +2434,7 @@ class TestIO : public TestFixture {
               "    printf(\"%X\", bp);\n"
               "    printf(\"%X\", u);\n"
               "    printf(\"%X\", i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %X in format string (no. 1) requires 'unsigned int' but the argument type is 'foo'.\n"
                       "[test.cpp:4]: (warning) %c in format string (no. 1) requires 'unsigned int' but the argument type is 'const char *'.\n"
                       "[test.cpp:5]: (warning) %o in format string (no. 1) requires 'unsigned int' but the argument type is 'double'.\n"
@@ -2329,7 +2445,7 @@ class TestIO : public TestFixture {
               "void foo(const char* cpc, char* pc) {\n"
               "    printf(\"%x\", cpc);\n"
               "    printf(\"%x\", pc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %x in format string (no. 1) requires 'unsigned int' but the argument type is 'const char *'.\n"
                       "[test.cpp:4]: (warning) %x in format string (no. 1) requires 'unsigned int' but the argument type is 'char *'.\n", errout_str());
 
@@ -2339,7 +2455,7 @@ class TestIO : public TestFixture {
               "    printf(\"%X\", L\"s5W\");\n"
               "    printf(\"%c\", L\"s5W\");\n"
               "    printf(\"%o\", L\"s5W\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %x in format string (no. 1) requires 'unsigned int' but the argument type is 'const wchar_t *'.\n"
                       "[test.cpp:4]: (warning) %X in format string (no. 1) requires 'unsigned int' but the argument type is 'const wchar_t *'.\n"
                       "[test.cpp:5]: (warning) %c in format string (no. 1) requires 'unsigned int' but the argument type is 'const wchar_t *'.\n"
@@ -2355,7 +2471,7 @@ class TestIO : public TestFixture {
               "    printf(\"%i\", b);\n"
               "    printf(\"%i\", bp);\n"
               "    printf(\"%i\", uc);\n" // char is smaller than int, so there shouldn't be a problem
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %i in format string (no. 1) requires 'int' but the argument type is 'foo'.\n"
                       "[test.cpp:4]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'const char *'.\n"
                       "[test.cpp:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'double'.\n"
@@ -2367,7 +2483,7 @@ class TestIO : public TestFixture {
               "void foo() {\n"
               "    printf(\"%i\", L\"s5W\");\n"
               "    printf(\"%d\", L\"s5W\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %i in format string (no. 1) requires 'int' but the argument type is 'const wchar_t *'.\n"
                       "[test.cpp:4]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'const wchar_t *'.\n", errout_str());
 
@@ -2381,7 +2497,7 @@ class TestIO : public TestFixture {
               "    printf(\"%u\", b);\n"
               "    printf(\"%u\", bp);\n"
               "    printf(\"%u\", bo);\n" // bool shouldn't have a negative sign
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'foo'.\n"
                       "[test.cpp:4]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'const char *'.\n"
                       "[test.cpp:5]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'double'.\n"
@@ -2392,7 +2508,7 @@ class TestIO : public TestFixture {
         check("class foo {};\n"
               "void foo(const int* cpi, foo f, bar b, bar* bp, double d, int i, bool bo) {\n"
               "    printf(\"%u\", L\"s5W\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("class foo {};\n"
@@ -2402,7 +2518,7 @@ class TestIO : public TestFixture {
               "    printf(\"%p\", bp);\n"
               "    printf(\"%p\", cpi);\n"
               "    printf(\"%p\", b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %p in format string (no. 1) requires an address but the argument type is 'foo'.\n"
                       "[test.cpp:4]: (warning) %p in format string (no. 1) requires an address but the argument type is 'char'.\n", errout_str());
 
@@ -2414,7 +2530,7 @@ class TestIO : public TestFixture {
               "    printf(\"%p\", cpwc);\n"
               "    printf(\"%p\", \"s4\");\n"
               "    printf(\"%p\", L\"s5W\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class foo {};\n"
@@ -2426,7 +2542,7 @@ class TestIO : public TestFixture {
               "    printf(\"%f\", d);\n"
               "    printf(\"%f\", b);\n"
               "    printf(\"%f\", (float)cpi);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %e in format string (no. 1) requires 'double' but the argument type is 'foo'.\n"
                       "[test.cpp:4]: (warning) %E in format string (no. 1) requires 'double' but the argument type is 'const char *'.\n"
                       "[test.cpp:5]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'const signed int *'.\n"
@@ -2439,7 +2555,7 @@ class TestIO : public TestFixture {
               "    printf(\"%f\", cpc);\n"
               "    printf(\"%G\", pc);\n"
               "    printf(\"%f\", pc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %e in format string (no. 1) requires 'double' but the argument type is 'const char *'.\n"
                       "[test.cpp:4]: (warning) %E in format string (no. 1) requires 'double' but the argument type is 'char *'.\n"
                       "[test.cpp:5]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'const char *'.\n"
@@ -2452,7 +2568,7 @@ class TestIO : public TestFixture {
               "    printf(\"%E\", L\"s5W\");\n"
               "    printf(\"%f\", L\"s5W\");\n"
               "    printf(\"%G\", L\"s5W\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %e in format string (no. 1) requires 'double' but the argument type is 'const wchar_t *'.\n"
                       "[test.cpp:4]: (warning) %E in format string (no. 1) requires 'double' but the argument type is 'const wchar_t *'.\n"
                       "[test.cpp:5]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'const wchar_t *'.\n"
@@ -2463,7 +2579,7 @@ class TestIO : public TestFixture {
               "    printf(\"%u\", f);\n"
               "    printf(\"%f\", f);\n"
               "    printf(\"%p\", f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'foo'.\n"
                       "[test.cpp:4]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'foo'.\n"
                       "[test.cpp:5]: (warning) %p in format string (no. 1) requires an address but the argument type is 'foo'.\n", errout_str());
@@ -2473,14 +2589,14 @@ class TestIO : public TestFixture {
         check("void foo(signed char sc, unsigned char uc, short int si, unsigned short int usi) {\n"
               "  printf(\"%hhx %hhd\", sc, uc);\n"
               "  printf(\"%hd %hu\", si, usi);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %hhx in format string (no. 1) requires 'unsigned char' but the argument type is 'signed char'.\n"
                       "[test.cpp:2]: (warning) %hhd in format string (no. 2) requires 'char' but the argument type is 'unsigned char'.\n", errout_str());
 
         check("void foo(long long int lli, unsigned long long int ulli, long int li, unsigned long int uli) {\n"
               "  printf(\"%llo %llx\", lli, ulli);\n"
               "  printf(\"%ld %lu\", li, uli);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(intmax_t im, uintmax_t uim, size_t s, ptrdiff_t p, long double ld, std::size_t ss, std::ptrdiff_t sp) {\n"
@@ -2490,7 +2606,7 @@ class TestIO : public TestFixture {
               "  printf(\"%Lf\", ld);\n"
               "  printf(\"%zx\", ss);\n"
               "  printf(\"%ti\", sp);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unrecognized (and non-existent in standard library) specifiers.
@@ -2502,31 +2618,31 @@ class TestIO : public TestFixture {
               "  printf(\"%La\", ld);\n"
               "  printf(\"%zv\", ss);\n"
               "  printf(\"%tp\", sp);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(long long l, ptrdiff_t p, std::ptrdiff_t sp) {\n"
               "  printf(\"%td\", p);\n"
               "  printf(\"%td\", sp);\n"
               "  printf(\"%td\", l);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4]: (warning) %td in format string (no. 1) requires 'ptrdiff_t' but the argument type is 'signed long long'.\n", errout_str());
 
         check("void foo(int i, long double ld) {\n"
               "  printf(\"%zx %zu\", i, ld);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %zx in format string (no. 1) requires 'size_t' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %zu in format string (no. 2) requires 'size_t' but the argument type is 'long double'.\n", errout_str());
 
         check("void foo(unsigned int ui, long double ld) {\n"
               "  printf(\"%zu %zx\", ui, ld);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %zu in format string (no. 1) requires 'size_t' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %zx in format string (no. 2) requires 'size_t' but the argument type is 'long double'.\n", errout_str());
 
         check("void foo(int i, long double ld) {\n"
               "  printf(\"%tx %tu\", i, ld);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %tx in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %tu in format string (no. 2) requires 'unsigned ptrdiff_t' but the argument type is 'long double'.\n", errout_str());
 
@@ -2541,7 +2657,7 @@ class TestIO : public TestFixture {
               "  printf(\"%t\", i);\n"
               "  printf(\"%L\", i);\n"
               "  printf(\"%I\", i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) 'h' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
                       "[test.cpp:3]: (warning) 'hh' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
                       "[test.cpp:4]: (warning) 'l' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
@@ -2557,7 +2673,7 @@ class TestIO : public TestFixture {
               "  printf(\"%hhd\", i);\n"
               "  printf(\"%ld\", i);\n"
               "  printf(\"%lld\", i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %hd in format string (no. 1) requires 'short' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:3]: (warning) %hhd in format string (no. 1) requires 'char' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:4]: (warning) %ld in format string (no. 1) requires 'long' but the argument type is 'unsigned int'.\n"
@@ -2566,56 +2682,56 @@ class TestIO : public TestFixture {
         check("void foo(size_t s, ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix32));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix32));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'size_t {aka unsigned long}'.\n"
                       "[test.cpp:3]: (portability) %tu in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'ptrdiff_t {aka signed long}'.\n", errout_str());
 
         check("void foo(std::size_t s, std::ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix32));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix32));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'std::size_t {aka unsigned long}'.\n"
                       "[test.cpp:3]: (portability) %tu in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'std::ptrdiff_t {aka signed long}'.\n", errout_str());
 
         check("void foo(size_t s, ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'size_t {aka unsigned long}'.\n"
                       "[test.cpp:3]: (portability) %tu in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'ptrdiff_t {aka signed long}'.\n", errout_str());
 
         check("void foo(std::size_t s, std::ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'std::size_t {aka unsigned long}'.\n"
                       "[test.cpp:3]: (portability) %tu in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'std::ptrdiff_t {aka signed long}'.\n", errout_str());
 
         check("void foo(size_t s, ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'size_t {aka unsigned long}'.\n"
                       "[test.cpp:3]: (portability) %tu in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'ptrdiff_t {aka signed long}'.\n", errout_str());
 
         check("void foo(std::size_t s, std::ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'std::size_t {aka unsigned long}'.\n"
                       "[test.cpp:3]: (portability) %tu in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'std::ptrdiff_t {aka signed long}'.\n", errout_str());
 
         check("void foo(size_t s, ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'size_t {aka unsigned long long}'.\n"
                       "[test.cpp:3]: (portability) %tu in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'ptrdiff_t {aka signed long long}'.\n", errout_str());
 
         check("void foo(std::size_t s, std::ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'std::size_t {aka unsigned long long}'.\n"
                       "[test.cpp:3]: (portability) %tu in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'std::ptrdiff_t {aka signed long long}'.\n", errout_str());
 
@@ -2624,7 +2740,7 @@ class TestIO : public TestFixture {
               "  printf(\"%lu\", um);\n"
               "  printf(\"%llu\", s);\n"
               "  printf(\"%llu\", um);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %lu in format string (no. 1) requires 'unsigned long' but the argument type is 'size_t {aka unsigned long long}'.\n"
                       "[test.cpp:3]: (portability) %lu in format string (no. 1) requires 'unsigned long' but the argument type is 'uintmax_t {aka unsigned long long}'.\n"
                       "[test.cpp:4]: (portability) %llu in format string (no. 1) requires 'unsigned long long' but the argument type is 'size_t {aka unsigned long long}'.\n"
@@ -2637,7 +2753,7 @@ class TestIO : public TestFixture {
               "  printf(\"%llu\", i);\n"
               "  printf(\"%lx\", i);\n"
               "  printf(\"%llx\", i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %ld in format string (no. 1) requires 'long' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:3]: (warning) %lld in format string (no. 1) requires 'long long' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:4]: (warning) %lu in format string (no. 1) requires 'unsigned long' but the argument type is 'unsigned int'.\n"
@@ -2649,13 +2765,13 @@ class TestIO : public TestFixture {
               "  printf(\"%lld\", i);\n"
               "  printf(\"%lld\", im);\n"
               "  printf(\"%lld\", p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %lld in format string (no. 1) requires 'long long' but the argument type is 'signed int'.\n", errout_str());
 
         check("void foo(intmax_t im, ptrdiff_t p) {\n"
               "  printf(\"%lld\", im);\n"
               "  printf(\"%lld\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %lld in format string (no. 1) requires 'long long' but the argument type is 'intmax_t {aka signed long long}'.\n"
                       "[test.cpp:3]: (portability) %lld in format string (no. 1) requires 'long long' but the argument type is 'ptrdiff_t {aka signed long long}'.\n", errout_str());
 
@@ -2674,7 +2790,7 @@ class TestIO : public TestFixture {
               "    printf(\"%d %f %f %d %f %f\",\n"
               "        foo->d, foo->bar[0].i, a[0],\n"
               "        f[0].d, f[0].baz.i, f[0].bar[0].i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:13]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'double'.\n"
                       "[test.cpp:13]: (warning) %f in format string (no. 2) requires 'double' but the argument type is 'signed int'.\n"
                       "[test.cpp:13]: (warning) %f in format string (no. 3) requires 'double' but the argument type is 'int'.\n"
@@ -2683,7 +2799,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:13]: (warning) %f in format string (no. 6) requires 'double' but the argument type is 'int'.\n", errout_str());
 
         check("short f() { return 0; }\n"
-              "void foo() { printf(\"%d %u %lu %I64u %I64d %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%d %u %lu %I64u %I64d %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed short'.\n"
                       "[test.cpp:2]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed short'.\n"
                       "[test.cpp:2]: (warning) %I64u in format string (no. 4) requires 'unsigned __int64' but the argument type is 'signed short'.\n"
@@ -2693,7 +2809,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'signed short'.\n", errout_str());
 
         check("unsigned short f() { return 0; }\n"
-              "void foo() { printf(\"%u %d %ld %I64d %I64u %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%u %d %ld %I64d %I64u %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'unsigned short'.\n"
                       "[test.cpp:2]: (warning) %I64d in format string (no. 4) requires '__int64' but the argument type is 'unsigned short'.\n"
                       "[test.cpp:2]: (warning) %I64u in format string (no. 5) requires 'unsigned __int64' but the argument type is 'unsigned short'.\n"
@@ -2702,7 +2818,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'unsigned short'.\n", errout_str());
 
         check("int f() { return 0; }\n"
-              "void foo() { printf(\"%d %u %lu %I64u %I64d %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%d %u %lu %I64u %I64d %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %I64u in format string (no. 4) requires 'unsigned __int64' but the argument type is 'signed int'.\n"
@@ -2712,7 +2828,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'signed int'.\n", errout_str());
 
         check("unsigned int f() { return 0; }\n"
-              "void foo() { printf(\"%u %d %ld %I64d %I64u %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%u %d %ld %I64d %I64u %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %I64d in format string (no. 4) requires '__int64' but the argument type is 'unsigned int'.\n"
@@ -2722,7 +2838,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'unsigned int'.\n", errout_str());
 
         check("long f() { return 0; }\n"
-              "void foo() { printf(\"%ld %u %lu %I64u %I64d %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%ld %u %lu %I64u %I64d %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed long'.\n"
                       "[test.cpp:2]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed long'.\n"
                       "[test.cpp:2]: (warning) %I64u in format string (no. 4) requires 'unsigned __int64' but the argument type is 'signed long'.\n"
@@ -2732,7 +2848,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'signed long'.\n", errout_str());
 
         check("unsigned long f() { return 0; }\n"
-              "void foo() { printf(\"%lu %d %ld %I64d %I64u %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%lu %d %ld %I64d %I64u %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned long'.\n"
                       "[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'unsigned long'.\n"
                       "[test.cpp:2]: (warning) %I64d in format string (no. 4) requires '__int64' but the argument type is 'unsigned long'.\n"
@@ -2742,7 +2858,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'unsigned long'.\n", errout_str());
 
         check("long long f() { return 0; }\n"
-              "void foo() { printf(\"%lld %u %lu %I64u %I64d %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%lld %u %lu %I64u %I64d %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed long long'.\n"
                       "[test.cpp:2]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed long long'.\n"
                       "[test.cpp:2]: (warning) %I64u in format string (no. 4) requires 'unsigned __int64' but the argument type is 'signed long long'.\n"
@@ -2751,7 +2867,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'signed long long'.\n", errout_str());
 
         check("unsigned long long f() { return 0; }\n"
-              "void foo() { printf(\"%llu %d %ld %I64d %I64u %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%llu %d %ld %I64d %I64u %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned long long'.\n"
                       "[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'unsigned long long'.\n"
                       "[test.cpp:2]: (warning) %I64d in format string (no. 4) requires '__int64' but the argument type is 'unsigned long long'.\n"
@@ -2760,7 +2876,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'unsigned long long'.\n", errout_str());
 
         check("float f() { return 0; }\n"
-              "void foo() { printf(\"%f %d %ld %u %lu %I64d %I64u %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%f %d %ld %u %lu %I64d %I64u %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'float'.\n"
                       "[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'float'.\n"
                       "[test.cpp:2]: (warning) %u in format string (no. 4) requires 'unsigned int' but the argument type is 'float'.\n"
@@ -2771,7 +2887,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 9) requires an address but the argument type is 'float'.\n", errout_str());
 
         check("double f() { return 0; }\n"
-              "void foo() { printf(\"%f %d %ld %u %lu %I64d %I64u %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%f %d %ld %u %lu %I64d %I64u %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'double'.\n"
                       "[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'double'.\n"
                       "[test.cpp:2]: (warning) %u in format string (no. 4) requires 'unsigned int' but the argument type is 'double'.\n"
@@ -2782,7 +2898,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 9) requires an address but the argument type is 'double'.\n", errout_str());
 
         check("long double f() { return 0; }\n"
-              "void foo() { printf(\"%Lf %d %ld %u %lu %I64d %I64u %f %p\", f(), f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%Lf %d %ld %u %lu %I64d %I64u %f %p\", f(), f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'long double'.\n"
                       "[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'long double'.\n"
                       "[test.cpp:2]: (warning) %u in format string (no. 4) requires 'unsigned int' but the argument type is 'long double'.\n"
@@ -2793,37 +2909,37 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 9) requires an address but the argument type is 'long double'.\n", errout_str());
 
         check("int f() { return 0; }\n"
-              "void foo() { printf(\"%I64d %I64u %I64x %d\", f(), f(), f(), f()); }");
+              "void foo() { printf(\"%I64d %I64u %I64x %d\", f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %I64d in format string (no. 1) requires '__int64' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %I64u in format string (no. 2) requires 'unsigned __int64' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %I64x in format string (no. 3) requires 'unsigned __int64' but the argument type is 'signed int'.\n", errout_str());
 
         check("long long f() { return 0; }\n"
-              "void foo() { printf(\"%I32d %I32u %I32x %lld\", f(), f(), f(), f()); }");
+              "void foo() { printf(\"%I32d %I32u %I32x %lld\", f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %I32d in format string (no. 1) requires '__int32' but the argument type is 'signed long long'.\n"
                       "[test.cpp:2]: (warning) %I32u in format string (no. 2) requires 'unsigned __int32' but the argument type is 'signed long long'.\n"
                       "[test.cpp:2]: (warning) %I32x in format string (no. 3) requires 'unsigned __int32' but the argument type is 'signed long long'.\n", errout_str());
 
         check("unsigned long long f() { return 0; }\n"
-              "void foo() { printf(\"%I32d %I32u %I32x %llx\", f(), f(), f(), f()); }");
+              "void foo() { printf(\"%I32d %I32u %I32x %llx\", f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %I32d in format string (no. 1) requires '__int32' but the argument type is 'unsigned long long'.\n"
                       "[test.cpp:2]: (warning) %I32u in format string (no. 2) requires 'unsigned __int32' but the argument type is 'unsigned long long'.\n"
                       "[test.cpp:2]: (warning) %I32x in format string (no. 3) requires 'unsigned __int32' but the argument type is 'unsigned long long'.\n", errout_str());
 
         check("signed char f() { return 0; }\n"
-              "void foo() { printf(\"%Id %Iu %Ix %hhi\", f(), f(), f(), f()); }");
+              "void foo() { printf(\"%Id %Iu %Ix %hhi\", f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %Id in format string (no. 1) requires 'ptrdiff_t' but the argument type is 'signed char'.\n"
                       "[test.cpp:2]: (warning) %Iu in format string (no. 2) requires 'size_t' but the argument type is 'signed char'.\n"
                       "[test.cpp:2]: (warning) %Ix in format string (no. 3) requires 'size_t' but the argument type is 'signed char'.\n", errout_str());
 
         check("unsigned char f() { return 0; }\n"
-              "void foo() { printf(\"%Id %Iu %Ix %hho\", f(), f(), f(), f()); }");
+              "void foo() { printf(\"%Id %Iu %Ix %hho\", f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %Id in format string (no. 1) requires 'ptrdiff_t' but the argument type is 'unsigned char'.\n"
                       "[test.cpp:2]: (warning) %Iu in format string (no. 2) requires 'size_t' but the argument type is 'unsigned char'.\n"
                       "[test.cpp:2]: (warning) %Ix in format string (no. 3) requires 'size_t' but the argument type is 'unsigned char'.\n", errout_str());
 
         check("namespace bar { int f() { return 0; } }\n"
-              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar::f(), bar::f(), bar::f(), bar::f(), bar::f(), bar::f()); }");
+              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar::f(), bar::f(), bar::f(), bar::f(), bar::f(), bar::f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed int'.\n"
@@ -2831,7 +2947,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 6) requires an address but the argument type is 'signed int'.\n", errout_str());
 
         check("struct Fred { int i; } f;\n"
-              "void foo() { printf(\"%d %u %lu %f %Lf %p\", f.i, f.i, f.i, f.i, f.i, f.i); }");
+              "void foo() { printf(\"%d %u %lu %f %Lf %p\", f.i, f.i, f.i, f.i, f.i, f.i); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed int'.\n"
@@ -2839,7 +2955,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 6) requires an address but the argument type is 'signed int'.\n", errout_str());
 
         check("struct Fred { unsigned int u; } f;\n"
-              "void foo() { printf(\"%u %d %ld %f %Lf %p\", f.u, f.u, f.u, f.u, f.u, f.u); }");
+              "void foo() { printf(\"%u %d %ld %f %Lf %p\", f.u, f.u, f.u, f.u, f.u, f.u); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'unsigned int'.\n"
@@ -2847,7 +2963,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 6) requires an address but the argument type is 'unsigned int'.\n", errout_str());
 
         check("struct Fred { unsigned int ui() { return 0; } } f;\n"
-              "void foo() { printf(\"%u %d %ld %f %Lf %p\", f.ui(), f.ui(), f.ui(), f.ui(), f.ui(), f.ui()); }");
+              "void foo() { printf(\"%u %d %ld %f %Lf %p\", f.ui(), f.ui(), f.ui(), f.ui(), f.ui(), f.ui()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'unsigned int'.\n"
@@ -2858,12 +2974,12 @@ class TestIO : public TestFixture {
         check("void f(int len, int newline) {\n"
               "    printf(\"%s\", newline ? a : str + len);\n"
               "    printf(\"%s\", newline + newline);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %s in format string (no. 1) requires 'char *' but the argument type is 'signed int'.\n", errout_str());
 
         check("struct Fred { int i; } f;\n"
               "struct Fred & bar() { };\n"
-              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }");
+              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed int'.\n"
@@ -2872,7 +2988,7 @@ class TestIO : public TestFixture {
 
         check("struct Fred { int i; } f;\n"
               "const struct Fred & bar() { };\n"
-              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }");
+              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed int'.\n"
@@ -2881,7 +2997,7 @@ class TestIO : public TestFixture {
 
         check("struct Fred { int i; } f;\n"
               "static const struct Fred & bar() { };\n"
-              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }");
+              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed int'.\n"
@@ -2890,7 +3006,7 @@ class TestIO : public TestFixture {
 
         check("struct Fred { int i; } f[2];\n"
               "struct Fred * bar() { return f; };\n"
-              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i); }");
+              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i); }\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed int'.\n"
@@ -2899,7 +3015,7 @@ class TestIO : public TestFixture {
 
         check("struct Fred { int i; } f[2];\n"
               "const struct Fred * bar() { return f; };\n"
-              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i); }");
+              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i); }\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed int'.\n"
@@ -2908,7 +3024,7 @@ class TestIO : public TestFixture {
 
         check("struct Fred { int i; } f[2];\n"
               "static const struct Fred * bar() { return f; };\n"
-              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i); }");
+              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i); }\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed int'.\n"
@@ -2917,7 +3033,7 @@ class TestIO : public TestFixture {
 
         check("struct Fred { int32_t i; } f;\n"
               "struct Fred & bar() { };\n"
-              "void foo() { printf(\"%d %ld %u %lu %f %Lf\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }");
+              "void foo() { printf(\"%d %ld %u %lu %f %Lf\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %ld in format string (no. 2) requires 'long' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %u in format string (no. 3) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %lu in format string (no. 4) requires 'unsigned long' but the argument type is 'signed int'.\n"
@@ -2928,27 +3044,27 @@ class TestIO : public TestFixture {
         // #4984
         check("void f(double *x) {\n"
               "    printf(\"%f\", x[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int array[10];\n"
               "int * foo() { return array; }\n"
               "void f() {\n"
               "    printf(\"%f\", foo()[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'.\n", errout_str());
 
         check("struct Base { int length() { } };\n"
               "struct Derived : public Base { };\n"
               "void foo(Derived * d) {\n"
               "    printf(\"%f\", d.length());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'.\n", errout_str());
 
         check("std::vector<int> v;\n"
               "void foo() {\n"
               "    printf(\"%d %u %f\", v[0], v[0], v[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 3) requires 'double' but the argument type is 'signed int'.\n", errout_str());
 
@@ -2956,7 +3072,7 @@ class TestIO : public TestFixture {
         check("int bar(int a);\n"
               "void foo() {\n"
               "    printf(\"%d\", bar(0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int> v;\n"
@@ -3202,20 +3318,20 @@ class TestIO : public TestFixture {
 
         check("void foo() {\n"
               "    printf(\"%f %d\", static_cast<int>(1.0f), reinterpret_cast<const void *>(0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'const void *'.\n", errout_str());
 
         check("void foo() {\n"
               "    UNKNOWN * u;\n"
               "    printf(\"%d %x %u %f\", u[i], u[i], u[i], u[i]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    long * l;\n"
               "    printf(\"%d %x %u %f\", l[i], l[i], l[i], l[i]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'signed long'.\n"
                       "[test.cpp:3]: (warning) %x in format string (no. 2) requires 'unsigned int' but the argument type is 'signed long'.\n"
                       "[test.cpp:3]: (warning) %u in format string (no. 3) requires 'unsigned int' but the argument type is 'signed long'.\n"
@@ -3236,27 +3352,27 @@ class TestIO : public TestFixture {
               "    printf(\"%u\",v6[0]);\n"
               "    myvector<char *> v7(1,0);\n"
               "    printf(\"%s\",v7[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<char> v;\n" // #5151
               "void foo() {\n"
               "   printf(\"%c %u %f\", v.at(32), v.at(32), v.at(32));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'char'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 3) requires 'double' but the argument type is 'char'.\n", errout_str());
 
         // #5195 (segmentation fault)
         check("void T::a(const std::vector<double>& vx) {\n"
               "    printf(\"%f\", vx.at(0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5486
         check("void foo() {\n"
               "    ssize_t test = 0;\n"
               "    printf(\"%zd\", test);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6009
@@ -3264,7 +3380,7 @@ class TestIO : public TestFixture {
               "extern int         IntByReturnValue();\n"
               "void MyFunction() {\n"
               "    printf( \"%s - %s\", StringByReturnValue(), IntByReturnValue() );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4]: (warning) %s in format string (no. 1) requires 'char *' but the argument type is 'std::string'.\n"
                       "[test.cpp:4]: (warning) %s in format string (no. 2) requires 'char *' but the argument type is 'signed int'.\n", errout_str());
 
@@ -3277,7 +3393,7 @@ class TestIO : public TestFixture {
               "    Array<int, 10> array1;\n"
               "    Array<float, 10> array2;\n"
               "    printf(\"%u %u\", array1[0], array2[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'int'.\n"
                       "[test.cpp:9]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'float'.\n", errout_str());
 
@@ -3285,19 +3401,19 @@ class TestIO : public TestFixture {
         check("struct S { unsigned short x; } s = {0};\n"
               "void foo() {\n"
               "    printf(\"%d\", s.x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #7601
         check("void foo(int i, unsigned int ui, long long ll, unsigned long long ull) {\n"
               "    printf(\"%Ld %Lu %Ld %Lu\", i, ui, ll, ull);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %Ld in format string (no. 1) requires 'long long' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %Lu in format string (no. 2) requires 'unsigned long long' but the argument type is 'unsigned int'.\n", errout_str());
 
         check("void foo(char c, unsigned char uc, short s, unsigned short us, int i, unsigned int ui, long l, unsigned long ul) {\n"
               "    printf(\"%hhd %hhd %hhd %hhd %hhd %hhd %hhd %hhd\", c, uc, s, us, i, ui, l, ul);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %hhd in format string (no. 2) requires 'char' but the argument type is 'unsigned char'.\n"
                       "[test.cpp:2]: (warning) %hhd in format string (no. 3) requires 'char' but the argument type is 'signed short'.\n"
                       "[test.cpp:2]: (warning) %hhd in format string (no. 4) requires 'char' but the argument type is 'unsigned short'.\n"
@@ -3308,7 +3424,7 @@ class TestIO : public TestFixture {
 
         check("void foo(char c, unsigned char uc, short s, unsigned short us, int i, unsigned int ui, long l, unsigned long ul) {\n"
               "    printf(\"%hhu %hhu %hhu %hhu %hhu %hhu %hhu %hhu\", c, uc, s, us, i, ui, l, ul);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %hhu in format string (no. 1) requires 'unsigned char' but the argument type is 'char'.\n"
                       "[test.cpp:2]: (warning) %hhu in format string (no. 3) requires 'unsigned char' but the argument type is 'signed short'.\n"
                       "[test.cpp:2]: (warning) %hhu in format string (no. 4) requires 'unsigned char' but the argument type is 'unsigned short'.\n"
@@ -3319,7 +3435,7 @@ class TestIO : public TestFixture {
 
         check("void foo(char c, unsigned char uc, short s, unsigned short us, int i, unsigned int ui, long l, unsigned long ul) {\n"
               "    printf(\"%hhx %hhx %hhx %hhx %hhx %hhx %hhx %hhx\", c, uc, s, us, i, ui, l, ul);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %hhx in format string (no. 1) requires 'unsigned char' but the argument type is 'char'.\n"
                       "[test.cpp:2]: (warning) %hhx in format string (no. 3) requires 'unsigned char' but the argument type is 'signed short'.\n"
                       "[test.cpp:2]: (warning) %hhx in format string (no. 4) requires 'unsigned char' but the argument type is 'unsigned short'.\n"
@@ -3330,7 +3446,7 @@ class TestIO : public TestFixture {
 
         check("void foo(char c, unsigned char uc, short s, unsigned short us, int i, unsigned int ui, long l, unsigned long ul) {\n"
               "    printf(\"%hd %hd %hd %hd %hd %hd %hd %hd\", c, uc, s, us, i, ui, l, ul);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %hd in format string (no. 1) requires 'short' but the argument type is 'char'.\n"
                       "[test.cpp:2]: (warning) %hd in format string (no. 2) requires 'short' but the argument type is 'unsigned char'.\n"
                       "[test.cpp:2]: (warning) %hd in format string (no. 4) requires 'short' but the argument type is 'unsigned short'.\n"
@@ -3341,7 +3457,7 @@ class TestIO : public TestFixture {
 
         check("void foo(char c, unsigned char uc, short s, unsigned short us, int i, unsigned int ui, long l, unsigned long ul) {\n"
               "    printf(\"%hu %hu %hu %hu %hu %hu %hu %hu\", c, uc, s, us, i, ui, l, ul);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %hu in format string (no. 1) requires 'unsigned short' but the argument type is 'char'.\n"
                       "[test.cpp:2]: (warning) %hu in format string (no. 2) requires 'unsigned short' but the argument type is 'unsigned char'.\n"
                       "[test.cpp:2]: (warning) %hu in format string (no. 3) requires 'unsigned short' but the argument type is 'signed short'.\n"
@@ -3352,7 +3468,7 @@ class TestIO : public TestFixture {
 
         check("void foo(char c, unsigned char uc, short s, unsigned short us, int i, unsigned int ui, long l, unsigned long ul) {\n"
               "    printf(\"%hx %hx %hx %hx %hx %hx %hx %hx\", c, uc, s, us, i, ui, l, ul);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %hx in format string (no. 1) requires 'unsigned short' but the argument type is 'char'.\n"
                       "[test.cpp:2]: (warning) %hx in format string (no. 2) requires 'unsigned short' but the argument type is 'unsigned char'.\n"
                       "[test.cpp:2]: (warning) %hx in format string (no. 3) requires 'unsigned short' but the argument type is 'signed short'.\n"
@@ -3368,9 +3484,23 @@ class TestIO : public TestFixture {
               "\n"
               "void foo(struct S x) {\n"
               "  printf(\"%f\", x.f(4.0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
+        check("enum E : uint8_t { E0 }; \n" // #7959
+              "void f(E e) {\n"
+              "    printf(\"%hhu\", e);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("enum E : uint8_t { E0 }; \n"
+              "void f(E e) {\n"
+              "    printf(\"%lu\", e);\n"
+              "}\n");
+        TODO_ASSERT_EQUALS("[test.cpp:3]: (warning) %lu in format string (no. 1) requires 'unsigned long' but the argument type is 'uint8_t'.\n",
+                           "",
+                           errout_str());
+
         check("void f() {\n"
               "    printf(\"%lu\", sizeof(char));\n"
               "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
@@ -4129,7 +4259,7 @@ class TestIO : public TestFixture {
               "  printf(\"%1$d\", 1);"
               "  printf(\"%1$d, %d, %1$d\", 1, 2);"
               "  scanf(\"%1$d\", &bar);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -4138,7 +4268,7 @@ class TestIO : public TestFixture {
               "  printf(\"%1$d, %d, %4$d\", 1, 2, 3);\n"
               "  scanf(\"%2$d\", &bar);\n"
               "  printf(\"%0$f\", 0.0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error) printf format string requires 1 parameter but only 0 are given. [wrongPrintfScanfArgNum]\n"
                       "[test.cpp:4:3]: (warning) printf: referencing parameter 4 while 3 arguments given [wrongPrintfScanfParameterPositionError]\n"
                       "[test.cpp:5:3]: (warning) scanf: referencing parameter 2 while 1 arguments given [wrongPrintfScanfParameterPositionError]\n"
@@ -4161,7 +4291,7 @@ class TestIO : public TestFixture {
               "    printf(\"%I32d %I32u %I32x\", u32, u32, u32);\n"
               "    printf(\"%I64d %I64u %I64x\", i64, i64, i64);\n"
               "    printf(\"%I64d %I64u %I64x\", u64, u64, u64);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:8:5]: (portability) %Id in format string (no. 1) requires 'ptrdiff_t' but the argument type is 'size_t {aka unsigned long}'. [invalidPrintfArgType_sint]\n"
                       "[test.cpp:9:5]: (portability) %Iu in format string (no. 2) requires 'size_t' but the argument type is 'ptrdiff_t {aka signed long}'. [invalidPrintfArgType_uint]\n"
                       "[test.cpp:9:5]: (portability) %Ix in format string (no. 3) requires 'size_t' but the argument type is 'ptrdiff_t {aka signed long}'. [invalidPrintfArgType_uint]\n"
@@ -4183,7 +4313,7 @@ class TestIO : public TestFixture {
               "    printf(\"%I32d %I32u %I32x\", u32, u32, u32);\n"
               "    printf(\"%I64d %I64u %I64x\", i64, i64, i64);\n"
               "    printf(\"%I64d %I64u %I64x\", u64, u64, u64);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
         ASSERT_EQUALS("[test.cpp:8:5]: (portability) %Id in format string (no. 1) requires 'ptrdiff_t' but the argument type is 'size_t {aka unsigned long long}'. [invalidPrintfArgType_sint]\n"
                       "[test.cpp:9:5]: (portability) %Iu in format string (no. 2) requires 'size_t' but the argument type is 'ptrdiff_t {aka signed long long}'. [invalidPrintfArgType_uint]\n"
                       "[test.cpp:9:5]: (portability) %Ix in format string (no. 3) requires 'size_t' but the argument type is 'ptrdiff_t {aka signed long long}'. [invalidPrintfArgType_uint]\n"
@@ -4209,7 +4339,7 @@ class TestIO : public TestFixture {
               "    printf(\"%I16x%i\", s, i);\n"
               "    printf(\"%I32%i\", s, i);\n"
               "    printf(\"%I64%i\", s, i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
                       "[test.cpp:5:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
                       "[test.cpp:6:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
@@ -4254,7 +4384,7 @@ class TestIO : public TestFixture {
               "    printf(\"%zd\", s);\n"
               "    printf(\"%zd%i\", s, i);\n"
               "    printf(\"%zu\", s);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:6:5]: (portability) %zu in format string (no. 1) requires 'size_t' but the argument type is 'SSIZE_T {aka signed long}'. [invalidPrintfArgType_uint]\n", errout_str());
 
         check("void foo() {\n"
@@ -4263,7 +4393,7 @@ class TestIO : public TestFixture {
               "    printf(\"%zd\", s);\n"
               "    printf(\"%zd%i\", s, i);\n"
               "    printf(\"%zu\", s);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
         ASSERT_EQUALS("[test.cpp:6:5]: (portability) %zu in format string (no. 1) requires 'size_t' but the argument type is 'SSIZE_T {aka signed long long}'. [invalidPrintfArgType_uint]\n", errout_str());
 
         check("void foo() {\n"
@@ -4272,7 +4402,7 @@ class TestIO : public TestFixture {
               "    printf(\"%zd\", s);\n"
               "    printf(\"%zd%i\", s, i);\n"
               "    printf(\"%zu\", s);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -4282,7 +4412,7 @@ class TestIO : public TestFixture {
               "    printf(\"%zd\", s);\n"
               "    printf(\"%zd%i\", s, i);\n"
               "    printf(\"%zu\", s);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
         ASSERT_EQUALS("[test.cpp:7:5]: (portability) %zu in format string (no. 1) requires 'size_t' but the argument type is 'SSIZE_T {aka signed long long}'. [invalidPrintfArgType_uint]\n", errout_str());
 
     }
@@ -4301,7 +4431,7 @@ class TestIO : public TestFixture {
               "    scanf(\"%I32d %I32u %I32x\", &u32, &u32, &u32);\n"
               "    scanf(\"%I64d %I64u %I64x\", &i64, &i64, &i64);\n"
               "    scanf(\"%I64d %I64u %I64x\", &u64, &u64, &u64);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:8:5]: (portability) %Id in format string (no. 1) requires 'ptrdiff_t *' but the argument type is 'size_t * {aka unsigned long *}'. [invalidScanfArgType_int]\n"
                       "[test.cpp:9:5]: (portability) %Iu in format string (no. 2) requires 'size_t *' but the argument type is 'ptrdiff_t * {aka signed long *}'. [invalidScanfArgType_int]\n"
                       "[test.cpp:9:5]: (portability) %Ix in format string (no. 3) requires 'size_t *' but the argument type is 'ptrdiff_t * {aka signed long *}'. [invalidScanfArgType_int]\n"
@@ -4325,7 +4455,7 @@ class TestIO : public TestFixture {
               "    scanf(\"%I32d %I32u %I32x\", &u32, &u32, &u32);\n"
               "    scanf(\"%I64d %I64u %I64x\", &i64, &i64, &i64);\n"
               "    scanf(\"%I64d %I64u %I64x\", &u64, &u64, &u64);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
         ASSERT_EQUALS("[test.cpp:8:5]: (portability) %Id in format string (no. 1) requires 'ptrdiff_t *' but the argument type is 'size_t * {aka unsigned long long *}'. [invalidScanfArgType_int]\n"
                       "[test.cpp:9:5]: (portability) %Iu in format string (no. 2) requires 'size_t *' but the argument type is 'ptrdiff_t * {aka signed long long *}'. [invalidScanfArgType_int]\n"
                       "[test.cpp:9:5]: (portability) %Ix in format string (no. 3) requires 'size_t *' but the argument type is 'ptrdiff_t * {aka signed long long *}'. [invalidScanfArgType_int]\n"
@@ -4353,7 +4483,7 @@ class TestIO : public TestFixture {
               "    scanf(\"%I16x%i\", &s, &i);\n"
               "    scanf(\"%I32%i\", &s, &i);\n"
               "    scanf(\"%I64%i\", &s, &i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
                       "[test.cpp:5:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
                       "[test.cpp:6:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
@@ -4375,7 +4505,7 @@ class TestIO : public TestFixture {
               "    scanf(\"%zd\", &s);\n"
               "    scanf(\"%zd%i\", &s, &i);\n"
               "    scanf(\"%zu\", &s);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:6:5]: (portability) %zu in format string (no. 1) requires 'size_t *' but the argument type is 'SSIZE_T * {aka signed long *}'. [invalidScanfArgType_int]\n", errout_str());
 
         check("void foo() {\n"
@@ -4384,7 +4514,7 @@ class TestIO : public TestFixture {
               "    scanf(\"%zd\", &s);\n"
               "    scanf(\"%zd%i\", &s, &i);\n"
               "    scanf(\"%zu\", &s);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
         ASSERT_EQUALS("[test.cpp:6:5]: (portability) %zu in format string (no. 1) requires 'size_t *' but the argument type is 'SSIZE_T * {aka signed long long *}'. [invalidScanfArgType_int]\n", errout_str());
 
         check("void foo() {\n"
@@ -4393,7 +4523,7 @@ class TestIO : public TestFixture {
               "    scanf(\"%zd\", &s);\n"
               "    scanf(\"%zd%i\", &s, &i);\n"
               "    scanf(\"%zu\", &s);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -4403,7 +4533,7 @@ class TestIO : public TestFixture {
               "    scanf(\"%zd\", &s);\n"
               "    scanf(\"%zd%i\", &s, &i);\n"
               "    scanf(\"%zu\", &s);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
         ASSERT_EQUALS("[test.cpp:7:5]: (portability) %zu in format string (no. 1) requires 'size_t *' but the argument type is 'SSIZE_T * {aka signed long long *}'. [invalidScanfArgType_int]\n", errout_str());
 
     }
@@ -4414,7 +4544,7 @@ class TestIO : public TestFixture {
               "    String string;\n"
               "    string.Format(\"%I32d\", u32);\n"
               "    string.AppendFormat(\"%I32d\", u32);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -4422,7 +4552,7 @@ class TestIO : public TestFixture {
               "    CString string;\n"
               "    string.Format(\"%I32d\", u32);\n"
               "    string.AppendFormat(\"%I32d\", u32);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix32));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix32));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -4431,7 +4561,7 @@ class TestIO : public TestFixture {
               "    string.Format(\"%I32d\", u32);\n"
               "    string.AppendFormat(\"%I32d\", u32);\n"
               "    CString::Format(\"%I32d\", u32);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:4:12]: (portability) %I32d in format string (no. 1) requires '__int32' but the argument type is 'unsigned __int32 {aka unsigned int}'. [invalidPrintfArgType_sint]\n"
                       "[test.cpp:5:12]: (portability) %I32d in format string (no. 1) requires '__int32' but the argument type is 'unsigned __int32 {aka unsigned int}'. [invalidPrintfArgType_sint]\n"
                       "[test.cpp:6:14]: (portability) %I32d in format string (no. 1) requires '__int32' but the argument type is 'unsigned __int32 {aka unsigned int}'. [invalidPrintfArgType_sint]\n", errout_str());
@@ -4661,6 +4791,18 @@ class TestIO : public TestFixture {
                       "[test.cpp:17:5]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'. [invalidPrintfArgType_s]\n"
                       "[test.cpp:17:5]: (warning) sprintf_s format string requires 5 parameters but 6 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
+        check("int main()\n"
+              "{\n"
+              "    double value = 3.14;\n"
+              "    const size_t buffer_size = 64;\n"
+              "    char buffer[buffer_size];\n"
+              "    int precision = 2;\n"
+              "    _locale_t locale = _create_locale(LC_ALL, \"C\");\n"
+              "    _sprintf_s_l(buffer, buffer_size, \"%.*f\", locale, precision, value);\n"
+              "    _free_locale(locale);\n"
+              "    return 0;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testMicrosoftSecureScanfArgument() {
@@ -4800,26 +4942,33 @@ class TestIO : public TestFixture {
               "    wscanf_s(L\"%4[^-]\", msStr1, _countof(msStr1));\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(const char* c) {\n"
+              "    const size_t N = 5;\n"
+              "    char buf[N];\n"
+              "    sscanf_s(c, \"%4[^.]\", buf, N);\n"
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win64));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testQStringFormatArguments() {
         check("void foo(float f) {\n"
               "    QString string;\n"
               "    string.sprintf(\"%d\", f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:3:12]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'float'. [invalidPrintfArgType_sint]\n", errout_str());
 
         check("void foo(float f) {\n"
               "    QString string;\n"
               "    string = QString::asprintf(\"%d\", f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:3:23]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'float'. [invalidPrintfArgType_sint]\n", errout_str());
     }
 
     void testTernary() {  // ticket #6182
         check("void test(const std::string &val) {\n"
               "    printf(\"%s\", val.empty() ? \"I like to eat bananas\" : val.c_str());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4827,30 +4976,30 @@ class TestIO : public TestFixture {
         check("void test() {\n"
               "    unsigned const x = 5;\n"
               "    printf(\"%u\", x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void testAstType() { // ticket #7014
         check("void test() {\n"
               "    printf(\"%c\", \"hello\"[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test() {\n"
               "    printf(\"%lld\", (long long)1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test() {\n"
               "    printf(\"%i\", (short *)x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) %i in format string (no. 1) requires 'int' but the argument type is 'signed short *'. [invalidPrintfArgType_sint]\n", errout_str());
 
         check("int (*fp)();\n" // #7178 - function pointer call
               "void test() {\n"
               "    printf(\"%i\", fp());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4858,7 +5007,7 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    printf(\"%u %lu %llu\", 0U, 0UL, 0ULL);\n"
               "    printf(\"%u %lu %llu\", 0u, 0ul, 0ull);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4866,7 +5015,7 @@ class TestIO : public TestFixture {
         check("void f() {\n"
               "   const char *s = \"0\";\n"
               "   printf(\"%ld%lld\", atol(s), atoll(s));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // 8141
@@ -4885,7 +5034,7 @@ class TestIO : public TestFixture {
               "PCINT pci;"
               "void foo() {\n"
               "    printf(\"%d %p %p\", i, pi, pci);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("using INT = int;\n\n"
@@ -4896,7 +5045,7 @@ class TestIO : public TestFixture {
               "PCINT pci;"
               "void foo() {\n"
               "    printf(\"%f %f %f\", i, pi, pci);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'. [invalidPrintfArgType_float]\n"
                       "[test.cpp:8:5]: (warning) %f in format string (no. 2) requires 'double' but the argument type is 'signed int *'. [invalidPrintfArgType_float]\n"
                       "[test.cpp:8:5]: (warning) %f in format string (no. 3) requires 'double' but the argument type is 'const signed int *'. [invalidPrintfArgType_float]\n", errout_str());
@@ -4914,17 +5063,17 @@ class TestIO : public TestFixture {
     void testPrintfParenthesis() { // #8489
         check("void f(int a) {\n"
               "    printf(\"%f\", (a >> 24) & 0xff);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'. [invalidPrintfArgType_float]\n", errout_str());
 
         check("void f(int a) {\n"
               "    printf(\"%f\", 0xff & (a >> 24));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'. [invalidPrintfArgType_float]\n", errout_str());
 
         check("void f(int a) {\n"
               "    printf(\"%f\", ((a >> 24) + 1) & 0xff);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'. [invalidPrintfArgType_float]\n", errout_str());
     }
 
@@ -4932,7 +5081,7 @@ class TestIO : public TestFixture {
         check("void foo(const std::vector<int>& IO, const int* pio) {\n"
               "const auto Idx = std::distance(&IO.front(), pio);\n"
               "printf(\"Idx = %td\", Idx);\n"
-              "}", dinit(CheckOptions, $.portability = true));
+              "}\n", dinit(CheckOptions, $.portability = true));
         ASSERT_EQUALS("", errout_str());
     }
 
diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
index daf738e7b46..f644958c13c 100644
--- a/test/testleakautovar.cpp
+++ b/test/testleakautovar.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -154,6 +154,7 @@ class TestLeakAutoVar : public TestFixture {
         TEST_CASE(ifelse27);
         TEST_CASE(ifelse28); // #11038
         TEST_CASE(ifelse29);
+        TEST_CASE(ifelse30);
 
         // switch
         TEST_CASE(switch1);
@@ -181,6 +182,7 @@ class TestLeakAutoVar : public TestFixture {
         TEST_CASE(return10);
         TEST_CASE(return11); // #13098
         TEST_CASE(return12); // #12238
+        TEST_CASE(return13);
 
         // General tests: variable type, allocation type, etc
         TEST_CASE(test1);
@@ -200,6 +202,7 @@ class TestLeakAutoVar : public TestFixture {
         TEST_CASE(configuration4);
         TEST_CASE(configuration5);
         TEST_CASE(configuration6);
+        TEST_CASE(configurationUse);
 
         TEST_CASE(ptrptr);
 
@@ -209,6 +212,7 @@ class TestLeakAutoVar : public TestFixture {
         TEST_CASE(inlineFunction); // #3989
 
         TEST_CASE(smartPtrInContainer); // #8262
+        TEST_CASE(unconditionalScope);
 
         TEST_CASE(functionCallCastConfig); // #9652
         TEST_CASE(functionCallLeakIgnoreConfig); // #7923
@@ -224,23 +228,17 @@ class TestLeakAutoVar : public TestFixture {
     template<size_t size>
     void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
         const Settings& settings1 = options.s ? *options.s : settings;
-
-        // Tokenize..
-        SimpleTokenizer tokenizer(settings1, *this, options.cpp);
-        ASSERT_LOC(tokenizer.tokenize(code), file, line);
-
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        check_(file, line, code, settings1, options.cpp);
     }
 
     template<size_t size>
-    void check_(const char* file, int line, const char (&code)[size], const Settings & s) {
+    void check_(const char* file, int line, const char (&code)[size], const Settings & s, bool cpp = true) {
         // Tokenize..
-        SimpleTokenizer tokenizer(s, *this);
+        SimpleTokenizer tokenizer(s, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        CheckLeakAutoVar check;
+        runChecks(check, tokenizer, *this);
     }
 
     void assign1() {
@@ -248,7 +246,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    p = NULL;\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:5]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
@@ -257,7 +255,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    char *q = p;\n"
               "    free(q);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -266,7 +264,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    char *q = p + 1;\n"
               "    free(q - 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -275,7 +273,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *a = malloc(10);\n"
               "    a += 10;\n"
               "    free(a - 10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -284,7 +282,7 @@ class TestLeakAutoVar : public TestFixture {
               "{\n"
               "    char *p = new char[100];\n"
               "    list += p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -293,7 +291,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    p = strcpy(p,q);\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -301,7 +299,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void foo(struct str *d) {\n"
               "    struct str *p = malloc(10);\n"
               "    d->p = p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -309,7 +307,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void foo(struct str *d) {\n"
               "    struct str *p = malloc(10);\n"
               "    d->p = &p->x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -318,7 +316,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = x();\n"
               "    free(p);\n"
               "    p = NULL;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -328,7 +326,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (x) { p = malloc(10); }\n"
               "    if (!x) { p = NULL; }\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -336,7 +334,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    x = a(b(p));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:4:1]: (information) --check-library: Function b() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
     }
 
@@ -346,7 +344,7 @@ class TestLeakAutoVar : public TestFixture {
               "    free(p);\n"
               "    bar(&p);\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -356,22 +354,22 @@ class TestLeakAutoVar : public TestFixture {
               "    char * &ref = p;\n"
               "    p = malloc(10);\n"
               "    free(ref);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         TODO_ASSERT_EQUALS("", "[test.cpp:6:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void assign14() {
         check("void f(int x) {\n"
               "    char *p;\n"
-              "    if (x && (p = malloc(10))) { }"
-              "}");
-        ASSERT_EQUALS("[test.c:3:35]: (error) Memory leak: p [memleak]\n", errout_str());
+              "    if (x && (p = malloc(10))) { }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:4:1]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void f(int x) {\n"
               "    char *p;\n"
-              "    if (x && (p = new char[10])) { }"
-              "}", dinit(CheckOptions, $.cpp = true));
-        ASSERT_EQUALS("[test.cpp:3:37]: (error) Memory leak: p [memleak]\n", errout_str());
+              "    if (x && (p = new char[10])) { }\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:4:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void assign15() {
@@ -382,7 +380,7 @@ class TestLeakAutoVar : public TestFixture {
               "   free(p);\n"
               "   p = malloc(sizeof *p);\n"
               "   free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -391,48 +389,48 @@ class TestLeakAutoVar : public TestFixture {
               "   char *p = malloc(10);\n"
               "   free(p);\n"
               "   if (p=dostuff()) *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void assign17() { // #9047
         check("void f() {\n"
               "    char *p = (char*)malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:1]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void f() {\n"
               "    char *p = (char*)(int*)malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void assign18() {
         check("void f(int x) {\n"
               "    char *p;\n"
-              "    if (x && (p = (char*)malloc(10))) { }"
-              "}");
-        ASSERT_EQUALS("[test.c:3:42]: (error) Memory leak: p [memleak]\n", errout_str());
+              "    if (x && (p = (char*)malloc(10))) { }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:4:1]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void f(int x) {\n"
               "    char *p;\n"
-              "    if (x && (p = (char*)(int*)malloc(10))) { }"
-              "}");
-        ASSERT_EQUALS("[test.c:3:48]: (error) Memory leak: p [memleak]\n", errout_str());
+              "    if (x && (p = (char*)(int*)malloc(10))) { }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:4:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void assign19() {
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    free((void*)p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void assign20() { // #9187
         check("void f() {\n"
               "    char *p = static_cast<int>(malloc(10));\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:3:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
@@ -440,14 +438,14 @@ class TestLeakAutoVar : public TestFixture {
         check("void f(int **x) {\n" // #10186
               "    void *p = malloc(10);\n"
               "    *x = (int*)p;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("struct S { int i; };\n" // #10996
               "void f() {\n"
               "    S* s = new S();\n"
               "    (void)s;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:5:1]: (error) Memory leak: s [memleak]\n", errout_str());
     }
 
@@ -455,12 +453,12 @@ class TestLeakAutoVar : public TestFixture {
         const Settings s = settingsBuilder().library("posix.cfg").checkLibrary().build();
         check("void f(char tempFileName[256]) {\n"
               "    const int fd = socket(AF_INET, SOCK_PACKET, 0 );\n"
-              "}", dinit(CheckOptions, $.cpp = true, $.s = &s));
+              "}\n", dinit(CheckOptions, $.cpp = true, $.s = &s));
         ASSERT_EQUALS("[test.cpp:3:1]: (error) Resource leak: fd [resourceLeak]\n", errout_str());
 
         check("void f() {\n"
               "    const void * const p = malloc(10);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:3:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
@@ -568,7 +566,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n" // #11796
               "    int* p{ new int };\n"
               "    int* q(new int);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:1]: (error) Memory leak: p [memleak]\n"
                       "[test.cpp:4:1]: (error) Memory leak: q [memleak]\n",
                       errout_str());
@@ -632,14 +630,22 @@ class TestLeakAutoVar : public TestFixture {
         check("void f(int*& x) {\n" // #8235
               "    int* p = (int*)malloc(10);\n"
               "    x = p ? p : nullptr;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int*& x) {\n"
               "    int* p = (int*)malloc(10);\n"
               "    x = p != nullptr ? p : nullptr;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(const char* n) {\n" // #12724
+              "    FILE* fp = fopen(n, \"r\");\n"
+              "    bool b = (fp == NULL);\n"
+              "    if (b)\n"
+              "        return;\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:6:1]: (error) Resource leak: fp [resourceLeak]\n", errout_str());
     }
 
     void memcpy1() { // #11542
@@ -661,17 +667,17 @@ class TestLeakAutoVar : public TestFixture {
     void isAutoDealloc() {
         check("void f() {\n"
               "    char *p = new char[100];"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:29]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void f() {\n"
               "    Fred *fred = new Fred;"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    std::string *str = new std::string;"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:40]: (error) Memory leak: str [memleak]\n", errout_str());
 
         check("class TestType {\n" // #9028
@@ -680,13 +686,13 @@ class TestLeakAutoVar : public TestFixture {
               "};\n"
               "void f() {\n"
               "    TestType *tt = new TestType();\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:7:1]: (error) Memory leak: tt [memleak]\n", errout_str());
 
         check("void f(Bar& b) {\n" // #7622
               "    char* data = new char[10];\n"
               "    b = Bar(*new Foo(data));\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:1]: (information) --check-library: Function Foo() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
 
         check("class B {};\n"
@@ -694,7 +700,7 @@ class TestLeakAutoVar : public TestFixture {
               "    void g() {\n"
               "        auto d = new D();\n"
               "        if (d) {}\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:6:1]: (error) Memory leak: d [memleak]\n", errout_str());
 
         check("struct S {\n" // #12354
@@ -705,7 +711,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (b)\n"
               "        p = new S();\n"
               "    p->f();\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:9:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
@@ -714,7 +720,7 @@ class TestLeakAutoVar : public TestFixture {
               "    void *p = malloc(10);\n"
               "    void *q = realloc(p, 20);\n"
               "    free(q)\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -722,7 +728,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    void *p = malloc(10);\n"
               "    void *q = realloc(p, 20);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:4:1]: (error) Memory leak: q [memleak]\n", errout_str());
     }
 
@@ -730,7 +736,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    char *q = (char*) realloc(p, 20);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:4:1]: (error) Memory leak: q [memleak]\n", errout_str());
     }
 
@@ -739,7 +745,7 @@ class TestLeakAutoVar : public TestFixture {
               "    void * q = realloc(p, 10);\n"
               "    if (q == NULL)\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:5:1]: (error) Memory leak: q [memleak]\n", errout_str());
     }
 
@@ -750,7 +756,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (size && !datap)\n"
               "        free(ptr);\n"
               "    return datap;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9990
@@ -764,7 +770,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    }\n"
               "    free(p2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -773,7 +779,7 @@ class TestLeakAutoVar : public TestFixture {
               "    void *p = fopen(name,a);\n"
               "    void *q = freopen(name, b, p);\n"
               "    fclose(q)\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -781,7 +787,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    void *p = fopen(name,a);\n"
               "    void *q = freopen(name, b, p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:4:1]: (error) Resource leak: q [resourceLeak]\n", errout_str());
     }
 
@@ -789,13 +795,13 @@ class TestLeakAutoVar : public TestFixture {
         check("void f(char *p) {\n"
               "    free(p);\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:6]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n", errout_str());
 
         check("void f(char *p) {\n"
               "    free(p);\n"
               "    char c = *p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:15]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n", errout_str());
     }
 
@@ -803,7 +809,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f(struct str *p) {\n"
               "    free(p);\n"
               "    p = p->next;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:9]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n", errout_str());
     }
 
@@ -811,25 +817,25 @@ class TestLeakAutoVar : public TestFixture {
         check("void f(char *p) {\n"
               "    free(p);\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:2:5] -> [test.c:3:5]: (error) Returning/dereferencing 'p' after it is deallocated / released [deallocret]\n", errout_str());
 
         check("void f(char *p) {\n"
               "  if (!p) free(p);\n"
               "  return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *p) {\n"
               "  if (!p) delete p;\n"
               "  return p;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *p) {\n"
               "  if (!p) delete [] p;\n"
               "  return p;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void* p) {\n"
@@ -839,7 +845,7 @@ class TestLeakAutoVar : public TestFixture {
               "   }\n"
               "   g(p);\n"
               "   return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -847,7 +853,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f(char *p) {\n"
               "    free(p), p = 0;\n"
               "    *p = 0;\n"  // <- Make sure pointer info is reset. It is NOT a freed pointer dereference
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -855,7 +861,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f(char *p) {\n"
               "    free(p);\n"
               "    x = p = foo();\n"  // <- p is not dereferenced
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -864,14 +870,14 @@ class TestLeakAutoVar : public TestFixture {
               "void f(Foo* foo) {\n"
               "    delete foo->ptr;\n"
               "    foo->ptr = new Foo;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo { int* ptr; };\n"
               "void f(Foo* foo) {\n"
               "    delete foo->ptr;\n"
               "    x = *foo->ptr;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         TODO_ASSERT_EQUALS("[test.cpp:4:6]: (error) Dereferencing 'ptr' after it is deallocated / released [deallocuse]\n", "", errout_str());
 
         check("void parse() {\n"
@@ -880,7 +886,7 @@ class TestLeakAutoVar : public TestFixture {
               "        ~Buf() { delete[]m_buf; }\n"
               "        uint8_t *m_buf;\n"
               "    };\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo {\n"
@@ -892,14 +898,14 @@ class TestLeakAutoVar : public TestFixture {
               "    delete foo->ptr;\n"
               "    foo->ptr = new Foo;\n"
               "    foo->ptr->func();\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(void (*conv)(char**)) {\n"
               "  char * ptr=(char*)malloc(42);\n"
               "  free(ptr);\n"
               "  (*conv)(&ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -908,7 +914,7 @@ class TestLeakAutoVar : public TestFixture {
               "    int *ptr = new int;\n"
               "    delete(ptr);\n"
               "    *ptr = 0;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Dereferencing 'ptr' after it is deallocated / released [deallocuse]\n", errout_str());
     }
 
@@ -959,14 +965,14 @@ class TestLeakAutoVar : public TestFixture {
               "  int *array = new int[42];\n"
               "  delete [] array;\n"
               "  return array[1];" // <<
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:3:3] -> [test.cpp:4:3]: (error) Returning/dereferencing 'array' after it is deallocated / released [deallocret]\n", errout_str());
 
         check("int f() {\n"
               "  int *array = (int*)malloc(40);\n"
               "  free(array);\n"
               "  return array[1];" // <<
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:3] -> [test.c:4:3]: (error) Returning/dereferencing 'array' after it is deallocated / released [deallocret]\n", errout_str());
     }
 
@@ -977,7 +983,7 @@ class TestLeakAutoVar : public TestFixture {
               "}\n"
               "void f2(struct foo *f, int *out) {\n"
               "  *out = f->x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1115,35 +1121,35 @@ class TestLeakAutoVar : public TestFixture {
               "    else\n"
               "        p = 0;\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:9] -> [test.c:6:5]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void foo(char *p) {\n"
             "  free(p);\n"
             "  free(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.c:2:3] -> [test.c:3:3]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void foo(char *p, char *r) {\n"
             "  free(p);\n"
             "  free(r);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo() {\n"
             "  free(p);\n"
             "  free(r);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(char *p) {\n"
             "  if (x < 3) free(p);\n"
             "  else { if (x > 9) free(p); }\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1151,7 +1157,7 @@ class TestLeakAutoVar : public TestFixture {
             "  free(p);\n"
             "  getNext(&p);\n"
             "  free(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1159,7 +1165,7 @@ class TestLeakAutoVar : public TestFixture {
             "  free(p);\n"
             "  bar();\n"
             "  free(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.c:2:3] -> [test.c:4:3]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
@@ -1167,7 +1173,7 @@ class TestLeakAutoVar : public TestFixture {
             "  free(p);\n"
             "  printf(\"Freed memory at location %x\", p);\n"
             "  free(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.c:3:41]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n"
                       "[test.c:2:3] -> [test.c:4:3]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n",
                       errout_str());
@@ -1176,21 +1182,21 @@ class TestLeakAutoVar : public TestFixture {
             "void foo(FILE *p) {\n"
             "  fclose(p);\n"
             "  fclose(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.c:2:3] -> [test.c:3:3]: (error) Resource handle 'p' freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void foo(FILE *p, FILE *r) {\n"
             "  fclose(p);\n"
             "  fclose(r);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(FILE *p) {\n"
             "  if (x < 3) fclose(p);\n"
             "  else { if (x > 9) fclose(p); }\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1198,7 +1204,7 @@ class TestLeakAutoVar : public TestFixture {
             "  fclose(p);\n"
             "  gethandle(&p);\n"
             "  fclose(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1206,14 +1212,14 @@ class TestLeakAutoVar : public TestFixture {
             "  fclose(p);\n"
             "  gethandle();\n"
             "  fclose(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.c:2:3] -> [test.c:4:3]: (error) Resource handle 'p' freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void foo(Data* p) {\n"
             "  free(p->a);\n"
             "  free(p->b);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1224,7 +1230,7 @@ class TestLeakAutoVar : public TestFixture {
             "        exit();\n"
             "    }\n"
             "    free(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1235,7 +1241,7 @@ class TestLeakAutoVar : public TestFixture {
             "        x = 0;\n"
             "    }\n"
             "    free(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.c:4:9] -> [test.c:7:5]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
@@ -1244,35 +1250,35 @@ class TestLeakAutoVar : public TestFixture {
             "    free(p);\n"
             "    p = do_something();\n"
             "    free(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(char *p) {\n"
             "  delete p;\n"
             "  delete p;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:10] -> [test.cpp:3:10]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void foo(char *p, char *r) {\n"
             "  delete p;\n"
             "  delete r;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(P p) {\n"
             "  delete p.x;\n"
             "  delete p;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(char **p) {\n"
             "  delete p[0];\n"
             "  delete p[1];\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1280,7 +1286,7 @@ class TestLeakAutoVar : public TestFixture {
             "  delete p;\n"
             "  getNext(&p);\n"
             "  delete p;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1288,21 +1294,21 @@ class TestLeakAutoVar : public TestFixture {
             "  delete p;\n"
             "  bar();\n"
             "  delete p;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:10] -> [test.cpp:4:10]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void foo(char *p) {\n"
             "  delete[] p;\n"
             "  delete[] p;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:3:12]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void foo(char *p, char *r) {\n"
             "  delete[] p;\n"
             "  delete[] r;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1310,7 +1316,7 @@ class TestLeakAutoVar : public TestFixture {
             "  delete[] p;\n"
             "  getNext(&p);\n"
             "  delete[] p;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1318,7 +1324,7 @@ class TestLeakAutoVar : public TestFixture {
             "  delete[] p;\n"
             "  bar();\n"
             "  delete[] p;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:4:12]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
@@ -1329,7 +1335,7 @@ class TestLeakAutoVar : public TestFixture {
             "  delete pxpm;\n"
             "  pxpm = NULL;\n"
             "  return *this;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1346,7 +1352,7 @@ class TestLeakAutoVar : public TestFixture {
             "      throw;\n"
             "    }\n"
             "  delete ptr;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1362,7 +1368,7 @@ class TestLeakAutoVar : public TestFixture {
             "   if(doDelete)\n"
             "       delete a;\n"
             "   return 0;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         TODO_ASSERT_EQUALS("", "[test.cpp:8:8] -> [test.cpp:11:15]: (error) Memory pointed to by 'a' is freed twice. [doubleFree]\n", errout_str());
 
         check(
@@ -1376,7 +1382,7 @@ class TestLeakAutoVar : public TestFixture {
             "        delete[] x;\n"
             "    }\n"
             "    delete[] x;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1388,7 +1394,7 @@ class TestLeakAutoVar : public TestFixture {
             "        delete[] x;\n"
             "    }\n"
             "    delete[] x;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         TODO_ASSERT_EQUALS("[test.cpp:8]: (error) Memory pointed to by 'x' is freed twice.\n", "", errout_str());
 
         check(
@@ -1400,7 +1406,7 @@ class TestLeakAutoVar : public TestFixture {
             "        delete[] x;\n"
             "    }\n"
             "    delete[] x;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         TODO_ASSERT_EQUALS("[test.cpp:8]: (error) Memory pointed to by 'x' is freed twice.\n", "", errout_str());
 
         check(
@@ -1412,7 +1418,7 @@ class TestLeakAutoVar : public TestFixture {
             "        free(x);\n"
             "    }\n"
             "    free(x);\n"
-            "}");
+            "}\n");
         TODO_ASSERT_EQUALS("[test.c:8]: (error) Memory pointed to by 'x' is freed twice.\n", "", errout_str());
 
         check(
@@ -1426,7 +1432,7 @@ class TestLeakAutoVar : public TestFixture {
             "        delete[] x;\n"
             "    }\n"
             "    delete[] x;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1440,7 +1446,7 @@ class TestLeakAutoVar : public TestFixture {
             "        delete[] x;\n"
             "    } while (true);\n"
             "    delete[] x;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1452,7 +1458,7 @@ class TestLeakAutoVar : public TestFixture {
             "        free(p);\n"
             "    }\n"
             "    free(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.c:6:9] -> [test.c:8:5]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
@@ -1473,7 +1479,7 @@ class TestLeakAutoVar : public TestFixture {
             "void MyThrow(err)\n"
             "{\n"
             "    throw(err);\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1494,7 +1500,7 @@ class TestLeakAutoVar : public TestFixture {
             "void MyExit(err)\n"
             "{\n"
             "    exit(err);\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check( // #6252
@@ -1509,14 +1515,14 @@ class TestLeakAutoVar : public TestFixture {
             "        delete m_thing;\n"
             "        m_thing = new Thing;\n"
             "    }\n"
-            "};", dinit(CheckOptions, $.cpp = true));
+            "};\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         // #7401
         check("void pCodeLabelDestruct(pCode *pc) {\n"
               "    free(PCL(pc)->label);\n"
               "    free(pc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1526,7 +1532,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (a == 2) { free(p); return ((void*)1); }\n"
               "    free(p);\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1543,7 +1549,7 @@ class TestLeakAutoVar : public TestFixture {
               "       free(bar)\n"
               "   } while(!done);\n"
               "   return;"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("", errout_str());
     }
@@ -1555,7 +1561,7 @@ class TestLeakAutoVar : public TestFixture {
               "    exit(1);\n"
               "  }\n"
               "  free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void* p, int i) {\n" // #11391
@@ -1575,7 +1581,7 @@ class TestLeakAutoVar : public TestFixture {
               "  free(p);\n"
               "  x = (q == p);\n"
               "  free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:2:3] -> [test.c:4:3]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
     }
 
@@ -1583,7 +1589,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void do_wordexp(FILE *f) {\n"
               "  free(getword(f));\n"
               "  fclose(f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1592,14 +1598,14 @@ class TestLeakAutoVar : public TestFixture {
               "    free(p);\n"
               "    if (x && (p = malloc(10)))\n"
               "        free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *p, int x) {\n"
               "    delete[] p;\n"
               "    if (x && (p = new char[10]))\n"
               "        delete[] p;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1712,7 +1718,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (q == NULL)\n"
               "        return;\n"
               "    free(q);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:16] -> [test.c:8:5]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
     }
 
@@ -1748,7 +1754,7 @@ class TestLeakAutoVar : public TestFixture {
               "    int *i = new int;\n"
               "    unique_ptr<int> x(i);\n"
               "    delete i;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:6:5] -> [test.cpp:7:12]: (error) Memory pointed to by 'i' is freed twice. [doubleFree]\n", errout_str());
 
         check("using namespace std;\n"
@@ -1757,14 +1763,14 @@ class TestLeakAutoVar : public TestFixture {
               "{\n"
               "    int *i = new int;\n"
               "    unique_ptr<int> x(i);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
     void doublefree15() { // #11966
         check("void f(FILE* fp) {\n"
               "    static_cast<void>(fclose(fp));\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1826,7 +1832,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    exit(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1834,7 +1840,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    fatal_error();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:18]: (information) --check-library: Function fatal_error() should have <noreturn> configuration [checkLibraryNoReturn]\n",
                       errout_str());
     }
@@ -1845,9 +1851,9 @@ class TestLeakAutoVar : public TestFixture {
               "  if (x) {\n"
               "    free(p);\n"
               "    ::exit(0);\n"
-              "  }"
+              "  }\n"
               "  free(p);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -1855,9 +1861,9 @@ class TestLeakAutoVar : public TestFixture {
               "  if (x) {\n"
               "    free(p);\n"
               "    std::exit(0);\n"
-              "  }"
+              "  }\n"
               "  free(p);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1870,7 +1876,7 @@ class TestLeakAutoVar : public TestFixture {
               "        func_notret();\n"
               "    }\n"
               "    free(ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1879,7 +1885,7 @@ class TestLeakAutoVar : public TestFixture {
               "  p->x = malloc(10);\n"
               "  free(p->x);\n"
               "  p->x = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(s_t s) {\n" // #11061
@@ -1901,7 +1907,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void g(size_t len) {\n" // #12365
               "    char* b = new char[len + 1]{};\n"
               "    std::string str = std::string(b);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:1]: (error) Memory leak: b [memleak]\n", errout_str());
     }
 
@@ -1912,7 +1918,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (err) {\n"
               "        free(reg);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1925,7 +1931,7 @@ class TestLeakAutoVar : public TestFixture {
               "        goto x;\n"
               "    }\n"
               "    return p;\n"  // no error since there is a goto
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1950,7 +1956,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (x) { p = malloc(10); }\n"
               "    else { return 0; }\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1959,7 +1965,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = NULL;\n"
               "    if (x) { p = malloc(10); }\n"
               "    else { return 0; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:5:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
@@ -1968,7 +1974,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    if (!p) { return; }\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("char * f(size_t size) {"
@@ -1976,14 +1982,14 @@ class TestLeakAutoVar : public TestFixture {
               "    if (!p && size != 0)"
               "        return NULL;"
               "    return p;"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    if (p) { } else { return; }\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3866 - UNLIKELY
@@ -1991,7 +1997,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    if (UNLIKELY(!p)) { return; }\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2000,7 +2006,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p;\n"
               "    if (x) { p = malloc(10); }\n"
               "    if (x) { free(p); }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
@@ -2008,7 +2014,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (x) { p = malloc(10); }\n"
               "    if (!x) { return; }\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2017,7 +2023,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    if (!p && x) { p = malloc(10); }\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2028,7 +2034,7 @@ class TestLeakAutoVar : public TestFixture {
               "        free(a);\n"
               "    else\n"
               "        a = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:6:9]: (error) Memory leak: a [memleak]\n", errout_str());
     }
 
@@ -2038,7 +2044,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (x < 0)\n"  // assume negative value indicates its unallocated
               "        return;\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2048,7 +2054,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (fd == -1)\n"
               "        return -1;\n"
               "    return fd;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
@@ -2056,7 +2062,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (fd != -1)\n"
               "        return fd;\n"
               "    return -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2066,7 +2072,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (dostuff(p==NULL,0))\n"
               "        return;\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2076,7 +2082,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (!(x != NULL))\n"
               "        return;\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2086,7 +2092,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (NULL == (p = malloc(4)))\n"
               "        return;\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2094,7 +2100,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f(char **p) {\n"
               "    if ((*p = malloc(4)) == NULL)\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2105,7 +2111,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return 1;\n"
               "    free(path);\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int fd, const char *mode) {\n"
@@ -2114,7 +2120,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return 1;\n" // <- memory leak
               "    free(path);\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4] memory leak", "", errout_str());
     }
 
@@ -2124,7 +2130,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (buf == (char*)NULL)\n"
               "        return NULL;\n"
               "    return buf;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2134,14 +2140,14 @@ class TestLeakAutoVar : public TestFixture {
               "void test_alloc() {\n"
               "   if ( global_ptr = new SSS()) {}\n"
               "   return;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("FILE* hFile;\n"
               "int openFile( void ) {\n"
               "   if ((hFile = fopen(\"1.txt\", \"wb\" )) == NULL) return 0;\n"
               "   return 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2152,7 +2158,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    free(p);\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void) {\n"
@@ -2161,7 +2167,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    free(p);\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2171,7 +2177,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (!p)\n"
               "        return NULL;\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int *f() {\n"
@@ -2179,7 +2185,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (!!(!p))\n"
               "        return NULL;\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2190,7 +2196,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (q == 0)\n"
               "        return;\n"
               "    free(q);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:5:9]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void f() {\n"
@@ -2201,7 +2207,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    } else\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:8:9]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
@@ -2212,7 +2218,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (!b)\n"
               "        return;\n"
               "    a = b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2223,7 +2229,7 @@ class TestLeakAutoVar : public TestFixture {
               "    else\n"
               "        void * p2 = malloc(2);\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:30]: (error) Memory leak: p1 [memleak]\n"
                       "[test.c:5:30]: (error) Memory leak: p2 [memleak]\n", errout_str());
 
@@ -2232,7 +2238,7 @@ class TestLeakAutoVar : public TestFixture {
               "        void * p1 = malloc(5);\n"
               "    else\n"
               "        void * p2 = malloc(2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:30]: (error) Memory leak: p1 [memleak]\n"
                       "[test.c:5:30]: (error) Memory leak: p2 [memleak]\n", errout_str());
     }
@@ -2245,7 +2251,7 @@ class TestLeakAutoVar : public TestFixture {
               "            p = malloc(5);\n"
               "    }\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:6:5]: (error) Memory leak: p [memleak]\n",  errout_str());
     }
 
@@ -2255,7 +2261,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (fd >= 0)\n"
               "        return fd;\n"
               "    return -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(const char * pathname, int flags) {\n"
@@ -2263,7 +2269,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (fd <= -1)\n"
               "        return -1;\n"
               "    return fd;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2381,6 +2387,22 @@ class TestLeakAutoVar : public TestFixture {
         ASSERT_EQUALS("", errout_str()); // don't crash
     }
 
+    void ifelse30() {
+        check("void f(void** pp) {\n" // #14709
+              "    void* p = malloc(8);\n"
+              "    if ((void*)p == 0)\n"
+              "        return;\n"
+              "    *pp = p;\n"
+              "}\n"
+              "void g(void** pp) {\n"
+              "    void* p = malloc(8);\n"
+              "    if (static_cast<void*>(p) == 0)\n"
+              "        return;\n"
+              "    *pp = p;\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void switch1() {
         check("void f() {\n"
               "    char *p = 0;\n"
@@ -2389,7 +2411,7 @@ class TestLeakAutoVar : public TestFixture {
               "    default: return;\n"
               "    }\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2400,7 +2422,7 @@ class TestLeakAutoVar : public TestFixture {
               "    for (i=0;i<5;i++) { }\n"
               "    if (x) { free(p) }\n"
               "    else { a = p; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2435,13 +2457,13 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    free(f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:2:12] -> [test.c:3:5]: (error) Mismatching allocation and deallocation: f [mismatchAllocDealloc]\n", errout_str());
 
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    free((void*)f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:2:12] -> [test.c:3:5]: (error) Mismatching allocation and deallocation: f [mismatchAllocDealloc]\n", errout_str());
 
         check("void f() {\n"
@@ -2451,18 +2473,18 @@ class TestLeakAutoVar : public TestFixture {
               "    delete[] cPtr;\n"
               "    cPtr = new char[100];\n"
               "    delete cPtr;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:6:12] -> [test.cpp:7:12]: (error) Mismatching allocation and deallocation: cPtr [mismatchAllocDealloc]\n", errout_str());
 
         check("void f() {\n"
               "    char *cPtr = new char[100];\n"
               "    free(cPtr);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:18] -> [test.cpp:3:5]: (error) Mismatching allocation and deallocation: cPtr [mismatchAllocDealloc]\n", errout_str());
 
         check("void f() {\n"
               "    char *cPtr = new (buf) char[100];\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -2481,7 +2503,7 @@ class TestLeakAutoVar : public TestFixture {
               "   void* a = malloc(1);\n"
               "   void* b = freopen(f, p, a);\n"
               "   free(b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:2:14] -> [test.c:3:14]: (error) Mismatching allocation and deallocation: a [mismatchAllocDealloc]\n"
                       "[test.c:3:14] -> [test.c:4:4]: (error) Mismatching allocation and deallocation: b [mismatchAllocDealloc]\n", errout_str());
 
@@ -2489,14 +2511,14 @@ class TestLeakAutoVar : public TestFixture {
               "   void* a;\n"
               "   void* b = realloc(a, 10);\n"
               "   free(b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   int * i = new int;\n"
               "   int * j = realloc(i, 2 * sizeof(int));\n"
               "   delete[] j;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:14] -> [test.cpp:3:14]: (error) Mismatching allocation and deallocation: i [mismatchAllocDealloc]\n"
                       "[test.cpp:3:14] -> [test.cpp:4:13]: (error) Mismatching allocation and deallocation: j [mismatchAllocDealloc]\n", errout_str());
 
@@ -2526,26 +2548,26 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::unique_ptr<FILE> fp{f};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:3:30]: (error) Mismatching allocation and deallocation: f [mismatchAllocDealloc]\n", errout_str());
 
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::unique_ptr<FILE, decltype(&fclose)> fp{f, &fclose};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::shared_ptr<FILE> fp{f, &fclose};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("struct deleter { void operator()(FILE* f) { fclose(f); }};\n"
               "void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::unique_ptr<FILE, deleter> fp{f};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("int * create();\n"
@@ -2567,39 +2589,39 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::shared_ptr<FILE> fp{f, [](FILE* x) { fclose(x); }};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::shared_ptr<FILE> fp{f, +[](FILE* x) { fclose(x); }};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::shared_ptr<FILE> fp{f, [](FILE* x) { free(f); }};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:3:30]: (error) Mismatching allocation and deallocation: f [mismatchAllocDealloc]\n", errout_str());
 
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::shared_ptr<FILE> fp{f, [](FILE* x) {}};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:3:30]: (error) Mismatching allocation and deallocation: f [mismatchAllocDealloc]\n", errout_str());
 
         check("class C;\n"
               "void f() {\n"
               "  C* c = new C{};\n"
               "  std::shared_ptr<C> a{c, [](C*) {}};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("class C;\n"
               "void f() {\n"
               "  C* c = new C{};\n"
               "  std::shared_ptr<C> a{c, [](C* x) { delete x; }};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("struct DirDeleter {\n" // #12544
@@ -2631,7 +2653,7 @@ class TestLeakAutoVar : public TestFixture {
         check("int f() {\n"
               "    char *p = malloc(100);\n"
               "    return 123;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:5]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
@@ -2639,7 +2661,7 @@ class TestLeakAutoVar : public TestFixture {
         check("char *f() {\n"
               "    char *p = malloc(100);\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2647,7 +2669,7 @@ class TestLeakAutoVar : public TestFixture {
         check("struct dev * f() {\n"
               "    struct ABC *abc = malloc(100);\n"
               "    return &abc->dev;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2659,7 +2681,7 @@ class TestLeakAutoVar : public TestFixture {
               "        throw 1;\n"
               "    }\n"
               "    free(p);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *p, int x) {\n"
@@ -2668,7 +2690,7 @@ class TestLeakAutoVar : public TestFixture {
               "        throw 1;\n"
               "    }\n"
               "    delete p;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *p, int x) {\n"
@@ -2677,7 +2699,7 @@ class TestLeakAutoVar : public TestFixture {
               "        throw 1;\n"
               "    }\n"
               "    delete [] p;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2691,7 +2713,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    }\n"
               "    *p = 0;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2699,7 +2721,7 @@ class TestLeakAutoVar : public TestFixture {
         check("std::pair<char*, char*> f(size_t n) {\n"
               "   char* p = (char* )malloc(n);\n"
               "   return {p, p};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2707,43 +2729,43 @@ class TestLeakAutoVar : public TestFixture {
         check("uint8_t *f() {\n"
               "    void *x = malloc(1);\n"
               "    return (uint8_t *)x;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("uint8_t f() {\n"
               "    void *x = malloc(1);\n"
               "    return (uint8_t)x;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Memory leak: x [memleak]\n", errout_str());
 
         check("void** f() {\n"
               "    void *x = malloc(1);\n"
               "    return (void**)x;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return (long long)x;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return (void*)(short)x;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Memory leak: x [memleak]\n", errout_str());
 
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return (mytype)x;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void* f() {\n" // Do not crash
               "    void *x = malloc(1);\n"
               "    return (mytype)y;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Memory leak: x [memleak]\n", errout_str());
     }
 
@@ -2751,25 +2773,25 @@ class TestLeakAutoVar : public TestFixture {
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return (x);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return ((x));\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return ((((x))));\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("char* f() {\n"
               "    void *x = malloc(1);\n"
               "    return (char*)(x);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2777,7 +2799,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void* f() {\n"
               "    void *x = malloc (sizeof (struct alloc));\n"
               "    return x + sizeof (struct alloc);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2786,7 +2808,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char* p = (char*)malloc(1);\n"
               "    p[0] = 'x';\n"
               "    return p[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:4:5]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("struct S { int f(); };\n" // #11746
@@ -2794,14 +2816,14 @@ class TestLeakAutoVar : public TestFixture {
               "    S* s = new S;\n"
               "    delete s;\n"
               "    return s->f();\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:5:5]: (error) Returning/dereferencing 's' after it is deallocated / released [deallocret]\n", errout_str());
 
         check("int f() {\n"
               "    int* p = new int(3);\n"
               "    delete p;\n"
               "    return *p;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:3:5] -> [test.cpp:4:5]: (error) Returning/dereferencing 'p' after it is deallocated / released [deallocret]\n", errout_str());
     }
 
@@ -2838,10 +2860,26 @@ class TestLeakAutoVar : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void return13() { // #4638
+        CheckOptions options;
+        options.cpp = true;
+        check("bool f() {\n"
+              "    int* p = new int;\n"
+              "    return p;\n"
+              "}\n"
+              "bool g() {\n"
+              "    void* p = malloc(4);\n"
+              "    return p;\n"
+              "}\n", options);
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Memory leak: p [memleak]\n"
+                      "[test.cpp:7:5]: (error) Memory leak: p [memleak]\n",
+                      errout_str());
+    }
+
     void test1() {
         check("void f(double*&p) {\n" // 3809
               "    p = malloc(0x100);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int*& p) {\n" // #4400
@@ -2870,7 +2908,7 @@ class TestLeakAutoVar : public TestFixture {
         check("struct Fred {\n"
               "    char *p;\n"
               "    void f1() { free(p); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2878,7 +2916,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    char *&p = x();\n"
               "    p = malloc(10);\n"
-              "};", dinit(CheckOptions, $.cpp = true));
+              "};\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2887,21 +2925,21 @@ class TestLeakAutoVar : public TestFixture {
               "    static char *p;\n"
               "    if (!p) p = malloc(10);\n"
               "    if (x) { free(p); p = 0; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void test5() { // unknown type
-        check("void f() { Fred *p = malloc(10); }", dinit(CheckOptions, $.cpp = true));
+        check("void f() { Fred *p = malloc(10); }\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:1:34]: (error) Memory leak: p [memleak]\n", errout_str());
 
-        check("void f() { Fred *p = malloc(10); }");
+        check("void f() { Fred *p = malloc(10); }\n");
         ASSERT_EQUALS("[test.c:1:34]: (error) Memory leak: p [memleak]\n", errout_str());
 
-        check("void f() { Fred *p = new Fred; }", dinit(CheckOptions, $.cpp = true));
+        check("void f() { Fred *p = new Fred; }\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { Fred fred = malloc(10); }", dinit(CheckOptions, $.cpp = true));
+        check("void f() { Fred fred = malloc(10); }\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2909,7 +2947,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    throw 123;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void f() {\n"
@@ -2919,7 +2957,7 @@ class TestLeakAutoVar : public TestFixture {
               "        throw 123;\n"
               "    } catch (...) { }\n"
               "    free(p);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2936,7 +2974,7 @@ class TestLeakAutoVar : public TestFixture {
               "        throw ::NS::Except();\n"
               "    }\n"
               "    delete pi;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2949,7 +2987,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    x(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:9]: (information) --check-library: Function x() should have <noreturn> configuration [checkLibraryNoReturn]\n"
                       "[test.c:4:1]: (information) --check-library: Function x() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n",
                       errout_str());
@@ -2967,7 +3005,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    x(&p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:10]: (information) --check-library: Function x() should have <noreturn> configuration [checkLibraryNoReturn]\n"
                       "[test.c:4:1]: (information) --check-library: Function x() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n",
                       errout_str());
@@ -2978,7 +3016,7 @@ class TestLeakAutoVar : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    char *p = malloc(10);\n"
                                 "    if (set_data(p)) { }\n"
-                                "}";
+                                "}\n";
             check(code);
             ASSERT_EQUALS("[test.c:4:1]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
             check(code, dinit(CheckOptions, $.cpp = true));
@@ -2989,7 +3027,7 @@ class TestLeakAutoVar : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    char *p = malloc(10);\n"
                                 "    if (set_data(p)) { return; }\n"
-                                "}";
+                                "}\n";
             check(code);
             ASSERT_EQUALS("[test.c:3:24]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n"
                           "[test.c:4:1]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n"
@@ -3006,7 +3044,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    int ret = set_data(p);\n"
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:4:5]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
     }
 
@@ -3065,6 +3103,29 @@ class TestLeakAutoVar : public TestFixture {
         ASSERT_EQUALS("[test.cpp:5:5]: (error) Resource leak: file [resourceLeak]\n", errout_str());
     }
 
+    void configurationUse() {
+        // A function configured with <use> takes care of the memory, so it needs
+        // no further configuration.
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def format=\"2\">\n"
+                                   "  <memory>\n"
+                                   "    <alloc>myalloc</alloc>\n"
+                                   "    <use>set_data</use>\n"
+                                   "    <dealloc>myfree</dealloc>\n"
+                                   "  </memory>\n"
+                                   "  <function name=\"set_data\">\n"
+                                   "    <noreturn>false</noreturn>\n"
+                                   "    <arg nr=\"1\"/>\n"
+                                   "  </function>\n"
+                                   "</def>\n";
+        const Settings settingsUse = settingsBuilder().libraryxml(xmldata).checkLibrary().build();
+        check("void f() {\n"
+              "    char *p = myalloc(10);\n"
+              "    set_data(p);\n"
+              "}\n", settingsUse);
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void configuration6() {
         check("void f() {}\n" // #11198
               "void g() {\n"
@@ -3084,7 +3145,7 @@ class TestLeakAutoVar : public TestFixture {
     void ptrptr() {
         check("void f() {\n"
               "    char **p = malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
@@ -3092,19 +3153,19 @@ class TestLeakAutoVar : public TestFixture {
         check("void QueueDSMCCPacket(unsigned char *data, int length) {\n"
               "    unsigned char *dataCopy = malloc(length * sizeof(unsigned char));\n"
               "    m_dsmccQueue.enqueue(new DSMCCPacket(dataCopy));\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:1]: (information) --check-library: Function DSMCCPacket() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
 
         check("void QueueDSMCCPacket(unsigned char *data, int length) {\n"
               "    unsigned char *dataCopy = malloc(length * sizeof(unsigned char));\n"
               "    m_dsmccQueue.enqueue(new DSMCCPacket(somethingunrelated));\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:1]: (error) Memory leak: dataCopy [memleak]\n", errout_str());
 
         check("void f() {\n"
               "  char *buf = new char[1000];\n"
               "  clist.push_back(new (std::nothrow) C(buf));\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:1]: (information) --check-library: Function C() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
     }
 
@@ -3113,7 +3174,7 @@ class TestLeakAutoVar : public TestFixture {
               "  double *new = malloc(1*sizeof(double));\n"
               "  free(new);\n"
               "  return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3126,7 +3187,7 @@ class TestLeakAutoVar : public TestFixture {
               "    }\n"
               "    c = malloc(128);\n"
               "    return ret();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3142,6 +3203,34 @@ class TestLeakAutoVar : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void unconditionalScope() {
+        check("void f() {\n" // #14945
+              "    {\n"
+              "        int* p = new int;\n"
+              "        *p = 1;\n"
+              "    }\n"
+              "    {\n"
+              "        int* q = new int;\n"
+              "        *q = 2;\n"
+              "        delete q;\n"
+              "    }\n"
+              "    int* r = new int;\n"
+              "    *r = 3;\n"
+              "    delete r;\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Memory leak: p [memleak]\n", errout_str());
+
+        check("void f() {\n"
+              "    int* p = new int;\n"
+              "    {\n"
+              "        (void)p;\n"
+              "    }\n"
+              "    *p = 1;\n"
+              "    delete p;\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void functionCallCastConfig() { // #9652
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
                                    "<def format=\"2\">\n"
@@ -3161,7 +3250,7 @@ class TestLeakAutoVar : public TestFixture {
               "{\n"
               "    char * buf = malloc(4);\n"
               "    free_func((void *)(1), buf);\n"
-              "}", settingsFunctionCall);
+              "}\n", settingsFunctionCall);
         ASSERT_EQUALS("[test.cpp:5:1]: (information) --check-library: Function free_func() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
 
         check("void g(void*);\n"
@@ -3230,8 +3319,8 @@ class TestLeakAutoVarRecursiveCountLimit : public TestFixture {
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        CheckLeakAutoVar check;
+        runChecks(check, tokenizer, *this);
     }
 
     void run() override {
@@ -3247,7 +3336,7 @@ class TestLeakAutoVarRecursiveCountLimit : public TestFixture {
                                             "void foo() {\n"
                                             "  if (0) { }\n"
                                             "  THOU THOU\n"
-                                            "}"), LIMIT, "Internal limit: CheckLeakAutoVar::checkScope() Maximum recursive count of 1000 reached.");
+                                            "}\n"), LIMIT, "Internal limit: CheckLeakAutoVar::checkScope() Maximum recursive count of 1000 reached.");
         ASSERT_NO_THROW(checkP("#define ONE     if (0) { }\n"
                                "#define TEN     ONE ONE ONE ONE ONE ONE ONE ONE ONE ONE\n"
                                "#define HUN     TEN TEN TEN TEN TEN TEN TEN TEN TEN TEN\n"
@@ -3255,7 +3344,7 @@ class TestLeakAutoVarRecursiveCountLimit : public TestFixture {
                                "void foo() {\n"
                                "  if (0) { }\n"
                                "  THOU THOU\n"
-                               "}"));
+                               "}\n"));
     }
 };
 
@@ -3277,8 +3366,8 @@ class TestLeakAutoVarStrcpy : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        CheckLeakAutoVar check;
+        runChecks(check, tokenizer, *this);
     }
 
     void run() override {
@@ -3297,7 +3386,7 @@ class TestLeakAutoVarStrcpy : public TestFixture {
               "{\n"
               "    char* ptr = new char[strlen(str)+1];\n"
               "    m = strcpy(ptr, str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3305,7 +3394,7 @@ class TestLeakAutoVarStrcpy : public TestFixture {
         check("void f(char *p) {\n"
               "    free(p);\n"
               "    strcpy(a, p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n", errout_str());
 
         check("void f(char *p, const char *q) {\n" // #11665
@@ -3318,12 +3407,12 @@ class TestLeakAutoVarStrcpy : public TestFixture {
         check("void f(char *p) {\n"   // #3041 - assigning pointer when it's used
               "    free(p);\n"
               "    strcpy(a, p=b());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void fclose_false_positive() { // #9575
-        check("int  f(FILE *fp) { return fclose(fp); }");
+        check("int  f(FILE *fp) { return fclose(fp); }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3353,7 +3442,7 @@ class TestLeakAutoVarStrcpy : public TestFixture {
               "    if (b)\n"
               "        p = new S();\n"
               "    p->f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:1]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("class B { std::string s; };\n" // #12062
@@ -3382,8 +3471,8 @@ class TestLeakAutoVarWindows : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this, false);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        CheckLeakAutoVar check;
+        runChecks(check, tokenizer, *this);
     }
 
     void run() override {
@@ -3455,8 +3544,8 @@ class TestLeakAutoVarPosix : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        CheckLeakAutoVar check;
+        runChecks(check, tokenizer, *this);
     }
 
     void run() override {
diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp
index a531ac4cba9..c0ccbea0831 100644
--- a/test/testlibrary.cpp
+++ b/test/testlibrary.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -109,7 +109,7 @@ class TestLibrary : public TestFixture {
                                    "  </function>\n"
                                    "</def>";
 
-        const char code[] = "foo();";
+        const char code[] = "foo();\n";
         SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
 
@@ -131,13 +131,13 @@ class TestLibrary : public TestFixture {
         Library library;
         ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
         {
-            const char code[] = "fred.foo(123);"; // <- wrong scope, not library function
+            const char code[] = "fred.foo(123);\n"; // <- wrong scope, not library function
             const SimpleTokenList tokenList(code);
 
             ASSERT(library.isNotLibraryFunction(tokenList.front()->tokAt(2)));
         }
         {
-            const char code[] = "Fred::foo(123);"; // <- wrong scope, not library function
+            const char code[] = "Fred::foo(123);\n"; // <- wrong scope, not library function
             const SimpleTokenList tokenList(code);
 
             ASSERT(library.isNotLibraryFunction(tokenList.front()->tokAt(2)));
@@ -153,7 +153,7 @@ class TestLibrary : public TestFixture {
                                    "</def>";
 
         TokenList tokenList(settingsDefault, Standards::Language::CPP);
-        const char code[] = "foo();"; // <- too few arguments, not library function
+        const char code[] = "foo();\n"; // <- too few arguments, not library function
         ASSERT(tokenList.createTokensFromString(code));
         Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
         tokenList.createAst();
@@ -177,7 +177,7 @@ class TestLibrary : public TestFixture {
 
         {
             TokenList tokenList(settingsDefault, Standards::Language::CPP);
-            const char code[] = "foo();"; // <- too few arguments, not library function
+            const char code[] = "foo();\n"; // <- too few arguments, not library function
             ASSERT(tokenList.createTokensFromString(code));
             Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
             tokenList.createAst();
@@ -186,7 +186,7 @@ class TestLibrary : public TestFixture {
         }
         {
             TokenList tokenList(settingsDefault, Standards::Language::CPP);
-            const char code[] = "foo(a);"; // <- library function
+            const char code[] = "foo(a);\n"; // <- library function
             ASSERT(tokenList.createTokensFromString(code));
             Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
             tokenList.createAst();
@@ -197,7 +197,7 @@ class TestLibrary : public TestFixture {
         }
         {
             TokenList tokenList(settingsDefault, Standards::Language::CPP);
-            const char code[] = "foo(a, b);"; // <- library function
+            const char code[] = "foo(a, b);\n"; // <- library function
             ASSERT(tokenList.createTokensFromString(code));
             Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
             tokenList.createAst();
@@ -208,7 +208,7 @@ class TestLibrary : public TestFixture {
         }
         {
             TokenList tokenList(settingsDefault, Standards::Language::CPP);
-            const char code[] = "foo(a, b, c);"; // <- too much arguments, not library function
+            const char code[] = "foo(a, b, c);\n"; // <- too much arguments, not library function
             ASSERT(tokenList.createTokensFromString(code));
             Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
             tokenList.createAst();
@@ -225,7 +225,7 @@ class TestLibrary : public TestFixture {
                                    "  </function>\n"
                                    "</def>";
 
-        const char code[] = "Fred foo(123);"; // <- Variable declaration, not library function
+        const char code[] = "Fred foo(123);\n"; // <- Variable declaration, not library function
         SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
         tokenList.front()->next()->varId(1);
@@ -285,7 +285,7 @@ class TestLibrary : public TestFixture {
         ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
         ASSERT_EQUALS(0, library.functions().at("foo").argumentChecks.at(-1).notuninit);
 
-        const char code[] = "foo(a,b,c,d,e);";
+        const char code[] = "foo(a,b,c,d,e);\n";
         SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
 
@@ -309,7 +309,7 @@ class TestLibrary : public TestFixture {
         Library library;
         ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-        const char code[] = "foo(a,b,c,d);";
+        const char code[] = "foo(a,b,c,d);\n";
         SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
 
@@ -340,7 +340,7 @@ class TestLibrary : public TestFixture {
         Library library;
         ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-        const char code[] = "foo(a,b,c,d,e,f,g,h,i,j,k);";
+        const char code[] = "foo(a,b,c,d,e,f,g,h,i,j,k);\n";
         SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
 
@@ -481,7 +481,7 @@ class TestLibrary : public TestFixture {
         Library library;
         ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-        const char code[] = "foo(a,b,c,d,e);";
+        const char code[] = "foo(a,b,c,d,e);\n";
         SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
 
@@ -543,13 +543,13 @@ class TestLibrary : public TestFixture {
         ASSERT(library.functions().at("bar").argumentChecks.empty());
 
         {
-            const char code[] = "Foo::foo();";
+            const char code[] = "Foo::foo();\n";
             const SimpleTokenList tokenList(code);
             ASSERT(library.isnotnoreturn(tokenList.front()->tokAt(2)));
         }
 
         {
-            const char code[] = "bar();";
+            const char code[] = "bar();\n";
             const SimpleTokenList tokenList(code);
             ASSERT(library.isnotnoreturn(tokenList.front()));
         }
@@ -569,14 +569,14 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer tokenizer(settingsDefault, *this);
-            const char code[] = "CString str; str.Format();";
+            const char code[] = "CString str; str.Format();\n";
             ASSERT(tokenizer.tokenize(code));
             ASSERT(library.isnotnoreturn(Token::findsimplematch(tokenizer.tokens(), "Format")));
         }
 
         {
             SimpleTokenizer tokenizer(settingsDefault, *this);
-            const char code[] = "HardDrive hd; hd.Format();";
+            const char code[] = "HardDrive hd; hd.Format();\n";
             ASSERT(tokenizer.tokenize(code));
             ASSERT(!library.isnotnoreturn(Token::findsimplematch(tokenizer.tokens(), "Format")));
         }
@@ -595,14 +595,14 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer tokenizer(settingsDefault, *this);
-            const char code[] = "struct X : public Base { void dostuff() { f(0); } };";
+            const char code[] = "struct X : public Base { void dostuff() { f(0); } };\n";
             ASSERT(tokenizer.tokenize(code));
             ASSERT(library.isnullargbad(Token::findsimplematch(tokenizer.tokens(), "f"),1));
         }
 
         {
             SimpleTokenizer tokenizer(settingsDefault, *this);
-            const char code[] = "struct X : public Base { void dostuff() { f(1,2); } };";
+            const char code[] = "struct X : public Base { void dostuff() { f(1,2); } };\n";
             ASSERT(tokenizer.tokenize(code));
             ASSERT(!library.isnullargbad(Token::findsimplematch(tokenizer.tokens(), "f"),1));
         }
@@ -622,7 +622,7 @@ class TestLibrary : public TestFixture {
         Library library;
         ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-        const char code[] = "a(); b();";
+        const char code[] = "a(); b();\n";
         const SimpleTokenList tokenList(code);
 
         const Library::WarnInfo* a = library.getWarnInfo(tokenList.front());
@@ -872,7 +872,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::A<int> a;"));
+            ASSERT(var.tokenize("std::A<int> a;\n"));
             ASSERT_EQUALS(&A, library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             bool isIterator;
@@ -882,7 +882,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::A<int>::size_type a_s;"));
+            ASSERT(var.tokenize("std::A<int>::size_type a_s;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
@@ -890,7 +890,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::A<int>::iterator a_it;"));
+            ASSERT(var.tokenize("std::A<int>::iterator a_it;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT_EQUALS(&A, library.detectIterator(var.tokens()));
             bool isIterator;
@@ -900,7 +900,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::B<int> b;"));
+            ASSERT(var.tokenize("std::B<int> b;\n"));
             ASSERT_EQUALS(&B, library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             bool isIterator;
@@ -910,7 +910,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::B<int>::size_type b_s;"));
+            ASSERT(var.tokenize("std::B<int>::size_type b_s;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
@@ -918,7 +918,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::B<int>::iterator b_it;"));
+            ASSERT(var.tokenize("std::B<int>::iterator b_it;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT_EQUALS(&B, library.detectIterator(var.tokens()));
             bool isIterator;
@@ -928,7 +928,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("C c;"));
+            ASSERT(var.tokenize("C c;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
@@ -936,7 +936,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("D d;"));
+            ASSERT(var.tokenize("D d;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
@@ -944,7 +944,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::E e;"));
+            ASSERT(var.tokenize("std::E e;\n"));
             ASSERT(library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             bool isIterator;
@@ -955,7 +955,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("E e;"));
+            ASSERT(var.tokenize("E e;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
@@ -964,7 +964,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::E::iterator I;"));
+            ASSERT(var.tokenize("std::E::iterator I;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
@@ -973,7 +973,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::E::size_type p;"));
+            ASSERT(var.tokenize("std::E::size_type p;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
@@ -982,7 +982,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::F f;"));
+            ASSERT(var.tokenize("std::F f;\n"));
             ASSERT(library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             bool isIterator;
@@ -992,7 +992,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::F::iterator I;"));
+            ASSERT(var.tokenize("std::F::iterator I;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             TODO_ASSERT(library.detectIterator(var.tokens()));
             bool isIterator = false;
@@ -1002,7 +1002,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("F::iterator I;"));
+            ASSERT(var.tokenize("F::iterator I;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
@@ -1156,6 +1156,23 @@ class TestLibrary : public TestFixture {
 
         // comma followed by dot
         LOADLIB_ERROR_INVALID_RANGE("-10:0,.5:");
+
+        // arg indirect out of range (index into ArgumentChecks::direction)
+        LOADLIBERROR("<?xml version=\"1.0\"?>\n"
+                     "<def>\n"
+                     "  <function name=\"foo\">\n"
+                     "    <arg nr=\"1\" direction=\"in\" indirect=\"1000000\"/>\n"
+                     "  </function>\n"
+                     "</def>",
+                     Library::ErrorCode::BAD_ATTRIBUTE_VALUE);
+
+        LOADLIBERROR("<?xml version=\"1.0\"?>\n"
+                     "<def>\n"
+                     "  <function name=\"foo\">\n"
+                     "    <arg nr=\"1\" direction=\"out\" indirect=\"-5\"/>\n"
+                     "  </function>\n"
+                     "</def>",
+                     Library::ErrorCode::BAD_ATTRIBUTE_VALUE);
     }
 
     void loadLibCombinations() const {
diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
index a2f9526162c..800334926e5 100644
--- a/test/testmathlib.cpp
+++ b/test/testmathlib.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 #include "token.h"
 #include "tokenlist.h"
 
+#include <cmath>
 #include <limits>
 #include <memory>
 #include <string>
@@ -44,6 +45,7 @@ class TestMathLib : public TestFixture {
         TEST_CASE(isnegative);
         TEST_CASE(ispositive);
         TEST_CASE(isFloat);
+        TEST_CASE(isLongDoubleOutOfDoubleRange);
         TEST_CASE(isDecimalFloat);
         TEST_CASE(isGreater);
         TEST_CASE(isGreaterEqual);
@@ -167,7 +169,7 @@ class TestMathLib : public TestFixture {
         ASSERT_EQUALS("1", MathLib::calculate("0", "1", '^'));
 
         // Unknown action should throw exception
-        ASSERT_THROW_INTERNAL_EQUALS(MathLib::calculate("1","2",'j'),INTERNAL, "Unexpected action 'j' in MathLib::calculate(). Please report this to Cppcheck developers.");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::calculate("1","2",'j'),INTERNAL, "Unexpected action 'j' in MathLib::calculate().");
     }
 
     void calculate1() const {
@@ -598,6 +600,16 @@ class TestMathLib : public TestFixture {
         // TODO: test with 128-bit values
     }
 
+    void isLongDoubleOutOfDoubleRange() const {
+        ASSERT_EQUALS(true, MathLib::isLongDoubleOutOfDoubleRange("1e400L"));
+        ASSERT_EQUALS(true, MathLib::isLongDoubleOutOfDoubleRange("1.0e4931l"));
+        ASSERT_EQUALS(false, MathLib::isLongDoubleOutOfDoubleRange("1e300L"));
+        ASSERT_EQUALS(false, MathLib::isLongDoubleOutOfDoubleRange("1e10000"));
+        ASSERT_EQUALS(false, MathLib::isLongDoubleOutOfDoubleRange("1e10000f"));
+        ASSERT_EQUALS(false, MathLib::isLongDoubleOutOfDoubleRange("10L"));
+        ASSERT_EQUALS(false, MathLib::isLongDoubleOutOfDoubleRange(""));
+    }
+
     void toDoubleNumber() const {
         // float values
         ASSERT_EQUALS_DOUBLE(1.0,    MathLib::toDoubleNumber("1."),       0.001);
@@ -677,6 +689,13 @@ class TestMathLib : public TestFixture {
         ASSERT_EQUALS_DOUBLE(static_cast<double>('\200'), MathLib::toDoubleNumber("'\\200'"), 0.000001);
         ASSERT_EQUALS_DOUBLE(static_cast<double>(L'A'),   MathLib::toDoubleNumber("L'A'"), 0.000001);
 
+        // out of the range of double, like glibc's HUGE_VAL for compilers other than GCC
+        ASSERT_EQUALS(true, std::isinf(MathLib::toDoubleNumber("1e10000")));
+        ASSERT_EQUALS(true, std::isinf(MathLib::toDoubleNumber("1e10000f")));
+        ASSERT_EQUALS(true, std::isinf(MathLib::toDoubleNumber("1e10000L")));
+        ASSERT_EQUALS(true, std::isinf(MathLib::toDoubleNumber("1.5E+400")));
+        ASSERT_EQUALS(true, std::isinf(MathLib::toDoubleNumber("1.0e4931L"))); // #12282
+
         ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: invalid");
 
         // AppleClang before 18 reports a different error
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index 406f46de902..e05698ae23e 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,33 +39,32 @@ class TestMemleak : public TestFixture {
 
 #define functionReturnType(...) functionReturnType_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
-    CheckMemoryLeak::AllocType functionReturnType_(const char* file, int line, const char (&code)[size]) {
+    CheckMemoryLeakImpl::AllocType functionReturnType_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
         SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        const CheckMemoryLeak c(&tokenizer, this, &settingsDefault);
-
+        const CheckMemoryLeakImpl c(&tokenizer, settingsDefault, *this);
         return (c.functionReturnType)(&tokenizer.getSymbolDatabase()->scopeList.front().functionList.front());
     }
 
     void testFunctionReturnType() {
         {
             const char code[] = "const char *foo()\n"
-                                "{ return 0; }";
-            ASSERT_EQUALS(CheckMemoryLeak::No, functionReturnType(code));
+                                "{ return 0; }\n";
+            ASSERT_EQUALS(CheckMemoryLeakImpl::No, functionReturnType(code));
         }
 
         {
             const char code[] = "Fred *newFred()\n"
-                                "{ return new Fred; }";
-            ASSERT_EQUALS(CheckMemoryLeak::New, functionReturnType(code));
+                                "{ return new Fred; }\n";
+            ASSERT_EQUALS(CheckMemoryLeakImpl::New, functionReturnType(code));
         }
 
         {
             const char code[] = "char *foo()\n"
-                                "{ return new char[100]; }";
-            ASSERT_EQUALS(CheckMemoryLeak::NewArray, functionReturnType(code));
+                                "{ return new char[100]; }\n";
+            ASSERT_EQUALS(CheckMemoryLeakImpl::NewArray, functionReturnType(code));
         }
 
         {
@@ -73,8 +72,8 @@ class TestMemleak : public TestFixture {
                                 "{\n"
                                 "    char *p = new char[100];\n"
                                 "    return p;\n"
-                                "}";
-            ASSERT_EQUALS(CheckMemoryLeak::NewArray, functionReturnType(code));
+                                "}\n";
+            ASSERT_EQUALS(CheckMemoryLeakImpl::NewArray, functionReturnType(code));
         }
     }
 
@@ -94,8 +93,8 @@ class TestMemleak : public TestFixture {
 
         // there is no allocation
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), "ret =");
-        const CheckMemoryLeak check(&tokenizer, nullptr, &settingsDefault);
-        ASSERT_EQUALS(CheckMemoryLeak::No, check.getAllocationType(tok->tokAt(2), 1));
+        const CheckMemoryLeakImpl check(&tokenizer, settingsDefault, *this);
+        ASSERT_EQUALS(CheckMemoryLeakImpl::No, check.getAllocationType(tok->tokAt(2), 1));
     }
 };
 
@@ -120,7 +119,7 @@ class TestMemleakInFunction : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for memory leaks..
-        CheckMemoryLeakInFunction checkMemoryLeak(&tokenizer, &settings, this);
+        CheckMemoryLeakInFunctionImpl checkMemoryLeak(&tokenizer, settings, *this);
         checkMemoryLeak.checkReallocUsage();
     }
 
@@ -150,6 +149,7 @@ class TestMemleakInFunction : public TestFixture {
         TEST_CASE(realloc22);
         TEST_CASE(realloc23);
         TEST_CASE(realloc24); // #9228
+        TEST_CASE(realloc25);
     }
 
     void realloc1() {
@@ -157,7 +157,7 @@ class TestMemleakInFunction : public TestFixture {
               "{\n"
               "    char *a = (char *)malloc(10);\n"
               "    a = realloc(a, 100);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
@@ -167,7 +167,7 @@ class TestMemleakInFunction : public TestFixture {
               "    char *a = (char *)malloc(10);\n"
               "    a = (char *)realloc(a, 100);\n"
               "    free(a);\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
@@ -179,7 +179,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if ((a = realloc(a, 100)) == NULL)\n"
               "        return;\n"
               "    free(a);\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -191,7 +191,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if ((a = realloc(a, 100)) == NULL)\n"
               "        return;\n"
               "    free(a);\n"
-              "}");
+              "}\n");
 
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Memory leak: a\n",
                            "[test.cpp:4:10]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n",
@@ -209,7 +209,7 @@ class TestMemleakInFunction : public TestFixture {
               "        free(buf);\n"
               "    else\n"
               "        free(new_buf);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -223,7 +223,7 @@ class TestMemleakInFunction : public TestFixture {
               "    }\n"
               "    free(pData);\n"
               "    return true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -235,7 +235,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if (!m_buf) {\n"
               "        m_buf = origBuf;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -243,7 +243,7 @@ class TestMemleakInFunction : public TestFixture {
         check("void foo()\n"
               "{\n"
               "    x = realloc(x,100);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -253,7 +253,7 @@ class TestMemleakInFunction : public TestFixture {
               "    pa = pb = malloc(10);\n"
               "    pa = realloc(pa, 20);"
               "    exit();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -264,7 +264,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if (!p)\n"
               "        error();\n"
               "    usep(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -275,7 +275,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if ((a = realloc(a, x + 100)) == NULL)\n"
               "        return;\n"
               "    free(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -285,7 +285,7 @@ class TestMemleakInFunction : public TestFixture {
               "    char **str;\n"
               "    *str = realloc(*str,100);\n"
               "    free (*str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Common realloc mistake: \'str\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
@@ -296,7 +296,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if (!p)\n"
               "        error();\n"
               "    usep(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -307,7 +307,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if( m_options == NULL )\n"
               "        return false;\n"
               "    return true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Common realloc mistake: \'m_options\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
@@ -317,7 +317,7 @@ class TestMemleakInFunction : public TestFixture {
               "  if (zLine) {\n"
               "    free(zLine);\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -326,7 +326,7 @@ class TestMemleakInFunction : public TestFixture {
               "{\n"
               "    void ***a = malloc(sizeof(a));\n"
               "    ***a = realloc(***(a), sizeof(a) * 2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
@@ -335,7 +335,7 @@ class TestMemleakInFunction : public TestFixture {
               "{\n"
               "    void *a = malloc(sizeof(a));\n"
               "    a = realloc((void*)a, sizeof(a) * 2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
@@ -344,7 +344,7 @@ class TestMemleakInFunction : public TestFixture {
               "{\n"
               "    void *a = malloc(sizeof(a));\n"
               "    a = (realloc((void*)((a)), sizeof(a) * 2));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
@@ -353,7 +353,7 @@ class TestMemleakInFunction : public TestFixture {
               "{\n"
               "    void *a = malloc(sizeof(a));\n"
               "    a = realloc((a) + 1, sizeof(a) * 2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -364,7 +364,7 @@ class TestMemleakInFunction : public TestFixture {
               "    bs = realloc(bs, 100);\n"
               "    if (bs == NULL) return bs0;\n"
               "    return bs;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -375,7 +375,7 @@ class TestMemleakInFunction : public TestFixture {
               "    bs = realloc(bs, 100);\n"
               "    if (bs == NULL) return;\n"
               "    *bsp = bs;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -386,7 +386,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if (!(cigar = realloc(cigar, 100 * sizeof(*cigar))))\n"
               "        return;\n"
               "    s->cigar = cigar;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -394,28 +394,82 @@ class TestMemleakInFunction : public TestFixture {
         check("void f() {\n"
               "void *a = NULL;\n"
               "a = realloc(a, 20);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "void *a = NULL;\n"
               "a = malloc(10);\n"
               "a = realloc(a, 20);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:1]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
 
         check("void f() {\n"
               "void *a = nullptr;\n"
               "a = malloc(10);\n"
               "a = realloc(a, 20);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:1]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
 
         check("void f(char *b) {\n"
               "void *a = NULL;\n"
               "a = b;\n"
               "a = realloc(a, 20);\n"
-              "}");
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void realloc25() {
+        check("struct T {\n"
+              "    char* ptr;\n"
+              "    size_t len;\n"
+              "};\n"
+              "struct S {\n"
+              "    struct T t;\n"
+              "};\n"
+              "void f(struct S* s, size_t len) {\n"
+              "    char* p = s->t.ptr;\n"
+              "    p = realloc(p, len);\n"
+              "    if (p) {\n"
+              "        s->t.ptr = p;\n"
+              "        s->t.len = len;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct T {\n"
+              "    char* ptr;\n"
+              "    size_t len;\n"
+              "};\n"
+              "struct S {\n"
+              "    struct T t[1];\n"
+              "};\n"
+              "void f(struct S* s, size_t len) {\n"
+              "    char* p = s->t[0].ptr;\n"
+              "    p = realloc(p, len);\n"
+              "    if (p) {\n"
+              "        s->t[0].ptr = p;\n"
+              "        s->t[0].len = len;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct T {\n" // #14718
+              "    char* ptr;\n"
+              "    size_t len;\n"
+              "};\n"
+              "struct S {\n"
+              "    struct T t;\n"
+              "};\n"
+              "char* get(struct T t) { return t.ptr; };\n"
+              "void f(struct S* s, size_t len) {\n"
+              "    char* p = get(s->t);\n"
+              "    p = realloc(p, len);\n"
+              "    if (p) {\n"
+              "        s->t.ptr = p;\n"
+              "        s->t.len = len;\n"
+              "    }\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 };
@@ -434,7 +488,7 @@ class TestMemleakInClass : public TestFixture {
     TestMemleakInClass() : TestFixture("TestMemleakInClass") {}
 
 private:
-    const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::style).library("std.cfg").build();
+    const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::style).library("std.cfg").library("posix.cfg").build();
 
     /**
      * Tokenize and execute leak check for given code
@@ -447,7 +501,7 @@ class TestMemleakInClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for memory leaks..
-        CheckMemoryLeakInClass checkMemoryLeak(&tokenizer, &settings, this);
+        CheckMemoryLeakInClassImpl checkMemoryLeak(&tokenizer, settings, *this);
         (checkMemoryLeak.check)();
     }
 
@@ -479,6 +533,7 @@ class TestMemleakInClass : public TestFixture {
         TEST_CASE(class25); // ticket #4367 - false positive implementation for destructor is not seen
         TEST_CASE(class26); // ticket #10789
         TEST_CASE(class27); // ticket #8126
+        TEST_CASE(class28); // ticket #14954
 
         TEST_CASE(staticvar);
 
@@ -513,7 +568,7 @@ class TestMemleakInClass : public TestFixture {
               "Fred::~Fred()\n"
               "{\n"
               "    delete [] str2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
         check("class Fred\n"
@@ -531,7 +586,7 @@ class TestMemleakInClass : public TestFixture {
               "    {\n"
               "        delete [] str2;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
@@ -553,7 +608,7 @@ class TestMemleakInClass : public TestFixture {
               "Fred::~Fred()\n"
               "{\n"
               "    free(str1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:17:5]: (error) Mismatching allocation and deallocation: Fred::str1 [mismatchAllocDealloc]\n", errout_str());
 
         check("class Fred\n"
@@ -569,7 +624,7 @@ class TestMemleakInClass : public TestFixture {
               "    {\n"
               "        free(str1);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:12:9]: (error) Mismatching allocation and deallocation: Fred::str1 [mismatchAllocDealloc]\n", errout_str());
     }
 
@@ -605,7 +660,7 @@ class TestMemleakInClass : public TestFixture {
               "        delete tok;\n"
               "        tok = next;\n"
               "    }\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -634,7 +689,7 @@ class TestMemleakInClass : public TestFixture {
               "            tok = next;\n"
               "        }\n"
               "    }\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -658,7 +713,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    ABC *p = new ABC;\n"
               "    addAbc( p );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct ABC;\n"
@@ -675,7 +730,7 @@ class TestMemleakInClass : public TestFixture {
               "        ABC *p = new ABC;\n"
               "        addAbc( p );\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -691,7 +746,7 @@ class TestMemleakInClass : public TestFixture {
               "    char *str = new char[100];\n"
               "    delete [] str;\n"
               "    hello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -703,7 +758,7 @@ class TestMemleakInClass : public TestFixture {
               "        delete [] str;\n"
               "        hello();\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -723,7 +778,7 @@ class TestMemleakInClass : public TestFixture {
               "Fred::~Fred()\n"
               "{\n"
               "    delete this->i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -738,7 +793,7 @@ class TestMemleakInClass : public TestFixture {
               "    {\n"
               "        delete this->i;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -755,7 +810,7 @@ class TestMemleakInClass : public TestFixture {
               "    int* c = new int(1);\n"
               "    delete c;\n"
               "    doNothing(c);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
@@ -768,7 +823,7 @@ class TestMemleakInClass : public TestFixture {
               "        doNothing(c);\n"
               "    }\n"
               "    void doNothing() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -785,7 +840,7 @@ class TestMemleakInClass : public TestFixture {
               "{ p = new int; }\n"
               "\n"
               "A::~A()\n"
-              "{ delete (p); }");
+              "{ delete (p); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
@@ -796,7 +851,7 @@ class TestMemleakInClass : public TestFixture {
               "    { p = new int; }\n"
               "    ~A()\n"
               "    { delete (p); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -808,7 +863,7 @@ class TestMemleakInClass : public TestFixture {
               "    A();\n"
               "};\n"
               "A::A()\n"
-              "{ p = new int; }");
+              "{ p = new int; }\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
         check("class A\n"
@@ -816,7 +871,7 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    int * p;\n"
               "    A() { p = new int; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
@@ -826,8 +881,8 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    int * p;\n"
               "    A() : p(new int[10])\n"
-              "    { }"
-              "};");
+              "    { }\n"
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
         check("class A\n"
@@ -837,7 +892,7 @@ class TestMemleakInClass : public TestFixture {
               "    A();\n"
               "};\n"
               "A::A() : p(new int[10])\n"
-              "{ }");
+              "{ }\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
@@ -859,7 +914,7 @@ class TestMemleakInClass : public TestFixture {
               "{ }\n"
               "\n"
               "void A::cleanup()\n"
-              "{ delete [] p; }");
+              "{ delete [] p; }\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
         check("class A\n"
@@ -873,7 +928,7 @@ class TestMemleakInClass : public TestFixture {
               "    { }\n"
               "    void cleanup()\n"
               "    { delete [] p; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
@@ -895,7 +950,7 @@ class TestMemleakInClass : public TestFixture {
               "{ }\n"
               "\n"
               "void A::foo()\n"
-              "{ p = new int[10]; delete [] p; }");
+              "{ p = new int[10]; delete [] p; }\n");
         ASSERT_EQUALS("[test.cpp:17:3]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated. [publicAllocationError]\n", errout_str());
 
         check("class A\n"
@@ -909,7 +964,7 @@ class TestMemleakInClass : public TestFixture {
               "    { }\n"
               "    void foo()\n"
               "    { p = new int[10]; delete [] p; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:11:7]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated. [publicAllocationError]\n", errout_str());
     }
 
@@ -922,7 +977,7 @@ class TestMemleakInClass : public TestFixture {
               "};\n"
               "\n"
               "void A::init()\n"
-              "{ p = new int[10]; }");
+              "{ p = new int[10]; }\n");
         ASSERT_EQUALS("[test.cpp:9:3]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated. [publicAllocationError]\n"
                       "[test.cpp:3:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
@@ -932,7 +987,7 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    void init()\n"
               "    { p = new int[10]; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated. [publicAllocationError]\n"
                       "[test.cpp:3:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
@@ -945,7 +1000,7 @@ class TestMemleakInClass : public TestFixture {
               "};\n"
               "\n"
               "void A::init()\n"
-              "{ p = new int; }");
+              "{ p = new int; }\n");
         ASSERT_EQUALS("[test.cpp:9:3]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated. [publicAllocationError]\n"
                       "[test.cpp:3:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
@@ -955,7 +1010,7 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    void init()\n"
               "    { p = new int; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated. [publicAllocationError]\n"
                       "[test.cpp:3:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
@@ -968,7 +1023,7 @@ class TestMemleakInClass : public TestFixture {
               "};\n"
               "\n"
               "void A::init()\n"
-              "{ p = malloc(sizeof(int)*10); }");
+              "{ p = malloc(sizeof(int)*10); }\n");
         ASSERT_EQUALS("[test.cpp:9:3]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated. [publicAllocationError]\n"
                       "[test.cpp:3:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
@@ -978,7 +1033,7 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    void init()\n"
               "    { p = malloc(sizeof(int)*10); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated. [publicAllocationError]\n"
                       "[test.cpp:3:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
@@ -992,7 +1047,7 @@ class TestMemleakInClass : public TestFixture {
               "    ~A() { delete [] p; }\n"
               "};\n"
               "A::A()\n"
-              "{ p = new int[10]; }");
+              "{ p = new int[10]; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
@@ -1002,7 +1057,7 @@ class TestMemleakInClass : public TestFixture {
               "    A()\n"
               "    { p = new int[10]; }\n"
               "    ~A() { delete [] p; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -1014,7 +1069,7 @@ class TestMemleakInClass : public TestFixture {
               "    ~A() { delete p; }\n"
               "};\n"
               "A::A()\n"
-              "{ p = new int; }");
+              "{ p = new int; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
@@ -1024,7 +1079,7 @@ class TestMemleakInClass : public TestFixture {
               "    A()\n"
               "    { p = new int; }\n"
               "    ~A() { delete p; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -1036,7 +1091,7 @@ class TestMemleakInClass : public TestFixture {
               "    ~A() { free(p); }\n"
               "};\n"
               "A::A()\n"
-              "{ p = malloc(sizeof(int)*10); }");
+              "{ p = malloc(sizeof(int)*10); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
@@ -1046,7 +1101,7 @@ class TestMemleakInClass : public TestFixture {
               "    A()\n"
               "    { p = malloc(sizeof(int)*10); }\n"
               "    ~A() { free(p); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1059,7 +1114,7 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    A() { a = b = new int[10]; }\n"
               "    ~A() { delete [] a; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1076,7 +1131,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    A::pd = new char[12];\n"
               "    delete [] A::pd;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:5]: (warning) Possible leak in public function. The pointer 'pd' is not deallocated before it is allocated. [publicAllocationError]\n", errout_str());
 
         check("class A {\n"
@@ -1088,7 +1143,7 @@ class TestMemleakInClass : public TestFixture {
               "        pd = new char[12];\n"
               "        delete [] pd;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:7:9]: (warning) Possible leak in public function. The pointer 'pd' is not deallocated before it is allocated. [publicAllocationError]\n", errout_str());
 
         check("class A {\n"
@@ -1102,7 +1157,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    pd = new char[12];\n"
               "    delete [] pd;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:5]: (warning) Possible leak in public function. The pointer 'pd' is not deallocated before it is allocated. [publicAllocationError]\n", errout_str());
     }
 
@@ -1118,7 +1173,7 @@ class TestMemleakInClass : public TestFixture {
               "  }\n"
               "private:\n"
               "  char *a;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class  A : public x\n"
@@ -1132,7 +1187,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "  a = new char[10];\n"
               "  foo(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1150,7 +1205,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    rp1 = new TRadioButton(this);\n"
               "    rp2 = new TRadioButton(this);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class TRadioButton { };\n"
@@ -1166,7 +1221,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    rp1 = new TRadioButton;\n"
               "    rp2 = new TRadioButton;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:19]: (style) Class 'Foo' is unsafe, 'Foo::rp1' can leak by wrong usage. [unsafeClassCanLeak]\n"
                       "[test.cpp:6:19]: (style) Class 'Foo' is unsafe, 'Foo::rp2' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
@@ -1189,7 +1244,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    delete rp1;\n"
               "    delete rp2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1211,7 +1266,7 @@ class TestMemleakInClass : public TestFixture {
               "            delete [] str2;\n"
               "        }\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:15]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
         check("namespace ns1 {\n"
@@ -1235,7 +1290,7 @@ class TestMemleakInClass : public TestFixture {
               "    {\n"
               "        delete [] str2;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:15]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
         check("namespace ns1 {\n"
@@ -1258,7 +1313,7 @@ class TestMemleakInClass : public TestFixture {
               "ns1::Fred::~Fred()\n"
               "{\n"
               "    delete [] str2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:15]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
         check("namespace ns1 {\n"
@@ -1283,7 +1338,7 @@ class TestMemleakInClass : public TestFixture {
               "ns1::ns2::Fred::~Fred()\n"
               "{\n"
               "    delete [] str2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:19]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
         check("namespace ns1 {\n"
@@ -1310,7 +1365,7 @@ class TestMemleakInClass : public TestFixture {
               "ns1::ns2::ns3::Fred::~Fred()\n"
               "{\n"
               "    delete [] str2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:23]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
@@ -1327,7 +1382,7 @@ class TestMemleakInClass : public TestFixture {
               "    C *c;\n"
               "public:\n"
               "    A() : b(new B()), c(new C(b)) { }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:9:8]: (style) Class 'A' is unsafe, 'A::b' can leak by wrong usage. [unsafeClassCanLeak]\n"
                            "[test.cpp:10]: (style) Class 'A' is unsafe, 'A::c' can leak by wrong usage.\n",
                            "[test.cpp:9:8]: (style) Class 'A' is unsafe, 'A::b' can leak by wrong usage. [unsafeClassCanLeak]\n",
@@ -1349,7 +1404,7 @@ class TestMemleakInClass : public TestFixture {
               "       b = new B();\n"
               "       c = new C(b);\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:9:8]: (style) Class 'A' is unsafe, 'A::b' can leak by wrong usage. [unsafeClassCanLeak]\n"
                            "[test.cpp:10]: (style) Class 'A' is unsafe, 'A::c' can leak by wrong usage.\n",
                            "[test.cpp:9:8]: (style) Class 'A' is unsafe, 'A::b' can leak by wrong usage. [unsafeClassCanLeak]\n",
@@ -1363,7 +1418,7 @@ class TestMemleakInClass : public TestFixture {
               "private:\n"
               "    Fred() { a = new int; }\n"
               "    ~Fred() { (delete(a), (a)=NULL); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1382,7 +1437,7 @@ class TestMemleakInClass : public TestFixture {
               "    ~CData() { if (m_impl) m_impl->Release(); }\n"
               "private:\n"
               "    CDataImpl *m_impl;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1393,7 +1448,7 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    Fred(const Fred &fred) { a = new int; }\n"
               "    ~Fred() { delete a; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1404,7 +1459,7 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    Fred() { a = new int; }\n"
               "    ~Fred();\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1430,6 +1485,15 @@ class TestMemleakInClass : public TestFixture {
         ASSERT_EQUALS("[test.cpp:6:11]: (style) Class 'S' is unsafe, 'S::a' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
+    void class28() { // ticket #14954
+        check("struct S {\n"
+              "    explicit S(char *name) { m_fd = mkstemp(name); }\n"
+              "    ~S() { /* close(m_fd); */ }\n"
+              "    int m_fd;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) Class 'S' is unsafe, 'S::m_fd' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
+    }
+
     void staticvar() {
         check("class A\n"
               "{\n"
@@ -1441,7 +1505,7 @@ class TestMemleakInClass : public TestFixture {
               "        if (!p)\n"
               "            p = new int[100];\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1473,7 +1537,7 @@ class TestMemleakInClass : public TestFixture {
               "void Tokenizer::deleteTokens(int *tok)\n"
               "{\n"
               "    delete tok;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Global function
@@ -1500,7 +1564,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    deleteTokens(_tokens);\n"
               "    _tokens = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1525,7 +1589,7 @@ class TestMemleakInClass : public TestFixture {
               "\n"
               "A::~A() {\n"
               "    delete [] pkt_buffer;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:14:9]: (error) Mismatching allocation and deallocation: A::pkt_buffer [mismatchAllocDealloc]\n", errout_str());
 
         check("struct S {\n" // 5678
@@ -1561,7 +1625,7 @@ class TestMemleakInClass : public TestFixture {
               "  data_ = new char[42];\n"
               "  delete data_;\n"
               "  data_ = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:17:3]: (warning) Possible leak in public function. The pointer 'data_' is not deallocated before it is allocated. [publicAllocationError]\n"
                       "[test.cpp:18:3]: (error) Mismatching allocation and deallocation: Foo::data_ [mismatchAllocDealloc]\n", errout_str());
 
@@ -1584,7 +1648,7 @@ class TestMemleakInClass : public TestFixture {
               "  data_ = new char[42];\n"
               "  delete data_;\n"
               "  data_ = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:17:3]: (warning) Possible leak in public function. The pointer 'data_' is not deallocated before it is allocated. [publicAllocationError]\n"
                       "[test.cpp:18:3]: (error) Mismatching allocation and deallocation: Foo::data_ [mismatchAllocDealloc]\n", errout_str());
     }
@@ -1599,7 +1663,7 @@ class TestMemleakInClass : public TestFixture {
               "    ~Fred() { free(s); }\n"
               "    void xy()\n"
               "    { s = malloc(100); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:9:7]: (warning) Possible leak in public function. The pointer 's' is not deallocated before it is allocated. [publicAllocationError]\n", errout_str());
 
         check("class Fred\n"
@@ -1611,7 +1675,7 @@ class TestMemleakInClass : public TestFixture {
               "    { s = malloc(100); }\n"
               "private:\n"
               "    char *s;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:7:7]: (warning) Possible leak in public function. The pointer 's' is not deallocated before it is allocated. [publicAllocationError]\n", errout_str());
     }
 
@@ -1625,7 +1689,7 @@ class TestMemleakInClass : public TestFixture {
               "    ~Fred() { free(s); }\n"
               "    const Fred & operator = (const Fred &f)\n"
               "    { s = malloc(100); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:9:7]: (warning) Possible leak in public function. The pointer 's' is not deallocated before it is allocated. [publicAllocationError]\n", errout_str());
     }
 };
@@ -1652,7 +1716,7 @@ class TestMemleakStructMember : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for memory leaks..
-        CheckMemoryLeakStructMember checkMemoryLeakStructMember(&tokenizer, &settings, this);
+        CheckMemoryLeakStructMemberImpl checkMemoryLeakStructMember(&tokenizer, settings, *this);
         (checkMemoryLeakStructMember.check)();
     }
 
@@ -1674,6 +1738,7 @@ class TestMemleakStructMember : public TestFixture {
         TEST_CASE(assign3);
         TEST_CASE(assign4); // #11019
         TEST_CASE(assign5);
+        TEST_CASE(assign6);
 
         // Failed allocation
         TEST_CASE(failedAllocation);
@@ -1683,6 +1748,7 @@ class TestMemleakStructMember : public TestFixture {
         TEST_CASE(function3);   // #3024: kernel list
         TEST_CASE(function4);   // #3038: Deallocating in function
         TEST_CASE(function5);   // #10381, #10382, #10158
+        TEST_CASE(function6);
 
         // Handle if-else
         TEST_CASE(ifelse);
@@ -1716,14 +1782,14 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC *abc = malloc(sizeof(struct ABC));\n"
               "    abc->a = malloc(10);\n"
               "    free(abc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (error) Memory leak: abc.a [memleak]\n", errout_str());
 
         check("static void foo()\n"
               "{\n"
               "    struct ABC *abc = malloc(sizeof(struct ABC));\n"
               "    abc->a = malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:1]: (error) Memory leak: abc.a [memleak]\n", errout_str());
 
         check("static ABC * foo()\n"
@@ -1736,7 +1802,7 @@ class TestMemleakStructMember : public TestFixture {
               "        return 0;\n"
               "    }\n"
               "    return abc;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:9]: (error) Memory leak: abc.a [memleak]\n", errout_str());
 
         check("static void foo(int a)\n"
@@ -1748,7 +1814,7 @@ class TestMemleakStructMember : public TestFixture {
               "        free(abc->a);\n"
               "        return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:1]: (error) Memory leak: abc.a [memleak]\n", errout_str());
     }
 
@@ -1764,7 +1830,7 @@ class TestMemleakStructMember : public TestFixture {
               "out:\n"
               "    free(abc->a);\n"
               "    free(abc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1774,13 +1840,13 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC *abc = malloc(sizeof(struct ABC));\n"
               "    abc->a = malloc(10);\n"
               "    return abc;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static void foo(struct ABC *abc)\n"
               "{\n"
               "    abc->a = malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7302
@@ -1788,14 +1854,14 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC abc;\n"
               "    abc.a = malloc(10);\n"
               "    return abc.a;\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         check("void* foo() {\n"
               "    struct ABC abc;\n"
               "    abc.a = malloc(10);\n"
               "    return abc.b;\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("[test.c:4:5]: (error) Memory leak: abc.a [memleak]\n", errout_str());
     }
 
@@ -1805,7 +1871,7 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC *abc = malloc(sizeof(struct ABC));\n"
               "    abc->a = malloc(10);\n"
               "    return &abc->self;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1814,7 +1880,7 @@ class TestMemleakStructMember : public TestFixture {
               "{\n"
               "    struct ABC *abc = abc1;\n"
               "    abc->a = malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static void foo()\n"
@@ -1822,7 +1888,7 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC *abc;\n"
               "    abc1 = abc = malloc(sizeof(ABC));\n"
               "    abc->a = malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static void foo()\n"
@@ -1831,7 +1897,7 @@ class TestMemleakStructMember : public TestFixture {
               " ptr = malloc(sizeof(struct msn_entry));\n"
               " ptr->msn = malloc(100);\n"
               " back = ptr;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
     }
@@ -1840,7 +1906,7 @@ class TestMemleakStructMember : public TestFixture {
         check("static void foo() {\n"
               "    struct ABC *abc = malloc(123);\n"
               "    abc->a = abc->b = malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1849,7 +1915,7 @@ class TestMemleakStructMember : public TestFixture {
               "    struct s f2;\n"
               "    f2.a = malloc(100);\n"
               "    *f1 = f2;\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1955,6 +2021,15 @@ class TestMemleakStructMember : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void assign6() {
+        check("struct S { S* p; };\n" // #14524
+              "void f() {\n"
+              "    S s;\n"
+              "    s.p = static_cast<S*>(malloc(sizeof(S)));\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:1]: (error) Memory leak: s.p [memleak]\n", errout_str());
+    }
+
     void failedAllocation() {
         check("static struct ABC * foo()\n"
               "{\n"
@@ -1966,7 +2041,7 @@ class TestMemleakStructMember : public TestFixture {
               "        return 0;\n"
               "    }\n"
               "    return abc;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1977,7 +2052,7 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC *abc = malloc(sizeof(struct ABC));\n"
               "    abc->a = malloc(10);\n"
               "    func(abc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static void foo()\n"
@@ -1985,7 +2060,7 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC *abc = malloc(sizeof(struct ABC));\n"
               "    abclist.push_back(abc);\n"
               "    abc->a = malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1995,7 +2070,7 @@ class TestMemleakStructMember : public TestFixture {
               "  A a = { 0 };\n"
               "  a.foo = (char *) malloc(10);\n"
               "  assign(&a);\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2005,7 +2080,7 @@ class TestMemleakStructMember : public TestFixture {
               "  struct ABC *abc = malloc(100);\n"
               "  abc.a = (char *) malloc(10);\n"
               "  list_add_tail(&abc->list, head);\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2016,7 +2091,7 @@ class TestMemleakStructMember : public TestFixture {
               "  struct ABC abc;\n"
               "  abc.a = (char *) malloc(10);\n"
               "  a(abc.a);\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2025,14 +2100,14 @@ class TestMemleakStructMember : public TestFixture {
               "    struct s s1;\n"
               "    s1->x = malloc(1);\n"
               "    return (s1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct nc_rpc nc_rpc_getconfig() {\n" // #10382
               "    struct nc_rpc rpc;\n"
               "    rpc->filter = malloc(1);\n"
               "    return (nc_rpc)rpc;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("T* f(const char *str) {\n" // #10158
@@ -2054,7 +2129,33 @@ class TestMemleakStructMember : public TestFixture {
               "    }\n"
               "    return g(&a);\n"
               "}\n");
-        TODO_ASSERT_EQUALS("", "[test.cpp:9:9]: (error) Memory leak: a.str [memleak]\n", errout_str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int *p; };\n"
+              "S f(int i) {\n"
+              "    S s;\n"
+              "    switch(i) {\n"
+              "    case 1:\n"
+              "        s.p = new int;\n"
+              "        break;\n"
+              "    default: {\n"
+              "        return {};\n"
+              "    }\n"
+              "    }\n"
+              "    return s;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void function6() {
+        check("struct S { int* p; };\n" // #14706
+              "void g(void*);\n"
+              "void f() {\n"
+              "    S* s = new S();\n"
+              "    s->p = new int();\n"
+              "    g((void*)s);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse() {
@@ -2072,7 +2173,7 @@ class TestMemleakStructMember : public TestFixture {
               "    }\n"
               "    free(abc->a);\n"
               "    free(abc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2088,7 +2189,7 @@ class TestMemleakStructMember : public TestFixture {
               "        free(abc);\n"
               "        abc = next;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2100,7 +2201,7 @@ class TestMemleakStructMember : public TestFixture {
               "    abc = malloc(sizeof(struct ABC));\n"
               "    abc->a = malloc(10);\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2118,7 +2219,7 @@ class TestMemleakStructMember : public TestFixture {
                              "    a.f = fopen(\"test\", \"r\");\n"
                              "    a.c = new char[12];\n"
                              "    a.m = malloc(12);\n"
-                             "}";
+                             "}\n";
 
         check(code1, true);
         ASSERT_EQUALS("[test.cpp:12:1]: (error) Resource leak: a.f [resourceLeak]\n"
@@ -2143,7 +2244,7 @@ class TestMemleakStructMember : public TestFixture {
                              "    fclose(a.f);\n"
                              "    delete [] a.c;\n"
                              "    free(a.m);\n"
-                             "}";
+                             "}\n";
 
         check(code2, true);
         ASSERT_EQUALS("", errout_str());
@@ -2152,7 +2253,7 @@ class TestMemleakStructMember : public TestFixture {
         const char code3[] = "void func() {\n"
                              "    struct A a;\n"
                              "    a.f = fopen(\"test\", \"r\");\n"
-                             "}";
+                             "}\n";
 
         check(code3, true);
         ASSERT_EQUALS("", errout_str());
@@ -2167,7 +2268,7 @@ class TestMemleakStructMember : public TestFixture {
                              "void func() {\n"
                              "    struct A a;\n"
                              "    a.f = fopen(\"test\", \"r\");\n"
-                             "}";
+                             "}\n";
 
         check(code4, true);
         ASSERT_EQUALS("", errout_str());
@@ -2183,7 +2284,7 @@ class TestMemleakStructMember : public TestFixture {
               "{\n"
               "  Test& y = *x;\n"
               "  y.data = malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2193,7 +2294,7 @@ class TestMemleakStructMember : public TestFixture {
               "unique_ptr<char[]>otherbuffer{new char[otherbufsize+1]};\n"
               "char *const oldbuffer = otherbuffer.get();\n"
               "int const oldbufsize = otherbufsize;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2206,7 +2307,7 @@ class TestMemleakStructMember : public TestFixture {
               "  (s).state_check_buff = (void* )malloc(1);\n"
               "  if (s.state_check_buff == 0)\n"
               "    return;\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("[test.c:9:1]: (error) Memory leak: s.state_check_buff [memleak]\n", errout_str());
     }
 
@@ -2216,7 +2317,7 @@ class TestMemleakStructMember : public TestFixture {
               "  foo f;\n"
               "  ((f)->realm) = strdup(realm);\n"
               "  if(f->realm == NULL) {}\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("[test.c:6:1]: (error) Memory leak: f.realm [memleak]\n", errout_str());
     }
 
@@ -2227,7 +2328,7 @@ class TestMemleakStructMember : public TestFixture {
               "void func() {\n"
               "    struct ABC abc;\n"
               "    abc.a = myalloc();\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("[test.c:7:1]: (error) Memory leak: abc.a [memleak]\n", errout_str());
     }
 
@@ -2243,7 +2344,7 @@ class TestMemleakStructMember : public TestFixture {
             "    }\n"
             "    delete[] s.p;\n"
             "    return 0;\n"
-            "}", true);
+            "}\n", true);
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -2297,7 +2398,7 @@ class TestMemleakNoVar : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for memory leaks..
-        CheckMemoryLeakNoVar checkMemoryLeakNoVar(&tokenizer, &settings, this);
+        CheckMemoryLeakNoVarImpl checkMemoryLeakNoVar(&tokenizer, settings, *this);
         (checkMemoryLeakNoVar.check)();
     }
 
@@ -2324,23 +2425,23 @@ class TestMemleakNoVar : public TestFixture {
         // standard function..
         check("void x() {\n"
               "    strcpy(a, strdup(p));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (error) Allocation with strdup, strcpy doesn't release it. [leakNoVarFunctionCall]\n", errout_str());
 
         check("char *x() {\n"
               "    char *ret = strcpy(malloc(10), \"abc\");\n"
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("char *x() {\n"
               "    return strcpy(malloc(10), \"abc\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void x() {\n"
               "    free(malloc(10));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // user function..
@@ -2349,7 +2450,7 @@ class TestMemleakNoVar : public TestFixture {
               "\n"
               "void x() {\n"
               "    set_error(strdup(p));\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:15]: (error) Allocation with strdup, set_error doesn't release it. [leakNoVarFunctionCall]\n", "", errout_str());
 
         check("void f()\n"
@@ -2357,68 +2458,68 @@ class TestMemleakNoVar : public TestFixture {
               "    int fd;\n"
               "    fd = mkstemp(strdup(\"/tmp/file.XXXXXXXX\"));\n"
               "    close(fd);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Allocation with strdup, mkstemp doesn't release it.\n", "", errout_str());
 
         check("void f()\n"
               "{\n"
               "    if(TRUE || strcmp(strdup(a), b));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (error) Allocation with strdup, strcmp doesn't release it. [leakNoVarFunctionCall]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    if(!strcmp(strdup(a), b) == 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Allocation with strdup, strcmp doesn't release it. [leakNoVarFunctionCall]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    42, strcmp(strdup(a), b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Allocation with strdup, strcmp doesn't release it. [leakNoVarFunctionCall]\n", errout_str());
 
         check("void f() {\n"
               "   assert(freopen(\"/dev/null\", \"r\", stdin));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void x() {\n"
               "    strcpy(a, (void*)strdup(p));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (error) Allocation with strdup, strcpy doesn't release it. [leakNoVarFunctionCall]\n", errout_str());
 
         check("void* malloc1() {\n"
               "    return (malloc(1));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("char *x() {\n"
               "    char *ret = (char*)strcpy(malloc(10), \"abc\");\n"
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    free(malloc(1));\n"
               "    strcpy(a, strdup(p));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Allocation with strdup, strcpy doesn't release it. [leakNoVarFunctionCall]\n", errout_str());
 
         check("void f() {\n"
               "    memcmp(calloc(10, 10), strdup(q), 100);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (error) Allocation with calloc, memcmp doesn't release it. [leakNoVarFunctionCall]\n"
                       "[test.cpp:2:28]: (error) Allocation with strdup, memcmp doesn't release it. [leakNoVarFunctionCall]\n", errout_str());
 
         check("void* f(int size) {\n"
               "    return (void*) malloc(size);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int* f(int size) {\n"
               "    return static_cast<int*>(malloc(size));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() { if (new int[42]) {} }\n" // #10857
@@ -2511,31 +2612,57 @@ class TestMemleakNoVar : public TestFixture {
               "    a.g(new int);\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("int f() {\n" // #11184
+              "    return strlen(new char[4]{});\n"
+              "}\n"
+              "int g() {\n"
+              "    int i = strlen(new char[4]{});\n"
+              "    return i;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:19]: (error) Allocation with new, strlen doesn't release it. [leakNoVarFunctionCall]\n"
+                      "[test.cpp:5:20]: (error) Allocation with new, strlen doesn't release it. [leakNoVarFunctionCall]\n",
+                      errout_str());
+
+        check("int* f1() { return new int; }\n" // #14808
+              "std::string* f2() { return new std::string(\"abc\"); }\n"
+              "std::clock_t* f3() { return new std::clock_t; }\n"
+              "QWidget* f4(QObject* parent) { return new QWidget(parent); }\n"
+              "void g(QObject* parent) {\n"
+              "    assert(f1());\n"
+              "    assert(f2());\n"
+              "    assert(f3());\n"
+              "    assert(f4(parent));\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:12]: (error) Allocation with f1, assert doesn't release it. [leakNoVarFunctionCall]\n"
+                      "[test.cpp:7:12]: (error) Allocation with f2, assert doesn't release it. [leakNoVarFunctionCall]\n"
+                      "[test.cpp:8:12]: (error) Allocation with f3, assert doesn't release it. [leakNoVarFunctionCall]\n",
+                      errout_str());
     }
 
     void missingAssignment() {
         check("void x()\n"
               "{\n"
               "    malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void x()\n"
               "{\n"
               "    calloc(10, 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Return value of allocation function 'calloc' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void x()\n"
               "{\n"
               "    strdup(\"Test\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Return value of allocation function 'strdup' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void x()\n"
               "{\n"
               "    (char*) malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void x()\n"
@@ -2543,7 +2670,7 @@ class TestMemleakNoVar : public TestFixture {
               "    char* ptr = malloc(10);\n"
               "    foo(ptr);\n"
               "    free(ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f( void ) {\n" // FP: #11246
@@ -2552,19 +2679,19 @@ class TestMemleakNoVar : public TestFixture {
               "  if ( ok )\n"
               "    free( address ), address = 0;\n"
               "  return 0;\n"
-              "} ");
+              "} \n");
         ASSERT_EQUALS("", errout_str());
 
         check("char** x(const char* str) {\n"
               "    char* ptr[] = { malloc(10), malloc(5), strdup(str) };\n"
               "    return ptr;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void x()\n"
               "{\n"
               "    42,malloc(42);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void *f()\n"
@@ -2574,7 +2701,7 @@ class TestMemleakNoVar : public TestFixture {
               "void x()\n"
               "{\n"
               "    f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Return value of allocation function 'f' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void f()\n" // #8100
@@ -2584,7 +2711,7 @@ class TestMemleakNoVar : public TestFixture {
               "void x()\n"
               "{\n"
               "    f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void *f() {\n" // #8848
@@ -2593,26 +2720,26 @@ class TestMemleakNoVar : public TestFixture {
               "void x()\n"
               "{\n"
               "    f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void x()\n"
               "{\n"
               "    if(!malloc(5)) fail();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("FOO* factory() {\n"
               "    FOO* foo = new (std::nothrow) FOO;\n"
               "    return foo;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #6536
         check("struct S { S(int) {} };\n"
               "void foo(int i) {\n"
               "  S socket(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #6693
@@ -2622,12 +2749,12 @@ class TestMemleakNoVar : public TestFixture {
               "};\n"
               "void CTest::Initialise() {\n"
               "    malloc();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // #7348 - cast
               "    p = (::X*)malloc(42);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7182 "crash: CheckMemoryLeak::functionReturnType()"
@@ -2635,7 +2762,7 @@ class TestMemleakNoVar : public TestFixture {
               "template<typename T, typename... Ts> auto binary_left_comma (T x, Ts... ts) { return (x , ... , ts); }\n"
               "int main() {\n"
               "  unary_right_comma (a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -2651,7 +2778,7 @@ class TestMemleakNoVar : public TestFixture {
               "    new int{};\n"
               "    new int{ 1 };\n"
               "    new uint8_t[4];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
                       "[test.cpp:3:5]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
                       "[test.cpp:4:5]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
@@ -2669,7 +2796,7 @@ class TestMemleakNoVar : public TestFixture {
         check("void f(int* p) {\n"
               "    new auto('c');\n"
               "    new(p) int;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:1:29]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
                            "[test.cpp:3]: (error) Return value of allocation function 'new' is not stored.\n",
                            "",
@@ -2706,7 +2833,7 @@ class TestMemleakNoVar : public TestFixture {
               "    C{ new int(1), 1 };\n"
               "    C{ new(p) int, 1 };\n"
               "    C{ new QWidget, 1 };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) { if (b && malloc(42)) {} }\n" //  // #10858
@@ -2752,59 +2879,71 @@ class TestMemleakNoVar : public TestFixture {
               "    if (std::freopen(NULL, \"w+b\", fp2) == NULL) {}\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n" // #14172
+              "    if (malloc(4) == nullptr) {}\n"
+              "    if (::malloc(4) == nullptr) {}\n"
+              "    if (std::malloc(4) == nullptr) {}\n"
+              "    if (::std::malloc(4) == nullptr) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n"
+                      "[test.cpp:3:11]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n"
+                      "[test.cpp:4:14]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n"
+                      "[test.cpp:5:16]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n",
+                      errout_str());
     }
 
     void smartPointerFunctionParam() {
         check("void x() {\n"
               "    f(shared_ptr<int>(new int(42)), g());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Unsafe allocation. If g() throws, memory could be leaked. Use make_shared<int>() instead. [leakUnsafeArgAlloc]\n", errout_str());
 
         check("void x() {\n"
               "    h(12, f(shared_ptr<int>(new int(42)), g()));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning, inconclusive) Unsafe allocation. If g() throws, memory could be leaked. Use make_shared<int>() instead. [leakUnsafeArgAlloc]\n", errout_str());
 
         check("void x() {\n"
               "    f(unique_ptr<int>(new int(42)), g());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Unsafe allocation. If g() throws, memory could be leaked. Use make_unique<int>() instead. [leakUnsafeArgAlloc]\n", errout_str());
 
         check("void x() {\n"
               "    f(g(), shared_ptr<int>(new int(42)));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Unsafe allocation. If g() throws, memory could be leaked. Use make_shared<int>() instead. [leakUnsafeArgAlloc]\n", errout_str());
 
         check("void x() {\n"
               "    f(g(), unique_ptr<int>(new int(42)));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Unsafe allocation. If g() throws, memory could be leaked. Use make_unique<int>() instead. [leakUnsafeArgAlloc]\n", errout_str());
 
         check("void x() {\n"
               "    f(shared_ptr<char>(new char), make_unique<int>(32));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Unsafe allocation. If make_unique<int>() throws, memory could be leaked. Use make_shared<char>() instead. [leakUnsafeArgAlloc]\n", errout_str());
 
         check("void x() {\n"
               "    f(g(124), h(\"test\", 234), shared_ptr<char>(new char));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Unsafe allocation. If h() throws, memory could be leaked. Use make_shared<char>() instead. [leakUnsafeArgAlloc]\n", errout_str());
 
         check("void x() {\n"
               "    f(shared_ptr<std::string>(new std::string(\"\")), g<std::string>());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Unsafe allocation. If g<std::string>() throws, memory could be leaked. Use make_shared<std::string>() instead. [leakUnsafeArgAlloc]\n", errout_str());
 
         check("void g(int x) throw() { }\n"
               "void x() {\n"
               "    f(g(124), shared_ptr<char>(new char));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void __declspec(nothrow) g(int x) { }\n"
               "void x() {\n"
               "    f(g(124), shared_ptr<char>(new char));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
     void resourceLeak() {
@@ -2815,23 +2954,23 @@ class TestMemleakNoVar : public TestFixture {
               "    if (result) return !result;\n"
               "    fclose(fp);\n"
               "    return result;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "  fopen(\"file.txt\", \"r\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (error) Return value of allocation function 'fopen' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void foo() {\n"
               "  FILE *f = fopen(\"file.txt\", \"r\");\n"
               "  freopen(\"file.txt\", \"r\", f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error) Return value of allocation function 'freopen' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void foo() {\n"
               "  freopen(\"file.txt\", \"r\", stdin);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
@@ -2841,7 +2980,7 @@ class TestMemleakNoVar : public TestFixture {
               "};\n"
               "void foo() {\n"
               "  Holder h ( fopen(\"file.txt\", \"r\"));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
@@ -2851,7 +2990,7 @@ class TestMemleakNoVar : public TestFixture {
               "};\n"
               "void foo() {\n"
               "  Holder ( fopen(\"file.txt\", \"r\"));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
@@ -2861,7 +3000,7 @@ class TestMemleakNoVar : public TestFixture {
               "};\n"
               "void foo() {\n"
               "  Holder h { fopen(\"file.txt\", \"r\")};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
@@ -2871,7 +3010,7 @@ class TestMemleakNoVar : public TestFixture {
               "};\n"
               "void foo() {\n"
               "  Holder h = fopen(\"file.txt\", \"r\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
@@ -2881,7 +3020,7 @@ class TestMemleakNoVar : public TestFixture {
               "};\n"
               "void foo() {\n"
               "  Holder { fopen(\"file.txt\", \"r\")};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
@@ -2891,7 +3030,7 @@ class TestMemleakNoVar : public TestFixture {
               "};\n"
               "void foo() {\n"
               "  Holder { 0, fopen(\"file.txt\", \"r\")};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2902,7 +3041,7 @@ class TestMemleakNoVar : public TestFixture {
               "\n"
               "void f() {\n"
               "  makeThing();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10631
@@ -2929,12 +3068,12 @@ class TestMemleakNoVar : public TestFixture {
     void crash1() { // #10729
         check("void foo() {\n"
               "    extern void *realloc (void *ptr, size_t size);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    extern void *malloc (size_t size);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
index ee971fd44a8..ca5c183c911 100644
--- a/test/testnullpointer.cpp
+++ b/test/testnullpointer.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,6 +37,7 @@ class TestNullPointer : public TestFixture {
 
 private:
     const Settings settings = settingsBuilder().library("std.cfg").severity(Severity::warning).build();
+    const Settings settings_i = settingsBuilder(settings).certainty(Certainty::inconclusive).build();
 
     void run() override {
         mNewTemplate = true;
@@ -142,6 +143,11 @@ class TestNullPointer : public TestFixture {
         TEST_CASE(nullpointer103);
         TEST_CASE(nullpointer104); // #13881
         TEST_CASE(nullpointer105); // #13861
+        TEST_CASE(nullpointer106); // #13682
+        TEST_CASE(nullpointer107); // #13682 (FP/FN cases around guards that depend on the pointer indirectly)
+        TEST_CASE(nullpointer108);
+        TEST_CASE(nullpointer109);
+        TEST_CASE(nullpointer110); // #14937
         TEST_CASE(nullpointer_addressOf); // address of
         TEST_CASE(nullpointerSwitch); // #2626
         TEST_CASE(nullpointer_cast); // #4692
@@ -183,20 +189,23 @@ class TestNullPointer : public TestFixture {
     {
         bool inconclusive = false;
         bool cpp = true;
-        Standards::cstd_t cstd = Standards::CLatest;
     };
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
-        const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, options.inconclusive).c(options.cstd).build();
+        const Settings& settings1 = options.inconclusive ? settings_i : settings;
+        check_(file, line, code, settings1, options.cpp);
+    }
 
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], const Settings& s, bool cpp = true) {
         // Tokenize..
-        SimpleTokenizer tokenizer(settings1, *this, options.cpp);
+        SimpleTokenizer tokenizer(s, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for null pointer dereferences..
-        runChecks<CheckNullPointer>(tokenizer, this);
+        CheckNullPointer check;
+        runChecks(check, tokenizer, *this);
     }
 
 #define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
@@ -207,8 +216,8 @@ class TestNullPointer : public TestFixture {
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check for null pointer dereferences..
-        runChecks<CheckNullPointer>(tokenizer, this);
+        CheckNullPointer check;
+        runChecks(check, tokenizer, *this);
     }
 
 
@@ -219,7 +228,7 @@ class TestNullPointer : public TestFixture {
               "{\n"
               "    while (tok);\n"
               "    tok = tok->next();\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:3:12] -> [test.cpp:4:11]: (warning) Either the condition 'tok' is redundant or there is possible null pointer dereference: tok. [nullPointerRedundantCheck]\n", errout_str());
 
         // #2681
@@ -244,7 +253,7 @@ class TestNullPointer : public TestFixture {
               "        while (tok && tok->str() != \";\")\n"
               "            tok = tok->next();\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:3]: (warning) Either the condition 'while' is redundant or there is possible null pointer dereference: tok.\n", "", errout_str());
 
         check("void foo(Token &tok)\n"
@@ -254,7 +263,7 @@ class TestNullPointer : public TestFixture {
               "        while (!tok)\n"
               "            char c = tok.read();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -265,7 +274,7 @@ class TestNullPointer : public TestFixture {
               "            tok = tok->next();\n"
               "        if( !tok ) break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -275,7 +284,7 @@ class TestNullPointer : public TestFixture {
               "        while (tok && tok->str() != \";\")\n"
               "            tok = tok->next();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(A*a)\n"
@@ -290,7 +299,7 @@ class TestNullPointer : public TestFixture {
               "      a->b();\n"
               "      break;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // dereference in outer scope..
@@ -299,7 +308,7 @@ class TestNullPointer : public TestFixture {
               "        while (tok) tok = tok->next();\n"
               "    }\n"
               "    tok->str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16] -> [test.cpp:5:5]: (warning) Either the condition 'tok' is redundant or there is possible null pointer dereference: tok. [nullPointerRedundantCheck]\n", errout_str());
 
         check("int foo(const Token *tok)\n"
@@ -324,7 +333,7 @@ class TestNullPointer : public TestFixture {
               "    while (d && d->i == 0)\n"
               "      d = d->c;\n"
               "  if (!d) throw;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct b {\n"
@@ -349,7 +358,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    else if (a->x == 2) { }\n"
               "    if (a) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #2134 - sizeof doesn't dereference
@@ -359,7 +368,7 @@ class TestNullPointer : public TestFixture {
               "    sizeof(*list);\n"
               "    if (!list)\n"
               "        ;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // ticket #2245 - sizeof doesn't dereference
@@ -367,7 +376,7 @@ class TestNullPointer : public TestFixture {
               "    if (!p) {\n"
               "        int sz = sizeof(p->x);\n"
               "    }\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
     }
@@ -379,7 +388,7 @@ class TestNullPointer : public TestFixture {
               "    Fred fred;\n"
               "    while (fred);\n"
               "    fred.hello();\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -395,7 +404,7 @@ class TestNullPointer : public TestFixture {
               "    int a = abc->a;\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:13]: (warning) Either the condition '!abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(struct ABC *abc) {\n"
@@ -404,7 +413,7 @@ class TestNullPointer : public TestFixture {
               "    bar(x, y, abc->a);\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:2:9]: (warning) Either the condition '!abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n"
                       "[test.cpp:5:9] -> [test.cpp:3:12]: (warning) Either the condition '!abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n"
                       "[test.cpp:5:9] -> [test.cpp:4:15]: (warning) Either the condition '!abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n", errout_str());
@@ -414,7 +423,7 @@ class TestNullPointer : public TestFixture {
               "        return;\n"
               "    }\n"
               "    if (abc) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:5:9] -> [test.cpp:2:9]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -424,7 +433,7 @@ class TestNullPointer : public TestFixture {
               "        return;\n"
               "    }\n"
               "    if (!abc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:2:9]: (warning) Either the condition '!abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n", errout_str());
 
         // TODO: False negative if member of member is dereferenced
@@ -432,14 +441,14 @@ class TestNullPointer : public TestFixture {
               "    abc->next->a = 0;\n"
               "    if (abc->next)\n"
               "        ;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (warning) Possible null pointer dereference: abc - otherwise it is redundant to check it against null.\n", "", errout_str());
 
         check("void foo(ABC *abc) {\n"
               "    abc->a = 0;\n"
               "    if (abc && abc->b == 0)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:9] -> [test.cpp:2:5]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -450,13 +459,13 @@ class TestNullPointer : public TestFixture {
               "    if (abc && abc->a);\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(struct ABC *abc) {\n"
               "    int x = abc && a(abc->x);\n"
               "    if (abc) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ok to use a linked list..
@@ -465,13 +474,13 @@ class TestNullPointer : public TestFixture {
               "    abc = abc->next;\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(struct ABC *abc) {\n"
               "    abc = (ABC *)(abc->_next);\n"
-              "    if (abc) { }"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "    if (abc) { }\n"
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // reassign struct..
@@ -481,7 +490,7 @@ class TestNullPointer : public TestFixture {
               "    abc = abc->next;\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(struct ABC *abc)\n"
@@ -490,7 +499,7 @@ class TestNullPointer : public TestFixture {
               "    f(&abc);\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // goto..
@@ -504,7 +513,7 @@ class TestNullPointer : public TestFixture {
               "out:\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // loops..
@@ -518,7 +527,7 @@ class TestNullPointer : public TestFixture {
               "        --a;\n"
               "    }\n"
               "    while (a > 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -530,7 +539,7 @@ class TestNullPointer : public TestFixture {
               "        if (!tok)\n"
               "            return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // dynamic_cast..
@@ -539,7 +548,7 @@ class TestNullPointer : public TestFixture {
               "    int a = abc->a;\n"
               "    if (!dynamic_cast<DEF *>(abc))\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #2641 - global pointer, function call
@@ -548,14 +557,14 @@ class TestNullPointer : public TestFixture {
               "    abc->a = 0;\n"
               "    do_stuff();\n"
               "    if (abc) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("",errout_str());
 
         check("Fred *fred;\n"
               "void f() {\n"
               "    fred->foo();\n"
               "    if (fred) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("",errout_str());
 
         // #2641 - local pointer, function call
@@ -564,7 +573,7 @@ class TestNullPointer : public TestFixture {
               "    abc->a = 0;\n"
               "    do_stuff();\n"
               "    if (abc) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:5:9] -> [test.cpp:3:5]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -574,7 +583,7 @@ class TestNullPointer : public TestFixture {
               "    abc->a = 0;\n"
               "    do_stuff();\n"
               "    if (abc) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:9] -> [test.cpp:2:5]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -589,32 +598,32 @@ class TestNullPointer : public TestFixture {
               "            if ( abc ) {}\n"
               "            break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3128
         check("void f(ABC *abc) {\n"
               "    x(!abc || y(abc->a));\n"
               "    if (abc) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(ABC *abc) {\n"
               "  x(def || !abc || y(def, abc->a));\n"
               "  if (abc) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(ABC *abc) {\n"
               "  x(abc && y(def, abc->a));\n"
               "  if (abc) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(ABC *abc) {\n"
               "    x(def && abc && y(def, abc->a));\n"
               "    if (abc) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3228 - calling function with null object
@@ -622,7 +631,7 @@ class TestNullPointer : public TestFixture {
             const char code[] = "void f(Fred *fred) {\n"
                                 "    fred->x();\n"
                                 "    if (fred) { }\n"
-                                "}";
+                                "}\n";
             check(code);
             ASSERT_EQUALS(
                 "[test.cpp:3:9] -> [test.cpp:2:5]: (warning) Either the condition 'fred' is redundant or there is possible null pointer dereference: fred. [nullPointerRedundantCheck]\n",
@@ -634,7 +643,7 @@ class TestNullPointer : public TestFixture {
                "void f(struct FRED *fred) {\n"
                "    fred->x = 0;\n"
                "    IF(!fred){}\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -642,7 +651,7 @@ class TestNullPointer : public TestFixture {
               "  if (!buffer)\n"
               "    uv_fatal_error();\n"
               "  buffer->x = 11;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -656,14 +665,14 @@ class TestNullPointer : public TestFixture {
               "    *p = 0;\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:6]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(int *p)\n"
               "{\n"
               "    *p = 0;\n"
               "    if (p) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:9] -> [test.cpp:3:6]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -672,7 +681,7 @@ class TestNullPointer : public TestFixture {
               "{\n"
               "    *p = 0;\n"
               "    if (p || q) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:9] -> [test.cpp:3:6]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -682,7 +691,7 @@ class TestNullPointer : public TestFixture {
               "    bar(*p);\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:10]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(char *p)\n"
@@ -690,14 +699,14 @@ class TestNullPointer : public TestFixture {
               "    strcpy(p, \"abc\");\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:12]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(char *p)\n"
               "{\n"
               "    if (*p == 0) { }\n"
               "    if (!p) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:10]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         // no error
@@ -707,7 +716,7 @@ class TestNullPointer : public TestFixture {
               "    f(&p);\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -715,7 +724,7 @@ class TestNullPointer : public TestFixture {
               "    int **p = f();\n"
               "    if (!p)\n"
               "        ;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p)\n"
@@ -726,7 +735,7 @@ class TestNullPointer : public TestFixture {
               "        *p = 0;\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int x)\n"
@@ -734,7 +743,7 @@ class TestNullPointer : public TestFixture {
               "    int a = 2 * x;"
               "    if (x == 0)\n"
               "        ;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p)\n"
@@ -742,7 +751,7 @@ class TestNullPointer : public TestFixture {
               "    int var1 = p ? *p : 0;\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p, bool x)\n"
@@ -750,7 +759,7 @@ class TestNullPointer : public TestFixture {
               "    int var1 = x ? *p : 5;\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:9] -> [test.cpp:3:21]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -759,13 +768,13 @@ class TestNullPointer : public TestFixture {
         check("void f(int *p) {\n"
               "    *p = 0;\n"
               "    while (p) { p = 0; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p) {\n"
               "    *p = 0;\n"
               "    while (p) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:12] -> [test.cpp:2:6]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -776,7 +785,7 @@ class TestNullPointer : public TestFixture {
               "    int var1 = p ? (p->a) : 0;\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(ABC *p)\n"
@@ -784,7 +793,7 @@ class TestNullPointer : public TestFixture {
               "    int var1 = p ? (1 + p->a) : 0;\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -816,7 +825,7 @@ class TestNullPointer : public TestFixture {
               "      break;\n"
               "    else\n"
               "      p = p->next();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(Document *doc) {\n"
@@ -824,27 +833,27 @@ class TestNullPointer : public TestFixture {
               "    if (!doc) {\n"
               "        return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3128 - false positive
         check("void f(int *p) {\n"
               "    assert(!p || (*p<=6));\n"
               "    if (p) { *p = 0; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p) {\n"
               "    assert(p && (*p<=6));\n"
               "    if (p) { *p = 0; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p) {\n"
               "    *p = 12;\n"
               "    assert(p && (*p<=6));\n"
               "    if (p) { *p = 0; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:12] -> [test.cpp:2:6]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -854,7 +863,7 @@ class TestNullPointer : public TestFixture {
               "    p = p->next;\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(x *p)\n"
@@ -862,7 +871,7 @@ class TestNullPointer : public TestFixture {
               "    p = bar(p->next);\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(x *p)\n"
@@ -870,7 +879,7 @@ class TestNullPointer : public TestFixture {
               "    p = aa->bar(p->next);\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(x *p)\n"
@@ -878,7 +887,7 @@ class TestNullPointer : public TestFixture {
               "    p = *p2 = p->next;\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(struct ABC *abc)\n"
@@ -886,32 +895,32 @@ class TestNullPointer : public TestFixture {
               "    abc = abc ? abc->next : 0;\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(struct ABC *abc) {\n" // #4523
               "    abc = (*abc).next;\n"
               "    if (abc) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(struct ABC *abc) {\n" // #4523
               "    abc = (*abc->ptr);\n"
               "    if (abc) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(Item *item) {\n"
               "    x = item ? ab(item->x) : 0;\n"
               "    if (item) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(Item *item) {\n"
               "    item->x = 0;\n"
               "    a = b ? c : d;\n"
               "    if (item) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:9] -> [test.cpp:2:5]: (warning) Either the condition 'item' is redundant or there is possible null pointer dereference: item. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -925,7 +934,7 @@ class TestNullPointer : public TestFixture {
               "\n"
               "    if( !pFrm )\n"
               "        return FALSE;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #2463
@@ -945,7 +954,7 @@ class TestNullPointer : public TestFixture {
               "                break;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #2525 - sizeof
@@ -954,26 +963,26 @@ class TestNullPointer : public TestFixture {
               "    int c = sizeof(test[0]);\n"
               "    if (!test)\n"
               "        ;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(type* p) {\n" // #4983
               "    x(sizeof p[0]);\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3023 - checked deref
         check("void f(struct ABC *abc) {\n"
               "  WARN_ON(!abc || abc->x == 0);\n"
               "  if (!abc) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(struct ABC *abc) {\n"
               "  WARN_ON(!abc || abc->x == 7);\n"
               "  if (!abc) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3425 - false positives when there are macros
@@ -981,20 +990,28 @@ class TestNullPointer : public TestFixture {
                "void f(int *p) {\n"
                "    *p = 0;\n"
                "    IF(!p){}\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #3914 - false positive
               "    int *p;\n"
               "    ((p=ret()) && (x=*p));\n"
               "    if (p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S { struct T { char c; } *p; };\n" // #6541
               "char f(S* s) { return s->p ? 'a' : s->p->c; }\n");
         ASSERT_EQUALS("[test.cpp:2:24] -> [test.cpp:2:37]: (warning) Either the condition 's->p' is redundant or there is possible null pointer dereference: s->p. [nullPointerRedundantCheck]\n",
                       errout_str());
+
+        check("int f(const int a[]) {\n" // #14544
+              "    int i = 0;\n"
+              "    if (!a)\n"
+              "        a = &i;\n"
+              "    return *a;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer5() {
@@ -1004,7 +1021,7 @@ class TestNullPointer : public TestFixture {
               " char c = a.c();\n"
               " if (!a)\n"
               "   return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1019,18 +1036,18 @@ class TestNullPointer : public TestFixture {
               "    } else { if (a == 2) {\n"
               "        p = new FooCar; } }\n"
               "    p->abcd();\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:8]: (error) Possible null pointer dereference: p\n",
                            "", errout_str());
 
         check("static void foo() {\n"
               "    int &r = *(int*)0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
 
         check("static void foo(int x) {\n"
               "    int y = 5 + *(int*)0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
 
         {
@@ -1045,7 +1062,7 @@ class TestNullPointer : public TestFixture {
 
         check("static void foo() {\n"
               "    std::cout << *(int*)0;"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:19]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
 
         check("void f()\n"
@@ -1055,12 +1072,12 @@ class TestNullPointer : public TestFixture {
               "        delete c;\n"
               "    }\n"
               "    c[0] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Null pointer dereference: c [nullPointer]\n", errout_str());
 
         check("static void foo() {\n"
               "    if (3 > *(int*)0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
 
         // no false positive..
@@ -1069,20 +1086,20 @@ class TestNullPointer : public TestFixture {
               "    Foo *p = 0;\n"
               "    p = new Foo;\n"
               "    p->abcd();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
               "    int sz = sizeof((*(struct dummy *)0).x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void get_offset(long &offset)\n"
               "{\n"
               "    mystruct * temp; temp = 0;\n"
               "    offset = (long)(&(temp->z));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #1893 - try/catch inside else
@@ -1101,7 +1118,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    *Q=1;\n"
               "    return Q;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int *test(int *Z)\n"
@@ -1117,7 +1134,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    *Q=1;\n"
               "    return Q;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:12:6]: (warning) Possible null pointer dereference: Q [nullPointer]\n", errout_str());
 
         // Ticket #2052 (false positive for 'else continue;')
@@ -1128,7 +1145,7 @@ class TestNullPointer : public TestFixture {
               "        else continue;\n"
               "        *p = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // function pointer..
@@ -1137,7 +1154,7 @@ class TestNullPointer : public TestFixture {
               "    void (*f)();\n"
               "    f = 0;\n"
               "    f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (error) Null pointer dereference: f [nullPointer]\n", errout_str());
 
         check("int* g();\n" // #11007
@@ -1155,7 +1172,7 @@ class TestNullPointer : public TestFixture {
               "    for (int i = 0; i < 10; ++i) {\n"
               "        int x = *p + 1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("void f(int a) {\n"
@@ -1166,21 +1183,21 @@ class TestNullPointer : public TestFixture {
               "    for (int i = 0; i < 3; i++) {\n"
               "        if (a && (p[i] == '1'));\n"
               "    }\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // ticket #2251: taking the address of member
         check("void f() {\n"
               "    Fred *fred = 0;\n"
               "    int x = &fred->x;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // ticket #3220: dereferencing a null pointer is UB
         check("void f() {\n"
               "    Fred *fred = NULL;\n"
               "    fred->do_something();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Null pointer dereference: fred [nullPointer]\n", errout_str());
 
         // ticket #3570 - parsing of conditions
@@ -1190,21 +1207,21 @@ class TestNullPointer : public TestFixture {
                   "    if (x)\n"
                   "        p = q;\n"
                   "    if (p && *p) { }\n"
-                  "}", dinit(CheckOptions, $.inconclusive = true));
+                  "}\n", dinit(CheckOptions, $.inconclusive = true));
             ASSERT_EQUALS("", errout_str());
             check("void f() {\n"
                   "    int *p = NULL;\n"
                   "    if (x)\n"
                   "        p = q;\n"
                   "    if (!p || *p) { }\n"
-                  "}", dinit(CheckOptions, $.inconclusive = true));
+                  "}\n", dinit(CheckOptions, $.inconclusive = true));
             ASSERT_EQUALS("", errout_str());
             check("void f() {\n"
                   "    int *p = NULL;\n"
                   "    if (x)\n"
                   "        p = q;\n"
                   "    if (p || *p) { }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("[test.cpp:5:15]: (warning) Possible null pointer dereference: p [nullPointer]\n", errout_str());
         }
 
@@ -1220,7 +1237,7 @@ class TestNullPointer : public TestFixture {
                   "\n"
                   "void g() {\n"
                   "    f(NULL, NULL);\n"
-                  "}", dinit(CheckOptions, $.inconclusive = true));
+                  "}\n", dinit(CheckOptions, $.inconclusive = true));
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -1245,7 +1262,7 @@ class TestNullPointer : public TestFixture {
               "    for (int i = 0; i < n; i++) {\n"
               "        argv32[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // No false negative:
@@ -1260,7 +1277,7 @@ class TestNullPointer : public TestFixture {
               "    for (int i = 0; i < n; i++) {\n"
               "        argv32[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:9]: (warning) Possible null pointer dereference: argv32 [nullPointer]\n", errout_str());
 
         // #2231 - error if assignment in loop is not used
@@ -1276,7 +1293,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:11:6]: (warning) Possible null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
@@ -1285,7 +1302,7 @@ class TestNullPointer : public TestFixture {
               "{\n"
               "  wxLongLong x = 0;\n"
               "  int y = x.GetValue();\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1294,7 +1311,7 @@ class TestNullPointer : public TestFixture {
               "{\n"
               "  std::string * x = 0;\n"
               "  *x = \"test\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Null pointer dereference: x [nullPointer]\n", errout_str());
     }
 
@@ -1304,7 +1321,7 @@ class TestNullPointer : public TestFixture {
               "{\n"
               "  struct my_type* p = 0;\n"
               "  p->x = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:3]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
@@ -1316,7 +1333,7 @@ class TestNullPointer : public TestFixture {
               "  struct my_type* p;\n"
               "  p = 0;\n"
               "  return p->x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
@@ -1330,7 +1347,8 @@ class TestNullPointer : public TestFixture {
         check(code); // C++ file => nullptr means NULL
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Null pointer dereference: i [nullPointer]\n", errout_str());
 
-        check(code, dinit(CheckOptions, $.cpp = false, $.cstd = Standards::C17)); // C17 file => nullptr does not mean NULL
+        const Settings s = settingsBuilder(settings).c(Standards::C17).build();
+        check(code, s, false); // C17 file => nullptr does not mean NULL
         ASSERT_EQUALS("", errout_str());
 
         check(code, dinit(CheckOptions, $.cpp = false));
@@ -1342,7 +1360,7 @@ class TestNullPointer : public TestFixture {
               "    char *p = 0;\n"
               "    if (x) p = \"abcd\";\n"
               "    return p ? f(*p) : f(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1351,7 +1369,7 @@ class TestNullPointer : public TestFixture {
               "    int *p = 0;\n"
               "    bar(&p);\n"
               "    *p = 0;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1360,14 +1378,14 @@ class TestNullPointer : public TestFixture {
               "    int *p = 0;\n"
               "    if (x) { return 0; }\n"
               "    return !p || *p;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
               "    int *p = 0;\n"
               "    if (x) { return 0; }\n"
               "    return p && *p;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1380,14 +1398,14 @@ class TestNullPointer : public TestFixture {
               "  {\n"
               "    i++;\n"
               "  };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Null pointer dereference: str [nullPointer]\n", errout_str());
     }
 
     void nullpointer19() { // #3811
         check("int foo() {\n"
               "    perror(0);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1396,14 +1414,14 @@ class TestNullPointer : public TestFixture {
               "    struct xy *p = 0;\n"
               "    if (x) p = q;\n"
               "    if (p ? p->x || p->y : 0) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"   // false negative
               "    struct xy *p = 0;\n"
               "    if (x) p = q;\n"
               "    if (y ? p->x : p->y) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (warning) Possible null pointer dereference: p [nullPointer]\n"
                       "[test.cpp:4:20]: (warning) Possible null pointer dereference: p [nullPointer]\n",
                       errout_str());
@@ -1415,7 +1433,7 @@ class TestNullPointer : public TestFixture {
               "    if (x) p = q;\n"
               "    else return;\n"
               "    *p = 0;\n" // <- p is not NULL
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1424,7 +1442,7 @@ class TestNullPointer : public TestFixture {
               "    char *c = NULL;\n"
               "    char cBuf[10];\n"
               "    sprintf(cBuf, \"%s\", c ? c : \"0\" );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("",errout_str());
     }
 
@@ -1433,7 +1451,7 @@ class TestNullPointer : public TestFixture {
               "    char *c = NULL;\n"
               "    x = c = new char[10];\n"
               "    *c = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1443,7 +1461,7 @@ class TestNullPointer : public TestFixture {
               "    int *array = NULL;\n"
               "    if (data == 1 && array[i] == 0)\n"
               "        std::cout << \"test\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:22]: (error) Null pointer dereference: array [nullPointer]\n", errout_str());
     }
 
@@ -1460,7 +1478,7 @@ class TestNullPointer : public TestFixture {
               "    if (t2 && (!t1))\n"
               "        return 0.0;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1474,7 +1492,7 @@ class TestNullPointer : public TestFixture {
               "    pointer_=NULL;\n"
               "    *pointer_=0;\n"
               "    return *this;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:6]: (error) Null pointer dereference: pointer_ [nullPointer]\n", errout_str());
     }
 
@@ -1484,7 +1502,7 @@ class TestNullPointer : public TestFixture {
               "  int i = s ? s->value + 1\n"
               "            : s->value - 1; // <-- null ptr dereference\n"
               "  return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:11] -> [test.cpp:4:15]: (warning) Either the condition 's' is redundant or there is possible null pointer dereference: s. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -1535,7 +1553,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "\n"
               "    (void)f->x;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1647,7 +1665,7 @@ class TestNullPointer : public TestFixture {
               "void f(struct A *a) {\n"
               "    if (a->x == NULL) {}\n"
               "    *(a->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:14] -> [test.cpp:4:8]: (warning) Either the condition 'a->x==NULL' is redundant or there is possible null pointer dereference: a->x. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -1658,7 +1676,7 @@ class TestNullPointer : public TestFixture {
               "void f(struct A *a) {\n"
               "    if (a->x == nullptr) {}\n"
               "    *(a->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:14] -> [test.cpp:4:8]: (warning) Either the condition 'a->x==nullptr' is redundant or there is possible null pointer dereference: a->x. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -1669,7 +1687,7 @@ class TestNullPointer : public TestFixture {
               "void f(struct A *a) {\n"
               "    if (a->g() == nullptr) {}\n"
               "    *(a->g());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:16] -> [test.cpp:4:11]: (warning) Either the condition 'a->g()==nullptr' is redundant or there is possible null pointer dereference: a->g(). [nullPointerRedundantCheck]\n",
             errout_str());
@@ -1678,7 +1696,7 @@ class TestNullPointer : public TestFixture {
               "void f(struct A *a) {\n"
               "    if (a->g() == nullptr) {}\n"
               "    *(a->g());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1687,7 +1705,7 @@ class TestNullPointer : public TestFixture {
               "void f(struct A *a) {\n"
               "    if (a->g() == nullptr) {}\n"
               "    *(a->g());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:16] -> [test.cpp:4:11]: (warning) Either the condition 'a->g()==nullptr' is redundant or there is possible null pointer dereference: a->g(). [nullPointerRedundantCheck]\n",
             errout_str());
@@ -1700,7 +1718,7 @@ class TestNullPointer : public TestFixture {
               "    if (x) {\n"
               "        (void)*a->x;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1712,7 +1730,7 @@ class TestNullPointer : public TestFixture {
               "    if ( w == 0.0 )\n"
               "        return 0;\n"
               "    return b->get();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         // #9423
         check("extern F* GetF();\n"
@@ -1729,7 +1747,7 @@ class TestNullPointer : public TestFixture {
               "    if (!lPtrOk)\n"
               "        return;\n"
               "    lPtr->Clear();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1746,7 +1764,7 @@ class TestNullPointer : public TestFixture {
               "    g();\n"
               "  a d = *c->b();\n"
               "  return d;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
@@ -1762,7 +1780,7 @@ class TestNullPointer : public TestFixture {
               "    e();\n"
               "  a d = *c->b();\n"
               "  return d;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1770,7 +1788,7 @@ class TestNullPointer : public TestFixture {
         check("void f() {\n"
               "    char* p = new(std::nothrow) char[1];\n"
               "    if( p ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1779,7 +1797,7 @@ class TestNullPointer : public TestFixture {
               "   if(!p[0]) {}\n"
               "   const int *const a = p;\n"
               "   if(!a){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7] -> [test.cpp:2:8]: (warning) Either the condition '!a' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
     }
 
@@ -1788,7 +1806,7 @@ class TestNullPointer : public TestFixture {
               "auto f(T& x) -> decltype(x);\n"
               "int& g(int* x) {\n"
               "    return f(*x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1798,7 +1816,7 @@ class TestNullPointer : public TestFixture {
               "    if(n > 10) q = p;\n"
               "    *p +=2;\n"
               "    if(n < 120) *q+=12;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:18]: (warning) Possible null pointer dereference: q [nullPointer]\n", errout_str());
 
         check("void f(int *p, int n) {\n"
@@ -1806,7 +1824,7 @@ class TestNullPointer : public TestFixture {
               "    if(n > 10) q = p;\n"
               "    *p +=2;\n"
               "    if(n > 10) *q+=12;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1820,7 +1838,7 @@ class TestNullPointer : public TestFixture {
               "            }\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:8] -> [test.cpp:6:18]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -1836,7 +1854,7 @@ class TestNullPointer : public TestFixture {
               "  if (c(e, \"\"))\n"
               "    return nullptr;\n"
               "  return e->b();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1846,7 +1864,7 @@ class TestNullPointer : public TestFixture {
               "    if(b) c = b;\n"
               "    if (!c) c = &a;\n"
               "    return *c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int a, int* b) {\n"
@@ -1855,7 +1873,7 @@ class TestNullPointer : public TestFixture {
               "    bool d = !c;\n"
               "    if (d) c = &a;\n"
               "    return *c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int* x; };\n"
@@ -1865,7 +1883,7 @@ class TestNullPointer : public TestFixture {
               "    if(b) c.x = b;\n"
               "    if (!c.x) c.x = &a;\n"
               "    return *c.x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int* x; };\n"
@@ -1876,7 +1894,7 @@ class TestNullPointer : public TestFixture {
               "    bool d = !c.x;\n"
               "    if (d) c.x = &a;\n"
               "    return *c.x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int* x; };\n"
@@ -1899,7 +1917,7 @@ class TestNullPointer : public TestFixture {
               "}\n"
               "void bar() {\n"
               "  f(0, 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Possible null pointer dereference: params [nullPointer]\n", errout_str());
     }
 
@@ -1915,7 +1933,7 @@ class TestNullPointer : public TestFixture {
               "int bar() {\n"
               "    int **array = NULL;\n"
               "    foo (array, 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1925,7 +1943,7 @@ class TestNullPointer : public TestFixture {
               "    while (tok3->astParent() && tok3->str() == \",\")\n"
               "        tok3 = tok3->astParent();\n"
               "    if (tok3 && tok3->str() == \"(\") {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:5:9] -> [test.cpp:3:12]: (warning) Either the condition 'tok3' is redundant or there is possible null pointer dereference: tok3. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -1938,7 +1956,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    if (!t1 || !t2)\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(int* i);\n"
@@ -1946,7 +1964,7 @@ class TestNullPointer : public TestFixture {
               "    while(f(i) && *i == 0)\n"
               "        i++;\n"
               "    if (!i) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1958,7 +1976,7 @@ class TestNullPointer : public TestFixture {
               "    ListEntry *prev = NULL;\n"
               "    for (ListEntry *cursor = listHead; cursor != NULL; prev = cursor, cursor = cursor->next) {}\n"
               "    if (prev) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2435,6 +2453,9 @@ class TestNullPointer : public TestFixture {
 
     void nullpointer77()
     {
+        // No warning: 'i' is passed to the unknown function 'h' in the same condition that guards the
+        // dereference. 'h' may validate the pointer (e.g. return false for null), so '*i' can be safe
+        // - this is the common "if (check(p) && p->...)" pattern, so we must not assume 'i' is null.
         check("bool h(int*);\n"
               "void f(int* i) {\n"
               "    int* i = nullptr;\n"
@@ -2450,6 +2471,8 @@ class TestNullPointer : public TestFixture {
               "}\n");
         ASSERT_EQUALS("", errout_str());
 
+        // Likewise here, even though 'i' is null when the first 'h(i)' was true: the second 'h(i)' is an
+        // independent call that may validate 'i', so '*i' is not necessarily a null dereference.
         check("bool h(int*);\n"
               "void f(int* x) {\n"
               "    int* i = x;\n"
@@ -2458,6 +2481,14 @@ class TestNullPointer : public TestFixture {
               "    if (h(i) && *i == 1) {}\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(int i) {\n" // #13797
+              "    int* p = nullptr;\n"
+              "    if (!i) {\n"
+              "        *p = 0;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:10]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
     void nullpointer78() // #7802
@@ -2468,7 +2499,7 @@ class TestNullPointer : public TestFixture {
               "    int *p = 0;\n"
               "    pp = &p;\n"
               "    **pp = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:6]: (error) Null pointer dereference: *pp [nullPointer]\n", errout_str());
     }
 
@@ -2704,7 +2735,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "  }\n"
               "  return \"unknown\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:12] -> [test.cpp:3:7]: (warning) Either the condition 'ctx' is redundant or there is possible null pointer dereference: ctx. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -2746,7 +2777,7 @@ class TestNullPointer : public TestFixture {
               "        int* myNull = GetThing();\n"
               "        *myNull=42;\n"
               "        return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (error) Null pointer dereference: myNull [nullPointer]\n", errout_str());
 
         check("struct foo {\n"
@@ -2757,7 +2788,7 @@ class TestNullPointer : public TestFixture {
               "        int* myNull = myFoo.GetThing();\n"
               "        *myNull=42;\n"
               "        return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:10]: (error) Null pointer dereference: myNull [nullPointer]\n", errout_str());
 
         check("struct T { bool g() const; };\n"
@@ -2854,7 +2885,7 @@ class TestNullPointer : public TestFixture {
               "        int * buf = foo(true);\n"
               "        buf[2] = 0;" // <<
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:14:9]: (error) Null pointer dereference: buf [nullPointer]\n", errout_str());
     }
 
@@ -2945,17 +2976,188 @@ class TestNullPointer : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void nullpointer106() // #13682
+    {
+        // An unrelated condition between the null check and the dereference must not stop the analysis
+        check("struct S {\n"
+              "    bool b;\n"
+              "    bool f() const;\n"
+              "};\n"
+              "void f(const S* p, const S* o) {\n"
+              "    const S* p1 = p;\n"
+              "    if (p1 && p1->f())\n"
+              "        return;\n"
+              "    if (p == o)\n"
+              "        return;\n"
+              "    if (p1->b) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:7:9] -> [test.cpp:11:9]: (warning) Either the condition 'p1' is redundant or there is possible null pointer dereference: p1. [nullPointerRedundantCheck]\n",
+            errout_str());
+    }
+
+    void nullpointer107() // #13682 - guards that depend on the pointer indirectly
+    {
+        // cached null-check 'ok'; guard 'if (!ok)' is safe -> no FP
+        check("struct S { void g(); bool f() const; };\n"
+              "void f(S* p) {\n"
+              "    bool ok = (p != nullptr);\n"
+              "    if (p && p->f())\n"
+              "        return;\n"
+              "    if (!ok)\n"
+              "        return;\n"
+              "    p->g();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // unrelated bool guard -> conservative, no FP
+        check("struct S { void g(); bool f() const; };\n"
+              "void f(S* p, bool valid) {\n"
+              "    S* p1 = p;\n"
+              "    if (p1 && p1->f())\n"
+              "        return;\n"
+              "    if (!valid)\n"
+              "        return;\n"
+              "    p1->g();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // guard on a different pointer -> no FP
+        check("struct S { void g(); bool f() const; };\n"
+              "void f(S* p, S* q) {\n"
+              "    S* p1 = p;\n"
+              "    if (p1 && p1->f())\n"
+              "        return;\n"
+              "    if (!q)\n"
+              "        return;\n"
+              "    p1->g();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // direct null guard on the alias -> no FP
+        check("struct S { void g(); bool f() const; };\n"
+              "void f(S* p) {\n"
+              "    S* p1 = p;\n"
+              "    if (p1 && p1->f())\n"
+              "        return;\n"
+              "    if (!p)\n"
+              "        return;\n"
+              "    p1->g();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // FN: 'if (ok)' => survivor has p==nullptr, but the cached 'ok' is not followed -> should warn
+        check("struct S { void g(); bool f() const; };\n"
+              "void f(S* p) {\n"
+              "    bool ok = (p != nullptr);\n"
+              "    if (p && p->f())\n"
+              "        return;\n"
+              "    if (ok)\n"
+              "        return;\n"
+              "    p->g();\n"
+              "}\n");
+        TODO_ASSERT_EQUALS(
+            "[test.cpp:4:9] -> [test.cpp:8:5]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
+            "",
+            errout_str());
+
+        // FN: sink(q) drops the q==p symbolic, so guard 'if (q)' is no longer seen to relate to p -> should warn
+        check("struct S { void g(); bool f() const; };\n"
+              "void sink(S*&);\n"
+              "void f(S* p) {\n"
+              "    S* q = p;\n"
+              "    if (p && p->f())\n"
+              "        return;\n"
+              "    sink(q);\n"
+              "    if (q)\n"
+              "        return;\n"
+              "    p->g();\n"
+              "}\n");
+        TODO_ASSERT_EQUALS(
+            "[test.cpp:5:9] -> [test.cpp:10:5]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
+            "",
+            errout_str());
+
+        // a conditional modification makes ProgramMemory drop the guard (FP-prone) -> must stay quiet:
+        // alias 'q==p' re-assigned to p under a condition
+        check("struct S { void g(); bool f() const; };\n"
+              "void f(S* p, bool c) {\n"
+              "    S* q = p;\n"
+              "    if (p && p->f())\n"
+              "        return;\n"
+              "    if (c)\n"
+              "        q = p;\n"
+              "    if (!q)\n"
+              "        return;\n"
+              "    p->g();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // cached 'ok' refreshed under a condition
+        check("struct S { void g(); bool f() const; };\n"
+              "void f(S* p, bool c) {\n"
+              "    bool ok = (p != nullptr);\n"
+              "    if (p && p->f())\n"
+              "        return;\n"
+              "    if (c)\n"
+              "        ok = (p != nullptr);\n"
+              "    if (!ok)\n"
+              "        return;\n"
+              "    p->g();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void nullpointer108() { // #14422
+        check("void f() {\n"
+              "    int *p{};\n"
+              "    int *&r{p};\n"
+              "    if (*r) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:10]: (error) Null pointer dereference: r [nullPointer]\n", errout_str());
+    }
+
+    void nullpointer109()
+    {
+        check("boost::asio::awaitable<int> test()\n"
+              "{\n"
+              "    const auto *s = getStr();\n"
+              "    if(!s) co_return int{1};\n"
+              "    std::print(\"{}\",*s);\n"
+              "    co_return int{9};\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void nullpointer110()
+    { // #14937 - noreturn member function called on operator() result
+        check("struct A {\n"
+              "    [[noreturn]] void g(int);\n"
+              "};\n"
+              "template<class T>\n"
+              "struct Thunk {\n"
+              "    T& operator()() const;\n"
+              "};\n"
+              "void f(Thunk<A> thunk, int* p) {\n"
+              "    if (!p)\n"
+              "        thunk().g(0);\n"
+              "    *p = 1;\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void nullpointer_addressOf() { // address of
         check("void f() {\n"
               "  struct X *x = 0;\n"
               "  if (addr == &x->y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  struct X *x = 0;\n"
               "  if (addr == &x->y.z[0]) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkP("typedef int Count;\n" // #10018
@@ -2981,7 +3183,7 @@ class TestNullPointer : public TestFixture {
               "        break;\n"
               "    }\n"
               "    return p;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:7:10]: (warning) Possible null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
@@ -2991,7 +3193,7 @@ class TestNullPointer : public TestFixture {
               "        while (*p && nasm_isspace(*p))\n"
               "            p++;\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char* origin) {\n" // #11449
@@ -3006,7 +3208,7 @@ class TestNullPointer : public TestFixture {
         check("void f () {\n"
               "    int *buf; buf = NULL;\n"
               "    buf;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3028,27 +3230,27 @@ class TestNullPointer : public TestFixture {
               "    if (!p) {\n"
               "    }\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:6]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(char *p) {\n"
               "    if (p && *p == 0) {\n"
               "    }\n"
               "    printf(\"%c\", *p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:19]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(char *p) {\n"
               "    if (p && *p == 0) {\n"
               "    } else { *p = 0; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:15]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(char *p) {\n"
               "    if (p) {\n"
               "    }\n"
               "    strcpy(p, \"abc\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:12]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(char *p) {\n"
@@ -3056,7 +3258,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    bar();\n"
               "    strcpy(p, \"abc\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:5:12]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(abc *p) {\n"
@@ -3064,7 +3266,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    else { if (!p->x) {\n"
               "    } }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -3074,7 +3276,7 @@ class TestNullPointer : public TestFixture {
                 "        abort();\n"
                 "    }\n"
                 "    *p = 0;\n"
-                "}";
+                "}\n";
             check(code);
             ASSERT_EQUALS("", errout_str());
 
@@ -3087,7 +3289,7 @@ class TestNullPointer : public TestFixture {
               "        (*bail)();\n"
               "    }\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
@@ -3095,7 +3297,7 @@ class TestNullPointer : public TestFixture {
               "        throw x;\n"
               "    }\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
@@ -3103,21 +3305,21 @@ class TestNullPointer : public TestFixture {
               "        ab.abort();\n"
               "    }\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
               "    if (!p) {\n"
               "        switch (x) { }\n"
               "    }\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
               "    if (!p) {\n"
               "    }\n"
               "    return *x;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(int *p) {\n"
@@ -3125,7 +3327,7 @@ class TestNullPointer : public TestFixture {
               "        x = *p;\n"
               "        return 5+*p;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:14]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n"
                       "[test.cpp:2:9] -> [test.cpp:4:19]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
@@ -3135,7 +3337,7 @@ class TestNullPointer : public TestFixture {
               "    if (!a) {\n"
               "        a.x();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // This is why this check can't be used on the simplified token list
@@ -3143,7 +3345,7 @@ class TestNullPointer : public TestFixture {
               "    if (!dynamic_cast<bar *>(foo)) {\n"
               "        *foo = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket: #2300 - calling unknown function that may initialize the pointer
@@ -3153,7 +3355,7 @@ class TestNullPointer : public TestFixture {
               "        initfred();\n"
               "        fred->x = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #1219
@@ -3162,7 +3364,7 @@ class TestNullPointer : public TestFixture {
               "        return;\n"
               "    }\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:5:6]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         // #2467 - unknown macro may terminate the application
@@ -3171,7 +3373,7 @@ class TestNullPointer : public TestFixture {
               "        MACRO;\n"
               "    }\n"
               "    fred->a();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #2493 - switch
@@ -3184,7 +3386,7 @@ class TestNullPointer : public TestFixture {
               "            fred->a();\n"
               "            break;\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4118 - second if
@@ -3192,7 +3394,7 @@ class TestNullPointer : public TestFixture {
               "    int x = 1;\n"
               "    if (!p) x = 0;\n"
               "    if (x) *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #2674 - different functions
@@ -3209,7 +3411,7 @@ class TestNullPointer : public TestFixture {
               "\n"
               "void Fred::b() {\n"
               "    wilma->Reload();\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void test(int *i) {\n"
@@ -3217,7 +3419,7 @@ class TestNullPointer : public TestFixture {
               "  else {\n"
               "    int b = *i;\n"
               "  }\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // #2696 - false positives nr 1
@@ -3230,7 +3432,7 @@ class TestNullPointer : public TestFixture {
               "\n"
               "   if (pFoo)\n"
               "      bar();\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // #2696 - false positives nr 2
@@ -3243,7 +3445,7 @@ class TestNullPointer : public TestFixture {
               "      pFoo = pFoo->next;\n"
               "\n"
               "   len = sizeof(pFoo->data);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // #2696 - false positives nr 3
@@ -3256,13 +3458,13 @@ class TestNullPointer : public TestFixture {
               "      pFoo = pFoo->next;\n"
               "\n"
               "   len = decltype(*pFoo);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(struct Fred *fred) {\n"
               "    if (fred) { }\n"
               "    return fred->a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:12]: (warning) Either the condition 'fred' is redundant or there is possible null pointer dereference: fred. [nullPointerRedundantCheck]\n", errout_str());
 
         // #2789 - assign and check pointer
@@ -3270,7 +3472,7 @@ class TestNullPointer : public TestFixture {
               "    char *p; p = x();\n"
               "    if (!p) { }\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:4:6]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         // check, assign and use
@@ -3279,7 +3481,7 @@ class TestNullPointer : public TestFixture {
               "    if (p == 0 && (p = malloc(10)) != 0) {\n"
               "        *p = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // check, assign and use
@@ -3288,7 +3490,7 @@ class TestNullPointer : public TestFixture {
               "    if (p == 0 && (p = malloc(10)) != a && (*p = a)) {\n"
               "        *p = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // check, and use
@@ -3297,7 +3499,7 @@ class TestNullPointer : public TestFixture {
               "    if (p == 0 && (*p = 0)) {\n"
               "        return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:3:21]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         // check, and use
@@ -3306,7 +3508,7 @@ class TestNullPointer : public TestFixture {
               "    if (p == 0 && p->x == 10) {\n"
               "        return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:3:19]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         // check, and use
@@ -3315,7 +3517,7 @@ class TestNullPointer : public TestFixture {
               "    if (p == 0 || p->x == 10) {\n"
               "        return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // check, and use
@@ -3324,7 +3526,7 @@ class TestNullPointer : public TestFixture {
               "    if (p == NULL && (*p = a)) {\n"
               "        return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:3:24]: (warning) Either the condition 'p==NULL' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         // check, and use
@@ -3332,14 +3534,14 @@ class TestNullPointer : public TestFixture {
               "    if (!p && x==1 || p && p->x==0) {\n"
               "        return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
             const char code[] = "void f(Fred *fred) {\n"
                                 "    if (fred == NULL) { }\n"
                                 "    fred->x();\n"
-                                "}";
+                                "}\n";
 
             check(code);     // inconclusive
             ASSERT_EQUALS("[test.cpp:2:14] -> [test.cpp:3:5]: (warning) Either the condition 'fred==NULL' is redundant or there is possible null pointer dereference: fred. [nullPointerRedundantCheck]\n", errout_str());
@@ -3348,52 +3550,52 @@ class TestNullPointer : public TestFixture {
         check("void f(char *s) {\n"   // #3358
               "    if (s==0);\n"
               "    strcpy(a, s?b:c);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // sizeof
         check("void f(struct fred_t *fred) {\n"
               "    if (!fred)\n"
               "        int sz = sizeof(fred->x);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // check in macro
         check("void f(int *x) {\n"
               "    $if (!x) {}\n"
               "    *x = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return ?:
         check("int f(ABC *p) {\n" // FP : return ?:
               "    if (!p) {}\n"
               "    return p ? p->x : 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("int f(ABC *p) {\n" // no fn
               "    if (!p) {}\n"
               "    return q ? p->x : 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:16]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("int f(ABC *p) {\n" // FP : return &&
               "    if (!p) {}\n"
               "    return p && p->x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int *p) {\n"
               "    if (x || !p) {}\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14] -> [test.cpp:3:6]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         // sizeof
         check("void f() {\n"
               "  int *pointer = NULL;\n"
               "  pointer = func(sizeof pointer[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct T {\n" // #14164
@@ -3409,6 +3611,27 @@ class TestNullPointer : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:8:21] -> [test.cpp:10:18]: (warning) Either the condition 'tok=tok->next' is redundant or there is possible null pointer dereference: tok. [nullPointerRedundantCheck]\n",
                       errout_str());
+
+        check("void f(const A* a, const B* b) {\n" // #6282
+              "    if (b && a) {}\n"
+              "    if (a != b && b->value) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:19]: (warning) Either the condition 'b' is redundant or there is possible null pointer dereference: b. [nullPointerRedundantCheck]\n",
+                      errout_str());
+
+        check("void f(int* a) {\n" // #12859
+              "    if (!a)\n"
+              "        x;\n"
+              "    *a = 0;\n"
+              "}\n"
+              "void g(int* a) {\n"
+              "    if (!a)\n"
+              "        x();\n"
+              "    *a = 0;\n"
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:6]: (warning, inconclusive) Either the condition '!a' is redundant or there is possible null pointer dereference: a. [nullPointerRedundantCheck]\n"
+                      "[test.cpp:7:9] -> [test.cpp:9:6]: (warning, inconclusive) Either the condition '!a' is redundant or there is possible null pointer dereference: a. [nullPointerRedundantCheck]\n",
+                      errout_str());
     }
 
     // Test CheckNullPointer::nullConstantDereference
@@ -3416,12 +3639,12 @@ class TestNullPointer : public TestFixture {
         check("int f() {\n"
               "    int* p = 0;\n"
               "    return p[4];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("void f() {\n"
               "    typeof(*NULL) y;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("int * f() {\n"
@@ -3429,7 +3652,7 @@ class TestNullPointer : public TestFixture {
               "}\n"
               "int main() {\n"
               "  return *f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Null pointer dereference: f() [nullPointer]\n", errout_str());
     }
 
@@ -3437,7 +3660,7 @@ class TestNullPointer : public TestFixture {
         // Ticket #2621
         check("void f(struct ABC *abc) {\n"
               "    ({ if (abc) dbg(); })\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3445,7 +3668,7 @@ class TestNullPointer : public TestFixture {
         // Ticket #2840
         check("void f() {\n"
               "    int bytes = snprintf(0, 0, \"%u\", 1);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3453,150 +3676,143 @@ class TestNullPointer : public TestFixture {
         // Ticket #2840
         check("void f() {\n"
               "    int bytes = snprintf(0, 10, \"%u\", 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:26]: (error) Null pointer dereference [nullPointer]\n", errout_str());
     }
 
     void printf_with_invalid_va_argument() {
         check("void f() {\n"
               "    printf(\"%s\", 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (error) Null pointer dereference [nullPointer]\n", errout_str());
 
         check("void f(char* s) {\n"
               "    printf(\"%s\", s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char* s = 0;\n"
               "    printf(\"%s\", s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:18]: (error) Null pointer dereference: s [nullPointer]\n"
-            "[test.cpp:3:18]: (error) Null pointer dereference [nullPointer]\n",
+            "[test.cpp:3:18]: (error) Null pointer dereference: s [nullPointer]\n",
             errout_str());
 
         check("void f() {\n"
               "    char *s = 0;\n"
               "    printf(\"%s\", s == 0 ? a : s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    printf(\"%u%s\", 0, 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (error) Null pointer dereference [nullPointer]\n", errout_str());
 
         check("void f(char* s) {\n"
               "    printf(\"%u%s\", 0, s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char* s = 0;\n"
               "    printf(\"%u%s\", 123, s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:25]: (error) Null pointer dereference: s [nullPointer]\n"
-            "[test.cpp:3:25]: (error) Null pointer dereference [nullPointer]\n",
+            "[test.cpp:3:25]: (error) Null pointer dereference: s [nullPointer]\n",
             errout_str());
 
 
         check("void f() {\n"
               "    printf(\"%%%s%%\", 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (error) Null pointer dereference [nullPointer]\n", errout_str());
 
         check("void f(char* s) {\n"
               "    printf(\"text: %s, %s\", s, 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:31]: (error) Null pointer dereference [nullPointer]\n", errout_str());
 
 
         check("void f() {\n"
               "    char* s = \"blabla\";\n"
               "    printf(\"%s\", s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
         check("void f(char* s) {\n"
               "    printf(\"text: %m%s, %s\", s, 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:33]: (error) Null pointer dereference [nullPointer]\n", errout_str());
 
         check("void f(char* s) {\n"
               "    printf(\"text: %*s, %s\", s, 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:32]: (error) Null pointer dereference [nullPointer]\n", errout_str());
 
         // Ticket #3364
         check("void f() {\n"
               "    printf(\"%-*.*s\", s, 0);\n"
               "    sprintf(\"%*\", s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void scanf_with_invalid_va_argument() {
         check("void f(char* s) {\n"
               "    sscanf(s, \"%s\", 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:21]: (error) Null pointer dereference [nullPointer]\n"
-            "[test.cpp:2:21]: (error) Null pointer dereference [nullPointer]\n",   // duplicate
+            "[test.cpp:2:21]: (error) Null pointer dereference [nullPointer]\n",
             errout_str());
 
         check("void f() {\n"
               "    scanf(\"%d\", 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:17]: (error) Null pointer dereference [nullPointer]\n"
-            "[test.cpp:2:17]: (error) Null pointer dereference [nullPointer]\n",   // duplicate
+            "[test.cpp:2:17]: (error) Null pointer dereference [nullPointer]\n",
             errout_str());
 
         check("void f(char* foo) {\n"
               "    char location[200];\n"
               "    int width, height;\n"
               "    sscanf(imgInfo, \"%s %d %d\", location, &width, &height);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // ticket #3207
 
         check("void f(char *dummy) {\n"
               "    int iVal;\n"
               "    sscanf(dummy, \"%d%c\", &iVal);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // ticket #3211
 
         check("void f(char *dummy) {\n"
               "    int* iVal = 0;\n"
               "    sscanf(dummy, \"%d\", iVal);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:25]: (error) Null pointer dereference: iVal [nullPointer]\n"
-            "[test.cpp:3:25]: (error) Null pointer dereference [nullPointer]\n"
-            "[test.cpp:3:25]: (error) Null pointer dereference [nullPointer]\n",   // duplicate
+            "[test.cpp:3:25]: (error) Null pointer dereference: iVal [nullPointer]\n",
             errout_str());
 
         check("void f(char *dummy) {\n"
               "    int* iVal;\n"
               "    sscanf(dummy, \"%d\", foo(iVal));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *dummy) {\n"
               "    int* iVal = 0;\n"
               "    sscanf(dummy, \"%d%d\", foo(iVal), iVal);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char* dummy) {\n"
               "    sscanf(dummy, \"%*d%u\", 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:28]: (error) Null pointer dereference [nullPointer]\n"
-            "[test.cpp:2:28]: (error) Null pointer dereference [nullPointer]\n",   // duplicate
+            "[test.cpp:2:28]: (error) Null pointer dereference [nullPointer]\n",
             errout_str());
     }
 
@@ -3606,12 +3822,12 @@ class TestNullPointer : public TestFixture {
               "    int* iVal = 0;\n"
               "    if(maybe()) iVal = g();\n"
               "    return iVal[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (warning) Possible null pointer dereference: iVal [nullPointer]\n", errout_str());
 
         check("int foo(int* iVal) {\n"
               "    return iVal[0];\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3621,20 +3837,20 @@ class TestNullPointer : public TestFixture {
               "bool foo() {\n"
               "     PolymorphicA* a = 0;\n"
               "     return typeid(*a) == typeid(*a);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("struct NonPolymorphicA { ~A() {} };\n"
               "bool foo() {\n"
               "     NonPolymorphicA* a = 0;\n"
               "     return typeid(*a) == typeid(*a);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo() {\n"
               "     char* c = 0;\n"
               "     return typeid(*c) == typeid(*c);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3643,40 +3859,40 @@ class TestNullPointer : public TestFixture {
         check("size_t foo() {\n"
               "    char* c = 0;\n"
               "    return alignof(*c);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("size_t foo() {\n"
               "    return alignof(*0);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p) {\n"
               "    f(alignof(*p));\n"
               "    if (p) {}\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("size_t foo() {\n"
               "    char* c = 0;\n"
               "    return _Alignof(*c);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("size_t foo() {\n"
               "    return _alignof(*0);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("size_t foo() {\n"
               "    return __alignof(*0);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("size_t foo() {\n"
               "    return __alignof__(*0);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3687,7 +3903,7 @@ class TestNullPointer : public TestFixture {
               "  cnt = 0;\n"
               " for (int i = 0; i < cnt; ++i)\n"
               "  *ptr++ = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #11635
@@ -3701,6 +3917,26 @@ class TestNullPointer : public TestFixture {
               "            i++;\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(const int* p) {\n" // #6710
+              "    for (int i = *p; i < 5; ++i) {}\n"
+              "    if (p) {}\n"
+              "}\n"
+              "struct S { int a; };\n"
+              "void g(const S* s) {\n"
+              "    for (int i = s->a; i < 5; ++i) {}\n"
+              "    if (s) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:2:19]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n"
+                      "[test.cpp:8:9] -> [test.cpp:7:18]: (warning) Either the condition 's' is redundant or there is possible null pointer dereference: s. [nullPointerRedundantCheck]\n",
+                      errout_str());
+
+        check("struct S { int a; };\n" // #6492
+              "void h(const S* s) {\n"
+              "    for (int i = s->a; s; ++i) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:24] -> [test.cpp:3:18]: (warning) Either the condition 's' is redundant or there is possible null pointer dereference: s. [nullPointerRedundantCheck]\n",
+                      errout_str());
     }
 
     void nullpointerDeadCode() {
@@ -3742,6 +3978,15 @@ class TestNullPointer : public TestFixture {
                "    return 1 ? 1 : *(int*)0 = 1;\n"
                "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check ("struct S {\n" // #13220
+               "    explicit S(int* p) : i(*p) {\n"
+               "        if (p) {}\n"
+               "    }\n"
+               "    int i;\n"
+               "};\n");
+        ASSERT_EQUALS("[test.cpp:3:13] -> [test.cpp:2:29]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
+                      errout_str());
     }
 
     void nullpointerDelete() {
@@ -3768,7 +4013,22 @@ class TestNullPointer : public TestFixture {
               "void f(int* x) {\n"
               "    if (x)\n"
               "        g(x);\n"
-              "}");
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct T {\n" // #14308
+              "    bool b{};\n"
+              "    T* next{};\n"
+              "};\n"
+              "bool g(const T*& r) {\n"
+              "    const T* t = r;\n"
+              "    r = t->next;\n"
+              "    return t->b;\n"
+              "}\n"
+              "void f(const T* tok) {\n"
+              "    if (g(tok)) {}\n"
+              "    if (tok) {}\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3795,7 +4055,7 @@ class TestNullPointer : public TestFixture {
               "    std::string s4 = p;\n"
               "    std::string s5(p);\n"
               "    foo(std::string(p));\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:9:10]: (error) Null pointer dereference: p [nullPointer]\n"
                       "[test.cpp:10:22]: (error) Null pointer dereference: p [nullPointer]\n"
                       "[test.cpp:11:20]: (error) Null pointer dereference: p [nullPointer]\n"
@@ -3811,7 +4071,7 @@ class TestNullPointer : public TestFixture {
               "    std::string s2 = nullptr;\n"
               "    std::string s3(nullptr);\n"
               "    foo(std::string(nullptr));\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Null pointer dereference [nullPointer]\n"
                       "[test.cpp:3:22]: (error) Null pointer dereference [nullPointer]\n"
                       "[test.cpp:4:17]: (error) Null pointer dereference [nullPointer]\n"
@@ -3823,7 +4083,7 @@ class TestNullPointer : public TestFixture {
               "    std::string s2 = NULL;\n"
               "    std::string s3(NULL);\n"
               "    foo(std::string(NULL));\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Null pointer dereference [nullPointer]\n"
                       "[test.cpp:3:22]: (error) Null pointer dereference [nullPointer]\n"
                       "[test.cpp:4:17]: (error) Null pointer dereference [nullPointer]\n"
@@ -3839,7 +4099,7 @@ class TestNullPointer : public TestFixture {
               "    foo(p == s1);\n"
               "    foo(p == s2);\n"
               "    foo(p == s3);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:4:15]: (error) Null pointer dereference: p [nullPointer]\n"
                       "[test.cpp:5:15]: (error) Null pointer dereference: p [nullPointer]\n"
                       "[test.cpp:7:9]: (error) Null pointer dereference: p [nullPointer]\n"
@@ -3854,7 +4114,7 @@ class TestNullPointer : public TestFixture {
               "    foo(s1.size() == 0);\n"
               "    foo(s2.size() == 0);\n"
               "    foo(s3->size() == 0);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string s1, const std::string& s2) {\n"
@@ -3863,7 +4123,7 @@ class TestNullPointer : public TestFixture {
               "    foo(0 == s2[0]);\n"
               "    foo(s1[0] == 0);\n"
               "    foo(s2[0] == 0);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string s1, const std::string& s2) {\n"
@@ -3872,7 +4132,7 @@ class TestNullPointer : public TestFixture {
               "    foo(s2 == '\\0');\n"
               "    foo('\\0' == s1);\n"
               "    foo('\\0' == s2);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("class Bar {\n"
@@ -3883,19 +4143,19 @@ class TestNullPointer : public TestFixture {
               "    std::string s;\n"
               "    Foo();\n"
               "};\n"
-              "Foo::Foo() : s(0) {}");
+              "Foo::Foo() : s(0) {}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Null pointer dereference [nullPointer]\n"
                       "[test.cpp:9:14]: (error) Null pointer dereference [nullPointer]\n", errout_str());
 
         check("void f() {\n"
               "    std::string s = 0 == x ? \"a\" : \"b\";\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  const std::string s = g();\n"
               "  ASSERT_MESSAGE(\"Error on s\", 0 == s.compare(\"Some text\"));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int i, std::string s);\n"
@@ -3906,7 +4166,7 @@ class TestNullPointer : public TestFixture {
               "  foo(var, NULL);\n"
               "  foo(var, nullptr);\n"
               "  foo(0, var);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (error) Null pointer dereference [nullPointer]\n"
                       "[test.cpp:5:12]: (error) Null pointer dereference [nullPointer]\n"
                       "[test.cpp:6:12]: (error) Null pointer dereference [nullPointer]\n"
@@ -3920,7 +4180,8 @@ class TestNullPointer : public TestFixture {
               "  std::string s(p);\n"
               "  return s;\n"
               "}\n", dinit(CheckOptions, $.inconclusive = true));
-        ASSERT_EQUALS("", errout_str());
+        ASSERT_EQUALS("[test.cpp:6:17]: (warning, inconclusive) Possible null pointer dereference: p [nullPointer]\n",
+                      errout_str());
 
         check("void f() {\n" // #11078
               "    const char* p = nullptr;\n"
@@ -3935,13 +4196,22 @@ class TestNullPointer : public TestFixture {
               "void f() { std::string s = g(0L); }\n");
         ASSERT_EQUALS("[test.cpp:2:29]: (error) Null pointer dereference: g(0L) [nullPointer]\n",
                       errout_str());
+
+        check("const char* g() { return nullptr; }\n" // #14098
+              "std::string f() {\n"
+              "    std::string s{ g() };\n"
+              "    return s + std::string(g());\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:21]: (error) Null pointer dereference: g() [nullPointer]\n"
+                      "[test.cpp:4:29]: (error) Null pointer dereference: g() [nullPointer]\n",
+                      errout_str());
     }
 
     void nullpointerStdStream() {
         check("void f(std::ifstream& is) {\n"
               "    char* p = 0;\n"
               "    is >> p;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Possible null pointer dereference: p\n", "", errout_str());
 
         check("void f(const std::ostringstream& oss, char* q) {\n"
@@ -3950,7 +4220,7 @@ class TestNullPointer : public TestFixture {
               "    oss << foo << p;\n"
               "    if(q == 0)\n"
               "        oss << foo << q;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Null pointer dereference: p [nullPointer]\n"
                       "[test.cpp:4:19]: (error) Null pointer dereference: p [nullPointer]\n"
                       "[test.cpp:5:10] -> [test.cpp:6:23]: (warning) Either the condition 'q==0' is redundant or there is possible null pointer dereference: q. [nullPointerRedundantCheck]\n", errout_str());
@@ -3962,7 +4232,7 @@ class TestNullPointer : public TestFixture {
               "        std::cin >> p;\n"
               "        std::cout << abc << p;\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:2:10] -> [test.cpp:3:22]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n"
                            "[test.cpp:2:10] -> [test.cpp:4:22]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n"
                            "[test.cpp:2:10] -> [test.cpp:5]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n"
@@ -3977,7 +4247,7 @@ class TestNullPointer : public TestFixture {
               "    char* p2 = 0;\n"
               "    std::cin >> (int)p;\n" // result casted
               "    std::cout << (int)p;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::string& str) {\n"
@@ -3985,13 +4255,13 @@ class TestNullPointer : public TestFixture {
               "    std::istringstream istr(str);\n"
               "    istr >> std::hex >> ret;\n" // Read integer
               "    return ret;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int* i) {\n"
               "    if(i) return;\n"
               "    std::cout << i;\n" // Its no char* (#4240)
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // #5811 false positive: (error) Null pointer dereference
@@ -4000,7 +4270,7 @@ class TestNullPointer : public TestFixture {
               "    stringstream out;\n"
               "    out << ((ip >> 0) & 0xFF);\n"
               "    return out.str();\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
         // avoid regression from first fix attempt for #5811...
         check("void deserialize(const std::string &data) {\n"
@@ -4020,42 +4290,42 @@ class TestNullPointer : public TestFixture {
               "void f(std::shared_ptr<Fred> p) {\n"
               "  if (p) {}\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7] -> [test.cpp:4:11]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("struct Fred { int x; };\n"
               "void f(std::shared_ptr<Fred> p) {\n"
               "  p = nullptr;\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("struct Fred { int x; };\n"
               "void f(std::unique_ptr<Fred> p) {\n"
               "  if (p) {}\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7] -> [test.cpp:4:11]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("struct Fred { int x; };\n"
               "void f(std::unique_ptr<Fred> p) {\n"
               "  p = nullptr;\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("struct Fred { int x; };\n"
               "void f() {\n"
               "  std::shared_ptr<Fred> p;\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("struct Fred { int x; };\n"
               "void f(std::shared_ptr<Fred> p) {\n"
               "  p.reset();\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("struct Fred { int x; };\n"
@@ -4063,7 +4333,7 @@ class TestNullPointer : public TestFixture {
               "  Fred * pp = nullptr;\n"
               "  p.reset(pp);\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:11]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("struct Fred { int x; };\n"
@@ -4071,28 +4341,28 @@ class TestNullPointer : public TestFixture {
               "  std::shared_ptr<Fred> p;\n"
               "  p.reset(&f);\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Fred { int x; };\n"
               "void f(std::shared_ptr<Fred> p) {\n"
               "  p.reset();\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("struct Fred { int x; };\n"
               "void f() {\n"
               "  std::shared_ptr<Fred> p(nullptr);\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("struct A {};\n"
               "void f(int n) {\n"
               "    std::unique_ptr<const A*[]> p;\n"
               "    p.reset(new const A*[n]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9216
@@ -4103,7 +4373,7 @@ class TestNullPointer : public TestFixture {
               "void g(std::unique_ptr<A> var) {\n"
               "    var->reset();\n"
               "    var->f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9439
@@ -4131,21 +4401,21 @@ class TestNullPointer : public TestFixture {
               "    int *p = malloc(10);\n"
               "    *p = 0;\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (warning) If memory allocation fails, then there is a possible null pointer dereference: p [nullPointerOutOfMemory]\n", errout_str());
 
         check("void f() {\n"
               "    int *p = malloc(10);\n"
               "    *(p+2) = 0;\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8]: (error) If memory allocation fails: pointer addition with NULL pointer. [nullPointerArithmeticOutOfMemory]\n", errout_str());
 
         check("void f() {\n" // #13676
               "    int* q = static_cast<int*>(std::malloc(4));\n"
               "    *q = 0;\n"
               "    std::free(q);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (warning) If memory allocation fails, then there is a possible null pointer dereference: q [nullPointerOutOfMemory]\n", errout_str());
     }
 
@@ -4157,7 +4427,7 @@ class TestNullPointer : public TestFixture {
                   "    *p = 0;\n"
                   "    foo(p);\n"
                   "    if (p) { }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
 
             // function seen (taking pointer parameter)
@@ -4167,7 +4437,7 @@ class TestNullPointer : public TestFixture {
                   "    *p = 0;\n"
                   "    foo(p);\n"
                   "    if (p) { }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS(
                 "[test.cpp:6:9] -> [test.cpp:4:6]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
                 errout_str());
@@ -4179,7 +4449,7 @@ class TestNullPointer : public TestFixture {
                   "    *p = 0;\n"
                   "    foo(p);\n"
                   "    if (p) { }\n"
-                  "}", dinit(CheckOptions, $.inconclusive = true));
+                  "}\n", dinit(CheckOptions, $.inconclusive = true));
             ASSERT_EQUALS("", errout_str());
 
             // function implementation not seen
@@ -4189,7 +4459,7 @@ class TestNullPointer : public TestFixture {
                   "    *p = 0;\n"
                   "    foo(p);\n"
                   "    if (p) { }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS(
                 "[test.cpp:6:9] -> [test.cpp:4:6]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
                 errout_str());
@@ -4199,7 +4469,7 @@ class TestNullPointer : public TestFixture {
                   "    *p = 0;\n"
                   "    foo(p);\n"
                   "    if (p) { }\n"
-                  "}", dinit(CheckOptions, $.inconclusive = true));
+                  "}\n", dinit(CheckOptions, $.inconclusive = true));
             ASSERT_EQUALS(
                 "[test.cpp:4:9] -> [test.cpp:2:6]: (warning, inconclusive) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
                 errout_str());
@@ -4212,7 +4482,7 @@ class TestNullPointer : public TestFixture {
                   "    abc->a = 0;\n"
                   "    foo(abc);\n"
                   "    if (abc) { }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
 
             // function seen (taking pointer parameter)
@@ -4222,7 +4492,7 @@ class TestNullPointer : public TestFixture {
                   "    abc->a = 0;\n"
                   "    foo(abc);\n"
                   "    if (abc) { }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS(
                 "[test.cpp:6:9] -> [test.cpp:4:5]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n",
                 errout_str());
@@ -4234,7 +4504,7 @@ class TestNullPointer : public TestFixture {
                   "    abc->a = 0;\n"
                   "    foo(abc);\n"
                   "    if (abc) { }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS(
                 "[test.cpp:6:9] -> [test.cpp:4:5]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n",
                 errout_str());
@@ -4244,7 +4514,7 @@ class TestNullPointer : public TestFixture {
                   "    abc->a = 0;\n"
                   "    foo(abc);\n"
                   "    if (abc) { }\n"
-                  "}", dinit(CheckOptions, $.inconclusive = true));
+                  "}\n", dinit(CheckOptions, $.inconclusive = true));
             ASSERT_EQUALS(
                 "[test.cpp:4:9] -> [test.cpp:2:5]: (warning, inconclusive) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n",
                 errout_str());
@@ -4261,11 +4531,64 @@ class TestNullPointer : public TestFixture {
             "[test.cpp:3:13]: (warning) If resource allocation fails, then there is a possible null pointer dereference: fid [nullPointerOutOfResources]\n"
             "[test.cpp:4:12]: (warning) If resource allocation fails, then there is a possible null pointer dereference: fid [nullPointerOutOfResources]\n",
             errout_str());
+
+        // the guard might call an unknown, possibly noreturn function -> no warning
+        check("void f() {\n"
+              "    FILE* fid = fopen(\"x.txt\", \"w\");\n"
+              "    if (fid == NULL)\n"
+              "        g();\n"
+              "    fclose(fid);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // .. but an inconclusive warning is reported with --inconclusive
+        check("void f() {\n"
+              "    FILE* fid = fopen(\"x.txt\", \"w\");\n"
+              "    if (fid == NULL)\n"
+              "        g();\n"
+              "    fclose(fid);\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS(
+            "[test.cpp:5:12]: (warning, inconclusive) If resource allocation fails, then there is a possible null pointer dereference: fid [nullPointerOutOfResources]\n",
+            errout_str());
+
+        check("int f(const int* p) {\n"
+              "    if (p == nullptr)\n"
+              "        g();\n"
+              "    return *p;\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS(
+            "[test.cpp:2:11] -> [test.cpp:4:13]: (warning, inconclusive) Either the condition 'p==nullptr' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    FILE* fid = fopen(\"x.txt\", \"w\");\n"
+              "    if (fid != NULL)\n"
+              "        ;\n"
+              "    else\n"
+              "        g();\n"
+              "    fclose(fid);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // guard function is known to return -> warning
+        check("void g() {}\n"
+              "void f() {\n"
+              "    FILE* fid = fopen(\"x.txt\", \"w\");\n"
+              "    if (fid == NULL)\n"
+              "        g();\n"
+              "    fclose(fid);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:6:12]: (warning) If resource allocation fails, then there is a possible null pointer dereference: fid [nullPointerOutOfResources]\n",
+            errout_str());
     }
 
     void functioncalllibrary() {
         SimpleTokenizer tokenizer(settingsDefault,*this,false);
-        const char code[] = "void f() { int a,b,c; x(a,b,c); }";
+        const char code[] = "void f() { int a,b,c; x(a,b,c); }\n";
         ASSERT_EQUALS(true, tokenizer.tokenize(code));
         const Token *xtok = Token::findsimplematch(tokenizer.tokens(), "x");
 
@@ -4283,8 +4606,7 @@ class TestNullPointer : public TestFixture {
             Library library;
             ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-            std::list<const Token *> null;
-            CheckNullPointer::parseFunctionCall(*xtok, null, library);
+            const std::list<const Token *> null = CheckNullPointerImpl::parseFunctionCall(*xtok, library);
             ASSERT_EQUALS(0U, null.size());
         }
 
@@ -4302,8 +4624,7 @@ class TestNullPointer : public TestFixture {
             Library library;
             ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-            std::list<const Token *> null;
-            CheckNullPointer::parseFunctionCall(*xtok, null, library);
+            const std::list<const Token *> null = CheckNullPointerImpl::parseFunctionCall(*xtok, library);
             ASSERT_EQUALS(1U, null.size());
             ASSERT_EQUALS("a", null.front()->str());
         }
@@ -4313,51 +4634,51 @@ class TestNullPointer : public TestFixture {
 
         check("void f(int *p = 0) {\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    if (!p)\n"
               "        return;\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char a, int *p = 0) {\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    printf(\"p = %d\", *p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    printf(\"p[1] = %d\", p[1]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    buf[p] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    if (p != 0 && bar())\n"
               "      *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p) {\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    if (p != 0)\n"
               "      *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
@@ -4365,13 +4686,13 @@ class TestNullPointer : public TestFixture {
               "    if (p == 0)\n"
               "      p = &y;\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int *p = 0) {\n"
               "    if (a != 0)\n"
               "      *p = 0;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
             "[test.cpp:3:8]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n",
             errout_str());
@@ -4379,13 +4700,13 @@ class TestNullPointer : public TestFixture {
         check("void f(int *p = 0) {\n"
               "    p = a;\n"
               "    *p = 0;\n" // <- don't simplify and verify
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    p += a;\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int *p = 0) {\n"
@@ -4393,17 +4714,17 @@ class TestNullPointer : public TestFixture {
               "        return 0;\n"
               "    }\n"
               "    return *p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    std::cout << p ? *p : 0;\n" // Due to operator precedence, this is equivalent to: (std::cout << p) ? *p : 0;
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n", errout_str()); // Check the first branch of ternary
 
         check("void f(char *p = 0) {\n"
               "    std::cout << p ? *p : 0;\n" // Due to operator precedence, this is equivalent to: (std::cout << p) ? *p : 0;
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:18]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n"
             "[test.cpp:2:23]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n",   // duplicate
@@ -4411,27 +4732,27 @@ class TestNullPointer : public TestFixture {
 
         check("void f(int *p = 0) {\n"
               "    std::cout << (p ? *p : 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    std::cout << p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    std::cout << (p && p[0] ? *p : 42);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void isEmpty(int *p = 0) {\n"
               "    return p && *p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int *p = 0) {\n"
               "    return !p || *p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4440,13 +4761,13 @@ class TestNullPointer : public TestFixture {
         check("void f(int *p = 0) {\n"
               "    bar(p);\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    printf(\"%p\", p);\n"
               "    *p = 0;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:3:6]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n", errout_str());
 
         // The init() function may or may not initialize p, but since the address
@@ -4455,14 +4776,14 @@ class TestNullPointer : public TestFixture {
         check("void f(int *p = 0) {\n"
               "    init(&p);\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void init(int* &g);\n"
               "void f(int *p = 0) {\n"
               "    init(p);\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
@@ -4470,7 +4791,7 @@ class TestNullPointer : public TestFixture {
               "        init(&p);\n"
               "    }\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
@@ -4478,12 +4799,12 @@ class TestNullPointer : public TestFixture {
               "        throw SomeException;\n"
               "    }\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int x, int *p = 0) {\n"
               "    int var1 = x ? *p : 5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:21]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n", errout_str());
 
         check("void f(int* i = nullptr) { *i = 0; }\n" // #11567
@@ -4498,7 +4819,7 @@ class TestNullPointer : public TestFixture {
               "    unsigned int j;\n"
               "    for (j = 0; j < b[0].a->size; ++j) {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4522,33 +4843,33 @@ class TestNullPointer : public TestFixture {
         check("void foo(char *s) {\n"
               "  char *p = s - 20;\n"
               "}\n"
-              "void bar() { foo(0); }");
+              "void bar() { foo(0); }\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (error) Overflow in pointer arithmetic, NULL pointer is subtracted. [nullPointerArithmetic]\n",
                       errout_str());
 
         check("void foo(char *s) {\n"
               "  if (!s) {}\n"
               "  char *p = s - 20;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7] -> [test.cpp:3:15]: (warning) Either the condition '!s' is redundant or there is overflow in pointer subtraction. [nullPointerArithmeticRedundantCheck]\n", errout_str());
 
         check("void foo(char *s) {\n"
               "  s -= 20;\n"
               "}\n"
-              "void bar() { foo(0); }");
+              "void bar() { foo(0); }\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (error) Overflow in pointer arithmetic, NULL pointer is subtracted. [nullPointerArithmetic]\n",
                       errout_str());
 
         check("void foo(char *s) {\n"
               "  if (!s) {}\n"
               "  s -= 20;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7] -> [test.cpp:3:5]: (warning) Either the condition '!s' is redundant or there is overflow in pointer subtraction. [nullPointerArithmeticRedundantCheck]\n", errout_str());
 
-        check("int* f8() { int *x = NULL; return --x; }");
+        check("int* f8() { int *x = NULL; return --x; }\n");
         ASSERT_EQUALS("[test.cpp:1:35]: (error) Overflow in pointer arithmetic, NULL pointer is subtracted. [nullPointerArithmetic]\n", errout_str());
 
-        check("int* f9() { int *x = NULL; return x--; }");
+        check("int* f9() { int *x = NULL; return x--; }\n");
         ASSERT_EQUALS("[test.cpp:1:36]: (error) Overflow in pointer arithmetic, NULL pointer is subtracted. [nullPointerArithmetic]\n", errout_str());
     }
 
@@ -4556,48 +4877,48 @@ class TestNullPointer : public TestFixture {
         check("void foo(char *s) {\n"
               "  char * p = s + 20;\n"
               "}\n"
-              "void bar() { foo(0); }");
+              "void bar() { foo(0); }\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (error) Pointer addition with NULL pointer. [nullPointerArithmetic]\n", errout_str());
 
         check("void foo(char *s) {\n"
               "  if (!s) {}\n"
               "  char * p = s + 20;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7] -> [test.cpp:3:16]: (warning) Either the condition '!s' is redundant or there is pointer arithmetic with NULL pointer. [nullPointerArithmeticRedundantCheck]\n", errout_str());
 
         check("void foo(char *s) {\n"
               "  char * p = 20 + s;\n"
               "}\n"
-              "void bar() { foo(0); }");
+              "void bar() { foo(0); }\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (error) Pointer addition with NULL pointer. [nullPointerArithmetic]\n", errout_str());
 
         check("void foo(char *s) {\n"
               "  if (!s) {}\n"
               "  char * p = 20 + s;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7] -> [test.cpp:3:17]: (warning) Either the condition '!s' is redundant or there is pointer arithmetic with NULL pointer. [nullPointerArithmeticRedundantCheck]\n", errout_str());
 
         check("void foo(char *s) {\n"
               "  s += 20;\n"
               "}\n"
-              "void bar() { foo(0); }");
+              "void bar() { foo(0); }\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (error) Pointer addition with NULL pointer. [nullPointerArithmetic]\n", errout_str());
 
         check("void foo(char *s) {\n"
               "  if (!s) {}\n"
               "  s += 20;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7] -> [test.cpp:3:5]: (warning) Either the condition '!s' is redundant or there is pointer arithmetic with NULL pointer. [nullPointerArithmeticRedundantCheck]\n", errout_str());
 
-        check("int* f7() { int *x = NULL; return ++x; }");
+        check("int* f7() { int *x = NULL; return ++x; }\n");
         ASSERT_EQUALS("[test.cpp:1:35]: (error) Pointer addition with NULL pointer. [nullPointerArithmetic]\n", errout_str());
 
-        check("int* f10() { int *x = NULL; return x++; }");
+        check("int* f10() { int *x = NULL; return x++; }\n");
         ASSERT_EQUALS("[test.cpp:1:37]: (error) Pointer addition with NULL pointer. [nullPointerArithmetic]\n", errout_str());
 
         check("class foo {};\n"
               "const char* get() const { return 0; }\n"
-              "void f(foo x) { if (get()) x += get(); }");
+              "void f(foo x) { if (get()) x += get(); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("typedef struct { uint8_t* buf, *buf_end; } S;\n" // #11117
@@ -4613,7 +4934,7 @@ class TestNullPointer : public TestFixture {
     }
 
     void isPointerDeRefFunctionDecl() {
-        check("const char** get() { return 0; }");
+        check("const char** get() { return 0; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4624,11 +4945,11 @@ class TestNullPointer : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
+        const CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
 
-        // Check code..
-        std::list<Check::FileInfo*> fileInfo;
-        Check& c = getCheck<CheckNullPointer>();
+        CheckNullPointer check;
+        Check& c = getCheck(check);
+        std::list<const Check::FileInfo*> fileInfo;
         fileInfo.push_back(c.getFileInfo(tokenizer, settings, ""));
         c.analyseWholeProgram(*ctu, fileInfo, settings, *this); // TODO: check result
         while (!fileInfo.empty()) {
@@ -4647,7 +4968,7 @@ class TestNullPointer : public TestFixture {
             "int main() {\n"
             "  int *p = 0;\n"
             "  f(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: error: Null pointer dereference: fp [ctunullpointer]\n"
                       "[test.cpp:5:12]: note: Assignment 'p=0', assigned value is 0\n"
                       "[test.cpp:6:4]: note: Calling function f, 1st argument is null\n"
@@ -4657,7 +4978,7 @@ class TestNullPointer : public TestFixture {
             "void call(int x, int *p) { x++; use(p); }\n"
             "int main() {\n"
             "  call(4,0);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:1:25]: error: Null pointer dereference: p [ctunullpointer]\n"
                       "[test.cpp:4:7]: note: Calling function call, 2nd argument is null\n"
                       "[test.cpp:2:33]: note: Calling function use, 1st argument is null\n"
@@ -4671,7 +4992,7 @@ class TestNullPointer : public TestFixture {
             "\n"
             "void f() {\n"
             "  dostuff(a, 0);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         ctu("void dostuff(int *x, int *y) {\n"
@@ -4682,7 +5003,7 @@ class TestNullPointer : public TestFixture {
             "\n"
             "void f() {\n"
             "  dostuff(a, 0);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // else
@@ -4693,7 +5014,7 @@ class TestNullPointer : public TestFixture {
             "\n"
             "void f() {\n"
             "  dostuff(0, 0);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ?, &&, ||
@@ -4703,14 +5024,14 @@ class TestNullPointer : public TestFixture {
             "\n"
             "void f() {\n"
             "  dostuff(0, 0);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         ctu("void g(int* x) { *x; }\n"
             "void f(int* x) {\n"
             "    if (x)\n"
             "        g(x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         ctu("size_t f(int* p) {\n"
@@ -4758,6 +5079,15 @@ class TestNullPointer : public TestFixture {
                       "[test.cpp:5:20]: note: Assignment 'f=fopen(notexist,t)', assigned value is 0\n"
                       "[test.cpp:6:8]: note: Calling function foo, 1st argument is null\n"
                       "[test.cpp:2:13]: note: Dereferencing argument f that is null\n", errout_str());
+
+        ctu("void g(std::optional<int>& o) {\n" // #14728
+            "    *o = 1;\n"
+            "}\n"
+            "void f() {\n"
+            "    std::optional<int> x = 0;\n"
+            "    g(x);\n"
+            "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 };
 
diff --git a/test/testoptions.cpp b/test/testoptions.cpp
index 7c72b2de336..af164fb43cc 100644
--- a/test/testoptions.cpp
+++ b/test/testoptions.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,9 +35,8 @@ class TestOptions : public TestFixture {
         TEST_CASE(which_test);
         TEST_CASE(which_test_method);
         TEST_CASE(no_test_method);
-        TEST_CASE(not_quiet);
+        TEST_CASE(defaults);
         TEST_CASE(quiet);
-        TEST_CASE(not_help);
         TEST_CASE(help);
         TEST_CASE(help_long);
         TEST_CASE(multiple_testcases);
@@ -45,54 +44,65 @@ class TestOptions : public TestFixture {
         TEST_CASE(invalid_switches);
         TEST_CASE(summary);
         TEST_CASE(dry_run);
+        TEST_CASE(exclude_tests);
+        TEST_CASE(timer_results);
     }
 
 
     void which_test() const {
         const char* argv[] = {"./test_runner", "TestClass"};
         options args(getArrayLength(argv), argv);
-        ASSERT(std::set<std::string> {"TestClass"} == args.which_test());
+        const std::map<std::string, std::set<std::string>> expected{
+            { "TestClass", {} }
+        };
+        ASSERT(expected == args.which_tests());
+        ASSERT(args.errors().empty());
     }
 
 
     void which_test_method() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod"};
         options args(getArrayLength(argv), argv);
-        ASSERT(std::set<std::string> {"TestClass::TestMethod"} == args.which_test());
+        const std::map<std::string, std::set<std::string>> expected{
+            { "TestClass", {"TestMethod"} }
+        };
+        ASSERT(expected == args.which_tests());
+        ASSERT(args.errors().empty());
     }
 
 
     void no_test_method() const {
         const char* argv[] = {"./test_runner"};
         options args(getArrayLength(argv), argv);
-        ASSERT(std::set<std::string> {""} == args.which_test());
+        const std::map<std::string, std::set<std::string>> expected{};
+        ASSERT(expected == args.which_tests());
+        ASSERT(args.errors().empty());
     }
 
 
-    void not_quiet() const {
-        const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-v"};
+    void defaults() const {
+        const char* argv[] = {"./test_runner", "TestClass::TestMethod"};
         options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(false, args.quiet());
+        ASSERT_EQUALS(false, args.help());
+        ASSERT_EQUALS(true, args.summary());
+        ASSERT_EQUALS(false, args.dry_run());
+        ASSERT_EQUALS(false, args.exclude_tests());
+        ASSERT(args.errors().empty());
     }
 
-
     void quiet() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-q"};
         options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(true, args.quiet());
+        ASSERT(args.errors().empty());
     }
 
-    void not_help() const {
-        const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-v"};
-        options args(getArrayLength(argv), argv);
-        ASSERT_EQUALS(false, args.help());
-    }
-
-
     void help() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-h"};
         options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(true, args.help());
+        ASSERT(args.errors().empty());
     }
 
 
@@ -100,40 +110,69 @@ class TestOptions : public TestFixture {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "--help"};
         options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(true, args.help());
+        ASSERT(args.errors().empty());
     }
 
     void multiple_testcases() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "TestClass::AnotherTestMethod"};
         options args(getArrayLength(argv), argv);
-        std::set<std::string> expected {"TestClass::TestMethod", "TestClass::AnotherTestMethod"};
-        ASSERT(expected == args.which_test());
+        const std::map<std::string, std::set<std::string>> expected{
+            { "TestClass", { "TestMethod", "AnotherTestMethod" } }
+        };
+        ASSERT(expected == args.which_tests());
+        ASSERT(args.errors().empty());
     }
 
     void multiple_testcases_ignore_duplicates() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "TestClass"};
         options args(getArrayLength(argv), argv);
-        std::set<std::string> expected {"TestClass"};
-        ASSERT(expected == args.which_test());
+        const std::map<std::string, std::set<std::string>> expected{
+            { "TestClass", {} }
+        };
+        ASSERT(expected == args.which_tests());
+        ASSERT(args.errors().empty());
     }
 
     void invalid_switches() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-a", "-v", "-q"};
         options args(getArrayLength(argv), argv);
-        std::set<std::string> expected {"TestClass::TestMethod"};
-        ASSERT(expected == args.which_test());
+        const std::map<std::string, std::set<std::string>> expected {
+            { "TestClass", { "TestMethod" } }
+        };
+        ASSERT(expected == args.which_tests());
         ASSERT_EQUALS(true, args.quiet());
+        ASSERT_EQUALS(2, args.errors().size());
+        auto it = args.errors().cbegin();
+        ASSERT_EQUALS("unknown option '-a'", *it);
+        ++it;
+        ASSERT_EQUALS("unknown option '-v'", *it);
     }
 
     void summary() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-n"};
         options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(false, args.summary());
+        ASSERT(args.errors().empty());
     }
 
     void dry_run() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-d"};
         options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(true, args.dry_run());
+        ASSERT(args.errors().empty());
+    }
+
+    void exclude_tests() const {
+        const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-x"};
+        options args(getArrayLength(argv), argv);
+        ASSERT_EQUALS(true, args.exclude_tests());
+        ASSERT(args.errors().empty());
+    }
+
+    void timer_results() const {
+        const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-t"};
+        options args(getArrayLength(argv), argv);
+        ASSERT(!!args.timer_results());
     }
 };
 
diff --git a/test/testother.cpp b/test/testother.cpp
index 50581a332c5..6908ce4b282 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -76,6 +76,7 @@ class TestOther : public TestFixture {
         TEST_CASE(zeroDiv22);
 
         TEST_CASE(zeroDivCond); // division by zero / useless condition
+        TEST_CASE(zeroDivErrorPath);
 
         TEST_CASE(nanInArithmeticExpression);
 
@@ -121,6 +122,9 @@ class TestOther : public TestFixture {
         TEST_CASE(varScope41);      // #11845
         TEST_CASE(varScope42);
         TEST_CASE(varScope43);
+        TEST_CASE(varScope44);
+        TEST_CASE(varScope45);
+        TEST_CASE(varScope46);
 
         TEST_CASE(oldStylePointerCast);
         TEST_CASE(intToPointerCast);
@@ -139,6 +143,7 @@ class TestOther : public TestFixture {
         TEST_CASE(switchRedundantOperationTest);
         TEST_CASE(switchRedundantBitwiseOperationTest);
         TEST_CASE(unreachableCode);
+        TEST_CASE(unreachableSwitchCase); // #8442
         TEST_CASE(redundantContinue);
 
         TEST_CASE(suspiciousCase);
@@ -196,6 +201,10 @@ class TestOther : public TestFixture {
         TEST_CASE(duplicateExpression17); // #12036
         TEST_CASE(duplicateExpression18);
         TEST_CASE(duplicateExpression19);
+        TEST_CASE(duplicateExpression20);
+        TEST_CASE(duplicateExpression21);
+        TEST_CASE(duplicateExpression22);
+        TEST_CASE(duplicateExpression23); // #12282
         TEST_CASE(duplicateExpressionLoop);
         TEST_CASE(duplicateValueTernary);
         TEST_CASE(duplicateValueTernarySizeof); // #13773
@@ -222,6 +231,7 @@ class TestOther : public TestFixture {
         TEST_CASE(checkRedundantCopy);
 
         TEST_CASE(checkNegativeShift);
+        TEST_CASE(checkNegativeShiftErrorPath);
 
         TEST_CASE(incompleteArrayFill);
 
@@ -260,6 +270,7 @@ class TestOther : public TestFixture {
         TEST_CASE(testUnusedLabel);
         TEST_CASE(testUnusedLabelConfiguration);
         TEST_CASE(testUnusedLabelSwitchConfiguration);
+        TEST_CASE(testUnusedLabelPremiumMisra);
 
         TEST_CASE(testEvaluationOrder);
         TEST_CASE(testEvaluationOrderSelfAssignment);
@@ -299,6 +310,8 @@ class TestOther : public TestFixture {
         TEST_CASE(moveForRange);
         TEST_CASE(moveTernary);
         TEST_CASE(movePointerAlias);
+        TEST_CASE(moveOutparam);
+        TEST_CASE(moveTryEmplace);
 
         TEST_CASE(funcArgNamesDifferent);
         TEST_CASE(funcArgOrderDifferent);
@@ -351,10 +364,6 @@ class TestOther : public TestFixture {
         }
         else {
             settings = opt.settings;
-            settings->severity.enable(Severity::style);
-            settings->severity.enable(Severity::warning);
-            settings->severity.enable(Severity::portability);
-            settings->severity.enable(Severity::performance);
         }
         settings->certainty.setEnabled(Certainty::inconclusive, opt.inconclusive);
         settings->verbose = opt.verbose;
@@ -363,8 +372,8 @@ class TestOther : public TestFixture {
         SimpleTokenizer tokenizer(*settings, *this, opt.cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckOther>(tokenizer, this);
+        CheckOther check;
+        runChecks(check, tokenizer, *this);
     }
 
     struct CheckPOptions
@@ -380,8 +389,8 @@ class TestOther : public TestFixture {
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check..
-        runChecks<CheckOther>(tokenizer, this);
+        CheckOther check;
+        runChecks(check, tokenizer, *this);
     }
 
     template<size_t size>
@@ -393,7 +402,7 @@ class TestOther : public TestFixture {
 
     void emptyBrackets() {
         check("{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -401,22 +410,22 @@ class TestOther : public TestFixture {
     void zeroDiv1() { // floating point division by zero => no error
         check("void foo() {\n"
               "    cout << 1. / 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    cout << 42 / (double)0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    cout << 42 / (float)0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    cout << 42 / (int)0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
@@ -429,34 +438,34 @@ class TestOther : public TestFixture {
               "        sum += i;\n"
               "    }\n"
               "    cout<<b/sum;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void zeroDiv3() {
         check("int foo(int i) {\n"
               "    return i / 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("int foo(int i) {\n"
               "    return i % 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("void foo(int& i) {\n"
               "    i /= 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("void foo(int& i) {\n"
               "    i %= 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("uint8_t foo(uint8_t i) {\n"
               "    return i / 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
@@ -464,40 +473,40 @@ class TestOther : public TestFixture {
         check("void f()\n"
               "{\n"
               "   long a = b / 0x6;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "   long a = b / 0x0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(long b)\n"
               "{\n"
               "   long a = b / 0x0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "   long a = b / 0L;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(long b)\n"
               "{\n"
               "   long a = b / 0L;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "   long a = b / 0ul;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(long b)\n"
               "{\n"
               "   long a = b / 0ul;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         // Don't warn about floating points (gcc doesn't warn either)
@@ -505,13 +514,13 @@ class TestOther : public TestFixture {
         check("void f()\n"
               "{\n"
               "   long a = b / 0.0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "   long a = b / 0.5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -519,12 +528,12 @@ class TestOther : public TestFixture {
         check("void f()\n"
               "{ { {\n"
               "   long a = b / 0;\n"
-              "} } }");
+              "} } }\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(long b)\n"
               "{ { {\n"
               "   long a = b / 0;\n"
-              "} } }");
+              "} } }\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
@@ -532,12 +541,12 @@ class TestOther : public TestFixture {
         check("void f()\n"
               "{ { {\n"
               "   int a = b % 0;\n"
-              "} } }");
+              "} } }\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(int b)\n"
               "{ { {\n"
               "   int a = b % 0;\n"
-              "} } }");
+              "} } }\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
@@ -546,12 +555,12 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "  int a = x/2*3/0;\n"
               "  int b = y/2*3%0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(int x, int y) {\n"
               "  int a = x/2*3/0;\n"
               "  int b = y/2*3%0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (error) Division by zero. [zerodiv]\n"
                       "[test.cpp:3:16]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
@@ -562,7 +571,7 @@ class TestOther : public TestFixture {
               "  int a = 0;\n"
               "  do_something(a);\n"
               "  return 4 / a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error, inconclusive) Division by zero. [zerodiv]\n", errout_str());
     }
 
@@ -576,7 +585,7 @@ class TestOther : public TestFixture {
               "       sal_Int32 nIntervalCount = static_cast< sal_Int32 >(fStepMain / fStepHelp);\n"
               "    }\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -587,7 +596,7 @@ class TestOther : public TestFixture {
               "    << boost::format(\" %d :: %s <> %s\") % 0 % \"a\" % \"b\"\n"
               "    << std::endl;\n"
               "  return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -595,13 +604,13 @@ class TestOther : public TestFixture {
         check("void f(int a) {\n"
               "  int res = (a+2)/0;\n"
               "  int res = (a*2)/0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (error) Division by zero. [zerodiv]\n"
                       "[test.cpp:3:18]: (error) Division by zero. [zerodiv]\n", errout_str());
         check("void f() {\n"
               "  int res = (a+2)/0;\n"
               "  int res = (a*2)/0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -609,7 +618,7 @@ class TestOther : public TestFixture {
         // #8141
         check("intmax_t f() {\n"
               "  return 1 / imaxabs(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
     void zeroDiv13() {
@@ -704,7 +713,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    uint16_t x = 0xFFFFU;\n" // UINT16_MAX=0xFFFF
               "    return 42/(++x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
@@ -731,25 +740,25 @@ class TestOther : public TestFixture {
         check("void f(unsigned int x) {\n"
               "  int y = 17 / x;\n"
               "  if (x > 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:2:14]: (warning) Either the condition 'x>0' is redundant or there is division by zero at line 2. [zerodivcond]\n", errout_str());
 
         check("void f(unsigned int x) {\n"
               "  int y = 17 / x;\n"
               "  if (x >= 1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:2:14]: (warning) Either the condition 'x>=1' is redundant or there is division by zero at line 2. [zerodivcond]\n", errout_str());
 
         check("void f(int x) {\n"
               "  int y = 17 / x;\n"
               "  if (x == 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:2:14]: (warning) Either the condition 'x==0' is redundant or there is division by zero at line 2. [zerodivcond]\n", errout_str());
 
         check("void f(unsigned int x) {\n"
               "  int y = 17 / x;\n"
               "  if (x != 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:2:14]: (warning) Either the condition 'x!=0' is redundant or there is division by zero at line 2. [zerodivcond]\n", errout_str());
 
         // function call
@@ -757,7 +766,7 @@ class TestOther : public TestFixture {
               "void f2(unsigned int y) {\n"
               "    f1(123,y);\n"
               "    if (y>0){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:10] -> [test.cpp:1:28]: (warning) Either the condition 'y>0' is redundant or there is division by zero at line 1. [zerodivcond]\n",
             errout_str());
@@ -768,7 +777,7 @@ class TestOther : public TestFixture {
               "  int y = 17 / x;\n"
               "  x = some+calculation;\n"
               "  if (x != 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -779,7 +788,7 @@ class TestOther : public TestFixture {
                   "  int y = 17 / x;\n"
                   "  do_something();\n"
                   "  if (x != 0) {}\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
 
             // function is called. but don't care, variable is local
@@ -789,7 +798,7 @@ class TestOther : public TestFixture {
                   "  int y = 17 / x;\n"
                   "  do_something();\n"
                   "  if (x != 0) {}\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("[test.cpp:6:9] -> [test.cpp:4:14]: (warning) Either the condition 'x!=0' is redundant or there is division by zero at line 4. [zerodivcond]\n", errout_str());
         }
 
@@ -797,14 +806,14 @@ class TestOther : public TestFixture {
               "void f(int x) {\n"
               "  int y = 17 / x;\n"
               "  do_something(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int x;\n"
               "void f() {\n"
               "  int y = 17 / x;\n"
               "  while (y || x == 0) { x--; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket 5033 segmentation fault (valid code) in CheckOther::checkZeroDivisionOrUselessCondition
@@ -813,33 +822,33 @@ class TestOther : public TestFixture {
               "double* p2= new double[1];\n"
               "double* p3= new double[1];\n"
               "double* pp[3] = {p1,p2,p3};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5105 - FP
         check("int f(int a, int b) {\n"
               "  int r = a / b;\n"
               "  if (func(b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown types for b and c --> do not warn
         check("int f(int d) {\n"
               "  int r = (a?b:c) / d;\n"
               "  if (d == 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int a) {\n"
               "  int r = a ? 1 / a : 0;\n"
               "  if (a == 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int a) {\n"
               "  int r = (a == 0) ? 0 : 1 / a;\n"
               "  if (a == 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int g();\n"
@@ -849,7 +858,7 @@ class TestOther : public TestFixture {
               "  else if (x > 0) {}\n"
               "  else\n"
               "    a = b / -x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -891,40 +900,73 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void zeroDivErrorPath() {
+        setMultiline();
+        Settings s = settings0;
+        s.templateLocation = "{file}:{line}:note:{info}\n";
+
+        check("int f1(int i, bool b) {\n"
+              "    int j = b ? i : 0;\n"
+              "    return 1 / j;\n"
+              "}\n"
+              "int f2(int i, bool b) {\n"
+              "    int j = b ? 0 : i;\n"
+              "    return 1 / j;\n"
+              "}\n"
+              "int f3(int i, bool b) {\n"
+              "    int j = 1;\n"
+              "    if (b)\n"
+              "        j = 0;\n"
+              "    return 1 / j;\n"
+              "}\n", dinit(CheckOptions, $.settings = &s));
+        ASSERT_EQUALS("[test.cpp:3:14]: warning: Division by zero. [zerodivcond]\n"
+                      "[test.cpp:2:13]: note: Assuming condition 'b' is false\n"
+                      "[test.cpp:2:15]: note: Assignment 'j=b?i:0', assigned value is 0\n"
+                      "[test.cpp:3:14]: note: Division by zero\n"
+                      "[test.cpp:7:14]: warning: Division by zero. [zerodivcond]\n"
+                      "[test.cpp:6:13]: note: Assuming condition 'b' is true\n"
+                      "[test.cpp:6:15]: note: Assignment 'j=b?0:i', assigned value is 0\n"
+                      "[test.cpp:7:14]: note: Division by zero\n"
+                      "[test.cpp:13:14]: warning: Division by zero. [zerodivcond]\n"
+                      "[test.cpp:12:13]: note: Assignment 'j=0', assigned value is 0\n"
+                      "[test.cpp:11:9]: note: Assuming condition is true\n"
+                      "[test.cpp:13:14]: note: Division by zero\n", errout_str());
+    }
+
     void nanInArithmeticExpression() {
         check("void f()\n"
               "{\n"
               "   double x = 3.0 / 0.0 + 1.0;\n"
               "   printf(\"%f\", x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (style) Using NaN/Inf in a computation. [nanInArithmeticExpression]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "   double x = 3.0 / 0.0 - 1.0;\n"
               "   printf(\"%f\", x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (style) Using NaN/Inf in a computation. [nanInArithmeticExpression]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "   double x = 1.0 + 3.0 / 0.0;\n"
               "   printf(\"%f\", x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25]: (style) Using NaN/Inf in a computation. [nanInArithmeticExpression]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "   double x = 1.0 - 3.0 / 0.0;\n"
               "   printf(\"%f\", x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25]: (style) Using NaN/Inf in a computation. [nanInArithmeticExpression]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "   double x = 3.0 / 0.0;\n"
               "   printf(\"%f\", x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
     }
@@ -955,7 +997,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "\n"
               "    return 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -965,7 +1007,7 @@ class TestOther : public TestFixture {
               "    Error e;\n"
               "    e.SetValue(12);\n"
               "    throw e;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -979,7 +1021,7 @@ class TestOther : public TestFixture {
               "        p = &i;\n"
               "    }\n"
               "    *p = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -987,7 +1029,7 @@ class TestOther : public TestFixture {
         check("void foo()\n"
               "{\n"
               "    int i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -998,7 +1040,7 @@ class TestOther : public TestFixture {
               "    if (x) {\n"
               "        for ( ; i < 10; ++i) ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) The scope of the variable 'i' can be reduced. [variableScope]\n", errout_str());
 
         check("void f(int x) {\n"
@@ -1006,7 +1048,7 @@ class TestOther : public TestFixture {
               "    if (x) {\n"
               "        for ( ; i < 10; ++i) ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x)\n"
@@ -1016,7 +1058,7 @@ class TestOther : public TestFixture {
               "    else {\n"
               "        for ( ; i < 10; ++i) ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) The scope of the variable 'i' can be reduced. [variableScope]\n", errout_str());
     }
 
@@ -1030,7 +1072,7 @@ class TestOther : public TestFixture {
               "    if (b) {\n"
               "        c(i);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #5398
@@ -1039,14 +1081,14 @@ class TestOther : public TestFixture {
               "    if (success) {\n"
               "        foo(notReducable);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(Test &test) {\n"
               "  int& x = test.getData();\n"
               "  if (test.process())\n"
               "    x = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -1061,7 +1103,7 @@ class TestOther : public TestFixture {
               "  return 0;\n"
               " }\n"
               "}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int &x)\n"
@@ -1072,7 +1114,7 @@ class TestOther : public TestFixture {
               "    ++n;\n"
               "    ++x;\n"
               "  } while (x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1084,7 +1126,7 @@ class TestOther : public TestFixture {
               "    if (x) {\n"
               "        y++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1095,7 +1137,7 @@ class TestOther : public TestFixture {
               "    BOOST_FOREACH(int edge, edges) {\n"
               "        edgeResistance = (edge+1) / 2.0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) The scope of the variable 'edgeResistance' can be reduced. [variableScope]\n", errout_str());
     }
 
@@ -1111,7 +1153,7 @@ class TestOther : public TestFixture {
               "    if (a == 2) {\n"
               "        f.x();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class fred {\n" // #2062
@@ -1123,7 +1165,7 @@ class TestOther : public TestFixture {
               "    if (a == 2) {\n"
               "        f.x();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:10]: (style) The scope of the variable 'f' can be reduced. [variableScope]\n", errout_str());
 
         check("struct S { int a, b; };\n"
@@ -1144,7 +1186,7 @@ class TestOther : public TestFixture {
               "    FOR {\n"
               "        foo(x++);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1152,21 +1194,21 @@ class TestOther : public TestFixture {
         check("int f() {\n"
               "    int x = 0;\n"
               "    AB ab = { x, 0 };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    int x = 0;\n"
               "    if (a == 0) { ++x; }\n"
               "    AB ab = { x, 0 };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    int x = 0;\n"
               "    if (a == 0) { ++x; }\n"
               "    if (a == 1) { AB ab = { x, 0 }; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1177,7 +1219,7 @@ class TestOther : public TestFixture {
               "    if (x)\n"
               "        foo(i);\n"
               "    foo(j);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'i' can be reduced. [variableScope]\n", errout_str());
 
         check("void f(int x) {\n"
@@ -1186,7 +1228,7 @@ class TestOther : public TestFixture {
               "    if (x)\n"
               "        j = i;\n"
               "    foo(j);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
@@ -1194,7 +1236,7 @@ class TestOther : public TestFixture {
               "    x++;\n"
               "    if (x == 5)\n"
               "        foo(b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
@@ -1202,7 +1244,7 @@ class TestOther : public TestFixture {
               "    x++;\n"
               "    if (x == 5)\n"
               "        foo(b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1213,7 +1255,7 @@ class TestOther : public TestFixture {
               "    forever {\n"
               "        if (i++ == 42) { break; }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1224,7 +1266,7 @@ class TestOther : public TestFixture {
               "    if(a) {\n"
               "        for ( ; i < 10; ++i) ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1236,7 +1278,7 @@ class TestOther : public TestFixture {
               "    else if(b);\n"
               "    else if(c);\n"
               "    else;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1246,7 +1288,7 @@ class TestOther : public TestFixture {
               "    while((++a) < 56) {\n"
               "        foo();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -1254,7 +1296,7 @@ class TestOther : public TestFixture {
               "    do {\n"
               "        foo();\n"
               "    } while((++a) < 56);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -1263,7 +1305,7 @@ class TestOther : public TestFixture {
               "        a = 64;\n"
               "        foo(a);\n"
               "    } while((++a) < 56);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -1272,7 +1314,7 @@ class TestOther : public TestFixture {
               "        a = 64;\n"
               "        foo(a);\n"
               "    } while(z());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'a' can be reduced. [variableScope]\n", errout_str());
     }
 
@@ -1283,7 +1325,7 @@ class TestOther : public TestFixture {
               "        x = stuff(x);\n"
               "        morestuff(x);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
 
         check("void f() {\n"
@@ -1293,7 +1335,7 @@ class TestOther : public TestFixture {
               "        morestuff(x);\n"
               "    }\n"
               "    if (b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
     }
 
@@ -1313,7 +1355,7 @@ class TestOther : public TestFixture {
               "        x = foo();\n"
               "        do_something(x);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
 
         check("void f() {\n"
@@ -1332,7 +1374,7 @@ class TestOther : public TestFixture {
               "        x = foo();\n"
               "        do_something(x);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -1347,7 +1389,7 @@ class TestOther : public TestFixture {
               "        default:\n"
               "            break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
 
         check("void f() {\n"
@@ -1364,7 +1406,7 @@ class TestOther : public TestFixture {
               "                do_something(x);\n"
               "            break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1374,7 +1416,7 @@ class TestOther : public TestFixture {
               "  int b = a;\n"
               "  if (b > 32) b = x;\n"
               "  return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1383,7 +1425,7 @@ class TestOther : public TestFixture {
               "    int test_value = 3;\n"
               "    int test_array[1][1] = { { test_value } };\n"
               "    return sizeof(test_array);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1396,7 +1438,7 @@ class TestOther : public TestFixture {
               "      ++p;\n"
               "      ++i;\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         // try to avoid an obvious false negative after applying the fix for the example above:
         check("void foo() {\n"
@@ -1409,7 +1451,7 @@ class TestOther : public TestFixture {
               "      ++p;\n"
               "      ++i;\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'p' can be reduced. [variableScope]\n", errout_str());
     }
 
@@ -1419,7 +1461,7 @@ class TestOther : public TestFixture {
               "   Test myTest([&](size_t aX){\n"
               "       std::cout << myCounter += aX << std::endl;\n"
               "   });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1429,7 +1471,7 @@ class TestOther : public TestFixture {
               "   if (cond) {\n"
               "       r.dostuff();\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'r' can be reduced. [variableScope]\n", errout_str());
 
         check("void f(Foo x) {\n"
@@ -1437,7 +1479,7 @@ class TestOther : public TestFixture {
               "   if (cond) {\n"
               "       foo.dostuff();\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1448,7 +1490,7 @@ class TestOther : public TestFixture {
               "        currtime = time(&dummy);\n"
               "        if (currtime > t) {}\n"
               "    }\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:2:12]: (style) The scope of the variable 'currtime' can be reduced. [variableScope]\n", errout_str());
     }
 
@@ -1460,7 +1502,7 @@ class TestOther : public TestFixture {
               "       if (cond2) { dostuff(key); }\n"
               "     }\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1470,7 +1512,7 @@ class TestOther : public TestFixture {
                "#ifdef X\n"
                "#endif\n"
                "  if (id == ABC) { return x; }\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkP("void f() {\n"
@@ -1478,7 +1520,7 @@ class TestOther : public TestFixture {
                "#endif\n"
                "  int x = 0;\n"
                "  if (id == ABC) { return x; }\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
     }
 
@@ -1512,7 +1554,7 @@ class TestOther : public TestFixture {
               "        s = \"abc\";\n"
               "        g(s);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) The scope of the variable 's' can be reduced. [variableScope]\n", errout_str());
 
         check("auto foo(std::vector<int>& vec, bool flag) {\n"
@@ -1525,7 +1567,7 @@ class TestOther : public TestFixture {
               "        iter = dummy.begin();\n"
               "    }\n"
               "    return *iter;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:28]: (style) Parameter 'vec' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("auto& foo(std::vector<int>& vec, bool flag) {\n"
@@ -1538,7 +1580,7 @@ class TestOther : public TestFixture {
               "        iter = dummy.begin();\n"
               "    }\n"
               "    return *iter;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1791,7 +1833,7 @@ class TestOther : public TestFixture {
 
     void varScope39() {
         check("struct S {\n" // #12405
-              "    void f(const std::string&) const;\n"
+              "    void f(const std::string& s) const;\n"
               "    const int* g(std::string&) const;\n"
               "};\n"
               "void h(int);\n"
@@ -1947,6 +1989,100 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("[test.cpp:3:12]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
     }
 
+    void varScope44() { // #14496
+        check("char* f() {\n"
+              "    char* p = nullptr;\n"
+              "    {\n"
+              "        p = strdup(\"abc\");\n"
+              "        if (p) {\n"
+              "            return p;\n"
+              "        }\n"
+              "    }\n"
+              "    return nullptr;\n"
+              "}\n"
+              "char* g() {\n"
+              "    char* q = NULL;\n"
+              "    {\n"
+              "        q = strdup(\"abc\");\n"
+              "        if (q) {\n"
+              "            return q;\n"
+              "        }\n"
+              "    }\n"
+              "    return nullptr;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) The scope of the variable 'p' can be reduced. [variableScope]\n"
+                      "[test.cpp:12:11]: (style) The scope of the variable 'q' can be reduced. [variableScope]\n",
+                      errout_str());
+    }
+
+    void varScope45() {
+        check("void g(int x, int y) {\n" // #14497
+              "    int a = x, b = y;\n"
+              "    if (a) {}\n"
+              "    else {\n"
+              "        if (b) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:16]: (style) The scope of the variable 'b' can be reduced. [variableScope]\n", errout_str());
+    }
+
+    void varScope46() {
+        check("void f() {\n" // #7091
+              "    int y1;\n"
+              "    for (int i = 0; i < 3; ++i) {\n"
+              "        for(int j = 0; j < 3; ++j) {\n"
+              "                y1 = 2 * 1;\n"
+              "                y1 += 1;\n"
+              "        }\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'y1' can be reduced. [variableScope]\n",
+                      errout_str());
+
+        check("bool f() {\n"
+              "bool b = false;\n"
+              "do {\n"
+              "    switch (g()) {\n"
+              "        case 0:\n"
+              "            b = true;\n"
+              "            break;\n"
+              "        case 1:\n"
+              "            return b;\n"
+              "            break;\n"
+              "        default:\n"
+              "            break;\n"
+              "    }\n"
+              "}\n"
+              "while (true);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    int y1 = 0;\n"
+              "    for (int i = 0; i < 3; ++i) {\n"
+              "        for(int j = 0; j < 3; ++j) {\n"
+              "                y1 = y1 + 1;\n"
+              "                dostuff(y1);\n"
+              "        }\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(int& r) {\n" // #14566
+              "    int i = 0;\n"
+              "    while (g()) {\n"
+              "        {\n"
+              "            if (g()) {\n"
+              "                i = 0;"
+              "                std::swap(i, r);\n"
+              "            }\n"
+              "        }\n"
+              "    }\n"
+              "    use(i);"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
 #define checkOldStylePointerCast(...) checkOldStylePointerCast_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void checkOldStylePointerCast_(const char* file, int line, const char (&code)[size], Standards::cppstd_t std = Standards::CPPLatest) {
@@ -1957,7 +2093,7 @@ class TestOther : public TestFixture {
         SimpleTokenizer tokenizerCpp(settings, *this);
         ASSERT_LOC(tokenizerCpp.tokenize(code), file, line);
 
-        CheckOther checkOtherCpp(&tokenizerCpp, &settings, this);
+        CheckOtherImpl checkOtherCpp(&tokenizerCpp, settings, *this);
         checkOtherCpp.warningOldStylePointerCast();
         checkOtherCpp.warningDangerousTypeCast();
     }
@@ -1968,7 +2104,7 @@ class TestOther : public TestFixture {
                                  "void foo(Base* base)\n"
                                  "{\n"
                                  "    Derived * d = (Derived *) base;\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("[test.cpp:5:19]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base{};\n"
@@ -1976,13 +2112,13 @@ class TestOther : public TestFixture {
                                  "void foo(Derived* derived)\n"
                                  "{\n"
                                  "    Base * b = (Base *) derived;\n" // <- cast from derived to base is safe => cstyleCast
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("[test.cpp:5:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         checkOldStylePointerCast("void foo(Base* base)\n"
                                  "{\n"
                                  "    Derived * d = (Derived *) base;\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base{};\n"
@@ -1990,7 +2126,7 @@ class TestOther : public TestFixture {
                                  "void foo(Base* base)\n"
                                  "{\n"
                                  "    Derived * d = (const Derived *) base;\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("[test.cpp:5:19]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base{};\n"
@@ -1998,7 +2134,7 @@ class TestOther : public TestFixture {
                                  "void foo()\n"
                                  "{\n"
                                  "    Derived * d = (const Derived *) ( new Base() );\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("[test.cpp:5:19]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base{};\n"
@@ -2006,102 +2142,102 @@ class TestOther : public TestFixture {
                                  "void foo()\n"
                                  "{\n"
                                  "    Derived * d = (const Derived *) new Base();\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("[test.cpp:5:19]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base{};\n"
                                  "void foo()\n"
                                  "{\n"
                                  "    Base * b = (Base *) new short[10];\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base;\n"
                                  "void foo()\n"
                                  "{\n"
                                  "    Base * b = (volatile Base *) derived;\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base;\n"
                                  "void foo()\n"
                                  "{\n"
                                  "    Base * b = (volatile Base * const) derived;\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base;\n"
                                  "void foo()\n"
                                  "{\n"
                                  "    Base * b = (const volatile Base *) derived;\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base;\n"
                                  "void foo()\n"
                                  "{\n"
                                  "    Base * b = (const volatile Base * const) derived;\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base;\n"
                                  "void foo()\n"
                                  "{\n"
                                  "    Base * b = (const Base *) ( new Derived() );\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base;\n"
                                  "void foo()\n"
                                  "{\n"
                                  "    Base * b = (const Base *) new Derived();\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base;\n"
                                  "void foo()\n"
                                  "{\n"
                                  "    Base * b = (const Base *) new short[10];\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
 
         checkOldStylePointerCast("class B;\n"
                                  "class A\n"
                                  "{\n"
                                  "  virtual void abc(B *) const = 0;\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOldStylePointerCast("class B;\n"
                                  "class A\n"
                                  "{\n"
                                  "  virtual void abc(const B *) const = 0;\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3630
         checkOldStylePointerCast("class SomeType{};\n"
                                  "class X : public Base {\n"
                                  "    X() : Base((SomeType*)7) {}\n" // <- intToPointerCast
-                                 "};");
+                                 "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOldStylePointerCast("class SomeType{};\n"
                                  "class X : public Base {\n"
                                  "    X() : Base((SomeType*)0x7000) {}\n" // <- it's common in embedded code to cast address
-                                 "};");
+                                 "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOldStylePointerCast("class SomeType;\n"
                                  "class X : public Base {\n"
                                  "    X() : Base((SomeType*)var) {}\n"
-                                 "};");
+                                 "};\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         checkOldStylePointerCast("class SomeType;\n"
                                  "class X : public Base {\n"
                                  "    X() : Base((SomeType*)0) {}\n"
-                                 "};");
+                                 "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5560
@@ -2111,7 +2247,7 @@ class TestOther : public TestFixture {
                                  "{ virtual G* createGui(S*, C*) const = 0; };\n"
                                  "\n"
                                  "class MS : public M\n"
-                                 "{ virtual void addController(C*) override {} };", Standards::CPP03);
+                                 "{ virtual void addController(C*) override {} };\n", Standards::CPP03);
         ASSERT_EQUALS("", errout_str());
 
         // #6164
@@ -2120,7 +2256,7 @@ class TestOther : public TestFixture {
                                  "void testCC() {\n"
                                  "  std::vector<Base*> v;\n"
                                  "  v.push_back((Base*)new Derived);\n"
-                                 "}");
+                                 "}\n");
         // FIXME write a dangerousTypeCast warning instead
         ASSERT_EQUALS("[test.cpp:5:15]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
@@ -2231,6 +2367,11 @@ class TestOther : public TestFixture {
                                  "    return N::f(float_ptr(b.data()));\n" // <- the cast is safe
                                  "}\n");
         ASSERT_EQUALS("[test.cpp:9:17]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
+
+        checkOldStylePointerCast("void f(const T& x) {\n" // #13766
+                                 "    const U& y = (typename const U&)(x);\n"
+                                 "}\n");
+        ASSERT_EQUALS("[test.cpp:2:18]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
     }
 
 #define checkIntToPointerCast(...) checkIntToPointerCast_(__FILE__, __LINE__, __VA_ARGS__)
@@ -2243,27 +2384,30 @@ class TestOther : public TestFixture {
         SimpleTokenizer tokenizerCpp(settings, *this);
         ASSERT_LOC(tokenizerCpp.tokenize(code), file, line);
 
-        CheckOther checkOtherCpp(&tokenizerCpp, &settings, this);
+        CheckOtherImpl checkOtherCpp(&tokenizerCpp, settings, *this);
         checkOtherCpp.warningIntToPointerCast();
     }
 
     void intToPointerCast() {
         // #3630
-        checkIntToPointerCast("uint8_t* ptr = (uint8_t*)7;");
+        checkIntToPointerCast("uint8_t* ptr = (uint8_t*)7;\n");
         ASSERT_EQUALS("[test.cpp:1:16]: (portability) Casting non-zero decimal integer literal to pointer. [intToPointerCast]\n", errout_str());
 
-        checkIntToPointerCast("void* ptr = (void*)7;");
+        checkIntToPointerCast("void* ptr = (void*)7;\n");
         ASSERT_EQUALS("[test.cpp:1:13]: (portability) Casting non-zero decimal integer literal to pointer. [intToPointerCast]\n", errout_str());
 
-        checkIntToPointerCast("uint8_t* ptr = (uint8_t*)0;");
+        checkIntToPointerCast("uint8_t* ptr = (uint8_t*)0;\n");
         ASSERT_EQUALS("", errout_str());
 
-        checkIntToPointerCast("uint8_t* ptr = (uint8_t*)0x7000;"); // <- it's common in embedded code to cast address
+        checkIntToPointerCast("uint8_t* ptr = (uint8_t*)0x7000;\n"); // <- it's common in embedded code to cast address
         ASSERT_EQUALS("", errout_str());
 
         checkIntToPointerCast("struct S { int i; };\n" // #13886, don't crash
-                              "int f() { return sizeof(((struct S*)0)->i); }");
+                              "int f() { return sizeof(((struct S*)0)->i); }\n");
         ASSERT_EQUALS("", errout_str());
+
+        checkIntToPointerCast("auto p = (int*)0b10;\n"); // #14180
+        ASSERT_EQUALS("[test.cpp:1:10]: (portability) Casting non-zero binary integer literal to pointer. [intToPointerCast]\n", errout_str());
     }
 
     struct CheckInvalidPointerCastOptions
@@ -2282,7 +2426,7 @@ class TestOther : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CheckOther checkOtherCpp(&tokenizer, &settings, this);
+        CheckOtherImpl checkOtherCpp(&tokenizer, settings, *this);
         checkOtherCpp.invalidPointerCast();
     }
 
@@ -2292,19 +2436,19 @@ class TestOther : public TestFixture {
                                 "    float *f = new float[10];\n"
                                 "    delete [] (double*)f;\n"
                                 "    delete [] (long double const*)(new float[10]);\n"
-                                "}");
+                                "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (portability) Casting between float * and double * which have an incompatible binary data representation. [invalidPointerCast]\n"
                       "[test.cpp:4:15]: (portability) Casting between float * and const long double * which have an incompatible binary data representation. [invalidPointerCast]\n", errout_str());
 
         checkInvalidPointerCast("void test(const float* f) {\n"
                                 "    double *d = (double*)f;\n"
-                                "}");
+                                "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (portability) Casting between const float * and double * which have an incompatible binary data representation. [invalidPointerCast]\n", errout_str());
 
         checkInvalidPointerCast("void test(double* d1) {\n"
                                 "    long double *ld = (long double*)d1;\n"
                                 "    double *d2 = (double*)ld;\n"
-                                "}");
+                                "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (portability) Casting between double * and long double * which have an incompatible binary data representation. [invalidPointerCast]\n"
                       "[test.cpp:3:18]: (portability) Casting between long double * and double * which have an incompatible binary data representation. [invalidPointerCast]\n", errout_str());
 
@@ -2312,148 +2456,148 @@ class TestOther : public TestFixture {
                                 "    long double *d = (long double*)(i);\n"
                                 "    double *d = (double*)(i);\n"
                                 "    float *f = reinterpret_cast<float*>(i);\n"
-                                "}");
+                                "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (portability) Casting between signed int * and long double * which have an incompatible binary data representation. [invalidPointerCast]\n"
                       "[test.cpp:3:17]: (portability) Casting between signed int * and double * which have an incompatible binary data representation. [invalidPointerCast]\n"
                       "[test.cpp:4:16]: (portability) Casting between signed int * and float * which have an incompatible binary data representation. [invalidPointerCast]\n", errout_str());
 
         checkInvalidPointerCast("float* test(unsigned int* i) {\n"
                                 "    return (float*)i;\n"
-                                "}");
+                                "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (portability) Casting between unsigned int * and float * which have an incompatible binary data representation. [invalidPointerCast]\n", errout_str());
 
         checkInvalidPointerCast("float* test(unsigned int* i) {\n"
                                 "    return (float*)i[0];\n"
-                                "}");
+                                "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInvalidPointerCast("float* test(double& d) {\n"
                                 "    return (float*)&d;\n"
-                                "}");
+                                "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (portability) Casting between double * and float * which have an incompatible binary data representation. [invalidPointerCast]\n", errout_str());
 
         checkInvalidPointerCast("void test(float* data) {\n"
                                 "    f.write((char*)data,sizeof(float));\n"
-                                "}");
+                                "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInvalidPointerCast("void test(float* data) {\n"
                                 "    f.write((char*)data,sizeof(float));\n"
-                                "}", dinit(CheckInvalidPointerCastOptions, $.inconclusive = true)); // #3639
-        ASSERT_EQUALS("[test.cpp:2:13]: (portability, inconclusive) Casting from float * to signed char * is not portable due to different binary data representations on different platforms. [invalidPointerCast]\n", errout_str());
+                                "}\n", dinit(CheckInvalidPointerCastOptions, $.inconclusive = true)); // #3639
+        ASSERT_EQUALS("[test.cpp:2:13]: (portability, inconclusive) Casting from float * to char * is not portable due to different binary data representations on different platforms. [invalidPointerCast]\n", errout_str());
 
 
         checkInvalidPointerCast("long long* test(float* f) {\n"
                                 "    return (long long*)f;\n"
-                                "}", dinit(CheckInvalidPointerCastOptions, $.portability = false));
+                                "}\n", dinit(CheckInvalidPointerCastOptions, $.portability = false));
         ASSERT_EQUALS("", errout_str());
 
         checkInvalidPointerCast("long long* test(float* f, char* c) {\n"
                                 "    foo((long long*)f);\n"
                                 "    return reinterpret_cast<long long*>(c);\n"
-                                "}");
+                                "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (portability) Casting from float * to signed long long * is not portable due to different binary data representations on different platforms. [invalidPointerCast]\n", errout_str());
 
-        checkInvalidPointerCast("Q_DECLARE_METATYPE(int*)"); // #4135 - don't crash
+        checkInvalidPointerCast("Q_DECLARE_METATYPE(int*)\n"); // #4135 - don't crash
     }
 
 
     void passedByValue() {
-        check("void f(const std::string str) {}");
+        check("void f(const std::string str) {}\n");
         ASSERT_EQUALS("[test.cpp:1:26]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("void f(std::unique_ptr<std::string> ptr) {}");
+        check("void f(std::unique_ptr<std::string> ptr) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(const std::shared_ptr<std::string> ptr) {}");
+        check("void f(const std::shared_ptr<std::string> ptr) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(const std::function<F> ptr) {}");
+        check("void f(const std::function<F> ptr) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
-            check("void f(const std::pair<int,int> x) {}");
+            check("void f(const std::pair<int,int> x) {}\n");
             ASSERT_EQUALS("", errout_str());
 
-            check("void f(const std::pair<std::string,std::string> x) {}");
+            check("void f(const std::pair<std::string,std::string> x) {}\n");
             TODO_ASSERT_EQUALS("error", "", errout_str());
         }
 
-        check("void f(const std::string::size_type x) {}");
+        check("void f(const std::string::size_type x) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("class Foo;\nvoid f(const Foo foo) {}"); // Unknown class
+        check("class Foo;\nvoid f(const Foo foo) {}\n"); // Unknown class
         ASSERT_EQUALS("[test.cpp:2:18]: (performance, inconclusive) Function parameter 'foo' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("class Foo { std::vector<int> v; };\nvoid f(const Foo foo) {}"); // Large class (STL member)
+        check("class Foo { std::vector<int> v; };\nvoid f(const Foo foo) {}\n"); // Large class (STL member)
         ASSERT_EQUALS("[test.cpp:2:18]: (performance) Function parameter 'foo' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("class Foo { int i; };\nvoid f(const Foo foo) {}"); // Small class
+        check("class Foo { int i; };\nvoid f(const Foo foo) {}\n"); // Small class
         ASSERT_EQUALS("", errout_str());
 
-        check("class Foo { int i[6]; };\nvoid f(const Foo foo) {}"); // Large class (array)
+        check("class Foo { int i[6]; };\nvoid f(const Foo foo) {}\n"); // Large class (array)
         ASSERT_EQUALS("[test.cpp:2:18]: (performance) Function parameter 'foo' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("class Foo { std::string* s; };\nvoid f(const Foo foo) {}"); // Small class (pointer)
+        check("class Foo { std::string* s; };\nvoid f(const Foo foo) {}\n"); // Small class (pointer)
         ASSERT_EQUALS("", errout_str());
 
-        check("class Foo { static std::string s; };\nvoid f(const Foo foo) {}"); // Small class (static member)
+        check("class Foo { static std::string s; };\nvoid f(const Foo foo) {}\n"); // Small class (static member)
         ASSERT_EQUALS("", errout_str());
 
-        check("class X { std::string s; }; class Foo : X { };\nvoid f(const Foo foo) {}"); // Large class (inherited)
+        check("class X { std::string s; }; class Foo : X { };\nvoid f(const Foo foo) {}\n"); // Large class (inherited)
         ASSERT_EQUALS("[test.cpp:2:18]: (performance) Function parameter 'foo' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("class X { std::string s; }; class Foo { X x; };\nvoid f(const Foo foo) {}"); // Large class (inherited)
+        check("class X { std::string s; }; class Foo { X x; };\nvoid f(const Foo foo) {}\n"); // Large class (inherited)
         ASSERT_EQUALS("[test.cpp:2:18]: (performance) Function parameter 'foo' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("void f(const std::string &str) {}");
+        check("void f(const std::string &str) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // The idiomatic way of passing a std::string_view is by value
-        check("void f(const std::string_view str) {}");
+        check("void f(const std::string_view str) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(std::string_view str) {}");
+        check("void f(std::string_view str) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(const std::string_view &str) {}");
+        check("void f(const std::string_view &str) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(const std::vector<int> v) {}");
+        check("void f(const std::vector<int> v) {}\n");
         ASSERT_EQUALS("[test.cpp:1:31]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("void f(const std::vector<std::string> v) {}");
+        check("void f(const std::vector<std::string> v) {}\n");
         ASSERT_EQUALS("[test.cpp:1:39]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("void f(const std::vector<std::string>::size_type s) {}");
+        check("void f(const std::vector<std::string>::size_type s) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(const std::vector<int> &v) {}");
+        check("void f(const std::vector<int> &v) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(const std::map<int,int> &v) {}");
+        check("void f(const std::map<int,int> &v) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(const std::map<int,int> v) {}");
+        check("void f(const std::map<int,int> v) {}\n");
         ASSERT_EQUALS("[test.cpp:1:32]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("void f(const std::map<std::string,std::string> v) {}");
+        check("void f(const std::map<std::string,std::string> v) {}\n");
         ASSERT_EQUALS("[test.cpp:1:48]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("void f(const std::map<int,std::string> v) {}");
+        check("void f(const std::map<int,std::string> v) {}\n");
         ASSERT_EQUALS("[test.cpp:1:40]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("void f(const std::map<std::string,int> v) {}");
+        check("void f(const std::map<std::string,int> v) {}\n");
         ASSERT_EQUALS("[test.cpp:1:40]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("void f(const std::streamoff pos) {}");
+        check("void f(const std::streamoff pos) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(std::initializer_list<int> i) {}");
+        check("void f(std::initializer_list<int> i) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5824
-        check("void log(const std::string& file, int line, const std::string& function, const std::string str, ...) {}");
+        check("void log(const std::string& file, int line, const std::string& function, const std::string str, ...) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5534
@@ -2462,12 +2606,12 @@ class TestOther : public TestFixture {
               "class Plane {\n"
               "    vec Refract(vec &vec) const;\n"
               "    bool IntersectLinePlane(const vec &planeNormal);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class X {\n"
               "    virtual void func(const std::string str) {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:2:41]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("enum X;\n"
@@ -2484,7 +2628,7 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("", errout_str());
 
         check("enum X;\n"
-              "enum X { a, b, c };"
+              "enum X { a, b, c };\n"
               "void foo(X x4){}\n");
         ASSERT_EQUALS("", errout_str());
 
@@ -2628,6 +2772,26 @@ class TestOther : public TestFixture {
         check("void f(const std::array<int, 10> a[]) {}\n"); // #13524
         ASSERT_EQUALS("", errout_str());
 
+        check("struct S {\n" // #10733
+              "    std::vector<int> v;\n"
+              "    using F = void (*)();\n"
+              "    void func(F f);\n"
+              "};\n"
+              "void S::func(S::F f) {}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("bool f(std::vector<std::vector<int>> v) {\n" // #12136
+              "    if (v.size() != 10U)\n"
+              "        return false;\n"
+              "    for (auto it = v.begin(); it != v.end(); ++it) {\n"
+              "        if (it->size() < 9U)\n"
+              "            return false;\n"
+              "        it->erase(it->begin(), it->begin() + 9U);\n"
+              "    }\n"
+              "    return true;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
         /*const*/ Settings settingsWin64 = settingsBuilder().platform(Platform::Type::Win64).build();
         check("using ui64 = unsigned __int64;\n"
               "ui64 Test(ui64 one, ui64 two) { return one + two; }\n",
@@ -2636,85 +2800,87 @@ class TestOther : public TestFixture {
     }
 
     void passedByValue_nonConst() {
-        check("void f(std::string str) {}");
+        check("void f(std::string str) {}\n");
         ASSERT_EQUALS("[test.cpp:1:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("void f(std::string str) {\n"
               "    return str + x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("void f(std::string str) {\n"
               "    std::cout << str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("void f(std::string str) {\n"
               "    std::cin >> str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string str) {\n"
               "    std::string s2 = str;\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:1:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:17]: (performance, inconclusive) Use const reference for 's2' to avoid unnecessary data copying. [redundantCopyLocalConst]\n"
+                      "[test.cpp:1:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n",
+                      errout_str());
 
         check("void f(std::string str) {\n"
               "    std::string& s2 = str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n"
                       "[test.cpp:2:18]: (style) Variable 's2' can be declared as reference to const [constVariableReference]\n",
                       errout_str());
 
         check("void f(std::string str) {\n"
               "    const std::string& s2 = str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("void f(std::string str) {\n"
               "    str = \"\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string str) {\n"
               "    foo(str);\n" // It could be that foo takes str as non-const-reference
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const std::string& str);\n"
               "void f(std::string str) {\n"
               "    foo(str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("void foo(std::string str);\n"
               "void f(std::string str) {\n"
               "    foo(str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("void foo(std::string& str);\n"
               "void f(std::string str) {\n"
               "    foo(str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(std::string* str);\n"
               "void f(std::string str) {\n"
               "    foo(&str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int& i1, const std::string& str, int& i2);\n"
               "void f(std::string str) {\n"
               "    foo((a+b)*c, str, x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("std::string f(std::string str) {\n"
               "    str += x;\n"
               "    return str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class X {\n"
@@ -2723,7 +2889,7 @@ class TestOther : public TestFixture {
               "};\n"
               "Y f(X x) {\n"
               "    x.func();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:7]: (performance) Function parameter 'x' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("class X {\n"
@@ -2731,17 +2897,17 @@ class TestOther : public TestFixture {
               "};\n"
               "Y f(X x) {\n"
               "    x.func();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class X {\n"
               "    void func(std::string str) {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:2:27]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("class X {\n"
               "    virtual void func(std::string str) {}\n" // Do not warn about virtual functions, if 'str' is not declared as const
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class X {\n"
@@ -2751,7 +2917,7 @@ class TestOther : public TestFixture {
               "    char b;\n"
               "};\n"
               "void f(Y y) {\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:10]: (performance) Function parameter 'y' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("class X {\n"
@@ -2764,7 +2930,7 @@ class TestOther : public TestFixture {
               "    char c;\n"
               "};\n"
               "void f(X x, Y y) {\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:15]: (performance) Function parameter 'y' should be passed by const reference. [passedByValue]\n", errout_str());
 
         {
@@ -2773,13 +2939,13 @@ class TestOther : public TestFixture {
                                 "    uint64_t a;\n"
                                 "    uint64_t b;\n"
                                 "};\n"
-                                "void f(X x) {}";
+                                "void f(X x) {}\n";
 
-            /*const*/ Settings s32 = settingsBuilder(settings0).platform(Platform::Type::Unix32).build();
+            /*const*/ Settings s32 = settingsBuilder(settings1).platform(Platform::Type::Unix32).build();
             check(code, dinit(CheckOptions, $.settings = &s32));
             ASSERT_EQUALS("[test.cpp:5:10]: (performance) Function parameter 'x' should be passed by const reference. [passedByValue]\n", errout_str());
 
-            /*const*/ Settings s64 = settingsBuilder(settings0).platform(Platform::Type::Unix64).build();
+            /*const*/ Settings s64 = settingsBuilder(settings1).platform(Platform::Type::Unix64).build();
             check(code, dinit(CheckOptions, $.settings = &s64));
             ASSERT_EQUALS("", errout_str());
         }
@@ -2788,27 +2954,30 @@ class TestOther : public TestFixture {
               "\n"
               "void foo(Buffer& buffer) {\n"
               "    getWriter()->operator<<(buffer);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void passedByValue_externC() {
-        check("struct X { int a[5]; }; void f(X v) { }");
+        check("struct X { int a[5]; }; void f(X v) { }\n");
         ASSERT_EQUALS("[test.cpp:1:34]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("extern \"C\" { struct X { int a[5]; }; void f(X v) { } }");
+        check("extern \"C\" { struct X { int a[5]; }; void f(X v) { } }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct X { int a[5]; }; extern \"C\" void f(X v) { }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("struct X { int a[5]; }; extern \"C\" void f(X v) { }");
+        check("struct X { int a[5]; }; void f(const X v);\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("struct X { int a[5]; }; void f(const X v);");
+        check("struct X { int a[5]; }; void f(const X v) { (void) v; }\n");
         ASSERT_EQUALS("[test.cpp:1:40]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("extern \"C\" { struct X { int a[5]; }; void f(const X v); }");
+        check("extern \"C\" { struct X { int a[5]; }; void f(const X v); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("struct X { int a[5]; }; extern \"C\" void f(const X v) { }");
+        check("struct X { int a[5]; }; extern \"C\" void f(const X v) { }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2816,140 +2985,140 @@ class TestOther : public TestFixture {
         check("int f(std::vector<int> x) {\n"
               "    int& i = x[0];\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:24]: (performance) Function parameter 'x' should be passed by const reference. [passedByValue]\n"
                       "[test.cpp:2:10]: (style) Variable 'i' can be declared as reference to const [constVariableReference]\n",
                       errout_str());
 
         check("int f(std::vector<int>& x) {\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:25]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("int f(std::vector<int> x) {\n"
               "    const int& i = x[0];\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:24]: (performance) Function parameter 'x' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("int f(std::vector<int> x) {\n"
               "    static int& i = x[0];\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:24]: (performance) Function parameter 'x' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("int f(std::vector<int> x) {\n"
               "    int& i = x[0];\n"
               "    i++;\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int& f(std::vector<int>& x) {\n"
               "    x.push_back(1);\n"
               "    int& i = x[0];\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(const std::vector<int>& x) {\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int& f(std::vector<int>& x) {\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const int& f(std::vector<int>& x) {\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:32]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("int f(std::vector<int>& x) {\n"
               "    x[0]++;\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int a; };\n"
               "A f(std::vector<A>& x) {\n"
               "    x[0].a = 1;\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int a(); };\n"
               "A f(std::vector<A>& x) {\n"
               "    x[0].a();\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int g(int& x);\n"
               "int f(std::vector<int>& x) {\n"
               "    g(x[0]);\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<class T>\n"
               "T f(T& x) {\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<class T>\n"
               "T f(T&& x) {\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<class T>\n"
               "T f(T& x) {\n"
               "    return x[0];\n"
               "}\n"
-              "void h() { std::vector<int> v; h(v); }");
+              "void h() { std::vector<int> v; h(v); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int& x) {\n"
               "    return std::move(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::ostream& os) {\n"
               "    os << \"Hello\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int*);\n"
               "void f(int& x) {\n"
               "    g(&x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { A(int*); };\n"
               "A f(int& x) {\n"
               "    return A(&x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { A(int*); };\n"
               "A f(int& x) {\n"
               "    return A{&x};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int& x, int& y) {\n"
               "    y++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:13]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("struct A {\n"
               "    explicit A(int& y) : x(&y) {}\n"
               "    int * x = nullptr;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -2957,7 +3126,7 @@ class TestOther : public TestFixture {
               "    void swap(A& a) {\n"
               "        v.swap(a.v);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -2968,24 +3137,24 @@ class TestOther : public TestFixture {
               "};\n"
               "void g(A& a) {\n"
               "    a.f<int>();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int>& v) {\n"
               "    for(auto&& x:v)\n"
               "        x = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int>& v) {\n"
               "    for(auto x:v)\n"
               "        x = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:26]: (style) Parameter 'v' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("void f(std::vector<int>& v) {\n"
               "    for(auto& x:v) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Variable 'x' can be declared as reference to const [constVariableReference]\n",
                       errout_str());
 
@@ -3006,32 +3175,32 @@ class TestOther : public TestFixture {
 
         check("void f(std::vector<int>& v) {\n"
               "    for(const auto& x:v) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:26]: (style) Parameter 'v' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("void f(int& i) {\n"
               "    int& j = i;\n"
               "    j++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int>& v) {\n"
               "    int& i = v[0];\n"
               "    i++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::map<unsigned int, std::map<std::string, unsigned int> >& m, unsigned int i) {\n"
               "    std::map<std::string, unsigned int>& members = m[i];\n"
               "    members.clear();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    int& x;\n"
               "    A(int& y) : x(y)\n"
               "    {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -3040,14 +3209,14 @@ class TestOther : public TestFixture {
               "struct B : A {\n"
               "    B(int& x) : A(x)\n"
               "    {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b, int& x, int& y) {\n"
               "  auto& z = x;\n"
               "  auto& w = b ? y : z;\n"
               "  w = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -3055,7 +3224,7 @@ class TestOther : public TestFixture {
               "};\n"
               "int& f(S& s) {\n"
               "  return s.i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int* f(std::list<int>& x, unsigned int y) {\n"
@@ -3064,7 +3233,7 @@ class TestOther : public TestFixture {
               "            return &m;\n"
               "    }\n"
               "    return nullptr;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int& f(std::list<int>& x, int& y) {\n"
@@ -3073,7 +3242,7 @@ class TestOther : public TestFixture {
               "            return m;\n"
               "    }\n"
               "    return y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool from_string(int& t, const std::string& s) {\n"
@@ -3117,7 +3286,7 @@ class TestOther : public TestFixture {
         check("struct T { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
         check("struct T : public U  { void dostuff() const {}};\n"
               "void a(T& x) {\n"
@@ -3125,86 +3294,86 @@ class TestOther : public TestFixture {
               "    const T& z = x;\n" // Make sure we find all assignments
               "    T& y = x;\n"
               "    y.mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("struct T : public U  { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U& y = x\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
         check("struct T : public U  { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    U& y = x;\n"
               "    y.mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("struct T : public U  { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    my<fancy>::type& y = x;\n" // we don't know if y is const or not
               "    y.mutate();\n"             // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("struct T : public U  { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U& y = static_cast<const U&>(x);\n"
               "    y.mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
         check("struct T : public U  { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    U& y = static_cast<U&>(x);\n"
               "    y.mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U& y = dynamic_cast<const U&>(x)\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U& y = dynamic_cast<U const &>(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U& y = dynamic_cast<U & const>(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    U& y = dynamic_cast<U&>(x);\n"
               "    y.mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U& y = dynamic_cast<typename const U&>(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    U& y = dynamic_cast<typename U&>(x);\n"
               "    y.mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    U* y = dynamic_cast<U*>(&x);\n"
               "    y->mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct T : public U { void dostuff() const {}};\n"
@@ -3212,49 +3381,49 @@ class TestOther : public TestFixture {
               "    x.dostuff();\n"
               "    const U * y = dynamic_cast<const U *>(&x);\n"
               "    y->mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("can be const", errout_str(), ""); //Currently taking the address is treated as a non-const operation when it should depend on what we do with it
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    U const * y = dynamic_cast<U const *>(&x);\n"
               "    y->mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("can be const", errout_str(), ""); //Currently taking the address is treated as a non-const operation when it should depend on what we do with it
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U const * const * const * const y = dynamic_cast<const U const * const * const * const>(&x);\n"
               "    y->mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U const * const * const * const y = dynamic_cast<const U const * const * const * const>(&x);\n"
               "    y->mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("can be const", errout_str(), ""); //Currently taking the address is treated as a non-const operation when it should depend on what we do with it
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U const * const *  * const y = dynamic_cast<const U const * const *  * const>(&x);\n"
               "    y->mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    my::fancy<typename type const *> const * const  * const y = dynamic_cast<my::fancy<typename type const *> const * const  * const>(&x);\n"
               "    y->mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U& y = (const U&)(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n"
                       "[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n",
                       errout_str());
@@ -3263,13 +3432,13 @@ class TestOther : public TestFixture {
               "    x.dostuff();\n"
               "    U& y = (U&)(x);\n"
               "    y.mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U& y = (typename const U&)(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n"
                       "[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n",
                       errout_str());
@@ -3278,14 +3447,14 @@ class TestOther : public TestFixture {
               "    x.dostuff();\n"
               "    U& y = (typename U&)(x);\n"
               "    y.mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    U* y = (U*)(&x);\n"
               "    y->mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
 
         check("struct C { void f() const; };\n" // #9875 - crash
@@ -3293,7 +3462,7 @@ class TestOther : public TestFixture {
               "void foo(C& x) {\n"
               "   x.f();\n"
               "   foo( static_cast<U2>(0) );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("class a {\n"
@@ -3501,7 +3670,7 @@ class TestOther : public TestFixture {
               "void bh(const std::list<int> &ak, const std::list<int> &al);\n"
               "void ah();\n"
               "void an();\n"
-              "void h();");
+              "void h();\n");
         ASSERT_EQUALS("[test.cpp:131:12]: (style) Variable 'tm' can be declared as pointer to const [constVariablePointer]\n"
                       "[test.cpp:136:19]: (style) Variable 'af' can be declared as pointer to const [constVariablePointer]\n"
                       "[test.cpp:137:12]: (style) Variable 'ag' can be declared as pointer to const [constVariablePointer]\n",
@@ -3516,7 +3685,7 @@ class TestOther : public TestFixture {
               "class D\n"
               "{\n"
               "public:\n"
-              "  explicit D(int&);\n"
+              "  explicit D(int& i);\n"
               "\n"
               "private:\n"
               "  C c;\n"
@@ -3525,7 +3694,7 @@ class TestOther : public TestFixture {
               "D::D(int& i)\n"
               "  : c(i)\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class C\n"
@@ -3537,7 +3706,7 @@ class TestOther : public TestFixture {
               "class D\n"
               "{\n"
               "public:\n"
-              "  explicit D(int&) noexcept;\n"
+              "  explicit D(int& i) noexcept;\n"
               "\n"
               "private:\n"
               "  C c;\n"
@@ -3545,7 +3714,7 @@ class TestOther : public TestFixture {
               "\n"
               "D::D(int& i) noexcept\n"
               "  : c(i)\n"
-              "{}");
+              "{}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class C\n"
@@ -3557,7 +3726,7 @@ class TestOther : public TestFixture {
               "class D\n"
               "{\n"
               "public:\n"
-              "  explicit D(int&);\n"
+              "  explicit D(int& i);\n"
               "\n"
               "private:\n"
               "  C c;\n"
@@ -3566,7 +3735,7 @@ class TestOther : public TestFixture {
               "D::D(int& i)\n"
               "  : c(i)\n"
               "{\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:16]: (style) Parameter 'i' can be declared as reference to const\n", "", errout_str());
 
         check("class C\n"
@@ -3578,7 +3747,7 @@ class TestOther : public TestFixture {
               "class D\n"
               "{\n"
               "public:\n"
-              "  explicit D(int&);\n"
+              "  explicit D(int& i);\n"
               "\n"
               "private:\n"
               "  C c;\n"
@@ -3587,7 +3756,7 @@ class TestOther : public TestFixture {
               "D::D(int& i)\n"
               "  : c(i)\n"
               "{\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:16]: (style) Parameter 'i' can be declared as reference to const\n", "", errout_str());
 
         check("class C\n"
@@ -3599,7 +3768,7 @@ class TestOther : public TestFixture {
               "class D\n"
               "{\n"
               "public:\n"
-              "  explicit D(int&);\n"
+              "  explicit D(int& i);\n"
               "\n"
               "private:\n"
               "  C c;\n"
@@ -3608,13 +3777,13 @@ class TestOther : public TestFixture {
               "D::D(int& i)\n"
               "  : c(0, i)\n"
               "{\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:16]: (style) Parameter 'i' can be declared as reference to const\n", "", errout_str());
 
         check("void f(std::map<int, std::vector<int>> &map) {\n" // #10266
               "  for (auto &[slave, panels] : map)\n"
               "    panels.erase(it);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S { void f(); int i; };\n"
@@ -3800,7 +3969,9 @@ class TestOther : public TestFixture {
               "    (void)(true);\n"
               "    if (r) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:1:13]: (style) Parameter 'r' can be declared as reference to const [constParameterReference]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) Redundant code: Found unused cast in expression '(void)(true)'. [constStatement]\n"
+                      "[test.cpp:1:13]: (style) Parameter 'r' can be declared as reference to const [constParameterReference]\n",
+                      errout_str());
 
         check("struct S { void f(int&); };\n" // #12216
               "void g(S& s, int& r, void (S::* p2m)(int&)) {\n"
@@ -3963,7 +4134,7 @@ class TestOther : public TestFixture {
                       "[test.cpp:10:25]: (style) Parameter 'v' can be declared as reference to const [constParameterReference]\n",
                       errout_str());
 
-        check("void push(V& v) { v.push_back({ .x = 1 }); }"); // #14010
+        check("void push(V& v) { v.push_back({ .x = 1 }); }\n"); // #14010
         ASSERT_EQUALS("", errout_str());
 
         check("size_t* f(std::array<uint8_t, 128>& a) { return reinterpret_cast<size_t*>(a.data()); }\n"); // #14074
@@ -3995,11 +4166,107 @@ class TestOther : public TestFixture {
               "    return static_cast<const D&>(b).i;\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:9:10]: (style) Parameter 'b' can be declared as reference to const [constParameterReference]\n", errout_str());
+
+        check("void f(int *p) {\n" // #14409
+              "    int*& pp{ p };\n"
+              "    if (*pp) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("class C {\n"
+              "public:\n"
+              "    explicit C(const std::string s);\n"
+              "private:\n"
+              "    std::string _s;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(int& r) {\n" // #9761
+              "    o1 = r;\n"
+              "}\n"
+              "boost::optional<int&> o2;\n"
+              "void g(int& r) {\n"
+              "    o2 = r;\n"
+              "}\n"
+              "struct T {\n"
+              "    int* p;\n"
+              "    T& operator=(int& rhs) { p = &rhs; return *this; }\n"
+              "};\n"
+              "void h(T& t, int& r) {\n"
+              "    t = r;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(std::optional<int>& o) {\n"
+              "    *o = 1;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f() {\n"
+              "  int x = 0;\n"
+              "  int& r(x);\n"
+              "  r = x;\n"
+              "  return r;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct Item { int state; };\n"
+              "void foo(std::vector<Item> &items) {\n"
+              "    for (auto &item : items) {\n"
+              "        switch (auto &s = item.state) {\n"
+              "        case 0: s = 1; break;\n"
+              "        default: break;\n"
+              "        }\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct DS;\n" // #15104
+              "void select(int a, int b);\n"
+              "class Query {\n"
+              "public:\n"
+              "    template <typename Callback>\n"
+              "    int select(DS &ds, Callback cb);\n"
+              "    template <typename Callback>\n"
+              "    int select(DS *ds, Callback cb);\n"
+              "    int select(DS &ds) { return select(ds, [](int) {}); }\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int& g();\n" // reference to function
+              "int k();\n"
+              "int f1() { int& (&r)() = g; return r(); }\n"
+              "int f2() { int (&r)() = k; return r(); }\n"
+              "int& f3(int& (&f)()) { return f(); }\n"
+              "int f4(int&& (&f)()) { return f(); }\n"
+              "int f5(int (&f)()) { return f(); }\n"
+              "using FR = int&(&)();\n"
+              "void f6(FR f) { f(); }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #15087
+              "    int a, b;\n"
+              "};\n"
+              "int& f(S& s, bool b) {\n"
+              "    return b ? s.a : s.b;\n"
+              "}\n"
+              "int* g(U& u) {\n"
+              "    return &(u.i);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("typedef int I;\n" // #15167
+              "I f() {\n"
+              "    I a[1] = { 0 };\n"
+              "    return a[0];\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:7]: (style) Variable 'a' can be declared as const array [constVariable]\n",
+                      errout_str());
     }
 
     void constParameterCallback() {
         check("int callback(std::vector<int>& x) { return x[0]; }\n"
-              "void f() { dostuff(callback); }");
+              "void f() { dostuff(callback); }\n");
         ASSERT_EQUALS("[test.cpp:2:20] -> [test.cpp:1:32]: (style) Parameter 'x' can be declared as reference to const. However it seems that 'callback' is a callback function, if 'x' is declared with const you might also need to cast function pointer(s). [constParameterCallback]\n", errout_str());
 
         // #9906
@@ -4017,13 +4284,13 @@ class TestOther : public TestFixture {
               "\n"
               "void EventEngine::signalEvent(ev::sig& signal, int revents) {\n"
               "    switch (signal.signum) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:48] -> [test.cpp:13:40]: (style) Parameter 'signal' can be declared as reference to const. However it seems that 'signalEvent' is a callback function, if 'signal' is declared with const you might also need to cast function pointer(s). [constParameterCallback]\n", errout_str());
 
         check("void f(int* p) {}\n" // 12843
               "void g(std::map<void(*)(int*), int>&m) {\n"
               "    m[&f] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:1:13]: (style) Parameter 'p' can be declared as pointer to const. "
                       "However it seems that 'f' is a callback function, if 'p' is declared with const you might also need to cast function pointer(s). [constParameterCallback]\n",
                       errout_str());
@@ -4036,52 +4303,62 @@ class TestOther : public TestFixture {
               "    S s2{ cb };\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:6:11] -> [test.cpp:2:21]: (performance) Function parameter 's' should be passed by const reference. However it seems that 'cb' is a callback function. [passedByValueCallback]\n", errout_str());
+
+        check("struct S {\n" // #14696
+              "    explicit S(std::string s = {}) {}\n"
+              "};\n"
+              "struct T {\n"
+              "    explicit T(std::string* s = {}) {}\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:2:28]: (performance) Function parameter 's' should be passed by const reference. [passedByValue]\n"
+                      "[test.cpp:5:29]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
     }
 
     void constPointer() {
-        check("void foo(int *p) { return *p; }");
+        check("void foo(int *p) { return *p; }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { x = *p; }");
+        check("void foo(int *p) { x = *p; }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { int &ref = *p; ref = 12; }");
+        check("void foo(int *p) { int &ref = *p; ref = 12; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void foo(int *p) { x = *p + 10; }");
+        check("void foo(int *p) { x = *p + 10; }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { return p[10]; }");
+        check("void foo(int *p) { return p[10]; }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { int &ref = p[0]; ref = 12; }");
+        check("void foo(int *p) { int &ref = p[0]; ref = 12; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void foo(int *p) { x[*p] = 12; }");
+        check("void foo(int *p) { x[*p] = 12; }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { if (p) {} }");
+        check("void foo(int *p) { if (p) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { if (p || x) {} }");
+        check("void foo(int *p) { if (p || x) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { if (p == 0) {} }");
+        check("void foo(int *p) { if (p == 0) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { if (!p) {} }");
+        check("void foo(int *p) { if (!p) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { if (*p > 123) {} }");
+        check("void foo(int *p) { if (*p > 123) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { return *p + 1; }");
+        check("void foo(int *p) { return *p + 1; }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { return *p > 1; }");
+        check("void foo(int *p) { return *p > 1; }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(const int* c) { if (c == 0) {}; }");
+        check("void foo(const int* c) { if (c == 0) {}; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct a { void b(); };\n"
@@ -4114,59 +4391,59 @@ class TestOther : public TestFixture {
               "    int& i = (*x)[0];\n"
               "    i++;\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int a; };\n"
               "A f(std::vector<A>* x) {\n"
               "    x->front().a = 1;\n"
               "    return x->front();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int>* v) {\n"
               "    for(auto&& x:*v)\n"
               "        x = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    int* x;\n"
               "    A(int* y) : x(y)\n"
               "    {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b, int* x, int* y) {\n"
               "  int* z = x;\n"
               "  int* w = b ? y : z;\n"
               "  *w = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b, int* x, int* y) {\n"
               "  int& z = *x;\n"
               "  int& w = b ? *y : z;\n"
               "  w = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Base { virtual void dostuff(int *p) = 0; };\n" // #10397
-              "class Derived: public Base { int x; void dostuff(int *p) override { x = *p; } };");
+              "class Derived: public Base { int x; void dostuff(int *p) override { x = *p; } };\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Data { char buf[128]; };\n" // #10483
               "void encrypt(Data& data) {\n"
               "    const char a[] = \"asfasd\";\n"
               "    memcpy(data.buf, &a, sizeof(a));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10547
         check("void foo(std::istream &istr) {\n"
               "  unsigned char x[2];\n"
               "  istr >> x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10744
@@ -4625,6 +4902,153 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("[test.cpp:1:18]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:18]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
+
+        check("using fp_t = int (*)(int*);\n" // #14510
+              "fp_t g_fp;\n"
+              "struct S { fp_t m_fp; };\n"
+              "void g(fp_t);\n"
+              "S f(S* s) {\n"
+              "    g_fp = [](int* p) { return *p; };\n"
+              "    s->m_fp = [](int* p) { return *p; };\n"
+              "    g([](int* p) { return *p; });\n"
+              "    auto x = [](int* p) { return *p; };\n"
+              "    g(x);\n"
+              "    return { [](int* p) { return *p; } };\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    int i = 0;\n"
+              "    auto x = [&]() { int* p = &i; if (*p) {} };\n"
+              "    x();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:27]: (style) Variable 'p' can be declared as pointer to const [constVariablePointer]\n", errout_str());
+
+        check("int f() {\n"
+              "    int i = 0;\n"
+              "    return [](int* p) { return *p; }(&i);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:20]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
+
+        check("struct S {\n" // #14571
+              "    char* c;\n"
+              "};\n"
+              "struct T {\n"
+              "    S s;\n"
+              "};\n"
+              "void f(std::string* p, T& t) {\n"
+              "    S& r = t.s;\n"
+              "    strcpy(r.c, p->c_str());\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:7:21]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
+
+        check("struct S {\n" // #14559
+              "    int gc() const;\n"
+              "    int gnc();\n"
+              "};\n"
+              "int f1(S* s) {\n"
+              "    return h(s ? s->gc() : 1);\n"
+              "}\n"
+              "int f2(S* s) {\n"
+              "    return h(s ? s->gnc() : 1);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:11]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n", errout_str());
+
+        check("using IntPtr = int *;\n"
+              "int* foo(IntPtr bar) {\n"
+              "  return bar = 0;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int x; };\n" // #14700
+              "int f(S* s) {\n"
+              "    return s->x ? 1 : 0;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n", errout_str());
+
+        check("struct S { int a[1][1]; };\n" // #14714
+              "int f(S* s) {\n"
+              "    return s->a[0][0] ? 1 : 0;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n", errout_str());
+
+        check("int f(int *p, int *q) {\n" // #14748
+              "    return p ? *p : *q;\n"
+              "}\n"
+              "void g(int *p, int *q) {\n"
+              "    int& r = p ? *p : *q;\n"
+              "    r = 0;\n"
+              "}\n"
+              "void h(int *p, int *q) {\n"
+              "    i(p ? *p : *q);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:12]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n"
+                      "[test.cpp:1:20]: (style) Parameter 'q' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("int f(std::vector<int>* p) {\n" // #14810
+              "    return *p->cbegin();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:25]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
+
+        check("struct S {\n" // #14817
+              "    explicit S(int *a) : m{ a[0], a[1] } {}\n"
+              "    int m[2];\n"
+              "}\n"
+              "struct T {\n"
+              "    explicit T(int *a) : m{ &a[0], &a[1] } {}\n"
+              "    int* m[2];\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:2:21]: (style) Parameter 'a' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("class A {\n" // #11471
+              "public:\n"
+              "    A(const int& i, int) : m_i(&i) {}\n"
+              "    const int* m_i;\n"
+              "};\n"
+              "A f(int& s) {\n"
+              "    return A(s, 0);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:10]: (style) Parameter 's' can be declared as reference to const [constParameterReference]\n",
+                      errout_str());
+
+        check("struct S { std::string a; };\n" // #13678
+              "struct T { S s; };\n"
+              "bool f(S* s) {\n"
+              "    return s->a.empty();\n"
+              "}\n"
+              "bool g(T* t) {\n"
+              "    return t->s.a.empty();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n"
+                      "[test.cpp:6:11]: (style) Parameter 't' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("struct S { int i; };\n" // #13099
+              "double f(S * s, int n, int a, int b, double* p) {\n"
+              "    return (s + (n * (a + 1) + b))->i / *(p + b);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:14]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n"
+                      "[test.cpp:2:46]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("struct S : U {\n" // #13944
+              "    void f(int* p) const {\n"
+              "        if (m == p) {}\n"
+              "    }\n"
+              "    void g(int* p) final {\n"
+              "        if (m == p) {}\n"
+              "    }\n"
+              "    int* m;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:2:17]: (style) Either there is a missing override/final keyword, or the parameter 'p' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("void f(int *p __attribute__((unused))) {}\n"
+              "void g(__attribute__((unused)) int *p) {}\n"
+              "void h(int *p) {}\n");
+        ASSERT_EQUALS("[test.cpp:3:13]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
     }
 
     void constArray() {
@@ -4696,7 +5120,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:11] -> [test.cpp:9:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
 
         check("void foo()\n"
@@ -4712,7 +5136,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:11] -> [test.cpp:11:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
 
         check("void foo()\n"
@@ -4729,7 +5153,7 @@ class TestOther : public TestFixture {
               "        }\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -4747,7 +5171,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -4762,7 +5186,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -4777,7 +5201,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -4794,7 +5218,7 @@ class TestOther : public TestFixture {
               "        }\n"
               "        bar(y);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -4811,7 +5235,7 @@ class TestOther : public TestFixture {
               "        }\n"
               "        bar(y);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -4826,7 +5250,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -4841,7 +5265,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:11] -> [test.cpp:10:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
 
         check("void bar() {}\n" // bar isn't noreturn
@@ -4857,7 +5281,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:11] -> [test.cpp:11:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
 
         check("void foo(int a) {\n"
@@ -4869,7 +5293,7 @@ class TestOther : public TestFixture {
               "    case 3:\n"
               "      strcpy(str, \"b'\");\n"
               "    }\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         TODO_ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:8]: (style) Buffer 'str' is being written before its old content has been used. 'break;' missing?\n",
                            "",
                            errout_str());
@@ -4883,7 +5307,7 @@ class TestOther : public TestFixture {
               "    case 3:\n"
               "      strncpy(str, \"b'\");\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:8]: (style) Buffer 'str' is being written before its old content has been used. 'break;' missing?\n",
                            "",
                            errout_str());
@@ -4900,7 +5324,7 @@ class TestOther : public TestFixture {
               "      strcpy(str, \"b'\");\n"
               "      z++;\n"
               "    }\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         TODO_ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:10]: (style) Buffer 'str' is being written before its old content has been used. 'break;' missing?\n",
                            "",
                            errout_str());
@@ -4916,7 +5340,7 @@ class TestOther : public TestFixture {
               "      strcpy(str, \"b'\");\n"
               "      break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a) {\n"
@@ -4929,7 +5353,7 @@ class TestOther : public TestFixture {
               "    case 3:\n"
               "      strcpy(str, \"b'\");\n"
               "    }\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #5158 "segmentation fault (valid code)"
@@ -4962,7 +5386,7 @@ class TestOther : public TestFixture {
               "  case 1: x = 3; goto a;\n"
               "  case 1: x = 6; goto a;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4978,7 +5402,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:9] -> [test.cpp:9:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4993,7 +5417,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:9] -> [test.cpp:11:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5006,7 +5430,7 @@ class TestOther : public TestFixture {
               "        ++y;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5019,7 +5443,7 @@ class TestOther : public TestFixture {
               "        ++y;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5032,7 +5456,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:9] -> [test.cpp:9:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5047,7 +5471,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:9] -> [test.cpp:11:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5060,7 +5484,7 @@ class TestOther : public TestFixture {
               "        --y;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5073,7 +5497,7 @@ class TestOther : public TestFixture {
               "        --y;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5086,7 +5510,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:10] -> [test.cpp:9:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5101,7 +5525,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:10] -> [test.cpp:11:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5114,7 +5538,7 @@ class TestOther : public TestFixture {
               "        y++;\n"
               "    }\n"
               "    bar(y);\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5127,7 +5551,7 @@ class TestOther : public TestFixture {
               "        y++;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5140,7 +5564,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:10] -> [test.cpp:9:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5155,7 +5579,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:10] -> [test.cpp:11:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5168,7 +5592,7 @@ class TestOther : public TestFixture {
               "        y--;\n"
               "    }\n"
               "    bar(y);\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5181,7 +5605,7 @@ class TestOther : public TestFixture {
               "        y--;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5197,7 +5621,7 @@ class TestOther : public TestFixture {
               "        }\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5214,7 +5638,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5228,7 +5652,7 @@ class TestOther : public TestFixture {
               "        y++;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5242,7 +5666,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5258,7 +5682,7 @@ class TestOther : public TestFixture {
               "        }\n"
               "        bar(y);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5274,7 +5698,7 @@ class TestOther : public TestFixture {
               "        }\n"
               "        bar(y);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5288,7 +5712,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5302,7 +5726,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:10] -> [test.cpp:10:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
 
         check("bool f() {\n"
@@ -5320,7 +5744,7 @@ class TestOther : public TestFixture {
               "    };\n"
               "    ret = true;\n"
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13] -> [test.cpp:14:9]: (style) Variable 'ret' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:8:13] -> [test.cpp:14:9]: (style) Variable 'ret' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:11:13] -> [test.cpp:14:9]: (style) Variable 'ret' is reassigned a value before the old one has been used. [redundantAssignment]\n",
@@ -5339,7 +5763,7 @@ class TestOther : public TestFixture {
               "        y |= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:9]: (style) Redundant bitwise operation on 'y' in 'switch' statement. 'break;' missing? [redundantBitwiseOperationInSwitch]\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5353,7 +5777,7 @@ class TestOther : public TestFixture {
               "        y = y | 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:9]: (style) Redundant bitwise operation on 'y' in 'switch' statement. 'break;' missing? [redundantBitwiseOperationInSwitch]\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5367,7 +5791,7 @@ class TestOther : public TestFixture {
               "        y |= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:9]: (style) Redundant bitwise operation on 'y' in 'switch' statement. 'break;' missing? [redundantBitwiseOperationInSwitch]\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5382,7 +5806,7 @@ class TestOther : public TestFixture {
               "            y |= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5397,7 +5821,7 @@ class TestOther : public TestFixture {
               "        y |= z;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5412,7 +5836,7 @@ class TestOther : public TestFixture {
               "        y |= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5427,7 +5851,7 @@ class TestOther : public TestFixture {
               "        y |= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:11] -> [test.cpp:8:11]: (style) Variable 'y' is reassigned a value before the old one has been used. [redundantAssignment]\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5441,7 +5865,7 @@ class TestOther : public TestFixture {
               "        y &= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:9]: (style) Redundant bitwise operation on 'y' in 'switch' statement. 'break;' missing? [redundantBitwiseOperationInSwitch]\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5456,7 +5880,7 @@ class TestOther : public TestFixture {
               "        y |= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5470,7 +5894,7 @@ class TestOther : public TestFixture {
               "        y ^= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5484,7 +5908,7 @@ class TestOther : public TestFixture {
               "        y |= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5498,7 +5922,7 @@ class TestOther : public TestFixture {
               "        y &= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5512,7 +5936,7 @@ class TestOther : public TestFixture {
               "        y &= 2;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5524,20 +5948,20 @@ class TestOther : public TestFixture {
               "            continue;\n"
               "        }\n"
               "    }\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:5:13]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("int foo(int a) {\n"
               "    return 0;\n"
               "    return(a-1);\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("int foo(int a) {\n"
               "  A:"
               "    return(0);\n"
               "    goto A;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
@@ -5547,12 +5971,12 @@ class TestOther : public TestFixture {
                                    "    <arg nr=\"1\"/>\n"
                                    "  </function>\n"
                                    "</def>";
-        /*const*/ Settings settings = settingsBuilder().libraryxml(xmldata).build();
+        /*const*/ Settings settings = settingsBuilder().libraryxml(xmldata).severity(Severity::style).build();
 
         check("void foo() {\n"
               "    exit(0);\n"
               "    break;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
+              "}\n", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("class NeonSession {\n"
@@ -5561,16 +5985,16 @@ class TestOther : public TestFixture {
               "void NeonSession::exit()\n"
               "{\n"
               "    SAL_INFO(\"ucb.ucp.webdav\", \"neon commands cannot be aborted\");\n"
-              "}", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
+              "}\n", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
         ASSERT_EQUALS("", errout_str());
 
         check("void NeonSession::exit()\n"
               "{\n"
               "    SAL_INFO(\"ucb.ucp.webdav\", \"neon commands cannot be aborted\");\n"
-              "}", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
+              "}\n", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
         ASSERT_EQUALS("", errout_str());
 
-        check("void foo() { xResAccess->exit(); }", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
+        check("void foo() { xResAccess->exit(); }\n", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5584,7 +6008,7 @@ class TestOther : public TestFixture {
               "            c++;\n"
               "            break;\n"
               "         }\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:7:13]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5597,7 +6021,7 @@ class TestOther : public TestFixture {
               "            c++;\n"
               "            break;\n"
               "         }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5608,7 +6032,7 @@ class TestOther : public TestFixture {
               "            break;\n"
               "          }\n"
               "       }\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:6:13]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5620,7 +6044,7 @@ class TestOther : public TestFixture {
               "          }\n"
               "          a+=2;\n"
               "       }\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:6:13]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5631,50 +6055,50 @@ class TestOther : public TestFixture {
               "          }\n"
               "          a+=2;\n"
               "       }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
               "    throw 0;\n"
               "    return 1;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("void foo() {\n"
               "    throw 0;\n"
               "    return;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("int foo() {\n"
               "    throw = 0;\n"
               "    return 1;\n"
-              "}", dinit(CheckOptions, $.cpp = false, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.cpp = false, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
               "    return 0;\n"
               "    return 1;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("int foo() {\n"
               "    return 0;\n"
               "    foo();\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Statements following 'return' will never be executed. [unreachableCode]\n", errout_str());
 
         check("int foo(int unused) {\n"
               "    return 0;\n"
               "    (void)unused;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(int unused1, int unused2) {\n"
               "    return 0;\n"
               "    (void)unused1;\n"
               "    (void)unused2;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(int unused1, int unused2) {\n"
@@ -5682,14 +6106,14 @@ class TestOther : public TestFixture {
               "    (void)unused1;\n"
               "    (void)unused2;\n"
               "    foo();\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:5:5]: (style) Statements following 'return' will never be executed. [unreachableCode]\n", errout_str());
 
         check("int foo() {\n"
               "    if(bar)\n"
               "        return 0;\n"
               "    return 124;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
@@ -5700,7 +6124,7 @@ class TestOther : public TestFixture {
               "        return 0;\n"
               "    }\n"
               "    return 124;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:4:9]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("void foo() {\n"
@@ -5708,7 +6132,7 @@ class TestOther : public TestFixture {
               "        return;\n"
               "        break;\n"
               "    }\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:4:9]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         // #5707
@@ -5719,20 +6143,20 @@ class TestOther : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "    j=2;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:7:5]: (style) Statements following 'return' will never be executed. [unreachableCode]\n", errout_str());
 
         check("int foo() {\n"
               "    return 0;\n"
               "  label:\n"
               "    throw 0;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:3]: (style) Label 'label' is not used. [unusedLabel]\n", errout_str());
 
         check("struct A {\n"
               "    virtual void foo  (P & Val) throw ();\n"
               "    virtual void foo1 (P & Val) throw ();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
@@ -5741,7 +6165,7 @@ class TestOther : public TestFixture {
               "     bar();\n"
               "     label:\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // #3457
 
         check("int foo() {\n"
@@ -5750,7 +6174,7 @@ class TestOther : public TestFixture {
               "     bar();\n"
               "     label:\n"
               "    } while (true);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // #3457
 
         check("int foo() {\n"
@@ -5759,7 +6183,7 @@ class TestOther : public TestFixture {
               "     bar();\n"
               "     label:\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // #3457
 
         // #3383. TODO: Use preprocessor
@@ -5768,20 +6192,20 @@ class TestOther : public TestFixture {
               "    return 0;\n"
               "\n" // #endif
               "    return 1;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
         check("int foo() {\n"
               "\n" // #ifdef A
               "    return 0;\n"
               "\n" // #endif
               "    return 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (style, inconclusive) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         // #4711 lambda functions
         check("int f() {\n"
               "    return g([](int x){(void)x+1; return x;});\n"
-              "}",
+              "}\n",
               dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
@@ -5796,7 +6220,7 @@ class TestOther : public TestFixture {
               "             __asm__ (\"rorw $8, %w0\" : \"=r\" (__v) : \"0\" (__x) : \"cc\");\n"
               "         (void)__v;\n"
               "     }));\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // #6008
@@ -5805,7 +6229,7 @@ class TestOther : public TestFixture {
               "        int sum = a_ + b_;\n"
               "        return sum;\n"
               "    };\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // #5789
@@ -5813,20 +6237,20 @@ class TestOther : public TestFixture {
               "    uint64_t enter, exit;\n"
               "    uint64_t events;\n"
               "    per_state_info() : enter(0), exit(0), events(0) {}\n"
-              "};", dinit(CheckOptions, $.inconclusive = false));
+              "};\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // #6664
         check("void foo() {\n"
               "    (beat < 100) ? (void)0 : exit(0);\n"
               "    bar();\n"
-              "}", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
+              "}\n", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    (beat < 100) ? exit(0) : (void)0;\n"
               "    bar();\n"
-              "}", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
+              "}\n", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
         ASSERT_EQUALS("", errout_str());
 
         // #8261
@@ -5834,13 +6258,13 @@ class TestOther : public TestFixture {
         TODO_ASSERT_THROW(check("void foo() {\n"
                                 "    (beat < 100) ? (void)0 : throw(0);\n"
                                 "    bar();\n"
-                                "}", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings)), InternalError);
+                                "}\n", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings)), InternalError);
         //ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
               "    exit(0);\n"
               "    return 1;\n" // <- clarify for tools that function does not continue..
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -6025,29 +6449,84 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
-    void redundantContinue() {
-        check("void f() {\n" // #11195
-              "    for (int i = 0; i < 10; ++i) {\n"
-              "        printf(\"i = %d\\n\", i);\n"
-              "        continue;\n"
+    void unreachableSwitchCase() {
+        check("enum T { A, B};\n"
+              "void f(const T &t) {\n"
+              "    if (t == A) {\n"
+              "        switch (t) {\n"
+              "        case A:\n"
+              "            break;\n"
+              "        case B:\n"
+              "            break;\n"
+              "        }\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4:9]: (style) 'continue' is redundant since it is the last statement in a loop. [redundantContinue]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:7:9]: (style) Switch case 'B' can never be selected because the switch condition is known to be 0. [unreachableSwitchCase]\n", errout_str());
 
-        check("void f() {\n"
-              "    int i = 0;"
-              "    do {\n"
-              "        ++i;\n"
-              "        printf(\"i = %d\\n\", i);\n"
-              "        continue;\n"
-              "    } while (i < 10);\n"
+        check("void f(int t) {\n"
+              "    if (t == 0) {\n"
+              "        switch (t) {\n"
+              "        case 0:\n"
+              "            break;\n"
+              "        case 1:\n"
+              "            break;\n"
+              "        }\n"
+              "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5:9]: (style) 'continue' is redundant since it is the last statement in a loop. [redundantContinue]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:6:9]: (style) Switch case '1' can never be selected because the switch condition is known to be 0. [unreachableSwitchCase]\n", errout_str());
 
-        check("int f() {\n" // #13475
-              "    { return 0; };\n"
-              "}\n");
-        ASSERT_EQUALS("", errout_str());
+        check("void f(int t) {\n"
+              "    switch (t) {\n"
+              "    case 0:\n"
+              "        break;\n"
+              "    case 1:\n"
+              "        break;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(int x, int y) {\n"
+              "    if (x == 0) {\n"
+              "        switch (x) {\n"
+              "        case 0:\n"
+              "            switch (y) {\n"
+              "            case 1:\n"
+              "                break;\n"
+              "            case 2:\n"
+              "                break;\n"
+              "            }\n"
+              "            break;\n"
+              "        case 1:\n"
+              "            break;\n"
+              "        }\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:12:9]: (style) Switch case '1' can never be selected because the switch condition is known to be 0. [unreachableSwitchCase]\n", errout_str());
+    }
+
+    void redundantContinue() {
+        check("void f() {\n" // #11195
+              "    for (int i = 0; i < 10; ++i) {\n"
+              "        printf(\"i = %d\\n\", i);\n"
+              "        continue;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) 'continue' is redundant since it is the last statement in a loop. [redundantContinue]\n", errout_str());
+
+        check("void f() {\n"
+              "    int i = 0;"
+              "    do {\n"
+              "        ++i;\n"
+              "        printf(\"i = %d\\n\", i);\n"
+              "        continue;\n"
+              "    } while (i < 10);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:9]: (style) 'continue' is redundant since it is the last statement in a loop. [redundantContinue]\n", errout_str());
+
+        check("int f() {\n" // #13475
+              "    { return 0; };\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int i) {\n" // #13478
               "    int x = 0;\n"
@@ -6083,7 +6562,7 @@ class TestOther : public TestFixture {
               "        case A||B:\n"
               "            foo();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (warning, inconclusive) Found suspicious case label in switch(). Operator '&&' probably doesn't work as intended. [suspiciousCase]\n"
                       "[test.cpp:5:16]: (warning, inconclusive) Found suspicious case label in switch(). Operator '||' probably doesn't work as intended. [suspiciousCase]\n"
                       "[test.cpp:7:15]: (warning, inconclusive) Found suspicious case label in switch(). Operator '||' probably doesn't work as intended. [suspiciousCase]\n", errout_str());
@@ -6093,7 +6572,7 @@ class TestOther : public TestFixture {
               "        case 1:\n"
               "            a=A&&B;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // TODO Do not throw AST validation exception
@@ -6102,19 +6581,19 @@ class TestOther : public TestFixture {
                                 "        case A&&B?B:A:\n"
                                 "            foo();\n"
                                 "    }\n"
-                                "}"), InternalError);
+                                "}\n"), InternalError);
         //ASSERT_EQUALS("", errout_str());
     }
 
     void suspiciousEqualityComparison() {
         check("void foo(int c) {\n"
               "    if (x) c == 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
         check("void foo(const int* c) {\n"
               "    if (x) *c == 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
 
@@ -6122,90 +6601,90 @@ class TestOther : public TestFixture {
               "    if (c == 1) {\n"
               "        c = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int c) {\n"
               "    c == 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
         check("void foo(int c) {\n"
               "    for (int i = 0; i == 10; i ++) {\n"
               "        a ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int c) {\n"
               "    for (i == 0; i < 10; i ++) {\n"
               "        c ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
         check("void foo(int c) {\n"
               "    for (i == 1; i < 10; i ++) {\n"
               "        c ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
         check("void foo(int c) {\n"
               "    for (i == 2; i < 10; i ++) {\n"
               "        c ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
         check("void foo(int c) {\n"
               "    for (int i = 0; i < 10; i == c) {\n"
               "        c ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:31]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
         check("void foo(int c) {\n"
               "    for (; running == 1;) {\n"
               "        c ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int c) {\n"
               "    printf(\"%i\", ({x==0;}));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int arg) {\n"
               "    printf(\"%i\", ({int x = do_something(); x == 0;}));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int x) {\n"
               "    printf(\"%i\", ({x == 0; x > 0 ? 10 : 20}));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
         check("void foo(int x) {\n"
               "    for (const Token* end = tok->link(); tok != end; tok = (tok == end) ? end : tok->next()) {\n"
               "        x++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int x) {\n"
               "    for (int i = (x == 0) ? 0 : 5; i < 10; i ++) {\n"
               "        x++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int x) {\n"
               "    for (int i = 0; i < 10; i += (x == 5) ? 1 : 2) {\n"
               "        x++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6261,26 +6740,26 @@ class TestOther : public TestFixture {
               "    int x = 1;\n"
               "    x = x;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Redundant assignment of 'x' to itself. [selfAssignment]\n", errout_str());
 
         check("void foo()\n"
               "{\n"
               "    int x = x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Redundant assignment of 'x' to itself. [selfAssignment]\n", errout_str());
 
         check("struct A { int b; };\n"
               "void foo(A* a1, A* a2) {\n"
               "    a1->b = a1->b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Redundant assignment of 'a1->b' to itself. [selfAssignment]\n", errout_str());
 
         check("int x;\n"
               "void f()\n"
               "{\n"
               "    x = x = 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Redundant assignment of 'x' to itself. [selfAssignment]\n", errout_str());
 
         // #4073 (segmentation fault)
@@ -6288,59 +6767,59 @@ class TestOther : public TestFixture {
               "{\n"
               "    if (a == 42)\n"
               "    a = a;\n"
-              "}");
+              "}\n");
 
         check("void foo()\n"
               "{\n"
               "    int x = 1;\n"
               "    x = x + 1;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
               "        int *x = getx();\n"
               "        *x = x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    BAR *x = getx();\n"
               "    x = x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (style) Redundant assignment of 'x' to itself. [selfAssignment]\n", errout_str());
 
         // #2502 - non-primitive type -> there might be some side effects
         check("void foo()\n"
               "{\n"
               "    Fred fred; fred = fred;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    x = (x == 0);"
               "    func(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    x = (x != 0);"
               "    func(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #3001 - false positive
         check("void foo(int x) {\n"
               "    x = x ? x : 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3800 - false negative when variable is extern
         check("extern int i;\n"
               "void f() {\n"
               "    i = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (style) Redundant assignment of 'i' to itself. [selfAssignment]\n", errout_str());
 
         // #4291 - id for variables accessed through 'this'
@@ -6350,16 +6829,16 @@ class TestOther : public TestFixture {
               "};\n"
               "void Foo::func() {\n"
               "    this->var = var;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:15]: (style) Redundant assignment of 'this->var' to itself. [selfAssignment]\n", errout_str());
 
         check("class Foo {\n"
               "    int var;\n"
-              "    void func(int var);\n"
+              "    Foo(int var);\n"
               "};\n"
-              "void Foo::func(int var) {\n"
+              "Foo::Foo(int var) {\n"
               "    this->var = var;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6406 - designated initializer doing bogus self assignment
@@ -6369,7 +6848,7 @@ class TestOther : public TestFixture {
               "void something(void) {}\n"
               "void f() {\n"
               "    struct callbacks ops = { .s = ops.s };\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (style) Redundant assignment of 'something' to itself.\n", "", errout_str());
 
         check("class V\n"
@@ -6384,12 +6863,12 @@ class TestOther : public TestFixture {
               "        x = x; y = y; z = z;\n"
               "    }\n"
               "    double x, y, z;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:10:11]: (style) Redundant assignment of 'x' to itself. [selfAssignment]\n"
                       "[test.cpp:10:18]: (style) Redundant assignment of 'y' to itself. [selfAssignment]\n"
                       "[test.cpp:10:25]: (style) Redundant assignment of 'z' to itself. [selfAssignment]\n", errout_str());
 
-        check("void f(int i) { i = !!i; }");
+        check("void f(int i) { i = !!i; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -6459,7 +6938,7 @@ class TestOther : public TestFixture {
               "    Lock(123);\n"
               "    std::cout << \"hello\" << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:15:5]: (style) Instance of 'Lock' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
     }
 
@@ -6478,7 +6957,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    CouldBeFunction ( 123 ) ;\n"
               "    return 0 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6495,7 +6974,7 @@ class TestOther : public TestFixture {
               "        error();\n"
               "        do_something();\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6505,7 +6984,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    NotAFunction ( 123 );\n"
               "    return 0 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (style) Instance of 'NotAFunction' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
     }
 
@@ -6515,7 +6994,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    NotAClass ( 123 ) ;\n"
               "    return true ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (style) Instance of 'NotAClass' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
     }
 
@@ -6524,7 +7003,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    if ( a > b ) return c == a ;\n"
               "    return b == a ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6534,7 +7013,7 @@ class TestOther : public TestFixture {
               "public:\n"
               "~Something ( ) ;\n"
               "Something ( ) ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6553,7 +7032,7 @@ class TestOther : public TestFixture {
               "    int a = 1;\n"
               "    IncrementFunctor()(a);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6566,7 +7045,7 @@ class TestOther : public TestFixture {
               "    };\n"
               "    Foo();\n"
               "    do_something();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (style) Instance of 'Foo' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
     }
 
@@ -6578,7 +7057,7 @@ class TestOther : public TestFixture {
               "\n"
               "void fn() {\n"
               "    Foo().bar();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6607,14 +7086,14 @@ class TestOther : public TestFixture {
               "void foo() {\n"
               "    stat(\"file.txt\", &st);\n"
               "    do_something();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("",errout_str());
 
         check("struct AMethodObject {\n" // #4336
               "    AMethodObject(double, double, double);\n"
               "};\n"
               "struct S {\n"
-              "    static void A(double, double, double);\n"
+              "    static void A(double a1, double a2, double a3);\n"
               "};\n"
               "void S::A(double const a1, double const a2, double const a3) {\n"
               "    AMethodObject(a1, a2, a3);\n"
@@ -6711,7 +7190,8 @@ class TestOther : public TestFixture {
               "    std::pair<int, int>(1, 2);\n"
               "    (void)0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:10]: (style) Instance of 'std::string' object is destroyed immediately. [unusedScopedObject]\n"
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) Redundant code: Found unused cast in expression '(void)0'. [constStatement]\n"
+                      "[test.cpp:2:10]: (style) Instance of 'std::string' object is destroyed immediately. [unusedScopedObject]\n"
                       "[test.cpp:3:10]: (style) Instance of 'std::string' object is destroyed immediately. [unusedScopedObject]\n"
                       "[test.cpp:4:10]: (style) Instance of 'std::pair' object is destroyed immediately. [unusedScopedObject]\n",
                       errout_str());
@@ -6760,7 +7240,7 @@ class TestOther : public TestFixture {
               "\n"
               "    { sigaction(SIGHUP, &sa, 0); };\n"
               "    { sigaction(SIGINT, &sa, 0); };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6771,76 +7251,76 @@ class TestOther : public TestFixture {
               "    };\n"
               "\n"
               "    const AB ab[3] = { AB(0), AB(1), AB(2) };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void clarifyCalculation() {
         check("int f(char c) {\n"
               "    return 10 * (c == 0) ? 1 : 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:26]: (style) Clarify calculation precedence for '*' and '?'. [clarifyCalculation]\n", errout_str());
 
         check("void f(char c) {\n"
               "    printf(\"%i\", 10 * (c == 0) ? 1 : 2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:32]: (style) Clarify calculation precedence for '*' and '?'. [clarifyCalculation]\n", errout_str());
 
         check("void f() {\n"
               "    return (2*a)?b:c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char c) {\n"
               "    printf(\"%i\", a + b ? 1 : 2);\n"
-              "}",dinit(CheckOptions, $.inconclusive = false));
+              "}\n",dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:2:24]: (style) Clarify calculation precedence for '+' and '?'. [clarifyCalculation]\n", errout_str());
 
         check("void f() {\n"
               "    std::cout << x << y ? 2 : 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (style) Clarify calculation precedence for '<<' and '?'. [clarifyCalculation]\n", errout_str());
 
         check("void f() {\n"
               "    int ab = a - b ? 2 : 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (style) Clarify calculation precedence for '-' and '?'. [clarifyCalculation]\n", errout_str());
 
         check("void f() {\n"
               "    int ab = a | b ? 2 : 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (style) Clarify calculation precedence for '|' and '?'. [clarifyCalculation]\n", errout_str());
 
         // ticket #195
         check("int f(int x, int y) {\n"
               "    return x >> ! y ? 8 : 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:21]: (style) Clarify calculation precedence for '>>' and '?'. [clarifyCalculation]\n", errout_str());
 
         check("int f() {\n"
               "   return shift < sizeof(int64_t)*8 ? 1 : 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { a = *p ? 1 : 2; }");
+        check("void f() { a = *p ? 1 : 2; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int x) { const char *p = x & 1 ? \"1\" : \"0\"; }");
+        check("void f(int x) { const char *p = x & 1 ? \"1\" : \"0\"; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void foo() { x = a % b ? \"1\" : \"0\"; }");
+        check("void foo() { x = a % b ? \"1\" : \"0\"; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int x) { return x & 1 ? '1' : '0'; }");
+        check("void f(int x) { return x & 1 ? '1' : '0'; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int x) { return x & 16 ? 1 : 0; }");
+        check("void f(int x) { return x & 16 ? 1 : 0; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int x) { return x % 16 ? 1 : 0; }");
+        check("void f(int x) { return x % 16 ? 1 : 0; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("enum {X,Y}; void f(int x) { return x & Y ? 1 : 0; }");
+        check("enum {X,Y}; void f(int x) { return x & Y ? 1 : 0; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6848,7 +7328,7 @@ class TestOther : public TestFixture {
         check("char* f(char* c) {\n"
               "    *c++;\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '*', result is not used. [constStatement]\n"
             "[test.cpp:2:7]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'? [clarifyStatement]\n",
@@ -6857,7 +7337,7 @@ class TestOther : public TestFixture {
         check("char* f(char** c) {\n"
               "    *c[5]--;\n"
               "    return *c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '*', result is not used. [constStatement]\n"
             "[test.cpp:2:10]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'? [clarifyStatement]\n",
@@ -6865,7 +7345,7 @@ class TestOther : public TestFixture {
 
         check("void f(Foo f) {\n"
               "    *f.a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '*', result is not used. [constStatement]\n"
             "[test.cpp:2:9]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'? [clarifyStatement]\n",
@@ -6873,7 +7353,7 @@ class TestOther : public TestFixture {
 
         check("void f(Foo f) {\n"
               "    *f.a[5].v[3]++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '*', result is not used. [constStatement]\n"
             "[test.cpp:2:17]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'? [clarifyStatement]\n",
@@ -6881,7 +7361,7 @@ class TestOther : public TestFixture {
 
         check("void f(Foo f) {\n"
               "    *f.a(1, 5).v[x + y]++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '*', result is not used. [constStatement]\n"
             "[test.cpp:2:24]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'? [clarifyStatement]\n",
@@ -6890,18 +7370,18 @@ class TestOther : public TestFixture {
         check("char* f(char* c) {\n"
               "    (*c)++;\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char* c) {\n"
               "    bar(*c++);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("char*** f(char*** c) {\n"
               "    ***c++;\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '*', result is not used. [constStatement]\n"
             "[test.cpp:2:9]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'? [clarifyStatement]\n",
@@ -6910,7 +7390,7 @@ class TestOther : public TestFixture {
         check("char** f(char*** c) {\n"
               "    **c[5]--;\n"
               "    return **c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '*', result is not used. [constStatement]\n"
             "[test.cpp:2:11]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'? [clarifyStatement]\n",
@@ -6919,7 +7399,7 @@ class TestOther : public TestFixture {
         check("char*** f(char*** c) {\n"
               "    (***c)++;\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const int*** p) {\n" // #10923
@@ -6929,12 +7409,12 @@ class TestOther : public TestFixture {
 
         check("void *f(char** c) {\n"
               "    bar(**c++);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void *f(char* p) {\n"
               "    for (p = path; *p++;) ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -6954,7 +7434,7 @@ class TestOther : public TestFixture {
               "        b = 1;\n"
               "    else\n"
               "        b = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:2:5]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n", errout_str());
 
         check("void f(int a, int &b) {\n"
@@ -6965,7 +7445,7 @@ class TestOther : public TestFixture {
               "            b = 2;\n"
               "    } else\n"
               "        b = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:3:9]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n", errout_str());
 
         check("void f(int a, int &b) {\n"
@@ -6977,7 +7457,7 @@ class TestOther : public TestFixture {
               "        else\n"
               "            b = 2;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:9] -> [test.cpp:5:9]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n", errout_str());
 
         check("int f(int signed, unsigned char value) {\n"
@@ -6987,7 +7467,7 @@ class TestOther : public TestFixture {
               "    else\n"
               "        ret = (unsigned char)value;\n"
               "    return ret;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -6995,7 +7475,7 @@ class TestOther : public TestFixture {
               "        __asm__(\"mov ax, bx\");\n"
               "    else\n"
               "        __asm__(\"mov bx, bx\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // #3407
 
         check("void f() {\n"
@@ -7003,7 +7483,7 @@ class TestOther : public TestFixture {
               "        __asm__(\"mov ax, bx\");\n"
               "    else\n"
               "        __asm__(\"mov ax, bx\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:2:5]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n", errout_str());
     }
 
@@ -7017,7 +7497,7 @@ class TestOther : public TestFixture {
               "    frac = front/(front-back);\n"
               "  else\n"
               "    frac = front/(front-back);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:3] -> [test.cpp:3:3]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n", errout_str());
 
         check("void f()\n"
@@ -7026,7 +7506,7 @@ class TestOther : public TestFixture {
               "  { frac = front/(front-back);}\n"
               "  else\n"
               "    frac = front/((front-back));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:3] -> [test.cpp:3:3]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n", errout_str());
 
         // No message about empty branches (#5354)
@@ -7036,7 +7516,7 @@ class TestOther : public TestFixture {
               "  {}\n"
               "  else\n"
               "  {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7048,7 +7528,7 @@ class TestOther : public TestFixture {
                "    DOSTUFF1\n"
                "  else\n"
                "    DOSTUFF2\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7060,7 +7540,7 @@ class TestOther : public TestFixture {
               "    } else {\n"
               "        x = j;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:5:7] -> [test.cpp:3:5]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n"
                       "[test.cpp:2:9]: (style) The scope of the variable 'j' can be reduced. [variableScope]\n",
                       errout_str());
@@ -7073,7 +7553,7 @@ class TestOther : public TestFixture {
               "    } else {\n"
               "        x = j;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7084,7 +7564,7 @@ class TestOther : public TestFixture {
               "    } else {\n"
               "        return new A::Z(true);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7098,7 +7578,7 @@ class TestOther : public TestFixture {
               "        unsigned int i = 0;\n"
               "        j = i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:7] -> [test.cpp:3:5]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n", errout_str());
 
         check("void f(bool b) {\n"
@@ -7110,7 +7590,7 @@ class TestOther : public TestFixture {
               "        unsigned int i = 0;\n"
               "        j = 1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
@@ -7120,7 +7600,7 @@ class TestOther : public TestFixture {
               "    } else {\n"
               "        int i = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
@@ -7132,7 +7612,16 @@ class TestOther : public TestFixture {
               "        int i = 0;\n"
               "        j = i;\n"
               "    }\n"
-              "}");
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(int i) {\n"
+              "  if (1 == i) {\n"
+              "    ;\n"
+              "  } else {\n"
+              "    ;\n"
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7142,7 +7631,7 @@ class TestOther : public TestFixture {
               "    } else {\n"
               "        int i = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
@@ -7150,14 +7639,14 @@ class TestOther : public TestFixture {
               "        int i = 0;\n"
               "    } else {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpression1() {
         check("void foo(int a) {\n"
               "    if (a == a) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
 
         check("void fun(int b) {\n"
@@ -7166,7 +7655,7 @@ class TestOther : public TestFixture {
               "            d > d &&\n"
               "            e < e &&\n"
               "            f ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Same expression on both sides of '&&'. [duplicateExpression]\n"
                       "[test.cpp:3:15]: (style) Same expression on both sides of '=='. [duplicateExpression]\n"
                       "[test.cpp:4:15]: (style) Same expression on both sides of '>'. [duplicateExpression]\n"
@@ -7174,82 +7663,82 @@ class TestOther : public TestFixture {
 
         check("void foo() {\n"
               "    return a && a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Same expression on both sides of '&&'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    a = b && b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Same expression on both sides of '&&'. [duplicateExpression]\n", errout_str());
 
         check("void foo(int b) {\n"
               "    f(a,b == b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
 
         check("void foo(int b) {\n"
               "    f(b == b, a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (x!=2 || x!=2) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Same expression on both sides of '||'. [duplicateExpression]\n", errout_str());
 
         check("void foo(int a, int b) {\n"
               "    if ((a < b) && (b > a)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Same expression on both sides of '&&' because 'a<b' and 'b>a' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void foo(int a, int b) {\n"
               "    if ((a <= b) && (b >= a)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (style) Same expression on both sides of '&&' because 'a<=b' and 'b>=a' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void foo() {\n"
               "    if (x!=2 || y!=3 || x!=2) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (style) Same expression 'x!=2' found multiple times in chain of '||' operators. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (x!=2 && (x=y) && x!=2) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if (a && b || a && b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (style) Same expression on both sides of '||'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (a && b || b && c) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if (a && b | b && c) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (style) Same expression on both sides of '|'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if ((a + b) | (a + b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Same expression on both sides of '|'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if ((a | b) & (a | b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Same expression on both sides of '&'. [duplicateExpression]\n", errout_str());
 
         check("void foo(int a, int b) {\n"
               "    if ((a | b) == (a | b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (a1[a2[c & 0xff] & 0xff]) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void d(const char f, int o, int v)\n"
@@ -7257,127 +7746,133 @@ class TestOther : public TestFixture {
               "     if (((f=='R') && (o == 1) && ((v < 2) || (v > 99))) ||\n"
               "         ((f=='R') && (o == 2) && ((v < 2) || (v > 99))) ||\n"
               "         ((f=='T') && (o == 2) && ((v < 200) || (v > 9999)))) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f(int x) { return x+x; }");
+        check("int f(int x) { return x+x; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int x) { while (x+=x) ; }");
+        check("void f(int x) { while (x+=x) ; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if (a && b && b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (style) Same expression on both sides of '&&'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (a || b || b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (style) Same expression on both sides of '||'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (a / 1000 / 1000) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(int i) {\n"
               "    return i/i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Same expression on both sides of '/'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (a << 1 << 1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f() { return !!y; }"); // No FP
+        check("int f() { return !!y; }\n"); // No FP
         ASSERT_EQUALS("", errout_str());
 
         // make sure there are not "same expression" fp when there are different casts
-        check("void f(long x) { if ((int32_t)x == (int64_t)x) {} }",
+        check("void f(long x) { if ((int32_t)x == (int64_t)x) {} }\n",
               dinit(CheckOptions, $.inconclusive = false)
               );
         ASSERT_EQUALS("", errout_str());
 
         // make sure there are not "same expression" fp when there are different ({}) expressions
-        check("void f(long x) { if (({ 1+2; }) == ({3+4;})) {} }");
+        check("void f(long x) { if (({ 1+2; }) == ({3+4;})) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5535: Reference named like its type
-        check("void foo() { UMSConfig& UMSConfig = GetUMSConfiguration(); }");
+        check("void foo() { UMSConfig& UMSConfig = GetUMSConfiguration(); }\n");
         ASSERT_EQUALS("[test.cpp:1:25]: (style) Variable 'UMSConfig' can be declared as reference to const [constVariableReference]\n", errout_str());
 
         // #3868 - false positive (same expression on both sides of |)
         check("void f(int x) {\n"
               "    a = x ? A | B | C\n"
               "          : A | B;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const Bar &bar) {\n"
               "    bool a = bar.isSet() && bar->isSet();\n"
               "    bool b = bar.isSet() && bar.isSet();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:26]: (style) Same expression on both sides of '&&'. [duplicateExpression]\n", errout_str());
 
 
         check("void foo(int a, int b) {\n"
               "    if ((b + a) | (a + b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Same expression on both sides of '|' because 'b+a' and 'a+b' represent the same value. [duplicateExpression]\n", errout_str());
 
         check("void foo(const std::string& a, const std::string& b) {\n"
               "  return a.find(b+\"&\") || a.find(\"&\"+b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a, int b) {\n"
               "    if ((b > a) | (a > b)) {}\n" // > is not commutative
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(double a, double b) {\n"
               "    if ((b + a) > (a + b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) The comparison 'b+a > a+b' is always false because 'b+a' and 'a+b' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x == 1) && (x == 0x00000001))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (style) Same expression on both sides of '&&' because 'x==1' and 'x==0x00000001' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    enum { Four = 4 };\n"
-              "    if (Four == 4) {}"
-              "}");
+              "    if (Four == 4) {}\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (style) The comparison 'Four == 4' is always true. [knownConditionTrueFalse]\n",
                       errout_str());
 
         check("void f() {\n"
               "    enum { Four = 4 };\n"
               "    static_assert(Four == 4, \"\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    enum { Four = 4 };\n"
               "    _Static_assert(Four == 4, \"\");\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n" // #15020
+              "    enum { Four = 4 };\n"
+              "    static_assert(Four == 4, \"\");\n"
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    enum { Four = 4 };\n"
               "    static_assert(4 == Four, \"\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    enum { FourInEnumOne = 4 };\n"
               "    enum { FourInEnumTwo = 4 };\n"
               "    if (FourInEnumOne == FourInEnumTwo) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:23]: (style) The comparison 'FourInEnumOne == FourInEnumTwo' is always true because 'FourInEnumOne' and 'FourInEnumTwo' represent the same value. [knownConditionTrueFalse]\n",
                       errout_str());
 
@@ -7385,13 +7880,13 @@ class TestOther : public TestFixture {
               "    enum { FourInEnumOne = 4 };\n"
               "    enum { FourInEnumTwo = 4 };\n"
               "    static_assert(FourInEnumOne == FourInEnumTwo, \"\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a, int b) {\n"
               "    if (sizeof(a) == sizeof(a)) { }\n"
               "    if (sizeof(a) == sizeof(b)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:19]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
 
         check("float bar(int) __attribute__((pure));\n"
@@ -7400,7 +7895,7 @@ class TestOther : public TestFixture {
               "    if (bar(a) == bar(a)) { }\n"
               "    if (unknown(a) == unknown(a)) { }\n"
               "    if (foo(a) == foo(a)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:16]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
     }
 
@@ -7410,25 +7905,25 @@ class TestOther : public TestFixture {
               "    if (!(dbl == dbl)) have_nan = 1;\n"
               "    if (flt != flt) have_nan = 1;\n"
               "    return have_nan;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("float f(float x) { return x-x; }"); // ticket #4485 (Inf)
+        check("float f(float x) { return x-x; }\n"); // ticket #4485 (Inf)
         ASSERT_EQUALS("", errout_str());
 
-        check("float f(float x) { return (X double)x == (X double)x; }", dinit(CheckOptions, $.inconclusive = false));
+        check("float f(float x) { return (X double)x == (X double)x; }\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("struct X { float f; };\n"
-              "float f(struct X x) { return x.f == x.f; }");
+              "float f(struct X x) { return x.f == x.f; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct X { int i; };\n"
-              "int f(struct X x) { return x.i == x.i; }");
+              "int f(struct X x) { return x.i == x.i; }\n");
         ASSERT_EQUALS("[test.cpp:2:32]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
 
         // #5284 - when type is unknown, assume it's float
-        check("int f() { return x==x; }");
+        check("int f() { return x==x; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7441,11 +7936,11 @@ class TestOther : public TestFixture {
                                    "    <arg nr=\"2\"/>\n"
                                    "  </function>\n"
                                    "</def>";
-        /*const*/ Settings settings = settingsBuilder().libraryxml(xmldata).build();
+        /*const*/ Settings settings = settingsBuilder().libraryxml(xmldata).severity(Severity::style).build();
 
         check("void foo() {\n"
               "    if (x() || x()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -7454,7 +7949,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void A::foo() const {\n"
               "    if (bar() && bar()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:15]: (style) Same expression on both sides of '&&'. [duplicateExpression]\n", errout_str());
 
         check("struct A {\n"
@@ -7464,7 +7959,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void A::foo() {\n"
               "    if (bar() && bar()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class B {\n"
@@ -7478,55 +7973,55 @@ class TestOther : public TestFixture {
               "    A a;\n"
               "    if (b.bar(1) && b.bar(1)) {}\n"
               "    if (a.bar(1) && a.bar(1)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:11:18]: (style) Same expression on both sides of '&&'. [duplicateExpression]\n", errout_str());
 
         check("class D { void strcmp(); };\n"
               "void foo() {\n"
               "    D d;\n"
               "    if (d.strcmp() && d.strcmp()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if ((mystrcmp(a, b) == 0) || (mystrcmp(a, b) == 0)) {}\n"
-              "}", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
+              "}\n", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:2:31]: (style) Same expression on both sides of '||'. [duplicateExpression]\n", errout_str());
 
         check("void GetValue() { return rand(); }\n"
               "void foo() {\n"
               "    if ((GetValue() == 0) || (GetValue() == 0)) { dostuff(); }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void __attribute__((const)) GetValue() { return X; }\n"
               "void foo() {\n"
               "    if ((GetValue() == 0) || (GetValue() == 0)) { dostuff(); }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:27]: (style) Same expression on both sides of '||'. [duplicateExpression]\n", errout_str());
 
         check("void GetValue() __attribute__((const));\n"
               "void GetValue() { return X; }\n"
               "void foo() {\n"
               "    if ((GetValue() == 0) || (GetValue() == 0)) { dostuff(); }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:27]: (style) Same expression on both sides of '||'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (str == \"(\" || str == \"(\") {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (style) Same expression on both sides of '||'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (bar(a) && !strcmp(a, b) && bar(a) && !strcmp(a, b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5334
         check("void f(C *src) {\n"
               "    if (x<A*>(src) || x<B*>(src))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(A *src) {\n"
@@ -7537,15 +8032,15 @@ class TestOther : public TestFixture {
         // #5819
         check("Vector func(Vector vec1) {\n"
               "    return fabs(vec1 & vec1 & vec1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("Vector func(int vec1) {\n"
               "    return fabs(vec1 & vec1 & vec1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:22]: (style) Same expression on both sides of '&'. [duplicateExpression]\n"
-            "[test.cpp:2:29]: (style) Same expression on both sides of '&'. [duplicateExpression]\n",   // duplicate
+            "[test.cpp:2:29]: (style) Same expression on both sides of '&'. [duplicateExpression]\n",
             errout_str());
 
     }
@@ -7553,25 +8048,25 @@ class TestOther : public TestFixture {
     void duplicateExpression4() {
         check("void foo() {\n"
               "    if (*a++ != b || *a++ != b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if (*a-- != b || *a-- != b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment
         check("void f() {\n"
               "  while (*(a+=2)==*(b+=2) && *(a+=2)==*(b+=2)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpression5() {  // #3749 - macros with same values
         check("void f() {\n"
               "    if ($a == $a) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkP("#define X 1\n"
@@ -7593,7 +8088,7 @@ class TestOther : public TestFixture {
     void duplicateExpression6() {  // #4639
         check("float IsNan(float value) { return !(value == value); }\n"
               "double IsNan(double value) { return !(value == value); }\n"
-              "long double IsNan(long double value) { return !(value == value); }");
+              "long double IsNan(long double value) { return !(value == value); }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7601,36 +8096,36 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "    const int i = sizeof(int);\n"
               "    if ( i != sizeof (int)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25] -> [test.cpp:3:12]: (style) The comparison 'i != sizeof(int)' is always false because 'i' and 'sizeof(int)' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    const int i = sizeof(int);\n"
               "    if ( sizeof (int) != i){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25] -> [test.cpp:3:23]: (style) The comparison 'sizeof(int) != i' is always false because 'sizeof(int)' and 'i' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
-        check("void f(int a = 1) { if ( a != 1){}}");
+        check("void f(int a = 1) { if ( a != 1){}}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a = 1;\n"
               "    if ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:3:12]: (style) The comparison 'a != 1' is always false. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    int a = 1;\n"
               "    int b = 1;\n"
               "    if ( a != b){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:3:13] -> [test.cpp:4:12]: (style) The comparison 'a != b' is always false because 'a' and 'b' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    int a = 1;\n"
               "    int b = a;\n"
               "    if ( a != b){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13] -> [test.cpp:4:12]: (style) The comparison 'a != b' is always false because 'a' and 'b' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void use(int);\n"
@@ -7639,7 +8134,7 @@ class TestOther : public TestFixture {
               "    int b = 1;\n"
               "    use(b);\n"
               "    if ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13] -> [test.cpp:6:12]: (style) The comparison 'a != 1' is always false. [knownConditionTrueFalse]\n", errout_str());
 
         check("void use(int);\n"
@@ -7648,7 +8143,7 @@ class TestOther : public TestFixture {
               "    use(a);\n"
               "    a = 2;\n"
               "    if ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void use(int);\n"
@@ -7657,38 +8152,38 @@ class TestOther : public TestFixture {
               "    use(a);\n"
               "    a = 1;\n"
               "    if ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const int a = 1;\n"
               "void f() {\n"
               "    if ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:15] -> [test.cpp:3:12]: (style) The comparison 'a != 1' is always false. [knownConditionTrueFalse]\n", errout_str());
 
         check("int a = 1;\n"
               "    void f() {\n"
               "    if ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    static const int a = 1;\n"
               "    if ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:26] -> [test.cpp:3:12]: (style) The comparison 'a != 1' is always false. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    static int a = 1;\n"
               "    if ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a = 1;\n"
               "    if ( a != 1){\n"
               "        a++;\n"
-              "    }}");
+              "    }}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:3:12]: (style) The comparison 'a != 1' is always false. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int b) {\n"
@@ -7697,13 +8192,13 @@ class TestOther : public TestFixture {
               "        if ( a != 1){}\n"
               "        a++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(bool a, bool b) {\n"
               "    const bool c = a;\n"
               "    return a && b && c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20] -> [test.cpp:3:19]: (style) Same expression 'a' found multiple times in chain of '&&' operators because 'a' and 'c' represent the same value. [knownConditionTrueFalse]\n",
                       errout_str());
 
@@ -7711,13 +8206,13 @@ class TestOther : public TestFixture {
         check("void f(const bool b) {\n"
               "   const bool b1 = !b;\n"
               "   if(!b && b1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20] -> [test.cpp:3:10]: (style) Same expression on both sides of '&&' because '!b' and 'b1' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         // 7284
         check("void f(void) {\n"
               "   if (a || !!a) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Same expression on both sides of '||' because 'a' and '!!a' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         // 8205
@@ -7728,7 +8223,7 @@ class TestOther : public TestFixture {
               "       if (Diag==0) {}\n"
               "       break;\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15] -> [test.cpp:5:16]: (style) The comparison 'Diag == 0' is always true. [knownConditionTrueFalse]\n", errout_str());
 
         // #9744
@@ -7756,13 +8251,13 @@ class TestOther : public TestFixture {
               "    int b = a;\n"
               "    a = 2;\n"
               "    if ( b != a){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int * a, int i) { int b = a[i]; a[i] = 2; if ( b != a[i]){}}");
+        check("void f(int * a, int i) { int b = a[i]; a[i] = 2; if ( b != a[i]){}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int * a, int i) { int b = *a; *a = 2; if ( b != *a){}}");
+        check("void f(int * a, int i) { int b = *a; *a = 2; if ( b != *a){}}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int f() const; };\n"
@@ -7773,7 +8268,7 @@ class TestOther : public TestFixture {
               "        x = g();\n"
               "        if (x.f() == a) break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int i);\n"
@@ -7786,14 +8281,14 @@ class TestOther : public TestFixture {
               "    const bool x = a.f(A::B);\n"
               "    const bool y = a.f(A::C);\n"
               "    if(!x && !y) return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    const bool x = a.f(A::B);\n"
               "    const bool y = a.f(A::C);\n"
               "    if (!x && !y) return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool * const b);\n"
@@ -7802,17 +8297,17 @@ class TestOther : public TestFixture {
               "    bool y = true;\n"
               "    f(&x);\n"
               "    if (!x && !y) return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const int a = {};\n"
               "    if(a == 1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("volatile const int var = 42;\n"
-              "void f() { if(var == 42) {} }");
+              "void f() { if(var == 42) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -7821,7 +8316,7 @@ class TestOther : public TestFixture {
               "    c.a = &a;\n"
               "    g(&c);\n"
               "    if (a == 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7831,7 +8326,7 @@ class TestOther : public TestFixture {
               "  uint16_t x = 1000;\n"
               "  uint8_t y = x;\n"
               "  if (x != y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7842,7 +8337,7 @@ class TestOther : public TestFixture {
               "   const int b = a-1;\n"
               "   const int c = a+1;\n"
               "   return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7851,7 +8346,7 @@ class TestOther : public TestFixture {
               "public:\n"
               "    double getScale() const { return m_range * m_zoom; }\n"
               "    void setZoom(double z) { m_zoom = z; }\n"
-              "    void dostuff(int);\n"
+              "    void dostuff(int x);\n"
               "private:\n"
               "    double m_zoom;\n"
               "    double m_range;\n"
@@ -7863,7 +8358,7 @@ class TestOther : public TestFixture {
               "        setZoom(m_zoom + 1);\n"
               "        double scale_ratio = getScale() / old_scale;\n" // <- FP
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7872,14 +8367,14 @@ class TestOther : public TestFixture {
               "{\n"
               "        int var = buffer[index - 1];\n"
               "        return buffer[index - 1] - var;\n"  // <<
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25] -> [test.cpp:4:34]: (style) Same expression on both sides of '-' because 'buffer[index-1]' and 'var' represent the same value. [duplicateExpression]\n", errout_str());
     }
 
     void duplicateExpression13() { //#7899
         check("void f() {\n"
               "    if (sizeof(long) == sizeof(long long)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -8010,50 +8505,125 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
-    void duplicateExpressionLoop() {
-        check("void f() {\n"
-              "    int a = 1;\n"
-              "    while ( a != 1){}\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:3:15]: (style) The comparison 'a != 1' is always false. [knownConditionTrueFalse]\n", errout_str());
-
-        check("void f() { int a = 1; while ( a != 1){ a++; }}");
+    void duplicateExpression20() {
+        check("enum { N = 1 };\n" // #14202
+              "int f() { return N - 1; }\n");
         ASSERT_EQUALS("", errout_str());
+    }
 
-        check("void f() { int a = 1; for ( int i=0; i < 3 && a != 1; i++){ a++; }}");
+    void duplicateExpression21() {
+        check("struct S { int i; };\n" // #12795
+              "struct T {\n"
+              "    std::map<std::string, S*> m;\n"
+              "    S* get(const std::string& s) { return m[s]; }\n"
+              "    void modify() { for (const auto& e : m) e.second->i = 0; }\n"
+              "};\n"
+              "void f(T& t) {\n"
+              "    const S* p = t.get(\"abc\");\n"
+              "    const int o = p->i;\n"
+              "    t.modify();\n"
+              "    if (p->i == o) {}\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int b) { int a = 1; while (b) { if ( a != 1){} b++; } a++; }");
+        check("struct S { int i; };\n"
+              "    struct T {\n"
+              "    std::vector<S*> m;\n"
+              "    void modify() { for (auto e : m) e->i = 0; }\n"
+              "};\n"
+              "void f(T& t) {\n"
+              "    const S* p = t.m[0];\n"
+              "    const int o = p->i;\n"
+              "    t.modify();\n"
+              "    if (p->i == o) {}\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
+    }
 
-        check("void f() {\n"
-              "    for(int i = 0; i < 10;) {\n"
-              "        if( i != 0 ) {}\n"
-              "    }\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:2:17] -> [test.cpp:3:15]: (style) The comparison 'i != 0' is always false. [knownConditionTrueFalse]\n", errout_str());
-
-        check("void f() {\n"
-              "    for(int i = 0; i < 10;) {\n"
-              "        if( i != 0 ) {}\n"
-              "        i++;\n"
-              "    }\n"
-              "}");
+    void duplicateExpression23() { // #12282
+        // long double literals out of the range of double are different values
+        check("long double f() {\n"
+              "    return 1e400L / 1e500L;\n"
+              "}\n"
+              "int g(long double x) {\n"
+              "    return x == 1e400L || x == 1e500L;\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
+    }
 
-        check("void f() {\n"
-              "    for(int i = 0; i < 10;) {\n"
+    void duplicateExpression22() {
+        check("int f() {\n" // #14913
+              "    return 0x1 | (0x2 | 0x4) | 0x1;\n"
+              "}\n"
+              "int g() {\n"
+              "    return 0x1 | (0x2 | 0x1);\n"
+              "}\n"
+              "int h() {\n"
+              "    return 0x1 | (0x1 | 0x2);\n"
+              "}\n"
+              "int i() {\n"
+              "    return 0x2 | (0x4 | 0x1) | 0x1;\n"
+              "}\n"
+              "int j() {\n"
+              "    return 0x2 | (0x1 | 0x4) | 0x1;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:30]: (style) Same expression '0x1' found multiple times in chain of '|' operators. [duplicateExpression]\n"
+                      "[test.cpp:5:23]: (style) Same expression '0x1' found multiple times in chain of '|' operators. [duplicateExpression]\n"
+                      "[test.cpp:8:23]: (style) Same expression '0x1' found multiple times in chain of '|' operators. [duplicateExpression]\n"
+                      "[test.cpp:11:23]: (style) Same expression '0x1' found multiple times in chain of '|' operators. [duplicateExpression]\n"
+                      "[test.cpp:14:23]: (style) Same expression '0x1' found multiple times in chain of '|' operators. [duplicateExpression]\n",
+                      errout_str());
+
+        check("bool f(const int** a, const int** b) {\n"
+              "    return (a[0] != nullptr) != (b[0] != nullptr);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void duplicateExpressionLoop() {
+        check("void f() {\n"
+              "    int a = 1;\n"
+              "    while ( a != 1){}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:3:15]: (style) The comparison 'a != 1' is always false. [knownConditionTrueFalse]\n", errout_str());
+
+        check("void f() { int a = 1; while ( a != 1){ a++; }}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() { int a = 1; for ( int i=0; i < 3 && a != 1; i++){ a++; }}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(int b) { int a = 1; while (b) { if ( a != 1){} b++; } a++; }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    for(int i = 0; i < 10;) {\n"
+              "        if( i != 0 ) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:17] -> [test.cpp:3:15]: (style) The comparison 'i != 0' is always false. [knownConditionTrueFalse]\n", errout_str());
+
+        check("void f() {\n"
+              "    for(int i = 0; i < 10;) {\n"
+              "        if( i != 0 ) {}\n"
+              "        i++;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    for(int i = 0; i < 10;) {\n"
               "        if( i != 0 ) { i++; }\n"
               "        i++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    for(int i = 0; i < 10;) {\n"
               "        if( i != 0 ) { i++; }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -8062,7 +8632,7 @@ class TestOther : public TestFixture {
               "        if( i != 0 ) {}\n"
               "        i++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int b) {\n"
@@ -8071,7 +8641,7 @@ class TestOther : public TestFixture {
               "        if ( a != 1){}\n"
               "        b++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17] -> [test.cpp:4:16]: (style) The comparison 'a != 1' is always false. [knownConditionTrueFalse]\n", errout_str());
 
         check("struct T {\n" // #11083
@@ -8114,36 +8684,36 @@ class TestOther : public TestFixture {
     void duplicateExpressionTernary() { // #6391
         check("void f() {\n"
               "    return A ? x : x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
 
         check("int f(bool b, int a) {\n"
               "    const int c = a;\n"
               "    return b ? a : c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:19] -> [test.cpp:3:18]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
 
         check("void f() {\n"
               "    return A ? x : z;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(unsigned char c) {\n"
               "  x = y ? (signed char)c : (unsigned char)c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string stringMerge(std::string const& x, std::string const& y) {\n" // #7938
               "    return ((x > y) ? (y + x) : (x + y));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6426
         {
             const char code[] = "void foo(bool flag) {\n"
                                 "  bar( (flag) ? ~0u : ~0ul);\n"
-                                "}";
-            /*const*/ Settings settings = settings0;
+                                "}\n";
+            /*const*/ Settings settings = settings1;
             settings.platform.sizeof_int = 4;
             settings.platform.int_bit = 32;
 
@@ -8162,31 +8732,31 @@ class TestOther : public TestFixture {
     void duplicateValueTernary() {
         check("void f() {\n"
               "    if( a ? (b ? false:false): false ) ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
 
-        check("int f1(int a) {return (a == 1) ? (int)1 : 1; }");
+        check("int f1(int a) {return (a == 1) ? (int)1 : 1; }\n");
         ASSERT_EQUALS("[test.cpp:1:41]: (style) Same value in both branches of ternary operator. [duplicateValueTernary]\n", errout_str());
 
-        check("int f2(int a) {return (a == 1) ? (int)1 : (int)1; }");
+        check("int f2(int a) {return (a == 1) ? (int)1 : (int)1; }\n");
         ASSERT_EQUALS("[test.cpp:1:41]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
 
-        check("int f3(int a) {return (a == 1) ? 1 : (int)1; }");
+        check("int f3(int a) {return (a == 1) ? 1 : (int)1; }\n");
         ASSERT_EQUALS("[test.cpp:1:36]: (style) Same value in both branches of ternary operator. [duplicateValueTernary]\n", errout_str());
 
-        check("int f4(int a) {return (a == 1) ? 1 : 1; }");
+        check("int f4(int a) {return (a == 1) ? 1 : 1; }\n");
         ASSERT_EQUALS("[test.cpp:1:36]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
 
-        check("int f5(int a) {return (a == (int)1) ? (int)1 : 1; }");
+        check("int f5(int a) {return (a == (int)1) ? (int)1 : 1; }\n");
         ASSERT_EQUALS("[test.cpp:1:46]: (style) Same value in both branches of ternary operator. [duplicateValueTernary]\n", errout_str());
 
-        check("int f6(int a) {return (a == (int)1) ? (int)1 : (int)1; }");
+        check("int f6(int a) {return (a == (int)1) ? (int)1 : (int)1; }\n");
         ASSERT_EQUALS("[test.cpp:1:46]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
 
-        check("int f7(int a) {return (a == (int)1) ? 1 : (int)1; }");
+        check("int f7(int a) {return (a == (int)1) ? 1 : (int)1; }\n");
         ASSERT_EQUALS("[test.cpp:1:41]: (style) Same value in both branches of ternary operator. [duplicateValueTernary]\n", errout_str());
 
-        check("int f8(int a) {return (a == (int)1) ? 1 : 1; }");
+        check("int f8(int a) {return (a == (int)1) ? 1 : 1; }\n");
         ASSERT_EQUALS("[test.cpp:1:41]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
 
         check("struct Foo {\n"
@@ -8240,10 +8810,10 @@ class TestOther : public TestFixture {
     }
 
     void duplicateValueTernarySizeof() { // #13773
-        check("int f() { return x ? sizeof(uint32_t) : sizeof(unsigned int); }");
+        check("int f() { return x ? sizeof(uint32_t) : sizeof(unsigned int); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f() { return x ? sizeof(uint32_t) : sizeof(uint32_t); }");
+        check("int f() { return x ? sizeof(uint32_t) : sizeof(uint32_t); }\n");
         ASSERT_EQUALS("[test.cpp:1:39]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
     }
 
@@ -8252,7 +8822,7 @@ class TestOther : public TestFixture {
               "    if (I >= 0 && I < 3) {}\n"
               "}\n"
               "\n"
-              "static auto a = f<0>();");
+              "static auto a = f<0>();\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<typename T>\n" // #7754
@@ -8338,35 +8908,35 @@ class TestOther : public TestFixture {
     }
 
     void oppositeExpression() {
-        check("void f(bool a) { if(a && !a) {} }");
+        check("void f(bool a) { if(a && !a) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (style) Opposite expression on both sides of '&&'. [oppositeExpression]\n", errout_str());
 
-        check("void f(bool a) { if(a != !a) {} }");
+        check("void f(bool a) { if(a != !a) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (style) Opposite expression on both sides of '!='. [oppositeExpression]\n", errout_str());
 
-        check("void f(bool a) { if( a == !(a) ) {}}");
+        check("void f(bool a) { if( a == !(a) ) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:24]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n", errout_str());
 
-        check("void f(bool a) { if( a != !(a) ) {}}");
+        check("void f(bool a) { if( a != !(a) ) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:24]: (style) Opposite expression on both sides of '!='. [oppositeExpression]\n", errout_str());
 
-        check("void f(bool a) { if( !(a) == a ) {}}");
+        check("void f(bool a) { if( !(a) == a ) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:27]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n", errout_str());
 
-        check("void f(bool a) { if( !(a) != a ) {}}");
+        check("void f(bool a) { if( !(a) != a ) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:27]: (style) Opposite expression on both sides of '!='. [oppositeExpression]\n", errout_str());
 
-        check("void f(bool a) { if( !(!a) == !(a) ) {}}");
+        check("void f(bool a) { if( !(!a) == !(a) ) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:28]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n", errout_str());
 
-        check("void f(bool a) { if( !(!a) != !(a) ) {}}");
+        check("void f(bool a) { if( !(!a) != !(a) ) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:28]: (style) Opposite expression on both sides of '!='. [oppositeExpression]\n", errout_str());
 
         check("void f1(bool a) {\n"
               "    const bool b = a;\n"
               "    if( a == !(b) ) {}\n"
               "    if( b == !(a) ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20] -> [test.cpp:3:11]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n"
                       "[test.cpp:2:20] -> [test.cpp:4:11]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n", errout_str());
 
@@ -8374,26 +8944,26 @@ class TestOther : public TestFixture {
               "    const bool b = *a;\n"
               "    if( *a == !(b) ) {}\n"
               "    if( b == !(*a) ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20] -> [test.cpp:3:12]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n"
                       "[test.cpp:2:20] -> [test.cpp:4:11]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n", errout_str());
 
-        check("void f(bool a) { a = !a; }");
+        check("void f(bool a) { a = !a; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int a) { if( a < -a ) {}}");
+        check("void f(int a) { if( a < -a ) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (style) Opposite expression on both sides of '<'. [oppositeExpression]\n", errout_str());
 
-        check("void f(int a) { a -= -a; }");
+        check("void f(int a) { a -= -a; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int a) { a = a / (-a); }");
+        check("void f(int a) { a = a / (-a); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("bool f(int i){ return !((i - 1) & i); }");
+        check("bool f(int i){ return !((i - 1) & i); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("bool f(unsigned i){ return (x > 0) && (x & (x-1)) == 0; }");
+        check("bool f(unsigned i){ return (x > 0) && (x & (x-1)) == 0; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void A::f(bool a, bool c)\n"
@@ -8401,27 +8971,27 @@ class TestOther : public TestFixture {
               "    const bool b = a;\n"
               "    if(c) { a = false; }\n"
               "    if(b && !a) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool c) {\n"
               "    const bool b = a;\n"
               "    if(c) { a = false; }\n"
               "    if(b && !a) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    bool x = a;\n"
               "    dostuff();\n"
               "    if (x && a) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  const bool b = g();\n"
               "  if (!b && g()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const bool *a) {\n"
@@ -8464,7 +9034,7 @@ class TestOther : public TestFixture {
               "void test() {\n"
               "    int i = f();\n"
               "    int j = f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("struct Foo { int f() const; int g() const; };\n"
@@ -8472,7 +9042,7 @@ class TestOther : public TestFixture {
               "    Foo f = Foo{};\n"
               "    int i = f.f();\n"
               "    int j = f.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("struct Foo { int f() const; int g() const; };\n"
@@ -8481,7 +9051,7 @@ class TestOther : public TestFixture {
               "    Foo f2 = Foo{};\n"
               "    int i = f.f();\n"
               "    int j = f.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:9] -> [test.cpp:5:9]: (style) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("int f() __attribute__((pure));\n"
@@ -8489,7 +9059,7 @@ class TestOther : public TestFixture {
               "void test() {\n"
               "    int i = 1 + f();\n"
               "    int j = 1 + f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("int f() __attribute__((pure));\n"
@@ -8497,7 +9067,7 @@ class TestOther : public TestFixture {
               "void test() {\n"
               "    int i = f() + 1;\n"
               "    int j = 1 + f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() __attribute__((pure));\n"
@@ -8506,7 +9076,7 @@ class TestOther : public TestFixture {
               "    int x = f();\n"
               "    int i = x + 1;\n"
               "    int j = f() + 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() __attribute__((pure));\n"
@@ -8514,7 +9084,7 @@ class TestOther : public TestFixture {
               "void test() {\n"
               "    int i = f() + f();\n"
               "    int j = f() + f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("int f(int) __attribute__((pure));\n"
@@ -8522,7 +9092,7 @@ class TestOther : public TestFixture {
               "void test() {\n"
               "    int i = f(0);\n"
               "    int j = f(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("int f(int) __attribute__((pure));\n"
@@ -8531,39 +9101,39 @@ class TestOther : public TestFixture {
               "    const int x = 0;\n"
               "    int i = f(0);\n"
               "    int j = f(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test(const int * p, const int * q) {\n"
               "    int i = *p;\n"
               "    int j = *p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:2:9]: (style) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("struct A { int x; int y; };"
               "void test(A a) {\n"
               "    int i = a.x;\n"
               "    int j = a.x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:2:9]: (style) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("void test() {\n"
               "    int i = 0;\n"
               "    int j = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test() {\n"
               "    int i = -1;\n"
               "    int j = -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int);\n"
               "void test() {\n"
               "    int i = f(0);\n"
               "    int j = f(1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f();\n"
@@ -8571,21 +9141,21 @@ class TestOther : public TestFixture {
               "void test() {\n"
               "    int i = f() || f();\n"
               "    int j = f() && f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo {};\n"
               "void test() {\n"
               "    Foo i = Foo();\n"
               "    Foo j = Foo();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo {};\n"
               "void test() {\n"
               "    Foo i = Foo{};\n"
               "    Foo j = Foo{};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo { int f() const; float g() const; };\n"
@@ -8593,7 +9163,7 @@ class TestOther : public TestFixture {
               "    Foo f = Foo{};\n"
               "    int i = f.f();\n"
               "    int j = f.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("struct Foo { int f(); int g(); };\n"
@@ -8601,43 +9171,43 @@ class TestOther : public TestFixture {
               "    Foo f = Foo{};\n"
               "    int i = f.f();\n"
               "    int j = f.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test() {\n"
               "    int i = f();\n"
               "    int j = f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test(int x) {\n"
               "    int i = ++x;\n"
               "    int j = ++x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test(int x) {\n"
               "    int i = x++;\n"
               "    int j = x++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test(int x) {\n"
               "    int i = --x;\n"
               "    int j = --x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test(int x) {\n"
               "    int i = x--;\n"
               "    int j = x--;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test(int x) {\n"
               "    int i = x + 1;\n"
               "    int j = 1 + x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -8646,7 +9216,7 @@ class TestOther : public TestFixture {
               "void foo(SW* x) {\n"
               "    int start = x->first;\n"
               "    int end   = x->first;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'start' and 'end'. [duplicateAssignExpression]\n"
                       "[test.cpp:2:14]: (style) Parameter 'x' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -8655,7 +9225,7 @@ class TestOther : public TestFixture {
               "void foo(SW* x, int i, int j) {\n"
               "    int start = x->first;\n"
               "    int end   = x->first;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'start' and 'end'. [duplicateAssignExpression]\n"
                       "[test.cpp:2:14]: (style) Parameter 'x' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -8665,13 +9235,13 @@ class TestOther : public TestFixture {
               "    Foo f = Foo{};\n"
               "    int i = f.f();\n"
               "    int j = f.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("void test(const int * p) {\n"
               "    int i = *p;\n"
               "    int j = *p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:2:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("struct Foo { int f() const; int g(int) const; };\n"
@@ -8679,7 +9249,7 @@ class TestOther : public TestFixture {
               "    Foo f = Foo{};\n"
               "    int i = f.f();\n"
               "    int j = f.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("struct Foo { int f() const; };\n"
@@ -8687,7 +9257,7 @@ class TestOther : public TestFixture {
               "    Foo f = Foo{};\n"
               "    int i = f.f();\n"
               "    int j = f.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
     }
 
@@ -8699,7 +9269,7 @@ class TestOther : public TestFixture {
               "    int j = a.x;\n"
               "    use(i);\n"
               "    i = j;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("struct A { int x; int y; };"
@@ -8709,7 +9279,7 @@ class TestOther : public TestFixture {
               "    int j = a.x;\n"
               "    use(j);\n"
               "    j = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("struct A { int x; int y; };"
@@ -8719,10 +9289,9 @@ class TestOther : public TestFixture {
               "    int j = a.x;\n"
               "    use(j);\n"
               "    if (i == j) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n"
-            "[test.cpp:3:14] -> [test.cpp:4:14] -> [test.cpp:6:11]: (style) The comparison 'i == j' is always true because 'i' and 'j' represent the same value. [knownConditionTrueFalse]\n",
+            "[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n",
             errout_str());
 
         check("struct A { int x; int y; };"
@@ -8732,10 +9301,9 @@ class TestOther : public TestFixture {
               "    int j = a.x;\n"
               "    use(j);\n"
               "    if (i == a.x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n"
-            "[test.cpp:3:14] -> [test.cpp:6:11]: (style) The comparison 'i == a.x' is always true because 'i' and 'a.x' represent the same value. [knownConditionTrueFalse]\n",
+            "[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n",
             errout_str());
 
         check("struct A { int x; int y; };"
@@ -8745,10 +9313,9 @@ class TestOther : public TestFixture {
               "    int j = a.x;\n"
               "    use(i);\n"
               "    if (j == a.x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n"
-            "[test.cpp:4:14] -> [test.cpp:6:11]: (style) The comparison 'j == a.x' is always true because 'j' and 'a.x' represent the same value. [knownConditionTrueFalse]\n",
+            "[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n",
             errout_str());
 
         // Issue #8612
@@ -8777,7 +9344,7 @@ class TestOther : public TestFixture {
               "        }\n"
               "        previous = current;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:16:7] -> [test.cpp:15:7]: (style, inconclusive) Same expression used in consecutive assignments of 'current' and 'previous'. [duplicateAssignExpression]\n", errout_str());
     }
 
@@ -8793,21 +9360,21 @@ class TestOther : public TestFixture {
               "        int b = x.f();\n"
               "        (void)a;\n"
               "        (void)b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:13] -> [test.cpp:7:13]: (style, inconclusive) Same expression used in consecutive assignments of 'a' and 'b'. [duplicateAssignExpression]\n", errout_str());
 
         // Issue #8712
         check("void f() {\n"
               "  unsigned char d;\n"
               "  d = d % 5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template <typename T>\n"
               "T f() {\n"
               "  T x = T();\n"
               "}\n"
-              "int &a = f<int&>();");
+              "int &a = f<int&>();\n");
         ASSERT_EQUALS("", errout_str());
 
         // Issue #8713
@@ -8819,7 +9386,7 @@ class TestOther : public TestFixture {
               "  uint32_t a = 42;\n"
               "  uint32_t b = uint32_t(A ::B / 1024);\n"
               "  int32_t c = int32_t(a / b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Issue #8709
@@ -8828,7 +9395,7 @@ class TestOther : public TestFixture {
               "  switch (d) { case b:; }\n"
               "  double e(b);\n"
               "  if(e <= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10718
@@ -8849,7 +9416,7 @@ class TestOther : public TestFixture {
               "  int val = 0;\n"
               "  if (val < 0) continue;\n"
               "  if ((val > 0)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:3:11]: (style) The comparison 'val < 0' is always false. [knownConditionTrueFalse]\n"
                       "[test.cpp:2:13] -> [test.cpp:4:12]: (style) The comparison 'val > 0' is always false. [knownConditionTrueFalse]\n", errout_str());
 
@@ -8880,7 +9447,7 @@ class TestOther : public TestFixture {
               "  if (val < 0) {\n"
               "    if ((val > 0)) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:3:11]: (style) The comparison 'val < 0' is always false. [knownConditionTrueFalse]\n"
                       "[test.cpp:2:13] -> [test.cpp:4:14]: (style) The comparison 'val > 0' is always false. [knownConditionTrueFalse]\n", errout_str());
 
@@ -8889,7 +9456,7 @@ class TestOther : public TestFixture {
               "  if (val < 0) {\n"
               "    if ((val < 0)) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:3:11]: (style) The comparison 'val < 0' is always false. [knownConditionTrueFalse]\n"
                       "[test.cpp:2:13] -> [test.cpp:4:14]: (style) The comparison 'val < 0' is always false. [knownConditionTrueFalse]\n", errout_str());
 
@@ -8898,25 +9465,25 @@ class TestOther : public TestFixture {
               "  int foo = 0;\n"
               "  if (activate) {}\n"
               "  else if (foo) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void checkSignOfUnsignedVariable() {
         check("void foo() {\n"
               "  for(unsigned char i = 10; i >= 0; i--) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:31]: (style) Unsigned expression 'i' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(bool b) {\n"
               "  for(unsigned int i = 10; b || i >= 0; i--) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:35]: (style) Unsigned expression 'i' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         {
             const char code[] = "void foo(unsigned int x) {\n"
                                 "  if (x < 0) {}\n"
-                                "}";
+                                "}\n";
             check(code, dinit(CheckOptions, $.inconclusive = false));
             ASSERT_EQUALS("[test.cpp:2:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
             check(code, dinit(CheckOptions, $.inconclusive = false, $.verbose = true));
@@ -8925,19 +9492,19 @@ class TestOther : public TestFixture {
 
         check("void foo(unsigned int x) {\n"
               "  if (x < 0u) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(int x) {\n"
               "  if (x < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
             const char code[] = "void foo(unsigned x) {\n"
                                 "  int y = 0;\n"
                                 "  if (x < y) {}\n"
-                                "}";
+                                "}\n";
             check(code, dinit(CheckOptions, $.inconclusive = false));
             ASSERT_EQUALS("[test.cpp:3:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
             check(code, dinit(CheckOptions, $.inconclusive = false, $.verbose = true));
@@ -8948,149 +9515,149 @@ class TestOther : public TestFixture {
               "  if (b)\n"
               "    y = 1;\n"
               "  if (x < y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x) {\n"
               "  if (0 > x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(unsigned int x) {\n"
               "  if (0UL > x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(int x) {\n"
               "  if (0 > x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x) {\n"
               "  if (x >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(unsigned int x, unsigned y) {\n"
               "  if (x - y >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Unsigned expression 'x-y' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(unsigned int x) {\n"
               "  if (x >= 0ull) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(int x) {\n"
               "  if (x >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x) {\n"
               "  if (0 <= x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(unsigned int x) {\n"
               "  if (0ll <= x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(int x) {\n"
               "  if (0 <= x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (x < 0 && y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (x < 0 && y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (0 > x && y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (0 > x && y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (x >= 0 && y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (x >= 0 && y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (y && x < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (y && x < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (y && 0 > x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (y && 0 > x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (y && x >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (y && x >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (x < 0 || y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (x < 0 || y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (0 > x || y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (0 > x || y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (x >= 0 || y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (x >= 0 || y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3233 - FP when template is used (template parameter is numeric constant)
@@ -9098,7 +9665,7 @@ class TestOther : public TestFixture {
             const char code[] = "template<int n> void foo(unsigned int x) {\n"
                                 "  if (x <= n);\n"
                                 "}\n"
-                                "foo<0>();";
+                                "foo<0>();\n";
             check(code, dinit(CheckOptions, $.inconclusive = false));
             ASSERT_EQUALS("", errout_str());
             check(code);
@@ -9108,7 +9675,7 @@ class TestOther : public TestFixture {
         {
             check("template<int n> void foo(unsigned int x) {\n"
                   "if (x <= 0);\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("[test.cpp:2:7]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
         }
 
@@ -9119,7 +9686,7 @@ class TestOther : public TestFixture {
               "  {\n"
               "    value = 0u;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (style) Checking if unsigned expression 'value' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         // #9040
@@ -9136,7 +9703,7 @@ class TestOther : public TestFixture {
               "   const uint32_t x = 0;\n"
               "   constexpr const auto y = 0xFFFFU;\n"
               "   if (y < x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) Checking if unsigned expression 'y' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         // #12387
@@ -9148,28 +9715,46 @@ class TestOther : public TestFixture {
               "}\n"
               "void g() {\n"
               "    f<uint32_t>(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #13734
         check("void f() {\n"
               "    uint8_t a[N + 1];\n"
               "    for (unsigned p = 0; p < (sizeof(a) / sizeof((a)[0])); ++p) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(const unsigned char u) {\n"
+              "    if (u >  0) {}\n"
+              "    if (u <  0) {}\n"
+              "    if (u >= 0) {}\n"
+              "    if (u <= 0) {}\n"
+              "    if (0 <  u) {}\n"
+              "    if (0 >  u) {}\n"
+              "    if (0 <= u) {}\n"
+              "    if (0 >= u) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Checking if unsigned expression 'u' is less than zero. [unsignedLessThanZero]\n"
+                      "[test.cpp:4:11]: (style) Unsigned expression 'u' can't be negative so it is unnecessary to test it. [unsignedPositive]\n"
+                      "[test.cpp:5:11]: (style) Checking if unsigned expression 'u' is less than zero. [unsignedLessThanZero]\n"
+                      "[test.cpp:7:11]: (style) Checking if unsigned expression 'u' is less than zero. [unsignedLessThanZero]\n"
+                      "[test.cpp:8:11]: (style) Unsigned expression 'u' can't be negative so it is unnecessary to test it. [unsignedPositive]\n"
+                      "[test.cpp:9:11]: (style) Checking if unsigned expression 'u' is less than zero. [unsignedLessThanZero]\n",
+                      errout_str());
     }
 
     void checkSignOfPointer() {
         check("void foo(const int* x) {\n"
               "  if (x >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not. [pointerPositive]\n", errout_str());
 
         {
             const char code[] = "void foo(const int* x) {\n"
                                 "  int y = 0;\n"
                                 "  if (x >= y) {}\n"
-                                "}";
+                                "}\n";
             check(code, dinit(CheckOptions, $.inconclusive = false));
             ASSERT_EQUALS("[test.cpp:3:9]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not. [pointerPositive]\n", errout_str());
             check(code, dinit(CheckOptions, $.inconclusive = false, $.verbose = true));
@@ -9177,19 +9762,19 @@ class TestOther : public TestFixture {
         }
         check("void foo(const int* x) {\n"
               "  if (*x >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const int* x) {\n"
               "  if (x < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) A pointer can not be negative so it is either pointless or an error to check if it is. [pointerLessThanZero]\n", errout_str());
 
         {
             const char code[] = "void foo(const int* x) {\n"
                                 "  unsigned y = 0u;\n"
                                 "  if (x < y) {}\n"
-                                "}";
+                                "}\n";
 
             check(code, dinit(CheckOptions, $.inconclusive = false));
             ASSERT_EQUALS("[test.cpp:3:9]: (style) A pointer can not be negative so it is either pointless or an error to check if it is. [pointerLessThanZero]\n", errout_str());
@@ -9199,32 +9784,32 @@ class TestOther : public TestFixture {
 
         check("void foo(const int* x) {\n"
               "  if (*x < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const int* x, const int* y) {\n"
               "  if (x - y < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const int* x, const int* y) {\n"
               "  if (x - y <= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const int* x, const int* y) {\n"
               "  if (x - y > 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const int* x, const int* y) {\n"
               "  if (x - y >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const Bar* x) {\n"
               "  if (0 <= x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not. [pointerPositive]\n", errout_str());
 
         check("struct S {\n"
@@ -9232,7 +9817,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first) {\n"
               "  if (first.ptr >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:17]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not. [pointerPositive]\n"
                       "[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9242,7 +9827,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first, S* second) {\n"
               "  if((first.ptr - second.ptr) >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:23]: (style) Parameter 'second' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9252,7 +9837,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first) {\n"
               "  if((first.ptr) >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:18]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not. [pointerPositive]\n"
                       "[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9262,7 +9847,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first, S* second) {\n"
               "  if(0 <= first.ptr - second.ptr) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:23]: (style) Parameter 'second' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9272,7 +9857,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first, S* second) {\n"
               "  if(0 <= (first.ptr - second.ptr)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:23]: (style) Parameter 'second' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9282,7 +9867,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first, S* second) {\n"
               "  if(first.ptr - second.ptr < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:23]: (style) Parameter 'second' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9292,7 +9877,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first, S* second) {\n"
               "  if((first.ptr - second.ptr) < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:23]: (style) Parameter 'second' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9302,7 +9887,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first, S* second) {\n"
               "  if(0 > first.ptr - second.ptr) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:23]: (style) Parameter 'second' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9312,69 +9897,69 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first, S* second) {\n"
               "  if(0 > (first.ptr - second.ptr)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:23]: (style) Parameter 'second' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
 
         check("void foo(const int* x) {\n"
               "  if (0 <= x[0]) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(Bar* x) {\n"
               "  if (0 <= x.y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'x' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
         check("void foo(Bar* x) {\n"
               "  if (0 <= x->y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'x' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
         check("void foo(Bar* x, Bar* y) {\n"
               "  if (0 <= x->y - y->y ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'x' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:1:23]: (style) Parameter 'y' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
 
         check("void foo(const Bar* x) {\n"
               "  if (0 > x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) A pointer can not be negative so it is either pointless or an error to check if it is. [pointerLessThanZero]\n", errout_str());
 
         check("void foo(const int* x) {\n"
               "  if (0 > x[0]) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(Bar* x) {\n"
               "  if (0 > x.y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'x' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
         check("void foo(Bar* x) {\n"
               "  if (0 > x->y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'x' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
         check("void foo() {\n"
               "  int (*t)(void *a, void *b);\n"
               "  if (t(a, b) < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "  int (*t)(void *a, void *b);\n"
               "  if (0 > t(a, b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct object_info { int *typep; };\n"
               "void packed_object_info(struct object_info *oi) {\n"
               "  if (oi->typep < 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) A pointer can not be negative so it is either pointless or an error to check if it is. [pointerLessThanZero]\n"
                       "[test.cpp:2:45]: (style) Parameter 'oi' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9382,7 +9967,7 @@ class TestOther : public TestFixture {
         check("struct object_info { int typep[10]; };\n"
               "void packed_object_info(struct object_info *oi) {\n"
               "  if (oi->typep < 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) A pointer can not be negative so it is either pointless or an error to check if it is. [pointerLessThanZero]\n"
                       "[test.cpp:2:45]: (style) Parameter 'oi' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9390,28 +9975,28 @@ class TestOther : public TestFixture {
         check("struct object_info { int *typep; };\n"
               "void packed_object_info(struct object_info *oi) {\n"
               "  if (*oi->typep < 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:45]: (style) Parameter 'oi' can be declared as pointer to const [constParameterPointer]\n", errout_str());
     }
 
     void checkSuspiciousSemicolon1() {
         check("void foo() {\n"
               "  for(int i = 0; i < 10; ++i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Empty block
         check("void foo() {\n"
               "  for(int i = 0; i < 10; ++i); {\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (warning) Suspicious use of ; at the end of 'for' statement. [suspiciousSemicolon]\n", errout_str());
 
         check("void foo() {\n"
               "  while (!quit); {\n"
               "    do_something();\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (warning) Suspicious use of ; at the end of 'while' statement. [suspiciousSemicolon]\n", errout_str());
     }
 
@@ -9420,21 +10005,21 @@ class TestOther : public TestFixture {
               "  if (i == 1); {\n"
               "    do_something();\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (warning) Suspicious use of ; at the end of 'if' statement. [suspiciousSemicolon]\n", errout_str());
 
         // Seen this in the wild
         check("void foo() {\n"
               "  if (Match());\n"
               "  do_something();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "  if (Match());\n"
               "  else\n"
               "    do_something();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -9443,7 +10028,7 @@ class TestOther : public TestFixture {
               "  {\n"
               "    do_something();\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -9452,7 +10037,7 @@ class TestOther : public TestFixture {
               "  {\n"
               "    do_something();\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -9461,20 +10046,20 @@ class TestOther : public TestFixture {
                "void foo() {\n"
                "  if (x == 123);\n"
                "  REQUIRE(y=z);\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void checkSuspiciousComparison() {
         checkP("void f(int a, int b) {\n"
                "  a > b;\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '>', result is not used. [constStatement]\n", errout_str());
 
         checkP("void f() {\n" // #10607
                "  for (auto p : m)\n"
                "    std::vector<std::pair<std::string, std::string>> k;\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -9482,25 +10067,25 @@ class TestOther : public TestFixture {
         check("void foo(char *p) {\n"
               "  char *a; a = malloc(1024);\n"
               "  free(a + 10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error) Mismatching address is freed. The address you get from malloc() must be freed without offset. [invalidFree]\n", errout_str());
 
         check("void foo(char *p) {\n"
               "  char *a; a = malloc(1024);\n"
               "  free(a - 10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error) Mismatching address is freed. The address you get from malloc() must be freed without offset. [invalidFree]\n", errout_str());
 
         check("void foo(char *p) {\n"
               "  char *a; a = malloc(1024);\n"
               "  free(10 + a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error) Mismatching address is freed. The address you get from malloc() must be freed without offset. [invalidFree]\n", errout_str());
 
         check("void foo(char *p) {\n"
               "  char *a; a = new char[1024];\n"
               "  delete[] (a + 10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:16]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:3:3]: (error) Mismatching address is deleted. The address you get from new must be deleted without offset. [invalidFree]\n",
                       errout_str());
@@ -9508,7 +10093,7 @@ class TestOther : public TestFixture {
         check("void foo(char *p) {\n"
               "  char *a; a = new char;\n"
               "  delete a + 10;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:16]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:3:3]: (error) Mismatching address is deleted. The address you get from new must be deleted without offset. [invalidFree]\n",
                       errout_str());
@@ -9517,7 +10102,7 @@ class TestOther : public TestFixture {
               "  char *a; a = new char;\n"
               "  bar(a);\n"
               "  delete a + 10;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
@@ -9526,7 +10111,7 @@ class TestOther : public TestFixture {
               "  bar(a);\n"
               "  delete a + 10;\n"
               "  delete b + 10;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:3]: (error) Mismatching address is deleted. The address you get from new must be deleted without offset. [invalidFree]\n", errout_str());
 
         check("void foo(char *p) {\n"
@@ -9535,14 +10120,14 @@ class TestOther : public TestFixture {
               "  bar(a, b);\n"
               "  delete a + 10;\n"
               "  delete b + 10;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
               "  char *a; a = new char;\n"
               "  bar()\n"
               "  delete a + 10;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:16]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:3]: (error) Mismatching address is deleted. The address you get from new must be deleted without offset. [invalidFree]\n",
                       errout_str());
@@ -9551,7 +10136,7 @@ class TestOther : public TestFixture {
               "  char *ptr; ptr = malloc(42);\n"
               "  ptr += xx;\n"
               "  free(ptr + 1 - xx);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:3]: (error) Mismatching address is freed. The address you get from malloc() must be freed without offset. [invalidFree]\n", errout_str());
 
         check("void foo(size_t xx) {\n"
@@ -9559,7 +10144,7 @@ class TestOther : public TestFixture {
               "  std::cout << ptr;\n"
               "  ptr = otherPtr;\n"
               "  free(otherPtr - xx - 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:9]: (style) Variable 'ptr' can be declared as pointer to const [constVariablePointer]\n",
             errout_str());
@@ -9569,7 +10154,7 @@ class TestOther : public TestFixture {
         check("const std::string& getA(){static std::string a;return a;}\n"
               "void foo() {\n"
               "    const std::string a = getA();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (performance, inconclusive) Use const reference for 'a' to avoid unnecessary data copying. [redundantCopyLocalConst]\n", errout_str());
 
         check("class A { public: A() {} char x[100]; };\n"
@@ -9578,7 +10163,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    const A a = getA();\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (performance, inconclusive) Use const reference for 'a' to avoid unnecessary data copying. [redundantCopyLocalConst]\n", errout_str());
 
         check("const int& getA(){static int a;return a;}\n"
@@ -9586,7 +10171,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    const int a = getA();\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const int& getA(){static int a;return a;}\n"
@@ -9595,7 +10180,7 @@ class TestOther : public TestFixture {
               "    int getA = 0;\n"
               "    const int a = getA + 3;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:12] -> [test.cpp:4:9]: (style) Local variable 'getA' shadows outer function [shadowFunction]\n", errout_str());
 
         check("class A { public: A() {} char x[100]; };\n"
@@ -9604,7 +10189,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    const A a(getA());\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (performance, inconclusive) Use const reference for 'a' to avoid unnecessary data copying. [redundantCopyLocalConst]\n", errout_str());
 
         check("const int& getA(){static int a;return a;}\n"
@@ -9612,7 +10197,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    const int a(getA());\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A{\n"
@@ -9624,7 +10209,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    const A a = getA() + 1;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A{\n"
@@ -9636,7 +10221,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    const A a(getA()+1);\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5190 - FP when creating object with constructor that takes a reference
@@ -9645,7 +10230,7 @@ class TestOther : public TestFixture {
               "const A &getA();\n"
               "void f() {\n"
               "    const B b(getA());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A {};\n"
@@ -9653,7 +10238,7 @@ class TestOther : public TestFixture {
               "const A& getA();\n"
               "void f() {\n"
               "    const B b{ getA() };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5618
@@ -9666,7 +10251,7 @@ class TestOther : public TestFixture {
                                 "        const std::string temp = tok->str();\n"
                                 "        tok->str(tok->strAt(2));\n"
                                 "    }\n"
-                                "}";
+                                "}\n";
         check(code5618);
         ASSERT_EQUALS("", errout_str());
         check(code5618, dinit(CheckOptions, $.inconclusive = false));
@@ -9677,7 +10262,7 @@ class TestOther : public TestFixture {
               "X f<X>(const X &in) {\n"
               "    const X s = f<X>(in);\n"
               "    return f<X>(s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7981 - False positive redundantCopyLocalConst - const ref argument to ctor
@@ -9689,7 +10274,7 @@ class TestOther : public TestFixture {
               " \n"
               "void foo() {\n"
               "  const CD cd(CD::getOne());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #10545
@@ -9702,7 +10287,7 @@ class TestOther : public TestFixture {
               "    if (i != 0)\n"
               "        return old;\n"
               "    return {};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct X { int x; };\n" // #10191
@@ -9798,9 +10383,7 @@ class TestOther : public TestFixture {
               "    u.g();\n"
               "    if (c == m->get()) {}\n"
               "}\n");
-        TODO_ASSERT_EQUALS("",
-                           "[test.cpp:16:33] -> [test.cpp:18:11]: (style) The comparison 'c == m->get()' is always true because 'c' and 'm->get()' represent the same value. [knownConditionTrueFalse]\n",
-                           errout_str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #12925
               "    const std::string & f() const { return str; }\n"
@@ -9827,6 +10410,58 @@ class TestOther : public TestFixture {
               "    if (s.empty()) {}\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:6:16]: (performance, inconclusive) Use const reference for 's' to avoid unnecessary data copying. [redundantCopyLocalConst]\n", errout_str());
+
+        check("void f1(const std::string& s) {\n"
+              "    std::string s1 = s;\n"
+              "    (void)s1;\n"
+              "}\n"
+              "void f2() {\n"
+              "    const std::string s;\n"
+              "    std::string s1 = s;\n"
+              "    (void)s1;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:17]: (performance, inconclusive) Use const reference for 's1' to avoid unnecessary data copying. [redundantCopyLocalConst]\n"
+                      "[test.cpp:7:17]: (performance, inconclusive) Use const reference for 's1' to avoid unnecessary data copying. [redundantCopyLocalConst]\n",
+                      errout_str());
+
+        check("struct S {\n"
+              "    std::string m;\n"
+              "    int f(const std::string& s);\n"
+              "};\n"
+              "int S::f(const std::string& s) {\n"
+              "    std::string c = s;\n"
+              "    m.clear();\n"
+              "    return c.size();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n"
+              "    std::string m;\n"
+              "    int f(std::string s);\n"
+              "};\n"
+              "int S::f(std::string s) {\n"
+              "    s += m;\n"
+              "    std::string c = s;\n"
+              "    m.clear();\n"
+              "    return c.size();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:7:17]: (performance, inconclusive) Use const reference for 'c' to avoid unnecessary data copying. [redundantCopyLocalConst]\n",
+                      errout_str());
+
+        check("int f(const char* c) {\n" // #14530
+              "    std::string s = c;\n"
+              "    return s.rfind('.');\n"
+              "}\n"
+              "struct M {\n"
+              "    M(const std::array<double, 9>& a);\n"
+              "    double m[3][3];\n"
+              "    double trace() const;\n"
+              "};\n"
+              "double g(const std::array<double, 9>& a) {\n"
+              "    M m = a;\n"
+              "    return m.trace();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkNegativeShift() {
@@ -9834,62 +10469,62 @@ class TestOther : public TestFixture {
               "{\n"
               "   int a; a = 123;\n"
               "   (void)(a << -1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Shifting by a negative value is undefined behaviour [shiftNegative]\n", errout_str());
         check("void foo()\n"
               "{\n"
               "   int a; a = 123;\n"
               "   (void)(a >> -1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Shifting by a negative value is undefined behaviour [shiftNegative]\n", errout_str());
         check("void foo()\n"
               "{\n"
               "   int a; a = 123;\n"
               "   a <<= -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Shifting by a negative value is undefined behaviour [shiftNegative]\n", errout_str());
         check("void foo()\n"
               "{\n"
               "   int a; a = 123;\n"
               "   a >>= -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Shifting by a negative value is undefined behaviour [shiftNegative]\n", errout_str());
         check("void foo()\n"
               "{\n"
               "   std::cout << -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "   std::cout << a << -1 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "   std::cout << 3 << -1 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo() {\n"
               "   x = (-10+2) << 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (portability) Shifting a negative value is technically undefined behaviour [shiftNegativeLHS]\n", errout_str());
 
-        check("x = y ? z << $-1 : 0;");
+        check("x = y ? z << $-1 : 0;\n");
         ASSERT_EQUALS("", errout_str());
 
         // Negative LHS
-        check("const int x = -1 >> 2;");
+        check("const int x = -1 >> 2;\n");
         ASSERT_EQUALS("[test.cpp:1:18]: (portability) Shifting a negative value is technically undefined behaviour [shiftNegativeLHS]\n", errout_str());
 
         // #6383 - unsigned type
-        check("const int x = (unsigned int)(-1) >> 2;");
+        check("const int x = (unsigned int)(-1) >> 2;\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7814 - UB happening in valueflowcode when it tried to compute shifts.
         check("int shift1() { return 1 >> -1 ;}\n"
               "int shift2() { return 1 << -1 ;}\n"
               "int shift3() { return -1 >> 1 ;}\n"
-              "int shift4() { return -1 << 1 ;}");
+              "int shift4() { return -1 << 1 ;}\n");
         ASSERT_EQUALS("[test.cpp:1:25]: (error) Shifting by a negative value is undefined behaviour [shiftNegative]\n"
                       "[test.cpp:2:25]: (error) Shifting by a negative value is undefined behaviour [shiftNegative]\n"
                       "[test.cpp:3:26]: (portability) Shifting a negative value is technically undefined behaviour [shiftNegativeLHS]\n"
@@ -9932,13 +10567,31 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void checkNegativeShiftErrorPath() {
+        setMultiline();
+        Settings s = settings1;
+        s.templateLocation = "{file}:{line}:note:{info}\n";
+
+        check("int f(int i, bool b) {\n"
+              "    int s = -1;\n"
+              "    if (b)\n"
+              "        return i;\n"
+              "    return i << s;\n"
+              "}\n", dinit(CheckOptions, $.settings = &s));
+        ASSERT_EQUALS("[test.cpp:5:14]: warning: Shifting by a negative value is undefined behaviour [shiftNegative]\n"
+                      "[test.cpp:2:14]: note: Assignment 's=-1', assigned value is -1\n"
+                      "[test.cpp:3:9]: note: Assuming condition is false\n"
+                      "[test.cpp:5:14]: note: Shifting by a negative value is undefined behaviour\n",
+                      errout_str());
+    }
+
     void incompleteArrayFill() {
         check("void f() {\n"
               "    int a[5];\n"
               "    memset(a, 123, 5);\n"
               "    memcpy(a, b, 5);\n"
               "    memmove(a, b, 5);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(// TODO "[test.cpp:4] -> [test.cpp:5]: (performance) Buffer 'a' is being written before its old content has been used.\n"
             "[test.cpp:3:5]: (warning, inconclusive) Array 'a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*a)'? [incompleteArrayFill]\n"
             "[test.cpp:4:5]: (warning, inconclusive) Array 'a' is filled incompletely. Did you forget to multiply the size given to 'memcpy()' with 'sizeof(*a)'? [incompleteArrayFill]\n"
@@ -9949,7 +10602,7 @@ class TestOther : public TestFixture {
               "void f() {\n"
               "    memset(::a, 123, 5);\n"
               "    memset(Z::b.a, 123, 5);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:5]: (warning, inconclusive) Array '::a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*::a)'? [incompleteArrayFill]\n"
                            "[test.cpp:5]: (warning, inconclusive) Array 'Z::b.a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*Z::b.a)'?\n",
                            "[test.cpp:4:5]: (warning, inconclusive) Array '::a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*::a)'? [incompleteArrayFill]\n", errout_str());
@@ -9957,45 +10610,45 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "    Foo* a[5];\n"
               "    memset(a, 'a', 5);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning, inconclusive) Array 'a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*a)'? [incompleteArrayFill]\n", errout_str());
 
         check("class Foo {int a; int b;};\n"
               "void f() {\n"
               "    Foo a[5];\n"
               "    memset(a, 'a', 5);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning, inconclusive) Array 'a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*a)'? [incompleteArrayFill]\n", errout_str());
 
         check("void f() {\n"
               "    Foo a[5];\n" // Size of foo is unknown
               "    memset(a, 'a', 5);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char a[5];\n"
               "    memset(a, 'a', 5);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a[5];\n"
               "    memset(a+15, 'a', 5);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    bool a[5];\n"
               "    memset(a, false, 5);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (portability, inconclusive) Array 'a' might be filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*a)'? [incompleteArrayFill]\n", errout_str());
 
         check("void f() {\n"
               "    const int n = 5;"
               "    int a[n];\n"
               "    memset(a, 0, n);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning, inconclusive) Array 'a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*a)'? [incompleteArrayFill]\n", errout_str());
     }
 
@@ -10006,7 +10659,7 @@ class TestOther : public TestFixture {
         check("void f(int i) {\n"
               "    i = 1;\n"
               "    i = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: style: Variable 'i' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:2:7]: note: i is assigned\n"
                       "[test.cpp:3:7]: note: i is overwritten\n", errout_str());
@@ -10016,7 +10669,7 @@ class TestOther : public TestFixture {
               "void f() {\n"
               "    i = 1;\n"
               "    i = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: style: Variable 'i' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:7]: note: i is assigned\n"
                       "[test.cpp:4:7]: note: i is overwritten\n", errout_str());
@@ -10025,7 +10678,7 @@ class TestOther : public TestFixture {
               "    int i;\n"
               "    i = 1;\n"
               "    i = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: style: Variable 'i' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:7]: note: i is assigned\n"
                       "[test.cpp:4:7]: note: i is overwritten\n", errout_str());
@@ -10034,14 +10687,14 @@ class TestOther : public TestFixture {
               "    static int i;\n"
               "    i = 1;\n"
               "    i = 1;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         check("void f() {\n"
               "    int i[10];\n"
               "    i[2] = 1;\n"
               "    i[2] = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: style: Variable 'i[2]' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:10]: note: i[2] is assigned\n"
                       "[test.cpp:4:10]: note: i[2] is overwritten\n", errout_str());
@@ -10051,14 +10704,14 @@ class TestOther : public TestFixture {
               "    i[x] = 1;\n"
               "    x=1;\n"
               "    i[x] = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const int x) {\n"
               "    int i[10];\n"
               "    i[x] = 1;\n"
               "    i[x] = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: style: Variable 'i[x]' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:10]: note: i[x] is assigned\n"
                       "[test.cpp:4:10]: note: i[x] is overwritten\n", errout_str());
@@ -10067,14 +10720,14 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "    Foo& bar = foo();\n"
               "    bar = x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    Foo& bar = foo();\n"
               "    bar = x;\n"
               "    bar = y;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         check("void f() {\n"
@@ -10082,7 +10735,7 @@ class TestOther : public TestFixture {
               "    bar = y();\n"
               "    foo();\n"
               "    bar = y();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Tests with function call between assignment
@@ -10090,7 +10743,7 @@ class TestOther : public TestFixture {
               "    i = 1;\n"
               "    bar();\n"
               "    i = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: style: Variable 'i' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:2:7]: note: i is assigned\n"
                       "[test.cpp:4:7]: note: i is overwritten\n", errout_str());
@@ -10100,7 +10753,7 @@ class TestOther : public TestFixture {
               "    i = 1;\n"
               "    bar();\n" // Global variable might be accessed in bar()
               "    i = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -10108,7 +10761,7 @@ class TestOther : public TestFixture {
               "    i = 1;\n"
               "    bar();\n" // bar() might call f() recursively. This could be a false positive in more complex examples (when value of i is used somewhere. See #4229)
               "    i = 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -10116,7 +10769,7 @@ class TestOther : public TestFixture {
               "    i = 1;\n"
               "    bar();\n"
               "    i = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:7]: style: Variable 'i' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:7]: note: i is assigned\n"
                       "[test.cpp:5:7]: note: i is overwritten\n", errout_str());
@@ -10126,14 +10779,14 @@ class TestOther : public TestFixture {
               "    i = 1;\n"
               "    bar(i);\n" // Passed as argument
               "    i = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    Foo bar = foo();\n"
               "    bar();\n" // #5568. operator() called
               "    bar = y();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Branch tests
@@ -10141,7 +10794,7 @@ class TestOther : public TestFixture {
               "    i = 1;\n"
               "    if(x)\n"
               "        i = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int i) {\n"
@@ -10149,7 +10802,7 @@ class TestOther : public TestFixture {
               "        i = 0;\n"
               "    i = 1;\n"
               "    i = 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:7]: style: Variable 'i' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:4:7]: note: i is assigned\n"
                       "[test.cpp:5:7]: note: i is overwritten\n", errout_str());
@@ -10162,7 +10815,7 @@ class TestOther : public TestFixture {
               "void f() {\n"
               "    x = 2;\n"
               "    x = g();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int g() {\n"
@@ -10171,7 +10824,7 @@ class TestOther : public TestFixture {
               "void f(int x) {\n"
               "    x = 2;\n"
               "    x = g();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:7]: style: Variable 'x' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:5:7]: note: x is assigned\n"
                       "[test.cpp:6:7]: note: x is overwritten\n", errout_str());
@@ -10180,7 +10833,7 @@ class TestOther : public TestFixture {
               "    Foo& bar = foo();\n"
               "    bar = x;\n"
               "    bar = y();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class C {\n"
@@ -10192,7 +10845,7 @@ class TestOther : public TestFixture {
               "void C::f() {\n"
               "    x = 2;\n"
               "    x = g();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class C {\n"
@@ -10204,7 +10857,7 @@ class TestOther : public TestFixture {
               "void C::f(Foo z) {\n"
               "    x = 2;\n"
               "    x = z.g();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ({ })
@@ -10212,7 +10865,7 @@ class TestOther : public TestFixture {
               "  int x;\n"
               "  x = 321;\n"
               "  x = ({ asm(123); })\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // from #3103 (avoid a false negative)
@@ -10221,7 +10874,7 @@ class TestOther : public TestFixture {
               "    x = 1;\n"
               "    x = 1;\n"
               "    return x + 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: style: Variable 'x' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:7]: note: x is assigned\n"
                       "[test.cpp:4:7]: note: x is overwritten\n", errout_str());
@@ -10233,20 +10886,20 @@ class TestOther : public TestFixture {
               "    if (y)\n" // <-- cppcheck does not know anything about 'y'
               "        x = 2;\n"
               "    return x + 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // initialization, assignment with 0
         check("void f() {\n"  // Ticket #4356
               "    int x = 0;\n"  // <- ignore initialization with 0
               "    x = 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  state_t *x = NULL;\n"
               "  x = dostuff();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:12]: style: Variable 'x' can be declared as pointer to const [constVariablePointer]\n",
             errout_str());
@@ -10255,7 +10908,7 @@ class TestOther : public TestFixture {
               "  state_t *x;\n"
               "  x = NULL;\n"
               "  x = dostuff();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:12]: style: Variable 'x' can be declared as pointer to const [constVariablePointer]\n",
             errout_str());
@@ -10265,7 +10918,7 @@ class TestOther : public TestFixture {
               "    bar(++x);\n"
               "    x = 5;\n"
               "    return bar(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // struct member..
@@ -10276,7 +10929,7 @@ class TestOther : public TestFixture {
               "    ab.a = 1;\n"
               "    ab.a = 2;\n"
               "    return ab.a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:10]: style: Variable 'ab.a' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:5:10]: note: ab.a is assigned\n"
                       "[test.cpp:6:10]: note: ab.a is overwritten\n", errout_str());
@@ -10288,7 +10941,7 @@ class TestOther : public TestFixture {
               "    ab.a = 1;\n"
               "    ab = do_something();\n"
               "    return ab.a;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         check("struct AB { int a; int b; };\n"
@@ -10299,7 +10952,7 @@ class TestOther : public TestFixture {
               "    do_something(&ab);\n"
               "    ab.a = 2;\n"
               "    return ab.a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct AB { int a; int b; };\n"
@@ -10310,7 +10963,7 @@ class TestOther : public TestFixture {
               "    do_something(&ab);\n"
               "    ab.a = 2;\n"
               "    return ab.a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct AB { int a; int b; };\n"
@@ -10321,7 +10974,7 @@ class TestOther : public TestFixture {
               "    ab++;\n"
               "    ab->a = 1;\n"
               "    ab->b = 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct AB { int a; int b; };\n"
@@ -10332,20 +10985,20 @@ class TestOther : public TestFixture {
               "    ab = x;\n"
               "    ab->a = 1;\n"
               "    ab->b = 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(struct AB *ab) {\n" // #
               "    ab->data->x = 1;\n"
               "    ab = &ab1;\n"
               "    ab->data->x = 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5964
         check("void func(char *buffer, const char *format, int precision, unsigned value) {\n"
               "    (precision < 0) ? sprintf(buffer, format, value) : sprintf(buffer, format, precision, value);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // don't crash
@@ -10358,14 +11011,14 @@ class TestOther : public TestFixture {
               "void func(struct state *s) {\n"
               "  s->foo[s->x++] = 2;\n"
               "  s->d[1].fc.i++;\n"
-              "}");
+              "}\n");
 
         // #6525 - inline assembly
         check("void f(int i) {\n"
               "    i = 1;\n"
               "    asm(\"foo\");\n"
               "    i = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6555
@@ -10378,7 +11031,7 @@ class TestOther : public TestFixture {
               "    catch (...) {\n"
               "        barney(p);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -10390,7 +11043,7 @@ class TestOther : public TestFixture {
               "    catch (...) {\n"
               "        barney(x);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: style: The scope of the variable 'p' can be reduced. [variableScope]\n"
                       "[test.cpp:2:11]: style: Variable 'p' can be declared as pointer to const [constVariablePointer]\n",
                       errout_str());
@@ -10406,17 +11059,17 @@ class TestOther : public TestFixture {
               "    catch (...) {\n"
               "        barney(p);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Member variable pointers
         check("void podMemPtrs() {\n"
-              "    int POD::*memptr;\n"
+              "    const int POD::*memptr;\n"
               "    memptr = &POD::a;\n"
               "    memptr = &POD::b;\n"
               "    if (memptr)\n"
               "        memptr = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: style: Variable 'memptr' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:12]: note: memptr is assigned\n"
                       "[test.cpp:4:12]: note: memptr is overwritten\n", errout_str());
@@ -10426,7 +11079,7 @@ class TestOther : public TestFixture {
               "{\n"
               "  var[0] = 0.2f;\n"
               "  var[0] = 0.2f;\n" // <-- is initialized twice
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: style: Variable 'var[0]' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:10]: note: var[0] is assigned\n"
                       "[test.cpp:4:10]: note: var[0] is overwritten\n", errout_str());
@@ -10435,7 +11088,7 @@ class TestOther : public TestFixture {
               "{\n"
               "  *var = 0.2f;\n"
               "  *var = 0.2f;\n" // <-- is initialized twice
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:8]: style: Variable '*var' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:8]: note: *var is assigned\n"
                       "[test.cpp:4:8]: note: *var is overwritten\n", errout_str());
@@ -10445,7 +11098,7 @@ class TestOther : public TestFixture {
               "  volatile char *reg = (volatile char *)0x12345;\n"
               "  *reg = 12;\n"
               "  *reg = 34;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::map<int, int>& m, int key, int value) {\n" // #6379
@@ -10462,28 +11115,28 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "   int a = 0;\n"
               "   a = 4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   int a;\n"
               "   a = 0;\n"
               "   a = 4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   unsigned a;\n"
               "   a = 0u;\n"
               "   a = 2u;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   void* a;\n"
               "   a = (void*)0;\n"
               "   a = p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:10]: (style) Variable 'a' can be declared as pointer to const [constVariablePointer]\n",
             errout_str());
@@ -10492,10 +11145,25 @@ class TestOther : public TestFixture {
               "   void* a;\n"
               "   a = (void*)0U;\n"
               "   a = p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:10]: (style) Variable 'a' can be declared as pointer to const [constVariablePointer]\n",
             errout_str());
+
+        check("std::string f() {\n" // #14534
+              "    std::string s = \"abc\";\n"
+              "    s = \"def\";\n"
+              "    return s;\n"
+              "}\n"
+              "const char* g() {\n"
+              "    const char* p = \"abc\";\n"
+              "    p = \"def\";\n"
+              "    return p;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:19] -> [test.cpp:3:7]: (style) Redundant initialization for 's'. The initialized value is overwritten before it is read. [redundantInitialization]\n"
+            "[test.cpp:7:19] -> [test.cpp:8:7]: (style) Redundant initialization for 'p'. The initialized value is overwritten before it is read. [redundantInitialization]\n",
+            errout_str());
     }
 
     void redundantVarAssignment_struct() {
@@ -10507,7 +11175,7 @@ class TestOther : public TestFixture {
               "  struct foo x;\n"
               "  x.a = _mm_set1_ps(1.0);\n"
               "  x.a = _mm_set1_ps(2.0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:7] -> [test.cpp:8:7]: (style) Variable 'x.a' is reassigned a value before the old one has been used. [redundantAssignment]\n", errout_str());
 
         check("void f() {\n"
@@ -10515,13 +11183,13 @@ class TestOther : public TestFixture {
               "  ab.x = 23;\n"
               "  ab.y = 41;\n"
               "  ab.x = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:5:8]: (style) Variable 'ab.x' is reassigned a value before the old one has been used. [redundantAssignment]\n", errout_str());
 
         check("void f() {\n"
               "  struct AB ab = {0};\n"
               "  ab = foo();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -10542,7 +11210,7 @@ class TestOther : public TestFixture {
               "    u.l1 = 1;\n"
               "    lTotal += u.b.b1;\n"
               "    u.l1 = 2;\n" //Should not show RedundantAssignment
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #5115 "redundantAssignment when using a union"
@@ -10560,7 +11228,7 @@ class TestOther : public TestFixture {
               "    } u;\n"
               "    u.l1 = 1;\n"
               "    u.l1 = 2;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:13:10] -> [test.cpp:14:10]: (style) Variable 'u.l1' is reassigned a value before the old one has been used. [redundantAssignment]\n", errout_str());
 
         // Ticket #10093 "redundantAssignment when using a union"
@@ -10584,7 +11252,7 @@ class TestOther : public TestFixture {
               "    m.u16.ab = 47;\n"
               "    m.u16.cd = 0;\n"
               "    m.u16.ab = m.u32.abcd / 53;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #10093 "redundantAssignment when using a union"
@@ -10602,7 +11270,7 @@ class TestOther : public TestFixture {
               "    u.as_int = 42;\n"
               "    fn(&u.as_char[0], 4);\n"
               "    u.as_int = 0;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #5115 "redundantAssignment when using a union"
@@ -10613,7 +11281,7 @@ class TestOther : public TestFixture {
               "    } addr;\n"
               "    addr.s8 = ptr;\n"
               "    addr.u64 += 8;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #12895
@@ -10627,6 +11295,48 @@ class TestOther : public TestFixture {
               "    Dst.s->y = Src.s->y;\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        // Ticket #14371 "redundantAssignment when using a union"
+        check("union U {\n"
+              "    struct {\n"
+              "        unsigned int abcd;\n"
+              "    } u32;\n"
+              "    struct {\n"
+              "        unsigned short ab;\n"
+              "        unsigned short cd;\n"
+              "    } u16;\n"
+              "};\n"
+              "void f1() {\n"
+              "    U m;\n"
+              "    m.u32.abcd = 1234;\n"
+              "    m.u32.abcd = 5 * m.u16.ab;\n"
+              "}\n"
+              "void f2(unsigned int a, unsigned short b) {\n"
+              "    U m;\n"
+              "    m.u32.abcd = a;\n"
+              "    m.u32.abcd += 0x8000;\n"
+              "    m.u32.abcd = m.u16.ab * b;\n"
+              "}\n"
+              "void f3(unsigned int seed) {\n"
+              "    U m, other;\n"
+              "    other.u32.abcd = seed;\n"
+              "    m.u32.abcd = 1234;\n"
+              "    m.u32.abcd = other.u16.ab * 2;\n"
+              "}\n"
+              "void f4(unsigned short x) {\n"
+              "    U m;\n"
+              "    m.u16.ab = x;\n"
+              "    m.u16.cd = 0;\n"
+              "    m.u16.ab = m.u32.abcd / 53;\n"
+              "}\n"
+              "void f5(unsigned short x, unsigned int y) {\n"
+              "    U m;\n"
+              "    m.u16.ab = x;\n"
+              "    m.u16.cd = 0;\n"
+              "    m.u16.ab = y;\n"
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("[test.cpp:24:16] -> [test.cpp:25:16]: (style) Variable 'm.u32.abcd' is reassigned a value before the old one has been used. [redundantAssignment]\n"
+                      "[test.cpp:35:14] -> [test.cpp:37:14]: (style) Variable 'm.u16.ab' is reassigned a value before the old one has been used. [redundantAssignment]\n", errout_str());
     }
 
     void redundantVarAssignment_7133() {
@@ -10648,7 +11358,7 @@ class TestOther : public TestFixture {
               "   }\n"
               "   catch (const uno::Exception&)  {\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void ConvertBitmapData(sal_uInt16 nDestBits) {\n"
@@ -10657,7 +11367,7 @@ class TestOther : public TestFixture {
               "    BitmapBuffer aDstBuf;\n"
               "    aSrcBuf.mnBitCount = nDestBits;\n"
               "    bConverted = ::ImplFastBitmapConversion( aDstBuf, aSrcBuf, aTwoRects );\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:24] -> [test.c:5:24]: (style) Variable 'aSrcBuf.mnBitCount' is reassigned a value before the old one has been used. [redundantAssignment]\n", errout_str());
         check("void ConvertBitmapData(sal_uInt16 nDestBits) {\n"
               "    BitmapBuffer aSrcBuf;\n"
@@ -10665,7 +11375,7 @@ class TestOther : public TestFixture {
               "    BitmapBuffer aDstBuf;\n"
               "    aSrcBuf.mnBitCount = nDestBits;\n"
               "    bConverted = ::ImplFastBitmapConversion( aDstBuf, aSrcBuf, aTwoRects );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:24] -> [test.cpp:5:24]: (style) Variable 'aSrcBuf.mnBitCount' is reassigned a value before the old one has been used. [redundantAssignment]\n",
                       errout_str());
 
@@ -10674,7 +11384,7 @@ class TestOther : public TestFixture {
               "    C c;\n"
               "    c = x;\n"
               "    c = x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7] -> [test.cpp:5:7]: (style, inconclusive) Variable 'c' is reassigned a value before the old one has been used if variable is no semaphore variable. [redundantAssignment]\n", errout_str());
     }
 
@@ -10688,7 +11398,7 @@ class TestOther : public TestFixture {
               "    m->prev->next = m->next;\n"
               "    m->next->prev = m->prev;\n"
               "    return m->next;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -10702,7 +11412,7 @@ class TestOther : public TestFixture {
               "    x = 6;\n"
               "    f();\n"
               "    return y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10228
@@ -10722,7 +11432,7 @@ class TestOther : public TestFixture {
               "    for (i = 0; i < 4; i++)\n"
               "        buf[i] = 131;\n"
               "    buf[i] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void bar() {\n" // #9262 do-while with break
@@ -10732,20 +11442,20 @@ class TestOther : public TestFixture {
               "        if (foo()) break;\n"
               "        x = 1;\n"
               "     } while (false);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int num) {\n" // #9420 FP
               "  int a = num;\n"
               "  for (int b = 0; b < num; a = b++)\n"
               "    dostuff(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int num) {\n" // #9420 FN
               "  int a = num;\n"
               "  for (int b = 0; b < num; a = b++);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
@@ -10758,7 +11468,7 @@ class TestOther : public TestFixture {
               "        break;\n"
               "    }\n"
               "    ret = 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13] -> [test.cpp:8:9]: (style) Variable 'ret' is reassigned a value before the old one has been used. [redundantAssignment]\n", errout_str());
     }
 
@@ -10768,7 +11478,7 @@ class TestOther : public TestFixture {
               "    *x = 23;\n"
               "    foo(ptr);\n"
               "    *x = 32;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8997
@@ -10778,7 +11488,7 @@ class TestOther : public TestFixture {
               "  *p = 1;\n"
               "  p += 1;\n"
               "  *p = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -10787,7 +11497,7 @@ class TestOther : public TestFixture {
               "    *p = 1;\n"
               "    if (condition) return;\n"
               "    *p = 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -10799,7 +11509,7 @@ class TestOther : public TestFixture {
               "    i += 2;\n"
               "    arr[i] = 3;\n"
               "    dostuff(arr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -10813,9 +11523,9 @@ class TestOther : public TestFixture {
               "        if (b) break;\n"
               "        ret = 1;\n"
               "        break;\n"
-              "    }"
+              "    }\n"
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b) {\n"
@@ -10826,8 +11536,8 @@ class TestOther : public TestFixture {
               "        if (b) break;\n"
               "        ret = 1;\n"
               "        break;\n"
-              "    }"
-              "}");
+              "    }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13] -> [test.cpp:7:13]: (style) Variable 'ret' is reassigned a value before the old one has been used. [redundantAssignment]\n", errout_str());
     }
 
@@ -10837,7 +11547,7 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "    int err = -ENOMEM;\n"
               "    err = dostuff();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: style: Redundant initialization for 'err'. The initialized value is overwritten before it is read. [redundantInitialization]\n"
                       "[test.cpp:2:13]: note: err is initialized\n"
                       "[test.cpp:3:9]: note: err is overwritten\n",
@@ -10846,7 +11556,7 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "    struct S s = {1,2,3};\n"
               "    s = dostuff();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: style: Redundant initialization for 's'. The initialized value is overwritten before it is read. [redundantInitialization]\n"
                       "[test.cpp:2:16]: note: s is initialized\n"
                       "[test.cpp:3:7]: note: s is overwritten\n",
@@ -10855,7 +11565,7 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "    int *p = NULL;\n"
               "    p = dostuff();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:10]: style: Variable 'p' can be declared as pointer to const [constVariablePointer]\n",
             errout_str());
@@ -10864,14 +11574,14 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "    struct S s = {0};\n"
               "    s = dostuff();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace N { enum E {e0,e1}; }\n"
               "void f() {\n"
               "    N::E e = N::e0;\n" // #9261
               "    e = dostuff();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #10143
@@ -10887,6 +11597,87 @@ class TestOther : public TestFixture {
               "    return i;\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("int f(char c) {\n" // #15037
+              "	   int i = (int)c;\n"
+              "	   i = 3;\n"
+              "	   return i;\n"
+              "}\n"
+              "int g(char c) {\n"
+              "     int i = static_cast<int>(c);\n"
+              "     i = 3;\n"
+              "     return i;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:7]: style: Redundant initialization for 'i'. The initialized value is overwritten before it is read. [redundantInitialization]\n"
+                      "[test.cpp:2:11]: note: i is initialized\n"
+                      "[test.cpp:3:7]: note: i is overwritten\n"
+                      "[test.cpp:8:8]: style: Redundant initialization for 'i'. The initialized value is overwritten before it is read. [redundantInitialization]\n"
+                      "[test.cpp:7:12]: note: i is initialized\n"
+                      "[test.cpp:8:8]: note: i is overwritten\n", errout_str());
+
+        check("int g();\n" // #15023
+              "int f1() {\n"
+              "    int i{ g() };\n"
+              "    i = 0;\n"
+              "    return i;\n"
+              "}\n"
+              "int f2() {\n"
+              "    int i(g());\n"
+              "    i = 0;\n"
+              "    return i;\n"
+              "}\n"
+              "int f3() {\n"
+              "    int i{ 1 };\n"
+              "    i = 0;\n"
+              "    return i;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:7]: style: Redundant initialization for 'i'. The initialized value is overwritten before it is read. [redundantInitialization]\n"
+                      "[test.cpp:3:10]: note: i is initialized\n"
+                      "[test.cpp:4:7]: note: i is overwritten\n"
+                      "[test.cpp:9:7]: style: Redundant initialization for 'i'. The initialized value is overwritten before it is read. [redundantInitialization]\n"
+                      "[test.cpp:8:10]: note: i is initialized\n"
+                      "[test.cpp:9:7]: note: i is overwritten\n",
+                      errout_str());
+
+        check("struct S { int a, b; };\n" // #15021
+              "int f(S s) {\n"
+              "    auto [x, y] = s;\n"
+              "    x = 1;\n"
+              "    y = 2;\n"
+              "    return x + y;\n"
+              "}\n"
+              "struct T { int c; };\n"
+              "int g(T t) {\n"
+              "    auto [z] = t;\n"
+              "    z = 0;\n"
+              "    return z;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:7]: style: Redundant initialization for 'x'. The initialized value is overwritten before it is read. [redundantInitialization]\n"
+                      "[test.cpp:3:17]: note: x is initialized\n"
+                      "[test.cpp:4:7]: note: x is overwritten\n"
+                      "[test.cpp:5:7]: style: Redundant initialization for 'y'. The initialized value is overwritten before it is read. [redundantInitialization]\n"
+                      "[test.cpp:3:17]: note: y is initialized\n"
+                      "[test.cpp:5:7]: note: y is overwritten\n"
+                      "[test.cpp:11:7]: style: Redundant initialization for 'z'. The initialized value is overwritten before it is read. [redundantInitialization]\n"
+                      "[test.cpp:10:14]: note: z is initialized\n"
+                      "[test.cpp:11:7]: note: z is overwritten\n",
+                      errout_str());
+
+        check("struct S {\n"
+              "    int a, b;\n"
+              "};\n"
+              "void f(S& s) {\n"
+              "    auto& [x, y] = s;\n"
+              "    y = 1;\n"
+              "}\n"
+              "void f(S s) {\n"
+              "    auto [x, y] = s;\n"
+              "    y = 1;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:10:7]: style: Redundant initialization for 'y'. The initialized value is overwritten before it is read. [redundantInitialization]\n"
+                      "[test.cpp:9:17]: note: y is initialized\n"
+                      "[test.cpp:10:7]: note: y is overwritten\n",
+                      errout_str());
     }
 
     // cppcheck-suppress unusedPrivateFunction
@@ -10896,21 +11687,21 @@ class TestOther : public TestFixture {
               "    char a[10];\n"
               "    memcpy(a, foo, bar);\n"
               "    memset(a, 0, bar);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance) Buffer 'a' is being written before its old content has been used.\n", errout_str());
 
         check("void f() {\n"
               "    char a[10];\n"
               "    strcpy(a, foo);\n"
               "    strncpy(a, 0, bar);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance) Buffer 'a' is being written before its old content has been used.\n", errout_str());
 
         check("void f() {\n"
               "    char a[10];\n"
               "    sprintf(a, \"foo\");\n"
               "    memmove(a, 0, bar);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance) Buffer 'a' is being written before its old content has been used.\n", errout_str());
 
         check("void f(char *filename) {\n"
@@ -10918,14 +11709,14 @@ class TestOther : public TestFixture {
               "    strcpy(p, \"foo\");\n"
               "    dostuff(filename);\n"
               "    strcpy(p, \"foo\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Writing to different parts of a buffer
         check("void f(void* a) {\n"
               "    memcpy(a, foo, bar);\n"
               "    memset(a+5, 0, bar);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Use variable as second argument
@@ -10933,7 +11724,7 @@ class TestOther : public TestFixture {
               "    memset(a, 0, 5);\n"
               "    memcpy(b, a, 5);\n"
               "    memset(a, 1, 5);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // strcat is special
@@ -10942,7 +11733,7 @@ class TestOther : public TestFixture {
               "    strcpy(a, foo);\n"
               "    strcat(a, bar);\n" // Not redundant
               "    strcpy(a, x);\n" // Redundant
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (performance) Buffer 'a' is being written before its old content has been used.\n", errout_str());
 
         // Tests with function call between copy
@@ -10951,7 +11742,7 @@ class TestOther : public TestFixture {
               "    snprintf(a, foo, bar);\n"
               "    bar();\n"
               "    memset(a, 0, size);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (performance) Buffer 'a' is being written before its old content has been used.\n", errout_str());
 
         check("void* a;\n"
@@ -10959,7 +11750,7 @@ class TestOther : public TestFixture {
               "    memset(a, 0, size);\n"
               "    bar();\n" // Global variable might be accessed in bar()
               "    memset(a, 0, size);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -10967,7 +11758,7 @@ class TestOther : public TestFixture {
               "    memset(a, 0, size);\n"
               "    bar();\n"
               "    memset(a, 0, size);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (performance) Buffer 'a' is being written before its old content has been used.\n", "", errout_str());
 
         check("void bar(void* a) {}\n"
@@ -10975,7 +11766,7 @@ class TestOther : public TestFixture {
               "    memset(a, 0, size);\n"
               "    bar(a);\n" // Passed as argument
               "    memset(a, 0, size);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Branch tests
@@ -10983,7 +11774,7 @@ class TestOther : public TestFixture {
               "    memset(a, 0, size);\n"
               "    if(x)\n"
               "        memset(a, 0, size);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4455 - initialization of local buffer
@@ -10991,14 +11782,14 @@ class TestOther : public TestFixture {
               "    char buf[10];\n"
               "    memset(buf, 0, 10);\n"
               "    strcpy(buf, string);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void) {\n"
               "    char buf[10] = {0};\n"
               "    memset(buf, 0, 10);\n"
               "    strcpy(buf, string);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance) Buffer 'buf' is being written before its old content has been used.\n", errout_str());
 
         // #5689 - use return value of strcpy
@@ -11006,7 +11797,7 @@ class TestOther : public TestFixture {
               "    int i = atoi(strcpy(a, foo));\n"
               "    strncpy(a, 0, bar);\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7175 - read+write
@@ -11015,7 +11806,7 @@ class TestOther : public TestFixture {
               "    strcpy(buf, x);\n"
               "    strcpy(buf, dostuff(buf));\n" // <- read + write
               "    strcpy(buf, x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -11023,7 +11814,7 @@ class TestOther : public TestFixture {
               "    strcpy(buf, x);\n"
               "    strcpy(buf, dostuff(buf));\n"
               "    strcpy(buf, x);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
@@ -11086,17 +11877,24 @@ class TestOther : public TestFixture {
               "        x = a + b;\n"
               "    return x;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:4:9]: (style) Variable 'x' is assigned an expression that holds the same value. [redundantAssignment]\n",
-                      errout_str());
+        ASSERT_EQUALS(
+            "[test.cpp:2:11] -> [test.cpp:3:9] -> [test.cpp:4:9]: (style) Variable 'x' is assigned an expression that holds the same value. [redundantAssignment]\n",
+            errout_str());
     }
 
     void varFuncNullUB() { // #4482
         check("void a(...);\n"
-              "void b() { a(NULL); }");
+              "void b() { a(NULL); }\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (portability) Passing NULL after the last typed argument to a variadic function leads to undefined behaviour. [varFuncNullUB]\n", errout_str());
 
         check("void a(char *p, ...);\n"
-              "void b() { a(NULL, 2); }");
+              "void b() { a(NULL, 2); }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkP("extern const int sentinel;\n"
+               "void a(int, ...);\n"
+               "#define b(x, ...) a((x), __VA_ARGS__, &sentinel)\n"
+               "void c() { b(1, NULL); }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -11110,7 +11908,7 @@ class TestOther : public TestFixture {
               "    bar(c);\n"
               "    c = getchar();\n"
               "  } ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (warning) Storing getchar() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f() {\n"
@@ -11119,7 +11917,7 @@ class TestOther : public TestFixture {
               "  {\n"
               "    bar(c);\n"
               "  } ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (warning) Storing getchar() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f() {\n"
@@ -11129,7 +11927,7 @@ class TestOther : public TestFixture {
               "    bar(c);\n"
               "    c = getchar();\n"
               "  } ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (warning) Storing getchar() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f() {\n"
@@ -11137,7 +11935,7 @@ class TestOther : public TestFixture {
               "  while( EOF != ( c = getchar() ) )\n"
               "  {\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (warning) Storing getchar() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f() {\n"
@@ -11147,7 +11945,7 @@ class TestOther : public TestFixture {
               "    bar(i);\n"
               "    i = getchar();\n"
               "  } ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -11157,7 +11955,7 @@ class TestOther : public TestFixture {
               "    bar(i);\n"
               "    i = getchar();\n"
               "  } ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -11167,7 +11965,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  c = getc (pFile);\n"
               "} while (c != EOF);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (warning) Storing getc() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f (FILE * pFile){\n"
@@ -11175,7 +11973,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  c = getc (pFile);\n"
               "} while (EOF != c);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:17]: (warning) Storing getc() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f (FILE * pFile){\n"
@@ -11183,7 +11981,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  i = getc (pFile);\n"
               "} while (i != EOF);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f (FILE * pFile){\n"
@@ -11191,7 +11989,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  i = getc (pFile);\n"
               "} while (EOF != i);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -11201,7 +11999,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  c = fgetc (pFile);\n"
               "} while (c != EOF);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (warning) Storing fgetc() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f (FILE * pFile){\n"
@@ -11209,7 +12007,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  c = fgetc (pFile);\n"
               "} while (EOF != c);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:17]: (warning) Storing fgetc() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f (FILE * pFile){\n"
@@ -11217,7 +12015,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  c = fgetc (pFile);\n"
               "} while (EOF != c);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f (FILE * pFile){\n"
@@ -11225,7 +12023,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  i = fgetc (pFile);\n"
               "} while (i != EOF);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f (FILE * pFile){\n"
@@ -11233,7 +12031,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  i = fgetc (pFile);\n"
               "} while (EOF != i);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // cin.get()
@@ -11243,7 +12041,7 @@ class TestOther : public TestFixture {
               "        std::cout << ch;\n"
               "        ch = std::cin.get();\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (warning) Storing cin.get() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f(){\n"
@@ -11252,7 +12050,7 @@ class TestOther : public TestFixture {
               "        std::cout << ch;\n"
               "        ch = std::cin.get();\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (warning) Storing cin.get() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f(){\n"
@@ -11261,7 +12059,7 @@ class TestOther : public TestFixture {
               "        std::cout << i;\n"
               "        i = std::cin.get();\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(){\n"
@@ -11270,7 +12068,7 @@ class TestOther : public TestFixture {
               "        std::cout << i;\n"
               "        i = std::cin.get();\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -11279,32 +12077,32 @@ class TestOther : public TestFixture {
               "  if (a < 0)\n"
               "    return a++,\n"
               "  do_something();\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Comma is used in return statement. The comma can easily be misread as a ';'.\n", "", errout_str());
 
         check("int fun(int a) {\n"
               "  if (a < 0)\n"
               "    return a++, do_something();\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("int fun(int a) {\n"
               "  if (a < 0)\n"
               "    return a+5,\n"
               "  do_something();\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Comma is used in return statement. The comma can easily be misread as a ';'.\n", "", errout_str());
 
         check("int fun(int a) {\n"
               "  if (a < 0)\n"
               "    return a+5, do_something();\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("int fun(int a) {\n"
               "  if (a < 0)\n"
               "    return c<int,\nint>::b;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // #4943 take care of C++11 initializer lists
@@ -11315,7 +12113,7 @@ class TestOther : public TestFixture {
               "        { \"2\" },\n"
               "        { \"3\" }\n"
               "    };\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -11331,7 +12129,7 @@ class TestOther : public TestFixture {
               "    explicit B(A a) : a(std::move(a)) {}\n"
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
-              "};", dinit(CheckOptions, $.inconclusive = false));
+              "};\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("struct A\n"
@@ -11344,7 +12142,7 @@ class TestOther : public TestFixture {
               "    explicit B(A a) : a{std::move(a)} {}\n"
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
-              "};", dinit(CheckOptions, $.inconclusive = false));
+              "};\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("struct A\n"
@@ -11358,7 +12156,7 @@ class TestOther : public TestFixture {
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
               "    A a2;"
-              "};", dinit(CheckOptions, $.inconclusive = false));
+              "};\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("struct A\n"
@@ -11372,7 +12170,7 @@ class TestOther : public TestFixture {
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
               "    A a2;"
-              "};", dinit(CheckOptions, $.inconclusive = false));
+              "};\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:8:14]: (performance) Function parameter 'a2' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("struct A\n"
@@ -11386,11 +12184,11 @@ class TestOther : public TestFixture {
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
               "    A a2;"
-              "};", dinit(CheckOptions, $.inconclusive = false));
+              "};\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:8:14]: (performance) Function parameter 'a2' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("std::map<int, int> m;\n" // #10817
-              "void f(const decltype(m)::const_iterator i) {}");
+              "void f(const decltype(m)::const_iterator i) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int (*pf) (std::vector<int>) = nullptr;\n" // #12118
@@ -11423,6 +12221,19 @@ class TestOther : public TestFixture {
               "void f(S<char, 3> s) {}\n");
         ASSERT_EQUALS("", errout_str());
 
+        check("struct T {\n" // #14667
+              "    U u1, u2;\n"
+              "    union {\n"
+              "        enum { E0, E1 } e;\n"
+              "        U u3;\n"
+              "        T i;\n"
+              "    } x;\n"
+              "};\n"
+              "T f(T t) {\n"
+              "    return t;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str()); // don't crash
+
         Settings settingsUnix32 = settingsBuilder().platform(Platform::Type::Unix32).build();
         check("struct S {\n" // #13850
               "    int i0 : 32;\n"
@@ -11437,33 +12248,33 @@ class TestOther : public TestFixture {
         // positive test
         check("bool f(int x){\n"
               "   return isless(x,x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of two identical variables with isless(x,x) always evaluates to false. [comparisonFunctionIsAlwaysTrueOrFalse]\n", errout_str());
 
         check("bool f(int x){\n"
               "   return isgreater(x,x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of two identical variables with isgreater(x,x) always evaluates to false. [comparisonFunctionIsAlwaysTrueOrFalse]\n", errout_str());
 
         check("bool f(int x){\n"
               "   return islessgreater(x,x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of two identical variables with islessgreater(x,x) always evaluates to false. [comparisonFunctionIsAlwaysTrueOrFalse]\n", errout_str());
 
         check("bool f(int x){\n"
               "   return islessequal(x,x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of two identical variables with islessequal(x,x) always evaluates to true. [comparisonFunctionIsAlwaysTrueOrFalse]\n", errout_str());
 
         check("bool f(int x){\n"
               "   return isgreaterequal(x,x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of two identical variables with isgreaterequal(x,x) always evaluates to true. [comparisonFunctionIsAlwaysTrueOrFalse]\n", errout_str());
 
         // no warning should be reported for
         check("bool f(int x, int y){\n"
               "   return isgreaterequal(x,y) && islessequal(x,y) && islessgreater(x,y) && isgreater(x,y) && isless(x,y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -11471,7 +12282,7 @@ class TestOther : public TestFixture {
         // no signed integer overflow should happen
         check("void f(unsigned long long ull) {\n"
               "    if (ull == 0x89504e470d0a1a0a || ull == 0x8a4d4e470d0a1a0a) ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -11566,7 +12377,7 @@ class TestOther : public TestFixture {
     void test_isSameExpression() { // see #5738
         check("bool isInUnoIncludeFile(StringRef name) {"
               "   return  name.startswith(SRCDIR \"/com/\") || name.startswith(SRCDIR \"/uno/\");\n"
-              "};", dinit(CheckOptions, $.inconclusive = false));
+              "};\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -11575,7 +12386,7 @@ class TestOther : public TestFixture {
                                   "    int counter = 0;\n"
                                   "    InterlockedDecrement(&counter);\n"
                                   "    whatever();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11584,7 +12395,7 @@ class TestOther : public TestFixture {
                                   "    if (counter)\n"
                                   "        return;\n"
                                   "    destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11592,7 +12403,7 @@ class TestOther : public TestFixture {
                                   "    InterlockedDecrement(&counter);\n"
                                   "    if (!counter)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11601,7 +12412,7 @@ class TestOther : public TestFixture {
                                   "    if (counter > 0)\n"
                                   "        return;\n"
                                   "    destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11610,7 +12421,7 @@ class TestOther : public TestFixture {
                                   "    if (0 < counter)\n"
                                   "        return;\n"
                                   "    destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11618,7 +12429,7 @@ class TestOther : public TestFixture {
                                   "    InterlockedDecrement(&counter);\n"
                                   "    if (counter == 0)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11626,7 +12437,7 @@ class TestOther : public TestFixture {
                                   "    InterlockedDecrement(&counter);\n"
                                   "    if (0 == counter)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11635,7 +12446,7 @@ class TestOther : public TestFixture {
                                   "    if (0 != counter)\n"
                                   "        return;\n"
                                   "    destroy()\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11644,7 +12455,7 @@ class TestOther : public TestFixture {
                                   "    if (counter != 0)\n"
                                   "        return;\n"
                                   "    destroy()\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11652,7 +12463,7 @@ class TestOther : public TestFixture {
                                   "    InterlockedDecrement(&counter);\n"
                                   "    if (counter <= 0)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11660,7 +12471,7 @@ class TestOther : public TestFixture {
                                   "    InterlockedDecrement(&counter);\n"
                                   "    if (0 >= counter)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11669,7 +12480,7 @@ class TestOther : public TestFixture {
                                   "    if (newCount)\n"
                                   "        return;\n"
                                   "    destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11677,7 +12488,7 @@ class TestOther : public TestFixture {
                                   "    int newCount = InterlockedDecrement(&counter);\n"
                                   "    if (!newCount)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11686,7 +12497,7 @@ class TestOther : public TestFixture {
                                   "    if (newCount > 0)\n"
                                   "        return;\n"
                                   "    destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11695,7 +12506,7 @@ class TestOther : public TestFixture {
                                   "    if (0 < newCount)\n"
                                   "        return;\n"
                                   "    destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11703,7 +12514,7 @@ class TestOther : public TestFixture {
                                   "    int newCount = InterlockedDecrement(&counter);\n"
                                   "    if (newCount == 0)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11711,7 +12522,7 @@ class TestOther : public TestFixture {
                                   "    int newCount = InterlockedDecrement(&counter);\n"
                                   "    if (0 == newCount)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11720,7 +12531,7 @@ class TestOther : public TestFixture {
                                   "    if (0 != newCount)\n"
                                   "        return;\n"
                                   "    destroy()\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11729,7 +12540,7 @@ class TestOther : public TestFixture {
                                   "    if (newCount != 0)\n"
                                   "        return;\n"
                                   "    destroy()\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11737,7 +12548,7 @@ class TestOther : public TestFixture {
                                   "    int newCount = InterlockedDecrement(&counter);\n"
                                   "    if (newCount <= 0)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11745,7 +12556,7 @@ class TestOther : public TestFixture {
                                   "    int newCount = InterlockedDecrement(&counter);\n"
                                   "    if (0 >= newCount)\n"
                                   "        destroy;\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("int f() {\n"
@@ -11756,7 +12567,7 @@ class TestOther : public TestFixture {
                                   "    } else {\n"
                                   "        return counter;\n"
                                   "    }\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:7:16]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("int f() {\n"
@@ -11767,7 +12578,7 @@ class TestOther : public TestFixture {
                                   "    } else {\n"
                                   "        return counter;\n"
                                   "    }\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:7:16]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
 
@@ -11778,7 +12589,7 @@ class TestOther : public TestFixture {
                                   "        return 0;\n"
                                   "    }\n"
                                   "    return counter;\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:7:12]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("int f() {\n"
@@ -11788,7 +12599,7 @@ class TestOther : public TestFixture {
                                   "        return 0;\n"
                                   "    }\n"
                                   "    return counter;\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:7:12]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("int f() {\n"
@@ -11799,7 +12610,7 @@ class TestOther : public TestFixture {
                                   "    } else\n"
                                   "        return counter;\n"
                                   "   \n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:7:16]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("int f() {\n"
@@ -11810,21 +12621,21 @@ class TestOther : public TestFixture {
                                   "    } else\n"
                                   "        return counter;\n"
                                   "   \n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:7:16]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
     }
 
     void testUnusedLabel() {
         check("void f() {\n"
               "    label:\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Label 'label' is not used. [unusedLabel]\n", errout_str());
 
         check("void f() {\n"
               "    label:\n"
               "    foo();\n"
               "    goto label;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -11834,28 +12645,28 @@ class TestOther : public TestFixture {
               "}\n"
               "void g() {\n"
               "    label:\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (style) Label 'label' is not used. [unusedLabel]\n", errout_str());
 
         check("void f() {\n"
               "    switch(a) {\n"
               "        default:\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    class X {\n"
               "        protected:\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    class X {\n"
               "        my_protected:\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int test(char art) {\n"
@@ -11867,7 +12678,7 @@ class TestOther : public TestFixture {
               "    case 2:\n"
               "        return 2;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Label 'caseZERO' is not used. Should this be a 'case' of the enclosing switch()? [unusedLabelSwitch]\n"
                       "[test.cpp:5:5]: (warning) Label 'case1' is not used. Should this be a 'case' of the enclosing switch()? [unusedLabelSwitch]\n", errout_str());
 
@@ -11877,7 +12688,7 @@ class TestOther : public TestFixture {
               "        return 2;\n"
               "    }\n"
               "    label:\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (style) Label 'label' is not used. [unusedLabel]\n", errout_str());
     }
 
@@ -11888,7 +12699,7 @@ class TestOther : public TestFixture {
                "    goto END;\n"
                "#endif\n"
                "END:\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("[test.cpp:5:1]: (style) Label 'END' is not used. There is #if in function body so the label might be used in code that is removed by the preprocessor. [unusedLabelConfiguration]\n",
                       errout_str());
     }
@@ -11906,45 +12717,58 @@ class TestOther : public TestFixture {
                "    END:\n"
                "        return;\n"
                "    }\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("[test.cpp:10:5]: (warning) Label 'END' is not used. There is #if in function body so the label might be used in code that is removed by the preprocessor. Should this be a 'case' of the enclosing switch()? [unusedLabelSwitchConfiguration]\n",
                       errout_str());
     }
 
+    void testUnusedLabelPremiumMisra() { // #14467 - enable unusedLabel with --premium=misra-c-20xx flag
+        Settings s;
+        check("void f() {\n"
+              "    label:\n"
+              "}\n", dinit(CheckOptions, $.settings = &s));
+        ASSERT_EQUALS("", errout_str());
+        s.premiumArgs = "--misra-c-2012"; // <- activates unusedLabel checking
+        check("void f() {\n"
+              "    label:\n"
+              "}\n", dinit(CheckOptions, $.settings = &s));
+        ASSERT_EQUALS("[test.cpp:2:5]: (style) Label 'label' is not used. [unusedLabel]\n", errout_str());
+    }
+
     // TODO: only used in a single place
 #define checkCustomSettings(...) checkCustomSettings_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
-    void checkCustomSettings_(const char* file, int line, const char (&code)[size], const Settings& settings) {
+    void checkCustomSettings_(const char* file, int line, const char (&code)[size], const Settings& settings, bool cpp = true) {
         // Tokenize..
-        SimpleTokenizer tokenizer(settings, *this);
+        SimpleTokenizer tokenizer(settings, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckOther>(tokenizer, this);
+        CheckOther check;
+        runChecks(check, tokenizer, *this);
     }
 
     void testEvaluationOrder() {
         check("void f() {\n"
               "  int x = dostuff();\n"
               "  return x + x++;\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:12]: (error) Expression 'x+x++' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
 
         // #7226
         check("long int f1(const char *exp) {\n"
               "  return strtol(++exp, (char **)&exp, 10);\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         check("long int f1(const char *exp) {\n"
               "  return dostuff(++exp, exp, 10);\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:2:23]: (error) Expression '++exp,exp' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
 
         check("void f() {\n"
               "  int a;\n"
               "  while (a=x(), a==123) {}\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         // # 8717
@@ -11969,33 +12793,39 @@ class TestOther : public TestFixture {
 
         check("void f(int i) {\n"
               "  int n = ++i + i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (error) Expression '++i+i' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
 
         check("long int f1(const char *exp) {\n"
               "  return dostuff(++exp, ++exp, 10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (portability) Expression '++exp,++exp' depends on order of evaluation of side effects. Behavior is Unspecified according to c++17 [unknownEvaluationOrder]\n"
                       "[test.cpp:2:23]: (portability) Expression '++exp,++exp' depends on order of evaluation of side effects. Behavior is Unspecified according to c++17 [unknownEvaluationOrder]\n", errout_str());
 
         check("void f(int i) {\n"
               "  int n = (~(-(++i)) + i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (error) Expression '~(-(++i))+i' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
 
         const Settings settings11 = settingsBuilder(settings0).cpp(Standards::CPP11).certainty(Certainty::inconclusive).build();
 
         checkCustomSettings("void f(int i) {\n"
                             "  i = i++ + 2;\n"
-                            "}", settings11);
+                            "}\n", settings11);
         ASSERT_EQUALS("[test.cpp:2:11]: (error) Expression 'i+++2' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
+
+        // #14431
+        checkCustomSettings("int f(void) {\n"
+                            "  struct baz baz = {.bar = {.foo = {.foo = 1}}};\n"
+                            "}\n", settings0, false);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testEvaluationOrderSelfAssignment() {
         // self assignment
         check("void f() {\n"
               "  int x = x = y + 1;\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS(
             "[test.c:2:9]: (style) Redundant assignment of 'x' to itself. [selfAssignment]\n"
             "[test.c:2:9]: (style) Redundant assignment of 'x' to itself. [selfAssignment]\n",   // duplicate
@@ -12007,7 +12837,7 @@ class TestOther : public TestFixture {
         checkP("#define X x\n"
                "void f(int x) {\n"
                "  return x + X++;\n"
-               "}", dinit(CheckPOptions, $.cpp = false));
+               "}\n", dinit(CheckPOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:12]: (error) Expression 'x+x++' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
     }
 
@@ -12015,13 +12845,13 @@ class TestOther : public TestFixture {
         // FP
         check("void f(int id) {\n"
               "  id = dostuff(id += 42);\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         // FN
         check("void f(int id) {\n"
               "  id = id + dostuff(id += 42);\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
@@ -12029,19 +12859,19 @@ class TestOther : public TestFixture {
         check("int f(void) {\n"
               "  int t;\n"
               "  return (unsigned char)(t=1,t^c);\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void) {\n"
               "  int t;\n"
               "  dostuff(t=1,t^c);\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:14]: (error) Expression 't=1,t^c' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
 
         check("void f(void) {\n"
               "  int t;\n"
               "  dostuff((t=1,t),2);\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         // #8230
@@ -12070,7 +12900,7 @@ class TestOther : public TestFixture {
     void testEvaluationOrderSizeof() {
         check("void f(char *buf) {\n"
               "  dostuff(buf++, sizeof(*buf));"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -12089,10 +12919,20 @@ class TestOther : public TestFixture {
               "  if (0 > d.n) {\n"
               "    return;\n"
               "  }\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:8:11]: (style) Checking if unsigned expression 'd.n' is less than zero. [unsignedLessThanZero]\n"
                       "[test.c:12:9]: (style) Checking if unsigned expression 'd.n' is less than zero. [unsignedLessThanZero]\n",
                       errout_str());
+
+        check("int ifunc(int x);\n"
+              "unsigned int ufunc(unsigned int x);\n"
+              "void f(void)\n"
+              "{\n"
+              "    unsigned int x = 0;\n"
+              "    if (_Generic(x, int: ifunc, unsigned int: ufunc)(x) < 0) {}\n"
+              "}\n", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:6:57]: (style) Checking if unsigned expression '_Generic(x,int:ifunc,unsigned int:ufunc)(x)' is less than zero. [unsignedLessThanZero]\n",
+                      errout_str());
     }
 
     void doubleMove1() {
@@ -12101,7 +12941,7 @@ class TestOther : public TestFixture {
               "    A a;\n"
               "    g(std::move(a));\n"
               "    g(std::move(a));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:17]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
 
@@ -12115,7 +12955,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    B b1;\n"
               "    B b2;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:24]: (warning) Access of moved variable 'b'. [accessMoved]\n", errout_str());
     }
 
@@ -12128,7 +12968,7 @@ class TestOther : public TestFixture {
               "    {}\n"
               "    B b1;\n"
               "    B b2;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:19]: (warning) Access of moved variable 'b'. [accessMoved]\n", errout_str());
     }
 
@@ -12159,7 +12999,7 @@ class TestOther : public TestFixture {
               "    A a;\n"
               "    a = g(std::move(a));\n"
               "    a = g(std::move(a));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -12169,7 +13009,7 @@ class TestOther : public TestFixture {
               "    A a;\n"
               "    B b = g(std::move(a));\n"
               "    C c = g(std::move(a));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
 
@@ -12185,7 +13025,7 @@ class TestOther : public TestFixture {
               "    h(a);\n"
               "    a = b;\n"
               "    h(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (warning) Access of moved variable 'a'. [accessMoved]\n"
                       "[test.cpp:8:7]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
@@ -12196,7 +13036,7 @@ class TestOther : public TestFixture {
               "    A a;\n"
               "    a.reset(g(std::move(a)));\n"
               "    a.reset(g(std::move(a)));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -12208,7 +13048,7 @@ class TestOther : public TestFixture {
               "    A c;\n"
               "    b.reset(g(std::move(a)));\n"
               "    c.reset(g(std::move(a)));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:25]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
 
@@ -12224,7 +13064,7 @@ class TestOther : public TestFixture {
               "    h(a);\n"
               "    a.reset(b);\n"
               "    h(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (warning) Access of moved variable 'a'. [accessMoved]\n"
                       "[test.cpp:8:7]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
@@ -12236,7 +13076,7 @@ class TestOther : public TestFixture {
               "    A b = std::move(a);\n"
               "    g(a);\n"
               "    A c = a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:7]: (warning) Access of moved variable 'a'. [accessMoved]\n"
                       "[test.cpp:6:11]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
@@ -12248,7 +13088,7 @@ class TestOther : public TestFixture {
               "    A b = std::move(a);\n"
               "    g(a);\n"
               "    A c = a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -12259,7 +13099,7 @@ class TestOther : public TestFixture {
               "    A b = std::move(a);\n"
               "    g(a);\n"
               "    A c = a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:7]: (warning) Access of moved variable 'a'. [accessMoved]\n"
                       "[test.cpp:6:11]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
@@ -12270,7 +13110,7 @@ class TestOther : public TestFixture {
               "    A b = std::move(a);\n"
               "    g(a);\n"
               "    A c = a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (warning, inconclusive) Access of moved variable 'a'. [accessMoved]\n"
                       "[test.cpp:5:11]: (warning, inconclusive) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
@@ -12283,7 +13123,7 @@ class TestOther : public TestFixture {
               "    if (i)\n"
               "        return g(std::move(b));\n"
               "    return h(std::move(a),std::move(b));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:24]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
 
@@ -12293,7 +13133,7 @@ class TestOther : public TestFixture {
               "    g(std::move(v));\n"
               "    v.clear();\n"
               "    if (v.empty()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -12303,9 +13143,19 @@ class TestOther : public TestFixture {
               "    g(std::move(p));\n"
               "    x = p->x;\n"
               "    y = p->y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (warning) Access of moved variable 'p'. [accessMoved]\n"
                       "[test.cpp:5:9]: (warning) Access of moved variable 'p'. [accessMoved]\n", errout_str());
+
+        check("void h(std::unique_ptr<int>);\n" // #12436
+              "void g(int);\n"
+              "void f() {\n"
+              "    std::unique_ptr<int> p = std::make_unique<int>(5);\n"
+              "    int* w = p.get();\n"
+              "    h(std::move(p));\n"
+              "    g(*w);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:10]: (style) Variable 'w' can be declared as pointer to const [constVariablePointer]\n", errout_str());
     }
 
     void moveAndAddressOf() {
@@ -12313,7 +13163,7 @@ class TestOther : public TestFixture {
               "    std::string s1 = x;\n"
               "    std::string s2 = std::move(s1);\n"
               "    p = &s1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -12322,16 +13172,16 @@ class TestOther : public TestFixture {
               "    A a;\n"
               "    gx(std::move(a).x());\n"
               "    gy(std::move(a).y());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void moveAndLambda() {
         check("void f() {\n"
               "    A a;\n"
-              "    auto h = [a=std::move(a)](){return g(std::move(a));};"
+              "    auto h = [a=std::move(a)](){return g(std::move(a));};\n"
               "    b = a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -12352,6 +13202,24 @@ class TestOther : public TestFixture {
               "    }\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:4:36]: (warning) Access of moved variable 'l'. [accessMoved]\n", errout_str());
+
+        check("struct S {\n" // #13179
+              "    operator bool() const { return !m.empty(); }\n"
+              "    std::string m;\n"
+              "};\n"
+              "S get();\n"
+              "void set(S);\n"
+              "void f() {\n"
+              "    while (S s = get()) {\n"
+              "        set(std::move(s));\n"
+              "    }\n"
+              "}\n"
+              "void g() {\n"
+              "    while (S s{ get() }) {\n"
+              "        set(std::move(s));\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void moveCallback()
@@ -12384,7 +13252,7 @@ class TestOther : public TestFixture {
               "void f(T && t) {\n"
               "    g(std::forward<T>(t));\n"
               "    T s = t;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (warning) Access of forwarded variable 't'. [accessForwarded]\n", errout_str());
     }
 
@@ -12410,6 +13278,13 @@ class TestOther : public TestFixture {
               "    cif::condition mWhere;\n"
               "};\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void g(std::string);\n" // #14928
+              "void f(std::string s) {\n"
+              "    g(std::move(s));\n"
+              "    for (char c : s) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:19]: (warning) Access of moved variable 's'. [accessMoved]\n", errout_str());
     }
 
     void moveTernary()
@@ -12439,6 +13314,18 @@ class TestOther : public TestFixture {
               "    h(b ? h(gA(5, std::move(s))) : h(gB(7, std::move(s))));\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("int cb(std::string);\n" // #13628
+              "void f(bool b, std::string s1) {\n"
+              "    std::string s2 = b ? cb(std::move(s1)) : s1;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int cb(std::string);\n"
+              "void f(bool b, std::string s1) {\n"
+              "    std::string s2 = b ? cb(std::move(s1)) : s1 + s1;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void movePointerAlias()
@@ -12452,6 +13339,38 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("[test.cpp:5:8]: (warning) Access of moved variable '.'. [accessMoved]\n", errout_str());
     }
 
+    void moveOutparam()
+    {
+        check("void f(std::vector<std::string>& v) {\n" // #11300
+              "    std::string l;\n"
+              "    while (std::getline(std::cin, l)) {\n"
+              "        if (!l.empty()) {\n"
+              "            v.emplace_back(std::move(l));\n"
+              "        }\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(std::ifstream& fin, std::set<std::string>& s) {\n"
+              "    std::string line;\n"
+              "    while (std::getline(fin, line)) {\n"
+              "        s.emplace(std::move(line));\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void moveTryEmplace()
+    {
+        check("void f(std::map<std::string, std::string>& m, std::string& s) {\n" // #12773
+              "    bool b = m.try_emplace(\"a\", std::move(s)).second;\n"
+              "    if (!b) {\n"
+              "        std::cout << s;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void funcArgNamesDifferent() {
         check("void func1(int a, int b, int c);\n"
               "void func1(int a, int b, int c) { }\n"
@@ -12466,7 +13385,7 @@ class TestOther : public TestFixture {
               "void Fred::func1(int a, int b, int c) { }\n"
               "void Fred::func2(int A, int B, int C) { }\n"
               "void Fred::func3(int a, int b, int c) { }\n"
-              "void Fred::func4(int A, int B, int C) { }");
+              "void Fred::func4(int A, int B, int C) { }\n");
         ASSERT_EQUALS("[test.cpp:3:16] -> [test.cpp:4:16]: (style, inconclusive) Function 'func2' argument 1 names different: declaration 'a' definition 'A'. [funcArgNamesDifferent]\n"
                       "[test.cpp:3:23] -> [test.cpp:4:23]: (style, inconclusive) Function 'func2' argument 2 names different: declaration 'b' definition 'B'. [funcArgNamesDifferent]\n"
                       "[test.cpp:3:30] -> [test.cpp:4:30]: (style, inconclusive) Function 'func2' argument 3 names different: declaration 'c' definition 'C'. [funcArgNamesDifferent]\n"
@@ -12476,6 +13395,39 @@ class TestOther : public TestFixture {
                       "[test.cpp:9:20] -> [test.cpp:14:22]: (style, inconclusive) Function 'func4' argument 1 names different: declaration 'a' definition 'A'. [funcArgNamesDifferent]\n"
                       "[test.cpp:9:31] -> [test.cpp:14:29]: (style, inconclusive) Function 'func4' argument 2 names different: declaration 'b' definition 'B'. [funcArgNamesDifferent]\n"
                       "[test.cpp:9:42] -> [test.cpp:14:36]: (style, inconclusive) Function 'func4' argument 3 names different: declaration 'c' definition 'C'. [funcArgNamesDifferent]\n", errout_str());
+
+        check("using F1 = void (*)();\n" // #14633
+              "void f(F1 a);\n"
+              "void f(F1 b) {}\n"
+              "typedef void (*F2)();\n"
+              "void g(F2 a);\n"
+              "void g(F2 b) {}\n"
+              "void h(void (*a)());\n"
+              "void h(void (*b)()) {}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:11] -> [test.cpp:3:11]: (style, inconclusive) Function 'f' argument 1 names different: declaration 'a' definition 'b'. [funcArgNamesDifferent]\n"
+            "[test.cpp:5:11] -> [test.cpp:6:11]: (style, inconclusive) Function 'g' argument 1 names different: declaration 'a' definition 'b'. [funcArgNamesDifferent]\n"
+            "[test.cpp:7:15] -> [test.cpp:8:15]: (style, inconclusive) Function 'h' argument 1 names different: declaration 'a' definition 'b'. [funcArgNamesDifferent]\n",
+            errout_str());
+
+        check("void f(int a);\n" // #14632
+              "void f(int) {}\n"
+              "void g(int);\n"
+              "void g(int b) {}\n"
+              "void h(int);\n"
+              "void h(int) {}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:1:12]: (style, inconclusive) Function 'f' argument 1 names different: declaration 'a' definition '<unnamed>'. [funcArgNamesDifferentUnnamed]\n"
+            "[test.cpp:4:12]: (style, inconclusive) Function 'g' argument 1 names different: declaration '<unnamed>' definition 'b'. [funcArgNamesDifferentUnnamed]\n",
+            errout_str());
+
+        check("void f(void (*fp)(), int x);\n" // #14847
+              "void f(void (*fp)(), int x) {}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(void (*fp)(int a, int b), int b);\n" // #14853
+              "void f(void (*fp)(int a, int b), int b) {}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void funcArgOrderDifferent() {
@@ -12501,54 +13453,58 @@ class TestOther : public TestFixture {
                       "[test.cpp:9:20] -> [test.cpp:14:22]: (warning) Function 'func2' argument order different: declaration 'a, b, c' definition 'c, b, a' [funcArgOrderDifferent]\n"
                       "[test.cpp:10:20] -> [test.cpp:15:22]: (warning) Function 'func3' argument order different: declaration 'a, b, c' definition 'c, b, a' [funcArgOrderDifferent]\n"
                       "[test.cpp:11:16] -> [test.cpp:16:22]: (warning) Function 'func4' argument order different: declaration ', b, c' definition 'c, b, a' [funcArgOrderDifferent]\n", errout_str());
+
+        check("void f(int N, const int a[N], const int b[N]);\n" // #14710
+              "void f(int N, const int a[N], const int b[N]) {}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #7846 - Syntax error when using C++11 braced-initializer in default argument
     void cpp11FunctionArgInit() {
         // syntax error is not expected
-        ASSERT_NO_THROW(check("\n void foo(int declaration = {}) {"
+        ASSERT_NO_THROW(check("\n void foo(int declaration = {}) {\n"
                               "\n   for (int i = 0; i < 10; i++) {}\n"
-                              "\n }"
-                              "\n  "));
+                              "\n }\n"
+                              "\n"));
         ASSERT_EQUALS("", errout_str());
     }
 
     void shadowVariables() {
         check("int x;\n"
-              "void f() { int x; }");
+              "void f() { int x; }\n");
         ASSERT_EQUALS("[test.cpp:1:5] -> [test.cpp:2:16]: (style) Local variable 'x' shadows outer variable [shadowVariable]\n", errout_str());
 
         check("int x();\n"
-              "void f() { int x; }");
+              "void f() { int x; }\n");
         ASSERT_EQUALS("[test.cpp:1:5] -> [test.cpp:2:16]: (style) Local variable 'x' shadows outer function [shadowFunction]\n", errout_str());
 
         check("struct C {\n"
               "    C(int x) : x(x) {}\n" // <- we do not want a FP here
               "    int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  if (cond) {int x;}\n" // <- not a shadow variable
               "  int x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int size() {\n"
               "  int size;\n" // <- not a shadow variable
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #8954 - lambda
               "  int x;\n"
-              "  auto f = [](){ int x; }"
-              "}");
+              "  auto f = [](){ int x; }\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int x) { int x; }");
+        check("void f(int x) { int x; }\n");
         ASSERT_EQUALS("[test.cpp:1:12] -> [test.cpp:1:21]: (style) Local variable 'x' shadows outer argument [shadowArgument]\n", errout_str());
 
-        check("class C { C(); void foo() { static int C = 0; } }"); // #9195 - shadow constructor
+        check("class C { C(); void foo() { static int C = 0; } }\n"); // #9195 - shadow constructor
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n" // #10091 - shadow destructor
@@ -12557,7 +13513,7 @@ class TestOther : public TestFixture {
               "        bool C{};\n"
               "    }\n"
               "};\n"
-              "C::~C() = default;");
+              "C::~C() = default;\n");
         ASSERT_EQUALS("", errout_str());
 
         // 10752 - no
@@ -12568,21 +13524,21 @@ class TestOther : public TestFixture {
               "        int i = 0;\n"
               "        return i;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "    int i{};\n"
               "    void f() { int i; }\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:20]: (style) Local variable 'i' shadows outer variable [shadowVariable]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:20]: (style) Local variable 'i' shadows outer member [shadowMember]\n", errout_str());
 
         check("struct S {\n"
               "    int i{};\n"
               "    std::vector<int> v;\n"
               "    void f() const { for (const int& i : v) {} }\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:38]: (style) Local variable 'i' shadows outer variable [shadowVariable]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:38]: (style) Local variable 'i' shadows outer member [shadowMember]\n", errout_str());
 
         check("struct S {\n" // #10405
               "    F* f{};\n"
@@ -12592,7 +13548,7 @@ class TestOther : public TestFixture {
               "void S::f() const {\n"
               "    for (const F& f : fl) {}\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:2:8] -> [test.cpp:7:19]: (style) Local variable 'f' shadows outer variable [shadowVariable]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:8] -> [test.cpp:7:19]: (style) Local variable 'f' shadows outer member [shadowMember]\n", errout_str());
 
         check("extern int a;\n"
               "int a;\n"
@@ -12614,25 +13570,76 @@ class TestOther : public TestFixture {
               "    friend int f() { int i = 5; return i; }\n"
               "};\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("int x;\n"
+              "void f(int x) {}\n");
+        ASSERT_EQUALS("[test.cpp:1:5] -> [test.cpp:2:12]: (style) Argument 'x' shadows outer variable [shadowVariable]\n", errout_str());
+
+        check("void x() {}\n"
+              "void f(int x) {}\n");
+        ASSERT_EQUALS("[test.cpp:1:6] -> [test.cpp:2:12]: (style) Argument 'x' shadows outer function [shadowFunction]\n", errout_str());
+
+        check("struct S { int v; void func(int v); };\n"
+              "void S::func(int v) { this->v = v; }\n");
+        ASSERT_EQUALS("[test.cpp:1:16] -> [test.cpp:2:18]: (style) Argument 'v' shadows outer member [shadowMember]\n", errout_str());
+
+        check("struct S { int v; void func(void); };\n"
+              "void S::func() { int v = 0; }\n");
+        ASSERT_EQUALS("[test.cpp:1:16] -> [test.cpp:2:22]: (style) Local variable 'v' shadows outer member [shadowMember]\n", errout_str());
+
+        check("struct S { int v; explicit S(int v); };\n"
+              "S::S(int v) : v(v) {}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int v(); explicit S(int v); };\n"
+              "S::S(int v) : v(v) {}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int i(); static void f(int i) {} };\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { static int i(); static void f(int i) {} };\n");
+        ASSERT_EQUALS("[test.cpp:1:23] -> [test.cpp:1:46]: (style) Argument 'i' shadows outer function [shadowFunction]\n", errout_str());
+
+        check("struct S { void g(float f) {} void f() {} };\n");
+        ASSERT_EQUALS("[test.cpp:1:36] -> [test.cpp:1:25]: (style) Argument 'f' shadows outer function [shadowFunction]\n", errout_str());
+
+        check("int f() {\n" // #15114
+              "    int i = 0;\n"
+              "    return i;\n"
+              "}\n"
+              "int i = 1;\n");
+        ASSERT_EQUALS("", errout_str());
+
+        {
+            ScopedFile inc("test.h", "int pad1;\nint pad2;\nint pad3;\nint pad4;\nfloat f;\n");
+            checkP("void g() {\n"
+                   "    #include \"test.h\"\n"
+                   "    {\n"
+                   "        float f;\n"
+                   "    }\n"
+                   "}\n");
+            ASSERT_EQUALS("[test.h:5:7] -> [test.cpp:4:15]: (style) Local variable 'f' shadows outer variable [shadowVariable]\n", errout_str());
+        }
     }
 
     void knownArgument() {
         check("void g(int);\n"
               "void f(int x) {\n"
               "   g((x & 0x01) >> 7);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Argument '(x&0x01)>>7' to function g is always 0. It does not matter what value 'x' has. [knownArgument]\n", errout_str());
 
         check("void g(int);\n"
               "void f(int x) {\n"
               "   g((int)((x & 0x01) >> 7));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (style) Argument '(int)((x&0x01)>>7)' to function g is always 0. It does not matter what value 'x' has. [knownArgument]\n", errout_str());
 
         check("void g(int, int);\n"
               "void f(int x) {\n"
               "   g(x, (x & 0x01) >> 7);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:20]: (style) Argument '(x&0x01)>>7' to function g is always 0. It does not matter what value 'x' has. [knownArgument]\n",
             errout_str());
@@ -12640,65 +13647,65 @@ class TestOther : public TestFixture {
         check("void g(int);\n"
               "void f(int x) {\n"
               "    g(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void h() { return 1; }\n"
               "void f(int x) {\n"
               "    g(h());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void f(int x) {\n"
               "    g(std::strlen(\"a\"));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void f(int x) {\n"
               "    g((int)0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(Foo *);\n"
               "void f() {\n"
               "    g(reinterpret_cast<Foo*>(0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void f(int x) {\n"
               "    x = 0;\n"
               "    g(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void f() {\n"
               "    const int x = 0;\n"
               "    g(x + 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void f() {\n"
               "    char i = 1;\n"
               "    g(static_cast<int>(i));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("char *yytext;\n"
               "void re_init_scanner() {\n"
               "  int size = 256;\n"
               "  yytext = xmalloc(size * sizeof *yytext);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const char *c) {\n"
               "    if (*c == '+' && (operand || !isalnum(*c))) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8986
@@ -12706,14 +13713,14 @@ class TestOther : public TestFixture {
               "void g() {\n"
               "    const int x[] = { 10, 10 };\n"
               "    f(x[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int);\n"
               "void g() {\n"
               "    int x[] = { 10, 10 };\n"
               "    f(x[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Variable 'x' can be declared as const array [constVariable]\n", errout_str());
 
         check("struct A { int x; };"
@@ -12722,21 +13729,21 @@ class TestOther : public TestFixture {
               "    A y;\n"
               "    y.x = 1;\n"
               "    g(y.x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // allow known argument value in assert call
         check("void g(int);\n"
               "void f(int x) {\n"
               "   ASSERT((int)((x & 0x01) >> 7));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9905 - expression that does not use integer calculation at all
         check("void foo() {\n"
               "    const std::string heading = \"Interval\";\n"
               "    std::cout << std::setw(heading.length());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9909 - struct member with known value
@@ -12747,7 +13754,7 @@ class TestOther : public TestFixture {
               "void growLongStack(LongStack* self) {\n"
               "    self->maxsize = 32;\n"
               "    dostuff(self->maxsize * sizeof(intptr_t));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #11894
@@ -12816,6 +13823,18 @@ class TestOther : public TestFixture {
                "    return MACRO(true);\n"
                "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #15063
+              "    int (*f)(int, int);\n"
+              "    int (*a[2])(int, int);\n"
+              "};\n"
+              "int g1(struct S* p, int x) {\n"
+              "    return (p->f)(x, 10);\n"
+              "}\n"
+              "int g2(struct S s, int x) {\n"
+              "    return s.a[0](x, 10);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void knownArgumentHiddenVariableExpression() {
@@ -12842,7 +13861,7 @@ class TestOther : public TestFixture {
               "    bar(P, N); \n"
               "    if (c ? a : b)\n"
               "      baz(P, N); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -12855,7 +13874,7 @@ class TestOther : public TestFixture {
               "       diff = 1;\n"
               "    }\n"
               "    return diff;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:15] -> [test.cpp:5:8] -> [test.cpp:3:15] -> [test.cpp:5:14] -> [test.cpp:5:12]: (error) Comparing pointers that point to different objects [comparePointers]\n",
             errout_str());
@@ -12866,7 +13885,7 @@ class TestOther : public TestFixture {
               "    int* xp = &x;\n"
               "    int* yp = &y;\n"
               "    return xp > yp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:9] -> [test.cpp:4:15] -> [test.cpp:3:9] -> [test.cpp:5:15] -> [test.cpp:6:15]: (error) Comparing pointers that point to different objects [comparePointers]\n"
             "[test.cpp:4:10]: (style) Variable 'xp' can be declared as pointer to const [constVariablePointer]\n"
@@ -12877,7 +13896,7 @@ class TestOther : public TestFixture {
               "    int x = 0;\n"
               "    int y = 1;\n"
               "    return &x > &y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:9] -> [test.cpp:4:12] -> [test.cpp:3:9] -> [test.cpp:4:17] -> [test.cpp:4:15]: (error) Comparing pointers that point to different objects [comparePointers]\n",
             errout_str());
@@ -12889,7 +13908,7 @@ class TestOther : public TestFixture {
               "    int* xp = &x.data;\n"
               "    int* yp = &y.data;\n"
               "    return xp > yp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:7] -> [test.cpp:5:15] -> [test.cpp:4:7] -> [test.cpp:6:15] -> [test.cpp:7:15]: (error) Comparing pointers that point to different objects [comparePointers]\n"
             "[test.cpp:5:10]: (style) Variable 'xp' can be declared as pointer to const [constVariablePointer]\n"
@@ -12903,7 +13922,7 @@ class TestOther : public TestFixture {
               "    int* xp = &x->data;\n"
               "    int* yp = &y->data;\n"
               "    return xp > yp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:10] -> [test.cpp:3:12] -> [test.cpp:5:15] -> [test.cpp:2:16] -> [test.cpp:4:12] -> [test.cpp:6:15] -> [test.cpp:7:15]: (error) Comparing pointers that point to different objects [comparePointers]\n"
             "[test.cpp:5:10]: (style) Variable 'xp' can be declared as pointer to const [constVariablePointer]\n"
@@ -12912,7 +13931,7 @@ class TestOther : public TestFixture {
 
         check("bool f(int * xp, int* yp) {\n"
               "    return &xp > &yp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:14] -> [test.cpp:2:12] -> [test.cpp:1:23] -> [test.cpp:2:18] -> [test.cpp:2:16]: (error) Comparing pointers that point to different objects [comparePointers]\n",
             errout_str());
@@ -12921,7 +13940,7 @@ class TestOther : public TestFixture {
               "    int x = 0;\n"
               "    int y = 1;\n"
               "    return &x - &y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:9] -> [test.cpp:4:12] -> [test.cpp:3:9] -> [test.cpp:4:17] -> [test.cpp:4:15]: (error) Subtracting pointers that point to different objects [subtractPointers]\n",
             errout_str());
@@ -12931,19 +13950,19 @@ class TestOther : public TestFixture {
               "    int* xp = &x[0];\n"
               "    int* yp = &x[1];\n"
               "    return xp > yp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Variable 'xp' can be declared as pointer to const [constVariablePointer]\n"
                       "[test.cpp:4:10]: (style) Variable 'yp' can be declared as pointer to const [constVariablePointer]\n",
                       errout_str());
 
         check("bool f(const int * xp, const int* yp) {\n"
               "    return xp > yp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(const int & x, const int& y) {\n"
               "    return &x > &y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int& g();\n"
@@ -12953,7 +13972,7 @@ class TestOther : public TestFixture {
               "    const int* xp = &x;\n"
               "    const int* yp = &y;\n"
               "    return xp > yp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {int data;};\n"
@@ -12963,7 +13982,7 @@ class TestOther : public TestFixture {
               "    int* xp = &x->data;\n"
               "    int* yp = &y->data;\n"
               "    return xp > yp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (style) Variable 'xp' can be declared as pointer to const [constVariablePointer]\n"
                       "[test.cpp:6:10]: (style) Variable 'yp' can be declared as pointer to const [constVariablePointer]\n",
                       errout_str());
@@ -13014,21 +14033,21 @@ class TestOther : public TestFixture {
               "            return A::Hash{}(a);\n"
               "        }\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void moduloOfOne() {
         check("void f(unsigned int x) {\n"
               "  int y = x % 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Modulo of one is always equal to zero [moduloofone]\n", errout_str());
 
         check("void f() {\n"
               "  for (int x = 1; x < 10; x++) {\n"
               "    int y = 100 % x;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int i, int j) {\n" // #11191
@@ -13036,6 +14055,13 @@ class TestOther : public TestFixture {
               "    if (j % c) {}\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    int i = 0;\n"
+              "    i %= 1;\n"
+              "    (void)i;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:7]: (style) Modulo of one is always equal to zero [moduloofone]\n", errout_str());
     }
 
     void sameExpressionPointers() {
@@ -13054,44 +14080,44 @@ class TestOther : public TestFixture {
               "    union { int i; float f; } u;\n"
               "    u.i = 0;\n"
               "    u.i = u.f;\n" // <- error
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Overlapping read/write of union is undefined behavior [overlappingWriteUnion]\n", errout_str());
 
         check("void foo() {\n" // #11013
               "    union { struct { uint8_t a; uint8_t b; }; uint16_t c; } u;\n"
               "    u.a = u.b = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // memcpy
         check("void foo() {\n"
               "    char a[10];\n"
               "    memcpy(&a[5], &a[4], 2u);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Overlapping read/write in memcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
 
         check("void foo() {\n"
               "    char a[10];\n"
               "    memcpy(a+5, a+4, 2u);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Overlapping read/write in memcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
 
         check("void foo() {\n"
               "    char a[10];\n"
               "    memcpy(a, a+1, 2u);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Overlapping read/write in memcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
 
         check("void foo() {\n"
               "    char a[8];\n"
               "    memcpy(&a[0], &a[4], 4u);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("_Bool a[10];\n" // #10350
               "void foo() {\n"
               "    memcpy(&a[5], &a[4], 2u * sizeof(a[0]));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Overlapping read/write in memcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
 
         check("int K[2];\n" // #12638
@@ -13100,7 +14126,7 @@ class TestOther : public TestFixture {
               "    memcpy(&K[1], &K[0], sizeof(K[0]));\n"
               "    memcpy(p, p + 1, sizeof(*p));\n"
               "    memcpy(p + 1, p, sizeof(*p));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int K[2];\n"
@@ -13109,7 +14135,7 @@ class TestOther : public TestFixture {
               "    memcpy(&K[1], &K[0], 2 *sizeof(K[0]));\n"
               "    memcpy(p, p + 1, 2 * sizeof(*p));\n"
               "    memcpy(p + 1, p, 2 * sizeof(*p));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Overlapping read/write in memcpy() is undefined behavior [overlappingWriteFunction]\n"
                       "[test.cpp:4:5]: (error) Overlapping read/write in memcpy() is undefined behavior [overlappingWriteFunction]\n"
                       "[test.cpp:5:5]: (error) Overlapping read/write in memcpy() is undefined behavior [overlappingWriteFunction]\n"
@@ -13120,25 +14146,25 @@ class TestOther : public TestFixture {
         check("void foo() {\n"
               "    wchar_t a[10];\n"
               "    wmemcpy(&a[5], &a[4], 2u);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Overlapping read/write in wmemcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
 
         check("void foo() {\n"
               "    wchar_t a[10];\n"
               "    wmemcpy(a+5, a+4, 2u);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Overlapping read/write in wmemcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
 
         check("void foo() {\n"
               "    wchar_t a[10];\n"
               "    wmemcpy(a, a+1, 2u);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Overlapping read/write in wmemcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
 
         // strcpy
         check("void foo(char *ptr) {\n"
               "    strcpy(ptr, ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (error) Overlapping read/write in strcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
     }
 
@@ -13177,14 +14203,14 @@ class TestOther : public TestFixture {
               "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("struct A { bool x; };\n"
+        check("struct A { bool x; };\n" // #14481
               "bool f(A* a) {\n"
               "    if (a) {\n"
               "        return a->x;\n"
               "    }\n"
               "    return false;\n"
               "}\n");
-        ASSERT_EQUALS("", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'a' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
         check("struct A { int* x; };\n"
               "bool f(A a) {\n"
@@ -13195,7 +14221,7 @@ class TestOther : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:4:17]: (style) Pointer expression 'a.x' converted to bool is always true. [knownPointerToBool]\n", errout_str());
 
-        check("void f(bool* b) { if (b) *b = true; }");
+        check("void f(bool* b) { if (b) *b = true; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
@@ -13243,8 +14269,14 @@ class TestOther : public TestFixture {
               "void f() {\n"
               "    bool b[2] = {};\n"
               "    g(b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void g(bool);\n" // #14303
+              "void f() {\n"
+              "    g(g);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:7]: (style) Pointer expression 'g' converted to bool is always true. [knownPointerToBool]\n", errout_str());
     }
 
     void iterateByValue() {
@@ -13442,7 +14474,7 @@ class TestOther : public TestFixture {
             "  union bad_union_0 bad1 = {0};\n"
             "  e(&bad1);\n"
             "  bad_union_1 bad2 = {0};\n"
-            "}");
+            "}\n");
         const std::string exp = unionZeroInitMessage(20, 28, "bad0", "i") +
                                 unionZeroInitMessage(21, 21, "bad1", "i64") +
                                 unionZeroInitMessage(23, 15, "bad2", "i");
@@ -13453,7 +14485,7 @@ class TestOther : public TestFixture {
         check(
             "void foo(void) {\n"
             " union { int c; char s8[2]; } u = {0};\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -13469,7 +14501,7 @@ class TestOther : public TestFixture {
             "       } s1;\n"
             "    } s0;\n"
             "  } u = {0};\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -13477,7 +14509,7 @@ class TestOther : public TestFixture {
         check(
             "union u {\n"
             "  Unknown x;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -13497,7 +14529,7 @@ class TestOther : public TestFixture {
             "\n"
             "void foo(void) {\n"
             "  Evex evex = {0};\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 };
diff --git a/test/testpath.cpp b/test/testpath.cpp
index 7c181e28afb..0ebe343685f 100644
--- a/test/testpath.cpp
+++ b/test/testpath.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -57,6 +57,7 @@ class TestPath : public TestFixture {
         TEST_CASE(getAbsolutePath);
         TEST_CASE(exists);
         TEST_CASE(fromNativeSeparators);
+        TEST_CASE(isRelative);
     }
 
     void removeQuotationMarks() const {
@@ -202,6 +203,8 @@ class TestPath : public TestFixture {
         //ASSERT_EQUALS("", Path::join("S:/a", "S:/b"));
         //ASSERT_EQUALS("", Path::join("S:/a", "S:\\b"));
         //ASSERT_EQUALS("", Path::join("S:/a", "/b"));
+
+        ASSERT_EQUALS("a/b/c", Path::join("a", "b", "c"));
     }
 
     void isDirectory() const {
@@ -315,7 +318,7 @@ class TestPath : public TestFixture {
         ASSERT_EQUALS(Standards::Language::CPP, Path::identify("/mnt/c/foo/index.cpp", false));
         ASSERT_EQUALS(Standards::Language::CPP, Path::identify("/mnt/c/foo/index.Cpp", false));
 
-        // TODO: check for case-insenstive filesystem instead
+        // TODO: check for case-insensitive filesystem instead
         // In unix .C is considered C++
 #if !defined(_WIN32) && !(defined(__APPLE__) && defined(__MACH__))
         ASSERT_EQUALS(Standards::Language::CPP, Path::identify("index.C", false));
@@ -513,7 +516,8 @@ class TestPath : public TestFixture {
         ASSERT_EQUALS(expected, Path::getAbsoluteFilePath(Path::join(cwd, "testabspath.txt")));
 
         std::string cwd_up = Path::getPathFromFilename(cwd);
-        cwd_up.pop_back(); // remove trailing slash
+        if (cwd_up != "/")
+            cwd_up.pop_back(); // remove trailing slash
         ASSERT_EQUALS(cwd_up, Path::getAbsoluteFilePath(Path::join(cwd, "..")));
         ASSERT_EQUALS(cwd_up, Path::getAbsoluteFilePath(Path::join(cwd, "../")));
         ASSERT_EQUALS(cwd_up, Path::getAbsoluteFilePath(Path::join(cwd, "..\\")));
@@ -533,7 +537,7 @@ class TestPath : public TestFixture {
 
 #ifndef _WIN32
         // the underlying realpath() call only returns something if the path actually exists
-        ASSERT_THROW_EQUALS_2(Path::getAbsoluteFilePath("testabspath2.txt"), std::runtime_error, "path 'testabspath2.txt' does not exist");
+        ASSERT_THROW_EQUALS(Path::getAbsoluteFilePath("testabspath2.txt"), std::runtime_error, "path 'testabspath2.txt' does not exist");
 #else
         ASSERT_EQUALS(Path::toNativeSeparators(Path::join(cwd, "testabspath2.txt")), Path::getAbsoluteFilePath("testabspath2.txt"));
 #endif
@@ -572,7 +576,7 @@ class TestPath : public TestFixture {
 #endif
 
 #ifndef _WIN32
-        ASSERT_THROW_EQUALS_2(Path::getAbsoluteFilePath("C:\\path\\files.txt"), std::runtime_error, "path 'C:\\path\\files.txt' does not exist");
+        ASSERT_THROW_EQUALS(Path::getAbsoluteFilePath("C:\\path\\files.txt"), std::runtime_error, "path 'C:\\path\\files.txt' does not exist");
 #endif
 
         // TODO: test UNC paths
@@ -618,6 +622,33 @@ class TestPath : public TestFixture {
         ASSERT_EQUALS("//lib/file.c", Path::fromNativeSeparators("\\\\lib\\file.c"));
         ASSERT_EQUALS("./lib/file.c", Path::fromNativeSeparators(".\\lib\\file.c"));
     }
+
+    void isRelative() const {
+        ASSERT_EQUALS(true, Path::isRelative("dir/file"));
+        ASSERT_EQUALS(true, Path::isRelative("dir\\file"));
+
+        // TODO: is this expected?
+        ASSERT_EQUALS(true, Path::isRelative("file/"));
+        ASSERT_EQUALS(true, Path::isRelative("file\\"));
+
+        ASSERT_EQUALS(false, Path::isRelative("file"));
+
+#ifdef _WIN32
+        // this is a relative path on Windows
+        ASSERT_EQUALS(true, Path::isRelative("/dir/file"));
+#else
+        ASSERT_EQUALS(false, Path::isRelative("/dir/file"));
+#endif
+
+#ifdef _WIN32
+        // TODO: this is not detected as absolute path in _WIN32 builds
+        ASSERT_EQUALS(false, Path::isRelative("c:\\dir\\file"));
+        ASSERT_EQUALS(false, Path::isRelative("c:/dir/file"));
+#else
+        ASSERT_EQUALS(true, Path::isRelative("c:\\dir\\file"));
+        ASSERT_EQUALS(true, Path::isRelative("c:/dir/file"));
+#endif
+    }
 };
 
 REGISTER_TEST(TestPath)
diff --git a/test/testpathmatch.cpp b/test/testpathmatch.cpp
index 2be6a943845..7e721502a11 100644
--- a/test/testpathmatch.cpp
+++ b/test/testpathmatch.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,11 @@ class TestPathMatch : public TestFixture {
     TestPathMatch() : TestFixture("TestPathMatch") {}
 
 private:
+    class PathMatchTest final : public PathMatch
+    {
+        friend class TestPathMatch;
+    };
+
     static constexpr auto unix = PathMatch::Syntax::unix;
     static constexpr auto windows = PathMatch::Syntax::windows;
     static constexpr auto ifreg = PathMatch::Filemode::regular;
@@ -277,7 +282,7 @@ class TestPathMatch : public TestFixture {
     void pathiterator() const {
         /* See https://learn.microsoft.com/en-us/dotnet/standard/io/file-path-formats
          * for information on Windows path syntax. */
-        using PathIterator = PathMatch::PathIterator;
+        using PathIterator = PathMatchTest::PathIterator;
         ASSERT_EQUALS("/", PathIterator("/", nullptr, unix).read());
         ASSERT_EQUALS("/", PathIterator("//", nullptr, unix).read());
         ASSERT_EQUALS("/", PathIterator("/", "/", unix).read());
@@ -291,7 +296,7 @@ class TestPathMatch : public TestFixture {
         ASSERT_EQUALS("", PathIterator(nullptr, "", unix).read());
         ASSERT_EQUALS("", PathIterator(nullptr, nullptr, unix).read());
         ASSERT_EQUALS("c:", PathIterator("C:", nullptr, windows).read());
-        /* C: without slash is a bit ambigous. It should probably not be considered a root because it's
+        /* C: without slash is a bit ambiguous. It should probably not be considered a root because it's
          * not fully qualified (it designates the current directory on the C drive),
          * so this test could be considered to be unspecified behavior. */
         ASSERT_EQUALS("c:", PathIterator("C:", "../..", windows).read());
diff --git a/test/testplatform.cpp b/test/testplatform.cpp
index c0f7bb2c017..ccb7d9b41a8 100644
--- a/test/testplatform.cpp
+++ b/test/testplatform.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,11 +37,12 @@ class TestPlatform : public TestFixture {
         TEST_CASE(valid_config_win32w);
         TEST_CASE(valid_config_unix32);
         TEST_CASE(valid_config_win64);
+        // TODO: test native and unspecified
         TEST_CASE(valid_config_file_1);
         TEST_CASE(valid_config_file_2);
-        TEST_CASE(valid_config_file_3);
         TEST_CASE(valid_config_file_4);
         TEST_CASE(invalid_config_file_1);
+        TEST_CASE(invalid_config_file_2);
         TEST_CASE(empty_elements);
         TEST_CASE(default_platform);
         TEST_CASE(limitsDefines);
@@ -50,7 +51,7 @@ class TestPlatform : public TestFixture {
         TEST_CASE(wrong_root_node);
     }
 
-    class PlatformTest : public Platform
+    class PlatformTest final : public Platform
     {
         friend class TestPlatform;
     };
@@ -85,7 +86,7 @@ class TestPlatform : public TestFixture {
         ASSERT_EQUALS(2, platform.sizeof_wchar_t);
         ASSERT_EQUALS(4, platform.sizeof_size_t);
         ASSERT_EQUALS(4, platform.sizeof_pointer);
-        ASSERT_EQUALS('\0', platform.defaultSign);
+        ASSERT_EQUALS('s', platform.defaultSign);
         ASSERT_EQUALS(8, platform.char_bit);
         ASSERT_EQUALS(16, platform.short_bit);
         ASSERT_EQUALS(32, platform.int_bit);
@@ -110,7 +111,7 @@ class TestPlatform : public TestFixture {
         ASSERT_EQUALS(4, platform.sizeof_wchar_t);
         ASSERT_EQUALS(8, platform.sizeof_size_t);
         ASSERT_EQUALS(8, platform.sizeof_pointer);
-        ASSERT_EQUALS('\0', platform.defaultSign);
+        ASSERT_EQUALS('s', platform.defaultSign);
         ASSERT_EQUALS(8, platform.char_bit);
         ASSERT_EQUALS(16, platform.short_bit);
         ASSERT_EQUALS(32, platform.int_bit);
@@ -138,7 +139,7 @@ class TestPlatform : public TestFixture {
         ASSERT_EQUALS(2, platform.sizeof_wchar_t);
         ASSERT_EQUALS(4, platform.sizeof_size_t);
         ASSERT_EQUALS(4, platform.sizeof_pointer);
-        ASSERT_EQUALS('\0', platform.defaultSign);
+        ASSERT_EQUALS('s', platform.defaultSign);
         ASSERT_EQUALS(8, platform.char_bit);
         ASSERT_EQUALS(16, platform.short_bit);
         ASSERT_EQUALS(32, platform.int_bit);
@@ -166,7 +167,7 @@ class TestPlatform : public TestFixture {
         ASSERT_EQUALS(4, platform.sizeof_wchar_t);
         ASSERT_EQUALS(4, platform.sizeof_size_t);
         ASSERT_EQUALS(4, platform.sizeof_pointer);
-        ASSERT_EQUALS('\0', platform.defaultSign);
+        ASSERT_EQUALS('s', platform.defaultSign);
         ASSERT_EQUALS(8, platform.char_bit);
         ASSERT_EQUALS(16, platform.short_bit);
         ASSERT_EQUALS(32, platform.int_bit);
@@ -194,7 +195,7 @@ class TestPlatform : public TestFixture {
         ASSERT_EQUALS(2, platform.sizeof_wchar_t);
         ASSERT_EQUALS(8, platform.sizeof_size_t);
         ASSERT_EQUALS(8, platform.sizeof_pointer);
-        ASSERT_EQUALS('\0', platform.defaultSign);
+        ASSERT_EQUALS('s', platform.defaultSign);
         ASSERT_EQUALS(8, platform.char_bit);
         ASSERT_EQUALS(16, platform.short_bit);
         ASSERT_EQUALS(32, platform.int_bit);
@@ -210,6 +211,7 @@ class TestPlatform : public TestFixture {
         // Similar to the avr8 platform file.
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
                                    "<platform>\n"
+                                   "  <windows>false</windows>\n"
                                    "  <char_bit>8</char_bit>\n"
                                    "  <default-sign>unsigned</default-sign>\n"
                                    "  <sizeof>\n"
@@ -254,6 +256,7 @@ class TestPlatform : public TestFixture {
         // char_bit > 8.
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
                                    "<platform>\n"
+                                   "  <windows>true</windows>\n"
                                    "  <char_bit>20</char_bit>\n"
                                    "  <default-sign>signed</default-sign>\n"
                                    "  <sizeof>\n"
@@ -273,7 +276,7 @@ class TestPlatform : public TestFixture {
         PlatformTest platform;
         ASSERT(readPlatform(platform, xmldata));
         ASSERT_EQUALS(Platform::Type::File, platform.type);
-        ASSERT(!platform.isWindows());
+        ASSERT(platform.isWindows());
         ASSERT_EQUALS(20, platform.char_bit);
         ASSERT_EQUALS('s', platform.defaultSign);
         ASSERT_EQUALS(1, platform.sizeof_bool);
@@ -293,11 +296,12 @@ class TestPlatform : public TestFixture {
         ASSERT_EQUALS(100, platform.long_long_bit);
     }
 
-    void valid_config_file_3() const {
-        // Valid platform configuration without any usable information.
+    void invalid_config_file_2() const {
+        // Invalid platform configuration without any usable information.
         // Similar like an empty file.
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
                                    "<platform>\n"
+                                   "  <windows1>true</windows1>\n"
                                    "  <char_bit1>8</char_bit1>\n"
                                    "  <default-sign1>unsigned</default-sign1>\n"
                                    "  <sizeof1>\n"
@@ -324,6 +328,7 @@ class TestPlatform : public TestFixture {
         // set to 0.
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
                                    "<platform>\n"
+                                   "  <windows>true</windows>\n"
                                    "  <char_bit>0</char_bit>\n"
                                    "  <default-sign>z</default-sign>\n"
                                    "  <sizeof>\n"
@@ -343,7 +348,7 @@ class TestPlatform : public TestFixture {
         PlatformTest platform;
         ASSERT(readPlatform(platform, xmldata));
         ASSERT_EQUALS(Platform::Type::File, platform.type);
-        ASSERT(!platform.isWindows());
+        ASSERT(platform.isWindows());
         ASSERT_EQUALS(0, platform.char_bit);
         ASSERT_EQUALS('z', platform.defaultSign);
         ASSERT_EQUALS(0, platform.sizeof_bool);
@@ -367,6 +372,7 @@ class TestPlatform : public TestFixture {
         // Invalid XML file: mismatching elements "boolt" vs "bool".
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
                                    "<platform>\n"
+                                   "  <windows>false</windows>\n"
                                    "  <char_bit>8</char_bit>\n"
                                    "  <default-sign>unsigned</default-sign>\n"
                                    "  <sizeof>\n"
@@ -392,6 +398,7 @@ class TestPlatform : public TestFixture {
         // Similar like an empty file.
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
                                    "<platform>\n"
+                                   "  <windows></windows>\n"
                                    "  <char_bit></char_bit>\n"
                                    "  <default-sign></default-sign>\n"
                                    "  <sizeof>\n"
diff --git a/test/testpostfixoperator.cpp b/test/testpostfixoperator.cpp
index 9e95fabc949..85568c974ac 100644
--- a/test/testpostfixoperator.cpp
+++ b/test/testpostfixoperator.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,8 +38,7 @@ class TestPostfixOperator : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for postfix operators..
-        CheckPostfixOperator checkPostfixOperator(&tokenizer, &settings, this);
+        CheckPostfixOperatorImpl checkPostfixOperator(&tokenizer, settings, *this);
         checkPostfixOperator.postfixOperator();
     }
 
@@ -72,7 +71,7 @@ class TestPostfixOperator : public TestFixture {
               "    k--;\n"
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class K {};"
@@ -83,7 +82,7 @@ class TestPostfixOperator : public TestFixture {
               "    k++;\n"
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("struct K {};"
@@ -91,14 +90,14 @@ class TestPostfixOperator : public TestFixture {
               "{\n"
               "    K k(0);\n"
               "    k++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("struct K {};\n"
               "void foo(K& k)\n"
               "{\n"
               "    k++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("union K {};"
@@ -106,7 +105,7 @@ class TestPostfixOperator : public TestFixture {
               "{\n"
               "    K k(0);\n"
               "    k++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("class K {};"
@@ -119,7 +118,7 @@ class TestPostfixOperator : public TestFixture {
               "    }\n"
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:9]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("class K {};"
@@ -133,7 +132,7 @@ class TestPostfixOperator : public TestFixture {
               "    k++;\n"
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
 
@@ -145,7 +144,7 @@ class TestPostfixOperator : public TestFixture {
               "    k--;\n"
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("class K {};"
@@ -156,7 +155,7 @@ class TestPostfixOperator : public TestFixture {
               "    ++k;\n"
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class K {};"
@@ -167,7 +166,7 @@ class TestPostfixOperator : public TestFixture {
               "    --k;\n"
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9042
@@ -178,7 +177,7 @@ class TestPostfixOperator : public TestFixture {
               "};\n"
               "template <class T>\n"
               "class s {};\n"
-              "using BOOL = char;");
+              "using BOOL = char;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -189,7 +188,7 @@ class TestPostfixOperator : public TestFixture {
               "         std::cout << i << std::endl;\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class K {};\n"
@@ -199,7 +198,7 @@ class TestPostfixOperator : public TestFixture {
               "         std::cout << i << std::endl;\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:28]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("class K {};\n"
@@ -209,7 +208,7 @@ class TestPostfixOperator : public TestFixture {
               "         std::cout << i << std::endl;\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class K {};\n"
@@ -219,7 +218,7 @@ class TestPostfixOperator : public TestFixture {
               "         std::cout << i << std::endl;\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:27]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("class K {};\n"
@@ -229,7 +228,7 @@ class TestPostfixOperator : public TestFixture {
               "         std::cout << i << std::endl;\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::string &s) {\n" // #7731
@@ -247,7 +246,7 @@ class TestPostfixOperator : public TestFixture {
               "    k++;\n"
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
     }
 
@@ -262,7 +261,7 @@ class TestPostfixOperator : public TestFixture {
               "    }\n"
               "    v.clear();\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:64]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("int main() {\n"
@@ -276,7 +275,7 @@ class TestPostfixOperator : public TestFixture {
               "       it++;\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:8]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("int main() {\n"
@@ -289,7 +288,7 @@ class TestPostfixOperator : public TestFixture {
               "       it++;\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:8]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("int main() {\n"
@@ -303,14 +302,14 @@ class TestPostfixOperator : public TestFixture {
               "       rit--;\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:8]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
     }
 
     void test2168() {
         ASSERT_THROW_INTERNAL(check("--> declare allocator lock here\n"
-                                    "int main(){}"),
+                                    "int main(){}\n"),
                               AST);
     }
 
@@ -318,7 +317,7 @@ class TestPostfixOperator : public TestFixture {
         check("void f(int* p){\n"
               "    p++;\n"
               "    std::cout << *p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -328,7 +327,7 @@ class TestPostfixOperator : public TestFixture {
               "\n"
               "void f() {\n"
               "    p++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -336,7 +335,7 @@ class TestPostfixOperator : public TestFixture {
         check("bool foo() {\n"
               "    std::vector<FilterConfigCacheEntry>::iterator aIter(aImport.begin());\n"
               "    aIter++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
     }
 
@@ -345,14 +344,14 @@ class TestPostfixOperator : public TestFixture {
               "    class A {}; class B {A a;};\n"
               "    B b;\n"
               "    b.a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("bool foo() {\n"
               "    class A {}; class B {A a;};\n"
               "    B b;\n"
               "    foo(b.a++);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -361,7 +360,7 @@ class TestPostfixOperator : public TestFixture {
               "    class A {};\n"
               "    A a;\n"
               "    i++, a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("bool foo(int i) {\n"
@@ -369,7 +368,7 @@ class TestPostfixOperator : public TestFixture {
               "    A a;\n"
               "    foo(i, a++);\n"
               "    foo(a++, i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -381,7 +380,7 @@ class TestPostfixOperator : public TestFixture {
               "        a += i;\n"
               "    }\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 };
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
index 66b3e24062f..faa1d9ce01b 100644
--- a/test/testpreprocessor.cpp
+++ b/test/testpreprocessor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,7 +32,9 @@
 #include "fixture.h"
 #include "helpers.h"
 
+#include <algorithm>
 #include <cstring>
+#include <iterator>
 #include <list>
 #include <map>
 #include <set>
@@ -50,13 +52,14 @@ class TestPreprocessor : public TestFixture {
     TestPreprocessor() : TestFixture("TestPreprocessor") {}
 
 private:
+    #define expandMacros(...) expandMacros_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
-    std::string expandMacros(const char (&code)[size], ErrorLogger &errorLogger) const {
+    std::string expandMacros_(const char* file, int line, const char (&code)[size], ErrorLogger &errorLogger) const {
         simplecpp::OutputList outputList;
         std::vector<std::string> files;
-        simplecpp::TokenList tokens1 = simplecpp::TokenList(code, files, "file.cpp", &outputList);
+        simplecpp::TokenList tokens1 = simplecpp::TokenList(code, files, "file.cpp", {}, &outputList);
         Preprocessor p(tokens1, settingsDefault, errorLogger, Path::identify(tokens1.getFiles()[0], false));
-        ASSERT(p.loadFiles(files));
+        ASSERT_LOC(p.loadAllIncludes(files), file, line);
         simplecpp::TokenList tokens2 = p.preprocess("", files, outputList);
         (void)p.reportOutput(outputList, true);
         return tokens2.stringify();
@@ -72,7 +75,7 @@ class TestPreprocessor : public TestFixture {
             throw std::runtime_error("token list not empty");
 
         simplecpp::OutputList outputList;
-        const simplecpp::TokenList tokens1(code, files, file0, &outputList);
+        const simplecpp::TokenList tokens1(code, files, file0, dui, &outputList);
 
         // Preprocess..
         simplecpp::TokenList tokens2(files);
@@ -121,7 +124,7 @@ class TestPreprocessor : public TestFixture {
         simplecpp::OutputList outputList;
         std::vector<std::string> files;
 
-        simplecpp::TokenList tokens({code, size}, files, Path::simplifyPath(filename), &outputList);
+        simplecpp::TokenList tokens({code, size}, files, Path::simplifyPath(filename), {}, &outputList);
 
         // TODO: we should be using the actual Preprocessor implementation
         Preprocessor preprocessor(tokens, settings, errorlogger, Path::identify(tokens.getFiles()[0], false));
@@ -136,12 +139,15 @@ class TestPreprocessor : public TestFixture {
         preprocessor.simplifyPragmaAsm();
 
         std::map<std::string, std::string> cfgcode;
-        if (cfgs.empty())
-            cfgs = preprocessor.getConfigs();
+        if (cfgs.empty()) {
+            cfgs.insert("");
+            std::set<std::string> configDefines = { "__cplusplus" };
+            preprocessor.getConfigs(configDefines, cfgs);
+        }
         for (const std::string & config : cfgs) {
             try {
-                const bool writeLocations = (strstr(code, "#file") != nullptr) || (strstr(code, "#include") != nullptr);
-                cfgcode[config] = preprocessor.getcode(config, files, writeLocations);
+                const bool writeLocs = (strstr(code, "#include") != nullptr);
+                cfgcode[config] = preprocessor.getcode(config, files, writeLocs);
             } catch (const simplecpp::Output &) {
                 cfgcode[config] = "";
             }
@@ -281,6 +287,7 @@ class TestPreprocessor : public TestFixture {
 
         // inline suppression, missingInclude/missingIncludeSystem
         TEST_CASE(inline_suppressions);
+        TEST_CASE(inline_suppressions_not_next_line);
 
         // remark comment
         TEST_CASE(remarkComment1);
@@ -318,10 +325,15 @@ class TestPreprocessor : public TestFixture {
         TEST_CASE(getConfigs11); // #9832 - include guards
         TEST_CASE(getConfigs12); // #14222
         TEST_CASE(getConfigs13); // #14222
-        TEST_CASE(getConfigs14); // #1059
-        TEST_CASE(getConfigs15); // #1059
-        TEST_CASE(getConfigs16); // #1059
-        TEST_CASE(getConfigs17); // #1059
+        TEST_CASE(getConfigs_gte); // #1059
+        TEST_CASE(getConfigs_lte); // #1059
+        TEST_CASE(getConfigs_gt); // #1059
+        TEST_CASE(getConfigs_lt); // #1059
+        TEST_CASE(getConfigs_eq_compound); // #1059
+        TEST_CASE(getConfigs_gte_compound); // #1059
+        TEST_CASE(getConfigs_lte_compound); // #1059
+        TEST_CASE(getConfigs_gt_compound); // #1059
+        TEST_CASE(getConfigs_lt_compound); // #1059
         TEST_CASE(getConfigsError);
 
         TEST_CASE(getConfigsD1);
@@ -334,6 +346,11 @@ class TestPreprocessor : public TestFixture {
         TEST_CASE(getConfigsU6);
         TEST_CASE(getConfigsU7);
 
+        TEST_CASE(getConfigsAndCodeIssue14317);
+        TEST_CASE(getConfigsMostGeneralConfigIssue14317);
+
+        TEST_CASE(getConfigsInvalid); // #14732
+
         TEST_CASE(if_sizeof);
 
         TEST_CASE(invalid_ifs); // #5909
@@ -356,17 +373,24 @@ class TestPreprocessor : public TestFixture {
         TEST_CASE(testMissingIncludeMixed);
         TEST_CASE(testMissingIncludeCheckConfig);
 
+        TEST_CASE(testLazyInclude);
+        TEST_CASE(testKeepComments);
+        TEST_CASE(testKeepCommentsMultiline);
+
         TEST_CASE(hasInclude);
 
         TEST_CASE(limitsDefines);
 
         TEST_CASE(hashCalculation);
+        TEST_CASE(hashCalculationIncludeOrder);
 
         TEST_CASE(standard);
 
         TEST_CASE(writeLocations);
 
         TEST_CASE(pragmaAsm);
+
+        TEST_CASE(dumpPreprocessor);
     }
 
     template<size_t size>
@@ -380,12 +404,27 @@ class TestPreprocessor : public TestFixture {
             ASSERT(settings.library.load("", library, false).errorcode == Library::ErrorCode::OK);
         std::vector<std::string> files;
         simplecpp::OutputList outputList;
-        simplecpp::TokenList tokens(code,files,"test.c",&outputList);
-        Preprocessor preprocessor(tokens, settings, *this, Standards::Language::C); // TODO: do we need to consider #file?
-        ASSERT(preprocessor.loadFiles(files));
-        ASSERT(!preprocessor.reportOutput(outputList, true));
+        simplecpp::TokenList tokens(code, files, "test.c", {}, &outputList);
+        Preprocessor preprocessor(tokens, settings, *this, Standards::Language::C);
+        std::set<std::string> configs = { "" };
+        std::set<std::string> configDefines = { "__cplusplus" };
+        const auto getDefineName = [](const std::string &defineString) {
+            return defineString.substr(0, defineString.find_first_of("( "));
+        };
+        std::transform(settings.library.defines().begin(),
+                       settings.library.defines().end(),
+                       std::inserter(configDefines, configDefines.end()),
+                       getDefineName);
+        preprocessor.setLoadCallback([&](simplecpp::FileData &data, bool loaded) {
+            if (loaded) {
+                Preprocessor::removeComments(data.tokens);
+                preprocessor.getConfigs(data.filename, data.tokens, configDefines, configs);
+            }
+        });
         preprocessor.removeComments();
-        const std::set<std::string> configs = preprocessor.getConfigs();
+        preprocessor.getConfigs(configDefines, configs);
+        ASSERT(preprocessor.loadAllIncludes(files));
+        ASSERT(!preprocessor.reportOutput(outputList, true));
         std::string ret;
         for (const std::string & config : configs)
             ret += config + '\n';
@@ -396,9 +435,14 @@ class TestPreprocessor : public TestFixture {
     std::size_t getHash(const char (&code)[size]) {
         std::vector<std::string> files;
         simplecpp::TokenList tokens(code,files,"test.c");
-        Preprocessor preprocessor(tokens, settingsDefault, *this, Standards::Language::C); // TODO: do we need to consider #file?
-        ASSERT(preprocessor.loadFiles(files));
+        Preprocessor preprocessor(tokens, settingsDefault, *this, Standards::Language::C);
+        preprocessor.setLoadCallback([](simplecpp::FileData &data, bool loaded) {
+            if (loaded) {
+                Preprocessor::removeComments(data.tokens);
+            }
+        });
         preprocessor.removeComments();
+        ASSERT(preprocessor.loadAllIncludes(files));
         return preprocessor.calculateHash("");
     }
 
@@ -407,7 +451,7 @@ class TestPreprocessor : public TestFixture {
                                 "cpp\n"
                                 "#else\n"
                                 "c\n"
-                                "#endif";
+                                "#endif\n";
 
         {
             // Preprocess => actual result..
@@ -435,7 +479,7 @@ class TestPreprocessor : public TestFixture {
                                 "#else\n"
                                 "#error abcd\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nA\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nA=A\n", getConfigsStr(filedata));
     }
 
     void error2() {
@@ -461,16 +505,19 @@ class TestPreprocessor : public TestFixture {
     void error4() {
         // In included file
         {
+            ScopedFile header("ab.h", "#error hello world!\n");
             const auto settings = dinit(Settings, $.userDefines = "TEST");
-            const char code[] = "#file \"ab.h\"\n#error hello world!\n#endfile";
+            const char code[] = "#include \"ab.h\"\n";
             (void)getcodeforcfg(settings, *this, code, "TEST", "test.c");
             ASSERT_EQUALS("[ab.h:1:2]: (error) #error hello world! [preprocessorErrorDirective]\n", errout_str());
         }
 
         // After including a file
         {
+            ScopedFile header("ab.h", "");
             const auto settings = dinit(Settings, $.userDefines = "TEST");
-            const char code[] = "#file \"ab.h\"\n\n#endfile\n#error aaa";
+            const char code[] = "#include \"ab.h\"\n"
+                                "#error aaa\n";
             (void)getcodeforcfg(settings, *this, code, "TEST", "test.c");
             ASSERT_EQUALS("[test.c:2:2]: (error) #error aaa [preprocessorErrorDirective]\n", errout_str());
         }
@@ -495,7 +542,7 @@ class TestPreprocessor : public TestFixture {
                                  "#else\n"
                                  "#error 2\n"
                                  "#endif\n";
-        ASSERT_EQUALS("\nA\nA;B\nB\n", getConfigsStr(filedata1));
+        ASSERT_EQUALS("\nA=A\nA=A;B=B\nB=B\n", getConfigsStr(filedata1));
 
         const char filedata2[] = "#ifndef A\n"
                                  "#error 1\n"
@@ -527,7 +574,7 @@ class TestPreprocessor : public TestFixture {
                                 "#else\n"
                                 "#error \"2\"\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nB\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nB=B\n", getConfigsStr(filedata));
     }
 
     void error8() {
@@ -539,8 +586,8 @@ class TestPreprocessor : public TestFixture {
                                 "\n"
                                 "#ifndef C\n"
                                 "#error aa\n"
-                                "#endif";
-        ASSERT_EQUALS("A;B;C\nA;C\nC\n", getConfigsStr(filedata));
+                                "#endif\n";
+        ASSERT_EQUALS("A=A;B=B;C\nA=A;C\nC\n", getConfigsStr(filedata));
     }
 
     void setPlatformInfo() {
@@ -573,35 +620,35 @@ class TestPreprocessor : public TestFixture {
     }
 
     void includeguard1() {
+        ScopedFile header("abc.h",
+                          "#ifndef abcH\n"
+                          "#define abcH\n"
+                          "#endif\n");
         // Handling include guards..
-        const char filedata[] = "#file \"abc.h\"\n"
-                                "#ifndef abcH\n"
-                                "#define abcH\n"
-                                "#endif\n"
-                                "#endfile\n"
+        const char filedata[] = "#include \"abc.h\"\n"
                                 "#ifdef ABC\n"
-                                "#endif";
-        ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
+                                "#endif\n";
+        ASSERT_EQUALS("\nABC=ABC\n", getConfigsStr(filedata));
     }
 
     void includeguard2() {
+        ScopedFile header("abc.h",
+                          "foo\n"
+                          "#ifdef ABC\n"
+                          "\n"
+                          "#endif\n");
         // Handling include guards..
-        const char filedata[] = "#file \"abc.h\"\n"
-                                "foo\n"
-                                "#ifdef ABC\n"
-                                "\n"
-                                "#endif\n"
-                                "#endfile\n";
-        ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
+        const char filedata[] = "#include \"abc.h\"\n";
+        ASSERT_EQUALS("\nABC=ABC\n", getConfigsStr(filedata));
     }
 
 
     void ifdefwithfile() {
+        ScopedFile header("abc.h", "class A{};/*\n\n\n\n\n\n\n*/\n");
+
         // Handling include guards..
         const char filedata[] = "#ifdef ABC\n"
-                                "#file \"abc.h\"\n"
-                                "class A{};/*\n\n\n\n\n\n\n*/\n"
-                                "#endfile\n"
+                                "#include \"abc.h\"\n"
                                 "#endif\n"
                                 "int main() {}\n";
 
@@ -611,7 +658,7 @@ class TestPreprocessor : public TestFixture {
         // Expected configurations: "" and "ABC"
         ASSERT_EQUALS(2, actual.size());
         ASSERT_EQUALS("\n\n\nint main ( ) { }", actual.at(""));
-        ASSERT_EQUALS("\n#line 1 \"abc.h\"\nclass A { } ;\n#line 4 \"file.c\"\n int main ( ) { }", actual.at("ABC"));
+        ASSERT_EQUALS("\n#line 1 \"abc.h\"\nclass A { } ;\n#line 4 \"file.c\"\n int main ( ) { }", actual.at("ABC=ABC"));
     }
 
     void if0() {
@@ -648,7 +695,7 @@ class TestPreprocessor : public TestFixture {
                                     "#else\n"
                                     "GHI\n"
                                     "#endif\n";
-            ASSERT_EQUALS("\nDEF1\nDEF2\n", getConfigsStr(filedata));
+            ASSERT_EQUALS("\nDEF1=DEF1\nDEF2=DEF2\n", getConfigsStr(filedata));
         }
     }
 
@@ -668,7 +715,7 @@ class TestPreprocessor : public TestFixture {
                                 "#if defined(A) && defined(B)\n"
                                 "ab\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nA\nA;B\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nA=A\nA=A;B=B\n", getConfigsStr(filedata));
 
         if_cond2b();
         if_cond2c();
@@ -685,7 +732,7 @@ class TestPreprocessor : public TestFixture {
                                 "#else\n"
                                 "a\n"
                                 "#endif\n";
-        TODO_ASSERT_EQUALS("\nA;B\n", "\nA\nB\n", getConfigsStr(filedata));
+        TODO_ASSERT_EQUALS("\nA;B=B\n", "\nA\nB=B\n", getConfigsStr(filedata));
     }
 
     void if_cond2c() {
@@ -699,7 +746,7 @@ class TestPreprocessor : public TestFixture {
                                 "#else\n"
                                 "a\n"
                                 "#endif\n";
-        TODO_ASSERT_EQUALS("\nA\nA;B\n", "\nA\nB\n", getConfigsStr(filedata));
+        TODO_ASSERT_EQUALS("\nA\nA;B=B\n", "\nA\nB=B\n", getConfigsStr(filedata));
     }
 
     void if_cond2d() {
@@ -718,7 +765,7 @@ class TestPreprocessor : public TestFixture {
                                 "!b\n"
                                 "#endif\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nA\nA;B\nB\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nA\nA;B=B\nB=B\n", getConfigsStr(filedata));
     }
 
     void if_cond2e() {
@@ -737,7 +784,7 @@ class TestPreprocessor : public TestFixture {
                                 "abc\n"
                                 "#endif\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nA\nA;B;C\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nA=A\nA=A;B=B;C=C\n", getConfigsStr(filedata));
     }
 
     void if_cond4() {
@@ -758,7 +805,7 @@ class TestPreprocessor : public TestFixture {
                                     "#endif\n"
                                     "}\n"
                                     "#endif\n";
-            ASSERT_EQUALS("\nA\nA;B\n", getConfigsStr(filedata));
+            ASSERT_EQUALS("\nA\nA;B=B\n", getConfigsStr(filedata));
         }
 
         {
@@ -793,20 +840,20 @@ class TestPreprocessor : public TestFixture {
                                 "#if defined(B) && defined(A)\n"
                                 "ef\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nA;B\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nA=A;B=B\n", getConfigsStr(filedata));
     }
 
     void if_cond6() {
         const char filedata[] = "\n"
                                 "#if defined(A) && defined(B))\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nA;B\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nA=A;B=B\n", getConfigsStr(filedata));
     }
 
     void if_cond8() {
         const char filedata[] = "#if defined(A) + defined(B) + defined(C) != 1\n"
                                 "#endif\n";
-        TODO_ASSERT_EQUALS("\nA\n", "\nA;B;C\n", getConfigsStr(filedata));
+        TODO_ASSERT_EQUALS("\nA=A\n", "\nA=A;B=B;C=C\n", getConfigsStr(filedata));
     }
 
 
@@ -865,7 +912,7 @@ class TestPreprocessor : public TestFixture {
         const char filedata[] = "#if defined(DEF_10) || defined(DEF_11)\n"
                                 "a1;\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nDEF_10;DEF_11\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nDEF_10=DEF_10;DEF_11=DEF_11\n", getConfigsStr(filedata));
     }
 
     void if_or_2() {
@@ -916,7 +963,7 @@ class TestPreprocessor : public TestFixture {
     void ticket_4922() { // #4922
         const char code[] = "__asm__ \n"
                             "{ int extern __value) 0; (double return (\"\" } extern\n"
-                            "__typeof __finite (__finite) __finite __inline \"__GI___finite\");";
+                            "__typeof __finite (__finite) __finite __inline \"__GI___finite\");\n";
         (void)getcode(settings0, *this, code);
     }
 
@@ -1027,7 +1074,7 @@ class TestPreprocessor : public TestFixture {
 
     void macro_simple16() {  // # 4703
         const char filedata[] = "#define MACRO( A, B, C ) class A##B##C##Creator {};\n"
-                                "MACRO( B\t, U , G )";
+                                "MACRO( B\t, U , G )\n";
         ASSERT_EQUALS("\nclass BUGCreator { } ;", expandMacros(filedata, *this));
     }
 
@@ -1035,41 +1082,41 @@ class TestPreprocessor : public TestFixture {
         // It would probably be OK if the generated code was
         // "\n123+$123" since the first 123 comes from the source code
         const char filedata[] = "#define MACRO(A) A+123\n"
-                                "MACRO(123)";
+                                "MACRO(123)\n";
         ASSERT_EQUALS("\n123 + 123", expandMacros(filedata, *this));
     }
 
     void macro_simple18() {  // (1e-7)
         const char filedata1[] = "#define A (1e-7)\n"
-                                 "a=A;";
+                                 "a=A;\n";
         ASSERT_EQUALS("\na = ( 1e-7 ) ;", expandMacros(filedata1, *this));
 
         const char filedata2[] = "#define A (1E-7)\n"
-                                 "a=A;";
+                                 "a=A;\n";
         ASSERT_EQUALS("\na = ( 1E-7 ) ;", expandMacros(filedata2, *this));
 
         const char filedata3[] = "#define A (1e+7)\n"
-                                 "a=A;";
+                                 "a=A;\n";
         ASSERT_EQUALS("\na = ( 1e+7 ) ;", expandMacros(filedata3, *this));
 
         const char filedata4[] = "#define A (1.e+7)\n"
-                                 "a=A;";
+                                 "a=A;\n";
         ASSERT_EQUALS("\na = ( 1.e+7 ) ;", expandMacros(filedata4, *this));
 
         const char filedata5[] = "#define A (1.7f)\n"
-                                 "a=A;";
+                                 "a=A;\n";
         ASSERT_EQUALS("\na = ( 1.7f ) ;", expandMacros(filedata5, *this));
 
         const char filedata6[] = "#define A (.1)\n"
-                                 "a=A;";
+                                 "a=A;\n";
         ASSERT_EQUALS("\na = ( .1 ) ;", expandMacros(filedata6, *this));
 
         const char filedata7[] = "#define A (1.)\n"
-                                 "a=A;";
+                                 "a=A;\n";
         ASSERT_EQUALS("\na = ( 1. ) ;", expandMacros(filedata7, *this));
 
         const char filedata8[] = "#define A (8.0E+007)\n"
-                                 "a=A;";
+                                 "a=A;\n";
         ASSERT_EQUALS("\na = ( 8.0E+007 ) ;", expandMacros(filedata8, *this));
     }
 
@@ -1241,8 +1288,8 @@ class TestPreprocessor : public TestFixture {
 
     void macro_NULL() {
         // See ticket #4482 - UB when passing NULL to variadic function
-        ASSERT_EQUALS("\n0", expandMacros("#define null 0\nnull", *this));
-        TODO_ASSERT_EQUALS("\nNULL", "\n0", expandMacros("#define NULL 0\nNULL", *this)); // TODO: Let the tokenizer handle NULL?
+        ASSERT_EQUALS("\n0", expandMacros("#define null 0\nnull\n", *this));
+        TODO_ASSERT_EQUALS("\nNULL\n", "\n0", expandMacros("#define NULL 0\nNULL\n", *this)); // TODO: Let the tokenizer handle NULL?
     }
 
     void string1() {
@@ -1492,7 +1539,7 @@ class TestPreprocessor : public TestFixture {
                                 "#pragma asm foo\n"
                                 "    mov r1, 11\n"
                                 "#pragma endasm bar\n"
-                                "bbb";
+                                "bbb\n";
 
         // Preprocess => actual result..
         const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
@@ -1506,7 +1553,7 @@ class TestPreprocessor : public TestFixture {
         const char filedata[] = "#pragma asm\n"
                                 "    mov @w1, 11\n"
                                 "#pragma endasm ( temp=@w1 )\n"
-                                "bbb";
+                                "bbb\n";
 
         // Preprocess => actual result..
         const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
@@ -1529,7 +1576,7 @@ class TestPreprocessor : public TestFixture {
         ASSERT_EQUALS(2, actual.size());
         const std::string expected("void f ( ) {\n\n\n}");
         ASSERT_EQUALS(expected, actual.at(""));
-        ASSERT_EQUALS(expected, actual.at("A"));
+        ASSERT_EQUALS(expected, actual.at("A=A"));
     }
 
     void handle_error() {
@@ -1565,22 +1612,9 @@ class TestPreprocessor : public TestFixture {
         }
 
         {
-            const char filedata[] = "#file \"abc.h\"\n"
-                                    "#define a\n"
-                                    "\"\n"
-                                    "#endfile\n";
-
-            // expand macros..
-            const std::string actual(expandMacros(filedata, *this));
-
-            ASSERT_EQUALS("", actual);
-            ASSERT_EQUALS("[abc.h:2:1]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported. [syntaxError]\n", errout_str());
-        }
-
-        {
-            const char filedata[] = "#file \"abc.h\"\n"
-                                    "#define a\n"
-                                    "#endfile\n"
+            ScopedFile header("abc.h",
+                              "#define a\n");
+            const char filedata[] = "#include \"abc.h\"\n"
                                     "\"\n";
 
             // expand macros..
@@ -1641,7 +1675,7 @@ class TestPreprocessor : public TestFixture {
                                 "#else\n"
                                 "#define N 20\n"
                                 "#endif\n"
-                                "N";
+                                "N\n";
 
         // Preprocess => actual result..
         const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
@@ -1649,7 +1683,7 @@ class TestPreprocessor : public TestFixture {
         // Compare results..
         ASSERT_EQUALS(2, actual.size());
         ASSERT_EQUALS("\n\n\n\n\n$20", actual.at(""));
-        ASSERT_EQUALS("\n\n\n\n\n$10", actual.at("A"));
+        ASSERT_EQUALS("\n\n\n\n\n$10", actual.at("A=A"));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1701,7 +1735,7 @@ class TestPreprocessor : public TestFixture {
         // Compare results..
         ASSERT_EQUALS(2, actual.size());
         ASSERT_EQUALS("", actual.at(""));
-        ASSERT_EQUALS("\nA\n\n\nA", actual.at("ABC"));
+        ASSERT_EQUALS("\nA\n\n\nA", actual.at("ABC=ABC"));
     }
 
     void define_if1() {
@@ -1709,14 +1743,14 @@ class TestPreprocessor : public TestFixture {
             const char filedata[] = "#define A 0\n"
                                     "#if A\n"
                                     "FOO\n"
-                                    "#endif";
+                                    "#endif\n";
             ASSERT_EQUALS("", getcodeforcfg(settings0, *this, filedata,"","test.c"));
         }
         {
             const char filedata[] = "#define A 1\n"
                                     "#if A==1\n"
                                     "FOO\n"
-                                    "#endif";
+                                    "#endif\n";
             ASSERT_EQUALS("\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
         }
     }
@@ -1726,7 +1760,7 @@ class TestPreprocessor : public TestFixture {
                                 "#define B A\n"
                                 "#if (B==A) || (B==C)\n"
                                 "FOO\n"
-                                "#endif";
+                                "#endif\n";
         ASSERT_EQUALS("\n\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
     }
 
@@ -1734,7 +1768,7 @@ class TestPreprocessor : public TestFixture {
         const char filedata[] = "#define A 0\n"
                                 "#if (A==0)\n"
                                 "FOO\n"
-                                "#endif";
+                                "#endif\n";
         ASSERT_EQUALS("\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
     }
 
@@ -1742,7 +1776,7 @@ class TestPreprocessor : public TestFixture {
         const char filedata[] = "#define X +123\n"
                                 "#if X==123\n"
                                 "FOO\n"
-                                "#endif";
+                                "#endif\n";
         ASSERT_EQUALS("\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
     }
 
@@ -1752,7 +1786,7 @@ class TestPreprocessor : public TestFixture {
                                     "#define B (A & 0x00f0)\n"
                                     "#if B==0x0010\n"
                                     "FOO\n"
-                                    "#endif";
+                                    "#endif\n";
             ASSERT_EQUALS("\n\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
         }
         {
@@ -1761,14 +1795,14 @@ class TestPreprocessor : public TestFixture {
                                     "#define C (B & A)\n"
                                     "#if C==0x0010\n"
                                     "FOO\n"
-                                    "#endif";
+                                    "#endif\n";
             ASSERT_EQUALS("\n\n\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
         }
         {
             const char filedata[] = "#define A (1+A)\n" // don't hang for recursive macros
                                     "#if A==1\n"
                                     "FOO\n"
-                                    "#endif";
+                                    "#endif\n";
             ASSERT_EQUALS("\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
         }
     }
@@ -1900,7 +1934,7 @@ class TestPreprocessor : public TestFixture {
         const char filedata[] = "#ifndef A\n"
                                 "#define A(x) x\n"
                                 "#endif\n"
-                                "A(123);";
+                                "A(123);\n";
 
         // Preprocess => actual result..
         const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
@@ -1942,9 +1976,9 @@ class TestPreprocessor : public TestFixture {
         // Compare results..
         ASSERT_EQUALS(4, actual.size());
         ASSERT(actual.find("") != actual.end());
-        ASSERT(actual.find("BAR") != actual.end());
-        ASSERT(actual.find("FOO") != actual.end());
-        ASSERT(actual.find("BAR;FOO") != actual.end());
+        ASSERT(actual.find("BAR=BAR") != actual.end());
+        ASSERT(actual.find("FOO=FOO") != actual.end());
+        ASSERT(actual.find("BAR=BAR;FOO=FOO") != actual.end());
     }
 
 
@@ -1978,19 +2012,19 @@ class TestPreprocessor : public TestFixture {
         // cases should be fixed whenever this other bug is fixed
         ASSERT_EQUALS(2U, actual.size());
 
-        ASSERT_EQUALS_MSG(true, (actual.find("A") != actual.end()), "A is expected to be checked but it was not checked");
+        ASSERT_EQUALS_MSG(true, (actual.find("A=A") != actual.end()), "A is expected to be checked but it was not checked");
 
-        ASSERT_EQUALS_MSG(true, (actual.find("A;A;B") == actual.end()), "A;A;B is expected to NOT be checked but it was checked");
+        ASSERT_EQUALS_MSG(true, (actual.find("A=A;A=A;B=B") == actual.end()), "A;A;B is expected to NOT be checked but it was checked");
     }
 
     void invalid_define_1() {
         (void)getcode(settings0, *this, "#define =\n");
-        ASSERT_EQUALS("[file.c:1:2]: (error) Failed to parse #define [syntaxError]\n", errout_str());
+        ASSERT_EQUALS("[file.c:1:2]: (error) Failed to parse #define, bad macro syntax [syntaxError]\n", errout_str());
     }
 
     void invalid_define_2() {  // #4036
         (void)getcode(settings0, *this, "#define () {(int f(x) }\n");
-        ASSERT_EQUALS("[file.c:1:2]: (error) Failed to parse #define [syntaxError]\n", errout_str());
+        ASSERT_EQUALS("[file.c:1:2]: (error) Failed to parse #define, bad macro syntax [syntaxError]\n", errout_str());
     }
 
     void inline_suppressions() {
@@ -2027,6 +2061,38 @@ class TestPreprocessor : public TestFixture {
         ignore_errout(); // we are not interested in the output
     }
 
+    void inline_suppressions_not_next_line() {
+        const auto settings = dinit(Settings,
+                                    $.inlineSuppressions = true,
+                                        $.checks.enable (Checks::missingInclude));
+
+        const char code[] = "// cppcheck-suppress missingInclude\n"
+                            "// some other comment\n"
+                            "#include \"missing.h\"\n"
+                            "// cppcheck-suppress missingIncludeSystem\n"
+                            "\n" // Empty line
+                            "#include <missing2.h>\n";
+        SuppressionList inlineSuppr;
+        (void)getcodeforcfg(settings, *this, code, "", "test.c", &inlineSuppr);
+
+        auto suppressions = inlineSuppr.getSuppressions();
+        ASSERT_EQUALS(2, suppressions.size());
+
+        auto suppr = suppressions.front();
+        suppressions.pop_front();
+        ASSERT_EQUALS("missingInclude", suppr.errorId);
+        ASSERT_EQUALS("test.c", suppr.fileName);
+        ASSERT_EQUALS(3, suppr.lineNumber);
+
+        suppr = suppressions.front();
+        suppressions.pop_front();
+        ASSERT_EQUALS("missingIncludeSystem", suppr.errorId);
+        ASSERT_EQUALS("test.c", suppr.fileName);
+        ASSERT_EQUALS(6, suppr.lineNumber);
+
+        ignore_errout();
+    }
+
     void remarkComment1() {
         const char code[] = "// REMARK: assignment with 1\n"
                             "x=1;\n";
@@ -2054,7 +2120,7 @@ class TestPreprocessor : public TestFixture {
     }
 
     void remarkComment4() {
-        const char code[] = "//REMARK /";
+        const char code[] = "//REMARK /\n";
         const auto remarkComments = getRemarkComments(code, *this);
         ASSERT_EQUALS(0, remarkComments.size());
     }
@@ -2103,19 +2169,19 @@ class TestPreprocessor : public TestFixture {
 
     void predefine5() {  // #3737, #5119 - automatically define __cplusplus
         // #3737...
-        const char code[] = "#ifdef __cplusplus\n123\n#endif";
+        const char code[] = "#ifdef __cplusplus\n123\n#endif\n";
         ASSERT_EQUALS("",      getcodeforcfg(settings0, *this, code, "", "test.c"));
         ASSERT_EQUALS("\n123", getcodeforcfg(settings0, *this, code, "", "test.cpp"));
     }
 
     void predefine6() { // automatically define __STDC_VERSION__
-        const char code[] = "#ifdef __STDC_VERSION__\n123\n#endif";
+        const char code[] = "#ifdef __STDC_VERSION__\n123\n#endif\n";
         ASSERT_EQUALS("\n123", getcodeforcfg(settings0, *this, code, "", "test.c"));
         ASSERT_EQUALS("",      getcodeforcfg(settings0, *this, code, "", "test.cpp"));
     }
 
     void strictAnsi() {
-        const char code[] = "#ifdef __STRICT_ANSI__\n123\n#endif";
+        const char code[] = "#ifdef __STRICT_ANSI__\n123\n#endif\n";
         Settings settings;
 
         settings.standards.setStd("gnu99");
@@ -2146,7 +2212,7 @@ class TestPreprocessor : public TestFixture {
                                 "    qwerty\n"
                                 "#endif  \n";
 
-        ASSERT_EQUALS("\nWIN32\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nWIN32=WIN32\n", getConfigsStr(filedata));
     }
 
     void getConfigs2() {
@@ -2167,7 +2233,7 @@ class TestPreprocessor : public TestFixture {
                                 "c\n"
                                 "#endif\n";
 
-        ASSERT_EQUALS("\nABC\nABC;DEF\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nABC=ABC\nABC=ABC;DEF=DEF\n", getConfigsStr(filedata));
     }
 
     void getConfigs4() {
@@ -2177,7 +2243,7 @@ class TestPreprocessor : public TestFixture {
                                 "#ifdef ABC\n"
                                 "A\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nABC=ABC\n", getConfigsStr(filedata));
     }
 
     void getConfigs5() {
@@ -2189,7 +2255,7 @@ class TestPreprocessor : public TestFixture {
                                 "C\n"
                                 "#endif\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nABC\nDEF\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nABC=ABC\nDEF=DEF\n", getConfigsStr(filedata));
     }
 
     void getConfigs7() {
@@ -2199,7 +2265,7 @@ class TestPreprocessor : public TestFixture {
                                 "B\n"
                                 "#endif\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nABC=ABC\n", getConfigsStr(filedata));
     }
 
     void getConfigs7a() {
@@ -2219,7 +2285,7 @@ class TestPreprocessor : public TestFixture {
                                 "B\n"
                                 "#endif\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nABC=ABC\n", getConfigsStr(filedata));
     }
 
     void getConfigs7c() {
@@ -2229,7 +2295,7 @@ class TestPreprocessor : public TestFixture {
                                 "B\n"
                                 "#endif\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nABC=ABC\n", getConfigsStr(filedata));
     }
 
     void getConfigs7d() {
@@ -2239,20 +2305,20 @@ class TestPreprocessor : public TestFixture {
                                 "B\n"
                                 "#endif\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nABC=ABC\n", getConfigsStr(filedata));
     }
 
     void getConfigs7e() {
+        ScopedFile header("test.h",
+                          "#ifndef test_h\n"
+                          "#define test_h\n"
+                          "#ifdef ABC\n"
+                          "#endif\n"
+                          "#endif\n");
         const char filedata[] = "#ifdef ABC\n"
-                                "#file \"test.h\"\n"
-                                "#ifndef test_h\n"
-                                "#define test_h\n"
-                                "#ifdef ABC\n"
-                                "#endif\n"
-                                "#endif\n"
-                                "#endfile\n"
+                                "#include \"test.h\"\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nABC=ABC\n", getConfigsStr(filedata));
     }
 
     void getConfigs8() {
@@ -2267,17 +2333,17 @@ class TestPreprocessor : public TestFixture {
                                 "#define bar foo\n"
                                 "#define baz bar+0\n"
                                 "#if 0\n"
-                                "#endif";
+                                "#endif\n";
         ASSERT_EQUALS("\n", getConfigsStr(filedata));
     }
 
     void getConfigs11() { // #9832 - include guards
-        const char filedata[] = "#file \"test.h\"\n"
-                                "#if !defined(test_h)\n"
-                                "#define test_h\n"
-                                "123\n"
-                                "#endif\n"
-                                "#endfile\n";
+        ScopedFile header("test.h",
+                          "#if !defined(test_h)\n"
+                          "#define test_h\n"
+                          "123\n"
+                          "#endif\n");
+        const char filedata[] = "#include \"test.h\"\n";
         ASSERT_EQUALS("\n", getConfigsStr(filedata));
     }
 
@@ -2295,32 +2361,259 @@ class TestPreprocessor : public TestFixture {
         ASSERT_EQUALS("\n", getConfigsStr(filedata, nullptr, "gnu.cfg"));
     }
 
-    void getConfigs14() { // #1059
-        const char filedata[] = "#if A >= 1\n"
-                                "1\n"
-                                "#endif\n";
-        ASSERT_EQUALS("\nA=1\n", getConfigsStr(filedata));
+    void getConfigs_gte() { // #1059
+        {
+            const char filedata[] = "#if A >= 1\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=1\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A >= 201112L\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=201112L\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A >= 12147483647\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=12147483647\n", getConfigsStr(filedata));
+        }
     }
 
-    void getConfigs15() { // #1059
-        const char filedata[] = "#if A <= 1\n"
-                                "1\n"
-                                "#endif\n";
-        ASSERT_EQUALS("\nA=1\n", getConfigsStr(filedata));
+    void getConfigs_lte() { // #1059
+        {
+            const char filedata[] = "#if A <= 1\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=1\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A <= 201112L\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=201112L\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A <= 12147483647\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=12147483647\n", getConfigsStr(filedata));
+        }
     }
 
-    void getConfigs16() { // #1059
-        const char filedata[] = "#if A > 1\n"
-                                "1\n"
-                                "#endif\n";
-        ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+    void getConfigs_gt() { // #1059
+        {
+            const char filedata[] = "#if A > 1\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 1L\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 1U\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 1UL\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 1Z\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 0x1\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 01\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 0b1\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 1t\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_THROW_INTERNAL_EQUALS(getConfigsStr(filedata), INTERNAL, "Internal Error. MathLib::toBigNumber: input was not completely consumed: 1t");
+        }
+        {
+            const char filedata[] = "#if A > 1.0\n"
+                                    "1\n"
+                                    "#endif\n";
+            TODO_ASSERT_THROW(getConfigsStr(filedata), InternalError); // floating point literals are not allowed
+        }
+        {
+            const char filedata[] = "#if A > 12147483647\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=12147483648\n", getConfigsStr(filedata));
+        }
     }
 
-    void getConfigs17() { // #1059
-        const char filedata[] = "#if A < 1\n"
-                                "1\n"
-                                "#endif\n";
-        ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+    void getConfigs_lt() { // #1059
+        {
+            const char filedata[] = "#if A < 1\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 1L\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 1U\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 1UL\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 1Z\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 0x1\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 01\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 0b1\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 1t\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_THROW_INTERNAL_EQUALS(getConfigsStr(filedata), INTERNAL, "Internal Error. MathLib::toBigNumber: input was not completely consumed: 1t");
+        }
+        {
+            const char filedata[] = "#if A < 1.0\n"
+                                    "1\n"
+                                    "#endif\n";
+            TODO_ASSERT_THROW(getConfigsStr(filedata), InternalError); // floating point literals are not allowed
+        }
+        {
+            const char filedata[] = "#if A < 12147483647\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=12147483646\n", getConfigsStr(filedata));
+        }
+    }
+
+    void getConfigs_eq_compound() { // #1059
+        {
+            const char filedata[] = "#if A == 1 && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=1;B=B\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A == 201112L && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=201112L;B=B\n", getConfigsStr(filedata));
+        }
+    }
+
+    void getConfigs_gte_compound() { // #1059
+        {
+            const char filedata[] = "#if A >= 1 && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=1;B=B\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A >= 201112L && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=201112L;B=B\n", getConfigsStr(filedata));
+        }
+    }
+
+    void getConfigs_lte_compound() { // #1059
+        {
+            const char filedata[] = "#if A <= 1 && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=1;B=B\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A <= 201112L && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=201112L;B=B\n", getConfigsStr(filedata));
+        }
+    }
+
+    void getConfigs_gt_compound() { // #1059
+        {
+            const char filedata[] = "#if A > 1 && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2;B=B\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 201112L && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=201113;B=B\n", getConfigsStr(filedata));
+        }
+    }
+
+    void getConfigs_lt_compound() { // #1059
+        {
+            const char filedata[] = "#if A < 1 && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0;B=B\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 201112L && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=201111;B=B\n", getConfigsStr(filedata));
+        }
     }
 
     void getConfigsError() {
@@ -2334,7 +2627,7 @@ class TestPreprocessor : public TestFixture {
                                  "#error \"!Y\"\n"
                                  "#endif\n"
                                  "#endif\n";
-        ASSERT_EQUALS("\nX;Y\nY\n", getConfigsStr(filedata2));
+        ASSERT_EQUALS("\nX=X;Y\nY\n", getConfigsStr(filedata2));
     }
 
     void getConfigsD1() {
@@ -2344,14 +2637,14 @@ class TestPreprocessor : public TestFixture {
                                 "#endif\n"
                                 "#endif\n";
         ASSERT_EQUALS("\n", getConfigsStr(filedata, "-DX"));
-        ASSERT_EQUALS("\nX\nY\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nX=X\nY=Y\n", getConfigsStr(filedata));
     }
 
     void getConfigsU1() {
         const char filedata[] = "#ifdef X\n"
                                 "#endif\n";
         ASSERT_EQUALS("\n", getConfigsStr(filedata, "-UX"));
-        ASSERT_EQUALS("\nX\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nX=X\n", getConfigsStr(filedata));
     }
 
     void getConfigsU2() {
@@ -2375,8 +2668,8 @@ class TestPreprocessor : public TestFixture {
         const char filedata[] = "#if defined(X) || defined(Y) || defined(Z)\n"
                                 "#else\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nY;Z\n", getConfigsStr(filedata, "-UX"));
-        ASSERT_EQUALS("\nX;Y;Z\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nY=Y;Z=Z\n", getConfigsStr(filedata, "-UX"));
+        ASSERT_EQUALS("\nX=X;Y=Y;Z=Z\n", getConfigsStr(filedata));
     }
 
     void getConfigsU5() {
@@ -2400,13 +2693,87 @@ class TestPreprocessor : public TestFixture {
         ASSERT_EQUALS("\nY\n", getConfigsStr(code, "-DX"));
     }
 
+    void getConfigsAndCodeIssue14317() {
+        const char filedata[] = "bool test() {\n"
+                                "return\n"
+                                "#if defined(isless)\n"
+                                "0 != isless(1.0, 2.0)\n"
+                                "#else\n"
+                                "0\n"
+                                "#endif\n"
+                                ";\n"
+                                "}\n";
+        // Test getConfigsStr()
+        ASSERT_EQUALS("\nisless=isless\n", getConfigsStr(filedata));
+
+        // Test getcode()
+        // Preprocess => actual result..
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
+
+        // Expected configurations: "" and "ABC"
+        ASSERT_EQUALS(2, actual.size());
+        ASSERT_EQUALS("bool test ( ) {\nreturn\n\n\n\n0\n\n;\n}", actual.at(""));
+        ASSERT_EQUALS("bool test ( ) {\nreturn\n\n0 != $isless ( 1.0 , 2.0 )\n\n\n\n;\n}", actual.at("isless=isless"));
+    }
+
+    void getConfigsMostGeneralConfigIssue14317() {
+        // Verifies that the most general X (out of X=X and X) and Y=Y is returned
+        // For Z: First Z=Z is added to ret, then the ifndef else branch replaces Z=Z with the more general Z
+        const char filedata[] = "#ifdef X\n"
+                                "print(X);\n"
+                                "#endif\n"
+                                "#if X\n"
+                                "print(X+1);\n"
+                                "#endif\n"
+                                "#if defined(Y)\n"
+                                "print(Y);\n"
+                                "#endif\n"
+                                "#ifdef Z\n"
+                                "print(Z);\n"
+                                "#endif\n"
+                                "#ifndef Z\n"
+                                "print(Z+1);\n"
+                                "#else\n"
+                                "print(Z+2);\n"
+                                "#endif\n";
+        // Test getConfigsStr()
+        ASSERT_EQUALS("\nX\nY=Y\nZ\n", getConfigsStr(filedata));
+    }
+
+    void getConfigsInvalid() { // #14732
+        {
+            const char filedata[] = "#if<\n";
+            ASSERT_EQUALS("\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if>\n";
+            ASSERT_EQUALS("\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if==\n";
+            ASSERT_EQUALS("\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if<=\n";
+            ASSERT_EQUALS("\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if>=\n";
+            ASSERT_EQUALS("\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if!\n";
+            ASSERT_EQUALS("\n", getConfigsStr(filedata));
+        }
+    }
+
     void if_sizeof() { // #4071
         const char code[] = "#if sizeof(unsigned short) == 2\n"
                             "Fred & Wilma\n"
                             "#elif sizeof(unsigned short) == 4\n"
                             "Fred & Wilma\n"
                             "#else\n"
-                            "#endif";
+                            "#endif\n";
 
         const std::map<std::string, std::string> actual = getcode(settings0, *this, code);
         ASSERT_EQUALS("\nFred & Wilma", actual.at(""));
@@ -2434,7 +2801,7 @@ class TestPreprocessor : public TestFixture {
     void garbage() {
         const char filedata[] = "V\n"
                                 "#define X b   #endif #line 0 \"x\"  ;\n"
-                                "#if ! defined ( Y )    #endif";
+                                "#if ! defined ( Y )    #endif\n";
 
         // Preprocess => don't crash..
         (void)getcode(settings0, *this, filedata);
@@ -2458,7 +2825,7 @@ class TestPreprocessor : public TestFixture {
 
         ScopedFile header("header.h", "");
 
-        const char code[] = "#include \"header.h\"";
+        const char code[] = "#include \"header.h\"\n";
         (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
         ASSERT_EQUALS("", errout_str());
@@ -2473,7 +2840,7 @@ class TestPreprocessor : public TestFixture {
                                     );
         setTemplateFormat("simple");
 
-        const char code[] = "#include \"header.h\"";
+        const char code[] = "#include \"header.h\"\n";
         (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
         ASSERT_EQUALS("test.c:1:2: information: Include file: \"header.h\" not found. [missingInclude]\n", errout_str());
@@ -2490,7 +2857,7 @@ class TestPreprocessor : public TestFixture {
 
         ScopedFile header("header.h", "", "inc");
 
-        const char code[] = "#include \"header.h\"";
+        const char code[] = "#include \"header.h\"\n";
         (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
         ASSERT_EQUALS("test.c:1:2: information: Include file: \"header.h\" not found. [missingInclude]\n", errout_str());
@@ -2508,7 +2875,7 @@ class TestPreprocessor : public TestFixture {
 
         ScopedFile header("header.h", "", "inc");
 
-        const char code[] = "#include \"inc/header.h\"";
+        const char code[] = "#include \"inc/header.h\"\n";
         (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
         ASSERT_EQUALS("", errout_str());
@@ -2526,7 +2893,7 @@ class TestPreprocessor : public TestFixture {
 
         ScopedFile header("header.h", "", Path::getCurrentPath());
 
-        std::string code("#include \"" + header.path() + "\"");
+        std::string code("#include \"" + header.path() + "\"\n");
         (void)getcodeforcfg(settings, *this, code.data(), code.size(), "", "test.c");
 
         ASSERT_EQUALS("", errout_str());
@@ -2543,7 +2910,7 @@ class TestPreprocessor : public TestFixture {
 
         const std::string header = Path::join(Path::getCurrentPath(), "header.h");
 
-        std::string code("#include \"" + header + "\"");
+        std::string code("#include \"" + header + "\"\n");
         (void)getcodeforcfg(settings, *this, code.data(), code.size(), "", "test.c");
 
         ASSERT_EQUALS("test.c:1:2: information: Include file: \"" + header + "\" not found. [missingInclude]\n", errout_str());
@@ -2560,10 +2927,10 @@ class TestPreprocessor : public TestFixture {
 
         ScopedFile header("header.h", "");
 
-        const char code[] = "#include <header.h>";
+        const char code[] = "#include <header.h>\n";
         (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
-        ASSERT_EQUALS("test.c:1:2: information: Include file: <header.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
+        ASSERT_EQUALS("test.c:1:2: information: Include file: <header.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     // test for missing system include
@@ -2575,10 +2942,10 @@ class TestPreprocessor : public TestFixture {
                                     );
         setTemplateFormat("simple");
 
-        const char code[] = "#include <header.h>";
+        const char code[] = "#include <header.h>\n";
         (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
-        ASSERT_EQUALS("test.c:1:2: information: Include file: <header.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
+        ASSERT_EQUALS("test.c:1:2: information: Include file: <header.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     // test for existing system include in system include path
@@ -2593,7 +2960,7 @@ class TestPreprocessor : public TestFixture {
 
         ScopedFile header("header.h", "", "system");
 
-        const char code[] = "#include <header.h>";
+        const char code[] = "#include <header.h>\n";
         (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
         ASSERT_EQUALS("", errout_str());
@@ -2611,7 +2978,7 @@ class TestPreprocessor : public TestFixture {
 
         ScopedFile header("header.h", "", Path::getCurrentPath());
 
-        std::string code("#include <" + header.path() + ">");
+        std::string code("#include <" + header.path() + ">\n");
         (void)getcodeforcfg(settings, *this, code.data(), code.size(), "", "test.c");
 
         ASSERT_EQUALS("", errout_str());
@@ -2628,10 +2995,10 @@ class TestPreprocessor : public TestFixture {
 
         const std::string header = Path::join(Path::getCurrentPath(), "header.h");
 
-        std::string code("#include <" + header + ">");
+        std::string code("#include <" + header + ">\n");
         (void)getcodeforcfg(settings, *this, code.data(), code.size(), "", "test.c");
 
-        ASSERT_EQUALS("test.c:1:2: information: Include file: <" + header + "> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
+        ASSERT_EQUALS("test.c:1:2: information: Include file: <" + header + "> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     // test for missing local and system include
@@ -2650,12 +3017,12 @@ class TestPreprocessor : public TestFixture {
         const char code[] = "#include \"missing.h\"\n"
                             "#include <header.h>\n"
                             "#include <missing2.h>\n"
-                            "#include \"header2.h\"";
+                            "#include \"header2.h\"\n";
         (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
         ASSERT_EQUALS("test.c:1:2: information: Include file: \"missing.h\" not found. [missingInclude]\n"
-                      "test.c:2:2: information: Include file: <header.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n"
-                      "test.c:3:2: information: Include file: <missing2.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
+                      "test.c:2:2: information: Include file: <header.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n"
+                      "test.c:3:2: information: Include file: <missing2.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     void testMissingIncludeCheckConfig() {
@@ -2691,15 +3058,91 @@ class TestPreprocessor : public TestFixture {
         (void)getcodeforcfg(settings, *this, code.data(), code.size(), "", "test.c");
 
         ASSERT_EQUALS("test.c:1:2: information: Include file: \"missing.h\" not found. [missingInclude]\n"
-                      "test.c:2:2: information: Include file: <header.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n"
-                      "test.c:3:2: information: Include file: <missing2.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n"
+                      "test.c:2:2: information: Include file: <header.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n"
+                      "test.c:3:2: information: Include file: <missing2.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n"
                       "test.c:6:2: information: Include file: \"header4.h\" not found. [missingInclude]\n"
                       "test.c:9:2: information: Include file: \"" + missing3 + "\" not found. [missingInclude]\n"
-                      "test.c:11:2: information: Include file: <" + missing4 + "> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
+                      "test.c:11:2: information: Include file: <" + missing4 + "> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n", errout_str());
+    }
+
+    void testLazyInclude() {
+        const char *code = "#ifdef CONFIG1\n"
+                           "#include \"header1.h\"\n"
+                           "#include \"missing1.h\"\n"
+                           "#else\n"
+                           "#include \"header2.h\"\n"
+                           "#include \"missing2.h\"\n"
+                           "#endif\n";
+
+        std::vector<std::string> files;
+        simplecpp::TokenList tokens(code, files, "test.c");
+
+        ScopedFile header1("header1.h", "1\n");
+        ScopedFile header2("header2.h", "2\n");
+
+        Settings settings;
+        Preprocessor preprocessor(tokens, settings, *this, Standards::Language::CPP);
+
+        simplecpp::OutputList outputList;
+        simplecpp::TokenList tokens2 = preprocessor.preprocess("CONFIG1", files, outputList);
+        std::string out = tokens2.stringify();
+
+        const simplecpp::FileDataCache &cache = preprocessor.mFileCache;
+
+        ASSERT_EQUALS("\n#line 1 \"header1.h\"\n1", out);
+        ASSERT_EQUALS(1, outputList.size());
+        ASSERT_EQUALS("Header not found: \"missing1.h\"", outputList.begin()->msg);
+        ASSERT_EQUALS(1, cache.size());
+    }
+
+    void testKeepComments() {
+        const char *code = "#include \"header.h\"\n"
+                           "// source file comment\n"
+                           "/* source file comment */\n";
+        std::vector<std::string> files;
+        simplecpp::TokenList tokens(code, files, "test.c");
+
+        ScopedFile header("header.h",
+                          "// header comment\n"
+                          "/* header comment */\n");
+
+        Settings settings;
+        settings.keepComments = true;
+        Preprocessor preprocessor(tokens, settings, *this, Standards::Language::CPP);
+
+        simplecpp::OutputList outputList;
+        simplecpp::TokenList tokens2 = preprocessor.preprocess("", files, outputList);
+        std::string out = tokens2.stringify();
+
+        const char *expected = "\n"
+                               "#line 1 \"header.h\"\n"
+                               "// header comment\n"
+                               "/* header comment */\n"
+                               "#line 2 \"test.c\"\n"
+                               "// source file comment\n"
+                               "/* source file comment */";
+        ASSERT_EQUALS(expected, out);
+    }
+
+    void testKeepCommentsMultiline() {
+        const char *code = "/* multi...\n"
+                           "   ...line */\n"
+                           "int x;\n";
+        std::vector<std::string> files;
+        simplecpp::TokenList tokens(code, files, "test.c");
+
+        Settings settings;
+        settings.keepComments = true;
+        Preprocessor preprocessor(tokens, settings, *this, Standards::Language::C);
+
+        const char *expected = "/* multi...\n"
+                               "   ...line */\n"
+                               "int x ;";
+        ASSERT_EQUALS(expected, preprocessor.getcode("", files, false));
     }
 
     void hasInclude() {
-        const char code[] = "#if __has_include(<directory/non-existent-header.h>)\n123\n#endif";
+        const char code[] = "#if __has_include(<directory/non-existent-header.h>)\n123\n#endif\n";
         Settings settings;
 
         settings.standards.setStd("c++11");
@@ -2719,7 +3162,7 @@ class TestPreprocessor : public TestFixture {
         // #11928 / #10045
         const char code[] = "void f(long l) {\n"
                             "  if (l > INT_MAX) {}\n"
-                            "}";
+                            "}\n";
         const std::string actual = getcodeforcfg(settings0, *this, code, "", "test.c");
         ASSERT_EQUALS("void f ( long l ) {\n"
                       "if ( l > $2147483647 ) { }\n"
@@ -2728,9 +3171,9 @@ class TestPreprocessor : public TestFixture {
 
     void hashCalculation() {
         // #12383
-        const char code[] = "int a;";
-        const char code2[] = "int  a;"; // extra space
-        const char code3[] = "\n\nint a;"; // extra new line
+        const char code[] = "int a;\n";
+        const char code2[] = "int  a;\n"; // extra space
+        const char code3[] = "\n\nint a;\n"; // extra new line
 
         ASSERT_EQUALS(getHash(code), getHash(code));
         ASSERT_EQUALS(getHash(code2), getHash(code2));
@@ -2740,9 +3183,28 @@ class TestPreprocessor : public TestFixture {
         ASSERT(getHash(code2) != getHash(code3));
     }
 
+    void hashCalculationIncludeOrder() {
+        // #15132 - the load order of the includes must not change the hash
+        const ScopedFile headerA("hash_a.h", "int a;\n");
+        const ScopedFile headerZ("hash_z.h", "int z;\n");
+        const char code[] = "#include \"hash_z.h\"\n"
+                            "#include \"hash_a.h\"\n";
+
+        const auto getHashLoadOrder = [&](const std::vector<std::string> &loadOrder) {
+            std::vector<std::string> files;
+            simplecpp::TokenList tokens(code, files, "test.c");
+            Preprocessor preprocessor(tokens, settingsDefault, *this, Standards::Language::C);
+            for (const std::string &header : loadOrder)
+                ASSERT(preprocessor.loadFile(files, header));
+            return preprocessor.calculateHash("");
+        };
+
+        ASSERT_EQUALS(getHashLoadOrder({"hash_z.h", "hash_a.h"}), getHashLoadOrder({"hash_a.h", "hash_z.h"}));
+    }
+
     void standard() {
 
-        const char code[] = "int a;";
+        const char code[] = "int a;\n";
         // TODO: this bypasses the standard determined from the settings - the parameter should not be exposed
         simplecpp::DUI dui;
 
@@ -2783,7 +3245,7 @@ class TestPreprocessor : public TestFixture {
             std::vector<std::string> files;
             TokenList tokenlist{settingsDefault, Standards::Language::CPP};
             // TODO: can this happen from application code? if yes we need to turn it into a proper error
-            ASSERT_THROW_EQUALS_2(preprocess(code, files, "test.cpp", tokenlist, dui), std::runtime_error, "unexpected simplecpp::Output type 9");
+            ASSERT_THROW_EQUALS(preprocess(code, files, "test.cpp", tokenlist, dui), std::runtime_error, "unexpected simplecpp::Output type 12");
             ASSERT(!tokenlist.front()); // nothing is tokenized when an unknown standard is provided
         }
     }
@@ -2793,8 +3255,8 @@ class TestPreprocessor : public TestFixture {
         const char inc[] = "class A {\n"
                            "public:\n"
                            "    void f() {}\n"
-                           "};";
-        const char code[] = R"(#include "test.h")";
+                           "};\n";
+        const char code[] = "#include \"test.h\"\n";
         ScopedFile header("test.h", inc);
         const std::string processed = getcodeforcfg(settingsDefault, *this, code, "", "test.cpp");
         ASSERT_EQUALS(
@@ -2809,9 +3271,33 @@ class TestPreprocessor : public TestFixture {
 
     void pragmaAsm()
     {
-        const char code[] = "#pragma asm";
+        const char code[] = "#pragma asm\n";
         ASSERT_THROW_INTERNAL(getcodeforcfg(settingsDefault, *this, code, "", "test.cpp"), InternalError::SYNTAX);
     }
+
+    void dumpPreprocessor() {
+        const char code[] = "#if M == 0\n"
+                            "#endif\n;\n";
+        std::vector<std::string> files;
+        simplecpp::OutputList outputList;
+
+        Settings settings;
+        settings.relativePaths = true;
+        settings.basePaths.emplace_back("/some/path");
+
+        simplecpp::TokenList tokens1(code, files, "/some/path/test.cpp", {}, &outputList);
+        Preprocessor preprocessor(tokens1, settings, *this, Standards::Language::CPP);
+        (void)preprocessor.preprocess("", files, outputList);
+        (void)preprocessor.reportOutput(outputList, true);
+
+        std::ostringstream ostr;
+        preprocessor.dump(ostr);
+        ASSERT_EQUALS(
+            "  <simplecpp-if-cond>\n"
+            "    <if-cond file=\"test.cpp\" line=\"1\" column=\"2\" E=\"M == 0\" result=\"1\"/>\n"
+            "  </simplecpp-if-cond>\n",
+            ostr.str());
+    }
 };
 
 REGISTER_TEST(TestPreprocessor)
diff --git a/test/testprocessexecutor.cpp b/test/testprocessexecutor.cpp
index 1866234ac78..87b03d915f8 100644
--- a/test/testprocessexecutor.cpp
+++ b/test/testprocessexecutor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,7 +51,7 @@ class TestProcessExecutorBase : public TestFixture {
 
 private:
 #ifdef HAS_THREADING_MODEL_FORK
-    /*const*/ Settings settings = settingsBuilder().library("std.cfg").build();
+    /*const*/ Settings settings;
     bool useFS;
 
     std::string fprefix() const
@@ -64,7 +64,7 @@ class TestProcessExecutorBase : public TestFixture {
     struct CheckOptions
     {
         bool quiet = true;
-        ShowTime showtime = ShowTime::NONE;
+        Settings::ShowTime showtime = Settings::ShowTime::NONE;
         const char* plistOutput = nullptr;
         std::vector<std::string> filesList;
     };
@@ -104,6 +104,9 @@ class TestProcessExecutorBase : public TestFixture {
             s.plistOutput = opt.plistOutput;
         s.templateFormat = "{callstack}: ({severity}) {inconclusive:inconclusive: }{message}";
         Suppressions supprs;
+        std::unique_ptr<TimerResults> timerResults;
+        if (s.showtime != Settings::ShowTime::NONE)
+            timerResults.reset(new TimerResults);
 
         // NOLINTNEXTLINE(performance-unnecessary-value-param)
         auto executeFn = [](std::string,std::vector<std::string>,std::string,std::string&){
@@ -119,7 +122,7 @@ class TestProcessExecutorBase : public TestFixture {
         if (useFS)
             filelist.clear();
 
-        ProcessExecutor executor(filelist, fileSettings, s, supprs, *this, executeFn);
+        ProcessExecutor executor(filelist, fileSettings, s, supprs, *this, timerResults.get(), executeFn);
         ASSERT_EQUALS(result, executor.check());
     }
 #endif // HAS_THREADING_MODEL_FORK
@@ -137,9 +140,7 @@ class TestProcessExecutorBase : public TestFixture {
         TEST_CASE(one_error_less_files);
         TEST_CASE(one_error_several_files);
         TEST_CASE(showtime_top5_file);
-        TEST_CASE(showtime_top5_summary);
         TEST_CASE(showtime_file);
-        TEST_CASE(showtime_summary);
         TEST_CASE(showtime_file_total);
         TEST_CASE(suppress_error_library);
         TEST_CASE(unique_errors);
@@ -178,7 +179,7 @@ class TestProcessExecutorBase : public TestFixture {
               "void f()\n"
               "{\n"
               "  (void)(*((int*)0));\n"
-              "}", dinit(CheckOptions, $.showtime = ShowTime::SUMMARY));
+              "}", dinit(CheckOptions, $.showtime = Settings::ShowTime::SUMMARY));
         // we are not interested in the results - so just consume them
         ignore_errout();
     }
@@ -247,25 +248,10 @@ class TestProcessExecutorBase : public TestFixture {
         check(2, 2, 0,
               "int main() {}",
               dinit(CheckOptions,
-                    $.showtime = ShowTime::TOP5_FILE));
-        // for each file: top5 results + overall + empty line
+                    $.showtime = Settings::ShowTime::TOP5_FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        // for each file: top5 results + overall + empty line
-        TODO_ASSERT_EQUALS(static_cast<long long>(5 + 1 + 1) * 2, 0, cppcheck::count_all_of(output_s, '\n'));
-    }
-
-    void showtime_top5_summary() {
-        REDIRECT;
-        check(2, 2, 0,
-              "int main() {}",
-              dinit(CheckOptions,
-                    $.showtime = ShowTime::TOP5_SUMMARY));
-        const std::string output_s = GET_REDIRECT_OUTPUT;
-        // once: top5 results + overall + empty line
-        TODO_ASSERT_EQUALS(5 + 1 + 1, 1, cppcheck::count_all_of(output_s, '\n'));
-        // should only report the top5 once
-        ASSERT(output_s.find("1 result(s)") == std::string::npos);
-        TODO_ASSERT(output_s.find("2 result(s)") != std::string::npos);
+        // for each file: top5 results + check time
+        TODO_ASSERT_EQUALS(static_cast<long long>(5 + 1) * 2, 0, cppcheck::count_all_of(output_s, '\n'));
     }
 
     void showtime_file() {
@@ -273,29 +259,17 @@ class TestProcessExecutorBase : public TestFixture {
         check(2, 2, 0,
               "int main() {}",
               dinit(CheckOptions,
-                    $.showtime = ShowTime::FILE));
+                    $.showtime = Settings::ShowTime::FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
         TODO_ASSERT_EQUALS(2, 0, cppcheck::count_all_of(output_s, "Overall time:"));
     }
 
-    void showtime_summary() {
-        REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
-        check(2, 2, 0,
-              "int main() {}",
-              dinit(CheckOptions,
-                    $.showtime = ShowTime::SUMMARY));
-        const std::string output_s = GET_REDIRECT_OUTPUT;
-        // should only report the actual summary once
-        ASSERT(output_s.find("1 result(s)") == std::string::npos);
-        TODO_ASSERT(output_s.find("2 result(s)") != std::string::npos);
-    }
-
     void showtime_file_total() {
         REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
         check(2, 2, 0,
               "int main() {}",
               dinit(CheckOptions,
-                    $.showtime = ShowTime::FILE_TOTAL));
+                    $.showtime = Settings::ShowTime::FILE_TOTAL));
         const std::string output_s = GET_REDIRECT_OUTPUT;
         TODO_ASSERT(output_s.find("Check time: " + fprefix() + "_1.c: ") != std::string::npos);
         TODO_ASSERT(output_s.find("Check time: " + fprefix() + "_2.c: ") != std::string::npos);
diff --git a/test/testprogrammemory.cpp b/test/testprogrammemory.cpp
index a6cf933d843..c37431de608 100644
--- a/test/testprogrammemory.cpp
+++ b/test/testprogrammemory.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ class TestProgramMemory : public TestFixture {
     }
 
     void copyOnWrite() const {
-        SimpleTokenList tokenlist("1+1;");
+        SimpleTokenList tokenlist("1+1;\n");
         Token* tok = tokenlist.front();
         const nonneg int id = 123;
         tok->exprId(id);
@@ -98,8 +98,8 @@ class TestProgramMemory : public TestFixture {
 
     void at() const {
         ProgramMemory pm;
-        ASSERT_THROW_EQUALS_2(pm.at(123), std::out_of_range, "ProgramMemory::at");
-        ASSERT_THROW_EQUALS_2(utils::as_const(pm).at(123), std::out_of_range, "ProgramMemory::at");
+        ASSERT_THROW_EQUALS(pm.at(123), std::out_of_range, "ProgramMemory::at");
+        ASSERT_THROW_EQUALS(utils::as_const(pm).at(123), std::out_of_range, "ProgramMemory::at");
     }
 };
 
diff --git a/test/testrefthunk.cpp b/test/testrefthunk.cpp
new file mode 100644
index 00000000000..f9ae525295a
--- /dev/null
+++ b/test/testrefthunk.cpp
@@ -0,0 +1,134 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 Cppcheck team.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "fixture.h"
+#include "refthunk.h"
+
+#include <cstddef>
+#include <string>
+
+class TestRefThunk : public TestFixture {
+public:
+    TestRefThunk() : TestFixture("TestRefThunk") {}
+
+private:
+    void run() override {
+        TEST_CASE(callAccess);
+        TEST_CASE(getReference);
+        TEST_CASE(referenceConversion);
+        TEST_CASE(memberAccess);
+        TEST_CASE(mutation);
+        TEST_CASE(copyConstruct);
+        TEST_CASE(copyAssign);
+        TEST_CASE(rebind);
+        TEST_CASE(convertToConst);
+        TEST_CASE(functionArguments);
+    }
+
+    void callAccess() const {
+        int x = 42;
+        const RefThunk<int> p(x);
+        ASSERT_EQUALS(42, p());
+        ASSERT(&p() == &x);
+    }
+
+    void getReference() const {
+        int x = 1;
+        const RefThunk<int> p(x);
+        ASSERT(&p.get() == &x);
+        p.get() = 2;
+        ASSERT_EQUALS(2, x);
+    }
+
+    void referenceConversion() const {
+        int x = 1;
+        const RefThunk<int> p(x);
+        int& ref = p;
+        ASSERT(&ref == &x);
+        ref = 2;
+        ASSERT_EQUALS(2, x);
+    }
+
+    void memberAccess() const {
+        const std::string s = "abc";
+        const RefThunk<const std::string> p(s);
+        ASSERT_EQUALS(3, p().size());
+        ASSERT_EQUALS("abc", p());
+    }
+
+    void mutation() const {
+        std::string s = "abc";
+        const RefThunk<std::string> p(s);
+        p() += "d";
+        p().push_back('e');
+        ASSERT_EQUALS("abcde", s);
+    }
+
+    void copyConstruct() const {
+        int x = 1;
+        const RefThunk<int> p(x);
+        const RefThunk<int> q(p);
+        ASSERT(&q() == &x);
+    }
+
+    void copyAssign() const {
+        int x = 1;
+        int y = 2;
+        RefThunk<int> p(x);
+        const RefThunk<int> q(y);
+        ASSERT(&p() == &x);
+        p = q;
+        ASSERT(&p() == &y);
+        ASSERT_EQUALS(2, p());
+    }
+
+    void rebind() const {
+        int x = 1;
+        int y = 2;
+        RefThunk<int> p(x);
+        ASSERT(&p() == &x);
+        // assignment rebinds, like std::reference_wrapper - it does not write through
+        p = y;
+        ASSERT(&p() == &y);
+        ASSERT_EQUALS(1, x);
+    }
+
+    void convertToConst() const {
+        int x = 1;
+        const RefThunk<int> p(x);
+        const RefThunk<const int> cp(p);
+        ASSERT(&cp() == &x);
+        const int& ref = cp;
+        ASSERT(&ref == &x);
+    }
+
+    static std::size_t refArg(const std::string& s) {
+        return s.size();
+    }
+
+    void functionArguments() const {
+        std::string s = "abcd";
+        const RefThunk<std::string> p(s);
+        // implicit conversion to reference, like std::reference_wrapper
+        ASSERT_EQUALS(4, refArg(p));
+        // explicit access through operator()
+        ASSERT_EQUALS(4, refArg(p()));
+    }
+};
+
+REGISTER_TEST(TestRefThunk)
diff --git a/test/testregex.cpp b/test/testregex.cpp
index 628ec3e6f5d..f26a9fee4fa 100644
--- a/test/testregex.cpp
+++ b/test/testregex.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,11 +26,13 @@
 #include <string>
 #include <utility>
 
-class TestRegEx : public TestFixture {
+class TestRegExBase : public TestFixture {
 public:
-    TestRegEx() : TestFixture("TestRegEx") {}
+    TestRegExBase(const char * const name, Regex::Engine engine) : TestFixture(name), mEngine(engine) {}
 
 private:
+    Regex::Engine mEngine;
+
     void run() override {
         TEST_CASE(match);
         TEST_CASE(nomatch);
@@ -44,9 +46,11 @@ class TestRegEx : public TestFixture {
 #define assertRegex(...) assertRegex_(__FILE__, __LINE__, __VA_ARGS__)
     std::shared_ptr<Regex> assertRegex_(const char* file, int line, std::string pattern, const std::string& exp_err = "") const {
         std::string regex_err;
-        auto r = Regex::create(std::move(pattern), regex_err);
-        if (exp_err.empty())
+        auto r = Regex::create(std::move(pattern), mEngine, regex_err);
+        if (exp_err.empty()) {
             ASSERT_LOC(!!r.get(), file, line);
+            ASSERT_EQUALS_ENUM_LOC(mEngine, r->engine(), file, line);
+        }
         else
             ASSERT_LOC(!r.get(), file, line); // only not set if we encountered an error
         ASSERT_EQUALS_LOC(exp_err, regex_err, file, line);
@@ -80,7 +84,11 @@ class TestRegEx : public TestFixture {
     }
 
     void compileError() const {
-        (void)assertRegex("[", "pcre_compile failed: missing terminating ] for character class");
+        std::string exp;
+        if (mEngine == Regex::Engine::Pcre)
+            exp = "missing terminating ] for character class";
+
+        (void)assertRegex("[", exp);
     }
 
     void copy() const {
@@ -190,6 +198,11 @@ class TestRegEx : public TestFixture {
 #undef assertRegex
 };
 
-REGISTER_TEST(TestRegEx)
+class TestRegExPcre : public TestRegExBase {
+public:
+    TestRegExPcre() : TestRegExBase("TestRegExPcre", Regex::Engine::Pcre) {}
+};
+
+REGISTER_TEST(TestRegExPcre)
 
 #endif // HAVE_RULES
diff --git a/test/testrunner.vcxproj b/test/testrunner.vcxproj
index cd7a039c418..2ce6a97d9c4 100755
--- a/test/testrunner.vcxproj
+++ b/test/testrunner.vcxproj
@@ -53,6 +53,7 @@
     <ClCompile Include="testbufferoverrun.cpp" />
     <ClCompile Include="testcharvar.cpp" />
     <ClCompile Include="testcheck.cpp" />
+    <ClCompile Include="testcheckersreport.cpp" />
     <ClCompile Include="testclangimport.cpp" />
     <ClCompile Include="testclass.cpp" />
     <ClCompile Include="testcmdlineparser.cpp" />
@@ -86,6 +87,7 @@
     <ClCompile Include="testpreprocessor.cpp" />
     <ClCompile Include="testprocessexecutor.cpp" />
     <ClCompile Include="testprogrammemory.cpp" />
+    <ClCompile Include="testrefthunk.cpp" />
     <ClCompile Include="testregex.cpp" />
     <ClCompile Include="testsarifreport.cpp" />
     <ClCompile Include="testsettings.cpp" />
diff --git a/test/testsarifreport.cpp b/test/testsarifreport.cpp
index b4d3056a762..e9fc56d736d 100644
--- a/test/testsarifreport.cpp
+++ b/test/testsarifreport.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test/testsettings.cpp b/test/testsettings.cpp
index fd8f62c1a82..8235e75f8c7 100644
--- a/test/testsettings.cpp
+++ b/test/testsettings.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,6 +42,9 @@ class TestSettings : public TestFixture {
         TEST_CASE(getMaxConfigsDefines);
         TEST_CASE(getMaxConfigsDefinesAndOpt);
         TEST_CASE(getMaxConfigsOptAndProject);
+
+        TEST_CASE(isPremiumEnabledCert);
+        TEST_CASE(isPremiumEnabledMisra);
     }
 
     void simpleEnableGroup() const {
@@ -236,6 +239,21 @@ class TestSettings : public TestFixture {
                             R"({"suppressions": [1]}\n)");
             ASSERT_EQUALS("'suppressions' array entry is not a string", Settings::loadCppcheckCfg(s, supprs));
         }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"manualUrl": "https://docs.notcppcheck.com/manual.pdf"})");
+            ASSERT_EQUALS("", Settings::loadCppcheckCfg(s, supprs));
+            ASSERT_EQUALS("https://docs.notcppcheck.com/manual.pdf", s.manualUrl);
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"manualUrl": 0}\n)");
+            ASSERT_EQUALS("'manualUrl' is not a string", Settings::loadCppcheckCfg(s, supprs));
+        }
 
         // TODO: test with FILESDIR
     }
@@ -341,6 +359,38 @@ class TestSettings : public TestFixture {
         s.maxConfigsProject = 10;
         ASSERT_EQUALS(3, s.getMaxConfigs());
     }
+
+    void isPremiumEnabledCert() const {
+        Settings s;
+        s.premiumArgs = "--cert-c-2016";
+        ASSERT(s.isPremiumEnabled("uninitvar"));
+        s.premiumArgs = "--cert-c";
+        ASSERT(s.isPremiumEnabled("uninitvar"));
+        s.premiumArgs = "--cert-c:all";
+        ASSERT(s.isPremiumEnabled("uninitvar"));
+        s.premiumArgs = "--cert-c++";
+        ASSERT(s.isPremiumEnabled("uninitvar"));
+        s.premiumArgs = "--cert-cpp";
+        ASSERT(s.isPremiumEnabled("uninitvar"));
+    }
+
+    void isPremiumEnabledMisra() const {
+        Settings s;
+        s.premiumArgs = "--misra-c-2012";
+        ASSERT(s.isPremiumEnabled("uninitvar"));
+        s.premiumArgs = "--misra-c-2023";
+        ASSERT(s.isPremiumEnabled("uninitvar"));
+        s.premiumArgs = "--misra-c-2025";
+        ASSERT(s.isPremiumEnabled("uninitvar"));
+        s.premiumArgs = "--misra-cpp-2008";
+        ASSERT(s.isPremiumEnabled("uninitvar"));
+        s.premiumArgs = "--misra-c++-2008";
+        ASSERT(s.isPremiumEnabled("uninitvar"));
+        s.premiumArgs = "--misra-cpp-2023";
+        ASSERT(s.isPremiumEnabled("uninitvar"));
+        s.premiumArgs = "--misra-c++-2023";
+        ASSERT(s.isPremiumEnabled("uninitvar"));
+    }
 };
 
 REGISTER_TEST(TestSettings)
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
index 494127fbee8..407649e0c7f 100644
--- a/test/testsimplifytemplate.cpp
+++ b/test/testsimplifytemplate.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -224,6 +224,8 @@ class TestSimplifyTemplate : public TestFixture {
         TEST_CASE(template180);
         TEST_CASE(template181);
         TEST_CASE(template182); // #13770
+        TEST_CASE(template183);
+        TEST_CASE(template184);
         TEST_CASE(template_specialization_1);  // #7868 - template specialization template <typename T> struct S<C<T>> {..};
         TEST_CASE(template_specialization_2);  // #7868 - template specialization template <typename T> struct S<C<T>> {..};
         TEST_CASE(template_specialization_3);
@@ -312,21 +314,24 @@ class TestSimplifyTemplate : public TestFixture {
         TEST_CASE(requires3);
         TEST_CASE(requires4);
         TEST_CASE(requires5);
+        TEST_CASE(requires6);
 
         TEST_CASE(explicitBool1);
         TEST_CASE(explicitBool2);
 
         TEST_CASE(templateArgPreserveType); // #13882 - type of template argument
 
+        TEST_CASE(template_shift_negative); // shift folding with a negative operand
+
         TEST_CASE(dumpTemplateArgFrom);
     }
 
-    class TemplateSimplifierTest : public TemplateSimplifier
+    class TemplateSimplifierTest final : public TemplateSimplifier
     {
         friend class TestSimplifyTemplate;
     };
 
-    class TokenizerTest : public Tokenizer
+    class TokenizerTest final : public Tokenizer
     {
         friend class TestSimplifyTemplate;
     public:
@@ -367,7 +372,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template1() {
         const char code[] = "template <class T> T f(T val) { T a; }\n"
-                            "f<int>(10);";
+                            "f<int>(10);\n";
 
         const char expected[] = "int f<int> ( int val ) ; "
                                 "f<int> ( 10 ) ; "
@@ -378,7 +383,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template2() {
         const char code[] = "template <class T> class Fred { T a; };\n"
-                            "Fred<int> fred;";
+                            "Fred<int> fred;\n";
 
         const char expected[] = "class Fred<int> ; "
                                 "Fred<int> fred ; "
@@ -389,7 +394,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template3() {
         const char code[] = "template <class T, int sz> class Fred { T data[sz]; };\n"
-                            "Fred<float,4> fred;";
+                            "Fred<float,4> fred;\n";
 
         const char expected[] = "class Fred<float,4> ; "
                                 "Fred<float,4> fred ; "
@@ -400,7 +405,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template4() {
         const char code[] = "template <class T> class Fred { Fred(); };\n"
-                            "Fred<float> fred;";
+                            "Fred<float> fred;\n";
 
         const char expected[] = "class Fred<float> ; "
                                 "Fred<float> fred ; "
@@ -412,7 +417,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template5() {
         const char code[] = "template <class T> class Fred { };\n"
                             "template <class T> Fred<T>::Fred() { }\n"
-                            "Fred<float> fred;";
+                            "Fred<float> fred;\n";
 
         const char expected[] = "class Fred<float> ; "
                                 "Fred<float> fred ; "
@@ -425,7 +430,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template6() {
         const char code[] = "template <class T> class Fred { };\n"
                             "Fred<float> fred1;\n"
-                            "Fred<float> fred2;";
+                            "Fred<float> fred2;\n";
 
         const char expected[] = "class Fred<float> ; "
                                 "Fred<float> fred1 ; "
@@ -526,7 +531,7 @@ class TestSimplifyTemplate : public TestFixture {
                       "template < typename T > class A { void f ( ) { B < T > a ; a = B < T > :: g ( ) ; T b ; b = 0 ; if ( b ) { b = 0 ; } } } ; "
                       "template < typename T > B < T > h ( ) { return B < T > ( ) ; }", tok(code));
 
-        ASSERT_EQUALS("class A { template < typename T > int foo ( T d ) ; } ;", tok("class A{ template<typename T> int foo(T d);};"));
+        ASSERT_EQUALS("class A { template < typename T > int foo ( T d ) ; } ;", tok("class A{ template<typename T> int foo(T d);};\n"));
     }
 
     void template9() {
@@ -631,7 +636,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    y(AA<CC>::create(new CC(AA<BB>(), 0)))\n"
                             "    {}\n"
                             "\n"
-                            "int yy[AA<CC>::size()];";
+                            "int yy[AA<CC>::size()];\n";
         const char expected[] = "class BB { } ; "
                                 "class AA<BB> ; "
                                 "class AA<CC> ; "
@@ -707,7 +712,7 @@ class TestSimplifyTemplate : public TestFixture {
                              "  vec(const vec<n-1>& v) {}\n" // <- never used don't instantiate
                              "};\n"
                              "\n"
-                             "vec<4> v;";
+                             "vec<4> v;\n";
         const char expected2[] = "struct vec<4> ; "
                                  "vec<4> v ; "
                                  "struct vec<4> { "
@@ -765,7 +770,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template18() {
         const char code[] = "template <class T> class foo { T a; };\n"
-                            "foo<int> *f;";
+                            "foo<int> *f;\n";
 
         const char expected[] = "class foo<int> ; "
                                 "foo<int> * f ; "
@@ -810,7 +815,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template21() {
         {
             const char code[] = "template <class T> struct Fred { T a; };\n"
-                                "Fred<int> fred;";
+                                "Fred<int> fred;\n";
 
             const char expected[] = "struct Fred<int> ; "
                                     "Fred<int> fred ; "
@@ -821,7 +826,7 @@ class TestSimplifyTemplate : public TestFixture {
 
         {
             const char code[] = "template <class T, int sz> struct Fred { T data[sz]; };\n"
-                                "Fred<float,4> fred;";
+                                "Fred<float,4> fred;\n";
 
             const char expected[] = "struct Fred<float,4> ; "
                                     "Fred<float,4> fred ; "
@@ -832,7 +837,7 @@ class TestSimplifyTemplate : public TestFixture {
 
         {
             const char code[] = "template <class T> struct Fred { Fred(); };\n"
-                                "Fred<float> fred;";
+                                "Fred<float> fred;\n";
 
             const char expected[] = "struct Fred<float> ; "
                                     "Fred<float> fred ; "
@@ -844,7 +849,7 @@ class TestSimplifyTemplate : public TestFixture {
         {
             const char code[] = "template <class T> struct Fred { };\n"
                                 "Fred<float> fred1;\n"
-                                "Fred<float> fred2;";
+                                "Fred<float> fred2;\n";
 
             const char expected[] = "struct Fred<float> ; "
                                     "Fred<float> fred1 ; "
@@ -857,7 +862,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template22() {
         const char code[] = "template <class T> struct Fred { T a; };\n"
-                            "Fred<std::string> fred;";
+                            "Fred<std::string> fred;\n";
 
         const char expected[] = "struct Fred<std::string> ; "
                                 "Fred<std::string> fred ; "
@@ -870,7 +875,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <class T> void foo() { }\n"
                             "void bar() {\n"
                             "    std::cout << (foo<double>());\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "void foo<double> ( ) ; "
                                 "void bar ( ) {"
@@ -891,7 +896,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template<int x> class bitset: B<sizeof(int)>\n"
                             "{};\n"
                             "\n"
-                            "bitset<1> z;";
+                            "bitset<1> z;\n";
         const char expected[] = "struct B<4> ; "
                                 "class bitset<1> ; "
                                 "bitset<1> z ; "
@@ -909,7 +914,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template<int x> class bitset: B<((sizeof(int)) ? : 1)>\n"
                             "{};\n"
                             "\n"
-                            "bitset<1> z;";
+                            "bitset<1> z;\n";
         const char expected[] = "struct B<4> ; "
                                 "class bitset<1> ; "
                                 "bitset<1> z ; "
@@ -932,7 +937,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template27() {
         // #3350 - template inside macro call
-        const char code[] = "X(template<class T> class Fred);";
+        const char code[] = "X(template<class T> class Fred);\n";
         ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
     }
 
@@ -949,19 +954,19 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template30() {
         // #3529 - template < template < ..
-        const char code[] = "template<template<class> class A, class B> void f(){}";
+        const char code[] = "template<template<class> class A, class B> void f(){}\n";
         ASSERT_EQUALS("template < template < class > class A , class B > void f ( ) { }", tok(code));
     }
 
     void template31() {
         // #4010 - template reference type
-        const char code[] = "template<class T> struct A{}; A<int&> a;";
+        const char code[] = "template<class T> struct A{}; A<int&> a;\n";
         ASSERT_EQUALS("struct A<int&> ; "
                       "A<int&> a ; "
                       "struct A<int&> { } ;", tok(code));
 
         // #7409 - rvalue
-        const char code2[] = "template<class T> struct A{}; A<int&&> a;";
+        const char code2[] = "template<class T> struct A{}; A<int&&> a;\n";
         ASSERT_EQUALS("struct A<int&&> ; "
                       "A<int&&> a ; "
                       "struct A<int&&> { } ;", tok(code2));
@@ -991,7 +996,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "template<class T> struct A { };\n"
                                 "template<class T> struct B { };\n"
                                 "template<class T> struct C { A<B<X<T> > > ab; };\n"
-                                "C<int> c;";
+                                "C<int> c;\n";
             ASSERT_EQUALS("struct A<B<X<int>>> ; "
                           "struct B<X<int>> ; "
                           "struct C<int> ; "
@@ -1006,7 +1011,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "struct A { };\n"
                                 "template<class T> struct B { };\n"
                                 "template<class T> struct C { };\n"
-                                "C< B<A> > c;";
+                                "C< B<A> > c;\n";
             ASSERT_EQUALS("struct A { } ; "
                           "template < class T > struct B { } ; "  // <- redundant.. but nevermind
                           "struct C<B<A>> ; "
@@ -1021,13 +1026,13 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "namespace abc {\n"
                             "template <typename T> struct X { void f(X<T> &x) {} };\n"
                             "}\n"
-                            "template <> int X<int>::Y(0);";
+                            "template <> int X<int>::Y(0);\n";
         (void)tok(code);
     }
 
     void template35() { // #4074 - "A<'x'> a;" is not recognized as template instantiation
         const char code[] = "template <char c> class A {};\n"
-                            "A <'x'> a;";
+                            "A <'x'> a;\n";
         ASSERT_EQUALS("class A<'x'> ; "
                       "A<'x'> a ; "
                       "class A<'x'> { } ;", tok(code));
@@ -1036,7 +1041,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template36() { // #4310 - Passing unknown template instantiation as template argument
         const char code[] = "template <class T> struct X { T t; };\n"
                             "template <class C> struct Y { Foo < X< Bar<C> > > _foo; };\n" // <- Bar is unknown
-                            "Y<int> bar;";
+                            "Y<int> bar;\n";
         ASSERT_EQUALS("struct X<Bar<int>> ; "
                       "struct Y<int> ; "
                       "Y<int> bar ; "
@@ -1050,7 +1055,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "class A { };\n"
                                 "template<class T> class B {};\n"
                                 "B<class A> b1;\n"
-                                "B<A> b2;";
+                                "B<A> b2;\n";
             ASSERT_EQUALS("class A { } ; class B<A> ; B<A> b1 ; B<A> b2 ; class B<A> { } ;",
                           tok(code));
         }
@@ -1058,7 +1063,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "struct A { };\n"
                                 "template<class T> class B {};\n"
                                 "B<struct A> b1;\n"
-                                "B<A> b2;";
+                                "B<A> b2;\n";
             ASSERT_EQUALS("struct A { } ; class B<A> ; B<A> b1 ; B<A> b2 ; class B<A> { } ;",
                           tok(code));
         }
@@ -1066,7 +1071,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "enum A { };\n"
                                 "template<class T> class B {};\n"
                                 "B<enum A> b1;\n"
-                                "B<A> b2;";
+                                "B<A> b2;\n";
             ASSERT_EQUALS("enum A { } ; class B<A> ; B<A> b1 ; B<A> b2 ; class B<A> { } ;",
                           tok(code));
         }
@@ -1074,7 +1079,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template_unhandled() {
         // An unhandled template usage should not be simplified..
-        ASSERT_EQUALS("x < int > ( ) ;", tok("x<int>();"));
+        ASSERT_EQUALS("x < int > ( ) ;", tok("x<int>();\n"));
     }
 
     void template38() { // #4832 - Crash on C++11 right angle brackets
@@ -1108,21 +1113,21 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template39() { // #4742 - Used to freeze in 1.60
-        const char code[] = "template<typename T> struct vector {"
-                            "  operator T() const;"
-                            "};"
-                            "void f() {"
-                            "  vector<vector<int>> v;"
-                            "  const vector<int> vi = static_cast<vector<int>>(v);"
-                            "}";
+        const char code[] = "template<typename T> struct vector {\n"
+                            "  operator T() const;\n"
+                            "};\n"
+                            "void f() {\n"
+                            "  vector<vector<int>> v;\n"
+                            "  const vector<int> vi = static_cast<vector<int>>(v);\n"
+                            "}\n";
         (void)tok(code);
     }
 
     void template40() { // #5055 - false negatives when there is template specialization outside struct
-        const char code[] = "struct A {"
-                            "  template<typename T> struct X { T t; };"
-                            "};"
-                            "template<> struct A::X<int> { int *t; };";
+        const char code[] = "struct A {\n"
+                            "  template<typename T> struct X { T t; };\n"
+                            "};\n"
+                            "template<> struct A::X<int> { int *t; };\n";
         const char expected[] = "struct A { "
                                 "struct X<int> ; "
                                 "template < typename T > struct X { T t ; } ; "
@@ -1133,13 +1138,13 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template41() { // #4710 - const in template instantiation not handled perfectly
         const char code1[] = "template<class T> struct X { };\n"
-                             "void f(const X<int> x) { }";
+                             "void f(const X<int> x) { }\n";
         ASSERT_EQUALS("struct X<int> ; "
                       "void f ( const X<int> x ) { } "
                       "struct X<int> { } ;", tok(code1));
 
         const char code2[] = "template<class T> T f(T t) { return t; }\n"
-                             "int x() { return f<int>(123); }";
+                             "int x() { return f<int>(123); }\n";
         ASSERT_EQUALS("int f<int> ( int t ) ; "
                       "int x ( ) { return f<int> ( 123 ) ; } "
                       "int f<int> ( int t ) { return t ; }", tok(code2));
@@ -1153,7 +1158,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "  }() + ^ {\n"
                             "    return sizeof...(args);\n"
                             "  }();\n"
-                            "}";
+                            "}\n";
         ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
     }
 
@@ -1171,7 +1176,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "int main(void) {\n"
                             "    C<A> ca;\n"
                             "    return 0;\n"
-                            "}";
+                            "}\n";
         const char expected[] = "struct E<void*> ; "
                                 "struct C<B<A>> ; "
                                 "struct C<A> ; "
@@ -1210,14 +1215,14 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template44() { // #5297
-        const char code[] = "template<class T> struct StackContainer {"
-                            "  void foo(int i) {"
-                            "    if (0 >= 1 && i<0) {}"
-                            "  }"
-                            "};"
-                            "template<class T> class ZContainer : public StackContainer<T> {};"
-                            "struct FGSTensor {};"
-                            "class FoldedZContainer : public ZContainer<FGSTensor> {};";
+        const char code[] = "template<class T> struct StackContainer {\n"
+                            "  void foo(int i) {\n"
+                            "    if (0 >= 1 && i<0) {}\n"
+                            "  }\n"
+                            "};\n"
+                            "template<class T> class ZContainer : public StackContainer<T> {};\n"
+                            "struct FGSTensor {};\n"
+                            "class FoldedZContainer : public ZContainer<FGSTensor> {};\n";
         const char expected[] = "struct StackContainer<FGSTensor> ; "
                                 "class ZContainer<FGSTensor> ; "
                                 "struct FGSTensor { } ; "
@@ -1232,14 +1237,14 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template45() { // #5814
-        const char code[] = "namespace Constants { const int fourtytwo = 42; } "
-                            "template <class T, int U> struct TypeMath { "
-                            "  static const int mult = sizeof(T) * U; "
-                            "}; "
-                            "template <class T> struct FOO { "
-                            "  enum { value = TypeMath<T, Constants::fourtytwo>::mult }; "
-                            "}; "
-                            "FOO<int> foo;";
+        const char code[] = "namespace Constants { const int fourtytwo = 42; }\n"
+                            "template <class T, int U> struct TypeMath {\n"
+                            "  static const int mult = sizeof(T) * U;\n"
+                            "};\n"
+                            "template <class T> struct FOO {\n"
+                            "  enum { value = TypeMath<T, Constants::fourtytwo>::mult };\n"
+                            "};\n"
+                            "FOO<int> foo;\n";
         const char expected[] = "namespace Constants { const int fourtytwo = 42 ; } "
                                 "struct TypeMath<int,Constants::fourtytwo> ; "
                                 "struct FOO<int> ; "
@@ -1255,32 +1260,32 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template46() { // #5816
-        ASSERT_NO_THROW(tok("template<class T, class U> struct A { static const int value = 0; }; "
-                            "template <class T> struct B { "
-                            "  enum { value = A<typename T::type, int>::value }; "
-                            "};"));
+        ASSERT_NO_THROW(tok("template<class T, class U> struct A { static const int value = 0; };\n"
+                            "template <class T> struct B {\n"
+                            "  enum { value = A<typename T::type, int>::value };\n"
+                            "};\n"));
         ASSERT_EQUALS("", errout_str());
-        ASSERT_NO_THROW(tok("template <class T, class U> struct A {}; "
-                            "enum { e = sizeof(A<int, int>) }; "
-                            "template <class T, class U> struct B {};"));
+        ASSERT_NO_THROW(tok("template <class T, class U> struct A {};\n"
+                            "enum { e = sizeof(A<int, int>) };\n"
+                            "template <class T, class U> struct B {};\n"));
         ASSERT_EQUALS("", errout_str());
-        ASSERT_NO_THROW(tok("template<class T, class U> struct A { static const int value = 0; }; "
-                            "template<class T> struct B { typedef int type; }; "
-                            "template <class T> struct C { "
-                            "  enum { value = A<typename B<T>::type, int>::value }; "
-                            "};"));
+        ASSERT_NO_THROW(tok("template<class T, class U> struct A { static const int value = 0; };\n"
+                            "template<class T> struct B { typedef int type; };\n"
+                            "template <class T> struct C {\n"
+                            "  enum { value = A<typename B<T>::type, int>::value };\n"
+                            "};\n"));
         ASSERT_EQUALS("", errout_str());
     }
 
     void template47() { // #6023
-        ASSERT_NO_THROW(tok("template <typename T1, typename T2 = T3<T1> > class C1 {}; "
-                            "class C2 : public C1<C2> {};"));
+        ASSERT_NO_THROW(tok("template <typename T1, typename T2 = T3<T1> > class C1 {};\n"
+                            "class C2 : public C1<C2> {};\n"));
         ASSERT_EQUALS("", errout_str());
     }
 
     void template48() { // #6134 (hang)
-        (void)tok("template <int> int f( {  } ); "
-                  "int foo = f<1>(0);");
+        (void)tok("template <int> int f( {  } );\n"
+                  "int foo = f<1>(0);\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1322,17 +1327,17 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template52() { // #6437
-        const char code[] = "template <int value> int sum() { "
-                            "  return value + sum<value/2>(); "
-                            "} "
-                            "template<int x, int y> int calculate_value() { "
-                            "  if (x != y) { "
-                            "    return sum<x - y>(); "
-                            "  } else { "
-                            "    return 0; "
-                            "  } "
-                            "} "
-                            "int value = calculate_value<1,1>();";
+        const char code[] = "template <int value> int sum() {\n"
+                            "  return value + sum<value/2>();\n"
+                            "}\n"
+                            "template<int x, int y> int calculate_value() {\n"
+                            "  if (x != y) {\n"
+                            "    return sum<x - y>();\n"
+                            "  } else {\n"
+                            "    return 0;\n"
+                            "  }\n"
+                            "}\n"
+                            "int value = calculate_value<1,1>();\n";
         const char expected[] = "int sum<0> ( ) ; "
                                 "int calculate_value<1,1> ( ) ; "
                                 "int value ; value = calculate_value<1,1> ( ) ; "
@@ -1350,13 +1355,13 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template53() { // #4335
-        const char code[] = "template<int N> struct Factorial { "
-                            "  enum { value = N * Factorial<N - 1>::value }; "
-                            "};"
-                            "template <> struct Factorial<0> { "
-                            "  enum { value = 1 }; "
-                            "};"
-                            "const int x = Factorial<4>::value;";
+        const char code[] = "template<int N> struct Factorial {\n"
+                            "  enum { value = N * Factorial<N - 1>::value };\n"
+                            "};\n"
+                            "template <> struct Factorial<0> {\n"
+                            "  enum { value = 1 };\n"
+                            "};\n"
+                            "const int x = Factorial<4>::value;\n";
         const char expected[] = "struct Factorial<0> ; "
                                 "struct Factorial<4> ; "
                                 "struct Factorial<3> ; "
@@ -1383,12 +1388,12 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template54() { // #6587 (use-after-free)
-        (void)tok("template<typename _Tp> _Tp* fn(); "
-                  "template <class T> struct A { "
-                  "  template <class U, class S = decltype(fn<T>())> "
-                  "  struct B { }; "
-                  "}; "
-                  "A<int> a;");
+        (void)tok("template<typename _Tp> _Tp* fn();\n"
+                  "template <class T> struct A {\n"
+                  "  template <class U, class S = decltype(fn<T>())>\n"
+                  "  struct B { };\n"
+                  "};\n"
+                  "A<int> a;\n");
     }
 
     void template55() { // #6604
@@ -1402,7 +1407,7 @@ class TestSimplifyTemplate : public TestFixture {
                 "{\n"
                 "    friend struct ConstCastHelper<AtSmartPtr<const T>, T>;\n"
                 "    AtSmartPtr(const AtSmartPtr<T>& r);\n"
-                "};"));
+                "};\n"));
 
         // Similar problem can also happen with ...
         ASSERT_EQUALS(
@@ -1422,16 +1427,16 @@ class TestSimplifyTemplate : public TestFixture {
                 "        (A<T...>*)(p);\n"
                 "    }\n"
                 "};\n"
-                "A<int> a(0);"));
+                "A<int> a(0);\n"));
     }
 
     void template56() { // #7117
-        const char code[] = "template<bool B> struct Foo { "
-                            "  std::array<int, B ? 1 : 2> mfoo; "
-                            "}; "
-                            "void foo() { "
-                            "  Foo<true> myFoo; "
-                            "}";
+        const char code[] = "template<bool B> struct Foo {\n"
+                            "  std::array<int, B ? 1 : 2> mfoo;\n"
+                            "};\n"
+                            "void foo() {\n"
+                            "  Foo<true> myFoo;\n"
+                            "}\n";
         const char expected[] = "struct Foo<true> ; "
                                 "void foo ( ) { "
                                 "Foo<true> myFoo ; "
@@ -1444,7 +1449,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template57() { // #7891
         const char code[] = "template<class T> struct Test { Test(T); };\n"
-                            "Test<unsigned long> test( 0 );";
+                            "Test<unsigned long> test( 0 );\n";
         const char exp[] = "struct Test<unsignedlong> ; "
                            "Test<unsignedlong> test ( 0 ) ; "
                            "struct Test<unsignedlong> { Test<unsignedlong> ( unsigned long ) ; } ;";
@@ -1458,7 +1463,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "void foo() {\n"
                             "  TestArithmetic<int>();\n"
-                            "}";
+                            "}\n";
         const char exp[] = "void TestArithmetic<int> ( ) ; "
                            "void foo ( ) {"
                            " TestArithmetic<int> ( ) ; "
@@ -1484,7 +1489,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "int main () {\n"
                             "    return diagonalGroupTest<4>();\n"
-                            "}";
+                            "}\n";
         const char exp[] = "struct Factorial<0> ; "
                            "struct Factorial<4> ; "
                            "struct Factorial<3> ; "
@@ -1506,7 +1511,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename T> void f() {}\n"
                             "template <typename T> void h() { f<typename S<T>::type(0)>(); }\n"
                             "\n"
-                            "void j() { h<int>(); }";
+                            "void j() { h<int>(); }\n";
         const char exp[] = "struct S<int> ; "
                            "void f<S<int>::type(0)> ( ) ; "
                            "void h<int> ( ) ; "
@@ -1529,7 +1534,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "  void f1(Bar<T> x) {}\n"
                             "  Foo<Bar<T>> f2() { }\n"
                             "};\n"
-                            "Bar<int> c;";
+                            "Bar<int> c;\n";
         const char exp[] = "struct Foo<Bar<int>> ; "
                            "struct Bar<int> ; "
                            "Bar<int> c ; "
@@ -1546,7 +1551,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <class T> void f() { x = y ? C1<int>::allocate(1) : 0; }\n"
                             "template <class T, unsigned S> class C3 {};\n"
                             "template <class T, unsigned S> C3<T, S>::C3(const C3<T, S> &v) { C1<T *> c1; }\n"
-                            "C3<int,6> c3;";
+                            "C3<int,6> c3;\n";
         const char exp[] = "struct C1<int*> ; "
                            "template < class T > void f ( ) { x = y ? ( C1 < int > :: allocate ( 1 ) ) : 0 ; } "
                            "class C3<int,6> ; "
@@ -1558,8 +1563,8 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template63() { // #8576
-        const char code[] = "template<class T> struct TestClass { T m_hi; };"
-                            "TestClass<std::auto_ptr<v>> objTest3;";
+        const char code[] = "template<class T> struct TestClass { T m_hi; };\n"
+                            "TestClass<std::auto_ptr<v>> objTest3;\n";
         const char exp[] = "struct TestClass<std::auto_ptr<v>> ; "
                            "TestClass<std::auto_ptr<v>> objTest3 ; "
                            "struct TestClass<std::auto_ptr<v>> { std :: auto_ptr < v > m_hi ; } ;";
@@ -1580,7 +1585,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    t_func<0>();\n"
                             "    t_func<1>();\n"
                             "}\n"
-                            "};";
+                            "};\n";
         const char exp[] = "bool foo<int> ( ) ; "
                            "struct A { "
                            "void t_func<0> ( ) ; "
@@ -1618,7 +1623,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "int main() {\n"
                             "  AssociationDAGlobalGraphObserver<string,unsigned int> grObs;\n"
                             " return 1;\n"
-                            "}";
+                            "}\n";
         const char exp[] = "namespace bpp "
                            "{ "
                            "class AssociationDAGraphImplObserver<string,unsignedint,DAGlobalGraph> ; "
@@ -1638,7 +1643,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    const int ** foo();\n"
                             "};\n"
                             "template <class T> const int ** Fred<T>::foo() { return nullptr; }\n"
-                            "Fred<int> fred;";
+                            "Fred<int> fred;\n";
         const char exp[] = "struct Fred<int> ; "
                            "Fred<int> fred ; "
                            "struct Fred<int> { "
@@ -1661,7 +1666,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <class T> Container<T>::Container(const Container & x) { nElements = x.nElements; c = x.c; }\n"
                             "template <class T> Container<T> & Container<T>::operator = (const Container & x) { mElements = x.mElements; c = x.c; return *this; }\n"
                             "template <class T> Container<T>::~Container() {}\n"
-                            "Container<int> intContainer;";
+                            "Container<int> intContainer;\n";
 
         const char expected[] = "struct Container<int> ; "
                                 "Container<int> intContainer ; "
@@ -1686,7 +1691,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    char dummy[sizeof(T)];\n"
                             "    T value;\n"
                             "};\n"
-                            "Fred<int> fred;";
+                            "Fred<int> fred;\n";
         const char exp[] = "union Fred<int> ; "
                            "Fred<int> fred ; "
                            "union Fred<int> { "
@@ -1701,7 +1706,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    int test;\n"
                             "    template <class T> T lookup() { return test; }\n"
                             "    int Fun() { return lookup<int>(); }\n"
-                            "};";
+                            "};\n";
         const char exp[] = "class Test { "
                            "int test ; "
                            "int lookup<int> ( ) ; "
@@ -1719,7 +1724,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template<typename K, typename V, int KeySize>\n"
                             "class Bar : private Bar<void, void> {\n"
                             "   void foo() { }\n"
-                            "};";
+                            "};\n";
         const char exp[] = "template < typename T , typename V , int KeySize = 0 > class Bar ; "
                            "class Bar<void,void> ; "
                            "class Bar<void,void> { "
@@ -1751,7 +1756,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    return f1(pInterface, interface_type::static_type());\n"
                             "}\n"
                             "\n"
-                            "Reference< class XPropertyList > dostuff();";
+                            "Reference< class XPropertyList > dostuff();\n";
         const char exp[] = "int f1 ( int * pInterface , int x ) { return 0 ; } "
                            "class Reference<XPropertyList> ; "
                            "Reference<XPropertyList> dostuff ( ) ; "
@@ -1764,7 +1769,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <typename N, typename P> class Tokenizer;\n"
                             "const Tokenizer<Node, Path> *tokenizer() const;\n"
                             "template <typename N, typename P>\n"
-                            "Tokenizer<N, P>::Tokenizer() { }";
+                            "Tokenizer<N, P>::Tokenizer() { }\n";
         const char exp[] = "template < typename N , typename P > class Tokenizer ; "
                            "const Tokenizer < Node , Path > * tokenizer ( ) const ; "
                            "template < typename N , typename P > "
@@ -1776,7 +1781,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template<typename T>\n"
                             "void keep_range(T& value, const T mini, const T maxi){}\n"
                             "template void keep_range<float>(float& v, const float l, const float u);\n"
-                            "template void keep_range<int>(int& v, const int l, const int u);";
+                            "template void keep_range<int>(int& v, const int l, const int u);\n";
         const char exp[] = "void keep_range<float> ( float & value , const float mini , const float maxi ) ; "
                            "void keep_range<int> ( int & value , const int mini , const int maxi ) ; "
                            "void keep_range<float> ( float & value , const float mini , const float maxi ) { } "
@@ -1789,7 +1794,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "class PushBackStreamBuf {\n"
                             "public:\n"
                             "    void pushBack(const BTlist<int> &vec);\n"
-                            "};";
+                            "};\n";
         const char exp[] = "class BTlist<int> ; "
                            "class PushBackStreamBuf { "
                            "public: "
@@ -1802,7 +1807,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template75() {
         const char code[] = "template<typename T>\n"
                             "T foo(T& value){ return value; }\n"
-                            "template std::vector<std::vector<int>> foo<std::vector<std::vector<int>>>(std::vector<std::vector<int>>& v);";
+                            "template std::vector<std::vector<int>> foo<std::vector<std::vector<int>>>(std::vector<std::vector<int>>& v);\n";
         const char exp[] = "std :: vector < std :: vector < int > > foo<std::vector<std::vector<int>>> ( std :: vector < std :: vector < int > > & value ) ; "
                            "std :: vector < std :: vector < int > > foo<std::vector<std::vector<int>>> ( std :: vector < std :: vector < int > > & value ) { return value ; }";
         ASSERT_EQUALS(exp, tok(code));
@@ -1832,7 +1837,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "int main() {\n"
                             "    std::cout << is_void<char>::value << std::endl;\n"
                             "    std::cout << is_void<void>::value << std::endl;\n"
-                            "}";
+                            "}\n";
         const char exp[] = "struct is_void<void> ; "
                            "struct is_void<char> ; "
                            "struct is_void<void> : std :: true_type { } ; "
@@ -1847,7 +1852,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template78() {
         const char code[] = "template <typename>\n"
                             "struct Base { };\n"
-                            "struct S : Base <void>::Type { };";
+                            "struct S : Base <void>::Type { };\n";
         const char exp[] = "struct Base<void> ; "
                            "struct S : Base<void> :: Type { } ; "
                            "struct Base<void> { } ;";
@@ -1865,7 +1870,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "void some_func() {\n"
                             "    Foo x;\n"
                             "    x.foo<int>();\n"
-                            "}";
+                            "}\n";
         const char exp[] = "class Foo { "
                            "public: "
                            "void foo<int> ( ) ; "
@@ -1886,7 +1891,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "class Fred {\n"
                             "    template <typename T> T foo(T t) const { return t; }\n"
                             "};\n"
-                            "const void * p = Fred::foo<const void *>(nullptr);";
+                            "const void * p = Fred::foo<const void *>(nullptr);\n";
         const char exp[] = "class Fred { "
                            "const void * foo<constvoid*> ( const void * t ) const ; "
                            "} ; "
@@ -1904,7 +1909,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "SortWith<Type>::SortWith(Type) {}\n"
                             "int main() {\n"
                             "    SortWith<int>(0);\n"
-                            "}";
+                            "}\n";
         const char exp[] = "template < typename Type > "
                            "struct SortWith { "
                            "SortWith ( Type ) ; "
@@ -1934,7 +1939,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "  swizzle<1>(tt2);\n"
                             "  tvec3<f16> tt3;\n"
                             "  swizzle<2,3>(tt3);\n"
-                            "}";
+                            "}\n";
         const char exp[] = "const int f16 = 16 ; "
                            "class tvec2<f16> ; "
                            "class tvec3<f16> ; "
@@ -1965,7 +1970,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "MultiConsumer<Task>::MultiConsumer() : sizeBuffer(0) {}\n"
                             "MultiReads::MultiReads() {\n"
                             "    mc = new MultiConsumer<reads_packet>();\n"
-                            "}";
+                            "}\n";
         const char exp[] = "template < typename Task > " // TODO: this should be expanded
                            "class MultiConsumer { "
                            "MultiConsumer ( ) ; "
@@ -1983,7 +1988,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "template <class b, int c, class>\n"
                                 "auto d() -> typename a<decltype(b{})>::e {\n"
                                 "  d<int, c, int>();\n"
-                                "}";
+                                "}\n";
             const char exp[] = "template < class b , int c , class > "
                                "auto d ( ) . a < decltype ( b { } ) > :: e { "
                                "d < int , c , int > ( ) ; "
@@ -1994,8 +1999,8 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "template <class b, int c, class>\n"
                                 "auto d() -> typename a<decltype(b{})>::e {\n"
                                 "  d<int, c, int>();\n"
-                                "}"
-                                "void foo() { d<char, 1, int>(); }";
+                                "}\n"
+                                "void foo() { d<char, 1, int>(); }\n";
             const char exp[] = "auto d<char,1,int> ( ) . a < char > :: e ; "
                                "auto d<int,1,int> ( ) . a < int > :: e ; "
                                "void foo ( ) { d<char,1,int> ( ) ; } "
@@ -2019,7 +2024,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "extern template void C<int>::foo<int, nullptr>();\n"
                             "template<typename T>\n"
                             "template<typename U, typename std::enable_if<(!std::is_fundamental<U>::value)>::type>\n"
-                            "void C<T>::foo() {}";
+                            "void C<T>::foo() {}\n";
         // @todo the output is very wrong but we are only worried about the crash for now
         (void)tok(code);
     }
@@ -2035,7 +2040,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename T>\n"
                             "S<T> U<T>::u;\n"
                             "template S<int> U<int>::u;\n"
-                            "S<int> &i = U<int>::u;";
+                            "S<int> &i = U<int>::u;\n";
         (void)tok(code);
     }
 
@@ -2043,7 +2048,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template<typename T>\n"
                             "T f1(T t) { return t; }\n"
                             "template const char * f1<const char *>(const char *);\n"
-                            "template const char & f1<const char &>(const char &);";
+                            "template const char & f1<const char &>(const char &);\n";
         const char exp[] = "const char * f1<constchar*> ( const char * t ) ; "
                            "const char & f1<constchar&> ( const char & t ) ; "
                            "const char * f1<constchar*> ( const char * t ) { return t ; } "
@@ -2070,7 +2075,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "int main() {\n"
                             "    CTest::Greeting<bool>(true);\n"
                             "    return 0;\n"
-                            "}";
+                            "}\n";
         const char exp[] = "class CTest { "
                            "public: "
                            "static void Greeting<bool> ( bool ) ; "
@@ -2100,7 +2105,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template void Fred::foo<char>();\n"
                             "template void Fred::foo<float>();\n"
                             "template <> void Fred::foo<bool>() { }\n"
-                            "template <> void Fred::foo<int>() { }";
+                            "template <> void Fred::foo<int>() { }\n";
         const char exp[] = "struct Fred { "
                            "static void foo<int> ( ) ; "
                            "static void foo<bool> ( ) ; "
@@ -2118,7 +2123,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <typename T> struct S1 {};\n"
                             "void f(S1<double>) {}\n"
                             "template <typename T>\n"
-                            "decltype(S1<T>().~S1<T>()) fun1() {};";
+                            "decltype(S1<T>().~S1<T>()) fun1() {};\n";
         const char exp[] = "struct S1<double> ; "
                            "void f ( S1<double> ) { } "
                            "template < typename T > "
@@ -2133,7 +2138,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "template<> char foo<char>(char a) { return a; }\n"
                                 "template<> int foo<int>(int a) { return a; }\n"
                                 "template float foo<float>(float);\n"
-                                "template double foo<double>(double);";
+                                "template double foo<double>(double);\n";
             const char exp[] = "int foo<int> ( int a ) ; "
                                "char foo<char> ( char a ) ; "
                                "float foo<float> ( float t ) ; "
@@ -2151,7 +2156,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "    template<> int foo<int>(int a) { return a; }\n"
                                 "};\n"
                                 "template float Fred::foo<float>(float);\n"
-                                "template double Fred::foo<double>(double);";
+                                "template double Fred::foo<double>(double);\n";
             const char exp[] = "struct Fred { "
                                "int foo<int> ( int a ) ; "
                                "char foo<char> ( char a ) ; "
@@ -2176,7 +2181,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "    template float NS2::foo<float>(float);\n"
                                 "    template bool NS1::NS2::foo<bool>(bool);\n"
                                 "}\n"
-                                "template double NS1::NS2::foo<double>(double);";
+                                "template double NS1::NS2::foo<double>(double);\n";
             const char exp[] = "namespace NS1 { "
                                "namespace NS2 { "
                                "int foo<int> ( int a ) ; "
@@ -2209,7 +2214,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "    template float NS::foo<float>(float);\n"
                                 "    template bool NS1::NS::foo<bool>(bool);\n"
                                 "}\n"
-                                "template double NS1::NS::foo<double>(double);";
+                                "template double NS1::NS::foo<double>(double);\n";
             const char exp[] = "namespace NS1 { "
                                "namespace NS { "
                                "int foo<int> ( int a ) ; "
@@ -2240,7 +2245,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    foo<int>(2);\n"
                             "    foo<double>(3.14);\n"
                             "    foo<float>(3.14f);\n"
-                            "}";
+                            "}\n";
         const char exp[] = "void foo<double> ( const double & d ) ; "
                            "void foo<float> ( const float & t ) ; "
                            "void foo<int> ( const int & t ) ; "
@@ -2269,7 +2274,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "void Vector2<Type>::process() {\n"
                             "    ForEach<iterator>();\n"
                             "}\n"
-                            "Vector2<string> c;";
+                            "Vector2<string> c;\n";
         const char exp[] = "void ForEach<iterator> ( ) ; "
                            "class Vector2<string> ; "
                            "Vector2<string> c ; "
@@ -2299,7 +2304,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "Array<T> matmul() {\n"
                             "    return foo<T>( );\n"
                             "}\n"
-                            "template Array<std::complex<float>> matmul<std::complex<float>>();";
+                            "template Array<std::complex<float>> matmul<std::complex<float>>();\n";
         const char exp[] = "class Array<double> ; "
                            "class Array<std::complex<float>> ; "
                            "class Array<float> ; "
@@ -2327,7 +2332,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template<>\n"
                             "int Value<int> = 456;\n"
                             "float f = Value<float>;\n"
-                            "int i = Value<int>;";
+                            "int i = Value<int>;\n";
         const char exp[] = "float Value<float> ; Value<float> = 123 ; "
                            "int Value<int> ; Value<int> = 456 ; "
                            "float f ; f = Value<float> ; "
@@ -2346,7 +2351,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "long f0 = fib<0>;\n"
                                 "long f1 = fib<1>;\n"
                                 "long f2 = fib<2>;\n"
-                                "long f3 = fib<3>;";
+                                "long f3 = fib<3>;\n";
             const char exp[] = "constexpr long fib<2> = fib<1> + fib<0> ; "
                                "constexpr long fib<3> = fib<2> + fib<1> ; "
                                "constexpr long fib<0> = 0 ; "
@@ -2406,7 +2411,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "using namespace NS1::NS2::NS3::NS4;\n"
                             "Fred<bool> fred_bool1;\n"
-                            "NS1::NS2::NS3::NS4::Fred<int> fred_int1;";
+                            "NS1::NS2::NS3::NS4::Fred<int> fred_int1;\n";
         const char exp[] = "namespace NS1 { "
                            "namespace NS2 { "
                            "namespace NS3 { "
@@ -2484,7 +2489,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    unique_ptr_with_deleter<A> tmp(new A(), [](A* a) {\n"
                             "        delete a;\n"
                             "    });\n"
-                            "}";
+                            "}\n";
         const char exp[] = "class A { } ; "
                            "static void func ( ) { "
                            "std :: unique_ptr < A , std :: function < void ( A * ) > > tmp ( new A ( ) , [ ] ( A * a ) { "
@@ -2532,7 +2537,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    using ArrayType = std::vector<int>;\n"
                             "    void func(typename ArrayType::size_type i) {\n"
                             "    }\n"
-                            "};";
+                            "};\n";
 
         const char exp[] = "class A { "
                            "public: "
@@ -2553,7 +2558,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "void f() {\n"
                             "    if(std::is_floating_point<float>::value) {}\n"
-                            "}";
+                            "}\n";
         const char exp[] = "namespace ns { "
                            "template < class T > "
                            "struct is_floating_point "
@@ -2578,7 +2583,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    return t;\n"
                             "  }\n"
                             "}\n"
-                            "sample::Sample<int> s1;";
+                            "sample::Sample<int> s1;\n";
         const char exp[] = "namespace sample { "
                            "class Sample<int> ; "
                            "} "
@@ -2604,7 +2609,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    BOOST_HANA_CONSTANT_CHECK ( hana :: equal (\n"
                             "        hana :: at_key ( hana :: make_map ( p < 0 , 0 > ( ) ) , key < 0 > ( ) ) ,\n"
                             "        val < 0 > ( ) ) ) ;\n"
-                            "}";
+                            "}\n";
         const char exp[] = "auto key<0> ( ) ; "
                            "auto val<0> ( ) ; "
                            "auto p<0,0> ( ) ; "
@@ -2624,7 +2629,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <template <typename> class TOUT>\n"
                             "class ObjectCache { };\n"
                             "template <typename T> class Fred {};\n"
-                            "ObjectCache<Fred> _cache;";
+                            "ObjectCache<Fred> _cache;\n";
         const char exp[] = "class ObjectCache<Fred> ; "
                            "template < typename T > class Fred { } ; "
                            "ObjectCache<Fred> _cache ; class ObjectCache<Fred> { } ;";
@@ -2639,7 +2644,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template<template<class T, class U> class V> class B {\n"
                             "   V<char, char> i;\n"
                             "};\n"
-                            "B<A> c;";
+                            "B<A> c;\n";
         const char exp[] = "class A<char,char> ; "
                            "class B<A> ; "
                            "B<A> c ; "
@@ -2665,7 +2670,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "};\n"
                             "void foo() {\n"
                             "  f<C3, long>();\n"
-                            "}";
+                            "}\n";
         const char exp[] = "void f<C3,long> ( ) ; "
                            "struct C3 { "
                            "class T3<long> ; "
@@ -2716,7 +2721,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "  bool h = f::h;\n"
                                 "};\n"
                                 "template <typename i> using j = typename e<i>::g;\n"
-                                "}";
+                                "}\n";
             const char exp[] = "namespace { "
                                "template < typename > struct a ; "
                                "template < typename > struct b { } ; "
@@ -2744,7 +2749,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "};\n"
                                 "template <typename i> using j = typename e<i>::g;\n"
                                 "}\n"
-                                "j<int> foo;";
+                                "j<int> foo;\n";
             const char exp[] = "namespace { "
                                "template < typename > struct a ; "
                                "struct b<c<int>::g> ; "
@@ -2830,7 +2835,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template<typename T> using A<T*> = char;\n"
                             "template<> using A<char> = char;\n"
                             "template using A<char> = char;\n"
-                            "using A<char> = char;";
+                            "using A<char> = char;\n";
         const char exp[] = "template < typename T > using A = int ; "
                            "template < typename T > using A < T * > = char ; "
                            "template < > using A < char > = char ; "
@@ -2841,7 +2846,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template111() { // crash
         const char code[] = "template<typename T, typename U> struct pair;\n"
-                            "template<typename T> using cell = pair<T*, cell<T>*>;";
+                            "template<typename T> using cell = pair<T*, cell<T>*>;\n";
         const char exp[] = "template < typename T , typename U > struct pair ; "
                            "template < typename T > using cell = pair < T * , cell < T > * > ;";
         ASSERT_EQUALS(exp, tok(code));
@@ -2851,7 +2856,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <int> struct a;\n"
                             "template <class, class b> using c = typename a<int{b::d}>::e;\n"
                             "template <class> struct f;\n"
-                            "template <class b> using g = typename f<c<int, b>>::e;";
+                            "template <class b> using g = typename f<c<int, b>>::e;\n";
         const char exp[] = "template < int > struct a ; "
                            "template < class , class b > using c = typename a < int { b :: d } > :: e ; "
                            "template < class > struct f ; "
@@ -2862,7 +2867,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template113() {
         {
             const char code[] = "template <class> class A { void f(); };\n"
-                                "A<int> a;";
+                                "A<int> a;\n";
             const char exp[] = "class A<int> ; "
                                "A<int> a ; "
                                "class A<int> { void f ( ) ; } ;";
@@ -2870,7 +2875,7 @@ class TestSimplifyTemplate : public TestFixture {
         }
         {
             const char code[] = "template <struct> struct A { void f(); };\n"
-                                "A<int> a;";
+                                "A<int> a;\n";
             const char exp[] = "struct A<int> ; "
                                "A<int> a ; "
                                "struct A<int> { void f ( ) ; } ;";
@@ -2884,7 +2889,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "template <typename> struct c;\n"
                                 "template <typename> struct d : b<bool, std::is_polymorphic<int>{}> {};\n"
                                 "template <bool> struct e;\n"
-                                "template <typename a> using f = typename e<c<d<a>>::g>::h;";
+                                "template <typename a> using f = typename e<c<d<a>>::g>::h;\n";
             const char exp[] =  "template < typename a , a > struct b { } ; "
                                "template < typename > struct c ; "
                                "template < typename > struct d : b < bool , std :: is_polymorphic < int > { } > { } ; "
@@ -2916,7 +2921,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    }\n"
                             "    template <class c> using g = b::f<e<int, c>>;\n"
                             "}\n"
-                            "g<int> g1;";
+                            "g<int> g1;\n";
         const char exp[] = "namespace { "
                            "namespace b { "
                            "struct B<0> ; "
@@ -2933,7 +2938,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template116() { // #9178
         {
             const char code[] = "template <class, class a> auto b() -> decltype(a{}.template b<void(int, int)>);\n"
-                                "template <class, class a> auto b() -> decltype(a{}.template b<void(int, int)>){}";
+                                "template <class, class a> auto b() -> decltype(a{}.template b<void(int, int)>){}\n";
             const char exp[] = "template < class , class a > auto b ( ) . decltype ( a { } . template b < void ( int , int ) > ) ; "
                                "template < class , class a > auto b ( ) . decltype ( a { } . template b < void ( int , int ) > ) { }";
             ASSERT_EQUALS(exp, tok(code));
@@ -2944,7 +2949,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "struct c {\n"
                                 "  template <class> void b();\n"
                                 "};\n"
-                                "void d() { b<c, c>(); }";
+                                "void d() { b<c, c>(); }\n";
             const char exp[] = "auto b<c,c> ( ) . decltype ( c { } . template b < void ( int , int ) > ( ) ) ; "
                                "struct c { "
                                "template < class > void b ( ) ; "
@@ -2957,7 +2962,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template117() {
         const char code[] = "template<typename T = void> struct X {};\n"
-                            "X<X<>> x;";
+                            "X<X<>> x;\n";
         const char exp[] = "struct X<void> ; "
                            "struct X<X<void>> ; "
                            "X<X<void>> x ; "
@@ -2968,7 +2973,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template118() {
         const char code[] = "template<int> struct S { void f(int i); };\n"
-                            "S<1> s;";
+                            "S<1> s;\n";
         const char exp[] = "struct S<1> ; "
                            "S<1> s ; struct S<1> { "
                            "void f ( int i ) ; "
@@ -2983,7 +2988,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "template <typename T>\n"
                                 "constexpr auto funcBraced = [](auto x){ return T{x};};\n"
                                 "double f(int x) { return func<double>(x); }\n"
-                                "double fBraced(int x) { return funcBraced<int>(x); }";
+                                "double fBraced(int x) { return funcBraced<int>(x); }\n";
             const char exp[] = "constexpr auto func<double> = [ ] ( auto x ) { return double ( x ) ; } ; "
                                "constexpr auto funcBraced<int> = [ ] ( auto x ) { return int { x } ; } ; "
                                "double f ( int x ) { return func<double> ( x ) ; } "
@@ -2996,7 +3001,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "void foo() {\n"
                                 "    func<int>(x);\n"
                                 "    func<double>(x);\n"
-                                "}";
+                                "}\n";
             const char exp[] = "constexpr auto func<int> = [ ] ( auto x ) { return int ( x ) ; } ; "
                                "constexpr auto func<double> = [ ] ( auto x ) { return double ( x ) ; } ; "
                                "void foo ( ) { "
@@ -3020,7 +3025,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    template<typename This>\n"
                             "    struct result<This()> : lambda_context<tuple<> > {};\n"
                             "};\n"
-                            "lambda<int> l;";
+                            "lambda<int> l;\n";
         const char exp[] = "template < typename Tuple > "
                            "struct lambda_context { "
                            "template < typename Sig > struct result ; "
@@ -3039,7 +3044,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template121() { // #9193
         const char code[] = "template <class VALUE_T, class LIST_T = std::list<VALUE_T>>\n"
                             "class TestList { };\n"
-                            "TestList<std::shared_ptr<int>> m_test;";
+                            "TestList<std::shared_ptr<int>> m_test;\n";
         const char exp[] = "class TestList<std::shared_ptr<int>,std::list<std::shared_ptr<int>>> ; "
                            "TestList<std::shared_ptr<int>,std::list<std::shared_ptr<int>>> m_test ; "
                            "class TestList<std::shared_ptr<int>,std::list<std::shared_ptr<int>>> { } ;";
@@ -3053,7 +3058,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <template <class> class c, class... f, template <class...> class d>\n"
                             "struct b<c<f...>, d<>>;\n"
                             "}\n"
-                            "void e() { using c = a<>; }";
+                            "void e() { using c = a<>; }\n";
         const char exp[] = "template < class ... > struct a ; "
                            "namespace { "
                            "template < class , class > struct b ; "
@@ -3075,7 +3080,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "void fn1() {\n"
                             "  using c = a<>;\n"
                             "  using e = a<>;\n"
-                            "}";
+                            "}\n";
         const char exp[] = "template < class ... > struct a ; "
                            "namespace { "
                            "template < class , class , class , class > "
@@ -3094,7 +3099,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename> struct e;\n"
                             "template <typename> struct h {\n"
                             "  template <typename... f, c<h<e<typename f::d...>>::g>> void i();\n"
-                            "};";
+                            "};\n";
         const char exp[] = "template < bool > struct a ; "
                            "template < bool b > using c = typename a < b > :: d ; "
                            "template < typename > struct e ; "
@@ -3112,12 +3117,12 @@ class TestSimplifyTemplate : public TestFixture {
                                   "};\n"
                                   "int main() {\n"
                                   "  GCD< 1, 0 >::val;\n"
-                                  "}"), INSTANTIATION);
+                                  "}\n"), INSTANTIATION);
     }
 
     void template126() { // #9217
         const char code[] = "template <typename b> using d = a<b>;\n"
-                            "static_assert(i<d<l<b>>>{}, \"\");";
+                            "static_assert(i<d<l<b>>>{}, \"\");\n";
         const char exp[] = "static_assert ( i < a < l < b > > > { } , \"\" ) ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -3130,7 +3135,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "a<int> c;\n"
                                 "template <typename d>\n"
                                 "template <typename b>\n"
-                                "constexpr decltype(auto) a<d>::operator()(b &&) const {}";
+                                "constexpr decltype(auto) a<d>::operator()(b &&) const {}\n";
             const char exp[] = "struct a<int> ; "
                                "a<int> c ; "
                                "template < typename d > "
@@ -3158,7 +3163,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "template <typename d>\n"
                                 "template <typename b>\n"
                                 "void a<d>::foo() {}\n"
-                                "void bar() { a<int>::foo<char>(); }";
+                                "void bar() { a<int>::foo<char>(); }\n";
             const char exp[] = "struct a<int> ; "
                                "a<int> c ; "
                                "template < typename d > "
@@ -3189,7 +3194,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "template <typename d>\n"
                                 "template <typename b>\n"
                                 "void a<d>::foo() {}\n"
-                                "void bar() { a<int>::foo<char>(); }";
+                                "void bar() { a<int>::foo<char>(); }\n";
             const char exp[] = "struct a<int> ; "
                                "template < typename d > "
                                "template < typename b > "
@@ -3215,7 +3220,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template128() { // #9224
         const char code[] = "template <typename> struct a { };\n"
                             "template <typename j> void h() { k.h<a<j>>; }\n"
-                            "void foo() { h<int>(); }";
+                            "void foo() { h<int>(); }\n";
         const char exp[] = "struct a<int> ; "
                            "void h<int> ( ) ; "
                            "void foo ( ) { h<int> ( ) ; } "
@@ -3232,7 +3237,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "};\n"
                             "void setupLuaBindingsDNSQuestion() {\n"
                             "  g_lua.registerFunction<void (DNSQuestion ::*)(std ::string, std ::string)>();\n"
-                            "}";
+                            "}\n";
         const char exp[] = "class LuaContext { "
                            "public: "
                            "template < typename TFunctionType , typename TType > "
@@ -3249,7 +3254,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename, typename> using b = a<>;\n"
                             "template <typename, typename> void c();\n"
                             "template <typename d, typename> void e() { c<b<d, int>, int>; }\n"
-                            "void f() { e<int(int, ...), int>(); }";
+                            "void f() { e<int(int, ...), int>(); }\n";
         const char exp[] = "template < typename , typename > void c ( ) ; "
                            "void e<int(int,...),int> ( ) ; "
                            "void f ( ) { e<int(int,...),int> ( ) ; } "
@@ -3260,7 +3265,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template131() { // #9249
         {
             const char code[] = "template <long a, bool = 0 == a> struct b {};\n"
-                                "b<1> b1;";
+                                "b<1> b1;\n";
             const char exp[] = "struct b<1,false> ; "
                                "b<1,false> b1 ; "
                                "struct b<1,false> { } ;";
@@ -3268,7 +3273,7 @@ class TestSimplifyTemplate : public TestFixture {
         }
         {
             const char code[] = "template <long a, bool = 0 != a> struct b {};\n"
-                                "b<1> b1;";
+                                "b<1> b1;\n";
             const char exp[] = "struct b<1,true> ; "
                                "b<1,true> b1 ; "
                                "struct b<1,true> { } ;";
@@ -3276,7 +3281,7 @@ class TestSimplifyTemplate : public TestFixture {
         }
         {
             const char code[] = "template <long a, bool = a < 0> struct b {};\n"
-                                "b<1> b1;";
+                                "b<1> b1;\n";
             const char exp[] = "struct b<1,false> ; "
                                "b<1,false> b1 ; "
                                "struct b<1,false> { } ;";
@@ -3284,7 +3289,7 @@ class TestSimplifyTemplate : public TestFixture {
         }
         {
             const char code[] = "template <long a, bool = 0 < a> struct b {};\n"
-                                "b<1> b1;";
+                                "b<1> b1;\n";
             const char exp[] = "struct b<1,true> ; "
                                "b<1,true> b1 ; "
                                "struct b<1,true> { } ;";
@@ -3292,7 +3297,7 @@ class TestSimplifyTemplate : public TestFixture {
         }
         {
             const char code[] = "template <long a, bool = 0 <= a> struct b {};\n"
-                                "b<1> b1;";
+                                "b<1> b1;\n";
             const char exp[] = "struct b<1,true> ; "
                                "b<1,true> b1 ; "
                                "struct b<1,true> { } ;";
@@ -3300,7 +3305,7 @@ class TestSimplifyTemplate : public TestFixture {
         }
         {
             const char code[] = "template <long a, bool = a >= 0> struct b {};\n"
-                                "b<1> b1;";
+                                "b<1> b1;\n";
             const char exp[] = "struct b<1,true> ; "
                                "b<1,true> b1 ; "
                                "struct b<1,true> { } ;";
@@ -3319,7 +3324,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "int f1() {\n"
                             "  return foo<TrueFalse>();\n"
-                            "}";
+                            "}\n";
         const char exp[] = "struct TrueFalse { "
                            "static constexpr bool v ( ) { return true ; } "
                            "} ; "
@@ -3344,7 +3349,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "bar<short> bs;\n"
                             "bar<std::array<int,4>> ba;\n"
                             "bar<short> b1 = bar<short>::foo<std::array<int,4>>(ba);\n"
-                            "bar<std::array<int,4>> b2 = bar<std::array<int,4>>::foo<short>(bs);";
+                            "bar<std::array<int,4>> b2 = bar<std::array<int,4>>::foo<short>(bs);\n";
         const char act[] = "struct bar<short> ; struct bar<std::array<int,4>> ; "
                            "bar<short> bs ; "
                            "bar<std::array<int,4>> ba ; "
@@ -3386,7 +3391,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <int a> class e { };\n"
                             "template <int a> class b { e<(c > a ? 1 : 0)> d; };\n"
                             "b<0> b0;\n"
-                            "b<1> b1;";
+                            "b<1> b1;\n";
         const char exp[] = "class e<(c>0)> ; class e<(c>1)> ; "
                            "class b<0> ; class b<1> ; "
                            "b<0> b0 ; "
@@ -3398,7 +3403,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template135() {
         const char code[] = "template <int> struct a { template <int b> void c(a<b>); };\n"
-                            "a<2> d;";
+                            "a<2> d;\n";
         const char exp[] = "struct a<2> ; "
                            "a<2> d ; "
                            "struct a<2> { template < int b > void c ( a < b > ) ; } ;";
@@ -3417,7 +3422,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "namespace hana = a;\n"
                             "using e = int;\n"
-                            "void l(hana::d<hana::i<e>>);";
+                            "void l(hana::d<hana::i<e>>);\n";
         const char exp[] = "namespace a { "
                            "template < typename > struct b ; "
                            "template < int > struct c ; "
@@ -3437,7 +3442,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <class, template <class> class, class> struct e;\n"
                             "template <class f, class g, class... h>\n"
                             "using i = typename e<f, g::template fn, h...>::d;\n"
-                            "template <class... j> struct k : c<sizeof...(j), int>::template fn<j...> {};";
+                            "template <class... j> struct k : c<sizeof...(j), int>::template fn<j...> {};\n";
         const char exp[] = "template < bool > struct a ; "
                            "template < bool b , class > using c = typename a < b > :: d ; "
                            "template < class , template < class > class , class > struct e ; "
@@ -3458,7 +3463,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "};\n"
                                 "int main() {\n"
                                 "  return 0;\n"
-                                "}";
+                                "}\n";
             const char exp[] = "struct inferior { "
                                "template < typename T > "
                                "bool operator() ( const T & a , const T & b ) const { "
@@ -3479,7 +3484,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "};\n"
                                 "int main() {\n"
                                 "  return 0;\n"
-                                "}";
+                                "}\n";
             const char exp[] = "struct inferior { "
                                "template < typename T > "
                                "bool operator() ( const T & a , const T & b ) const { "
@@ -3501,7 +3506,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "};\n"
                                 "int main() {\n"
                                 "  return 0;\n"
-                                "}";
+                                "}\n";
             const char exp[] = "struct inferior { "
                                "template < typename T > "
                                "bool operator() ( const T & a , const T & b ) const { "
@@ -3522,7 +3527,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "};\n"
                                 "int main() {\n"
                                 "  return 0;\n"
-                                "}";
+                                "}\n";
             const char exp[] = "struct inferior { "
                                "template < typename T > "
                                "bool operator() ( const T & a , const T & b ) const { "
@@ -3541,7 +3546,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "template<typename T>\n"
                                 "struct Foo {\n"
                                 "  template<typename> friend struct Foo;\n"
-                                "};";
+                                "};\n";
             const char exp[] = "template < typename T > "
                                "struct Foo { "
                                "template < typename > friend struct Foo ; "
@@ -3553,7 +3558,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "struct Foo {\n"
                                 "  template<typename> friend struct Foo;\n"
                                 "} ;\n"
-                                "Foo<int> foo;";
+                                "Foo<int> foo;\n";
             const char exp[] = "struct Foo<int> ; "
                                "Foo<int> foo ; "
                                "struct Foo<int> { "
@@ -3570,7 +3575,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "    d();\n"
                                 "    d(d<a<b>> e);\n"
                                 "};\n"
-                                "void foo() { d<char> c; }";
+                                "void foo() { d<char> c; }\n";
             const char exp[] = "struct a<char> ; "
                                "struct d<char> ; "
                                "void foo ( ) { d<char> c ; } "
@@ -3587,7 +3592,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "template <typename> constexpr bool e() { return false; }\n"
                                 "template <typename b> class f { f(f<c<b>>); };\n"
                                 "static_assert(!e<f<char>>());\n"
-                                "}";
+                                "}\n";
             const char exp[] = "namespace a { "
                                "constexpr bool e<f<char>> ( ) ; "
                                "class f<char> ; "
@@ -3602,7 +3607,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "struct a {\n"
                             "  int c;\n"
                             "  template <typename b> void d(b e) const { c < *e; }\n"
-                            "};";
+                            "};\n";
         const char exp[] = "struct a { "
                            "int c ; "
                            "template < typename b > void d ( b e ) const { c < * e ; } "
@@ -3615,7 +3620,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename b, typename c, typename... d> struct a<b c::*, d...> {\n"
                             "  using typename b ::e;\n"
                             "  static_assert(e::f ? sizeof...(d) : sizeof...(d), \"\");\n"
-                            "};";
+                            "};\n";
         const char exp[] = "template < typename ... > struct a ; "
                            "template < typename b , typename c , typename ... d > struct a < b c :: * , d ... > { "
                            "using e = b :: e ; "
@@ -3633,7 +3638,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "A2<bool> a2;\n"
                             "template<class T>\n"
                             "using A3 = enum B3 {b = 0};\n"
-                            "A3<int> a3;";
+                            "A3<int> a3;\n";
         const char exp[] = "template < int N > "
                            "using A1 = struct B1 { static auto constexpr value = N ; } ; "
                            "A1 < 0 > a1 ; "
@@ -3655,7 +3660,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename T>\n"
                             "struct promote <T, typename std::enable_if< std::is_integral<T>::value && sizeof(T) < sizeof(int) >::type>{\n"
                             "};\n"
-                            "}";
+                            "}\n";
         const char exp[] = "namespace a { "
                            "template < typename T , typename enable = void > "
                            "struct promote { "
@@ -3669,7 +3674,7 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template145() { // syntax error
-        const char code[] = "template<template<typename, Ts = 0> class ...Cs, Cs<Ts> ...Vs> struct B { };";
+        const char code[] = "template<template<typename, Ts = 0> class ...Cs, Cs<Ts> ...Vs> struct B { };\n";
         const char exp[] = "template < template < typename , Ts = 0 > class ... Cs , Cs < Ts > ... Vs > struct B { } ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -3679,7 +3684,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template<class T, template<class TT_T0, template<class TT_T1> class TT_TT> class TT, class U = TT<int, C> >\n"
                             "struct S {\n"
                             "  void foo(TT<T, C>);\n"
-                            "};";
+                            "};\n";
         const char exp[] = "template < class T > struct C { } ; "
                            "template < class T , template < class TT_T0 , template < class TT_T1 > class TT_TT > class TT , class U = TT < int , C > > "
                            "struct S { "
@@ -3689,7 +3694,7 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template147() { // syntax error
-        const char code[] = "template <template <typename> class C, typename X, C<X>*> struct b { };";
+        const char code[] = "template <template <typename> class C, typename X, C<X>*> struct b { };\n";
         const char exp[] = "template < template < typename > class C , typename X , C < X > * > struct b { } ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -3697,7 +3702,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template148() { // syntax error
         const char code[] = "static_assert(var<S1<11, 100>> == var<S1<199, 23>> / 2\n"
                             "  && var<S1<50, 120>> == var<S1<150, var<S1<10, 10>>>>\n"
-                            "  && var<S1<53, 23>> != 222, \"\");";
+                            "  && var<S1<53, 23>> != 222, \"\");\n";
         const char exp[] = "static_assert ( var < S1 < 11 , 100 > > == var < S1 < 199 , 23 > > / 2 "
                            "&& var < S1 < 50 , 120 > > == var < S1 < 150 , var < S1 < 10 , 10 > > > > "
                            "&& var < S1 < 53 , 23 > > != 222 , \"\" ) ;";
@@ -3707,7 +3712,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template149() { // unknown macro
         const char code[] = "BEGIN_VERSIONED_NAMESPACE_DECL\n"
                             "template<typename T> class Fred { };\n"
-                            "END_VERSIONED_NAMESPACE_DECL";
+                            "END_VERSIONED_NAMESPACE_DECL\n";
         ASSERT_THROW_INTERNAL_EQUALS(tok(code), UNKNOWN_MACRO, "There is an unknown macro here somewhere. Configuration is required. If BEGIN_VERSIONED_NAMESPACE_DECL is a macro then please configure it.");
     }
 
@@ -3719,7 +3724,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "void foo() {\n"
                             "  Test test;\n"
                             "  const string type = test.operator[]<string>(\"type\");\n"
-                            "}";
+                            "}\n";
         const char exp[] = "struct Test { "
                            "string & operator[]<string> ( string ) ; "
                            "} ; "
@@ -3742,7 +3747,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "class GenericConfigurationHandler {\n"
                                 "  data_container<int, std::allocator<int>> m_target_configurations;\n"
                                 "};\n"
-                                "class TargetConfigurationHandler : public GenericConfigurationHandler<int> { };";
+                                "class TargetConfigurationHandler : public GenericConfigurationHandler<int> { };\n";
             const char exp[] = "class SimulationComponentGroupGenerator { "
                                "std :: list < int , std :: allocator < int > > build ( ) const ; "
                                "} ; "
@@ -3756,7 +3761,7 @@ class TestSimplifyTemplate : public TestFixture {
         {
             const char code[] = "std::list<std::allocator<int>> a;\n"
                                 "template <class, template <class> class allocator = std::allocator> class b {};\n"
-                                "class c : b<int> {};";
+                                "class c : b<int> {};\n";
             const char exp[] = "std :: list < std :: allocator < int > > a ; "
                                "class b<int,std::allocator> ; "
                                "class c : b<int,std::allocator> { } ; "
@@ -3767,7 +3772,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "template <typename> class a {};\n"
                                 "template class a<char>;\n"
                                 "template <class, template <class> class a = a> class b {};\n"
-                                "class c : b<int> {};";
+                                "class c : b<int> {};\n";
             const char exp[] = "class a<char> ; "
                                "class b<int,a> ; "
                                "class c : b<int,a> { } ; "
@@ -3791,7 +3796,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "int global() {\n"
                             "  int bar = 1;\n"
                             "  return bar;\n"
-                            "}";
+                            "}\n";
         const char exp[] = "class Foo { "
                            "bool bar<9> ( ) ; "
                            "template < unsigned int i > "
@@ -3810,13 +3815,13 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template153() { // #9483
-        const char code[] = "template <class = b<decltype(a<h>())...>> void i();";
+        const char code[] = "template <class = b<decltype(a<h>())...>> void i();\n";
         const char exp[] = "template < class = b < decltype ( a < h > ( ) ) ... > > void i ( ) ;";
         ASSERT_EQUALS(exp, tok(code));
     }
 
     void template154() { // #9495
-        const char code[] = "template <typename S, enable_if_t<(is_compile_string<S>::value), int>> void i(S s);";
+        const char code[] = "template <typename S, enable_if_t<(is_compile_string<S>::value), int>> void i(S s);\n";
         const char exp[] = "template < typename S , enable_if_t < ( is_compile_string < S > :: value ) , int > > void i ( S s ) ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -3829,7 +3834,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "void c() {\n"
                             "  b d;\n"
                             "  d[a<0>];\n"
-                            "}";
+                            "}\n";
         const char exp[] = "int a<0> ; "
                            "a<0> = 0 ; "
                            "struct b { "
@@ -3852,7 +3857,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename j> using k = e<i<j>::d>;\n"
                             "template <typename j> using l = h<k<j>::d, e<1 < (j)0>, f>;\n"
                             "template <typename> void m(int, int, int) { l<int> d; }\n"
-                            "void n() { m<int>(0, 4, 5); }";
+                            "void n() { m<int>(0, 4, 5); }\n";
         (void)tok(code); // don't crash
     }
 
@@ -3868,7 +3873,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "b3<0> var3;\n"
                             "b4<0> var4;\n"
                             "b5<0> var5;\n"
-                            "b6<0> var6;";
+                            "b6<0> var6;\n";
         const char exp[] = "struct b1<0,true> ; "
                            "struct b2<0,false> ; "
                            "struct b3<0,false> ; "
@@ -4093,7 +4098,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "b<a97<int>> d97;\n"
                             "b<a98<int>> d98;\n"
                             "b<a99<int>> d99;\n"
-                            "b<a100<int>> d100;";
+                            "b<a100<int>> d100;\n";
         // don't bother checking the output because this is not instantiated properly
         (void)tok(code); // don't crash
 
@@ -4125,7 +4130,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "tester<impl*, int> ti;\n"
                             "template<class T, class U, class = decltype(impl::create<T>()->impl::create<U>())>\n"
                             "int test() { return 0; }\n"
-                            "int i = test<impl*, int>();";
+                            "int i = test<impl*, int>();\n";
         const char exp[]  = "struct impl { template < class T > static T create ( ) ; } ; "
                             "struct tester<impl*,int,decltype(impl::create<impl*>().impl::create<int>())> ; "
                             "tester<impl*,int,decltype(impl::create<impl*>().impl::create<int>())> ti ; "
@@ -4144,7 +4149,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template void Fred::foo<char>();\n"
                             "template <> void Fred::foo<bool>() { }\n"
                             "template void Fred::foo<float>(float);\n"
-                            "template <> void Fred::foo<int>(int) { }";
+                            "template <> void Fred::foo<int>(int) { }\n";
         const char exp[]  = "struct Fred { "
                             "static void foo<bool> ( ) ; "
                             "static void foo<char> ( ) ; "
@@ -4167,7 +4172,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "};\n"
                             "void foo() {\n"
                             "   auto notifyJob = std::make_shared<adapter<JobEntry>> ();\n"
-                            "}";
+                            "}\n";
         const char exp[]  = "???";
         const char act[]  = "struct JobEntry { } ; "
                             "struct adapter<JobEntry> ; "
@@ -4185,12 +4190,12 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <std::size_t N>\n"
                             "struct CountryCode {\n"
                             "    CountryCode(std::string cc);\n"
-                            "};"
+                            "};\n"
                             "template <std::size_t N>\n"
                             "CountryCode<N>::CountryCode(std::string cc) : m_String{std::move(cc)} {\n"
                             "}\n"
                             "template class CountryCode<2>;\n"
-                            "template class CountryCode<3>;";
+                            "template class CountryCode<3>;\n";
         const char exp[]  = "struct CountryCode<2> ; "
                             "struct CountryCode<3> ; "
                             "struct CountryCode<2> { "
@@ -4207,7 +4212,7 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template163() { // #9685 syntax error
-        const char code[] = "extern \"C++\" template < typename T > T * test ( ) { return nullptr ; }";
+        const char code[] = "extern \"C++\" template < typename T > T * test ( ) { return nullptr ; }\n";
         const char expected[] = "template < typename T > T * test ( ) { return nullptr ; }";
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -4226,7 +4231,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <class TYPE>\n"
                             "void A<TYPE>::f() { }\n"
                             "template class A<int>;\n"
-                            "template class A<float>;";
+                            "template class A<float>;\n";
         const char exp[]  = "struct A<int> ; "
                             "struct A<float> ; "
                             "struct A<int> { "
@@ -4254,7 +4259,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    bool operator()(const T& l, const T& r) const {\n"
                             "        return l.first < r.first;\n"
                             "    }\n"
-                            "};";
+                            "};\n";
         const char exp[]  = "struct MyStruct { "
                             "template < class T > "
                             "bool operator() ( const T & l , const T & r ) const { "
@@ -4267,7 +4272,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template166() { // #10081 hang
         const char code[] = "template <typename T, size_t k = (T::s < 3) ? 0 : 3>\n"
                             "void foo() {}\n"
-                            "foo<T>();";
+                            "foo<T>();\n";
         const char exp[]  = "void foo<T,(T::s<3)?0:3> ( ) ; "
                             "foo<T,(T::s<3)?0:3> ( ) ; "
                             "void foo<T,(T::s<3)?0:3> ( ) { }";
@@ -4286,7 +4291,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "void foo() {\n"
                             "    std::string str = MathLib::toString(1.0);\n"
-                            "}";
+                            "}\n";
         const char exp[]  = "struct MathLib { "
                             "static std :: string toString<double> ( double value ) ; "
                             "template < class T > static std :: string toString ( T value ) { "
@@ -4316,7 +4321,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template < > struct type < long long, long long > {};\n"
                             "template < > struct type < double, double > {};\n"
                             "template < > struct type < float, float > {};\n"
-                            "template < > struct type < long double, long double > {};";
+                            "template < > struct type < long double, long double > {};\n";
         const char exp[]  = "struct type<longdouble,longdouble> ; "
                             "struct type<float,float> ; "
                             "struct type<double,double> ; "
@@ -4364,7 +4369,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "CImgList < last < long long > > c12;\n"
                             "CImgList < last < float > > c13;\n"
                             "CImgList < last < double > > c14;\n"
-                            "CImgList < last < long double > > c15;";
+                            "CImgList < last < long double > > c15;\n";
         const char exp[]  = "struct last<bool> ; "
                             "struct last<signedchar> ; "
                             "struct last<unsignedchar> ; "
@@ -4448,7 +4453,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "void c() {\n"
                             "  a<1>;\n"
                             "  [](auto b) {};\n"
-                            "}";
+                            "}\n";
         const char exp[]  = "int a<1> ; a<1> = 0 ; "
                             "void c ( ) { "
                             "a<1> ; "
@@ -4461,7 +4466,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <int> struct c { enum { b }; };\n"
                             "template <int> struct h { enum { d }; enum { e }; };\n"
                             "template <int f, long = h<f>::d, int g = h<f>::e> class i { enum { e = c<g>::b }; };\n"
-                            "void j() { i<2> a; }";
+                            "void j() { i<2> a; }\n";
         const char exp[]  = "struct c<h<2>::e> ; "
                             "struct h<2> ; "
                             "class i<2,h<2>::d,h<2>::e> ; "
@@ -4481,7 +4486,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template172() { // #10258 crash
         const char code[] = "template<typename T, typename... Args>\n"
                             "void bar(T t, Args&&... args) { }\n"
-                            "void foo() { bar<int>(0, 1); }";
+                            "void foo() { bar<int>(0, 1); }\n";
         const char exp[]  = "void bar<int> ( int t , Args && ... args ) ; "
                             "void foo ( ) { bar<int> ( 0 , 1 ) ; } "
                             "void bar<int> ( int t , Args && ... args ) { }";
@@ -4497,7 +4502,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "namespace std {\n"
                             "template <> void swap<a::d>(a::d &, a::d &) {}\n"
-                            "}";
+                            "}\n";
         const char exp[]  = "namespace a { "
                             "template < typename , typename > struct b ; "
                             "template < template < typename , typename > class > class c ; "
@@ -4558,7 +4563,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template177() {
         const char code[] = "template <typename Encoding, typename Allocator>\n"
                             "class C { xyz<Encoding, Allocator> x; };\n"
-                            "C<UTF8<>, MemoryPoolAllocator<>> c;";
+                            "C<UTF8<>, MemoryPoolAllocator<>> c;\n";
         const char exp[] = "class C<UTF8<>,MemoryPoolAllocator<>> ; "
                            "C<UTF8<>,MemoryPoolAllocator<>> c ; "
                            "class C<UTF8<>,MemoryPoolAllocator<>> { xyz < UTF8 < > , MemoryPoolAllocator < > > x ; } ;";
@@ -4572,7 +4577,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "void f() {\n"
                             "    g<int>();\n"
-                            "}";
+                            "}\n";
         const char exp[] = "void g<int> ( ) ; void f ( ) { g<int> ( ) ; } void g<int> ( ) { for ( int i = 0 ; i < int { 3 } ; ++ i ) { } }";
         ASSERT_EQUALS(exp, tok(code));
 
@@ -4587,7 +4592,7 @@ class TestSimplifyTemplate : public TestFixture {
                              "void f() {\n"
                              "    S<char> s{};\n"
                              "    s.g<int>();\n"
-                             "}";
+                             "}\n";
         const char exp2[] = "struct S<char> ; void f ( ) { S<char> s { } ; s . g<int> ( ) ; } struct S<char> { char c ; void g<int> ( ) ; } ; "
                             "void S<char> :: g<int> ( ) { for ( int i = 0 ; i < int { 3 } ; ++ i ) { } }";
         ASSERT_EQUALS(exp2, tok(code2));
@@ -4678,11 +4683,56 @@ class TestSimplifyTemplate : public TestFixture {
         ASSERT_EQUALS(exp, tok(code));
     }
 
+    void template183() { // #11498
+        const char code[] = "template <typename T>\n"
+                            "struct S {\n"
+                            "    void f();\n"
+                            "    using X = decltype(&S<T>::f);\n"
+                            "private:\n"
+                            "    X x;\n"
+                            "};\n"
+                            "S<int> s;\n";
+        const char exp[] = "struct S<int> ; "
+                           "S<int> s ; "
+                           "struct S<int> { "
+                           "void f ( ) ; "
+                           "private: "
+                           "decltype ( & S<int> :: f ) x ; "
+                           "} ;";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
+    void template184() {
+        const char code[] = "template <typename T>\n"
+                            "T g(T x) {\n"
+                            "  return x;\n"
+                            "}\n"
+                            "template <>\n"
+                            "float g<float>(float x) {\n"
+                            "  return x + 1.0f;\n"
+                            "}\n"
+                            "void f(int i) {\n"
+                            "  g(i);\n"
+                            "  g(1.0f);\n"
+                            "}\n";
+        const char exp[] = "float g<float> ( float x ) ; "
+                           "template < typename T > "
+                           "T g ( T x ) { return x ; } "
+                           "float g<float> ( float x ) {"
+                           " return x + 1.0f ; "
+                           "} "
+                           "void f ( int i ) {"
+                           " g ( i ) ;"
+                           " g<float> ( 1.0f ) ; "
+                           "}";
+        ASSERT_EQUALS(exp, tok(code)); // TODO: instantiate g<int>(int)
+    }
+
     void template_specialization_1() {  // #7868 - template specialization template <typename T> struct S<C<T>> {..};
         const char code[] = "template <typename T> struct C {};\n"
                             "template <typename T> struct S {a};\n"
                             "template <typename T> struct S<C<T>> {b};\n"
-                            "S<int> s;";
+                            "S<int> s;\n";
         const char exp[]  = "template < typename T > struct C { } ; struct S<int> ; template < typename T > struct S < C < T > > { b } ; S<int> s ; struct S<int> { a } ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -4691,7 +4741,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <typename T> struct C {};\n"
                             "template <typename T> struct S {a};\n"
                             "template <typename T> struct S<C<T>> {b};\n"
-                            "S<C<int>> s;";
+                            "S<C<int>> s;\n";
         const char exp[]  = "template < typename T > struct C { } ; template < typename T > struct S { a } ; struct S<C<int>> ; S<C<int>> s ; struct S<C<int>> { b } ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -4743,7 +4793,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "struct template_is_const\n"
                             "{\n"
                             "    enum {value = !type_equal<T, typename Unconst<T>::type>::value  };\n"
-                            "};";
+                            "};\n";
         const char exp[] = "template < class T > struct Unconst { } ; "
                            "template < class T > struct Unconst < const T > { } ; "
                            "template < class T > struct Unconst < const T & > { } ; "
@@ -4826,7 +4876,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "class A { }; "
                                 "template<class T> class B { }; "
                                 "template<class T1, class T2 = B<T1>> class C { }; "
-                                "template<class T1 = A, typename T2 = B<A>> class D { };";
+                                "template<class T1 = A, typename T2 = B<A>> class D { };\n";
             ASSERT_EQUALS("class A { } ; "
                           "template < class T > class B { } ; "
                           "template < class T1 , class T2 = B < T1 > > class C { } ; "
@@ -4834,9 +4884,9 @@ class TestSimplifyTemplate : public TestFixture {
         }
         {
             // #7548
-            const char code[] = "template<class T, class U> class DefaultMemory {}; "
-                                "template<class Key, class Val, class Mem=DefaultMemory<Key,Val> > class thv_table_c  {}; "
-                                "thv_table_c<void *,void *> id_table_m;";
+            const char code[] = "template<class T, class U> class DefaultMemory {};\n"
+                                "template<class Key, class Val, class Mem=DefaultMemory<Key,Val> > class thv_table_c  {};\n"
+                                "thv_table_c<void *,void *> id_table_m;\n";
             const char exp[] = "template < class T , class U > class DefaultMemory { } ; "
                                "class thv_table_c<void*,void*,DefaultMemory<void*,void*>> ; "
                                "thv_table_c<void*,void*,DefaultMemory<void*,void*>> id_table_m ; "
@@ -4851,7 +4901,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "void f() {\n"
                                 "  a<> b;\n"
                                 "  b.a<>::c();\n"
-                                "}";
+                                "}\n";
             ASSERT_EQUALS("struct a<void> ; "
                           "void f ( ) { "
                           "a<void> b ; "
@@ -4880,7 +4930,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "    B b;\n"
                                 "    b.A<>::Print();\n"
                                 "    return 0;\n"
-                                "}";
+                                "}\n";
             ASSERT_EQUALS("class A<void> ; "
                           "template < typename T0 > class A ; "
                           "class A<void> { "
@@ -4900,6 +4950,41 @@ class TestSimplifyTemplate : public TestFixture {
                           "return 0 ; "
                           "}", tok(code));
         }
+        {
+            // #14975
+            const char code[] = "template <typename T, int N>\n"
+                                "struct I;\n"
+                                "template <typename T,\n"
+                                "    int N = (sizeof(T) > 8 ? 8 : sizeof(T))>\n"
+                                "    struct A {\n"
+                                "    I<T, N> begin() { return I<T, N>(this); }\n"
+                                "};\n"
+                                "template <typename T, int N>\n"
+                                "struct I {\n"
+                                "    I(A<T, N>* a);\n"
+                                "    A<T, N>* p;\n"
+                                "};\n"
+                                "template <typename T, int N>\n"
+                                "inline I<T, N>::I(A<T, N>* a) : p(a) {}\n"
+                                "void f() { A<X> x; }\n";
+            TODO_ASSERT_EQUALS(
+                "Fix template arg",
+                "template < typename T , int N > struct I ; "
+                "struct A<X,(sizeof(X)>8)> ; "
+                "template < typename T , int N > struct I { "
+                "I ( A < T , N > * a ) ; "
+                "A < T , N > * p ; "
+                "} ; "
+                "I<X,(sizeof(X)>8)> :: I<X,(sizeof(X)>8)> ( A < X , ( sizeof ( X ) > 8 ) > * a ) ; "
+                "void f ( ) { "
+                "A<X,(sizeof(X)>8)> x ; "
+                "} "
+                "struct A<X,(sizeof(X)>8)> { "
+                "I<X,(sizeof(X)>8)> begin ( ) { return I<X,(sizeof(X)>8)> ( this ) ; } "
+                "} ; "
+                "I<X,(sizeof(X)>8)> :: I<X,(sizeof(X)>8)> ( A < X , ( sizeof ( X ) > 8 ) > * a ) : p ( a ) { }",
+                tok(code));
+        }
     }
 
     void template_forward_declared_default_parameter() {
@@ -4960,7 +5045,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "struct ei_solve_triangular_selector<Lhs,UpLo> {\n"
                                 "};\n"
                                 "template<typename Lhs, int TriangularPart>\n"
-                                "struct ei_solve_triangular_selector { };";
+                                "struct ei_solve_triangular_selector { };\n";
 
             const char exp[] = "template < typename Lhs , int TriangularPart = ( int ( Lhs :: Flags ) & LowerTriangularBit ) > "
                                "struct ei_solve_triangular_selector ; "
@@ -4986,7 +5071,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "{\n"
                                 "  return T{};\n"
                                 "}\n"
-                                "Foo<> f;";
+                                "Foo<> f;\n";
             const char exp[] = "class Foo<128,wchar_t> ; Foo<128,wchar_t> f ; "
                                "class Foo<128,wchar_t> { public: wchar_t operator[] ( int Index ) const ; } ; "
                                "wchar_t Foo<128,wchar_t> :: operator[] ( int Index ) const { return wchar_t { } ; }";
@@ -5027,7 +5112,7 @@ class TestSimplifyTemplate : public TestFixture {
         {
             const char code[] = "template <class T>\n"
                                 "void foo(typename T::t *)\n"
-                                "{ }";
+                                "{ }\n";
 
             // The expected result..
             const char expected[] = "template < class T > void foo ( T :: t * ) { }";
@@ -5038,7 +5123,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    x(sizeof typename);\n"
                                 "    type = 0;\n"
-                                "}";
+                                "}\n";
 
             ASSERT_EQUALS("void f ( ) { x ( sizeof ( typename ) ) ; type = 0 ; }", tok(code));
         }
@@ -5049,37 +5134,37 @@ class TestSimplifyTemplate : public TestFixture {
         //         "no constructor" false positives
         const char code[] = "class Fred {\n"
                             "    template<class T> explicit Fred(T t) { }\n"
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("class Fred { template < class T > explicit Fred ( T t ) { } } ;", tok(code));
 
         // #3532
         const char code2[] = "class Fred {\n"
                              "    template<class T> Fred(T t) { }\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("class Fred { template < class T > Fred ( T t ) { } } ;", tok(code2));
     }
 
     void syntax_error_templates_1() {
         // ok code.. using ">" for a comparison
-        ASSERT_NO_THROW(tok("x<y>z> xyz;"));
+        ASSERT_NO_THROW(tok("x<y>z> xyz;\n"));
         ASSERT_EQUALS("", errout_str());
 
         // ok code
-        ASSERT_NO_THROW(tok("template<class T> operator<(T a, T b) { }"));
+        ASSERT_NO_THROW(tok("template<class T> operator<(T a, T b) { }\n"));
         ASSERT_EQUALS("", errout_str());
 
         // ok code (ticket #1984)
         ASSERT_NO_THROW(tok("void f(a) int a;\n"
-                            "{ ;x<y; }"));
+                            "{ ;x<y; }\n"));
         ASSERT_EQUALS("", errout_str());
 
         // ok code (ticket #1985)
         ASSERT_NO_THROW(tok("void f()\n"
-                            "{ try { ;x<y; } }"));
+                            "{ try { ;x<y; } }\n"));
         ASSERT_EQUALS("", errout_str());
 
         // ok code (ticket #3183)
-        ASSERT_NO_THROW(tok("MACRO(({ i < x }))"));
+        ASSERT_NO_THROW(tok("MACRO(({ i < x }))\n"));
         ASSERT_EQUALS("", errout_str());
 
         // bad code.. missing ">"
@@ -5102,7 +5187,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    }\n"
                             "private:\n"
                             "    A a;\n"
-                            "};"));
+                            "};\n"));
         ASSERT_EQUALS("", errout_str());
 
         //both of these should work but in cppcheck 2.1 only the first option will work (ticket #9843)
@@ -5120,30 +5205,30 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template_member_ptr() { // Ticket #5786 (segmentation fault)
-        (void)tok("struct A {}; "
-                  "struct B { "
-                  "template <void (A::*)() const> struct BB {}; "
-                  "template <bool BT> static bool foo(int) { return true; } "
-                  "void bar() { bool b = foo<true>(0); }"
-                  "};");
-        (void)tok("struct A {}; "
-                  "struct B { "
-                  "template <void (A::*)() volatile> struct BB {}; "
-                  "template <bool BT> static bool foo(int) { return true; } "
-                  "void bar() { bool b = foo<true>(0); }"
-                  "};");
-        (void)tok("struct A {}; "
-                  "struct B { "
-                  "template <void (A::*)() const volatile> struct BB {}; "
-                  "template <bool BT> static bool foo(int) { return true; } "
-                  "void bar() { bool b = foo<true>(0); }"
-                  "};");
-        (void)tok("struct A {}; "
-                  "struct B { "
-                  "template <void (A::*)() volatile const> struct BB {}; "
-                  "template <bool BT> static bool foo(int) { return true; } "
-                  "void bar() { bool b = foo<true>(0); }"
-                  "};");
+        (void)tok("struct A {};\n"
+                  "struct B {\n"
+                  "template <void (A::*)() const> struct BB {};\n"
+                  "template <bool BT> static bool foo(int) { return true; }\n"
+                  "void bar() { bool b = foo<true>(0); }\n"
+                  "};\n");
+        (void)tok("struct A {};\n"
+                  "struct B {\n"
+                  "template <void (A::*)() volatile> struct BB {};\n"
+                  "template <bool BT> static bool foo(int) { return true; }\n"
+                  "void bar() { bool b = foo<true>(0); }\n"
+                  "};\n");
+        (void)tok("struct A {};\n"
+                  "struct B {\n"
+                  "template <void (A::*)() const volatile> struct BB {};\n"
+                  "template <bool BT> static bool foo(int) { return true; }\n"
+                  "void bar() { bool b = foo<true>(0); }\n"
+                  "};\n");
+        (void)tok("struct A {};\n"
+                  "struct B {\n"
+                  "template <void (A::*)() volatile const> struct BB {};\n"
+                  "template <bool BT> static bool foo(int) { return true; }\n"
+                  "void bar() { bool b = foo<true>(0); }\n"
+                  "};\n");
     }
 
     void template_namespace_1() {
@@ -5151,7 +5236,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "namespace {\n"
                             "  template<class T> void Fred(T value) { }\n"
                             "}\n"
-                            "Fred<int>(123);";
+                            "Fred<int>(123);\n";
         ASSERT_EQUALS("namespace { "
                       "void Fred<int> ( int value ) ; "
                       "} "
@@ -5164,7 +5249,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "namespace X {\n"
                             "  template<class T> struct S { };\n"
                             "}\n"
-                            "X::S<int> s;";
+                            "X::S<int> s;\n";
         ASSERT_EQUALS("namespace X { "
                       "struct S<int> ; "
                       "} "
@@ -5178,7 +5263,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    static void *bar();\n"
                             "  };\n"
                             "  void *test() { return foo<int>::bar(); }\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("namespace test16 {"
                       " struct foo<int> ;"
                       " void * test ( ) {"
@@ -5198,7 +5283,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "      A<int>::dostuff();\n"
                             "    }\n"
                             "  };\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("namespace foo {"
                       " class A<int> ;"
                       " struct S : public A<int> {"
@@ -5212,7 +5297,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template_namespace_5() {
         const char code[] = "template<class C> struct S {};\n"
-                            "namespace X { S<int> s; }";
+                            "namespace X { S<int> s; }\n";
         ASSERT_EQUALS("struct S<int> ; "
                       "namespace X { S<int> s ; } "
                       "struct S<int> { } ;", tok(code));
@@ -5233,7 +5318,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename T> NS::C<T>::C() {}\n"
                             "template <typename T> NS::C<T>::~C() {}\n"
                             "template <typename T> NS::C<T>::C(const NS::C<T> &) {}\n"
-                            "template <typename T> NS::C<T> & NS::C<T>::operator=(const NS::C<T> &) {}";
+                            "template <typename T> NS::C<T> & NS::C<T>::operator=(const NS::C<T> &) {}\n";
         ASSERT_EQUALS("namespace NS { "
                       "union C<int> ; "
                       "} "
@@ -5263,7 +5348,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "N2::CT<int> ct2;\n"
                             "}\n"
                             "N1::N2::C c3;\n"
-                            "N1::N2::CT<int> ct3;";
+                            "N1::N2::CT<int> ct3;\n";
         ASSERT_EQUALS("namespace N1 { "
                       "namespace N2 { "
                       "struct C { } ; "
@@ -5298,7 +5383,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    Fred<T>::~Fred() { }\n"
                             "}\n"
                             "}\n"
-                            "NS1::NS2::Fred<int> fred;";
+                            "NS1::NS2::Fred<int> fred;\n";
         ASSERT_EQUALS("namespace NS1 { "
                       "namespace NS2 { "
                       "struct Fred<int> ; "
@@ -5354,7 +5439,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "};\n"
                             "}\n"
                             "}\n"
-                            "NS1::NS2::Fred<int> fred;";
+                            "NS1::NS2::Fred<int> fred;\n";
         ASSERT_EQUALS("namespace NS1 { "
                       "namespace NS2 { "
                       "class Fred<int> ; "
@@ -5381,7 +5466,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    template< typename T > T TemplatedMethod(T);\n"
                             "};\n"
                             "template< typename T > T TestClass::TemplatedMethod(T t) { return t; }\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("namespace MyNamespace { "
                       "class TestClass { "
                       "public: "
@@ -5435,7 +5520,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template_pointer_type() {
         const char code[] = "template<class T> void foo(const T x) {}\n"
-                            "void bar() { foo<int*>(0); }";
+                            "void bar() { foo<int*>(0); }\n";
         ASSERT_EQUALS("void foo<int*> ( int * const x ) ; "
                       "void bar ( ) { foo<int*> ( 0 ) ; } "
                       "void foo<int*> ( int * const x ) { }", tok(code));
@@ -5449,12 +5534,12 @@ class TestSimplifyTemplate : public TestFixture {
                           "void bar() {\n"
                           "  int y[3];\n"
                           "  foo<int[]>(y);\n"
-                          "}"));
+                          "}\n"));
         ASSERT_EQUALS("struct A<int[2]> ; "
                       "A<int[2]> y ; "
                       "struct A<int[2]> { int [ 2 ] x ; } ;",
                       tok("template <class T> struct A { T x; };\n"
-                          "A<int[2]> y;"));
+                          "A<int[2]> y;\n"));
 
         // Previously resulted in:
         //   test.cpp:2:33: error: Syntax Error: AST broken, binary operator '>' doesn't have two operands. [internalAstError]
@@ -5468,7 +5553,7 @@ class TestSimplifyTemplate : public TestFixture {
                       tok("template <class  > struct A {};\n"
                           "template <class T> struct B { A<T[]> x; };\n"
                           "template <class T> struct C : B<T> {};\n"
-                          "C<B<int>> y;"));
+                          "C<B<int>> y;\n"));
     }
 
     template<size_t size>
@@ -5491,52 +5576,52 @@ class TestSimplifyTemplate : public TestFixture {
 
     void templateParameters() {
         // Test that the function TemplateSimplifier::templateParameters works
-        ASSERT_EQUALS(1U, templateParameters("X<struct C> x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<union C> x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<const int> x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<int const *> x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<const struct C> x;"));
-        ASSERT_EQUALS(0U, templateParameters("X<len>>x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<typename> x;"));
-        ASSERT_EQUALS(0U, templateParameters("X<...> x;"));
-        ASSERT_EQUALS(0U, templateParameters("X<class T...> x;")); // Invalid syntax
-        ASSERT_EQUALS(1U, templateParameters("X<class... T> x;"));
-        ASSERT_EQUALS(0U, templateParameters("X<class, typename T...> x;")); // Invalid syntax
-        ASSERT_EQUALS(2U, templateParameters("X<class, typename... T> x;"));
-        ASSERT_EQUALS(2U, templateParameters("X<int(&)(), class> x;"));
-        ASSERT_EQUALS(3U, templateParameters("X<char, int(*)(), bool> x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<int...> x;"));
-        ASSERT_EQUALS(2U, templateParameters("X<class, typename...> x;"));
-        ASSERT_EQUALS(2U, templateParameters("X<1, T> x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<T[]> x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<T[2]> x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<i == 0> x;"));
-        ASSERT_EQUALS(2U, templateParameters("X<int, i>=0> x;"));
-        ASSERT_EQUALS(3U, templateParameters("X<int, i>=0, i - 2> x;"));
-        ASSERT_EQUALS(0U, templateParameters("var1<1> x;"));
-        ASSERT_EQUALS(0U, templateParameters("X<1>2;"));
-        ASSERT_EQUALS(2U, templateParameters("template<typename...B,typename=SameSize<B...>> x;"));
-        ASSERT_EQUALS(2U, templateParameters("template<typename...B,typename=SameSize<B...> > x;"));
-        ASSERT_EQUALS(1U, templateParameters("template<template<typename>...Foo> x;"));
-        ASSERT_EQUALS(1U, templateParameters("template<template<typename>> x;"));
-        ASSERT_EQUALS(1U, templateParameters("template<template<template<typename>>> x;"));
-        ASSERT_EQUALS(1U, templateParameters("template<template<template<template<typename>>>> x;"));
-        ASSERT_EQUALS(1U, templateParameters("template<template<template<template<template<typename>>>>> x;"));
-        ASSERT_EQUALS(2U, templateParameters("template<template<typename>,int> x;"));
-        ASSERT_EQUALS(2U, templateParameters("template<template<template<typename>>,int> x;"));
-        ASSERT_EQUALS(2U, templateParameters("template<template<template<template<typename>>>,int> x;"));
-        ASSERT_EQUALS(2U, templateParameters("template<template<template<template<template<typename>>>>,int> x;"));
-        ASSERT_EQUALS(2U, templateParameters("template<template<typename>...Foo,template<template<template<typename>>>> x;"));
-        ASSERT_EQUALS(3U, templateParameters("template<template<typename>...Foo,int,template<template<template<typename>>>> x;"));
-        ASSERT_EQUALS(4U, templateParameters("template<template<typename>...Foo,int,template<template<template<typename>>>,int> x;"));
-        ASSERT_EQUALS(2U, templateParameters("template<typename S, enable_if_t<(is_compile_string<S>::value), int>> void i(S s);"));
-        ASSERT_EQUALS(2U, templateParameters("template<typename c, b<(c::d), int>> void e();"));
-        ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args&...>> constexpr void f() {}")); // #11351
-        ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args&&...>> void f() {}"));
-        ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args*...>> void f() {}"));
-        ASSERT_EQUALS(1U, templateParameters("S<4 < sizeof(uintptr_t)> x;"));
-        ASSERT_EQUALS(2U, templateParameters("template <typename... Ts, typename = std::enable_if_t<std::is_same<Ts..., int>::value>> void g() {}")); // #11915
-        ASSERT_EQUALS(1U, templateParameters("S<N::M<O<\"A\"_I>>> s;")); // #10837
+        ASSERT_EQUALS(1U, templateParameters("X<struct C> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<union C> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<const int> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<int const *> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<const struct C> x;\n"));
+        ASSERT_EQUALS(0U, templateParameters("X<len>>x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<typename> x;\n"));
+        ASSERT_EQUALS(0U, templateParameters("X<...> x;\n"));
+        ASSERT_EQUALS(0U, templateParameters("X<class T...> x;\n")); // Invalid syntax
+        ASSERT_EQUALS(1U, templateParameters("X<class... T> x;\n"));
+        ASSERT_EQUALS(0U, templateParameters("X<class, typename T...> x;\n")); // Invalid syntax
+        ASSERT_EQUALS(2U, templateParameters("X<class, typename... T> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("X<int(&)(), class> x;\n"));
+        ASSERT_EQUALS(3U, templateParameters("X<char, int(*)(), bool> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<int...> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("X<class, typename...> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("X<1, T> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<T[]> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<T[2]> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<i == 0> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("X<int, i>=0> x;\n"));
+        ASSERT_EQUALS(3U, templateParameters("X<int, i>=0, i - 2> x;\n"));
+        ASSERT_EQUALS(0U, templateParameters("var1<1> x;\n"));
+        ASSERT_EQUALS(0U, templateParameters("X<1>2;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<typename...B,typename=SameSize<B...>> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<typename...B,typename=SameSize<B...> > x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("template<template<typename>...Foo> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("template<template<typename>> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("template<template<template<typename>>> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("template<template<template<template<typename>>>> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("template<template<template<template<template<typename>>>>> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<template<typename>,int> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<template<template<typename>>,int> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<template<template<template<typename>>>,int> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<template<template<template<template<typename>>>>,int> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<template<typename>...Foo,template<template<template<typename>>>> x;\n"));
+        ASSERT_EQUALS(3U, templateParameters("template<template<typename>...Foo,int,template<template<template<typename>>>> x;\n"));
+        ASSERT_EQUALS(4U, templateParameters("template<template<typename>...Foo,int,template<template<template<typename>>>,int> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<typename S, enable_if_t<(is_compile_string<S>::value), int>> void i(S s);\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<typename c, b<(c::d), int>> void e();\n"));
+        ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args&...>> constexpr void f() {}\n")); // #11351
+        ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args&&...>> void f() {}\n"));
+        ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args*...>> void f() {}\n"));
+        ASSERT_EQUALS(1U, templateParameters("S<4 < sizeof(uintptr_t)> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template <typename... Ts, typename = std::enable_if_t<std::is_same<Ts..., int>::value>> void g() {}\n")); // #11915
+        ASSERT_EQUALS(1U, templateParameters("S<N::M<O<\"A\"_I>>> s;\n")); // #10837
     }
 
     // Helper function to unit test TemplateSimplifier::getTemplateNamePosition
@@ -5559,57 +5644,57 @@ class TestSimplifyTemplate : public TestFixture {
 
     void templateNamePosition() {
         // Template class
-        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> class A {};", 4));
-        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> struct A {};", 4));
-        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> class A : B {};", 4));
-        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> struct A : B {};", 4));
+        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> class A {};\n", 4));
+        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> struct A {};\n", 4));
+        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> class A : B {};\n", 4));
+        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> struct A : B {};\n", 4));
         // Template function definitions
-        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> unsigned foo() { return 0; }", 4));
-        ASSERT_EQUALS(3, templateNamePositionHelper("template<class T> unsigned* foo() { return 0; }", 4));
-        ASSERT_EQUALS(4, templateNamePositionHelper("template<class T> unsigned** foo() { return 0; }", 4));
+        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> unsigned foo() { return 0; }\n", 4));
+        ASSERT_EQUALS(3, templateNamePositionHelper("template<class T> unsigned* foo() { return 0; }\n", 4));
+        ASSERT_EQUALS(4, templateNamePositionHelper("template<class T> unsigned** foo() { return 0; }\n", 4));
 
-        ASSERT_EQUALS(3, templateNamePositionHelper("template<class T> const unsigned foo() { return 0; }", 4));
-        ASSERT_EQUALS(4, templateNamePositionHelper("template<class T> const unsigned& foo() { return 0; }", 4));
-        ASSERT_EQUALS(5, templateNamePositionHelper("template<class T> const unsigned** foo() { return 0; }", 4));
+        ASSERT_EQUALS(3, templateNamePositionHelper("template<class T> const unsigned foo() { return 0; }\n", 4));
+        ASSERT_EQUALS(4, templateNamePositionHelper("template<class T> const unsigned& foo() { return 0; }\n", 4));
+        ASSERT_EQUALS(5, templateNamePositionHelper("template<class T> const unsigned** foo() { return 0; }\n", 4));
 
-        ASSERT_EQUALS(4, templateNamePositionHelper("template<class T> std::string foo() { static str::string str; return str; }", 4));
-        ASSERT_EQUALS(5, templateNamePositionHelper("template<class T> std::string & foo() { static str::string str; return str; }", 4));
-        ASSERT_EQUALS(6, templateNamePositionHelper("template<class T> const std::string & foo() { static str::string str; return str; }", 4));
+        ASSERT_EQUALS(4, templateNamePositionHelper("template<class T> std::string foo() { static str::string str; return str; }\n", 4));
+        ASSERT_EQUALS(5, templateNamePositionHelper("template<class T> std::string & foo() { static str::string str; return str; }\n", 4));
+        ASSERT_EQUALS(6, templateNamePositionHelper("template<class T> const std::string & foo() { static str::string str; return str; }\n", 4));
 
-        ASSERT_EQUALS(9, templateNamePositionHelper("template<class T> std::map<int, int> foo() { static std::map<int, int> m; return m; }", 4));
-        ASSERT_EQUALS(10, templateNamePositionHelper("template<class T> std::map<int, int> & foo() { static std::map<int, int> m; return m; }", 4));
-        ASSERT_EQUALS(11, templateNamePositionHelper("template<class T> const std::map<int, int> & foo() { static std::map<int, int> m; return m; }", 4));
+        ASSERT_EQUALS(9, templateNamePositionHelper("template<class T> std::map<int, int> foo() { static std::map<int, int> m; return m; }\n", 4));
+        ASSERT_EQUALS(10, templateNamePositionHelper("template<class T> std::map<int, int> & foo() { static std::map<int, int> m; return m; }\n", 4));
+        ASSERT_EQUALS(11, templateNamePositionHelper("template<class T> const std::map<int, int> & foo() { static std::map<int, int> m; return m; }\n", 4));
         // Class template members
         ASSERT_EQUALS(4, templateNamePositionHelper(
-                          "class A { template<class T> unsigned foo(); }; "
-                          "template<class T> unsigned A::foo() { return 0; }", 19));
+                          "class A { template<class T> unsigned foo(); };\n"
+                          "template<class T> unsigned A::foo() { return 0; }\n", 19));
         ASSERT_EQUALS(5, templateNamePositionHelper(
-                          "class A { template<class T> const unsigned foo(); }; "
-                          "template<class T> const unsigned A::foo() { return 0; }", 20));
+                          "class A { template<class T> const unsigned foo(); };\n"
+                          "template<class T> const unsigned A::foo() { return 0; }\n", 20));
         ASSERT_EQUALS(7, templateNamePositionHelper(
-                          "class A { class B { template<class T> const unsigned foo(); }; } ; "
-                          "template<class T> const unsigned A::B::foo() { return 0; }", 25));
+                          "class A { class B { template<class T> const unsigned foo(); }; } ;\n"
+                          "template<class T> const unsigned A::B::foo() { return 0; }\n", 25));
         ASSERT_EQUALS(8, templateNamePositionHelper(
-                          "class A { class B { template<class T> const unsigned * foo(); }; } ; "
-                          "template<class T> const unsigned * A::B::foo() { return 0; }", 26));
+                          "class A { class B { template<class T> const unsigned * foo(); }; } ;\n"
+                          "template<class T> const unsigned * A::B::foo() { return 0; }\n", 26));
         ASSERT_EQUALS(9, templateNamePositionHelper(
-                          "class A { class B { template<class T> const unsigned ** foo(); }; } ; "
-                          "template<class T> const unsigned ** A::B::foo() { return 0; }", 27));
+                          "class A { class B { template<class T> const unsigned ** foo(); }; } ;\n"
+                          "template<class T> const unsigned ** A::B::foo() { return 0; }\n", 27));
         // Template class member
         ASSERT_EQUALS(6, templateNamePositionHelper(
-                          "template<class T> class A { A(); }; "
-                          "template<class T> A<T>::A() {}", 18));
+                          "template<class T> class A { A(); };\n"
+                          "template<class T> A<T>::A() {}\n", 18));
         ASSERT_EQUALS(8, templateNamePositionHelper(
-                          "template<class T, class U> class A { A(); }; "
-                          "template<class T, class U> A<T, U>::A() {}", 24));
+                          "template<class T, class U> class A { A(); };\n"
+                          "template<class T, class U> A<T, U>::A() {}\n", 24));
         ASSERT_EQUALS(7, templateNamePositionHelper(
-                          "template<class T> class A { unsigned foo(); }; "
-                          "template<class T> unsigned A<T>::foo() { return 0; }", 19));
+                          "template<class T> class A { unsigned foo(); };\n"
+                          "template<class T> unsigned A<T>::foo() { return 0; }\n", 19));
         ASSERT_EQUALS(9, templateNamePositionHelper(
-                          "template<class T, class U> class A { unsigned foo(); }; "
-                          "template<class T, class U> unsigned A<T, U>::foo() { return 0; }", 25));
+                          "template<class T, class U> class A { unsigned foo(); };\n"
+                          "template<class T, class U> unsigned A<T, U>::foo() { return 0; }\n", 25));
         ASSERT_EQUALS(12, templateNamePositionHelper(
-                          "template<> unsigned A<int, v<char> >::foo() { return 0; }", 2));
+                          "template<> unsigned A<int, v<char> >::foo() { return 0; }\n", 2));
     }
 
     // Helper function to unit test TemplateSimplifier::findTemplateDeclarationEnd
@@ -5632,14 +5717,14 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void findTemplateDeclarationEnd() {
-        ASSERT(findTemplateDeclarationEndHelper("template <typename T> class Fred { }; int x;", "; int x ;"));
-        ASSERT(findTemplateDeclarationEndHelper("template <typename T> void Fred() { } int x;", "} int x ;"));
-        ASSERT(findTemplateDeclarationEndHelper("template <typename T> int Fred = 0; int x;", "; int x ;"));
-        ASSERT(findTemplateDeclarationEndHelper("template <typename T> constexpr auto func = [](auto x){ return T(x);}; int x;", "; int x ;"));
-        ASSERT(findTemplateDeclarationEndHelper("template <class, class a> auto b() -> decltype(a{}.template b<void(int, int)>); int x;", "; int x ;"));
-        ASSERT(findTemplateDeclarationEndHelper("template <class, class a> auto b() -> decltype(a{}.template b<void(int, int)>){} int x;", "} int x ;"));
-        ASSERT(findTemplateDeclarationEndHelper("template <typename... f, c<h<e<typename f::d...>>::g>> void i(); int x;", "; int x ;"));
-        ASSERT(findTemplateDeclarationEndHelper("template <typename... f, c<h<e<typename f::d...>>::g>> void i(){} int x;", "} int x ;"));
+        ASSERT(findTemplateDeclarationEndHelper("template <typename T> class Fred { }; int x;\n", "; int x ;"));
+        ASSERT(findTemplateDeclarationEndHelper("template <typename T> void Fred() { } int x;\n", "} int x ;"));
+        ASSERT(findTemplateDeclarationEndHelper("template <typename T> int Fred = 0; int x;\n", "; int x ;"));
+        ASSERT(findTemplateDeclarationEndHelper("template <typename T> constexpr auto func = [](auto x){ return T(x);}; int x;\n", "; int x ;"));
+        ASSERT(findTemplateDeclarationEndHelper("template <class, class a> auto b() -> decltype(a{}.template b<void(int, int)>); int x;\n", "; int x ;"));
+        ASSERT(findTemplateDeclarationEndHelper("template <class, class a> auto b() -> decltype(a{}.template b<void(int, int)>){} int x;\n", "} int x ;"));
+        ASSERT(findTemplateDeclarationEndHelper("template <typename... f, c<h<e<typename f::d...>>::g>> void i(); int x;\n", "; int x ;"));
+        ASSERT(findTemplateDeclarationEndHelper("template <typename... f, c<h<e<typename f::d...>>::g>> void i(){} int x;\n", "} int x ;"));
     }
 
     // Helper function to unit test TemplateSimplifier::getTemplateParametersInDeclaration
@@ -5667,22 +5752,22 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void getTemplateParametersInDeclaration() {
-        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T> class Fred {};", std::vector<std::string> {"T"}));
-        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T=int> class Fred {};", std::vector<std::string> {"T"}));
-        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T,typename U> class Fred {};", std::vector<std::string> {"T","U"}));
-        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T,typename U=int> class Fred {};", std::vector<std::string> {"T","U"}));
-        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T=int,typename U=int> class Fred {};", std::vector<std::string> {"T","U"}));
+        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T> class Fred {};\n", std::vector<std::string> {"T"}));
+        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T=int> class Fred {};\n", std::vector<std::string> {"T"}));
+        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T,typename U> class Fred {};\n", std::vector<std::string> {"T","U"}));
+        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T,typename U=int> class Fred {};\n", std::vector<std::string> {"T","U"}));
+        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T=int,typename U=int> class Fred {};\n", std::vector<std::string> {"T","U"}));
     }
 
     void expandSpecialized1() {
-        ASSERT_EQUALS("class A<int> { } ;", tok("template<> class A<int> {};"));
-        ASSERT_EQUALS("class A<int> : public B { } ;", tok("template<> class A<int> : public B {};"));
-        ASSERT_EQUALS("class A<int> { A<int> ( ) ; ~ A<int> ( ) ; } ;", tok("template<> class A<int> { A(); ~A(); };"));
-        ASSERT_EQUALS("class A<int> { A<int> ( ) { } ~ A<int> ( ) { } } ;", tok("template<> class A<int> { A() {} ~A() {} };"));
+        ASSERT_EQUALS("class A<int> { } ;", tok("template<> class A<int> {};\n"));
+        ASSERT_EQUALS("class A<int> : public B { } ;", tok("template<> class A<int> : public B {};\n"));
+        ASSERT_EQUALS("class A<int> { A<int> ( ) ; ~ A<int> ( ) ; } ;", tok("template<> class A<int> { A(); ~A(); };\n"));
+        ASSERT_EQUALS("class A<int> { A<int> ( ) { } ~ A<int> ( ) { } } ;", tok("template<> class A<int> { A() {} ~A() {} };\n"));
         ASSERT_EQUALS("class A<int> { A<int> ( ) ; ~ A<int> ( ) ; } ; A<int> :: A<int> ( ) { } ~ A<int> :: A<int> ( ) { }",
-                      tok("template<> class A<int> { A(); ~A(); }; A<int>::A() { } ~A<int>::A() {}"));
+                      tok("template<> class A<int> { A(); ~A(); }; A<int>::A() { } ~A<int>::A() {}\n"));
         ASSERT_EQUALS("class A<int> { A<int> ( ) ; A<int> ( const A<int> & ) ; A<int> foo ( ) ; } ; A<int> :: A<int> ( ) { } A<int> :: A<int> ( const A<int> & ) { } A<int> A<int> :: foo ( ) { A<int> a ; return a ; }",
-                      tok("template<> class A<int> { A(); A(const A &) ; A foo(); }; A<int>::A() { } A<int>::A(const A &) { } A<int> A<int>::foo() { A a; return a; }"));
+                      tok("template<> class A<int> { A(); A(const A &) ; A foo(); }; A<int>::A() { } A<int>::A(const A &) { } A<int> A<int>::foo() { A a; return a; }\n"));
     }
 
     void expandSpecialized2() {
@@ -5714,7 +5799,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "   C(const C &) { }\n"
                                 "   ~C() { }\n"
                                 "   C & operator=(const C &) { return *this; }\n"
-                                "};";
+                                "};\n";
             const char expected[] = "class C<float> { "
                                     "public: "
                                     "C<float> ( ) { } "
@@ -5764,7 +5849,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "C::C() { }\n"
                                 "C::C(const C &) { }\n"
                                 "C::~C() { }\n"
-                                "C & C::operator=(const C &) { return *this; }";
+                                "C & C::operator=(const C &) { return *this; }\n";
             const char expected[] = "class C<float> { "
                                     "public: "
                                     "C<float> ( ) ; "
@@ -5786,7 +5871,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    void operator()(unsigned short) const;\n"
                             "private:\n"
                             "    std::basic_ostream<unsigned char> &outputStream_;\n"
-                            "};";
+                            "};\n";
         const char expected[] = "struct OutputU16<unsignedchar> { "
                                 "explicit OutputU16<unsignedchar> ( std :: basic_ostream < unsigned char > & t ) : outputStream_ ( t ) { } "
                                 "void operator() ( unsigned short ) const ; "
@@ -5799,7 +5884,7 @@ class TestSimplifyTemplate : public TestFixture {
     void expandSpecialized4() {
         {
             const char code[] = "template<> class C<char> { };\n"
-                                "map<int> m;";
+                                "map<int> m;\n";
             const char expected[] = "class C<char> { } ; "
                                     "map < int > m ;";
             ASSERT_EQUALS(expected, tok(code));
@@ -5807,7 +5892,7 @@ class TestSimplifyTemplate : public TestFixture {
         {
             const char code[] = "template<> class C<char> { };\n"
                                 "map<int> m;\n"
-                                "C<char> c;";
+                                "C<char> c;\n";
             const char expected[] = "class C<char> { } ; "
                                     "map < int > m ; "
                                     "C<char> c ;";
@@ -5827,7 +5912,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "template<typename T> class C { };\n"
                                 "template<> class C<char> { };\n"
                                 "map<int> m;\n"
-                                "C<int> i;";
+                                "C<int> i;\n";
             const char expected[] = "class C<char> ; "
                                     "class C<int> ; "
                                     "class C<char> { } ; "
@@ -5841,7 +5926,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "template<> class C<char> { };\n"
                                 "map<int> m;\n"
                                 "C<int> i;\n"
-                                "C<char> c;";
+                                "C<char> c;\n";
             const char expected[] = "class C<char> ; "
                                     "class C<int> ; "
                                     "class C<char> { } ; "
@@ -5919,7 +6004,7 @@ class TestSimplifyTemplate : public TestFixture {
     void templateAlias3() { // #8315
         const char code[] = "template <int> struct Tag {};\n"
                             "template <int ID> using SPtr = std::shared_ptr<void(Tag<ID>)>;\n"
-                            "SPtr<0> s;";
+                            "SPtr<0> s;\n";
         const char expected[] = "struct Tag<0> ; "
                                 "std :: shared_ptr < void ( Tag<0> ) > s ; "
                                 "struct Tag<0> { } ;";
@@ -5930,7 +6015,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <class T>\n"
                             "using IntrusivePtr = boost::intrusive_ptr<T>;\n"
                             "template <class T> class Vertex { };\n"
-                            "IntrusivePtr<Vertex<int>> p;";
+                            "IntrusivePtr<Vertex<int>> p;\n";
         const char expected[] = "class Vertex<int> ; "
                                 "boost :: intrusive_ptr < Vertex<int> > p ; "
                                 "class Vertex<int> { } ;";
@@ -5941,7 +6026,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template<typename T> using A = int;\n"
                             "template<typename T> using B = T;\n"
                             "A<char> a;\n"
-                            "B<char> b;";
+                            "B<char> b;\n";
         const char expected[] = "int a ; "
                                 "char b ;";
         ASSERT_EQUALS(expected, tok(code));
@@ -5960,25 +6045,25 @@ class TestSimplifyTemplate : public TestFixture {
     void instantiateMatchTest() {
         // Ticket #8175
         ASSERT_EQUALS(false,
-                      instantiateMatch("ConvertHelper < From, To > c ;",
+                      instantiateMatch("ConvertHelper < From, To > c ;\n",
                                        2, ":: %name% ("));
         ASSERT_EQUALS(true,
-                      instantiateMatch("ConvertHelper < From, To > :: Create ( ) ;",
+                      instantiateMatch("ConvertHelper < From, To > :: Create ( ) ;\n",
                                        2, ":: %name% ("));
         ASSERT_EQUALS(false,
-                      instantiateMatch("integral_constant < bool, sizeof ( ConvertHelper < From, To > :: Create ( ) ) > ;",
+                      instantiateMatch("integral_constant < bool, sizeof ( ConvertHelper < From, To > :: Create ( ) ) > ;\n",
                                        2, ":: %name% ("));
         ASSERT_EQUALS(false,
-                      instantiateMatch("integral_constant < bool, sizeof ( ns :: ConvertHelper < From, To > :: Create ( ) ) > ;",
+                      instantiateMatch("integral_constant < bool, sizeof ( ns :: ConvertHelper < From, To > :: Create ( ) ) > ;\n",
                                        2, ":: %name% ("));
     }
 
     void templateParameterWithoutName() {
-        ASSERT_EQUALS(1U, templateParameters("template<typename = void> struct s;"));
+        ASSERT_EQUALS(1U, templateParameters("template<typename = void> struct s;\n"));
         ASSERT_EQUALS(1U, templateParameters("template<template<typename = float> typename T> struct A {\n"
                                              "    void f();\n"
                                              "    void g();\n"
-                                             "};n"));
+                                             "};n\n"));
     }
 
     void templateTypeDeduction1() { // #8962
@@ -6007,7 +6092,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    f(L\"string\");\n"
                             "    f(true);\n"
                             "    f(false);\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void f<int> ( int n ) ; "
                                 "void f<unsignedint> ( unsigned int n ) ; "
                                 "void f<long> ( long n ) ; "
@@ -6071,7 +6156,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "static void func() {\n"
                             "    f(0, 0.0);\n"
                             "    f(0.0, 0);\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "void f<int,double> ( int t , double u ) ; "
                                 "void f<double,int> ( double t , int u ) ; "
@@ -6100,7 +6185,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "int main() {\n"
                             "    A a;\n"
                             "    a.f();\n"
-                            "}";
+                            "}\n";
         const char exp[]  = "struct A { "
                             "int a ; a = 1 ; "
                             "void f ( ) { g<int> ( 1 ) ; } "
@@ -6117,7 +6202,7 @@ class TestSimplifyTemplate : public TestFixture {
         {
             const char code[] = "int a = 1;\n"
                                 "template <typename T> void f(T x, T y) { a = x + y; }\n"
-                                "void test() { f(0, 0); }";
+                                "void test() { f(0, 0); }\n";
             const char exp[]  = "int a ; a = 1 ; "
                                 "void f<int> ( int x , int y ) ; "
                                 "void test ( ) { f<int> ( 0 , 0 ) ; } "
@@ -6127,7 +6212,7 @@ class TestSimplifyTemplate : public TestFixture {
         {
             const char code[] = "int a = 1;\n"
                                 "template <typename T> void f(T x, double y) { a = x + y; }\n"
-                                "void test() { f(0, 0.0); }";
+                                "void test() { f(0, 0.0); }\n";
             const char exp[]  = "int a ; a = 1 ; "
                                 "void f<int> ( int x , double y ) ; "
                                 "void test ( ) { f<int> ( 0 , 0.0 ) ; } "
@@ -6137,7 +6222,7 @@ class TestSimplifyTemplate : public TestFixture {
         {
             const char code[] = "int a = 1;\n"
                                 "template <typename T> void f(double x, T y) { a = x + y; }\n"
-                                "void test() { f(0.0, 0); }";
+                                "void test() { f(0.0, 0); }\n";
             const char exp[]  = "int a ; a = 1 ; "
                                 "void f<int> ( double x , int y ) ; "
                                 "void test ( ) { f<int> ( 0.0 , 0 ) ; } "
@@ -6154,7 +6239,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "    f(0.0, 0);\n"
                                 "    f(0, 0.0);\n"
                                 "    f(0.0, 0.0);\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "int a ; a = 1 ; "
                                 "void f<int> ( int x , int y ) ; "
                                 "void f<int> ( double x , int y ) ; "
@@ -6187,7 +6272,7 @@ class TestSimplifyTemplate : public TestFixture {
         {
             const char code[] = "int a = 1;\n"
                                 "template <typename T, typename U> void f(T x, U y) { a = x + y; }\n"
-                                "void test() { f(0, 0.0); }";
+                                "void test() { f(0, 0.0); }\n";
             const char exp[]  = "int a ; a = 1 ; "
                                 "void f<int,double> ( int x , double y ) ; "
                                 "void test ( ) { f<int,double> ( 0 , 0.0 ) ; } "
@@ -6208,7 +6293,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "Fred fred1 = Fred(0);\n"
                                 "Fred fred2 = Fred(0.0);\n"
                                 "Fred fred3 = Fred(\"zero\");\n"
-                                "Fred fred4 = Fred(false);";
+                                "Fred fred4 = Fred(false);\n";
             const char exp[]  = "class Fred { "
                                 "public: "
                                 "Fred<int> ( int t ) ; "
@@ -6267,26 +6352,26 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void simplifyTemplateArgs1() {
-        ASSERT_EQUALS("foo<2> = 2 ; foo<2> ;", tok("template<int N> foo = N; foo < ( 2 ) >;"));
-        ASSERT_EQUALS("foo<2> = 2 ; foo<2> ;", tok("template<int N> foo = N; foo < 1 + 1 >;"));
-        ASSERT_EQUALS("foo<2> = 2 ; foo<2> ;", tok("template<int N> foo = N; foo < ( 1 + 1 ) >;"));
+        ASSERT_EQUALS("foo<2> = 2 ; foo<2> ;", tok("template<int N> foo = N; foo < ( 2 ) >;\n"));
+        ASSERT_EQUALS("foo<2> = 2 ; foo<2> ;", tok("template<int N> foo = N; foo < 1 + 1 >;\n"));
+        ASSERT_EQUALS("foo<2> = 2 ; foo<2> ;", tok("template<int N> foo = N; foo < ( 1 + 1 ) >;\n"));
 
-        ASSERT_EQUALS("foo<2,2> = 4 ; foo<2,2> ;", tok("template<int N, int M> foo = N * M; foo < ( 2 ), ( 2 ) >;"));
-        ASSERT_EQUALS("foo<2,2> = 4 ; foo<2,2> ;", tok("template<int N, int M> foo = N * M; foo < 1 + 1, 1 + 1 >;"));
-        ASSERT_EQUALS("foo<2,2> = 4 ; foo<2,2> ;", tok("template<int N, int M> foo = N * M; foo < ( 1 + 1 ), ( 1 + 1 ) >;"));
+        ASSERT_EQUALS("foo<2,2> = 4 ; foo<2,2> ;", tok("template<int N, int M> foo = N * M; foo < ( 2 ), ( 2 ) >;\n"));
+        ASSERT_EQUALS("foo<2,2> = 4 ; foo<2,2> ;", tok("template<int N, int M> foo = N * M; foo < 1 + 1, 1 + 1 >;\n"));
+        ASSERT_EQUALS("foo<2,2> = 4 ; foo<2,2> ;", tok("template<int N, int M> foo = N * M; foo < ( 1 + 1 ), ( 1 + 1 ) >;\n"));
 
-        ASSERT_EQUALS("foo<true> = true ; foo<true> ;", tok("template<bool N> foo = N; foo < true ? true : false >;"));
-        ASSERT_EQUALS("foo<false> = false ; foo<false> ;", tok("template<bool N> foo = N; foo < false ? true : false >;"));
-        ASSERT_EQUALS("foo<true> = true ; foo<true> ;", tok("template<bool N> foo = N; foo < 1 ? true : false >;"));
-        ASSERT_EQUALS("foo<false> = false ; foo<false> ;", tok("template<bool N> foo = N; foo < 0 ? true : false >;"));
-        ASSERT_EQUALS("foo<true> = true ; foo<true> ;", tok("template<bool N> foo = N; foo < (1 + 1 ) ? true : false >;"));
-        ASSERT_EQUALS("foo<false> = false ; foo<false> ;", tok("template<bool N> foo = N; foo < ( 1 - 1) ? true : false >;"));
+        ASSERT_EQUALS("foo<true> = true ; foo<true> ;", tok("template<bool N> foo = N; foo < true ? true : false >;\n"));
+        ASSERT_EQUALS("foo<false> = false ; foo<false> ;", tok("template<bool N> foo = N; foo < false ? true : false >;\n"));
+        ASSERT_EQUALS("foo<true> = true ; foo<true> ;", tok("template<bool N> foo = N; foo < 1 ? true : false >;\n"));
+        ASSERT_EQUALS("foo<false> = false ; foo<false> ;", tok("template<bool N> foo = N; foo < 0 ? true : false >;\n"));
+        ASSERT_EQUALS("foo<true> = true ; foo<true> ;", tok("template<bool N> foo = N; foo < (1 + 1 ) ? true : false >;\n"));
+        ASSERT_EQUALS("foo<false> = false ; foo<false> ;", tok("template<bool N> foo = N; foo < ( 1 - 1) ? true : false >;\n"));
     }
 
     void simplifyTemplateArgs2() {
         const char code[] = "template<bool T> struct a_t { static const bool t = T; };\n"
                             "typedef a_t<sizeof(void*) == sizeof(char)> a;\n"
-                            "void foo() { bool b = a::t; }";
+                            "void foo() { bool b = a::t; }\n";
         const char expected[] = "struct a_t<false> ; "
                                 "void foo ( ) { bool b ; b = a_t<false> :: t ; } "
                                 "struct a_t<false> { static const bool t = false ; } ;";
@@ -6324,7 +6409,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template_variadic_1() { // #9144
         const char code[] = "template <typename...> struct e {};\n"
-                            "static_assert(sizeof(e<>) == sizeof(e<int,int>), \"\");";
+                            "static_assert(sizeof(e<>) == sizeof(e<int,int>), \"\");\n";
         const char expected[] = "struct e<> ; struct e<int,int> ; "
                                 "static_assert ( sizeof ( e<> ) == sizeof ( e<int,int> ) , \"\" ) ; "
                                 "struct e<> { } ; struct e<int,int> { } ;";
@@ -6337,7 +6422,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "\n"
                             "int main() {\n"
                             "    printf<int, float>(\"\", foo, bar);\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void printf<int,float> ( const char * s , int value , float ) ; "
                                 "int main ( ) { printf<int,float> ( \"\" , foo , bar ) ; } "
                                 "void printf<int,float> ( const char * s , int value , float ) { }";
@@ -6345,14 +6430,14 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template_variadic_3() { // #6172
-        const char code[] = "template<int N, int ... M> struct A { "
-                            "  static void foo() { "
-                            "    int i = N; "
-                            "  } "
-                            "}; "
-                            "void bar() { "
-                            "  A<0>::foo(); "
-                            "}";
+        const char code[] = "template<int N, int ... M> struct A {\n"
+                            "  static void foo() {\n"
+                            "    int i = N;\n"
+                            "  }\n"
+                            "};\n"
+                            "void bar() {\n"
+                            "  A<0>::foo();\n"
+                            "}\n";
         const char expected[] = "struct A<0> ; "
                                 "void bar ( ) { A<0> :: foo ( ) ; } "
                                 "struct A<0> { static void foo ( ) { int i ; i = ( int ) 0 ; } } ;";
@@ -6372,7 +6457,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "class E<1,3> { "
                                 "template < int ... I > "
                                 "int f ( int n , std :: integer_sequence < int , I ... > ) { "
-                                "return ( ( ( I == n ) ? : 0 ) + ... ) ; "
+                                "return ( ( ( I == n ) ? ( 1 , 3 ) : 0 ) + ... ) ; "  // TODO the simplification is not quite correct
                                 "} "
                                 "} ;";
         ASSERT_EQUALS(expected, tok(code));
@@ -6390,33 +6475,45 @@ class TestSimplifyTemplate : public TestFixture {
                                  "A<int,S> a ; "
                                  "struct A<int,S> { } ;";
         ASSERT_EQUALS(expected2, tok(code2));
+
+        const char code3[] = "template <int... N>\n" // #14477
+                             "    int f() {\n"
+                             "    return (0 | ... | (1, 2, 4));\n"
+                             "}\n"
+                             "int main() {\n"
+                             "    return f<1, 2, 4>();\n"
+                             "}\n";
+        const char expected3[] = "int f<1,2,4> ( ) ; "
+                                 "int main ( ) { return f<1,2,4> ( ) ; } "
+                                 "int f<1,2,4> ( ) { return ( 0 | ... | ( 1 , 2 , 4 ) ) ; }";
+        ASSERT_EQUALS(expected3, tok(code3));
     }
 
     void template_variable_1() {
         {
             const char code[] = "template <int N> const int foo = N*N;\n"
-                                "int x = foo<7>;";
+                                "int x = foo<7>;\n";
             const char expected[] = "const int foo<7> = 49 ; "
                                     "int x ; x = foo<7> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template <int> const int foo = 7;\n"
-                                "int x = foo<7>;";
+                                "int x = foo<7>;\n";
             const char expected[] = "const int foo<7> = 7 ; "
                                     "int x ; x = foo<7> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template <int N = 7> const int foo = N*N;\n"
-                                "int x = foo<7>;";
+                                "int x = foo<7>;\n";
             const char expected[] = "const int foo<7> = 49 ; "
                                     "int x ; x = foo<7> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template <int N = 7> const int foo = N*N;\n"
-                                "int x = foo<>;";
+                                "int x = foo<>;\n";
             const char expected[] = "const int foo<7> = 49 ; "
                                     "int x ; x = foo<7> ;";
             ASSERT_EQUALS(expected, tok(code));
@@ -6426,28 +6523,28 @@ class TestSimplifyTemplate : public TestFixture {
     void template_variable_2() {
         {
             const char code[] = "template<class T> constexpr T pi = T(3.1415926535897932385L);\n"
-                                "float x = pi<float>;";
+                                "float x = pi<float>;\n";
             const char expected[] = "constexpr float pi<float> = float ( 3.1415926535897932385L ) ; "
                                     "float x ; x = pi<float> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template<class> constexpr float pi = float(3.1415926535897932385L);\n"
-                                "float x = pi<float>;";
+                                "float x = pi<float>;\n";
             const char expected[] = "constexpr float pi<float> = float ( 3.1415926535897932385L ) ; "
                                     "float x ; x = pi<float> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template<class T = float> constexpr T pi = T(3.1415926535897932385L);\n"
-                                "float x = pi<float>;";
+                                "float x = pi<float>;\n";
             const char expected[] = "constexpr float pi<float> = float ( 3.1415926535897932385L ) ; "
                                     "float x ; x = pi<float> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template<class T = float> constexpr T pi = T(3.1415926535897932385L);\n"
-                                "float x = pi<>;";
+                                "float x = pi<>;\n";
             const char expected[] = "constexpr float pi<float> = float ( 3.1415926535897932385L ) ; "
                                     "float x ; x = pi<float> ;";
             ASSERT_EQUALS(expected, tok(code));
@@ -6457,35 +6554,35 @@ class TestSimplifyTemplate : public TestFixture {
     void template_variable_3() {
         {
             const char code[] = "template<class T, int N> constexpr T foo = T(N*N);\n"
-                                "float x = foo<float,7>;";
+                                "float x = foo<float,7>;\n";
             const char expected[] = "constexpr float foo<float,7> = float ( 49 ) ; "
                                     "float x ; x = foo<float,7> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template<class,int> constexpr float foo = float(7);\n"
-                                "float x = foo<float,7>;";
+                                "float x = foo<float,7>;\n";
             const char expected[] = "constexpr float foo<float,7> = float ( 7 ) ; "
                                     "float x ; x = foo<float,7> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template<class T = float, int N = 7> constexpr T foo = T(7);\n"
-                                "double x = foo<double, 14>;";
+                                "double x = foo<double, 14>;\n";
             const char expected[] = "constexpr double foo<double,14> = double ( 7 ) ; "
                                     "double x ; x = foo<double,14> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template<class T = float, int N = 7> constexpr T foo = T(7);\n"
-                                "float x = foo<>;";
+                                "float x = foo<>;\n";
             const char expected[] = "constexpr float foo<float,7> = float ( 7 ) ; "
                                     "float x ; x = foo<float,7> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template<class T = float, int N = 7> constexpr T foo = T(7);\n"
-                                "double x = foo<double>;";
+                                "double x = foo<double>;\n";
             const char expected[] = "constexpr double foo<double,7> = double ( 7 ) ; "
                                     "double x ; x = foo<double,7> ;";
             ASSERT_EQUALS(expected, tok(code));
@@ -6495,7 +6592,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template_variable_4() {
         const char code[] = "template<typename T> void test() { }\n"
                             "template<typename T> decltype(test<T>)* foo = &(test<T>);\n"
-                            "void bar() { foo<int>(); }";
+                            "void bar() { foo<int>(); }\n";
         const char expected[] = "void test<int> ( ) ; "
                                 "decltype ( test<int> ) * foo<int> = & ( test<int> ) ; "
                                 "void bar ( ) { foo<int> ( ) ; } "
@@ -6514,7 +6611,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "type<decltype(0ULL)> ull;\n"
                             "type<decltype(0.0)> d;\n"
                             "type<decltype(0.0F)> f;\n"
-                            "type<decltype(0.0L)> ld;";
+                            "type<decltype(0.0L)> ld;\n";
         const char expected[] = "class type<bool> ; "
                                 "class type<int> ; "
                                 "class type<unsignedint> ; "
@@ -6553,7 +6650,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename TC> class Base {};\n"
                             "template <typename TC> class Derived : private Base<TC> {};\n"
                             "typedef Derived<C<static_cast<int>(-1)> > C_;\n"
-                            "class C3 { C_ c; };";
+                            "class C3 { C_ c; };\n";
         const char expected[] = "template < int N > class C { } ; "
                                 "class Base<C<static_cast<int>(-1)>> ; "
                                 "class Derived<C<static_cast<int>(-1)>> ; "
@@ -6565,63 +6662,63 @@ class TestSimplifyTemplate : public TestFixture {
 
     void fold_expression_1() {
         const char code[] = "template<typename... Args> bool all(Args... args) { return (... && args); }\n"
-                            "x=all(true,false,true,true);";
+                            "x=all(true,false,true,true);\n";
         const char expected[] = "template < typename ... Args > bool all ( Args ... args ) { return ( __cppcheck_fold_&&__ ( args ... ) ) ; } x = all ( true , false , true , true ) ;";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void fold_expression_2() {
         const char code[] = "template<typename... Args> bool all(Args... args) { return (args && ...); }\n"
-                            "x=all(true,false,true,true);";
+                            "x=all(true,false,true,true);\n";
         const char expected[] = "template < typename ... Args > bool all ( Args ... args ) { return ( __cppcheck_fold_&&__ ( args ... ) ) ; } x = all ( true , false , true , true ) ;";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void fold_expression_3() {
         const char code[] = "template<typename... Args> int foo(Args... args) { return (12 * ... * args); }\n"
-                            "x=foo(1,2);";
+                            "x=foo(1,2);\n";
         const char expected[] = "template < typename ... Args > int foo ( Args ... args ) { return ( __cppcheck_fold_*__ ( args ... ) ) ; } x = foo ( 1 , 2 ) ;";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void fold_expression_4() {
         const char code[] = "template<typename... Args> int foo(Args... args) { return (args * ... * 123); }\n"
-                            "x=foo(1,2);";
+                            "x=foo(1,2);\n";
         const char expected[] = "template < typename ... Args > int foo ( Args ... args ) { return ( __cppcheck_fold_*__ ( args ... ) ) ; } x = foo ( 1 , 2 ) ;";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void concepts1() {
         const char code[] = "template <my_concept T> void f(T v) {}\n"
-                            "f<int>(123);";
+                            "f<int>(123);\n";
         const char expected[] = "void f<int> ( int v ) ; f<int> ( 123 ) ; void f<int> ( int v ) { }";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void requires1() {
         const char code[] = "template <class T> requires my_concept<T> void f(T v) {}\n"
-                            "f<int>(123);";
+                            "f<int>(123);\n";
         const char expected[] = "void f<int> ( int v ) ; f<int> ( 123 ) ; void f<int> ( int v ) { }";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void requires2() {
         const char code[] = "template<class T> requires (sizeof(T) > 1 && get_value<T>()) void f(T v){}\n"
-                            "f<int>(123);";
+                            "f<int>(123);\n";
         const char expected[] = "void f<int> ( int v ) ; f<int> ( 123 ) ; void f<int> ( int v ) { }";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void requires3() {
         const char code[] = "template<class T> requires c1<T> && c2<T> void f(T v){}\n"
-                            "f<int>(123);";
+                            "f<int>(123);\n";
         const char expected[] = "void f<int> ( int v ) ; f<int> ( 123 ) ; void f<int> ( int v ) { }";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void requires4() {
         const char code[] = "template <class T> void f(T v) requires my_concept<T> {}\n"
-                            "f<int>(123);";
+                            "f<int>(123);\n";
         const char expected[] = "void f<int> ( int v ) ; f<int> ( 123 ) ; void f<int> ( int v ) { }";
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -6630,18 +6727,34 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <class T>\n"
                             "  requires requires (T x) { x + x; }\n"
                             "  T add(T a, T b) { return a + b; }\n"
-                            "add<int>(123,456);";
+                            "add<int>(123,456);\n";
         const char expected[] = "int add<int> ( int a , int b ) ; add<int> ( 123 , 456 ) ; int add<int> ( int a , int b ) { return a + b ; }";
         ASSERT_EQUALS(expected, tok(code));
     }
 
+    void requires6() {
+        const char code[] = "template <int N>\n" // #14982
+                            "struct S {\n"
+                            "  static void f() noexcept\n"
+                            "    requires(N >= 5) {}\n"
+                            "  void g() const\n"
+                            "    requires(N >= 5) {}\n"
+                            "};";
+        const char expected[] = "template < int N > "
+                                "struct S { "
+                                "static void f ( ) noexcept { } "
+                                "void g ( ) const { } "
+                                "} ;";
+        ASSERT_EQUALS(expected, tok(code));
+    }
+
     void explicitBool1() {
-        const char code[] = "class Fred { explicit(true) Fred(int); };";
+        const char code[] = "class Fred { explicit(true) Fred(int); };\n";
         ASSERT_EQUALS("class Fred { explicit Fred ( int ) ; } ;", tok(code));
     }
 
     void explicitBool2() {
-        const char code[] = "class Fred { explicit(false) Fred(int); };";
+        const char code[] = "class Fred { explicit(false) Fred(int); };\n";
         ASSERT_EQUALS("class Fred { Fred ( int ) ; } ;", tok(code));
     }
 
@@ -6656,9 +6769,24 @@ class TestSimplifyTemplate : public TestFixture {
                       tok(code));
     }
 
+    void template_shift_negative() {
+        // a large hex literal is not negative as a string but parses to a negative
+        // bigint, so folding the shift in simplifyNumericCalculations would left-shift
+        // a negative value / shift by a negative count, both UB. the operand must be
+        // returned unchanged. parentheses are needed so the numeric folding is reached.
+        const char code[] = "template <long long> struct S { };\n"
+                            "S<(0x8000000000000000 << 1)> s1;\n"
+                            "S<(1 << 0x8000000000000000)> s2;\n"
+                            "S<(1 >> 0x8000000000000000)> s3;\n";
+        const char expected[] = "struct S<9223372036854775808U> ; struct S<1> ; "
+                                "S<9223372036854775808U> s1 ; S<1> s2 ; S<1> s3 ; "
+                                "struct S<9223372036854775808U> { } ; struct S<1> { } ;";
+        ASSERT_EQUALS(expected, tok(code));
+    }
+
     void dumpTemplateArgFrom() {
         const char code[] = "template<class T> void foo(T t) {}\n"
-                            "foo<int>(23);";
+                            "foo<int>(23);\n";
         const std::string d = dump(code);
         ASSERT(!d.empty());
 
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
index f55b1e83fc7..8d941c06464 100644
--- a/test/testsimplifytokens.cpp
+++ b/test/testsimplifytokens.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -208,7 +208,7 @@ class TestSimplifyTokens : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // result..
-        return tokenizer.tokens()->stringifyList(true);
+        return tokenizer.tokens()->stringifyList(true, false, true, true, true);
     }
 
 
@@ -232,10 +232,10 @@ class TestSimplifyTokens : public TestFixture {
                              "}\n";
         ASSERT_EQUALS(tok(code2), tok(code1));
 
-        const char code3[] = "x = L\"1\" TEXT(\"2\") L\"3\";";
+        const char code3[] = "x = L\"1\" TEXT(\"2\") L\"3\";\n";
         ASSERT_EQUALS("x = L\"123\" ;", tok(code3, dinit(TokOptions, $.type = Platform::Type::Win64)));
 
-        const char code4[] = "x = TEXT(\"1\") L\"2\";";
+        const char code4[] = "x = TEXT(\"1\") L\"2\";\n";
         ASSERT_EQUALS("x = L\"1\" L\"2\" ;", tok(code4, dinit(TokOptions, $.type = Platform::Type::Win64)));
     }
 
@@ -251,7 +251,7 @@ class TestSimplifyTokens : public TestFixture {
     }
 
     void combine_ustrings() {
-        const char code[] =  "abcd = u\"ab\" u\"cd\";";
+        const char code[] =  "abcd = u\"ab\" u\"cd\";\n";
 
         const char expected[] =  "abcd = u\"abcd\" ;";
 
@@ -262,7 +262,7 @@ class TestSimplifyTokens : public TestFixture {
     }
 
     void combine_Ustrings() {
-        const char code[] =  "abcd = U\"ab\" U\"cd\";";
+        const char code[] =  "abcd = U\"ab\" U\"cd\";\n";
 
         const char expected[] =  "abcd = U\"abcd\" ;";
 
@@ -273,7 +273,7 @@ class TestSimplifyTokens : public TestFixture {
     }
 
     void combine_u8strings() {
-        const char code[] =  "abcd = u8\"ab\" u8\"cd\";";
+        const char code[] =  "abcd = u8\"ab\" u8\"cd\";\n";
 
         const char expected[] =  "abcd = u8\"abcd\" ;";
 
@@ -284,7 +284,7 @@ class TestSimplifyTokens : public TestFixture {
     }
 
     void combine_mixedstrings() {
-        const char code[] = "abcdef = \"ab\" L\"cd\" \"ef\";";
+        const char code[] = "abcdef = \"ab\" L\"cd\" \"ef\";\n";
 
         const char expected[] =  "abcdef = L\"abcdef\" ;";
 
@@ -462,24 +462,25 @@ class TestSimplifyTokens : public TestFixture {
 
 
     void declareVar() {
-        const char code[] = "void f ( ) { char str [ 100 ] = \"100\" ; }";
-        ASSERT_EQUALS(code, tok(code));
+        const char code[] = "void f ( ) { char str [ 100 ] = \"100\" ; }\n";
+        const char expected[] = "void f ( ) { char str [ 100 ] = \"100\" ; }";
+        ASSERT_EQUALS(expected, tok(code));
     }
 
     void declareArray() {
-        const char code1[] = "void f ( ) { char str [ ] = \"100\" ; }";
+        const char code1[] = "void f ( ) { char str [ ] = \"100\" ; }\n";
         const char expected1[] = "void f ( ) { char str [ 4 ] = \"100\" ; }";
         ASSERT_EQUALS(expected1, tok(code1));
 
-        const char code2[] = "char str [ ] = \"\\x00\";";
+        const char code2[] = "char str [ ] = \"\\x00\";\n";
         const char expected2[] = "char str [ 2 ] = \"\\0\" ;";
         ASSERT_EQUALS(expected2, tok(code2));
 
-        const char code3[] = "char str [ ] = \"\\0\";";
+        const char code3[] = "char str [ ] = \"\\0\";\n";
         const char expected3[] = "char str [ 2 ] = \"\\0\" ;";
         ASSERT_EQUALS(expected3, tok(code3));
 
-        const char code4[] = "char str [ ] = \"\\n\\n\";";
+        const char code4[] = "char str [ ] = \"\\n\\n\";\n";
         const char expected4[] = "char str [ 3 ] = \"\\n\\n\" ;";
         ASSERT_EQUALS(expected4, tok(code4));
     }
@@ -512,11 +513,11 @@ class TestSimplifyTokens : public TestFixture {
 
 
     void elseif1() {
-        const char code[] = "void f(){ if(x) {} else if(ab) { cd } else { ef }gh; }";
+        const char code[] = "void f(){ if(x) {} else if(ab) { cd } else { ef }gh; }\n";
         ASSERT_EQUALS("\n\n##file 0\n1: void f ( ) { if ( x ) { } else { if ( ab ) { cd } else { ef } } gh ; }\n", tokenizeDebugListing(code));
 
         // syntax error: assert there is no segmentation fault
-        ASSERT_EQUALS("\n\n##file 0\n1: void f ( ) { if ( x ) { } else { if ( x ) { } } }\n", tokenizeDebugListing("void f(){ if(x) {} else if (x) { } }"));
+        ASSERT_EQUALS("\n\n##file 0\n1: void f ( ) { if ( x ) { } else { if ( x ) { } } }\n", tokenizeDebugListing("void f(){ if(x) {} else if (x) { } }\n"));
 
         {
             const char src[] =  "void f(int g,int f) {\n"
@@ -527,7 +528,7 @@ class TestSimplifyTokens : public TestFixture {
                                " else if( f==1)\n"
                                "  goo();\n"
                                "}\n"
-                               "}";
+                               "}\n";
 
             const char expected[] = "void f ( int g , int f ) "
                                     "{ "
@@ -544,23 +545,23 @@ class TestSimplifyTokens : public TestFixture {
                                     "} "
                                     "} "
                                     "} "
-                                    "}";
+                                    "}\n";
             ASSERT_EQUALS(tok(expected), tok(src));
         }
 
         // Ticket #6860 - lambdas
         {
-            const char src[] = "( []{if (ab) {cd}else if(ef) { gh } else { ij }kl}() );";
+            const char src[] = "( []{if (ab) {cd}else if(ef) { gh } else { ij }kl}() );\n";
             const char expected[] = "\n\n##file 0\n1: ( [ ] { if ( ab ) { cd } else { if ( ef ) { gh } else { ij } } kl } ( ) ) ;\n";
             ASSERT_EQUALS(expected, tokenizeDebugListing(src));
         }
         {
-            const char src[] = "[ []{if (ab) {cd}else if(ef) { gh } else { ij }kl}() ];";
+            const char src[] = "[ []{if (ab) {cd}else if(ef) { gh } else { ij }kl}() ];\n";
             const char expected[] = "\n\n##file 0\n1: [ [ ] { if ( ab ) { cd } else { if ( ef ) { gh } else { ij } } kl } ( ) ] ;\n";
             ASSERT_EQUALS(expected, tokenizeDebugListing(src));
         }
         {
-            const char src[] = "= { []{if (ab) {cd}else if(ef) { gh } else { ij }kl}() }";
+            const char src[] = "= { []{if (ab) {cd}else if(ef) { gh } else { ij }kl}() }\n";
             const char expected[] = "\n\n##file 0\n1: = { [ ] { if ( ab ) { cd } else { if ( ef ) { gh } else { ij } } kl } ( ) }\n";
             ASSERT_EQUALS(expected, tokenizeDebugListing(src));
         }
@@ -569,19 +570,19 @@ class TestSimplifyTokens : public TestFixture {
 
     void namespaces() {
         {
-            const char code[] = "namespace std { }";
+            const char code[] = "namespace std { }\n";
 
             ASSERT_EQUALS(";", tok(code));
         }
 
         {
-            const char code[] = "; namespace std { }";
+            const char code[] = "; namespace std { }\n";
 
             ASSERT_EQUALS(";", tok(code));
         }
 
         {
-            const char code[] = "using namespace std; namespace a{ namespace b{ void f(){} } }";
+            const char code[] = "using namespace std; namespace a{ namespace b{ void f(){} } }\n";
 
             const char expected[] = "namespace a { namespace b { void f ( ) { } } }";
 
@@ -589,7 +590,7 @@ class TestSimplifyTokens : public TestFixture {
         }
 
         {
-            const char code[] = "namespace b{ void f(){} }";
+            const char code[] = "namespace b{ void f(){} }\n";
 
             const char expected[] = "namespace b { void f ( ) { } }";
 
@@ -597,78 +598,78 @@ class TestSimplifyTokens : public TestFixture {
         }
 
         {
-            const char code[] = "void f(int namespace) { }";
+            const char code[] = "void f(int namespace) { }\n";
 
             ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
         }
     }
 
     void not1() {
-        ASSERT_EQUALS("void f ( ) { if ( ! p ) { ; } }", tok("void f() { if (not p); }", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { if ( p && ! q ) { ; } }", tok("void f() { if (p && not q); }", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { a = ! ( p && q ) ; }", tok("void f() { a = not(p && q); }", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( ! p ) { ; } }", tok("void f() { if (not p); }\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( p && ! q ) { ; } }", tok("void f() { if (p && not q); }\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { a = ! ( p && q ) ; }", tok("void f() { a = not(p && q); }\n", dinit(TokOptions, $.cpp = false)));
         // Don't simplify 'not' or 'compl' if they are defined as a type;
         // in variable declaration and in function declaration/definition
-        ASSERT_EQUALS("struct not { int x ; } ;", tok("struct not { int x; };", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { not p ; compl c ; }", tok(" void f() { not p; compl c; }", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("void foo ( not i ) ;", tok("void foo(not i);", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("int foo ( not i ) { return g ( i ) ; }", tok("int foo(not i) { return g(i); }", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("struct not { int x ; } ;", tok("struct not { int x; };\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { not p ; compl c ; }", tok(" void f() { not p; compl c; }\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("void foo ( not i ) ;", tok("void foo(not i);\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("int foo ( not i ) { return g ( i ) ; }", tok("int foo(not i) { return g(i); }\n", dinit(TokOptions, $.cpp = false)));
     }
 
     void and1() {
         ASSERT_EQUALS("void f ( ) { if ( p && q ) { ; } }",
-                      tok("void f() { if (p and q) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (p and q) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( foo ( ) && q ) { ; } }",
-                      tok("void f() { if (foo() and q) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (foo() and q) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( foo ( ) && bar ( ) ) { ; } }",
-                      tok("void f() { if (foo() and bar()) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (foo() and bar()) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( p && bar ( ) ) { ; } }",
-                      tok("void f() { if (p and bar()) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (p and bar()) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( p && ! q ) { ; } }",
-                      tok("void f() { if (p and not q) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (p and not q) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { r = a && b ; }",
-                      tok("void f() { r = a and b; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { r = a and b; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { r = ( a || b ) && ( c || d ) ; }",
-                      tok("void f() { r = (a || b) and (c || d); }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { r = (a || b) and (c || d); }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( test1 [ i ] == 'A' && test2 [ i ] == 'C' ) { } }",
-                      tok("void f() { if (test1[i] == 'A' and test2[i] == 'C') {} }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (test1[i] == 'A' and test2[i] == 'C') {} }\n", dinit(TokOptions, $.cpp = false)));
     }
 
     void or1() {
         ASSERT_EQUALS("void f ( ) { if ( p || q ) { ; } }",
-                      tok("void f() { if (p or q) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (p or q) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( foo ( ) || q ) { ; } }",
-                      tok("void f() { if (foo() or q) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (foo() or q) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( foo ( ) || bar ( ) ) { ; } }",
-                      tok("void f() { if (foo() or bar()) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (foo() or bar()) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( p || bar ( ) ) { ; } }",
-                      tok("void f() { if (p or bar()) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (p or bar()) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( p || ! q ) { ; } }",
-                      tok("void f() { if (p or not q) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (p or not q) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { r = a || b ; }",
-                      tok("void f() { r = a or b; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { r = a or b; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { r = ( a && b ) || ( c && d ) ; }",
-                      tok("void f() { r = (a && b) or (c && d); }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { r = (a && b) or (c && d); }\n", dinit(TokOptions, $.cpp = false)));
     }
 
     void cAlternativeTokens() {
         ASSERT_EQUALS("void f ( ) { err |= ( ( r & s ) && ! t ) ; }",
-                      tok("void f() { err or_eq ((r bitand s) and not t); }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { err or_eq ((r bitand s) and not t); }\n", dinit(TokOptions, $.cpp = false)));
         ASSERT_EQUALS("void f ( ) const { r = f ( a [ 4 ] | 0x0F , ~ c , ! d ) ; }",
-                      tok("void f() const { r = f(a[4] bitor 0x0F, compl c, not d) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() const { r = f(a[4] bitor 0x0F, compl c, not d) ; }\n", dinit(TokOptions, $.cpp = false)));
 
     }
 
@@ -789,8 +790,9 @@ class TestSimplifyTokens : public TestFixture {
 
         {
             // #4786 - don't replace , with ; in ".. : public B, C .." code
-            const char code[] = "template < class T = X > class A : public B , C { } ;";
-            ASSERT_EQUALS(code, tok(code));
+            const char code[] = "template < class T = X > class A : public B , C { } ;\n";
+            const char expected[] = "template < class T = X > class A : public B , C { } ;";
+            ASSERT_EQUALS(expected, tok(code));
         }
     }
 
@@ -828,12 +830,12 @@ class TestSimplifyTokens : public TestFixture {
                           "};\n"
                           "TClass::TClass(const TClass &other) {\n"
                           "    operator=(other);\n"
-                          "}"));
+                          "}\n"));
     }
 
     void simplifyArrayAccessSyntax() {
         ASSERT_EQUALS("\n\n##file 0\n"
-                      "1: int a@1 ; a@1 [ 13 ] ;\n", tokenizeDebugListing("int a; 13[a];"));
+                      "1: int a@1 ; a@1 [ 13 ] ;\n", tokenizeDebugListing("int a; 13[a];\n"));
     }
 
 
@@ -893,282 +895,282 @@ class TestSimplifyTokens : public TestFixture {
 
     void simplifyStructDecl1() {
         {
-            const char code[] = "struct ABC { } abc;";
+            const char code[] = "struct ABC { } abc;\n";
             const char expected[] = "struct ABC { } ; struct ABC abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct ABC { } * pabc;";
+            const char code[] = "struct ABC { } * pabc;\n";
             const char expected[] = "struct ABC { } ; struct ABC * pabc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct ABC { } abc[4];";
+            const char code[] = "struct ABC { } abc[4];\n";
             const char expected[] = "struct ABC { } ; struct ABC abc [ 4 ] ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct ABC { } abc, def;";
+            const char code[] = "struct ABC { } abc, def;\n";
             const char expected[] = "struct ABC { } ; struct ABC abc ; struct ABC def ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct ABC { } abc, * pabc;";
+            const char code[] = "struct ABC { } abc, * pabc;\n";
             const char expected[] = "struct ABC { } ; struct ABC abc ; struct ABC * pabc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct ABC { struct DEF {} def; } abc;";
+            const char code[] = "struct ABC { struct DEF {} def; } abc;\n";
             const char expected[] = "struct ABC { struct DEF { } ; struct DEF def ; } ; struct ABC abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { } abc;";
+            const char code[] = "struct { } abc;\n";
             const char expected[] = "struct Anonymous0 { } ; struct Anonymous0 abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { } * pabc;";
+            const char code[] = "struct { } * pabc;\n";
             const char expected[] = "struct Anonymous0 { } ; struct Anonymous0 * pabc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { } abc[4];";
+            const char code[] = "struct { } abc[4];\n";
             const char expected[] = "struct Anonymous0 { } ; struct Anonymous0 abc [ 4 ] ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct {int a;} const array[3] = {0};";
+            const char code[] = "struct {int a;} const array[3] = {0};\n";
             const char expected[] = "struct Anonymous0 { int a ; } ; struct Anonymous0 const array [ 3 ] = { 0 } ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "static struct {int a;} const array[3] = {0};";
+            const char code[] = "static struct {int a;} const array[3] = {0};\n";
             const char expected[] = "struct Anonymous0 { int a ; } ; static struct Anonymous0 const array [ 3 ] = { 0 } ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { } abc, def;";
+            const char code[] = "struct { } abc, def;\n";
             const char expected[] = "struct Anonymous0 { } ; struct Anonymous0 abc ; struct Anonymous0 def ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { } abc, * pabc;";
+            const char code[] = "struct { } abc, * pabc;\n";
             const char expected[] = "struct Anonymous0 { } ; struct Anonymous0 abc ; struct Anonymous0 * pabc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { struct DEF {} def; } abc;";
+            const char code[] = "struct { struct DEF {} def; } abc;\n";
             const char expected[] = "struct Anonymous0 { struct DEF { } ; struct DEF def ; } ; struct Anonymous0 abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct ABC { struct {} def; } abc;";
+            const char code[] = "struct ABC { struct {} def; } abc;\n";
             const char expected[] = "struct ABC { struct Anonymous0 { } ; struct Anonymous0 def ; } ; struct ABC abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { struct {} def; } abc;";
+            const char code[] = "struct { struct {} def; } abc;\n";
             const char expected[] = "struct Anonymous0 { struct Anonymous1 { } ; struct Anonymous1 def ; } ; struct Anonymous0 abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "union ABC { int i; float f; } abc;";
+            const char code[] = "union ABC { int i; float f; } abc;\n";
             const char expected[] = "union ABC { int i ; float f ; } ; union ABC abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct ABC { struct {} def; };";
+            const char code[] = "struct ABC { struct {} def; };\n";
             const char expected[] = "struct ABC { struct Anonymous0 { } ; struct Anonymous0 def ; } ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct ABC : public XYZ { struct {} def; };";
+            const char code[] = "struct ABC : public XYZ { struct {} def; };\n";
             const char expected[] = "struct ABC : public XYZ { struct Anonymous0 { } ; struct Anonymous0 def ; } ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { int x; }; int y;";
+            const char code[] = "struct { int x; }; int y;\n";
             const char expected[] = "int x ; int y ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { int x; };";
+            const char code[] = "struct { int x; };\n";
             const char expected[] = "int x ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { };";
+            const char code[] = "struct { };\n";
             const char expected[] = ";";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { struct { struct { } ; } ; };";
+            const char code[] = "struct { struct { struct { } ; } ; };\n";
             const char expected[] = ";";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         // ticket 2464
         {
-            const char code[] = "static struct ABC { } abc ;";
+            const char code[] = "static struct ABC { } abc ;\n";
             const char expected[] = "struct ABC { } ; static struct ABC abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         // ticket #980
         {
-            const char code[] = "void f() { int A(1),B(2),C=3,D,E(5),F=6; }";
+            const char code[] = "void f() { int A(1),B(2),C=3,D,E(5),F=6; }\n";
             const char expected[] = "void f ( ) { int A ( 1 ) ; int B ( 2 ) ; int C ; C = 3 ; int D ; int E ( 5 ) ; int F ; F = 6 ; }";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         // ticket #8284
         {
-            const char code[] = "void f() { class : foo<int> { } abc; }";
+            const char code[] = "void f() { class : foo<int> { } abc; }\n";
             const char expected[] = "void f ( ) { class Anonymous0 : foo < int > { } ; Anonymous0 abc ; }";
             ASSERT_EQUALS(expected, tok(code));
         }
     }
 
     void simplifyStructDecl2() { // ticket #2479 (segmentation fault)
-        const char code[] = "struct { char c; }";
+        const char code[] = "struct { char c; }\n";
         const char expected[] = "struct { char c ; }";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void simplifyStructDecl3() {
         {
-            const char code[] = "class ABC { } abc;";
+            const char code[] = "class ABC { } abc;\n";
             const char expected[] = "class ABC { } ; ABC abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class ABC { } * pabc;";
+            const char code[] = "class ABC { } * pabc;\n";
             const char expected[] = "class ABC { } ; ABC * pabc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class ABC { } abc[4];";
+            const char code[] = "class ABC { } abc[4];\n";
             const char expected[] = "class ABC { } ; ABC abc [ 4 ] ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class ABC { } abc, def;";
+            const char code[] = "class ABC { } abc, def;\n";
             const char expected[] = "class ABC { } ; ABC abc ; ABC def ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class ABC { } abc, * pabc;";
+            const char code[] = "class ABC { } abc, * pabc;\n";
             const char expected[] = "class ABC { } ; ABC abc ; ABC * pabc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class ABC { class DEF {} def; } abc;";
+            const char code[] = "class ABC { class DEF {} def; } abc;\n";
             const char expected[] = "class ABC { class DEF { } ; DEF def ; } ; ABC abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { } abc;";
+            const char code[] = "class { } abc;\n";
             const char expected[] = "class { } abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { } * pabc;";
+            const char code[] = "class { } * pabc;\n";
             const char expected[] = "class { } * pabc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { } abc[4];";
+            const char code[] = "class { } abc[4];\n";
             const char expected[] = "class { } abc [ 4 ] ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { } abc, def;";
+            const char code[] = "class { } abc, def;\n";
             const char expected[] = "class { } abc , def ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { } abc, * pabc;";
+            const char code[] = "class { } abc, * pabc;\n";
             const char expected[] = "class { } abc , * pabc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { class DEF {} def; } abc;";
+            const char code[] = "struct { class DEF {} def; } abc;\n";
             const char expected[] = "struct Anonymous0 { class DEF { } ; DEF def ; } ; struct Anonymous0 abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class ABC { struct {} def; } abc;";
+            const char code[] = "class ABC { struct {} def; } abc;\n";
             const char expected[] = "class ABC { struct Anonymous0 { } ; struct Anonymous0 def ; } ; ABC abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { class {} def; } abc;";
+            const char code[] = "class { class {} def; } abc;\n";
             const char expected[] = "class { class { } def ; } abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class ABC { struct {} def; };";
+            const char code[] = "class ABC { struct {} def; };\n";
             const char expected[] = "class ABC { struct Anonymous0 { } ; struct Anonymous0 def ; } ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class ABC : public XYZ { struct {} def; };";
+            const char code[] = "class ABC : public XYZ { struct {} def; };\n";
             const char expected[] = "class ABC : public XYZ { struct Anonymous0 { } ; struct Anonymous0 def ; } ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { int x; }; int y;";
+            const char code[] = "class { int x; }; int y;\n";
             const char expected[] = "class { int x ; } ; int y ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { int x; };";
+            const char code[] = "class { int x; };\n";
             const char expected[] = "class { int x ; } ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { };";
+            const char code[] = "class { };\n";
             const char expected[] = "class { } ;";
             ASSERT_EQUALS(expected, tok(code));
         }
@@ -1207,28 +1209,28 @@ class TestSimplifyTokens : public TestFixture {
                       "} ; struct A arrays ; arrays = { { 0 } } ;",
                       tok("struct A {\n"
                           "    char integers[X];\n"
-                          "} arrays = {{0}};"));
+                          "} arrays = {{0}};\n"));
     }
 
     void simplifyStructDecl7() {
         ASSERT_EQUALS("struct Anonymous0 { char x ; } ; struct Anonymous0 a [ 2 ] ;",
-                      tok("struct { char x; } a[2];"));
+                      tok("struct { char x; } a[2];\n"));
         ASSERT_EQUALS("struct Anonymous0 { char x ; } ; static struct Anonymous0 a [ 2 ] ;",
-                      tok("static struct { char x; } a[2];"));
+                      tok("static struct { char x; } a[2];\n"));
     }
 
     void simplifyStructDecl8() {
-        ASSERT_EQUALS("enum A { x , y , z } ; enum A a ; a = x ;", tok("enum A { x, y, z } a(x);"));
-        ASSERT_EQUALS("enum B { x , y , z } ; enum B b ; b = x ;", tok("enum B { x , y, z } b{x};"));
-        ASSERT_EQUALS("struct C { int i ; } ; struct C c ; c = C { 0 } ;", tok("struct C { int i; } c{0};"));
-        ASSERT_EQUALS("enum Anonymous0 { x , y , z } ; enum Anonymous0 d ; d = x ;", tok("enum { x, y, z } d(x);"));
-        ASSERT_EQUALS("enum Anonymous0 { x , y , z } ; enum Anonymous0 e ; e = x ;", tok("enum { x, y, z } e{x};"));
-        ASSERT_EQUALS("struct Anonymous0 { int i ; } ; struct Anonymous0 f ; f = Anonymous0 { 0 } ;", tok("struct { int i; } f{0};"));
-        ASSERT_EQUALS("struct Anonymous0 { } ; struct Anonymous0 x ; x = { 0 } ;", tok("struct {} x = {0};"));
-        ASSERT_EQUALS("enum G : short { x , y , z } ; enum G g ; g = x ;", tok("enum G : short { x, y, z } g(x);"));
-        ASSERT_EQUALS("enum H : short { x , y , z } ; enum H h ; h = x ;", tok("enum H : short { x, y, z } h{x};"));
-        ASSERT_EQUALS("enum class I : short { x , y , z } ; enum I i ; i = x ;", tok("enum class I : short { x, y, z } i(x);"));
-        ASSERT_EQUALS("enum class J : short { x , y , z } ; enum J j ; j = x ;", tok("enum class J : short { x, y, z } j{x};"));
+        ASSERT_EQUALS("enum A { x , y , z } ; enum A a ; a = x ;", tok("enum A { x, y, z } a(x);\n"));
+        ASSERT_EQUALS("enum B { x , y , z } ; enum B b ; b = x ;", tok("enum B { x , y, z } b{x};\n"));
+        ASSERT_EQUALS("struct C { int i ; } ; struct C c ; c = C { 0 } ;", tok("struct C { int i; } c{0};\n"));
+        ASSERT_EQUALS("enum Anonymous0 { x , y , z } ; enum Anonymous0 d ; d = x ;", tok("enum { x, y, z } d(x);\n"));
+        ASSERT_EQUALS("enum Anonymous0 { x , y , z } ; enum Anonymous0 e ; e = x ;", tok("enum { x, y, z } e{x};\n"));
+        ASSERT_EQUALS("struct Anonymous0 { int i ; } ; struct Anonymous0 f ; f = Anonymous0 { 0 } ;", tok("struct { int i; } f{0};\n"));
+        ASSERT_EQUALS("struct Anonymous0 { } ; struct Anonymous0 x ; x = { 0 } ;", tok("struct {} x = {0};\n"));
+        ASSERT_EQUALS("enum G : short { x , y , z } ; enum G g ; g = x ;", tok("enum G : short { x, y, z } g(x);\n"));
+        ASSERT_EQUALS("enum H : short { x , y , z } ; enum H h ; h = x ;", tok("enum H : short { x, y, z } h{x};\n"));
+        ASSERT_EQUALS("enum class I : short { x , y , z } ; enum I i ; i = x ;", tok("enum class I : short { x, y, z } i(x);\n"));
+        ASSERT_EQUALS("enum class J : short { x , y , z } ; enum J j ; j = x ;", tok("enum class J : short { x, y, z } j{x};\n"));
     }
 
     void simplifyStructDecl9() {
@@ -1289,74 +1291,74 @@ class TestSimplifyTokens : public TestFixture {
     }
 
     void removeUnwantedKeywords() {
-        ASSERT_EQUALS("int var ;", tok("register int var ;"));
-        ASSERT_EQUALS("short var ;", tok("register short int var ;"));
-        ASSERT_EQUALS("int foo ( ) { }", tok("inline int foo ( ) { }"));
-        ASSERT_EQUALS("int foo ( ) { }", tok("__inline int foo ( ) { }"));
-        ASSERT_EQUALS("int foo ( ) { }", tok("__forceinline int foo ( ) { }"));
-        ASSERT_EQUALS("constexpr int foo ( ) { }", tok("constexpr int foo() { }"));
-        ASSERT_EQUALS("constexpr int foo ( ) { }", tok("consteval int foo() { }"));
-        ASSERT_EQUALS("int x ; x = 0 ;", tok("constinit int x = 0;"));
-        ASSERT_EQUALS("void f ( ) { int final [ 10 ] ; }", tok("void f() { int final[10]; }"));
-        ASSERT_EQUALS("int * p ;", tok("int * __restrict p;", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("int * * p ;", tok("int * __restrict__ * p;", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("void foo ( float * a , float * b ) ;", tok("void foo(float * __restrict__ a, float * __restrict__ b);", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("int * p ;", tok("int * restrict p;", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("int * * p ;", tok("int * restrict * p;", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("void foo ( float * a , float * b ) ;", tok("void foo(float * restrict a, float * restrict b);", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("void foo ( int restrict ) ;", tok("void foo(int restrict);"));
-        ASSERT_EQUALS("int * p ;", tok("typedef int * __restrict__ rint; rint p;", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("int var ;", tok("register int var ;\n"));
+        ASSERT_EQUALS("short var ;", tok("register short int var ;\n"));
+        ASSERT_EQUALS("int foo ( ) { }", tok("inline int foo ( ) { }\n"));
+        ASSERT_EQUALS("int foo ( ) { }", tok("__inline int foo ( ) { }\n"));
+        ASSERT_EQUALS("int foo ( ) { }", tok("__forceinline int foo ( ) { }\n"));
+        ASSERT_EQUALS("constexpr int foo ( ) { }", tok("constexpr int foo() { }\n"));
+        ASSERT_EQUALS("constexpr int foo ( ) { }", tok("consteval int foo() { }\n"));
+        ASSERT_EQUALS("int x ; x = 0 ;", tok("constinit int x = 0;\n"));
+        ASSERT_EQUALS("void f ( ) { int final [ 10 ] ; }", tok("void f() { int final[10]; }\n"));
+        ASSERT_EQUALS("int * p ;", tok("int * __restrict p;\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("int * * p ;", tok("int * __restrict__ * p;\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("void foo ( float * a , float * b ) ;", tok("void foo(float * __restrict__ a, float * __restrict__ b);\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("int * p ;", tok("int * restrict p;\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("int * * p ;", tok("int * restrict * p;\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("void foo ( float * a , float * b ) ;", tok("void foo(float * restrict a, float * restrict b);\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("void foo ( int restrict ) ;", tok("void foo(int restrict);\n"));
+        ASSERT_EQUALS("int * p ;", tok("typedef int * __restrict__ rint; rint p;\n", dinit(TokOptions, $.cpp = false)));
 
         // don't remove struct members:
-        ASSERT_EQUALS("a = b . _inline ;", tok("a = b._inline;"));
+        ASSERT_EQUALS("a = b . _inline ;", tok("a = b._inline;\n"));
 
-        ASSERT_EQUALS("int i ; i = 0 ;", tok("auto int i = 0;", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("auto i ; i = 0 ;", tok("auto i = 0;"));
+        ASSERT_EQUALS("int i ; i = 0 ;", tok("auto int i = 0;\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("auto i ; i = 0 ;", tok("auto i = 0;\n"));
     }
 
     void simplifyCallingConvention() {
-        ASSERT_EQUALS("int f ( ) ;", tok("int __cdecl f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __stdcall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __fastcall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __clrcall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __thiscall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __syscall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __pascal f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __fortran f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __far __cdecl f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __far __stdcall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __far __fastcall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __far __clrcall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __far __thiscall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __far __syscall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __far __pascal f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __far __fortran f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int WINAPI f();", dinit(TokOptions, $.type = Platform::Type::Win32A)));
-        ASSERT_EQUALS("int f ( ) ;", tok("int APIENTRY f();", dinit(TokOptions, $.type = Platform::Type::Win32A)));
-        ASSERT_EQUALS("int f ( ) ;", tok("int CALLBACK f();", dinit(TokOptions, $.type = Platform::Type::Win32A)));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __cdecl f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __stdcall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __fastcall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __clrcall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __thiscall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __syscall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __pascal f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __fortran f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __far __cdecl f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __far __stdcall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __far __fastcall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __far __clrcall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __far __thiscall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __far __syscall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __far __pascal f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __far __fortran f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int WINAPI f();\n", dinit(TokOptions, $.type = Platform::Type::Win32A)));
+        ASSERT_EQUALS("int f ( ) ;", tok("int APIENTRY f();\n", dinit(TokOptions, $.type = Platform::Type::Win32A)));
+        ASSERT_EQUALS("int f ( ) ;", tok("int CALLBACK f();\n", dinit(TokOptions, $.type = Platform::Type::Win32A)));
 
         // don't simplify Microsoft defines in unix code (#7554)
-        ASSERT_EQUALS("enum E { CALLBACK } ;", tok("enum E { CALLBACK } ;", dinit(TokOptions, $.type = Platform::Type::Unix32)));
+        ASSERT_EQUALS("enum E { CALLBACK } ;", tok("enum E { CALLBACK } ;\n", dinit(TokOptions, $.type = Platform::Type::Unix32)));
     }
 
     void simplifyAttribute() {
-        ASSERT_EQUALS("int f ( ) ;", tok("__attribute__ ((visibility(\"default\"))) int f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("__attribute__((visibility(\"default\"))) int f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("__attribute ((visibility(\"default\"))) int f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("__attribute__ ((visibility(\"default\"))) __attribute__ ((warn_unused_result)) int f();"));
-        ASSERT_EQUALS("blah :: blah f ( ) ;", tok("__attribute__ ((visibility(\"default\"))) blah::blah f();"));
-        ASSERT_EQUALS("template < T > Result < T > f ( ) ;", tok("template<T> __attribute__ ((warn_unused_result)) Result<T> f();"));
-        ASSERT_EQUALS("template < T , U > Result < T , U > f ( ) ;", tok("template<T, U> __attribute__ ((warn_unused_result)) Result<T, U> f();"));
-        ASSERT_EQUALS("void ( * fp ) ( ) ; fp = nullptr ;", tok("typedef void (*fp_t)() __attribute__((noreturn)); fp_t fp = nullptr;")); // #12137
+        ASSERT_EQUALS("int f ( ) ;", tok("__attribute__ ((visibility(\"default\"))) int f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("__attribute__((visibility(\"default\"))) int f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("__attribute ((visibility(\"default\"))) int f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("__attribute__ ((visibility(\"default\"))) __attribute__ ((warn_unused_result)) int f();\n"));
+        ASSERT_EQUALS("blah :: blah f ( ) ;", tok("__attribute__ ((visibility(\"default\"))) blah::blah f();\n"));
+        ASSERT_EQUALS("template < T > Result < T > f ( ) ;", tok("template<T> __attribute__ ((warn_unused_result)) Result<T> f();\n"));
+        ASSERT_EQUALS("template < T , U > Result < T , U > f ( ) ;", tok("template<T, U> __attribute__ ((warn_unused_result)) Result<T, U> f();\n"));
+        ASSERT_EQUALS("void ( * fp ) ( ) ; fp = nullptr ;", tok("typedef void (*fp_t)() __attribute__((noreturn)); fp_t fp = nullptr;\n")); // #12137
     }
 
     void simplifyFunctorCall() {
-        ASSERT_EQUALS("IncrementFunctor ( ) ( a ) ;", tok("IncrementFunctor()(a);"));
+        ASSERT_EQUALS("IncrementFunctor ( ) ( a ) ;", tok("IncrementFunctor()(a);\n"));
     }
 
     // #ticket #5339 (simplify function pointer after comma)
     void simplifyFunctionPointer() {
-        ASSERT_EQUALS("f ( double x , double ( * y ) ( ) ) ;", tok("f (double x, double (*y) ());"));
+        ASSERT_EQUALS("f ( double x , double ( * y ) ( ) ) ;", tok("f (double x, double (*y) ());\n"));
     }
 
     void simplifyFunctionReturn() {
@@ -1368,7 +1370,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "    void ( * get2 ( ) ) ( ) { return 0 ; }\n"
                                 "    testfp get3();\n"
                                 "    void ( * get4 ( ) ) ( );\n"
-                                "};";
+                                "};\n";
             const char expected[] = "struct Fred "
                                     "{ "
                                     "void * get1 ( ) { return 0 ; } "
@@ -1383,7 +1385,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "    std::string s;\n"
                                 "    const std::string & foo();\n"
                                 "};\n"
-                                "const std::string & Fred::foo() { return \"\"; }";
+                                "const std::string & Fred::foo() { return \"\"; }\n";
             const char expected[] = "class Fred { "
                                     "std :: string s ; "
                                     "const std :: string & foo ( ) ; "
@@ -1412,16 +1414,17 @@ class TestSimplifyTokens : public TestFixture {
                                 "int main() {\n"
                                 "  fact2<3> ();\n"
                                 "  fact2<2> ();\n"
-                                "}";
+                                "}\n";
             (void)tok(code);
         }
     }
 
     void consecutiveBraces() {
-        ASSERT_EQUALS("void f ( ) { }", tok("void f(){{}}"));
-        ASSERT_EQUALS("void f ( ) { }", tok("void f(){{{}}}"));
-        ASSERT_EQUALS("void f ( ) { for ( ; ; ) { } }", tok("void f () { for(;;){} }"));
-        ASSERT_EQUALS("void f ( ) { { scope_lock lock ; foo ( ) ; } { scope_lock lock ; bar ( ) ; } }", tok("void f () { {scope_lock lock; foo();} {scope_lock lock; bar();} }"));
+        ASSERT_EQUALS("void f ( ) { }", tok("void f(){{}}\n"));
+        ASSERT_EQUALS("void f ( ) { }", tok("void f(){{{}}}\n"));
+        ASSERT_EQUALS("void f ( ) { for ( ; ; ) { } }", tok("void f () { for(;;){} }\n"));
+        ASSERT_EQUALS("void f ( ) { { scope_lock lock ; foo ( ) ; } { scope_lock lock ; bar ( ) ; } }", tok("void f () { {scope_lock lock; foo();} {scope_lock lock; bar();} }\n"));
+        ASSERT_EQUALS("std :: map < int , int > m { { } } ;", tok("std::map<int, int> m{ {} };\n"));
     }
 
     void simplifyOverride() { // ticket #5069
@@ -1434,35 +1437,35 @@ class TestSimplifyTokens : public TestFixture {
     }
 
     void simplifyNestedNamespace() {
-        ASSERT_EQUALS("namespace A { namespace B { namespace C { int i ; } } }", tok("namespace A::B::C { int i; }"));
+        ASSERT_EQUALS("namespace A { namespace B { namespace C { int i ; } } }", tok("namespace A::B::C { int i; }\n"));
     }
 
     void simplifyNamespaceAliases1() {
         ASSERT_EQUALS(";",
-                      tok("namespace ios = boost::iostreams;"));
+                      tok("namespace ios = boost::iostreams;\n"));
         ASSERT_EQUALS("boost :: iostreams :: istream foo ( \"foo\" ) ;",
-                      tok("namespace ios = boost::iostreams; ios::istream foo(\"foo\");"));
+                      tok("namespace ios = boost::iostreams; ios::istream foo(\"foo\");\n"));
         ASSERT_EQUALS("boost :: iostreams :: istream foo ( \"foo\" ) ;",
-                      tok("using namespace std; namespace ios = boost::iostreams; ios::istream foo(\"foo\");"));
+                      tok("using namespace std; namespace ios = boost::iostreams; ios::istream foo(\"foo\");\n"));
         ASSERT_EQUALS(";",
-                      tok("using namespace std; namespace ios = boost::iostreams;"));
+                      tok("using namespace std; namespace ios = boost::iostreams;\n"));
         ASSERT_EQUALS("namespace NS { boost :: iostreams :: istream foo ( \"foo\" ) ; }",
-                      tok("namespace NS { using namespace std; namespace ios = boost::iostreams; ios::istream foo(\"foo\"); }"));
+                      tok("namespace NS { using namespace std; namespace ios = boost::iostreams; ios::istream foo(\"foo\"); }\n"));
 
         // duplicate namespace aliases
         ASSERT_EQUALS(";",
-                      tok("namespace ios = boost::iostreams;\nnamespace ios = boost::iostreams;"));
+                      tok("namespace ios = boost::iostreams;\nnamespace ios = boost::iostreams;\n"));
         ASSERT_EQUALS(";",
-                      tok("namespace ios = boost::iostreams;\nnamespace ios = boost::iostreams;\nnamespace ios = boost::iostreams;"));
+                      tok("namespace ios = boost::iostreams;\nnamespace ios = boost::iostreams;\nnamespace ios = boost::iostreams;\n"));
         ASSERT_EQUALS("namespace A { namespace B { void foo ( ) { bar ( A :: B :: ab ( ) ) ; } } }",
-                      tok("namespace A::B {"
-                          "namespace AB = A::B;"
-                          "void foo() {"
-                          "    namespace AB = A::B;" // duplicate declaration
-                          "    bar(AB::ab());"
-                          "}"
-                          "namespace AB = A::B;" //duplicate declaration
-                          "}"));
+                      tok("namespace A::B {\n"
+                          "namespace AB = A::B;\n"
+                          "void foo() {\n"
+                          "    namespace AB = A::B;\n" // duplicate declaration
+                          "    bar(AB::ab());\n"
+                          "}\n"
+                          "namespace AB = A::B;\n" //duplicate declaration
+                          "}\n"));
         ASSERT_EQUALS(";",
                       tok("namespace p = boost::python;\n"
                           "namespace np = boost::numpy;\n"));
@@ -1470,19 +1473,19 @@ class TestSimplifyTokens : public TestFixture {
         // redeclared nested namespace aliases
         TODO_ASSERT_EQUALS("namespace A { namespace B { void foo ( ) { bar ( A :: B :: ab ( ) ) ; { baz ( A :: a ( ) ) ; } bar ( A :: B :: ab ( ) ) ; } } }",
                            "namespace A { namespace B { void foo ( ) { bar ( A :: B :: ab ( ) ) ; { baz ( A :: B :: a ( ) ) ; } bar ( A :: B :: ab ( ) ) ; } } }",
-                           tok("namespace A::B {"
-                               "namespace AB = A::B;"
-                               "void foo() {"
-                               "    namespace AB = A::B;" // duplicate declaration
-                               "    bar(AB::ab());"
-                               "    {"
-                               "         namespace AB = A;"
-                               "         baz(AB::a());" // redeclaration OK
-                               "    }"
-                               "    bar(AB::ab());"
-                               "}"
-                               "namespace AB = A::B;" //duplicate declaration
-                               "}"));
+                           tok("namespace A::B {\n"
+                               "namespace AB = A::B;\n"
+                               "void foo() {\n"
+                               "    namespace AB = A::B;\n" // duplicate declaration
+                               "    bar(AB::ab());\n"
+                               "    {\n"
+                               "         namespace AB = A;\n"
+                               "         baz(AB::a());\n" // redeclaration OK
+                               "    }\n"
+                               "    bar(AB::ab());\n"
+                               "}\n"
+                               "namespace AB = A::B;\n" //duplicate declaration
+                               "}\n"));
 
         // variable and namespace alias with same name
         ASSERT_EQUALS("namespace external { namespace ns { "
@@ -1494,16 +1497,16 @@ class TestSimplifyTokens : public TestFixture {
                       "namespace external { namespace ns { "
                       "void A :: f ( const std :: string & json ) { } "
                       "} }",
-                      tok("namespace external::ns {"
-                          "    class A {"
-                          "    public:"
-                          "        static void f(const std::string& json);"
-                          "    };"
-                          "}"
-                          "namespace json = rapidjson;"
-                          "namespace external::ns {"
-                          "    void A::f(const std::string& json) { }"
-                          "}"));
+                      tok("namespace external::ns {\n"
+                          "    class A {\n"
+                          "    public:\n"
+                          "        static void f(const std::string& json);\n"
+                          "    };\n"
+                          "}\n"
+                          "namespace json = rapidjson;\n"
+                          "namespace external::ns {\n"
+                          "    void A::f(const std::string& json) { }\n"
+                          "}\n"));
     }
 
     void simplifyNamespaceAliases2() {
@@ -1511,11 +1514,11 @@ class TestSimplifyTokens : public TestFixture {
                       "{ "
                       "int maxResults ; maxResults = :: a :: b :: c :: d :: ef :: MAX ; "
                       "}",
-                      tok("namespace ef = ::a::b::c::d::ef;"
-                          "void foo()"
-                          "{"
-                          "  int maxResults = ::a::b::c::d::ef::MAX;"
-                          "}"));
+                      tok("namespace ef = ::a::b::c::d::ef;\n"
+                          "void foo()\n"
+                          "{\n"
+                          "  int maxResults = ::a::b::c::d::ef::MAX;\n"
+                          "}\n"));
     }
 
     void simplifyNamespaceAliases3() {
@@ -1607,33 +1610,34 @@ class TestSimplifyTokens : public TestFixture {
 
     void simplifyKnownVariables14() {
         // ticket #753
-        const char code[] = "void f ( ) { int n ; n = 1 ; do { ++ n ; } while ( n < 10 ) ; }";
-        ASSERT_EQUALS(code, simplifyKnownVariables(code));
+        const char code[] = "void f ( ) { int n ; n = 1 ; do { ++ n ; } while ( n < 10 ) ; }\n";
+        const char expected[] = "void f ( ) { int n ; n = 1 ; do { ++ n ; } while ( n < 10 ) ; }";
+        ASSERT_EQUALS(expected, simplifyKnownVariables(code));
     }
 
     void simplifyKnownVariables16() {
         // ticket #807 - segmentation fault when macro isn't found
-        const char code[] = "void f ( ) { int n = 1; DISPATCH(while); }";
+        const char code[] = "void f ( ) { int n = 1; DISPATCH(while); }\n";
         ASSERT_THROW_INTERNAL(simplifyKnownVariables(code), UNKNOWN_MACRO);
     }
 
     void simplifyKnownVariables17() {
         // ticket #807 - segmentation fault when macro isn't found
-        const char code[] = "void f ( ) { char *s = malloc(100);mp_ptr p = s; p++; }";
+        const char code[] = "void f ( ) { char *s = malloc(100);mp_ptr p = s; p++; }\n";
         ASSERT_EQUALS(
             "void f ( ) { char * s ; s = malloc ( 100 ) ; mp_ptr p ; p = s ; p ++ ; }",
             simplifyKnownVariables(code));
     }
 
     void simplifyKnownVariables18() {
-        const char code[] = "void f ( ) { char *s = malloc(100);mp_ptr p = s; ++p; }";
+        const char code[] = "void f ( ) { char *s = malloc(100);mp_ptr p = s; ++p; }\n";
         ASSERT_EQUALS(
             "void f ( ) { char * s ; s = malloc ( 100 ) ; mp_ptr p ; p = s ; ++ p ; }",
             simplifyKnownVariables(code));
     }
 
     void simplifyKnownVariables19() {
-        const char code[] = "void f ( ) { int i=0; do { if (i>0) { a(); } i=b(); } while (i != 12); }";
+        const char code[] = "void f ( ) { int i=0; do { if (i>0) { a(); } i=b(); } while (i != 12); }\n";
         ASSERT_EQUALS(
             "void f ( ) { int i ; i = 0 ; do { if ( i > 0 ) { a ( ) ; } i = b ( ) ; } while ( i != 12 ) ; }",
             simplifyKnownVariables(code));
@@ -1642,7 +1646,7 @@ class TestSimplifyTokens : public TestFixture {
     void simplifyKnownVariables21() {
         ASSERT_EQUALS(
             "void foo ( int i ) { int n ; n = i ; for ( i = 0 ; i < n ; ++ i ) { } }",
-            simplifyKnownVariables("void foo(int i) { int n = i; for (i = 0; i < n; ++i) { } }"));
+            simplifyKnownVariables("void foo(int i) { int n = i; for (i = 0; i < n; ++i) { } }\n"));
     }
 
     void simplifyKnownVariables25() {
@@ -2058,11 +2062,14 @@ class TestSimplifyTokens : public TestFixture {
     void simplifyKnownVariables36() {
 
         // Ticket #5972
-        const char code2[] = "void f() {"
-                             "  char buf[10] = \"ab\";"
-                             "    memset(buf, 0, 10);"
-                             "}";
-        const char expected2[] = "void f ( ) { char buf [ 10 ] = \"ab\" ; memset ( buf , 0 , 10 ) ; }";
+        const char code2[] = "void f() {\n"
+                             "  char buf[10] = \"ab\";\n"
+                             "    memset(buf, 0, 10);\n"
+                             "}\n";
+        const char expected2[] = "void f ( ) {\n"
+                                 "char buf [ 10 ] = \"ab\" ;\n"
+                                 "memset ( buf , 0 , 10 ) ;\n"
+                                 "}";
         ASSERT_EQUALS(expected2, tokenizeAndStringify(code2));
     }
 
@@ -2072,7 +2079,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "   char a[10];\n"
                                 "   strcpy(a, \"hello\");\n"
                                 "   strcat(a, \"!\");\n"
-                                "}";
+                                "}\n";
             const char expected[] = "void f ( ) {\n"
                                     "char a [ 10 ] ;\n"
                                     "strcpy ( a , \"hello\" ) ;\n"
@@ -2082,27 +2089,27 @@ class TestSimplifyTokens : public TestFixture {
         }
 
         {
-            const char code[] = "void f() {"
-                                "    char *s = malloc(10);"
-                                "    strcpy(s, \"\");"
-                                "    free(s);"
-                                "}";
-            const char expected[] = "void f ( ) {"
-                                    " char * s ; s = malloc ( 10 ) ;"
-                                    " strcpy ( s , \"\" ) ;"
-                                    " free ( s ) ; "
+            const char code[] = "void f() {\n"
+                                "    char *s = malloc(10);\n"
+                                "    strcpy(s, \"\");\n"
+                                "    free(s);\n"
+                                "}\n";
+            const char expected[] = "void f ( ) {\n"
+                                    "char * s ; s = malloc ( 10 ) ;\n"
+                                    "strcpy ( s , \"\" ) ;\n"
+                                    "free ( s ) ;\n"
                                     "}";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "void f(char *p, char *q) {"
-                                "    strcpy(p, \"abc\");"
-                                "    q = p;"
-                                "}";
-            const char expected[] = "void f ( char * p , char * q ) {"
-                                    " strcpy ( p , \"abc\" ) ;"
-                                    " q = p ; "
+            const char code[] = "void f(char *p, char *q) {\n"
+                                "    strcpy(p, \"abc\");\n"
+                                "    q = p;\n"
+                                "}\n";
+            const char expected[] = "void f ( char * p , char * q ) {\n"
+                                    "strcpy ( p , \"abc\" ) ;\n"
+                                    "q = p ;\n"
                                     "}";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
@@ -2113,7 +2120,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "    char s[10];\n"
                                 "    strcpy(s, \"123\");\n"
                                 "    if (s[6] == ' ');\n"
-                                "}";
+                                "}\n";
             const char expected[] = "void f ( ) {\n"
                                     "char s [ 10 ] ;\n"
                                     "strcpy ( s , \"123\" ) ;\n"
@@ -2129,7 +2136,7 @@ class TestSimplifyTokens : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    int a, *p; p = &a;\n"
                                 "    { int a = *p; }\n"
-                                "}";
+                                "}\n";
             const char expected[] = "void f ( ) {\n"
                                     "int a ; int * p ; p = & a ;\n"
                                     "{ int a ; a = * p ; }\n"
@@ -2141,7 +2148,7 @@ class TestSimplifyTokens : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    int *a, **p; p = &a;\n"
                                 "    { int *a = *p; }\n"
-                                "}";
+                                "}\n";
             const char expected[] = "void f ( ) {\n"
                                     "int * a ; int * * p ; p = & a ;\n"
                                     "{ int * a ; a = * p ; }\n"
@@ -2154,7 +2161,7 @@ class TestSimplifyTokens : public TestFixture {
         const char code[] = "void a() {\n"
                             "    static int i = 10;\n"
                             "    b(i++);\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void a ( ) {\n"
                                 "static int i = 10 ;\n"
                                 "b ( i ++ ) ;\n"
@@ -2167,7 +2174,7 @@ class TestSimplifyTokens : public TestFixture {
                             "    int x = 0;\n"
                             "    cin >> x;\n"
                             "    return x;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "void f ( ) {\n"
                                 "int x ; x = 0 ;\n"
@@ -2185,7 +2192,7 @@ class TestSimplifyTokens : public TestFixture {
         const char code[] = "void f() {\n"
                             "    int x = 0;\n"
                             "    cin >> std::hex >> x;\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void f ( ) {\n"
                                 "int x ; x = 0 ;\n"
                                 "cin >> std :: hex >> x ;\n"
@@ -2201,12 +2208,13 @@ class TestSimplifyTokens : public TestFixture {
         const char code[] = "void f(int sz) {\n"
                             "    int i;\n"
                             "    for (i = 0; ((i<sz) && (sz>3)); ++i) { }\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void f ( int sz ) {\n"
                                 "int i ;\n"
                                 "for ( i = 0 ; ( i < sz ) && ( sz > 3 ) ; ++ i ) { }\n"
                                 "}";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeAndStringifyOptions, $.cpp = false)));
+        ignore_errout();
     }
 
     void simplifyKnownVariables49() { // #3691
@@ -2215,7 +2223,7 @@ class TestSimplifyTokens : public TestFixture {
                             "    case 1: sz = 2; continue;\n"
                             "    case 2: x = sz; break;\n"
                             "    }\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void f ( int sz ) {\n"
                                 "switch ( x ) {\n"
                                 "case 1 : ; sz = 2 ; continue ;\n"
@@ -2246,8 +2254,25 @@ class TestSimplifyTokens : public TestFixture {
                                 "v = { & x6 } ;\n"
                                 "const char x7 = 'b' ;\n"
                                 "return & x7 ;\n"
-                                "}";
-            ASSERT_EQUALS(code, tokenizeAndStringify(code));
+                                "}\n";
+
+            const char expected[] = "const char * foo ( ) {\n"
+                                    "const char x1 = 'b' ;\n"
+                                    "f ( & x1 ) ;\n"
+                                    "const char x2 = 'b' ;\n"
+                                    "f ( y , & x2 ) ;\n"
+                                    "const char x3 = 'b' ;\n"
+                                    "t = & x3 ;\n"
+                                    "const char x4 = 'b' ;\n"
+                                    "t = y + & x4 ;\n"
+                                    "const char x5 = 'b' ;\n"
+                                    "z [ & x5 ] = y ;\n"
+                                    "const char x6 = 'b' ;\n"
+                                    "v = { & x6 } ;\n"
+                                    "const char x7 = 'b' ;\n"
+                                    "return & x7 ;\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
             ASSERT_EQUALS(
                 "[test.cpp:5:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable y [valueFlowBailoutIncompleteVar]\n",
                 errout_str());
@@ -2269,8 +2294,25 @@ class TestSimplifyTokens : public TestFixture {
                                 "v = { & x6 } ;\n"
                                 "const int x7 = 1 ;\n"
                                 "return & x7 ;\n"
-                                "}";
-            ASSERT_EQUALS(code, tokenizeAndStringify(code));
+                                "}\n";
+
+            const char expected[] = "const int * foo ( ) {\n"
+                                    "const int x1 = 1 ;\n"
+                                    "f ( & x1 ) ;\n"
+                                    "const int x2 = 1 ;\n"
+                                    "f ( y , & x2 ) ;\n"
+                                    "const int x3 = 1 ;\n"
+                                    "t = & x3 ;\n"
+                                    "const int x4 = 1 ;\n"
+                                    "t = y + & x4 ;\n"
+                                    "const int x5 = 1 ;\n"
+                                    "z [ & x5 ] = y ;\n"
+                                    "const int x6 = 1 ;\n"
+                                    "v = { & x6 } ;\n"
+                                    "const int x7 = 1 ;\n"
+                                    "return & x7 ;\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
             ASSERT_EQUALS(
                 "[test.cpp:5:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable y [valueFlowBailoutIncompleteVar]\n",
                 errout_str());
@@ -2282,17 +2324,17 @@ class TestSimplifyTokens : public TestFixture {
                             "  TYPE *x=&x, **p=x, **q = NULL;\n"
                             "  BENCH1(q = _mhz_M(n); n = 1;)\n"
                             "  use_pointer(q);\n"
-                            "}";
+                            "}\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code), UNKNOWN_MACRO);
     }
 
     void simplifyKnownVariables54() { // #4913
-        ASSERT_EQUALS("void f ( int * p ) { * -- p = 0 ; * p = 0 ; }", tokenizeAndStringify("void f(int*p) { *--p=0; *p=0; }"));
+        ASSERT_EQUALS("void f ( int * p ) { * -- p = 0 ; * p = 0 ; }", tokenizeAndStringify("void f(int*p) { *--p=0; *p=0; }\n"));
     }
 
     void simplifyKnownVariables56() { // ticket #5301 - >>
         ASSERT_EQUALS("void f ( ) { int a ; a = 0 ; int b ; b = 0 ; * p >> a >> b ; return a / b ; }",
-                      tokenizeAndStringify("void f() { int a=0,b=0; *p>>a>>b; return a/b; }"));
+                      tokenizeAndStringify("void f() { int a=0,b=0; *p>>a>>b; return a/b; }\n"));
         ASSERT_EQUALS(
             "[test.cpp:1:26]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
             errout_str());
@@ -2307,7 +2349,7 @@ class TestSimplifyTokens : public TestFixture {
                             "} "
                             "int baz() { "
                             "  return sizeof(arr_t); "
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("enum e { VAL1 = 1 , VAL2 } ; "
                       "int foo ( int ) ; "
                       "void bar ( ) { "
@@ -2324,7 +2366,7 @@ class TestSimplifyTokens : public TestFixture {
                             "  for(i = 0, j = 1; i < 3, j < 12; i++,j++) {\n"
                             "    a[i] = 0;\n"
                             "  }\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("void f ( ) {\n"
                       "int a [ 3 ] ; int i ; int j ;\n"
                       "for ( i = 0 , j = 1 ; i < 3 , j < 12 ; i ++ , j ++ ) {\n"
@@ -2342,7 +2384,7 @@ class TestSimplifyTokens : public TestFixture {
                                              "    Other\n"
                                              "  };\n"
                                              "  enum { XX };\n"
-                                             "};"));
+                                             "};\n"));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2354,7 +2396,7 @@ class TestSimplifyTokens : public TestFixture {
                       tokenizeAndStringify("void foo(std::string str) {\n"
                                            "  char *p = &str[0];\n"
                                            "  *p = 0;\n"
-                                           "}"));
+                                           "}\n"));
     }
 
     void simplifyKnownVariables63() { // #10798
@@ -2500,24 +2542,33 @@ class TestSimplifyTokens : public TestFixture {
 
     void simplifyKnownVariablesFunctionCalls() {
         {
-            const char code[] = "void a(int &x);" // <- x is passed by reference
-                                "void b() {"
-                                "    int x = 123;"
-                                "    a(x);"       // <- don't replace with a(123);
-                                "}";
-            const char expected[] = "void a ( int & x ) ; void b ( ) { int x ; x = 123 ; a ( x ) ; }";
+            const char code[] = "void a(int &x);\n" // <- x is passed by reference
+                                "void b() {\n"
+                                "    int x = 123;\n"
+                                "    a(x);\n"       // <- don't replace with a(123);
+                                "}\n";
+            const char expected[] = "void a ( int & x ) ;\n"
+                                    "void b ( ) {\n"
+                                    "int x ; x = 123 ;\n"
+                                    "a ( x ) ;\n"
+                                    "}";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
     }
 
     void simplifyKnownVariablesGlobalVars() {
         // #8054
-        const char code[] = "static int x;"
-                            "void f() {"
-                            "    x = 123;"
-                            "    while (!x) { dostuff(); }"
-                            "}";
-        ASSERT_EQUALS("static int x ; void f ( ) { x = 123 ; while ( ! x ) { dostuff ( ) ; } }", tokenizeAndStringify(code));
+        const char code[] = "static int x;\n"
+                            "void f() {\n"
+                            "    x = 123;\n"
+                            "    while (!x) { dostuff(); }\n"
+                            "}\n";
+        const char expected[] = "static int x ;\n"
+                                "void f ( ) {\n"
+                                "x = 123 ;\n"
+                                "while ( ! x ) { dostuff ( ) ; }\n"
+                                "}";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
     }
 
@@ -2617,7 +2668,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "void bar ( ) {\n"
                                 "foo < 1 ? 0 ? 1 : 6 : 2 > x ;\n"
                                 "foo < 1 ? 0 : 2 > y ;\n"
-                                "}";
+                                "}\n";
             const char exp[] = "template < class T > struct foo ; "
                                "void bar ( ) { "
                                "foo < 6 > x ; "
@@ -2626,7 +2677,7 @@ class TestSimplifyTokens : public TestFixture {
             ASSERT_EQUALS(exp, tok(code));
         }
         {
-            const char code[] = "bool b = true ? false : 1 > 2 ;";
+            const char code[] = "bool b = true ? false : 1 > 2 ;\n";
             const char exp[] = "bool b ; b = true ? false : 1 > 2 ;";
             ASSERT_EQUALS(exp, tok(code));
         }
@@ -2635,12 +2686,12 @@ class TestSimplifyTokens : public TestFixture {
     void simplifyVarDeclInitLists()
     {
         {
-            const char code[] = "std::vector<int> v{a * b, 1};";
+            const char code[] = "std::vector<int> v{a * b, 1};\n";
             const char exp[] = "std :: vector < int > v { a * b , 1 } ;";
             ASSERT_EQUALS(exp, tok(code));
         }
         {
-            const char code[] = "enum E { E0 } e{};";
+            const char code[] = "enum E { E0 } e{};\n";
             const char exp[] = "enum E { E0 } ; enum E e ; e = { } ;";
             ASSERT_EQUALS(exp, tok(code));
         }
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
index a24131dd667..8ea0766c977 100644
--- a/test/testsimplifytypedef.cpp
+++ b/test/testsimplifytypedef.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,6 +65,7 @@ class TestSimplifyTypedef : public TestFixture {
         TEST_CASE(cfp5);
         TEST_CASE(cfp6);
         TEST_CASE(cfp7);
+        TEST_CASE(cfp8);
         TEST_CASE(carray1);
         TEST_CASE(carray2);
         TEST_CASE(carray3);
@@ -229,6 +230,12 @@ class TestSimplifyTypedef : public TestFixture {
         TEST_CASE(simplifyTypedef156);
         TEST_CASE(simplifyTypedef157);
         TEST_CASE(simplifyTypedef158);
+        TEST_CASE(simplifyTypedef159);
+        TEST_CASE(simplifyTypedef160);
+        TEST_CASE(simplifyTypedef161);
+        TEST_CASE(simplifyTypedef162);
+        TEST_CASE(simplifyTypedef163);
+        TEST_CASE(simplifyTypedef164);
 
         TEST_CASE(simplifyTypedefFunction1);
         TEST_CASE(simplifyTypedefFunction2); // ticket #1685
@@ -250,6 +257,9 @@ class TestSimplifyTypedef : public TestFixture {
 
         TEST_CASE(simplifyTypedefOriginalName1);
         TEST_CASE(simplifyTypedefOriginalName2);
+        TEST_CASE(simplifyTypedefOriginalName3);
+        TEST_CASE(simplifyTypedefOriginalName4);
+        TEST_CASE(simplifyTypedefOriginalName5);
 
         TEST_CASE(simplifyTypedefTokenColumn1);
         TEST_CASE(simplifyTypedefTokenColumn2);
@@ -258,9 +268,10 @@ class TestSimplifyTypedef : public TestFixture {
         TEST_CASE(typedefInfo1);
         TEST_CASE(typedefInfo2);
         TEST_CASE(typedefInfo3);
+        TEST_CASE(typedefInfo4);
     }
 
-    class TokenizerTest : public Tokenizer
+    class TokenizerTest final : public Tokenizer
     {
         friend class TestSimplifyTypedef;
     public:
@@ -356,7 +367,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void c1() {
         const char code[] = "typedef int t;\n"
-                            "t x;";
+                            "t x;\n";
         ASSERT_EQUALS("int x ;", simplifyTypedefC(code));
     }
 
@@ -407,56 +418,56 @@ class TestSimplifyTypedef : public TestFixture {
 
     void cconst() {
         const char code1[] = "typedef void* HWND;\n"
-                             "const HWND x;";
+                             "const HWND x;\n";
         ASSERT_EQUALS("void * const x ;", simplifyTypedef(code1));
 
         const char code2[] = "typedef void (*fp)();\n"
-                             "const fp x;";
+                             "const fp x;\n";
         ASSERT_EQUALS("void ( * const x ) ( ) ;", simplifyTypedef(code2));
     }
 
     void cstruct1() {
         const char code[] = "typedef struct { int a; int b; } t;\n"
-                            "t x;";
+                            "t x;\n";
         ASSERT_EQUALS("struct t { int a ; int b ; } ; struct t x ;", simplifyTypedef(code));
         ASSERT_EQUALS("struct t { int a ; int b ; } ; struct t x ;", simplifyTypedefC(code));
     }
 
     void cstruct2() {
         const char code[] = "typedef enum { A, B } t;\n"
-                            "t x;";
+                            "t x;\n";
         ASSERT_EQUALS("enum t { A , B } ; enum t x ;", simplifyTypedef(code));
         ASSERT_EQUALS("enum t { A , B } ; enum t x ;", simplifyTypedefC(code));
     }
 
     void cstruct3() {
         const char code[] = "typedef struct s { int a; int b; } t;\n"
-                            "t x;";
+                            "t x;\n";
         ASSERT_EQUALS("struct s { int a ; int b ; } ; struct s x ;", simplifyTypedefC(code));
     }
 
     void cstruct4() {
         const char code[] = "typedef struct s { int a; int b; } t;\n"
-                            "struct t x{};";
+                            "struct t x{};\n";
         ASSERT_EQUALS("struct s { int a ; int b ; } ; struct s x { } ;", simplifyTypedefC(code));
     }
 
     void cenum1() {
         const char code[] = "typedef enum { a, b } E;\n"
-                            "E e;";
+                            "E e;\n";
         ASSERT_EQUALS("enum E { a , b } ; enum E e ;", simplifyTypedefC(code));
     }
 
     void cfunction1() {
         const char code[] = "typedef int callback(int);\n"
-                            "callback* cb;";
+                            "callback* cb;\n";
         ASSERT_EQUALS("int ( * cb ) ( int ) ;", simplifyTypedefC(code));
     }
 
     void cfunction2() {
         const char code[] = "typedef int callback(int);\n"
                             "typedef callback* callbackPtr;\n"
-                            "callbackPtr cb;";
+                            "callbackPtr cb;\n";
         ASSERT_EQUALS("int ( * cb ) ( int ) ;", simplifyTypedefC(code));
     }
 
@@ -475,33 +486,33 @@ class TestSimplifyTypedef : public TestFixture {
 
     void cfp1() {
         const char code[] = "typedef void (*fp)(void * p);\n"
-                            "fp x;";
+                            "fp x;\n";
         ASSERT_EQUALS("void ( * x ) ( void * p ) ;", simplifyTypedefC(code));
     }
 
     void cfp2() {
         const char code[] = "typedef void (*const fp)(void * p);\n"
-                            "fp x;";
+                            "fp x;\n";
         ASSERT_EQUALS("void ( * const x ) ( void * p ) ;", simplifyTypedefC(code));
     }
 
     void cfp4() {
         const char code[] = "typedef struct S Stype ;\n"
                             "typedef void ( * F ) ( Stype * ) ;\n"
-                            "F func;";
+                            "F func;\n";
         ASSERT_EQUALS("void ( * func ) ( struct S * ) ;", simplifyTypedefC(code));
     }
 
     void cfp5() {
         const char code[] = "typedef void (*fp)(void);\n"
                             "typedef fp t;\n"
-                            "void foo(t p);";
+                            "void foo(t p);\n";
         ASSERT_EQUALS("void foo ( void ( * p ) ( void ) ) ;", simplifyTypedef(code));
     }
 
     void cfp6() {
         const char code[] = "typedef void (*fp)(void);\n"
-                            "fp a[10];";
+                            "fp a[10];\n";
         ASSERT_EQUALS("void ( * a [ 10 ] ) ( void ) ;", simplifyTypedef(code));
     }
 
@@ -512,15 +523,25 @@ class TestSimplifyTypedef : public TestFixture {
         ASSERT_EQUALS("uint32_t g ( ) ; uint32_t ( * f ) ( uint32_t n ) ;", simplifyTypedef(code));
     }
 
+    void cfp8() { // #5935
+        const char code[] = "typedef TypeDefStruct *(*ThisIsTheProblem)(Type *Var);\n"
+                            "typedef struct Struct1 {\n"
+                            "  ThisIsTheProblem *(AnotherType);\n"
+                            "} Struct1;\n";
+        const char expected[] = "struct Struct1 { TypeDefStruct * ( * * ( AnotherType ) ) ( Type * Var ) ; } ;";
+        ASSERT_EQUALS(expected, simplifyTypedefC(code));
+        ASSERT_EQUALS(expected, simplifyTypedef(code));
+    }
+
     void carray1() {
         const char code[] = "typedef int t[20];\n"
-                            "t x;";
+                            "t x;\n";
         ASSERT_EQUALS("int x [ 20 ] ;", simplifyTypedefC(code));
     }
 
     void carray2() {
         const char code[] = "typedef double t[4];\n"
-                            "t x[10];";
+                            "t x[10];\n";
         ASSERT_EQUALS("double x [ 10 ] [ 4 ] ;", simplifyTypedef(code));
     }
 
@@ -545,7 +566,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void cdonotreplace1() {
         const char code[] = "typedef int t;\n"
-                            "int* t;";
+                            "int* t;\n";
         ASSERT_EQUALS("int * t ;", simplifyTypedefC(code));
     }
 
@@ -553,13 +574,13 @@ class TestSimplifyTypedef : public TestFixture {
     void cppfp1() {
         const char code[] = "typedef void (*fp)(void);\n"
                             "typedef fp t;\n"
-                            "void foo(t p);";
+                            "void foo(t p);\n";
         ASSERT_EQUALS("void foo ( void ( * p ) ( void ) ) ;", tok(code));
     }
 
     void Generic1() {
         const char code[] = "typedef void func(void);\n"
-                            "_Generic((x), func: 1, default: 2);";
+                            "_Generic((x), func: 1, default: 2);\n";
         ASSERT_EQUALS("_Generic ( x , void ( ) : 1 , default : 2 ) ;", tok(code));
     }
 
@@ -576,7 +597,7 @@ class TestSimplifyTypedef : public TestFixture {
                             " duplicate a;\n"
                             " a.foo();\n"
                             " A::duplicate c = 0;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] =
             "class A "
@@ -602,7 +623,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "public:\n"
                             "typedef wchar_t duplicate;\n"
                             "duplicate foo() { wchar_t b; return b; }\n"
-                            "};";
+                            "};\n";
 
         const char expected[] =
             "class A ; "
@@ -627,7 +648,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "int main()\n"
                             "{\n"
                             "duplicate b;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] =
             "class A { } ; "
@@ -652,7 +673,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    s32 ivar = -2;\n"
                             "    u32 uvar = 2;\n"
                             "    return uvar / ivar;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] =
             "void f ( ) "
@@ -671,7 +692,7 @@ class TestSimplifyTypedef : public TestFixture {
             "void f()\n"
             "{\n"
             "    YY_BUFFER_STATE state;\n"
-            "}";
+            "}\n";
 
         const char expected[] =
             "void f ( ) "
@@ -688,7 +709,7 @@ class TestSimplifyTypedef : public TestFixture {
             "namespace VL {\n"
             "    typedef float float_t ;\n"
             "    inline VL::float_t fast_atan2(VL::float_t y, VL::float_t x){}\n"
-            "}";
+            "}\n";
         const char expected[] =
             "namespace VL { "
             ""
@@ -705,8 +726,8 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void simplifyTypedef7() {
-        const char code[] = "typedef int abc ; "
-                            "Fred :: abc f ;";
+        const char code[] = "typedef int abc ;\n"
+                            "Fred :: abc f ;\n";
         const char expected[] = "Fred :: abc f ;";
         ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
@@ -727,7 +748,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "RINT tri;\n"
                             "RUINT trui;\n"
                             "RCINT trci;\n"
-                            "RCUINT trcui;";
+                            "RCUINT trcui;\n";
 
         const char expected[] =
             "int ti ; "
@@ -752,7 +773,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "T t;\n"
                             "TP tp;\n"
                             "U u;\n"
-                            "V v;";
+                            "V v;\n";
 
         const char expected[] =
             "struct t { int a ; } ; "
@@ -778,7 +799,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "T t;\n"
                             "TP tp;\n"
                             "U u;\n"
-                            "V v;";
+                            "V v;\n";
 
         const char expected[] =
             "union t { int a ; float b ; } ; "
@@ -798,7 +819,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef enum { a = 0 , b = 1 , c = 2 } abc;\n"
                             "typedef enum xyz { x = 0 , y = 1 , z = 2 } XYZ;\n"
                             "abc e1;\n"
-                            "XYZ e2;";
+                            "XYZ e2;\n";
 
         const char expected[] = "enum abc { a = 0 , b = 1 , c = 2 } ; "
                                 "enum xyz { x = 0 , y = 1 , z = 2 } ; "
@@ -816,7 +837,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "V1 v1;\n"
                             "V2 v2;\n"
                             "V3 v3;\n"
-                            "IntListIterator iter;";
+                            "IntListIterator iter;\n";
 
         const char expected[] =
             "vector < int > v1 ; "
@@ -829,9 +850,9 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef13() {
         // ticket # 1167 (InternalError)
-        const char code[] = "typedef std::pair<int(*)(void*), void*> Func;"
-                            "typedef std::vector<Func> CallQueue;"
-                            "int main() {}";
+        const char code[] = "typedef std::pair<int(*)(void*), void*> Func;\n"
+                            "typedef std::vector<Func> CallQueue;\n"
+                            "int main() {}\n";
 
         // Tokenize and check output..
         ASSERT_NO_THROW(tok(code));
@@ -840,17 +861,17 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef14() {
         // ticket # 1232
-        const char code[] = "template <typename F, unsigned int N> struct E"
-                            "{"
-                            "    typedef E<F,(N>0)?(N-1):0> v;"
-                            "    typedef typename add<v,v>::val val;"
-                            "    FP_M(val);"
-                            "};"
-                            "template <typename F> struct E <F,0>"
-                            "{"
-                            "    typedef typename D<1>::val val;"
-                            "    FP_M(val);"
-                            "};";
+        const char code[] = "template <typename F, unsigned int N> struct E\n"
+                            "{\n"
+                            "    typedef E<F,(N>0)?(N-1):0> v;\n"
+                            "    typedef typename add<v,v>::val val;\n"
+                            "    FP_M(val);\n"
+                            "};\n"
+                            "template <typename F> struct E <F,0>\n"
+                            "{\n"
+                            "    typedef typename D<1>::val val;\n"
+                            "    FP_M(val);\n"
+                            "};\n";
 
         // Tokenize and check output..
         TODO_ASSERT_THROW(tok(code, dinit(TokOptions, $.debugwarnings = false)), InternalError); // TODO: Do not throw exception
@@ -860,7 +881,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef15() {
         {
             const char code[] = "typedef char frame[10];\n"
-                                "frame f;";
+                                "frame f;\n";
 
             const char expected[] = "char f [ 10 ] ;";
 
@@ -869,7 +890,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef unsigned char frame[10];\n"
-                                "frame f;";
+                                "frame f;\n";
 
             const char expected[] = "unsigned char f [ 10 ] ;";
 
@@ -883,7 +904,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef  MOT8 CHFOO[4096];\n"
                             "typedef struct {\n"
                             "   CHFOO freem;\n"
-                            "} STRFOO;";
+                            "} STRFOO;\n";
 
         // Tokenize and check output..
         ASSERT_NO_THROW(tok(code));
@@ -893,7 +914,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef17() {
         const char code[] = "typedef char * PCHAR, CHAR;\n"
                             "PCHAR pc;\n"
-                            "CHAR c;";
+                            "CHAR c;\n";
 
         const char expected[] =
             "char * pc ; "
@@ -904,7 +925,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef18() {
         const char code[] = "typedef vector<int[4]> a;\n"
-                            "a b;";
+                            "a b;\n";
         ASSERT_EQUALS("vector < int [ 4 ] > b ;", tok(code));
     }
 
@@ -914,7 +935,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef struct {} A, *B, **C;\n"
                                 "A a;\n"
                                 "B b;\n"
-                                "C c;";
+                                "C c;\n";
 
             const char expected[] =
                 "struct A { } ; "
@@ -928,7 +949,7 @@ class TestSimplifyTypedef : public TestFixture {
         {
             const char code[] = "typedef struct {} A, *********B;\n"
                                 "A a;\n"
-                                "B b;";
+                                "B b;\n";
 
             const char expected[] =
                 "struct A { } ; "
@@ -942,7 +963,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef struct {} **********A, *B, C;\n"
                                 "A a;\n"
                                 "B b;\n"
-                                "C c;";
+                                "C c;\n";
 
             const char expected[] =
                 "struct Unnamed0 { } ; "
@@ -956,7 +977,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef20() {
         // ticket #1284
-        const char code[] = "typedef jobject invoke_t (jobject, Proxy *, Method *, JArray< jobject > *);";
+        const char code[] = "typedef jobject invoke_t (jobject, Proxy *, Method *, JArray< jobject > *);\n";
         ASSERT_EQUALS(";", tok(code));
     }
 
@@ -964,7 +985,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef void (* PF)();\n"
                             "typedef void * (* PFV)(void *);\n"
                             "PF pf;\n"
-                            "PFV pfv;";
+                            "PFV pfv;\n";
 
         const char expected[] =
             ""
@@ -981,7 +1002,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    typedef void (*testfp)();\n"
                                 "    testfp get() { return test; }\n"
                                 "    static void test() { }\n"
-                                "};";
+                                "};\n";
 
             const char expected[] =
                 "class Fred { "
@@ -998,7 +1019,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    typedef void * (*testfp)(void *);\n"
                                 "    testfp get() { return test; }\n"
                                 "    static void * test(void * p) { return p; }\n"
-                                "};";
+                                "};\n";
 
             const char expected[] =
                 "class Fred { "
@@ -1015,7 +1036,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    typedef unsigned int * (*testfp)(unsigned int *);\n"
                                 "    testfp get() { return test; }\n"
                                 "    static unsigned int * test(unsigned int * p) { return p; }\n"
-                                "};";
+                                "};\n";
 
             const char expected[] =
                 "class Fred { "
@@ -1032,7 +1053,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    typedef const unsigned int * (*testfp)(const unsigned int *);\n"
                                 "    testfp get() { return test; }\n"
                                 "    static const unsigned int * test(const unsigned int * p) { return p; }\n"
-                                "};";
+                                "};\n";
 
             // static const gets changed to const static
             const char expected[] =
@@ -1050,7 +1071,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    typedef void * (*testfp)(void *);\n"
                                 "    testfp get(int i) { return test; }\n"
                                 "    static void * test(void * p) { return p; }\n"
-                                "};";
+                                "};\n";
 
             const char expected[] =
                 "class Fred { "
@@ -1066,7 +1087,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef23() {
         const char code[] = "typedef bool (*Callback) (int i);\n"
                             "void    addCallback(Callback callback) { }\n"
-                            "void    addCallback1(Callback callback, int j) { }";
+                            "void    addCallback1(Callback callback, int j) { }\n";
 
         const char expected[] =
             "void addCallback ( bool ( * callback ) ( int ) ) { } "
@@ -1081,7 +1102,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "void g( fp f )\n"
                                 "{\n"
                                 "  fp f2 = (fp)f;\n"
-                                "}";
+                                "}\n";
 
             const char expected[] =
                 "void g ( int ( * f ) ( ) ) "
@@ -1097,7 +1118,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "void g( fp f )\n"
                                 "{\n"
                                 "  fp f2 = static_cast<fp>(f);\n"
-                                "}";
+                                "}\n";
 
             const char expected[] =
                 "void g ( int ( * f ) ( ) ) "
@@ -1115,7 +1136,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef void (*fill_names_f) (const char *);\n"
                                 "struct vfs_class {\n"
                                 "    void (*fill_names) (struct vfs_class *me, fill_names_f);\n"
-                                "}";
+                                "}\n";
 
             const char expected[] =
                 "struct vfs_class { "
@@ -1129,7 +1150,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef void (*fill_names_f) (const char *);\n"
                                 "struct vfs_class {\n"
                                 "    void (*fill_names) (fill_names_f, struct vfs_class *me);\n"
-                                "}";
+                                "}\n";
 
             const char expected[] =
                 "struct vfs_class { "
@@ -1143,7 +1164,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef26() {
         {
             const char code[] = "typedef void (*Callback) ();\n"
-                                "void    addCallback(Callback (*callback)());";
+                                "void    addCallback(Callback (*callback)());\n";
 
             const char expected[] = "void addCallback ( void ( * ( * callback ) ( ) ) ( ) ) ;";
 
@@ -1155,7 +1176,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef void (*pc_video_update_proc)(bitmap_t *bitmap,\n"
                                 "struct mscrtc6845 *crtc);\n"
                                 "\n"
-                                "struct mscrtc6845 *pc_video_start(pc_video_update_proc (*choosevideomode)(running_machine *machine, int *width, int *height, struct mscrtc6845 *crtc));";
+                                "struct mscrtc6845 *pc_video_start(pc_video_update_proc (*choosevideomode)(running_machine *machine, int *width, int *height, struct mscrtc6845 *crtc));\n";
 
             const char expected[] = "struct mscrtc6845 * pc_video_start ( void ( * ( * choosevideomode ) ( running_machine * machine , int * width , int * height , struct mscrtc6845 * crtc ) ) ( bitmap_t * bitmap , struct mscrtc6845 * crtc ) ) ;";
 
@@ -1169,7 +1190,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "{\n"
                             "    typedef int (*func_ptr)(float, double);\n"
                             "    VERIFY((is_same<result_of<func_ptr(char, float)>::type, int>::value));\n"
-                            "}";
+                            "}\n";
 
         const char expected[] =
             "int main ( ) "
@@ -1186,7 +1207,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef28() {
         const char code[] = "typedef std::pair<double, double> (*F)(double);\n"
-                            "F f;";
+                            "F f;\n";
 
         const char expected[] = "std :: pair < double , double > ( * f ) ( double ) ;";
 
@@ -1202,7 +1223,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "array1 a1;\n"
                             "array2 a2;\n"
                             "int_t t;\n"
-                            "int_array ia;";
+                            "int_array ia;\n";
 
         const char expected[] =
             "int a [ ice_or < is_int < int > :: value , is_int < UDT > :: value > :: value ? 1 : -1 ] ; "
@@ -1220,7 +1241,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef ::std::list<int> int_list_array[10];\n"
                             "int_list il;\n"
                             "int_list_iterator ili;\n"
-                            "int_list_array ila;";
+                            "int_list_array ila;\n";
 
         const char expected[] =
             ":: std :: list < int > il ; "
@@ -1240,7 +1261,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    INT a;\n"
                                 "};\n"
                                 "A::INT A::get() const { return a; }\n"
-                                "A::INT i = A::a;";
+                                "A::INT i = A::a;\n";
 
             const char expected[] = "class A { "
                                     "public: "
@@ -1263,7 +1284,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    INT a;\n"
                                 "};\n"
                                 "A::INT A::get() const { return a; }\n"
-                                "A::INT i = A::a;";
+                                "A::INT i = A::a;\n";
 
             const char expected[] = "struct A { "
                                     ""
@@ -1284,7 +1305,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef const CHAR * LPCSTR;\n"
                             "CHAR c;\n"
                             "LPSTR cp;\n"
-                            "LPCSTR ccp;";
+                            "LPCSTR ccp;\n";
 
         const char expected[] =
             "char c ; "
@@ -1320,8 +1341,8 @@ class TestSimplifyTypedef : public TestFixture {
                             "};\n"
                             "A::CHAR_A A::funA() { return a; }\n"
                             "A::B::SHRT_B A::B::funB() { return b; }\n"
-                            "A::B::C::INT_C A::B::C::funC() { return c; }"
-                            "A::B::C::D::LONG_D A::B::C::D::funD() { return d; }";
+                            "A::B::C::INT_C A::B::C::funC() { return c; }\n"
+                            "A::B::C::D::LONG_D A::B::C::D::funD() { return d; }\n";
 
         const char codeFullSpecified[] = "class A {\n"
                                          "public:\n"
@@ -1348,8 +1369,8 @@ class TestSimplifyTypedef : public TestFixture {
                                          "};\n"
                                          "A::CHAR_A A::funA() { return a; }\n"
                                          "A::B::SHRT_B A::B::funB() { return b; }\n"
-                                         "A::B::C::INT_C A::B::C::funC() { return c; }"
-                                         "A::B::C::D::LONG_D A::B::C::D::funD() { return d; }";
+                                         "A::B::C::INT_C A::B::C::funC() { return c; }\n"
+                                         "A::B::C::D::LONG_D A::B::C::D::funD() { return d; }\n";
 
         const char codePartialSpecified[] = "class A {\n"
                                             "public:\n"
@@ -1376,8 +1397,8 @@ class TestSimplifyTypedef : public TestFixture {
                                             "};\n"
                                             "A::CHAR_A A::funA() { return a; }\n"
                                             "A::B::SHRT_B A::B::funB() { return b; }\n"
-                                            "A::B::C::INT_C A::B::C::funC() { return c; }"
-                                            "A::B::C::D::LONG_D A::B::C::D::funD() { return d; }";
+                                            "A::B::C::INT_C A::B::C::funC() { return c; }\n"
+                                            "A::B::C::D::LONG_D A::B::C::D::funD() { return d; }\n";
 
         const char expected[] =
             "class A { "
@@ -1420,7 +1441,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "int main()\n"
                             "{\n"
                             "    foofunc *Foo = new foofunc[2];\n"
-                            "}";
+                            "}\n";
         const char expected[] =
             "class X { } ; "
             "int main ( ) "
@@ -1468,7 +1489,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    A a = 0;\n"
                             "    S::A s = fun1(a) + fun2(a) - fun3(a);\n"
                             "    return a + s;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "class S "
                                 "{ "
@@ -1513,7 +1534,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "void f(va_list ap)\n"
                             "{\n"
                             "    *va_arg(ap, TIFFFaxFillFunc*) = 0;\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void f ( va_list ap ) "
                                 "{ "
                                 "* va_arg ( ap , void ( * * ) ( ) ) = 0 ; "
@@ -1526,7 +1547,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "void f()\n"
                             "{\n"
                             "    INT i; { }\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void f ( ) "
                                 "{ "
                                 "int i ; { } "
@@ -1536,7 +1557,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef38() {
         const char code[] = "typedef C A;\n"
-                            "struct AB : public A, public B { };";
+                            "struct AB : public A, public B { };\n";
         const char expected[] = "struct AB : public C , public B { } ;";
         ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         ASSERT_EQUALS("", errout_str());
@@ -1549,7 +1570,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "struct A\n"
                                 "{\n"
                                 "    int alloclen;\n"
-                                "};";
+                                "};\n";
 
             // The expected result..
             const char expected[] = "struct A "
@@ -1565,7 +1586,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "union A\n"
                                 "{\n"
                                 "    int alloclen;\n"
-                                "};";
+                                "};\n";
 
             // The expected result..
             const char expected[] = "union A "
@@ -1581,7 +1602,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "class A\n"
                                 "{\n"
                                 "    int alloclen;\n"
-                                "};";
+                                "};\n";
 
             // The expected result..
             const char expected[] = "class A "
@@ -1598,7 +1619,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef std::map<std::string, int> Map;\n"
                                 "class MyMap : public Map\n"
                                 "{\n"
-                                "};";
+                                "};\n";
 
             // The expected result..
             const char expected[] = "class MyMap : public std :: map < std :: string , int > "
@@ -1612,7 +1633,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef std::map<std::string, int> Map;\n"
                                 "class MyMap : protected Map\n"
                                 "{\n"
-                                "};";
+                                "};\n";
 
             // The expected result..
             const char expected[] = "class MyMap : protected std :: map < std :: string , int > "
@@ -1626,7 +1647,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef std::map<std::string, int> Map;\n"
                                 "class MyMap : private Map\n"
                                 "{\n"
-                                "};";
+                                "};\n";
 
             // The expected result..
             const char expected[] = "class MyMap : private std :: map < std :: string , int > "
@@ -1640,7 +1661,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef struct foo { } A;\n"
                                 "struct MyA : public A\n"
                                 "{\n"
-                                "};";
+                                "};\n";
 
             // The expected result..
             const char expected[] = "struct foo { } ; "
@@ -1655,7 +1676,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef class foo { } A;\n"
                                 "class MyA : public A\n"
                                 "{\n"
-                                "};";
+                                "};\n";
 
             // The expected result..
             const char expected[] = "class foo { } ; "
@@ -1697,7 +1718,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "void fn() {\n"
                             "    typedef foo<> bar;\n"
                             "    while (0 > bar(1)) {}\n"
-                            "}";
+                            "}\n";
 
         checkSimplifyTypedef(code);
         ASSERT_EQUALS_WITHOUT_LINENUMBERS(
@@ -1708,7 +1729,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef46() {
         const char code[] = "typedef const struct A { int a; } * AP;\n"
-                            "AP ap;";
+                            "AP ap;\n";
 
         // The expected result..
         const char expected[] = "struct A { int a ; } ; "
@@ -1719,7 +1740,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef47() {
         {
             const char code[] = "typedef std::pair<int, int> const I;\n"
-                                "I i;";
+                                "I i;\n";
 
             // The expected result..
             const char expected[] = "const std :: pair < int , int > i ;";
@@ -1728,7 +1749,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (X:: *F)();\n"
-                                "F f;";
+                                "F f;\n";
 
             // The expected result..
             const char expected[] = "void ( * f ) ( ) ;";
@@ -1741,7 +1762,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "void foo (LIST *module_name)\n"
                             "{\n"
                             "    bar(module_name ? module_name->string : 0);\n"
-                            "}";
+                            "}\n";
 
         // The expected result..
         const char expected[] = "struct string { } ; "
@@ -1757,7 +1778,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef const Class & Const_Reference;\n"
                             "void some_method (Const_Reference x) const {}\n"
                             "void another_method (Const_Reference x) const {}\n"
-                            "};";
+                            "};\n";
 
         // The expected result..
         const char expected[] = "class Class2 { "
@@ -1777,7 +1798,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "type1 (*tp1)[2];\n"
                             "type2 t2;\n"
                             "type3 t3;\n"
-                            "type4 t4;";
+                            "type4 t4;\n";
 
         // The expected result..
         const char expected[] = "char ( * t1 ) [ 10 ] ; "
@@ -1791,7 +1812,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef51() {
         const char code[] = "class A { public: int i; };\n"
                             "typedef const char (A :: * type1);\n"
-                            "type1 t1 = &A::i;";
+                            "type1 t1 = &A::i;\n";
 
         // The expected result..
         const char expected[] = "class A { public: int i ; } ; "
@@ -1802,7 +1823,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef52() { // ticket #1782
         {
             const char code[] = "typedef char (* type1)[10];\n"
-                                "type1 foo() { }";
+                                "type1 foo() { }\n";
 
             // The expected result..
             const char expected[] = "char ( * foo ( ) ) [ 10 ] { }";
@@ -1812,7 +1833,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef char (* type1)[10];\n"
-                                "LOCAL(type1) foo() { }";
+                                "LOCAL(type1) foo() { }\n";
 
             // this is invalid C, assert that an "unknown macro" warning is written
             ASSERT_THROW_INTERNAL(checkSimplifyTypedef(code), UNKNOWN_MACRO);
@@ -1831,7 +1852,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    {\n"
                             "        pthread_exit (0);\n"
                             "    }\n"
-                            "}";
+                            "}\n";
 
         checkSimplifyTypedef(code);
         ASSERT_EQUALS("", errout_str());
@@ -1843,7 +1864,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef int*const *_Iterator;\n"
                             "hwreg_t v1;\n"
                             "t1 v2;\n"
-                            "_Iterator v3;";
+                            "_Iterator v3;\n";
 
         // The expected result..
         const char expected[] = "volatile long * const v1 ; "
@@ -1861,7 +1882,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    typedef void (*fptr)();\n"
                             "    const fptr pr;\n"
                             "    operator const fptr& () { return pr; }\n"
-                            "};";
+                            "};\n";
 
         // The expected result..
         const char expected[] = "struct C { "
@@ -1877,7 +1898,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "void foo() {\n"
                             "    typedef int A;\n"
                             "    A a = A(1) * A(2);\n"
-                            "};";
+                            "};\n";
 
         // The expected result..
         const char expected[] = "void foo ( ) { "
@@ -1891,7 +1912,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef58() { // ticket #1963
         {
             const char code[] = "typedef int vec2_t[2];\n"
-                                "vec2_t coords[4] = {1,2,3,4,5,6,7,8};";
+                                "vec2_t coords[4] = {1,2,3,4,5,6,7,8};\n";
 
             // The expected result..
             const char expected[] = "int coords [ 4 ] [ 2 ] = { 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 } ;";
@@ -1901,7 +1922,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef int vec2_t[2];\n"
-                                "vec2_t coords[4][5][6+1] = {1,2,3,4,5,6,7,8};";
+                                "vec2_t coords[4][5][6+1] = {1,2,3,4,5,6,7,8};\n";
 
             // The expected result..
             const char expected[] = "int coords [ 4 ] [ 5 ] [ 6 + 1 ] [ 2 ] = { 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 } ;";
@@ -1913,7 +1934,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef59() { // ticket #2011
         const char code[] = "template<typename DISPATCHER> class SomeTemplateClass {\n"
                             "    typedef void (SomeTemplateClass<DISPATCHER>::*MessageDispatcherFunc)(SerialInputMessage&);\n"
-                            "};";
+                            "};\n";
         // The expected result..
         const char expected[] = "template < typename DISPATCHER > class SomeTemplateClass { } ;";
         ASSERT_EQUALS(expected, tok(code));
@@ -1927,7 +1948,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "{\n"
                             "    qboolean b;\n"
                             "    localEntitiyAddFunc_t f;\n"
-                            "}";
+                            "}\n";
         // The expected result..
         const char expected[] = "enum qboolean { qfalse , qtrue } ; void f ( ) { enum qboolean b ; enum qboolean ( * f ) ( struct le_s * , entity_t * ) ; }";
         ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
@@ -1936,14 +1957,14 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef61() { // ticket #2074 and 2075
         const char code1[] = "typedef       unsigned char   (*Mf_GetIndexByte_Func)          (void);\n"
-                             "typedef const unsigned char * (*Mf_GetPointerToCurrentPos_Func)(void);";
+                             "typedef const unsigned char * (*Mf_GetPointerToCurrentPos_Func)(void);\n";
 
         // Check for output..
         checkSimplifyTypedef(code1);
         ASSERT_EQUALS("", errout_str());
 
         const char code2[] = "typedef unsigned long uint32_t;\n"
-                             "typedef uint32_t (*write_type_t) (uint32_t);";
+                             "typedef uint32_t (*write_type_t) (uint32_t);\n";
 
         // Check for output..
         checkSimplifyTypedef(code2);
@@ -1955,7 +1976,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "void f()\n"
                              "{\n"
                              "    TString a, b;\n"
-                             "}";
+                             "}\n";
 
         // The expected tokens..
         const char expected1[] = "void f ( ) { char a [ 256 ] ; char b [ 256 ] ; }";
@@ -1966,7 +1987,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "void f()\n"
                              "{\n"
                              "    TString a = { 0 }, b = { 0 };\n"
-                             "}";
+                             "}\n";
 
         // The expected tokens..
         const char expected2[] = "void f ( ) { char a [ 256 ] = { 0 } ; char b [ 256 ] = { 0 } ; }";
@@ -1977,7 +1998,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "void f()\n"
                              "{\n"
                              "    TString a = \"\", b = \"\";\n"
-                             "}";
+                             "}\n";
 
         // The expected tokens..
         const char expected3[] = "void f ( ) { char a [ 256 ] ; a = \"\" ; char b [ 256 ] ; b = \"\" ; }";
@@ -1988,7 +2009,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "void f()\n"
                              "{\n"
                              "    TString a = \"1234\", b = \"5678\";\n"
-                             "}";
+                             "}\n";
 
         // The expected tokens..
         const char expected4[] = "void f ( ) { char a [ 256 ] ; a = \"1234\" ; char b [ 256 ] ; b = \"5678\" ; }";
@@ -1998,7 +2019,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef63() { // ticket #2175 'typedef float x[3];'
         const char code[] = "typedef float x[3];\n"
-                            "x a,b,c;";
+                            "x a,b,c;\n";
         const std::string actual(tok(code));
         ASSERT_EQUALS("float a [ 3 ] ; float b [ 3 ] ; float c [ 3 ] ;", actual);
         ASSERT_EQUALS("", errout_str());
@@ -2006,7 +2027,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef64() {
         const char code[] = "typedef typeof(__type1() + __type2()) __type;"
-                            "__type t;";
+                            "__type t;\n";
         const std::string actual(tok(code));
         ASSERT_EQUALS("typeof ( __type1 ( ) + __type2 ( ) ) t ;", actual);
         ASSERT_EQUALS("", errout_str());
@@ -2017,7 +2038,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "int main() {\n"
                             "    Foo b(0);\n"
                             "    return b > Foo(10);\n"
-                            "}";
+                            "}\n";
         const std::string actual(tok(code, dinit(TokOptions, $.debugwarnings = false)));
         ASSERT_EQUALS("int main ( ) { BAR < int > b ( 0 ) ; return b > BAR < int > ( 10 ) ; }", actual);
         ASSERT_EQUALS("", errout_str());
@@ -2025,7 +2046,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef66() { // ticket #2341
         const char code[] = "typedef long* GEN;\n"
-                            "extern GEN (*foo)(long);";
+                            "extern GEN (*foo)(long);\n";
         (void)tok(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -2034,7 +2055,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef int ( * Function ) ( ) ;\n"
                             "void f ( ) {\n"
                             "    ((Function * (*) (char *, char *, int, int)) global[6]) ( \"assoc\", \"eggdrop\", 106, 0);\n"
-                            "}";
+                            "}\n";
         // TODO should it be simplified as below instead?
         // "( ( int ( * * ( * ) ( char * , char * , int , int ) ) ( ) ) global [ 6 ] ) ( \"assoc\" , \"eggdrop\" , 106 , 0 ) ; "
         const char expected[] = "void f ( ) { "
@@ -2048,7 +2069,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef68() { // ticket #2355
         const char code[] = "typedef FMAC1 void (* a) ();\n"
-                            "void *(*b) ();";
+                            "void *(*b) ();\n";
         const std::string actual(tok(code));
         ASSERT_EQUALS("void * ( * b ) ( ) ;", actual);
         ASSERT_EQUALS("", errout_str());
@@ -2059,7 +2080,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef struct VirtualMachine\n"
                             "{\n"
                             "    CompilerHook *(*compilerHookVector)(void);\n"
-                            "}VirtualMachine;";
+                            "}VirtualMachine;\n";
         const char expected[] = "struct VirtualMachine "
                                 "{ "
                                 "int ( * * ( * compilerHookVector ) ( void ) ) ( ) ; "
@@ -2070,7 +2091,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef70() { // ticket #2348
         const char code[] = "typedef int pread_f ( int ) ;\n"
-                            "pread_f *(*test_func)(char *filename);";
+                            "pread_f *(*test_func)(char *filename);\n";
         const char expected[] = "int ( * ( * test_func ) ( char * filename ) ) ( int ) ;";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS("", errout_str());
@@ -2079,14 +2100,14 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef71() { // ticket #2348
         {
             const char code[] = "typedef int RexxFunctionHandler();\n"
-                                "RexxFunctionHandler *(efuncs[1]);";
+                                "RexxFunctionHandler *(efuncs[1]);\n";
             const char expected[] = "int ( * ( efuncs [ 1 ] ) ) ( ) ;";
             ASSERT_EQUALS(expected, tok(code));
             ASSERT_EQUALS("", errout_str());
         }
         {
             const char code[] = "typedef int RexxFunctionHandler();\n"
-                                "RexxFunctionHandler *(efuncs[]) = { NULL, NULL };";
+                                "RexxFunctionHandler *(efuncs[]) = { NULL, NULL };\n";
             const char expected[] = "int ( * ( efuncs [ ] ) ) ( ) = { NULL , NULL } ;";
             ASSERT_EQUALS(expected, tok(code));
             ASSERT_EQUALS("", errout_str());
@@ -2099,7 +2120,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "class Fred {\n"
                                 "    typedef int* (Fred::*F);\n"
                                 "    operator F() const { }\n"
-                                "};";
+                                "};\n";
             const char expected[] = "class Fred { "
                                     ""
                                     "operatorint** ( ) const { } "
@@ -2112,7 +2133,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "class Fred {\n"
                                 "    typedef int INT;\n"
                                 "    void f1() const { INT i; }\n"
-                                "};";
+                                "};\n";
             const char expected[] = "class Fred { "
                                     ""
                                     "void f1 ( ) const { int i ; } "
@@ -2126,7 +2147,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    typedef int INT;\n"
                                 "    void f1() const;\n"
                                 "};\n"
-                                "void Fred::f1() const { INT i; f(i); }";
+                                "void Fred::f1() const { INT i; f(i); }\n";
             const char expected[] = "class Fred { "
                                     ""
                                     "void f1 ( ) const ; "
@@ -2141,7 +2162,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    typedef int* (Fred::*F);\n"
                                 "    operator F() const;\n"
                                 "};\n"
-                                "Fred::operator F() const { }";
+                                "Fred::operator F() const { }\n";
             const char expected[] = "class Fred { "
                                     ""
                                     "operatorint** ( ) const ; "
@@ -2156,7 +2177,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "struct B {};\n"
                             "typedef struct A : public B {\n"
                             "    void f();\n"
-                            "} a, *aPtr;";
+                            "} a, *aPtr;\n";
         const char expected[] = "struct B { } ; "
                                 "struct A : public B { "
                                 "void f ( ) ; "
@@ -2169,7 +2190,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef long (*state_func_t)(void);\n"
                             "typedef state_func_t (*state_t)(void);\n"
                             "state_t current_state = death;\n"
-                            "static char get_runlevel(const state_t);";
+                            "static char get_runlevel(const state_t);\n";
         const char expected[] = "long ( * ( * current_state ) ( void ) ) ( void ) ; current_state = death ; "
                                 "static char get_runlevel ( long ( * ( * const ) ( void ) ) ( void ) ) ;";
         ASSERT_EQUALS(expected, tok(code));
@@ -2177,17 +2198,17 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void simplifyTypedef75() { // ticket #2426
-        const char code[] = "typedef _Packed struct S { long l; };";
+        const char code[] = "typedef _Packed struct S { long l; };\n";
         ASSERT_EQUALS(";", tok(code, dinit(TokOptions, $.debugwarnings = false)));
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef76() { // ticket #2453 segmentation fault
-        ASSERT_THROW_INTERNAL(checkSimplifyTypedef("void f1(typedef int x) {}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkSimplifyTypedef("void f1(typedef int x) {}\n"), SYNTAX);
     }
 
     void simplifyTypedef77() { // ticket #2554
-        const char code[] = "typedef char Str[10]; int x = sizeof(Str);";
+        const char code[] = "typedef char Str[10]; int x = sizeof(Str);\n";
         const char expected[] = "int x ; x = sizeof ( char [ 10 ] ) ;";
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -2196,7 +2217,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef struct A A_t;\n"
                             "A_t a;\n"
                             "typedef struct A { } A_t;\n"
-                            "A_t a1;";
+                            "A_t a1;\n";
         const char expected[] = "struct A a ; struct A { } ; struct A a1 ;";
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -2206,7 +2227,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef struct LangVtab\n"
                             "{\n"
                             "    Tcl_ObjCmdProc * (*V_LangOptionCommand);\n"
-                            "} LangVtab;";
+                            "} LangVtab;\n";
         const char expected[] = "struct LangVtab "
                                 "{ "
                                 "int ( * ( * V_LangOptionCommand ) ) ( int x ) ; "
@@ -2218,7 +2239,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef struct s { };\n"
                             "void f() {\n"
                             "    sizeof(struct s);\n"
-                            "};";
+                            "};\n";
         const char expected[] = "struct s { } ; "
                                 "void f ( ) { "
                                 "sizeof ( struct s ) ; "
@@ -2246,13 +2267,13 @@ class TestSimplifyTypedef : public TestFixture {
                              "{\n"
                              "  B * b = new B;\n"
                              "  b->f = new A::F * [ 10 ];\n"
-                             "}");
+                             "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef83() { // ticket #2620
         const char code[] = "typedef char Str[10];\n"
-                            "void f(Str &cl) { }";
+                            "void f(Str &cl) { }\n";
 
         // The expected result..
         const char expected[] = "void f ( char ( & cl ) [ 10 ] ) { }";
@@ -2261,18 +2282,18 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void simplifyTypedef84() { // ticket #2630 (segmentation fault)
-        const char code1[] = "typedef y x () x";
+        const char code1[] = "typedef y x () x\n";
         ASSERT_THROW_INTERNAL(checkSimplifyTypedef(code1), SYNTAX);
 
-        const char code2[] = "typedef struct template <>";
+        const char code2[] = "typedef struct template <>\n";
         ASSERT_THROW_INTERNAL(checkSimplifyTypedef(code2), SYNTAX);
 
-        const char code3[] = "typedef ::<>";
+        const char code3[] = "typedef ::<>\n";
         ASSERT_THROW_INTERNAL(checkSimplifyTypedef(code3), SYNTAX);
     }
 
     void simplifyTypedef85() { // ticket #2651
-        const char code[] = "typedef FOO ((BAR)(void, int, const int, int*));";
+        const char code[] = "typedef FOO ((BAR)(void, int, const int, int*));\n";
         const char expected[] = ";";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS("", errout_str());
@@ -2284,7 +2305,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "public:\n"
                             "    operator safe_bool() const;\n"
                             "    safe_bool operator!() const;\n"
-                            "};";
+                            "};\n";
         const char expected[] = "class relational { "
                                 ""
                                 "public: "
@@ -2296,14 +2317,14 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void simplifyTypedef87() { // ticket #2651
-        const char code[] = "typedef FOO (*(*BAR)(void, int, const int, int*));";
+        const char code[] = "typedef FOO (*(*BAR)(void, int, const int, int*));\n";
         const char expected[] = ";";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef88() { // ticket #2675
-        const char code[] = "typedef short int (*x)(...);";
+        const char code[] = "typedef short int (*x)(...);\n";
         const char expected[] = ";";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS("", errout_str());
@@ -2313,7 +2334,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "class Fred {\n"
                             "    typedef void f(int) const;\n"
                             "    f func;\n"
-                            "};";
+                            "};\n";
         const char expected[] = "class Fred { void func ( int ) const ; } ;";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS("", errout_str());
@@ -2321,7 +2342,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef90() { // ticket #2718
         const char code[] = "typedef int IA[2];\n"
-                            "void f(const IA&) {};";
+                            "void f(const IA&) {};\n";
         const char expected[] = "void f ( const int ( & ) [ 2 ] ) { } ;";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS("", errout_str());
@@ -2336,7 +2357,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "}\n"
                              "namespace NS {\n"
                              "    T A::f() {}\n"
-                             "}";
+                             "}\n";
         const char expected1[] = "namespace NS { "
                                  ""
                                  "class A { "
@@ -2355,7 +2376,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "        T f();\n"
                              "    };\n"
                              "}\n"
-                             "NS::T NS::A::f() {}";
+                             "NS::T NS::A::f() {}\n";
         const char expected2[] = "namespace NS { "
                                  ""
                                  "class A { "
@@ -2378,7 +2399,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "    namespace NS2 {\n"
                              "        T A::f() {}\n"
                              "    }\n"
-                             "}";
+                             "}\n";
         const char expected3[] = "namespace NS1 { "
                                  "namespace NS2 { "
                                  ""
@@ -2405,7 +2426,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "}\n"
                              "namespace NS1 {\n"
                              "    NS2::T NS2::A::f() {}\n"
-                             "}";
+                             "}\n";
         const char expected4[] = "namespace NS1 { "
                                  "namespace NS2 { "
                                  ""
@@ -2424,14 +2445,14 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef92() { // ticket #2736 (segmentation fault)
         const char code[] = "typedef long Long;\n"
                             "namespace NS {\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS(";", tok(code));
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef93() { // ticket #2738 (syntax error)
         const char code[] = "struct s { double x; };\n"
-                            "typedef struct s (*binop) (struct s, struct s);";
+                            "typedef struct s (*binop) (struct s, struct s);\n";
         const char expected[] = "struct s { double x ; } ;";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS("", errout_str());
@@ -2444,7 +2465,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "    int a[4];\n"
                              "  } data;\n"
                              "};\n"
-                             "A::data d;";
+                             "A::data d;\n";
         const char expected1[] = "class A { "
                                  "public: "
                                  "struct data { "
@@ -2461,7 +2482,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "    int a[4];\n"
                              "  } data;\n"
                              "};\n"
-                             "::A::data d;";
+                             "::A::data d;\n";
         const char expected2[] = "class A { "
                                  "public: "
                                  "struct data { "
@@ -2478,7 +2499,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "    int a[4];\n"
                              "  } data;\n"
                              "};\n"
-                             "class B : public ::A::data { };";
+                             "class B : public ::A::data { };\n";
         const char expected3[] = "class A { "
                                  "public: "
                                  "struct data { "
@@ -2495,7 +2516,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "public:\n"
                             "  typedef expression_error::error_code (*valid_func)(void *cbparam, const char *name, expression_space space);\n"
                             "  valid_func f;\n"
-                            "};";
+                            "};\n";
         const char expected[] = "class symbol_table { "
                                 "public: "
                                 "expression_error :: error_code ( * f ) ( void * , const char * , expression_space ) ; "
@@ -2505,25 +2526,25 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void simplifyTypedef96() { // ticket #2886 (segmentation fault)
-        const char code[] = "typedef struct x { }";
+        const char code[] = "typedef struct x { }\n";
         ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
     }
 
     void simplifyTypedef97() { // ticket #2983 (segmentation fault)
         const char code[] = "typedef x y\n"
-                            "(A); y";
+                            "(A); y\n";
         (void)tok(code);
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef99() { // ticket #2999
         const char code[] = "typedef struct Fred Fred;\n"
-                            "struct Fred { };";
+                            "struct Fred { };\n";
         (void)tok(code);
         ASSERT_EQUALS("", errout_str());
 
         const char code1[] = "struct Fred { };\n"
-                             "typedef struct Fred Fred;";
+                             "typedef struct Fred Fred;\n";
         (void)tok(code1);
         ASSERT_EQUALS("", errout_str());
     }
@@ -2534,14 +2555,14 @@ class TestSimplifyTypedef : public TestFixture {
                             "    Fred *fred;\n"
                             "    fred = se_alloc(sizeof(struct Fred));\n"
                             "    return fred;\n"
-                            "}";
+                            "}\n";
         (void)tok(code);
         ASSERT_EQUALS_WITHOUT_LINENUMBERS("", errout_str());
     }
 
     void simplifyTypedef101() { // ticket #3003 (segmentation fault)
         const char code[] = "typedef a x[];\n"
-                            "y = x";
+                            "y = x\n";
         ASSERT_EQUALS("y = x", tok(code));
     }
 
@@ -2550,7 +2571,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "void foo()\n"
                             "{\n"
                             "    Fred * Fred;\n"
-                            "}";
+                            "}\n";
         (void)tok(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -2560,29 +2581,29 @@ class TestSimplifyTypedef : public TestFixture {
                             "void foo()\n"
                             "{\n"
                             "    Fred Fred;\n"
-                            "}";
+                            "}\n";
         (void)tok(code);
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef104() { // ticket #3070
-        const char code[] = "typedef int (*in_func) (void FAR *, unsigned char FAR * FAR *);";
+        const char code[] = "typedef int (*in_func) (void FAR *, unsigned char FAR * FAR *);\n";
         ASSERT_EQUALS(";", tok(code));
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef105() { // ticket #3616 (segmentation fault)
-        const char code[] = "( int typedef char x; ){}";
+        const char code[] = "( int typedef char x; ){}\n";
         ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
     }
 
     void simplifyTypedef106() { // ticket #3619 (segmentation fault)
-        const char code[] = "typedef void f ();\ntypedef { f }";
+        const char code[] = "typedef void f ();\ntypedef { f }\n";
         ASSERT_THROW_INTERNAL_EQUALS(tok(code), INTERNAL, "Internal error. AST cyclic dependency.");
     }
 
     void simplifyTypedef107() { // ticket #3963 (bad code => segmentation fault)
-        const char code[] = "typedef int x[]; int main() { return x }";
+        const char code[] = "typedef int x[]; int main() { return x }\n";
         ASSERT_EQUALS("int main ( ) { return x }", tok(code));
         ignore_errout(); // we do not care about the output
     }
@@ -2592,7 +2613,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "void sort_factor(GEN *y, long n) {\n"
                             "    GEN a, b;\n"
                             "    foo(a, b);\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void sort_factor ( long * * y , long n ) { "
                                 "long * a ; long * b ; "
                                 "foo ( a , b ) ; "
@@ -2602,7 +2623,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef109() {
         const char code[] = "typedef int&& rref;\n"
-                            "rref var = 0;";
+                            "rref var = 0;\n";
         const char expected[] = "int && var = 0 ;";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS("", errout_str());
@@ -2637,7 +2658,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "            C::D::DKIPtr membervariable5;\n"
                             "        };\n"
                             "    }\n"
-                            "}";
+                            "}\n";
         const char expected[] = "namespace A { "
                                 "namespace B { "
                                 "struct ZClass { "
@@ -2718,7 +2739,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    enum  {\n"
                             "      domain_dim = TrafoEvaluator::domain_dim,\n"
                             "    };\n"
-                            "};";
+                            "};\n";
 
         const char expected[] = "template < "
                                 "typename DataType , "
@@ -2734,14 +2755,14 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef113() {     // ticket #7030
         const char code[] = "typedef int T;\n"
-                            "void f() { T:; }";
+                            "void f() { T:; }\n";
         const char expected[] = "void f ( ) { T : ; }";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void simplifyTypedef114() {     // ticket #7058
         const char code[] = "typedef struct { enum {A,B}; } AB;\n"
-                            "x=AB::B;";
+                            "x=AB::B;\n";
         const char expected[] = "struct AB { enum Anonymous0 { A , B } ; } ; x = AB :: B ;";
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -2749,7 +2770,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef115() {     // ticket #6998
         const char code[] = "typedef unsigned unsignedTypedef;\n"
                             "unsignedTypedef t1 ;\n"
-                            "unsigned t2 ;";
+                            "unsigned t2 ;\n";
         const char expected[] = "unsigned int t1 ; "
                                 "unsigned int t2 ;";
         ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
@@ -2762,7 +2783,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    CharacterToConversion c2c;\n"
                             "    for (CharacterToConversion::iterator it = c2c.begin(); it != c2c.end(); ++it) {}\n"
                             "    CharacterToConversion().swap(c2c);\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void fn ( ) { "
                                 "std :: vector < CharacterConversion > c2c ; "
                                 "for ( std :: vector < CharacterConversion > :: iterator it = c2c . begin ( ) ; it != c2c . end ( ) ; ++ it ) { } "
@@ -2776,7 +2797,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef struct bstr {} bstr;\n"
                             "struct bstr bstr0(const char *s) {\n"
                             "    return (struct bstr) { (unsigned char *)s, s ? strlen(s) : 0 };\n"
-                            "}";
+                            "}\n";
         const char expected[] = "struct bstr { } ; "
                                 "struct bstr bstr0 ( const char * s ) { "
                                 "return ( struct bstr ) { ( unsigned char * ) s , s ? strlen ( s ) : 0 } ; "
@@ -2791,7 +2812,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef int (ClassyClass::*funky_type);\n"
                             "operator funky_type() {\n"
                             "return &ClassyClass::id;\n"
-                            "}}";
+                            "}}\n";
         const char expected[] = "struct ClassyClass { "
                                 "int id ; "
                                 "operatorintClassyClass::* ( ) { "
@@ -2807,7 +2828,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "  typedef T1 XX;\n"
                             "}\n"
                             "namespace Baz { }\n"
-                            "enum Bar { XX = 1 };";
+                            "enum Bar { XX = 1 };\n";
         const char exp[] = "enum Bar { XX = 1 } ;";
         ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
         ASSERT_EQUALS("", errout_str());
@@ -2816,7 +2837,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef120() { // #8357
         const char code[] = "typedef char test_utf8_char[5];\n"
                             "static test_utf8_char const bad_chars[] = { };\n"
-                            "static void report_good(bool passed, test_utf8_char const c) { };";
+                            "static void report_good(bool passed, test_utf8_char const c) { };\n";
         const char exp[] = "static const char bad_chars [ ] [ 5 ] = { } ; "
                            "static void report_good ( bool passed , const char c [ 5 ] ) { } ;";
         ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
@@ -2840,7 +2861,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "vec3 & Fred::v() { return v3; }\n"
                             "mat3x3 & Fred::m() { return m3x3; }\n"
                             "const vec3 & Fred::vc() const { return v3; }\n"
-                            "const mat3x3 & Fred::mc() const { return m3x3; }";
+                            "const mat3x3 & Fred::mc() const { return m3x3; }\n";
         const char exp[] = "float v3 [ 3 ] ; "
                            "float m3x3 [ 3 ] [ 3 ] ; "
                            "const float * & gv ( ) { return v3 ; } "
@@ -2861,14 +2882,14 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void simplifyTypedef122() { // segmentation fault
-        const char code[] = "int result = [] { return git_run_cmd(\"update-index\",\"update-index -q --refresh\"); }();";
+        const char code[] = "int result = [] { return git_run_cmd(\"update-index\",\"update-index -q --refresh\"); }();\n";
         (void)tok(code);
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef123() { // ticket #7406
         const char code[] = "typedef int intvec[1];\n"
-                            "Dummy<intvec> y;";
+                            "Dummy<intvec> y;\n";
         const char exp[] = "Dummy < int [ 1 ] > y ;";
         ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
         ASSERT_EQUALS("", errout_str());
@@ -2876,15 +2897,15 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef124() { // ticket #7792
         const char code[] = "typedef long unsigned int size_t;\n"
-                            "typedef size_t (my_func)(char *, size_t, size_t, void *);"
-                            "size_t f(size_t s);";
+                            "typedef size_t (my_func)(char *, size_t, size_t, void *);\n"
+                            "size_t f(size_t s);\n";
 
         const char exp[] = "long f ( long s ) ;";
         ASSERT_EQUALS(exp, tok(code));
         ASSERT_EQUALS("", errout_str());
 
         const char code1[] = "typedef long unsigned int uint32_t;\n"
-                             "typedef uint32_t (my_func)(char *, uint32_t, uint32_t, void *);";
+                             "typedef uint32_t (my_func)(char *, uint32_t, uint32_t, void *);\n";
 
         // Check for output..
         checkSimplifyTypedef(code1);
@@ -2894,22 +2915,22 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef125() { // #8749
         const char code[] = "typedef char A[3];\n"
-                            "char (*p)[3] = new A[4];";
+                            "char (*p)[3] = new A[4];\n";
         const char exp[] = "char ( * p ) [ 3 ] = new char [ 4 ] [ 3 ] ;";
         ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef126() { // #5953
         const char code[] = "typedef char automap_data_t[100];\n"
-                            "void write_array(automap_data_t *data) {}";
+                            "void write_array(automap_data_t *data) {}\n";
         const char exp[] = "void write_array ( char ( * data ) [ 100 ] ) { }";
         ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef127() { // #8878
-        const char code[] = "class a; typedef int (a::*b); "
-                            "template <long, class> struct c; "
-                            "template <int g> struct d { enum { e = c<g, b>::f }; };";
+        const char code[] = "class a; typedef int (a::*b);\n"
+                            "template <long, class> struct c;\n"
+                            "template <int g> struct d { enum { e = c<g, b>::f }; };\n";
         const char exp[] = "class a ; "
                            "template < long , class > struct c ; "
                            "template < int g > struct d { enum Anonymous0 { e = c < g , int ( a :: * ) > :: f } ; } ;";
@@ -2920,7 +2941,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef int d[4];\n"
                             "void f() {\n"
                             "    dostuff((const d){1,2,3,4});\n"
-                            "}";
+                            "}\n";
         const char exp[] = "void f ( ) { "
                            "dostuff ( ( const int [ 4 ] ) { 1 , 2 , 3 , 4 } ) ; "
                            "}";
@@ -2932,7 +2953,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "class c {\n"
                                 "  typedef char foo[4];\n"
                                 "  foo &f ;\n"
-                                "};";
+                                "};\n";
 
             const char exp[] = "class c { char ( & f ) [ 4 ] ; } ;";
             ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
@@ -2942,7 +2963,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "class c {\n"
                                 "  typedef char foo[4];\n"
                                 "  const foo &f;\n"
-                                "};";
+                                "};\n";
 
             const char exp[] = "class c { const char ( & f ) [ 4 ] ; } ;";
             ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
@@ -2953,7 +2974,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "  typedef char foo[4];\n"
                                 "  foo _a;\n"
                                 "  constexpr const foo &c_str() const noexcept { return _a; }\n"
-                                "};";
+                                "};\n";
 
             const char exp[] = "class c { char _a [ 4 ] ; const constexpr char ( & c_str ( ) const noexcept ( true ) ) [ 4 ] { return _a ; } } ;";
             ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
@@ -2964,7 +2985,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "  typedef char foo[4];\n"
                                 "  foo _a;\n"
                                 "  constexpr operator foo &() noexcept { return _a; }\n"
-                                "};";
+                                "};\n";
 
             const char actual[] = "class c { char _a [ 4 ] ; constexpr char ( & operatorchar ( ) noexcept ( true ) ) [ 4 ] { return _a ; } } ;";
             const char exp[] = "class c { char _a [ 4 ] ; char ( & operatorchar ( ) noexcept ( true ) ) [ 4 ] { return _a ; } } ;";
@@ -2976,7 +2997,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "  typedef char foo[4];\n"
                                 "  foo _a;\n"
                                 "  constexpr operator const foo &() const noexcept { return _a; }\n"
-                                "};";
+                                "};\n";
 
             const char actual[] = "class c { char _a [ 4 ] ; constexpr const char ( & operatorconstchar ( ) const noexcept ( true ) ) [ 4 ] { return _a ; } } ;";
             const char exp[] = "class c { char _a [ 4 ] ; const char ( & operatorconstchar ( ) const noexcept ( true ) ) [ 4 ] { return _a ; } } ;";
@@ -2988,7 +3009,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "template <class, class> void a() {\n"
                             "  typedef int(*b)[10];\n"
                             "  a<b, b>();\n"
-                            "}";
+                            "}\n";
 
         const char exp[] = "template < class , class > void a ( ) { "
                            "a < int ( * ) [ 10 ] , int ( * ) [ 10 ] > ( ) ; "
@@ -3002,7 +3023,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "a4 a4obj;\n"
                             "a4 &&  a4_rref = std::move(a4obj);\n"
                             "a4* a4p = &(a4obj);\n"
-                            "a4*&& a4p_rref = std::move(a4p);";
+                            "a4*&& a4p_rref = std::move(a4p);\n";
 
         const char exp[] = "unsigned char a4obj [ 4 ] ; "
                            "unsigned char ( && a4_rref ) [ 4 ] = std :: move ( a4obj ) ; "
@@ -3024,7 +3045,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "\n"
                             "using NamespaceA::MySpecialType;\n"
                             "\n"
-                            "void A::DoSomething( MySpecialType wrongName ) {}";
+                            "void A::DoSomething( MySpecialType wrongName ) {}\n";
 
         const char exp[] = "class A { "
                            "void DoSomething ( int special ) ; "
@@ -3046,7 +3067,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "namespace foo { typedef long long int64; }\n"
                             "typedef int int32;\n"
                             "namespace foo { int64 i; }\n"
-                            "int32 j;";
+                            "int32 j;\n";
         ASSERT_EQUALS("; namespace foo { long long i ; } int j ;", tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
@@ -3066,7 +3087,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    AstNodePtr range;\n"
                             "    range->createTokens();\n"
                             "}\n"
-                            "void clangimport::AstNode::createScope(const std::vector<AstNodePtr> & children2) { }";
+                            "void clangimport::AstNode::createScope(const std::vector<AstNodePtr> & children2) { }\n";
         const char expected[] = "namespace clangimport { "
                                 "class AstNode ; "
                                 "class AstNode { "
@@ -3095,7 +3116,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "S1 s1;\n"
                             "S2 s2;\n"
                             "S3 s3;\n"
-                            "S4 s4;";
+                            "S4 s4;\n";
 
         const char expected[] = "class C1 { } ; "
                                 "class S1 { } ; "
@@ -3127,7 +3148,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "using namespace external::ns1;\n"
                                 "namespace ns {\n"
                                 "    void A::f(external::ns1::V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "namespace ns1 { "
                                 "struct B<1> ; "
@@ -3161,7 +3182,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void A::f(external::ns1::V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "namespace ns1 { "
                                 "struct B<1> ; "
@@ -3195,7 +3216,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "using namespace external::ns1;\n"
                                 "namespace ns {\n"
                                 "    void A::f(V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "namespace ns1 { "
                                 "struct B<1> ; "
@@ -3245,7 +3266,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void A::f(V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "namespace ns1 { "
                                 "struct B<1> ; "
@@ -3292,7 +3313,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void A::f(external::ns1::V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "struct B<1> ; "
                                 "} "
@@ -3322,7 +3343,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void A::f(external::ns1::V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "struct B<1> ; "
                                 "namespace ns { "
                                 "struct A { "
@@ -3803,10 +3824,89 @@ class TestSimplifyTypedef : public TestFixture {
         TODO_ASSERT_EQUALS(exp, cur, tok(code));
     }
 
+    void simplifyTypedef159() {
+        const char code[] = "typedef void (*const func_t)();\n" // #14387
+                            "func_t g() { return nullptr; }\n";
+        const char exp[] = "void * const g ( ) { return nullptr ; }";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
+    void simplifyTypedef160() {
+        const char code[] = "struct S1 {};\n"
+                            "typedef struct S1 S2;\n"
+                            "namespace N {\n"
+                            "    struct B {\n"
+                            "        explicit B(int& i);\n"
+                            "    };\n"
+                            "    struct S2 : B {\n"
+                            "        explicit S2(int& i) : B(i) {}\n"
+                            "    };\n"
+                            "}\n";
+        const char exp[] = "struct S1 { } ; " // #12623
+                           "namespace N { "
+                           "struct B { "
+                           "explicit B ( int & i ) ; } ; "
+                           "struct S2 : B { "
+                           "explicit S2 ( int & i ) : B ( i ) { } "
+                           "} ; "
+                           "}";
+        ASSERT_EQUALS(exp, tok(code));
+
+        const char code2[] = "typedef struct T* T;\n" // #14669
+                             "struct T {\n"
+                             "    T p;\n"
+                             "};\n";
+        const char exp2[] = "struct T { struct T * p ; } ;";
+        ASSERT_EQUALS(exp2, simplifyTypedefC(code2));
+    }
+
+    void simplifyTypedef161() {
+        const char code[] = "namespace N {\n" // #11775
+                            "    typedef int A[3];\n"
+                            "    p = new A*[n];\n"
+                            "}\n";
+        const char cur[] = "namespace N { p = new int ( * [ n ] ) [ 3 ] ; }";
+        const char exp[] = "namespace N { p = new ( int ( * [ n ] ) [ 3 ] ) ; }";
+        TODO_ASSERT_EQUALS(exp, cur, tok(code));
+
+        const char code2[] = "typedef int A[3];\n"
+                             "p = new A*[n];\n";
+        const char cur2[] = "p = new int ( * ) [ n ] [ 3 ] ;";
+        const char exp2[] = "p = new ( int ( * [ n ] ) [ 3 ] ) ;";
+        TODO_ASSERT_EQUALS(exp2, cur2, tok(code2));
+    }
+
+    void simplifyTypedef162() {
+        const char code[] = "using std::vector;\n" // #12041
+                            "typedef vector<int> ints;\n"
+                            "void f(ints v);\n";
+        const char exp[] = "void f ( std :: vector < int > v ) ;";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
+    void simplifyTypedef163() {
+        const char code[] = "typedef v *v;\n";
+        ASSERT_THROW_INTERNAL(tok(code), INTERNAL);
+    }
+
+    void simplifyTypedef164() {
+        const char code[] = "typedef struct D{x;}y y;\n";
+        ASSERT_THROW_INTERNAL(tok(code), INTERNAL);
+
+        const char code2[] = "typedef struct { int t; } t;"; // #14966
+        ASSERT_EQUALS("struct t { int t ; } ;", tok(code2));
+
+        const char code3[] = "typedef struct S { S() {} } S;"; // #14971
+        ASSERT_EQUALS("struct S { S ( ) { } } ;", tok(code3));
+
+        const char code4[] = "typedef struct S { S& operator=(const S&) = delete; } S;"; // #14977
+        ASSERT_EQUALS("struct S { S & operator= ( const S & ) = delete ; } ;", tok(code4));
+    }
+
     void simplifyTypedefFunction1() {
         {
             const char code[] = "typedef void (*my_func)();\n"
-                                "std::queue<my_func> func_queue;";
+                                "std::queue<my_func> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( ) > func_queue ;";
@@ -3816,7 +3916,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (*my_func)(void);\n"
-                                "std::queue<my_func> func_queue;";
+                                "std::queue<my_func> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( void ) > func_queue ;";
@@ -3826,7 +3926,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (*my_func)(int);\n"
-                                "std::queue<my_func> func_queue;";
+                                "std::queue<my_func> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int ) > func_queue ;";
@@ -3836,7 +3936,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (*my_func)(int*);\n"
-                                "std::queue<my_func> func_queue;";
+                                "std::queue<my_func> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int * ) > func_queue ;";
@@ -3847,7 +3947,7 @@ class TestSimplifyTypedef : public TestFixture {
         {
             // ticket # 1615
             const char code[] = "typedef void (*my_func)(arg_class*);\n"
-                                "std::queue<my_func> func_queue;";
+                                "std::queue<my_func> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( arg_class * ) > func_queue ;";
@@ -3858,7 +3958,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func)();\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( ) > func_queue ;";
@@ -3868,7 +3968,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func)(void);\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( void ) > func_queue ;";
@@ -3878,7 +3978,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func)(int);\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int ) > func_queue ;";
@@ -3888,7 +3988,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func)(int*);\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int * ) > func_queue ;";
@@ -3898,7 +3998,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func)(arg_class*);\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( arg_class * ) > func_queue ;";
@@ -3909,7 +4009,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void my_func();\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( ) > func_queue ;";
@@ -3919,7 +4019,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void my_func(void);\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( void ) > func_queue ;";
@@ -3929,7 +4029,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void my_func(int);\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int ) > func_queue ;";
@@ -3939,7 +4039,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void my_func(int*);\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int * ) > func_queue ;";
@@ -3949,7 +4049,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void my_func(arg_class*);\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( arg_class * ) > func_queue ;";
@@ -3960,7 +4060,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func());\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( ) > func_queue ;";
@@ -3970,7 +4070,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func(void));\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( void ) > func_queue ;";
@@ -3980,7 +4080,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func(int));\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int ) > func_queue ;";
@@ -3990,7 +4090,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func(int*));\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int * ) > func_queue ;";
@@ -4000,7 +4100,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func(arg_class*));\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( arg_class * ) > func_queue ;";
@@ -4011,7 +4111,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedefFunction2() { // ticket #1685
         const char code[] = "typedef void voidfn (int);\n"
-                            "voidfn xxx;";
+                            "voidfn xxx;\n";
 
         // The expected result..
         const char expected[] = "void xxx ( int ) ;";
@@ -4033,7 +4133,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func4 f4;\n"
                                 "func5 f5;\n"
                                 "func6 f6;\n"
-                                "func7 f7;";
+                                "func7 f7;\n";
 
             // The expected result..
             const char expected[] = "C f1 ( ) ; "
@@ -4061,7 +4161,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func4 f4;\n"
                                 "func5 f5;\n"
                                 "func6 f6;\n"
-                                "func7 f7;";
+                                "func7 f7;\n";
 
             // The expected result..
             // C const -> const C
@@ -4090,7 +4190,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func4 f4;\n"
                                 "func5 f5;\n"
                                 "func6 f6;\n"
-                                "func7 f7;";
+                                "func7 f7;\n";
 
             // The expected result..
             const char expected[] = "const C f1 ( ) ; "
@@ -4118,7 +4218,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func4 f4;\n"
                                 "func5 f5;\n"
                                 "func6 f6;\n"
-                                "func7 f7;";
+                                "func7 f7;\n";
 
             // The expected result..
             const char expected[] = "C * f1 ( ) ; "
@@ -4146,7 +4246,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func4 f4;\n"
                                 "func5 f5;\n"
                                 "func6 f6;\n"
-                                "func7 f7;";
+                                "func7 f7;\n";
 
             // The expected result..
             const char expected[] = "const C * f1 ( ) ; "
@@ -4174,7 +4274,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func4 f4;\n"
                                 "func5 f5;\n"
                                 "func6 f6;\n"
-                                "func7 f7;";
+                                "func7 f7;\n";
 
             // The expected result..
             // C const -> const C
@@ -4196,7 +4296,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef int ( * type3 ( bool ) ) ( int , int ) ;\n"
                             "type1 t1;\n"
                             "type2 t2;\n"
-                            "type3 t3;";
+                            "type3 t3;\n";
 
         // The expected result..
         const char expected[] = "int ( * ( * t1 ) ( bool ) ) ( int , int ) ; "
@@ -4230,7 +4330,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "type9 t9;\n"
                             "type10 t10;\n"
                             "type11 t11;\n"
-                            "type12 t12;";
+                            "type12 t12;\n";
 
         // The expected result..
         const char expected[] = "int ( * t1 ) ( float ) ; "
@@ -4259,7 +4359,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    void ( * get4 ( ) ) ( );\n"
                             "};\n"
                             "testfp Fred::get3() { return 0; }\n"
-                            "void ( * Fred::get4 ( ) ) ( ) { return 0 ; }";
+                            "void ( * Fred::get4 ( ) ) ( ) { return 0 ; }\n";
 
         // The expected result..
         const char expected[] = "struct Fred "
@@ -4277,8 +4377,8 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void simplifyTypedefFunction7() {
-        const char code[] = "typedef void ( __gnu_cxx :: _SGIAssignableConcept < _Tp > :: * _func_Tp_SGIAssignableConcept ) () ;"
-                            "_func_Tp_SGIAssignableConcept X;";
+        const char code[] = "typedef void ( __gnu_cxx :: _SGIAssignableConcept < _Tp > :: * _func_Tp_SGIAssignableConcept ) () ;\n"
+                            "_func_Tp_SGIAssignableConcept X;\n";
 
         // The expected result..
         const char expected[] = "void ( __gnu_cxx :: _SGIAssignableConcept < _Tp > :: * X ) ( ) ;";
@@ -4290,7 +4390,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedefFunction8() {
         // #2376 - internal error
         const char code[] = "typedef int f_expand(const nrv_byte *);\n"
-                            "void f(f_expand *(*get_fexp(int))){}";
+                            "void f(f_expand *(*get_fexp(int))){}\n";
         checkSimplifyTypedef(code);
         TODO_ASSERT_EQUALS("", "[test.cpp:2:29]: (debug) Function::addArguments found argument 'int' with varid 0. [varid0]\n", errout_str());  // make sure that there is no internal error
     }
@@ -4304,7 +4404,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func1 f1;\n"
                                 "func2 f2;\n"
                                 "func3 f3;\n"
-                                "func4 f4;";
+                                "func4 f4;\n";
 
             // The expected result..
             const char expected[] = ":: C ( :: C :: * f1 ) ( ) ; "
@@ -4323,7 +4423,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func1 f1;\n"
                                 "func2 f2;\n"
                                 "func3 f3;\n"
-                                "func4 f4;";
+                                "func4 f4;\n";
 
             // The expected result..
             const char expected[] = "B :: C ( * f1 ) ( ) ; "
@@ -4342,7 +4442,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func1 f1;\n"
                                 "func2 f2;\n"
                                 "func3 f3;\n"
-                                "func4 f4;";
+                                "func4 f4;\n";
 
             // The expected result..
             const char expected[] = ":: B :: C ( :: B :: C :: * f1 ) ( ) ; "
@@ -4361,7 +4461,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func1 f1;\n"
                                 "func2 f2;\n"
                                 "func3 f3;\n"
-                                "func4 f4;";
+                                "func4 f4;\n";
 
             // The expected result..
             const char expected[] = "A :: B :: C ( * f1 ) ( ) ; "
@@ -4381,7 +4481,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef Format_E1 (**PtrToFunPtr_Type1)();\n"
                             "typedef MySpace::Format_E2 (**PtrToFunPtr_Type2)();\n"
                             "PtrToFunPtr_Type1 t1;\n"
-                            "PtrToFunPtr_Type2 t2;";
+                            "PtrToFunPtr_Type2 t2;\n";
         ASSERT_EQUALS("enum Format_E1 { FORMAT11 , FORMAT12 } ; enum Format_E1 Format_T1 ; "
                       "namespace MySpace { "
                       "enum Format_E2 { FORMAT21 , FORMAT22 } ; enum Format_E2 Format_T2 ; "
@@ -4414,15 +4514,15 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedefStruct() {
         const char code1[] = "typedef struct S { int x; } xyz;\n"
-                             "xyz var;";
+                             "xyz var;\n";
         ASSERT_EQUALS("struct S { int x ; } ; struct S var ;", tok(code1,dinit(TokOptions, $.simplify = false)));
 
         const char code2[] = "typedef const struct S { int x; } xyz;\n"
-                             "xyz var;";
+                             "xyz var;\n";
         ASSERT_EQUALS("struct S { int x ; } ; const struct S var ;", tok(code2,dinit(TokOptions, $.simplify = false)));
 
         const char code3[] = "typedef volatile struct S { int x; } xyz;\n"
-                             "xyz var;";
+                             "xyz var;\n";
         ASSERT_EQUALS("struct S { int x ; } ; volatile struct S var ;", tok(code3,dinit(TokOptions, $.simplify = false)));
     }
 
@@ -4430,7 +4530,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef struct { int x; } xyz;;\n"
                             "void f(){\n"
                             "    int abc, xyz;\n" // <- shadow variable
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("struct xyz { int x ; } ; void f ( ) { int abc ; int xyz ; }",
                       tok(code,dinit(TokOptions, $.simplify = false)));
     }
@@ -4442,30 +4542,30 @@ class TestSimplifyTypedef : public TestFixture {
                             "\n"
                             "void foo(index_t prev_segment) {\n"
                             "    if(prev_segment==NO_SEGMENT) {}\n" // <- test that index_t is replaced with uint32_t in the expanded tokens
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("void foo ( uint32_t prev_segment ) { if ( prev_segment == ( ( uint32_t ) 12 ) ) { } }",
                       simplifyTypedefP(code));
     }
 
     void simplifyTypedefOriginalName1() {
-        const char code[] = "typedef unsigned char uint8_t;"
-                            "typedef float (*rFunctionPointer_fp)(uint8_t, uint8_t);"
-                            "typedef enum eEnumDef {"
-                            "  ABC = 0,"
-                            "}eEnum_t;"
-                            "typedef enum {"
-                            "  ABC = 0,"
-                            "}eEnum2_t;"
-                            "typedef short int16_t;"
-                            "typedef struct stStructDef {"
-                            "  int16_t swA;"
-                            "}stStruct_t;"
-                            "double endOfTypeDef;"
-                            "eEnum2_t enum2Type;"
-                            "stStruct_t structType;"
-                            "eEnum_t enumType;"
-                            "uint8_t t;"
-                            "void test(rFunctionPointer_fp functionPointer);";
+        const char code[] = "typedef unsigned char uint8_t;\n"
+                            "typedef float (*rFunctionPointer_fp)(uint8_t, uint8_t);\n"
+                            "typedef enum eEnumDef {\n"
+                            "  ABC = 0,\n"
+                            "}eEnum_t;\n"
+                            "typedef enum {\n"
+                            "  ABC = 0,\n"
+                            "}eEnum2_t;\n"
+                            "typedef short int16_t;\n"
+                            "typedef struct stStructDef {\n"
+                            "  int16_t swA;\n"
+                            "}stStruct_t;\n"
+                            "double endOfTypeDef;\n"
+                            "eEnum2_t enum2Type;\n"
+                            "stStruct_t structType;\n"
+                            "eEnum_t enumType;\n"
+                            "uint8_t t;\n"
+                            "void test(rFunctionPointer_fp functionPointer);\n";
 
         TokenList tokenlist{settings1, Standards::Language::C};
         ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
@@ -4498,7 +4598,7 @@ class TestSimplifyTypedef : public TestFixture {
         // Search for the simplified short token and check its original Name, start from front to get the variable in the struct
         token = Token::findsimplematch(tokenizer.list.front(), "short", tokenizer.list.back());
         ASSERT_EQUALS("int16_t", token->originalName());
-        // Search for the simplified * token -> function pointer gets "(*" tokens infront of it
+        // Search for the simplified * token -> function pointer gets "(*" tokens in front of it
         token = Token::findsimplematch(endOfTypeDef, "*", tokenizer.list.back());
         ASSERT_EQUALS("rFunctionPointer_fp", token->originalName());
     }
@@ -4506,7 +4606,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedefOriginalName2() {
         const char code[] = "typedef unsigned short uint16;\n"
                             "typedef uint16 A;\n"
-                            "A a;";
+                            "A a;\n";
         TokenList tokenlist{ settings1, Standards::Language::C };
         ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
         TokenizerTest tokenizer(std::move(tokenlist), *this);
@@ -4523,11 +4623,56 @@ class TestSimplifyTypedef : public TestFixture {
         ASSERT_EQUALS("A", token->originalName());
     }
 
+    void simplifyTypedefOriginalName3() {
+        const char code[] = "void f(void) {\n"
+                            "    typedef int A;\n"
+                            "    A a;\n"
+                            "}\n";
+        TokenList tokenlist{ settings1, Standards::Language::C };
+        ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
+        tokenizer.createLinks();
+        tokenizer.simplifyTypedef();
+        ASSERT_NO_THROW(tokenizer.validate());
+        const Token* token = Token::findsimplematch(tokenizer.list.front(), "int");
+        ASSERT_EQUALS("A", token->originalName());
+    }
+
+    void simplifyTypedefOriginalName4() {
+        const char code[] = "void f(void) {\n"
+                            "    typedef unsigned int A;\n"
+                            "    A a;\n"
+                            "}\n";
+        TokenList tokenlist{ settings1, Standards::Language::C };
+        ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
+        tokenizer.createLinks();
+        tokenizer.simplifyTypedef();
+        ASSERT_NO_THROW(tokenizer.validate());
+        const Token* token = Token::findsimplematch(tokenizer.list.front(), "int");
+        ASSERT_EQUALS("A", token->originalName());
+    }
+
+    void simplifyTypedefOriginalName5() {
+        const char code[] = "void f(void) {\n"
+                            "    typedef void (*A)(int);\n"
+                            "    A a;\n"
+                            "}\n";
+        TokenList tokenlist{ settings1, Standards::Language::C };
+        ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
+        tokenizer.createLinks();
+        tokenizer.simplifyTypedef();
+        ASSERT_NO_THROW(tokenizer.validate());
+        const Token* token = Token::findsimplematch(tokenizer.list.front(), "int");
+        ASSERT_EQUALS("A", token->originalName());
+    }
+
     void simplifyTypedefTokenColumn1() {  // #13155
         const char code[] = "void foo(void) {\n"
                             "    typedef signed int MY_INT;\n"
                             "    MY_INT x = 0;\n"
-                            "}";
+                            "}\n";
 
         TokenList tokenlist{settings1, Standards::Language::C};
         ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
@@ -4545,7 +4690,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "void foo(void) {\n"
                             "    typedef signed int (*F)(int);\n"
                             "    F x = 0;\n"
-                            "}";
+                            "}\n";
 
         TokenList tokenlist{settings1, Standards::Language::C};
         ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
@@ -4574,9 +4719,9 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void typedefInfo1() {
-        const std::string xml = dumpTypedefInfo("typedef int A;\nA x;");
+        const std::string xml = dumpTypedefInfo("typedef int A;\nA x;\n");
         ASSERT_EQUALS("  <typedef-info>\n"
-                      "    <info name=\"A\" file=\"file.c\" line=\"1\" column=\"1\" used=\"1\" isFunctionPointer=\"0\"/>\n"
+                      "    <info name=\"A\" file=\"file.c\" line=\"1\" column=\"13\" used=\"1\" isFunctionPointer=\"0\"/>\n"
                       "  </typedef-info>\n",
                       xml);
     }
@@ -4588,7 +4733,7 @@ class TestSimplifyTypedef : public TestFixture {
                                                 "   typedef fp16 ( *pfp16 ) ( void );\n"
                                                 "}\n");
         ASSERT_EQUALS("  <typedef-info>\n"
-                      "    <info name=\"fp16\" file=\"file.c\" line=\"2\" column=\"1\" used=\"1\" isFunctionPointer=\"1\">\n"
+                      "    <info name=\"fp16\" file=\"file.c\" line=\"2\" column=\"17\" used=\"1\" isFunctionPointer=\"1\">\n"
                       "      <token line=\"2\" column=\"1\" str=\"typedef\"/>\n"
                       "      <token line=\"2\" column=\"9\" str=\"void\"/>\n"
                       "      <token line=\"2\" column=\"14\" str=\"(\"/>\n"
@@ -4600,8 +4745,8 @@ class TestSimplifyTypedef : public TestFixture {
                       "      <token line=\"2\" column=\"33\" str=\"n\"/>\n"
                       "      <token line=\"2\" column=\"35\" str=\")\"/>\n"
                       "    </info>\n"
-                      "    <info name=\"int16_t\" file=\"file.c\" line=\"1\" column=\"1\" used=\"1\" isFunctionPointer=\"0\"/>\n"
-                      "    <info name=\"pfp16\" file=\"file.c\" line=\"4\" column=\"20\" used=\"0\" isFunctionPointer=\"1\">\n"
+                      "    <info name=\"int16_t\" file=\"file.c\" line=\"1\" column=\"22\" used=\"1\" isFunctionPointer=\"0\"/>\n"
+                      "    <info name=\"pfp16\" file=\"file.c\" line=\"4\" column=\"4\" used=\"0\" isFunctionPointer=\"1\">\n"
                       "      <token line=\"4\" column=\"4\" str=\"typedef\"/>\n"
                       "      <token line=\"4\" column=\"12\" str=\"void\"/>\n"
                       "      <token line=\"4\" column=\"12\" str=\"(\"/>\n"
@@ -4630,6 +4775,17 @@ class TestSimplifyTypedef : public TestFixture {
                                                 "}\n");
         ASSERT_EQUALS("",xml);
     }
+
+    void typedefInfo4() {
+        const std::string xml = dumpTypedefInfo("typedef struct coord {\n"
+                                                "    uint16_t x;\n"
+                                                "    uint16_t y;\n"
+                                                "} coord;\n"
+                                                "coord c;\n");
+        ASSERT_EQUALS("  <typedef-info>\n"
+                      "    <info name=\"coord\" originalName=\"coord\" file=\"file.c\" line=\"4\" column=\"3\" tagline=\"1\" tagcolumn=\"16\" used=\"1\" isFunctionPointer=\"0\"/>\n"
+                      "  </typedef-info>\n", xml);
+    }
 };
 
 REGISTER_TEST(TestSimplifyTypedef)
diff --git a/test/testsimplifyusing.cpp b/test/testsimplifyusing.cpp
index fa067f822ce..239407f5c2f 100644
--- a/test/testsimplifyusing.cpp
+++ b/test/testsimplifyusing.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include "helpers.h"
 #include "platform.h"
 #include "settings.h"
+#include "standards.h"
 #include "token.h"
 #include "utils.h"
 
@@ -73,6 +74,12 @@ class TestSimplifyUsing : public TestFixture {
         TEST_CASE(simplifyUsing34);
         TEST_CASE(simplifyUsing35);
         TEST_CASE(simplifyUsing36);
+        TEST_CASE(simplifyUsing37);
+        TEST_CASE(simplifyUsing38);
+        TEST_CASE(simplifyUsing39);
+        TEST_CASE(simplifyUsing40);
+        TEST_CASE(simplifyUsing41);
+        TEST_CASE(simplifyUsing42);
 
         TEST_CASE(simplifyUsing8970);
         TEST_CASE(simplifyUsing8971);
@@ -94,6 +101,7 @@ class TestSimplifyUsing : public TestFixture {
         TEST_CASE(simplifyUsing10335);
         TEST_CASE(simplifyUsing10720);
         TEST_CASE(simplifyUsing13873); // function declaration
+        TEST_CASE(simplifyUsing14877);
 
         TEST_CASE(scopeInfo1);
         TEST_CASE(scopeInfo2);
@@ -104,12 +112,14 @@ class TestSimplifyUsing : public TestFixture {
         Platform::Type type = Platform::Type::Native;
         bool debugwarnings = true;
         bool preprocess = false;
+        Standards::cppstd_t cppstd = Standards::CPPLatest;
     };
 
 #define tok(...) tok_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     std::string tok_(const char* file, int line, const char (&code)[size], const TokOptions& options = make_default_obj()) {
-        const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).debugwarnings(options.debugwarnings).platform(options.type).build();
+        const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).debugwarnings(options.debugwarnings)
+                                  .platform(options.type).cpp(options.cppstd).build();
 
         if (options.preprocess) {
             SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
@@ -137,7 +147,7 @@ class TestSimplifyUsing : public TestFixture {
                             " duplicate a;\n"
                             " a.foo();\n"
                             " A::duplicate c = 0;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] =
             "class A "
@@ -163,7 +173,7 @@ class TestSimplifyUsing : public TestFixture {
                             "public:\n"
                             "using duplicate = wchar_t;\n"
                             "duplicate foo() { wchar_t b; return b; }\n"
-                            "};";
+                            "};\n";
 
         const char expected[] =
             "class A ; "
@@ -188,7 +198,7 @@ class TestSimplifyUsing : public TestFixture {
                             "int main()\n"
                             "{\n"
                             "duplicate b;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] =
             "class A { } ; "
@@ -213,7 +223,7 @@ class TestSimplifyUsing : public TestFixture {
                             "    s32 ivar = -2;\n"
                             "    u32 uvar = 2;\n"
                             "    return uvar / ivar;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] =
             "void f ( ) "
@@ -231,7 +241,7 @@ class TestSimplifyUsing : public TestFixture {
             "void f()\n"
             "{\n"
             "    YY_BUFFER_STATE state;\n"
-            "}";
+            "}\n";
 
         const char expected[] =
             "void f ( ) "
@@ -247,7 +257,7 @@ class TestSimplifyUsing : public TestFixture {
             "namespace VL {\n"
             "    using float_t = float;\n"
             "    inline VL::float_t fast_atan2(VL::float_t y, VL::float_t x){}\n"
-            "}";
+            "}\n";
 
         const char expected[] =
             "namespace VL { "
@@ -259,8 +269,8 @@ class TestSimplifyUsing : public TestFixture {
     }
 
     void simplifyUsing7() {
-        const char code[] = "using abc = int; "
-                            "Fred :: abc f ;";
+        const char code[] = "using abc = int;\n"
+                            "Fred :: abc f ;\n";
         const char expected[] = "Fred :: abc f ;";
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -281,7 +291,7 @@ class TestSimplifyUsing : public TestFixture {
                             "RINT tri;\n"
                             "RUINT trui;\n"
                             "RCINT trci;\n"
-                            "RCUINT trcui;";
+                            "RCUINT trcui;\n";
 
         const char expected[] =
             "int ti ; "
@@ -310,7 +320,7 @@ class TestSimplifyUsing : public TestFixture {
                             "TP tp;\n"
                             "U u;\n"
                             "V v;\n"
-                            "W w;";
+                            "W w;\n";
 
         const char expected[] =
             "struct t { int a ; } ; "
@@ -341,7 +351,7 @@ class TestSimplifyUsing : public TestFixture {
                             "TP tp;\n"
                             "U u;\n"
                             "V v;\n"
-                            "W w;";
+                            "W w;\n";
 
         const char expected[] =
             "union t { int a ; float b ; } ; "
@@ -362,7 +372,7 @@ class TestSimplifyUsing : public TestFixture {
         const char code[] = "using abc = enum { a = 0 , b = 1 , c = 2 };\n"
                             "using XYZ = enum xyz { x = 0 , y = 1 , z = 2 };\n"
                             "abc e1;\n"
-                            "XYZ e2;";
+                            "XYZ e2;\n";
 
         const char expected[] = "enum abc { a = 0 , b = 1 , c = 2 } ; "
                                 "enum xyz { x = 0 , y = 1 , z = 2 } ; "
@@ -380,7 +390,7 @@ class TestSimplifyUsing : public TestFixture {
                             "V1 v1;\n"
                             "V2 v2;\n"
                             "V3 v3;\n"
-                            "IntListIterator iter;";
+                            "IntListIterator iter;\n";
 
         const char expected[] = "vector < int > v1 ; "
                                 "std :: vector < int > v2 ; "
@@ -395,7 +405,7 @@ class TestSimplifyUsing : public TestFixture {
                             "using CallQueue = std::vector<Func>;\n"
                             "int main() {\n"
                             " CallQueue q;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "int main ( ) { "
                                 "std :: vector < std :: pair < int ( * ) ( void * ) , void * > > q ; "
@@ -416,7 +426,7 @@ class TestSimplifyUsing : public TestFixture {
                             "{"
                             "    using nal = typename D<1>::val;"
                             "    FP_M(val);"
-                            "};";
+                            "};\n";
 
         TODO_ASSERT_THROW(tok(code, dinit(TokOptions, $.debugwarnings = false)), InternalError); // TODO: Do not throw AST validation exception
         //ASSERT_EQUALS("", errout_str());
@@ -425,7 +435,7 @@ class TestSimplifyUsing : public TestFixture {
     void simplifyUsing15() {
         {
             const char code[] = "using frame = char [10];\n"
-                                "frame f;";
+                                "frame f;\n";
 
             const char expected[] = "char f [ 10 ] ;";
 
@@ -434,7 +444,7 @@ class TestSimplifyUsing : public TestFixture {
 
         {
             const char code[] = "using frame = unsigned char [10];\n"
-                                "frame f;";
+                                "frame f;\n";
 
             const char expected[] = "unsigned char f [ 10 ] ;";
 
@@ -448,7 +458,7 @@ class TestSimplifyUsing : public TestFixture {
                             "using STRFOO = struct {\n"
                             "   CHFOO freem;\n"
                             "};\n"
-                            "STRFOO s;";
+                            "STRFOO s;\n";
 
         const char expected[] = "struct STRFOO { "
                                 "char freem [ 4096 ] ; "
@@ -468,7 +478,7 @@ class TestSimplifyUsing : public TestFixture {
                             "S1 s1;\n"
                             "S2 s2;\n"
                             "S3 s3;\n"
-                            "S4 s4;";
+                            "S4 s4;\n";
 
         const char expected[] = "class C1 { } ; "
                                 "class S1 { } ; "
@@ -484,7 +494,7 @@ class TestSimplifyUsing : public TestFixture {
     }
 
     void simplifyUsing18() {
-        const char code[] = "{ { { using a = a; using a; } } }";
+        const char code[] = "{ { { using a = a; using a; } } }\n";
         (void)tok(code); // don't crash
     }
 
@@ -496,7 +506,7 @@ class TestSimplifyUsing : public TestFixture {
                             "void foo::e() {\n"
                             "   using b = float;\n"
                             "}\n"
-                            "}";
+                            "}\n";
         (void)tok(code); // don't hang
         ignore_errout(); // we are not interested in the output
     }
@@ -541,14 +551,14 @@ class TestSimplifyUsing : public TestFixture {
                             "   };\n"
                             "   return nullptr;\n"
                             "}\n"
-                            "}}}}}}}";
+                            "}}}}}}}\n";
         (void)tok(code); // don't hang
         ignore_errout(); // we do not care about the output
     }
 
     void simplifyUsing21() {
         const char code[] = "using a = b;\n"
-                            "enum {}";
+                            "enum {}\n";
         (void)tok(code); // don't crash
     }
 
@@ -565,7 +575,7 @@ class TestSimplifyUsing : public TestFixture {
                             "fff::fff() : m_icm(icm) {\n"
                             "    using ESdk = aa::bb::sdk::common::api::Sdk::ESdk;\n"
                             "}\n"
-                            "}}}}}";
+                            "}}}}}\n";
         const char expected[] = "namespace aa { namespace bb { namespace cc { namespace dd { namespace ee { "
                                 "class fff { "
                                 "public: "
@@ -592,7 +602,7 @@ class TestSimplifyUsing : public TestFixture {
                             "   : m_icm(icm)\n"
                             "   , m_rt{rt::UNKNOWN_} {\n"
                             "  using escs = yy::zz::aa::bb::cc::dd::ee;\n"
-                            "}";
+                            "}\n";
         const char expected[] = "class cmcch { "
                                 "public: "
                                 "cmcch ( const icmsp & icm , Rtnf && rtnf = { } ) ; "
@@ -610,7 +620,7 @@ class TestSimplifyUsing : public TestFixture {
 
     void simplifyUsing24() {
         const char code[] = "using value_type = const ValueFlow::Value;\n"
-                            "value_type vt;";
+                            "value_type vt;\n";
         const char expected[] = "const ValueFlow :: Value vt ;";
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -623,7 +633,7 @@ class TestSimplifyUsing : public TestFixture {
                             "namespace vtkm {\n"
                             "template <>\n"
                             "struct VecTraits<UnusualType> : VecTraits<UnusualType::T> { };\n"
-                            "}";
+                            "}\n";
         const char expected[] = "struct UnusualType { "
                                 "vtkm :: Id X ; "
                                 "} ; "
@@ -882,11 +892,110 @@ class TestSimplifyUsing : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void simplifyUsing37() {
+        const char code1[] = "using fp1_t = int(*)(int);\n"
+                             "using fp2_t = int(* const)(int);\n"
+                             "fp1_t fp1;\n"
+                             "fp2_t fp2;\n";
+        const char expected1[] = "int ( * fp1 ) ( int ) ; int ( * const fp2 ) ( int ) ;";
+        ASSERT_EQUALS(expected1, tok(code1));
+        ASSERT_EQUALS("", errout_str());
+
+        const char code2[] = "using f_t = int(int);\n"
+                             "f_t* fp1;\n"
+                             "f_t* const fp2;\n";
+        const char expected2[] = "int ( * fp1 ) ( int ) ; int ( * const fp2 ) ( int ) ;";
+        ASSERT_EQUALS(expected2, tok(code2));
+        ASSERT_EQUALS("", errout_str());
+
+        const char code3[] = "using FP = std::string (*)();\n" // #14421
+                             "using FPC = std::string (*const)();\n"
+                             "FP fp;\n"
+                             "FPC fpc{};\n";
+        const char expected3[] = "std :: string ( * fp ) ( ) ; std :: string ( * const fpc ) ( ) { } ;";
+        ASSERT_EQUALS(expected3, tok(code3));
+        ASSERT_EQUALS("", errout_str());
+
+        const char code4[] = "using F = void(*)(char);\n" // #14429
+                             "F f(int);\n";
+        const char expected4[] = "void * f ( char ) ;";
+        ASSERT_EQUALS(expected4, tok(code4));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void simplifyUsing38() {
+        const char code[] = "using std::begin;\n" // #14424
+                            "using std::end;\n"
+                            "Unknown begin;\n"
+                            "int end;\n";
+        const char expected[] = "Unknown begin ; int end ;";
+        ASSERT_EQUALS(expected, tok(code));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void simplifyUsing39() {
+        const char code[] = "using std::wstring;\n" // #14578
+                            "wstring ws;\n";
+        const char expected[] = "std :: wstring ws ;";
+        ASSERT_EQUALS(expected, tok(code));
+        ASSERT_EQUALS("", errout_str());
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.cppstd = Standards::CPP03)));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void simplifyUsing40() {
+        const char code[] = "uint8_t f();\n" // #14876
+                            "using ::std::uint8_t;\n";
+        const char expected[] = "uint8_t f ( ) ;";
+        ASSERT_EQUALS(expected, tok(code));
+    }
+
+    void simplifyUsing41() {
+        const char code[] = "using FpHandler = void(*)(const SourceLocation&);\n"
+                            "inline FpHandler AssertImpl::m_fpHandler = nullptr;\n";
+        const char expected[] = "void ( * AssertImpl :: m_fpHandler ) ( const SourceLocation & ) ; m_fpHandler = nullptr ;";
+        ASSERT_EQUALS(expected, tok(code));
+    }
+
+    void simplifyUsing42() {
+        {
+            const char code[] = "using A = bool;\n"
+                                "template<typename T> A func() {}\n";
+            const char expected[] = "template < typename T > bool func ( ) { }";
+            ASSERT_EQUALS(expected, tok(code));
+        }
+        {
+            const char code[] = "using A = bool;\n"
+                                "template<typename A> A func() {}\n";
+            const char expected[] = "template < typename A > A func ( ) { }";
+            ASSERT_EQUALS(expected, tok(code));
+        }
+        {
+            const char code[] = "using A = bool;\n"
+                                "template<typename T> class C { A x; }\n";
+            const char expected[] = "template < typename T > class C { bool x ; }";
+            ASSERT_EQUALS(expected, tok(code));
+        }
+        {
+            const char code[] = "using A = bool;\n"
+                                "template<typename A> class C { A x; }\n";
+            const char expected[] = "template < typename A > class C { A x ; }";
+            ASSERT_EQUALS(expected, tok(code));
+        }
+        {
+            const char code[] = "using A = bool;\n"
+                                "template<typename T> class C { using A = T; A x; }\n"
+                                "C<int> c;\n";
+            const char expected[] = "class C<int> ; C<int> c ; class C<int> { int x ; }";
+            ASSERT_EQUALS(expected, tok(code));
+        }
+    }
+
     void simplifyUsing8970() {
         const char code[] = "using V = std::vector<int>;\n"
                             "struct A {\n"
                             "    V p;\n"
-                            "};";
+                            "};\n";
 
         const char expected[] = "struct A { "
                                 "std :: vector < int > p ; "
@@ -905,7 +1014,7 @@ class TestSimplifyUsing : public TestFixture {
                             "private:\n"
                             "    A::V v_;\n"
                             "    V v2_;\n"
-                            "};";
+                            "};\n";
 
         const char expected[] = "class A { "
                                 "public: "
@@ -920,7 +1029,7 @@ class TestSimplifyUsing : public TestFixture {
     }
 
     void simplifyUsing8976() {
-        const char code[] = "using mystring = std::string;";
+        const char code[] = "using mystring = std::string;\n";
 
         const char exp[] = ";";
 
@@ -928,7 +1037,7 @@ class TestSimplifyUsing : public TestFixture {
     }
 
     void simplifyUsing9040() {
-        const char code[] = "using BOOL = unsigned; int i;";
+        const char code[] = "using BOOL = unsigned; int i;\n";
 
         const char exp[] = "int i ;";
 
@@ -947,7 +1056,7 @@ class TestSimplifyUsing : public TestFixture {
                             "};\n"
                             "template <class T>\n"
                             "class s {};\n"
-                            "using BOOL = char;";
+                            "using BOOL = char;\n";
 
         const char exp[] = "template < class T > "
                            "class c { "
@@ -972,7 +1081,7 @@ class TestSimplifyUsing : public TestFixture {
                             "void f2() {\n"
                             "  using namespace NS1::NS2;\n"
                             "  _LONG A;\n"
-                            "}";
+                            "}\n";
 
         const char exp[] = "void f1 ( ) { "
                            "using namespace NS1 ; "
@@ -997,7 +1106,7 @@ class TestSimplifyUsing : public TestFixture {
                             "    };\n"
                             "    void A::func(UniqueResultPtr) {\n"
                             "    }\n"
-                            "}";
+                            "}\n";
         const char exp[] = "namespace ns { "
                            "class Result ; "
                            "class A { "
@@ -1022,7 +1131,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "};\n"
                                 "A::A(Foo) { }\n"
                                 "A::~A() { Foo foo; }\n"
-                                "void A::func(Foo) { }";
+                                "void A::func(Foo) { }\n";
             const char exp[] = "class A { "
                                "public: "
                                "A ( int foo ) ; "
@@ -1046,7 +1155,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "};\n"
                                 "A::B::B(Foo) { }\n"
                                 "A::B::~B() { Foo foo; }\n"
-                                "void A::B::func(Foo) { }";
+                                "void A::B::func(Foo) { }\n";
             const char exp[] = "class A { "
                                "public: "
                                "struct B { "
@@ -1069,7 +1178,7 @@ class TestSimplifyUsing : public TestFixture {
                             "    A(Type&);\n"
                             "    Type& t_;\n"
                             "};\n"
-                            "A::A(Type& t) : t_(t) { }";
+                            "A::A(Type& t) : t_(t) { }\n";
         const char exp[] = "class A { "
                            "public: "
                            "A ( int & ) ; "
@@ -1082,7 +1191,7 @@ class TestSimplifyUsing : public TestFixture {
     void simplifyUsing9518() {
         const char code[] = "namespace a {\n"
                             "using a = enum {};\n"
-                            "}";
+                            "}\n";
         const char exp[] = "namespace a { "
                            "enum a { } ; "
                            "}";
@@ -1095,7 +1204,7 @@ class TestSimplifyUsing : public TestFixture {
                             "template<> class MappedType<Type_t::Nil> { using type = void; };\n"
                             "std::string to_string (Example::Type_t type) {\n"
                             "   switch (type) {}\n"
-                            "}";
+                            "}\n";
         const char exp[] = "enum class Type_t { Nil = 0 } ; "
                            "class MappedType<Type_t::Nil> ; "
                            "template < Type_t type > class MappedType { } ; "
@@ -1112,7 +1221,7 @@ class TestSimplifyUsing : public TestFixture {
                             "using namespace ns;\n"
                             "static void f() {\n"
                             "    const ArrayType arr;\n"
-                            "}";
+                            "}\n";
         const char exp[] = "using namespace ns ; "
                            "static void f ( ) { "
                            "const std :: vector < int > arr ; "
@@ -1137,7 +1246,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "using namespace external::ns1;\n"
                                 "namespace ns {\n"
                                 "    void A::f(external::ns1::V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "namespace ns1 { "
                                 "struct B<1> ; "
@@ -1171,7 +1280,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void A::f(external::ns1::V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "namespace ns1 { "
                                 "struct B<1> ; "
@@ -1205,7 +1314,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "using namespace external::ns1;\n"
                                 "namespace ns {\n"
                                 "    void A::f(V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "namespace ns1 { "
                                 "struct B<1> ; "
@@ -1240,7 +1349,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void A::f(V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "namespace ns1 { "
                                 "struct B<1> ; "
@@ -1273,7 +1382,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void A::f(external::ns1::V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "struct B<1> ; "
                                 "} "
@@ -1303,7 +1412,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void A::f(external::ns1::V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "struct B<1> ; "
                                 "namespace ns { "
                                 "struct A { "
@@ -1330,7 +1439,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "public:\n"
                                 "    void f(const V&) const override;\n"
                                 "};\n"
-                                "void A::f(const std::vector<char>&) const { }";
+                                "void A::f(const std::vector<char>&) const { }\n";
             const char exp[]  = "class B { "
                                 "public: "
                                 "virtual void f ( const std :: vector < char > & ) const = 0 ; "
@@ -1371,7 +1480,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "    NS1::B::V v;\n"
                                 "    a.f(v);\n"
                                 "    c.f(v);\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace NS1 { "
                                 "class B { "
                                 "public: "
@@ -1426,7 +1535,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "   using MLSource = foo::s::Literal;\n"
                                 "   auto ret = foo::ResultCodes_e::NO_ERROR;\n"
                                 "   return ret;\n"
-                                "}";
+                                "}\n";
             (void)tok(code); // don't crash
             ignore_errout(); // we do not care about the output
         }
@@ -1446,7 +1555,7 @@ class TestSimplifyUsing : public TestFixture {
                             "}\n"
                             "namespace ns {\n"
                             "    void B::f(const std::vector<unsigned char>&) const { }\n"
-                            "}";
+                            "}\n";
         const char exp[] = "namespace ns { "
                            "class A { "
                            "public: "
@@ -1477,7 +1586,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void B::f(h) { }\n"
-                                "}";
+                                "}\n";
             const char exp[] = "namespace ns { "
                                "class A { "
                                "public: "
@@ -1508,7 +1617,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "namespace external {\n"
                                 "void B::f(h) {}\n"
                                 "}\n"
-                                "}";
+                                "}\n";
             const char exp[] = "namespace ns { "
                                "namespace external { "
                                "class A { "
@@ -1540,7 +1649,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "}\n"
                                 "void bar() {\n"
                                 "   Pr<st> p;\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "std :: ostream & operator<< ( std :: ostream & s , const Pr < st > p ) { "
                                 "return s ; "
                                 "} "
@@ -1564,7 +1673,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "void xxx::foobar() {\n"
                                 "   using NS1 = v1::l;\n"
                                 "}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace defsa { "
                                 "void xxx :: foo ( ) { "
                                 "} "
@@ -1580,7 +1689,7 @@ class TestSimplifyUsing : public TestFixture {
 
     void simplifyUsing10335() {
         const char code[] = "using uint8_t = unsigned char;\n"
-                            "enum E : uint8_t { E0 };";
+                            "enum E : uint8_t { E0 };\n";
         const char exp[]  = "enum E : unsigned char { E0 } ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -1610,13 +1719,19 @@ class TestSimplifyUsing : public TestFixture {
         ASSERT_EQUALS("namespace NS1 { void * f ( ) ; }", tok(code3));
     }
 
+    void simplifyUsing14877() {
+        const char code[] = "using C = struct C { C() {} };\n";
+        const char expected[] = "struct C { C ( ) { } } ;";
+        ASSERT_EQUALS(expected, tok(code));
+    }
+
     void scopeInfo1() {
         const char code[] = "struct A {\n"
                             "    enum class Mode { UNKNOWN, ENABLED, NONE, };\n"
                             "};\n"
                             "\n"
                             "namespace spdlog { class logger; }\n"
-                            "using LoggerPtr = std::shared_ptr<spdlog::logger>;";
+                            "using LoggerPtr = std::shared_ptr<spdlog::logger>;\n";
         (void)tok(code);
         ASSERT_EQUALS("", errout_str());
     }
diff --git a/test/testsingleexecutor.cpp b/test/testsingleexecutor.cpp
index feb760e5381..fe5cdf8181d 100644
--- a/test/testsingleexecutor.cpp
+++ b/test/testsingleexecutor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ class TestSingleExecutorBase : public TestFixture {
     TestSingleExecutorBase(const char * const name, bool useFS) : TestFixture(name), useFS(useFS) {}
 
 private:
-    /*const*/ Settings settings = settingsBuilder().library("std.cfg").build();
+    /*const*/ Settings settings;
     bool useFS;
 
     std::string fprefix() const
@@ -61,7 +61,7 @@ class TestSingleExecutorBase : public TestFixture {
     struct CheckOptions
     {
         bool quiet = true;
-        ShowTime showtime = ShowTime::NONE;
+        Settings::ShowTime showtime = Settings::ShowTime::NONE;
         const char* plistOutput = nullptr;
         std::vector<std::string> filesList;
     };
@@ -94,12 +94,15 @@ class TestSingleExecutorBase : public TestFixture {
         s.quiet = opt.quiet;
         if (opt.plistOutput)
             s.plistOutput = opt.plistOutput;
-        s.templateFormat = "{callstack}: ({severity}) {inconclusive:inconclusive: }{message}"; // TODO: remove when we only longer rely on toString() in unique message handling?
+        s.templateFormat = "{callstack}: ({severity}) {inconclusive:inconclusive: }{message}\n"; // TODO: remove when we only longer rely on toString() in unique message handling?
 
         Suppressions supprs;
+        std::unique_ptr<TimerResults> timerResults;
+        if (s.showtime != Settings::ShowTime::NONE)
+            timerResults.reset(new TimerResults);
 
         // NOLINTNEXTLINE(performance-unnecessary-value-param)
-        CppCheck cppcheck(s, supprs, *this, true, [](std::string,std::vector<std::string>,std::string,std::string&){
+        CppCheck cppcheck(s, supprs, *this, timerResults.get(), true, [](std::string,std::vector<std::string>,std::string,std::string&){
             return EXIT_SUCCESS;
         });
 
@@ -112,7 +115,7 @@ class TestSingleExecutorBase : public TestFixture {
         if (useFS)
             filelist.clear();
 
-        SingleExecutor executor(cppcheck, filelist, fileSettings, s, supprs, *this);
+        SingleExecutor executor(cppcheck, filelist, fileSettings, s, supprs, *this, timerResults.get());
         ASSERT_EQUALS(result, executor.check());
     }
 
@@ -127,9 +130,7 @@ class TestSingleExecutorBase : public TestFixture {
         TEST_CASE(one_error_less_files);
         TEST_CASE(one_error_several_files);
         TEST_CASE(showtime_top5_file);
-        TEST_CASE(showtime_top5_summary);
         TEST_CASE(showtime_file);
-        TEST_CASE(showtime_summary);
         TEST_CASE(showtime_file_total);
         TEST_CASE(suppress_error_library);
         TEST_CASE(unique_errors);
@@ -141,8 +142,8 @@ class TestSingleExecutorBase : public TestFixture {
               "void f()\n"
               "{\n"
               "  (void)(*((int*)0));\n"
-              "}", dinit(CheckOptions,
-                         $.quiet = false));
+              "}\n", dinit(CheckOptions,
+                           $.quiet = false));
         {
             std::string expected;
             for (int i = 1; i <= num_files; ++i) {
@@ -166,7 +167,7 @@ class TestSingleExecutorBase : public TestFixture {
               "void f()\n"
               "{\n"
               "  (void)(*((int*)0));\n"
-              "}", dinit(CheckOptions, $.showtime = ShowTime::SUMMARY));
+              "}\n", dinit(CheckOptions, $.showtime = Settings::ShowTime::SUMMARY));
         // we are not interested in the results - so just consume them
         ignore_errout();
     }
@@ -179,7 +180,7 @@ class TestSingleExecutorBase : public TestFixture {
               "void f()\n"
               "{\n"
               "  (void)(*((int*)0));\n"
-              "}", dinit(CheckOptions, $.plistOutput = plistOutput.c_str()));
+              "}\n", dinit(CheckOptions, $.plistOutput = plistOutput.c_str()));
         // we are not interested in the results - so just consume them
         ignore_errout();
     }
@@ -189,7 +190,7 @@ class TestSingleExecutorBase : public TestFixture {
               "int main()\n"
               "{\n"
               "  return 0;\n"
-              "}");
+              "}\n");
     }
 
     void no_errors_less_files() {
@@ -197,7 +198,7 @@ class TestSingleExecutorBase : public TestFixture {
               "int main()\n"
               "{\n"
               "  return 0;\n"
-              "}");
+              "}\n");
     }
 
     void no_errors_equal_amount_files() {
@@ -205,7 +206,7 @@ class TestSingleExecutorBase : public TestFixture {
               "int main()\n"
               "{\n"
               "  return 0;\n"
-              "}");
+              "}\n");
     }
 
     void one_error_less_files() {
@@ -213,7 +214,7 @@ class TestSingleExecutorBase : public TestFixture {
               "void f()\n"
               "{\n"
               "  (void)(*((int*)0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[" + fprefix() + "_" + zpad3(1) + ".c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
     }
 
@@ -223,7 +224,7 @@ class TestSingleExecutorBase : public TestFixture {
               "void f()\n"
               "{\n"
               "  (void)(*((int*)0));\n"
-              "}");
+              "}\n");
         {
             std::string expected;
             for (int i = 1; i <= num_files; ++i) {
@@ -238,56 +239,30 @@ class TestSingleExecutorBase : public TestFixture {
     void showtime_top5_file() {
         REDIRECT;
         check(2, 0,
-              "int main() {}",
+              "int main() {}\n",
               dinit(CheckOptions,
-                    $.showtime = ShowTime::TOP5_FILE));
+                    $.showtime = Settings::ShowTime::TOP5_FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        // for each file: top5 results + overall + total
-        ASSERT_EQUALS((5 + 1 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
-    }
-
-    void showtime_top5_summary() {
-        REDIRECT;
-        check(2, 0,
-              "int main() {}",
-              dinit(CheckOptions,
-                    $.showtime = ShowTime::TOP5_SUMMARY));
-        const std::string output_s = GET_REDIRECT_OUTPUT;
-        // once: top5 results + newline
-        ASSERT_EQUALS(5 + 1, cppcheck::count_all_of(output_s, '\n'));
-        // should only report the top5 once
-        ASSERT(output_s.find("1 result(s)") == std::string::npos);
-        ASSERT(output_s.find("2 result(s)") != std::string::npos);
+        // for each file: top5 results + check time
+        ASSERT_EQUALS((5 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
     }
 
     void showtime_file() {
         REDIRECT;
         check(2, 0,
-              "int main() {}",
+              "int main() {}\n",
               dinit(CheckOptions,
-                    $.showtime = ShowTime::FILE));
+                    $.showtime = Settings::ShowTime::FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
         ASSERT_EQUALS(0, cppcheck::count_all_of(output_s, "Overall time:"));
     }
 
-    void showtime_summary() {
-        REDIRECT;
-        check(2, 0,
-              "int main() {}",
-              dinit(CheckOptions,
-                    $.showtime = ShowTime::SUMMARY));
-        const std::string output_s = GET_REDIRECT_OUTPUT;
-        // should only report the actual summary once
-        ASSERT(output_s.find("1 result(s)") == std::string::npos);
-        ASSERT(output_s.find("2 result(s)") != std::string::npos);
-    }
-
     void showtime_file_total() {
         REDIRECT;
         check(2, 0,
-              "int main() {}",
+              "int main() {}\n",
               dinit(CheckOptions,
-                    $.showtime = ShowTime::FILE_TOTAL));
+                    $.showtime = Settings::ShowTime::FILE_TOTAL));
         const std::string output_s = GET_REDIRECT_OUTPUT;
         ASSERT(output_s.find("Check time: " + fprefix() + "_" + zpad3(1) + ".c: ") != std::string::npos);
         ASSERT(output_s.find("Check time: " + fprefix() + "_" + zpad3(2) + ".c: ") != std::string::npos);
@@ -302,7 +277,7 @@ class TestSingleExecutorBase : public TestFixture {
               "void f()\n"
               "{\n"
               "  (void)(*((int*)0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         settings = settingsOld;
     }
@@ -313,9 +288,9 @@ class TestSingleExecutorBase : public TestFixture {
                          "inline void f()\n"
                          "{\n"
                          "  (void)(*((int*)0));\n"
-                         "}");
+                         "}\n");
         check(2, 2,
-              "#include \"" + inc_h.name() + "\"");
+              "#include \"" + inc_h.name() + "\"\n");
         // these are not actually made unique by the implementation. That needs to be done by the given ErrorLogger
         ASSERT_EQUALS(
             "[" + inc_h.name() + ":3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n"
diff --git a/test/testsizeof.cpp b/test/testsizeof.cpp
index ad8aa3192af..0367c993951 100644
--- a/test/testsizeof.cpp
+++ b/test/testsizeof.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,8 +54,8 @@ class TestSizeof : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check...
-        runChecks<CheckSizeof>(tokenizer, this);
+        CheckSizeof check;
+        runChecks(check, tokenizer, *this);
     }
 
 #define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
@@ -66,56 +66,56 @@ class TestSizeof : public TestFixture {
         // Tokenize..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check...
-        runChecks<CheckSizeof>(tokenizer, this);
+        CheckSizeof check;
+        runChecks(check, tokenizer, *this);
     }
 
     void sizeofsizeof() {
         check("void foo()\n"
               "{\n"
               "    int i = sizeof sizeof char;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (warning) Calling 'sizeof' on 'sizeof'. [sizeofsizeof]\n", errout_str());
 
         check("void foo()\n"
               "{\n"
               "    int i = sizeof (sizeof long);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (warning) Calling 'sizeof' on 'sizeof'. [sizeofsizeof]\n", errout_str());
 
         check("void foo(long *p)\n"
               "{\n"
               "    int i = sizeof (sizeof (p));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (warning) Calling 'sizeof' on 'sizeof'. [sizeofsizeof]\n", errout_str());
     }
 
     void sizeofCalculation() {
-        check("int a, b; int a,sizeof(a+b)");
+        check("int a, b; int a,sizeof(a+b)\n");
         ASSERT_EQUALS("[test.cpp:1:25]: (warning) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
-        check("int a, b; sizeof(a*b)");
+        check("int a, b; sizeof(a*b)\n");
         ASSERT_EQUALS("[test.cpp:1:19]: (warning) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
-        check("int a, b; sizeof(-a)");
+        check("int a, b; sizeof(-a)\n");
         ASSERT_EQUALS("[test.cpp:1:18]: (warning) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
-        check("int a, b; sizeof(*a)");
+        check("int a, b; sizeof(*a)\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("sizeof(void * const)");
+        check("sizeof(void * const)\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("sizeof(int*[2])");
+        check("sizeof(int*[2])\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("sizeof(Fred**)");
+        check("sizeof(Fred**)\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("sizeof(foo++)");
+        check("sizeof(foo++)\n");
         ASSERT_EQUALS("[test.cpp:1:11]: (warning) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
-        check("sizeof(--foo)");
+        check("sizeof(--foo)\n");
         ASSERT_EQUALS("[test.cpp:1:8]: (warning) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
         // #6888
@@ -129,7 +129,7 @@ class TestSizeof : public TestFixture {
                "  VOIDCAST2(SIZEOF1);\n"
                "  VOIDCAST2(SIZEOF2);\n"
                "  return i + foo(1);\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkP("#define SIZEOF1   sizeof(i != 2)\n"
@@ -138,12 +138,12 @@ class TestSizeof : public TestFixture {
                "  SIZEOF1;\n"
                "  SIZEOF2;\n"
                "  return i + foo(1);\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("[test.cpp:4:3]: (warning, inconclusive) Found calculation inside sizeof(). [sizeofCalculation]\n"
                       "[test.cpp:5:3]: (warning, inconclusive) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
         checkP("#define MACRO(data)  f(data, sizeof(data))\n"
-               "x = MACRO((unsigned int *)data + 4);");
+               "x = MACRO((unsigned int *)data + 4);\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
     }
 
@@ -152,7 +152,7 @@ class TestSizeof : public TestFixture {
               "{\n"
               "    int bar() { return 1; };\n"
               "}\n"
-              "Foo f;int a=sizeof(f.bar());");
+              "Foo f;int a=sizeof(f.bar());\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (warning) Found function call inside sizeof(). [sizeofFunctionCall]\n", errout_str());
 
         check("class Foo\n"
@@ -160,35 +160,35 @@ class TestSizeof : public TestFixture {
               "    int bar() { return 1; };\n"
               "    int bar() const { return 1; };\n"
               "}\n"
-              "Foo f;int a=sizeof(f.bar());");
+              "Foo f;int a=sizeof(f.bar());\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Foo\n"
               "{\n"
               "    int bar() { return 1; };\n"
               "}\n"
-              "Foo * fp;int a=sizeof(fp->bar());");
+              "Foo * fp;int a=sizeof(fp->bar());\n");
         ASSERT_EQUALS("[test.cpp:5:16]: (warning) Found function call inside sizeof(). [sizeofFunctionCall]\n", errout_str());
 
-        check("int a=sizeof(foo());");
+        check("int a=sizeof(foo());\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int foo() { return 1; }; int a=sizeof(foo());");
+        check("int foo() { return 1; }; int a=sizeof(foo());\n");
         ASSERT_EQUALS("[test.cpp:1:32]: (warning) Found function call inside sizeof(). [sizeofFunctionCall]\n", errout_str());
 
-        check("int foo() { return 1; }; sizeof(decltype(foo()));");
+        check("int foo() { return 1; }; sizeof(decltype(foo()));\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int foo(int) { return 1; }; int a=sizeof(foo(0))");
+        check("int foo(int) { return 1; }; int a=sizeof(foo(0))\n");
         ASSERT_EQUALS("[test.cpp:1:35]: (warning) Found function call inside sizeof(). [sizeofFunctionCall]\n", errout_str());
 
-        check("char * buf; int a=sizeof(*buf);");
+        check("char * buf; int a=sizeof(*buf);\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int a=sizeof(foo())");
+        check("int a=sizeof(foo())\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int foo(int) { return 1; }; char buf[1024]; int a=sizeof(buf), foo(0)");
+        check("int foo(int) { return 1; }; char buf[1024]; int a=sizeof(buf), foo(0)\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<class T>\n"
@@ -204,7 +204,7 @@ class TestSizeof : public TestFixture {
               "        Y = sizeof(f(g() << h())) == sizeof(A),\n"
               "        Z = X & Y\n"
               "    };\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int g();\n"
@@ -217,7 +217,7 @@ class TestSizeof : public TestFixture {
         check("void f() {\n"
               "    int a[10];\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -225,7 +225,7 @@ class TestSizeof : public TestFixture {
               "    unsigned int b = 2;\n"
               "    int c[(a+b)];\n"
               "    std::cout << sizeof(c) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -233,7 +233,7 @@ class TestSizeof : public TestFixture {
               "    unsigned int b[] = { 0 };\n"
               "    int c[a[b[0]]];\n"
               "    std::cout << sizeof(c) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -242,36 +242,36 @@ class TestSizeof : public TestFixture {
               "    unsigned int b = 2;\n"
               "    int c[(a[0]+b)];\n"
               "    std::cout << sizeof(c) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a[] = { 1, 2, 3 };\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a[3] = { 1, 2, 3 };\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f( int a[]) {\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Using 'sizeof' on array given as "
                       "function argument returns size of a pointer. [sizeofwithsilentarraypointer]\n", errout_str());
 
         check("void f( int a[]) {\n"
               "    std::cout << sizeof a / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Using 'sizeof' on array given as "
                       "function argument returns size of a pointer. [sizeofwithsilentarraypointer]\n", errout_str());
 
         check("void f( int a[3] ) {\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Using 'sizeof' on array given as "
                       "function argument returns size of a pointer. [sizeofwithsilentarraypointer]\n", errout_str());
 
@@ -279,19 +279,19 @@ class TestSizeof : public TestFixture {
               "int f2(Fixname& f2v) {\n"
               "  int i = sizeof(f2v);\n"
               "  printf(\"sizeof f2v %d\", i);\n"
-              "   }");
+              "   }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p) {\n"
               "    p[0] = 0;\n"
               "    int unused = sizeof(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char p[] = \"test\";\n"
               "    int unused = sizeof(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #2495
@@ -305,56 +305,64 @@ class TestSizeof : public TestFixture {
               "      {1,0,1},\n"
               "    };\n"
               "    const int COL_MAX=sizeof(col)/sizeof(col[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #155
         check("void f() {\n"
               "    char buff1[1024*64],buff2[sizeof(buff1)*2];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #2510
         check("void f( int a[], int b) {\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Using 'sizeof' on array given as "
                       "function argument returns size of a pointer. [sizeofwithsilentarraypointer]\n", errout_str());
 
         // ticket #2510
         check("void f( int a[3] , int b[2] ) {\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Using 'sizeof' on array given as "
                       "function argument returns size of a pointer. [sizeofwithsilentarraypointer]\n", errout_str());
 
         // ticket #2510
         check("void f() {\n"
               "    char buff1[1024*64],buff2[sizeof(buff1)*(2+1)];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
+        check("int f(std::array<int, 2> a) {\n" // #14860
+              "    return sizeof(a);\n"
+              "}\n"
+              "int g(std::string a[2]) {\n"
+              "    return sizeof(a);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:12]: (warning) Using 'sizeof' on array given as function argument returns size of a pointer. [sizeofwithsilentarraypointer]\n",
+                      errout_str());
     }
 
     void sizeofForNumericParameter() {
         check("void f() {\n"
               "    std::cout << sizeof(10) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Suspicious usage of 'sizeof' with a numeric constant as parameter. [sizeofwithnumericparameter]\n", errout_str());
 
         check("void f() {\n"
               "    std::cout << sizeof(-10) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Suspicious usage of 'sizeof' with a numeric constant as parameter. [sizeofwithnumericparameter]\n", errout_str());
 
         check("void f() {\n"
               "    std::cout << sizeof 10  << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Suspicious usage of 'sizeof' with a numeric constant as parameter. [sizeofwithnumericparameter]\n", errout_str());
 
         check("void f() {\n"
               "    std::cout << sizeof -10  << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Suspicious usage of 'sizeof' with a numeric constant as parameter. [sizeofwithnumericparameter]\n", errout_str());
     }
 
@@ -362,51 +370,51 @@ class TestSizeof : public TestFixture {
         check("void f() {\n"
               "  int* p;\n"
               "  return sizeof(p)/5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (warning, inconclusive) Division of result of sizeof() on pointer type. [divideSizeof]\n", errout_str());
 
         check("void f() {\n"
               "  unknown p;\n"
               "  return sizeof(p)/5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  return sizeof(unknown)/5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int p;\n"
               "  return sizeof(p)/5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int* p[5];\n"
               "  return sizeof(p)/5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
         check("void f() {\n"
               "  return sizeof(foo)*sizeof(bar);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning, inconclusive) Multiplying sizeof() with sizeof() indicates a logic error. [multiplySizeof]\n", errout_str());
 
         check("void f() {\n"
               "  return (foo)*sizeof(bar);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  return sizeof(foo)*bar;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  return (end - source) / sizeof(encode_block_type) * sizeof(encode_block_type);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S { T* t; };\n" // #10179
@@ -463,49 +471,49 @@ class TestSizeof : public TestFixture {
         check("void f() {\n"
               "    char *x = malloc(10);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(*x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = (int*)malloc(sizeof(x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = static_cast<int*>(malloc(sizeof(x)));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(&x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int*));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
@@ -513,155 +521,155 @@ class TestSizeof : public TestFixture {
               "    free(x);\n"
               "    int **y = malloc(sizeof(int*));\n"
               "    free(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(100 * sizeof(x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(x) * 100);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof *x);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof x);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(100 * sizeof x);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = calloc(1, sizeof(*x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = calloc(1, sizeof *x);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = calloc(1, sizeof(x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = calloc(1, sizeof x);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = calloc(1, sizeof(int));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char x[10];\n"
               "    memset(x, 0, sizeof(x));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char* x[10];\n"
               "    memset(x, 0, sizeof(x));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char x[10];\n"
               "    memset(x, 0, sizeof x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    memset(x, 0, sizeof(int));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    memset(x, 0, sizeof(*x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    memset(x, 0, sizeof *x);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    memset(x, 0, sizeof x);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    memset(x, 0, sizeof(x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int) * 10);\n"
               "    memset(x, 0, sizeof(x) * 10);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int) * 10);\n"
               "    memset(x, 0, sizeof x * 10);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int) * 10);\n"
               "    memset(x, 0, sizeof(*x) * 10);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int) * 10);\n"
               "    memset(x, 0, sizeof *x * 10);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int) * 10);\n"
               "    memset(x, 0, sizeof(int) * 10);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -669,18 +677,18 @@ class TestSizeof : public TestFixture {
             "{\n"
             "  const char *buf1_ex = \"foobarbaz\";\n"
             "  return strncmp(buf1, buf1_ex, sizeof(buf1_ex)) == 0;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:4:24]: (warning) Size of pointer 'buf1_ex' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check(
             "int fun(const char *buf1) {\n"
             "  return strncmp(buf1, foo(buf2), sizeof(buf1)) == 0;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Size of pointer 'buf1' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("int fun(const char *buf2) {\n"
               "  return strncmp(buf1, buf2, sizeof(char*)) == 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:24]: (warning) Size of pointer 'buf2' used instead of size of its data. [pointerSize]\n", errout_str());
 
         // #ticket 3874
@@ -688,25 +696,25 @@ class TestSizeof : public TestFixture {
               "{\n"
               " int * pIntArray[10];\n"
               " memset(pIntArray, 0, sizeof(pIntArray));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void FreeFileName(const char *s) {\n"
               "  CxString tbuf;\n"
               "  const char *p;\n"
               "  memcpy(s, siezof(s));\n" // non-standard memcpy
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "  module_config_t *tab = module;\n"
               "  memset(tab + confsize, 0, sizeof(tab[confsize]));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(char* aug) {\n"
               "  memmove(aug + extra_string, aug, buf - (bfd_byte *)aug);\n" // #7100
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7518
@@ -714,13 +722,19 @@ class TestSizeof : public TestFixture {
               "  cpp_token *token;\n"
               "  cpp_hashnode **params = malloc(sizeof(cpp_hashnode *) * macro->paramc);\n"
               "  memcpy(params, macro->params, sizeof(cpp_hashnode *) * macro->paramc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void* foo() {\n"
               "  void* AtomName = malloc(sizeof(char *) * 34);\n"
               "  return AtomName;\n"
-              "}");
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void* f(size_t n) {\n" // #11754
+              "    char* p = malloc(n * sizeof(void*));\n"
+              "    return p;\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -728,7 +742,7 @@ class TestSizeof : public TestFixture {
         check("void f() {\n"
               "    struct foo *ptr;\n"
               "    memset( ptr->bar, 0, sizeof ptr->bar );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -736,7 +750,7 @@ class TestSizeof : public TestFixture {
               "        char bar[10];\n"
               "    }* ptr;\n"
               "    memset( ptr->bar, 0, sizeof ptr->bar );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -744,27 +758,27 @@ class TestSizeof : public TestFixture {
               "        char *bar;\n"
               "    }* ptr;\n"
               "    memset( ptr->bar, 0, sizeof ptr->bar );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:18]: (warning) Size of pointer 'bar' used instead of size of its data. [pointerSize]\n", errout_str());
     }
 
     void sizeofDivisionMemset() {
         check("void foo(memoryMapEntry_t* entry, memoryMapEntry_t* memoryMapEnd) {\n"
               "    memmove(entry, entry + 1, (memoryMapEnd - entry) / sizeof(entry));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:56]: (warning, inconclusive) Division of result of sizeof() on pointer type. [divideSizeof]\n"
                       "[test.cpp:2:54]: (warning) Division by result of sizeof(). memmove() expects a size in bytes, did you intend to multiply instead? [sizeofDivisionMemfunc]\n",
                       errout_str());
 
         check("Foo* allocFoo(int num) {\n"
               "    return malloc(num / sizeof(Foo));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (warning) Division by result of sizeof(). malloc() expects a size in bytes, did you intend to multiply instead? [sizeofDivisionMemfunc]\n", errout_str());
 
         check("void f() {\n"
               "  char str[100];\n"
               "  strncpy(str, xyz, sizeof(str)/sizeof(str[0]));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #9648
@@ -779,13 +793,13 @@ class TestSizeof : public TestFixture {
     void sizeofVoid() {
         check("void f() {\n"
               "  int size = sizeof(void);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (portability) Behaviour of 'sizeof(void)' is not covered by the ISO C standard. [sizeofVoid]\n", errout_str());
 
         check("void f() {\n"
               "  void* p;\n"
               "  int size = sizeof(*p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (portability) '*p' is of type 'void', the behaviour of 'sizeof(void)' is not covered by the ISO C standard. [sizeofDereferencedVoidPointer]\n", errout_str());
 
         check("void f() {\n"
@@ -793,7 +807,7 @@ class TestSizeof : public TestFixture {
               "  int* p2 = p + 4;\n"
               "  int* p3 = p - 1;\n"
               "  int* p4 = 1 + p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (portability) 'p' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n"
                       "[test.cpp:4:15]: (portability) 'p' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n"
                       "[test.cpp:5:15]: (portability) 'p' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
@@ -803,7 +817,7 @@ class TestSizeof : public TestFixture {
               "  void* p2 = malloc(5);\n"
               "  p1--;\n"
               "  p2++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (portability) 'p1' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n"
                       "[test.cpp:5:5]: (portability) 'p2' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
 
@@ -812,7 +826,7 @@ class TestSizeof : public TestFixture {
               "  void* p2 = malloc(5);\n"
               "  p1-=4;\n"
               "  p2+=4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (portability) 'p1' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n"
                       "[test.cpp:5:5]: (portability) 'p2' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
 
@@ -820,54 +834,54 @@ class TestSizeof : public TestFixture {
               "  void* p = malloc(10);\n"
               "  int* p2 = &p + 4;\n"
               "  int* p3 = &p - 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  void** p1 = malloc(10);\n"
               "  p1--;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  void** p1;\n"
               "  int j = sizeof(*p1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  void* p1[5];\n"
               "  int j = sizeof(*p1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Calculations on void* with casts
 
         check("void f(void *data) {\n"
               "  *((unsigned char *)data + 1) = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void *data) {\n"
               "  *((unsigned char *)(data) + 1) = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void *data) {\n"
               "  unsigned char* c = (unsigned char *)(data + 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:45]: (portability) 'data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
 
         check("void f(void *data) {\n"
               "  unsigned char* c = (unsigned char *)data++;\n"
               "  unsigned char* c2 = (unsigned char *)++data;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:43]: (portability) 'data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n"
                       "[test.cpp:3:40]: (portability) 'data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
 
         check("void f(void *data) {\n"
               "  void* data2 = data + 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (portability) 'data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
 
         // #4908 (void pointer as a member of a struct/class)
@@ -878,7 +892,7 @@ class TestSizeof : public TestFixture {
               "  char x = *((char*)(foo.data+1));\n"
               "  foo.data++;\n"
               "  return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:30]: (portability) 'foo.data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n"
                       "[test.cpp:6:11]: (portability) 'foo.data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
 
@@ -902,7 +916,7 @@ class TestSizeof : public TestFixture {
               "};\n"
               "void f4(struct BOO* boo) {\n"
               "  char c = *((char*)boo->data.data + 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct FOO {\n"
@@ -910,7 +924,7 @@ class TestSizeof : public TestFixture {
               "};\n"
               "char f(struct FOO* foo) {\n"
               "  *(foo[1].data + 1) = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:17]: (portability) 'foo[1].data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
 
         check("struct FOO {\n"
@@ -918,12 +932,12 @@ class TestSizeof : public TestFixture {
               "};\n"
               "void f2(struct FOO* foo) {\n"
               "  (foo[0]).data++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:16]: (portability) '(foo[0]).data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
 
         // #6050 arithmetic on void**
         check("void* array[10];\n"
-              "void** b = array + 3;");
+              "void** b = array + 3;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -932,7 +946,7 @@ class TestSizeof : public TestFixture {
         check("char strncat ();\n"
               "int main () {\n"
               "  return strncat ();\n"
-              "}");
+              "}\n");
     }
 
 };
diff --git a/test/teststl.cpp b/test/teststl.cpp
index 2c4669dbeca..7dbdf7793f0 100644
--- a/test/teststl.cpp
+++ b/test/teststl.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,6 +42,7 @@ class TestStl : public TestFixture {
         TEST_CASE(outOfBoundsSymbolic);
         TEST_CASE(outOfBoundsIndexExpression);
         TEST_CASE(outOfBoundsIterator);
+        TEST_CASE(outOfBoundsErrorPath);
 
         TEST_CASE(iterator1);
         TEST_CASE(iterator2);
@@ -74,10 +75,12 @@ class TestStl : public TestFixture {
         TEST_CASE(iterator29);
         TEST_CASE(iterator30);
         TEST_CASE(iterator31);
+        TEST_CASE(iterator32);
         TEST_CASE(iteratorExpression);
         TEST_CASE(iteratorSameExpression);
         TEST_CASE(mismatchingContainerIterator);
         TEST_CASE(eraseIteratorOutOfBounds);
+        TEST_CASE(algorithmOutOfBounds);
 
         TEST_CASE(dereference);
         TEST_CASE(dereference_break);  // #3644 - handle "break"
@@ -199,7 +202,8 @@ class TestStl : public TestFixture {
 
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        runChecks<CheckStl>(tokenizer, this);
+        CheckStl check;
+        runChecks(check, tokenizer, *this);
     }
 
     // TODO: get rid of this
@@ -209,7 +213,8 @@ class TestStl : public TestFixture {
 
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        runChecks<CheckStl>(tokenizer, this);
+        CheckStl check;
+        runChecks(check, tokenizer, *this);
     }
 
 #define checkNormal(...) checkNormal_(__FILE__, __LINE__, __VA_ARGS__)
@@ -219,8 +224,8 @@ class TestStl : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckStl>(tokenizer, this);
+        CheckStl check;
+        runChecks(check, tokenizer, *this);
     }
 
     void outOfBounds() {
@@ -247,19 +252,19 @@ class TestStl : public TestFixture {
         checkNormal("void f() {\n"
                     "  std::string s;\n"
                     "  s[10] = 1;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:3:4]: error: Out of bounds access in expression 's[10]' because 's' is empty. [containerOutOfBounds]\n", errout_str());
 
         checkNormal("void f() {\n"
                     "  std::string s = \"abcd\";\n"
                     "  s[10] = 1;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:3:4]: error: Out of bounds access in 's[10]', if 's' size is 4 and '10' is 10 [containerOutOfBounds]\n", errout_str());
 
         checkNormal("void f(std::vector<int> v) {\n"
                     "    v.front();\n"
                     "    if (v.empty()) {}\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: warning: Either the condition 'v.empty()' is redundant or expression 'v.front()' causes access out of bounds. [containerOutOfBounds]\n"
                       "[test.cpp:3:16]: note: condition 'v.empty()'\n"
                       "[test.cpp:2:12]: note: Access out of bounds\n", errout_str());
@@ -267,7 +272,7 @@ class TestStl : public TestFixture {
         checkNormal("void f(std::vector<int> v) {\n"
                     "    if (v.size() == 3) {}\n"
                     "    v[16] = 0;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: warning: Either the condition 'v.size()==3' is redundant or size of 'v' can be 3. Expression 'v[16]' causes access out of bounds. [containerOutOfBounds]\n"
                       "[test.cpp:2:18]: note: condition 'v.size()==3'\n"
                       "[test.cpp:3:6]: note: Access out of bounds\n", errout_str());
@@ -277,7 +282,7 @@ class TestStl : public TestFixture {
                     "    if (v.size() == 3) {\n"
                     "        v[i] = 0;\n"
                     "    }\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: warning: Either the condition 'v.size()==3' is redundant or size of 'v' can be 3. Expression 'v[i]' causes access out of bounds. [containerOutOfBounds]\n"
                       "[test.cpp:3:18]: note: condition 'v.size()==3'\n"
                       "[test.cpp:4:10]: note: Access out of bounds\n", errout_str());
@@ -285,19 +290,19 @@ class TestStl : public TestFixture {
         checkNormal("void f(std::vector<int> v, int i) {\n"
                     "    if (v.size() == 3 || i == 16) {}\n"
                     "    v[i] = 0;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(std::map<int,int> x) {\n"
                     "    if (x.empty()) { x[1] = 2; }\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(std::string s) {\n"
                     "    if (s.size() == 1) {\n"
                     "        s[2] = 0;\n"
                     "    }\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: warning: Either the condition 's.size()==1' is redundant or size of 's' can be 1. Expression 's[2]' causes access out of bounds. [containerOutOfBounds]\n"
                       "[test.cpp:2:18]: note: condition 's.size()==1'\n"
                       "[test.cpp:3:10]: note: Access out of bounds\n", errout_str());
@@ -307,25 +312,25 @@ class TestStl : public TestFixture {
                     "  std::string b[];\n"
                     "  for (auto c : b)\n"
                     "    c.data();\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNormal("std::string f(std::string x) {\n"
                     "  if (x.empty()) return {};\n"
                     "  x[0];\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNormal("std::string f(std::string x) {\n"
                     "  if (x.empty()) return std::string{};\n"
                     "  x[0];\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f() {\n"
                     "  std::string s;\n"
                     "  x = s.begin() + 1;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:17]: error: Out of bounds access in expression 's.begin()+1' because 's' is empty. [containerOutOfBounds]\n"
             "[test.cpp:3:17]: error: Out of bounds access in expression 's.begin()+1' because 's' is empty. [containerOutOfBounds]\n",   // duplicate
@@ -334,29 +339,29 @@ class TestStl : public TestFixture {
         checkNormal("void f(int x) {\n"
                     "  std::string s;\n"
                     "  auto it = s.begin() + x;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: error: Out of bounds access in expression 's.begin()+x' because 's' is empty and 'x' may be non-zero. [containerOutOfBounds]\n", errout_str());
 
         checkNormal("char fstr1(){const std::string s = \"<a><b>\"; return s[42]; }\n"
-                    "wchar_t fwstr1(){const std::wstring s = L\"<a><b>\"; return s[42]; }");
+                    "wchar_t fwstr1(){const std::wstring s = L\"<a><b>\"; return s[42]; }\n");
         ASSERT_EQUALS("[test.cpp:1:54]: error: Out of bounds access in 's[42]', if 's' size is 6 and '42' is 42 [containerOutOfBounds]\n"
                       "[test.cpp:2:60]: error: Out of bounds access in 's[42]', if 's' size is 6 and '42' is 42 [containerOutOfBounds]\n", errout_str());
 
         checkNormal("char fstr1(){const std::string s = \"<a><b>\"; return s[1]; }\n"
-                    "wchar_t fwstr1(){const std::wstring s = L\"<a><b>\"; return s[1]; }");
+                    "wchar_t fwstr1(){const std::wstring s = L\"<a><b>\"; return s[1]; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNormal("int f() {\n"
                     "    std::vector<int> v;\n"
                     "    std::vector<int> * pv = &v;\n"
                     "    return (*pv)[42];\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:4:17]: error: Out of bounds access in expression '(*pv)[42]' because '*pv' is empty. [containerOutOfBounds]\n", errout_str());
 
         checkNormal("void f() {\n"
                     "  std::string s;\n"
                     "  ++abc[s];\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // # 9274
@@ -365,14 +370,16 @@ class TestStl : public TestFixture {
                     "    int x = 6;\n"
                     "    if(b) ++x;\n"
                     "    return s[x];\n"
-                    "}");
-        ASSERT_EQUALS("[test.cpp:5:13]: error: Out of bounds access in 's[x]', if 's' size is 6 and 'x' is 6 [containerOutOfBounds]\n", errout_str());
+                    "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:5:13]: warning: Out of bounds access in 's[x]', if 's' size is 6 and 'x' is 7 [containerOutOfBounds]\n",
+            errout_str());
 
         checkNormal("void f() {\n"
                     "    static const int N = 4;\n"
                     "    std::array<int, N> x;\n"
                     "    x[0] = 0;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(bool b) {\n"
@@ -528,7 +535,7 @@ class TestStl : public TestFixture {
                     "        v.resize(entries);\n"
                     "    v[0] = 1;\n"
                     "}\n");
-        ASSERT_EQUALS("[test.cpp:5:6]: error: Out of bounds access in expression 'v[0]' because 'v' is empty. [containerOutOfBounds]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:6]: warning: Out of bounds access in expression 'v[0]' because 'v' is empty. [containerOutOfBounds]\n", errout_str());
 
         checkNormal("void f(size_t entries) {\n"
                     "    if (entries < 2) return;\n"
@@ -611,7 +618,7 @@ class TestStl : public TestFixture {
                     "            return i;\n"
                     "    return 0;\n"
                     "}\n");
-        ASSERT_EQUALS("[test.cpp:8:0]: style: Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:8:13]: style: Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         checkNormal("bool g();\n"
                     "int f(int x) {\n"
@@ -624,7 +631,7 @@ class TestStl : public TestFixture {
                     "            return i;\n"
                     "    return 0;\n"
                     "}\n");
-        ASSERT_EQUALS("[test.cpp:8:0]: style: Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:8:13]: style: Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         checkNormal("bool g();\n"
                     "void f(int x) {\n"
@@ -754,8 +761,10 @@ class TestStl : public TestFixture {
               "        v[i] = 42;\n"
               "    return v;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4:10]: error: Out of bounds access in 'v[i]', if 'v' size is 10 and 'i' is 10 [containerOutOfBounds]\n",
-                      errout_str());
+        TODO_ASSERT_EQUALS(
+            "[test.cpp:4:10]: error: Out of bounds access in 'v[i]', if 'v' size is 10 and 'i' is 10 [containerOutOfBounds]\n",
+            "[test.cpp:4:10]: warning: Out of bounds access in 'v[i]', if 'v' size is 10 and 'i' is 10 [containerOutOfBounds]\n",
+            errout_str());
 
         check("void f() {\n"
               "    int s = 2;\n"
@@ -972,6 +981,44 @@ class TestStl : public TestFixture {
                     "bool g() { return f(\" \"); }\n");
         ASSERT_EQUALS("[test.cpp:1:44]: error: Out of bounds access in 's[500]', if 's' size is 1 and '500' is 500 [containerOutOfBounds]\n",
                       errout_str());
+
+        checkNormal("int main() {\n" // #14342
+                    "    const int a[] = { 1, 2, 3 };\n"
+                    "    std::span<const int> x{ a };\n"
+                    "    return x[3];\n"
+                    "}\n");
+        ASSERT_EQUALS("[test.cpp:4:13]: error: Out of bounds access in 'x[3]', if 'x' size is 1 and '3' is 3 [containerOutOfBounds]\n",
+                      errout_str());
+
+        checkNormal("int main() {\n"
+                    "    const char a[] = \"abc\";\n"
+                    "    std::string_view x{ a };\n"
+                    "    return x[5];\n"
+                    "}\n");
+        ASSERT_EQUALS("[test.cpp:4:13]: error: Out of bounds access in 'x[5]', if 'x' size is 4 and '5' is 5 [containerOutOfBounds]\n",
+                      errout_str());
+
+        checkNormal("int f(const std::string& v) {\n"
+                    "    return v[2];\n"
+                    "}\n"
+                    "int main() {\n"
+                    "    std::string_view x{ \"a\" };\n"
+                    "    return f(std::string(x));\n"
+                    "}\n");
+        ASSERT_EQUALS("[test.cpp:2:13]: error: Out of bounds access in 'v[2]', if 'v' size is 1 and '2' is 2 [containerOutOfBounds]\n",
+                      errout_str());
+
+        checkNormal("std::string f(const std::string& str) {\n" // do not warn, the copy has the same size as 'str'
+                    "    std::string outStr = str;\n"
+                    "    if (!outStr.empty())\n"
+                    "        outStr[0] = 'a';\n"
+                    "    for (int i = 0; i < str.size(); ++i) {\n"
+                    "        if (outStr[i] == '_')\n"
+                    "            outStr[i] = ' ';\n"
+                    "    }\n"
+                    "    return outStr;\n"
+                    "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void outOfBoundsSymbolic()
@@ -984,6 +1031,12 @@ class TestStl : public TestFixture {
         ASSERT_EQUALS(
             "[test.cpp:2:12] -> [test.cpp:4:21]: (warning) Either the condition 'col>textline.size()' is redundant or 'col' can have the value textline.size(). Expression 'textline[col]' causes access out of bounds. [containerOutOfBounds]\n",
             errout_str());
+
+        check("void f(const std::vector<int>& v) {\n" // #12742
+              "    for (unsigned i = 0; i < v.size();)\n"
+              "        (void)v[i++];\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void outOfBoundsIndexExpression() {
@@ -991,22 +1044,22 @@ class TestStl : public TestFixture {
 
         checkNormal("void f(std::string s) {\n"
                     "  s[s.size()] = 1;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: error: Out of bounds access of s, index 's.size()' is out of bounds. [containerOutOfBoundsIndexExpression]\n", errout_str());
 
         checkNormal("void f(std::string s) {\n"
                     "  s[s.size()+1] = 1;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: error: Out of bounds access of s, index 's.size()+1' is out of bounds. [containerOutOfBoundsIndexExpression]\n", errout_str());
 
         checkNormal("void f(std::string s) {\n"
                     "  s[1+s.size()] = 1;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: error: Out of bounds access of s, index '1+s.size()' is out of bounds. [containerOutOfBoundsIndexExpression]\n", errout_str());
 
         checkNormal("void f(std::string s) {\n"
                     "  s[x*s.size()] = 1;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: error: Out of bounds access of s, index 'x*s.size()' is out of bounds. [containerOutOfBoundsIndexExpression]\n", errout_str());
 
         checkNormal("bool f(std::string_view& sv) {\n" // #10031
@@ -1075,6 +1128,58 @@ class TestStl : public TestFixture {
                       errout_str());
     }
 
+    void outOfBoundsErrorPath() {
+        setMultiline();
+        Settings s = settings;
+        s.templateLocation = "{file}:{line}:note:{info}";
+
+        check("int f(int i) {\n"
+              "    std::string s = \"abc\";\n"
+              "    if (i > 5)\n"
+              "        return 0;\n"
+              "    return s[i];\n"
+              "}\n", s);
+        ASSERT_EQUALS("[test.cpp:5:13]: warning: Either the condition 'i>5' is redundant or 'i' can have the value 5. Expression 's[i]' causes access out of bounds. [containerOutOfBounds]\n"
+                      "[test.cpp:3:11]: note: Assuming that condition 'i>5' is not redundant\n"
+                      "[test.cpp:5:13]: note: Access out of bounds\n",
+                      errout_str());
+
+        check("void f(std::vector<int>& v) {\n"
+              "    std::vector<int>::iterator it;\n"
+              "    for (it = v.begin(); it != v.end(); ++it) {\n"
+              "        if (*it == 0)\n"
+              "            break;\n"
+              "    }\n"
+              "    v.erase(it);\n"
+              "}\n", s);
+        ASSERT_EQUALS("[test.cpp:4:13]: style: Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n"
+                      "[test.cpp:7:7]: warning: Either the condition is redundant or function 'erase()' is called on the iterator 'it' which is out of bounds. [eraseIteratorOutOfBoundsCond]\n"
+                      "[test.cpp:3:29]: note: Assuming that condition 'it!=v.end()' is not redundant\n"
+                      "[test.cpp:7:7]: note: Either the condition is redundant or function 'erase()' is called on the iterator 'it' which is out of bounds.\n",
+                      errout_str());
+
+        check("char f(std::string& s, bool b) {\n"
+              "    if (b)\n"
+              "        s.clear();\n"
+              "    return s[0];\n"
+              "}\n"
+              "char g(bool b) {\n"
+              "    std::string s = \"abc\";\n"
+              "    int i = 0;\n"
+              "    if (b)\n"
+              "        i = 5;\n"
+              "    return s[i];\n"
+              "}\n", s);
+        ASSERT_EQUALS("[test.cpp:4:13]: warning: Out of bounds access in expression 's[0]' because 's' is empty. [containerOutOfBounds]\n"
+                      "[test.cpp:2:9]: note: Assuming condition is true\n"
+                      "[test.cpp:4:13]: note: Access out of bounds\n"
+                      "[test.cpp:11:13]: warning: Out of bounds access in 's[i]', if 's' size is 3 and 'i' is 5 [containerOutOfBounds]\n"
+                      "[test.cpp:10:13]: note: Assignment 'i=5', assigned value is 5\n"
+                      "[test.cpp:9:9]: note: Assuming condition is true\n"
+                      "[test.cpp:11:13]: note: Access out of bounds\n",
+                      errout_str());
+    }
+
     void iterator1() {
         check("void f()\n"
               "{\n"
@@ -1082,7 +1187,7 @@ class TestStl : public TestFixture {
               "    std::list<int> l2;\n"
               "    for (std::list<int>::iterator it = l1.begin(); it != l2.end(); ++it)\n"
               "    { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:40]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1092,7 +1197,7 @@ class TestStl : public TestFixture {
               "    std::list<int> l2;\n"
               "    for (std::list<int>::iterator it = l1.begin(); l2.end() != it; ++it)\n"
               "    { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:52]: (error) Iterators of different containers 'l2' and 'l1' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1102,7 +1207,7 @@ class TestStl : public TestFixture {
               "    for (it = l1.begin(); it != l1.end(); ++it) { }\n"
               "    C c;\n"
               "    for (it = c.l1.begin(); it != c.l1.end(); ++it) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Same check with reverse iterator
@@ -1112,7 +1217,7 @@ class TestStl : public TestFixture {
               "    std::list<int> l2;\n"
               "    for (std::list<int>::const_reverse_iterator it = l1.rbegin(); it != l2.rend(); ++it)\n"
               "    { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:54]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
                       errout_str());
     }
@@ -1127,7 +1232,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:35]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1140,7 +1245,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (error) Iterators of different containers 'l2' and 'l1' are used together. [mismatchingContainers]\n",
                       errout_str());
     }
@@ -1152,7 +1257,7 @@ class TestStl : public TestFixture {
               "    std::list<int> l2;\n"
               "    std::list<int>::iterator it = l1.begin();\n"
               "    l2.insert(it, 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Same iterator is used with different containers 'l1' and 'l2'. [iterators1]\n"
                       "[test.cpp:6:5]: (error) Iterator 'it' referring to container 'l1' is used with container 'l2'. [mismatchingContainerIterator]\n",
                       errout_str());
@@ -1162,7 +1267,7 @@ class TestStl : public TestFixture {
               "    std::list<int> l2;\n"
               "    std::list<int>::iterator it = l1.begin();\n"
               "    l2.insert(it, l1.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // #7658
@@ -1171,7 +1276,7 @@ class TestStl : public TestFixture {
               "    std::list<int>::iterator it = l1.begin();\n"
               "    std::list<int>::iterator end = l1.end();\n"
               "    l2.insert(it, end);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // only warn for insert when there are preciself 2 arguments.
@@ -1180,14 +1285,14 @@ class TestStl : public TestFixture {
               "    std::list<int> l2;\n"
               "    std::list<int>::iterator it = l1.begin();\n"
               "    l2.insert(it);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo() {\n"
               "    std::list<int> l1;\n"
               "    std::list<int> l2;\n"
               "    std::list<int>::iterator it = l1.begin();\n"
               "    l2.insert(it,0,1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
     }
@@ -1202,7 +1307,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        result.insert(cit->size());\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1210,7 +1315,7 @@ class TestStl : public TestFixture {
         check("void foo(std::vector<int> ints1, std::vector<int> ints2)\n"
               "{\n"
               "    std::vector<int>::iterator it = std::find(ints1.begin(), ints2.end(), 22);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:47]: (error) Iterators of different containers 'ints1' and 'ints2' are used together. [mismatchingContainers]\n",
                       errout_str());
     }
@@ -1223,7 +1328,7 @@ class TestStl : public TestFixture {
               "    std::set<int>::iterator it1 = ints1.begin();\n"
               "    std::set<int>::iterator it2 = ints1.end();\n"
               "    ints2.insert(it1, it2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const std::set<int> &ints1)\n"
@@ -1232,7 +1337,7 @@ class TestStl : public TestFixture {
               "    std::set<int>::iterator it1 = ints1.begin();\n"
               "    std::set<int>::iterator it2 = ints2.end();\n"
               "    ints2.insert(it1, it2);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Iterators of different containers are used together.\n", "", errout_str());
     }
 
@@ -1240,14 +1345,14 @@ class TestStl : public TestFixture {
         check("void foo(std::vector<int> ints1, std::vector<int> ints2)\n"
               "{\n"
               "    std::vector<int>::iterator it = std::inplace_merge(ints1.begin(), std::advance(ints1.rbegin(), 5), ints2.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:56]: (error) Iterators of different containers 'ints1' and 'ints2' are used together. [mismatchingContainers]\n",
                       errout_str());
 
         check("void foo(std::vector<int> ints1, std::vector<int> ints2)\n"
               "{\n"
               "    std::vector<int>::iterator it = std::inplace_merge(ints1.begin(), std::advance(ints2.rbegin(), 5), ints1.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1255,28 +1360,28 @@ class TestStl : public TestFixture {
         check("void foo(std::vector<int> ints1, std::vector<int> ints2)\n"
               "{\n"
               "    std::vector<int>::iterator it = std::find_first_of(ints1.begin(), ints2.end(), ints1.begin(), ints1.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:56]: (error) Iterators of different containers 'ints1' and 'ints2' are used together. [mismatchingContainers]\n",
                       errout_str());
 
         check("void foo(std::vector<int> ints1, std::vector<int> ints2)\n"
               "{\n"
               "    std::vector<int>::iterator it = std::find_first_of(ints1.begin(), ints1.end(), ints2.begin(), ints1.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:84]: (error) Iterators of different containers 'ints2' and 'ints1' are used together. [mismatchingContainers]\n",
                       errout_str());
 
         check("void foo(std::vector<int> ints1, std::vector<int> ints2)\n"
               "{\n"
               "    std::vector<int>::iterator it = std::find_first_of(foo.bar.begin(), foo.bar.end()-6, ints2.begin(), ints1.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:90]: (error) Iterators of different containers 'ints2' and 'ints1' are used together. [mismatchingContainers]\n",
                       errout_str());
 
         check("void foo(std::vector<int> ints1, std::vector<int> ints2)\n"
               "{\n"
               "    std::vector<int>::iterator it = std::find_first_of(ints1.begin(), ints1.end(), ints2.begin(), ints2.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6839
@@ -1287,7 +1392,7 @@ class TestStl : public TestFixture {
               "    const std::u32string tp4(b.begin(), a.end());\n"
               "    const std::string fp1 = std::string(a.begin(), a.end());\n"
               "    const std::string tp2(a.begin(), a.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS( // TODO "[test.cpp:2]: (error) Iterators of different containers are used together.\n"
             // TODO "[test.cpp:3]: (error) Iterators of different containers are used together.\n"
             "[test.cpp:4:26]: (error) Iterators of different containers 'tp3' and 'a' are used together. [mismatchingContainers]\n"
@@ -1309,7 +1414,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "        ++aI;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #2481
@@ -1325,7 +1430,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "        ++aI;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Execution path checking..
@@ -1344,7 +1449,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "        ++aI;\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:14] (error) After insert(), the iterator 'aI' may be invalid.", "", errout_str());
     }
 
@@ -1359,7 +1464,7 @@ class TestStl : public TestFixture {
               "        if (true) { }\n"
               "        if (it != s2.end()) continue;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:39]: (error) Iterators of different containers 's1' and 's2' are used together. [mismatchingContainers]\n",
                       errout_str());
     }
@@ -1371,7 +1476,7 @@ class TestStl : public TestFixture {
               "    vector<string> myVector;\n"
               "    for(vector<int>::iterator x = myVector.begin(); x != myVector.end(); x++)\n"
               "        myMap.erase(*x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1381,8 +1486,8 @@ class TestStl : public TestFixture {
               "    std::map<int, int> map1;\n"
               "    std::map<int, int> map2;\n"
               "    std::map<int, int>::const_iterator it = map1.find(123);\n"
-              "    if (it == map2.end()) { }"
-              "}");
+              "    if (it == map2.end()) { }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:45]: (error) Iterators of different containers 'map1' and 'map2' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1390,8 +1495,8 @@ class TestStl : public TestFixture {
               "    std::map<int, int> map1;\n"
               "    std::map<int, int> map2;\n"
               "    std::map<int, int>::const_iterator it = map1.find(123);\n"
-              "    if (map2.end() == it) { }"
-              "}");
+              "    if (map2.end() == it) { }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (error) Iterators of different containers 'map2' and 'map1' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1399,7 +1504,7 @@ class TestStl : public TestFixture {
               "    int pos = s.find(x);\n"
               "    s.erase(pos);\n"
               "    s.erase(pos);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1414,7 +1519,7 @@ class TestStl : public TestFixture {
               "    it = t.begin();\n"
               "    while (it!=a.end())\n"
               "        ++it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:10]: (error) Iterators of different containers 't' and 'a' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1429,7 +1534,7 @@ class TestStl : public TestFixture {
               "    it = t.begin();\n"
               "    while (it!=t.end())\n"
               "        ++it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -1444,7 +1549,7 @@ class TestStl : public TestFixture {
               "        ++it;\n"
               "    while (!z && it!=t.end())\n"
               "        ++it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1453,7 +1558,7 @@ class TestStl : public TestFixture {
               "    std::map<int,Foo> x;\n"
               "    std::map<int,Foo>::const_iterator it;\n"
               "    for (it = x.find(0)->second.begin(); it != x.find(0)->second.end(); ++it) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1461,7 +1566,7 @@ class TestStl : public TestFixture {
         check("void f(C1* x, std::list<int> a) {\n"
               "  std::list<int>::iterator pos = a.begin();\n"
               "  for(pos = x[0]->plist.begin(); pos != x[0]->plist.end(); ++pos) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1476,7 +1581,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1490,7 +1595,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it2;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:36]: (error) Iterators of different containers 'l2' and 'l1' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1504,7 +1609,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1518,7 +1623,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:35]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
                       errout_str());
     }
@@ -1535,7 +1640,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1550,7 +1655,7 @@ class TestStl : public TestFixture {
               "        ++it1;\n"
               "    }\n"
               "    it2 = l2.end();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -1565,7 +1670,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -1581,7 +1686,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
                       errout_str());
     }
@@ -1594,7 +1699,7 @@ class TestStl : public TestFixture {
               "    while (++it1 != --it2)\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(std::list<int> l1, std::list<int> l2)\n"
@@ -1604,7 +1709,7 @@ class TestStl : public TestFixture {
               "    while (it1++ != --it2)\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(std::list<int> l1, std::list<int> l2)\n"
@@ -1614,7 +1719,7 @@ class TestStl : public TestFixture {
               "    if (--it2 > it1++)\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("", "[test.cpp:5:15]: (error) Dangerous comparison using operator< on iterator. [stlBoundaries]\n", errout_str());
     }
 
@@ -1629,7 +1734,7 @@ class TestStl : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:13] -> [test.cpp:4:36]: (error) Same iterator is used with containers 'l1' that are temporaries or defined in different scopes. [iterators3]\n",
             errout_str());
@@ -1644,7 +1749,7 @@ class TestStl : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS(
             "[test.cpp:7] -> [test.cpp:4]: (error) Same iterator is used with containers 'l1' that are defined in different scopes.\n",
             "[test.cpp:7:19] -> [test.cpp:7:13]: (error) Same iterator is used with containers 'l1' that are temporaries or defined in different scopes. [iterators3]\n"
@@ -1662,7 +1767,7 @@ class TestStl : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:8:13] -> [test.cpp:4:36]: (error) Same iterator is used with containers 'l1' that are temporaries or defined in different scopes. [iterators3]\n",
             errout_str());
@@ -1678,7 +1783,7 @@ class TestStl : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:8:13] -> [test.cpp:7:40]: (error) Same iterator is used with containers 'l1' that are temporaries or defined in different scopes. [iterators3]\n",
             errout_str());
@@ -1718,7 +1823,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:36]: (error) Iterators of different containers 'l2' and 'l1' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1738,7 +1843,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it1;\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:13] -> [test.cpp:10] -> [test.cpp:11]: (error) Comparison of iterators from containers 'l1' and 'l2'.\n", "", errout_str());
 
     }
@@ -1756,7 +1861,7 @@ class TestStl : public TestFixture {
               "    if (it2 != it1)\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n"
                       "[test.cpp:6:36]: (error) Iterators of different containers 'l2' and 'l1' are used together. [mismatchingContainers]\n",
                       errout_str());
@@ -1770,7 +1875,7 @@ class TestStl : public TestFixture {
               "    if (it1 != it2 && it1 != it2)\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n"
                       "[test.cpp:5:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n", // duplicate
                       errout_str());
@@ -1781,7 +1886,7 @@ class TestStl : public TestFixture {
               "    std::list<int> &l = x.l;\n"
               "    std::list<int>::iterator it = l.find(123);\n"
               "    x.l.erase(it);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1796,7 +1901,7 @@ class TestStl : public TestFixture {
               "};\n"
               "bool A::B::operator==(const A::B& b) const {\n"
               "    return std::tie(x, y, z) == std::tie(b.x, b.y, b.z);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1804,29 +1909,29 @@ class TestStl : public TestFixture {
         // #9556
         check("void f(int a, int b) {\n"
               "  if (&a == &b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b) {\n"
               "  if (std::for_each(&a, &b + 1, [](auto) {})) {}\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:2:22]: (error) Iterators of different containers 'a' and 'b' are used together. [mismatchingContainers]\n",
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:22]: (error) Addresses of different objects 'a' and 'b' are used together. [mismatchingContainers]\n",
                       errout_str());
 
         check("void f(int a, int b) {\n"
               "  if (std::for_each(&a, &b, [](auto) {})) {}\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:2:22]: (error) Iterators of different containers 'a' and 'b' are used together. [mismatchingContainers]\n",
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:22]: (error) Addresses of different objects 'a' and 'b' are used together. [mismatchingContainers]\n",
                       errout_str());
 
         check("void f(int a) {\n"
               "  if (std::for_each(&a, &a, [](auto) {})) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:21]: (style) Same iterators expression are used for algorithm. [sameIteratorExpression]\n", errout_str());
 
         check("void f(int a) {\n"
               "  if (std::for_each(&a, &a + 1, [](auto) {})) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1839,7 +1944,7 @@ class TestStl : public TestFixture {
               "    bool operator()(const S& lhs, const S& rhs) const {\n"
               "        return &lhs.v != &rhs.v;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1957,8 +2062,21 @@ class TestStl : public TestFixture {
               "    std::string b;\n"
               "    return t.s.a.c_str() == b.c_str();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:9:13]: (error) Iterators of different containers 's.a' and 'b' are used together. [mismatchingContainers]\n"
-                      "[test.cpp:13:15]: (error) Iterators of different containers 't.s.a' and 'b' are used together. [mismatchingContainers]\n",
+        ASSERT_EQUALS("[test.cpp:9:13]: (error) Pointers of different containers 's.a' and 'b' are used together. [mismatchingContainers]\n"
+                      "[test.cpp:13:15]: (error) Pointers of different containers 't.s.a' and 'b' are used together. [mismatchingContainers]\n",
+                      errout_str());
+    }
+
+    void iterator32()
+    {
+        check("bool f(const std::string& a, const std::string& b) {\n" // #15158
+              "    return a.data() != b.data();\n"
+              "}\n"
+              "bool g(const std::unique_ptr<int>& a, const std::unique_ptr<int>& b) {\n"
+              "    return a.get() != b.get();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:12]: (error) Pointers of different containers 'a' and 'b' are used together. [mismatchingContainers]\n"
+                      "[test.cpp:5:12]: (error) Pointers of different objects 'a' and 'b' are used together. [mismatchingContainers]\n",
                       errout_str());
     }
 
@@ -1967,7 +2085,7 @@ class TestStl : public TestFixture {
               "std::vector<int>& g();\n"
               "void foo() {\n"
               "    (void)std::find(f().begin(), g().end(), 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:22]: (error) Iterators of different containers 'f()' and 'g()' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1975,7 +2093,7 @@ class TestStl : public TestFixture {
               "std::vector<int>& g();\n"
               "void foo() {\n"
               "    if(f().begin() == g().end()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Iterators of different containers 'f()' and 'g()' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1983,7 +2101,7 @@ class TestStl : public TestFixture {
               "std::vector<int>& g();\n"
               "void foo() {\n"
               "    auto size = f().end() - g().begin();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (error) Iterators of different containers 'f()' and 'g()' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1993,7 +2111,7 @@ class TestStl : public TestFixture {
               "};\n"
               "void foo() {\n"
               "    (void)std::find(A().f().begin(), A().g().end(), 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:6:26]: (error) Iterators of different containers 'A().f()' and 'A().g()' are used together. [mismatchingContainers]\n",
             errout_str());
@@ -2004,7 +2122,7 @@ class TestStl : public TestFixture {
               "};\n"
               "void foo() {\n"
               "    (void)std::find(A{} .f().begin(), A{} .g().end(), 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:6:27]: (error) Iterators of different containers 'A{}.f()' and 'A{}.g()' are used together. [mismatchingContainers]\n",
             errout_str());
@@ -2013,7 +2131,7 @@ class TestStl : public TestFixture {
               "std::vector<int>& g();\n"
               "void foo() {\n"
               "    (void)std::find(begin(f()), end(g()), 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:28]: (warning) Iterators to containers from different expressions 'f()' and 'g()' are used together. [mismatchingContainerExpression]\n", errout_str());
 
         check("struct A {\n"
@@ -2022,14 +2140,14 @@ class TestStl : public TestFixture {
               "};\n"
               "void foo() {\n"
               "    (void)std::find(A().f().begin(), A().f().end(), 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int>& f();\n"
               "std::vector<int>& g();\n"
               "void foo() {\n"
               "    if(bar(f().begin()) == g().end()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int>& f();\n"
@@ -2053,7 +2171,7 @@ class TestStl : public TestFixture {
               "    (void)std::find(begin(f()) + 1, end(f()), 0);\n"
               "    (void)std::find(begin(f()), end(f()) - 1, 0);\n"
               "    (void)std::find(begin(f()) + 1, end(f()) - 1, 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:30]: (error) Dereference of an invalid iterator: f().end()+1 [derefInvalidIterator]\n", errout_str());
 
         check("std::vector<int>& f();\n"
@@ -2062,7 +2180,7 @@ class TestStl : public TestFixture {
               "    if(f().begin() == f().end()+1) {}\n"
               "    if(f().begin()+1 == f().end()) {}\n"
               "    if(f().begin()+1 == f().end()+1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:32]: (error) Dereference of an invalid iterator: f().end()+1 [derefInvalidIterator]\n"
                       "[test.cpp:6:34]: (error) Dereference of an invalid iterator: f().end()+1 [derefInvalidIterator]\n",
                       errout_str());
@@ -2073,7 +2191,7 @@ class TestStl : public TestFixture {
               "    if(std::begin(f()) == std::end(f())+1) {}\n"
               "    if(std::begin(f())+1 == std::end(f())) {}\n"
               "    if(std::begin(f())+1 == std::end(f())+1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:40]: (error) Dereference of an invalid iterator: std::end(f())+1 [derefInvalidIterator]\n"
                       "[test.cpp:6:42]: (error) Dereference of an invalid iterator: std::end(f())+1 [derefInvalidIterator]\n",
                       errout_str());
@@ -2082,23 +2200,23 @@ class TestStl : public TestFixture {
               "std::vector<int>& f();\n"
               "void foo() {\n"
               "    if(f<1>().begin() == f<1>().end()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  if (a.begin().x == b.begin().x) {}\n"
               "  if (begin(a).x == begin(b).x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::list<int*> a, std::list<int*> b) {\n"
               "  if (*a.begin() == *b.begin()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if(f().begin(1) == f().end()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const uint8_t* data, const uint32_t dataLength) {\n"
@@ -2128,35 +2246,35 @@ class TestStl : public TestFixture {
     void iteratorSameExpression() {
         check("void f(std::vector<int> v) {\n"
               "    std::for_each(v.begin(), v.begin(), [](int){});\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:26]: (style) Same iterators expression are used for algorithm. [sameIteratorExpression]\n", errout_str());
 
         check("std::vector<int>& g();\n"
               "void f() {\n"
               "    std::for_each(g().begin(), g().begin(), [](int){});\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:28]: (style) Same iterators expression are used for algorithm. [sameIteratorExpression]\n", errout_str());
 
         check("void f(std::vector<int> v) {\n"
               "    std::for_each(v.end(), v.end(), [](int){});\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:24]: (style) Same iterators expression are used for algorithm. [sameIteratorExpression]\n", errout_str());
 
         check("std::vector<int>& g();\n"
               "void f() {\n"
               "    std::for_each(g().end(), g().end(), [](int){});\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:26]: (style) Same iterators expression are used for algorithm. [sameIteratorExpression]\n", errout_str());
 
         check("std::vector<int>::iterator g();\n"
               "void f(std::vector<int> v) {\n"
               "    std::for_each(g(), g(), [](int){});\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:20]: (style) Same iterators expression are used for algorithm. [sameIteratorExpression]\n", errout_str());
 
         check("void f(std::vector<int>::iterator it) {\n"
               "    std::for_each(it, it, [](int){});\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:19]: (style) Same iterators expression are used for algorithm. [sameIteratorExpression]\n", errout_str());
     }
 
@@ -2165,13 +2283,13 @@ class TestStl : public TestFixture {
               "    std::vector<int> a, b;\n"
               "    a.insert(b.end(), value);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Iterator 'b.end()' referring to container 'b' is used with container 'a'. [mismatchingContainerIterator]\n", errout_str());
 
         check("std::vector<int> f(std::vector<int> a, std::vector<int> b) {\n"
               "    a.erase(b.begin());\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (error) Iterator 'b.begin()' referring to container 'b' is used with container 'a'. [mismatchingContainerIterator]\n", errout_str());
 
         // #9973
@@ -2311,6 +2429,15 @@ class TestStl : public TestFixture {
               "    }   \n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("std::string g1();\n" // #12520
+              "const std::string& g2();\n"
+              "void f() {\n"
+              "    g1().erase(g1().begin());\n"
+              "    g2().erase(g2().begin());\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:7]: (error) Iterator 'g1().begin()' referring to temporary container 'g1()' is used with temporary container 'g1()'. [mismatchingContainerIterator]\n",
+                      errout_str());
     }
 
     void eraseIteratorOutOfBounds() {
@@ -2365,7 +2492,7 @@ class TestStl : public TestFixture {
               "    if (it == v.end()) {}\n"
               "    v.erase(it);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3:7]: (warning) Either the condition 'it==v.end()' is redundant or function 'erase()' is called on the iterator 'it' which is out of bounds. [eraseIteratorOutOfBoundsCond]\n",
+        ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:3:7]: (warning) Either the condition 'it==v.end()' is redundant or function 'erase()' is called on the iterator 'it' which is out of bounds. [eraseIteratorOutOfBoundsCond]\n",
                       errout_str());
 
         check("void f() {\n"
@@ -2376,19 +2503,400 @@ class TestStl : public TestFixture {
                       errout_str());
     }
 
-    // Dereferencing invalid pointer
-    void dereference() {
-        check("void f()\n"
-              "{\n"
-              "    std::vector<int> ints{1,2,3,4,5};\n"
-              "    std::vector<int>::iterator iter;\n"
-              "    iter = ints.begin() + 2;\n"
-              "    ints.erase(iter);\n"
-              "    std::cout << (*iter) << std::endl;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
-        TODO_ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:6] -> [test.cpp:3] -> [test.cpp:7]: (error) Using iterator to local container 'ints' that may be invalid.\n", "[test.cpp:5:22] -> [test.cpp:6:10] -> [test.cpp:3:22] -> [test.cpp:7:20]: (error, inconclusive) Using iterator to local container 'ints' that may be invalid. [invalidContainer]\n", errout_str());
-
-        // #6554 "False positive eraseDereference - erase in while() loop"
+    void algorithmOutOfBounds()
+    {
+        check("void f() {\n"
+              "    const std::deque<int> d0{1,2,3,4,5,6,7,8,9,10};\n"
+              "    const std::deque<int> d1{1,2,3,4,5,6};\n"
+              "    if(std::equal(d0.cbegin(), d0.cend(), d1.cbegin())) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:52]: (error) The algorithm 'std::equal' accesses 10 elements through the iterator 'd1.cbegin()' but only 6 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    const std::deque<int> d0{1,2,3,4,5,6};\n"
+              "    const std::deque<int> d1{1,2,3,4,5,6};\n"
+              "    if(std::equal(d0.cbegin(), d0.cend(), d1.cbegin())) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // two-range overload does not access the second range out of bounds
+        check("void f() {\n"
+              "    const std::deque<int> d0{1,2,3,4,5,6,7,8,9,10};\n"
+              "    const std::deque<int> d1{1,2,3,4,5,6};\n"
+              "    if(std::equal(d0.cbegin(), d0.cend(), d1.cbegin(), d1.cend())) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(3);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:45]: (error) The algorithm 'std::copy' accesses 5 elements through the iterator 'v1.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(5);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // iterator arithmetic
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(6);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin() + 3);\n"
+              "    std::copy(v0.begin() + 3, v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:48]: (error) The algorithm 'std::copy' accesses 5 elements through the iterator 'v1.begin()+3' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // don't warn when using iterator adaptors
+        check("void f() {\n"
+              "    const std::deque<int> d0{1,2,3,4,5,6,7,8,9,10};\n"
+              "    std::deque<int> d1;\n"
+              "    std::copy(d0.cbegin(), d0.cend(), std::back_inserter(d1));\n"
+              "    std::copy(d0.cbegin(), d0.cend(), std::inserter(d1, d1.begin()));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // algorithms that access at most last-first elements are inconclusive
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(3);\n"
+              "    std::copy_if(v0.begin(), v0.end(), v1.begin(), [](int i) { return i != 3; });\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(3);\n"
+              "    std::copy_if(v0.begin(), v0.end(), v1.begin(), [](int i) { return i != 3; });\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS(
+            "[test.cpp:4:48]: (warning, inconclusive) The algorithm 'std::copy_if' may access up to 5 elements through the iterator 'v1.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(3);\n"
+              "    std::transform(v0.begin(), v0.end(), v1.begin(), [](int i) { return i * 2; });\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:50]: (error) The algorithm 'std::transform' accesses 5 elements through the iterator 'v1.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // binary transform reads the third argument and writes the fourth argument
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    const std::vector<int> v1{1,2,3};\n"
+              "    std::vector<int> v2(5);\n"
+              "    std::transform(v0.begin(), v0.end(), v1.begin(), v2.begin(), [](int a, int b) { return a + b; });\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:5:50]: (error) The algorithm 'std::transform' accesses 5 elements through the iterator 'v1.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    const std::vector<int> v1{1,2,3,4,5};\n"
+              "    std::vector<int> v2(3);\n"
+              "    std::transform(v0.begin(), v0.end(), v1.begin(), v2.begin(), [](int a, int b) { return a + b; });\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:5:62]: (error) The algorithm 'std::transform' accesses 5 elements through the iterator 'v2.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // copying a range within the same container
+        check("void f() {\n"
+              "    std::vector<int> v{1,2,3,4,5,6,7,8,9,10};\n"
+              "    std::copy(v.begin(), v.begin() + 3, v.begin() + 7);\n"
+              "    std::copy(v.begin(), v.begin() + 4, v.begin() + 7);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:51]: (error) The algorithm 'std::copy' accesses 4 elements through the iterator 'v.begin()+7' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // unknown container sizes
+        check("void f(const std::vector<int>& v0, std::vector<int>& v1) {\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // don't warn for iterator variables when the container size changes before the algorithm is called
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::list<int> l1(3);\n"
+              "    auto it = l1.begin();\n"
+              "    l1.resize(10);\n"
+              "    std::copy(v0.begin(), v0.end(), it);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // iterator variables carry the container size
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(3);\n"
+              "    auto it = v1.begin();\n"
+              "    std::copy(v0.begin(), v0.end(), it);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:5:37]: (error) The algorithm 'std::copy' accesses 5 elements through the iterator 'it' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // ..and the size is the size at the call, not at the creation of the iterator
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::list<int> l1(10);\n"
+              "    auto it = l1.begin();\n"
+              "    l1.resize(3);\n"
+              "    std::copy(v0.begin(), v0.end(), it);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:6:37]: (error) The algorithm 'std::copy' accesses 5 elements through the iterator 'it' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // conditional container size
+        check("void f(std::vector<int>& v) {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    if (v.size() == 3)\n"
+              "        std::copy(v0.begin(), v0.end(), v.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:18] -> [test.cpp:4:48]: (warning) Either the condition 'v.size()==3' is redundant or the algorithm 'std::copy' accesses 5 elements through the iterator 'v.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f(std::vector<int>& v) {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    if (v.size() < 5)\n"
+              "        std::copy(v0.begin(), v0.end(), v.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:18] -> [test.cpp:4:48]: (warning) Either the condition 'v.size()<5' is redundant or the algorithm 'std::copy' accesses 5 elements through the iterator 'v.begin()' but only 4 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f(std::vector<int>& v) {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    if (v.size() >= 5)\n"
+              "        std::copy(v0.begin(), v0.end(), v.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // writing through the end iterator
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3};\n"
+              "    std::vector<int> v1(10);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.end());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:43]: (error) The algorithm 'std::copy' accesses 3 elements through the iterator 'v1.end()' but only 0 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // the source range is known even when the container size is not
+        check("void f(const std::vector<int>& v) {\n"
+              "    std::vector<int> v1(3);\n"
+              "    std::copy(v.begin(), v.begin() + 5, v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:49]: (error) The algorithm 'std::copy' accesses 5 elements through the iterator 'v1.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // count-based algorithms access both iterator arguments <count> times
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(3);\n"
+              "    std::copy_n(v0.begin(), 5, v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:40]: (error) The algorithm 'std::copy_n' accesses 5 elements through the iterator 'v1.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(10);\n"
+              "    std::copy_n(v0.begin(), 10, v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:25]: (error) The algorithm 'std::copy_n' accesses 10 elements through the iterator 'v0.begin()' but only 5 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(5);\n"
+              "    std::copy_n(v0.begin(), 5, v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v(5);\n"
+              "    std::fill_n(v.begin(), 10, 0);\n"
+              "    std::fill_n(v.begin() + 3, 3, 0);\n"
+              "    std::fill_n(v.begin(), 5, 0);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:24]: (error) The algorithm 'std::fill_n' accesses 10 elements through the iterator 'v.begin()' but only 5 elements are available. [algorithmOutOfBounds]\n"
+            "[test.cpp:4:27]: (error) The algorithm 'std::fill_n' accesses 3 elements through the iterator 'v.begin()+3' but only 2 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v;\n"
+              "    std::fill_n(std::back_inserter(v), 10, 0);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v(5);\n"
+              "    std::generate_n(v.begin(), 6, [] { return 1; });\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:28]: (error) The algorithm 'std::generate_n' accesses 6 elements through the iterator 'v.begin()' but only 5 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // conditional count
+        check("void f(std::vector<int>& v, int n) {\n"
+              "    if (v.size() == 5 && n > 5)\n"
+              "        std::fill_n(v.begin(), n, 0);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:28] -> [test.cpp:3:28]: (warning) Either the condition 'n>5' is redundant or the algorithm 'std::fill_n' accesses 6 elements through the iterator 'v.begin()' but only 5 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // an upper bound of the count cannot tell whether the access is out of bounds
+        check("void f(int n) {\n"
+              "    std::vector<int> v(3);\n"
+              "    if (n < 5)\n"
+              "        std::fill_n(v.begin(), n, 0);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // a lower bound of the container size cannot tell whether the access is out of bounds
+        check("void f(std::vector<int>& v) {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    if (v.size() >= 4)\n"
+              "        std::copy(v0.begin(), v0.end(), v.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // unknown count
+        check("void f(std::vector<int>& v, int n) {\n"
+              "    std::fill_n(v.begin(), n, 0);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // all container size values are checked, not only the first one
+        check("void f(bool b) {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1;\n"
+              "    if (b)\n"
+              "        v1.resize(3);\n"
+              "    else\n"
+              "        v1.resize(10);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:8:45]: (error) The algorithm 'std::copy' accesses 5 elements through the iterator 'v1.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f(bool b) {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1;\n"
+              "    if (b)\n"
+              "        v1.resize(5);\n"
+              "    else\n"
+              "        v1.resize(10);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // all iterator position values are checked as well
+        check("void f(bool b) {\n"
+              "    const std::vector<int> v0{1,2,3,4};\n"
+              "    std::vector<int> v1(5);\n"
+              "    auto it = b ? v1.begin() : v1.begin() + 3;\n"
+              "    std::copy(v0.begin(), v0.end(), it);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:5:37]: (error) The algorithm 'std::copy' accesses 4 elements through the iterator 'it' but only 2 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // do not combine possible values on both sides
+        check("void f(bool b, std::vector<int>& v0, std::vector<int>& v1) {\n"
+              "    if (b) v0.resize(5); else v0.resize(2);\n"
+              "    if (b) v1.resize(3); else v1.resize(10);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // all source range values are checked against the preferred destination values
+        check("void f(bool b) {\n"
+              "    std::vector<int> v0;\n"
+              "    if (b)\n"
+              "        v0.resize(3);\n"
+              "    else\n"
+              "        v0.resize(10);\n"
+              "    std::vector<int> v1(5);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:8:45]: (error) The algorithm 'std::copy' accesses 10 elements through the iterator 'v1.begin()' but only 5 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f(bool b) {\n"
+              "    std::vector<int> v0;\n"
+              "    if (b)\n"
+              "        v0.resize(3);\n"
+              "    else\n"
+              "        v0.resize(5);\n"
+              "    std::vector<int> v1(5);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // all count values are checked as well
+        check("void f(bool b) {\n"
+              "    std::vector<int> v(5);\n"
+              "    const int n = b ? 3 : 10;\n"
+              "    std::fill_n(v.begin(), n, 0);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:24]: (error) The algorithm 'std::fill_n' accesses 10 elements through the iterator 'v.begin()' but only 5 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // an iterator into a nested container does not carry the outer container's size
+        check("std::array<std::array<int, 16>, 1> f(const std::array<int, 16>& a) {\n"
+              "    std::array<std::array<int, 16>, 1> res;\n"
+              "    std::copy(a.begin(), a.end(), res[0].begin());\n"
+              "    return res;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3};\n"
+              "    std::vector<std::vector<int>> v1(1, std::vector<int>(5));\n"
+              "    std::copy(v0.begin(), v0.end(), v1[0].begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    // Dereferencing invalid pointer
+    void dereference() {
+        check("void f()\n"
+              "{\n"
+              "    std::vector<int> ints{1,2,3,4,5};\n"
+              "    std::vector<int>::iterator iter;\n"
+              "    iter = ints.begin() + 2;\n"
+              "    ints.erase(iter);\n"
+              "    std::cout << (*iter) << std::endl;\n"
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        TODO_ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:6] -> [test.cpp:3] -> [test.cpp:7]: (error) Using iterator to local container 'ints' that may be invalid.\n", "[test.cpp:5:22] -> [test.cpp:6:10] -> [test.cpp:3:22] -> [test.cpp:7:20]: (error, inconclusive) Using iterator to local container 'ints' that may be invalid. [invalidContainer]\n", errout_str());
+
+        // #6554 "False positive eraseDereference - erase in while() loop"
         check("typedef std::map<Packet> packetMap;\n"
               "packetMap waitingPackets;\n"
               "void ProcessRawPacket() {\n"
@@ -2397,7 +2905,7 @@ class TestStl : public TestFixture {
               "        waitingPackets.erase(wpi);\n"
               "        for (unsigned pos = 0; pos < buf.size(); ) {     }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8509 Uniform initialization ignored for iterator
@@ -2405,7 +2913,7 @@ class TestStl : public TestFixture {
               "  std::vector<int> ints;\n"
               "  std::vector<int>::const_iterator iter {ints.cbegin()};\n"
               "  std::cout << (*iter) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2422,7 +2930,7 @@ class TestStl : public TestFixture {
               "            break;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2434,7 +2942,7 @@ class TestStl : public TestFixture {
               "    iter = ints.begin();\n"
               "    ints.erase(iter);\n"
               "    std::cout << iter->first << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:18] -> [test.cpp:6:5]: (error) Iterator 'iter' used after element has been erased. [eraseDereference]\n"
                       "[test.cpp:6:10]: (error) Calling function 'erase()' on the iterator 'iter' which is out of bounds. [eraseIteratorOutOfBounds]\n",
                       errout_str());
@@ -2447,7 +2955,7 @@ class TestStl : public TestFixture {
               "    iter = ints.rbegin();\n"
               "    ints.erase(iter);\n"
               "    std::cout << iter->first << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:18] -> [test.cpp:6:5]: (error) Iterator 'iter' used after element has been erased. [eraseDereference]\n"
                       "[test.cpp:6:10]: (error) Calling function 'erase()' on the iterator 'iter' which is out of bounds. [eraseIteratorOutOfBounds]\n",
                       errout_str());
@@ -2460,14 +2968,14 @@ class TestStl : public TestFixture {
               "    auto iter = ints.begin() + 2;\n"
               "    ints.erase(iter);\n"
               "    std::cout << (*iter) << std::endl;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         TODO_ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:5] -> [test.cpp:3] -> [test.cpp:6]: (error) Using iterator to local container 'ints' that may be invalid.\n", "[test.cpp:4:27] -> [test.cpp:5:10] -> [test.cpp:3:22] -> [test.cpp:6:20]: (error, inconclusive) Using iterator to local container 'ints' that may be invalid. [invalidContainer]\n", errout_str());
 
         check("void f() {\n"
               "    auto x = *myList.begin();\n"
               "    myList.erase(x);\n"
               "    auto b = x.first;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const CXXRecordDecl *CXXRecordDecl::getTemplateInstantiationPattern() const {\n"
@@ -2475,7 +2983,7 @@ class TestStl : public TestFixture {
               "        auto From = TD->getInstantiatedFrom();\n"
               "    }\n"
               "    return nullptr;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2487,7 +2995,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "       foo[ii] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:6:11]: (error) Out of bounds access in expression 'foo[ii]' because 'foo' is empty. [containerOutOfBounds]\n",
             errout_str());
@@ -2496,21 +3004,21 @@ class TestStl : public TestFixture {
               "    for (unsigned int ii = 0; ii <= foo.size(); ++ii) {\n"
               "       foo.at(ii) = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (error) When ii==foo.size(), foo.at(ii) is out of bounds. [stlOutOfBounds]\n", errout_str());
 
         check("void foo(std::string& foo) {\n"
               "    for (unsigned int ii = 0; ii <= foo.length(); ++ii) {\n"
               "       foo[ii] = 'x';\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (error) When ii==foo.size(), foo[ii] is out of bounds. [stlOutOfBounds]\n", errout_str());
 
         check("void foo(std::string& foo, unsigned int ii) {\n"
               "    if (ii <= foo.length()) {\n"
               "       foo[ii] = 'x';\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (error) When ii==foo.size(), foo[ii] is out of bounds. [stlOutOfBounds]\n", errout_str());
 
         check("void foo(std::string& foo, unsigned int ii) {\n"
@@ -2518,7 +3026,7 @@ class TestStl : public TestFixture {
               "       foo[ii] = 'x';\n"
               "       ++i;\n"
               "    } while(ii <= foo.length());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (error) When ii==foo.size(), foo[ii] is out of bounds. [stlOutOfBounds]\n", errout_str());
 
         check("void foo(std::string& foo, unsigned int ii) {\n"
@@ -2526,7 +3034,7 @@ class TestStl : public TestFixture {
               "    } else if (ii <= foo.length()) {\n"
               "       foo[ii] = 'x';\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) When ii==foo.size(), foo[ii] is out of bounds. [stlOutOfBounds]\n", errout_str());
 
         check("void foo()\n"
@@ -2538,19 +3046,19 @@ class TestStl : public TestFixture {
               "    }\n"
               "    int ii = 0;\n"
               "    foo[ii] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    for (B b : D()) {}\n" // Don't crash on range-based for-loop
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(std::vector<int> foo) {\n"
               "    for (unsigned int ii = 0; ii <= foo.size() + 1; ++ii) {\n"
               "       foo.at(ii) = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3:11]: (error) When ii==foo.size(), foo.at(ii) is out of bounds. [stlOutOfBounds]\n", "", errout_str());
     }
 
@@ -2563,7 +3071,7 @@ class TestStl : public TestFixture {
                   "    {\n"
                   "       foo[ii] = 0;\n"
                   "    }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -2574,7 +3082,7 @@ class TestStl : public TestFixture {
                   "    for (unsigned int ii = 0; ii <= foo.size(); ++ii)\n"
                   "    {\n"
                   "    }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -2592,7 +3100,7 @@ class TestStl : public TestFixture {
                   "            foo[ii] = 0;\n"
                   "        }\n"
                   "    }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS(
                 "[test.cpp:11:16]: (error) Out of bounds access in expression 'foo[ii]' because 'foo' is empty. [containerOutOfBounds]\n",
                 errout_str());
@@ -2603,7 +3111,7 @@ class TestStl : public TestFixture {
                   "    int i = x;"
                   "    for (int i = 5; i <= data.size(); i++)\n"
                   "        data[i] = 0;\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -2612,7 +3120,7 @@ class TestStl : public TestFixture {
                   "    for (unsigned int ii = 0; ii <= foo.size() - 1; ++ii) {\n"
                   "       foo.at(ii) = 0;\n"
                   "    }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
         }
     }
@@ -2620,7 +3128,7 @@ class TestStl : public TestFixture {
     void negativeIndex() {
         check("void f(const std::vector<int> &v) {\n"
               "  v[-11] = 123;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (error) Array index -11 is out of bounds. [negativeContainerIndex]\n", errout_str());
 
         check("int f(int x, const std::vector<int>& a) {\n"
@@ -2628,7 +3136,7 @@ class TestStl : public TestFixture {
               "        return a[x - 5];\n"
               "    else\n"
               "        return a[4 - x];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::array<int,6> values;\n"
@@ -2708,7 +3216,7 @@ class TestStl : public TestFixture {
               "    for (it = foo.begin(); it != foo.end(); ++it) {\n"
               "        foo.erase(it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:5:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n"
                       "[test.cpp:7:5] -> [test.cpp:8:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
 
@@ -2717,7 +3225,7 @@ class TestStl : public TestFixture {
               "    std::list<int>::iterator i = ints.begin();\n"
               "    i = ints.erase(i);\n"
               "    *i = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -2725,7 +3233,7 @@ class TestStl : public TestFixture {
               "    std::list<int>::iterator i;\n"
               "    while (i != x.y.end())\n"
               "        i = x.y.erase(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #2101
@@ -2736,7 +3244,7 @@ class TestStl : public TestFixture {
               "        if (*it % 2)\n"
               "            it = ints[i].erase(it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2749,7 +3257,7 @@ class TestStl : public TestFixture {
               "        next++;\n"
               "        foo.erase(it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2759,7 +3267,7 @@ class TestStl : public TestFixture {
               "    std::list<abc>::iterator it = foo.begin();\n"
               "    foo.erase(it->a);\n"
               "    if (it->b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2771,7 +3279,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        foo.erase(it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:6:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
 
         check("void f()\n"
@@ -2781,7 +3289,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        foo.erase(it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:6:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
 
         check("void f()\n"
@@ -2791,7 +3299,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        foo.erase(it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:6:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
 
         check("void f()\n"
@@ -2801,7 +3309,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        foo.erase(++it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:6:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
     }
 
@@ -2815,7 +3323,7 @@ class TestStl : public TestFixture {
               "        if (*it == 123)\n"
               "            foo.erase(it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5] -> [test.cpp:8:22]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
     }
 
@@ -2828,7 +3336,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        vec.erase(it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2841,7 +3349,7 @@ class TestStl : public TestFixture {
               "        if (x)"
               "            break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5] -> [test.cpp:5:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
 
         check("void f()\n"
@@ -2853,7 +3361,7 @@ class TestStl : public TestFixture {
               "            break;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x)\n"
@@ -2864,7 +3372,7 @@ class TestStl : public TestFixture {
               "        if (x)"
               "            return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5] -> [test.cpp:5:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
 
     }
@@ -2881,7 +3389,7 @@ class TestStl : public TestFixture {
               "            continue;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::map<uint32, uint32> my_map) {\n" // #7365
@@ -2894,7 +3402,7 @@ class TestStl : public TestFixture {
               "    itr->second = 1;\n"
               "    break;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2908,7 +3416,7 @@ class TestStl : public TestFixture {
               "        foo.erase(it);\n"
               "        return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2928,7 +3436,7 @@ class TestStl : public TestFixture {
               "            return;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2947,7 +3455,7 @@ class TestStl : public TestFixture {
               "            return;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -2963,7 +3471,7 @@ class TestStl : public TestFixture {
               "                *it = 0;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS(
             "[test.cpp:5] -> [test.cpp:7] -> [test.cpp:8] -> [test.cpp:8] -> [test.cpp:7] -> [test.cpp:5] -> [test.cpp:9] -> [test.cpp:3] -> [test.cpp:5]: (error) Using iterator to local container 'foo' that may be invalid.\n",
             "[test.cpp:5:24] -> [test.cpp:7:13] -> [test.cpp:8:17] -> [test.cpp:8:17] -> [test.cpp:7:13] -> [test.cpp:5:31] -> [test.cpp:9:21] -> [test.cpp:3:22] -> [test.cpp:5:28]: (error, inconclusive) Using iterator to local container 'foo' that may be invalid. [invalidContainer]\n",
@@ -2979,7 +3487,7 @@ class TestStl : public TestFixture {
               "        goto abc;\n"
               "    }\n"
               "bar:\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2991,7 +3499,7 @@ class TestStl : public TestFixture {
               "        foo.erase(it);\n"
               "        it = foo.begin();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3009,7 +3517,7 @@ class TestStl : public TestFixture {
               "            ++it;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3018,7 +3526,7 @@ class TestStl : public TestFixture {
               "    std::list<std::list<int> >::const_iterator i = l.begin();\n"
               "    std::list<int>::const_iterator j = (*i).begin();\n"
               "    cout << *j << endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3027,14 +3535,14 @@ class TestStl : public TestFixture {
               "  std::list<int>::const_iterator it = data.begin();\n"
               "  it = data.erase(it);\n"
               "  it = data.erase(it);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(Data data) {\n"
               "  std::list<int>::const_iterator it = data.ints.begin();\n"
               "  it = data.ints.erase(it);\n"
               "  it = data.ints.erase(it);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3043,7 +3551,7 @@ class TestStl : public TestFixture {
               "    std::list<foo>::const_iterator i;\n"
               "    bar(i);\n"
               "    cout << *i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3054,7 +3562,7 @@ class TestStl : public TestFixture {
               "    iter = ints.begin() + 2;\n"
               "    ints.erase(iter);\n"
               "    ints.erase(iter);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         TODO_ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:4] -> [test.cpp:5] -> [test.cpp:1] -> [test.cpp:6]: (error) Using iterator to local container 'ints' that may be invalid.\n", "[test.cpp:1:31] -> [test.cpp:4:22] -> [test.cpp:5:10] -> [test.cpp:1:27] -> [test.cpp:6:16]: (error, inconclusive) Using iterator to local container 'ints' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3066,21 +3574,21 @@ class TestStl : public TestFixture {
               "    {\n"
               "        foo.erase(*it);\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Iterator 'it' becomes invalid when deleted by value from 'foo'\n", "", errout_str());
 
         check("int f(std::set<int> foo) {\n"
               "    std::set<int>::iterator it = foo.begin();\n"
               "    foo.erase(*it);\n"
               "    return *it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12] -> [test.cpp:3:5]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
 
         check("void f(std::set<int> foo)\n"
               "{\n"
               "    std::set<int>::iterator it = foo.begin();\n"
               "    foo.erase(*it);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5669
@@ -3088,14 +3596,14 @@ class TestStl : public TestFixture {
               "    HashSet_Ref::iterator aIt = m_ImplementationMap.find( xEle );\n"
               "    m_SetLoadedFactories.erase(*aIt);\n"
               "    m_SetLoadedFactories.erase(aIt);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::list<int>& m_ImplementationMap) {\n"
               "    std::list<int>::iterator aIt = m_ImplementationMap.begin();\n"
               "    m_ImplementationMap.erase(*aIt);\n"
               "    m_ImplementationMap.erase(aIt);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Invalid iterator: aIt [invalidIterator1]\n", errout_str());
 
         check("void f(const std::list<int>& m_ImplementationMap) {\n"
@@ -3103,7 +3611,7 @@ class TestStl : public TestFixture {
               "    std::list<int>::iterator bIt = m_ImplementationMap.begin();\n"
               "    m_ImplementationMap.erase(*bIt);\n"
               "    m_ImplementationMap.erase(aIt);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3117,7 +3625,7 @@ class TestStl : public TestFixture {
               "                 return;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5] -> [test.cpp:4:26]: (error) Iterator 'str' used after element has been erased. [eraseDereference]\n", errout_str());
     }
 
@@ -3126,7 +3634,7 @@ class TestStl : public TestFixture {
               "    std::vector<int>::iterator aIt = v.begin();\n"
               "    v.erase(something(unknown));\n" // All iterators become invalidated when erasing from std::vector
               "    v.erase(aIt);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:27] -> [test.cpp:2:45] -> [test.cpp:3:7] -> [test.cpp:1:26] -> [test.cpp:4:13]: (error) Using iterator to local container 'v' that may be invalid. [invalidContainer]\n", errout_str());
 
         check("void f(std::vector<int>& v) {\n"
@@ -3134,7 +3642,7 @@ class TestStl : public TestFixture {
               "    std::vector<int>::iterator bIt = v.begin();\n"
               "    v.erase(bIt);\n" // All iterators become invalidated when erasing from std::vector
               "    aIt = v.erase(aIt);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:27] -> [test.cpp:2:45] -> [test.cpp:4:7] -> [test.cpp:1:26] -> [test.cpp:5:19]: (error) Using iterator to local container 'v' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3144,7 +3652,7 @@ class TestStl : public TestFixture {
               "    std::vector<int>::const_iterator it = foo.begin();\n"
               "    foo.push_back(123);\n"
               "    *it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:35] -> [test.cpp:3:52] -> [test.cpp:4:9] -> [test.cpp:1:32] -> [test.cpp:5:6]: (error) Using iterator to local container 'foo' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3157,7 +3665,7 @@ class TestStl : public TestFixture {
               "        int *it = &foo[0];\n"
               "        *it = 456;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3171,7 +3679,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        foo.push_back(123);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:24] -> [test.cpp:6:31] -> [test.cpp:8:13] -> [test.cpp:3:22] -> [test.cpp:6:28]: (error) Using iterator to local container 'foo' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3183,7 +3691,7 @@ class TestStl : public TestFixture {
               "    int *first = &ints[0];\n"
               "    ints.push_back(2);\n"
               "    *first;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:18] -> [test.cpp:6:10] -> [test.cpp:3:22] -> [test.cpp:7:6]: (error) Using pointer to local variable 'ints' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3200,7 +3708,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        v.push_back(*i);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3216,7 +3724,7 @@ class TestStl : public TestFixture {
               "        if (*it == 1)\n"
               "            v.push_back(10);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:49] -> [test.cpp:8:17] -> [test.cpp:8:17] -> [test.cpp:6:56] -> [test.cpp:9:15] -> [test.cpp:3:22] -> [test.cpp:6:53]: (error) Using iterator to local container 'v' that may be invalid. [invalidContainer]\n", errout_str());
 
         check("void f()\n"
@@ -3229,7 +3737,7 @@ class TestStl : public TestFixture {
               "        if (*it == 1)\n"
               "            v.push_back(10);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:49] -> [test.cpp:8:17] -> [test.cpp:8:17] -> [test.cpp:6:56] -> [test.cpp:9:15] -> [test.cpp:3:22] -> [test.cpp:6:53]: (error) Using iterator to local container 'v' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3243,7 +3751,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        foo.push_back(123);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:24] -> [test.cpp:6:31] -> [test.cpp:8:13] -> [test.cpp:3:22] -> [test.cpp:6:28]: (error) Using iterator to local container 'foo' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3259,7 +3767,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        sum += *it;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:13]: (style) Consider using std::accumulate algorithm instead of a raw loop. [useStlAlgorithm]\n"
                       "[test.cpp:4:52] -> [test.cpp:5:10] -> [test.cpp:3:22] -> [test.cpp:8:35]: (error) Using iterator to local container 'ints' that may be invalid. [invalidContainer]\n",
                       errout_str());
@@ -3281,7 +3789,7 @@ class TestStl : public TestFixture {
               "        a.ints.push_back(*i);\n"
               "        ++i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3291,7 +3799,7 @@ class TestStl : public TestFixture {
               "    std::vector<int>::const_iterator it = foo.begin();\n"
               "    foo.reserve(100);\n"
               "    *it = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:29] -> [test.cpp:3:52] -> [test.cpp:4:9] -> [test.cpp:1:26] -> [test.cpp:5:6]: (error) Using iterator to local container 'foo' that may be invalid. [invalidContainer]\n", errout_str());
 
         // in loop
@@ -3304,7 +3812,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        foo.reserve(123);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:24] -> [test.cpp:6:31] -> [test.cpp:8:13] -> [test.cpp:3:22] -> [test.cpp:6:28]: (error) Using iterator to local container 'foo' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3318,7 +3826,7 @@ class TestStl : public TestFixture {
               "    } else {\n"
               "        ints.insert(it,0);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3334,7 +3842,7 @@ class TestStl : public TestFixture {
               "        {}\n"
               "        *it;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:54] -> [test.cpp:6:13] -> [test.cpp:3:25] -> [test.cpp:9:10]: (error, inconclusive) Using iterator to local container 'vec' that may be invalid. [invalidContainer]\n",
             errout_str());
@@ -3346,7 +3854,7 @@ class TestStl : public TestFixture {
               "    FilenameBuffer.resize(PreAppendSize + CurTok.getLength());\n"
               "    const char *BufPtr = &FilenameBuffer[PreAppendSize];\n"
               "    return true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3356,7 +3864,7 @@ class TestStl : public TestFixture {
               "    std::vector<int>::iterator iter = ints.begin() + 5;\n"
               "    ints.insert(ints.begin(), 1);\n"
               "    ++iter;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:30] -> [test.cpp:3:49] -> [test.cpp:4:10] -> [test.cpp:1:26] -> [test.cpp:5:7]: (error) Using iterator to local container 'ints' that may be invalid. [invalidContainer]\n", errout_str());
 
         check("void f()\n"
@@ -3364,7 +3872,7 @@ class TestStl : public TestFixture {
               "    std::vector<int> ints;\n"
               "    std::vector<int>::iterator iter = ints.begin();\n"
               "    ints.insert(iter, 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -3373,7 +3881,7 @@ class TestStl : public TestFixture {
               "    std::vector<int>::iterator iter = ints.begin();\n"
               "    ints.insert(iter, 1);\n"
               "    ints.insert(iter, 2);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         TODO_ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:5] -> [test.cpp:3] -> [test.cpp:6]: (error) Using iterator to local container 'ints' that may be invalid.\n", "[test.cpp:4:49] -> [test.cpp:5:10] -> [test.cpp:3:22] -> [test.cpp:6:17]: (error, inconclusive) Using iterator to local container 'ints' that may be invalid. [invalidContainer]\n", errout_str());
 
         check("void* f(const std::vector<Bar>& bars) {\n"
@@ -3381,21 +3889,21 @@ class TestStl : public TestFixture {
               "    bars.insert(Bar());\n"
               "    void* v = &i->foo;\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:37] -> [test.cpp:2:46] -> [test.cpp:3:10] -> [test.cpp:1:33] -> [test.cpp:4:16]: (error) Using iterator to local container 'bars' that may be invalid. [invalidContainer]\n", errout_str());
 
         check("Foo f(const std::vector<Bar>& bars) {\n"
               "    std::vector<Bar>::iterator i = bars.begin();\n"
               "    bars.insert(Bar());\n"
               "    return i->foo;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:35] -> [test.cpp:2:46] -> [test.cpp:3:10] -> [test.cpp:1:31] -> [test.cpp:4:12]: (error) Using iterator to local container 'bars' that may be invalid. [invalidContainer]\n", errout_str());
 
         check("void f(const std::vector<Bar>& bars) {\n"
               "    for(std::vector<Bar>::iterator i = bars.begin(); i != bars.end(); ++i) {\n"
               "        i = bars.insert(i, bar);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // TODO: This shouldn't be inconclusive
@@ -3404,7 +3912,7 @@ class TestStl : public TestFixture {
               "        bars.insert(i, bar);\n"
               "        i = bars.insert(i, bar);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:36] -> [test.cpp:2:50] -> [test.cpp:3:14] -> [test.cpp:1:32] -> [test.cpp:4:25]: (error, inconclusive) Using iterator to local container 'bars' that may be invalid. [invalidContainer]\n", errout_str());
 
         // TODO: This shouldn't be inconclusive
@@ -3414,7 +3922,7 @@ class TestStl : public TestFixture {
               "    i = bars.insert(i, Bar());\n"
               "    void* v = &i->foo;\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:37] -> [test.cpp:2:46] -> [test.cpp:3:10] -> [test.cpp:1:33] -> [test.cpp:4:21]: (error, inconclusive) Using iterator to local container 'bars' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3426,7 +3934,7 @@ class TestStl : public TestFixture {
               "        vec.insert(iter, 0);\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int> &vec) {\n"
@@ -3437,7 +3945,7 @@ class TestStl : public TestFixture {
               "            return;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3477,7 +3985,7 @@ class TestStl : public TestFixture {
                   "    std::" + stlCont[i] + "<int>::iterator it;\n"
                   "    for (it = ab.begin(); it < ab.end(); ++it)\n"
                   "        ;\n"
-                  "}");
+                  "}\n");
 
             ASSERT_EQUALS_MSG("[test.cpp:4:25]: (error) Dangerous comparison using operator< on iterator. [stlBoundaries]\n", errout_str(), stlCont[i]);
         }
@@ -3485,14 +3993,14 @@ class TestStl : public TestFixture {
         check("void f() {\n"
               "    std::forward_list<int>::iterator it;\n"
               "    for (it = ab.begin(); ab.end() > it; ++it) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:36]: (error) Dangerous comparison using operator< on iterator. [stlBoundaries]\n", errout_str());
 
         // #5926 no FP Dangerous comparison using operator< on iterator on std::deque
         check("void f() {\n"
               "    std::deque<int>::iterator it;\n"
               "    for (it = ab.begin(); ab.end() > it; ++it) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3503,7 +4011,7 @@ class TestStl : public TestFixture {
               "    std::vector<std::string>::const_iterator it;\n"
               "    for (it = files.begin(); it < files.end(); it++) { }\n"
               "    for (it = files.begin(); it < files.end(); it++) { };\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3517,14 +4025,14 @@ class TestStl : public TestFixture {
               "    {\n"
               "       assert(*current < 100)\n"
               "    }\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    static set<Foo>::const_iterator current;\n"
               "    return 25 > current->bar;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (error) Invalid iterator 'current' used. [eraseDereference]\n", errout_str());
     }
 
@@ -3533,13 +4041,13 @@ class TestStl : public TestFixture {
         check("void f() {\n"
               "    std::forward_list<std::vector<std::vector<int>>>::iterator it;\n"
               "    for (it = ab.begin(); ab.end() > it; ++it) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:36]: (error) Dangerous comparison using operator< on iterator. [stlBoundaries]\n", errout_str());
 
         // don't crash
         check("void f() {\n"
               "    if (list < 0) ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -3547,7 +4055,7 @@ class TestStl : public TestFixture {
               "        std::forward_list<std::vector<std::vector<int>>>::iterator it;\n"
               "        for (it = ab.begin(); ab.end() > it; ++it) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:40]: (error) Dangerous comparison using operator< on iterator. [stlBoundaries]\n", errout_str());
     }
 
@@ -3556,7 +4064,7 @@ class TestStl : public TestFixture {
               "int foo() {\n"
               "    iterator i;\n"
               "    return i.foo();;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("class iterator {\n"
@@ -3567,7 +4075,7 @@ class TestStl : public TestFixture {
               "int foo() {\n"
               "    iterator i;\n"
               "    return i.foo();;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:8:12]: (error, inconclusive) Invalid iterator 'i' used. [eraseDereference]\n", errout_str());
     }
 
@@ -3578,7 +4086,7 @@ class TestStl : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3592,109 +4100,109 @@ class TestStl : public TestFixture {
         check("void f(std::set<int> s)\n"
               "{\n"
               "    if (s.find(12)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // error (pointer)
         check("void f(std::set<int> *s)\n"
               "{\n"
               "    if ((*s).find(12)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // error (pointer)
         check("void f(std::set<int> *s)\n"
               "{\n"
               "    if (s->find(12)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // error (array-like pointer)
         check("void f(std::set<int> *s)\n"
               "{\n"
               "    if (s[0].find(12)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // error (array)
         check("void f(std::set<int> s [10])\n"
               "{\n"
               "    if (s[0].find(12)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // error (undefined length array)
         check("void f(std::set<int> s [])\n"
               "{\n"
               "    if (s[0].find(12)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // error (vector)
         check("void f(std::vector<std::set<int> > s)\n"
               "{\n"
               "    if (s[0].find(12)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // error (assignment)
         check("void f(std::set<int> s)\n"
               "{\n"
               "    if (a || (x = s.find(12))) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // ok (simple)
         check("void f(std::set<int> s)\n"
               "{\n"
               "    if (s.find(123) != s.end()) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ok (pointer)
         check("void f(std::set<int> *s)\n"
               "{\n"
               "    if ((*s).find(12) != s.end()) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ok (array-like pointer)
         check("void f(std::set<int> *s)\n"
               "{\n"
               "    if (s[0].find(12) != s->end()) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ok (array)
         check("void f(std::set<int> s [10])\n"
               "{\n"
               "    if (s[0].find(123) != s->end()) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ok (undefined length array)
         check("void f(std::set<int> s [])\n"
               "{\n"
               "    if (s[0].find(123) != s->end()) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ok (assignment)
         check("void f(std::set<int> s)\n"
               "{\n"
               "    if (a || (x = s.find(12)) != s.end()) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ok (dereference, #6402)
         check("void f(std::set<Foo> s) {\n"
               "    if (s.find(12).member) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::set<int> s) {\n"
               "    if (auto result = s.find(123); result != s.end()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ---------------------------
@@ -3705,33 +4213,33 @@ class TestStl : public TestFixture {
         check("void f()\n"
               "{\n"
               "    if (std::find(a,b,c)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // ok
         check("void f()\n"
               "{\n"
               "    if (std::find(a,b,c) != c) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ok (less than comparison, #6217)
         check("void f(std::vector<int> s)\n"
               "{\n"
               "    if (std::find(a, b, c) < d) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3714 - segmentation fault for syntax error
         ASSERT_THROW_INTERNAL(check("void f() {\n"
                                     "    if (()) { }\n"
-                                    "}"),
+                                    "}\n"),
                               AST);
 
         // #3865
         check("void f() {\n"
               "    if ((std::find(a,b,c)) != b) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3740,57 +4248,57 @@ class TestStl : public TestFixture {
         check("void f(const std::string &s)\n"
               "{\n"
               "    if (s.find(\"abc\")) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster. [stlIfStrFind]\n", errout_str());
 
         // error (pointer)
         check("void f(const std::string *s)\n"
               "{\n"
               "    if ((*s).find(\"abc\")) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster. [stlIfStrFind]\n", errout_str());
 
         // error (pointer)
         check("void f(const std::string *s)\n"
               "{\n"
               "    if (s->find(\"abc\")) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster. [stlIfStrFind]\n", errout_str());
 
         // error (vector)
         check("void f(const std::vector<std::string> &s)\n"
               "{\n"
               "    if (s[0].find(\"abc\")) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster. [stlIfStrFind]\n", errout_str());
 
         // #3162
         check("void f(const std::string& s1, const std::string& s2)\n"
               "{\n"
               "    if ((!s1.empty()) && (0 == s1.find(s2))) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:32]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster. [stlIfStrFind]\n", errout_str());
 
         // #4102
         check("void f(const std::string &define) {\n"
               "    if (define.find(\"=\") + 1U == define.size());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string a, std::string b) {\n"  // #4480
               "    if (a.find(\"<\") < b.find(\">\")) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::string &s) {\n"
               "    if (foo(s.find(\"abc\"))) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7349 - std::string::find_first_of
         check("void f(const std::string &s) {\n"
               "    if (s.find_first_of(\"abc\")==0) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // # 10153
@@ -3801,7 +4309,7 @@ class TestStl : public TestFixture {
               "      return 1;\n"
               "  }\n"
               "  return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3815,7 +4323,7 @@ class TestStl : public TestFixture {
                                 "void Fred::foo()\n"
                                 "{\n"
                                 "    if (x.size() == 0) {}\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:7:9]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
@@ -3827,7 +4335,7 @@ class TestStl : public TestFixture {
                                 "void f()\n"
                                 "{\n"
                                 "    if (x.size() == 0) {}\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:9]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
@@ -3839,7 +4347,7 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (x.size() == 0) {}\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:9]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
@@ -3851,7 +4359,7 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (0 == x.size()) {}\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:14]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
@@ -3863,7 +4371,7 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (x.size() != 0) {}\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:9]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
@@ -3875,7 +4383,7 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (0 != x.size()) {}\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:14]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
@@ -3887,7 +4395,7 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (x.size() > 0) {}\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:9]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
@@ -3899,7 +4407,7 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (0 < x.size()) {}\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:13]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
@@ -3911,7 +4419,7 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (x.size() >= 1) {}\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:9]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
@@ -3923,7 +4431,7 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (x.size() < 1) {}\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:9]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
@@ -3935,7 +4443,7 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (1 <= x.size()) {}\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:14]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
@@ -3947,7 +4455,7 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (1 > x.size()) {}\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:13]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
@@ -3959,7 +4467,7 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (x.size()) {}\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:9]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
@@ -3971,7 +4479,7 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (!x.size()) {}\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:10]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
@@ -3982,7 +4490,7 @@ class TestStl : public TestFixture {
               "{\n"
               "    std::list<int> x;\n"
               "    fun(x.size());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -3990,7 +4498,7 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    fun(!x.size());\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:10]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
@@ -4002,7 +4510,7 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    fun(a && x.size());\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:14]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
@@ -4012,19 +4520,19 @@ class TestStl : public TestFixture {
         check("void f() {\n" // #4039
               "    std::list<int> x;\n"
               "    fun(width % x.size() != 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4584
         check("void f() {\n"
               "    std::list<int> x;\n"
               "    if (foo + 1 > x.size()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f() {\n"
               "    std::list<int> x;\n"
               "    if (x.size() < 1 + foo) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4039,7 +4547,7 @@ class TestStl : public TestFixture {
                             "void Wilma::foo()\n"
                             "{\n"
                             "    if (f.x.size() == 0) {}\n"
-                            "}";
+                            "}\n";
         check(code, settingsCpp03);
         ASSERT_EQUALS(
             "[test.cpp:10:11]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n"
@@ -4062,7 +4570,7 @@ class TestStl : public TestFixture {
                                 "Zzz * zzz;\n"
                                 "int main() {\n"
                                 "    if (zzz->x.size() > 0) { }\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS(
                 "[test.cpp:10:14]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n"
@@ -4081,7 +4589,7 @@ class TestStl : public TestFixture {
                                 "int main() {\n"
                                 "    Zzz * zzz;\n"
                                 "    if (zzz->x.size() > 0) { }\n"
-                                "}";
+                                "}\n";
             check(code, settingsCpp03);
             ASSERT_EQUALS(
                 "[test.cpp:10:14]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n"
@@ -4096,17 +4604,17 @@ class TestStl : public TestFixture {
     void size4() { // #2652 - don't warn about vector/deque
         check("void f(std::vector<int> &v) {\n"
               "    if (v.size() > 0U) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::deque<int> &v) {\n"
               "    if (v.size() > 0U) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::array<int,3> &a) {\n"
               "    if (a.size() > 0U) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4115,8 +4623,18 @@ class TestStl : public TestFixture {
               "{\n"
               "    if (haystack.find(needle) != haystack.end())\n"
               "        haystack.remove(needle);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Redundant checking of STL container element existence before removing it. [redundantIfRemove]\n", errout_str());
+
+        check("void g(const std::string&);\n" // #14725
+              "std::set<std::string> g_s;\n"
+              "void f(const std::string& k) {\n"
+              "    if (g_s.find(k) != g_s.end()) {\n"
+              "        g_s.erase(k);\n"
+              "        g(k);\n"
+              "    }\n"
+              "}");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void missingInnerComparison1() {
@@ -4126,14 +4644,14 @@ class TestStl : public TestFixture {
               "            it++;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13] -> [test.cpp:2:71]: (warning) Missing bounds check for extra iterator increment in loop. [StlMissingComparison]\n", errout_str());
 
         check("void f(std::map<int,int> &ints) {\n"
               "    for (std::map<int,int>::iterator it = ints.begin(); it != ints.end(); ++it) {\n"
               "        ++it->second;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::vector<std::string> &v) {\n"
@@ -4144,7 +4662,7 @@ class TestStl : public TestFixture {
               "            ++it;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4157,7 +4675,7 @@ class TestStl : public TestFixture {
               "                return;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4167,7 +4685,7 @@ class TestStl : public TestFixture {
               "        for (std::set<int>::iterator it = ints2.begin(); it != ints2.end(); ++it)\n"
               "        { }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4179,7 +4697,7 @@ class TestStl : public TestFixture {
               "            break;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (style) Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("function f1(std::list<int> &l1) {\n"
@@ -4189,7 +4707,7 @@ class TestStl : public TestFixture {
               "            return;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (style) Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
     }
 
@@ -4198,7 +4716,7 @@ class TestStl : public TestFixture {
               "    for(it = map1.begin(); it != map1.end(); it++) {\n"
               "        str[i++] = (*it).first;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4207,7 +4725,7 @@ class TestStl : public TestFixture {
               "    for(string::iterator it = s.begin(); it != s.end(); it++) {\n"
               "        it = s.insert(++it, 0);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4215,50 +4733,50 @@ class TestStl : public TestFixture {
         check("void f() {\n"
               "    std::string errmsg;\n"
               "    throw errmsg.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after throwing exception. [stlcstrthrow]\n", errout_str());
 
         check("const char *get_msg() {\n"
               "    std::string errmsg;\n"
               "    return errmsg.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("const char *get_msg() {\n"
               "    std::ostringstream errmsg;\n"
               "    return errmsg.str().c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("const char *get_msg() {\n"
               "    std::string errmsg;\n"
               "    return std::string(\"ERROR: \" + errmsg).c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("const char *get_msg() {\n"
               "    std::string errmsg;\n"
               "    return (\"ERROR: \" + errmsg).c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("const char *get_msg() {\n"
               "    std::string errmsg;\n"
               "    return (\"ERROR: \" + std::string(\"crash me\")).c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("void f() {\n"
               "    std::ostringstream errmsg;\n"
               "    const char *c = errmsg.str().c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("std::string f();\n"
               "\n"
               "void foo() {\n"
               "    const char *c = f().c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:17]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("class Foo {\n"
@@ -4267,7 +4785,7 @@ class TestStl : public TestFixture {
               "const char *Foo::f() {\n"
               "    std::string s;\n"
               "    return s.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("class Foo {\n"
@@ -4276,27 +4794,27 @@ class TestStl : public TestFixture {
               "const char *f() {\n"
               "    Foo f;\n"
               "    return f.GetVal().c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("const char* foo() {\n"
               "    static std::string text;\n"
               "    text = \"hello world\\n\";\n"
               "    return text.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // #3427
 
         // Implicit conversion back to std::string
         check("std::string get_msg() {\n"
               "    std::string errmsg;\n"
               "    return errmsg.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (performance) Returning the result of c_str() in a function that returns std::string is slow and redundant. [stlcstrReturn]\n", errout_str());
 
         check("const std::string& get_msg() {\n"
               "    std::string errmsg;\n"
               "    return errmsg.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (performance) Returning the result of c_str() in a function that returns std::string is slow and redundant. [stlcstrReturn]\n", errout_str());
 
         check("class Foo {\n"
@@ -4305,19 +4823,19 @@ class TestStl : public TestFixture {
               "std::string f() {\n"
               "    Foo f;\n"
               "    return f.GetVal().c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (performance) Returning the result of c_str() in a function that returns std::string is slow and redundant. [stlcstrReturn]\n", errout_str());
 
         check("std::string get_msg() {\n"
               "    std::string errmsg;\n"
               "    return errmsg;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string get_msg() {\n" // #3678
               "    MyStringClass errmsg;\n"
               "    return errmsg.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void Foo1(const std::string& str) {}\n"
@@ -4337,7 +4855,7 @@ class TestStl : public TestFixture {
               "    Foo4(str, str.c_str());\n"
               "    Foo4(ss.str(), ss.str().c_str());\n"
               "    Foo4(str.c_str(), str.c_str());\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("[test.cpp:9:5]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant. [stlcstrParam]\n"
                       "[test.cpp:11:5]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 2 is slow and redundant. [stlcstrParam]\n"
@@ -4353,7 +4871,7 @@ class TestStl : public TestFixture {
               "    std::string str = \"bar\";\n"
               "    Foo1(str, foo);\n" // Don't crash
               "    Foo2(str.c_str());\n" // Don't crash
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo {\n"
@@ -4367,7 +4885,7 @@ class TestStl : public TestFixture {
               "    func(str.c_str());\n"
               "    Foo::sfunc(str.c_str());\n"
               "    foo.func(str.c_str());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:5]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant. [stlcstrParam]\n"
                       "[test.cpp:10:10]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant. [stlcstrParam]\n"
                       "[test.cpp:11:9]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant. [stlcstrParam]\n",
@@ -4402,7 +4920,7 @@ class TestStl : public TestFixture {
               "    std::string str = \"bar\";\n"
               "    std::ofstream svgFile(filename.c_str(), std::ios::trunc);\n"
               "    svgFile << \"test\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void Foo(const char* p) {}\n"
@@ -4411,12 +4929,12 @@ class TestStl : public TestFixture {
               "    std::string str = \"bar\";\n"
               "    Foo(str);\n"
               "    Foo(str.c_str());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int atoi(const std::string& str) {\n" // #3729: Don't suggest recursive call
               "    return atoi(str.c_str());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string hello()\n"
@@ -4427,7 +4945,7 @@ class TestStl : public TestFixture {
               "const char *f()\n"
               "{\n"
               "    return hello().c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("class Fred {\n"
@@ -4441,7 +4959,7 @@ class TestStl : public TestFixture {
               "const char *Fred::f()\n"
               "{\n"
               "    return hello().c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:11:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         // #4183 - using MyStringClass.c_str()
@@ -4450,12 +4968,12 @@ class TestStl : public TestFixture {
               "void b() {\n"
               "    MyStringClass s;\n"
               "    a(s.c_str());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string Format(const char * name) {\n" // #4938
               "    return String::Format(\"%s:\", name).c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7480
@@ -4465,7 +4983,7 @@ class TestStl : public TestFixture {
               "const char* GetMapAuthor(int index) {\n"
               "    const InternalMapInfo* mapInfo = &internal_getMapInfo;\n"
               "    return mapInfo->author.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct InternalMapInfo {\n"
@@ -4474,7 +4992,7 @@ class TestStl : public TestFixture {
               "std::string GetMapAuthor(int index) {\n"
               "    const InternalMapInfo* mapInfo = &internal_getMapInfo;\n"
               "    return mapInfo->author.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (performance) Returning the result of c_str() in a function that returns std::string is slow and redundant. [stlcstrReturn]\n", errout_str());
 
         check("struct InternalMapInfo {\n"
@@ -4483,7 +5001,7 @@ class TestStl : public TestFixture {
               "const char* GetMapAuthor(int index) {\n"
               "    const InternalMapInfo mapInfo = internal_getMapInfo;\n"
               "    return mapInfo.author.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("struct S {\n" // #7656
@@ -4493,7 +5011,7 @@ class TestStl : public TestFixture {
               "const char* test() {\n"
               "    const struct S &s = getS();\n"
               "    return s.data.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #7930
@@ -4503,7 +5021,7 @@ class TestStl : public TestFixture {
               "    S s;\n"
               "    std::string &ref = s.data;\n"
               "    return ref.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("void f(const wchar_t* w, int i = 0, ...);\n" // #10357
@@ -4648,6 +5166,58 @@ class TestStl : public TestFixture {
               "    return s->x.c_str();\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("std::string f(const std::string& s) {\n" // #14533
+              "    auto x = std::string(\"abc\") + s.c_str();\n"
+              "    auto y = s.c_str() + std::string(\"def\");\n"
+              "    return x + y;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:33]: (performance) Concatenating the result of c_str() and a std::string is slow and redundant. [stlcstrConcat]\n"
+                      "[test.cpp:3:24]: (performance) Concatenating the result of c_str() and a std::string is slow and redundant. [stlcstrConcat]\n",
+                      errout_str());
+
+        check("std::string get();\n"
+              "std::string f(const std::string& s) {\n"
+              "    return get() + s.c_str();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:18]: (performance) Concatenating the result of c_str() and a std::string is slow and redundant. [stlcstrConcat]\n",
+                      errout_str());
+
+        check("std::string get();\n" // #14536
+              "    std::string f(const std::string& s) {\n"
+              "    return s + get().c_str();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:14]: (performance) Concatenating the result of c_str() and a std::string is slow and redundant. [stlcstrConcat]\n",
+                      errout_str());
+
+        check("std::string get();\n"
+              "std::string f(std::string & s) {\n"
+              "    s = get().c_str();\n"
+              "    std::string s2{ get().c_str() };\n"
+              "    return s2;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:5]: (performance) Assigning the result of c_str() to a std::string is slow and redundant. [stlcstrAssignment]\n"
+                      "[test.cpp:4:17]: (performance) Constructing a std::string from the result of c_str() is slow and redundant. [stlcstrConstructor]\n",
+                      errout_str());
+
+        check("void f() {\n"
+              "    std::string s;\n"
+              "    auto a = + s.c_str();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("std::string f(const std::string& a) {\n" // #14600
+              "    std::string b(a.c_str() + 1 + 2);\n"
+              "    return b;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:17]: (performance) Constructing a std::string from the result of c_str() is slow and redundant. [stlcstrConstructor]\n",
+                      errout_str());
+
+        check("void f(std::string& a, const std::string& b) {\n"
+              "    a += b.c_str();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:7]: (performance) Concatenating the result of c_str() and a std::string is slow and redundant. [stlcstrConcat]\n",
+                      errout_str());
     }
 
     void uselessCalls() {
@@ -4656,7 +5226,7 @@ class TestStl : public TestFixture {
               "    string s1, s2;\n"
               "    s1.swap(s2);\n"
               "    s2.swap(s2);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -4664,7 +5234,7 @@ class TestStl : public TestFixture {
               "    std::string s1, s2;\n"
               "    s1.swap(s2);\n"
               "    s2.swap(s2);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (performance) It is inefficient to swap a object with itself by calling 's2.swap(s2)' [uselessCallsSwap]\n", errout_str());
 
         check("void f()\n"
@@ -4674,7 +5244,7 @@ class TestStl : public TestFixture {
               "    s2.compare(s2);\n"
               "    s1.compare(s2.c_str());\n"
               "    s1.compare(0, s1.size(), s1);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:16]: (warning) It is inefficient to call 's2.compare(s2)' as it always returns 0. [uselessCallsCompare]\n", errout_str());
 
         // #7370 False positive uselessCallsCompare on unknown type
@@ -4685,7 +5255,7 @@ class TestStl : public TestFixture {
               "    return (cmp);\n"
               "  }\n"
               "  WT_CURSOR *cursor_;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -4697,7 +5267,7 @@ class TestStl : public TestFixture {
               "    s1 = s2.substr(0, x);\n"
               "    s1 = s2.substr(0,std::string::npos);\n"
               "    s1 = s2.substr(x+5-n, 0);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (performance) Ineffective call of function \'substr\' because it returns a copy of "
                       "the object. Use operator= instead. [uselessCallsSubstr]\n"
                       "[test.cpp:8:10]: (performance) Ineffective call of function \'substr\' because it returns a copy of "
@@ -4713,26 +5283,26 @@ class TestStl : public TestFixture {
               "    s1 = s2.substr(0, x);\n"
               "    s1 = s2.substr(0,std::string::npos);\n"
               "    s1 = s2.substr(x+5-n, 0);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int main()\n"
               "{\n"
               "    std::string str = \"a1b1\";\n"
               "    return str.find(str[1], 2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(std::vector<int>& v) {\n"
               "    v.empty();\n"
               "    return v.empty();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) Ineffective call of function 'empty()'. Did you intend to call 'clear()' instead? [uselessCallsEmpty]\n", errout_str());
 
         check("void f() {\n" // #4938
               "    OdString str;\n"
               "    str.empty();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #4032
@@ -4740,7 +5310,7 @@ class TestStl : public TestFixture {
               "    const std::string::size_type npos = greeting.rfind(\" \");\n"
               "    if (npos != std::string::npos)\n"
               "        std::cout << greeting.substr(0, npos) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int> a) {\n"
@@ -4750,21 +5320,27 @@ class TestStl : public TestFixture {
               "    x = std::remove(a.begin(), a.end(), val);\n"
               "    a.erase(std::remove(a.begin(), a.end(), val));\n"
               "    std::remove(\"foo.txt\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) Return value of std::remove() ignored. Elements remain in container. [uselessCallsRemove]\n"
                       "[test.cpp:3:5]: (warning) Return value of std::remove_if() ignored. Elements remain in container. [uselessCallsRemove]\n"
                       "[test.cpp:4:5]: (warning) Return value of std::unique() ignored. Elements remain in container. [uselessCallsRemove]\n", errout_str());
 
+        check("void f(std::string& s) {\n" // #14764
+              "    auto it{ std::remove(s.begin(), s.end(), 'a') };\n"
+              "    s.erase(it, s.end());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
         // #4431 - fp
         check("bool f() {\n"
               "    return x ? true : (y.empty());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8360
         check("void f(std::string s) {\n"
               "    for (;s.empty();) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #11166
@@ -4829,7 +5405,7 @@ class TestStl : public TestFixture {
               "        EffectivityRange<int> er;\n"
               "    }\n"
               "    void shift() { EffectivityRangeData<int>::iterator it;  }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4839,7 +5415,7 @@ class TestStl : public TestFixture {
               "    if (std::isalpha(*i) && i != str.end()) {\n"
               "        std::cout << *i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         check("void foo(std::string::iterator& i) {\n"
@@ -4847,7 +5423,7 @@ class TestStl : public TestFixture {
               "    else if (std::isalpha(*i) && i != str.end()) {\n"
               "        std::cout << *i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:27]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test suggested correction doesn't report an error
@@ -4855,7 +5431,7 @@ class TestStl : public TestFixture {
               "    if (i != str.end() && std::isalpha(*i)) {\n"
               "        std::cout << *i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Test "while" with "&&" case
@@ -4864,7 +5440,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "        i ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         check("void foo(std::string::iterator& i) {\n"
@@ -4872,7 +5448,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "        i ++;\n"
               "    } while (std::isalpha(*i) && i != str.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:27]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test "while" with "||" case
@@ -4881,7 +5457,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "        i ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:28]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test fix for "while" with "||" case
@@ -4890,7 +5466,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "        i ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Test "for" with "&&" case
@@ -4899,7 +5475,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "        i ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test "for" with "||" case
@@ -4908,7 +5484,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "        i ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test that a dereference outside the condition part of a "for"
@@ -4918,7 +5494,7 @@ class TestStl : public TestFixture {
               "        std::cout << c;\n"
               "        i ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Test that other "&&" terms in the condition don't invalidate the check
@@ -4926,7 +5502,7 @@ class TestStl : public TestFixture {
               "    if (*c && std::isalpha(*i) && i != str.end()) {\n"
               "        std::cout << *i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:28]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test that dereference of different variable doesn't trigger a false positive
@@ -4934,7 +5510,7 @@ class TestStl : public TestFixture {
               "    if (std::isalpha(*c) && i != str.end()) {\n"
               "        std::cout << *c;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Test case involving "rend()" instead of "end()"
@@ -4943,7 +5519,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "        i ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test that mixed "&&" and "||" don't result in a false positive
@@ -4951,7 +5527,7 @@ class TestStl : public TestFixture {
               "    if ((i == str.end() || *i) || (isFoo() && i != str.end())) {\n"
               "        std::cout << \"foo\";\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -5174,7 +5750,7 @@ class TestStl : public TestFixture {
               "        return s.erase(it);\n"
               "    return s.end();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3:0]: (style) Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         // #11381
         check("int f(std::map<int, int>& map) {\n"
@@ -5261,6 +5837,13 @@ class TestStl : public TestFixture {
               "    return it;\n"
               "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:18:5]: (error, inconclusive) Invalid iterator 'it' used. [eraseDereference]\n", errout_str());
+
+        check("int f(const std::vector<int>& v) {\n" // #11895
+              "    auto it = v.end();\n"
+              "    std::advance(it, -2);\n"
+              "    return *it;\n"
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void loopAlgoElementAssign() {
@@ -5568,6 +6151,14 @@ class TestStl : public TestFixture {
               "}\n",
               dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(const std::vector<std::string>& v) {\n" // #14812
+              "    std::set<std::string> s;\n"
+              "    for (const std::string& a : v) {\n"
+              "        s.insert(a);\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::copy algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
     }
 
     void loopAlgoIncrement() {
@@ -5860,7 +6451,7 @@ class TestStl : public TestFixture {
               "            v1.erase(it1);\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:9:0]: (style) Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:9:17]: (style) Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("bool f(const std::set<std::string>& set, const std::string& f) {\n" // #11595
               "    for (const std::string& s : set) {\n"
@@ -6524,6 +7115,18 @@ class TestStl : public TestFixture {
               dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
+        check("template<typename T>\n" // #11583
+              "int g() { return 0; }\n"
+              "void f() {\n"
+              "    std::vector<int> v(1);\n"
+              "    auto itr = v.begin() + g<int>();\n"
+              "    std::vector<int> v2(itr, v.end());\n"
+              "    v.erase(itr, v.end());\n"
+              "    v.push_back(v2.size());\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
+
         // #13410
         check("int f(std::vector<int>& v) {\n"
               "    const int* i = &*v.cbegin();\n"
@@ -6865,7 +7468,7 @@ class TestStl : public TestFixture {
                   "      if(x.find(5) == x.end())\n"
                   "         x[5] = data;\n"
                   "   }\n"
-                  "}", s);
+                  "}\n", s);
             ASSERT_EQUALS("", errout_str());
 
             s.standards.cpp = Standards::CPP11;
@@ -6877,7 +7480,7 @@ class TestStl : public TestFixture {
                   "      if(x.find(5) == x.end())\n"
                   "         x[5] = data;\n"
                   "   }\n"
-                  "}", s);
+                  "}\n", s);
             ASSERT_EQUALS("[test.cpp:7:17]: (performance) Searching before insertion is not necessary. Instead of 'x[5]=data' consider using 'x.emplace(5, data);'. [stlFindInsert]\n", errout_str());
 
             check("void foo() {\n"
@@ -6888,9 +7491,106 @@ class TestStl : public TestFixture {
                   "      if(x.find(5) == x.end())\n"
                   "         x[5] = data;\n"
                   "   }\n"
-                  "}"); // TODO: use s?
+                  "}\n"); // TODO: use s?
             ASSERT_EQUALS("[test.cpp:7:17]: (performance) Searching before insertion is not necessary. Instead of 'x[5]=data' consider using 'x.try_emplace(5, data);'. [stlFindInsert]\n", errout_str());
         }
+
+        // The key is found => the value is assigned, try_emplace() would not do that
+        check("void f() {\n"
+              "    std::map<int, bool> m{{1, false}};\n"
+              "    if (m.count(1) != 0)\n"
+              "        m[1] = true;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:16]: (performance) Searching before modification is not necessary. Instead of 'm[1]=true' consider assigning the value through the iterator returned by 'm.find(1)'. [stlFindInsert]\n",
+            errout_str());
+
+        check("void f(std::map<unsigned, unsigned>& m, unsigned x) {\n"
+              "    if (m.find(x) != m.end())\n"
+              "        m[x] = 1;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:16]: (performance) Searching before modification is not necessary. Instead of 'm[x]=1' consider assigning the value through the iterator returned by 'm.find(x)'. [stlFindInsert]\n",
+            errout_str());
+
+        check("void f(std::map<unsigned, unsigned>& m, unsigned x) {\n"
+              "    if (m.count(x) > 0)\n"
+              "        m[x] = 1;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:16]: (performance) Searching before modification is not necessary. Instead of 'm[x]=1' consider assigning the value through the iterator returned by 'm.find(x)'. [stlFindInsert]\n",
+            errout_str());
+
+        check("void f(std::map<unsigned, unsigned>& m, unsigned x) {\n"
+              "    if (m.count(x) == 1)\n"
+              "        m[x] = 1;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:16]: (performance) Searching before modification is not necessary. Instead of 'm[x]=1' consider assigning the value through the iterator returned by 'm.find(x)'. [stlFindInsert]\n",
+            errout_str());
+
+        // The key is not found => try_emplace()
+        check("void f(std::map<unsigned, unsigned>& m, unsigned x) {\n"
+              "    if (m.count(x) == 0)\n"
+              "        m[x] = 1;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:16]: (performance) Searching before insertion is not necessary. Instead of 'm[x]=1' consider using 'm.try_emplace(x, 1);'. [stlFindInsert]\n",
+            errout_str());
+
+        check("void f(std::map<unsigned, unsigned>& m, unsigned x) {\n"
+              "    if (m.count(x) < 1)\n"
+              "        m[x] = 1;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:16]: (performance) Searching before insertion is not necessary. Instead of 'm[x]=1' consider using 'm.try_emplace(x, 1);'. [stlFindInsert]\n",
+            errout_str());
+
+        // Unknown condition => no suggestion
+        check("void f(std::map<unsigned, unsigned>& m, unsigned x, unsigned y) {\n"
+              "    if (m.count(x) == y)\n"
+              "        m[x] = 1;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:16]: (performance) Searching before insertion is not necessary. [stlFindInsert]\n",
+                      errout_str());
+
+        // Both branches set the value => no suggestion
+        check("void f(std::map<unsigned, unsigned>& m, unsigned x) {\n"
+              "    if (m.find(x) == m.end())\n"
+              "        m[x] = 1;\n"
+              "    else\n"
+              "        m[x] = 1;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:16]: (performance) Searching before insertion is not necessary. [stlFindInsert]\n",
+                      errout_str());
+
+        check("void f(std::map<unsigned, unsigned>& m, unsigned x) {\n"
+              "    if (m.find(x) != m.end())\n"
+              "        m[x] = 1;\n"
+              "    else\n"
+              "        m.emplace(x, 1);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:16]: (performance) Searching before insertion is not necessary. [stlFindInsert]\n",
+                      errout_str());
+
+        // The suggestion for a found key does not depend on the C++ standard
+        {
+            Settings s = settings;
+            const char code[] = "void f(std::map<unsigned, unsigned>& m, unsigned x) {\n"
+                                "    if (m.count(x) != 0)\n"
+                                "        m[x] = 1;\n"
+                                "}\n";
+            s.standards.cpp = Standards::CPP03;
+            check(code, s);
+            ASSERT_EQUALS(
+                "[test.cpp:3:16]: (performance) Searching before modification is not necessary. Instead of 'm[x]=1' consider assigning the value through the iterator returned by 'm.find(x)'. [stlFindInsert]\n",
+                errout_str());
+            s.standards.cpp = Standards::CPP11;
+            check(code, s);
+            ASSERT_EQUALS(
+                "[test.cpp:3:16]: (performance) Searching before modification is not necessary. Instead of 'm[x]=1' consider assigning the value through the iterator returned by 'm.find(x)'. [stlFindInsert]\n",
+                errout_str());
+        }
     }
 
     void checkKnownEmptyContainer() {
@@ -6935,7 +7635,10 @@ class TestStl : public TestFixture {
               "    std::copy(v1.begin(), v1.end(), v2.begin());\n"
               "}\n",
               dinit(CheckOptions, $.inconclusive = true));
-        ASSERT_EQUALS("[test.cpp:4:45]: (style) Using copy with iterator 'v2.begin()' that is always empty. [knownEmptyContainer]\n", errout_str());
+        ASSERT_EQUALS(
+            "[test.cpp:4:45]: (style) Using copy with iterator 'v2.begin()' that is always empty. [knownEmptyContainer]\n"
+            "[test.cpp:4:45]: (error) The algorithm 'std::copy' accesses 2 elements through the iterator 'v2.begin()' but only 0 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
 
         check("void f() {\n"
               "    std::vector<int> v;\n"
@@ -6977,7 +7680,7 @@ class TestStl : public TestFixture {
               "static void f() {\n"
               "    const ArrayType arr;\n"
               "    for (const auto &a : arr) {}\n"
-              "}",
+              "}\n",
               dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:7:26]: (style) Iterating over container 'arr' that is always empty. [knownEmptyContainer]\n", errout_str());
 
@@ -7224,7 +7927,7 @@ class TestStl : public TestFixture {
               dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void foo() { int f = 0; auto g(f); g = g; }");
+        check("void foo() { int f = 0; auto g(f); g = g; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct foobar {\n"
diff --git a/test/teststring.cpp b/test/teststring.cpp
index 051aa870788..e34950d127c 100644
--- a/test/teststring.cpp
+++ b/test/teststring.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -74,33 +74,33 @@ class TestString : public TestFixture {
         // Tokenize..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check char variable usage..
-        runChecks<CheckString>(tokenizer, this);
+        CheckString check;
+        runChecks(check, tokenizer, *this);
     }
 
     void stringLiteralWrite() {
         check("void f() {\n"
               "  char *abc = \"abc\";\n"
               "  abc[0] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3] -> [test.cpp:2:15]: (error) Modifying string literal \"abc\" directly or indirectly is undefined behaviour. [stringLiteralWrite]\n", errout_str());
 
         check("void f() {\n"
               "  char *abc = \"abc\";\n"
               "  *abc = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:4] -> [test.cpp:2:15]: (error) Modifying string literal \"abc\" directly or indirectly is undefined behaviour. [stringLiteralWrite]\n", errout_str());
 
         check("void f() {\n"
               "  char *abc = \"A very long string literal\";\n"
               "  abc[0] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3] -> [test.cpp:2:15]: (error) Modifying string literal \"A very long stri..\" directly or indirectly is undefined behaviour. [stringLiteralWrite]\n", errout_str());
 
         check("void f() {\n"
               "  QString abc = \"abc\";\n"
               "  abc[0] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo_FP1(char *p) {\n"
@@ -109,7 +109,7 @@ class TestString : public TestFixture {
               "void foo_FP2(void) {\n"
               "  char* s = \"Y\";\n"
               "  foo_FP1(s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:3] -> [test.cpp:5:13]: (error) Modifying string literal \"Y\" directly or indirectly is undefined behaviour. [stringLiteralWrite]\n",
             errout_str());
@@ -120,19 +120,19 @@ class TestString : public TestFixture {
               "void foo_FP2(void) {\n"
               "  char s[10] = \"Y\";\n"
               "  foo_FP1(s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  wchar_t *abc = L\"abc\";\n"
               "  abc[0] = u'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3] -> [test.cpp:2:18]: (error) Modifying string literal L\"abc\" directly or indirectly is undefined behaviour. [stringLiteralWrite]\n", errout_str());
 
         check("void f() {\n"
               "  char16_t *abc = u\"abc\";\n"
               "  abc[0] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3] -> [test.cpp:2:19]: (error) Modifying string literal u\"abc\" directly or indirectly is undefined behaviour. [stringLiteralWrite]\n", errout_str());
 
         check("void foo() {\n" // #8332
@@ -142,7 +142,7 @@ class TestString : public TestFixture {
               "        p[i] = \'X\';\n" // <<
               "    }\n"
               "    printf(\"%s\\n\", p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:3:16]: (error) Modifying string literal \"string literal\" directly or indirectly is undefined behaviour. [stringLiteralWrite]\n", errout_str());
     }
 
@@ -160,7 +160,7 @@ class TestString : public TestFixture {
               "  if (wmemcmp(L\"A\",L\"A\",1)){}\n"
               "  if (wcscmp(L\"A\",L\"A\")){}\n"
               "  if (wcscasecmp(L\"A\",L\"A\")){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n"
                       "[test.cpp:3:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n"
                       "[test.cpp:4:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n"
@@ -180,7 +180,7 @@ class TestString : public TestFixture {
               "     if (!memcmp(p + offset, p, 42)){}\n"
               "     if (!memcmp(offset + p, p, 42)){}\n"
               "     if (!memcmp(p, offset + p, 42)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // avoid false positives when the address is modified #6415
@@ -189,7 +189,7 @@ class TestString : public TestFixture {
               "     if (!memcmp(c + offset, c, 42)){}\n"
               "     if (!memcmp(offset + c, c, 42)){}\n"
               "     if (!memcmp(c, offset + c, 42)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // avoid false positives when the address is modified #6415
@@ -198,164 +198,164 @@ class TestString : public TestFixture {
               "     if (!memcmp(s.c_str() + offset, s.c_str(), 42)){}\n"
               "     if (!memcmp(offset + s.c_str(), s.c_str(), 42)){}\n"
               "     if (!memcmp(s.c_str(), offset + s.c_str(), 42)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(void) {\n" // #13527
               "    const wchar_t* str1 = L\"Hello\";\n"
               "    return wcsicmp(str1, str1);\n" // <<
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (warning) Comparison of identical string variables. [stringCompare]\n", errout_str());
 
         check("int main()\n"
               "{\n"
-              "  if (strcmp(\"00FF00\", \"00FF00\") == 0)"
-              "  {"
-              "    std::cout << \"Equal\";"
-              "  }"
-              "}");
+              "  if (strcmp(\"00FF00\", \"00FF00\") == 0)\n"
+              "  {\n"
+              "    std::cout << \"Equal\";\n"
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n", errout_str());
 
         check("void f() {\n"
-              "  if (strcmp($\"00FF00\", \"00FF00\") == 0) {}"
-              "}");
+              "  if (strcmp($\"00FF00\", \"00FF00\") == 0) {}\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
-              "  if ($strcmp(\"00FF00\", \"00FF00\") == 0) {}"
-              "}");
+              "  if ($strcmp(\"00FF00\", \"00FF00\") == 0) {}\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int main()\n"
               "{\n"
-              "  if (stricmp(\"hotdog\",\"HOTdog\") == 0)"
-              "  {"
-              "    std::cout << \"Equal\";"
-              "  }"
-              "}");
+              "  if (stricmp(\"hotdog\",\"HOTdog\") == 0)\n"
+              "  {\n"
+              "    std::cout << \"Equal\";\n"
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n", errout_str());
 
         check("int main()\n"
               "{\n"
-              "  if (QString::compare(\"Hamburger\", \"Hotdog\") == 0)"
-              "  {"
-              "    std::cout << \"Equal\";"
-              "  }"
-              "}");
+              "  if (QString::compare(\"Hamburger\", \"Hotdog\") == 0)\n"
+              "  {\n"
+              "    std::cout << \"Equal\";\n"
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n", errout_str());
 
         check("int main()\n"
               "{\n"
-              "  if (QString::compare(argv[2], \"hotdog\") == 0)"
-              "  {"
-              "    std::cout << \"Equal\";"
-              "  }"
-              "}");
+              "  if (QString::compare(argv[2], \"hotdog\") == 0)\n"
+              "  {\n"
+              "    std::cout << \"Equal\";\n"
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int main()\n"
               "{\n"
-              "  if (strncmp(\"hotdog\",\"hotdog\", 6) == 0)"
-              "  {"
-              "    std::cout << \"Equal\";"
-              "  }"
-              "}");
+              "  if (strncmp(\"hotdog\",\"hotdog\", 6) == 0)\n"
+              "  {\n"
+              "    std::cout << \"Equal\";\n"
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n", errout_str());
 
         check("int foo(const char *buf)\n"
               "{\n"
-              "  if (strcmp(buf, buf) == 0)"
-              "  {"
-              "    std::cout << \"Equal\";"
-              "  }"
-              "}");
+              "  if (strcmp(buf, buf) == 0)\n"
+              "  {\n"
+              "    std::cout << \"Equal\";\n"
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (warning) Comparison of identical string variables. [stringCompare]\n", errout_str());
 
         check("int foo(const std::string& buf)\n"
               "{\n"
-              "  if (stricmp(buf.c_str(), buf.c_str()) == 0)"
-              "  {"
-              "    std::cout << \"Equal\";"
-              "  }"
-              "}");
+              "  if (stricmp(buf.c_str(), buf.c_str()) == 0)\n"
+              "  {\n"
+              "    std::cout << \"Equal\";\n"
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (warning) Comparison of identical string variables. [stringCompare]\n", errout_str());
 
         check("int main() {\n"
               "  if (\"str\" == \"str\") {\n"
               "    std::cout << \"Equal\";\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n", errout_str());
 
         check("int main() {\n"
               "  if (\"str\" != \"str\") {\n"
               "    std::cout << \"Equal\";\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n", errout_str());
 
         check("int main() {\n"
               "  if (a+\"str\" != \"str\"+b) {\n"
               "    std::cout << \"Equal\";\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void suspiciousStringCompare() {
         check("bool foo(char* c) {\n"
               "    return c == \"x\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning) String literal compared with variable 'c'. Did you intend to use strcmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(char** c) {\n"
               "    return c[3] == \"x\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) String literal compared with variable 'c[3]'. Did you intend to use strcmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(wchar_t* c) {\n"
               "    return c == L\"x\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning) String literal compared with variable 'c'. Did you intend to use wcscmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(const char* c) {\n"
               "    return \"x\" == c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) String literal compared with variable 'c'. Did you intend to use strcmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return foo+\"x\" == c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return \"x\" == c+foo;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return \"x\" == c+foo;\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:2:16]: (warning) String literal compared with variable 'c+foo'. Did you intend to use strcmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(Foo c) {\n"
               "    return \"x\" == c.foo;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(Foo c) {\n"
               "    return \"x\" == c.foo;\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:2:16]: (warning) String literal compared with variable 'c.foo'. Did you intend to use strcmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(const std::string& c) {\n"
               "    return \"x\" == c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(const Foo* c) {\n"
               "    return \"x\" == c->bar();\n" // #4314
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #4257
@@ -367,33 +367,33 @@ class TestString : public TestFixture {
         // Ticket #4257
         check("bool foo() {\n"
               "MyString *str=Getter();\n"
-              "return *str==\"bug\"; }");
+              "return *str==\"bug\"; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #4257
         check("bool foo() {\n"
               "MyString **str=OtherGetter();\n"
-              "return *str==\"bug\"; }", dinit(CheckOptions, $.cpp = false));
+              "return *str==\"bug\"; }\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:12]: (warning) String literal compared with variable '*str'. Did you intend to use strcmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         // Ticket #4257
         check("bool foo() {\n"
               "MyString str=OtherGetter2();\n"
-              "return &str==\"bug\"; }", dinit(CheckOptions, $.cpp = false));
+              "return &str==\"bug\"; }\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:12]: (warning) String literal compared with variable '&str'. Did you intend to use strcmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         // Ticket #5734
         check("int foo(char c) {\n"
-              "return c == '4';}");
+              "return c == '4';}\n");
         ASSERT_EQUALS("", errout_str());
         check("int foo(char c) {\n"
-              "return c == '4';}", dinit(CheckOptions, $.cpp = false));
+              "return c == '4';}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
         check("int foo(char c) {\n"
-              "return c == \"42\"[0];}");
+              "return c == \"42\"[0];}\n");
         ASSERT_EQUALS("", errout_str());
         check("int foo(char c) {\n"
-              "return c == \"42\"[0];}", dinit(CheckOptions, $.cpp = false));
+              "return c == \"42\"[0];}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         // 5639 String literal compared with char buffer in a struct
@@ -418,81 +418,81 @@ class TestString : public TestFixture {
         check("void f(std::vector<std::string> theArgs) {\n"
               "   std::string arg1(*theArgs.begin());\n"
               "   if(arg1 == \"aaa\") {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void suspiciousStringCompare_char() {
         check("bool foo(char* c) {\n"
               "    return c == 'x';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning) Char literal compared with pointer 'c'. Did you intend to dereference it? [charLiteralWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(wchar_t* c) {\n"
               "    return c == L'x';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning) Char literal compared with pointer 'c'. Did you intend to dereference it? [charLiteralWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return '\\0' != c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Char literal compared with pointer 'c'. Did you intend to dereference it? [charLiteralWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(char c) {\n"
               "    return c == '\\0';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return c[0] == '\\0';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char** c) {\n"
               "    return c[0] == '\\0';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Char literal compared with pointer 'c[0]'. Did you intend to dereference it? [charLiteralWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(char** c) {\n"
               "    return *c == '\\0';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Char literal compared with pointer '*c'. Did you intend to dereference it? [charLiteralWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(char c) {\n"
               "    return c == 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return *c == 0;\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return *c == 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(Foo* c) {\n"
               "    return 0 == c->x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* c) {\n"
               "    if(c == '\\0') bar();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Char literal compared with pointer 'c'. Did you intend to dereference it? [charLiteralWithCharPtrCompare]\n", errout_str());
 
         check("void f() {\n"
               "  struct { struct { char *str; } x; } a;\n"
               "  return a.x.str == '\\0';"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (warning) Char literal compared with pointer 'a.x.str'. Did you intend to dereference it? [charLiteralWithCharPtrCompare]\n", errout_str());
 
         check("void f() {\n"
               "  struct { struct { char *str; } x; } a;\n"
               "  return *a.x.str == '\\0';"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -502,7 +502,7 @@ class TestString : public TestFixture {
               "{\n"
               "    char buf[100];\n"
               "    snprintf(buf,100,\"%s\",buf);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:27]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in snprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
@@ -511,7 +511,7 @@ class TestString : public TestFixture {
               "{\n"
               "    char buf[100];\n"
               "    sprintf(buf,\"%s\",buf);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:22]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in sprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
@@ -520,7 +520,7 @@ class TestString : public TestFixture {
               "{\n"
               "    char buf[100];\n"
               "    sprintf(buf,\"%i\",sizeof(buf));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -530,7 +530,7 @@ class TestString : public TestFixture {
               "    char buf[100];\n"
               "    sprintf(buf,\"%i\",sizeof(buf));\n"
               "    if (buf[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -545,7 +545,7 @@ class TestString : public TestFixture {
               "    const char* filename = \"hello\";\n"
               "    struct A a;\n"
               "    snprintf(a.filename, 128, \"%s\", filename);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -558,7 +558,7 @@ class TestString : public TestFixture {
               "void foo(struct A *a)\n"
               "{\n"
               "    snprintf(a->filename, 128, \"%s\", a->filename);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:39]: (error) Undefined behavior: Variable 'a->filename' is used as parameter and destination in snprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
@@ -567,7 +567,7 @@ class TestString : public TestFixture {
               "{\n"
               "    char buf[100];\n"
               "    sprintf((char*)buf,\"%s\",(char*)buf);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:29]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in sprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
@@ -576,7 +576,7 @@ class TestString : public TestFixture {
               "{\n"
               "    char buf[100];\n"
               "    sprintf((char*)(void*)buf,\"%s\",(void*)(char*)buf);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:36]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in sprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
@@ -585,7 +585,7 @@ class TestString : public TestFixture {
               "{\n"
               "    wchar_t buf[100];\n"
               "    swprintf(buf,10, \"%s\",buf);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:27]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in swprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
@@ -594,7 +594,7 @@ class TestString : public TestFixture {
         check("void foo()\n"
               "{\n"
               "    const char *p = \"/usr\" + '/';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:28]: (error) Unusual pointer arithmetic. A value of type 'char' is added to a string literal. [strPlusChar]\n", errout_str());
     }
 
@@ -604,7 +604,7 @@ class TestString : public TestFixture {
               "{\n"
               "    char ch = 1;\n"
               "    const char *p = ch + \"/usr\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Strange looking pointer arithmetic..
@@ -613,7 +613,7 @@ class TestString : public TestFixture {
               "    int i = 1;\n"
               "    const char* psz = \"Bla\";\n"
               "    const std::string str = i + psz;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -623,7 +623,7 @@ class TestString : public TestFixture {
               "{\n"
               "    std::string temp = \"/tmp\";\n"
               "    std::string path = temp + '/' + \"sub\" + '/';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -632,100 +632,100 @@ class TestString : public TestFixture {
         check("void foo()\n"
               "{\n"
               "    const wchar_t *p = L\"/usr\" + L'/';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:32]: (error) Unusual pointer arithmetic. A value of type 'wchar_t' is added to a string literal. [strPlusChar]\n", errout_str());
 
         check("void foo(wchar_t c)\n"
               "{\n"
               "    const wchar_t *p = L\"/usr\" + c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:32]: (error) Unusual pointer arithmetic. A value of type 'wchar_t' is added to a string literal. [strPlusChar]\n", errout_str());
     }
 
     void incorrectStringCompare() {
         check("int f() {\n"
               "    return test.substr( 0 , 4 ) == \"Hello\" ? 0 : 1 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) String literal \"Hello\" doesn't match length argument for substr(). [incorrectStringCompare]\n", errout_str());
 
         check("int f() {\n"
               "    return test.substr( 0 , 4 ) == L\"Hello\" ? 0 : 1 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) String literal L\"Hello\" doesn't match length argument for substr(). [incorrectStringCompare]\n", errout_str());
 
         check("int f() {\n"
               "    return test.substr( 0 , 5 ) == \"Hello\" ? 0 : 1 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    return \"Hello\" == test.substr( 0 , 4 ) ? 0 : 1 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:28]: (warning) String literal \"Hello\" doesn't match length argument for substr(). [incorrectStringCompare]\n", errout_str());
 
         check("int f() {\n"
               "    return \"Hello\" == foo.bar<int>().z[1].substr(i+j*4, 4) ? 0 : 1 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:43]: (warning) String literal \"Hello\" doesn't match length argument for substr(). [incorrectStringCompare]\n", errout_str());
 
         check("int f() {\n"
               "    return \"Hello\" == test.substr( 0 , 5 ) ? 0 : 1 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    if (\"Hello\") { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
 
         check("int f() {\n"
               "    if (\"Hello\" && test) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
 
         check("int f() {\n"
               "    if (test && \"Hello\") { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
 
         check("int f() {\n"
               "    while (\"Hello\") { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
 
         check("int f() {\n"
               "    return \"Hello\" ? 1 : 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
 
         check("int f() {\n"
               "    assert (test || \"Hello\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:21]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
 
         check("int f() {\n"
               "    assert (test && \"Hello\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    assert (\"Hello\" || test);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
 
         check("int f() {\n"
               "    assert (\"Hello\" && test);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    BOOST_ASSERT (\"Hello\" && test);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    return f2(\"Hello\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7750 warn about char literals in boolean expressions
@@ -734,7 +734,7 @@ class TestString : public TestFixture {
               "  if(L'b'){}\n"
               "  if(1 && 'c'){}\n"
               "  int x = 'd' ? 1 : 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (warning) Conversion of char literal 'a' to bool always evaluates to true. [incorrectCharBooleanError]\n"
                       "[test.cpp:3:6]: (warning) Conversion of char literal L'b' to bool always evaluates to true. [incorrectCharBooleanError]\n"
                       "[test.cpp:4:11]: (warning) Conversion of char literal 'c' to bool always evaluates to true. [incorrectCharBooleanError]\n"
@@ -744,7 +744,7 @@ class TestString : public TestFixture {
         check("void f() {\n"
               "  if('\\0'){}\n"
               "  if(L'\\0'){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (warning) Conversion of char literal '\\0' to bool always evaluates to false. [incorrectCharBooleanError]\n"
                       "[test.cpp:3:6]: (warning) Conversion of char literal L'\\0' to bool always evaluates to false. [incorrectCharBooleanError]\n",
                       errout_str());
@@ -752,7 +752,7 @@ class TestString : public TestFixture {
         check("void f() {\n"
               "  if('\\0' || cond){}\n"
               "  if(L'\\0' || cond){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (warning) Conversion of char literal '\\0' to bool always evaluates to false. [incorrectCharBooleanError]\n"
                       "[test.cpp:3:6]: (warning) Conversion of char literal L'\\0' to bool always evaluates to false. [incorrectCharBooleanError]\n", errout_str());
 
@@ -836,12 +836,12 @@ class TestString : public TestFixture {
     void deadStrcmp() {
         check("void f(const char *str) {\n"
               "  if (strcmp(str, \"abc\") == 0 || strcmp(str, \"def\")) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:40]: (warning) The expression 'strcmp(str,\"def\") != 0' is suspicious. It overlaps 'strcmp(str,\"abc\") == 0'. [overlappingStrcmp]\n", errout_str());
 
         check("void f(const wchar_t *str) {\n"
               "  if (wcscmp(str, L\"abc\") == 0 || wcscmp(str, L\"def\")) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:41]: (warning) The expression 'wcscmp(str,L\"def\") != 0' is suspicious. It overlaps 'wcscmp(str,L\"abc\") == 0'. [overlappingStrcmp]\n", errout_str());
 
         check("struct X {\n"
@@ -850,7 +850,7 @@ class TestString : public TestFixture {
               "\n"
               "void f(const struct X *x) {\n"
               "  if (strcmp(x->str, \"abc\") == 0 || strcmp(x->str, \"def\")) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:43]: (warning) The expression 'strcmp(x->str,\"def\") != 0' is suspicious. It overlaps 'strcmp(x->str,\"abc\") == 0'. [overlappingStrcmp]\n", errout_str());
     }
 };
diff --git a/test/testsummaries.cpp b/test/testsummaries.cpp
index 7896ffeb750..d550ee54804 100644
--- a/test/testsummaries.cpp
+++ b/test/testsummaries.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,15 +45,15 @@ class TestSummaries : public TestFixture {
     }
 
     void createSummaries1() {
-        ASSERT_EQUALS("foo\n", createSummaries("void foo() {}"));
+        ASSERT_EQUALS("foo\n", createSummaries("void foo() {}\n"));
     }
 
     void createSummariesGlobal() {
-        ASSERT_EQUALS("foo global:[x]\n", createSummaries("int x; void foo() { x=0; }"));
+        ASSERT_EQUALS("foo global:[x]\n", createSummaries("int x; void foo() { x=0; }\n"));
     }
 
     void createSummariesNoreturn() {
-        ASSERT_EQUALS("foo call:[bar] noreturn:[bar]\n", createSummaries("void foo() { bar(); }"));
+        ASSERT_EQUALS("foo call:[bar] noreturn:[bar]\n", createSummaries("void foo() { bar(); }\n"));
     }
 };
 
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
index 1f572bd2eb2..fbdcb6307e5 100644
--- a/test/testsuppressions.cpp
+++ b/test/testsuppressions.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "addoninfo.h"
 #include "config.h"
 #include "cppcheck.h"
 #include "cppcheckexecutor.h"
@@ -31,12 +32,13 @@
 #include "suppressions.h"
 #include "threadexecutor.h"
 
-#include <cstdint>
 #include <cstring>
+#include <initializer_list>
 #include <list>
 #include <map>
 #include <memory>
 #include <sstream>
+#include <stdexcept>
 #include <string>
 #include <utility>
 #include <vector>
@@ -47,10 +49,17 @@ class TestSuppressions : public TestFixture {
 
 private:
 
+    class CppCheckExecutorTest final : public CppCheckExecutor
+    {
+        friend class TestSuppressions;
+    };
+
     const std::string templateFormat{"{callstack}: ({severity}) {inconclusive:inconclusive: }{message}"};
 
     void run() override {
         mNewTemplate = true;
+        TEST_CASE(parseLine);
+        TEST_CASE(parseLineInvalid);
         TEST_CASE(suppressionsBadId1);
         TEST_CASE(suppressionsDosFormat);     // Ticket #1836
         TEST_CASE(suppressionsFileNameWithColon);    // Ticket #1919 - filename includes colon
@@ -108,14 +117,95 @@ class TestSuppressions : public TestFixture {
         TEST_CASE(addSuppressionDuplicate);
         TEST_CASE(updateSuppressionState);
         TEST_CASE(addSuppressionLineMultiple);
+        TEST_CASE(hashSuppression);
 
         TEST_CASE(suppressionsParseXmlFile);
+        TEST_CASE(xmlMacroSuppressions);
 
         TEST_CASE(toString);
 
         TEST_CASE(suppressionFromErrorMessage);
 
         TEST_CASE(suppressionWildcard);
+
+        TEST_CASE(polyspaceParseRange);
+        TEST_CASE(polyspaceParseIds);
+
+        TEST_CASE(polyspaceMisraC2012);
+        TEST_CASE(polyspacePremiumMisraC2012);
+        TEST_CASE(polyspaceMisraC2023);
+        TEST_CASE(polyspaceMisraCpp2008);
+        TEST_CASE(polyspaceMisraCpp2023);
+        TEST_CASE(polyspaceCertC);
+        TEST_CASE(polyspaceCertCpp);
+        TEST_CASE(polyspaceAutosar);
+        TEST_CASE(polyspaceIgnored);
+        TEST_CASE(polyspaceMultiple1);
+        TEST_CASE(polyspaceMultiple2);
+        TEST_CASE(polyspaceMultiple3);
+        TEST_CASE(polyspaceRange);
+        TEST_CASE(polyspaceBlock);
+        TEST_CASE(polyspaceExtraComments);
+    }
+
+
+    void parseLine() const {
+        ASSERT_EQUALS("bad", SuppressionList::parseLine("bad").toString());
+        ASSERT_EQUALS("bad:test.c", SuppressionList::parseLine("bad:test.c").toString());
+        ASSERT_EQUALS("bad:test.c:1", SuppressionList::parseLine("bad:test.c:1").toString());
+
+        // symbol
+        ASSERT_EQUALS("bad\nsymbol=x", SuppressionList::parseLine("bad\nsymbol=x").toString());
+        ASSERT_EQUALS("bad:test.c\nsymbol=x", SuppressionList::parseLine("bad:test.c\nsymbol=x").toString());
+        ASSERT_EQUALS("bad:test.c:1\nsymbol=x", SuppressionList::parseLine("bad:test.c:1\nsymbol=x").toString());
+
+        // empty symbol
+        ASSERT_EQUALS("bad", SuppressionList::parseLine("bad\nsymbol=").toString());
+        ASSERT_EQUALS("bad:test.c", SuppressionList::parseLine("bad:test.c\nsymbol=").toString());
+        ASSERT_EQUALS("bad:test.c:1", SuppressionList::parseLine("bad:test.c:1\nsymbol=").toString());
+
+        // polyspace
+        ASSERT_EQUALS("bad\npolyspace=1", SuppressionList::parseLine("bad\npolyspace=1").toString());
+        ASSERT_EQUALS("bad:test.c\npolyspace=1", SuppressionList::parseLine("bad:test.c\npolyspace=1").toString());
+        ASSERT_EQUALS("bad:test.c:1\npolyspace=1", SuppressionList::parseLine("bad:test.c:1\npolyspace=1").toString());
+
+        // symbol + polyspace
+        ASSERT_EQUALS("bad\nsymbol=x\npolyspace=1", SuppressionList::parseLine("bad\nsymbol=x\npolyspace=1").toString());
+        ASSERT_EQUALS("bad:test.c\nsymbol=x\npolyspace=1", SuppressionList::parseLine("bad:test.c\nsymbol=x\npolyspace=1").toString());
+        ASSERT_EQUALS("bad:test.c:1\nsymbol=x\npolyspace=1", SuppressionList::parseLine("bad:test.c:1\nsymbol=x\npolyspace=1").toString());
+
+        // polyspace + symbol
+        ASSERT_EQUALS("bad\nsymbol=x\npolyspace=1", SuppressionList::parseLine("bad\npolyspace=1\nsymbol=x").toString());
+        ASSERT_EQUALS("bad:test.c\nsymbol=x\npolyspace=1", SuppressionList::parseLine("bad:test.c\npolyspace=1\nsymbol=x").toString());
+        ASSERT_EQUALS("bad:test.c:1\nsymbol=x\npolyspace=1", SuppressionList::parseLine("bad:test.c:1\npolyspace=1\nsymbol=x").toString());
+    }
+
+    void parseLineInvalid() const {
+        // missing filename
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:"), std::runtime_error, "filename is missing");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:\n"), std::runtime_error, "filename is missing");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:\n1.c"), std::runtime_error, "filename is missing");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:#1.c"), std::runtime_error, "filename is missing"); // TODO: looks like a valid filename
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id://1.c"), std::runtime_error, "filename is missing");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id::"), std::runtime_error, "filename is missing");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id::1"), std::runtime_error, "filename is missing");
+
+        // missing/invalid line
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:"), std::runtime_error, "invalid line number (converting '' to integer failed - not an integer (invalid_argument))");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:\n"), std::runtime_error, "invalid line number (converting '' to integer failed - not an integer (invalid_argument))");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:\n1"), std::runtime_error, "invalid line number (converting '' to integer failed - not an integer (invalid_argument))");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:#1"), std::runtime_error, "invalid line number (converting '' to integer failed - not an integer (invalid_argument))"); // TODO: looks like a valid filename
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c://1"), std::runtime_error, "invalid line number (converting '' to integer failed - not an integer (invalid_argument))");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:zero"), std::runtime_error, "invalid line number (converting 'zero' to integer failed - not an integer (invalid_argument))");
+
+        // invalid extras
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:1\n"), std::runtime_error, "unexpected extra ''");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:1\nsym=x"), std::runtime_error, "unexpected extra 'sym=x'");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:1\nsymbol:x"), std::runtime_error, "unexpected extra 'symbol:x'");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:1\npolyspace=0"), std::runtime_error, "unexpected extra 'polyspace=0'");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:1\npolyspace:1"), std::runtime_error, "unexpected extra 'polyspace:1'");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id\n:"), std::runtime_error, "unexpected extra ':'");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c\n:"), std::runtime_error, "unexpected extra ':'");
     }
 
     void suppressionsBadId1() const {
@@ -286,11 +376,11 @@ class TestSuppressions : public TestFixture {
         if (useFS)
             filelist.clear();
 
-        CppCheck cppCheck(settings, supprs, *this, true, nullptr);
-        SingleExecutor executor(cppCheck, filelist, fileSettings, settings, supprs, *this);
+        CppCheck cppCheck(settings, supprs, *this, nullptr, true, nullptr);
+        SingleExecutor executor(cppCheck, filelist, fileSettings, settings, supprs, *this, nullptr);
         unsigned int exitCode = executor.check();
 
-        const bool err = CppCheckExecutor::reportUnmatchedSuppressions(settings, supprs.nomsg, filelist, fileSettings, *this);
+        const bool err = CppCheckExecutorTest::reportUnmatchedSuppressions(settings, supprs.nomsg, filelist, fileSettings, *this);
         if (err && exitCode == 0)
             exitCode = 1;
 
@@ -336,10 +426,10 @@ class TestSuppressions : public TestFixture {
         if (useFS)
             filelist.clear();
 
-        ThreadExecutor executor(filelist, fileSettings, settings, supprs, *this, CppCheckExecutor::executeCommand);
+        ThreadExecutor executor(filelist, fileSettings, settings, supprs, *this, nullptr, CppCheckExecutorTest::executeCommand);
         unsigned int exitCode = executor.check();
 
-        const bool err = CppCheckExecutor::reportUnmatchedSuppressions(settings, supprs.nomsg, filelist, fileSettings, *this);
+        const bool err = CppCheckExecutorTest::reportUnmatchedSuppressions(settings, supprs.nomsg, filelist, fileSettings, *this);
         if (err && exitCode == 0)
             exitCode = 1;
 
@@ -386,10 +476,10 @@ class TestSuppressions : public TestFixture {
         if (useFS)
             filelist.clear();
 
-        ProcessExecutor executor(filelist, fileSettings, settings, supprs, *this, CppCheckExecutor::executeCommand);
+        ProcessExecutor executor(filelist, fileSettings, settings, supprs, *this, nullptr, CppCheckExecutorTest::executeCommand);
         unsigned int exitCode = executor.check();
 
-        const bool err = CppCheckExecutor::reportUnmatchedSuppressions(settings, supprs.nomsg, filelist, fileSettings, *this);
+        const bool err = CppCheckExecutorTest::reportUnmatchedSuppressions(settings, supprs.nomsg, filelist, fileSettings, *this);
         if (err && exitCode == 0)
             exitCode = 1;
 
@@ -430,7 +520,7 @@ class TestSuppressions : public TestFixture {
                                         "    a++;\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("[test.cpp:2:0]: (error) File suppression should be at the top of the file [invalidSuppression]\n"
+        ASSERT_EQUALS("[test.cpp:2:5]: (error) File suppression should be at the top of the file [invalidSuppression]\n"
                       "[test.cpp:4:5]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         ASSERT_EQUALS(1, (this->*check)("void f() {\n"
@@ -439,7 +529,7 @@ class TestSuppressions : public TestFixture {
                                         "}\n"
                                         "// cppcheck-suppress-file uninitvar\n",
                                         ""));
-        ASSERT_EQUALS("[test.cpp:5:0]: (error) File suppression should be at the top of the file [invalidSuppression]\n"
+        ASSERT_EQUALS("[test.cpp:5:1]: (error) File suppression should be at the top of the file [invalidSuppression]\n"
                       "[test.cpp:3:5]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         ASSERT_EQUALS(0, (this->*check)("// cppcheck-suppress-file uninitvar\n"
@@ -491,7 +581,7 @@ class TestSuppressions : public TestFixture {
                                         "    b++;\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("[test.cpp:1:0]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:1:1]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
 
         // suppress uninitvar for this file only
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -507,7 +597,7 @@ class TestSuppressions : public TestFixture {
                                         "    b++;\n"
                                         "}\n",
                                         "uninitvar:test.cpp"));
-        ASSERT_EQUALS("[test.cpp]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:0:0]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
 
         // suppress all for this file only
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -523,7 +613,7 @@ class TestSuppressions : public TestFixture {
                                         "    b++;\n"
                                         "}\n",
                                         "*:test.cpp"));
-        ASSERT_EQUALS("[test.cpp]: (information) Unmatched suppression: * [unmatchedSuppression]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:0:0]: (information) Unmatched suppression: * [unmatchedSuppression]\n", errout_str());
 
         // suppress uninitvar for this file and line
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -658,7 +748,7 @@ class TestSuppressions : public TestFixture {
                                         "    int a;\n"
                                         "    // cppcheck-suppress uninitvar\n"
                                         "    a++;\n"
-                                        "}",
+                                        "}\n",
                                         ""));
         ASSERT_EQUALS("", errout_str());
 
@@ -669,7 +759,7 @@ class TestSuppressions : public TestFixture {
                                         "    b++;\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("[test.cpp:4:0]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
 
         // suppress block inline checks
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -691,7 +781,7 @@ class TestSuppressions : public TestFixture {
                                         "    b++;\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("[test.cpp:2:0]: (error) Suppress Begin: No matching end [invalidSuppression]\n"
+        ASSERT_EQUALS("[test.cpp:2:5]: (error) Suppress Begin: No matching end [invalidSuppression]\n"
                       "[test.cpp:4:5]: (error) Uninitialized variable: a [uninitvar]\n"
                       "[test.cpp:6:5]: (error) Uninitialized variable: b [uninitvar]\n", errout_str());
 
@@ -703,7 +793,7 @@ class TestSuppressions : public TestFixture {
                                         "    // cppcheck-suppress-end uninitvar\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("[test.cpp:6:0]: (error) Suppress End: No matching begin [invalidSuppression]\n"
+        ASSERT_EQUALS("[test.cpp:6:5]: (error) Suppress End: No matching begin [invalidSuppression]\n"
                       "[test.cpp:3:5]: (error) Uninitialized variable: a [uninitvar]\n"
                       "[test.cpp:5:5]: (error) Uninitialized variable: b [uninitvar]\n", errout_str());
 
@@ -714,11 +804,11 @@ class TestSuppressions : public TestFixture {
                                         "void f() {}\n"
                                         "// cppcheck-suppress-end-unknown id4\n",
                                         ""));
-        ASSERT_EQUALS("[test.cpp:1:0]: (error) unknown suppression type 'cppcheck-suppress:' [invalidSuppression]\n"
-                      "[test.cpp:2:0]: (error) unknown suppression type 'cppcheck-suppress-unknown' [invalidSuppression]\n"
-                      "[test.cpp:3:0]: (error) unknown suppression type 'cppcheck-suppress-begin-unknown' [invalidSuppression]\n"
-                      "[test.cpp:6:0]: (error) unknown suppression type 'cppcheck-suppress-end-unknown' [invalidSuppression]\n"
-                      "[test.cpp:4:0]: (error) Suppress Begin: No matching end [invalidSuppression]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:1:1]: (error) unknown suppression type 'cppcheck-suppress:' [invalidSuppression]\n"
+                      "[test.cpp:2:1]: (error) unknown suppression type 'cppcheck-suppress-unknown' [invalidSuppression]\n"
+                      "[test.cpp:3:1]: (error) unknown suppression type 'cppcheck-suppress-begin-unknown' [invalidSuppression]\n"
+                      "[test.cpp:6:1]: (error) unknown suppression type 'cppcheck-suppress-end-unknown' [invalidSuppression]\n"
+                      "[test.cpp:4:1]: (error) Suppress Begin: No matching end [invalidSuppression]\n", errout_str());
 
         ASSERT_EQUALS(1, (this->*check)("// cppcheck-suppress-file\n"
                                         "// cppcheck-suppress\n"
@@ -731,14 +821,14 @@ class TestSuppressions : public TestFixture {
                                         "void f() {}\n"
                                         "// cppcheck-suppress-end\n",
                                         ""));
-        ASSERT_EQUALS("[test.cpp:1:0]: (error) suppression without error ID [invalidSuppression]\n"
-                      "[test.cpp:2:0]: (error) suppression without error ID [invalidSuppression]\n"
-                      "[test.cpp:3:0]: (error) suppression without error ID [invalidSuppression]\n"
-                      "[test.cpp:4:0]: (error) suppression without error ID [invalidSuppression]\n"
-                      "[test.cpp:6:0]: (error) suppression without error ID [invalidSuppression]\n"
-                      "[test.cpp:7:0]: (error) suppression without error ID [invalidSuppression]\n"
-                      "[test.cpp:10:0]: (error) suppression without error ID [invalidSuppression]\n"
-                      "[test.cpp:8:0]: (error) Suppress Begin: No matching end [invalidSuppression]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:1:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:2:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:3:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:4:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:6:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:7:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:10:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:8:1]: (error) Suppress Begin: No matching end [invalidSuppression]\n", errout_str());
 
         ASSERT_EQUALS(1, (this->*check)("// cppcheck-suppress:\n"
                                         "// cppcheck-suppress-unknown\n"
@@ -748,11 +838,11 @@ class TestSuppressions : public TestFixture {
                                         "// cppcheck-suppress-end-unknown\n",
                                         ""));
         // TODO: actually these are all invalid types
-        ASSERT_EQUALS("[test.cpp:1:0]: (error) suppression without error ID [invalidSuppression]\n"
-                      "[test.cpp:2:0]: (error) suppression without error ID [invalidSuppression]\n"
-                      "[test.cpp:3:0]: (error) suppression without error ID [invalidSuppression]\n"
-                      "[test.cpp:4:0]: (error) suppression without error ID [invalidSuppression]\n"
-                      "[test.cpp:6:0]: (error) suppression without error ID [invalidSuppression]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:1:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:2:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:3:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:4:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:6:1]: (error) suppression without error ID [invalidSuppression]\n", errout_str());
 
         ASSERT_EQUALS(1, (this->*check)("void f() {\n"
                                         "    int a;\n"
@@ -852,7 +942,7 @@ class TestSuppressions : public TestFixture {
                                         "    // cppcheck-suppress-end [uninitvar, syntaxError]\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("[test.cpp:2:0]: (information) Unmatched suppression: syntaxError [unmatchedSuppression]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (information) Unmatched suppression: syntaxError [unmatchedSuppression]\n", errout_str());
 
         ASSERT_EQUALS(1, (this->*check)("// cppcheck-suppress-begin [uninitvar, syntaxError]\n"
                                         "void f() {\n"
@@ -867,7 +957,7 @@ class TestSuppressions : public TestFixture {
                                         "}\n"
                                         "// cppcheck-suppress-end [uninitvar, syntaxError]\n",
                                         ""));
-        ASSERT_EQUALS("[test.cpp:1:0]: (information) Unmatched suppression: syntaxError [unmatchedSuppression]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:1:1]: (information) Unmatched suppression: syntaxError [unmatchedSuppression]\n", errout_str());
 
         ASSERT_EQUALS(1, (this->*check)("// cppcheck-suppress-begin [uninitvar, syntaxError]\n"
                                         "void f() {\n"
@@ -880,9 +970,9 @@ class TestSuppressions : public TestFixture {
                                         "    b++;\n"
                                         "    // cppcheck-suppress-end uninitvar\n"
                                         "}\n"
-                                        "// cppcheck-suppress-end [uninitvar, syntaxError]",
+                                        "// cppcheck-suppress-end [uninitvar, syntaxError]\n",
                                         ""));
-        ASSERT_EQUALS("[test.cpp:1:0]: (information) Unmatched suppression: syntaxError [unmatchedSuppression]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:1:1]: (information) Unmatched suppression: syntaxError [unmatchedSuppression]\n", errout_str());
 
         // test of multiple suppression types
         ASSERT_EQUALS(0, (this->*check)("// cppcheck-suppress-file uninitvar\n"
@@ -932,7 +1022,7 @@ class TestSuppressions : public TestFixture {
                                         "    a++;\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("[test.cpp:4:0]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
 
         // #5746 - exitcode
         ASSERT_EQUALS(1U,
@@ -961,7 +1051,7 @@ class TestSuppressions : public TestFixture {
                        "#define DIV(A,B) A/B\n"
                        "a = DIV(10,1);\n",
                        "");
-        ASSERT_EQUALS("[test.cpp:2:0]: (information) Unmatched suppression: abc [unmatchedSuppression]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:1]: (information) Unmatched suppression: abc [unmatchedSuppression]\n", errout_str());
     }
 
     void suppressionsSettingsFiles() {
@@ -1035,38 +1125,45 @@ class TestSuppressions : public TestFixture {
         SuppressionList suppressions1;
         ASSERT_EQUALS("", suppressions1.parseFile(file1));
         ASSERT_EQUALS(true, suppressions1.isSuppressed(errorMessage("abc", "test.cpp", 123)));
+        ASSERT_EQUALS("", suppressions1.getSuppressions().cbegin()->extraComment);
 
         std::istringstream file2("// comment\n"
                                  "abc");
         SuppressionList suppressions2;
         ASSERT_EQUALS("", suppressions2.parseFile(file2));
         ASSERT_EQUALS(true, suppressions2.isSuppressed(errorMessage("abc", "test.cpp", 123)));
+        ASSERT_EQUALS("", suppressions2.getSuppressions().cbegin()->extraComment);
 
         std::istringstream file3("abc // comment");
         SuppressionList suppressions3;
         ASSERT_EQUALS("", suppressions3.parseFile(file3));
         ASSERT_EQUALS(true, suppressions3.isSuppressed(errorMessage("abc", "test.cpp", 123)));
+        ASSERT_EQUALS("comment", suppressions3.getSuppressions().cbegin()->extraComment);
 
         std::istringstream file4("abc\t\t # comment");
         SuppressionList suppressions4;
         ASSERT_EQUALS("", suppressions4.parseFile(file4));
         ASSERT_EQUALS(true, suppressions4.isSuppressed(errorMessage("abc", "test.cpp", 123)));
+        ASSERT_EQUALS("comment", suppressions4.getSuppressions().cbegin()->extraComment);
 
         std::istringstream file5("abc:test.cpp\t\t # comment");
         SuppressionList suppressions5;
         ASSERT_EQUALS("", suppressions5.parseFile(file5));
         ASSERT_EQUALS(true, suppressions5.isSuppressed(errorMessage("abc", "test.cpp", 123)));
+        ASSERT_EQUALS("comment", suppressions5.getSuppressions().cbegin()->extraComment);
 
         std::istringstream file6("abc:test.cpp:123\t\t # comment with . inside");
         SuppressionList suppressions6;
         ASSERT_EQUALS("", suppressions6.parseFile(file6));
         ASSERT_EQUALS(true, suppressions6.isSuppressed(errorMessage("abc", "test.cpp", 123)));
+        ASSERT_EQUALS("comment with . inside", suppressions6.getSuppressions().cbegin()->extraComment);
 
         std::istringstream file7(" // comment\n" // #11450
                                  "abc");
         SuppressionList suppressions7;
         ASSERT_EQUALS("", suppressions7.parseFile(file7));
         ASSERT_EQUALS(true, suppressions7.isSuppressed(errorMessage("abc", "test.cpp", 123)));
+        ASSERT_EQUALS("", suppressions7.getSuppressions().cbegin()->extraComment);
     }
 
     void inlinesuppress() const {
@@ -1151,14 +1248,37 @@ class TestSuppressions : public TestFixture {
     }
 
     void inlinesuppress_comment() const {
-        SuppressionList::Suppression s;
         std::string errMsg;
-        ASSERT_EQUALS(true, s.parseComment("// cppcheck-suppress abc ; some comment", &errMsg));
-        ASSERT_EQUALS("", errMsg);
-        ASSERT_EQUALS(true, s.parseComment("// cppcheck-suppress abc // some comment", &errMsg));
-        ASSERT_EQUALS("", errMsg);
-        ASSERT_EQUALS(true, s.parseComment("// cppcheck-suppress abc -- some comment", &errMsg));
-        ASSERT_EQUALS("", errMsg);
+        {
+            SuppressionList::Suppression s;
+            ASSERT_EQUALS(true, s.parseComment("// cppcheck-suppress abc ; some comment // extra stuff", &errMsg));
+            ASSERT_EQUALS("", errMsg);
+            ASSERT_EQUALS("some comment // extra stuff", s.extraComment);
+        }
+        {
+            SuppressionList::Suppression s;
+            ASSERT_EQUALS(true, s.parseComment("// cppcheck-suppress abc; some comment // extra stuff", &errMsg));
+            ASSERT_EQUALS("", errMsg);
+            ASSERT_EQUALS("some comment // extra stuff", s.extraComment);
+        }
+        {
+            SuppressionList::Suppression s;
+            ASSERT_EQUALS(true, s.parseComment("// cppcheck-suppress abc // some comment ; extra stuff", &errMsg));
+            ASSERT_EQUALS("", errMsg);
+            ASSERT_EQUALS("some comment ; extra stuff", s.extraComment);
+        }
+        {
+            SuppressionList::Suppression s;
+            ASSERT_EQUALS(true, s.parseComment("// cppcheck-suppress abc// some comment ; extra stuff", &errMsg));
+            ASSERT_EQUALS("", errMsg);
+            ASSERT_EQUALS("some comment ; extra stuff", s.extraComment);
+        }
+        {
+            SuppressionList::Suppression s;
+            ASSERT_EQUALS(true, s.parseComment("// cppcheck-suppress abc -- some comment", &errMsg));
+            ASSERT_EQUALS("", errMsg);
+            ASSERT_EQUALS("", s.extraComment);
+        }
     }
 
     // TODO: tests internal function - should it be private?
@@ -1299,6 +1419,48 @@ class TestSuppressions : public TestFixture {
         suppressions=SuppressionList::parseMultiSuppressComment("/*cppcheck-suppress[errorId1, errorId2 symbolName=arr]*/", &errMsg);
         ASSERT_EQUALS(2, suppressions.size());
         ASSERT_EQUALS(true, errMsg.empty());
+
+        errMsg = "";
+        suppressions=SuppressionList::parseMultiSuppressComment("//cppcheck-suppress[errorId1, errorId2 symbolName=arr] ; extra comment", &errMsg);
+        ASSERT_EQUALS(2, suppressions.size());
+        ASSERT_EQUALS(true, errMsg.empty());
+        ASSERT_EQUALS("extra comment", suppressions[0].extraComment);
+        ASSERT_EQUALS("extra comment", suppressions[1].extraComment);
+
+        errMsg = "";
+        suppressions=SuppressionList::parseMultiSuppressComment("//cppcheck-suppress[errorId1, errorId2 symbolName=arr] // extra comment", &errMsg);
+        ASSERT_EQUALS(2, suppressions.size());
+        ASSERT_EQUALS(true, errMsg.empty());
+        ASSERT_EQUALS("extra comment", suppressions[0].extraComment);
+        ASSERT_EQUALS("extra comment", suppressions[1].extraComment);
+
+        errMsg = "";
+        suppressions=SuppressionList::parseMultiSuppressComment("/*cppcheck-suppress[errorId1, errorId2 symbolName=arr] ; extra comment */", &errMsg);
+        ASSERT_EQUALS(2, suppressions.size());
+        ASSERT_EQUALS(true, errMsg.empty());
+        ASSERT_EQUALS("extra comment", suppressions[0].extraComment);
+        ASSERT_EQUALS("extra comment", suppressions[1].extraComment);
+
+        errMsg = "";
+        suppressions=SuppressionList::parseMultiSuppressComment("/*cppcheck-suppress[errorId1, errorId2 symbolName=arr] // extra comment */", &errMsg);
+        ASSERT_EQUALS(2, suppressions.size());
+        ASSERT_EQUALS(true, errMsg.empty());
+        ASSERT_EQUALS("extra comment", suppressions[0].extraComment);
+        ASSERT_EQUALS("extra comment", suppressions[1].extraComment);
+
+        errMsg = "";
+        suppressions=SuppressionList::parseMultiSuppressComment("/*cppcheck-suppress[errorId1, errorId2 symbolName=arr] ; extra comment // more */", &errMsg);
+        ASSERT_EQUALS(2, suppressions.size());
+        ASSERT_EQUALS(true, errMsg.empty());
+        ASSERT_EQUALS("extra comment // more", suppressions[0].extraComment);
+        ASSERT_EQUALS("extra comment // more", suppressions[1].extraComment);
+
+        errMsg = "";
+        suppressions=SuppressionList::parseMultiSuppressComment("/*cppcheck-suppress[errorId1, errorId2 symbolName=arr] // extra comment ; more */", &errMsg);
+        ASSERT_EQUALS(2, suppressions.size());
+        ASSERT_EQUALS(true, errMsg.empty());
+        ASSERT_EQUALS("extra comment ; more", suppressions[0].extraComment);
+        ASSERT_EQUALS("extra comment ; more", suppressions[1].extraComment);
     }
 
     void globalSuppressions() { // Testing that Cppcheck::useGlobalSuppressions works (#8515)
@@ -1310,10 +1472,10 @@ class TestSuppressions : public TestFixture {
         Suppressions supprs;
         ASSERT_EQUALS("", supprs.nomsg.addSuppressionLine("uninitvar"));
 
-        CppCheck cppCheck(settings, supprs, *this, false, nullptr); // <- do not "use global suppressions". pretend this is a thread that just checks a file.
+        CppCheck cppCheck(settings, supprs, *this, nullptr, false, nullptr); // <- do not "use global suppressions". pretend this is a thread that just checks a file.
 
-        const char code[] = "int f() { int a; return a; }";
-        ASSERT_EQUALS(0, cppCheck.checkBuffer(FileWithDetails("test.c", Standards::Language::C, 0),code, sizeof(code))); // <- no unsuppressed error is seen
+        const char code[] = "int f() { int a; return a; }\n";
+        ASSERT_EQUALS(0, cppCheck.checkBuffer(FileWithDetails("test.c", Standards::Language::C, 0),code, sizeof(code)-1)); // <- no unsuppressed error is seen
         ASSERT_EQUALS("[test.c:1:25]: (error) Uninitialized variable: a [uninitvar]\n", errout_str()); // <- report error so ThreadExecutor can suppress it and make sure the global suppression is matched.
     }
 
@@ -1351,9 +1513,9 @@ class TestSuppressions : public TestFixture {
             "    int x;\n"
             "    // cppcheck-suppress unusedStructMember\n"
             "    int y;\n"
-            "};";
-        CppCheck cppCheck(settings, supprs, *this, true, nullptr);
-        ASSERT_EQUALS(0, cppCheck.checkBuffer(FileWithDetails("/somewhere/test.cpp", Standards::Language::CPP, 0), code, sizeof(code)));
+            "};\n";
+        CppCheck cppCheck(settings, supprs, *this, nullptr, true, nullptr);
+        ASSERT_EQUALS(0, cppCheck.checkBuffer(FileWithDetails("/somewhere/test.cpp", Standards::Language::CPP, 0), code, sizeof(code)-1));
         ASSERT_EQUALS("",errout_str());
     }
 
@@ -1382,7 +1544,7 @@ class TestSuppressions : public TestFixture {
                             "   fld   TBYTE PTR [EAX]   ; load an extended real (10 bytes)\n"
                             "   fstp  QWORD PTR result  ; store a double (8 bytes)\n"
                             "   pop   EAX               ; restore EAX\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS(0, (this->*check)(code, ""));
         ASSERT_EQUALS("", errout_str());
     }
@@ -1448,7 +1610,7 @@ class TestSuppressions : public TestFixture {
     }
 
     void unusedFunctionInternal(unsigned int (TestSuppressions::*check)(const char[], const std::string &)) {
-        ASSERT_EQUALS(0, (this->*check)("void f() {}", "unusedFunction"));
+        ASSERT_EQUALS(0, (this->*check)("void f() {}\n", "unusedFunction"));
     }
 
     void unusedFunctionFiles() {
@@ -1460,7 +1622,7 @@ class TestSuppressions : public TestFixture {
     }
 
     void suppressingSyntaxErrorAndExitCodeInternal(unsigned int (TestSuppressions::*check)(const char[], const std::string &)) {
-        const char code[] = "fi if;";
+        const char code[] = "fi if;\n";
 
         ASSERT_EQUALS(0, (this->*check)(code, "*:test.cpp"));
         ASSERT_EQUALS("", errout_str());
@@ -1493,8 +1655,8 @@ class TestSuppressions : public TestFixture {
     void suppressingSyntaxErrorAndExitCodeMultiFileInternal(unsigned int (TestSuppressions::*check)(std::map<std::string, std::string> &f, const std::string &)) {
         // multi files, but only suppression one
         std::map<std::string, std::string> mfiles;
-        mfiles["test.cpp"] = "fi if;";
-        mfiles["test2.cpp"] = "fi if";
+        mfiles["test.cpp"] = "fi if;\n";
+        mfiles["test2.cpp"] = "fi if\n";
         ASSERT_EQUALS(1, (this->*check)(mfiles, "*:test.cpp"));
         ASSERT_EQUALS("[test2.cpp:1:4]: (error) syntax error [syntaxError]\n", errout_str());
     }
@@ -1535,7 +1697,7 @@ class TestSuppressions : public TestFixture {
         // No unmatched suppression
         {
             SuppressionList suppressions;
-            ASSERT_EQUALS(false, CppCheckExecutor::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS(false, CppCheckExecutorTest::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -1544,7 +1706,7 @@ class TestSuppressions : public TestFixture {
             SuppressionList suppressions;
             addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
             addCheckedSuppression(suppressions, {"unmatchedSuppression", "*", SuppressionList::Suppression::NO_LINE});
-            ASSERT_EQUALS(false, CppCheckExecutor::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS(false, CppCheckExecutorTest::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -1553,7 +1715,7 @@ class TestSuppressions : public TestFixture {
             SuppressionList suppressions;
             addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
             addCheckedSuppression(suppressions, {"unmatchedSuppression", "", SuppressionList::Suppression::NO_LINE});
-            ASSERT_EQUALS(false, CppCheckExecutor::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS(false, CppCheckExecutorTest::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -1562,7 +1724,7 @@ class TestSuppressions : public TestFixture {
             SuppressionList suppressions;
             addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
             addCheckedSuppression(suppressions, {"unmatchedSuppression", "a.c", SuppressionList::Suppression::NO_LINE});
-            ASSERT_EQUALS(false, CppCheckExecutor::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS(false, CppCheckExecutorTest::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -1571,7 +1733,7 @@ class TestSuppressions : public TestFixture {
             SuppressionList suppressions;
             addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
             addCheckedSuppression(suppressions, {"unmatchedSuppression", "a.c", 10U});
-            ASSERT_EQUALS(false, CppCheckExecutor::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS(false, CppCheckExecutorTest::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -1580,7 +1742,7 @@ class TestSuppressions : public TestFixture {
             SuppressionList suppressions;
             addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
             addCheckedSuppression(suppressions, {"unmatchedSuppression", "b.c", SuppressionList::Suppression::NO_LINE});
-            ASSERT_EQUALS(true, CppCheckExecutor::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS(true, CppCheckExecutorTest::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
             ASSERT_EQUALS("[a.c:10:0]: (information) Unmatched suppression: abc [unmatchedSuppression]\n", errout_str());
         }
 
@@ -1589,7 +1751,7 @@ class TestSuppressions : public TestFixture {
             SuppressionList suppressions;
             addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
             addCheckedSuppression(suppressions, {"unmatchedSuppression", "a.c", 1U});
-            ASSERT_EQUALS(true, CppCheckExecutor::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS(true, CppCheckExecutorTest::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
             ASSERT_EQUALS("[a.c:10:0]: (information) Unmatched suppression: abc [unmatchedSuppression]\n", errout_str());
         }
     }
@@ -1617,6 +1779,25 @@ class TestSuppressions : public TestFixture {
             ASSERT_EQUALS("sym", suppr.symbolName);
         }
 
+        {
+            ScopedFile file("suppressparsexml.xml",
+                            "<suppressions>\n"
+                            "<suppress>\n"
+                            "<id>uninitvar</id>\n"
+                            "<macroName>MACRO_NAME</macroName>\n"
+                            "</suppress>\n"
+                            "</suppressions>");
+
+            SuppressionList supprList;
+            ASSERT_EQUALS("", supprList.parseXmlFile(file.path().c_str()));
+            const auto& supprs = supprList.getSuppressions();
+            ASSERT_EQUALS(1, supprs.size());
+            const auto& suppr = *supprs.cbegin();
+            ASSERT_EQUALS("uninitvar", suppr.errorId);
+            ASSERT_EQUALS("MACRO_NAME", suppr.macroName);
+            ASSERT_EQUALS_ENUM(SuppressionList::Type::macro, suppr.type);
+        }
+
         // no file specified
         {
             SuppressionList supprList;
@@ -1670,6 +1851,67 @@ class TestSuppressions : public TestFixture {
         }
     }
 
+    #define testXmlSuppressions(...) testXmlSuppressions_(__FILE__,__LINE__,__VA_ARGS__)
+    void testXmlSuppressions_(const char *thisfile,
+                              int thisline,
+                              const std::string &xml,
+                              const std::string &code,
+                              const std::string &expected)
+    {
+        const char *xmlpath = "testsupressions.xml";
+        const char *sourcepath = "test.c";
+
+        Suppressions supprs;
+        const ScopedFile xmlfile(xmlpath, xml);
+        ASSERT_EQUALS_LOC("", supprs.nomsg.parseXmlFile(xmlpath), thisfile, thisline);
+
+        Settings settings;
+        settings.templateFormat = templateFormat;
+        settings.quiet = true;
+
+        const FileWithDetails sourcefile(sourcepath, Standards::Language::C, 0);
+        CppCheck instance(settings, supprs, *this, nullptr, true, nullptr);
+        instance.checkBuffer(sourcefile, code.c_str(), code.size());
+
+        ASSERT_EQUALS_LOC(expected, errout_str(), thisfile, thisline);
+    }
+
+    void xmlMacroSuppressions()
+    {
+        testXmlSuppressions(
+            "<suppressions>\n"
+            "<suppress>\n"
+            "<id>uninitvar</id>\n"
+            "<macroName>VAR</macroName>\n"
+            "</suppress>\n"
+            "</suppressions>",
+
+            "#define VAR x\n"
+            "int f(void) {\n"
+            "    int VAR;\n"
+            "    return VAR;\n"
+            "}\n",
+
+            ""
+            );
+        testXmlSuppressions(
+            "<suppressions>\n"
+            "<suppress>\n"
+            "<id>uninitvar</id>\n"
+            "<macroName>WRONG</macroName>\n"
+            "</suppress>\n"
+            "</suppressions>",
+
+            "#define VAR x\n"
+            "int f(void) {\n"
+            "    int VAR;\n"
+            "    return VAR;\n"
+            "}\n",
+
+            "[test.c:4:12]: (error) Uninitialized variable: x [uninitvar]\n"
+            );
+    }
+
     void addSuppressionDuplicate() const {
         SuppressionList supprs;
 
@@ -1718,6 +1960,36 @@ class TestSuppressions : public TestFixture {
         }
     }
 
+    void hashSuppression() const {
+        SuppressionList supprs;
+        SuppressionList::Suppression s;
+        s.errorId = "id";
+        s.hash = 1;
+        ASSERT_EQUALS("", supprs.addSuppression(s));
+        ASSERT_EQUALS("suppression 'id' already exists", supprs.addSuppression(s));
+        ASSERT_EQUALS(true, supprs.updateSuppressionState(s));
+        s.hash = 2;
+        ASSERT_EQUALS(false, supprs.updateSuppressionState(s));
+        // same hash, different id
+        s.errorId = "id2";
+        s.hash = 1;
+        ASSERT_EQUALS("", supprs.addSuppression(s));
+        ASSERT_EQUALS(true, supprs.updateSuppressionState(s));
+
+        SuppressionList::ErrorMessage error = errorMessage("id");
+        error.hash = 1;
+        ASSERT_EQUALS(true, supprs.isSuppressed(error));
+        error.hash = 2;
+        ASSERT_EQUALS(false, supprs.isSuppressed(error));
+        error.hash = 0;
+        ASSERT_EQUALS(false, supprs.isSuppressed(error));
+        error.hash = 1;
+        error.errorId = "id2";
+        ASSERT_EQUALS(true, supprs.isSuppressed(error));
+        error.errorId = "id3";
+        ASSERT_EQUALS(false, supprs.isSuppressed(error));
+    }
+
     void addSuppressionLineMultiple() const {
         SuppressionList supprlist;
 
@@ -1787,7 +2059,7 @@ class TestSuppressions : public TestFixture {
             SuppressionList::Suppression s;
             s.errorId = "unitvar";
             s.symbolName = "sym";
-            ASSERT_EQUALS("unitvar:sym", s.toString());
+            ASSERT_EQUALS("unitvar\nsymbol=sym", s.toString());
         }
     }
 
@@ -1896,6 +2168,261 @@ class TestSuppressions : public TestFixture {
             ASSERT(!suppressions.getUnmatchedGlobalSuppressions().empty());
         }
     }
+
+    static std::string polyspaceParseIdsResults(const std::string& comment, std::string::size_type pos) {
+        std::string ret;
+        for (const auto& fr: polyspace::Parser::parseFamilyRules(comment,pos)) {
+            if (!fr.second.empty())
+                ret += ',' + fr.first + ':' + fr.second;
+        }
+        return ret.empty() ? ret : ret.substr(1);
+    }
+
+    void polyspaceParseRange() const {
+        std::string::size_type pos;
+
+        // Happy case
+        pos = 0;
+        ASSERT_EQUALS(12, polyspace::Parser::parseRange(" +12 ",pos));
+        ASSERT_EQUALS(4U, pos);
+
+        // Invalid range => pos will point at the token
+        pos = 0;
+        ASSERT_EQUALS(0, polyspace::Parser::parseRange(" ",pos));
+        ASSERT_EQUALS(std::string::npos, pos);
+
+        pos = 0;
+        ASSERT_EQUALS(0, polyspace::Parser::parseRange(" test ",pos));
+        ASSERT_EQUALS(1U, pos);
+
+        pos = 0;
+        ASSERT_EQUALS(0, polyspace::Parser::parseRange(" +",pos));
+        ASSERT_EQUALS(1U, pos);
+
+        pos = 0;
+        ASSERT_EQUALS(0, polyspace::Parser::parseRange(" +12",pos));
+        ASSERT_EQUALS(1U, pos);
+
+        pos = 0;
+        ASSERT_EQUALS(0, polyspace::Parser::parseRange(" +A ",pos));
+        ASSERT_EQUALS(1U, pos);
+    }
+
+    void polyspaceParseIds() const {
+        ASSERT_EQUALS("test:12", polyspaceParseIdsResults("abc test:12",3));
+        ASSERT_EQUALS("test:12", polyspaceParseIdsResults("abc test:12 [12]",3));
+        ASSERT_EQUALS("test:12", polyspaceParseIdsResults("abc test:12 */",3));
+        ASSERT_EQUALS("test:1*", polyspaceParseIdsResults("abc test:1* */",3));
+        ASSERT_EQUALS("test:*", polyspaceParseIdsResults("// abc test:*",6));
+        // -_.
+        ASSERT_EQUALS("test:1-2.3", polyspaceParseIdsResults("abc test:1-2.3",3));
+        ASSERT_EQUALS("t-e_s.t:12", polyspaceParseIdsResults("abc t-e_s.t : 12",3));
+        // multiple ids
+        ASSERT_EQUALS("d:1,d:2", polyspaceParseIdsResults("abc d:1,2",3));
+        ASSERT_EQUALS("d:1,d:2,e:3,e:4,f:6", polyspaceParseIdsResults("abc d:1,2 e: 3 , 4 f : 6 ",3));
+    }
+
+    struct PolyspaceComment {
+        std::string text;
+        int line;
+
+        PolyspaceComment(const std::string &&text, int line)
+            : text(text)
+            , line(line)
+        {}
+    };
+
+    struct PolyspaceParseResult {
+        std::string errorId;
+        int lineNumber;
+        std::string extraComment;
+        SuppressionList::Type type = SuppressionList::Type::unique;
+        int lineBegin = SuppressionList::Suppression::NO_LINE;
+        int lineEnd = SuppressionList::Suppression::NO_LINE;
+
+        PolyspaceParseResult(const std::string &&errorId,
+                             int lineNumber,
+                             const std::string &&extraComment = "",
+                             SuppressionList::Type type = SuppressionList::Type::unique,
+                             int lineBegin = SuppressionList::Suppression::NO_LINE,
+                             int lineEnd = SuppressionList::Suppression::NO_LINE)
+            : errorId(errorId)
+            , lineNumber(lineNumber)
+            , extraComment(extraComment)
+            , type(type)
+            , lineBegin(lineBegin)
+            , lineEnd(lineEnd)
+        {}
+    };
+
+    void testPolyspaceSuppression(const std::string& addon,
+                                  const std::string& premiumArgs,
+                                  const PolyspaceComment& comment,
+                                  std::initializer_list<PolyspaceParseResult> results) const
+    {
+        SuppressionList list;
+        Settings settings;
+        if (!addon.empty()) {
+            AddonInfo info;
+            info.name = addon;
+            settings.addonInfos.push_back(info);
+        }
+        settings.premiumArgs = premiumArgs;
+        polyspace::Parser parser(settings);
+
+        const std::string fileName = "file.c";
+        const auto supprs = parser.parse(comment.text, comment.line, fileName);
+
+        ASSERT_EQUALS(results.size(), supprs.size());
+
+        auto supprIt = supprs.cbegin();
+        const auto *resultIt = results.begin();
+
+        for (; supprIt != supprs.cend(); supprIt++, resultIt++) {
+            ASSERT(supprIt->isPolyspace);
+            ASSERT(supprIt->isInline);
+            ASSERT_EQUALS(fileName, supprIt->fileName);
+            ASSERT_EQUALS(resultIt->errorId, supprIt->errorId);
+            ASSERT_EQUALS(resultIt->extraComment, supprIt->extraComment);
+            ASSERT_EQUALS_ENUM(resultIt->type, supprIt->type);
+            ASSERT_EQUALS(resultIt->lineNumber, supprIt->lineNumber);
+            ASSERT_EQUALS(resultIt->lineBegin, supprIt->lineBegin);
+            ASSERT_EQUALS(resultIt->lineEnd, supprIt->lineEnd);
+        }
+    }
+
+    void polyspaceMisraC2012() const {
+        testPolyspaceSuppression(
+            "misra", "",
+            { "/* polyspace MISRA2012 : 2.7 */", 1 },
+            { { "misra-c2012-2.7", 1 } }
+            );
+    }
+
+    void polyspacePremiumMisraC2012() const {
+        testPolyspaceSuppression(
+            "", "--misra-c-2012",
+            { "/* polyspace MISRA2012 : 2.7 */", 1 },
+            { { "premium-misra-c-2012-2.7", 1 } }
+            );
+    }
+
+    void polyspaceMisraC2023() const {
+        testPolyspaceSuppression(
+            "", "--misra-c-2023",
+            { "// polyspace MISRA-C-2023 : *", 2 },
+            { { "premium-misra-c-2023-*", 2 } }
+            );
+    }
+
+    void polyspaceMisraCpp2008() const {
+        testPolyspaceSuppression(
+            "", "--misra-cpp-2008",
+            { "// polyspace MISRA-CPP : 7-1-1", 1 },
+            { { "premium-misra-cpp-2008-7-1-1", 1 } }
+            );
+    }
+
+    void polyspaceMisraCpp2023() const {
+        testPolyspaceSuppression(
+            "", "--misra-cpp-2023",
+            { "// polyspace MISRA-CPP-2023 : 4.6.1", 1 },
+            { { "premium-misra-cpp-2023-4.6.1", 1 } }
+            );
+    }
+
+    void polyspaceCertC() const {
+        testPolyspaceSuppression(
+            "", "--cert-c",
+            { "// polyspace CERT-C : PRE30", 1 },
+            { { "premium-cert-c-PRE30", 1 } }
+            );
+    }
+
+    void polyspaceCertCpp() const {
+        testPolyspaceSuppression(
+            "", "--cert-cpp",
+            { "// polyspace CERT-CPP : CTR51", 1 },
+            { { "premium-cert-cpp-CTR51", 1 } }
+            );
+    }
+
+    void polyspaceAutosar() const {
+        testPolyspaceSuppression(
+            "", "--autosar",
+            { "// polyspace AUTOSAR-CPP14 : a2-10-1", 1 },
+            { { "premium-autosar-a2-10-1", 1 } }
+            );
+    }
+
+    void polyspaceIgnored() const {
+        testPolyspaceSuppression(
+            "", "",
+            { "// polyspace DEFECT : INT_OVFL AUTOSAR-CPP14 : a2-10-1", 1 },
+            {}
+            );
+    }
+
+    void polyspaceMultiple1() const {
+        testPolyspaceSuppression(
+            "", "--misra-c-2012",
+            { "/* polyspace MISRA2012 : 2.7, 9.1 */", 1 },
+            { { "premium-misra-c-2012-2.7", 1 },
+                { "premium-misra-c-2012-9.1", 1 } }
+            );
+    }
+
+    void polyspaceMultiple2() const {
+        testPolyspaceSuppression(
+            "", "--misra-c-2012 --misra-cpp-2008",
+            { "/* polyspace MISRA2012 : 2.7 MISRA-CPP : 7-1-1 */", 1 },
+            { { "premium-misra-c-2012-2.7", 1 },
+                { "premium-misra-cpp-2008-7-1-1", 1 } }
+            );
+    }
+
+    void polyspaceMultiple3() const {
+        testPolyspaceSuppression(
+            "", "--misra-c-2012 --misra-cpp-2008",
+            { "/* polyspace MISRA2012 : 2.7 [Justified:Low] \"comment 1\" polyspace MISRA-CPP : 7-1-1 \"comment 2\"*/", 1 },
+            { { "premium-misra-c-2012-2.7", 1, "comment 1" },
+                { "premium-misra-cpp-2008-7-1-1", 1, "comment 2" }, }
+            );
+    }
+
+    void polyspaceRange() const {
+        testPolyspaceSuppression(
+            "", "--misra-c-2012",
+            { "/* polyspace +3 MISRA2012 : 2.7 */", 1 },
+            { { "premium-misra-c-2012-2.7", 1, "", SuppressionList::Type::block, 1, 4 } }
+            );
+    }
+
+    void polyspaceBlock() const {
+        testPolyspaceSuppression(
+            "", "--misra-c-2012",
+            { "/* polyspace-begin MISRA2012 : 2.7 */", 1 },
+            { { "premium-misra-c-2012-2.7", 1, "", SuppressionList::Type::blockBegin } }
+            );
+
+        testPolyspaceSuppression(
+            "", "--misra-c-2012",
+            { "/* polyspace-end MISRA2012 : 2.7 */", 1 },
+            { { "premium-misra-c-2012-2.7", 1, "", SuppressionList::Type::blockEnd } }
+            );
+
+    }
+
+    void polyspaceExtraComments() const {
+        testPolyspaceSuppression(
+            "", "--misra-c-2012 --misra-cpp-2008",
+            { "/* polyspace MISRA2012 : 2.7 MISRA-CPP : 7-1-1 \"comment 1\" polyspace MISRA2012 : 8.1, 8.3 \"comment 2\" */", 1 },
+            { { "premium-misra-c-2012-2.7", 1, "comment 1" },
+                { "premium-misra-cpp-2008-7-1-1", 1, "comment 1" },
+                { "premium-misra-c-2012-8.1", 1, "comment 2" },
+                { "premium-misra-c-2012-8.3", 1, "comment 2" }, }
+            );
+    }
 };
 
 REGISTER_TEST(TestSuppressions)
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
index b33dcdbc30a..85ee8430a77 100644
--- a/test/testsymboldatabase.cpp
+++ b/test/testsymboldatabase.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +31,6 @@
 #include <cstdint>
 #include <cstring>
 #include <iterator>
-#include <limits>
 #include <list>
 #include <set>
 #include <sstream>
@@ -205,6 +204,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(isVariableDeclarationRValueRef);
         TEST_CASE(isVariableDeclarationDoesNotIdentifyCase);
         TEST_CASE(isVariableDeclarationIf);
+        TEST_CASE(isVariableDeclarationSwitch);
         TEST_CASE(isVariableStlType);
         TEST_CASE(isVariablePointerToConstPointer);
         TEST_CASE(isVariablePointerToVolatilePointer);
@@ -221,6 +221,8 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(VariableValueType4); // smart pointer type
         TEST_CASE(VariableValueType5); // smart pointer type
         TEST_CASE(VariableValueType6); // smart pointer type
+        TEST_CASE(VariableValueType7);
+        TEST_CASE(VariableValueType8);
         TEST_CASE(VariableValueTypeReferences);
         TEST_CASE(VariableValueTypeTemplate);
 
@@ -232,6 +234,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(rangeBasedFor);
 
         TEST_CASE(memberVar1);
+        TEST_CASE(memberVar2);
         TEST_CASE(arrayMemberVar1);
         TEST_CASE(arrayMemberVar2);
         TEST_CASE(arrayMemberVar3);
@@ -431,6 +434,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(symboldatabase110);
         TEST_CASE(symboldatabase111); // [[fallthrough]]
         TEST_CASE(symboldatabase112); // explicit operator
+        TEST_CASE(symboldatabase113);
 
         TEST_CASE(createSymbolDatabaseFindAllScopes1);
         TEST_CASE(createSymbolDatabaseFindAllScopes2);
@@ -442,6 +446,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(createSymbolDatabaseFindAllScopes8); // #12761
         TEST_CASE(createSymbolDatabaseFindAllScopes9);
         TEST_CASE(createSymbolDatabaseFindAllScopes10);
+        TEST_CASE(createSymbolDatabaseFindAllScopes11);
 
         TEST_CASE(createSymbolDatabaseIncompleteVars);
 
@@ -464,6 +469,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(enum17);
         TEST_CASE(enum18);
         TEST_CASE(enum19);
+        TEST_CASE(enum20); // #14419
 
         TEST_CASE(struct1);
 
@@ -538,6 +544,10 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(findFunction60);
         TEST_CASE(findFunction61);
         TEST_CASE(findFunction62); // #14272 - pointer passed to function is const
+        TEST_CASE(findFunction63); // #14937 - member function of type returned by operator()
+        TEST_CASE(findFunction64); // overloaded operator()
+        TEST_CASE(findFunction65);
+        TEST_CASE(findFunction66); // #15104 - object passed for pointer to its class
         TEST_CASE(findFunctionRef1);
         TEST_CASE(findFunctionRef2); // #13328
         TEST_CASE(findFunctionContainer);
@@ -585,6 +595,9 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(valueType2);
         TEST_CASE(valueType3);
         TEST_CASE(valueTypeThis);
+        TEST_CASE(valueTypeChar);
+        TEST_CASE(valueTypeRValueReference);
+        TEST_CASE(valueTypeGeneric);
 
         TEST_CASE(variadic1); // #7453
         TEST_CASE(variadic2); // #7649
@@ -629,10 +642,12 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(stdintFunction);
 
         TEST_CASE(userDefinedLiteral);
+
+        TEST_CASE(dumpValueNegative);  // #14735 - dumping negative impossible value for unsigned expression
     }
 
     void array() {
-        GET_SYMBOL_DB_C("int a[10+2];");
+        GET_SYMBOL_DB_C("int a[10+2];\n");
         ASSERT(db != nullptr);
 
         ASSERT(db->variableList().size() == 2); // the first one is not used
@@ -646,7 +661,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void array_ptr() {
         GET_SYMBOL_DB("const char* a[] = { \"abc\" };\n"
-                      "const char* b[] = { \"def\", \"ghijkl\" };");
+                      "const char* b[] = { \"def\", \"ghijkl\" };\n");
         ASSERT(db != nullptr);
 
         ASSERT(db->variableList().size() == 3); // the first one is not used
@@ -668,7 +683,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void stlarray1() {
-        GET_SYMBOL_DB("std::array<int, 16 + 4> arr;");
+        GET_SYMBOL_DB("std::array<int, 16 + 4> arr;\n");
         ASSERT(db != nullptr);
 
         ASSERT_EQUALS(2, db->variableList().size()); // the first one is not used
@@ -681,7 +696,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void stlarray2() {
-        GET_SYMBOL_DB("constexpr int sz = 16; std::array<int, sz + 4> arr;");
+        GET_SYMBOL_DB("constexpr int sz = 16; std::array<int, sz + 4> arr;\n");
         ASSERT(db != nullptr);
 
         ASSERT_EQUALS(3, db->variableList().size()); // the first one is not used
@@ -746,7 +761,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationCanHandleNull() {
         reset();
-        GET_SYMBOL_DB("void main(){}");
+        GET_SYMBOL_DB("void main(){}\n");
         const bool result = db->scopeList.front().isVariableDeclaration(nullptr, vartok, typetok);
         ASSERT_EQUALS(false, result);
         ASSERT(nullptr == vartok);
@@ -756,7 +771,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesSimpleDeclaration() {
         reset();
-        GET_SYMBOL_DB("int x;");
+        GET_SYMBOL_DB("int x;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
@@ -769,7 +784,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesInitialization() {
         reset();
-        GET_SYMBOL_DB("int x (1);");
+        GET_SYMBOL_DB("int x (1);\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
@@ -782,7 +797,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesCpp11Initialization() {
         reset();
-        GET_SYMBOL_DB("int x {1};");
+        GET_SYMBOL_DB("int x {1};\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
@@ -795,7 +810,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesScopedDeclaration() {
         reset();
-        GET_SYMBOL_DB("::int x;");
+        GET_SYMBOL_DB("::int x;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
@@ -808,7 +823,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesStdDeclaration() {
         reset();
-        GET_SYMBOL_DB("std::string x;");
+        GET_SYMBOL_DB("std::string x;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
@@ -821,7 +836,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesScopedStdDeclaration() {
         reset();
-        GET_SYMBOL_DB("::std::string x;");
+        GET_SYMBOL_DB("::std::string x;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
@@ -834,7 +849,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesManyScopes() {
         reset();
-        GET_SYMBOL_DB("AA::BB::CC::DD::EE x;");
+        GET_SYMBOL_DB("AA::BB::CC::DD::EE x;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
@@ -848,7 +863,7 @@ class TestSymbolDatabase : public TestFixture {
     void test_isVariableDeclarationIdentifiesPointers() {
         {
             reset();
-            GET_SYMBOL_DB("int* p;");
+            GET_SYMBOL_DB("int* p;\n");
             const bool result1 = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
             ASSERT_EQUALS(true, result1);
             ASSERT_EQUALS("p", vartok->str());
@@ -861,7 +876,7 @@ class TestSymbolDatabase : public TestFixture {
         {
             reset();
             SimpleTokenizer constpointer(*this);
-            ASSERT(constpointer.tokenize("const int* p;"));
+            ASSERT(constpointer.tokenize("const int* p;\n"));
             Variable v2(constpointer.tokens()->tokAt(3), constpointer.tokens()->next(), constpointer.tokens()->tokAt(2), 0, AccessControl::Public, nullptr, nullptr, settings1);
             ASSERT(false == v2.isArray());
             ASSERT(true == v2.isPointer());
@@ -870,7 +885,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         {
             reset();
-            GET_SYMBOL_DB("int* const p;");
+            GET_SYMBOL_DB("int* const p;\n");
             const bool result2 = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
             ASSERT_EQUALS(true, result2);
             ASSERT_EQUALS("p", vartok->str());
@@ -888,7 +903,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void slurpInManifest() {\n"
                       "  std::string tmpiostring(*tI);\n"
                       "  if(tmpiostring==\"infoonly\"){}\n"
-                      "}");
+                      "}\n");
 
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), "tmpiostring ==");
         ASSERT(tok->variable());
@@ -897,7 +912,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationDoesNotIdentifyConstness() {
         reset();
-        GET_SYMBOL_DB("const int* cp;");
+        GET_SYMBOL_DB("const int* cp;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(false, result);
         ASSERT(nullptr == vartok);
@@ -906,7 +921,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesFirstOfManyVariables() {
         reset();
-        GET_SYMBOL_DB("int first, second;");
+        GET_SYMBOL_DB("int first, second;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("first", vartok->str());
@@ -919,7 +934,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesScopedPointerDeclaration() {
         reset();
-        GET_SYMBOL_DB("AA::BB::CC::DD::EE* p;");
+        GET_SYMBOL_DB("AA::BB::CC::DD::EE* p;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("p", vartok->str());
@@ -932,7 +947,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesDeclarationWithIndirection() {
         reset();
-        GET_SYMBOL_DB("int** pp;");
+        GET_SYMBOL_DB("int** pp;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("pp", vartok->str());
@@ -945,7 +960,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesDeclarationWithMultipleIndirection() {
         reset();
-        GET_SYMBOL_DB("int***** p;");
+        GET_SYMBOL_DB("int***** p;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("p", vartok->str());
@@ -958,7 +973,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesArray() {
         reset();
-        GET_SYMBOL_DB("::std::string v[3];");
+        GET_SYMBOL_DB("::std::string v[3];\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("v", vartok->str());
@@ -972,7 +987,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesPointerArray() {
         reset();
-        GET_SYMBOL_DB("A *a[5];");
+        GET_SYMBOL_DB("A *a[5];\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("a", vartok->str());
@@ -987,7 +1002,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesOfArrayPointers1() {
         reset();
-        GET_SYMBOL_DB("A (*a)[5];");
+        GET_SYMBOL_DB("A (*a)[5];\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("a", vartok->str());
@@ -1002,7 +1017,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesOfArrayPointers2() {
         reset();
-        GET_SYMBOL_DB("A (*const a)[5];");
+        GET_SYMBOL_DB("A (*const a)[5];\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("a", vartok->str());
@@ -1017,7 +1032,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesOfArrayPointers3() {
         reset();
-        GET_SYMBOL_DB("A (** a)[5];");
+        GET_SYMBOL_DB("A (** a)[5];\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("a", vartok->str());
@@ -1032,7 +1047,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesArrayOfFunctionPointers() {
         reset();
-        GET_SYMBOL_DB("int (*a[])(int) = { g };"); // #11596
+        GET_SYMBOL_DB("int (*a[])(int) = { g };\n"); // #11596
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("a", vartok->str());
@@ -1048,7 +1063,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableDeclarationIdentifiesTemplatedPointerVariable() {
         reset();
-        GET_SYMBOL_DB("std::set<char>* chars;");
+        GET_SYMBOL_DB("std::set<char>* chars;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("chars", vartok->str());
@@ -1061,7 +1076,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableDeclarationIdentifiesTemplatedPointerToPointerVariable() {
         reset();
-        GET_SYMBOL_DB("std::deque<int>*** ints;");
+        GET_SYMBOL_DB("std::deque<int>*** ints;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("ints", vartok->str());
@@ -1074,7 +1089,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableDeclarationIdentifiesTemplatedArrayVariable() {
         reset();
-        GET_SYMBOL_DB("std::deque<int> ints[3];");
+        GET_SYMBOL_DB("std::deque<int> ints[3];\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("ints", vartok->str());
@@ -1087,7 +1102,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableDeclarationIdentifiesTemplatedVariable() {
         reset();
-        GET_SYMBOL_DB("std::vector<int> ints;");
+        GET_SYMBOL_DB("std::vector<int> ints;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("ints", vartok->str());
@@ -1100,7 +1115,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableDeclarationIdentifiesTemplatedVariableIterator() {
         reset();
-        GET_SYMBOL_DB("std::list<int>::const_iterator floats;");
+        GET_SYMBOL_DB("std::list<int>::const_iterator floats;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("floats", vartok->str());
@@ -1113,7 +1128,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableDeclarationIdentifiesNestedTemplateVariable() {
         reset();
-        GET_SYMBOL_DB("std::deque<std::set<int> > intsets;");
+        GET_SYMBOL_DB("std::deque<std::set<int> > intsets;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("intsets", vartok->str());
@@ -1127,7 +1142,7 @@ class TestSymbolDatabase : public TestFixture {
     void isVariableDeclarationIdentifiesReference() {
         {
             reset();
-            GET_SYMBOL_DB("int& foo;");
+            GET_SYMBOL_DB("int& foo;\n");
             const bool result1 = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
             ASSERT_EQUALS(true, result1);
             Variable v1(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1137,7 +1152,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         {
             reset();
-            GET_SYMBOL_DB("foo*& bar;");
+            GET_SYMBOL_DB("foo*& bar;\n");
             const bool result2 = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
             ASSERT_EQUALS(true, result2);
             Variable v2(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1147,7 +1162,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         {
             reset();
-            GET_SYMBOL_DB("std::vector<int>& foo;");
+            GET_SYMBOL_DB("std::vector<int>& foo;\n");
             const bool result3 = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
             ASSERT_EQUALS(true, result3);
             Variable v3(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1159,21 +1174,21 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableDeclarationDoesNotIdentifyTemplateClass() {
         reset();
-        GET_SYMBOL_DB("template <class T> class SomeClass{};");
+        GET_SYMBOL_DB("template <class T> class SomeClass{};\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(false, result);
     }
 
     void isVariableDeclarationDoesNotIdentifyCppCast() {
         reset();
-        GET_SYMBOL_DB("reinterpret_cast <char *> (code)[0] = 0;");
+        GET_SYMBOL_DB("reinterpret_cast <char *> (code)[0] = 0;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(false, result);
     }
 
     void isVariableDeclarationPointerConst() {
         reset();
-        GET_SYMBOL_DB("std::string const* s;");
+        GET_SYMBOL_DB("std::string const* s;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens()->next(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1184,7 +1199,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableDeclarationRValueRef() {
         reset();
-        GET_SYMBOL_DB("int&& i;");
+        GET_SYMBOL_DB("int&& i;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1200,8 +1215,8 @@ class TestSymbolDatabase : public TestFixture {
                         "void f() {\n"
                         "  switch (c) {\n"
                         "    case b:;\n"
-                        "  }"
-                        "}");
+                        "  }\n"
+                        "}\n");
         const Variable* b = db->getVariableFromVarId(1);
         ASSERT_EQUALS("b", b->name());
         ASSERT_EQUALS("a", b->typeStartToken()->str());
@@ -1212,7 +1227,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    for (auto& elem : items) {\n"
                       "        if (auto x = bar()) { int y = 3; }\n"
                       "    }\n"
-                      "}");
+                      "}\n");
         const Token *x = Token::findsimplematch(tokenizer.tokens(), "x");
         ASSERT(x);
         ASSERT(x->varId());
@@ -1224,9 +1239,20 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(y->variable());
     }
 
+    void isVariableDeclarationSwitch() {
+        GET_SYMBOL_DB("void foo(void) {\n"
+                      "    int x = 0;\n"
+                      "    switch (auto &s = x) {}\n"
+                      "}\n");
+        const Token *s = Token::findsimplematch(tokenizer.tokens(), "s");
+        ASSERT(s);
+        ASSERT(s->varId());
+        ASSERT(s->variable());
+    }
+
     void VariableValueType1() {
         GET_SYMBOL_DB("typedef uint8_t u8;\n"
-                      "static u8 x;");
+                      "static u8 x;\n");
         const Variable* x = db->getVariableFromVarId(1);
         ASSERT_EQUALS("x", x->name());
         ASSERT(x->valueType()->isIntegral());
@@ -1234,7 +1260,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void VariableValueType2() {
         GET_SYMBOL_DB("using u8 = uint8_t;\n"
-                      "static u8 x;");
+                      "static u8 x;\n");
         const Variable* x = db->getVariableFromVarId(1);
         ASSERT_EQUALS("x", x->name());
         ASSERT(x->valueType()->isIntegral());
@@ -1243,7 +1269,7 @@ class TestSymbolDatabase : public TestFixture {
     void VariableValueType3() {
         // std::string::size_type
         {
-            GET_SYMBOL_DB("void f(std::string::size_type x);");
+            GET_SYMBOL_DB("void f(std::string::size_type x);\n");
             const Variable* const x = db->getVariableFromVarId(1);
             ASSERT_EQUALS("x", x->name());
             // TODO: Configure std::string::size_type somehow.
@@ -1252,7 +1278,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         // std::wstring::size_type
         {
-            GET_SYMBOL_DB("void f(std::wstring::size_type x);");
+            GET_SYMBOL_DB("void f(std::wstring::size_type x);\n");
             const Variable* const x = db->getVariableFromVarId(1);
             ASSERT_EQUALS("x", x->name());
             // TODO: Configure std::wstring::size_type somehow.
@@ -1261,7 +1287,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         // std::u16string::size_type
         {
-            GET_SYMBOL_DB("void f(std::u16string::size_type x);");
+            GET_SYMBOL_DB("void f(std::u16string::size_type x);\n");
             const Variable* const x = db->getVariableFromVarId(1);
             ASSERT_EQUALS("x", x->name());
             // TODO: Configure std::u16string::size_type somehow.
@@ -1270,7 +1296,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         // std::u32string::size_type
         {
-            GET_SYMBOL_DB("void f(std::u32string::size_type x);");
+            GET_SYMBOL_DB("void f(std::u32string::size_type x);\n");
             const Variable* const x = db->getVariableFromVarId(1);
             ASSERT_EQUALS("x", x->name());
             // TODO: Configure std::u32string::size_type somehow.
@@ -1283,7 +1309,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("class C {\n"
                       "public:\n"
                       "  std::shared_ptr<C> x;\n"
-                      "};");
+                      "};\n");
 
         const Variable* const x = db->getVariableFromVarId(1);
         ASSERT(x->valueType());
@@ -1292,7 +1318,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void VariableValueType5() {
         GET_SYMBOL_DB("class C {};\n"
-                      "void foo(std::shared_ptr<C>* p) {}");
+                      "void foo(std::shared_ptr<C>* p) {}\n");
 
         const Variable* const p = db->getVariableFromVarId(1);
         ASSERT(p->valueType());
@@ -1302,7 +1328,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void VariableValueType6() {
         GET_SYMBOL_DB("struct Data{};\n"
-                      "void foo() { std::unique_ptr<Data> data = std::unique_ptr<Data>(new Data); }");
+                      "void foo() { std::unique_ptr<Data> data = std::unique_ptr<Data>(new Data); }\n");
 
         const Token* check = Token::findsimplematch(tokenizer.tokens(), "( new");
         ASSERT(check);
@@ -1310,6 +1336,71 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(check->valueType()->smartPointerTypeToken);
     }
 
+    void VariableValueType7() {
+        GET_SYMBOL_DB("void f() {\n"
+                      "    auto x0 = 0;\n"
+                      "    auto &x1 = x0;\n"
+                      "    auto &x2 {x0};\n"
+                      "    auto &&x3 = 0;\n"
+                      "    auto &&x4 {0};\n"
+                      "}\n");
+
+        const Token* x1 = Token::findsimplematch(tokenizer.tokens(), "x1");
+        const Token* x2 = Token::findsimplematch(tokenizer.tokens(), "x2");
+        const Token* x3 = Token::findsimplematch(tokenizer.tokens(), "x3");
+        const Token* x4 = Token::findsimplematch(tokenizer.tokens(), "x4");
+
+        ASSERT(x1);
+        ASSERT(x2);
+        ASSERT(x3);
+        ASSERT(x4);
+
+        ASSERT_EQUALS_ENUM(ValueType::INT, x1->valueType()->type);
+        ASSERT_EQUALS_ENUM(ValueType::INT, x2->valueType()->type);
+        ASSERT_EQUALS_ENUM(ValueType::INT, x3->valueType()->type);
+        ASSERT_EQUALS_ENUM(ValueType::INT, x4->valueType()->type);
+
+        ASSERT_EQUALS_ENUM(Reference::LValue, x1->valueType()->reference);
+        ASSERT_EQUALS_ENUM(Reference::LValue, x2->valueType()->reference);
+        ASSERT_EQUALS_ENUM(Reference::RValue, x3->valueType()->reference);
+        ASSERT_EQUALS_ENUM(Reference::RValue, x4->valueType()->reference);
+    }
+
+    void VariableValueType8() {
+        GET_SYMBOL_DB("void f() {\n"
+                      "    char buf[128];\n"
+                      "    const auto *const x0 {buf};\n"
+                      "    auto *const x1 {buf};\n"
+                      "    const auto *x2 {buf};\n"
+                      "    auto x3 {buf};\n"
+                      "}\n");
+
+        const Token* x0 = Token::findsimplematch(tokenizer.tokens(), "x0");
+        const Token* x1 = Token::findsimplematch(tokenizer.tokens(), "x1");
+        const Token* x2 = Token::findsimplematch(tokenizer.tokens(), "x2");
+        const Token* x3 = Token::findsimplematch(tokenizer.tokens(), "x3");
+
+        ASSERT(x0);
+        ASSERT(x1);
+        ASSERT(x2);
+        ASSERT(x3);
+
+        ASSERT_EQUALS_ENUM(ValueType::CHAR, x0->valueType()->type);
+        ASSERT_EQUALS_ENUM(ValueType::CHAR, x1->valueType()->type);
+        ASSERT_EQUALS_ENUM(ValueType::CHAR, x2->valueType()->type);
+        ASSERT_EQUALS_ENUM(ValueType::CHAR, x3->valueType()->type);
+
+        ASSERT_EQUALS(3, x0->valueType()->constness);
+        ASSERT_EQUALS(1, x1->valueType()->constness);
+        ASSERT_EQUALS(2, x2->valueType()->constness);
+        ASSERT_EQUALS(0, x3->valueType()->constness);
+
+        ASSERT_EQUALS(1, x0->valueType()->pointer);
+        ASSERT_EQUALS(1, x1->valueType()->pointer);
+        ASSERT_EQUALS(1, x2->valueType()->pointer);
+        ASSERT_EQUALS(1, x3->valueType()->pointer);
+    }
+
     void VariableValueTypeReferences() {
         {
             GET_SYMBOL_DB("void foo(int x) {}\n");
@@ -1512,6 +1603,66 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(p->valueType()->originalTypeName == "ubFunctionPointer_fp");
             ASSERT(p->valueType()->reference == Reference::None);
         }
+        { // function pointer returning a reference
+            GET_SYMBOL_DB("void foo(int& (*f)()) {}\n");
+            const Variable* const p = db->getVariableFromVarId(1);
+            ASSERT(!p->isReference());
+            ASSERT(p->isPointer());
+            ASSERT(p->valueType());
+            ASSERT(p->valueType()->pointer == 1);
+        }
+        {
+            GET_SYMBOL_DB("void foo(int&& (*f)()) {}\n");
+            const Variable* const p = db->getVariableFromVarId(1);
+            ASSERT(!p->isReference());
+            ASSERT(!p->isRValueReference());
+        }
+        {
+            GET_SYMBOL_DB("struct S { int& (*f[2])(); };\n");
+            const Variable* const p = db->getVariableFromVarId(1);
+            ASSERT(!p->isReference());
+            ASSERT(p->isArray());
+        }
+        { // pointer to member function returning a reference
+            GET_SYMBOL_DB("struct S { int& g(); };\n"
+                          "void foo(int& (S::*pm)()) {}\n");
+            const Variable* const p = db->getVariableFromVarId(1);
+            ASSERT(p);
+            ASSERT_EQUALS("pm", p->name());
+            ASSERT(!p->isReference());
+        }
+        { // parentheses that are no function declarator
+            GET_SYMBOL_DB("void foo(int& (r)) {}\n");
+            const Variable* const p = db->functionScopes.front()->function->getArgumentVar(0);
+            ASSERT(p);
+            ASSERT(p->isReference());
+        }
+        {
+            GET_SYMBOL_DB("void foo(int& UNUSED(r)) {}\n");
+            const Variable* const p = db->functionScopes.front()->function->getArgumentVar(0);
+            ASSERT(p);
+            ASSERT(p->isReference());
+        }
+        { // reference to function pointer
+            GET_SYMBOL_DB("void foo(int (*&f)()) {}\n");
+            const Variable* const p = db->getVariableFromVarId(1);
+            ASSERT(p->isReference());
+            ASSERT(p->isPointer());
+            ASSERT(p->valueType());
+            ASSERT(p->valueType()->reference == Reference::LValue);
+        }
+        { // reference to function returning a reference
+            GET_SYMBOL_DB("void foo(int& (&f)()) {}\n");
+            const Variable* const p = db->getVariableFromVarId(1);
+            ASSERT(p->isReference());
+            ASSERT(!p->isRValueReference());
+        }
+        {
+            GET_SYMBOL_DB("void foo(int&& (&f)()) {}\n");
+            const Variable* const p = db->getVariableFromVarId(1);
+            ASSERT(p->isReference());
+            ASSERT(!p->isRValueReference());
+        }
     }
 
     void VariableValueTypeTemplate() {
@@ -1545,7 +1696,7 @@ class TestSymbolDatabase : public TestFixture {
                       "{\n"
                       "    struct A::B b;\n"
                       "    b.x = 1;\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
 
         const Variable* bvar = db->getVariableFromVarId(1);
@@ -1571,7 +1722,7 @@ class TestSymbolDatabase : public TestFixture {
                       "{\n"
                       "    struct B::C c;\n"
                       "    c.x = 1;\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
 
         const Variable* cvar = db->getVariableFromVarId(3);
@@ -1591,7 +1742,7 @@ class TestSymbolDatabase : public TestFixture {
                       "{\n"
                       "    struct A a;\n"
                       "    a.x = 1;\n"
-                      "}");
+                      "}\n");
         (void)db;
         const Variable* avar = Token::findsimplematch(tokenizer.tokens(), "a")->variable();
         ASSERT(avar);
@@ -1602,7 +1753,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("extern \"C\" { typedef int INT; }\n"
                       "void bar() {\n"
                       "    INT x = 3;\n"
-                      "}");
+                      "}\n");
         (void)db;
         const Variable* avar = Token::findsimplematch(tokenizer.tokens(), "x")->variable();
         ASSERT(avar);
@@ -1614,7 +1765,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void reset() {\n"
                       "    for(auto& e : array)\n"
                       "        foo(e);\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
 
@@ -1627,7 +1778,7 @@ class TestSymbolDatabase : public TestFixture {
     void isVariableStlType() {
         {
             reset();
-            GET_SYMBOL_DB("std::string s;");
+            GET_SYMBOL_DB("std::string s;\n");
             const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
             ASSERT_EQUALS(true, result);
             Variable v(vartok, tokenizer.tokens(), tokenizer.list.back(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1640,7 +1791,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         {
             reset();
-            GET_SYMBOL_DB("std::vector<int> v;");
+            GET_SYMBOL_DB("std::vector<int> v;\n");
             const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
             ASSERT_EQUALS(true, result);
             Variable v(vartok, tokenizer.tokens(), tokenizer.list.back(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1653,7 +1804,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         {
             reset();
-            GET_SYMBOL_DB("SomeClass s;");
+            GET_SYMBOL_DB("SomeClass s;\n");
             const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
             ASSERT_EQUALS(true, result);
             Variable v(vartok, tokenizer.tokens(), tokenizer.list.back(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1666,7 +1817,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariablePointerToConstPointer() {
         reset();
-        GET_SYMBOL_DB("char* const * s;");
+        GET_SYMBOL_DB("char* const * s;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1677,7 +1828,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariablePointerToVolatilePointer() {
         reset();
-        GET_SYMBOL_DB("char* volatile * s;");
+        GET_SYMBOL_DB("char* volatile * s;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1688,7 +1839,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariablePointerToConstVolatilePointer() {
         reset();
-        GET_SYMBOL_DB("char* const volatile * s;");
+        GET_SYMBOL_DB("char* const volatile * s;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1699,7 +1850,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableMultiplePointersAndQualifiers() {
         reset();
-        GET_SYMBOL_DB("const char* const volatile * const volatile * const volatile * const volatile s;");
+        GET_SYMBOL_DB("const char* const volatile * const volatile * const volatile * const volatile s;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens()->next(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1710,7 +1861,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void variableVolatile() {
         GET_SYMBOL_DB("std::atomic<int> x;\n"
-                      "volatile int y;");
+                      "volatile int y;\n");
 
         const Token *x = Token::findsimplematch(tokenizer.tokens(), "x");
         ASSERT(x);
@@ -1724,7 +1875,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void variableConstexpr() {
-        GET_SYMBOL_DB("constexpr int x = 16;");
+        GET_SYMBOL_DB("constexpr int x = 16;\n");
 
         const Token *x = Token::findsimplematch(tokenizer.tokens(), "x");
         ASSERT(x);
@@ -1781,7 +1932,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void f() {\n"
                       "    struct Bar bar;\n"
                       "    bar.x = 123;\n"  // <- x should get a variable() pointer
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), "x =");
@@ -1789,6 +1940,22 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(Token::simpleMatch(tok->variable()->typeStartToken(), "int x ;"));
     }
 
+    void memberVar2() {
+        GET_SYMBOL_DB( "struct S { void (*fp)(); };\n"
+                       "void g();\n"
+                       "void f() {\n"
+                       "    S s;\n"
+                       "    s.fp = g;\n"
+                       "    s.fp();\n"
+                       "}\n");
+
+        ASSERT(db != nullptr);
+        const Token *fp1 = Token::findsimplematch(tokenizer.tokens(), "fp =");
+        const Token *fp2 = Token::findsimplematch(tokenizer.tokens(), "fp (");
+        ASSERT(fp1->varId());
+        ASSERT_EQUALS(fp2->varId(), fp1->varId());
+    }
+
     void arrayMemberVar1() {
         GET_SYMBOL_DB("struct Foo {\n"
                       "    int x;\n"
@@ -1796,7 +1963,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void f() {\n"
                       "    struct Foo foo[10];\n"
                       "    foo[1].x = 123;\n"  // <- x should get a variable() pointer
-                      "}");
+                      "}\n");
 
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), ". x");
         tok = tok ? tok->next() : nullptr;
@@ -1812,7 +1979,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void f() {\n"
                       "    struct Foo foo[10][10];\n"
                       "    foo[1][2].x = 123;\n"  // <- x should get a variable() pointer
-                      "}");
+                      "}\n");
 
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), ". x");
         tok = tok ? tok->next() : nullptr;
@@ -1828,7 +1995,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void f() {\n"
                       "    struct Foo foo[10];\n"
                       "    (foo[1]).x = 123;\n"  // <- x should get a variable() pointer
-                      "}");
+                      "}\n");
 
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), ". x");
         tok = tok ? tok->next() : nullptr;
@@ -1854,7 +2021,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("class Foo {\n"
                       "    static const double d;\n"
                       "};\n"
-                      "const double Foo::d = 5.0;");
+                      "const double Foo::d = 5.0;\n");
 
         const Variable* v = db->getVariableFromVarId(1);
         ASSERT(v && db->variableList().size() == 2);
@@ -1863,7 +2030,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void getVariableFromVarIdBoundsCheck() {
         GET_SYMBOL_DB("int x;\n"
-                      "int y;");
+                      "int y;\n");
 
         const Variable* v = db->getVariableFromVarId(2);
         // three elements: varId 0 also counts via a fake-entry
@@ -1871,16 +2038,16 @@ class TestSymbolDatabase : public TestFixture {
 
         // TODO: we should provide our own error message
 #ifdef _MSC_VER
-        ASSERT_THROW_EQUALS_2(db->getVariableFromVarId(3), std::out_of_range, "invalid vector subscript");
+        ASSERT_THROW_EQUALS(db->getVariableFromVarId(3), std::out_of_range, "invalid vector subscript");
 #elif !defined(_LIBCPP_VERSION)
-        ASSERT_THROW_EQUALS_2(db->getVariableFromVarId(3), std::out_of_range, "vector::_M_range_check: __n (which is 3) >= this->size() (which is 3)");
+        ASSERT_THROW_EQUALS(db->getVariableFromVarId(3), std::out_of_range, "vector::_M_range_check: __n (which is 3) >= this->size() (which is 3)");
 #else
-        ASSERT_THROW_EQUALS_2(db->getVariableFromVarId(3), std::out_of_range, "vector");
+        ASSERT_THROW_EQUALS(db->getVariableFromVarId(3), std::out_of_range, "vector");
 #endif
     }
 
     void hasRegularFunction() {
-        GET_SYMBOL_DB("void func() { }");
+        GET_SYMBOL_DB("void func() { }\n");
 
         // 2 scopes: Global and Function
         ASSERT(db && db->scopeList.size() == 2);
@@ -1901,7 +2068,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasRegularFunction_trailingReturnType() {
-        GET_SYMBOL_DB("auto func() -> int { }");
+        GET_SYMBOL_DB("auto func() -> int { }\n");
 
         // 2 scopes: Global and Function
         ASSERT(db && db->scopeList.size() == 2);
@@ -1922,7 +2089,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasInlineClassFunction() {
-        GET_SYMBOL_DB("class Fred { void func() { } };");
+        GET_SYMBOL_DB("class Fred { void func() { } };\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -1949,7 +2116,7 @@ class TestSymbolDatabase : public TestFixture {
 
 
     void hasInlineClassFunction_trailingReturnType() {
-        GET_SYMBOL_DB("class Fred { auto func() -> int { } };");
+        GET_SYMBOL_DB("class Fred { auto func() -> int { } };\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -1975,7 +2142,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasMissingInlineClassFunction() {
-        GET_SYMBOL_DB("class Fred { void func(); };");
+        GET_SYMBOL_DB("class Fred { void func(); };\n");
 
         // 2 scopes: Global and Class (no Function scope because there is no function implementation)
         ASSERT(db && db->scopeList.size() == 2);
@@ -1994,7 +2161,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasInlineClassOperatorTemplate() {
-        GET_SYMBOL_DB("struct Fred { template<typename T> Foo & operator=(const Foo &) { return *this; } };");
+        GET_SYMBOL_DB("struct Fred { template<typename T> Foo & operator=(const Foo &) { return *this; } };\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -2020,7 +2187,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasClassFunction() {
-        GET_SYMBOL_DB("class Fred { void func(); }; void Fred::func() { }");
+        GET_SYMBOL_DB("class Fred { void func(); }; void Fred::func() { }\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -2042,7 +2209,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasClassFunction_trailingReturnType() {
-        GET_SYMBOL_DB("class Fred { auto func() -> int; }; auto Fred::func() -> int { }");
+        GET_SYMBOL_DB("class Fred { auto func() -> int; }; auto Fred::func() -> int { }\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -2065,7 +2232,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void hasClassFunction_decltype_auto()
     {
-        GET_SYMBOL_DB("struct d { decltype(auto) f() {} };");
+        GET_SYMBOL_DB("struct d { decltype(auto) f() {} };\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -2086,7 +2253,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasRegularFunctionReturningFunctionPointer() {
-        GET_SYMBOL_DB("void (*func(int f))(char) { }");
+        GET_SYMBOL_DB("void (*func(int f))(char) { }\n");
 
         // 2 scopes: Global and Function
         ASSERT(db && db->scopeList.size() == 2);
@@ -2105,7 +2272,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasInlineClassFunctionReturningFunctionPointer() {
-        GET_SYMBOL_DB("class Fred { void (*func(int f))(char) { } };");
+        GET_SYMBOL_DB("class Fred { void (*func(int f))(char) { } };\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -2124,7 +2291,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasMissingInlineClassFunctionReturningFunctionPointer() {
-        GET_SYMBOL_DB("class Fred { void (*func(int f))(char); };");
+        GET_SYMBOL_DB("class Fred { void (*func(int f))(char); };\n");
 
         // 2 scopes: Global and Class (no Function scope because there is no function implementation)
         ASSERT(db && db->scopeList.size() == 2);
@@ -2143,7 +2310,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasClassFunctionReturningFunctionPointer() {
-        GET_SYMBOL_DB("class Fred { void (*func(int f))(char); }; void (*Fred::func(int f))(char) { }");
+        GET_SYMBOL_DB("class Fred { void (*func(int f))(char); }; void (*Fred::func(int f))(char) { }\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -2162,7 +2329,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void methodWithRedundantScope() {
-        GET_SYMBOL_DB("class Fred { void Fred::func() {} };");
+        GET_SYMBOL_DB("class Fred { void Fred::func() {} };\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -2190,7 +2357,7 @@ class TestSymbolDatabase : public TestFixture {
                       "float(*(*a2[10])(char))(long);\n"            // array 10 of pointer to func (char) returning pointer to func (long) returning float
                       "short(*(*(*a3[10])(char))(long))(double);\n" // array 10 of pointer to function (char) returning pointer to function (long) returning pointer to function (double) returning short
                       "::boost::rational(&r_)[9];\n"                // reference to array of ::boost::rational
-                      "::boost::rational<T>(&r_)[9];");             // reference to array of ::boost::rational<T> (template!)
+                      "::boost::rational<T>(&r_)[9];\n");             // reference to array of ::boost::rational<T> (template!)
 
         ASSERT(db != nullptr);
 
@@ -2210,7 +2377,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void pointerToMemberFunction() {
-        GET_SYMBOL_DB("bool (A::*pFun)();"); // Pointer to member function of A, returning bool and taking no parameters
+        GET_SYMBOL_DB("bool (A::*pFun)();\n"); // Pointer to member function of A, returning bool and taking no parameters
 
         ASSERT(db != nullptr);
 
@@ -2222,7 +2389,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasSubClassConstructor() {
-        GET_SYMBOL_DB("class Foo { class Sub; }; class Foo::Sub { Sub() {} };");
+        GET_SYMBOL_DB("class Foo { class Sub; }; class Foo::Sub { Sub() {} };\n");
         ASSERT(db != nullptr);
 
         bool seen_something = false;
@@ -2239,73 +2406,98 @@ class TestSymbolDatabase : public TestFixture {
 
     void testConstructors() {
         {
-            GET_SYMBOL_DB("class Foo { Foo(); };");
+            GET_SYMBOL_DB("class Foo { Foo(); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { Foo(Foo f); };");
+            GET_SYMBOL_DB("class Foo { Foo(Foo f); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eConstructor && !ctor->isExplicit());
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { explicit Foo(Foo f); };");
+            GET_SYMBOL_DB("class Foo { explicit Foo(Foo f); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(4)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eConstructor && ctor->isExplicit());
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { Foo(Bar& f); };");
+            GET_SYMBOL_DB("class Foo { Foo(Bar& f); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { Foo(Foo& f); };");
+            GET_SYMBOL_DB("class Foo { Foo(Foo& f); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eCopyConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { Foo(const Foo &f); };");
+            GET_SYMBOL_DB("class Foo { Foo(const Foo &f); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eCopyConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("template <T> class Foo { Foo(Foo<T>& f); };");
+            GET_SYMBOL_DB("template <T> class Foo { Foo(Foo<T>& f); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(7)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eCopyConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { Foo(Foo& f, int default = 0); };");
+            GET_SYMBOL_DB("class Foo { Foo(Foo& f, int default = 0); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eCopyConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { Foo(Foo& f, char noDefault); };");
+            GET_SYMBOL_DB("class Foo { Foo(Foo& f, char noDefault); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { Foo(Foo&& f); };");
+            GET_SYMBOL_DB("class Foo { Foo(Foo&& f); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eMoveConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { Foo(Foo&& f, int default = 1, bool defaultToo = true); };");
+            GET_SYMBOL_DB("class Foo { Foo(Foo&& f, int default = 1, bool defaultToo = true); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eMoveConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("void f() { extern void f(); }");
+            GET_SYMBOL_DB("class Foo { Foo(Foo&& (*f)()); };\n");
+            const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
+            ASSERT(db && ctor && ctor->type == FunctionType::eConstructor);
+        }
+        {
+            GET_SYMBOL_DB("class Foo { Foo(Foo& (&f)()); };\n");
+            const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
+            ASSERT(db && ctor && ctor->type == FunctionType::eConstructor);
+        }
+        {
+            GET_SYMBOL_DB("class Foo { Foo(Foo&& (&f)()); };\n");
+            const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
+            ASSERT(db && ctor && ctor->type == FunctionType::eConstructor);
+        }
+        {
+            GET_SYMBOL_DB("class Foo { Foo(Foo (&f)()); };\n");
+            const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
+            ASSERT(db && ctor && ctor->type == FunctionType::eConstructor);
+        }
+        {
+            GET_SYMBOL_DB("class Foo { Foo(Foo& (&)()); };\n");
+            const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
+            ASSERT(db && ctor && ctor->type == FunctionType::eConstructor);
+        }
+        {
+            GET_SYMBOL_DB("void f() { extern void f(); }\n");
             ASSERT(db && db->scopeList.size() == 2);
             const Function* f = findFunctionByName("f", &db->scopeList.back());
             ASSERT(f && f->type == FunctionType::eFunction);
@@ -2313,7 +2505,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionDeclarationTemplate() {
-        GET_SYMBOL_DB("std::map<int, string> foo() {}");
+        GET_SYMBOL_DB("std::map<int, string> foo() {}\n");
 
         // 2 scopes: Global and Function
         ASSERT(db && db->scopeList.size() == 2 && findFunctionByName("foo", &db->scopeList.back()));
@@ -2329,7 +2521,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionDeclarations() {
-        GET_SYMBOL_DB("void foo();\nvoid foo();\nint foo(int i);\nvoid foo() {}");
+        GET_SYMBOL_DB("void foo();\nvoid foo();\nint foo(int i);\nvoid foo() {}\n");
 
         // 2 scopes: Global and Function
         ASSERT(db && db->scopeList.size() == 2 && findFunctionByName("foo", &db->scopeList.back()));
@@ -2354,7 +2546,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionDeclarations2() {
-        GET_SYMBOL_DB("std::array<int,2> foo(int x);");
+        GET_SYMBOL_DB("std::array<int,2> foo(int x);\n");
 
         // 1 scopes: Global
         ASSERT(db && db->scopeList.size() == 1);
@@ -2375,7 +2567,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void constexprFunction() {
-        GET_SYMBOL_DB("constexpr int foo();");
+        GET_SYMBOL_DB("constexpr int foo();\n");
 
         // 1 scopes: Global
         ASSERT(db && db->scopeList.size() == 1);
@@ -2394,7 +2586,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void constructorInitialization() {
         GET_SYMBOL_DB("std::string logfile;\n"
-                      "std::ofstream log(logfile.c_str(), std::ios::out);");
+                      "std::ofstream log(logfile.c_str(), std::ios::out);\n");
 
         // 1 scope: Global
         ASSERT(db && db->scopeList.size() == 1);
@@ -2408,7 +2600,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void ScVbaValidation::getFormula1() {\n"
                       "    sal_uInt16 nFlags = 0;\n"
                       "    if (pDocSh && !getCellRangesForAddress(nFlags)) ;\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db && errout_str().empty());
 
@@ -2422,7 +2614,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void getFormula1() {\n"
                       "    sal_uInt16 nFlags = 0;\n"
                       "    if (pDocSh && !getCellRangesForAddress(nFlags)) ;\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db && errout_str().empty());
 
@@ -2440,7 +2632,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void ScVbaValidation::getFormula1() {\n"
                       "    sal_uInt16 nFlags = 0;\n"
                       "    if (pDocSh && !getCellRangesForAddress(nFlags)) ;\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db && errout_str().empty());
 
@@ -2455,7 +2647,7 @@ class TestSymbolDatabase : public TestFixture {
                       "extern void f3();\n"
                       "void f4();\n"
                       "extern void f5() { };\n"
-                      "void f6() { }");
+                      "void f6() { }\n");
 
         ASSERT(db && errout_str().empty());
 
@@ -2509,7 +2701,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void classWithFriend() {
-        GET_SYMBOL_DB("class Foo {}; class Bar1 { friend class Foo; }; class Bar2 { friend Foo; };");
+        GET_SYMBOL_DB("class Foo {}; class Bar1 { friend class Foo; }; class Bar2 { friend Foo; };\n");
         // 3 scopes: Global, 3 classes
         ASSERT(db && db->scopeList.size() == 4);
 
@@ -2526,7 +2718,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void parseFunctionCorrect() {
         // ticket 3188 - "if" statement parsed as function
-        GET_SYMBOL_DB("void func(i) int i; { if (i == 1) return; }");
+        GET_SYMBOL_DB("void func(i) int i; { if (i == 1) return; }\n");
         ASSERT(db != nullptr);
 
         // 3 scopes: Global, function, if
@@ -2539,7 +2731,7 @@ class TestSymbolDatabase : public TestFixture {
     void parseFunctionDeclarationCorrect() {
         GET_SYMBOL_DB("void func();\n"
                       "int bar() {}\n"
-                      "void func() {}");
+                      "void func() {}\n");
         ASSERT_EQUALS(3, db->findScopeByName("func")->bodyStart->linenr());
     }
 
@@ -2548,12 +2740,12 @@ class TestSymbolDatabase : public TestFixture {
                       "    std::vector<std::string> bar;\n"
                       "    Foo() : bar({\"a\", \"b\"})\n"
                       "    {}\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS(4, db->scopeList.front().nestedList.front()->nestedList.front()->bodyStart->linenr());
     }
 
     void hasGlobalVariables1() {
-        GET_SYMBOL_DB("int i;");
+        GET_SYMBOL_DB("int i;\n");
 
         ASSERT(db && db->scopeList.size() == 1);
 
@@ -2565,7 +2757,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasGlobalVariables2() {
-        GET_SYMBOL_DB("int array[2][2];");
+        GET_SYMBOL_DB("int array[2][2];\n");
 
         ASSERT(db && db->scopeList.size() == 1);
 
@@ -2578,7 +2770,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasGlobalVariables3() {
-        GET_SYMBOL_DB("int array[2][2] = { { 0, 0 }, { 0, 0 } };");
+        GET_SYMBOL_DB("int array[2][2] = { { 0, 0 }, { 0, 0 } };\n");
 
         ASSERT(db && db->scopeList.size() == 1);
 
@@ -2595,7 +2787,7 @@ class TestSymbolDatabase : public TestFixture {
                       "static const std::string j;\n"
                       "const std::string* k;\n"
                       "const char m[];\n"
-                      "void f(const char* const l) {}");
+                      "void f(const char* const l) {}\n");
 
         ASSERT(db && db->variableList().size() == 6 && db->getVariableFromVarId(1) && db->getVariableFromVarId(2) && db->getVariableFromVarId(3) && db->getVariableFromVarId(4) && db->getVariableFromVarId(5));
 
@@ -2624,12 +2816,12 @@ class TestSymbolDatabase : public TestFixture {
                       "    if (Diags.hasErrorOccurred())\n"
                       "      return;\n"
                       "  }\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS("DiagnosticsEngine", db->getVariableFromVarId(1)->typeStartToken()->str());
     }
 
     void checkTypeStartEndToken3() {
-        GET_SYMBOL_DB("void f(const char) {}");
+        GET_SYMBOL_DB("void f(const char) {}\n");
 
         ASSERT(db && db->functionScopes.size()==1U);
 
@@ -2658,7 +2850,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void functionArgs1() {
         {
-            GET_SYMBOL_DB("void f(std::vector<std::string>, const std::vector<int> & v) { }");
+            GET_SYMBOL_DB("void f(std::vector<std::string>, const std::vector<int> & v) { }\n");
             ASSERT_EQUALS(1+1, db->variableList().size());
             const Variable* v = db->getVariableFromVarId(1);
             ASSERT(v && v->isReference() && v->isConst() && v->isArgument());
@@ -2669,7 +2861,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT_EQUALS("", errout_str());
         }
         {
-            GET_SYMBOL_DB("void g(std::map<std::string, std::vector<int> > m) { }");
+            GET_SYMBOL_DB("void g(std::map<std::string, std::vector<int> > m) { }\n");
             ASSERT_EQUALS(1+1, db->variableList().size());
             const Variable* m = db->getVariableFromVarId(1);
             ASSERT(m && !m->isReference() && !m->isConst() && m->isArgument() && m->isClass());
@@ -2678,25 +2870,25 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT_EQUALS("", errout_str());
         }
         {
-            GET_SYMBOL_DB("void g(std::map<int, int> m = std::map<int, int>()) { }");
+            GET_SYMBOL_DB("void g(std::map<int, int> m = std::map<int, int>()) { }\n");
             const Scope* g = db->findScopeByName("g");
             ASSERT(g && g->type == ScopeType::eFunction && g->function && g->function->argumentList.size() == 1 && g->function->argumentList.front().index() == 0 && g->function->initializedArgCount() == 1);
             ASSERT_EQUALS("", errout_str());
         }
         {
-            GET_SYMBOL_DB("void g(int = 0) { }");
+            GET_SYMBOL_DB("void g(int = 0) { }\n");
             const Scope* g = db->findScopeByName("g");
             ASSERT(g && g->type == ScopeType::eFunction && g->function && g->function->argumentList.size() == 1 && g->function->argumentList.front().hasDefault());
             ASSERT_EQUALS("", errout_str());
         }
         {
-            GET_SYMBOL_DB("void g(int*) { }"); // unnamed pointer argument (#8052)
+            GET_SYMBOL_DB("void g(int*) { }\n"); // unnamed pointer argument (#8052)
             const Scope* g = db->findScopeByName("g");
             ASSERT(g && g->type == ScopeType::eFunction && g->function && g->function->argumentList.size() == 1 && g->function->argumentList.front().nameToken() == nullptr && g->function->argumentList.front().isPointer());
             ASSERT_EQUALS("", errout_str());
         }
         {
-            GET_SYMBOL_DB("void g(int* const) { }"); // 'const' is not the name of the variable - #5882
+            GET_SYMBOL_DB("void g(int* const) { }\n"); // 'const' is not the name of the variable - #5882
             const Scope* g = db->findScopeByName("g");
             ASSERT(g && g->type == ScopeType::eFunction && g->function && g->function->argumentList.size() == 1 && g->function->argumentList.front().nameToken() == nullptr);
             ASSERT_EQUALS("", errout_str());
@@ -2704,7 +2896,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionArgs2() {
-        GET_SYMBOL_DB("void f(int a[][4]) { }");
+        GET_SYMBOL_DB("void f(int a[][4]) { }\n");
         const Variable *a = db->getVariableFromVarId(1);
         ASSERT_EQUALS("a", a->nameToken()->str());
         ASSERT_EQUALS(2UL, a->dimensions().size());
@@ -2715,7 +2907,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionArgs4() {
-        GET_SYMBOL_DB("void f1(char [10], struct foo [10]);");
+        GET_SYMBOL_DB("void f1(char [10], struct foo [10]);\n");
         ASSERT_EQUALS(true, db->scopeList.front().functionList.size() == 1UL);
         const Function *func = &db->scopeList.front().functionList.front();
         ASSERT_EQUALS(true, func && func->argumentList.size() == 2UL);
@@ -2735,7 +2927,7 @@ class TestSymbolDatabase : public TestFixture {
                       "class Y {\n"
                       "  enum ABC {A,B,C};\n"
                       "  void f(enum ABC abc) {}\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS(true, db != nullptr);
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "f ( enum");
         ASSERT_EQUALS(true, f && f->function());
@@ -2750,7 +2942,7 @@ class TestSymbolDatabase : public TestFixture {
                       "class Y {\n"
                       "  enum ABC {A,B,C};\n"
                       "  void f(ABC abc) {}\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS(true, db != nullptr);
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "f ( ABC");
         ASSERT_EQUALS(true, f && f->function());
@@ -2767,7 +2959,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void bar() {\n"
                           "  struct AB ab;\n"
                           "  foo(&ab);\n"
-                          "};");
+                          "};\n");
             ASSERT_EQUALS(true, db != nullptr);
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( & ab");
             ASSERT_EQUALS(true, f && f->function());
@@ -2782,7 +2974,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void bar() {\n"
                           "  struct AB ab;\n"
                           "  foo(&ab);\n"
-                          "};");
+                          "};\n");
             ASSERT_EQUALS(true, db != nullptr);
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( & ab");
             ASSERT_EQUALS(true, f && f->function());
@@ -2797,7 +2989,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void bar() {\n"
                           "  AB ab;\n"
                           "  foo(&ab);\n"
-                          "};");
+                          "};\n");
             ASSERT_EQUALS(true, db != nullptr);
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( & ab");
             ASSERT_EQUALS(true, f && f->function());
@@ -2812,7 +3004,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void bar() {\n"
                           "  AB ab;\n"
                           "  foo(&ab);\n"
-                          "};");
+                          "};\n");
             ASSERT_EQUALS(true, db != nullptr);
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( & ab");
             ASSERT_EQUALS(true, f && f->function());
@@ -2831,7 +3023,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void bar() {\n"
                       "  struct B b;\n"
                       "  foo(b);\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS(true, db != nullptr);
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( b");
         ASSERT_EQUALS(true, f && f->function());
@@ -2847,7 +3039,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    enum C { };\n"
                       "  };\n"
                       "};\n"
-                      "void foo(A::B::C c) { }");
+                      "void foo(A::B::C c) { }\n");
         ASSERT_EQUALS(true, db != nullptr);
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo (");
         ASSERT_EQUALS(true, f && f->function());
@@ -2862,7 +3054,7 @@ class TestSymbolDatabase : public TestFixture {
                       "public:\n"
                       "  Fred(Whitespace = PRESERVE_WHITESPACE);\n"
                       "};\n"
-                      "Fred::Fred(Whitespace whitespace) { }");
+                      "Fred::Fred(Whitespace whitespace) { }\n");
         ASSERT_EQUALS(true, db != nullptr);
         ASSERT_EQUALS(3, db->scopeList.size());
         auto scope = db->scopeList.cbegin();
@@ -2880,7 +3072,7 @@ class TestSymbolDatabase : public TestFixture {
                       "public:\n"
                       "  void foo(char a[16]);\n"
                       "};\n"
-                      "void Fred::foo(char b[16]) { }");
+                      "void Fred::foo(char b[16]) { }\n");
         ASSERT_EQUALS(true, db != nullptr);
         ASSERT_EQUALS(3, db->scopeList.size());
         auto scope = db->scopeList.cbegin();
@@ -2900,7 +3092,7 @@ class TestSymbolDatabase : public TestFixture {
                       "};\n"
                       "struct B : public A {\n"
                       "    void foo(B::E e) { }\n"
-                      "};");
+                      "};\n");
 
         ASSERT_EQUALS(true, db != nullptr);
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo (");
@@ -2921,7 +3113,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    B(S s);\n"
                       "};\n"
                       "B::B(A::E e) { }\n"
-                      "B::B(A::S s) { }");
+                      "B::B(A::S s) { }\n");
 
         ASSERT_EQUALS(true, db != nullptr);
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "B ( A :: E");
@@ -2940,7 +3132,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionArgs14() { // #7697
-        GET_SYMBOL_DB("void f(int (&a)[10], int (&b)[10]);");
+        GET_SYMBOL_DB("void f(int (&a)[10], int (&b)[10]);\n");
         (void)db;
         const Function *func = tokenizer.tokens()->next()->function();
         ASSERT_EQUALS(true, func != nullptr);
@@ -2976,7 +3168,7 @@ class TestSymbolDatabase : public TestFixture {
     void functionArgs16() { // #9591
         const char code[] =
             "struct A { int var; };\n"
-            "void foo(int x, decltype(A::var) *&p) {}";
+            "void foo(int x, decltype(A::var) *&p) {}\n";
         GET_SYMBOL_DB(code);
         ASSERT(db);
         const Scope *scope = db->functionScopes.front();
@@ -2989,7 +3181,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionArgs17() {
-        const char code[] = "void f(int (*fp)(), int x, int y) {}";
+        const char code[] = "void f(int (*fp)(), int x, int y) {}\n";
         GET_SYMBOL_DB(code);
         ASSERT(db != nullptr);
         const Scope *scope = db->functionScopes.front();
@@ -2998,7 +3190,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionArgs18() {
-        const char code[] = "void f(int (*param1)[2], int param2) {}";
+        const char code[] = "void f(int (*param1)[2], int param2) {}\n";
         GET_SYMBOL_DB(code);
         ASSERT(db != nullptr);
         const Scope *scope = db->functionScopes.front();
@@ -3007,7 +3199,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionArgs19() {
-        const char code[] = "void f(int (*fp)(int), int x, int y) {}";
+        const char code[] = "void f(int (*fp)(int), int x, int y) {}\n";
         GET_SYMBOL_DB(code);
         ASSERT(db != nullptr);
         const Scope *scope = db->functionScopes.front();
@@ -3017,7 +3209,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void functionArgs20() {
         {
-            const char code[] = "void f(void *(*g)(void *) = [](void *p) { return p; }) {}"; // #11769
+            const char code[] = "void f(void *(*g)(void *) = [](void *p) { return p; }) {}\n"; // #11769
             GET_SYMBOL_DB(code);
             ASSERT(db != nullptr);
             const Scope *scope = db->functionScopes.front();
@@ -3027,7 +3219,7 @@ class TestSymbolDatabase : public TestFixture {
             TODO_ASSERT(arg->hasDefault());
         }
         {
-            const char code[] = "void f() { auto g = [&](const std::function<int(int)>& h = [](int i) -> int { return i; }) {}; }"; // #12338
+            const char code[] = "void f() { auto g = [&](const std::function<int(int)>& h = [](int i) -> int { return i; }) {}; }\n"; // #12338
             GET_SYMBOL_DB(code);
             ASSERT(db != nullptr);
             ASSERT_EQUALS(3, db->scopeList.size());
@@ -3058,7 +3250,7 @@ class TestSymbolDatabase : public TestFixture {
                             "template<typename T>\n"
                             "struct S { using t = int; };\n"
                             "template<typename T>\n"
-                            "S<T> operator+(const S<T>&lhs, typename S<T>::t) { return lhs; }";
+                            "S<T> operator+(const S<T>&lhs, typename S<T>::t) { return lhs; }\n";
         GET_SYMBOL_DB(code);
         ASSERT(db != nullptr);
         auto it = db->functionScopes.begin();
@@ -3094,7 +3286,7 @@ class TestSymbolDatabase : public TestFixture {
     void functionImplicitlyVirtual() {
         GET_SYMBOL_DB("class base { virtual void f(); };\n"
                       "class derived : base { void f(); };\n"
-                      "void derived::f() {}");
+                      "void derived::f() {}\n");
         ASSERT(db != nullptr);
         ASSERT_EQUALS(4, db->scopeList.size());
         const Function *function = db->scopeList.back().function;
@@ -3120,7 +3312,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionIsInlineKeyword() {
-        GET_SYMBOL_DB("inline void fs() {}");
+        GET_SYMBOL_DB("inline void fs() {}\n");
         (void)db;
         const Function *func = db->scopeList.back().function;
         ASSERT(func);
@@ -3128,7 +3320,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionStatic() {
-        GET_SYMBOL_DB("static void fs() {  }");
+        GET_SYMBOL_DB("static void fs() {  }\n");
         (void)db;
         const Function *func = db->scopeList.back().function;
         ASSERT(func);
@@ -3136,7 +3328,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionReturnsReference() {
-        GET_SYMBOL_DB("Fred::Reference foo();");
+        GET_SYMBOL_DB("Fred::Reference foo();\n");
         ASSERT_EQUALS(1, db->scopeList.back().functionList.size());
         const Function &func = *db->scopeList.back().functionList.cbegin();
         ASSERT(!Function::returnsReference(&func, false));
@@ -3149,7 +3341,7 @@ class TestSymbolDatabase : public TestFixture {
                       "        class X { X(int); };\n"
                       "    }\n"
                       "}\n"
-                      "namespace barney { X::X(int) { } }");
+                      "namespace barney { X::X(int) { } }\n");
 
         // Locate the scope for the class..
         auto it = std::find_if(db->scopeList.cbegin(), db->scopeList.cend(), [](const Scope& s) {
@@ -3180,7 +3372,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    namespace barney {\n"
                       "        X::X(int) { }\n"
                       "    }\n"
-                      "}");
+                      "}\n");
 
         // Locate the scope for the class..
         auto it = std::find_if(db->scopeList.cbegin(), db->scopeList.cend(), [](const Scope& s) {
@@ -3203,7 +3395,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void namespaces3() { // #3854 - namespace with unknown macro
         GET_SYMBOL_DB("namespace fred UNKNOWN_MACRO(default) {\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS(2U, db->scopeList.size());
         ASSERT_EQUALS_ENUM(ScopeType::eGlobal, db->scopeList.front().type);
         ASSERT_EQUALS_ENUM(ScopeType::eNamespace, db->scopeList.back().type);
@@ -3212,7 +3404,7 @@ class TestSymbolDatabase : public TestFixture {
     void namespaces4() { // #4698 - type lookup
         GET_SYMBOL_DB("struct A { int a; };\n"
                       "namespace fred { struct A {}; }\n"
-                      "fred::A fredA;");
+                      "fred::A fredA;\n");
         const Variable *fredA = db->getVariableFromVarId(2U);
         ASSERT_EQUALS("fredA", fredA->name());
         const Type *fredAType = fredA->type();
@@ -3266,7 +3458,7 @@ class TestSymbolDatabase : public TestFixture {
                            "    catch (const X::Error2 & x) { }\n"
                            "    catch (Error3 x) { }\n"
                            "    catch (X::Error4 x) { }\n"
-                           "}";
+                           "}\n";
         GET_SYMBOL_DB(str);
         ASSERT_EQUALS("", errout_str());
         ASSERT(db && db->variableList().size() == 5); // index 0 + 4 variables
@@ -3277,11 +3469,11 @@ class TestSymbolDatabase : public TestFixture {
     void symboldatabase1() {
         check("namespace foo {\n"
               "    class bar;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class foo : public bar < int, int> {\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3289,13 +3481,13 @@ class TestSymbolDatabase : public TestFixture {
         check("class foo {\n"
               "public:\n"
               "foo() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class foo {\n"
               "class bar;\n"
               "foo() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3303,7 +3495,7 @@ class TestSymbolDatabase : public TestFixture {
         check("typedef void (func_type)();\n"
               "struct A {\n"
               "    friend func_type f : 2;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3311,14 +3503,14 @@ class TestSymbolDatabase : public TestFixture {
         check("static void function_declaration_before(void) __attribute__((__used__));\n"
               "static void function_declaration_before(void) {}\n"
               "static void function_declaration_after(void) {}\n"
-              "static void function_declaration_after(void) __attribute__((__used__));");
+              "static void function_declaration_after(void) __attribute__((__used__));\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("main(int argc, char *argv[]) { }", true, false);
+        check("main(int argc, char *argv[]) { }\n", true, false);
         ASSERT_EQUALS("", errout_str());
 
         const Settings s = settingsBuilder(settings1).severity(Severity::portability).build();
-        check("main(int argc, char *argv[]) { }", false, false, &s);
+        check("main(int argc, char *argv[]) { }\n", false, false, &s);
         ASSERT_EQUALS("[test.c:1:1]: (portability) Omitted return type of function 'main' defaults to int, this is not supported by ISO C99 and later standards. [returnImplicitInt]\n",
                       errout_str());
 
@@ -3327,7 +3519,7 @@ class TestSymbolDatabase : public TestFixture {
               "    {\n"
               "        return std::locale();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace X {\n"
@@ -3335,12 +3527,12 @@ class TestSymbolDatabase : public TestFixture {
               "    static void function_declaration_before(void) {}\n"
               "    static void function_declaration_after(void) {}\n"
               "    static void function_declaration_after(void) __attribute__((__used__));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("testing::testing()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:10]: (debug) Executable scope 'testing' with unknown function. [symbolDatabaseWarning]\n"
             "[test.cpp:1:10]: (debug) Executable scope 'testing' with unknown function. [symbolDatabaseWarning]\n", // duplicate
@@ -3351,7 +3543,7 @@ class TestSymbolDatabase : public TestFixture {
         // ticket #2178 - segmentation fault
         ASSERT_THROW_INTERNAL(check("int CL_INLINE_DECL(integer_decode_float) (int x) {\n"
                                     "    return (sign ? cl_I() : 0);\n"
-                                    "}"), UNKNOWN_MACRO);
+                                    "}\n"), UNKNOWN_MACRO);
     }
 
     void symboldatabase6() {
@@ -3377,7 +3569,7 @@ class TestSymbolDatabase : public TestFixture {
               "{\n"
               "public:\n"
               "    int f() { return C< ::D,int>::f(); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3390,7 +3582,7 @@ class TestSymbolDatabase : public TestFixture {
               "    {\n"
               "        return vcl::unotools::createStandardColorSpace();\n"
               "    }\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3417,7 +3609,7 @@ class TestSymbolDatabase : public TestFixture {
               "};\n"
               "class B {\n"
               "  friend void A::f();\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3427,7 +3619,7 @@ class TestSymbolDatabase : public TestFixture {
         check("int g ();\n"
               "struct S {\n"
               "  int i : (false ? g () : 1);\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3436,7 +3628,7 @@ class TestSymbolDatabase : public TestFixture {
         // ticket #2547 - segmentation fault
         check("class foo {\n"
               "    void bar2 () = __null;\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3445,7 +3637,7 @@ class TestSymbolDatabase : public TestFixture {
         // ticket #2577 - segmentation fault
         check("class foo {\n"
               "    void bar2 () = A::f;\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3457,14 +3649,14 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase17() {
         // ticket #2657 - segmentation fault
-        check("{return f(){}}");
+        check("{return f(){}}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase19() {
         // ticket #2991 - segmentation fault
-        check("::y(){x}");
+        check("::y(){x}\n");
 
         ASSERT_EQUALS(
             "[test.cpp:1:3]: (debug) Executable scope 'y' with unknown function. [symbolDatabaseWarning]\n"
@@ -3485,7 +3677,7 @@ class TestSymbolDatabase : public TestFixture {
               "};\n"
               "Fred::func() const {\n"
               "    Foo foo;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3493,13 +3685,13 @@ class TestSymbolDatabase : public TestFixture {
     // ticket 3437 (segmentation fault)
     void symboldatabase22() {
         check("template <class C> struct A {};\n"
-              "A<int> a;");
+              "A<int> a;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     // ticket 3435 (std::vector)
     void symboldatabase23() {
-        GET_SYMBOL_DB("class A { std::vector<int*> ints; };");
+        GET_SYMBOL_DB("class A { std::vector<int*> ints; };\n");
         ASSERT_EQUALS(2U, db->scopeList.size());
         const Scope &scope = db->scopeList.back();
         ASSERT_EQUALS(1U, scope.varlist.size());
@@ -3515,7 +3707,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    Fred();\n"
                       "};\n"
                       "Fred::Fred() { }\n"
-                      "Fred::~Fred() { }");
+                      "Fred::~Fred() { }\n");
         // Global scope, Fred, Fred::Fred, Fred::~Fred
         ASSERT_EQUALS(4U, db->scopeList.size());
 
@@ -3552,7 +3744,7 @@ class TestSymbolDatabase : public TestFixture {
         const char str[] = "int main() {\n"
                            "    foo bar;\n"
                            "    throw bar;\n"
-                           "}";
+                           "}\n";
         GET_SYMBOL_DB(str);
         ASSERT_EQUALS("", errout_str());
         ASSERT(db && db->variableList().size() == 2); // index 0 + 1 variable
@@ -3562,7 +3754,7 @@ class TestSymbolDatabase : public TestFixture {
     void symboldatabase26() {
         const char str[] = "int main() {\n"
                            "    throw bar;\n"
-                           "}";
+                           "}\n";
         GET_SYMBOL_DB_C(str);
         ASSERT_EQUALS("", errout_str());
         ASSERT(db && db->variableList().size() == 2); // index 0 + 1 variable
@@ -3574,13 +3766,13 @@ class TestSymbolDatabase : public TestFixture {
               "{\n"
               "    B1()\n"
               "    {} C(int) : B1() class\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase28() {
         GET_SYMBOL_DB("struct S {};\n"
-                      "void foo(struct S s) {}");
+                      "void foo(struct S s) {}\n");
         ASSERT(db && db->getVariableFromVarId(1) && db->getVariableFromVarId(1)->typeScope() && db->getVariableFromVarId(1)->typeScope()->className == "S");
     }
 
@@ -3588,13 +3780,13 @@ class TestSymbolDatabase : public TestFixture {
     void symboldatabase29() {
         check("struct B : A {\n"
               "    B() : A {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase30() {
         GET_SYMBOL_DB("struct A { void foo(const int a); };\n"
-                      "void A::foo(int a) { }");
+                      "void A::foo(int a) { }\n");
         ASSERT(db && db->functionScopes.size() == 1 && db->functionScopes[0]->functionOf);
     }
 
@@ -3621,7 +3813,7 @@ class TestSymbolDatabase : public TestFixture {
                       "::Foo::Sub::Sub() { }\n"
                       "class Foo;\n"
                       "class Bar;\n"
-                      "class Sub;");
+                      "class Sub;\n");
         ASSERT(db && db->typeList.size() == 5);
 
         auto i = db->typeList.cbegin();
@@ -3644,7 +3836,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void foo() {}\n"
                       "};\n"
                       "class Deri : Base {\n"
-                      "};");
+                      "};\n");
         ASSERT(db && db->findScopeByName("Deri") && db->findScopeByName("Deri")->definedType->getFunction("foo"));
     }
 
@@ -3654,7 +3846,7 @@ class TestSymbolDatabase : public TestFixture {
                       "static struct A::B u(0);\n"
                       "static struct A::B v{0};\n"
                       "static struct A::B w({0});\n"
-                      "void foo() { }");
+                      "void foo() { }\n");
         ASSERT(db && db->functionScopes.size() == 1);
     }
 
@@ -3663,18 +3855,17 @@ class TestSymbolDatabase : public TestFixture {
               "typedef _Atomic(int)&atomic_int_ref;\n"
               "struct S {\n"
               "  _Atomic union { int n; };\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:2:1]: (debug) Failed to parse 'typedef _Atomic ( int ) & atomic_int_ref ;'. The checking continues anyway. [simplifyTypedef]\n", errout_str());
     }
 
     void symboldatabase35() { // ticket #4806 and #4841
-        check("class FragmentQueue : public CL_NS(util)::PriorityQueue<CL_NS(util)::Deletor::Object<TextFragment> >\n"
-              "{};");
-        ASSERT_EQUALS("", errout_str());
+        ASSERT_THROW_INTERNAL(check("class FragmentQueue : public CL_NS(util)::PriorityQueue<CL_NS(util)::Deletor::Object<TextFragment> >\n"
+                                    "{};\n"), UNKNOWN_MACRO);
     }
 
     void symboldatabase36() { // ticket #4892
-        ASSERT_THROW_INTERNAL(check("void struct ( ) { if ( 1 ) } int main ( ) { }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(check("void struct ( ) { if ( 1 ) } int main ( ) { }\n"), SYNTAX);
     }
 
     void symboldatabase37() {
@@ -3688,7 +3879,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    Fred(const struct Barney & b) { barney = b; }\n"
                       "private:\n"
                       "    struct Barney barney;\n"
-                      "};");
+                      "};\n");
         ASSERT(db && db->typeList.size() == 3);
 
         auto i = db->typeList.cbegin();
@@ -3714,24 +3905,24 @@ class TestSymbolDatabase : public TestFixture {
               "{\n"
               "  scoped_service( T* ptr ) : scoped_service<service>(ptr), m_ptr(ptr) {}\n"
               "  T* const m_ptr;\n"
-              "};");
+              "};\n");
     }
 
     void symboldatabase40() { // ticket #5153
         check("void f() {\n"
               "    try {  }\n"
               "    catch (std::bad_alloc) {  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase41() { // ticket #5197 (unknown macro)
-        GET_SYMBOL_DB("struct X1 { MACRO1 f(int spd) MACRO2; };");
+        GET_SYMBOL_DB("struct X1 { MACRO1 f(int spd) MACRO2; };\n");
         ASSERT(db && db->findScopeByName("X1") && db->findScopeByName("X1")->functionList.size() == 1 && !db->findScopeByName("X1")->functionList.front().hasBody());
     }
 
     void symboldatabase42() { // only put variables in variable list
-        GET_SYMBOL_DB("void f() { extern int x(); }");
+        GET_SYMBOL_DB("void f() { extern int x(); }\n");
         ASSERT(db != nullptr);
         const Scope * const fscope = db ? db->findScopeByName("f") : nullptr;
         ASSERT(fscope != nullptr);
@@ -3741,7 +3932,7 @@ class TestSymbolDatabase : public TestFixture {
     void symboldatabase43() { // ticket #4738
         check("void f() {\n"
               "    new int;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3751,7 +3942,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void foo() {\n"
                       "    int k { 1 };\n"
                       "    int l ( 1 );\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
         ASSERT_EQUALS(4U, db->variableList().size() - 1);
         ASSERT_EQUALS(2U, db->scopeList.size());
@@ -3772,7 +3963,7 @@ class TestSymbolDatabase : public TestFixture {
                       "        .span = (S) { 0UL },\n"
                       "        .flags = (x ? 256 : 0),\n"
                       "    };\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
         ASSERT_EQUALS(4U, db->variableList().size() - 1);
@@ -3794,7 +3985,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("struct S { };\n"
                       "namespace {\n"
                       "    struct S { };\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
         ASSERT_EQUALS(4U, db->scopeList.size());
@@ -3820,7 +4011,7 @@ class TestSymbolDatabase : public TestFixture {
                       "using namespace NS;\n"
                       "MyClass::~MyClass() {\n"
                       "    delete Example;\n"
-                      "}");
+                      "}\n");
         ASSERT(db && !db->functionScopes.empty() && db->functionScopes.front()->function && db->functionScopes.front()->function->functionScope == db->functionScopes.front());
     }
 
@@ -3833,7 +4024,7 @@ class TestSymbolDatabase : public TestFixture {
                       "}\n"
                       "using namespace NS;\n"
                       "MyClass::~MyClass() { }\n"
-                      "MyClass::MyClass() { }");
+                      "MyClass::MyClass() { }\n");
         ASSERT(db && !db->functionScopes.empty() && db->functionScopes.front()->function && db->functionScopes.front()->function->functionScope == db->functionScopes.front());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "MyClass ( ) ;");
@@ -3848,7 +4039,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("namespace Ns { class C; }\n"
                       "void f1() { char *p; *p = 0; }\n"
                       "class Ns::C* p;\n"
-                      "void f2() { char *p; *p = 0; }");
+                      "void f2() { char *p; *p = 0; }\n");
         ASSERT(db != nullptr);
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "p ; void f2");
         ASSERT_EQUALS(true, db && f && f->variable());
@@ -3873,7 +4064,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    : object_(object),\n"
                       "      member_(member) {\n"
                       "  }\n"
-                      "};");
+                      "};\n");
         ASSERT(db != nullptr);
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "_ConstTessMemberResultCallback_0_0 (");
         ASSERT_EQUALS(true, db && f && f->function() && f->function()->isConstructor());
@@ -3885,7 +4076,7 @@ class TestSymbolDatabase : public TestFixture {
                       "static const float f3 = 2 * std::foo3(a, b);\n"
                       "static const float f4 = c * foo4(a, b);\n"
                       "static const int i1 = 2 & foo5(a, b);\n"
-                      "static const bool b1 = 2 > foo6(a, b);");
+                      "static const bool b1 = 2 > foo6(a, b);\n");
         ASSERT(db != nullptr);
         ASSERT(findFunctionByName("foo1", &db->scopeList.front()) == nullptr);
         ASSERT(findFunctionByName("foo2", &db->scopeList.front()) == nullptr);
@@ -3899,7 +4090,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void foo() {\n"
                       "    int i = 0;\n"
                       "    S s{ { i }, 0 };\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
         ASSERT_EQUALS(2, db->scopeList.size());
@@ -3909,8 +4100,8 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void symboldatabase53() { // #7124
-        GET_SYMBOL_DB("int32_t x;"
-                      "std::int32_t y;");
+        GET_SYMBOL_DB("int32_t x;\n"
+                      "std::int32_t y;\n");
 
         ASSERT(db != nullptr);
         ASSERT(db->getVariableFromVarId(1) != nullptr);
@@ -3924,7 +4115,7 @@ class TestSymbolDatabase : public TestFixture {
                       "  void getReg() const override {\n"
                       "    assert(Kind == k_ShiftExtend);\n"
                       "  }\n"
-                      "};");
+                      "};\n");
 
         ASSERT(db != nullptr);
         ASSERT_EQUALS(1U, db->functionScopes.size());
@@ -3935,7 +4126,7 @@ class TestSymbolDatabase : public TestFixture {
     void symboldatabase55() { // #7767
         GET_SYMBOL_DB("PRIVATE S32 testfunc(void) {\n"
                       "    return 0;\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
         ASSERT_EQUALS(1U, db->functionScopes.size());
@@ -3950,7 +4141,7 @@ class TestSymbolDatabase : public TestFixture {
                           "        virtual void f();\n"
                           "    };\n"
                           "    friend void NestedClass::f();\n"
-                          "}");
+                          "}\n");
 
             ASSERT(db != nullptr);
             ASSERT_EQUALS(0U, db->functionScopes.size());
@@ -3961,7 +4152,7 @@ class TestSymbolDatabase : public TestFixture {
             GET_SYMBOL_DB("class Class {\n"
                           "    friend void f1();\n"
                           "    friend void f2() { }\n"
-                          "}");
+                          "}\n");
 
             ASSERT(db != nullptr);
             ASSERT_EQUALS(1U, db->functionScopes.size());
@@ -3970,7 +4161,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         {
             GET_SYMBOL_DB_C("friend f1();\n"
-                            "friend f2() { }");
+                            "friend f2() { }\n");
 
             ASSERT(db != nullptr);
             ASSERT_EQUALS(2U, db->scopeList.size());
@@ -3985,7 +4176,7 @@ class TestSymbolDatabase : public TestFixture {
                       "         return 1;\n"
                       "    else\n"
                       "         return 1;\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
         ASSERT(db->scopeList.size() == 4U);
         auto it = db->scopeList.cbegin();
@@ -4005,7 +4196,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    class A : public B\n"
                       "    {\n"
                       "    };\n"
-                      "};");
+                      "};\n");
         ASSERT(db != nullptr);
         ASSERT(db->typeList.size() == 3U);
         auto it = db->typeList.cbegin();
@@ -4020,13 +4211,13 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase59() { // #8465
         GET_SYMBOL_DB("struct A::B ab[10];\n"
-                      "void f() {}");
+                      "void f() {}\n");
         ASSERT(db != nullptr);
         ASSERT(db && db->scopeList.size() == 2);
     }
 
     void symboldatabase60() { // #8470
-        GET_SYMBOL_DB("struct A::someType A::bar() { return 0; }");
+        GET_SYMBOL_DB("struct A::someType A::bar() { return 0; }\n");
         ASSERT(db != nullptr);
         ASSERT(db && db->scopeList.size() == 2);
     }
@@ -4040,7 +4231,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    info = new (nothrow) struct Fred::Info();\n"
                       "    info = new struct Fred::Info();\n"
                       "    memset(info, 0, sizeof(struct Fred::Info));\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
         ASSERT(db && db->scopeList.size() == 4);
@@ -4057,7 +4248,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    for (std::vector<struct A::X>::const_iterator it = includes.begin(); it != includes.end(); ++it) {\n"
                           "        const struct A::X currentIncList = *it;\n"
                           "    }\n"
-                          "}");
+                          "}\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 5);
             const Scope *scope = db->findScopeByName("A");
@@ -4076,7 +4267,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    for (std::vector<class A::X>::const_iterator it = includes.begin(); it != includes.end(); ++it) {\n"
                           "        const class A::X currentIncList = *it;\n"
                           "    }\n"
-                          "}");
+                          "}\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 5);
             const Scope *scope = db->findScopeByName("A");
@@ -4095,7 +4286,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    for (std::vector<union A::X>::const_iterator it = includes.begin(); it != includes.end(); ++it) {\n"
                           "        const union A::X currentIncList = *it;\n"
                           "    }\n"
-                          "}");
+                          "}\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 5);
             const Scope *scope = db->findScopeByName("A");
@@ -4114,7 +4305,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    for (std::vector<enum A::X>::const_iterator it = includes.begin(); it != includes.end(); ++it) {\n"
                           "        const enum A::X currentIncList = *it;\n"
                           "    }\n"
-                          "}");
+                          "}\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 5);
             const Scope *scope = db->findScopeByName("A");
@@ -4127,12 +4318,12 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase63() {
         {
-            GET_SYMBOL_DB("template class T<int> ; void foo() { }");
+            GET_SYMBOL_DB("template class T<int> ; void foo() { }\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 2);
         }
         {
-            GET_SYMBOL_DB("template struct T<int> ; void foo() { }");
+            GET_SYMBOL_DB("template struct T<int> ; void foo() { }\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 2);
         }
@@ -4146,7 +4337,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    ~impl() { }\n"
                           "    impl(const impl &) { }\n"
                           "    void foo(const impl &, const impl &) const { }\n"
-                          "};");
+                          "};\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 7);
@@ -4189,7 +4380,7 @@ class TestSymbolDatabase : public TestFixture {
                           "Fred::impl::impl() { }\n"
                           "Fred::impl::~impl() { }\n"
                           "Fred::impl::impl(const Fred::impl &) { }\n"
-                          "void Fred::impl::foo(const Fred::impl &, const Fred::impl &) const { }");
+                          "void Fred::impl::foo(const Fred::impl &, const Fred::impl &) const { }\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 7);
@@ -4230,7 +4421,7 @@ class TestSymbolDatabase : public TestFixture {
                           "        impl(const impl &) { }\n"
                           "        void foo(const impl &, const impl &) const { }\n"
                           "    };\n"
-                          "}");
+                          "}\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4275,7 +4466,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    Fred::impl::~impl() { }\n"
                           "    Fred::impl::impl(const Fred::impl &) { }\n"
                           "    void Fred::impl::foo(const Fred::impl &, const Fred::impl &) const { }\n"
-                          "}");
+                          "}\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4320,7 +4511,7 @@ class TestSymbolDatabase : public TestFixture {
                           "NS::Fred::impl::impl() { }\n"
                           "NS::Fred::impl::~impl() { }\n"
                           "NS::Fred::impl::impl(const NS::Fred::impl &) { }\n"
-                          "void NS::Fred::impl::foo(const NS::Fred::impl &, const NS::Fred::impl &) const { }");
+                          "void NS::Fred::impl::foo(const NS::Fred::impl &, const NS::Fred::impl &) const { }\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4361,7 +4552,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    ~impl() { }\n"
                           "    impl(const impl &) { }\n"
                           "    void foo(const impl &, const impl &) const { }\n"
-                          "};");
+                          "};\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4406,7 +4597,7 @@ class TestSymbolDatabase : public TestFixture {
                           "NS::Fred::impl::impl() { }\n"
                           "NS::Fred::impl::~impl() { }\n"
                           "NS::Fred::impl::impl(const NS::Fred::impl &) { }\n"
-                          "void NS::Fred::impl::foo(const NS::Fred::impl &, const NS::Fred::impl &) const { }");
+                          "void NS::Fred::impl::foo(const NS::Fred::impl &, const NS::Fred::impl &) const { }\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4453,7 +4644,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    Fred::impl::~impl() { }\n"
                           "    Fred::impl::impl(const Fred::impl &) { }\n"
                           "    void Fred::impl::foo(const Fred::impl &, const Fred::impl &) const { }\n"
-                          "}");
+                          "}\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4499,7 +4690,7 @@ class TestSymbolDatabase : public TestFixture {
                           "Fred::impl::impl() { }\n"
                           "Fred::impl::~impl() { }\n"
                           "Fred::impl::impl(const Fred::impl &) { }\n"
-                          "void Fred::impl::foo(const Fred::impl &, const Fred::impl &) const { }");
+                          "void Fred::impl::foo(const Fred::impl &, const Fred::impl &) const { }\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4538,7 +4729,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    ~impl() { }\n"
                           "    impl(const impl &) { }\n"
                           "    void foo(const impl &, const impl &) const { }\n"
-                          "};");
+                          "};\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 7);
@@ -4581,7 +4772,7 @@ class TestSymbolDatabase : public TestFixture {
                           "template <typename A> Fred<A>::impl::impl() { }\n"
                           "template <typename A> Fred<A>::impl::~impl() { }\n"
                           "template <typename A> Fred<A>::impl::impl(const Fred<A>::impl &) { }\n"
-                          "template <typename A> void Fred<A>::impl::foo(const Fred<A>::impl &, const Fred<A>::impl &) const { }");
+                          "template <typename A> void Fred<A>::impl::foo(const Fred<A>::impl &, const Fred<A>::impl &) const { }\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 7);
@@ -4622,7 +4813,7 @@ class TestSymbolDatabase : public TestFixture {
                           "        impl(const impl &) { }\n"
                           "        void foo(const impl &, const impl &) const { }\n"
                           "    };\n"
-                          "}");
+                          "}\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4667,7 +4858,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    template <typename A> Fred<A>::impl::~impl() { }\n"
                           "    template <typename A> Fred<A>::impl::impl(const Fred<A>::impl &) { }\n"
                           "    template <typename A> void Fred<A>::impl::foo(const Fred<A>::impl &, const Fred<A>::impl &) const { }\n"
-                          "}");
+                          "}\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4712,7 +4903,7 @@ class TestSymbolDatabase : public TestFixture {
                           "template <typename A> NS::Fred<A>::impl::impl() { }\n"
                           "template <typename A> NS::Fred<A>::impl::~impl() { }\n"
                           "template <typename A> NS::Fred<A>::impl::impl(const NS::Fred<A>::impl &) { }\n"
-                          "template <typename A> void NS::Fred<A>::impl::foo(const NS::Fred<A>::impl &, const NS::Fred<A>::impl &) const { }");
+                          "template <typename A> void NS::Fred<A>::impl::foo(const NS::Fred<A>::impl &, const NS::Fred<A>::impl &) const { }\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4753,7 +4944,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    ~impl() { }\n"
                           "    impl(const impl &) { }\n"
                           "    void foo(const impl &, const impl &) const { }\n"
-                          "};");
+                          "};\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4798,7 +4989,7 @@ class TestSymbolDatabase : public TestFixture {
                           "template <typename A> NS::Fred<A>::impl::impl() { }\n"
                           "template <typename A> NS::Fred<A>::impl::~impl() { }\n"
                           "template <typename A> NS::Fred<A>::impl::impl(const NS::Fred<A>::impl &) { }\n"
-                          "template <typename A> void NS::Fred<A>::impl::foo(const NS::Fred<A>::impl &, const NS::Fred<A>::impl &) const { }");
+                          "template <typename A> void NS::Fred<A>::impl::foo(const NS::Fred<A>::impl &, const NS::Fred<A>::impl &) const { }\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4845,7 +5036,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    template <typename A> Fred<A>::impl::~impl() { }\n"
                           "    template <typename A> Fred<A>::impl::impl(const Fred<A>::impl &) { }\n"
                           "    template <typename A> void Fred<A>::impl::foo(const Fred<A>::impl &, const Fred<A>::impl &) const { }\n"
-                          "}");
+                          "}\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4891,7 +5082,7 @@ class TestSymbolDatabase : public TestFixture {
                           "template <typename A> Fred<A>::impl::impl() { }\n"
                           "template <typename A> Fred<A>::impl::~impl() { }\n"
                           "template <typename A> Fred<A>::impl::impl(const Fred<A>::impl &) { }\n"
-                          "template <typename A> void Fred<A>::impl::foo(const Fred<A>::impl &, const Fred<A>::impl &) const { }");
+                          "template <typename A> void Fred<A>::impl::foo(const Fred<A>::impl &, const Fred<A>::impl &) const { }\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4927,7 +5118,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase65() {
         // don't crash on missing links from instantiation of template with typedef
-        check("int ( * X0 ) ( long ) < int ( ) ( long ) > :: f0 ( int * ) { return 0 ; }");
+        check("int ( * X0 ) ( long ) < int ( ) ( long ) > :: f0 ( int * ) { return 0 ; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int g();\n" // #11385
@@ -4940,14 +5131,14 @@ class TestSymbolDatabase : public TestFixture {
     void symboldatabase66() { // #8540
         GET_SYMBOL_DB("enum class ENUM1;\n"
                       "enum class ENUM2 { MEMBER2 };\n"
-                      "enum class ENUM3 : int { MEMBER1, };");
+                      "enum class ENUM3 : int { MEMBER1, };\n");
         ASSERT(db != nullptr);
         ASSERT(db && db->scopeList.size() == 3);
         ASSERT(db && db->typeList.size() == 3);
     }
 
     void symboldatabase67() { // #8538
-        GET_SYMBOL_DB("std::string get_endpoint_url() const noexcept override;");
+        GET_SYMBOL_DB("std::string get_endpoint_url() const noexcept override;\n");
         const Function *f = db ? &db->scopeList.front().functionList.front() : nullptr;
         ASSERT(f != nullptr);
         ASSERT(f && f->hasOverrideSpecifier());
@@ -4961,7 +5152,7 @@ class TestSymbolDatabase : public TestFixture {
                       "};\n"
                       "struct Foo : Bar {\n"
                       "    virtual std::string get_endpoint_url() const noexcept override final;\n"
-                      "};");
+                      "};\n");
         const Token *f = db ? Token::findsimplematch(tokenizer.tokens(), "get_endpoint_url ( ) const noexcept ( true ) ;") : nullptr;
         ASSERT(f != nullptr);
         ASSERT(f && f->function() && f->function()->token->linenr() == 2);
@@ -4987,7 +5178,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void foo() volatile { }\n"
                       "    void foo() const { }\n"
                       "    void foo() { }\n"
-                      "};");
+                      "};\n");
         const Token *f = db ? Token::findsimplematch(tokenizer.tokens(), "foo ( ) const volatile {") : nullptr;
         ASSERT(f != nullptr);
         ASSERT(f && f->function() && f->function()->token->linenr() == 3);
@@ -5012,20 +5203,20 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase70() {
         {
-            GET_SYMBOL_DB("class Map<String,Entry>::Entry* e;");
+            GET_SYMBOL_DB("class Map<String,Entry>::Entry* e;\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 1);
             ASSERT(db && db->variableList().size() == 2);
         }
         {
-            GET_SYMBOL_DB("template class boost::token_iterator_generator<boost::offset_separator>::type; void foo() { }");
+            GET_SYMBOL_DB("template class boost::token_iterator_generator<boost::offset_separator>::type; void foo() { }\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 2);
         }
         {
             GET_SYMBOL_DB("void foo() {\n"
                           "    return class Arm_relocate_functions<big_endian>::thumb32_branch_offset(upper_insn, lower_insn);\n"
-                          "}");
+                          "}\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 2);
         }
@@ -5033,7 +5224,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase71() {
         GET_SYMBOL_DB("class A { };\n"
-                      "class B final : public A { };");
+                      "class B final : public A { };\n");
         ASSERT(db && db->scopeList.size() == 3);
         ASSERT(db && db->typeList.size() == 2);
     }
@@ -5043,7 +5234,7 @@ class TestSymbolDatabase : public TestFixture {
                       "struct A::B {\n"
                       "    B() = default;\n"
                       "    B(const B&) {}\n"
-                      "};");
+                      "};\n");
 
         ASSERT(db && db->scopeList.size() == 4);
         ASSERT(db && db->typeList.size() == 2);
@@ -5055,7 +5246,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase74() { // #8838 - final
         GET_SYMBOL_DB("class Base { virtual int f() const = 0; };\n"
-                      "class Derived : Base { virtual int f() const final { return 6; } };");
+                      "class Derived : Base { virtual int f() const final { return 6; } };\n");
 
         ASSERT_EQUALS(4, db->scopeList.size());
         ASSERT_EQUALS(1, db->functionScopes.size());
@@ -5078,7 +5269,7 @@ class TestSymbolDatabase : public TestFixture {
                           "auto optional<T>::value() && -> T && {}\n"
                           "template <typename T>\n"
                           "auto optional<T>::value() const & -> T const & {}\n"
-                          "optional<int> i;");
+                          "optional<int> i;\n");
 
             ASSERT_EQUALS(5, db->scopeList.size());
             ASSERT_EQUALS(3, db->functionScopes.size());
@@ -5123,7 +5314,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("namespace foo {\n"
                       "  using namespace bar::baz;\n"
                       "  auto func(int arg) -> bar::quux {}\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS(2, db->mVariableList.size());
     }
 
@@ -5132,7 +5323,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void f() {\n"
                       "  using T3 = typename T1::template T3<T2>;\n"
                       "  T3 t;\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS(2, db->mVariableList.size());
     }
 
@@ -5143,7 +5334,7 @@ class TestSymbolDatabase : public TestFixture {
                       "template <template <class> class c, class... f, template <class...> class d>\n"
                       "struct b<c<f...>, d<>>;\n"
                       "}\n"
-                      "void e() { using c = a<>; }");
+                      "void e() { using c = a<>; }\n");
         ASSERT(db != nullptr);
         ASSERT_EQUALS("", errout_str());
     }
@@ -5151,7 +5342,7 @@ class TestSymbolDatabase : public TestFixture {
     void symboldatabase79() { // #9392
         {
             GET_SYMBOL_DB("class C { C(); };\n"
-                          "C::C() = default;");
+                          "C::C() = default;\n");
             ASSERT(db->scopeList.size() == 2);
             ASSERT(db->scopeList.back().functionList.size() == 1);
             ASSERT(db->scopeList.back().functionList.front().isDefault() == true);
@@ -5161,14 +5352,14 @@ class TestSymbolDatabase : public TestFixture {
                           "class C { C(); };\n"
                           "}\n"
                           "using namespace ns;\n"
-                          "C::C() = default;");
+                          "C::C() = default;\n");
             ASSERT(db->scopeList.size() == 3);
             ASSERT(db->scopeList.back().functionList.size() == 1);
             ASSERT(db->scopeList.back().functionList.front().isDefault() == true);
         }
         {
             GET_SYMBOL_DB("class C { ~C(); };\n"
-                          "C::~C() = default;");
+                          "C::~C() = default;\n");
             ASSERT(db->scopeList.size() == 2);
             ASSERT(db->scopeList.back().functionList.size() == 1);
             ASSERT(db->scopeList.back().functionList.front().isDefault() == true);
@@ -5179,7 +5370,7 @@ class TestSymbolDatabase : public TestFixture {
                           "class C { ~C(); };\n"
                           "}\n"
                           "using namespace ns;\n"
-                          "C::~C() = default;");
+                          "C::~C() = default;\n");
             ASSERT(db->scopeList.size() == 3);
             ASSERT(db->scopeList.back().functionList.size() == 1);
             ASSERT(db->scopeList.back().functionList.front().isDefault() == true);
@@ -5197,7 +5388,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void f(const ns::A&);\n"
                           "};\n"
                           "using namespace ns;\n"
-                          "void AA::f(const A&) { }");
+                          "void AA::f(const A&) { }\n");
             ASSERT(db->scopeList.size() == 5);
             ASSERT(db->functionScopes.size() == 1);
             const Scope *scope = db->findScopeByName("AA");
@@ -5217,7 +5408,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void f(const ns::ns1::A&);\n"
                           "};\n"
                           "using namespace ns::ns1;\n"
-                          "void AA::f(const A&) { }");
+                          "void AA::f(const A&) { }\n");
             ASSERT(db->scopeList.size() == 6);
             ASSERT(db->functionScopes.size() == 1);
             const Scope *scope = db->findScopeByName("AA");
@@ -5237,7 +5428,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void f(const ns::ns1::A&);\n"
                           "};\n"
                           "using namespace ns;\n"
-                          "void AA::f(const ns1::A&) { }");
+                          "void AA::f(const ns1::A&) { }\n");
             ASSERT(db->scopeList.size() == 6);
             ASSERT(db->functionScopes.size() == 1);
             const Scope *scope = db->findScopeByName("AA");
@@ -5259,7 +5450,7 @@ class TestSymbolDatabase : public TestFixture {
                           "using namespace std;\n"
                           "using namespace Parser;\n"
                           "using namespace Terminal;\n"
-                          "string Complete::act(const Action *act) { }");
+                          "string Complete::act(const Action *act) { }\n");
             ASSERT(db->scopeList.size() == 4);
             ASSERT(db->functionScopes.size() == 1);
             const Scope *scope = db->findScopeByName("Complete");
@@ -5278,7 +5469,7 @@ class TestSymbolDatabase : public TestFixture {
                           "using namespace std;\n"
                           "using namespace Foo::Parser;\n"
                           "using namespace Terminal;\n"
-                          "string Complete::act(const Action *act) { }");
+                          "string Complete::act(const Action *act) { }\n");
             ASSERT(db->scopeList.size() == 4);
             ASSERT(db->functionScopes.size() == 1);
             const Scope *scope = db->findScopeByName("Complete");
@@ -5290,14 +5481,14 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void symboldatabase82() {
-        GET_SYMBOL_DB("namespace foo { void foo() {} }");
+        GET_SYMBOL_DB("namespace foo { void foo() {} }\n");
         ASSERT(db->functionScopes.size() == 1);
         ASSERT_EQUALS(false, db->functionScopes[0]->function->isConstructor());
     }
 
     void symboldatabase83() { // #9431
         GET_SYMBOL_DB_DBG("struct a { a() noexcept; };\n"
-                          "a::a() noexcept = default;");
+                          "a::a() noexcept = default;\n");
         const Scope *scope = db->findScopeByName("a");
         ASSERT(scope);
         ASSERT(scope->functionList.size() == 1);
@@ -5312,7 +5503,7 @@ class TestSymbolDatabase : public TestFixture {
     void symboldatabase84() {
         {
             GET_SYMBOL_DB_DBG("struct a { a() noexcept(false); };\n"
-                              "a::a() noexcept(false) = default;");
+                              "a::a() noexcept(false) = default;\n");
             const Scope *scope = db->findScopeByName("a");
             ASSERT(scope);
             ASSERT(scope->functionList.size() == 1);
@@ -5325,7 +5516,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         {
             GET_SYMBOL_DB_DBG("struct a { a() noexcept(true); };\n"
-                              "a::a() noexcept(true) = default;");
+                              "a::a() noexcept(true) = default;\n");
             const Scope *scope = db->findScopeByName("a");
             ASSERT(scope);
             ASSERT(scope->functionList.size() == 1);
@@ -5344,7 +5535,7 @@ class TestSymbolDatabase : public TestFixture {
                       "  void f() { _mode = x; }\n"
                       "  Mode _mode;\n"
                       "  DECLARE_PROPERTY_FIELD(_mode);\n"
-                      "};");
+                      "};\n");
         const Token *vartok1 = Token::findsimplematch(tokenizer.tokens(), "_mode =");
         ASSERT(vartok1);
         ASSERT(vartok1->variable());
@@ -5356,7 +5547,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase86() {
         GET_SYMBOL_DB("class C { auto operator=(const C&) -> C&; };\n"
-                      "auto C::operator=(const C&) -> C& = default;");
+                      "auto C::operator=(const C&) -> C& = default;\n");
         ASSERT(db->scopeList.size() == 2);
         ASSERT(db->scopeList.back().functionList.size() == 1);
         ASSERT(db->scopeList.back().functionList.front().isDefault() == true);
@@ -5364,7 +5555,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void symboldatabase87() { // #9922 'extern const char ( * x [ 256 ] ) ;'
-        GET_SYMBOL_DB("extern const char ( * x [ 256 ] ) ;");
+        GET_SYMBOL_DB("extern const char ( * x [ 256 ] ) ;\n");
         const Token *xtok = Token::findsimplematch(tokenizer.tokens(), "x");
         ASSERT(xtok->variable());
     }
@@ -5402,7 +5593,7 @@ class TestSymbolDatabase : public TestFixture {
                       "}\n"
                       "}\n"
                       "using namespace external::ns1;\n"
-                      "A a{AS};");
+                      "A a{AS};\n");
         const Token *vartok1 = Token::findsimplematch(tokenizer.tokens(), "A a");
         ASSERT(vartok1);
         ASSERT(vartok1->next());
@@ -5415,7 +5606,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("struct Fred {\n"
                       "    void foo(const int * const x);\n"
                       "};\n"
-                      "void Fred::foo(const int * x) { }");
+                      "void Fred::foo(const int * x) { }\n");
         ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "foo ( const int * x )");
         ASSERT(functok);
@@ -5428,7 +5619,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    struct Value {};\n"
                       "    void foo(const std::vector<std::function<void(const Fred::Value &)>> &callbacks);\n"
                       "}\n"
-                      "void Fred::foo(const std::vector<std::function<void(const Fred::Value &)>> &callbacks) { }");
+                      "void Fred::foo(const std::vector<std::function<void(const Fred::Value &)>> &callbacks) { }\n");
         ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(),
                                                       "foo ( const std :: vector < std :: function < void ( const Fred :: Value & ) > > & callbacks ) { }");
@@ -5442,11 +5633,11 @@ class TestSymbolDatabase : public TestFixture {
             GET_SYMBOL_DB("template <size_t, typename...> struct a;\n"
                           "template <size_t b, typename c, typename... d>\n"
                           "struct a<b, c, d...> : a<1, d...> {};\n"
-                          "template <typename... e> struct f : a<0, e...> {};");
+                          "template <typename... e> struct f : a<0, e...> {};\n");
             ASSERT_EQUALS("", errout_str());
         }
         {
-            GET_SYMBOL_DB("b.f();");
+            GET_SYMBOL_DB("b.f();\n");
             ASSERT_EQUALS("", errout_str());
         }
     }
@@ -5461,7 +5652,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void symboldatabase94() { // structured bindings
-        GET_SYMBOL_DB("int foo() { auto [x,y] = xy(); return x+y; }");
+        GET_SYMBOL_DB("int foo() { auto [x,y] = xy(); return x+y; }\n");
         ASSERT(db != nullptr);
         ASSERT(db->getVariableFromVarId(1) != nullptr);
         ASSERT(db->getVariableFromVarId(2) != nullptr);
@@ -5527,7 +5718,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void symboldatabase99() { // #10864
-        check("void f() { std::map<std::string, int> m; }");
+        check("void f() { std::map<std::string, int> m; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5610,7 +5801,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase102() {
         GET_SYMBOL_DB("std::string f() = delete;\n"
-                      "void g() {}");
+                      "void g() {}\n");
         ASSERT(db);
         ASSERT(db->scopeList.size() == 2);
         ASSERT(db->scopeList.front().type == ScopeType::eGlobal);
@@ -5841,7 +6032,7 @@ class TestSymbolDatabase : public TestFixture {
                       "            i();\n"
                       "            break;\n"
                       "    }\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
         ASSERT_EQUALS("", errout_str());
         const Token *case3 = Token::findsimplematch(tokenizer.tokens(), "case 3");
@@ -5859,8 +6050,35 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(f && f->function() && f->function()->isExplicit());
     }
 
+    void symboldatabase113() { // #11841
+        GET_SYMBOL_DB("template <typename T>\n"
+                      "struct S {\n"
+                      "  S();\n"
+                      "  int& g() { return a; }\n"
+                      "  struct I;\n"
+                      "private:\n"
+                      "  int a;\n"
+                      "};\n"
+                      "template <>\n"
+                      "struct S<int>::I{};\n");
+        ASSERT(db->scopeList.size() == 4);
+        auto it = db->scopeList.begin();
+        ++it;
+        ASSERT_EQUALS_ENUM(ScopeType::eStruct, it->type);
+        ASSERT_EQUALS("I", it->className);
+        ASSERT_EQUALS(0, it->varlist.size());
+        ++it;
+        ASSERT_EQUALS_ENUM(ScopeType::eStruct, it->type);
+        ASSERT_EQUALS("S < int >", it->className);
+        ASSERT_EQUALS(1, it->varlist.size());
+        ++it;
+        ASSERT_EQUALS_ENUM(ScopeType::eFunction, it->type);
+        ASSERT_EQUALS("g", it->className);
+        ASSERT_EQUALS(0, it->varlist.size());
+    }
+
     void createSymbolDatabaseFindAllScopes1() {
-        GET_SYMBOL_DB("void f() { union {int x; char *p;} a={0}; }");
+        GET_SYMBOL_DB("void f() { union {int x; char *p;} a={0}; }\n");
         ASSERT(db->scopeList.size() == 3);
         ASSERT_EQUALS_ENUM(ScopeType::eUnion, db->scopeList.back().type);
     }
@@ -6061,7 +6279,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    T* x;\n"
                       "    myst(T* y) : x(y){};\n"  // <- myst constructor
                       "  };\n"
-                      "};");
+                      "};\n");
         ASSERT(db);
 
         const Token* myst1 = Token::findsimplematch(tokenizer.tokens(), "myst ( T * y )");
@@ -6109,6 +6327,24 @@ class TestSymbolDatabase : public TestFixture {
         }
     }
 
+    void createSymbolDatabaseFindAllScopes11() // #13685
+    {
+        GET_SYMBOL_DB("int f() {\n"
+                      "    int x;\n"
+                      "    if (!({ int *p = &x; *p = 1; 1; }))\n"
+                      "        return 0;\n"
+                      "    return x;\n"
+                      "}\n");
+        ASSERT(db && db->scopeList.size() == 4);
+
+        auto it = db->scopeList.begin();
+        std::advance(it, 3);
+        const Scope& compoundScope = *it;
+        ASSERT_EQUALS_ENUM(ScopeType::eUnconditional, compoundScope.type);
+        ASSERT_EQUALS_ENUM(ScopeType::eFunction, compoundScope.nestedIn->type);
+        ASSERT_EQUALS("f", compoundScope.nestedIn->className);
+    }
+
     void createSymbolDatabaseIncompleteVars()
     {
         {
@@ -6223,7 +6459,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void enum1() {
-        GET_SYMBOL_DB("enum BOOL { FALSE, TRUE }; enum BOOL b;");
+        GET_SYMBOL_DB("enum BOOL { FALSE, TRUE }; enum BOOL b;\n");
 
         /* there is a enum scope with the name BOOL */
         ASSERT(db && db->scopeList.back().type == ScopeType::eEnum && db->scopeList.back().className == "BOOL");
@@ -6233,7 +6469,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void enum2() {
-        GET_SYMBOL_DB("enum BOOL { FALSE, TRUE } b;");
+        GET_SYMBOL_DB("enum BOOL { FALSE, TRUE } b;\n");
 
         /* there is a enum scope with the name BOOL */
         ASSERT(db && db->scopeList.back().type == ScopeType::eEnum && db->scopeList.back().className == "BOOL");
@@ -6243,7 +6479,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void enum3() {
-        GET_SYMBOL_DB("enum ABC { A=11,B,C=A+B };");
+        GET_SYMBOL_DB("enum ABC { A=11,B,C=A+B };\n");
         ASSERT(db && db->scopeList.back().type == ScopeType::eEnum);
 
         /* There is an enum A with value 11 */
@@ -6261,7 +6497,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void enum4() { // #7493
         GET_SYMBOL_DB("enum Offsets { O1, O2, O3=5, O4 };\n"
-                      "enum MyEnums { E1=O1+1, E2, E3=O3+1 };");
+                      "enum MyEnums { E1=O1+1, E2, E3=O3+1 };\n");
         ASSERT(db != nullptr);
 
         ASSERT_EQUALS(3U, db->scopeList.size());
@@ -6349,7 +6585,7 @@ class TestSymbolDatabase : public TestFixture {
                       "int b[A];\n"
                       "int c[A + 2];\n"
                       "int d[10 + B];\n"
-                      "int e[A + B];");
+                      "int e[A + B];\n");
         ASSERT(db != nullptr);
 
         ASSERT_EQUALS(2U, db->scopeList.size());
@@ -6404,7 +6640,7 @@ class TestSymbolDatabase : public TestFixture {
                       "};\n"
                       "struct Barney : public Fred {\n"
                       "    Enum func(Enum e) { return e; }\n"
-                      "};");
+                      "};\n");
         ASSERT(db != nullptr);
 
         const Token * const functionToken = Token::findsimplematch(tokenizer.tokens(), "func");
@@ -6443,7 +6679,7 @@ class TestSymbolDatabase : public TestFixture {
                       "char array9[sizeof(EL)];\n"
                       "char array10[sizeof(L)];\n"
                       "char array11[sizeof(ELL)];\n"
-                      "char array12[sizeof(LL)];");
+                      "char array12[sizeof(LL)];\n");
         ASSERT(db != nullptr);
 
         ASSERT(db->variableList().size() == 13); // the first one is not used
@@ -6860,6 +7096,23 @@ class TestSymbolDatabase : public TestFixture {
         }
     }
 
+    void enum20() { // #14419
+        {
+            GET_SYMBOL_DB("enum class myclass : uint8_t { A = 0U };\n");
+            const Token *A = Token::findsimplematch(tokenizer.tokens(), "A");
+            ASSERT(A && A->valueType() && A->valueType()->isEnum());
+            ASSERT_EQUALS_ENUM(ValueType::CHAR, A->valueType()->type);
+            ASSERT_EQUALS_ENUM(ValueType::UNSIGNED, A->valueType()->sign);
+        }
+        {
+            GET_SYMBOL_DB("enum myclass : uint8_t { A = 0U };\n");
+            const Token *A = Token::findsimplematch(tokenizer.tokens(), "A");
+            ASSERT(A && A->valueType() && A->valueType()->isEnum());
+            ASSERT_EQUALS_ENUM(ValueType::CHAR, A->valueType()->type);
+            ASSERT_EQUALS_ENUM(ValueType::UNSIGNED, A->valueType()->sign);
+        }
+    }
+
     void struct1() {
         GET_SYMBOL_DB_C("struct deer {\n"
                         "   uint16_t a;\n"
@@ -6869,7 +7122,7 @@ class TestSymbolDatabase : public TestFixture {
                         "   struct deer {\n"
                         "     uint16_t a;\n"
                         "   };\n"
-                        "}");
+                        "}\n");
 
         ASSERT_EQUALS("", errout_str());
         ASSERT(db);
@@ -6902,7 +7155,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void foo() {\n"
                       "    e abc[] = {A,B,C};\n"
                       "    int i = abc[ARRAY_SIZE(cats)];\n"
-                      "}");
+                      "}\n");
         const Token *e = Token::findsimplematch(tokenizer.tokens(), "e abc");
         (void)db->sizeOfType(e);  // <- don't crash
     }
@@ -6914,7 +7167,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "class Deri : Base {\n"
                           "    void foo() {}\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Deri") && db->findScopeByName("Deri")->functionList.front().isImplicitlyVirtual());
         }
         {
@@ -6926,7 +7179,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "class Deri2 : Deri1 {\n"
                           "    void foo() {}\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Deri2") && db->findScopeByName("Deri2")->functionList.front().isImplicitlyVirtual());
         }
         {
@@ -6935,7 +7188,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "class Deri : Base {\n"
                           "    void foo() {}\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Deri") && !db->findScopeByName("Deri")->functionList.front().isImplicitlyVirtual(true));
         }
         {
@@ -6944,7 +7197,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "class Deri : Base {\n"
                           "    void foo(std::string& s) {}\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Deri") && !db->findScopeByName("Deri")->functionList.front().isImplicitlyVirtual(true));
         }
         {
@@ -6956,7 +7209,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "class Deri2 : Deri1 {\n"
                           "    void foo() {}\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Deri2") && db->findScopeByName("Deri2")->functionList.front().isImplicitlyVirtual());
         }
         {
@@ -6965,7 +7218,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "class Deri : Base {\n"
                           "    void foo() {}\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Deri") && db->findScopeByName("Deri")->functionList.front().isImplicitlyVirtual(true)); // Default true -> true
         }
         {
@@ -6974,7 +7227,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "class Deri : Base {\n"
                           "    void foo() {}\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Deri") && !db->findScopeByName("Deri")->functionList.front().isImplicitlyVirtual(false)); // Default false -> false
         }
         {
@@ -6983,7 +7236,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "class Deri : Base {\n"
                           "    void foo() {}\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Deri") && db->findScopeByName("Deri")->functionList.front().isImplicitlyVirtual(false)); // Default false, but we saw "virtual" -> true
         }
         // #5289
@@ -6995,7 +7248,7 @@ class TestSymbolDatabase : public TestFixture {
                           "class Bar : private Bar<void, void> {\n"
                           "   void foo() {\n"
                           "   }\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Bar") && !db->findScopeByName("Bar")->functionList.empty() && !db->findScopeByName("Bar")->functionList.front().isImplicitlyVirtual(false));
             ASSERT_EQUALS(1, db->findScopeByName("Bar")->functionList.size());
         }
@@ -7015,7 +7268,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "void InfiniteA::foo() {\n"
                           "    C a;\n"
-                          "}");
+                          "}\n");
             //ASSERT(db && db->findScopeByName("InfiniteA") && !db->findScopeByName("InfiniteA")->functionList.front().isImplicitlyVirtual());
             TODO_ASSERT_EQUALS(1, 0, db->findScopeByName("InfiniteA")->functionList.size());
         }
@@ -7027,7 +7280,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    C(B b) = 0;\n"
                       "    C(C& c) = default;"
                       "    void g();\n"
-                      "};");
+                      "};\n");
         ASSERT(db && db->scopeList.back().functionList.size() == 4);
         auto it = db->scopeList.back().functionList.cbegin();
         ASSERT((it++)->isPure());
@@ -7040,7 +7293,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("TEST(a,b) {\n"
                       "  std::vector<int> messages;\n"
                       "  foo(messages[2].size());\n"
-                      "}");
+                      "}\n");
         const Variable * const var = db ? db->getVariableFromVarId(1U) : nullptr;
         ASSERT(db &&
                db->findScopeByName("TEST") &&
@@ -7059,7 +7312,7 @@ class TestSymbolDatabase : public TestFixture {
                       "{\n"
                       "    t = PTRRELOC(t);\n"
                       "    *PTRRELOC(&x) = &y;\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
         const Token *funcStart, *argStart, *declEnd;
         ASSERT(db && !db->isFunction(Token::findsimplematch(tokenizer.tokens(), "PTRRELOC ( &"), &db->scopeList.back(), funcStart, argStart, declEnd));
@@ -7072,7 +7325,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("std::vector<int>&& f(std::vector<int>& v) {\n"
                       "    v.push_back(1);\n"
                       "    return std::move(v);\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
         ASSERT_EQUALS(2, db->scopeList.size());
         const Token* ret = Token::findsimplematch(tokenizer.tokens(), "return");
@@ -7100,7 +7353,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void bar() {\n"    /* 3 */
                       "    foo();\n"      /* 4 */
                       "    foo(1);\n"     /* 5 */
-                      "}");               /* 6 */
+                      "}\n");               /* 6 */
         ASSERT_EQUALS("", errout_str());
         ASSERT(db);
         const Scope * bar = db->findScopeByName("bar");
@@ -7129,7 +7382,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void otherfunc() {\n"
                       "    float t;\n"
                       "    func(x, &t);\n"
-                      "}");
+                      "}\n");
         const Token *callfunc = Token::findsimplematch(tokenizer.tokens(), "func ( x , & t ) ;");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
@@ -7143,7 +7396,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void foo() {\n"
                       "    derived d;\n"
                       "    d.foo();\n"
-                      "}");
+                      "}\n");
 
         const Token *callfunc = Token::findsimplematch(tokenizer.tokens(), "d . foo ( ) ;");
         ASSERT_EQUALS("", errout_str());
@@ -7211,7 +7464,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo(crf);\n"
                       "    foo(crd);\n"
                       "    foo(crld);\n"
-                      "}");
+                      "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7311,7 +7564,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    int syncpos, len;\n"
                       "    Sync(syncpos, type, len);\n"
                       "    Sync(type, len);\n"
-                      "}");
+                      "}\n");
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "Sync ( syncpos");
         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 3);
 
@@ -7323,7 +7576,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void addtoken(Token** rettail, const Token *tok);\n"
                       "void CheckMemoryLeakInFunction::getcode(const Token *tok ) {\n"
                       "   addtoken(&rettail, tok);\n"
-                      "}");
+                      "}\n");
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "void addtoken ( Token * *");
         ASSERT_EQUALS(true, db && f && !f->function()); // regression value only
     }
@@ -7339,7 +7592,7 @@ class TestSymbolDatabase : public TestFixture {
                       "        power.nodeResults().size();\n"
                       "        assert(power.nodeResults().size()==ground.nodeResults().size());\n"
                       "    }\n"
-                      "};");
+                      "};\n");
         const Token *callfunc = Token::findsimplematch(tokenizer.tokens(), "power . nodeResults ( ) . size ( ) ;");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true, db != nullptr); // not null
@@ -7367,7 +7620,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void S::g() &&{ }\n"
                       "void S::g() const   { }\n"
                       "void S::g() const & { }\n"
-                      "void S::g() const &&{ }");
+                      "void S::g() const &&{ }\n");
         ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "f ( ) {");
@@ -7429,7 +7682,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("struct Fred {\n"
                       "    void foo(const int * p);\n"
                       "};\n"
-                      "void Fred::foo(const int * const p) { }");
+                      "void Fred::foo(const int * const p) { }\n");
         ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( const int * const p ) {");
@@ -7440,7 +7693,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("struct Fred {\n"
                       "    void foo(const int * p);\n"
                       "};\n"
-                      "void Fred::foo(const int p []) { }");
+                      "void Fred::foo(const int p []) { }\n");
         ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( const int p [ ] ) {");
@@ -7457,7 +7710,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo(bar());\n"
                       "    foo(cp);\n"
                       "    foo(\"\");\n"
-                      "}");
+                      "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7495,7 +7748,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo(fp);\n"
                       "    foo(cp);\n"
                       "    foo(\"\");\n"
-                      "}");
+                      "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7543,7 +7796,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo2(0);\n"
                       "    foo2(nullptr);\n"
                       "    foo2(NULL);\n"
-                      "}");
+                      "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7592,7 +7845,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo2(5, L'c');\n"
                       "    foo3(6, 'c');\n"
                       "    foo3(7, L'c');\n"
-                      "}");
+                      "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7632,7 +7885,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo(C::si);\n"
                       "    foo(c.ip);\n"
                       "    foo(c.fp);\n"
-                      "}");
+                      "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7669,7 +7922,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo(!b);\n"
                       "    foo(i > 0);\n"
                       "    foo(f + i);\n"
-                      "}");
+                      "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7695,7 +7948,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void f(float f) const { }\n"
                       "    void a() { f(1); }\n"
                       "    void b() { f(1.f); }\n"
-                      "};");
+                      "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7740,7 +7993,7 @@ class TestSymbolDatabase : public TestFixture {
                       "        E1                 v13 = e1;     v13 = get(get(v13));\n"
                       "        E2                 v14 = E2::e2; v14 = get(get(v14));\n"
                       "    }\n"
-                      "};");
+                      "};\n");
 
         ASSERT_EQUALS("", errout_str());
         ASSERT(db);
@@ -7778,20 +8031,12 @@ class TestSymbolDatabase : public TestFixture {
         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v7 ) ) ;");
         ASSERT(f);
         ASSERT(f->function());
-        if (std::numeric_limits<char>::is_signed) {
-            ASSERT_EQUALS(10, f->function()->tokenDef->linenr());
-        } else {
-            ASSERT_EQUALS(5, f->function()->tokenDef->linenr());
-        }
+        ASSERT_EQUALS(10, f->function()->tokenDef->linenr());
 
         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v8 ) ) ;");
         ASSERT(f);
         ASSERT(f->function());
-        if (std::numeric_limits<char>::is_signed) {
-            ASSERT_EQUALS(5, f->function()->tokenDef->linenr());
-        } else {
-            ASSERT_EQUALS(11, f->function()->tokenDef->linenr());
-        }
+        ASSERT_EQUALS(11, f->function()->tokenDef->linenr());
 
         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v9 ) ) ;");
         ASSERT(f);
@@ -7841,7 +8086,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    }\n"
                       "    int _x;\n"
                       "    int _y;\n"
-                      "};");
+                      "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7860,7 +8105,7 @@ class TestSymbolDatabase : public TestFixture {
                       "\n"
                       "void f(foo *myFoo) {\n"
                       "    int* myThing = myFoo->GetThing();\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
 
@@ -7879,7 +8124,7 @@ class TestSymbolDatabase : public TestFixture {
                       "\n"
                       "void f(const foo *myFoo) {\n"
                       "    int* myThing = myFoo->GetThing();\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
 
@@ -7898,7 +8143,7 @@ class TestSymbolDatabase : public TestFixture {
                       "\n"
                       "void f(foo *myFoo) {\n"
                       "    int* myThing = ((const foo *)myFoo)->GetThing();\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
 
@@ -7916,7 +8161,7 @@ class TestSymbolDatabase : public TestFixture {
                       "\n"
                       "void f(std::shared_ptr<foo> p) {\n"
                       "  p->dostuff();\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
         const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), ". dostuff ( ) ;")->next();
         ASSERT(tok1->function());
@@ -7933,7 +8178,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    {\n"
                       "        p->dostuff();\n"
                       "    }\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
         const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), ". dostuff ( ) ;")->next();
         ASSERT(tok1->function());
@@ -7944,7 +8189,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void dostuff(float) {}\n"
                       "void f(int *p) {\n"
                       "  dostuff(p);\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
         const Token *dostuff1 = Token::findsimplematch(tokenizer.tokens(), "dostuff ( p ) ;");
         ASSERT(dostuff1->function());
@@ -7954,7 +8199,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void findFunction27() {
         GET_SYMBOL_DB("namespace { void a(int); }\n"
-                      "void f() { a(9); }");
+                      "void f() { a(9); }\n");
         const Token *a = Token::findsimplematch(tokenizer.tokens(), "a ( 9 )");
         ASSERT(a);
         ASSERT(a->function());
@@ -7965,7 +8210,7 @@ class TestSymbolDatabase : public TestFixture {
                       "struct S {\n"
                       "  void foo() { a(7); }\n"
                       "  void a(int);\n"
-                      "};");
+                      "};\n");
         const Token *a = Token::findsimplematch(tokenizer.tokens(), "a ( 7 )");
         ASSERT(a);
         ASSERT(a->function());
@@ -7986,7 +8231,7 @@ class TestSymbolDatabase : public TestFixture {
                       "\n"
                       "void bar(BPtr b) {\n"
                       "    int x = b->a.foo();\n"
-                      "}");
+                      "}\n");
         const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( ) ;");
         ASSERT(foo);
         ASSERT(foo->function());
@@ -7998,7 +8243,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("struct A;\n"
                       "void foo(std::shared_ptr<A> ptr) {\n"
                       "    int x = ptr->bar();\n"
-                      "}");
+                      "}\n");
         const Token *bar = Token::findsimplematch(tokenizer.tokens(), "bar ( ) ;");
         ASSERT(bar);
         ASSERT(!bar->function());
@@ -8007,7 +8252,7 @@ class TestSymbolDatabase : public TestFixture {
     void findFunction31() {
         GET_SYMBOL_DB("void foo(bool);\n"
                       "void foo(std::string s);\n"
-                      "void bar() { foo(\"123\"); }");
+                      "void bar() { foo(\"123\"); }\n");
         const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( \"123\" ) ;");
         ASSERT(foo);
         ASSERT(foo->function());
@@ -8017,7 +8262,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void findFunction32() {
         GET_SYMBOL_DB_C("void foo(char *p);\n"
-                        "void bar() { foo(\"123\"); }");
+                        "void bar() { foo(\"123\"); }\n");
         (void)db;
         const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( \"123\" ) ;");
         ASSERT(foo);
@@ -8039,7 +8284,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void doIt() const {\n"
                           "        foo();\n"
                           "    }\n"
-                          "};");
+                          "};\n");
             (void)db;
             const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( ) ;");
             ASSERT(foo);
@@ -8059,7 +8304,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void doIt() const {\n"
                           "        foo(1);\n"
                           "    }\n"
-                          "};");
+                          "};\n");
             (void)db;
             const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( 1 ) ;");
             ASSERT(foo);
@@ -8079,7 +8324,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void doIt() const {\n"
                           "        foo(1,2);\n"
                           "    }\n"
-                          "};");
+                          "};\n");
             (void)db;
             const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( 1 , 2 ) ;");
             ASSERT(foo);
@@ -8099,7 +8344,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void doIt() const {\n"
                           "        foo(1);\n"
                           "    }\n"
-                          "};");
+                          "};\n");
             (void)db;
             const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( 1 ) ;");
             ASSERT(foo);
@@ -8119,7 +8364,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void doIt() const {\n"
                           "        foo(1,2);\n"
                           "    }\n"
-                          "};");
+                          "};\n");
             (void)db;
             const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( 1 , 2 ) ;");
             ASSERT(foo);
@@ -8139,7 +8384,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void doIt() const {\n"
                           "        foo(1, 2, 3);\n"
                           "    }\n"
-                          "};");
+                          "};\n");
             (void)db;
             const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( 1 , 2 , 3 ) ;");
             ASSERT(foo);
@@ -8160,7 +8405,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void selectOneVsConfig(cppcheck::Platform::PlatformType);\n"
                       "};\n"
                       "class Settings : public cppcheck::Platform { };\n"
-                      "void ImportProject::selectOneVsConfig(Settings::PlatformType) { }");
+                      "void ImportProject::selectOneVsConfig(Settings::PlatformType) { }\n");
         (void)db;
         const Token *foo = Token::findsimplematch(tokenizer.tokens(), "selectOneVsConfig ( Settings :: PlatformType ) { }");
         ASSERT(foo);
@@ -8178,7 +8423,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    };\n"
                       "}\n"
                       "::clangimport::AstNode::AstNode() { }\n"
-                      "void ::clangimport::AstNode::createTokens() { }");
+                      "void ::clangimport::AstNode::createTokens() { }\n");
         (void)db;
         const Token *foo = Token::findsimplematch(tokenizer.tokens(), "AstNode ( ) { }");
         ASSERT(foo);
@@ -8204,7 +8449,7 @@ class TestSymbolDatabase : public TestFixture {
                       "}\n"
                       "namespace ns {\n"
                       "    void A::f(external::T link_type) { }\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "f ( external :: T link_type )");
         ASSERT(functok);
@@ -8222,7 +8467,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void f(const ns::V&);\n"
                       "};\n"
                       "using ::ns::V;\n"
-                      "void A::f(const V&) { }");
+                      "void A::f(const V&) { }\n");
         ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "f ( const :: ns :: V & )");
         ASSERT(functok);
@@ -8240,7 +8485,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void f(const ns::Var&);\n"
                       "};\n"
                       "using ::ns::Var;\n"
-                      "void A::f(const Var&) {}");
+                      "void A::f(const Var&) {}\n");
         ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "f ( const :: ns :: V & )");
         ASSERT(functok);
@@ -8260,7 +8505,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void f(external::V::I);\n"
                       "};\n"
                       "using ::external::V;\n"
-                      "void A::f(V::I) {}");
+                      "void A::f(V::I) {}\n");
         ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "f ( int )");
         ASSERT(functok);
@@ -8276,7 +8521,7 @@ class TestSymbolDatabase : public TestFixture {
                       "};\n"
                       "const char* E::what() const noexcept {\n"
                       "    return nullptr;\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "what ( ) const noexcept ( true ) {");
         ASSERT(functok);
@@ -8526,7 +8771,7 @@ class TestSymbolDatabase : public TestFixture {
                           "  B(): b_obj(this) { b_obj->test(\"1\"); }\n"
                           "  void test(const std::string& str_obj);\n"
                           "  B* b_obj;\n"
-                          "};");
+                          "};\n");
             const Token* call = Token::findsimplematch(tokenizer.tokens(), "test ( \"1\" ) ;");
             ASSERT(call);
             ASSERT(call->function());
@@ -8545,7 +8790,7 @@ class TestSymbolDatabase : public TestFixture {
                           "  B(): b_obj(this) { b_obj->test(\"1\"); }\n"
                           "  void test(const STR& str_obj);\n"
                           "  B* b_obj;\n"
-                          "};");
+                          "};\n");
             const Token* call = Token::findsimplematch(tokenizer.tokens(), "test ( \"1\" ) ;");
             ASSERT(call);
             ASSERT(call->function());
@@ -8564,7 +8809,7 @@ class TestSymbolDatabase : public TestFixture {
                           "  B(): b_obj(this) { b_obj->test(\"1\"); }\n"
                           "  void test(const STR& str_obj);\n"
                           "  B* b_obj;\n"
-                          "};");
+                          "};\n");
             const Token* call = Token::findsimplematch(tokenizer.tokens(), "test ( \"1\" ) ;");
             ASSERT(call);
             ASSERT(call->function());
@@ -8748,6 +8993,235 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(2, functionCall->function()->token->linenr());
     }
 
+    void findFunction63()
+    { // #14937
+        GET_SYMBOL_DB("struct A {\n"
+                      "    void g(int);\n"
+                      "};\n"
+                      "template<class T>\n"
+                      "struct Thunk {\n"
+                      "    T& operator()() const;\n"
+                      "};\n"
+                      "void f(Thunk<A> thunk) {\n"
+                      "    thunk().g(0);\n"
+                      "}\n");
+        const Token* g = Token::findsimplematch(tokenizer.tokens(), "g ( 0 )");
+        ASSERT(g);
+        ASSERT(g->function());
+        ASSERT(g->function()->tokenDef);
+        ASSERT_EQUALS(2, g->function()->tokenDef->linenr());
+        const Token* call = Token::findsimplematch(tokenizer.tokens(), "( ) . g");
+        ASSERT(call && call->valueType());
+        ASSERT(call->valueType()->typeScope && call->valueType()->typeScope->className == "A");
+        ASSERT_EQUALS(static_cast<int>(Reference::LValue), static_cast<int>(call->valueType()->reference));
+    }
+
+    void findFunction64()
+    {                                                    // overloaded operator()
+        {
+            GET_SYMBOL_DB("struct A { void g(int); };\n" // overloads distinguished by argument count
+                          "struct B { void h(int); };\n"
+                          "template<class T>\n"
+                          "struct C {\n"
+                          "    A& operator()();\n"
+                          "    B& operator()(int);\n"
+                          "};\n"
+                          "void f(C<int> c) {\n"
+                          "    c().g(1);\n"
+                          "    c(1).h(1);\n"
+                          "}\n");
+            const Token* g = Token::findsimplematch(tokenizer.tokens(), "g ( 1 )");
+            ASSERT(g && g->function());
+            ASSERT_EQUALS(1, g->function()->tokenDef->linenr());
+            const Token* h = Token::findsimplematch(tokenizer.tokens(), "h ( 1 )");
+            ASSERT(h && h->function());
+            ASSERT_EQUALS(2, h->function()->tokenDef->linenr());
+        }
+        {
+            GET_SYMBOL_DB("struct A { void g(int); };\n" // overloads distinguished by constness of the object
+                          "struct B { void h(int); };\n"
+                          "template<class T>\n"
+                          "struct C {\n"
+                          "    A& operator()();\n"
+                          "    B& operator()() const;\n"
+                          "};\n"
+                          "void f(C<int> c, const C<int>& k) {\n"
+                          "    c().g(1);\n"
+                          "    k().h(1);\n"
+                          "}\n");
+            const Token* g = Token::findsimplematch(tokenizer.tokens(), "g ( 1 )");
+            ASSERT(g && g->function());
+            ASSERT_EQUALS(1, g->function()->tokenDef->linenr());
+            const Token* h = Token::findsimplematch(tokenizer.tokens(), "h ( 1 )");
+            ASSERT(h && h->function());
+            ASSERT_EQUALS(2, h->function()->tokenDef->linenr());
+        }
+        {
+            GET_SYMBOL_DB("struct A { void g(int); };\n" // overloads distinguished by argument type
+                          "struct B { void h(int); };\n"
+                          "template<class T>\n"
+                          "struct C {\n"
+                          "    A& operator()(int);\n"
+                          "    B& operator()(double);\n"
+                          "};\n"
+                          "void f(C<int> c, int i, double d) {\n"
+                          "    c(i).g(1);\n"
+                          "    c(d).h(1);\n"
+                          "}\n");
+            const Token* g = Token::findsimplematch(tokenizer.tokens(), "g ( 1 )");
+            ASSERT(g && g->function());
+            ASSERT_EQUALS(1, g->function()->tokenDef->linenr());
+            const Token* h = Token::findsimplematch(tokenizer.tokens(), "h ( 1 )");
+            ASSERT(h && h->function());
+            ASSERT_EQUALS(2, h->function()->tokenDef->linenr());
+        }
+    }
+
+    void findFunction65()
+    {
+        {
+            GET_SYMBOL_DB("bool g(char) { return true; }\n" // #15033
+                          "bool g(int) { return false; }\n"
+                          "void f(char c) {\n"
+                          "    if (g(+c)) {}\n"
+                          "}\n");
+            const Token* g = Token::findsimplematch(tokenizer.tokens(), "g ( +");
+            ASSERT(g && g->function());
+            ASSERT_EQUALS(2, g->function()->tokenDef->linenr());
+        }
+    }
+
+    void findFunction66() { // #15104 - object passed for pointer to its class
+        {
+            GET_SYMBOL_DB("struct DS;\n"
+                          "void select(int a, int b);\n"
+                          "class Query {\n"
+                          "    int m = 0;\n"
+                          "public:\n"
+                          "    template <typename Callback>\n"
+                          "    int select(DS &ds, Callback cb) { cb(m); return 0; }\n"
+                          "    template <typename Callback>\n"
+                          "    int select(DS *ds, Callback cb) { return select(*ds, cb); }\n"
+                          "    int select(DS &ds) { return select(ds, [](int) {}); }\n"
+                          "};\n");
+            const Token* call1 = Token::findsimplematch(tokenizer.tokens(), "select ( * ds , cb )");
+            ASSERT(call1 && call1->function());
+            ASSERT_EQUALS(7, call1->function()->tokenDef->linenr());
+            const Token* call2 = Token::findsimplematch(tokenizer.tokens(), "select ( ds , [");
+            ASSERT(call2 && call2->function());
+            ASSERT_EQUALS(7, call2->function()->tokenDef->linenr());
+        }
+        {
+            GET_SYMBOL_DB("struct DS;\n"
+                          "void select(int a, int b);\n"
+                          "struct Base {\n"
+                          "    int m = 0;\n"
+                          "    template <typename Callback>\n"
+                          "    int select(DS &ds, Callback cb) { cb(m); return 0; }\n"
+                          "    template <typename Callback>\n"
+                          "    int select(DS *ds, Callback cb) { return select(*ds, cb); }\n"
+                          "};\n"
+                          "struct Query : Base {\n"
+                          "    int run(DS &ds) { return select(ds, [](int) {}); }\n"
+                          "};\n");
+            const Token* call = Token::findsimplematch(tokenizer.tokens(), "select ( ds , [");
+            ASSERT(call && call->function());
+            ASSERT_EQUALS(6, call->function()->tokenDef->linenr());
+        }
+        {
+            GET_SYMBOL_DB("struct DS;\n"
+                          "void select(int a, int b);\n"
+                          "namespace N {\n"
+                          "    template <typename C> int select(DS &ds, C cb) { cb(1); return 0; }\n"
+                          "    template <typename C> int select(DS *ds, C cb) { return select(*ds, cb); }\n"
+                          "    int f(DS &ds) { return select(ds, [](int) {}); }\n"
+                          "}\n");
+            const Token* call = Token::findsimplematch(tokenizer.tokens(), "select ( ds , [");
+            ASSERT(call && call->function());
+            ASSERT_EQUALS(4, call->function()->tokenDef->linenr());
+        }
+        { // conversion operator
+            GET_SYMBOL_DB("struct C { operator C*(); };\n"
+                          "void f(C* p);\n"
+                          "void g(C c) { f(c); }\n");
+            const Token* call = Token::findsimplematch(tokenizer.tokens(), "f ( c )");
+            ASSERT(call && call->function());
+            ASSERT_EQUALS(2, call->function()->tokenDef->linenr());
+        }
+        { // converting constructor
+            GET_SYMBOL_DB("struct N { N(N* parent); };\n"
+                          "void f(N&& n);\n"
+                          "void g(const N& n);\n"
+                          "void h(N* p) { f(p); g(p); }\n");
+            const Token* call1 = Token::findsimplematch(tokenizer.tokens(), "f ( p )");
+            ASSERT(call1 && call1->function());
+            ASSERT_EQUALS(2, call1->function()->tokenDef->linenr());
+            const Token* call2 = Token::findsimplematch(tokenizer.tokens(), "g ( p )");
+            ASSERT(call2 && call2->function());
+            ASSERT_EQUALS(3, call2->function()->tokenDef->linenr());
+        }
+        { // function reference
+            GET_SYMBOL_DB("struct C { int x; };\n"
+                          "C make();\n"
+                          "void reg(C (*f)());\n"
+                          "void g() { C (&fr)() = make; reg(fr); }\n");
+            const Token* call = Token::findsimplematch(tokenizer.tokens(), "reg ( fr )");
+            ASSERT(call && call->function());
+            ASSERT_EQUALS(3, call->function()->tokenDef->linenr());
+        }
+        { // conversion operator in base class or with type alias
+            GET_SYMBOL_DB("template <class D> struct PtrConv { operator D*(); };\n"
+                          "struct C : PtrConv<C> {};\n"
+                          "struct F { using ptr = F*; operator ptr(); };\n"
+                          "void f(C* p);\n"
+                          "void k(F* p);\n"
+                          "void g(C c, F e) { f(c); k(e); }\n");
+            const Token* call1 = Token::findsimplematch(tokenizer.tokens(), "f ( c )");
+            ASSERT(call1 && call1->function());
+            ASSERT_EQUALS(4, call1->function()->tokenDef->linenr());
+            const Token* call2 = Token::findsimplematch(tokenizer.tokens(), "k ( e )");
+            ASSERT(call2 && call2->function());
+            ASSERT_EQUALS(5, call2->function()->tokenDef->linenr());
+        }
+        { // conversion operator in unknown base class or to qualified type
+            GET_SYMBOL_DB("struct C : Unknown { int x; };\n"
+                          "struct D { operator ::D*(); };\n"
+                          "void f(C* p);\n"
+                          "void k(D* p);\n"
+                          "void g(C c, D d) { f(c); k(d); }\n");
+            const Token* call1 = Token::findsimplematch(tokenizer.tokens(), "f ( c )");
+            ASSERT(call1 && call1->function());
+            ASSERT_EQUALS(3, call1->function()->tokenDef->linenr());
+            const Token* call2 = Token::findsimplematch(tokenizer.tokens(), "k ( d )");
+            ASSERT(call2 && call2->function());
+            ASSERT_EQUALS(4, call2->function()->tokenDef->linenr());
+        }
+        { // pointer passed for non-const reference
+            GET_SYMBOL_DB("struct C { int x; };\n"
+                          "void f(int a, int b);\n"
+                          "namespace N {\n"
+                          "    template <class T> void f(C& r, T t);\n"
+                          "    template <class T> void f(C* p, T t);\n"
+                          "    void h(C* p) { f(p, 1); }\n"
+                          "}\n");
+            const Token* call = Token::findsimplematch(tokenizer.tokens(), "f ( p , 1 )");
+            ASSERT(call && call->function());
+            ASSERT_EQUALS(5, call->function()->tokenDef->linenr());
+        }
+        { // removed candidate must not change name hiding of base class functions
+            GET_SYMBOL_DB("struct C { int x; };\n"
+                          "struct Base { void f(const C& r, int i) const; };\n"
+                          "struct Derived : Base {\n"
+                          "    void f(C* p, int i);\n"
+                          "    void f(C& r, double v);\n"
+                          "    void g(C& c) { f(c, 1); }\n"
+                          "};\n");
+            const Token* call = Token::findsimplematch(tokenizer.tokens(), "f ( c , 1 )");
+            ASSERT(call && call->function());
+            ASSERT_EQUALS(5, call->function()->tokenDef->linenr());
+        }
+    }
+
     void findFunctionRef1() {
         GET_SYMBOL_DB("struct X {\n"
                       "    const std::vector<int> getInts() const & { return mInts; }\n"
@@ -8791,7 +9265,7 @@ class TestSymbolDatabase : public TestFixture {
             GET_SYMBOL_DB("void dostuff(std::vector<int> v);\n"
                           "void f(std::vector<int> v) {\n"
                           "  dostuff(v);\n"
-                          "}");
+                          "}\n");
             (void)db;
             const Token *dostuff = Token::findsimplematch(tokenizer.tokens(), "dostuff ( v ) ;");
             ASSERT(dostuff->function());
@@ -8803,7 +9277,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void dostuff(int *i);\n"
                           "void f(std::vector<char> v) {\n"
                           "  dostuff(v);\n"
-                          "}");
+                          "}\n");
             (void)db;
             const Token *dostuff = Token::findsimplematch(tokenizer.tokens(), "dostuff ( v ) ;");
             ASSERT(!dostuff->function());
@@ -8814,7 +9288,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("extern \"C\" { void foo(int); }\n"
                       "void bar() {\n"
                       "    foo(42);\n"
-                      "}");
+                      "}\n");
         const Token *a = Token::findsimplematch(tokenizer.tokens(), "foo ( 42 )");
         ASSERT(a);
         ASSERT(a->function());
@@ -8830,7 +9304,7 @@ class TestSymbolDatabase : public TestFixture {
                       "\n"
                       "void S::foo() {\n"
                       "    x = ::bar(x);\n"
-                      "}");
+                      "}\n");
         const Token *bar = Token::findsimplematch(tokenizer.tokens(), "bar ( x )");
         ASSERT(bar);
         ASSERT(bar->function());
@@ -8843,7 +9317,7 @@ class TestSymbolDatabase : public TestFixture {
                       "\n"
                       "void foo(S x) {\n"
                       "    x(123);\n"
-                      "}");
+                      "}\n");
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), "x . operator() ( 123 )");
         ASSERT(tok);
         ASSERT(tok->tokAt(2)->function());
@@ -8880,7 +9354,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void func1() noexcept;\n"
                       "void func2() noexcept { }\n"
                       "void func3() noexcept(true);\n"
-                      "void func4() noexcept(true) { }");
+                      "void func4() noexcept(true) { }\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
@@ -8891,7 +9365,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void noexceptFunction2() {
-        GET_SYMBOL_DB("template <class T> void self_assign(T& t) noexcept(noexcept(t = t)) {t = t; }");
+        GET_SYMBOL_DB("template <class T> void self_assign(T& t) noexcept(noexcept(t = t)) {t = t; }\n");
 
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
@@ -8920,7 +9394,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void func11() const noexcept(true) = 0;\n"
                       "    void func12() const noexcept(true) = 0;\n"
                       "    void func13() const noexcept(false) = 0;\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
@@ -8952,7 +9426,7 @@ class TestSymbolDatabase : public TestFixture {
                       "   A a;\n"
                       "   B(B&& b) noexcept\n"
                       "   :a(std::move(b.a)) { }\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT(db != nullptr); // not null
         const Scope *b = db->findScopeByName("B");
@@ -8970,7 +9444,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void func1() throw();\n"
                       "void func2() throw() { }\n"
                       "void func3() throw(int);\n"
-                      "void func4() throw(int) { }");
+                      "void func4() throw(int) { }\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT(db != nullptr); // not null
 
@@ -8999,7 +9473,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void func10() throw(int) = 0;\n"
                       "    void func11() const throw() = 0;\n"
                       "    void func12() const throw(int) = 0;\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
@@ -9020,7 +9494,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void constAttributeFunction() {
-        GET_SYMBOL_DB("void func(void) __attribute__((const));");
+        GET_SYMBOL_DB("void func(void) __attribute__((const));\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true, db != nullptr); // not null
 
@@ -9030,7 +9504,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void pureAttributeFunction() {
-        GET_SYMBOL_DB("void func(void) __attribute__((pure));");
+        GET_SYMBOL_DB("void func(void) __attribute__((pure));\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true, db != nullptr); // not null
 
@@ -9041,7 +9515,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void nothrowAttributeFunction() {
         GET_SYMBOL_DB("void func() __attribute__((nothrow));\n"
-                      "void func() { }");
+                      "void func() { }\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
@@ -9051,7 +9525,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void nothrowDeclspecFunction() {
-        GET_SYMBOL_DB("void __declspec(nothrow) func() { }");
+        GET_SYMBOL_DB("void __declspec(nothrow) func() { }\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
@@ -9103,7 +9577,7 @@ class TestSymbolDatabase : public TestFixture {
                       "int func1() { }\n"
                       "[[nodiscard]] int func2();\n"
                       "[[nodiscard]] int func3() { }\n"
-                      "template <class T> [[nodiscard]] int func4() { }"
+                      "template <class T> [[nodiscard]] int func4() { }\n"
                       "std::pair<bool, char> [[nodiscard]] func5();\n"
                       "[[nodiscard]] std::pair<bool, char> func6();\n"
                       );
@@ -9136,7 +9610,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void varTypesIntegral() {
-        GET_SYMBOL_DB("void f() { bool b; char c; unsigned char uc; short s; unsigned short us; int i; unsigned u; unsigned int ui; long l; unsigned long ul; long long ll; }");
+        GET_SYMBOL_DB("void f() { bool b; char c; unsigned char uc; short s; unsigned short us; int i; unsigned u; unsigned int ui; long l; unsigned long ul; long long ll; }\n");
         const Variable *b = db->getVariableFromVarId(1);
         ASSERT(b != nullptr);
         ASSERT_EQUALS("b", b->nameToken()->str());
@@ -9195,7 +9669,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void varTypesFloating() {
         {
-            GET_SYMBOL_DB("void f() { float f; double d; long double ld; }");
+            GET_SYMBOL_DB("void f() { float f; double d; long double ld; }\n");
             const Variable *f = db->getVariableFromVarId(1);
             ASSERT(f != nullptr);
             ASSERT_EQUALS("f", f->nameToken()->str());
@@ -9212,7 +9686,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT_EQUALS(true, ld->isFloatingType());
         }
         {
-            GET_SYMBOL_DB("void f() { float * f; static const float * scf; }");
+            GET_SYMBOL_DB("void f() { float * f; static const float * scf; }\n");
             const Variable *f = db->getVariableFromVarId(1);
             ASSERT(f != nullptr);
             ASSERT_EQUALS("f", f->nameToken()->str());
@@ -9226,7 +9700,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT_EQUALS(true, scf->isArrayOrPointer());
         }
         {
-            GET_SYMBOL_DB("void f() { float fa[42]; }");
+            GET_SYMBOL_DB("void f() { float fa[42]; }\n");
             const Variable *fa = db->getVariableFromVarId(1);
             ASSERT(fa != nullptr);
             ASSERT_EQUALS("fa", fa->nameToken()->str());
@@ -9236,7 +9710,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void varTypesOther() {
-        GET_SYMBOL_DB("void f() { class A {} a; void *b;  }");
+        GET_SYMBOL_DB("void f() { class A {} a; void *b;  }\n");
         const Variable *a = db->getVariableFromVarId(1);
         ASSERT(a != nullptr);
         ASSERT_EQUALS("a", a->nameToken()->str());
@@ -9268,7 +9742,7 @@ class TestSymbolDatabase : public TestFixture {
                       "        y += 10.0f - x;\n"
                       "    }\n"
                       "    lambda();\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db && db->scopeList.size() == 3);
         auto scope = db->scopeList.cbegin();
@@ -9287,7 +9761,7 @@ class TestSymbolDatabase : public TestFixture {
                       "        float x = 1.0f;\n"
                       "    };\n"
                       "    lambda();\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db && db->scopeList.size() == 3);
         auto scope = db->scopeList.cbegin();
@@ -9301,7 +9775,7 @@ class TestSymbolDatabase : public TestFixture {
     void lambda3() {
         GET_SYMBOL_DB("void func() {\n"
                       "    auto f = []() mutable {};\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db && db->scopeList.size() == 3);
         auto scope = db->scopeList.cbegin();
@@ -9367,7 +9841,7 @@ class TestSymbolDatabase : public TestFixture {
               "int main() {\n"
               "	E c;\n"
               "	c.f();\n"
-              "}");
+              "}\n");
     }
 
     void executableScopeWithUnknownFunction() {
@@ -9375,7 +9849,7 @@ class TestSymbolDatabase : public TestFixture {
             GET_SYMBOL_DB("class Fred {\n"
                           "    void foo(const std::string & a = \"\");\n"
                           "};\n"
-                          "Fred::foo(const std::string & b) { }");
+                          "Fred::foo(const std::string & b) { }\n");
 
             ASSERT(db && db->scopeList.size() == 3);
             auto scope = db->scopeList.cbegin();
@@ -9427,232 +9901,234 @@ class TestSymbolDatabase : public TestFixture {
                                          $.platform.long_long_bit = 64);
 
         // numbers
-        ASSERT_EQUALS("signed int", typeOf("1;", "1", false, &s));
-        ASSERT_EQUALS("signed int", typeOf("(-1);", "-1", false, &s));
-        ASSERT_EQUALS("signed int", typeOf("32767;", "32767", false, &s));
-        ASSERT_EQUALS("signed int", typeOf("(-32767);", "-32767", false, &s));
-        ASSERT_EQUALS("signed long", typeOf("32768;", "32768", false, &s));
-        ASSERT_EQUALS("signed long", typeOf("(-32768);", "-32768", false, &s));
-        ASSERT_EQUALS("signed long", typeOf("32768l;", "32768l", false, &s));
-        ASSERT_EQUALS("unsigned int", typeOf("32768U;", "32768U", false, &s));
-        ASSERT_EQUALS("signed long long", typeOf("2147483648;", "2147483648", false, &s));
-        ASSERT_EQUALS("unsigned long", typeOf("2147483648u;", "2147483648u", false, &s));
-        ASSERT_EQUALS("signed long long", typeOf("2147483648L;", "2147483648L", false, &s));
-        ASSERT_EQUALS("unsigned long long", typeOf("18446744069414584320;", "18446744069414584320", false, &s));
-        ASSERT_EQUALS("signed int", typeOf("0xFF;", "0xFF", false, &s));
-        ASSERT_EQUALS("unsigned int", typeOf("0xFFU;", "0xFFU", false, &s));
-        ASSERT_EQUALS("unsigned int", typeOf("0xFFFF;", "0xFFFF", false, &s));
-        ASSERT_EQUALS("signed long", typeOf("0xFFFFFF;", "0xFFFFFF", false, &s));
-        ASSERT_EQUALS("unsigned long", typeOf("0xFFFFFFU;", "0xFFFFFFU", false, &s));
-        ASSERT_EQUALS("unsigned long", typeOf("0xFFFFFFFF;", "0xFFFFFFFF", false, &s));
-        ASSERT_EQUALS("signed long long", typeOf("0xFFFFFFFFFFFF;", "0xFFFFFFFFFFFF", false, &s));
-        ASSERT_EQUALS("unsigned long long", typeOf("0xFFFFFFFFFFFFU;", "0xFFFFFFFFFFFFU", false, &s));
-        ASSERT_EQUALS("unsigned long long", typeOf("0xFFFFFFFF00000000;", "0xFFFFFFFF00000000", false, &s));
-
-        ASSERT_EQUALS("signed long", typeOf("2147483648;", "2147483648", false, &sSameSize));
-        ASSERT_EQUALS("unsigned long", typeOf("0xc000000000000000;", "0xc000000000000000", false, &sSameSize));
-
-        ASSERT_EQUALS("unsigned int", typeOf("1U;", "1U"));
-        ASSERT_EQUALS("signed long", typeOf("1L;", "1L"));
-        ASSERT_EQUALS("unsigned long", typeOf("1UL;", "1UL"));
-        ASSERT_EQUALS("signed long long", typeOf("1LL;", "1LL"));
-        ASSERT_EQUALS("unsigned long long", typeOf("1ULL;", "1ULL"));
-        ASSERT_EQUALS("unsigned long long", typeOf("1LLU;", "1LLU"));
-        ASSERT_EQUALS("signed long long", typeOf("1i64;", "1i64"));
-        ASSERT_EQUALS("unsigned long long", typeOf("1ui64;", "1ui64"));
-        ASSERT_EQUALS("unsigned int", typeOf("1u;", "1u"));
-        ASSERT_EQUALS("signed long", typeOf("1l;", "1l"));
-        ASSERT_EQUALS("unsigned long", typeOf("1ul;", "1ul"));
-        ASSERT_EQUALS("signed long long", typeOf("1ll;", "1ll"));
-        ASSERT_EQUALS("unsigned long long", typeOf("1ull;", "1ull"));
-        ASSERT_EQUALS("unsigned long long", typeOf("1llu;", "1llu"));
-        ASSERT_EQUALS("signed int", typeOf("01;", "01"));
-        ASSERT_EQUALS("unsigned int", typeOf("01U;", "01U"));
-        ASSERT_EQUALS("signed long", typeOf("01L;", "01L"));
-        ASSERT_EQUALS("unsigned long", typeOf("01UL;", "01UL"));
-        ASSERT_EQUALS("signed long long", typeOf("01LL;", "01LL"));
-        ASSERT_EQUALS("unsigned long long", typeOf("01ULL;", "01ULL"));
-        ASSERT_EQUALS("signed int", typeOf("0B1;", "0B1"));
-        ASSERT_EQUALS("signed int", typeOf("0b1;", "0b1"));
-        ASSERT_EQUALS("unsigned int", typeOf("0b1U;", "0b1U"));
-        ASSERT_EQUALS("signed long", typeOf("0b1L;", "0b1L"));
-        ASSERT_EQUALS("unsigned long", typeOf("0b1UL;", "0b1UL"));
-        ASSERT_EQUALS("signed long long", typeOf("0b1LL;", "0b1LL"));
-        ASSERT_EQUALS("unsigned long long", typeOf("0b1ULL;", "0b1ULL"));
-        ASSERT_EQUALS("float", typeOf("1.0F;", "1.0F"));
-        ASSERT_EQUALS("float", typeOf("1.0f;", "1.0f"));
-        ASSERT_EQUALS("double", typeOf("1.0;", "1.0"));
-        ASSERT_EQUALS("double", typeOf("1E3;", "1E3"));
-        ASSERT_EQUALS("double", typeOf("0x1.2p3;", "0x1.2p3"));
-        ASSERT_EQUALS("long double", typeOf("1.23L;", "1.23L"));
-        ASSERT_EQUALS("long double", typeOf("1.23l;", "1.23l"));
+        ASSERT_EQUALS("signed int", typeOf("1;\n", "1", false, &s));
+        ASSERT_EQUALS("signed int", typeOf("(-1);\n", "-1", false, &s));
+        ASSERT_EQUALS("signed int", typeOf("32767;\n", "32767", false, &s));
+        ASSERT_EQUALS("signed int", typeOf("(-32767);\n", "-32767", false, &s));
+        ASSERT_EQUALS("signed long", typeOf("32768;\n", "32768", false, &s));
+        ASSERT_EQUALS("signed long", typeOf("(-32768);\n", "-32768", false, &s));
+        ASSERT_EQUALS("signed long", typeOf("32768l;\n", "32768l", false, &s));
+        ASSERT_EQUALS("unsigned int", typeOf("32768U;\n", "32768U", false, &s));
+        ASSERT_EQUALS("signed long long", typeOf("2147483648;\n", "2147483648", false, &s));
+        ASSERT_EQUALS("unsigned long", typeOf("2147483648u;\n", "2147483648u", false, &s));
+        ASSERT_EQUALS("signed long long", typeOf("2147483648L;\n", "2147483648L", false, &s));
+        ASSERT_EQUALS("unsigned long long", typeOf("18446744069414584320;\n", "18446744069414584320", false, &s));
+        ASSERT_EQUALS("signed int", typeOf("0xFF;\n", "0xFF", false, &s));
+        ASSERT_EQUALS("unsigned int", typeOf("0xFFU;\n", "0xFFU", false, &s));
+        ASSERT_EQUALS("unsigned int", typeOf("0xFFFF;\n", "0xFFFF", false, &s));
+        ASSERT_EQUALS("signed long", typeOf("0xFFFFFF;\n", "0xFFFFFF", false, &s));
+        ASSERT_EQUALS("unsigned long", typeOf("0xFFFFFFU;\n", "0xFFFFFFU", false, &s));
+        ASSERT_EQUALS("unsigned long", typeOf("0xFFFFFFFF;\n", "0xFFFFFFFF", false, &s));
+        ASSERT_EQUALS("signed long long", typeOf("0xFFFFFFFFFFFF;\n", "0xFFFFFFFFFFFF", false, &s));
+        ASSERT_EQUALS("unsigned long long", typeOf("0xFFFFFFFFFFFFU;\n", "0xFFFFFFFFFFFFU", false, &s));
+        ASSERT_EQUALS("unsigned long long", typeOf("0xFFFFFFFF00000000;\n", "0xFFFFFFFF00000000", false, &s));
+
+        ASSERT_EQUALS("signed long", typeOf("2147483648;\n", "2147483648", false, &sSameSize));
+        ASSERT_EQUALS("unsigned long", typeOf("0xc000000000000000;\n", "0xc000000000000000", false, &sSameSize));
+
+        ASSERT_EQUALS("unsigned int", typeOf("1U;\n", "1U"));
+        ASSERT_EQUALS("signed long", typeOf("1L;\n", "1L"));
+        ASSERT_EQUALS("unsigned long", typeOf("1UL;\n", "1UL"));
+        ASSERT_EQUALS("signed long long", typeOf("1LL;\n", "1LL"));
+        ASSERT_EQUALS("unsigned long long", typeOf("1ULL;\n", "1ULL"));
+        ASSERT_EQUALS("unsigned long long", typeOf("1LLU;\n", "1LLU"));
+        ASSERT_EQUALS("signed long long", typeOf("1i64;\n", "1i64"));
+        ASSERT_EQUALS("unsigned long long", typeOf("1ui64;\n", "1ui64"));
+        ASSERT_EQUALS("unsigned int", typeOf("1u;\n", "1u"));
+        ASSERT_EQUALS("signed long", typeOf("1l;\n", "1l"));
+        ASSERT_EQUALS("unsigned long", typeOf("1ul;\n", "1ul"));
+        ASSERT_EQUALS("signed long long", typeOf("1ll;\n", "1ll"));
+        ASSERT_EQUALS("unsigned long long", typeOf("1ull;\n", "1ull"));
+        ASSERT_EQUALS("unsigned long long", typeOf("1llu;\n", "1llu"));
+        ASSERT_EQUALS("signed int", typeOf("01;\n", "01"));
+        ASSERT_EQUALS("unsigned int", typeOf("01U;\n", "01U"));
+        ASSERT_EQUALS("signed long", typeOf("01L;\n", "01L"));
+        ASSERT_EQUALS("unsigned long", typeOf("01UL;\n", "01UL"));
+        ASSERT_EQUALS("signed long long", typeOf("01LL;\n", "01LL"));
+        ASSERT_EQUALS("unsigned long long", typeOf("01ULL;\n", "01ULL"));
+        ASSERT_EQUALS("signed int", typeOf("0B1;\n", "0B1"));
+        ASSERT_EQUALS("signed int", typeOf("0b1;\n", "0b1"));
+        ASSERT_EQUALS("unsigned int", typeOf("0b1U;\n", "0b1U"));
+        ASSERT_EQUALS("signed long", typeOf("0b1L;\n", "0b1L"));
+        ASSERT_EQUALS("unsigned long", typeOf("0b1UL;\n", "0b1UL"));
+        ASSERT_EQUALS("signed long long", typeOf("0b1LL;\n", "0b1LL"));
+        ASSERT_EQUALS("unsigned long long", typeOf("0b1ULL;\n", "0b1ULL"));
+        ASSERT_EQUALS("float", typeOf("1.0F;\n", "1.0F"));
+        ASSERT_EQUALS("float", typeOf("1.0f;\n", "1.0f"));
+        ASSERT_EQUALS("double", typeOf("1.0;\n", "1.0"));
+        ASSERT_EQUALS("double", typeOf("1E3;\n", "1E3"));
+        ASSERT_EQUALS("double", typeOf("0x1.2p3;\n", "0x1.2p3"));
+        ASSERT_EQUALS("long double", typeOf("1.23L;\n", "1.23L"));
+        ASSERT_EQUALS("long double", typeOf("1.23l;\n", "1.23l"));
 
         // Constant calculations
-        ASSERT_EQUALS("signed int", typeOf("1 + 2;", "+"));
-        ASSERT_EQUALS("signed long", typeOf("1L + 2;", "+"));
-        ASSERT_EQUALS("signed long long", typeOf("1LL + 2;", "+"));
-        ASSERT_EQUALS("float", typeOf("1.2f + 3;", "+"));
-        ASSERT_EQUALS("float", typeOf("1 + 2.3f;", "+"));
+        ASSERT_EQUALS("signed int", typeOf("1 + 2;\n", "+"));
+        ASSERT_EQUALS("signed long", typeOf("1L + 2;\n", "+"));
+        ASSERT_EQUALS("signed long long", typeOf("1LL + 2;\n", "+"));
+        ASSERT_EQUALS("float", typeOf("1.2f + 3;\n", "+"));
+        ASSERT_EQUALS("float", typeOf("1 + 2.3f;\n", "+"));
 
         // promotions
-        ASSERT_EQUALS("signed int", typeOf("(char)1 +  (char)2;", "+"));
-        ASSERT_EQUALS("signed int", typeOf("(short)1 + (short)2;", "+"));
-        ASSERT_EQUALS("signed int", typeOf("(signed int)1 + (signed char)2;", "+"));
-        ASSERT_EQUALS("signed int", typeOf("(signed int)1 + (unsigned char)2;", "+"));
-        ASSERT_EQUALS("unsigned int", typeOf("(unsigned int)1 + (signed char)2;", "+"));
-        ASSERT_EQUALS("unsigned int", typeOf("(unsigned int)1 + (unsigned char)2;", "+"));
-        ASSERT_EQUALS("unsigned int", typeOf("(unsigned int)1 + (signed int)2;", "+"));
-        ASSERT_EQUALS("unsigned int", typeOf("(unsigned int)1 + (unsigned int)2;", "+"));
-        ASSERT_EQUALS("signed long", typeOf("(signed long)1 + (unsigned int)2;", "+"));
-        ASSERT_EQUALS("unsigned long", typeOf("(unsigned long)1 + (signed int)2;", "+"));
+        ASSERT_EQUALS("signed int", typeOf("(char)1 +  (char)2;\n", "+"));
+        ASSERT_EQUALS("signed int", typeOf("(short)1 + (short)2;\n", "+"));
+        ASSERT_EQUALS("signed int", typeOf("(signed int)1 + (signed char)2;\n", "+"));
+        ASSERT_EQUALS("signed int", typeOf("(signed int)1 + (unsigned char)2;\n", "+"));
+        ASSERT_EQUALS("unsigned int", typeOf("(unsigned int)1 + (signed char)2;\n", "+"));
+        ASSERT_EQUALS("unsigned int", typeOf("(unsigned int)1 + (unsigned char)2;\n", "+"));
+        ASSERT_EQUALS("unsigned int", typeOf("(unsigned int)1 + (signed int)2;\n", "+"));
+        ASSERT_EQUALS("unsigned int", typeOf("(unsigned int)1 + (unsigned int)2;\n", "+"));
+        ASSERT_EQUALS("signed long", typeOf("(signed long)1 + (unsigned int)2;\n", "+"));
+        ASSERT_EQUALS("unsigned long", typeOf("(unsigned long)1 + (signed int)2;\n", "+"));
 
         // char
-        ASSERT_EQUALS("char", typeOf("'a';", "'a'", true));
-        ASSERT_EQUALS("char", typeOf("'\\\'';", "'\\\''", true));
-        ASSERT_EQUALS("signed int", typeOf("'a';", "'a'", false));
-        ASSERT_EQUALS("wchar_t", typeOf("L'a';", "L'a'", true));
-        ASSERT_EQUALS("wchar_t", typeOf("L'a';", "L'a'", false));
-        ASSERT_EQUALS("signed int", typeOf("'aaa';", "'aaa'", true));
-        ASSERT_EQUALS("signed int", typeOf("'aaa';", "'aaa'", false));
+        ASSERT_EQUALS("char", typeOf("'a';\n", "'a'", true));
+        ASSERT_EQUALS("char", typeOf("'\\\'';\n", "'\\\''", true));
+        ASSERT_EQUALS("signed int", typeOf("'a';\n", "'a'", false));
+        ASSERT_EQUALS("wchar_t", typeOf("L'a';\n", "L'a'", true));
+        ASSERT_EQUALS("wchar_t", typeOf("L'a';\n", "L'a'", false));
+        ASSERT_EQUALS("signed int", typeOf("'aaa';\n", "'aaa'", true));
+        ASSERT_EQUALS("signed int", typeOf("'aaa';\n", "'aaa'", false));
 
         // char *
-        ASSERT_EQUALS("const char *", typeOf("\"hello\" + 1;", "+"));
-        ASSERT_EQUALS("const char",  typeOf("\"hello\"[1];", "["));
-        ASSERT_EQUALS("const char",  typeOf(";*\"hello\";", "*"));
-        ASSERT_EQUALS("const wchar_t *", typeOf("L\"hello\" + 1;", "+"));
+        ASSERT_EQUALS("const char *", typeOf("\"hello\" + 1;\n", "+"));
+        ASSERT_EQUALS("const char",  typeOf("\"hello\"[1];\n", "["));
+        ASSERT_EQUALS("const char",  typeOf(";*\"hello\";\n", "*"));
+        ASSERT_EQUALS("const wchar_t *", typeOf("L\"hello\" + 1;\n", "+"));
 
         // Variable calculations
-        ASSERT_EQUALS("void *", typeOf("void *p; a = p + 1;", "+"));
-        ASSERT_EQUALS("signed int", typeOf("int x; a = x + 1;", "+"));
-        ASSERT_EQUALS("signed int", typeOf("int x; a = x | 1;", "|"));
-        ASSERT_EQUALS("float", typeOf("float x; a = x + 1;", "+"));
-        ASSERT_EQUALS("signed int", typeOf("signed x; a = x + 1;", "x +"));
-        ASSERT_EQUALS("unsigned int", typeOf("unsigned x; a = x + 1;", "x +"));
-        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 + 1;",  "u1 +"));
-        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 + 1U;", "u1 +"));
-        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 + u2;", "u1 +"));
-        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 * 2;",  "u1 *"));
-        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 * u2;", "u1 *"));
-        ASSERT_EQUALS("signed int *", typeOf("int x; a = &x;", "&"));
-        ASSERT_EQUALS("signed int *", typeOf("int x; a = &x;", "&"));
-        ASSERT_EQUALS("long double", typeOf("long double x; dostuff(x,1);", "x ,"));
-        ASSERT_EQUALS("long double *", typeOf("long double x; dostuff(&x,1);", "& x ,"));
-        ASSERT_EQUALS("signed int", typeOf("struct X {int i;}; void f(struct X x) { x.i }", "."));
-        ASSERT_EQUALS("signed int *", typeOf("int *p; a = p++;", "++"));
-        ASSERT_EQUALS("signed int", typeOf("int x; a = x++;", "++"));
-        ASSERT_EQUALS("signed int *", typeOf("enum AB {A,B}; AB *ab; x=ab+2;", "+"));
-        ASSERT_EQUALS("signed int *", typeOf("enum AB {A,B}; enum AB *ab; x=ab+2;", "+"));
-        ASSERT_EQUALS("AB *", typeOf("struct AB {int a; int b;}; AB ab; x=&ab;", "&"));
-        ASSERT_EQUALS("AB *", typeOf("struct AB {int a; int b;}; struct AB ab; x=&ab;", "&"));
-        ASSERT_EQUALS("A::BC *", typeOf("namespace A { struct BC { int b; int c; }; }; struct A::BC abc; x=&abc;", "&"));
-        ASSERT_EQUALS("A::BC *", typeOf("namespace A { struct BC { int b; int c; }; }; struct A::BC *abc; x=abc+1;", "+"));
-        ASSERT_EQUALS("signed int", typeOf("auto a(int& x, int& y) { return x + y; }", "+"));
-        ASSERT_EQUALS("signed int", typeOf("auto a(int& x) { return x << 1; }", "<<"));
-        ASSERT_EQUALS("signed int", typeOf("void a(int& x, int& y) { x = y; }", "=")); //Debatably this should be a signed int & but we'll stick with the current behavior for now
-        ASSERT_EQUALS("signed int", typeOf("auto a(int* y) { return *y; }", "*")); //Debatably this should be a signed int & but we'll stick with the current behavior for now
+        ASSERT_EQUALS("void *", typeOf("void *p; a = p + 1;\n", "+"));
+        ASSERT_EQUALS("signed int", typeOf("int x; a = x + 1;\n", "+"));
+        ASSERT_EQUALS("signed int", typeOf("int x; a = x | 1;\n", "|"));
+        ASSERT_EQUALS("float", typeOf("float x; a = x + 1;\n", "+"));
+        ASSERT_EQUALS("signed int", typeOf("signed x; a = x + 1;\n", "x +"));
+        ASSERT_EQUALS("unsigned int", typeOf("unsigned x; a = x + 1;\n", "x +"));
+        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 + 1;\n",  "u1 +"));
+        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 + 1U;\n", "u1 +"));
+        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 + u2;\n", "u1 +"));
+        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 * 2;\n",  "u1 *"));
+        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 * u2;\n", "u1 *"));
+        ASSERT_EQUALS("signed int *", typeOf("int x; a = &x;\n", "&"));
+        ASSERT_EQUALS("signed int *", typeOf("int x; a = &x;\n", "&"));
+        ASSERT_EQUALS("long double", typeOf("long double x; dostuff(x,1);\n", "x ,"));
+        ASSERT_EQUALS("long double *", typeOf("long double x; dostuff(&x,1);\n", "& x ,"));
+        ASSERT_EQUALS("signed int", typeOf("struct X {int i;}; void f(struct X x) { x.i }\n", "."));
+        ASSERT_EQUALS("signed int *", typeOf("int *p; a = p++;\n", "++"));
+        ASSERT_EQUALS("signed int", typeOf("int x; a = x++;\n", "++"));
+        ASSERT_EQUALS("signed int *", typeOf("enum AB {A,B}; AB *ab; x=ab+2;\n", "+"));
+        ASSERT_EQUALS("signed int *", typeOf("enum AB {A,B}; enum AB *ab; x=ab+2;\n", "+"));
+        ASSERT_EQUALS("AB *", typeOf("struct AB {int a; int b;}; AB ab; x=&ab;\n", "&"));
+        ASSERT_EQUALS("AB *", typeOf("struct AB {int a; int b;}; struct AB ab; x=&ab;\n", "&"));
+        ASSERT_EQUALS("A::BC *", typeOf("namespace A { struct BC { int b; int c; }; }; struct A::BC abc; x=&abc;\n", "&"));
+        ASSERT_EQUALS("A::BC *", typeOf("namespace A { struct BC { int b; int c; }; }; struct A::BC *abc; x=abc+1;\n", "+"));
+        ASSERT_EQUALS("signed int", typeOf("auto a(int& x, int& y) { return x + y; }\n", "+"));
+        ASSERT_EQUALS("signed int", typeOf("auto a(int& x) { return x << 1; }\n", "<<"));
+        ASSERT_EQUALS("signed int", typeOf("void a(int& x, int& y) { x = y; }\n", "=")); //Debatably this should be a signed int & but we'll stick with the current behavior for now
+        ASSERT_EQUALS("signed int", typeOf("auto a(int* y) { return *y; }\n", "*")); //Debatably this should be a signed int & but we'll stick with the current behavior for now
 
         // Unary arithmetic/bit operators
-        ASSERT_EQUALS("signed int", typeOf("int x; a = -x;", "-"));
-        ASSERT_EQUALS("signed int", typeOf("int x; a = ~x;", "~"));
-        ASSERT_EQUALS("double", typeOf("double x; a = -x;", "-"));
+        ASSERT_EQUALS("signed int", typeOf("int x; a = -x;\n", "-"));
+        ASSERT_EQUALS("signed int", typeOf("int x; a = ~x;\n", "~"));
+        ASSERT_EQUALS("double", typeOf("double x; a = -x;\n", "-"));
 
         // Ternary operator
-        ASSERT_EQUALS("signed int", typeOf("int x; a = (b ? x : x);", "?"));
-        ASSERT_EQUALS("", typeOf("int x; a = (b ? x : y);", "?"));
-        ASSERT_EQUALS("double", typeOf("int x; double y; a = (b ? x : y);", "?"));
-        ASSERT_EQUALS("const char *", typeOf("int x; double y; a = (b ? \"a\" : \"b\");", "?"));
-        ASSERT_EQUALS("", typeOf("int x; double y; a = (b ? \"a\" : std::string(\"b\"));", "?"));
-        ASSERT_EQUALS("bool", typeOf("int x; a = (b ? false : true);", "?"));
+        ASSERT_EQUALS("signed int", typeOf("int x; a = (b ? x : x);\n", "?"));
+        ASSERT_EQUALS("", typeOf("int x; a = (b ? x : y);\n", "?"));
+        ASSERT_EQUALS("double", typeOf("int x; double y; a = (b ? x : y);\n", "?"));
+        ASSERT_EQUALS("const char *", typeOf("int x; double y; a = (b ? \"a\" : \"b\");\n", "?"));
+        ASSERT_EQUALS("", typeOf("int x; double y; a = (b ? \"a\" : std::string(\"b\"));\n", "?"));
+        ASSERT_EQUALS("bool", typeOf("int x; a = (b ? false : true);\n", "?"));
 
         // Boolean operators/literals
-        ASSERT_EQUALS("bool", typeOf("a > b;", ">"));
-        ASSERT_EQUALS("bool", typeOf(";!b;", "!"));
-        ASSERT_EQUALS("bool", typeOf("c = a && b;", "&&"));
-        ASSERT_EQUALS("bool", typeOf("a = false;", "false"));
-        ASSERT_EQUALS("bool", typeOf("a = true;", "true"));
+        ASSERT_EQUALS("bool", typeOf("a > b;\n", ">"));
+        ASSERT_EQUALS("bool", typeOf(";!b;\n", "!"));
+        ASSERT_EQUALS("bool", typeOf("c = a && b;\n", "&&"));
+        ASSERT_EQUALS("bool", typeOf("a = false;\n", "false"));
+        ASSERT_EQUALS("bool", typeOf("a = true;\n", "true"));
 
         // shift => result has same type as lhs
-        ASSERT_EQUALS("signed int", typeOf("int x; a = x << 1U;", "<<"));
-        ASSERT_EQUALS("signed int", typeOf("int x; a = x >> 1U;", ">>"));
-        ASSERT_EQUALS("",           typeOf("a = 12 >> x;", ">>", true)); // >> might be overloaded
-        ASSERT_EQUALS("signed int", typeOf("a = 12 >> x;", ">>", false));
-        ASSERT_EQUALS("",           typeOf("a = 12 << x;", "<<", true)); // << might be overloaded
-        ASSERT_EQUALS("signed int", typeOf("a = 12 << x;", "<<", false));
-        ASSERT_EQUALS("signed int", typeOf("a = true << 1U;", "<<"));
+        ASSERT_EQUALS("signed int", typeOf("int x; a = x << 1U;\n", "<<"));
+        ASSERT_EQUALS("signed int", typeOf("int x; a = x >> 1U;\n", ">>"));
+        ASSERT_EQUALS("",           typeOf("a = 12 >> x;\n", ">>", true)); // >> might be overloaded
+        ASSERT_EQUALS("signed int", typeOf("a = 12 >> x;\n", ">>", false));
+        ASSERT_EQUALS("",           typeOf("a = 12 << x;\n", "<<", true)); // << might be overloaded
+        ASSERT_EQUALS("signed int", typeOf("a = 12 << x;\n", "<<", false));
+        ASSERT_EQUALS("signed int", typeOf("a = true << 1U;\n", "<<"));
 
         // assignment => result has same type as lhs
-        ASSERT_EQUALS("unsigned short", typeOf("unsigned short x; x = 3;", "="));
+        ASSERT_EQUALS("unsigned short", typeOf("unsigned short x; x = 3;\n", "="));
 
         // array..
-        ASSERT_EQUALS("void * *", typeOf("void * x[10]; a = x + 0;", "+"));
-        ASSERT_EQUALS("signed int *", typeOf("int x[10]; a = x + 1;", "+"));
-        ASSERT_EQUALS("signed int",  typeOf("int x[10]; a = x[0] + 1;", "+"));
-        ASSERT_EQUALS("",            typeOf("a = x[\"hello\"];", "[", true));
-        ASSERT_EQUALS("const char",  typeOf("a = x[\"hello\"];", "[", false));
-        ASSERT_EQUALS("signed int *", typeOf("int x[10]; a = &x;", "&"));
-        ASSERT_EQUALS("signed int *", typeOf("int x[10]; a = &x[1];", "&"));
+        ASSERT_EQUALS("void * *", typeOf("void * x[10]; a = x + 0;\n", "+"));
+        ASSERT_EQUALS("signed int *", typeOf("int x[10]; a = x + 1;\n", "+"));
+        ASSERT_EQUALS("signed int",  typeOf("int x[10]; a = x[0] + 1;\n", "+"));
+        ASSERT_EQUALS("",            typeOf("a = x[\"hello\"];\n", "[", true));
+        ASSERT_EQUALS("const char",  typeOf("a = x[\"hello\"];\n", "[", false));
+        ASSERT_EQUALS("signed int *", typeOf("int x[10]; a = &x;\n", "&"));
+        ASSERT_EQUALS("signed int *", typeOf("int x[10]; a = &x[1];\n", "&"));
 
         // cast..
-        ASSERT_EQUALS("void *", typeOf("a = (void *)0;", "("));
-        ASSERT_EQUALS("char", typeOf("a = (char)32;", "("));
-        ASSERT_EQUALS("signed long", typeOf("a = (long)32;", "("));
-        ASSERT_EQUALS("signed long", typeOf("a = (long int)32;", "("));
-        ASSERT_EQUALS("signed long long", typeOf("a = (long long)32;", "("));
-        ASSERT_EQUALS("long double", typeOf("a = (long double)32;", "("));
-        ASSERT_EQUALS("char", typeOf("a = static_cast<char>(32);", "("));
-        ASSERT_EQUALS("", typeOf("a = (unsigned x)0;", "("));
-        ASSERT_EQUALS("unsigned int", typeOf("a = unsigned(123);", "("));
+        ASSERT_EQUALS("void *", typeOf("a = (void *)0;\n", "("));
+        ASSERT_EQUALS("char", typeOf("a = (char)32;\n", "("));
+        ASSERT_EQUALS("signed long", typeOf("a = (long)32;\n", "("));
+        ASSERT_EQUALS("signed long", typeOf("a = (long int)32;\n", "("));
+        ASSERT_EQUALS("signed long long", typeOf("a = (long long)32;\n", "("));
+        ASSERT_EQUALS("signed int &", typeOf("void f(int& (*fp)()) { fp(); }\n", "( ) ;")); // #15094
+        ASSERT_EQUALS("signed int &&", typeOf("void f(int&& (*fp)()) { fp(); }\n", "( ) ;"));
+        ASSERT_EQUALS("long double", typeOf("a = (long double)32;\n", "("));
+        ASSERT_EQUALS("char", typeOf("a = static_cast<char>(32);\n", "("));
+        ASSERT_EQUALS("", typeOf("a = (unsigned x)0;\n", "("));
+        ASSERT_EQUALS("unsigned int", typeOf("a = unsigned(123);\n", "("));
 
         // sizeof..
-        ASSERT_EQUALS("char", typeOf("sizeof(char);", "char"));
+        ASSERT_EQUALS("char", typeOf("sizeof(char);\n", "char"));
 
         // const..
-        ASSERT_EQUALS("const char *", typeOf("a = \"123\";", "\"123\""));
-        ASSERT_EQUALS("const signed int *", typeOf("const int *a; x = a + 1;", "a +"));
-        ASSERT_EQUALS("signed int * const", typeOf("int * const a; x = a + 1;", "+"));
-        ASSERT_EQUALS("const signed int *", typeOf("const int a[20]; x = a + 1;", "+"));
-        ASSERT_EQUALS("const signed int *", typeOf("const int x; a = &x;", "&"));
-        ASSERT_EQUALS("signed int", typeOf("int * const a; x = *a;", "*"));
-        ASSERT_EQUALS("const signed int", typeOf("const int * const a; x = *a;", "*"));
+        ASSERT_EQUALS("const char *", typeOf("a = \"123\";\n", "\"123\""));
+        ASSERT_EQUALS("const signed int *", typeOf("const int *a; x = a + 1;\n", "a +"));
+        ASSERT_EQUALS("signed int * const", typeOf("int * const a; x = a + 1;\n", "+"));
+        ASSERT_EQUALS("const signed int *", typeOf("const int a[20]; x = a + 1;\n", "+"));
+        ASSERT_EQUALS("const signed int *", typeOf("const int x; a = &x;\n", "&"));
+        ASSERT_EQUALS("signed int", typeOf("int * const a; x = *a;\n", "*"));
+        ASSERT_EQUALS("const signed int", typeOf("const int * const a; x = *a;\n", "*"));
 
         // function call..
-        ASSERT_EQUALS("signed int", typeOf("int a(int); a(5);", "( 5"));
-        ASSERT_EQUALS("signed int", typeOf("auto a(int) -> int; a(5);", "( 5"));
-        ASSERT_EQUALS("unsigned long", typeOf("sizeof(x);", "("));
-        ASSERT_EQUALS("signed int", typeOf("int (*a)(int); a(5);", "( 5"));
-        ASSERT_EQUALS("s", typeOf("struct s { s foo(); s(int, int); }; s s::foo() { return s(1, 2); } ", "( 1 , 2 )"));
+        ASSERT_EQUALS("signed int", typeOf("int a(int); a(5);\n", "( 5"));
+        ASSERT_EQUALS("signed int", typeOf("auto a(int) -> int; a(5);\n", "( 5"));
+        ASSERT_EQUALS("unsigned long", typeOf("sizeof(x);\n", "("));
+        ASSERT_EQUALS("signed int", typeOf("int (*a)(int); a(5);\n", "( 5"));
+        ASSERT_EQUALS("s", typeOf("struct s { s foo(); s(int, int); }; s s::foo() { return s(1, 2); } \n", "( 1 , 2 )"));
         // Some standard template functions.. TODO library configuration
-        ASSERT_EQUALS("signed int &&", typeOf("std::move(5);", "( 5 )"));
-        ASSERT_EQUALS("signed int", typeOf("using F = int(int*); F* f; f(ptr);", "( ptr")); // #9792
+        ASSERT_EQUALS("signed int &&", typeOf("std::move(5);\n", "( 5 )"));
+        ASSERT_EQUALS("signed int", typeOf("using F = int(int*); F* f; f(ptr);\n", "( ptr")); // #9792
 
         // calling constructor..
-        ASSERT_EQUALS("s", typeOf("struct s { s(int); }; s::s(int){} void foo() { throw s(1); } ", "( 1 )")); // #13100
+        ASSERT_EQUALS("s", typeOf("struct s { s(int); }; s::s(int){} void foo() { throw s(1); } \n", "( 1 )")); // #13100
 
         // struct member..
-        ASSERT_EQUALS("signed int", typeOf("struct AB { int a; int b; } ab; x = ab.a;", "."));
-        ASSERT_EQUALS("signed int", typeOf("struct AB { int a; int b; } *ab; x = ab[1].a;", "."));
+        ASSERT_EQUALS("signed int", typeOf("struct AB { int a; int b; } ab; x = ab.a;\n", "."));
+        ASSERT_EQUALS("signed int", typeOf("struct AB { int a; int b; } *ab; x = ab[1].a;\n", "."));
 
         // Overloaded operators
-        ASSERT_EQUALS("Fred &", typeOf("class Fred { Fred& operator<(int); }; void f() { Fred fred; x=fred<123; }", "<"));
+        ASSERT_EQUALS("Fred &", typeOf("class Fred { Fred& operator<(int); }; void f() { Fred fred; x=fred<123; }\n", "<"));
 
         // Static members
-        ASSERT_EQUALS("signed int", typeOf("struct AB { static int a; }; x = AB::a;", "::"));
+        ASSERT_EQUALS("signed int", typeOf("struct AB { static int a; }; x = AB::a;\n", "::"));
 
         // Pointer to unknown type
-        ASSERT_EQUALS("*", typeOf("Bar* b;", "b"));
+        ASSERT_EQUALS("*", typeOf("Bar* b;\n", "b"));
 
         // Enum
-        ASSERT_EQUALS("char", typeOf("enum E : char { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("signed char", typeOf("enum E : signed char { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("unsigned char", typeOf("enum E : unsigned char { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("signed short", typeOf("enum E : short { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("unsigned short", typeOf("enum E : unsigned short { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("signed int", typeOf("enum E : int { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("unsigned int", typeOf("enum E : unsigned int { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("signed long", typeOf("enum E : long { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("unsigned long", typeOf("enum E : unsigned long { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("signed long long", typeOf("enum E : long long { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("unsigned long long", typeOf("enum E : unsigned long long { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
+        ASSERT_EQUALS("char", typeOf("enum E : char { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("signed char", typeOf("enum E : signed char { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("unsigned char", typeOf("enum E : unsigned char { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("signed short", typeOf("enum E : short { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("unsigned short", typeOf("enum E : unsigned short { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("signed int", typeOf("enum E : int { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("unsigned int", typeOf("enum E : unsigned int { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("signed long", typeOf("enum E : long { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("unsigned long", typeOf("enum E : unsigned long { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("signed long long", typeOf("enum E : long long { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("unsigned long long", typeOf("enum E : unsigned long long { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
 
 #define CHECK_LIBRARY_FUNCTION_RETURN_TYPE(type) do { \
         const char xmldata[] = "<?xml version=\"1.0\"?>\n" \
@@ -9662,7 +10138,7 @@ class TestSymbolDatabase : public TestFixture {
                                "</function>\n" \
                                "</def>";              \
         const Settings sF = settingsBuilder().libraryxml(xmldata).build(); \
-        ASSERT_EQUALS(#type, typeOf("void f() { auto x = g(); }", "x", true, &sF)); \
+        ASSERT_EQUALS(#type, typeOf("void f() { auto x = g(); }\n", "x", true, &sF)); \
 } while (false)
         // *INDENT-OFF*
         CHECK_LIBRARY_FUNCTION_RETURN_TYPE(bool);
@@ -9695,12 +10171,12 @@ class TestSymbolDatabase : public TestFixture {
             settings.platform.sizeof_short = 2;
             settings.platform.sizeof_int = 4;
 
-            ASSERT_EQUALS("unsigned char", typeOf("u8'a';", "u8'a'", true, &settings));
-            ASSERT_EQUALS("unsigned short", typeOf("u'a';", "u'a'", true, &settings));
-            ASSERT_EQUALS("unsigned int", typeOf("U'a';", "U'a'", true, &settings));
-            ASSERT_EQUALS("const unsigned char *", typeOf("u8\"a\";", "u8\"a\"", true, &settings));
-            ASSERT_EQUALS("const unsigned short *", typeOf("u\"a\";", "u\"a\"", true, &settings));
-            ASSERT_EQUALS("const unsigned int *", typeOf("U\"a\";", "U\"a\"", true, &settings));
+            ASSERT_EQUALS("unsigned char", typeOf("u8'a';\n", "u8'a'", true, &settings));
+            ASSERT_EQUALS("unsigned short", typeOf("u'a';\n", "u'a'", true, &settings));
+            ASSERT_EQUALS("unsigned int", typeOf("U'a';\n", "U'a'", true, &settings));
+            ASSERT_EQUALS("const unsigned char *", typeOf("u8\"a\";\n", "u8\"a\"", true, &settings));
+            ASSERT_EQUALS("const unsigned short *", typeOf("u\"a\";\n", "u\"a\"", true, &settings));
+            ASSERT_EQUALS("const unsigned int *", typeOf("U\"a\";\n", "U\"a\"", true, &settings));
         }
         {
             // PodType
@@ -9718,11 +10194,11 @@ class TestSymbolDatabase : public TestFixture {
             ValueType vt2;
             ASSERT_EQUALS(true, vt2.fromLibraryType("podtype2", settingsWin64));
             ASSERT_EQUALS(ValueType::Type::INT, vt2.type);
-            ASSERT_EQUALS("unsigned int *", typeOf(";void *data = new u32[10];", "new", true, &settingsWin64));
-            ASSERT_EQUALS("unsigned int *", typeOf(";void *data = new xyz::x[10];", "new", true, &settingsWin64));
-            ASSERT_EQUALS("unsigned int", typeOf("; x = (xyz::x)12;", "(", true, &settingsWin64));
-            ASSERT_EQUALS("unsigned int", typeOf(";u32(12);", "(", true, &settingsWin64));
-            ASSERT_EQUALS("unsigned int", typeOf("x = u32(y[i]);", "(", true, &settingsWin64));
+            ASSERT_EQUALS("unsigned int *", typeOf(";void *data = new u32[10];\n", "new", true, &settingsWin64));
+            ASSERT_EQUALS("unsigned int *", typeOf(";void *data = new xyz::x[10];\n", "new", true, &settingsWin64));
+            ASSERT_EQUALS("unsigned int", typeOf("; x = (xyz::x)12;\n", "(", true, &settingsWin64));
+            ASSERT_EQUALS("unsigned int", typeOf(";u32(12);\n", "(", true, &settingsWin64));
+            ASSERT_EQUALS("unsigned int", typeOf("x = u32(y[i]);\n", "(", true, &settingsWin64));
         }
         {
             // PlatformType
@@ -9757,9 +10233,9 @@ class TestSymbolDatabase : public TestFixture {
                                        "  <container id=\"C\" startPattern=\"C\"/>\n"
                                        "</def>";
             const Settings sC = settingsBuilder().libraryxml(xmldata).build();
-            ASSERT_EQUALS("container(C) *", typeOf("C*c=new C;","new",true,&sC));
-            ASSERT_EQUALS("container(C) *", typeOf("x=(C*)c;","(",true,&sC));
-            ASSERT_EQUALS("container(C)", typeOf("C c = C();","(",true,&sC));
+            ASSERT_EQUALS("container(C) *", typeOf("C*c=new C;\n","new",true,&sC));
+            ASSERT_EQUALS("container(C) *", typeOf("x=(C*)c;\n","(",true,&sC));
+            ASSERT_EQUALS("container(C)", typeOf("C c = C();\n","(",true,&sC));
         }
         {
             // Container (vector)
@@ -9779,64 +10255,64 @@ class TestSymbolDatabase : public TestFixture {
                                        "  </container>\n"
                                        "</def>";
             const Settings set = settingsBuilder().libraryxml(xmldata).build();
-            ASSERT_EQUALS("signed int", typeOf("Vector<int> v; v[0]=3;", "[", true, &set));
-            ASSERT_EQUALS("container(test :: string)", typeOf("{return test::string();}", "(", true, &set));
+            ASSERT_EQUALS("signed int", typeOf("Vector<int> v; v[0]=3;\n", "[", true, &set));
+            ASSERT_EQUALS("container(test :: string)", typeOf("{return test::string();}\n", "(", true, &set));
             ASSERT_EQUALS(
                 "container(test :: string)",
-                typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }", "s", true, &set));
+                typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }\n", "s", true, &set));
             ASSERT_EQUALS(
                 "container(test :: string)",
-                typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }", "+", true, &set));
+                typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }\n", "+", true, &set));
             ASSERT_EQUALS("container(test :: string) &",
-                          typeOf("Vector<test::string> v; x = v.front();", "(", true, &set));
+                          typeOf("Vector<test::string> v; x = v.front();\n", "(", true, &set));
             ASSERT_EQUALS("container(test :: string) *",
-                          typeOf("Vector<test::string> v; x = v.data();", "(", true, &set));
-            ASSERT_EQUALS("signed int &", typeOf("Vector<int> v; x = v.front();", "(", true, &set));
-            ASSERT_EQUALS("signed int *", typeOf("Vector<int> v; x = v.data();", "(", true, &set));
-            ASSERT_EQUALS("signed int * *", typeOf("Vector<int*> v; x = v.data();", "(", true, &set));
-            ASSERT_EQUALS("iterator(Vector <)", typeOf("Vector<int> v; x = v.begin();", "(", true, &set));
-            ASSERT_EQUALS("signed int &", typeOf("Vector<int> v; x = *v.begin();", "*", true, &set));
+                          typeOf("Vector<test::string> v; x = v.data();\n", "(", true, &set));
+            ASSERT_EQUALS("signed int &", typeOf("Vector<int> v; x = v.front();\n", "(", true, &set));
+            ASSERT_EQUALS("signed int *", typeOf("Vector<int> v; x = v.data();\n", "(", true, &set));
+            ASSERT_EQUALS("signed int * *", typeOf("Vector<int*> v; x = v.data();\n", "(", true, &set));
+            ASSERT_EQUALS("iterator(Vector <)", typeOf("Vector<int> v; x = v.begin();\n", "(", true, &set));
+            ASSERT_EQUALS("signed int &", typeOf("Vector<int> v; x = *v.begin();\n", "*", true, &set));
             ASSERT_EQUALS("container(test :: string)",
-                          typeOf("void foo(){test::string s; return \"x\"+s;}", "+", true, &set));
+                          typeOf("void foo(){test::string s; return \"x\"+s;}\n", "+", true, &set));
             ASSERT_EQUALS("container(test :: string)",
-                          typeOf("void foo(){test::string s; return s+\"x\";}", "+", true, &set));
+                          typeOf("void foo(){test::string s; return s+\"x\";}\n", "+", true, &set));
             ASSERT_EQUALS("container(test :: string)",
-                          typeOf("void foo(){test::string s; return 'x'+s;}", "+", true, &set));
+                          typeOf("void foo(){test::string s; return 'x'+s;}\n", "+", true, &set));
             ASSERT_EQUALS("container(test :: string)",
-                          typeOf("void foo(){test::string s; return s+'x';}", "+", true, &set));
+                          typeOf("void foo(){test::string s; return s+'x';}\n", "+", true, &set));
         }
 
         // new
-        ASSERT_EQUALS("C *", typeOf("class C {}; x = new C();", "new"));
+        ASSERT_EQUALS("C *", typeOf("class C {}; x = new C();\n", "new"));
 
         // auto variables
-        ASSERT_EQUALS("signed int", typeOf("; auto x = 3;", "x"));
-        ASSERT_EQUALS("signed int *", typeOf("; auto *p = (int *)0;", "p"));
-        ASSERT_EQUALS("const signed int *", typeOf("; auto *p = (const int *)0;", "p"));
-        ASSERT_EQUALS("const signed int *", typeOf("; auto *p = (constexpr int *)0;", "p"));
-        ASSERT_EQUALS("const signed int *", typeOf("; const auto *p = (int *)0;", "p"));
-        ASSERT_EQUALS("const signed int *", typeOf("; constexpr auto *p = (int *)0;", "p"));
-        ASSERT_EQUALS("const signed int *", typeOf("; const auto *p = (const int *)0;", "p"));
-        ASSERT_EQUALS("const signed int *", typeOf("; constexpr auto *p = (constexpr int *)0;", "p"));
-        ASSERT_EQUALS("const signed int *", typeOf("; const constexpr auto *p = (int *)0;", "p"));
-        ASSERT_EQUALS("signed int *", typeOf("; auto data = new int[100];", "data"));
-        ASSERT_EQUALS("signed int", typeOf("; auto data = new X::Y; int x=1000; x=x/5;", "/")); // #7970
-        ASSERT_EQUALS("signed int *", typeOf("; auto data = new (nothrow) int[100];", "data"));
-        ASSERT_EQUALS("signed int *", typeOf("; auto data = new (std::nothrow) int[100];", "data"));
-        ASSERT_EQUALS("const signed short", typeOf("short values[10]; void f() { for (const auto x : values); }", "x"));
-        ASSERT_EQUALS("const signed short &", typeOf("short values[10]; void f() { for (const auto& x : values); }", "x"));
-        ASSERT_EQUALS("signed short &", typeOf("short values[10]; void f() { for (auto& x : values); }", "x"));
-        ASSERT_EQUALS("signed int * &", typeOf("int* values[10]; void f() { for (auto& p : values); }", "p"));
-        ASSERT_EQUALS("signed int * const &", typeOf("int* values[10]; void f() { for (const auto& p : values); }", "p"));
-        ASSERT_EQUALS("const signed int *", typeOf("int* values[10]; void f() { for (const auto* p : values); }", "p"));
-        ASSERT_EQUALS("const signed int", typeOf("; const auto x = 3;", "x"));
-        ASSERT_EQUALS("const signed int", typeOf("; constexpr auto x = 3;", "x"));
-        ASSERT_EQUALS("const signed int", typeOf("; const constexpr auto x = 3;", "x"));
-        ASSERT_EQUALS("void * const", typeOf("typedef void* HWND; const HWND x = 0;", "x"));
+        ASSERT_EQUALS("signed int", typeOf("; auto x = 3;\n", "x"));
+        ASSERT_EQUALS("signed int *", typeOf("; auto *p = (int *)0;\n", "p"));
+        ASSERT_EQUALS("const signed int *", typeOf("; auto *p = (const int *)0;\n", "p"));
+        ASSERT_EQUALS("const signed int *", typeOf("; auto *p = (constexpr int *)0;\n", "p"));
+        ASSERT_EQUALS("const signed int *", typeOf("; const auto *p = (int *)0;\n", "p"));
+        ASSERT_EQUALS("const signed int *", typeOf("; constexpr auto *p = (int *)0;\n", "p"));
+        ASSERT_EQUALS("const signed int *", typeOf("; const auto *p = (const int *)0;\n", "p"));
+        ASSERT_EQUALS("const signed int *", typeOf("; constexpr auto *p = (constexpr int *)0;\n", "p"));
+        ASSERT_EQUALS("const signed int *", typeOf("; const constexpr auto *p = (int *)0;\n", "p"));
+        ASSERT_EQUALS("signed int *", typeOf("; auto data = new int[100];\n", "data"));
+        ASSERT_EQUALS("signed int", typeOf("; auto data = new X::Y; int x=1000; x=x/5;\n", "/")); // #7970
+        ASSERT_EQUALS("signed int *", typeOf("; auto data = new (nothrow) int[100];\n", "data"));
+        ASSERT_EQUALS("signed int *", typeOf("; auto data = new (std::nothrow) int[100];\n", "data"));
+        ASSERT_EQUALS("const signed short", typeOf("short values[10]; void f() { for (const auto x : values); }\n", "x"));
+        ASSERT_EQUALS("const signed short &", typeOf("short values[10]; void f() { for (const auto& x : values); }\n", "x"));
+        ASSERT_EQUALS("signed short &", typeOf("short values[10]; void f() { for (auto& x : values); }\n", "x"));
+        ASSERT_EQUALS("signed int * &", typeOf("int* values[10]; void f() { for (auto& p : values); }\n", "p"));
+        ASSERT_EQUALS("signed int * const &", typeOf("int* values[10]; void f() { for (const auto& p : values); }\n", "p"));
+        ASSERT_EQUALS("const signed int *", typeOf("int* values[10]; void f() { for (const auto* p : values); }\n", "p"));
+        ASSERT_EQUALS("const signed int", typeOf("; const auto x = 3;\n", "x"));
+        ASSERT_EQUALS("const signed int", typeOf("; constexpr auto x = 3;\n", "x"));
+        ASSERT_EQUALS("const signed int", typeOf("; const constexpr auto x = 3;\n", "x"));
+        ASSERT_EQUALS("void * const", typeOf("typedef void* HWND; const HWND x = 0;\n", "x"));
 
         // Variable declaration
-        ASSERT_EQUALS("char *", typeOf("; char abc[] = \"abc\";", "["));
-        ASSERT_EQUALS("", typeOf("; int x[10] = { [3]=1 };", "[ 3 ]"));
+        ASSERT_EQUALS("char *", typeOf("; char abc[] = \"abc\";\n", "["));
+        ASSERT_EQUALS("", typeOf("; int x[10] = { [3]=1 };\n", "[ 3 ]"));
 
         // std::make_shared
         {
@@ -9846,7 +10322,7 @@ class TestSymbolDatabase : public TestFixture {
                                        "</def>";
             const Settings set = settingsBuilder().libraryxml(xmldata).build();
             ASSERT_EQUALS("smart-pointer(std::shared_ptr)",
-                          typeOf("class C {}; x = std::make_shared<C>();", "(", true, &set));
+                          typeOf("class C {}; x = std::make_shared<C>();\n", "(", true, &set));
         }
 
         // return
@@ -9857,7 +10333,7 @@ class TestSymbolDatabase : public TestFixture {
                                        "  <container id=\"C\" startPattern=\"C\"/>\n"
                                        "</def>";
             const Settings sC = settingsBuilder().libraryxml(xmldata).build();
-            ASSERT_EQUALS("container(C)", typeOf("C f(char *p) { char data[10]; return data; }", "return", true, &sC));
+            ASSERT_EQUALS("container(C)", typeOf("C f(char *p) { char data[10]; return data; }\n", "return", true, &sC));
         }
         // Smart pointer
         {
@@ -9867,9 +10343,9 @@ class TestSymbolDatabase : public TestFixture {
                                        "</def>";
             const Settings set = settingsBuilder().libraryxml(xmldata).build();
             ASSERT_EQUALS("smart-pointer(MyPtr)",
-                          typeOf("void f() { MyPtr<int> p; return p; }", "p ;", true, &set));
-            ASSERT_EQUALS("signed int", typeOf("void f() { MyPtr<int> p; return *p; }", "* p ;", true, &set));
-            ASSERT_EQUALS("smart-pointer(MyPtr)", typeOf("void f() {return MyPtr<int>();}", "(", true, &set));
+                          typeOf("void f() { MyPtr<int> p; return p; }\n", "p ;", true, &set));
+            ASSERT_EQUALS("signed int", typeOf("void f() { MyPtr<int> p; return *p; }\n", "* p ;", true, &set));
+            ASSERT_EQUALS("smart-pointer(MyPtr)", typeOf("void f() {return MyPtr<int>();}\n", "(", true, &set));
         }
     }
 
@@ -9884,7 +10360,7 @@ class TestSymbolDatabase : public TestFixture {
                       "\n"
                       "void f() {\n"
                       "    func(i, b, u, s, v, it, p);\n"
-                      "}");
+                      "}\n");
 
         const Token* tok = tokenizer.tokens();
 
@@ -9940,6 +10416,18 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(tok && tok->valueType());
             ASSERT_EQUALS("iterator(std :: vector <)", tok->valueType()->str());
         }
+        {
+            GET_SYMBOL_DB("struct S { std::vector<int> v[1][1]; };\n"
+                          "void f(S& s) {\n"
+                          "    auto it = std::begin(s.v[0][0]);\n"
+                          "}\n");
+            ASSERT_EQUALS("", errout_str());
+
+            const Token* tok = tokenizer.tokens();
+            tok = Token::findsimplematch(tok, "auto");
+            ASSERT(tok && tok->valueType());
+            ASSERT_EQUALS("iterator(std :: vector <)", tok->valueType()->str());
+        }
         {
             GET_SYMBOL_DB("void f(std::vector<int>::iterator beg, std::vector<int>::iterator end) {\n"
                           "    auto it = std::find(beg, end, 0);\n"
@@ -10120,11 +10608,97 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(tok);
             TODO_ASSERT(tok->valueType() && "container(std :: string|wstring|u16string|u32string)" == tok->valueType()->str());
         }
+        {
+            GET_SYMBOL_DB("void f() {\n"
+                          "    int &&x = 0;\n"
+                          "}\n");
+
+            const Token* tok = Token::findsimplematch(tokenizer.tokens(), "&&");
+            ASSERT(tok);
+            ASSERT_EQUALS(static_cast<const ValueType*>(nullptr), tok->valueType());
+        }
     }
 
     void valueTypeThis() {
-        ASSERT_EQUALS("C *", typeOf("class C { C() { *this = 0; } };", "this"));
-        ASSERT_EQUALS("const C *", typeOf("class C { void foo() const; }; void C::foo() const { *this = 0; }", "this"));
+        ASSERT_EQUALS("C *", typeOf("class C { C() { *this = 0; } };\n", "this"));
+        ASSERT_EQUALS("const C *", typeOf("class C { void foo() const; }; void C::foo() const { *this = 0; }\n", "this"));
+    }
+
+    void valueTypeChar() {
+        Settings s = settings2;
+        s.platform.defaultSign = 's';
+        ASSERT_EQUALS("char", typeOf("char c; c = 'x';\n", "c =", true, &s));
+        ASSERT_EQUALS("char", typeOf("char buf[10]; buf[0] = 'x';\n", "[ 0 ]", true, &s));
+    }
+
+    void valueTypeRValueReference() {
+        TODO_ASSERT_EQUALS("", "bool", typeOf("void f(std::string&& s = {})\n", "&&"));
+    }
+
+    void valueTypeGeneric() {
+        ASSERT_EQUALS("float", typeOf(
+                          "float floatvar;\n"
+                          "int intvar;\n"
+                          "void testfunc() {\n"
+                          "    int controlvar;\n"
+                          "    auto testvar = _Generic(controlvar, int: floatvar, default: intvar);\n"
+                          "}\n", "testvar"));
+
+        ASSERT_EQUALS("signed int", typeOf(
+                          "float floatvar;\n"
+                          "int intvar;\n"
+                          "void testfunc() {\n"
+                          "    float controlvar;\n"
+                          "    auto testvar = _Generic(controlvar, int: floatvar, default: intvar);\n"
+                          "}\n", "testvar"));
+
+        ASSERT_EQUALS("float", typeOf(
+                          "float floatvar;\n"
+                          "int intvar;\n"
+                          "void testfunc() {\n"
+                          "    int *const controlvar;\n"
+                          "    auto testvar = _Generic(controlvar, int*: floatvar, default: intvar);\n"
+                          "}\n", "testvar"));
+
+        ASSERT_EQUALS("signed int", typeOf(
+                          "float floatvar;\n"
+                          "int intvar;\n"
+                          "void testfunc() {\n"
+                          "    const int *controlvar;\n"
+                          "    auto testvar = _Generic(controlvar, int*: floatvar, default: intvar);\n"
+                          "}\n", "testvar"));
+
+        ASSERT_EQUALS("float", typeOf(
+                          "float floatfunc();\n"
+                          "int intfunc();\n"
+                          "void testfunc() {\n"
+                          "    int controlvar;\n"
+                          "    auto testvar = _Generic(controlvar, int: floatfunc, default: intfunc)();\n"
+                          "}\n", "testvar"));
+
+        ASSERT_EQUALS("signed int", typeOf(
+                          "float floatfunc();\n"
+                          "int intfunc();\n"
+                          "void testfunc() {\n"
+                          "    float controlvar;\n"
+                          "    auto testvar = _Generic(controlvar, int: floatfunc, default: intfunc)();\n"
+                          "}\n", "testvar"));
+
+        ASSERT_EQUALS("float", typeOf(
+                          "float floatfunc();\n"
+                          "int intfunc();\n"
+                          "void testfunc() {\n"
+                          "    int *const controlvar;\n"
+                          "    auto testvar = _Generic(controlvar, int*: floatfunc, default: intfunc)();\n"
+                          "}\n", "testvar"));
+
+        ASSERT_EQUALS("signed int", typeOf(
+                          "float floatfunc();\n"
+                          "int intfunc();\n"
+                          "void testfunc() {\n"
+                          "    const int *controlvar;\n"
+                          "    auto testvar = _Generic(controlvar, int*: floatfunc, default: intfunc)();\n"
+                          "}\n", "testvar"));
     }
 
     void variadic1() { // #7453
@@ -10135,7 +10709,7 @@ class TestSymbolDatabase : public TestFixture {
                           "{\n"
                           "   CBase* cp1 = create(\"AAAA\", 44, (char*)0);\n"
                           "   CBase* cp2 = create(ot, \"AAAA\", 44, (char*)0);\n"
-                          "}");
+                          "}\n");
 
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "create ( \"AAAA\"");
             ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 1);
@@ -10149,7 +10723,7 @@ class TestSymbolDatabase : public TestFixture {
                           "{\n"
                           "   CBase* cp1 = create(\"AAAA\", 44, (char*)0);\n"
                           "   CBase* cp2 = create(ot, \"AAAA\", 44, (char*)0);\n"
-                          "}");
+                          "}\n");
 
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "create ( \"AAAA\"");
             ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 2);
@@ -10166,7 +10740,7 @@ class TestSymbolDatabase : public TestFixture {
                           "{\n"
                           "   CBase* cp1 = create(\"AAAA\", 44, (char*)0);\n"
                           "   CBase* cp2 = create(L\"AAAA\", 44, (char*)0);\n"
-                          "}");
+                          "}\n");
 
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "cp1 = create (");
             ASSERT_EQUALS(true, db && f && f->tokAt(2) && f->tokAt(2)->function() && f->tokAt(2)->function()->tokenDef->linenr() == 1);
@@ -10180,7 +10754,7 @@ class TestSymbolDatabase : public TestFixture {
                           "{\n"
                           "   CBase* cp1 = create(\"AAAA\", 44, (char*)0);\n"
                           "   CBase* cp2 = create(L\"AAAA\", 44, (char*)0);\n"
-                          "}");
+                          "}\n");
 
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "cp1 = create (");
             ASSERT_EQUALS(true, db && f && f->tokAt(2) && f->tokAt(2)->function() && f->tokAt(2)->function()->tokenDef->linenr() == 2);
@@ -10197,7 +10771,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    long length;\n"
                           "    XYZ per;\n"
                           "    zdcalc(length, &per);\n"
-                          "}");
+                          "}\n");
 
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "zdcalc ( length");
             ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 2);
@@ -10209,7 +10783,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    long length;\n"
                           "    XYZ per;\n"
                           "    zdcalc(length, &per);\n"
-                          "}");
+                          "}\n");
 
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "zdcalc ( length");
             ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 1);
@@ -10217,7 +10791,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void noReturnType() {
-        GET_SYMBOL_DB_C("func() { }");
+        GET_SYMBOL_DB_C("func() { }\n");
 
         ASSERT(db && db->functionScopes.size() == 1);
         ASSERT(db->functionScopes[0]->function != nullptr);
@@ -10226,7 +10800,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void auto1() {
-        GET_SYMBOL_DB("; auto x = \"abc\";");
+        GET_SYMBOL_DB("; auto x = \"abc\";\n");
         const Token *autotok = tokenizer.tokens()->next();
         ASSERT(autotok && autotok->isStandardType());
         const Variable *var = db ? db->getVariableFromVarId(1) : nullptr;
@@ -10241,7 +10815,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    auto c = new S[10];\n"
                       "    auto * d = new S[10];\n"
                       "    return a->i + b->i + c[0]->i + d[0]->i;\n"
-                      "}");
+                      "}\n");
         const Token *autotok = Token::findsimplematch(tokenizer.tokens(), "auto");
         ASSERT(db && autotok && autotok->valueType() && autotok->valueType()->pointer == 1 && autotok->valueType()->typeScope && autotok->valueType()->typeScope->definedType && autotok->valueType()->typeScope->definedType->name() == "S" && autotok->type() == nullptr);
 
@@ -10303,7 +10877,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    auto c = new E[10];\n"
                       "    auto * d = new E[10];\n"
                       "    return *a + *b + c[0] + d[0];\n"
-                      "}");
+                      "}\n");
         const Token *autotok = Token::findsimplematch(tokenizer.tokens(), "auto");
         ASSERT(db && autotok && autotok->valueType() && autotok->valueType()->pointer == 1 && autotok->valueType()->typeScope && autotok->valueType()->typeScope->definedType && autotok->valueType()->typeScope->definedType->name() == "E" && autotok->type() == nullptr);
 
@@ -10358,7 +10932,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    for (const auto * e : array)\n"
                       "        auto ei = e->i;\n"
                       "    return array[0].i;\n"
-                      "}");
+                      "}\n");
         const Token *autotok = Token::findsimplematch(tokenizer.tokens(), "auto a");
         ASSERT(db && autotok && autotok->valueType() && autotok->valueType()->pointer == 0 && autotok->valueType()->constness == 0 && autotok->valueType()->typeScope && autotok->valueType()->typeScope->definedType && autotok->valueType()->typeScope->definedType->name() == "S");
         ASSERT(db && autotok && autotok->type() && autotok->type()->name() == "S");
@@ -10449,7 +11023,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    for (const auto * e : vec)\n"
                       "        auto ei = e->i;\n"
                       "    return vec[0].i;\n"
-                      "}");
+                      "}\n");
         const Token *autotok = Token::findsimplematch(tokenizer.tokens(), "auto a");
         ASSERT(autotok && autotok->valueType() && autotok->valueType()->pointer == 0 && autotok->valueType()->constness == 0 && autotok->valueType()->typeScope && autotok->valueType()->typeScope->definedType && autotok->valueType()->typeScope->definedType->name() == "S");
         ASSERT(autotok && autotok->type() && autotok->type()->name() == "S");
@@ -10545,7 +11119,7 @@ class TestSymbolDatabase : public TestFixture {
                       "mBuffersForTF . clear ( ) ;\n"
                       "for ( const auto & cur : mIndexedBindings ) {}\n"
                       "return mBuffersForTF ;\n"
-                      "}");
+                      "}\n");
     }
 
     void auto7() {
@@ -10571,7 +11145,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    const auto * v10 = bar.getFoo2()[0].b;\n"
                       "    auto v11 = v1 + v2 + v3[0] + v4[0] + v5[0] + v6 + v7 + v8[0] + v9[0] + v10[0];\n"
                       "    return v11;\n"
-                      "}");
+                      "}\n");
         const Token *autotok = Token::findsimplematch(tokenizer.tokens(), "auto v1");
 
         // auto = int, v1 = int
@@ -10755,7 +11329,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("std::vector<int> vec;\n"
                       "void foo() {\n"
                       "    for (auto it = vec.begin(); it != vec.end(); ++it) { }\n"
-                      "}");
+                      "}\n");
         const Token *autotok = Token::findsimplematch(tokenizer.tokens(), "auto it");
 
         ASSERT(autotok);
@@ -10795,14 +11369,14 @@ class TestSymbolDatabase : public TestFixture {
                       "{\n"
                       "  for (auto& elem : secret_) {\n"
                       "  }\n"
-                      "}");
+                      "}\n");
     }
 
     void auto10() { // #8020
         GET_SYMBOL_DB("void f() {\n"
                       "    std::vector<int> ints(4);\n"
                       "    auto iter = ints.begin() + (ints.size() - 1);\n"
-                      "}");
+                      "}\n");
         const Token *autotok = Token::findsimplematch(tokenizer.tokens(), "auto iter");
 
         ASSERT(autotok);
@@ -10817,7 +11391,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void f() {\n"
                       "  const auto v1 = 3;\n"
                       "  const auto *v2 = 0;\n"
-                      "}");
+                      "}\n");
 
         const Token *v1tok = Token::findsimplematch(tokenizer.tokens(), "v1");
         ASSERT(v1tok && v1tok->variable() && v1tok->variable()->isConst());
@@ -10830,7 +11404,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void f(const std::string &x) {\n"
                       "  auto y = x;\n"
                       "  if (y.empty()) {}\n"
-                      "}");
+                      "}\n");
 
         const Token *tok;
 
@@ -10848,7 +11422,7 @@ class TestSymbolDatabase : public TestFixture {
                       "{\n"
                       "    auto *next = get();\n"
                       "    return next;\n"
-                      "}");
+                      "}\n");
 
         const Token *tok;
 
@@ -10864,7 +11438,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("static void foo() {\n"
                       "    auto combo = widget->combo = new Combo{};\n"
                       "    combo->addItem();\n"
-                      "}");
+                      "}\n");
 
         const Token *tok;
 
@@ -10874,7 +11448,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void auto15() {
         GET_SYMBOL_DB("auto var1{3};\n"
-                      "auto var2{4.0};");
+                      "auto var2{4.0};\n");
         ASSERT_EQUALS(3, db->variableList().size());
         const Variable *var1 = db->variableList()[1];
         ASSERT(var1->valueType());
@@ -11042,7 +11616,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    Fred(float x) : f(x) { }\n"
                       "    int i;\n"
                       "    float f;\n"
-                      "};");
+                      "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -11066,7 +11640,7 @@ class TestSymbolDatabase : public TestFixture {
                       "  {   // return iterator for end of reversed nonmutable sequence\n"
                       "    return (rend());\n"
                       "  }\n"
-                      "};");
+                      "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -11345,7 +11919,7 @@ class TestSymbolDatabase : public TestFixture {
 
         {
             GET_SYMBOL_DB("typedef void ( *fp16 )( int16_t n );\n"
-                          "fp16 fp3 = ( fp16 ) 0x8000;");
+                          "fp16 fp3 = ( fp16 ) 0x8000;\n");
             const Token* tok = Token::findsimplematch(tokenizer.tokens(), "( void * ) 0x8000");
             ASSERT_EQUALS(tok->isCast(), true);
             ASSERT(tok->valueType());
@@ -11362,7 +11936,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    friend bool operator==(const Foo&lhs, const Foo&rhs) {\n"
                       "        return lhs.x == rhs.x;\n"
                       "    }\n"
-                      "};");
+                      "};\n");
         std::ostringstream ostr;
         db->printXml(ostr);
         ASSERT(ostr.str().find(" isFriend=\"true\"") != std::string::npos);
@@ -11371,13 +11945,13 @@ class TestSymbolDatabase : public TestFixture {
     void smartPointerLookupCtor() { // #13719
         // do not crash in smartpointer lookup
         GET_SYMBOL_DB("struct S { int v; S(int i); };\n"
-                      "void f() { S(0).v; }");
+                      "void f() { S(0).v; }\n");
 
         ASSERT(db);
     }
 
     void stdintFunction() {
-        GET_SYMBOL_DB("a = UINT32_C(60);");
+        GET_SYMBOL_DB("a = UINT32_C(60);\n");
         const Token* tok = Token::findsimplematch(tokenizer.tokens(), "UINT32_C (");
         ASSERT(tok != nullptr);
         ASSERT_EQUALS(tok->next()->valueType()->sign, ValueType::Sign::UNSIGNED);
@@ -11385,12 +11959,24 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void userDefinedLiteral() {
-        GET_SYMBOL_DB("_ 1p;");
+        GET_SYMBOL_DB("_ 1p;\n");
         const Token *x = Token::findsimplematch(tokenizer.tokens(), "1p");
         ASSERT(x);
         ASSERT(!x->varId());
         ASSERT(!x->variable());
     }
+
+    void dumpValueNegative() { // #14735
+        GET_SYMBOL_DB("void f(unsigned int x) { a = x; }\n");
+        const Token* x = Token::findsimplematch(tokenizer.tokens(), "x ;");
+        ASSERT(x != nullptr);
+        std::ostringstream out;
+        x->printValueFlow({"test.cpp"}, true, out);
+        const std::string dump = out.str();
+        const std::string expected = "<value intvalue=\"-1\" bound=\"Upper\" impossible=\"true\" path=\"0\"/>";
+        // dump should contain expected string, otherwise print the dump string
+        ASSERT_EQUALS(expected, dump.find(expected) == std::string::npos ? dump : expected);
+    }
 };
 
 REGISTER_TEST(TestSymbolDatabase)
diff --git a/test/testthreadexecutor.cpp b/test/testthreadexecutor.cpp
index 106a5bc9078..c32fb360bec 100644
--- a/test/testthreadexecutor.cpp
+++ b/test/testthreadexecutor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,7 +51,7 @@ class TestThreadExecutorBase : public TestFixture {
 
 private:
 #ifdef HAS_THREADING_MODEL_THREAD
-    /*const*/ Settings settings = settingsBuilder().library("std.cfg").build();
+    /*const*/ Settings settings;
     bool useFS;
 
     std::string fprefix() const
@@ -64,7 +64,7 @@ class TestThreadExecutorBase : public TestFixture {
     struct CheckOptions
     {
         bool quiet = true;
-        ShowTime showtime = ShowTime::NONE;
+        Settings::ShowTime showtime = Settings::ShowTime::NONE;
         const char* plistOutput = nullptr;
         std::vector<std::string> filesList;
     };
@@ -105,6 +105,9 @@ class TestThreadExecutorBase : public TestFixture {
         s.templateFormat = "{callstack}: ({severity}) {inconclusive:inconclusive: }{message}"; // TODO: remove when we only longer rely on toString() in unique message handling?
 
         Suppressions supprs;
+        std::unique_ptr<TimerResults> timerResults;
+        if (s.showtime != Settings::ShowTime::NONE)
+            timerResults.reset(new TimerResults);
 
         // NOLINTNEXTLINE(performance-unnecessary-value-param)
         auto executeFn = [](std::string,std::vector<std::string>,std::string,std::string&){
@@ -120,7 +123,7 @@ class TestThreadExecutorBase : public TestFixture {
         if (useFS)
             filelist.clear();
 
-        ThreadExecutor executor(filelist, fileSettings, s, supprs, *this, executeFn);
+        ThreadExecutor executor(filelist, fileSettings, s, supprs, *this, timerResults.get(), executeFn);
         ASSERT_EQUALS(result, executor.check());
     }
 #endif // HAS_THREADING_MODEL_THREAD
@@ -138,9 +141,7 @@ class TestThreadExecutorBase : public TestFixture {
         TEST_CASE(one_error_less_files);
         TEST_CASE(one_error_several_files);
         TEST_CASE(showtime_top5_file);
-        TEST_CASE(showtime_top5_summary);
         TEST_CASE(showtime_file);
-        TEST_CASE(showtime_summary);
         TEST_CASE(showtime_file_total);
         TEST_CASE(suppress_error_library);
         TEST_CASE(unique_errors);
@@ -168,7 +169,7 @@ class TestThreadExecutorBase : public TestFixture {
               "void f()\n"
               "{\n"
               "  (void)(*((int*)0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(num_files, cppcheck::count_all_of(errout_str(), "(error) Null pointer dereference: (int*)0"));
     }
 
@@ -179,7 +180,7 @@ class TestThreadExecutorBase : public TestFixture {
               "void f()\n"
               "{\n"
               "  (void)(*((int*)0));\n"
-              "}", dinit(CheckOptions, $.showtime = ShowTime::SUMMARY));
+              "}\n", dinit(CheckOptions, $.showtime = Settings::ShowTime::SUMMARY));
         // we are not interested in the results - so just consume them
         ignore_errout();
     }
@@ -192,7 +193,7 @@ class TestThreadExecutorBase : public TestFixture {
               "void f()\n"
               "{\n"
               "  (void)(*((int*)0));\n"
-              "}", dinit(CheckOptions, $.plistOutput = plistOutput.c_str()));
+              "}\n", dinit(CheckOptions, $.plistOutput = plistOutput.c_str()));
         // we are not interested in the results - so just consume them
         ignore_errout();
     }
@@ -202,7 +203,7 @@ class TestThreadExecutorBase : public TestFixture {
               "int main()\n"
               "{\n"
               "  return 0;\n"
-              "}");
+              "}\n");
     }
 
     void no_errors_less_files() {
@@ -210,7 +211,7 @@ class TestThreadExecutorBase : public TestFixture {
               "int main()\n"
               "{\n"
               "  return 0;\n"
-              "}");
+              "}\n");
     }
 
     void no_errors_equal_amount_files() {
@@ -218,7 +219,7 @@ class TestThreadExecutorBase : public TestFixture {
               "int main()\n"
               "{\n"
               "  return 0;\n"
-              "}");
+              "}\n");
     }
 
     void one_error_less_files() {
@@ -226,7 +227,7 @@ class TestThreadExecutorBase : public TestFixture {
               "void f()\n"
               "{\n"
               "  (void)(*((int*)0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[" + fprefix() + "_1.c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
     }
 
@@ -236,7 +237,7 @@ class TestThreadExecutorBase : public TestFixture {
               "void f()\n"
               "{\n"
               "  (void)(*((int*)0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(num_files, cppcheck::count_all_of(errout_str(), "(error) Null pointer dereference: (int*)0"));
     }
 
@@ -246,56 +247,30 @@ class TestThreadExecutorBase : public TestFixture {
     void showtime_top5_file() {
         REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
         check(2, 2, 0,
-              "int main() {}",
+              "int main() {}\n",
               dinit(CheckOptions,
-                    $.showtime = ShowTime::TOP5_FILE));
+                    $.showtime = Settings::ShowTime::TOP5_FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        // for each file: top5 results + newline + overall
-        ASSERT_EQUALS((5 + 1 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
-    }
-
-    void showtime_top5_summary() {
-        REDIRECT;
-        check(2, 2, 0,
-              "int main() {}",
-              dinit(CheckOptions,
-                    $.showtime = ShowTime::TOP5_SUMMARY));
-        const std::string output_s = GET_REDIRECT_OUTPUT;
-        // once: top5 results + newline
-        ASSERT_EQUALS(5 + 1, cppcheck::count_all_of(output_s, '\n'));
-        // should only report the top5 once
-        ASSERT(output_s.find("1 result(s)") == std::string::npos);
-        ASSERT(output_s.find("2 result(s)") != std::string::npos);
+        // for each file: top5 results + check time
+        ASSERT_EQUALS((5 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
     }
 
     void showtime_file() {
         REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
         check(2, 2, 0,
-              "int main() {}",
+              "int main() {}\n",
               dinit(CheckOptions,
-                    $.showtime = ShowTime::FILE));
+                    $.showtime = Settings::ShowTime::FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
         ASSERT_EQUALS(0, cppcheck::count_all_of(output_s, "Overall time:"));
     }
 
-    void showtime_summary() {
-        REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
-        check(2, 2, 0,
-              "int main() {}",
-              dinit(CheckOptions,
-                    $.showtime = ShowTime::SUMMARY));
-        const std::string output_s = GET_REDIRECT_OUTPUT;
-        // should only report the actual summary once
-        ASSERT(output_s.find("1 result(s)") == std::string::npos);
-        ASSERT(output_s.find("2 result(s)") != std::string::npos);
-    }
-
     void showtime_file_total() {
         REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
         check(2, 2, 0,
-              "int main() {}",
+              "int main() {}\n",
               dinit(CheckOptions,
-                    $.showtime = ShowTime::FILE_TOTAL));
+                    $.showtime = Settings::ShowTime::FILE_TOTAL));
         const std::string output_s = GET_REDIRECT_OUTPUT;
         ASSERT(output_s.find("Check time: " + fprefix() + "_1.c: ") != std::string::npos);
         ASSERT(output_s.find("Check time: " + fprefix() + "_2.c: ") != std::string::npos);
@@ -310,7 +285,7 @@ class TestThreadExecutorBase : public TestFixture {
               "void f()\n"
               "{\n"
               "  (void)(*((int*)0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         settings = settingsOld;
     }
@@ -321,9 +296,9 @@ class TestThreadExecutorBase : public TestFixture {
                          "inline void f()\n"
                          "{\n"
                          "  (void)(*((int*)0));\n"
-                         "}");
+                         "}\n");
         check(2, 2, 2,
-              "#include \"" + inc_h.name() +"\"");
+              "#include \"" + inc_h.name() +"\"\n");
         // this is made unique by the executor
         ASSERT_EQUALS("[" + inc_h.name() + ":3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
     }
diff --git a/test/testtimer.cpp b/test/testtimer.cpp
index 75fead13d2d..4d5c1c2700c 100644
--- a/test/testtimer.cpp
+++ b/test/testtimer.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
  */
 
 #include "fixture.h"
+#include "redirect.h"
 #include "timer.h"
 
 #include <chrono>
@@ -26,17 +27,43 @@ class TestTimer : public TestFixture {
     TestTimer() : TestFixture("TestTimer") {}
 
 private:
-
     void run() override {
         TEST_CASE(result);
     }
 
-    void result() const {
-        TimerResultsData t1;
-        t1.mDuration = std::chrono::milliseconds{1234};
-        ASSERT(t1.getSeconds().count() > 1.233 && t1.getSeconds().count() < 1.235);
+    void result() {
+        REDIRECT;
+
+        TimerResults t1;
+        t1.addResults("call1", std::chrono::milliseconds{1230});
+        t1.addResults("call2", std::chrono::milliseconds{1234});
+        t1.addResults("call1", std::chrono::milliseconds{1235});
+        t1.addResults("call1", std::chrono::milliseconds{1239});
+
+        const auto results = t1.getResults();
+        ASSERT_EQUALS(2, results.size());
+
+        auto it = results.find("call1");
+        ASSERT(it != results.cend());
+        ASSERT_EQUALS(3, it->second.size());
+        ASSERT_EQUALS(1230, it->second[0].count());
+        ASSERT_EQUALS(1235, it->second[1].count());
+        ASSERT_EQUALS(1239, it->second[2].count());
+
+        it = results.find("call2");
+        ASSERT(it != results.cend());
+        ASSERT_EQUALS(1, it->second.size());
+        ASSERT_EQUALS(1234, it->second[0].count());
+
+        t1.showResults();
+        ASSERT_EQUALS("call1: 3.704s (avg. 1.23467s / min 1.23s / max 1.239s - 3 result(s))\n"
+                      "call2: 1.234s (avg. 1.234s / min 1.234s / max 1.234s - 1 result(s))\n", GET_REDIRECT_OUTPUT);
+
+        t1.showResults(1);
+        ASSERT_EQUALS("call1: 3.704s (avg. 1.23467s / min 1.23s / max 1.239s - 3 result(s))\n", GET_REDIRECT_OUTPUT);
 
-        // TODO : more tests
+        t1.showResults(1, false);
+        ASSERT_EQUALS("call1: 3.704s\n", GET_REDIRECT_OUTPUT);
     }
 };
 
diff --git a/test/testtoken.cpp b/test/testtoken.cpp
index 1a94e092ac9..b72c7f60148 100644
--- a/test/testtoken.cpp
+++ b/test/testtoken.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,6 +36,11 @@ class TestToken : public TestFixture {
     TestToken() : TestFixture("TestToken") {}
 
 private:
+    class TokenTest final : public Token
+    {
+        friend class TestToken;
+    };
+
     const TokenList list{settingsDefault, Standards::Language::C};
 
     std::vector<std::string> arithmeticalOps;
@@ -59,6 +64,7 @@ class TestToken : public TestFixture {
         TEST_CASE(multiCompare3);                   // false positive for %or% on code using "|="
         TEST_CASE(multiCompare4);
         TEST_CASE(multiCompare5);
+        TEST_CASE(multiCompare6);
         TEST_CASE(charTypes);
         TEST_CASE(stringTypes);
         TEST_CASE(getStrLength);
@@ -152,7 +158,7 @@ class TestToken : public TestFixture {
 #define MatchCheck(...) MatchCheck_(__FILE__, __LINE__, __VA_ARGS__)
     bool MatchCheck_(const char* file, int line, const std::string& code, const std::string& pattern) {
         SimpleTokenizer tokenizer(settingsDefault, *this);
-        const std::string code2 = ";" + code + ";";
+        const std::string code2 = ";" + code + ";\n";
         try {
             ASSERT_LOC(tokenizer.tokenize(code2), file, line);
         } catch (...) {}
@@ -165,15 +171,15 @@ class TestToken : public TestFixture {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token one(list, std::move(tokensFrontBack));
             one.str("one");
-            ASSERT_EQUALS(1, Token::multiCompare(&one, "one|two", 0));
+            ASSERT_EQUALS(1, TokenTest::multiCompare(&one, "one|two", 0));
         }
 
         {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token two(list, std::move(tokensFrontBack));
             two.str("two");
-            ASSERT_EQUALS(1, Token::multiCompare(&two, "one|two", 0));
-            ASSERT_EQUALS(1, Token::multiCompare(&two, "verybig|two|", 0));
+            ASSERT_EQUALS(1, TokenTest::multiCompare(&two, "one|two", 0));
+            ASSERT_EQUALS(1, TokenTest::multiCompare(&two, "verybig|two|", 0));
         }
 
         // Test for empty string found
@@ -181,45 +187,45 @@ class TestToken : public TestFixture {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token notfound(list, std::move(tokensFrontBack));
             notfound.str("notfound");
-            ASSERT_EQUALS(0, Token::multiCompare(&notfound, "one|two|", 0));
+            ASSERT_EQUALS(0, TokenTest::multiCompare(&notfound, "one|two|", 0));
 
             // Test for not found
-            ASSERT_EQUALS(-1, Token::multiCompare(&notfound, "one|two", 0));
+            ASSERT_EQUALS(-1, TokenTest::multiCompare(&notfound, "one|two", 0));
         }
 
         {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token s(list, std::move(tokensFrontBack));
             s.str("s");
-            ASSERT_EQUALS(-1, Token::multiCompare(&s, "verybig|two", 0));
+            ASSERT_EQUALS(-1, TokenTest::multiCompare(&s, "verybig|two", 0));
         }
 
         {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token ne(list, std::move(tokensFrontBack));
             ne.str("ne");
-            ASSERT_EQUALS(-1, Token::multiCompare(&ne, "one|two", 0));
+            ASSERT_EQUALS(-1, TokenTest::multiCompare(&ne, "one|two", 0));
         }
 
         {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token a(list, std::move(tokensFrontBack));
             a.str("a");
-            ASSERT_EQUALS(-1, Token::multiCompare(&a, "abc|def", 0));
+            ASSERT_EQUALS(-1, TokenTest::multiCompare(&a, "abc|def", 0));
         }
 
         {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token abcd(list, std::move(tokensFrontBack));
             abcd.str("abcd");
-            ASSERT_EQUALS(-1, Token::multiCompare(&abcd, "abc|def", 0));
+            ASSERT_EQUALS(-1, TokenTest::multiCompare(&abcd, "abc|def", 0));
         }
 
         {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token def(list, std::move(tokensFrontBack));
             def.str("default");
-            ASSERT_EQUALS(-1, Token::multiCompare(&def, "abc|def", 0));
+            ASSERT_EQUALS(-1, TokenTest::multiCompare(&def, "abc|def", 0));
         }
 
         // %op%
@@ -227,22 +233,22 @@ class TestToken : public TestFixture {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token plus(list, std::move(tokensFrontBack));
             plus.str("+");
-            ASSERT_EQUALS(1, Token::multiCompare(&plus, "one|%op%", 0));
-            ASSERT_EQUALS(1, Token::multiCompare(&plus, "%op%|two", 0));
+            ASSERT_EQUALS(1, TokenTest::multiCompare(&plus, "one|%op%", 0));
+            ASSERT_EQUALS(1, TokenTest::multiCompare(&plus, "%op%|two", 0));
         }
         {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token x(list, std::move(tokensFrontBack));
             x.str("x");
-            ASSERT_EQUALS(-1, Token::multiCompare(&x, "one|%op%", 0));
-            ASSERT_EQUALS(-1, Token::multiCompare(&x, "%op%|two", 0));
+            ASSERT_EQUALS(-1, TokenTest::multiCompare(&x, "one|%op%", 0));
+            ASSERT_EQUALS(-1, TokenTest::multiCompare(&x, "%op%|two", 0));
         }
 
     }
 
     void multiCompare2() const { // #3294
         // Original pattern that failed: [[,(=<>+-*|&^] %num% [+-*/] %num% ]|,|)|;|=|%op%
-        const SimpleTokenList toks("a == 1");
+        const SimpleTokenList toks("a == 1\n");
         ASSERT_EQUALS(true, Token::Match(toks.front(), "a =|%op%"));
     }
 
@@ -251,28 +257,28 @@ class TestToken : public TestFixture {
         // Code snippet that failed: "return lv@86 |= rv@87 ;"
 
         // Note: Also test "reverse" alternative pattern, two different code paths to handle it
-        const SimpleTokenList toks("return a |= b ;");
+        const SimpleTokenList toks("return a |= b ;\n");
         ASSERT_EQUALS(false, Token::Match(toks.front(), "return %name% xyz|%or% %name% ;"));
         ASSERT_EQUALS(false, Token::Match(toks.front(), "return %name% %or%|xyz %name% ;"));
 
-        const SimpleTokenList toks2("return a | b ;");
+        const SimpleTokenList toks2("return a | b ;\n");
         ASSERT_EQUALS(true, Token::Match(toks2.front(), "return %name% xyz|%or% %name% ;"));
         ASSERT_EQUALS(true, Token::Match(toks2.front(), "return %name% %or%|xyz %name% ;"));
 
-        const SimpleTokenList toks3("return a || b ;");
+        const SimpleTokenList toks3("return a || b ;\n");
         ASSERT_EQUALS(false, Token::Match(toks3.front(), "return %name% xyz|%or% %name% ;"));
         ASSERT_EQUALS(false, Token::Match(toks3.front(), "return %name% %or%|xyz %name% ;"));
 
         ASSERT_EQUALS(true, Token::Match(toks3.front(), "return %name% xyz|%oror% %name% ;"));
         ASSERT_EQUALS(true, Token::Match(toks3.front(), "return %name% %oror%|xyz %name% ;"));
 
-        const SimpleTokenList toks4("a % b ;");
+        const SimpleTokenList toks4("a % b ;\n");
         ASSERT_EQUALS(true, Token::Match(toks4.front(), "%name% >>|<<|&|%or%|^|% %name% ;"));
         ASSERT_EQUALS(true, Token::Match(toks4.front(), "%name% %|>>|<<|&|%or%|^ %name% ;"));
         ASSERT_EQUALS(true, Token::Match(toks4.front(), "%name% >>|<<|&|%or%|%|^ %name% ;"));
 
         //%name%|%num% support
-        const SimpleTokenList num("100");
+        const SimpleTokenList num("100\n");
         ASSERT_EQUALS(true, Token::Match(num.front(), "%num%|%name%"));
         ASSERT_EQUALS(true, Token::Match(num.front(), "%name%|%num%"));
         ASSERT_EQUALS(true, Token::Match(num.front(), "%name%|%num%|%bool%"));
@@ -282,7 +288,7 @@ class TestToken : public TestFixture {
         ASSERT_EQUALS(false, Token::Match(num.front(), "%type%|%bool%|%char%"));
         ASSERT_EQUALS(true, Token::Match(num.front(), "%type%|%bool%|100"));
 
-        const SimpleTokenList numparen("( 100 )");
+        const SimpleTokenList numparen("( 100 )\n");
         ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| %num%|%name% )|"));
         ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| %name%|%num% )|"));
         ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| %name%|%num%|%bool% )|"));
@@ -300,7 +306,7 @@ class TestToken : public TestFixture {
 
     void multiCompare4() {
         SimpleTokenizer var(*this);
-        ASSERT(var.tokenize("std :: queue < int > foo ;"));
+        ASSERT(var.tokenize("std :: queue < int > foo ;\n"));
 
         ASSERT_EQUALS(Token::eBracket, var.tokens()->tokAt(3)->tokType());
         ASSERT_EQUALS(Token::eBracket, var.tokens()->tokAt(5)->tokType());
@@ -314,7 +320,18 @@ class TestToken : public TestFixture {
         auto tokensFrontBack = std::make_shared<TokensFrontBack>();
         Token tok(list, std::move(tokensFrontBack));
         tok.str("||");
-        ASSERT_EQUALS(true, Token::multiCompare(&tok, "+|%or%|%oror%", 0) >= 0);
+        ASSERT_EQUALS(true, TokenTest::multiCompare(&tok, "+|%or%|%oror%", 0) >= 0);
+    }
+
+    void multiCompare6() const {
+        {
+            const SimpleTokenList stl("x %= y;\n");
+            ASSERT_EQUALS(true, Token::Match(stl.front(), "%name% %= %name%"));
+        }
+        {
+            const SimpleTokenList stl("x += y;\n");
+            ASSERT_EQUALS(false, Token::Match(stl.front(), "%name% %= %name%"));
+        }
     }
 
     void charTypes() const {
@@ -581,40 +598,40 @@ class TestToken : public TestFixture {
 
     void nextArgument() {
         SimpleTokenizer example1(*this);
-        ASSERT(example1.tokenize("foo(1, 2, 3, 4);"));
+        ASSERT(example1.tokenize("foo(1, 2, 3, 4);\n"));
         ASSERT_EQUALS(true, Token::simpleMatch(example1.tokens()->tokAt(2)->nextArgument(), "2 , 3"));
         ASSERT_EQUALS(true, Token::simpleMatch(example1.tokens()->tokAt(4)->nextArgument(), "3 , 4"));
 
         SimpleTokenizer example2(*this);
-        ASSERT(example2.tokenize("foo();"));
+        ASSERT(example2.tokenize("foo();\n"));
         ASSERT_EQUALS(true, example2.tokens()->tokAt(2)->nextArgument() == nullptr);
 
         SimpleTokenizer example3(*this);
-        ASSERT(example3.tokenize("foo(bar(a, b), 2, 3);"));
+        ASSERT(example3.tokenize("foo(bar(a, b), 2, 3);\n"));
         ASSERT_EQUALS(true, Token::simpleMatch(example3.tokens()->tokAt(2)->nextArgument(), "2 , 3"));
 
         SimpleTokenizer example4(*this);
-        ASSERT(example4.tokenize("foo(x.i[1], \"\", 3);"));
+        ASSERT(example4.tokenize("foo(x.i[1], \"\", 3);\n"));
         ASSERT_EQUALS(true, Token::simpleMatch(example4.tokens()->tokAt(2)->nextArgument(), "\"\" , 3"));
     }
 
     void eraseTokens() const {
-        SimpleTokenList code("begin ; { this code will be removed } end", Standards::Language::C);
+        SimpleTokenList code("begin ; { this code will be removed } end\n", Standards::Language::C);
         Token::eraseTokens(code.front()->next(), code.front()->tokAt(9));
         ASSERT_EQUALS("begin ; end", code.front()->stringifyList(nullptr, false));
     }
 
 
     void matchAny() const {
-        const SimpleTokenList varBitOrVar("abc|def");
+        const SimpleTokenList varBitOrVar("abc|def\n");
         ASSERT_EQUALS(true, Token::Match(varBitOrVar.front(), "%name% %or% %name%"));
 
-        const SimpleTokenList varLogOrVar("abc||def");
+        const SimpleTokenList varLogOrVar("abc||def\n");
         ASSERT_EQUALS(true, Token::Match(varLogOrVar.front(), "%name% %oror% %name%"));
     }
 
     void matchSingleChar() const {
-        const SimpleTokenList singleChar("a");
+        const SimpleTokenList singleChar("a\n");
         ASSERT_EQUALS(true, Token::Match(singleChar.front(), "[a|bc]"));
         ASSERT_EQUALS(false, Token::Match(singleChar.front(), "[d|ef]"));
 
@@ -629,83 +646,83 @@ class TestToken : public TestFixture {
         ASSERT_EQUALS(true, Token::Match(empty_String.front(), "!!else"));
         ASSERT_EQUALS(false, Token::Match(empty_String.front(), "!!else something"));
 
-        const SimpleTokenList ifSemicolon("if ;");
+        const SimpleTokenList ifSemicolon("if ;\n");
         ASSERT_EQUALS(true, Token::Match(ifSemicolon.front(), "if ; !!else"));
 
-        const SimpleTokenList ifSemicolonSomething("if ; something");
+        const SimpleTokenList ifSemicolonSomething("if ; something\n");
         ASSERT_EQUALS(true, Token::Match(ifSemicolonSomething.front(), "if ; !!else"));
 
-        const SimpleTokenList justElse("else");
+        const SimpleTokenList justElse("else\n");
         ASSERT_EQUALS(false, Token::Match(justElse.front(), "!!else"));
 
-        const SimpleTokenList ifSemicolonElse("if ; else");
+        const SimpleTokenList ifSemicolonElse("if ; else\n");
         ASSERT_EQUALS(false, Token::Match(ifSemicolonElse.front(), "if ; !!else"));
     }
 
     void matchType() {
-        const SimpleTokenList type("abc");
+        const SimpleTokenList type("abc\n");
         ASSERT_EQUALS(true, Token::Match(type.front(), "%type%"));
 
         SimpleTokenizer isVar(*this);
-        ASSERT(isVar.tokenize("int a = 3 ;"));
+        ASSERT(isVar.tokenize("int a = 3 ;\n"));
         ASSERT_EQUALS(true, Token::Match(isVar.tokens(), "%type%"));
         ASSERT_EQUALS(true, Token::Match(isVar.tokens(), "%type% %name%"));
         ASSERT_EQUALS(false, Token::Match(isVar.tokens(), "%type% %type%"));
 
         // TODO: %type% should not match keywords other than fundamental types
-        const SimpleTokenList noType1_cpp("delete");
+        const SimpleTokenList noType1_cpp("delete\n");
         ASSERT_EQUALS(true, Token::Match(noType1_cpp.front(), "%type%"));
 
-        const SimpleTokenList noType1_c("delete", Standards::Language::C);
+        const SimpleTokenList noType1_c("delete\n", Standards::Language::C);
         ASSERT_EQUALS(true, Token::Match(noType1_c.front(), "%type%"));
 
-        const SimpleTokenList noType2("void delete");
+        const SimpleTokenList noType2("void delete\n");
         ASSERT_EQUALS(true, Token::Match(noType2.front(), "!!foo %type%"));
     }
 
     void matchChar() const {
-        const SimpleTokenList chr1("'a'");
+        const SimpleTokenList chr1("'a'\n");
         ASSERT_EQUALS(true, Token::Match(chr1.front(), "%char%"));
 
-        const SimpleTokenList chr2("'1'");
+        const SimpleTokenList chr2("'1'\n");
         ASSERT_EQUALS(true, Token::Match(chr2.front(), "%char%"));
 
-        const SimpleTokenList noChr("\"10\"");
+        const SimpleTokenList noChr("\"10\"\n");
         ASSERT_EQUALS(false, Token::Match(noChr.front(), "%char%"));
     }
 
     void matchCompOp() const {
-        const SimpleTokenList comp1("<=");
+        const SimpleTokenList comp1("<=\n");
         ASSERT_EQUALS(true, Token::Match(comp1.front(), "%comp%"));
 
-        const SimpleTokenList comp2(">");
+        const SimpleTokenList comp2(">\n");
         ASSERT_EQUALS(true, Token::Match(comp2.front(), "%comp%"));
 
-        const SimpleTokenList noComp("=");
+        const SimpleTokenList noComp("=\n");
         ASSERT_EQUALS(false, Token::Match(noComp.front(), "%comp%"));
     }
 
     void matchStr() const {
-        const SimpleTokenList noStr1("abc");
+        const SimpleTokenList noStr1("abc\n");
         ASSERT_EQUALS(false, Token::Match(noStr1.front(), "%str%"));
 
-        const SimpleTokenList noStr2("'a'");
+        const SimpleTokenList noStr2("'a'\n");
         ASSERT_EQUALS(false, Token::Match(noStr2.front(), "%str%"));
 
-        const SimpleTokenList str("\"abc\"");
+        const SimpleTokenList str("\"abc\"\n");
         ASSERT_EQUALS(true, Token::Match(str.front(), "%str%"));
 
         // Empty string
-        const SimpleTokenList emptyStr("\"\"");
+        const SimpleTokenList emptyStr("\"\"\n");
         ASSERT_EQUALS(true, Token::Match(emptyStr.front(), "%str%"));
     }
 
     void matchVarid() {
         SimpleTokenizer var(*this);
-        ASSERT(var.tokenize("int a ; int b ;"));
+        ASSERT(var.tokenize("int a ; int b ;\n"));
 
         // Varid == 0 should throw exception
-        ASSERT_THROW_INTERNAL_EQUALS((void)Token::Match(var.tokens(), "%type% %varid% ; %type% %name%", 0),INTERNAL,"Internal error. Token::Match called with varid 0. Please report this to Cppcheck developers");
+        ASSERT_THROW_INTERNAL_EQUALS((void)Token::Match(var.tokens(), "%type% %varid% ; %type% %name%", 0),INTERNAL,"Internal error. Token::Match called with varid 0.");
 
         ASSERT_EQUALS(true, Token::Match(var.tokens(), "%type% %varid% ; %type% %name%", 1));
         ASSERT_EQUALS(true, Token::Match(var.tokens(), "%type% %name% ; %type% %varid%", 2));
@@ -719,89 +736,89 @@ class TestToken : public TestFixture {
     }
 
     void matchNumeric() const {
-        const SimpleTokenList nonNumeric("abc");
+        const SimpleTokenList nonNumeric("abc\n");
         ASSERT_EQUALS(false, Token::Match(nonNumeric.front(), "%num%"));
 
-        const SimpleTokenList msLiteral("5ms"); // #11438
+        const SimpleTokenList msLiteral("5ms\n"); // #11438
         ASSERT_EQUALS(false, Token::Match(msLiteral.front(), "%num%"));
 
-        const SimpleTokenList sLiteral("3s");
+        const SimpleTokenList sLiteral("3s\n");
         ASSERT_EQUALS(false, Token::Match(sLiteral.front(), "%num%"));
 
-        const SimpleTokenList octal("0123");
+        const SimpleTokenList octal("0123\n");
         ASSERT_EQUALS(true, Token::Match(octal.front(), "%num%"));
 
-        const SimpleTokenList decimal("4567");
+        const SimpleTokenList decimal("4567\n");
         ASSERT_EQUALS(true, Token::Match(decimal.front(), "%num%"));
 
-        const SimpleTokenList hexadecimal("0xDEADBEEF");
+        const SimpleTokenList hexadecimal("0xDEADBEEF\n");
         ASSERT_EQUALS(true, Token::Match(hexadecimal.front(), "%num%"));
 
-        const SimpleTokenList floatingPoint("0.0f");
+        const SimpleTokenList floatingPoint("0.0f\n");
         ASSERT_EQUALS(true, Token::Match(floatingPoint.front(), "%num%"));
 
-        const SimpleTokenList signedLong("0L");
+        const SimpleTokenList signedLong("0L\n");
         ASSERT_EQUALS(true, Token::Match(signedLong.front(), "%num%"));
 
-        const SimpleTokenList negativeSignedLong("-0L");
+        const SimpleTokenList negativeSignedLong("-0L\n");
         ASSERT_EQUALS(true, Token::Match(negativeSignedLong.front(), "- %num%"));
 
-        const SimpleTokenList positiveSignedLong("+0L");
+        const SimpleTokenList positiveSignedLong("+0L\n");
         ASSERT_EQUALS(true, Token::Match(positiveSignedLong.front(), "+ %num%"));
 
-        const SimpleTokenList unsignedInt("0U");
+        const SimpleTokenList unsignedInt("0U\n");
         ASSERT_EQUALS(true, Token::Match(unsignedInt.front(), "%num%"));
 
-        const SimpleTokenList unsignedLong("0UL");
+        const SimpleTokenList unsignedLong("0UL\n");
         ASSERT_EQUALS(true, Token::Match(unsignedLong.front(), "%num%"));
 
-        const SimpleTokenList unsignedLongLong("0ULL");
+        const SimpleTokenList unsignedLongLong("0ULL\n");
         ASSERT_EQUALS(true, Token::Match(unsignedLongLong.front(), "%num%"));
 
-        const SimpleTokenList positive("+666");
+        const SimpleTokenList positive("+666\n");
         ASSERT_EQUALS(true, Token::Match(positive.front(), "+ %num%"));
 
-        const SimpleTokenList negative("-42");
+        const SimpleTokenList negative("-42\n");
         ASSERT_EQUALS(true, Token::Match(negative.front(), "- %num%"));
 
-        const SimpleTokenList negativeNull("-.0");
+        const SimpleTokenList negativeNull("-.0\n");
         ASSERT_EQUALS(true, Token::Match(negativeNull.front(), "- %num%"));
 
-        const SimpleTokenList positiveNull("+.0");
+        const SimpleTokenList positiveNull("+.0\n");
         ASSERT_EQUALS(true, Token::Match(positiveNull.front(), "+ %num%"));
     }
 
 
     void matchBoolean() const {
-        const SimpleTokenList yes("YES");
+        const SimpleTokenList yes("YES\n");
         ASSERT_EQUALS(false, Token::Match(yes.front(), "%bool%"));
 
-        const SimpleTokenList positive("true");
+        const SimpleTokenList positive("true\n");
         ASSERT_EQUALS(true, Token::Match(positive.front(), "%bool%"));
 
-        const SimpleTokenList negative("false");
+        const SimpleTokenList negative("false\n");
         ASSERT_EQUALS(true, Token::Match(negative.front(), "%bool%"));
     }
 
     void matchOr() const {
-        const SimpleTokenList bitwiseOr(";|;");
+        const SimpleTokenList bitwiseOr(";|;\n");
         ASSERT_EQUALS(true,  Token::Match(bitwiseOr.front(), "; %or%"));
         ASSERT_EQUALS(true,  Token::Match(bitwiseOr.front(), "; %op%"));
         ASSERT_EQUALS(false, Token::Match(bitwiseOr.front(), "; %oror%"));
 
-        const SimpleTokenList bitwiseOrAssignment(";|=;");
+        const SimpleTokenList bitwiseOrAssignment(";|=;\n");
         ASSERT_EQUALS(false,  Token::Match(bitwiseOrAssignment.front(), "; %or%"));
         ASSERT_EQUALS(true,  Token::Match(bitwiseOrAssignment.front(), "; %op%"));
         ASSERT_EQUALS(false, Token::Match(bitwiseOrAssignment.front(), "; %oror%"));
 
-        const SimpleTokenList logicalOr(";||;");
+        const SimpleTokenList logicalOr(";||;\n");
         ASSERT_EQUALS(false, Token::Match(logicalOr.front(), "; %or%"));
         ASSERT_EQUALS(true,  Token::Match(logicalOr.front(), "; %op%"));
         ASSERT_EQUALS(true,  Token::Match(logicalOr.front(), "; %oror%"));
         ASSERT_EQUALS(true,  Token::Match(logicalOr.front(), "; &&|%oror%"));
         ASSERT_EQUALS(true,  Token::Match(logicalOr.front(), "; %oror%|&&"));
 
-        const SimpleTokenList logicalAnd(";&&;");
+        const SimpleTokenList logicalAnd(";&&;\n");
         ASSERT_EQUALS(true, Token::simpleMatch(logicalAnd.front(), "; &&"));
         ASSERT_EQUALS(true, Token::Match(logicalAnd.front(), "; &&|%oror%"));
         ASSERT_EQUALS(true, Token::Match(logicalAnd.front(), "; %oror%|&&"));
@@ -1042,7 +1059,6 @@ class TestToken : public TestFixture {
         standard_types.emplace_back("long");
         standard_types.emplace_back("float");
         standard_types.emplace_back("double");
-        standard_types.emplace_back("size_t");
 
         for (auto test_op = standard_types.cbegin(); test_op != standard_types.cend(); ++test_op) {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
@@ -1128,7 +1144,7 @@ class TestToken : public TestFixture {
 
     void canFindMatchingBracketsNeedsOpen() {
         SimpleTokenizer var(*this);
-        ASSERT(var.tokenize("std::deque<std::set<int> > intsets;"));
+        ASSERT(var.tokenize("std::deque<std::set<int> > intsets;\n"));
 
         const Token* const t = var.tokens()->findClosingBracket();
         ASSERT(t == nullptr);
@@ -1136,7 +1152,7 @@ class TestToken : public TestFixture {
 
     void canFindMatchingBracketsInnerPair() {
         SimpleTokenizer var(*this);
-        ASSERT(var.tokenize("std::deque<std::set<int> > intsets;"));
+        ASSERT(var.tokenize("std::deque<std::set<int> > intsets;\n"));
 
         const Token * const t = var.tokens()->tokAt(7)->findClosingBracket();
         ASSERT_EQUALS(">", t->str());
@@ -1145,7 +1161,7 @@ class TestToken : public TestFixture {
 
     void canFindMatchingBracketsOuterPair() {
         SimpleTokenizer var(*this);
-        ASSERT(var.tokenize("std::deque<std::set<int> > intsets;"));
+        ASSERT(var.tokenize("std::deque<std::set<int> > intsets;\n"));
 
         const Token* const t = var.tokens()->tokAt(3)->findClosingBracket();
         ASSERT_EQUALS(">", t->str());
@@ -1154,7 +1170,7 @@ class TestToken : public TestFixture {
 
     void canFindMatchingBracketsWithTooManyClosing() {
         SimpleTokenizer var(*this);
-        ASSERT(var.tokenize("X< 1>2 > x1;"));
+        ASSERT(var.tokenize("X< 1>2 > x1;\n"));
 
         const Token* const t = var.tokens()->next()->findClosingBracket();
         ASSERT_EQUALS(">", t->str());
@@ -1163,7 +1179,7 @@ class TestToken : public TestFixture {
 
     void canFindMatchingBracketsWithTooManyOpening() {
         SimpleTokenizer var(*this);
-        ASSERT(var.tokenize("X < (2 < 1) > x1;"));
+        ASSERT(var.tokenize("X < (2 < 1) > x1;\n"));
 
         const Token* t = var.tokens()->next()->findClosingBracket();
         ASSERT(t != nullptr && t->str() == ">");
@@ -1174,7 +1190,7 @@ class TestToken : public TestFixture {
 
     void findClosingBracket() {
         SimpleTokenizer var(*this);
-        ASSERT(var.tokenize("template<typename X, typename...Y> struct S : public Fred<Wilma<Y...>> {}"));
+        ASSERT(var.tokenize("template<typename X, typename...Y> struct S : public Fred<Wilma<Y...>> {}\n"));
 
         const Token* const t = var.tokens()->next()->findClosingBracket();
         ASSERT(Token::simpleMatch(t, "> struct"));
@@ -1208,29 +1224,29 @@ class TestToken : public TestFixture {
 
     void expressionString() {
         SimpleTokenizer var1(*this);
-        ASSERT(var1.tokenize("void f() { *((unsigned long long *)x) = 0; }"));
+        ASSERT(var1.tokenize("void f() { *((unsigned long long *)x) = 0; }\n"));
         const Token *const tok1 = Token::findsimplematch(var1.tokens(), "*");
         ASSERT_EQUALS("*((unsigned long long*)x)", tok1->expressionString());
 
         SimpleTokenizer var2(*this);
-        ASSERT(var2.tokenize("typedef unsigned long long u64; void f() { *((u64 *)x) = 0; }"));
+        ASSERT(var2.tokenize("typedef unsigned long long u64; void f() { *((u64 *)x) = 0; }\n"));
         const Token *const tok2 = Token::findsimplematch(var2.tokens(), "*");
         ASSERT_EQUALS("*((unsigned long long*)x)", tok2->expressionString());
 
         SimpleTokenizer data3(*this);
-        ASSERT(data3.tokenize("void f() { return (t){1,2}; }"));
+        ASSERT(data3.tokenize("void f() { return (t){1,2}; }\n"));
         ASSERT_EQUALS("return(t){1,2}", data3.tokens()->tokAt(5)->expressionString());
 
         SimpleTokenizer data4(*this);
-        ASSERT(data4.tokenize("void f() { return L\"a\"; }"));
+        ASSERT(data4.tokenize("void f() { return L\"a\"; }\n"));
         ASSERT_EQUALS("returnL\"a\"", data4.tokens()->tokAt(5)->expressionString());
 
         SimpleTokenizer data5(*this);
-        ASSERT(data5.tokenize("void f() { return U\"a\"; }"));
+        ASSERT(data5.tokenize("void f() { return U\"a\"; }\n"));
         ASSERT_EQUALS("returnU\"a\"", data5.tokens()->tokAt(5)->expressionString());
 
         SimpleTokenizer data6(*this);
-        ASSERT(data6.tokenize("x = \"\\0\\x1\\x2\\x3\\x4\\x5\\x6\\x7\";"));
+        ASSERT(data6.tokenize("x = \"\\0\\x1\\x2\\x3\\x4\\x5\\x6\\x7\";\n"));
         ASSERT_EQUALS("x=\"\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\"", data6.tokens()->next()->expressionString());
     }
 
@@ -1467,13 +1483,6 @@ class TestToken : public TestFixture {
             tok.str("char"); // not treated as keyword in TokenList::isKeyword()
             assert_tok(&tok, Token::Type::eType, /*l=*/ false, /*std=*/ true);
         }
-        {
-            TokenList list_c{settingsDefault, Standards::Language::C};
-            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
-            Token tok(list_c, std::move(tokensFrontBack));
-            tok.str("size_t"); // not treated as keyword in TokenList::isKeyword()
-            assert_tok(&tok, Token::Type::eType, /*l=*/ false, /*std=*/ true);
-        }
     }
 
     void update_property_info_etype_cpp() const
@@ -1485,21 +1494,12 @@ class TestToken : public TestFixture {
             tok.str("bool"); // not treated as keyword in TokenList::isKeyword()
             assert_tok(&tok, Token::Type::eType, /*l=*/ false, /*std=*/ true);
         }
-        {
-            TokenList list_cpp{settingsDefault, Standards::Language::CPP};
-            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
-            Token tok(list_cpp, std::move(tokensFrontBack));
-            tok.str("size_t");
-            assert_tok(&tok, Token::Type::eType, /*l=*/ false, /*std=*/ true);
-        }
     }
 
     void update_property_info_replace() const // #13743
     {
         auto tokensFrontBack = std::make_shared<TokensFrontBack>();
         Token tok(list, std::move(tokensFrontBack));
-        tok.str("size_t");
-        assert_tok(&tok, Token::Type::eType, false, true);
         tok.str("long");
         assert_tok(&tok, Token::Type::eType, false, true);
     }
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 70b78a44250..d5c770169e4 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,11 +46,17 @@ class TestTokenizer : public TestFixture {
     TestTokenizer() : TestFixture("TestTokenizer") {}
 
 private:
-    const Settings settings0 = settingsBuilder().library("qt.cfg").build();
-    const Settings settings1 = settingsBuilder().library("qt.cfg").library("std.cfg").debugwarnings().build();
+    const Settings settings1 = settingsBuilder().library("std.cfg").debugwarnings().build();
     const Settings settings2 = settingsBuilder(settings1).cpp(Standards::CPP11).c(Standards::C11).build();
-    const Settings settings3 = settingsBuilder(settings0).c(Standards::C89).cpp(Standards::CPP03).build();
+    const Settings settings2_win32a = settingsBuilder(settings2).platform(Platform::Type::Win32A).build();
+    const Settings settings2_win32w = settingsBuilder(settings2).platform(Platform::Type::Win32W).build();
+    const Settings settings2_win64 = settingsBuilder(settings2).platform(Platform::Type::Win64).build();
+    const Settings settings2_unix32 = settingsBuilder(settings2).platform(Platform::Type::Unix32).build();
+    const Settings settings2_unix64 = settingsBuilder(settings2).platform(Platform::Type::Unix64).build();
+    const Settings settings3 = settingsBuilder().c(Standards::C89).cpp(Standards::CPP03).build();
     const Settings settings_windows = settingsBuilder().library("windows.cfg").debugwarnings().cpp(Standards::CPP11).build();
+    const Settings settings_win32a = settingsBuilder(settings_windows).platform(Platform::Type::Win32A).build();
+    const Settings settings_win32w = settingsBuilder(settings_windows).platform(Platform::Type::Win32W).build();
 
     void run() override {
         mNewTemplate = true;
@@ -86,6 +92,8 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(tokenize40);  // #13181
         TEST_CASE(tokenize41);  // #13847
         TEST_CASE(tokenize42);  // #13861
+        TEST_CASE(tokenize43);  // #13861
+        TEST_CASE(tokenize44);  // #14955
 
         TEST_CASE(validate);
 
@@ -97,6 +105,7 @@ class TestTokenizer : public TestFixture {
 
         TEST_CASE(foreach);     // #3690
         TEST_CASE(ifconstexpr);
+        TEST_CASE(ifconsteval);
 
         TEST_CASE(combineOperators);
 
@@ -110,7 +119,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(simplifyAt);
 
         TEST_CASE(inlineasm);
-        TEST_CASE(simplifyAsm2);  // #4725 (writing asm() around "^{}")
+        TEST_CASE(simplifyAsm2);  // #4725 (writing asm() around "^{}\n")
 
         TEST_CASE(ifAddBraces1);
         TEST_CASE(ifAddBraces2);
@@ -134,6 +143,7 @@ class TestTokenizer : public TestFixture {
 
         TEST_CASE(whileAddBraces);
         TEST_CASE(whileAddBracesLabels);
+        TEST_CASE(whileAddBracesDump);
 
         TEST_CASE(doWhileAddBraces);
         TEST_CASE(doWhileAddBracesLabels);
@@ -144,6 +154,8 @@ class TestTokenizer : public TestFixture {
 
         TEST_CASE(simplifyExternC);
         TEST_CASE(simplifyKeyword); // #5842 - remove C99 static keyword between []
+        TEST_CASE(simplifyKeywordNoreturn1);
+        TEST_CASE(simplifyKeywordNoreturn2);
 
         TEST_CASE(isOneNumber);
 
@@ -184,6 +196,8 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(removeParentheses26);      // Ticket #8875 a[0](0)
         TEST_CASE(removeParentheses27);
         TEST_CASE(removeParentheses28);      // #12164 - don't remove parentheses in '(expr1) ? (expr2) : (expr3);'
+        TEST_CASE(removeParantheses29);      // #13735
+        TEST_CASE(removeParentheses30);
 
         TEST_CASE(tokenize_double);
         TEST_CASE(tokenize_strings);
@@ -225,11 +239,14 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(vardecl32);
         TEST_CASE(vardecl33);
         TEST_CASE(vardecl34);
+        TEST_CASE(vardecl35);
+        TEST_CASE(vardecl36);
         TEST_CASE(vardecl_stl_1);
         TEST_CASE(vardecl_stl_2);
         TEST_CASE(vardecl_stl_3);
         TEST_CASE(vardecl_template_1);
         TEST_CASE(vardecl_template_2);
+        TEST_CASE(vardecl_template_3);
         TEST_CASE(vardecl_union);
         TEST_CASE(vardecl_par);     // #2743 - set links if variable type contains parentheses
         TEST_CASE(vardecl_par2);    // #3912 - set correct links
@@ -280,8 +297,13 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(cppMaybeUnusedBefore);
         TEST_CASE(cppMaybeUnusedAfter1);
         TEST_CASE(cppMaybeUnusedAfter2);
+        TEST_CASE(cppMaybeUnusedAfter3);
         TEST_CASE(cppMaybeUnusedStructuredBinding);
 
+        TEST_CASE(attributeAlignasBefore);
+        TEST_CASE(attributeAlignasAfter);
+        TEST_CASE(simplifyAlignedStorage);
+
         TEST_CASE(splitTemplateRightAngleBrackets);
 
         TEST_CASE(cpp03template1);
@@ -321,6 +343,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(bitfields19); // ticket #13733
         TEST_CASE(bitfields20);
         TEST_CASE(bitfields21);
+        TEST_CASE(bitfields22);
 
         TEST_CASE(simplifyNamespaceStd);
 
@@ -423,6 +446,12 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(astdesignatedinit);
         TEST_CASE(astrvaluedecl);
         TEST_CASE(astorkeyword);
+        TEST_CASE(astenumdecl);
+        TEST_CASE(astcompound);
+        TEST_CASE(astfuncdecl);
+        TEST_CASE(astarrayinit);
+        TEST_CASE(astbracedinit);
+        TEST_CASE(astif);
 
         TEST_CASE(startOfExecutableScope);
 
@@ -462,6 +491,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(cppKeywordInCSource);
 
         TEST_CASE(cppcast);
+        TEST_CASE(ccast);
 
         TEST_CASE(checkHeader1);
 
@@ -507,6 +537,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(simplifyPlatformTypes);
 
         TEST_CASE(dumpFallthrough);
+        TEST_CASE(dumpAttributeUsed);
 
         TEST_CASE(simplifyRedundantParentheses);
 
@@ -515,7 +546,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(simplifyEnum2);
     }
 
-    class TokenizerTest : public Tokenizer
+    class TokenizerTest final : public Tokenizer
     {
         friend class TestTokenizer;
     public:
@@ -527,19 +558,14 @@ class TestTokenizer : public TestFixture {
     struct TokenizeOptions
     {
         bool expand = true;
-        Platform::Type platform = Platform::Type::Native;
         bool cpp = true;
-        Standards::cppstd_t cppstd = Standards::CPP11;
-        Standards::cstd_t cstd = Standards::C11;
     };
 
 #define tokenizeAndStringify(...) tokenizeAndStringify_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     std::string tokenizeAndStringify_(const char* file, int linenr, const char (&code)[size], const TokenizeOptions& opt = make_default_obj{}) {
-        const Settings settings = settingsBuilder(settings1).cpp(opt.cppstd).c(opt.cstd).platform(opt.platform).build();
-
         // tokenize..
-        SimpleTokenizer tokenizer(settings, *this, opt.cpp);
+        SimpleTokenizer tokenizer(settings2, *this, opt.cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, linenr);
 
         if (tokenizer.tokens())
@@ -558,27 +584,13 @@ class TestTokenizer : public TestFixture {
     }
 
     template<size_t size>
-    std::string tokenizeAndStringify_(const char* file, int line, const char (&code)[size], const Settings &settings, bool cpp = true) {
+    std::string tokenizeAndStringify_(const char* file, int line, const char (&code)[size], const Settings &settings, bool cpp = true, bool expand = true) {
         // tokenize..
         SimpleTokenizer tokenizer(settings, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
         if (!tokenizer.tokens())
             return "";
-        return tokenizer.tokens()->stringifyList(false, true, false, true, false, nullptr, nullptr);
-    }
-
-#define tokenizeAndStringifyWindows(...) tokenizeAndStringifyWindows_(__FILE__, __LINE__, __VA_ARGS__)
-    template<size_t size>
-    std::string tokenizeAndStringifyWindows_(const char* file, int linenr, const char (&code)[size], Platform::Type platform = Platform::Type::Native) {
-        const Settings settings = settingsBuilder(settings_windows).platform(platform).build();
-
-        // tokenize..
-        SimpleTokenizer tokenizer(settings, *this);
-        ASSERT_LOC(tokenizer.tokenize(code), file, linenr);
-
-        if (tokenizer.tokens())
-            return tokenizer.tokens()->stringifyList(false, true, false, true, false, nullptr, nullptr);
-        return "";
+        return tokenizer.tokens()->stringifyList(false, expand, false, true, false, nullptr, nullptr);
     }
 
 #define tokenizeDebugListing(...) tokenizeDebugListing_(__FILE__, __LINE__, __VA_ARGS__)
@@ -600,11 +612,17 @@ class TestTokenizer : public TestFixture {
     void directiveDump(const char (&code)[size], const char filename[], const Settings& settings, std::ostream& ostr) {
         simplecpp::OutputList outputList;
         std::vector<std::string> files;
-        simplecpp::TokenList tokens1(code, files, filename, &outputList);
+        simplecpp::TokenList tokens1(code, files, filename, {}, &outputList);
         Preprocessor preprocessor(tokens1, settings, *this, Path::identify(tokens1.getFiles()[0], false));
+        std::list<Directive> directives;
+        preprocessor.setLoadCallback([&](const simplecpp::FileData &data, bool loaded) {
+            if (loaded) {
+                Preprocessor::createDirectives(data.tokens, directives);
+            }
+        });
+        preprocessor.createDirectives(directives);
+        ASSERT(preprocessor.loadAllIncludes(files));
         (void)preprocessor.reportOutput(outputList, true);
-        ASSERT(preprocessor.loadFiles(files));
-        std::list<Directive> directives = preprocessor.createDirectives();
 
         TokenList tokenlist{settings, Path::identify(filename, false)};
         Tokenizer tokenizer(std::move(tokenlist), *this);
@@ -614,16 +632,18 @@ class TestTokenizer : public TestFixture {
     }
 
     void tokenize1() {
-        const char code[] = "void f ( )\n"
-                            "{ if ( p . y ( ) > yof ) { } }";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
+        const char code[] = "void f()\n"
+                            "{ if (p.y() > yof) {} }\n";
+        const char expected[] = "void f ( )\n"
+                                "{ if ( p . y ( ) > yof ) { } }";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS(
-            "[test.cpp:2:20]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable yof [valueFlowBailoutIncompleteVar]\n",
+            "[test.cpp:2:15]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable yof [valueFlowBailoutIncompleteVar]\n",
             errout_str());
     }
 
     void tokenize2() {
-        const char code[] = "{ sizeof a, sizeof b }";
+        const char code[] = "{ sizeof a, sizeof b }\n";
         ASSERT_EQUALS("{ sizeof ( a ) , sizeof ( b ) }", tokenizeAndStringify(code));
     }
 
@@ -632,7 +652,7 @@ class TestTokenizer : public TestFixture {
                             "{\n"
                             "public:\n"
                             "    const int i;\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("class foo\n"
                       "{\n"
                       "public:\n"
@@ -643,8 +663,8 @@ class TestTokenizer : public TestFixture {
 
     void tokenize5() {
         // Tokenize values
-        ASSERT_EQUALS("; + 1E3 ;", tokenizeAndStringify("; +1E3 ;"));
-        ASSERT_EQUALS("; 1E-2 ;", tokenizeAndStringify("; 1E-2 ;"));
+        ASSERT_EQUALS("; + 1E3 ;", tokenizeAndStringify("; +1E3 ;\n"));
+        ASSERT_EQUALS("; 1E-2 ;", tokenizeAndStringify("; 1E-2 ;\n"));
     }
 
     void tokenize7() {
@@ -673,13 +693,13 @@ class TestTokenizer : public TestFixture {
                             "typedef fp (*fpp)();\n"
                             "void f() {\n"
                             "    fpp x = (fpp)f();\n"
-                            "}";
+                            "}\n";
         (void)tokenizeAndStringify(code);
         ASSERT_EQUALS("", errout_str());
     }
 
     void tokenize11() {
-        ASSERT_EQUALS("X * sizeof ( Y ( ) ) ;", tokenizeAndStringify("X * sizeof(Y());"));
+        ASSERT_EQUALS("X * sizeof ( Y ( ) ) ;", tokenizeAndStringify("X * sizeof(Y());\n"));
     }
 
     // bailout if there is "@" - it is not handled well
@@ -693,44 +713,44 @@ class TestTokenizer : public TestFixture {
 
     // Ticket #2361: 0X10 => 16
     void tokenize14() {
-        ASSERT_EQUALS("; 0x10 ;", tokenizeAndStringify(";0x10;"));
-        ASSERT_EQUALS("; 0X10 ;", tokenizeAndStringify(";0X10;"));
-        ASSERT_EQUALS("; 0444 ;", tokenizeAndStringify(";0444;"));
+        ASSERT_EQUALS("; 0x10 ;", tokenizeAndStringify(";0x10;\n"));
+        ASSERT_EQUALS("; 0X10 ;", tokenizeAndStringify(";0X10;\n"));
+        ASSERT_EQUALS("; 0444 ;", tokenizeAndStringify(";0444;\n"));
     }
 
     // Ticket #8050
     void tokenizeHexWithSuffix() {
-        ASSERT_EQUALS("; 0xFFFFFF ;", tokenizeAndStringify(";0xFFFFFF;"));
-        ASSERT_EQUALS("; 0xFFFFFFu ;", tokenizeAndStringify(";0xFFFFFFu;"));
-        ASSERT_EQUALS("; 0xFFFFFFul ;", tokenizeAndStringify(";0xFFFFFFul;"));
+        ASSERT_EQUALS("; 0xFFFFFF ;", tokenizeAndStringify(";0xFFFFFF;\n"));
+        ASSERT_EQUALS("; 0xFFFFFFu ;", tokenizeAndStringify(";0xFFFFFFu;\n"));
+        ASSERT_EQUALS("; 0xFFFFFFul ;", tokenizeAndStringify(";0xFFFFFFul;\n"));
 
         // Number of digits decides about internal representation...
-        ASSERT_EQUALS("; 0xFFFFFFFF ;", tokenizeAndStringify(";0xFFFFFFFF;"));
-        ASSERT_EQUALS("; 0xFFFFFFFFu ;", tokenizeAndStringify(";0xFFFFFFFFu;"));
-        ASSERT_EQUALS("; 0xFFFFFFFFul ;", tokenizeAndStringify(";0xFFFFFFFFul;"));
+        ASSERT_EQUALS("; 0xFFFFFFFF ;", tokenizeAndStringify(";0xFFFFFFFF;\n"));
+        ASSERT_EQUALS("; 0xFFFFFFFFu ;", tokenizeAndStringify(";0xFFFFFFFFu;\n"));
+        ASSERT_EQUALS("; 0xFFFFFFFFul ;", tokenizeAndStringify(";0xFFFFFFFFul;\n"));
     }
 
     // Ticket #2429: 0.125
     void tokenize15() {
-        ASSERT_EQUALS("0.125 ;", tokenizeAndStringify(".125;"));
-        ASSERT_EQUALS("005.125 ;", tokenizeAndStringify("005.125;")); // Don't confuse with octal values
+        ASSERT_EQUALS("0.125 ;", tokenizeAndStringify(".125;\n"));
+        ASSERT_EQUALS("005.125 ;", tokenizeAndStringify("005.125;\n")); // Don't confuse with octal values
     }
 
     void tokenize17() { // #2759
-        ASSERT_EQUALS("class B : private :: A { } ;", tokenizeAndStringify("class B : private ::A { };"));
+        ASSERT_EQUALS("class B : private :: A { } ;", tokenizeAndStringify("class B : private ::A { };\n"));
     }
 
     void tokenize18() { // tokenize "(X&&Y)" into "( X && Y )" instead of "( X & & Y )"
-        ASSERT_EQUALS("( X && Y ) ;", tokenizeAndStringify("(X&&Y);"));
+        ASSERT_EQUALS("( X && Y ) ;", tokenizeAndStringify("(X&&Y);\n"));
     }
 
     void tokenize19() {
         // #3006 - added hasComplicatedSyntaxErrorsInTemplates to avoid segmentation fault
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("x < () <"), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("x < () <\n"), SYNTAX);
 
         // #3496 - make sure hasComplicatedSyntaxErrorsInTemplates works
         ASSERT_EQUALS("void a ( Fred * f ) { for ( ; n < f . x ( ) ; ) { } }",
-                      tokenizeAndStringify("void a(Fred* f) MACRO { for (;n < f->x();) {} }"));
+                      tokenizeAndStringify("void a(Fred* f) MACRO { for (;n < f->x();) {} }\n"));
 
         // #6216 - make sure hasComplicatedSyntaxErrorsInTemplates works
         ASSERT_EQUALS("C :: C ( )\n"
@@ -746,30 +766,30 @@ class TestTokenizer : public TestFixture {
                                            "    for (int dim = 0; dim < v.size(); ++dim) {\n"
                                            "        v[dim]->f();\n"
                                            "    }\n"
-                                           "};"));
+                                           "};\n"));
         ignore_errout(); // we do not care about the output
     }
 
     void tokenize21() { // tokenize 0x0E-7
-        ASSERT_EQUALS("0x0E - 7 ;", tokenizeAndStringify("0x0E-7;"));
+        ASSERT_EQUALS("0x0E - 7 ;", tokenizeAndStringify("0x0E-7;\n"));
     }
 
     void tokenize22() { // tokenize special marker $ from preprocessor
-        ASSERT_EQUALS("a$b", tokenizeAndStringify("a$b"));
-        ASSERT_EQUALS("a $b\nc", tokenizeAndStringify("a $b\nc"));
-        ASSERT_EQUALS("a = $0 ;", tokenizeAndStringify("a = $0;"));
-        ASSERT_EQUALS("a$ ++ ;", tokenizeAndStringify("a$++;"));
-        ASSERT_EQUALS("$if ( ! p )", tokenizeAndStringify("$if(!p)"));
+        ASSERT_EQUALS("a$b", tokenizeAndStringify("a$b\n"));
+        ASSERT_EQUALS("a $b\nc", tokenizeAndStringify("a $b\nc\n"));
+        ASSERT_EQUALS("a = $0 ;", tokenizeAndStringify("a = $0;\n"));
+        ASSERT_EQUALS("a$ ++ ;", tokenizeAndStringify("a$++;\n"));
+        ASSERT_EQUALS("$if ( ! p )", tokenizeAndStringify("$if(!p)\n"));
     }
 
-    // #4239 - segfault for "f ( struct { int typedef T x ; } ) { }"
+    // #4239 - segfault for "f ( struct { int typedef T x ; } ) { }\n"
     void tokenize25() {
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("f ( struct { int typedef T x ; } ) { }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("f ( struct { int typedef T x ; } ) { }\n"), SYNTAX);
     }
 
     // #4245 - segfault
     void tokenize26() {
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("class x { protected : template < int y = } ;"), SYNTAX); // Garbage code
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("class x { protected : template < int y = } ;\n"), SYNTAX); // Garbage code
     }
 
     void tokenize27() {
@@ -778,11 +798,11 @@ class TestTokenizer : public TestFixture {
                                    "~except_spec_d_good();\n"
                                    "};\n"
                                    "struct S { S(); };\n"
-                                   "S::S() __attribute((pure)) = default;"
+                                   "S::S() __attribute((pure)) = default;\n"
                                    );
 
         // original code: glibc-2.18/posix/bug-regex20.c
-        (void)tokenizeAndStringify("static unsigned int re_string_context_at (const re_string_t *input, int idx, int eflags) internal_function __attribute__ ((pure));");
+        (void)tokenizeAndStringify("static unsigned int re_string_context_at (const re_string_t *input, int idx, int eflags) internal_function __attribute__ ((pure));\n");
     }
 
     // #3503 - don't "simplify" SetFunction member function to a variable
@@ -792,21 +812,22 @@ class TestTokenizer : public TestFixture {
                       "} ;",
                       tokenizeAndStringify("struct TTestClass { TTestClass() { }\n"
                                            "    void SetFunction(Other(*m_f)()) { }\n"
-                                           "};"));
+                                           "};\n"));
 
         ASSERT_EQUALS("struct TTestClass { TTestClass ( ) { }\n"
                       "void SetFunction ( Other ( * m_f ) ( ) ) ;\n"
                       "} ;",
                       tokenizeAndStringify("struct TTestClass { TTestClass() { }\n"
                                            "    void SetFunction(Other(*m_f)());\n"
-                                           "};"));
+                                           "};\n"));
     }
 
     // #5884 - Avoid left shift of negative integer value.
     void tokenize32() {
         // Do not simplify negative integer left shifts.
-        const char code[] = "void f ( ) { int max_x ; max_x = -10000 << 16 ; }";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
+        const char code[] = "void f () { int max_x; max_x = -10000 << 16; }\n";
+        const char expected[] = "void f ( ) { int max_x ; max_x = -10000 << 16 ; }";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     // #5780 Various crashes on valid template code in Tokenizer::setVarId()
@@ -825,7 +846,7 @@ class TestTokenizer : public TestFixture {
                                 "  int* mElements;\n"
                                 "};\n"
                                 "Container::Container() : mElements(nullptr) {}\n"
-                                "Container intContainer;";
+                                "Container intContainer;\n";
             const char exp[] = "1: struct Container {\n"
                                "2: Container ( ) ;\n"
                                "3: int * mElements@1 ;\n"
@@ -840,7 +861,7 @@ class TestTokenizer : public TestFixture {
                                 "  int* mElements;\n"
                                 "};\n"
                                 "template <class T> Container<T>::Container() : mElements(nullptr) {}\n"
-                                "Container<int> intContainer;";
+                                "Container<int> intContainer;\n";
             const char exp[] = "1: struct Container<int> ;\n"
                                "2:\n"
                                "|\n"
@@ -856,42 +877,45 @@ class TestTokenizer : public TestFixture {
     }
 
     void tokenize35() { // #8361
-        ASSERT_NO_THROW(tokenizeAndStringify("typedef int CRCWord; "
-                                             "template<typename T> ::CRCWord const Compute(T const t) { return 0; }"));
+        ASSERT_NO_THROW(tokenizeAndStringify("typedef int CRCWord;\n"
+                                             "template<typename T> ::CRCWord const Compute(T const t) { return 0; }\n"));
     }
 
     void tokenize36() { // #8436
-        const char code[] = "int foo ( int i ) { return i ? * new int { 5 } : int { i ? 0 : 1 } ; }";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
+        const char code[] = "int foo (int i) { return i ? *new int {5} : int {i ? 0 : 1}; }\n";
+        const char expected[] = "int foo ( int i ) { return i ? * new int { 5 } : int { i ? 0 : 1 } ; }";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void tokenize37() { // #8550
-        const char codeC[] = "class name { public: static void init ( ) {} } ; "
-                             "typedef class name N; "
-                             "void foo ( ) { return N :: init ( ) ; }";
-        const char expC[] = "class name { public: static void init ( ) { } } ; "
+        const char codeC[] = "class name { public: static void init ( ) {} } ;\n"
+                             "typedef class name N;\n"
+                             "void foo ( ) { return N :: init ( ) ; }\n";
+        const char expC[] = "class name { public: static void init ( ) { } } ;\n"
+                            "\n"
                             "void foo ( ) { return name :: init ( ) ; }";
         ASSERT_EQUALS(expC, tokenizeAndStringify(codeC));
-        const char codeS[] = "class name { public: static void init ( ) {} } ; "
-                             "typedef struct name N; "
-                             "void foo ( ) { return N :: init ( ) ; }";
-        const char expS[] = "class name { public: static void init ( ) { } } ; "
+        const char codeS[] = "class name { public: static void init ( ) {} } ;\n"
+                             "typedef struct name N;\n"
+                             "void foo ( ) { return N :: init ( ) ; }\n";
+        const char expS[] = "class name { public: static void init ( ) { } } ;\n"
+                            "\n"
                             "void foo ( ) { return name :: init ( ) ; }";
         ASSERT_EQUALS(expS, tokenizeAndStringify(codeS));
     }
 
     void tokenize38() { // #9569
-        const char code[] = "using Binary = std::vector<char>; enum Type { Binary };";
+        const char code[] = "using Binary = std::vector<char>; enum Type { Binary };\n";
         const char exp[]  = "enum Type { Binary } ;";
         ASSERT_EQUALS(exp, tokenizeAndStringify(code));
     }
 
     void tokenize39() { // #9771
-        const char code[] = "template <typename T> class Foo;"
-                            "template <typename T> bool operator!=(const Foo<T> &, const Foo<T> &);"
-                            "template <typename T> class Foo { friend bool operator!= <> (const Foo<T> &, const Foo<T> &); };";
-        const char exp[]  = "template < typename T > class Foo ; "
-                            "template < typename T > bool operator!= ( const Foo < T > & , const Foo < T > & ) ; "
+        const char code[] = "template <typename T> class Foo;\n"
+                            "template <typename T> bool operator!=(const Foo<T> &, const Foo<T> &);\n"
+                            "template <typename T> class Foo { friend bool operator!= <> (const Foo<T> &, const Foo<T> &); };\n";
+        const char exp[]  = "template < typename T > class Foo ;\n"
+                            "template < typename T > bool operator!= ( const Foo < T > & , const Foo < T > & ) ;\n"
                             "template < typename T > class Foo { friend bool operator!= < > ( const Foo < T > & , const Foo < T > & ) ; } ;";
         ASSERT_EQUALS(exp, tokenizeAndStringify(code));
     }
@@ -935,15 +959,36 @@ class TestTokenizer : public TestFixture {
         (void)errout_str();
     }
 
+    void tokenize43() {
+        const char code[] = "void f(int i) { do if (i &= 1) {} while (0); }\n";
+        ASSERT_NO_THROW(tokenizeAndStringify(code));
+        (void)errout_str();
+    }
+
+    void tokenize44() { // #14955
+        const char code[] = "namespace O {}\n"
+                            "namespace N {\n"
+                            "    using namespace O;\n"
+                            "    enum class E { E0 };\n"
+                            "    E E0 = E::E0;\n"
+                            "}\n";
+        const char expected[] = "2: namespace N {\n"
+                                "3: using namespace O ;\n"
+                                "4: enum class E { E0 } ;\n"
+                                "5: E E0@1 ; E0@1 = E :: E0 ;\n"
+                                "6: }\n";
+        ASSERT_EQUALS(expected, tokenizeDebugListing(code));
+    }
+
     void validate() {
         // C++ code in C file
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";using namespace std;",dinit(TokenizeOptions, $.expand = false, $.cpp = false)), SYNTAX);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";std::map<int,int> m;",dinit(TokenizeOptions, $.expand = false, $.cpp = false)), SYNTAX);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";template<class T> class X { };",dinit(TokenizeOptions, $.expand = false, $.cpp = false)), SYNTAX);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("int X<Y>() {};",dinit(TokenizeOptions, $.expand = false, $.cpp = false)), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";using namespace std;\n",dinit(TokenizeOptions, $.expand = false, $.cpp = false)), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";std::map<int,int> m;\n",dinit(TokenizeOptions, $.expand = false, $.cpp = false)), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";template<class T> class X { };\n",dinit(TokenizeOptions, $.expand = false, $.cpp = false)), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("int X<Y>() {};\n",dinit(TokenizeOptions, $.expand = false, $.cpp = false)), SYNTAX);
         {
             TokenList tokenlist{settings1, Standards::Language::C}; // headers are treated as C files
-            const char code[] = "void foo(int i) { reinterpret_cast<char>(i) };";
+            const char code[] = "void foo(int i) { reinterpret_cast<char>(i) };\n";
             tokenlist.appendFileIfNew("test.h");
             ASSERT(tokenlist.createTokensFromString(code));
             Tokenizer tokenizer(std::move(tokenlist), *this);
@@ -952,56 +997,56 @@ class TestTokenizer : public TestFixture {
     }
 
     void objectiveC() {
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { [foo bar]; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { [foo bar]; }\n"), SYNTAX);
     }
 
     void syntax_case_default() { // correct syntax
-        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0: z(); break;}}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0: z(); break;}}\n"));
         ASSERT_EQUALS("", errout_str());
 
-        (void)tokenizeAndStringify("void f(int n) {switch (n) { case 0:; break;}}");
+        (void)tokenizeAndStringify("void f(int n) {switch (n) { case 0:; break;}}\n");
         ASSERT_EQUALS("", errout_str());
 
         // TODO: Do not throw AST validation exception
-        TODO_ASSERT_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0?1:2 : z(); break;}}"), InternalError);
+        TODO_ASSERT_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0?1:2 : z(); break;}}\n"), InternalError);
         //ASSERT_EQUALS("", errout_str());
 
         // TODO: Do not throw AST validation exception
-        TODO_ASSERT_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0?(1?3:4):2 : z(); break;}}"), InternalError);
+        TODO_ASSERT_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0?(1?3:4):2 : z(); break;}}\n"), InternalError);
         ASSERT_EQUALS("", errout_str());
 
         //allow GCC '({ %name%|%num%|%bool% ; })' statement expression extension
         // TODO: Do not throw AST validation exception
-        TODO_ASSERT_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0?({0;}):1: z(); break;}}"), InternalError);
+        TODO_ASSERT_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0?({0;}):1: z(); break;}}\n"), InternalError);
         ASSERT_EQUALS("", errout_str());
 
         //'b' can be or a macro or an undefined enum
-        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case b: z(); break;}}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case b: z(); break;}}\n"));
         ASSERT_EQUALS("", errout_str());
 
         //valid, when there's this declaration: 'constexpr int g() { return 2; }'
-        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case g(): z(); break;}}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case g(): z(); break;}}\n"));
         ASSERT_EQUALS("", errout_str());
 
         //valid, when there's also this declaration: 'constexpr int g[1] = {0};'
-        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case g[0]: z(); break;}}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case g[0]: z(); break;}}\n"));
         ASSERT_EQUALS(
             "[test.cpp:1:34]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable g [valueFlowBailoutIncompleteVar]\n",
             errout_str());
 
         //valid, similar to above case
-        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case *g: z(); break;}}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case *g: z(); break;}}\n"));
         ASSERT_EQUALS("", errout_str());
 
         //valid, when 'x' and 'y' are constexpr.
-        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case sqrt(x+y): z(); break;}}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case sqrt(x+y): z(); break;}}\n"));
         ASSERT_EQUALS(
             "[test.cpp:1:39]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
             errout_str());
     }
 
     void removePragma() {
-        const char code[] = "_Pragma(\"abc\") int x;";
+        const char code[] = "_Pragma(\"abc\") int x;\n";
         const Settings s_c89 = settingsBuilder().c(Standards::C89).build();
         ASSERT_EQUALS("_Pragma ( \"abc\" ) int x ;", tokenizeAndStringify(code, s_c89, false));
         const Settings s_clatest;
@@ -1015,7 +1060,7 @@ class TestTokenizer : public TestFixture {
 
     void foreach () {
         // #3690,#5154
-        const char code[] ="void f() { for each ( char c in MyString ) { Console::Write(c); } }";
+        const char code[] ="void f() { for each ( char c in MyString ) { Console::Write(c); } }\n";
         ASSERT_EQUALS("void f ( ) { for ( char c : MyString ) { Console :: Write ( c ) ; } }", tokenizeAndStringify(code));
         ASSERT_EQUALS(
             "[test.cpp:1:33]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable MyString [valueFlowBailoutIncompleteVar]\n",
@@ -1023,39 +1068,56 @@ class TestTokenizer : public TestFixture {
     }
 
     void ifconstexpr() {
-        ASSERT_EQUALS("void f ( ) { if ( FOO ) { bar ( c ) ; } }", tokenizeAndStringify("void f() { if constexpr ( FOO ) { bar(c); } }"));
+        ASSERT_EQUALS("void f ( ) { if ( FOO ) { bar ( c ) ; } }", tokenizeAndStringify("void f() { if constexpr ( FOO ) { bar(c); } }\n"));
         ASSERT_EQUALS(
             "[test.cpp:1:27]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable FOO [valueFlowBailoutIncompleteVar]\n",
             filter_valueflow(errout_str()));
     }
 
+    void ifconsteval() {
+        ASSERT_EQUALS("void f ( ) { if ( __cppcheck_consteval__ ) { bar ( ) ; } }", tokenizeAndStringify("void f() { if consteval { bar(); } }"));
+        filter_valueflow(errout_str());
+
+        ASSERT_EQUALS("void f ( ) { if ( ! __cppcheck_consteval__ ) { bar ( ) ; } }", tokenizeAndStringify("void f() { if !consteval { bar(); } }"));
+        filter_valueflow(errout_str());
+
+        ASSERT_EQUALS("void f ( ) { if ( __cppcheck_consteval__ ) { bar ( ) ; } else { baz ( ) ; } }",
+                      tokenizeAndStringify("void f() { if consteval { bar(); } else { baz(); } }"));
+        filter_valueflow(errout_str());
+
+        ASSERT_EQUALS("constexpr bool is_runtime_evaluated ( ) noexcept ( true ) { if ( ! __cppcheck_consteval__ ) { return true ; } else { return false ; } }",
+                      tokenizeAndStringify("constexpr bool is_runtime_evaluated() noexcept { if not consteval { return true; } else { return false; } }"));
+        filter_valueflow(errout_str());
+    }
+
     void combineOperators() {
-        ASSERT_EQUALS("; private: ;", tokenizeAndStringify(";private:;"));
-        ASSERT_EQUALS("; protected: ;", tokenizeAndStringify(";protected:;"));
-        ASSERT_EQUALS("; public: ;", tokenizeAndStringify(";public:;"));
-        ASSERT_EQUALS("; __published: ;", tokenizeAndStringify(";__published:;"));
-        ASSERT_EQUALS("a . public : ;", tokenizeAndStringify("a.public:;"));
-        ASSERT_EQUALS("void f ( x & = 2 ) ;", tokenizeAndStringify("void f(x &= 2);"));
-        ASSERT_EQUALS("const_cast < a * > ( & e )", tokenizeAndStringify("const_cast<a*>(&e)"));
+        ASSERT_EQUALS("; private: ;", tokenizeAndStringify(";private:;\n"));
+        ASSERT_EQUALS("; protected: ;", tokenizeAndStringify(";protected:;\n"));
+        ASSERT_EQUALS("; public: ;", tokenizeAndStringify(";public:;\n"));
+        ASSERT_EQUALS("; __published: ;", tokenizeAndStringify(";__published:;\n"));
+        ASSERT_EQUALS("a . public : ;", tokenizeAndStringify("a.public:;\n"));
+        ASSERT_EQUALS("void f ( x & = 2 ) ;", tokenizeAndStringify("void f(x &= 2);\n"));
+        ASSERT_EQUALS("const_cast < a * > ( & e )", tokenizeAndStringify("const_cast<a*>(&e)\n"));
     }
 
     void concatenateNegativeNumber() {
-        ASSERT_EQUALS("i = -12 ;", tokenizeAndStringify("i = -12;"));
-        ASSERT_EQUALS("1 - 2 ;", tokenizeAndStringify("1-2;"));
-        ASSERT_EQUALS("foo ( -1 ) - 2 ;", tokenizeAndStringify("foo(-1)-2;"));
-        ASSERT_EQUALS("int f ( ) { return -2 ; }", tokenizeAndStringify("int f(){return -2;}"));
-        ASSERT_EQUALS("int x [ 2 ] = { -2 , 1 }", tokenizeAndStringify("int x[2] = {-2,1}"));
+        ASSERT_EQUALS("i = -12 ;", tokenizeAndStringify("i = -12;\n"));
+        ASSERT_EQUALS("1 - 2 ;", tokenizeAndStringify("1-2;\n"));
+        ASSERT_EQUALS("foo ( -1 ) - 2 ;", tokenizeAndStringify("foo(-1)-2;\n"));
+        ASSERT_EQUALS("int f ( ) { return -2 ; }", tokenizeAndStringify("int f(){return -2;}\n"));
+        ASSERT_EQUALS("int x [ 2 ] = { -2 , 1 }", tokenizeAndStringify("int x[2] = {-2,1}\n"));
 
-        ASSERT_EQUALS("f ( 123 )", tokenizeAndStringify("f(+123)"));
+        ASSERT_EQUALS("f ( +123 )", tokenizeAndStringify("f(+123)\n"));
 
-        ASSERT_EQUALS("std :: extent_v < A > - 1 ;", tokenizeAndStringify("std::extent_v<A> - 1;")); // #11341
+        ASSERT_EQUALS("std :: extent_v < A > - 1 ;", tokenizeAndStringify("std::extent_v<A> - 1;\n")); // #11341
     }
 
 
 
     void longtok() {
-        const std::string filedata(10000, 'a');
-        ASSERT_EQUALS(filedata, tokenizeAndStringify(filedata));
+        const std::string code = std::string(10000, 'a') + '\n';
+        const std::string expected = std::string(10000, 'a');
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
 
@@ -1065,13 +1127,13 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("; template <typename... a> uint8_t b(std::tuple<uint8_t> d) {\n"
                                            "  std::tuple<a...> c{std::move(d)};\n"
                                            "  return std::get<0>(c);\n"
-                                           "}", s));
+                                           "}\n", s));
         ASSERT_EQUALS("int g ( int ) ;",
                       tokenizeAndStringify("int g(int);\n"
                                            "template <class F, class... Ts> auto h(F f, Ts... xs) {\n"
                                            "    auto e = f(g(xs)...);\n"
                                            "    return e;\n"
-                                           "}", s));
+                                           "}\n", s));
     }
 
     void simplifyHeadersAndUnusedTemplates2() {
@@ -1081,7 +1143,7 @@ class TestTokenizer : public TestFixture {
                             "    void FooBar() {\n"
                             "        new ( (uBAR ? uBAR : sizeof(T))) T;\n"
                             "    }\n"
-                            "};";
+                            "};\n";
 
         {
             const Settings s = settingsBuilder().checkUnusedTemplates(false).build();
@@ -1100,100 +1162,104 @@ class TestTokenizer : public TestFixture {
     }
 
     void simplifyAt() {
-        ASSERT_EQUALS("int x ;", tokenizeAndStringify("int x@123;"));
-        ASSERT_EQUALS("bool x ;", tokenizeAndStringify("bool x@123:1;"));
+        ASSERT_EQUALS("int x ;", tokenizeAndStringify("int x@123;\n"));
+        ASSERT_EQUALS("bool x ;", tokenizeAndStringify("bool x@123:1;\n"));
         ASSERT_EQUALS("char PORTB ; bool PB3 ;", tokenizeAndStringify("char PORTB @ 0x10; bool PB3 @ PORTB:3;\n"));
-        ASSERT_EQUALS("int x ;", tokenizeAndStringify("int x @ (0x1000 + 18);"));
+        ASSERT_EQUALS("int x ;", tokenizeAndStringify("int x @ (0x1000 + 18);\n"));
 
-        ASSERT_EQUALS("int x [ 10 ] ;", tokenizeAndStringify("int x[10]@0x100;"));
+        ASSERT_EQUALS("int x [ 10 ] ;", tokenizeAndStringify("int x[10]@0x100;\n"));
 
-        ASSERT_EQUALS("void ( * f [ ] ) ( void ) ;", tokenizeAndStringify("void (*f[])(void)@0x100;")); // #13458
+        ASSERT_EQUALS("void ( * f [ ] ) ( void ) ;", tokenizeAndStringify("void (*f[])(void)@0x100;\n")); // #13458
 
-        ASSERT_EQUALS("interrupt@ f ( ) { }", tokenizeAndStringify("@interrupt f() {}"));
+        ASSERT_EQUALS("interrupt@ f ( ) { }", tokenizeAndStringify("@interrupt f() {}\n"));
 
-        ASSERT_EQUALS("const short MyVariable = 0xF0F0 ;", tokenizeAndStringify("const short MyVariable @ \"MYOWNSECTION\" = 0xF0F0; ")); // #12602
+        ASSERT_EQUALS("const short MyVariable = 0xF0F0 ;", tokenizeAndStringify("const short MyVariable @ \"MYOWNSECTION\" = 0xF0F0; \n")); // #12602
     }
 
     void inlineasm() {
-        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ;", tokenizeAndStringify("asm { mov ax,bx };"));
-        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ;", tokenizeAndStringify("_asm { mov ax,bx };"));
-        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ;", tokenizeAndStringify("_asm mov ax,bx"));
-        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ;", tokenizeAndStringify("__asm { mov ax,bx };"));
-        ASSERT_EQUALS("asm ( \"\"mov ax,bx\"\" ) ;", tokenizeAndStringify("__asm__ __volatile__ ( \"mov ax,bx\" );"));
-        ASSERT_EQUALS("asm ( \"_emit 12h\" ) ;", tokenizeAndStringify("__asm _emit 12h ;"));
-        ASSERT_EQUALS("asm ( \"mov a , b\" ) ;", tokenizeAndStringify("__asm mov a, b ;"));
-        ASSERT_EQUALS("asm ( \"\"fnstcw %0\" : \"= m\" ( old_cw )\" ) ;", tokenizeAndStringify("asm volatile (\"fnstcw %0\" : \"= m\" (old_cw));"));
-        ASSERT_EQUALS("asm ( \"\"fnstcw %0\" : \"= m\" ( old_cw )\" ) ;", tokenizeAndStringify(" __asm__ (\"fnstcw %0\" : \"= m\" (old_cw));"));
-        ASSERT_EQUALS("asm ( \"\"ddd\"\" ) ;", tokenizeAndStringify(" __asm __volatile__ (\"ddd\") ;"));
-        ASSERT_EQUALS("asm ( \"\"ddd\"\" ) ;", tokenizeAndStringify(" __asm __volatile (\"ddd\") ;"));
-        ASSERT_EQUALS("asm ( \"\"mov ax,bx\"\" ) ;", tokenizeAndStringify("__asm__ volatile ( \"mov ax,bx\" );"));
-        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ; int a ;", tokenizeAndStringify("asm { mov ax,bx } int a;"));
-        ASSERT_EQUALS("asm\n\n( \"mov ax , bx\" ) ;", tokenizeAndStringify("__asm\nmov ax,bx\n__endasm;"));
-        ASSERT_EQUALS("asm\n\n( \"push b ; for if\" ) ;", tokenizeAndStringify("__asm\npush b ; for if\n__endasm;"));
-        ASSERT_EQUALS("asm ( \"\"mov ax , bx\"\" ) ;", tokenizeAndStringify("asm volatile (\"mov ax , bx\");"));
-        ASSERT_EQUALS("asm ( \"\"mov ax , bx\"\" ) ;", tokenizeAndStringify("asm goto (\"mov ax , bx\");"));
-        ASSERT_EQUALS("asm ( \"\"mov ax , bx\"\" ) ;", tokenizeAndStringify("asm inline (\"mov ax , bx\");"));
+        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ;", tokenizeAndStringify("asm { mov ax,bx };\n"));
+        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ;", tokenizeAndStringify("_asm { mov ax,bx };\n"));
+        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ;", tokenizeAndStringify("_asm mov ax,bx\n"));
+        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ;", tokenizeAndStringify("__asm { mov ax,bx };\n"));
+        ASSERT_EQUALS("asm ( \"\"mov ax,bx\"\" ) ;", tokenizeAndStringify("__asm__ __volatile__ ( \"mov ax,bx\" );\n"));
+        ASSERT_EQUALS("asm ( \"_emit 12h\" ) ;", tokenizeAndStringify("__asm _emit 12h ;\n"));
+        ASSERT_EQUALS("asm ( \"mov a , b\" ) ;", tokenizeAndStringify("__asm mov a, b ;\n"));
+        ASSERT_EQUALS("asm ( \"\"fnstcw %0\" : \"= m\" ( old_cw )\" ) ;", tokenizeAndStringify("asm volatile (\"fnstcw %0\" : \"= m\" (old_cw));\n"));
+        ASSERT_EQUALS("asm ( \"\"fnstcw %0\" : \"= m\" ( old_cw )\" ) ;", tokenizeAndStringify(" __asm__ (\"fnstcw %0\" : \"= m\" (old_cw));\n"));
+        ASSERT_EQUALS("asm ( \"\"ddd\"\" ) ;", tokenizeAndStringify(" __asm __volatile__ (\"ddd\") ;\n"));
+        ASSERT_EQUALS("asm ( \"\"ddd\"\" ) ;", tokenizeAndStringify(" __asm __volatile (\"ddd\") ;\n"));
+        ASSERT_EQUALS("asm ( \"\"mov ax,bx\"\" ) ;", tokenizeAndStringify("__asm__ volatile ( \"mov ax,bx\" );\n"));
+        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ; int a ;", tokenizeAndStringify("asm { mov ax,bx } int a;\n"));
+        ASSERT_EQUALS("asm\n\n( \"mov ax , bx\" ) ;", tokenizeAndStringify("__asm\nmov ax,bx\n__endasm;\n"));
+        ASSERT_EQUALS("asm\n\n( \"push b ; for if\" ) ;", tokenizeAndStringify("__asm\npush b ; for if\n__endasm;\n"));
+        ASSERT_EQUALS("asm ( \"\"mov ax , bx\"\" ) ;", tokenizeAndStringify("asm volatile (\"mov ax , bx\");\n"));
+        ASSERT_EQUALS("asm ( \"\"mov ax , bx\"\" ) ;", tokenizeAndStringify("asm goto (\"mov ax , bx\");\n"));
+        ASSERT_EQUALS("asm ( \"\"mov ax , bx\"\" ) ;", tokenizeAndStringify("asm inline (\"mov ax , bx\");\n"));
 
         // 'asm ( ) ;' should be in the same line
-        ASSERT_EQUALS(";\n\nasm ( \"\"mov ax,bx\"\" ) ;", tokenizeAndStringify(";\n\n__asm__ volatile ( \"mov ax,bx\" );"));
+        ASSERT_EQUALS(";\n\nasm ( \"\"mov ax,bx\"\" ) ;", tokenizeAndStringify(";\n\n__asm__ volatile ( \"mov ax,bx\" );\n"));
 
-        ASSERT_EQUALS("void func1 ( ) ;", tokenizeAndStringify("void func1() __asm__(\"...\") __attribute__();"));
+        ASSERT_EQUALS("void func1 ( ) ;", tokenizeAndStringify("void func1() __asm__(\"...\") __attribute__();\n"));
 
         // #14250 - assembler function
-        const char code[] = "__asm void dostuff(uint32_t x) { "
-                            "%reg x "
-                            "  e_lis r7, (lf)@h "
-                            "%error "
-                            "}";
-        ASSERT_EQUALS("void dostuff ( uint32_t x ) { asm ( \"% reg x e_lis r7 , ( lf ) @ h % error\" ) ; }",
-                      tokenizeAndStringify(code));
+        const char code[] = "__asm void dostuff(uint32_t x) {\n"
+                            "%reg x\n"
+                            "  e_lis r7, (lf)@h\n"
+                            "%error\n"
+                            "}\n";
+        const char expected[] = "void dostuff ( uint32_t x ) {\n"
+                                "asm ( \"% reg x e_lis r7 , ( lf ) @ h % error\" ) ;\n"
+                                "\n"
+                                "\n"
+                                "}";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     // #4725 - ^{}
     void simplifyAsm2() {
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { ^{} }"), SYNTAX, "syntax error");
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { x(^{}); }"), SYNTAX, "syntax error");
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { foo(A(), ^{ bar(); }); }"), SYNTAX, "syntax error");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { ^{} }\n"), SYNTAX, "syntax error");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { x(^{}); }\n"), SYNTAX, "syntax error");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { foo(A(), ^{ bar(); }); }\n"), SYNTAX, "syntax error");
         ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("int f0(Args args) {\n"
                                                           "    return ^{\n"
                                                           "        return sizeof...(Args);\n"
                                                           "    }() + ^ {\n"
                                                           "        return sizeof...(args);\n"
                                                           "    }();\n"
-                                                          "};"), SYNTAX, "syntax error");
+                                                          "};\n"), SYNTAX, "syntax error");
         ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("int(^block)(void) = ^{\n"
                                                           "    static int test = 0;\n"
                                                           "    return test;\n"
-                                                          "};"), SYNTAX, "syntax error");
+                                                          "};\n"), SYNTAX, "syntax error");
 
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("; return f(a[b=c],^{});"), SYNTAX, "syntax error: keyword 'return' is not allowed in global scope"); // #7185
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("; return f(a[b=c],^{});\n"), SYNTAX, "syntax error: keyword 'return' is not allowed in global scope"); // #7185
         ASSERT_EQUALS("{ return f ( asm ( \"^(void){somecode}\" ) ) ; }",
-                      tokenizeAndStringify("{ return f(^(void){somecode}); }"));
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify(";a?(b?(c,^{}):0):^{};"), SYNTAX, "syntax error");
-        ASSERT_EQUALS("template < typename T > "
-                      "CImg < T > operator| ( const char * const expression , const CImg < T > & img ) { "
-                      "return img | expression ; "
-                      "} "
-                      "template < typename T > "
-                      "CImg < T > operator^ ( const char * const expression , const CImg < T > & img ) { "
-                      "return img ^ expression ; "
-                      "} "
-                      "template < typename T > "
-                      "CImg < T > operator== ( const char * const expression , const CImg < T > & img ) { "
-                      "return img == expression ; "
+                      tokenizeAndStringify("{ return f(^(void){somecode}); }\n"));
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify(";a?(b?(c,^{}):0):^{};\n"), SYNTAX, "syntax error");
+        ASSERT_EQUALS("template < typename T >\n"
+                      "CImg < T > operator| ( const char * const expression , const CImg < T > & img ) {\n"
+                      "return img | expression ;\n"
+                      "}\n"
+                      "template < typename T >\n"
+                      "CImg < T > operator^ ( const char * const expression , const CImg < T > & img ) {\n"
+                      "return img ^ expression ;\n"
+                      "}\n"
+                      "template < typename T >\n"
+                      "CImg < T > operator== ( const char * const expression , const CImg < T > & img ) {\n"
+                      "return img == expression ;\n"
                       "}",
-                      tokenizeAndStringify("template < typename T >"
-                                           "inline CImg<T> operator|(const char *const expression, const CImg<T>& img) {"
-                                           "  return img | expression ;"
-                                           "}"
-                                           "template<typename T>"
-                                           "inline CImg<T> operator^(const char *const expression, const CImg<T>& img) {"
-                                           "  return img ^ expression;"
-                                           "}"
-                                           "template<typename T>"
-                                           "inline CImg<T> operator==(const char *const expression, const CImg<T>& img) {"
-                                           "  return img == expression;"
-                                           "}"));
+                      tokenizeAndStringify("template < typename T >\n"
+                                           "inline CImg<T> operator|(const char *const expression, const CImg<T>& img) {\n"
+                                           "  return img | expression ;\n"
+                                           "}\n"
+                                           "template<typename T>\n"
+                                           "inline CImg<T> operator^(const char *const expression, const CImg<T>& img) {\n"
+                                           "  return img ^ expression;\n"
+                                           "}\n"
+                                           "template<typename T>\n"
+                                           "inline CImg<T> operator==(const char *const expression, const CImg<T>& img) {\n"
+                                           "  return img == expression;\n"
+                                           "}\n"));
     }
 
     void ifAddBraces1() {
@@ -1279,6 +1345,10 @@ class TestTokenizer : public TestFixture {
                       "return ; } }\n\n"
                       "return ;\n"
                       "}", tokenizeAndStringify(code));
+        ASSERT_EQUALS_WITHOUT_LINENUMBERS(
+            "[test.cpp:5:1]: (debug) valueflow.cpp:5427:valueFlowForLoopSimplifyAfter bailout: For loop variable bailout on escape statement [valueFlowBailout]\n"
+            "[test.cpp:5:1]: (debug) valueflow.cpp:5427:valueFlowForLoopSimplifyAfter bailout: For loop variable bailout on escape statement [valueFlowBailout]\n",
+            errout_str());
     }
 
     void ifAddBraces7() {
@@ -1300,34 +1370,34 @@ class TestTokenizer : public TestFixture {
     void ifAddBraces9() {
         // ticket #990
         const char code[] =
-            "void f() {"
-            "    for (int k=0; k<VectorSize; k++)"
-            "        LOG_OUT(ID_Vector[k])"
-            "}";
+            "void f() {\n"
+            "    for (int k=0; k<VectorSize; k++)\n"
+            "        LOG_OUT(ID_Vector[k])\n"
+            "}\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code), UNKNOWN_MACRO);
     }
 
     void ifAddBraces11() {
-        const char code[] = "{ if (x) if (y) ; else ; }";
+        const char code[] = "{ if (x) if (y) ; else ; }\n";
         const char expected[] = "{ if ( x ) { if ( y ) { ; } else { ; } } }";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void ifAddBraces12() {
         // ticket #1424
-        const char code[] = "{ if (x) do { } while(x); }";
+        const char code[] = "{ if (x) do { } while(x); }\n";
         const char expected[] = "{ if ( x ) { do { } while ( x ) ; } }";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void ifAddBraces13() {
         // ticket #1809
-        const char code[] = "{ if (x) if (y) { } else { } else { } }";
+        const char code[] = "{ if (x) if (y) { } else { } else { } }\n";
         const char expected[] = "{ if ( x ) { if ( y ) { } else { } } else { } }";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
 
         // ticket #1809
-        const char code2[] = "{ if (x) while (y) { } else { } }";
+        const char code2[] = "{ if (x) while (y) { } else { } }\n";
         const char expected2[] = "{ if ( x ) { while ( y ) { } } else { } }";
         ASSERT_EQUALS(expected2, tokenizeAndStringify(code2));
     }
@@ -1335,19 +1405,21 @@ class TestTokenizer : public TestFixture {
     void ifAddBraces15() {
         // ticket #2616 - unknown macro before if
         // TODO: Remove "A" or change it to ";A;". Then cleanup Tokenizer::ifAddBraces().
-        ASSERT_EQUALS("{ A if ( x ) { y ( ) ; } }", tokenizeAndStringify("{A if(x)y();}"));
+        ASSERT_EQUALS("{ A if ( x ) { y ( ) ; } }", tokenizeAndStringify("{A if(x)y();}\n"));
     }
 
     void ifAddBraces16() {
         // ticket #2873 - the fix is not needed anymore.
         {
-            const char code[] = "void f() { "
-                                "(void) ( { if(*p) (*p) = x(); } ) "
-                                "}";
-            ASSERT_EQUALS("void f ( ) { ( void ) ( { if ( * p ) { ( * p ) = x ( ) ; } } ) }",
-                          tokenizeAndStringify(code));
+            const char code[] = "void f() {\n"
+                                "(void) ( { if(*p) (*p) = x(); } )\n"
+                                "}\n";
+            const char expected[] = "void f ( ) {\n"
+                                    "( void ) ( { if ( * p ) { ( * p ) = x ( ) ; } } )\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
             ASSERT_EQUALS(
-                "[test.cpp:1:27]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+                "[test.cpp:2:16]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
                 filter_valueflow(errout_str()));
         }
     }
@@ -1377,10 +1449,10 @@ class TestTokenizer : public TestFixture {
     void ifAddBraces18() {
         // ticket #3424 - if if { } else else
         ASSERT_EQUALS("{ if ( x ) { if ( y ) { } else { ; } } else { ; } }",
-                      tokenizeAndStringify("{ if(x) if(y){}else;else;}"));
+                      tokenizeAndStringify("{ if(x) if(y){}else;else;}\n"));
 
         ASSERT_EQUALS("{ if ( x ) { if ( y ) { if ( z ) { } else { ; } } else { ; } } else { ; } }",
-                      tokenizeAndStringify("{ if(x) if(y) if(z){}else;else;else;}"));
+                      tokenizeAndStringify("{ if(x) if(y) if(z){}else;else;else;}\n"));
     }
 
     void ifAddBraces19() {
@@ -1409,7 +1481,7 @@ class TestTokenizer : public TestFixture {
     }
 
     void ifAddBraces20() { // #5012 - syntax error 'else }'
-        const char code[] = "void f() { if(x) {} else }";
+        const char code[] = "void f() { if(x) {} else }\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code), SYNTAX);
     }
 
@@ -1422,7 +1494,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("int f(int x) {\n"
                                            "  if (x)\n"
                                            "  l1: l2: return x;\n"
-                                           "}"));
+                                           "}\n"));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         // Labels before {
@@ -1433,7 +1505,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("int f(int x) {\n"
                                            "  if (x)\n"
                                            "  l1: l2: { return x; }\n"
-                                           "}"));
+                                           "}\n"));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         // Labels before try/catch
@@ -1448,7 +1520,7 @@ class TestTokenizer : public TestFixture {
                                            "  l1: l2:\n"
                                            "    try { throw 1; }\n"
                                            "    catch(...) { return x; }\n"
-                                           "}"));
+                                           "}\n"));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
     }
 
@@ -1461,7 +1533,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("int f(int x) {\n"
                                            "  switch (x)\n"
                                            "  l1: case 0: l2: case (1): return x;\n"
-                                           "}"));
+                                           "}\n"));
 
         // Labels before {
         ASSERT_EQUALS("int f ( int x ) {\n"
@@ -1471,7 +1543,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("int f(int x) {\n"
                                            "  switch (x)\n"
                                            "  l1: case 0: l2: case (1): { return x; }\n"
-                                           "}"));
+                                           "}\n"));
 
         // Labels before try/catch
         ASSERT_EQUALS("int f ( int x ) {\n"
@@ -1485,11 +1557,11 @@ class TestTokenizer : public TestFixture {
                                            "  l1: case 0: l2: case (1):\n"
                                            "    try { throw 1; }\n"
                                            "    catch(...) { return x; }\n"
-                                           "}"));
+                                           "}\n"));
     }
 
     void whileAddBraces() {
-        const char code[] = "{while(a);}";
+        const char code[] = "{while(a);}\n";
         ASSERT_EQUALS("{ while ( a ) { ; } }", tokenizeAndStringify(code));
     }
 
@@ -1502,7 +1574,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("void f(int x) {\n"
                                            "  while (x)\n"
                                            "  l1: l2: --x;\n"
-                                           "}"));
+                                           "}\n"));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         // Labels before {
@@ -1513,7 +1585,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("void f(int x) {\n"
                                            "  while (x)\n"
                                            "  l1: l2: { -- x; }\n"
-                                           "}"));
+                                           "}\n"));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         // Labels before try/catch
@@ -1528,13 +1600,24 @@ class TestTokenizer : public TestFixture {
                                            "  l1: l2:\n"
                                            "    try { throw 1; }\n"
                                            "    catch(...) { --x; }\n"
-                                           "}"));
+                                           "}\n"));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
     }
 
+    void whileAddBracesDump() {
+        const char code[] = "void f(){while(a);}\n";
+        SimpleTokenizer tokenizer(settingsDefault, *this, false);
+        ASSERT(tokenizer.tokenize(code));
+        ASSERT(Token::simpleMatch(tokenizer.tokens(), "void f ( ) { while ( a ) { ; } }"));
+        std::ostringstream ostr;
+        tokenizer.dump(ostr);
+        const std::string dump = ostr.str();
+        ASSERT(dump.find("isInsertedBrace=\"true\"") != std::string::npos);
+    }
+
     void doWhileAddBraces() {
         {
-            const char code[] = "{do ; while (0);}";
+            const char code[] = "{do ; while (0);}\n";
             const char result[] = "{ do { ; } while ( 0 ) ; }";
 
             ASSERT_EQUALS(result, tokenizeAndStringify(code));
@@ -1542,13 +1625,13 @@ class TestTokenizer : public TestFixture {
         }
 
         {
-            const char code[] = "{ UNKNOWN_MACRO ( do ) ; while ( a -- ) ; }";
+            const char code[] = "{ UNKNOWN_MACRO ( do ) ; while ( a -- ) ; }\n";
             ASSERT_THROW_INTERNAL(tokenizeAndStringify(code), SYNTAX);
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "{ UNKNOWN_MACRO ( do , foo ) ; while ( a -- ) ; }";
+            const char code[] = "{ UNKNOWN_MACRO ( do , foo ) ; while ( a -- ) ; }\n";
             ASSERT_THROW_INTERNAL(tokenizeAndStringify(code), SYNTAX);
             ASSERT_EQUALS("", errout_str());
         }
@@ -1595,7 +1678,7 @@ class TestTokenizer : public TestFixture {
             // #8148 - while inside the do-while body
             const char code[] = "void foo() {\n"
                                 "    do { while (x) f(); } while (y);\n"
-                                "}";
+                                "}\n";
             const char result[] = "void foo ( ) {\n"
                                   "do { while ( x ) { f ( ) ; } } while ( y ) ;\n"
                                   "}";
@@ -1617,7 +1700,7 @@ class TestTokenizer : public TestFixture {
                                            "  do\n"
                                            "  l1: l2: --x;\n"
                                            "  while (x);\n"
-                                           "}"));
+                                           "}\n"));
 
         // Labels before {
         ASSERT_EQUALS("void f ( int x ) {\n"
@@ -1629,7 +1712,7 @@ class TestTokenizer : public TestFixture {
                                            "  do\n"
                                            "  l1: l2: { -- x; }\n"
                                            "  while (x);\n"
-                                           "}"));
+                                           "}\n"));
 
         // Labels before try/catch
         ASSERT_EQUALS("void f ( int x ) {\n"
@@ -1645,7 +1728,7 @@ class TestTokenizer : public TestFixture {
                                            "    try { throw 1; }\n"
                                            "    catch(...) { --x; }\n"
                                            "  while (x);\n"
-                                           "}"));
+                                           "}\n"));
     }
 
     void forAddBraces1() {
@@ -1654,7 +1737,7 @@ class TestTokenizer : public TestFixture {
                                 "     for(;;)\n"
                                 "         if (a) { }\n"
                                 "         else { }\n"
-                                "}";
+                                "}\n";
             const char expected[] = "void f ( ) {\n"
                                     "for ( ; ; ) {\n"
                                     "if ( a ) { }\n"
@@ -1672,7 +1755,7 @@ class TestTokenizer : public TestFixture {
                                 "         if (a) { }\n"
                                 "         else if (b) { }\n"
                                 "         else { }\n"
-                                "}";
+                                "}\n";
             const char expected[] = "void f ( ) {\n"
                                     "for ( ; ; ) {\n"
                                     "if ( a ) { }\n"
@@ -1689,7 +1772,7 @@ class TestTokenizer : public TestFixture {
     void forAddBraces2() { // #5088
         const char code[] = "void f() {\n"
                             "    for(;;) try { } catch (...) { }\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void f ( ) {\n"
                                 "for ( ; ; ) { try { } catch ( ... ) { } }\n"
                                 "}";
@@ -1705,7 +1788,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("void f(int x) {\n"
                                            "  for ( ; x; )\n"
                                            "  l1: l2: --x;\n"
-                                           "}"));
+                                           "}\n"));
 
         // Labels before {
         ASSERT_EQUALS("void f ( int x ) {\n"
@@ -1715,7 +1798,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("void f(int x) {\n"
                                            "  for ( ; x; )\n"
                                            "  l1: l2: { -- x; }\n"
-                                           "}"));
+                                           "}\n"));
 
         // Labels before try/catch
         ASSERT_EQUALS("void f ( int x ) {\n"
@@ -1729,43 +1812,43 @@ class TestTokenizer : public TestFixture {
                                            "  l1: l2:\n"
                                            "    try { throw 1; }\n"
                                            "    catch(...) { --x; }\n"
-                                           "}"));
+                                           "}\n"));
     }
 
 
     void simplifyExternC() {
         const char expected[] = "int foo ( ) ;";
         {
-            const char code[] = "extern \"C\" int foo();";
+            const char code[] = "extern \"C\" int foo();\n";
             // tokenize..
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             // Expected result..
             ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
             ASSERT(tokenizer.tokens()->next()->isExternC());
         }
         {
-            const char code[] = "extern \"C\" { int foo(); }";
+            const char code[] = "extern \"C\" { int foo(); }\n";
             // tokenize..
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             // Expected result..
             ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
             ASSERT(tokenizer.tokens()->next()->isExternC());
         }
         {
-            const char code[] = "extern \"C++\" int foo();";
+            const char code[] = "extern \"C++\" int foo();\n";
             // tokenize..
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             // Expected result..
             ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
             ASSERT(!tokenizer.tokens()->next()->isExternC());
         }
         {
-            const char code[] = "extern \"C++\" { int foo(); }";
+            const char code[] = "extern \"C++\" { int foo(); }\n";
             // tokenize..
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             // Expected result..
             ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -1775,41 +1858,49 @@ class TestTokenizer : public TestFixture {
 
     void simplifyFunctionParameters() {
         {
-            const char code[] = "char a [ ABC ( DEF ) ] ;";
-            ASSERT_EQUALS(code, tokenizeAndStringify(code));
+            const char code[] = "char a [ ABC ( DEF ) ] ;\n";
+            const char expected[] = "char a [ ABC ( DEF ) ] ;";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "module ( a , a , sizeof ( a ) , 0444 ) ;";
+            const char code[] = "module ( a , a , sizeof ( a ) , 0444 ) ;\n";
             ASSERT_EQUALS("module ( a , a , sizeof ( a ) , 0444 ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
-        ASSERT_EQUALS("void f ( int x ) { }", tokenizeAndStringify("void f(x) int x; { }"));
+        ASSERT_EQUALS("void f ( int x ) { }", tokenizeAndStringify("void f(x) int x; { }\n"));
         ASSERT_EQUALS("", errout_str());
-        ASSERT_EQUALS("void f ( int x , char y ) { }", tokenizeAndStringify("void f(x,y) int x; char y; { }"));
+        ASSERT_EQUALS("void f ( int x , char y ) { }", tokenizeAndStringify("void f(x,y) int x; char y; { }\n"));
         ASSERT_EQUALS("", errout_str());
-        ASSERT_EQUALS("int main ( int argc , char * argv [ ] ) { }", tokenizeAndStringify("int main(argc,argv) int argc; char *argv[]; { }"));
+        ASSERT_EQUALS("int main ( int argc , char * argv [ ] ) { }", tokenizeAndStringify("int main(argc,argv) int argc; char *argv[]; { }\n"));
         ASSERT_EQUALS("", errout_str());
-        ASSERT_EQUALS("int f ( int p , int w , float d ) { }", tokenizeAndStringify("int f(p,w,d) float d; { }"));
+        ASSERT_EQUALS("int f ( int p , int w , float d ) { }", tokenizeAndStringify("int f(p,w,d) float d; { }\n"));
         ASSERT_EQUALS("", errout_str());
 
         // #1067 - Not simplified. Feel free to fix so it is simplified correctly but this syntax is obsolescent.
-        ASSERT_EQUALS("int ( * d ( a , b , c ) ) ( ) int a ; int b ; int c ; { }", tokenizeAndStringify("int (*d(a,b,c))()int a,b,c; { }"));
+        ASSERT_EQUALS("int ( * d ( a , b , c ) ) ( ) int a ; int b ; int c ; { }", tokenizeAndStringify("int (*d(a,b,c))()int a,b,c; { }\n"));
         ASSERT_EQUALS("", errout_str());
 
         {
             // This is not a function but the pattern is similar..
-            const char code[] = "void foo()"
-                                "{"
-                                "    if (x)"
-                                "        int x;"
-                                "    { }"
-                                "}";
-            ASSERT_EQUALS("void foo ( ) { if ( x ) { int x ; } { } }", tokenizeAndStringify(code));
+            const char code[] = "void foo()\n"
+                                "{\n"
+                                "    if (x)\n"
+                                "        int x;\n"
+                                "    { }\n"
+                                "}\n";
+
+            const char expected[] = "void foo ( )\n"
+                                    "{\n"
+                                    "if ( x ) {\n"
+                                    "int x ; }\n"
+                                    "{ }\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
             ASSERT_EQUALS(
-                "[test.cpp:1:20]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
+                "[test.cpp:3:9]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
                 filter_valueflow(errout_str()));
         }
     }
@@ -1827,36 +1918,52 @@ class TestTokenizer : public TestFixture {
     }
 
     void simplifyFunctionParameters2() { // #4430
-        const char code[] = "class Item { "
-                            "int i ; "
-                            "public: "
-                            "Item ( int i ) ; "
-                            "} ; "
-                            "Item :: Item ( int i ) : i ( i ) { }";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
+        const char code[] = "class Item {\n"
+                            "    int i;\n"
+                            "public:\n"
+                            "    Item (int i);\n"
+                            "};\n"
+                            "Item::Item(int i) : i(i) { }\n";
+        const char expected[] = "class Item {\n"
+                                "int i ;\n"
+                                "public:\n"
+                                "Item ( int i ) ;\n"
+                                "} ;\n"
+                                "Item :: Item ( int i ) : i ( i ) { }";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void simplifyFunctionParameters3() { // #4436
-        const char code[] = "class Item { "
-                            "int i ; "
-                            "int j ; "
-                            "public: "
-                            "Item ( int i , int j ) ; "
-                            "} ; "
-                            "Item :: Item ( int i , int j ) : i ( i ) , j ( j ) { }";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
+        const char code[] = "class Item {\n"
+                            "    int i;\n"
+                            "    int j;\n"
+                            "public:\n"
+                            "    Item(int i, int j);\n"
+                            "};\n"
+                            "Item :: Item (int i, int j) : i(i), j(j) {}\n";
+        const char expected[] = "class Item {\n"
+                                "int i ;\n"
+                                "int j ;\n"
+                                "public:\n"
+                                "Item ( int i , int j ) ;\n"
+                                "} ;\n"
+                                "Item :: Item ( int i , int j ) : i ( i ) , j ( j ) { }";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void simplifyFunctionParameters4() { // #9421
-        const char code[] = "int foo :: bar ( int , int ) const ;";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
+        const char code[] = "int foo::bar(int, int) const;\n";
+        const char expected[] = "int foo :: bar ( int , int ) const ;";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void simplifyFunctionParametersMultiTemplate() {
-        const char code[] = "template < typename T1 > template < typename T2 > "
-                            "void A < T1 > :: foo ( T2 ) { }";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
-        ASSERT_EQUALS("[test.cpp:1:68]: (debug) Executable scope 'foo' with unknown function. [symbolDatabaseWarning]\n", errout_str());
+        const char code[] = "template<typename T1> template<typename T2>\n"
+                            "void A<T1>::foo(T2) {}\n";
+        const char expected[] = "template < typename T1 > template < typename T2 >\n"
+                                "void A < T1 > :: foo ( T2 ) { }";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        ASSERT_EQUALS("[test.cpp:2:13]: (debug) Executable scope 'foo' with unknown function. [symbolDatabaseWarning]\n", errout_str());
     }
 
     void simplifyFunctionParametersErrors() {
@@ -1872,7 +1979,7 @@ class TestTokenizer : public TestFixture {
                                                    "{}\n"), SYNTAX);
 
         ASSERT_NO_THROW(tokenizeAndStringify("void foo(int, int)\n"
-                                             "{}"));
+                                             "{}\n"));
         ASSERT_EQUALS("", errout_str());
 
         // #3848 - Don't hang
@@ -1882,7 +1989,7 @@ class TestTokenizer : public TestFixture {
                                    "void CreateSdrOLEFromStorage() {\n"
                                    "    comphelper::EmbeddedObjectContainer aCnt( xDestStorage );\n"
                                    "    { }\n"
-                                   "}");
+                                   "}\n");
         ignore_errout();
     }
 
@@ -1894,7 +2001,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("void foo() try {\n"
                                            "} catch (int) {\n"
                                            "} catch (char) {\n"
-                                           "}"));
+                                           "}\n"));
 
         ASSERT_EQUALS("void foo ( ) { try {\n"
                       "struct S {\n"
@@ -1913,7 +2020,7 @@ class TestTokenizer : public TestFixture {
                                            "    }\n"
                                            "  };\n"
                                            "} catch (long) {\n"
-                                           "}"));
+                                           "}\n"));
 
         ASSERT_EQUALS("struct S { void func ( ) const ; } ;\n"
                       "void S :: func ( ) const {\n"
@@ -1927,77 +2034,104 @@ class TestTokenizer : public TestFixture {
 
     // Simplify "((..))" into "(..)"
     void removeParentheses1() {
-        const char code[] = "void foo()"
-                            "{"
-                            "    free(((void*)p));"
-                            "}";
-
-        ASSERT_EQUALS("void foo ( ) { free ( ( void * ) p ) ; }", tokenizeAndStringify(code));
+        const char code[] = "void foo()\n"
+                            "{\n"
+                            "    free(((void*)p));\n"
+                            "}\n";
+        const char expected[] = "void foo ( )\n"
+                                "{\n"
+                                "free ( ( void * ) p ) ;\n"
+                                "}";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS(
-            "[test.cpp:1:29]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+            "[test.cpp:3:18]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
             errout_str());
     }
 
     void removeParentheses3() {
         {
-            const char code[] = "void foo()"
-                                "{"
-                                "    if (( true )==(true)){}"
-                                "}";
-            ASSERT_EQUALS("void foo ( ) { if ( true == true ) { } }", tokenizeAndStringify(code));
+            const char code[] = "void foo()\n"
+                                "{\n"
+                                "    if (( true )==(true)){}\n"
+                                "}\n";
+            const char expected[] = "void foo ( )\n"
+                                    "{\n"
+                                    "if ( true == true ) { }\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "void foo()"
-                                "{"
-                                "    if (( 2 )==(2)){}"
-                                "}";
-            ASSERT_EQUALS("void foo ( ) { if ( 2 == 2 ) { } }", tokenizeAndStringify(code));
+            const char code[] = "void foo()\n"
+                                "{\n"
+                                "    if (( 2 )==(2)){}\n"
+                                "}\n";
+            const char expected[] = "void foo ( )\n"
+                                    "{\n"
+                                    "if ( 2 == 2 ) { }\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "void foo()"
-                                "{"
-                                "    if( g(10)){}"
-                                "}";
-            ASSERT_EQUALS("void foo ( ) { if ( g ( 10 ) ) { } }", tokenizeAndStringify(code));
+            const char code[] = "void foo()\n"
+                                "{\n"
+                                "    if( g(10)){}\n"
+                                "}\n";
+            const char expected[] = "void foo ( )\n"
+                                    "{\n"
+                                    "if ( g ( 10 ) ) { }\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
     }
 
     // Simplify "( function (..))" into "function (..)"
     void removeParentheses4() {
-        const char code[] = "void foo()"
-                            "{"
-                            "    (free(p));"
-                            "}";
-        ASSERT_EQUALS("void foo ( ) { free ( p ) ; }", tokenizeAndStringify(code));
+        const char code[] = "void foo()\n"
+                            "{\n"
+                            "    (free(p));\n"
+                            "}\n";
+        const char expected[] = "void foo ( )\n"
+                                "{\n"
+                                "free ( p ) ;\n"
+                                "}";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS(
-            "[test.cpp:1:22]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+            "[test.cpp:3:11]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
             errout_str());
     }
 
     void removeParentheses5() {
         // Simplify "( delete x )" into "delete x"
         {
-            const char code[] = "void foo()"
-                                "{"
-                                "    (delete p);"
-                                "}";
-            ASSERT_EQUALS("void foo ( ) { delete p ; }", tokenizeAndStringify(code));
+            const char code[] = "void foo()\n"
+                                "{\n"
+                                "    (delete p);\n"
+                                "}\n";
+            const char expected[] = "void foo ( )\n"
+                                    "{\n"
+                                    "delete p ;\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
             ASSERT_EQUALS(
-                "[test.cpp:1:24]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+                "[test.cpp:3:13]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
                 errout_str());
         }
 
         // Simplify "( delete [] x )" into "delete [] x"
         {
-            const char code[] = "void foo()"
-                                "{"
-                                "    (delete [] p);"
-                                "}";
-            ASSERT_EQUALS("void foo ( ) { delete [ ] p ; }", tokenizeAndStringify(code));
+            const char code[] = "void foo()\n"
+                                "{\n"
+                                "    (delete [] p);\n"
+                                "}\n";
+            const char expected[] = "void foo ( )\n"
+                                    "{\n"
+                                    "delete [ ] p ;\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
             ASSERT_EQUALS(
-                "[test.cpp:1:27]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+                "[test.cpp:3:16]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
                 errout_str());
         }
     }
@@ -2005,18 +2139,18 @@ class TestTokenizer : public TestFixture {
     // "!(abc.a)" => "!abc.a"
     void removeParentheses6() {
         {
-            const char code[] = "(!(abc.a));";
+            const char code[] = "(!(abc.a));\n";
             ASSERT_EQUALS("( ! abc . a ) ;", tokenizeAndStringify(code));
         }
         //handle more complex member selections
         {
-            const char code[] = "(!(a.b.c.d));";
+            const char code[] = "(!(a.b.c.d));\n";
             ASSERT_EQUALS("( ! a . b . c . d ) ;", tokenizeAndStringify(code));
         }
     }
 
     void removeParentheses7() {
-        const char code[] = ";char *p; (delete(p), (p)=0);";
+        const char code[] = ";char *p; (delete(p), (p)=0);\n";
         ASSERT_EQUALS("; char * p ; delete ( p ) , p = 0 ;", tokenizeAndStringify(code));
     }
 
@@ -2024,7 +2158,7 @@ class TestTokenizer : public TestFixture {
         const char code[] = "struct foo {\n"
                             "    void operator delete(void *obj, size_t sz);\n"
                             "}\n";
-        const std::string actual(tokenizeAndStringify(code, dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
+        const std::string actual(tokenizeAndStringify(code, settings2_win32a));
 
         const char expected[] = "struct foo {\n"
                                 "void operatordelete ( void * obj , unsigned long sz ) ;\n"
@@ -2034,77 +2168,77 @@ class TestTokenizer : public TestFixture {
     }
 
     void removeParentheses9() {
-        ASSERT_EQUALS("void delete ( double num ) ;", tokenizeAndStringify("void delete(double num);"));
+        ASSERT_EQUALS("void delete ( double num ) ;", tokenizeAndStringify("void delete(double num);\n"));
     }
 
     void removeParentheses10() {
-        ASSERT_EQUALS("p = buf + 8 ;", tokenizeAndStringify("p = (buf + 8);"));
+        ASSERT_EQUALS("p = buf + 8 ;", tokenizeAndStringify("p = (buf + 8);\n"));
     }
 
     void removeParentheses11() {
         // #2502
-        ASSERT_EQUALS("{ } x ( ) ;", tokenizeAndStringify("{}(x());"));
+        ASSERT_EQUALS("{ } x ( ) ;", tokenizeAndStringify("{}(x());\n"));
     }
 
     void removeParentheses12() {
         // #2760
-        ASSERT_EQUALS(", x = 0 ;", tokenizeAndStringify(",(x)=0;"));
+        ASSERT_EQUALS(", x = 0 ;", tokenizeAndStringify(",(x)=0;\n"));
     }
 
     void removeParentheses13() {
-        ASSERT_EQUALS("; f ( a + b , c ) ;", tokenizeAndStringify(";f((a+b),c);"));
-        ASSERT_EQUALS("; x = y [ a + b ] ;", tokenizeAndStringify(";x=y[(a+b)];"));
+        ASSERT_EQUALS("; f ( a + b , c ) ;", tokenizeAndStringify(";f((a+b),c);\n"));
+        ASSERT_EQUALS("; x = y [ a + b ] ;", tokenizeAndStringify(";x=y[(a+b)];\n"));
     }
 
     void removeParentheses14() {
-        ASSERT_EQUALS("{ if ( ( i & 1 ) == 0 ) { ; } }", tokenizeAndStringify("{ if ( (i & 1) == 0 ); }"));
+        ASSERT_EQUALS("{ if ( ( i & 1 ) == 0 ) { ; } }", tokenizeAndStringify("{ if ( (i & 1) == 0 ); }\n"));
     }
 
     void removeParentheses15() {
-        ASSERT_EQUALS("a = b ? c : 123 ;", tokenizeAndStringify("a = b ? c : (123);"));
-        ASSERT_EQUALS("a = b ? c : ( 123 + 456 ) ;", tokenizeAndStringify("a = b ? c : ((123)+(456));"));
-        ASSERT_EQUALS("a = b ? ( 123 ) : c ;", tokenizeAndStringify("a = b ? (123) : c;"));
+        ASSERT_EQUALS("a = b ? c : 123 ;", tokenizeAndStringify("a = b ? c : (123);\n"));
+        ASSERT_EQUALS("a = b ? c : ( 123 + 456 ) ;", tokenizeAndStringify("a = b ? c : ((123)+(456));\n"));
+        ASSERT_EQUALS("a = b ? ( 123 ) : c ;", tokenizeAndStringify("a = b ? (123) : c;\n"));
 
         // #4316
-        ASSERT_EQUALS("a = b ? c : ( d = 1 , 0 ) ;", tokenizeAndStringify("a = b ? c : (d=1,0);"));
+        ASSERT_EQUALS("a = b ? c : ( d = 1 , 0 ) ;", tokenizeAndStringify("a = b ? c : (d=1,0);\n"));
     }
 
     void removeParentheses16() { // *(x.y)=
         // #4423
-        ASSERT_EQUALS("; * x = 0 ;", tokenizeAndStringify(";*(x)=0;"));
-        ASSERT_EQUALS("; * x . y = 0 ;", tokenizeAndStringify(";*(x.y)=0;"));
+        ASSERT_EQUALS("; * x = 0 ;", tokenizeAndStringify(";*(x)=0;\n"));
+        ASSERT_EQUALS("; * x . y = 0 ;", tokenizeAndStringify(";*(x.y)=0;\n"));
     }
 
     void removeParentheses17() { // a ? b : (c > 0 ? d : e)
-        ASSERT_EQUALS("a ? b : ( c > 0 ? d : e ) ;", tokenizeAndStringify("a?b:(c>0?d:e);"));
+        ASSERT_EQUALS("a ? b : ( c > 0 ? d : e ) ;", tokenizeAndStringify("a?b:(c>0?d:e);\n"));
     }
 
     void removeParentheses18() {
-        ASSERT_EQUALS("float ( * a ) [ 2 ] ;", tokenizeAndStringify("float(*a)[2];"));
+        ASSERT_EQUALS("float ( * a ) [ 2 ] ;", tokenizeAndStringify("float(*a)[2];\n"));
     }
 
     void removeParentheses19() {
-        ASSERT_EQUALS("( ( ( typeof ( X ) ) * ) 0 ) ;", tokenizeAndStringify("(((typeof(X))*)0);"));
+        ASSERT_EQUALS("( ( ( typeof ( X ) ) * ) 0 ) ;", tokenizeAndStringify("(((typeof(X))*)0);\n"));
     }
 
     void removeParentheses20() {
-        ASSERT_EQUALS("a < b < int > > ( 2 ) ;", tokenizeAndStringify("a<b<int>>(2);"));
+        ASSERT_EQUALS("a < b < int > > ( 2 ) ;", tokenizeAndStringify("a<b<int>>(2);\n"));
     }
 
     void removeParentheses21() {
-        ASSERT_EQUALS("a = ( int ) - b ;", tokenizeAndStringify("a = ((int)-b);"));
+        ASSERT_EQUALS("a = ( int ) - b ;", tokenizeAndStringify("a = ((int)-b);\n"));
     }
 
     void removeParentheses22() {
-        static char code[] = "struct S { "
-                             "char *(a); "
-                             "char &(b); "
-                             "const static char *(c); "
-                             "} ;";
-        static const char exp[] = "struct S { "
-                                  "char * a ; "
-                                  "char & b ; "
-                                  "static const char * c ; "
+        static char code[] = "struct S {\n"
+                             "    char *(a);\n"
+                             "    char &(b);\n"
+                             "    const static char *(c);\n"
+                             "};\n";
+        static const char exp[] = "struct S {\n"
+                                  "char * a ;\n"
+                                  "char & b ;\n"
+                                  "static const char * c ;\n"
                                   "} ;";
         ASSERT_EQUALS(exp, tokenizeAndStringify(code));
     }
@@ -2112,48 +2246,48 @@ class TestTokenizer : public TestFixture {
     void removeParentheses23() { // Ticket #6103
         // Reported case
         {
-            static char code[] = "; * * p f ( ) int = { new int ( * [ 2 ] ) ; void }";
+            static char code[] = "; * * p f ( ) int = { new int ( * [ 2 ] ) ; void }\n";
             static const char exp[] = "; * * p f ( ) int = { new int ( * [ 2 ] ) ; void }";
             ASSERT_EQUALS(exp, tokenizeAndStringify(code));
         }
         // Various valid cases
         {
-            static char code[] = "int * f [ 1 ] = { new ( int ) } ;";
+            static char code[] = "int * f [ 1 ] = { new ( int ) } ;\n";
             static const char exp[] = "int * f [ 1 ] = { new int } ;";
             ASSERT_EQUALS(exp, tokenizeAndStringify(code));
         }
         {
-            static char code[] = "int * * f [ 1 ] = { new ( int ) [ 1 ] } ;";
+            static char code[] = "int * * f [ 1 ] = { new ( int ) [ 1 ] } ;\n";
             static const char exp[] = "int * * f [ 1 ] = { new int [ 1 ] } ;";
             ASSERT_EQUALS(exp, tokenizeAndStringify(code));
         }
         {
-            static char code[] = "list < int > * f [ 1 ] = { new ( list < int > ) } ;";
+            static char code[] = "list < int > * f [ 1 ] = { new ( list < int > ) } ;\n";
             static const char exp[] = "list < int > * f [ 1 ] = { new list < int > } ;";
             ASSERT_EQUALS(exp, tokenizeAndStringify(code));
         }
         // don't remove parentheses in operator new overload
         {
-            static char code[] = "void *operator new(__SIZE_TYPE__, int);";
+            static char code[] = "void *operator new(__SIZE_TYPE__, int);\n";
             static const char exp[] = "void * operatornew ( __SIZE_TYPE__ , int ) ;";
             ASSERT_EQUALS(exp, tokenizeAndStringify(code));
         }
     }
 
     void removeParentheses24() { // Ticket #7040
-        static char code[] = "std::hash<decltype(t._data)>()(t._data);";
+        static char code[] = "std::hash<decltype(t._data)>()(t._data);\n";
         static const char exp[] = "std :: hash < decltype ( t . _data ) > ( ) ( t . _data ) ;";
         ASSERT_EQUALS(exp, tokenizeAndStringify(code));
     }
 
     void removeParentheses25() { // daca@home - a=(b,c)
-        static char code[] = "a=(b,c);";
+        static char code[] = "a=(b,c);\n";
         static const char exp[] = "a = ( b , c ) ;";
         ASSERT_EQUALS(exp, tokenizeAndStringify(code));
     }
 
     void removeParentheses26() { // Ticket #8875 a[0](0)
-        static char code[] = "a[0](0);";
+        static char code[] = "a[0](0);\n";
         static const char exp[] = "a [ 0 ] ( 0 ) ;";
         ASSERT_EQUALS(exp, tokenizeAndStringify(code));
     }
@@ -2173,11 +2307,36 @@ class TestTokenizer : public TestFixture {
     }
 
     void removeParentheses28() { // Ticket #12164
-        static char code[] = "temp1 = (value > 100U) ? (value+100U) : (value-50U);";
+        static char code[] = "temp1 = (value > 100U) ? (value+100U) : (value-50U);\n";
         static const char exp[] = "temp1 = ( value > 100U ) ? ( value + 100U ) : ( value - 50U ) ;";
         ASSERT_EQUALS(exp, tokenizeAndStringify(code));
     }
 
+    void removeParantheses29() { // Ticket #13735
+        static char code[] = "double foo(void)\n"
+                             "{\n"
+                             "return (modf)(12.3, NULL);\n"
+                             "}\n";
+        static const char exp[] = "double foo ( )\n"
+                                  "{\n"
+                                  "return modf ( 12.3 , NULL ) ;\n"
+                                  "}";
+        ASSERT_EQUALS(exp, tokenizeAndStringify(code));
+    }
+
+    void removeParentheses30() {
+        static char code[] = "void f (Node *node) {\n"
+                             "    if (node->data && (node->provider)->free)\n"
+                             "        (node->provider)->free (node);\n"
+                             "}\n";
+        static const char exp[] = "void f ( Node * node ) {\n"
+                                  "if ( node . data && ( node . provider ) . free ) {\n"
+                                  "node . provider . free ( node ) ; }\n"
+                                  "}";
+        ASSERT_EQUALS(exp, tokenizeAndStringify(code));
+        (void) errout_str();
+    }
+
     void tokenize_double() {
         const char code[] = "void f() {\n"
                             "    double a = 4.2;\n"
@@ -2185,7 +2344,7 @@ class TestTokenizer : public TestFixture {
                             "    double c = 4.2e+10;\n"
                             "    double d = 4.2e-10;\n"
                             "    int e = 4+2;\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("void f ( ) {\n"
                       "double a ; a = 4.2 ;\n"
                       "float b ; b = 4.2f ;\n"
@@ -2196,14 +2355,14 @@ class TestTokenizer : public TestFixture {
     }
 
     void tokenize_strings() {
-        const char code[] =   "void f() {\n"
+        const char code[] = "void f() {\n"
                             "const char *a =\n"
                             "{\n"
                             "\"hello \"\n"
                             "\"more \"\n"
                             "\"world\"\n"
                             "};\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("void f ( ) {\n"
                       "const char * a ; a =\n"
                       "{\n"
@@ -2215,27 +2374,32 @@ class TestTokenizer : public TestFixture {
     }
 
     void simplifyStructDecl() {
-        const char code[] = "const struct A { int a; int b; } a;";
+        const char code[] = "const struct A { int a; int b; } a;\n";
         ASSERT_EQUALS("struct A { int a ; int b ; } ; const struct A a ;", tokenizeAndStringify(code));
 
         // #9519
-        const char code2[] = "enum A {} (a);";
+        const char code2[] = "enum A {} (a);\n";
         const char expected2[] = "enum A { } ; enum A a ;";
         ASSERT_EQUALS(expected2, tokenizeAndStringify(code2));
 
         // #11052
-        const char code3[] = "struct a { int b; } static e[1];";
+        const char code3[] = "struct a { int b; } static e[1];\n";
         const char expected3[] = "struct a { int b ; } ; struct a static e [ 1 ] ;";
         ASSERT_EQUALS(expected3, tokenizeAndStringify(code3));
 
         // #11013 - Do not remove unnamed struct in union
-        const char code4[] = "union U { struct { int a; int b; }; int ab[2]; };";
+        const char code4[] = "union U { struct { int a; int b; }; int ab[2]; };\n";
         const char expected4[] = "union U { struct { int a ; int b ; } ; int ab [ 2 ] ; } ;";
         ASSERT_EQUALS(expected4, tokenizeAndStringify(code4));
+
+        // #14836: FP syntaxError for anonymous struct in for loop
+        const char code5[] = "void f(void) { for (struct { int a; } it = {0}; it.a < 10; it.a++) {} }\n";
+        const char expected5[] = "void f ( ) { struct Anonymous0 { int a ; } ; for ( struct Anonymous0 it = { 0 } ; it . a < 10 ; it . a ++ ) { } }";
+        ASSERT_EQUALS(expected5, tokenizeAndStringify(code5));
     }
 
     void vardecl1() {
-        const char code[] = "unsigned int a, b;";
+        const char code[] = "unsigned int a, b;\n";
 
         const std::string actual(tokenizeAndStringify(code));
 
@@ -2243,7 +2407,7 @@ class TestTokenizer : public TestFixture {
     }
 
     void vardecl2() {
-        const char code[] = "void foo(a,b) unsigned int a, b; { }";
+        const char code[] = "void foo(a,b) unsigned int a, b; { }\n";
 
         const std::string actual(tokenizeAndStringify(code));
 
@@ -2251,7 +2415,7 @@ class TestTokenizer : public TestFixture {
     }
 
     void vardecl3() {
-        const char code[] = "void f() { char * p = foo<10,char>(); }";
+        const char code[] = "void f() { char * p = foo<10,char>(); }\n";
         const std::string actual(tokenizeAndStringify(code));
         ASSERT_EQUALS("void f ( ) { char * p ; p = foo < 10 , char > ( ) ; }", actual);
     }
@@ -2259,23 +2423,23 @@ class TestTokenizer : public TestFixture {
     void vardecl4() {
         // ticket #346
 
-        const char code1[] = "void *p = NULL;";
+        const char code1[] = "void *p = NULL;\n";
         const char res1[]  = "void * p ; p = NULL ;";
         ASSERT_EQUALS(res1, tokenizeAndStringify(code1));
 
-        const char code2[] = "const void *p = NULL;";
+        const char code2[] = "const void *p = NULL;\n";
         const char res2[]  = "const void * p ; p = NULL ;";
         ASSERT_EQUALS(res2, tokenizeAndStringify(code2));
 
-        const char code3[] = "void * const p = NULL;";
+        const char code3[] = "void * const p = NULL;\n";
         const char res3[]  = "void * const p ; p = NULL ;";
         ASSERT_EQUALS(res3, tokenizeAndStringify(code3));
 
-        const char code4[] = "const void * const p = NULL;";
+        const char code4[] = "const void * const p = NULL;\n";
         const char res4[]  = "const void * const p ; p = NULL ;";
         ASSERT_EQUALS(res4, tokenizeAndStringify(code4));
 
-        const char code5[] = "const void * volatile p = NULL;";
+        const char code5[] = "const void * volatile p = NULL;\n";
         const char res5[]  = "const void * volatile p ; p = NULL ;";
         ASSERT_EQUALS(res5, tokenizeAndStringify(code5));
     }
@@ -2285,7 +2449,7 @@ class TestTokenizer : public TestFixture {
                       "int addI ; addI = frontPoint == 2 || frontPoint == 1 ? ( i = 0 , 1 ) : ( i = nX - 2 , -1 ) ;\n"
                       "}", tokenizeAndStringify("void foo(int nX) {\n"
                                                 "    int addI = frontPoint == 2 || frontPoint == 1 ? i = 0, 1 : (i = nX - 2, -1);\n"
-                                                "}"));
+                                                "}\n"));
         ASSERT_EQUALS(
             "[test.cpp:2:16]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable frontPoint [valueFlowBailoutIncompleteVar]\n",
             errout_str());
@@ -2294,56 +2458,69 @@ class TestTokenizer : public TestFixture {
     void vardecl_stl_1() {
         // ticket #520
 
-        const char code1[] = "std::vector<std::string>a, b;";
+        const char code1[] = "std::vector<std::string>a, b;\n";
         const char res1[]  = "std :: vector < std :: string > a ; std :: vector < std :: string > b ;";
         ASSERT_EQUALS(res1, tokenizeAndStringify(code1));
 
-        const char code2[] = "std::vector<std::string>::const_iterator it, cit;";
+        const char code2[] = "std::vector<std::string>::const_iterator it, cit;\n";
         const char res2[]  = "std :: vector < std :: string > :: const_iterator it ; std :: vector < std :: string > :: const_iterator cit ;";
         ASSERT_EQUALS(res2, tokenizeAndStringify(code2));
 
-        const char code3[] = "std::vector<std::pair<std::string, std::string > > *c, d;";
+        const char code3[] = "std::vector<std::pair<std::string, std::string > > *c, d;\n";
         const char res3[]  = "std :: vector < std :: pair < std :: string , std :: string > > * c ; std :: vector < std :: pair < std :: string , std :: string > > d ;";
         ASSERT_EQUALS(res3, tokenizeAndStringify(code3));
     }
 
     void vardecl_stl_2() {
-        const char code1[] = "{ std::string x = \"abc\"; }";
+        const char code1[] = "{ std::string x = \"abc\"; }\n";
         ASSERT_EQUALS("{ std :: string x ; x = \"abc\" ; }", tokenizeAndStringify(code1));
 
-        const char code2[] = "{ std::vector<int> x = y; }";
+        const char code2[] = "{ std::vector<int> x = y; }\n";
         ASSERT_EQUALS("{ std :: vector < int > x ; x = y ; }", tokenizeAndStringify(code2));
     }
 
     void vardecl_stl_3()
     {
-        const char code1[] = "{ std::string const x = \"abc\"; }";
+        const char code1[] = "{ std::string const x = \"abc\"; }\n";
         ASSERT_EQUALS("{ const std :: string x = \"abc\" ; }", tokenizeAndStringify(code1));
 
-        const char code2[] = "{ std::vector<int> const x = y; }";
+        const char code2[] = "{ std::vector<int> const x = y; }\n";
         ASSERT_EQUALS("{ const std :: vector < int > x = y ; }", tokenizeAndStringify(code2));
     }
 
     void vardecl_template_1() {
         // ticket #1046
-        const char code1[] = "b<(1<<24),10,24> u, v;";
+        const char code1[] = "b<(1<<24),10,24> u, v;\n";
         const char res1[]  = "b < 16777216 , 10 , 24 > u ; b < 16777216 , 10 , 24 > v ;";
         ASSERT_EQUALS(res1, tokenizeAndStringify(code1));
         // ticket #3571 (segmentation fault)
-        (void)tokenizeAndStringify("template <int i = (3>4) > class X4 {};");
+        (void)tokenizeAndStringify("template <int i = (3>4) > class X4 {};\n");
     }
 
     void vardecl_template_2() {
         // ticket #3650
-        const char code[] = "const string str = x<8,int>();";
+        const char code[] = "const string str = x<8,int>();\n";
         const char expected[]  = "const string str = x < 8 , int > ( ) ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
+    void vardecl_template_3() {
+        const char code[] = "template <class T>\n" // #14909
+                            "void f(T x) {\n"
+                            "    const auto y = h<T, x.size()>;\n"
+                            "}\n";
+        const char expected[]  = "template < class T >\n"
+                                 "void f ( T x ) {\n"
+                                 "const auto y = h < T , x . size ( ) > ;\n"
+                                 "}";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        ASSERT_EQUALS("[test.cpp:3:11]: (debug) auto token with no type. [autoNoType]\n", errout_str());
+    }
+
     void vardecl_union() {
         // ticket #1976
-        const char code1[] = "class Fred { public: union { int a ; int b ; } ; } ;";
-        ASSERT_EQUALS(code1, tokenizeAndStringify(code1));
+        const char code1[] = "class Fred { public: union { int a ; int b ; } ; } ;\n";
+        ASSERT_EQUALS("class Fred { public: union { int a ; int b ; } ; } ;", tokenizeAndStringify(code1));
 
         // ticket #2039
         const char code2[] = "void f() {\n"
@@ -2351,34 +2528,34 @@ class TestTokenizer : public TestFixture {
                              "         int x;\n"
                              "         long y;\n"
                              "     };\n"
-                             "}";
+                             "}\n";
         ASSERT_EQUALS("void f ( ) {\nunion {\nint x ;\nlong y ;\n} ;\n}", tokenizeAndStringify(code2));
 
         // ticket #3927
-        const char code3[] = "union xy *p = NULL;";
+        const char code3[] = "union xy *p = NULL;\n";
         ASSERT_EQUALS("union xy * p ; p = NULL ;", tokenizeAndStringify(code3));
     }
 
     void vardecl_par() {
         // ticket #2743 - set links if variable type contains parentheses
-        const char code[] = "Fred<int(*)()> fred1=a, fred2=b;";
+        const char code[] = "Fred<int(*)()> fred1=a, fred2=b;\n";
         ASSERT_EQUALS("Fred < int ( * ) ( ) > fred1 ; fred1 = a ; Fred < int ( * ) ( ) > fred2 ; fred2 = b ;", tokenizeAndStringify(code));
     }
 
     void vardecl_par2() {
         // ticket #3912 - set correct links
-        const char code[] = "function<void (shared_ptr<MyClass>)> v;";
+        const char code[] = "function<void (shared_ptr<MyClass>)> v;\n";
         ASSERT_EQUALS("function < void ( shared_ptr < MyClass > ) > v ;", tokenizeAndStringify(code));
     }
 
     void vardecl_par3() {
         // ticket #6556- Fred x1(a), x2(b);
-        const char code[] = "Fred x1(a), x2(b);";
+        const char code[] = "Fred x1(a), x2(b);\n";
         ASSERT_EQUALS("Fred x1 ( a ) ; Fred x2 ( b ) ;", tokenizeAndStringify(code));
     }
 
     void vardecl_class_ref() {
-        const char code[] = "class A { B &b1,&b2; };";
+        const char code[] = "class A { B &b1,&b2; };\n";
         ASSERT_EQUALS("class A { B & b1 ; B & b2 ; } ;", tokenizeAndStringify(code));
     }
 
@@ -2386,59 +2563,60 @@ class TestTokenizer : public TestFixture {
         {
             // don't simplify declarations of static variables
             // "static int i = 0;" is not the same as "static int i; i = 0;"
-            const char code[] = "static int i = 0 ;";
-            ASSERT_EQUALS(code, tokenizeAndStringify(code));
+            const char code[] = "static int i = 0 ;\n";
+            ASSERT_EQUALS("static int i = 0 ;", tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "static int a, b;";
+            const char code[] = "static int a, b;\n";
             ASSERT_EQUALS("static int a ; static int b ;", tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "static unsigned int a, b;";
+            const char code[] = "static unsigned int a, b;\n";
             ASSERT_EQUALS("static unsigned int a ; static unsigned int b ;", tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "static int a=1, b=1;";
+            const char code[] = "static int a=1, b=1;\n";
             ASSERT_EQUALS("static int a = 1 ; static int b = 1 ;", tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "static int *a, *b;";
+            const char code[] = "static int *a, *b;\n";
             ASSERT_EQUALS("static int * a ; static int * b ;", tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "static unsigned int *a=0, *b=0;";
+            const char code[] = "static unsigned int *a=0, *b=0;\n";
             ASSERT_EQUALS("static unsigned int * a = 0 ; static unsigned int * b = 0 ;", tokenizeAndStringify(code));
         }
 
         {
             // Ticket #4450
-            const char code[] = "static int large_eeprom_type = (13 | (5)), "
-                                "default_flash_type = 42;";
-            ASSERT_EQUALS("static int large_eeprom_type = 13 | 5 ; static int default_flash_type = 42 ;",
+            const char code[] = "static int large_eeprom_type = (13 | (5)),\n"
+                                "default_flash_type = 42;\n";
+            ASSERT_EQUALS("static int large_eeprom_type = 13 | 5 ; static int\n"
+                          "default_flash_type = 42 ;",
                           tokenizeAndStringify(code));
         }
 
         {
             // Ticket #5121
-            const char code[] = "unsigned int x;"
-                                "static const unsigned int A = 1, B = A, C = 0, D = (A), E = 0;"
-                                "void f() {"
-                                "  unsigned int *foo = &x;"
-                                "}";
-            ASSERT_EQUALS("unsigned int x ; "
+            const char code[] = "unsigned int x;\n"
+                                "static const unsigned int A = 1, B = A, C = 0, D = (A), E = 0;\n"
+                                "void f() {\n"
+                                "  unsigned int *foo = &x;\n"
+                                "}\n";
+            ASSERT_EQUALS("unsigned int x ;\n"
                           "static const unsigned int A = 1 ; "
                           "static const unsigned int B = A ; "
                           "static const unsigned int C = 0 ; "
                           "static const unsigned int D = A ; "
-                          "static const unsigned int E = 0 ; "
-                          "void f ( ) { "
+                          "static const unsigned int E = 0 ;\n"
+                          "void f ( ) {\n"
                           "unsigned int * foo ; "
-                          "foo = & x ; "
+                          "foo = & x ;\n"
                           "}",
                           tokenizeAndStringify(code));
         }
@@ -2448,7 +2626,7 @@ class TestTokenizer : public TestFixture {
             const char code[] = "class Machine {\n"
                                 "  static int const STACK_ORDER = 10, STACK_MAX = 1 << STACK_ORDER,"
                                 "                   STACK_GUARD = 2;\n"
-                                "};";
+                                "};\n";
             ASSERT_EQUALS("class Machine {\n"
                           "static const int STACK_ORDER = 10 ; static const int STACK_MAX = 1 << STACK_ORDER ; "
                           "static const int STACK_GUARD = 2 ;\n"
@@ -2473,7 +2651,7 @@ class TestTokenizer : public TestFixture {
     void vardecl6() {
         // ticket #565
 
-        const char code1[] = "int z = x >> 16;";
+        const char code1[] = "int z = x >> 16;\n";
         const char res1[]  = "int z ; z = x >> 16 ;";
         ASSERT_EQUALS(res1, tokenizeAndStringify(code1));
     }
@@ -2484,7 +2662,7 @@ class TestTokenizer : public TestFixture {
                             "    for (int c = 0; c < 0; ++c) {}\n"
                             "    int t;\n"
                             "    D(3 > t, \"T\");\n"
-                            "}";
+                            "}\n";
         const char res[] = "void f ( ) {\n"
                            "for ( int c = 0 ; c < 0 ; ++ c ) { }\n"
                            "int t ;\n"
@@ -2496,38 +2674,38 @@ class TestTokenizer : public TestFixture {
 
     void vardecl8() {
         // ticket #696
-        const char code[] = "char a[10]={'\\0'}, b[10]={'\\0'};";
+        const char code[] = "char a[10]={'\\0'}, b[10]={'\\0'};\n";
         const char res[]  = "char a [ 10 ] = { '\\0' } ; char b [ 10 ] = { '\\0' } ;";
         ASSERT_EQUALS(res, tokenizeAndStringify(code));
     }
 
     void vardecl9() {
-        const char code[] = "char a[2] = {'A', '\\0'}, b[2] = {'B', '\\0'};";
+        const char code[] = "char a[2] = {'A', '\\0'}, b[2] = {'B', '\\0'};\n";
         const char res[]  = "char a [ 2 ] = { 'A' , '\\0' } ; char b [ 2 ] = { 'B' , '\\0' } ;";
         ASSERT_EQUALS(res, tokenizeAndStringify(code));
     }
 
     void vardecl10() {
         // ticket #732
-        const char code[] = "char a [ 2 ] = { '-' } ; memset ( a , '-' , sizeof ( a ) ) ;";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
+        const char code[] = "char a[2] = {'-'}; memset(a, '-', sizeof(a));\n";
+        ASSERT_EQUALS("char a [ 2 ] = { '-' } ; memset ( a , '-' , sizeof ( a ) ) ;", tokenizeAndStringify(code));
     }
 
     void vardecl11() {
         // ticket #1684
-        const char code[] = "char a[5][8], b[5][8];";
+        const char code[] = "char a[5][8], b[5][8];\n";
         ASSERT_EQUALS("char a [ 5 ] [ 8 ] ; char b [ 5 ] [ 8 ] ;", tokenizeAndStringify(code));
     }
 
     void vardecl12() {
-        const char code[] = "struct A { public: B a, b, c, d; };";
+        const char code[] = "struct A { public: B a, b, c, d; };\n";
         ASSERT_EQUALS("struct A { public: B a ; B b ; B c ; B d ; } ;", tokenizeAndStringify(code));
     }
 
     void vardecl13() {
         const char code[] = "void f() {\n"
                             "    int a = (x < y) ? 1 : 0;\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("void f ( ) {\nint a ; a = ( x < y ) ? 1 : 0 ;\n}", tokenizeAndStringify(code));
         ASSERT_EQUALS(
             "[test.cpp:2:14]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
@@ -2535,8 +2713,9 @@ class TestTokenizer : public TestFixture {
     }
 
     void vardecl14() {
+        const Settings s = settingsBuilder(settings1).cpp(Standards::CPP03).build();
         const char code[] = "::std::tr1::shared_ptr<int> pNum1, pNum2;\n";
-        ASSERT_EQUALS(":: std :: tr1 :: shared_ptr < int > pNum1 ; :: std :: tr1 :: shared_ptr < int > pNum2 ;", tokenizeAndStringify(code, dinit(TokenizeOptions, $.expand = false, $.cppstd = Standards::CPP03)));
+        ASSERT_EQUALS(":: std :: tr1 :: shared_ptr < int > pNum1 ; :: std :: tr1 :: shared_ptr < int > pNum2 ;", tokenizeAndStringify(code, s, true, false));
     }
 
     void vardecl15() {
@@ -2700,11 +2879,11 @@ class TestTokenizer : public TestFixture {
     }
 
     void vardecl22() {  // #4211 - segmentation fault
-        (void)tokenizeAndStringify("A<B<C<int>> >* p = 0;");
+        (void)tokenizeAndStringify("A<B<C<int>> >* p = 0;\n");
     }
 
     void vardecl23() {  // #4276 - segmentation fault
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("class a { protected : template < class int x = 1 ; public : int f ( ) ; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("class a { protected : template < class int x = 1 ; public : int f ( ) ; }\n"), SYNTAX);
     }
 
     void vardecl24() {  // #4187 - variable declaration within lambda function
@@ -2713,7 +2892,7 @@ class TestTokenizer : public TestFixture {
                              "    {\n"
                              "        int temp = 0;\n"
                              "    });\n"
-                             "}";
+                             "}\n";
 
         const char expected1[] = "void f ( ) {\n"
                                  "std :: for_each ( ints . begin ( ) , ints . end ( ) , [ ] ( int val )\n"
@@ -2726,7 +2905,7 @@ class TestTokenizer : public TestFixture {
 
         const char code2[] = "void f(int j) {\n"
                              "    g( [](){int temp = 0;} , j );\n"
-                             "}";
+                             "}\n";
 
         const char expected2[] = "void f ( int j ) {\n"
                                  "g ( [ ] ( ) { int temp ; temp = 0 ; } , j ) ;\n"
@@ -2739,12 +2918,12 @@ class TestTokenizer : public TestFixture {
         (void)tokenizeAndStringify("void A::func(P g) const {}\n"
                                    "void A::a() {\n"
                                    "   b = new d(  [this]( const P & p) -> double { return this->func(p);}  );\n"
-                                   "}");
+                                   "}\n");
         ignore_errout();
     }
 
     void vardecl26() { // #5907
-        const char code[] = "extern int *new, obj, player;";
+        const char code[] = "extern int *new, obj, player;\n";
         const char expected[] = "extern int * new ; extern int obj ; extern int player ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
@@ -2757,7 +2936,7 @@ class TestTokenizer : public TestFixture {
                             "  if (foo(c))\n"
                             "    return 0;\n"
                             "  return 0;\n"
-                            "}";
+                            "}\n";
         (void)tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false));
     }
 
@@ -2765,7 +2944,7 @@ class TestTokenizer : public TestFixture {
         const char code[] = "unsigned short f(void) {\n"
                             "    unsigned short const int x = 1;\n"
                             "    return x;\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("unsigned short f ( ) {\n"
                       "const unsigned short x ; x = 1 ;\n"
                       "return x ;\n"
@@ -2775,7 +2954,7 @@ class TestTokenizer : public TestFixture {
 
     void vardecl29() { // #9282
         {
-            const char code[] = "double f1() noexcept, f2(double) noexcept;";
+            const char code[] = "double f1() noexcept, f2(double) noexcept;\n";
             ASSERT_EQUALS("double f1 ( ) noexcept ( true ) ; double f2 ( double ) noexcept ( true ) ;",
                           tokenizeAndStringify(code));
         }
@@ -2792,7 +2971,7 @@ class TestTokenizer : public TestFixture {
     }
 
     void vardecl30() {
-        const char code[] = "struct D {} const d;";
+        const char code[] = "struct D {} const d;\n";
         ASSERT_EQUALS("struct D { } ; struct D const d ;",
                       tokenizeAndStringify(code));
         ASSERT_EQUALS("struct D { } ; struct D const d ;",
@@ -2801,37 +2980,95 @@ class TestTokenizer : public TestFixture {
 
     void vardecl31() {
         {
-            const char code[] = "void foo() { int (*fptr)() = 0; }";
+            const char code[] = "void foo() { int (*fptr)() = 0; }\n";
             ASSERT_EQUALS("void foo ( ) { int ( * fptr ) ( ) ; fptr = 0 ; }", tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "void foo() { int (*fptr)(int) = 0; }";
+            const char code[] = "void foo() { int (*fptr)(int) = 0; }\n";
             ASSERT_EQUALS("void foo ( ) { int ( * fptr ) ( int ) ; fptr = 0 ; }", tokenizeAndStringify(code));
         }
     }
 
     void vardecl32() {
         {
-            const char code[] = "static enum { E } f() { return E; }";
+            const char code[] = "static enum { E } f() { return E; }\n";
             ASSERT_EQUALS("enum Anonymous0 { E } ; static enum Anonymous0 f ( ) { return E ; }", tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
     }
 
     void vardecl33() {
         {
-            const char code[] = "static enum { E } *f() { return NULL; }";
+            const char code[] = "static enum { E } *f() { return NULL; }\n";
             ASSERT_EQUALS("enum Anonymous0 { E } ; static enum Anonymous0 * f ( ) { return NULL ; }", tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
     }
 
     void vardecl34() {
         {
-            const char code[] = "static enum { E } const *f() { return NULL; }";
+            const char code[] = "static enum { E } const *f() { return NULL; }\n";
             ASSERT_EQUALS("enum Anonymous0 { E } ; static enum Anonymous0 const * f ( ) { return NULL ; }", tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
     }
 
+    void vardecl35() { // #14842
+        {
+            const char code[] = "auto f() -> void {\n"
+                                "    auto p = new int;\n"
+                                "    *p = 0;\n"
+                                "}\n";
+            ASSERT_EQUALS("auto f ( ) . void {\n"
+                          "auto p ; p = new int ;\n"
+                          "* p = 0 ;\n"
+                          "}", tokenizeAndStringify(code));
+            ignore_errout();
+        }
+        {
+            const char code[] = "auto f() -> ::std::vector<int> {\n"
+                                "    int i = 0;\n"
+                                "    return { i };\n"
+                                "}\n";
+            ASSERT_EQUALS("auto f ( ) . :: std :: vector < int > {\n"
+                          "int i ; i = 0 ;\n"
+                          "return { i } ;\n"
+                          "}",
+                          tokenizeAndStringify(code));
+            ignore_errout();
+        }
+    }
+
+    void vardecl36() {
+        const char code[] = "struct S {\n" // #15086
+                            "    bool f1() const;\n"
+                            "    bool f2() const;\n"
+                            "    int g() const;\n"
+                            "    int x, y;\n"
+                            "};\n"
+                            "bool S::f1() const {\n"
+                            "    const bool b = x ? g() < 0 : 0 > y;\n"
+                            "    return b;\n"
+                            "}\n"
+                            "bool S::f2() const {\n"
+                            "    const bool b = g() < x ? x != y : 0 > y;\n"
+                            "    return b;\n"
+                            "}\n";
+        const char expected[] = "struct S {\n"
+                                "bool f1 ( ) const ;\n"
+                                "bool f2 ( ) const ;\n"
+                                "int g ( ) const ;\n"
+                                "int x ; int y ;\n"
+                                "} ;\n"
+                                "bool S :: f1 ( ) const {\n"
+                                "const bool b = x ? ( g ( ) < 0 ) : 0 > y ;\n"
+                                "return b ;\n"
+                                "}\n"
+                                "bool S :: f2 ( ) const {\n"
+                                "const bool b = g ( ) < x ? x != y : 0 > y ;\n"
+                                "return b ;\n"
+                                "}";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+    }
+
     void volatile_variables() {
         {
             const char code[] = "volatile int a=0;\n"
@@ -2854,11 +3091,11 @@ class TestTokenizer : public TestFixture {
 
     void simplifyKeyword() {
         {
-            const char code[] = "void f (int a [ static 5] );";
+            const char code[] = "void f (int a [ static 5] );\n";
             ASSERT_EQUALS("void f ( int a [ 5 ] ) ;", tokenizeAndStringify(code));
         }
         {
-            const char in4[] = "struct B final : A { void foo(); };";
+            const char in4[] = "struct B final : A { void foo(); };\n";
             const char out4[] = "struct B : A { void foo ( ) ; } ;";
             ASSERT_EQUALS(out4, tokenizeAndStringify(in4));
 
@@ -2885,25 +3122,51 @@ class TestTokenizer : public TestFixture {
         }
         {
             // Ticket #8679
-            const char code[] = "thread_local void *thread_local_var; "
-                                "__thread void *thread_local_var_2;";
-            ASSERT_EQUALS("static void * thread_local_var ; "
+            const char code[] = "thread_local void *thread_local_var;\n"
+                                "__thread void *thread_local_var_2;\n";
+            ASSERT_EQUALS("static void * thread_local_var ;\n"
                           "void * thread_local_var_2 ;", tokenizeAndStringify(code));
         }
 
-        ASSERT_EQUALS("class Fred { } ;", tokenizeAndStringify("class DLLEXPORT Fred final { };"));
+        ASSERT_EQUALS("class Fred { } ;", tokenizeAndStringify("class DLLEXPORT Fred final { };\n"));
+    }
+
+    void simplifyKeywordNoreturn1() {
+        const char code[] = "_Noreturn void f(void) {}\n";
+        const char expected[] = "_Noreturn void f ( ) { }";
+        SimpleTokenizer tokenizer(*this, false);
+        ASSERT(tokenizer.tokenize(code));
+
+        ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
+
+        const Token *f = Token::findsimplematch(tokenizer.tokens(), "f");
+        ASSERT(f);
+        ASSERT(f->isAttributeNoreturn());
+    }
+
+    void simplifyKeywordNoreturn2() {
+        const char code[] = "noreturn void f(void) {}\n";
+        const char expected[] = "noreturn void f ( ) { }";
+        SimpleTokenizer tokenizer(*this, false);
+        ASSERT(tokenizer.tokenize(code));
+
+        ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
+
+        const Token *f = Token::findsimplematch(tokenizer.tokens(), "f");
+        ASSERT(f);
+        ASSERT(f->isAttributeNoreturn());
     }
 
     void implicitIntConst() {
-        ASSERT_EQUALS("const int x ;", tokenizeAndStringify("const x;", dinit(TokenizeOptions, $.cpp = false)));
-        ASSERT_EQUALS("const int * x ;", tokenizeAndStringify("const *x;", dinit(TokenizeOptions, $.cpp = false)));
-        ASSERT_EQUALS("const int * f ( ) ;", tokenizeAndStringify("const *f();", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("const int x ;", tokenizeAndStringify("const x;\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("const int * x ;", tokenizeAndStringify("const *x;\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("const int * f ( ) ;", tokenizeAndStringify("const *f();\n", dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void implicitIntExtern() {
-        ASSERT_EQUALS("extern int x ;", tokenizeAndStringify("extern x;", dinit(TokenizeOptions, $.cpp = false)));
-        ASSERT_EQUALS("extern int * x ;", tokenizeAndStringify("extern *x;", dinit(TokenizeOptions, $.cpp = false)));
-        ASSERT_EQUALS("const int * f ( ) ;", tokenizeAndStringify("const *f();", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("extern int x ;", tokenizeAndStringify("extern x;\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("extern int * x ;", tokenizeAndStringify("extern *x;\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("const int * f ( ) ;", tokenizeAndStringify("const *f();\n", dinit(TokenizeOptions, $.cpp = false)));
     }
 
     /**
@@ -2911,29 +3174,31 @@ class TestTokenizer : public TestFixture {
      */
     void implicitIntSigned1() {
         {
-            const char code1[] = "void foo ( signed int , float ) ;";
-            ASSERT_EQUALS(code1, tokenizeAndStringify(code1));
+            const char code1[] = "void foo(signed int, float);\n";
+            const char code2[] = "void foo ( signed int , float ) ;";
+            ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
 
         {
-            const char code1[] = "signed i ;";
+            const char code1[] = "signed i ;\n";
             const char code2[] = "signed int i ;";
             ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
 
         {
-            const char code1[] = "signed int i ;";
-            ASSERT_EQUALS(code1, tokenizeAndStringify(code1));
+            const char code1[] = "signed int i ;\n";
+            const char code2[] = "signed int i ;";
+            ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
 
         {
-            const char code1[] = "int signed i ;";
+            const char code1[] = "int signed i ;\n";
             const char code2[] = "signed int i ;";
             ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
 
         {
-            const char code1[] = "void f() { for (signed i=0; i<10; i++) {} }";
+            const char code1[] = "void f() { for (signed i=0; i<10; i++) {} }\n";
             const char code2[] = "void f ( ) { for ( signed int i = 0 ; i < 10 ; i ++ ) { } }";
             ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
@@ -2946,40 +3211,41 @@ class TestTokenizer : public TestFixture {
     void implicitIntUnsigned1() {
         // No changes..
         {
-            const char code[] = "void foo ( unsigned int , float ) ;";
-            ASSERT_EQUALS(code, tokenizeAndStringify(code));
+            const char code1[] = "void foo(unsigned int, float);\n";
+            const char code2[] = "void foo ( unsigned int , float ) ;";
+            ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
 
         // insert "int" after "unsigned"..
         {
-            const char code1[] = "unsigned i ;";
+            const char code1[] = "unsigned i ;\n";
             const char code2[] = "unsigned int i ;";
             ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
 
         {
-            const char code1[] = "int unsigned i ;";
+            const char code1[] = "int unsigned i ;\n";
             const char code2[] = "unsigned int i ;";
             ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
 
         // insert "int" after "unsigned"..
         {
-            const char code1[] = "void f() { for (unsigned i=0; i<10; i++) {} }";
+            const char code1[] = "void f() { for (unsigned i=0; i<10; i++) {} }\n";
             const char code2[] = "void f ( ) { for ( unsigned int i = 0 ; i < 10 ; i ++ ) { } }";
             ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
 
         // "extern unsigned x;" => "extern int x;"
         {
-            const char code1[] = "; extern unsigned x;";
+            const char code1[] = "; extern unsigned x;\n";
             const char code2[] = "; extern unsigned int x ;";
             ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
     }
 
     void implicitIntUnsigned2() {
-        const char code[] = "i = (unsigned)j;";
+        const char code[] = "i = (unsigned)j;\n";
         const char expected[] = "i = ( unsigned int ) j ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
@@ -2987,13 +3253,13 @@ class TestTokenizer : public TestFixture {
     // simplify "unsigned" when using templates..
     void implicitIntUnsigned3() {
         {
-            const char code[] = "; foo<unsigned>();";
+            const char code[] = "; foo<unsigned>();\n";
             const char expected[] = "; foo < unsigned int > ( ) ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "; foo<unsigned int>();";
+            const char code[] = "; foo<unsigned int>();\n";
             const char expected[] = "; foo < unsigned int > ( ) ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
@@ -3002,160 +3268,160 @@ class TestTokenizer : public TestFixture {
     void simplifyStdType() { // #4947, #4950, #4951
         // unsigned long long
         {
-            const char code[] = "long long unsigned int x;";
+            const char code[] = "long long unsigned int x;\n";
             const char expected[] = "unsigned long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "long long int unsigned x;";
+            const char code[] = "long long int unsigned x;\n";
             const char expected[] = "unsigned long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "unsigned long long int x;";
+            const char code[] = "unsigned long long int x;\n";
             const char expected[] = "unsigned long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "unsigned int long long x;";
+            const char code[] = "unsigned int long long x;\n";
             const char expected[] = "unsigned long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "int unsigned long long x;";
+            const char code[] = "int unsigned long long x;\n";
             const char expected[] = "unsigned long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "int long long unsigned x;";
+            const char code[] = "int long long unsigned x;\n";
             const char expected[] = "unsigned long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         // signed long long
         {
-            const char code[] = "long long signed int x;";
+            const char code[] = "long long signed int x;\n";
             const char expected[] = "signed long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "long long int signed x;";
+            const char code[] = "long long int signed x;\n";
             const char expected[] = "signed long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "signed long long int x;";
+            const char code[] = "signed long long int x;\n";
             const char expected[] = "signed long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "signed int long long x;";
+            const char code[] = "signed int long long x;\n";
             const char expected[] = "signed long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "int signed long long x;";
+            const char code[] = "int signed long long x;\n";
             const char expected[] = "signed long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "int long long signed x;";
+            const char code[] = "int long long signed x;\n";
             const char expected[] = "signed long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         // unsigned short
         {
-            const char code[] = "short unsigned int x;";
+            const char code[] = "short unsigned int x;\n";
             const char expected[] = "unsigned short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "short int unsigned x;";
+            const char code[] = "short int unsigned x;\n";
             const char expected[] = "unsigned short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "unsigned short int x;";
+            const char code[] = "unsigned short int x;\n";
             const char expected[] = "unsigned short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "unsigned int short x;";
+            const char code[] = "unsigned int short x;\n";
             const char expected[] = "unsigned short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "int unsigned short x;";
+            const char code[] = "int unsigned short x;\n";
             const char expected[] = "unsigned short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "int short unsigned x;";
+            const char code[] = "int short unsigned x;\n";
             const char expected[] = "unsigned short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         // signed short
         {
-            const char code[] = "short signed int x;";
+            const char code[] = "short signed int x;\n";
             const char expected[] = "signed short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "short int signed x;";
+            const char code[] = "short int signed x;\n";
             const char expected[] = "signed short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "signed short int x;";
+            const char code[] = "signed short int x;\n";
             const char expected[] = "signed short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "signed int short x;";
+            const char code[] = "signed int short x;\n";
             const char expected[] = "signed short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "int signed short x;";
+            const char code[] = "int signed short x;\n";
             const char expected[] = "signed short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "int short signed x;";
+            const char code[] = "int short signed x;\n";
             const char expected[] = "signed short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "unsigned static short const int i;";
+            const char code[] = "unsigned static short const int i;\n";
             const char expected[] = "static const unsigned short i ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "float complex x;";
+            const char code[] = "float complex x;\n";
             const char expected[] = "float complex x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "float complex x;";
+            const char code[] = "float complex x;\n";
             const char expected[] = "_Complex float x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
         {
-            const char code[] = "complex float x;";
+            const char code[] = "complex float x;\n";
             const char expected[] = "_Complex float x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
         {
-            const char code[] = "complex long double x;";
+            const char code[] = "complex long double x;\n";
             const char expected[] = "_Complex long double x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
         {
-            const char code[] = "long double complex x;";
+            const char code[] = "long double complex x;\n";
             const char expected[] = "_Complex long double x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
         {
-            const char code[] = "double complex;";
+            const char code[] = "double complex;\n";
             const char expected[] = "double complex ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
@@ -3165,8 +3431,8 @@ class TestTokenizer : public TestFixture {
         {
             const char code[] = "class A{\n"
                                 " void f() {}\n"
-                                "};";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "};\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             // A body {}
@@ -3188,8 +3454,8 @@ class TestTokenizer : public TestFixture {
             const char code[] = "void f(){\n"
                                 " char a[10];\n"
                                 " char *b ; b = new char[a[0]];\n"
-                                "};";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "};\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             // a[10]
@@ -3210,8 +3476,8 @@ class TestTokenizer : public TestFixture {
         {
             const char code[] = "void f(){\n"
                                 " foo(g());\n"
-                                "};";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "};\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             // foo(
@@ -3228,8 +3494,8 @@ class TestTokenizer : public TestFixture {
         {
             const char code[] = "bool foo(C<z> a, bar<int, x<float>>& f, int b) {\n"
                                 "    return(a<b && b>f);\n"
-                                "}";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "}\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             // template<
@@ -3254,8 +3520,8 @@ class TestTokenizer : public TestFixture {
         {
             const char code[] = "void foo() {\n"
                                 "    return static_cast<bar>(a);\n"
-                                "}";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "}\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3269,8 +3535,8 @@ class TestTokenizer : public TestFixture {
         {
             const char code[] = "void foo() {\n"
                                 "    nvwa<(x > y)> ERROR_nnn;\n"
-                                "}";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "}\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3283,8 +3549,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // #4860
-            const char code[] = "class A : public B<int> {};";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "class A : public B<int> {};\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3297,8 +3563,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // #4860
-            const char code[] = "Bar<Typelist< int, Typelist< int, Typelist< int, FooNullType>>>>::set(1, 2, 3);";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "Bar<Typelist< int, Typelist< int, Typelist< int, FooNullType>>>>::set(1, 2, 3);\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3312,8 +3578,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // #5627
-            const char code[] = "new Foo<Bar>[10];";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "new Foo<Bar>[10];\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3326,8 +3592,8 @@ class TestTokenizer : public TestFixture {
         }
         {
             // #6242
-            const char code[] = "func = integral_<uchar, int, double>;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "func = integral_<uchar, int, double>;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3339,8 +3605,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // if (a < b || c > d) { }
-            const char code[] = "{ if (a < b || c > d); }";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "{ if (a < b || c > d); }\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3349,8 +3615,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // bool f = a < b || c > d
-            const char code[] = "bool f = a < b || c > d;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "bool f = a < b || c > d;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3359,8 +3625,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // template
-            const char code[] = "a < b || c > d;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "a < b || c > d;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3369,8 +3635,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // if (a < ... > d) { }
-            const char code[] = "{ if (a < b || c == 3 || d > e); }";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "{ if (a < b || c == 3 || d > e); }\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3379,8 +3645,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // template
-            const char code[] = "a<b==3 || c> d;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "a<b==3 || c> d;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(7));
@@ -3388,16 +3654,16 @@ class TestTokenizer : public TestFixture {
 
         {
             // template
-            const char code[] = "a<b || c==4> d;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "a<b || c==4> d;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(7));
         }
 
         {
-            const char code[] = "template < f = b || c > struct S;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "template < f = b || c > struct S;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(7));
@@ -3405,8 +3671,8 @@ class TestTokenizer : public TestFixture {
         }
 
         {
-            const char code[] = "struct A : B<c&&d> {};";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "struct A : B<c&&d> {};\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(4) == tok->tokAt(8));
@@ -3414,8 +3680,8 @@ class TestTokenizer : public TestFixture {
         }
 
         {
-            const char code[] = "Data<T&&>;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "Data<T&&>;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(4));
@@ -3424,8 +3690,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // #6601
-            const char code[] = "template<class R> struct FuncType<R(&)()> : FuncType<R()> { };";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "template<class R> struct FuncType<R(&)()> : FuncType<R()> { };\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3442,8 +3708,8 @@ class TestTokenizer : public TestFixture {
     void createLinks2() {
         {
             // #7158
-            const char code[] = "enum { value = boost::mpl::at_c<B, C> };";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "enum { value = boost::mpl::at_c<B, C> };\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = Token::findsimplematch(tokenizer.tokens(), "<");
             ASSERT_EQUALS(true, tok->link() == tok->tokAt(4));
@@ -3455,7 +3721,7 @@ class TestTokenizer : public TestFixture {
             const char code[] = "template <typename T, typename U>\n"
                                 "struct CheckedDivOp< T, U, typename std::enable_if<std::is_floating_point<T>::value || std::is_floating_point<U>::value>::type> {\n"
                                 "};\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "struct")->tokAt(2);
             const Token *tok2 = Token::findsimplematch(tokenizer.tokens(), "{")->previous();
@@ -3466,7 +3732,7 @@ class TestTokenizer : public TestFixture {
         {
             // #7975
             const char code[] = "template <class C> X<Y&&Z, C*> copy() {};\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "< Y");
             const Token *tok2 = Token::findsimplematch(tok1, "> copy");
@@ -3476,8 +3742,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // #8006
-            const char code[] = "C<int> && a = b;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "C<int> && a = b;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = tokenizer.tokens()->next();
             const Token *tok2 = tok1->tokAt(2);
@@ -3487,8 +3753,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // #8115
-            const char code[] = "void Test(C<int> && c);";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "void Test(C<int> && c);\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "<");
             const Token *tok2 = tok1->tokAt(2);
@@ -3498,25 +3764,25 @@ class TestTokenizer : public TestFixture {
         {
             // #8654
             const char code[] = "template<int N> struct A {}; "
-                                "template<int... Ns> struct foo : A<Ns>... {};";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "template<int... Ns> struct foo : A<Ns>... {};\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *A = Token::findsimplematch(tokenizer.tokens(), "A <");
             ASSERT_EQUALS(true, A->linkAt(1) == A->tokAt(3));
         }
         {
             // #8851
-            const char code[] = "template<typename std::enable_if<!(std::value1) && std::value2>::type>"
-                                "void basic_json() {}";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "template<typename std::enable_if<!(std::value1) && std::value2>::type>\n"
+                                "void basic_json() {}\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT_EQUALS(true, Token::simpleMatch(tokenizer.tokens()->linkAt(1), "> void"));
         }
 
         {
             // #9094 - template usage or comparison?
-            const char code[] = "a = f(x%x<--a==x>x);";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "a = f(x%x<--a==x>x);\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr == Token::findsimplematch(tokenizer.tokens(), "<")->link());
         }
@@ -3525,8 +3791,8 @@ class TestTokenizer : public TestFixture {
             // #11319
             const char code[] = "using std::same_as;\n"
                                 "template<same_as<int> T>\n"
-                                "void f();";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "void f();\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "template <");
             const Token *tok2 = Token ::findsimplematch(tokenizer.tokens(), "same_as <");
@@ -3536,8 +3802,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // #9131 - template usage or comparison?
-            const char code[] = "using std::list; list<t *> l;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "using std::list; list<t *> l;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "<")->link());
         }
@@ -3547,8 +3813,8 @@ class TestTokenizer : public TestFixture {
                                 "void foo()\n"
                                 "{\n"
                                 "    for (set<ParticleSource*>::iterator i = sources.begin(); i != sources.end(); ++i) {}\n"
-                                "}";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "}\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "<")->link());
         }
@@ -3559,7 +3825,7 @@ class TestTokenizer : public TestFixture {
                                 "  a<> b;\n"
                                 "  b.a<>::c();\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> ::")->link());
         }
@@ -3570,7 +3836,7 @@ class TestTokenizer : public TestFixture {
                                 "template <char... b> struct c {\n"
                                 "  void d() { a<b...>[0]; }\n"
                                 "};\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> [")->link());
         }
@@ -3582,7 +3848,7 @@ class TestTokenizer : public TestFixture {
                                 "template <typename e> using f = c<e() && sizeof(int), int>;\n"
                                 "template <typename e, typename = f<e>> struct g {};\n"
                                 "template <typename e> using baz = g<e>;\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> ;")->link());
         }
@@ -3596,7 +3862,7 @@ class TestTokenizer : public TestFixture {
                                 "template <int> using c = a;\n"
                                 "template <int d> c<d> e;\n"
                                 "auto f = -e<1> == 0;\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> ==")->link());
         }
@@ -3614,7 +3880,7 @@ class TestTokenizer : public TestFixture {
                                 "constexpr void b<a, d>::operator()(c &&) const {\n"
                                 "  i<3>.f([] {});\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> . f (")->link());
         }
@@ -3622,7 +3888,7 @@ class TestTokenizer : public TestFixture {
         {
             // #10491
             const char code[] = "template <template <class> class> struct a;\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< class");
             const Token* tok2 = Token::findsimplematch(tok1, "> class");
@@ -3633,7 +3899,7 @@ class TestTokenizer : public TestFixture {
         {
             // #10491
             const char code[] = "template <template <class> class> struct a;\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< template");
             const Token* tok2 = Token::findsimplematch(tok1, "> struct");
@@ -3644,7 +3910,7 @@ class TestTokenizer : public TestFixture {
         {
             // #10552
             const char code[] = "v.value<QPair<int, int>>()\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< QPair");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
@@ -3655,7 +3921,7 @@ class TestTokenizer : public TestFixture {
         {
             // #10552
             const char code[] = "v.value<QPair<int, int>>()\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< int");
             const Token* tok2 = Token::findsimplematch(tok1, "> > (");
@@ -3666,7 +3932,7 @@ class TestTokenizer : public TestFixture {
         {
             // #10615
             const char code[] = "struct A : public B<__is_constructible()>{};\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< >");
             const Token* tok2 = Token::findsimplematch(tok1, "> { } >");
@@ -3677,7 +3943,7 @@ class TestTokenizer : public TestFixture {
         {
             // #10664
             const char code[] = "class C1 : public T1<D2<C2>const> {};\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< C2");
             const Token* tok2 = Token::findsimplematch(tok1, "> const");
@@ -3692,7 +3958,7 @@ class TestTokenizer : public TestFixture {
                                 "void f() {\n"
                                 "    if (a<int>[0]) {}\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< int");
             const Token* tok2 = Token::findsimplematch(tok1, "> [");
@@ -3706,7 +3972,7 @@ class TestTokenizer : public TestFixture {
                                 "    int b[2] = {};\n"
                                 "    if (b[idx<1>]) {}\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< 1");
             const Token* tok2 = Token::findsimplematch(tok1, "> ]");
@@ -3718,7 +3984,7 @@ class TestTokenizer : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    []<typename T>() {};\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< T");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
@@ -3730,7 +3996,7 @@ class TestTokenizer : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    auto g = [] <typename A, typename B> (A a, B&& b) { return a < b; };\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< A");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
@@ -3744,7 +4010,7 @@ class TestTokenizer : public TestFixture {
                                 "        return [] <typename T> () {};\n"
                                 "    };\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< T");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
@@ -3761,7 +4027,7 @@ class TestTokenizer : public TestFixture {
                                 "    S s;\n"
                                 "    s.operator()<int, int>(1);\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< int");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
@@ -3777,7 +4043,7 @@ class TestTokenizer : public TestFixture {
                                 "        std::is_same<typename T::size_type, std::size_t>::value && std::is_same<typename T::size_type, std::size_t>::value\n"
                                 "        >();\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< bool");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
@@ -3789,17 +4055,58 @@ class TestTokenizer : public TestFixture {
             const char code[] = "double f() {\n"
                                 "    return std::is_same_v<int, double> ? 1e-7 : 1e-3;\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< int");
             const Token* tok2 = Token::findsimplematch(tok1, "> ?");
             ASSERT_EQUALS(true, tok1->link() == tok2);
             ASSERT_EQUALS(true, tok2->link() == tok1);
         }
+
+        {
+            const char code[] = "template <typename Fn, typename... Args>\n" // #14612
+                                "void f(Fn&& fn, Args&&... args) {\n"
+                                "    static_assert(std::is_invocable_v<Fn&&, Args&&...>);\n"
+                                "}\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
+            ASSERT(tokenizer.tokenize(code));
+            const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< Fn");
+            const Token* tok2 = Token::findsimplematch(tok1, "> )");
+            ASSERT_EQUALS(true, tok1->link() == tok2);
+            ASSERT_EQUALS(true, tok2->link() == tok1);
+        }
+
+        {
+            const char code[] = "template <typename Fn, typename... Args>\n" // #14615
+                                "void f(Fn&& fn, Args&&... args) {\n"
+                                "    constexpr bool b{ std::is_invocable_v<Fn&&, Args&&...> };\n"
+                                "}\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
+            ASSERT(tokenizer.tokenize(code));
+            const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< Fn");
+            const Token* tok2 = Token::findsimplematch(tok1, "> }");
+            ASSERT_EQUALS(true, tok1->link() == tok2);
+            ASSERT_EQUALS(true, tok2->link() == tok1);
+        }
+
+        {
+            const char code[] = "std::enable_if_t<0 || 1, void> f() {}\n" // #14982
+                                "std::enable_if_t<0 || 1, void> S::g() {}\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
+            ASSERT(tokenizer.tokenize(code));
+            const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< 0");
+            const Token* tok2 = Token::findsimplematch(tok1, "> f");
+            ASSERT_EQUALS(true, tok1->link() == tok2);
+            ASSERT_EQUALS(true, tok2->link() == tok1);
+            const Token* tok3 = Token::findsimplematch(tok2, "< 0");
+            const Token* tok4 = Token::findsimplematch(tok3, "> S");
+            ASSERT_EQUALS(true, tok3->link() == tok4);
+            ASSERT_EQUALS(true, tok4->link() == tok3);
+        }
     }
 
     void simplifyString() {
-        TokenList tokenlist{settings0, Standards::Language::CPP};
+        TokenList tokenlist{settingsDefault, Standards::Language::CPP};
         TokenizerTest tokenizer(std::move(tokenlist), *this);
         ASSERT_EQUALS("\"abc\"", tokenizer.simplifyString("\"abc\""));
         ASSERT_EQUALS("\"\n\"", tokenizer.simplifyString("\"\\xa\""));
@@ -3827,102 +4134,102 @@ class TestTokenizer : public TestFixture {
 
     void simplifyConst() {
         ASSERT_EQUALS("void foo ( ) { const int x ; }",
-                      tokenizeAndStringify("void foo(){ int const x;}"));
+                      tokenizeAndStringify("void foo(){ int const x;}\n"));
 
         ASSERT_EQUALS("void foo ( ) { { } const long x ; }",
-                      tokenizeAndStringify("void foo(){ {} long const x;}"));
+                      tokenizeAndStringify("void foo(){ {} long const x;}\n"));
 
         ASSERT_EQUALS("void foo ( int b , const unsigned int x ) { }",
-                      tokenizeAndStringify("void foo(int b,unsigned const x){}"));
+                      tokenizeAndStringify("void foo(int b,unsigned const x){}\n"));
 
         ASSERT_EQUALS("void foo ( ) { bar ( ) ; const char x ; }",
-                      tokenizeAndStringify("void foo(){ bar(); char const x;}"));
+                      tokenizeAndStringify("void foo(){ bar(); char const x;}\n"));
 
         ASSERT_EQUALS("void foo ( const char x ) { }",
-                      tokenizeAndStringify("void foo(char const x){}"));
+                      tokenizeAndStringify("void foo(char const x){}\n"));
 
         ASSERT_EQUALS("void foo ( int b , const char x ) { }",
-                      tokenizeAndStringify("void foo(int b,char const x){}"));
+                      tokenizeAndStringify("void foo(int b,char const x){}\n"));
 
         ASSERT_EQUALS("void foo ( ) { int * const x ; }",
-                      tokenizeAndStringify("void foo(){ int * const x;}"));
+                      tokenizeAndStringify("void foo(){ int * const x;}\n"));
 
-        ASSERT_EQUALS("const int foo ( ) ;", tokenizeAndStringify("int const foo ();"));
+        ASSERT_EQUALS("const int foo ( ) ;", tokenizeAndStringify("int const foo ();\n"));
 
-        ASSERT_EQUALS("const int x ;", tokenizeAndStringify("int const x;"));
-        ASSERT_EQUALS("const unsigned int x ;", tokenizeAndStringify("unsigned const x;"));
-        ASSERT_EQUALS("const struct X x ;", tokenizeAndStringify("struct X const x;"));
+        ASSERT_EQUALS("const int x ;", tokenizeAndStringify("int const x;\n"));
+        ASSERT_EQUALS("const unsigned int x ;", tokenizeAndStringify("unsigned const x;\n"));
+        ASSERT_EQUALS("const struct X x ;", tokenizeAndStringify("struct X const x;\n"));
     }
 
     void switchCase() {
         ASSERT_EQUALS("void foo ( int i ) { switch ( i ) { case -1 : ; break ; } }",
-                      tokenizeAndStringify("void foo (int i) { switch(i) { case -1: break; } }"));
+                      tokenizeAndStringify("void foo (int i) { switch(i) { case -1: break; } }\n"));
         //ticket #3227
         ASSERT_EQUALS("void foo ( int n ) { switch ( n ) { label : ; case 1 : ; label1 : ; label2 : ; break ; } }",
-                      tokenizeAndStringify("void foo(int n){ switch (n){ label: case 1: label1: label2: break; }}"));
+                      tokenizeAndStringify("void foo(int n){ switch (n){ label: case 1: label1: label2: break; }}\n"));
         //ticket #8345
         ASSERT_EQUALS("void foo ( ) { switch ( 0 ) { case 0 : ; default : ; } }",
-                      tokenizeAndStringify("void foo () { switch(0) case 0 : default : ; }"));
+                      tokenizeAndStringify("void foo () { switch(0) case 0 : default : ; }\n"));
         //ticket #8477
         ASSERT_EQUALS("void foo ( ) { enum Anonymous0 : int { Six = 6 } ; return Six ; }",
-                      tokenizeAndStringify("void foo () { enum : int { Six = 6 } ; return Six ; }"));
+                      tokenizeAndStringify("void foo () { enum : int { Six = 6 } ; return Six ; }\n"));
         // ticket #8281
-        ASSERT_NO_THROW(tokenizeAndStringify("void lzma_decode(int i) { "
-                                             "  bool state; "
-                                             "  switch (i) "
-                                             "  while (true) { "
-                                             "     state=false; "
-                                             "   case 1: "
-                                             "      ; "
-                                             "  }"
-                                             "}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void lzma_decode(int i) {\n"
+                                             "  bool state;\n"
+                                             "  switch (i)\n"
+                                             "  while (true) {\n"
+                                             "     state=false;\n"
+                                             "   case 1:\n"
+                                             "      ;\n"
+                                             "  }\n"
+                                             "}\n"));
         // ticket #8417
-        ASSERT_NO_THROW(tokenizeAndStringify("void printOwnedAttributes(int mode) { "
-                                             "  switch(mode) case 0: { break; } "
-                                             "}"));
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void printOwnedAttributes(int mode) { "
-                                                   "  switch(mode) case 0: { break; } case 1: ; "
-                                                   "}"),
+        ASSERT_NO_THROW(tokenizeAndStringify("void printOwnedAttributes(int mode) {\n"
+                                             "  switch(mode) case 0: { break; }\n"
+                                             "}\n"));
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void printOwnedAttributes(int mode) {\n"
+                                                   "  switch(mode) case 0: { break; } case 1: ;\n"
+                                                   "}\n"),
                               SYNTAX);
     }
 
     void simplifyPointerToStandardType() {
         // Pointer to standard type
         ASSERT_EQUALS("char buf [ 100 ] ; readlink ( path , buf , 99 ) ;",
-                      tokenizeAndStringify("char buf[100] ; readlink(path, &buf[0], 99);",
+                      tokenizeAndStringify("char buf[100] ; readlink(path, &buf[0], 99);\n",
                                            dinit(TokenizeOptions, $.cpp = false)));
         ASSERT_EQUALS("", errout_str());
 
         ASSERT_EQUALS("void foo ( char * c ) { if ( 1 == ( 1 & c [ 0 ] ) ) { } }",
-                      tokenizeAndStringify("void foo(char *c) { if (1==(1 & c[0])) {} }",
+                      tokenizeAndStringify("void foo(char *c) { if (1==(1 & c[0])) {} }\n",
                                            dinit(TokenizeOptions, $.cpp = false)));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         // Simplification of unknown type - C only
         ASSERT_EQUALS("foo data [ 100 ] ; something ( foo ) ;",
-                      tokenizeAndStringify("foo data[100]; something(&foo[0]);", dinit(TokenizeOptions, $.cpp = false)));
+                      tokenizeAndStringify("foo data[100]; something(&foo[0]);\n", dinit(TokenizeOptions, $.cpp = false)));
         ASSERT_EQUALS("", errout_str());
 
         // C++: No pointer simplification
         ASSERT_EQUALS("foo data [ 100 ] ; something ( & foo [ 0 ] ) ;",
-                      tokenizeAndStringify("foo data[100]; something(&foo[0]);"));
+                      tokenizeAndStringify("foo data[100]; something(&foo[0]);\n"));
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyFunctionPointers1() {
-        ASSERT_EQUALS("void ( * f ) ( ) ;", tokenizeAndStringify("void (*f)();"));
-        ASSERT_EQUALS("void * ( * f ) ( ) ;", tokenizeAndStringify("void *(*f)();"));
-        ASSERT_EQUALS("unsigned int ( * f ) ( ) ;", tokenizeAndStringify("unsigned int (*f)();"));
-        ASSERT_EQUALS("unsigned int * ( * f ) ( ) ;", tokenizeAndStringify("unsigned int * (*f)();"));
-        ASSERT_EQUALS("void ( * f [ 2 ] ) ( ) ;", tokenizeAndStringify("void (*f[2])();"));
-        ASSERT_EQUALS("void ( * f [ 2 ] ) ( void ) ;", tokenizeAndStringify("typedef void func_t(void); func_t *f[2];")); // #10581
+        ASSERT_EQUALS("void ( * f ) ( ) ;", tokenizeAndStringify("void (*f)();\n"));
+        ASSERT_EQUALS("void * ( * f ) ( ) ;", tokenizeAndStringify("void *(*f)();\n"));
+        ASSERT_EQUALS("unsigned int ( * f ) ( ) ;", tokenizeAndStringify("unsigned int (*f)();\n"));
+        ASSERT_EQUALS("unsigned int * ( * f ) ( ) ;", tokenizeAndStringify("unsigned int * (*f)();\n"));
+        ASSERT_EQUALS("void ( * f [ 2 ] ) ( ) ;", tokenizeAndStringify("void (*f[2])();\n"));
+        ASSERT_EQUALS("void ( * f [ 2 ] ) ( void ) ;", tokenizeAndStringify("typedef void func_t(void); func_t *f[2];\n")); // #10581
     }
 
     void simplifyFunctionPointers2() {
         const char code[] = "typedef void (* PF)();"
                             "void f1 ( ) { }"
                             "PF pf = &f1;"
-                            "PF pfs[] = { &f1, &f1 };";
+                            "PF pfs[] = { &f1, &f1 };\n";
         const char expected[] = "void f1 ( ) { } "
                                 "void ( * pf ) ( ) ; pf = & f1 ; "
                                 "void ( * pfs [ ] ) ( ) = { & f1 , & f1 } ;";
@@ -3933,7 +4240,7 @@ class TestTokenizer : public TestFixture {
         // Related with ticket #2873
         const char code[] = "void f() {\n"
                             "(void)(xy(*p)(0));"
-                            "\n}";
+                            "\n}\n";
         const char expected[] = "void f ( ) {\n"
                                 "( void ) ( xy ( * p ) ( 0 ) ) ;\n"
                                 "}";
@@ -3948,7 +4255,7 @@ class TestTokenizer : public TestFixture {
                             "{\n"
                             "    typedef void (*FP)();\n"
                             "    virtual FP getFP();\n"
-                            "};";
+                            "};\n";
         const char expected[] = "1: struct S\n"
                                 "2: {\n"
                                 "3:\n"
@@ -3958,67 +4265,67 @@ class TestTokenizer : public TestFixture {
     }
 
     void simplifyFunctionPointers5() {
-        const char code[] = ";void (*fp[])(int a) = {0,0,0};";
+        const char code[] = ";void (*fp[])(int a) = {0,0,0};\n";
         const char expected[] = "1: ; void ( * fp@1 [ ] ) ( int ) = { 0 , 0 , 0 } ;\n"; // TODO: Array dimension
         ASSERT_EQUALS(expected, tokenizeDebugListing(code));
     }
 
     void simplifyFunctionPointers6() {
-        const char code1[] = "void (*fp(void))(int) {}";
+        const char code1[] = "void (*fp(void))(int) {}\n";
         const char expected1[] = "1: void * fp ( ) { }\n";
         ASSERT_EQUALS(expected1, tokenizeDebugListing(code1));
 
-        const char code2[] = "std::string (*fp(void))(int);";
+        const char code2[] = "std::string (*fp(void))(int);\n";
         const char expected2[] = "1: std :: string * fp ( ) ;\n";
         ASSERT_EQUALS(expected2, tokenizeDebugListing(code2));
     }
 
     void simplifyFunctionPointers7() {
-        const char code1[] = "void (X::*y)();";
+        const char code1[] = "void (X::*y)();\n";
         const char expected1[] = "1: void ( * y@1 ) ( ) ;\n";
         ASSERT_EQUALS(expected1, tokenizeDebugListing(code1));
     }
 
     void simplifyFunctionPointers8() {
-        const char code1[] = "int (*f)() throw(int);";
+        const char code1[] = "int (*f)() throw(int);\n";
         const char expected1[] = "1: int ( * f@1 ) ( ) ;\n";
         ASSERT_EQUALS(expected1, tokenizeDebugListing(code1));
     }
 
     void simplifyFunctionPointers9() { // function call with function pointer
-        const char code1[] = "int f() { (*f)(); }";
+        const char code1[] = "int f() { (*f)(); }\n";
         const char expected1[] = "1: int f ( ) { ( * f ) ( ) ; }\n";
         ASSERT_EQUALS(expected1, tokenizeDebugListing(code1));
 
-        const char code2[] = "int f() { return (*f)(); }";
+        const char code2[] = "int f() { return (*f)(); }\n";
         const char expected2[] = "1: int f ( ) { return ( * f ) ( ) ; }\n";
         ASSERT_EQUALS(expected2, tokenizeDebugListing(code2));
 
-        const char code3[] = "int f() { throw (*f)(); }";
+        const char code3[] = "int f() { throw (*f)(); }\n";
         const char expected3[] = "1: int f ( ) { throw ( * f ) ( ) ; }\n";
         ASSERT_EQUALS(expected3, tokenizeDebugListing(code3));
     }
 
     void removedeclspec() {
-        ASSERT_EQUALS("a b", tokenizeAndStringify("a __declspec ( dllexport ) b"));
-        ASSERT_EQUALS("a b", tokenizeAndStringify("a _declspec ( dllexport ) b"));
-        ASSERT_EQUALS("int a ;", tokenizeAndStringify("__declspec(thread) __declspec(align(32)) int a;"));
-        ASSERT_EQUALS("int i ;", tokenizeAndStringify("__declspec(allocate(\"mycode\")) int i;"));
-        ASSERT_EQUALS("struct IUnknown ;", tokenizeAndStringify("struct __declspec(uuid(\"00000000-0000-0000-c000-000000000046\")) IUnknown;"));
-        ASSERT_EQUALS("__property int x [ ] ;", tokenizeAndStringify("__declspec(property(get=GetX, put=PutX)) int x[];"));
+        ASSERT_EQUALS("a b", tokenizeAndStringify("a __declspec ( dllexport ) b\n"));
+        ASSERT_EQUALS("a b", tokenizeAndStringify("a _declspec ( dllexport ) b\n"));
+        ASSERT_EQUALS("int a ;", tokenizeAndStringify("__declspec(thread) __declspec(align(32)) int a;\n"));
+        ASSERT_EQUALS("int i ;", tokenizeAndStringify("__declspec(allocate(\"mycode\")) int i;\n"));
+        ASSERT_EQUALS("struct IUnknown ;", tokenizeAndStringify("struct __declspec(uuid(\"00000000-0000-0000-c000-000000000046\")) IUnknown;\n"));
+        ASSERT_EQUALS("__property int x [ ] ;", tokenizeAndStringify("__declspec(property(get=GetX, put=PutX)) int x[];\n"));
     }
 
     void removeattribute() {
-        ASSERT_EQUALS("short array [ 3 ] ;", tokenizeAndStringify("short array[3] __attribute__ ((aligned));"));
-        ASSERT_EQUALS("int x [ 2 ] ;", tokenizeAndStringify("int x[2] __attribute__ ((packed));"));
-        ASSERT_EQUALS("int vecint ;", tokenizeAndStringify("int __attribute__((mode(SI))) __attribute__((vector_size (16))) vecint;"));
+        ASSERT_EQUALS("short array [ 3 ] ;", tokenizeAndStringify("short array[3] __attribute__ ((aligned));\n"));
+        ASSERT_EQUALS("int x [ 2 ] ;", tokenizeAndStringify("int x[2] __attribute__ ((packed));\n"));
+        ASSERT_EQUALS("int vecint ;", tokenizeAndStringify("int __attribute__((mode(SI))) __attribute__((vector_size (16))) vecint;\n"));
 
         // alternate spelling #5328
-        ASSERT_EQUALS("short array [ 3 ] ;", tokenizeAndStringify("short array[3] __attribute ((aligned));"));
-        ASSERT_EQUALS("int x [ 2 ] ;", tokenizeAndStringify("int x[2] __attribute ((packed));"));
-        ASSERT_EQUALS("int vecint ;", tokenizeAndStringify("int __attribute((mode(SI))) __attribute((vector_size (16))) vecint;"));
+        ASSERT_EQUALS("short array [ 3 ] ;", tokenizeAndStringify("short array[3] __attribute ((aligned));\n"));
+        ASSERT_EQUALS("int x [ 2 ] ;", tokenizeAndStringify("int x[2] __attribute ((packed));\n"));
+        ASSERT_EQUALS("int vecint ;", tokenizeAndStringify("int __attribute((mode(SI))) __attribute((vector_size (16))) vecint;\n"));
 
-        ASSERT_EQUALS("struct Payload_IR_config { uint8_t tap [ 16 ] ; } ;", tokenizeAndStringify("struct __attribute__((packed, gcc_struct)) Payload_IR_config { uint8_t tap[16]; };"));
+        ASSERT_EQUALS("struct Payload_IR_config { uint8_t tap [ 16 ] ; } ;", tokenizeAndStringify("struct __attribute__((packed, gcc_struct)) Payload_IR_config { uint8_t tap[16]; };\n"));
     }
 
     void functionAttributeBefore1() {
@@ -4027,11 +4334,11 @@ class TestTokenizer : public TestFixture {
                             "void __attribute__((nothrow)) __attribute__((pure)) __attribute__((const)) func3();\n"
                             "void __attribute__((__nothrow__)) __attribute__((__pure__)) __attribute__((__const__)) func4();\n"
                             "void __attribute__((noreturn)) func5();\n"
-                            "void __attribute__((__visibility__(\"default\"))) func6();";
+                            "void __attribute__((__visibility__(\"default\"))) func6();\n";
         const char expected[] = "void func1 ( ) ; void func2 ( ) ; void func3 ( ) ; void func4 ( ) ; void func5 ( ) ; void func6 ( ) ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
@@ -4053,11 +4360,11 @@ class TestTokenizer : public TestFixture {
     }
 
     void functionAttributeBefore2() {
-        const char code[] = "extern vas_f *VAS_Fail __attribute__((__noreturn__));";
+        const char code[] = "extern vas_f *VAS_Fail __attribute__((__noreturn__));\n";
         const char expected[] = "extern vas_f * VAS_Fail ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
 
@@ -4066,11 +4373,11 @@ class TestTokenizer : public TestFixture {
     }
 
     void functionAttributeBefore3() { // #10978
-        const char code[] = "void __attribute__((__noreturn__)) (*func_notret)(void);";
+        const char code[] = "void __attribute__((__noreturn__)) (*func_notret)(void);\n";
         const char expected[] = "void ( * func_notret ) ( void ) ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
 
@@ -4079,11 +4386,11 @@ class TestTokenizer : public TestFixture {
     }
 
     void functionAttributeBefore4() {
-        const char code[] = "__attribute__((const)) int& foo();";
+        const char code[] = "__attribute__((const)) int& foo();\n";
         const char expected[] = "int & foo ( ) ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
 
@@ -4096,7 +4403,7 @@ class TestTokenizer : public TestFixture {
         const char expected[] = "void func1 ( ) ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
@@ -4111,12 +4418,12 @@ class TestTokenizer : public TestFixture {
         const char code[] = "void func1() __attribute__((pure)) __attribute__((nothrow)) __attribute__((const));\n"
                             "void func2() __attribute__((__pure__)) __attribute__((__nothrow__)) __attribute__((__const__));\n"
                             "void func3() __attribute__((nothrow)) __attribute__((pure)) __attribute__((const));\n"
-                            "void func4() __attribute__((__nothrow__)) __attribute__((__pure__)) __attribute__((__const__));"
-                            "void func5() __attribute__((noreturn));";
+                            "void func4() __attribute__((__nothrow__)) __attribute__((__pure__)) __attribute__((__const__));\n"
+                            "void func5() __attribute__((noreturn));\n";
         const char expected[] = "void func1 ( ) ; void func2 ( ) ; void func3 ( ) ; void func4 ( ) ; void func5 ( ) ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
@@ -4139,11 +4446,11 @@ class TestTokenizer : public TestFixture {
         const char code[] = "class foo {\n"
                             "public:\n"
                             "    bool operator==(const foo &) __attribute__((__pure__));\n"
-                            "};";
+                            "};\n";
         const char expected[] = "class foo { public: bool operator== ( const foo & ) ; } ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
@@ -4161,12 +4468,12 @@ class TestTokenizer : public TestFixture {
                             "void __attribute__((noreturn,format(printf,1,2))) func5();\n"
                             "void __attribute__((__nothrow__)) __attribute__((__pure__,__const__)) func6();\n"
                             "void __attribute__((__nothrow__,__pure__)) __attribute__((__const__)) func7();\n"
-                            "void __attribute__((noreturn)) __attribute__(()) __attribute__((nothrow,pure,const)) func8();";
+                            "void __attribute__((noreturn)) __attribute__(()) __attribute__((nothrow,pure,const)) func8();\n";
         const char expected[] = "void func1 ( ) ; void func2 ( ) ; void func3 ( ) ; void func4 ( ) ; void func5 ( ) ; "
                                 "void func6 ( ) ; void func7 ( ) ; void func8 ( ) ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
@@ -4199,12 +4506,12 @@ class TestTokenizer : public TestFixture {
                             "void func5() __attribute__((noreturn,format(printf,1,2)));\n"
                             "void func6() __attribute__((__nothrow__)) __attribute__((__pure__,__const__));\n"
                             "void func7() __attribute__((__nothrow__,__pure__)) __attribute__((__const__));\n"
-                            "void func8() __attribute__((noreturn)) __attribute__(()) __attribute__((nothrow,pure,const));";
+                            "void func8() __attribute__((noreturn)) __attribute__(()) __attribute__((nothrow,pure,const));\n";
         const char expected[] = "void func1 ( ) ; void func2 ( ) ; void func3 ( ) ; void func4 ( ) ; void func5 ( ) ; "
                                 "void func6 ( ) ; void func7 ( ) ; void func8 ( ) ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
@@ -4235,7 +4542,7 @@ class TestTokenizer : public TestFixture {
         const char expected[] = "void func1 ( const char * format , ... ) ; void func2 ( ) ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
@@ -4249,10 +4556,10 @@ class TestTokenizer : public TestFixture {
     }
 
     void cppMaybeUnusedBefore() {
-        const char code[] = "[[maybe_unused]] int var {};";
+        const char code[] = "[[maybe_unused]] int var {};\n";
         const char expected[] = "int var { } ;";
 
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -4262,10 +4569,10 @@ class TestTokenizer : public TestFixture {
     }
 
     void cppMaybeUnusedAfter1() {
-        const char code[] = "int var [[maybe_unused]] {};";
+        const char code[] = "int var [[maybe_unused]] {};\n";
         const char expected[] = "int var { } ;";
 
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -4275,10 +4582,10 @@ class TestTokenizer : public TestFixture {
     }
 
     void cppMaybeUnusedAfter2() {
-        const char code[] = "std::string var [[maybe_unused]];";
+        const char code[] = "std::string var [[maybe_unused]];\n";
         const char expected[] = "std :: string var ;";
 
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -4287,11 +4594,24 @@ class TestTokenizer : public TestFixture {
         ASSERT(var && var->isAttributeMaybeUnused());
     }
 
+    void cppMaybeUnusedAfter3() {
+        const char code[] = "void foo(int x [[maybe_unused]]) {}\n";
+        const char expected[] = "void foo ( int x ) { }";
+
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
+
+        ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
+
+        const Token *x = Token::findsimplematch(tokenizer.tokens(), "x");
+        ASSERT(x && x->isAttributeMaybeUnused());
+    }
+
     void cppMaybeUnusedStructuredBinding() {
-        const char code[] = "[[maybe_unused]] auto [var1, var2] = f();";
+        const char code[] = "[[maybe_unused]] auto [var1, var2] = f();\n";
         const char expected[] = "auto [ var1 , var2 ] = f ( ) ;";
 
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -4302,10 +4622,54 @@ class TestTokenizer : public TestFixture {
         ASSERT(var2 && var2->isAttributeMaybeUnused());
     }
 
+    void attributeAlignasBefore() {
+        const char code[] = "alignas(long) unsigned char buffer[sizeof(long)];\n";
+        const char expected[] = "char buffer [ sizeof ( long ) ] ;";
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
+
+        ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
+
+        const Token *var = Token::findsimplematch(tokenizer.tokens(), "buffer");
+        ASSERT(var);
+        ASSERT(var->hasAttributeAlignas());
+        ASSERT(var->getAttributeAlignas().size() == 1);
+        ASSERT_EQUALS(var->getAttributeAlignas()[0], "long");
+    }
+
+    void attributeAlignasAfter() {
+        const char code[] = "unsigned char buffer[sizeof(long)] alignas(long);\n";
+        const char expected[] = "char buffer [ sizeof ( long ) ] ;";
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
+
+        ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
+
+        const Token *var = Token::findsimplematch(tokenizer.tokens(), "buffer");
+        ASSERT(var);
+        ASSERT(var->hasAttributeAlignas());
+        ASSERT(var->getAttributeAlignas().size() == 1);
+        ASSERT_EQUALS(var->getAttributeAlignas()[0], "long");
+    }
+
+    void simplifyAlignedStorage() {
+        const char code[] = "std::aligned_storage<sizeof(long), alignof(long)>::type buffer;\n";
+        const char expected[] = "std :: aligned_storage < sizeof ( long ) , alignof ( long ) > :: type buffer ;";
+
+        SimpleTokenizer tokenizer(settings2, *this);
+        ASSERT(tokenizer.tokenize(code));
+
+        ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
+
+        const Token *buffer = Token::findsimplematch(tokenizer.tokens(), "buffer");
+        ASSERT(buffer);
+        ASSERT(buffer->hasAttributeAlignas());
+        ASSERT_EQUALS("alignof ( long )", buffer->getAttributeAlignas()[0]);
+    }
 
     void splitTemplateRightAngleBrackets() {
         {
-            const char code[] = "; z = x < 0 ? x >> y : x >> y;";
+            const char code[] = "; z = x < 0 ? x >> y : x >> y;\n";
             ASSERT_EQUALS("; z = x < 0 ? x >> y : x >> y ;", tokenizeAndStringify(code));
         }
         {
@@ -4319,7 +4683,7 @@ class TestTokenizer : public TestFixture {
                                 "         FFABS ( sprite_offset [ 1 ] [ i ] ) >= INT_MAX >> shift_c ||\n"
                                 "         FFABS ( sprite_delta [ 0 ] [ i ] ) >= INT_MAX >> shift_y ||\n"
                                 "         FFABS ( sprite_delta [ 1 ] [ i ] ) >= INT_MAX >> shift_y ) ;\n"
-                                "}";
+                                "}\n";
             ASSERT_EQUALS(std::string::npos, tokenizeAndStringify(code).find("> >"));
             ASSERT_EQUALS(
                 "[test.cpp:2:24]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable sprite_shift [valueFlowBailoutIncompleteVar]\n",
@@ -4337,15 +4701,15 @@ class TestTokenizer : public TestFixture {
 
     void cpp03template1() {
         {
-            const char code[] = "template<typename> struct extent {};";
+            const char code[] = "template<typename> struct extent {};\n";
             ASSERT_EQUALS("template < typename > struct extent { } ;", tokenizeAndStringify(code));
         }
         {
-            const char code[] = "template<typename> struct extent;";
+            const char code[] = "template<typename> struct extent;\n";
             ASSERT_EQUALS("template < typename > struct extent ;", tokenizeAndStringify(code));
         }
         {
-            const char code[] = "template<typename, unsigned = 0> struct extent;";
+            const char code[] = "template<typename, unsigned = 0> struct extent;\n";
             ASSERT_EQUALS("template < typename , unsigned int = 0 > struct extent ;", tokenizeAndStringify(code));
         }
     }
@@ -4394,262 +4758,262 @@ class TestTokenizer : public TestFixture {
         ASSERT_NO_THROW(tokenizeAndStringify("class A; "
                                              "template <class T> class Disposer; "
                                              "template <typename T, class D = Disposer<T>> class Shim {}; "
-                                             "class B : public Shim<A> {};"));
+                                             "class B : public Shim<A> {};\n"));
         // #6354 (segmentation fault)
-        (void)tokenizeAndStringify("template <class ELFT> class ELFObjectImage {}; "
-                                   "ObjectImage *createObjectImage() { "
-                                   "  return new ELFObjectImage<ELFType<little>>(Obj); "
-                                   "} "
-                                   "void resolveX86_64Relocation() { "
-                                   "  reinterpret_cast<int>(0); "
-                                   "}");
+        (void)tokenizeAndStringify("template <class ELFT> class ELFObjectImage {};\n"
+                                   "ObjectImage *createObjectImage() {\n"
+                                   "  return new ELFObjectImage<ELFType<little>>(Obj);\n"
+                                   "}\n"
+                                   "void resolveX86_64Relocation() {\n"
+                                   "  reinterpret_cast<int>(0);\n"
+                                   "}\n");
         // #6414
-        ASSERT_NO_THROW(tokenizeAndStringify("template<typename value_type, typename function_type> "
-                                             "value_type Base(const value_type x, const value_type dx, function_type func, int type_deriv) { "
-                                             "   return 0.0; "
-                                             "}; "
-                                             "namespace { "
-                                             "  template<class DC> class C { "
-                                             "    void Fun(int G, const double x); "
-                                             "  }; "
-                                             "  template<class DC> void C<DC>::Fun(int G, const double x) {"
-                                             "    Base<double, CDFFunctor<DC>>(2, 2, f, 0); "
-                                             "  }; "
-                                             "  template<class DC> class C2 {}; "
-                                             "}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("template<typename value_type, typename function_type>\n"
+                                             "value_type Base(const value_type x, const value_type dx, function_type func, int type_deriv) {\n"
+                                             "   return 0.0;\n"
+                                             "};\n"
+                                             "namespace {\n"
+                                             "  template<class DC> class C {\n"
+                                             "    void Fun(int G, const double x);\n"
+                                             "  };\n"
+                                             "  template<class DC> void C<DC>::Fun(int G, const double x) {\n"
+                                             "    Base<double, CDFFunctor<DC>>(2, 2, f, 0);\n"
+                                             "  };\n"
+                                             "  template<class DC> class C2 {};\n"
+                                             "}\n"));
 
         ignore_errout();
     }
 
     void cpp0xtemplate5() { // #9154
         {
-            const char code[] = "struct s<x<u...>>;";
+            const char code[] = "struct s<x<u...>>;\n";
             ASSERT_EQUALS("struct s < x < u ... > > ;",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "template <class f> using c = e<i<q<f,r>,b...>>;";
+            const char code[] = "template <class f> using c = e<i<q<f,r>,b...>>;\n";
             ASSERT_EQUALS("template < class f > using c = e < i < q < f , r > , b ... > > ;",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "struct s<x<u...>> { };";
+            const char code[] = "struct s<x<u...>> { };\n";
             ASSERT_EQUALS("struct s < x < u ... > > { } ;",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "struct q : s<x<u...>> { };";
+            const char code[] = "struct q : s<x<u...>> { };\n";
             ASSERT_EQUALS("struct q : s < x < u ... > > { } ;",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "struct q : private s<x<u...>> { };";
+            const char code[] = "struct q : private s<x<u...>> { };\n";
             ASSERT_EQUALS("struct q : private s < x < u ... > > { } ;",
                           tokenizeAndStringify(code));
         }
     }
 
     void cpp14template() { // Ticket #6708
-        (void)tokenizeAndStringify("template <typename T> "
-                                   "decltype(auto) forward(T& t) { return 0; }");
-        ASSERT_EQUALS("[test.cpp:1:32]: (debug) auto token with no type. [autoNoType]\n", errout_str());
+        (void)tokenizeAndStringify("template <typename T>\n"
+                                   "decltype(auto) forward(T& t) { return 0; }\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (debug) auto token with no type. [autoNoType]\n", errout_str());
     }
 
     void arraySize() {
-        ASSERT_EQUALS("; int a [ 3 ] = { 1 , 2 , 3 } ;", tokenizeAndStringify(";int a[]={1,2,3};"));
-        ASSERT_EQUALS("; int a [ 3 ] = { 1 , 2 , 3 } ;", tokenizeAndStringify(";int a[]={1,2,3,};"));
-        ASSERT_EQUALS("; foo a [ 3 ] = { { 1 , 2 } , { 3 , 4 } , { 5 , 6 } } ;", tokenizeAndStringify(";foo a[]={{1,2},{3,4},{5,6}};"));
-        ASSERT_EQUALS("; int a [ 1 ] = { foo < bar1 , bar2 > ( 123 , 4 ) } ;", tokenizeAndStringify(";int a[]={foo<bar1,bar2>(123,4)};"));
-        ASSERT_EQUALS("; int a [ 2 ] = { b > c ? 1 : 2 , 3 } ;", tokenizeAndStringify(";int a[]={ b>c?1:2,3};"));
-        ASSERT_EQUALS("int main ( ) { int a [ 2 ] = { b < c ? 1 : 2 , 3 } }", tokenizeAndStringify("int main(){int a[]={b<c?1:2,3}}"));
+        ASSERT_EQUALS("; int a [ 3 ] = { 1 , 2 , 3 } ;", tokenizeAndStringify(";int a[]={1,2,3};\n"));
+        ASSERT_EQUALS("; int a [ 3 ] = { 1 , 2 , 3 } ;", tokenizeAndStringify(";int a[]={1,2,3,};\n"));
+        ASSERT_EQUALS("; foo a [ 3 ] = { { 1 , 2 } , { 3 , 4 } , { 5 , 6 } } ;", tokenizeAndStringify(";foo a[]={{1,2},{3,4},{5,6}};\n"));
+        ASSERT_EQUALS("; int a [ 1 ] = { foo < bar1 , bar2 > ( 123 , 4 ) } ;", tokenizeAndStringify(";int a[]={foo<bar1,bar2>(123,4)};\n"));
+        ASSERT_EQUALS("; int a [ 2 ] = { b > c ? 1 : 2 , 3 } ;", tokenizeAndStringify(";int a[]={ b>c?1:2,3};\n"));
+        ASSERT_EQUALS("int main ( ) { int a [ 2 ] = { b < c ? 1 : 2 , 3 } }", tokenizeAndStringify("int main(){int a[]={b<c?1:2,3}}\n"));
         ASSERT_EQUALS(
             "[test.cpp:1:21]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable b [valueFlowBailoutIncompleteVar]\n",
             errout_str());
-        ASSERT_EQUALS("; int a [ 3 ] = { ABC , 2 , 3 } ;", tokenizeAndStringify(";int a[]={ABC,2,3};"));
-        ASSERT_EQUALS("; int a [ 3 ] = { [ 2 ] = 5 } ;", tokenizeAndStringify(";int a[]={ [2] = 5 };"));
-        ASSERT_EQUALS("; int a [ 5 ] = { 1 , 2 , [ 2 ] = 5 , 3 , 4 } ;", tokenizeAndStringify(";int a[]={ 1, 2, [2] = 5, 3, 4 };"));
-        ASSERT_EQUALS("; int a [ ] = { 1 , 2 , [ x ] = 5 , 3 , 4 } ;", tokenizeAndStringify(";int a[]={ 1, 2, [x] = 5, 3, 4 };"));
-        ASSERT_EQUALS("; const char c [ 4 ] = \"abc\" ;", tokenizeAndStringify(";const char c[] = { \"abc\" };"));
+        ASSERT_EQUALS("; int a [ 3 ] = { ABC , 2 , 3 } ;", tokenizeAndStringify(";int a[]={ABC,2,3};\n"));
+        ASSERT_EQUALS("; int a [ 3 ] = { [ 2 ] = 5 } ;", tokenizeAndStringify(";int a[]={ [2] = 5 };\n"));
+        ASSERT_EQUALS("; int a [ 5 ] = { 1 , 2 , [ 2 ] = 5 , 3 , 4 } ;", tokenizeAndStringify(";int a[]={ 1, 2, [2] = 5, 3, 4 };\n"));
+        ASSERT_EQUALS("; int a [ ] = { 1 , 2 , [ x ] = 5 , 3 , 4 } ;", tokenizeAndStringify(";int a[]={ 1, 2, [x] = 5, 3, 4 };\n"));
+        ASSERT_EQUALS("; const char c [ 4 ] = \"abc\" ;", tokenizeAndStringify(";const char c[] = { \"abc\" };\n"));
     }
 
     void arraySizeAfterValueFlow() {
-        const char code[] = "enum {X=10}; int a[] = {[X]=1};";
+        const char code[] = "enum {X=10}; int a[] = {[X]=1};\n";
         ASSERT_EQUALS("enum Anonymous0 { X = 10 } ; int a [ 11 ] = { [ X ] = 1 } ;", tokenizeAndStringify(code));
     }
 
     void labels() {
-        ASSERT_EQUALS("void f ( ) { ab : ; a = 0 ; }", tokenizeAndStringify("void f() { ab: a=0; }"));
+        ASSERT_EQUALS("void f ( ) { ab : ; a = 0 ; }", tokenizeAndStringify("void f() { ab: a=0; }\n"));
         //ticket #3176
-        ASSERT_EQUALS("void f ( ) { ab : ; ( * func ) ( ) ; }", tokenizeAndStringify("void f() { ab: (*func)(); }"));
+        ASSERT_EQUALS("void f ( ) { ab : ; ( * func ) ( ) ; }", tokenizeAndStringify("void f() { ab: (*func)(); }\n"));
         //with '*' operator
-        ASSERT_EQUALS("void f ( ) { ab : ; * b = 0 ; }", tokenizeAndStringify("void f() { ab: *b=0; }"));
-        ASSERT_EQUALS("void f ( ) { ab : ; * * b = 0 ; }", tokenizeAndStringify("void f() { ab: **b=0; }"));
+        ASSERT_EQUALS("void f ( ) { ab : ; * b = 0 ; }", tokenizeAndStringify("void f() { ab: *b=0; }\n"));
+        ASSERT_EQUALS("void f ( ) { ab : ; * * b = 0 ; }", tokenizeAndStringify("void f() { ab: **b=0; }\n"));
         //with '&' operator
-        ASSERT_EQUALS("void f ( ) { ab : ; & b = 0 ; }", tokenizeAndStringify("void f() { ab: &b=0; }"));
-        ASSERT_EQUALS("void f ( ) { ab : ; & ( b . x ) = 0 ; }", tokenizeAndStringify("void f() { ab: &(b->x)=0; }"));
+        ASSERT_EQUALS("void f ( ) { ab : ; & b = 0 ; }", tokenizeAndStringify("void f() { ab: &b=0; }\n"));
+        ASSERT_EQUALS("void f ( ) { ab : ; & ( b . x ) = 0 ; }", tokenizeAndStringify("void f() { ab: &(b->x)=0; }\n"));
         //with '(' parentheses
-        ASSERT_EQUALS("void f ( ) { ab : ; * ( * b ) . x = 0 ; }", tokenizeAndStringify("void f() { ab: *(* b)->x=0; }"));
-        ASSERT_EQUALS("void f ( ) { ab : ; ( * * b ) . x = 0 ; }", tokenizeAndStringify("void f() { ab: (** b).x=0; }"));
-        ASSERT_EQUALS("void f ( ) { ab : ; & ( * b . x ) = 0 ; }", tokenizeAndStringify("void f() { ab: &(*b.x)=0; }"));
+        ASSERT_EQUALS("void f ( ) { ab : ; * ( * b ) . x = 0 ; }", tokenizeAndStringify("void f() { ab: *(* b)->x=0; }\n"));
+        ASSERT_EQUALS("void f ( ) { ab : ; ( * * b ) . x = 0 ; }", tokenizeAndStringify("void f() { ab: (** b).x=0; }\n"));
+        ASSERT_EQUALS("void f ( ) { ab : ; & ( * b . x ) = 0 ; }", tokenizeAndStringify("void f() { ab: &(*b.x)=0; }\n"));
         //with '{' parentheses
-        ASSERT_EQUALS("void f ( ) { ab : ; { b = 0 ; } }", tokenizeAndStringify("void f() { ab: {b=0;} }"));
-        ASSERT_EQUALS("void f ( ) { ab : ; { * b = 0 ; } }", tokenizeAndStringify("void f() { ab: { *b=0;} }"));
-        ASSERT_EQUALS("void f ( ) { ab : ; { & b = 0 ; } }", tokenizeAndStringify("void f() { ab: { &b=0;} }"));
-        ASSERT_EQUALS("void f ( ) { ab : ; { & ( * b . x ) = 0 ; } }", tokenizeAndStringify("void f() { ab: {&(*b.x)=0;} }"));
+        ASSERT_EQUALS("void f ( ) { ab : ; { b = 0 ; } }", tokenizeAndStringify("void f() { ab: {b=0;} }\n"));
+        ASSERT_EQUALS("void f ( ) { ab : ; { * b = 0 ; } }", tokenizeAndStringify("void f() { ab: { *b=0;} }\n"));
+        ASSERT_EQUALS("void f ( ) { ab : ; { & b = 0 ; } }", tokenizeAndStringify("void f() { ab: { &b=0;} }\n"));
+        ASSERT_EQUALS("void f ( ) { ab : ; { & ( * b . x ) = 0 ; } }", tokenizeAndStringify("void f() { ab: {&(*b.x)=0;} }\n"));
         //with unhandled MACRO() code
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { MACRO(ab: b=0;, foo)}"), UNKNOWN_MACRO);
-        ASSERT_EQUALS("void f ( ) { MACRO ( bar , ab : { & ( * b . x ) = 0 ; } ) }", tokenizeAndStringify("void f() { MACRO(bar, ab: {&(*b.x)=0;})}"));
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { MACRO(ab: b=0;, foo)}\n"), UNKNOWN_MACRO);
+        ASSERT_EQUALS("void f ( ) { MACRO ( bar , ab : { & ( * b . x ) = 0 ; } ) }", tokenizeAndStringify("void f() { MACRO(bar, ab: {&(*b.x)=0;})}\n"));
 
         ignore_errout();
     }
 
     void simplifyInitVar() {
         {
-            const char code[] = "int i ; int p(0);";
+            const char code[] = "int i ; int p(0);\n";
             ASSERT_EQUALS("int i ; int p ( 0 ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int i; int *p(0);";
+            const char code[] = "int i; int *p(0);\n";
             ASSERT_EQUALS("int i ; int * p ( 0 ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int p(0);";
+            const char code[] = "int p(0);\n";
             ASSERT_EQUALS("int p ( 0 ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int *p(0);";
+            const char code[] = "int *p(0);\n";
             ASSERT_EQUALS("int * p ( 0 ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int i ; int p(i);";
+            const char code[] = "int i ; int p(i);\n";
             ASSERT_EQUALS("int i ; int p ( i ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int i; int *p(&i);";
+            const char code[] = "int i; int *p(&i);\n";
             ASSERT_EQUALS("int i ; int * p ( & i ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int i; void *p(&i);";
+            const char code[] = "int i; void *p(&i);\n";
             ASSERT_EQUALS("int i ; void * p ( & i ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "struct S { }; struct S s; struct S *p(&s);";
+            const char code[] = "struct S { }; struct S s; struct S *p(&s);\n";
             ASSERT_EQUALS("struct S { } ; struct S s ; struct S * p ( & s ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "struct S { }; S s; S *p(&s);";
+            const char code[] = "struct S { }; S s; S *p(&s);\n";
             ASSERT_EQUALS("struct S { } ; S s ; S * p ( & s ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "union S { int i; float f; }; union S s; union S *p(&s);";
+            const char code[] = "union S { int i; float f; }; union S s; union S *p(&s);\n";
             ASSERT_EQUALS("union S { int i ; float f ; } ; union S s ; union S * p ( & s ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "union S { int i; float f; }; S s; S *p(&s);";
+            const char code[] = "union S { int i; float f; }; S s; S *p(&s);\n";
             ASSERT_EQUALS("union S { int i ; float f ; } ; S s ; S * p ( & s ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "class C { }; class C c; class C *p(&c);";
+            const char code[] = "class C { }; class C c; class C *p(&c);\n";
             ASSERT_EQUALS("class C { } ; class C c ; class C * p ( & c ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "class C { }; C c; C *p(&c);";
+            const char code[] = "class C { }; C c; C *p(&c);\n";
             ASSERT_EQUALS("class C { } ; C c ; C * p ( & c ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "struct S { }; struct S s; struct S s1(s);";
+            const char code[] = "struct S { }; struct S s; struct S s1(s);\n";
             ASSERT_EQUALS("struct S { } ; struct S s ; struct S s1 ( s ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "struct S { }; S s; S s1(s);";
+            const char code[] = "struct S { }; S s; S s1(s);\n";
             ASSERT_EQUALS("struct S { } ; S s ; S s1 ( s ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "struct S { }; struct S s; struct S s1(&s);";
+            const char code[] = "struct S { }; struct S s; struct S s1(&s);\n";
             ASSERT_EQUALS("struct S { } ; struct S s ; struct S s1 ( & s ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "struct S { }; S s; S s1(&s);";
+            const char code[] = "struct S { }; S s; S s1(&s);\n";
             ASSERT_EQUALS("struct S { } ; S s ; S s1 ( & s ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "class S { int function(); };";
+            const char code[] = "class S { int function(); };\n";
             ASSERT_EQUALS("class S { int function ( ) ; } ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "class S { int function(void); };";
+            const char code[] = "class S { int function(void); };\n";
             ASSERT_EQUALS("class S { int function ( ) ; } ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "class S { int function(int); };";
+            const char code[] = "class S { int function(int); };\n";
             ASSERT_EQUALS("class S { int function ( int ) ; } ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int function(void);";
+            const char code[] = "int function(void);\n";
             ASSERT_EQUALS("int function ( ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int function(int);";
+            const char code[] = "int function(int);\n";
             ASSERT_EQUALS("int function ( int ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "extern int function(void);";
+            const char code[] = "extern int function(void);\n";
             ASSERT_EQUALS("extern int function ( ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int function1(void); int function2(void);";
+            const char code[] = "int function1(void); int function2(void);\n";
             ASSERT_EQUALS("int function1 ( ) ; int function2 ( ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int function(A);";
+            const char code[] = "int function(A);\n";
             // We can't tell if this a function prototype or a variable without knowing
             // what A is. Since A is undefined, just leave it alone.
             ASSERT_EQUALS("int function ( A ) ;", tokenizeAndStringify(code));
@@ -4657,39 +5021,39 @@ class TestTokenizer : public TestFixture {
         }
 
         {
-            const char code[] = "int i; int function(A);";
+            const char code[] = "int i; int function(A);\n";
             ASSERT_EQUALS("int i ; int function ( A ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "class A { } ; int foo(A);";
+            const char code[] = "class A { } ; int foo(A);\n";
             ASSERT_EQUALS("class A { } ; int foo ( A ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "class A { } ; A a; int foo(a);";
+            const char code[] = "class A { } ; A a; int foo(a);\n";
             ASSERT_EQUALS("class A { } ; A a ; int foo ( a ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int x(f());";
+            const char code[] = "int x(f());\n";
             ASSERT_EQUALS("int x ( f ( ) ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "{ return doSomething(X), 0; }";
+            const char code[] = "{ return doSomething(X), 0; }\n";
             ASSERT_EQUALS("{ return doSomething ( X ) , 0 ; }", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
             // 13893
-            const char code[] = "namespace test { bool foo; }";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "namespace test { bool foo; }\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(!tokenizer.tokens()->tokAt(2)->isInitBracket());
         }
@@ -4699,7 +5063,7 @@ class TestTokenizer : public TestFixture {
         // ticket #5131 - unsigned
         const char code[] = "void f() {\n"
                             "    unsigned int a(0),b(0);\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("void f ( ) {\n"
                       "unsigned int a ( 0 ) ; unsigned int b ( 0 ) ;\n"
                       "}", tokenizeAndStringify(code));
@@ -4708,7 +5072,7 @@ class TestTokenizer : public TestFixture {
     void simplifyInitVar3() {
         const char code[] = "void f() {\n"
                             "    int *a(0),b(0);\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("void f ( ) {\n"
                       "int * a ( 0 ) ; int b ( 0 ) ;\n"
                       "}", tokenizeAndStringify(code));
@@ -4717,203 +5081,203 @@ class TestTokenizer : public TestFixture {
     void simplifyInitVar4() {
         const char code[] = "void f() {\n"
                             "    uint32_t x{0};\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("void f ( ) {\n"
                       "uint32_t x { 0 } ;\n"
                       "}", tokenizeAndStringify(code));
     }
 
     void simplifyInitVar5() { // #14218
-        const char code[] = "int c[1]{}, b;";
+        const char code[] = "int c[1]{}, b;\n";
         ASSERT_EQUALS("int c [ 1 ] { } ; int b ;", tokenizeAndStringify(code));
     }
 
     void bitfields1() {
-        const char code1[] = "struct A { bool x : 1; };";
+        const char code1[] = "struct A { bool x : 1; };\n";
         ASSERT_EQUALS("struct A { bool x ; } ;", tokenizeAndStringify(code1));
 
-        const char code2[] = "struct A { char x : 3; };";
+        const char code2[] = "struct A { char x : 3; };\n";
         ASSERT_EQUALS("struct A { char x ; } ;", tokenizeAndStringify(code2));
 
-        const char code3[] = "struct A { short x : 3; };";
+        const char code3[] = "struct A { short x : 3; };\n";
         ASSERT_EQUALS("struct A { short x ; } ;", tokenizeAndStringify(code3));
 
-        const char code4[] = "struct A { int x : 3; };";
+        const char code4[] = "struct A { int x : 3; };\n";
         ASSERT_EQUALS("struct A { int x ; } ;", tokenizeAndStringify(code4));
 
-        const char code5[] = "struct A { long x : 3; };";
+        const char code5[] = "struct A { long x : 3; };\n";
         ASSERT_EQUALS("struct A { long x ; } ;", tokenizeAndStringify(code5));
 
-        const char code6[] = "struct A { __int8 x : 3; };";
-        ASSERT_EQUALS("struct A { char x ; } ;", tokenizeAndStringifyWindows(code6, Platform::Type::Win32A));
+        const char code6[] = "struct A { __int8 x : 3; };\n";
+        ASSERT_EQUALS("struct A { char x ; } ;", tokenizeAndStringify(code6, settings_win32a));
 
-        const char code7[] = "struct A { __int16 x : 3; };";
-        ASSERT_EQUALS("struct A { short x ; } ;", tokenizeAndStringifyWindows(code7, Platform::Type::Win32A));
+        const char code7[] = "struct A { __int16 x : 3; };\n";
+        ASSERT_EQUALS("struct A { short x ; } ;", tokenizeAndStringify(code7,settings_win32a));
 
-        const char code8[] = "struct A { __int32 x : 3; };";
-        ASSERT_EQUALS("struct A { int x ; } ;", tokenizeAndStringifyWindows(code8, Platform::Type::Win32A));
+        const char code8[] = "struct A { __int32 x : 3; };\n";
+        ASSERT_EQUALS("struct A { int x ; } ;", tokenizeAndStringify(code8, settings_win32a));
 
-        const char code9[] = "struct A { __int64 x : 3; };";
-        ASSERT_EQUALS("struct A { long long x ; } ;", tokenizeAndStringifyWindows(code9, Platform::Type::Win32A));
+        const char code9[] = "struct A { __int64 x : 3; };\n";
+        ASSERT_EQUALS("struct A { long long x ; } ;", tokenizeAndStringify(code9, settings_win32a));
 
-        const char code10[] = "struct A { unsigned char x : 3; };";
+        const char code10[] = "struct A { unsigned char x : 3; };\n";
         ASSERT_EQUALS("struct A { unsigned char x ; } ;", tokenizeAndStringify(code10));
 
-        const char code11[] = "struct A { unsigned short x : 3; };";
+        const char code11[] = "struct A { unsigned short x : 3; };\n";
         ASSERT_EQUALS("struct A { unsigned short x ; } ;", tokenizeAndStringify(code11));
 
-        const char code12[] = "struct A { unsigned int x : 3; };";
+        const char code12[] = "struct A { unsigned int x : 3; };\n";
         ASSERT_EQUALS("struct A { unsigned int x ; } ;", tokenizeAndStringify(code12));
 
-        const char code13[] = "struct A { unsigned long x : 3; };";
+        const char code13[] = "struct A { unsigned long x : 3; };\n";
         ASSERT_EQUALS("struct A { unsigned long x ; } ;", tokenizeAndStringify(code13));
 
-        const char code14[] = "struct A { unsigned __int8 x : 3; };";
-        ASSERT_EQUALS("struct A { unsigned char x ; } ;", tokenizeAndStringifyWindows(code14, Platform::Type::Win32A));
+        const char code14[] = "struct A { unsigned __int8 x : 3; };\n";
+        ASSERT_EQUALS("struct A { unsigned char x ; } ;", tokenizeAndStringify(code14, settings_win32a));
 
-        const char code15[] = "struct A { unsigned __int16 x : 3; };";
-        ASSERT_EQUALS("struct A { unsigned short x ; } ;", tokenizeAndStringifyWindows(code15, Platform::Type::Win32A));
+        const char code15[] = "struct A { unsigned __int16 x : 3; };\n";
+        ASSERT_EQUALS("struct A { unsigned short x ; } ;", tokenizeAndStringify(code15, settings_win32a));
 
-        const char code16[] = "struct A { unsigned __int32 x : 3; };";
-        ASSERT_EQUALS("struct A { unsigned int x ; } ;", tokenizeAndStringifyWindows(code16, Platform::Type::Win32A));
+        const char code16[] = "struct A { unsigned __int32 x : 3; };\n";
+        ASSERT_EQUALS("struct A { unsigned int x ; } ;", tokenizeAndStringify(code16, settings_win32a));
 
-        const char code17[] = "struct A { unsigned __int64 x : 3; };";
-        ASSERT_EQUALS("struct A { unsigned long long x ; } ;", tokenizeAndStringifyWindows(code17, Platform::Type::Win32A));
+        const char code17[] = "struct A { unsigned __int64 x : 3; };\n";
+        ASSERT_EQUALS("struct A { unsigned long long x ; } ;", tokenizeAndStringify(code17, settings_win32a));
 
-        const char code18[] = "struct A { signed char x : 3; };";
+        const char code18[] = "struct A { signed char x : 3; };\n";
         ASSERT_EQUALS("struct A { signed char x ; } ;", tokenizeAndStringify(code18));
 
-        const char code19[] = "struct A { signed short x : 3; };";
+        const char code19[] = "struct A { signed short x : 3; };\n";
         ASSERT_EQUALS("struct A { signed short x ; } ;", tokenizeAndStringify(code19));
 
-        const char code20[] = "struct A { signed int x : 3; };";
+        const char code20[] = "struct A { signed int x : 3; };\n";
         ASSERT_EQUALS("struct A { signed int x ; } ;", tokenizeAndStringify(code20));
 
-        const char code21[] = "struct A { signed long x : 3; };";
-        ASSERT_EQUALS("struct A { signed long x ; } ;", tokenizeAndStringifyWindows(code21));
+        const char code21[] = "struct A { signed long x : 3; };\n";
+        ASSERT_EQUALS("struct A { signed long x ; } ;", tokenizeAndStringify(code21, settings_windows));
 
-        const char code22[] = "struct A { signed __int8 x : 3; };";
-        ASSERT_EQUALS("struct A { signed char x ; } ;", tokenizeAndStringifyWindows(code22, Platform::Type::Win32A));
+        const char code22[] = "struct A { signed __int8 x : 3; };\n";
+        ASSERT_EQUALS("struct A { signed char x ; } ;", tokenizeAndStringify(code22, settings_win32a));
 
-        const char code23[] = "struct A { signed __int16 x : 3; };";
-        ASSERT_EQUALS("struct A { signed short x ; } ;", tokenizeAndStringifyWindows(code23, Platform::Type::Win32A));
+        const char code23[] = "struct A { signed __int16 x : 3; };\n";
+        ASSERT_EQUALS("struct A { signed short x ; } ;", tokenizeAndStringify(code23, settings_win32a));
 
-        const char code24[] = "struct A { signed __int32 x : 3; };";
-        ASSERT_EQUALS("struct A { signed int x ; } ;", tokenizeAndStringifyWindows(code24, Platform::Type::Win32A));
+        const char code24[] = "struct A { signed __int32 x : 3; };\n";
+        ASSERT_EQUALS("struct A { signed int x ; } ;", tokenizeAndStringify(code24, settings_win32a));
 
-        const char code25[] = "struct A { signed __int64 x : 3; };";
-        ASSERT_EQUALS("struct A { signed long long x ; } ;", tokenizeAndStringifyWindows(code25, Platform::Type::Win32A));
+        const char code25[] = "struct A { signed __int64 x : 3; };\n";
+        ASSERT_EQUALS("struct A { signed long long x ; } ;", tokenizeAndStringify(code25, settings_win32a));
     }
 
     void bitfields2() {
-        const char code1[] = "struct A { public: int x : 3; };";
+        const char code1[] = "struct A { public: int x : 3; };\n";
         ASSERT_EQUALS("struct A { public: int x ; } ;", tokenizeAndStringify(code1));
 
-        const char code2[] = "struct A { public: unsigned long x : 3; };";
+        const char code2[] = "struct A { public: unsigned long x : 3; };\n";
         ASSERT_EQUALS("struct A { public: unsigned long x ; } ;", tokenizeAndStringify(code2));
 
-        const char code3[] = "struct A { protected: int x : 3; };";
+        const char code3[] = "struct A { protected: int x : 3; };\n";
         ASSERT_EQUALS("struct A { protected: int x ; } ;", tokenizeAndStringify(code3));
 
-        const char code4[] = "struct A { protected: unsigned long x : 3; };";
+        const char code4[] = "struct A { protected: unsigned long x : 3; };\n";
         ASSERT_EQUALS("struct A { protected: unsigned long x ; } ;", tokenizeAndStringify(code4));
 
-        const char code5[] = "struct A { private: int x : 3; };";
+        const char code5[] = "struct A { private: int x : 3; };\n";
         ASSERT_EQUALS("struct A { private: int x ; } ;", tokenizeAndStringify(code5));
 
-        const char code6[] = "struct A { private: unsigned long x : 3; };";
+        const char code6[] = "struct A { private: unsigned long x : 3; };\n";
         ASSERT_EQUALS("struct A { private: unsigned long x ; } ;", tokenizeAndStringify(code6));
     }
 
     void bitfields3() {
-        const char code1[] = "struct A { const int x : 3; };";
+        const char code1[] = "struct A { const int x : 3; };\n";
         ASSERT_EQUALS("struct A { const int x ; } ;", tokenizeAndStringify(code1));
 
-        const char code2[] = "struct A { const unsigned long x : 3; };";
+        const char code2[] = "struct A { const unsigned long x : 3; };\n";
         ASSERT_EQUALS("struct A { const unsigned long x ; } ;", tokenizeAndStringify(code2));
 
-        const char code3[] = "struct A { public: const int x : 3; };";
+        const char code3[] = "struct A { public: const int x : 3; };\n";
         ASSERT_EQUALS("struct A { public: const int x ; } ;", tokenizeAndStringify(code3));
 
-        const char code4[] = "struct A { public: const unsigned long x : 3; };";
+        const char code4[] = "struct A { public: const unsigned long x : 3; };\n";
         ASSERT_EQUALS("struct A { public: const unsigned long x ; } ;", tokenizeAndStringify(code4));
     }
 
     void bitfields4() { // ticket #1956
-        const char code1[] = "struct A { CHAR x : 3; };";
+        const char code1[] = "struct A { CHAR x : 3; };\n";
         ASSERT_EQUALS("struct A { CHAR x ; } ;", tokenizeAndStringify(code1));
 
-        const char code2[] = "struct A { UCHAR x : 3; };";
+        const char code2[] = "struct A { UCHAR x : 3; };\n";
         ASSERT_EQUALS("struct A { UCHAR x ; } ;", tokenizeAndStringify(code2));
 
-        const char code3[] = "struct A { BYTE x : 3; };";
+        const char code3[] = "struct A { BYTE x : 3; };\n";
         ASSERT_EQUALS("struct A { BYTE x ; } ;", tokenizeAndStringify(code3));
 
-        const char code4[] = "struct A { WORD x : 3; };";
+        const char code4[] = "struct A { WORD x : 3; };\n";
         ASSERT_EQUALS("struct A { WORD x ; } ;", tokenizeAndStringify(code4));
 
-        const char code5[] = "struct A { DWORD x : 3; };";
+        const char code5[] = "struct A { DWORD x : 3; };\n";
         ASSERT_EQUALS("struct A { DWORD x ; } ;", tokenizeAndStringify(code5));
 
-        const char code6[] = "struct A { LONG x : 3; };";
+        const char code6[] = "struct A { LONG x : 3; };\n";
         ASSERT_EQUALS("struct A { LONG x ; } ;", tokenizeAndStringify(code6));
 
-        const char code7[] = "struct A { UINT8 x : 3; };";
+        const char code7[] = "struct A { UINT8 x : 3; };\n";
         ASSERT_EQUALS("struct A { UINT8 x ; } ;", tokenizeAndStringify(code7));
 
-        const char code8[] = "struct A { UINT16 x : 3; };";
+        const char code8[] = "struct A { UINT16 x : 3; };\n";
         ASSERT_EQUALS("struct A { UINT16 x ; } ;", tokenizeAndStringify(code8));
 
-        const char code9[] = "struct A { UINT32 x : 3; };";
+        const char code9[] = "struct A { UINT32 x : 3; };\n";
         ASSERT_EQUALS("struct A { UINT32 x ; } ;", tokenizeAndStringify(code9));
 
-        const char code10[] = "struct A { UINT64 x : 3; };";
+        const char code10[] = "struct A { UINT64 x : 3; };\n";
         ASSERT_EQUALS("struct A { UINT64 x ; } ;", tokenizeAndStringify(code10));
     }
 
     void bitfields5() { // ticket #1956
-        const char code1[] = "struct RGB { unsigned int r : 3, g : 3, b : 2; };";
+        const char code1[] = "struct RGB { unsigned int r : 3, g : 3, b : 2; };\n";
         ASSERT_EQUALS("struct RGB { unsigned int r ; unsigned int g ; unsigned int b ; } ;", tokenizeAndStringify(code1));
 
-        const char code2[] = "struct A { int a : 3; int : 3; int c : 3; };";
+        const char code2[] = "struct A { int a : 3; int : 3; int c : 3; };\n";
         ASSERT_EQUALS("struct A { int a ; int anonymous@0 ; int c ; } ;", tokenizeAndStringify(code2));
 
-        const char code3[] = "struct A { virtual void f() {} int f1 : 1; };";
+        const char code3[] = "struct A { virtual void f() {} int f1 : 1; };\n";
         ASSERT_EQUALS("struct A { virtual void f ( ) { } int f1 ; } ;", tokenizeAndStringify(code3));
     }
 
     void bitfields6() { // ticket #2595
-        const char code1[] = "struct A { bool b : true; };";
+        const char code1[] = "struct A { bool b : true; };\n";
         ASSERT_EQUALS("struct A { bool b ; } ;", tokenizeAndStringify(code1));
 
-        const char code2[] = "struct A { bool b : true, c : true; };";
+        const char code2[] = "struct A { bool b : true, c : true; };\n";
         ASSERT_EQUALS("struct A { bool b ; bool c ; } ;", tokenizeAndStringify(code2));
 
-        const char code3[] = "struct A { bool : true; };";
+        const char code3[] = "struct A { bool : true; };\n";
         ASSERT_EQUALS("struct A { bool anonymous@0 ; } ;", tokenizeAndStringify(code3));
     }
 
     void bitfields7() { // ticket #1987
-        const char code[] = "typedef struct Descriptor {"
-                            "    unsigned element_size: 8* sizeof( unsigned );"
-                            "} Descriptor;";
-        const char expected[] = "struct Descriptor { "
-                                "unsigned int element_size ; "
+        const char code[] = "typedef struct Descriptor {\n"
+                            "    unsigned element_size: 8* sizeof( unsigned );\n"
+                            "} Descriptor;\n";
+        const char expected[] = "struct Descriptor {\n"
+                                "unsigned int element_size ;\n"
                                 "} ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS("", errout_str());
     }
 
     void bitfields8() {
-        const char code[] = "struct A;"
-                            "class B : virtual public C"
-                            "{"
-                            "    int f();"
-                            "};";
-        const char expected[] = "struct A ; "
-                                "class B : virtual public C "
-                                "{ "
-                                "int f ( ) ; "
+        const char code[] = "struct A;\n"
+                            "class B : virtual public C\n"
+                            "{\n"
+                            "    int f();\n"
+                            "};\n";
+        const char expected[] = "struct A ;\n"
+                                "class B : virtual public C\n"
+                                "{\n"
+                                "int f ( ) ;\n"
                                 "} ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS("", errout_str());
@@ -4926,17 +5290,21 @@ class TestTokenizer : public TestFixture {
                             "    {\n"
                             "        ;\n"
                             "    }\n"
-                            "};";
+                            "};\n";
         (void)tokenizeAndStringify(code);
         ASSERT_EQUALS("", errout_str());
     }
 
     void bitfields10() { // ticket #2737
-        const char code[] = "{}"
-                            "MACRO "
-                            "default: { }"
-                            ";";
-        ASSERT_EQUALS("{ } MACRO default : { } ;", tokenizeAndStringify(code));
+        const char code[] = "{}\n"
+                            "MACRO\n"
+                            "default: { }\n"
+                            ";\n";
+        const char expected[] = "{ }\n"
+                                "MACRO\n"
+                                "default : { }\n"
+                                ";";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void bitfields12() { // ticket #3485 (segmentation fault)
@@ -4954,13 +5322,13 @@ class TestTokenizer : public TestFixture {
                       "} ;",
                       tokenizeAndStringify("struct AB {\n"
                                            "  enum Foo {A,B} : 4;\n"
-                                           "};"));
+                                           "};\n"));
         ASSERT_EQUALS("struct AB {\n"
                       "enum Foo { A , B } ; enum Foo foo ;\n"
                       "} ;",
                       tokenizeAndStringify("struct AB {\n"
                                            "  enum Foo {A,B} foo : 4;\n"
-                                           "};"));
+                                           "};\n"));
 
         ASSERT_EQUALS("struct S {\n" // #14324
                       "enum E : int { E0 , E1 } ; enum E e ;\n"
@@ -4978,9 +5346,9 @@ class TestTokenizer : public TestFixture {
     }
 
     void bitfields16() {
-        const char code[] = "struct A { unsigned int x : 1; };";
+        const char code[] = "struct A { unsigned int x : 1; };\n";
 
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
         const Token *x = Token::findsimplematch(tokenizer.tokens(), "x");
         ASSERT_EQUALS(1, x->bits());
@@ -5013,24 +5381,24 @@ class TestTokenizer : public TestFixture {
     }
 
     void bitfields18() {
-        const char code[] = "struct S { unsigned int a : 100000; };";
+        const char code[] = "struct S { unsigned int a : 100000; };\n";
         (void) tokenizeAndStringify(code);
         ASSERT_EQUALS("[test.cpp:1:29]: (warning) Bit-field size exceeds max number of bits 32767 [tooLargeBitField]\n", errout_str());
     }
 
     void bitfields19() {
-        const char code[] = "struct S { volatile std::uint32_t a : 10; };";
+        const char code[] = "struct S { volatile std::uint32_t a : 10; };\n";
         ASSERT_EQUALS("struct S { volatile std :: uint32_t a ; } ;", tokenizeAndStringify(code));
     }
 
     void bitfields20() {
-        const char code[] = "struct S { volatile ::uint32_t a : 10; };";
+        const char code[] = "struct S { volatile ::uint32_t a : 10; };\n";
         ASSERT_EQUALS("struct S { volatile :: uint32_t a ; } ;", tokenizeAndStringify(code));
     }
 
     void bitfields21() {
-        const char code[] = "struct S { uint32_t a : 1, b : 1; };";
-        SimpleTokenizer tokenizer(settings0, *this);
+        const char code[] = "struct S { uint32_t a : 1, b : 1; };\n";
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
         const Token *a = Token::findsimplematch(tokenizer.tokens(), "a");
         ASSERT_EQUALS(1, a->bits());
@@ -5038,72 +5406,80 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS(1, b->bits());
     }
 
+    void bitfields22() {
+        const char code[] = "constexpr int BITS{4};\n"
+                            "struct Struct { unsigned int m_data : BITS; };\n";
+        const char expected[] = "constexpr int BITS { 4 } ;\n"
+                                "struct Struct { unsigned int m_data ; } ;";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+    }
+
     void simplifyNamespaceStd() {
         const char *expected;
 
         {
-            const char code[] = "map<foo, bar> m;"; // namespace std is not used
+            const char code[] = "map<foo, bar> m;\n"; // namespace std is not used
             ASSERT_EQUALS("map < foo , bar > m ;", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
-                                "map<foo, bar> m;";
+                                "map<foo, bar> m;\n";
             ASSERT_EQUALS("std :: map < foo , bar > m ;", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
-                                "string s;";
+                                "string s;\n";
             ASSERT_EQUALS("std :: string s ;", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
-                                "void foo() {swap(a, b); }";
+                                "void foo() {swap(a, b); }\n";
             ASSERT_EQUALS("void foo ( ) { std :: swap ( a , b ) ; }", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
-                                "void search() {}";
+                                "void search() {}\n";
             ASSERT_EQUALS("void search ( ) { }", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
                                 "void search();\n"
-                                "void dostuff() { search(); }";
+                                "void dostuff() { search(); }\n";
             ASSERT_EQUALS("void search ( ) ;\nvoid dostuff ( ) { search ( ) ; }", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
-                                "void foo() {map(a, b); }"; // That's obviously not std::map<>
+                                "void foo() {map(a, b); }\n"; // That's obviously not std::map<>
             ASSERT_EQUALS("void foo ( ) { map ( a , b ) ; }", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
-                                "string<wchar_t> s;"; // That's obviously not std::string
+                                "string<wchar_t> s;\n"; // That's obviously not std::string
             TODO_ASSERT_EQUALS("string < wchar_t > s ;", "std :: string < wchar_t > s ;", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
-                                "swap s;"; // That's obviously not std::swap
+                                "swap s;\n"; // That's obviously not std::swap
             ASSERT_EQUALS("swap s ;", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
-                                "std::string s;";
+                                "std::string s;\n";
             ASSERT_EQUALS("std :: string s ;", tokenizeAndStringify(code));
         }
 
         { // #4042 (Do not add 'std ::' to variables)
             const char code[] = "using namespace std;\n"
-                                "const char * string = \"Hi\";";
+                                "const char * string = \"Hi\";\n";
             ASSERT_EQUALS("const char * string ; string = \"Hi\" ;", tokenizeAndStringify(code));
         }
 
@@ -5112,11 +5488,11 @@ class TestTokenizer : public TestFixture {
                                 "string f(const char * string) {\n"
                                 "    cout << string << endl;\n"
                                 "    return string;\n"
-                                "}";
+                                "}\n";
             expected = "std :: string f ( const char * string ) {\n"
                        "std :: cout << string << std :: endl ;\n"
                        "return string ;\n"
-                       "}";
+                       "}\n";
             TODO_ASSERT_EQUALS(expected,
                                "std :: string f ( const char * string ) {\n"
                                "cout << string << endl ;\n"
@@ -5133,7 +5509,7 @@ class TestTokenizer : public TestFixture {
                                 "void f() {\n"
                                 "  try { }\n"
                                 "  catch(std::exception &exception) { }\n"
-                                "}";
+                                "}\n";
             expected = "void f ( ) {\n"
                        "try { }\n"
                        "catch ( std :: exception & exception ) { }\n"
@@ -5147,7 +5523,7 @@ class TestTokenizer : public TestFixture {
                                 "    void search() {}\n"
                                 "    void search() const {}\n"
                                 "    void search() THROW_MACRO {}\n"
-                                "};";
+                                "};\n";
             expected = "class C {\n"
                        "void search ( ) { }\n"
                        "void search ( ) const { }\n"
@@ -5159,48 +5535,43 @@ class TestTokenizer : public TestFixture {
         // Ticket #8091
         ASSERT_EQUALS("enum Anonymous0 { string } ;",
                       tokenizeAndStringify("using namespace std; "
-                                           "enum { string };"));
+                                           "enum { string };\n"));
         ASSERT_EQUALS("enum Type { string } ;",
                       tokenizeAndStringify("using namespace std; "
-                                           "enum Type { string } ;"));
+                                           "enum Type { string } ;\n"));
         ASSERT_EQUALS("enum class Type { string } ;",
                       tokenizeAndStringify("using namespace std; "
-                                           "enum class Type { string } ;"));
+                                           "enum class Type { string } ;\n"));
         ASSERT_EQUALS("enum struct Type { string } ;",
                       tokenizeAndStringify("using namespace std; "
-                                           "enum struct Type { string } ;"));
+                                           "enum struct Type { string } ;\n"));
         ASSERT_EQUALS("enum struct Type : int { f = 0 , string } ;",
                       tokenizeAndStringify("using namespace std; "
-                                           "enum struct Type : int { f = 0 , string } ;"));
+                                           "enum struct Type : int { f = 0 , string } ;\n"));
         ASSERT_EQUALS("enum Type { a , b } ; void foo ( enum Type , std :: string ) { }",
                       tokenizeAndStringify("using namespace std; "
-                                           "enum Type { a , b } ; void foo ( enum Type , string) {}"));
+                                           "enum Type { a , b } ; void foo ( enum Type , string) {}\n"));
         ASSERT_EQUALS("struct T { } ; enum struct Type : int { f = 0 , string } ;",
                       tokenizeAndStringify("using namespace std; "
                                            "struct T { typedef int type; } ; "
-                                           "enum struct Type : T :: type { f = 0 , string } ;"));
+                                           "enum struct Type : T :: type { f = 0 , string } ;\n"));
         // Handle garbage enum code "well"
         ASSERT_EQUALS("enum E : int ; void foo ( ) { std :: string s ; }",
-                      tokenizeAndStringify("using namespace std; enum E : int ; void foo ( ) { string s ; }"));
+                      tokenizeAndStringify("using namespace std; enum E : int ; void foo ( ) { string s ; }\n"));
 
-        ASSERT_NO_THROW(tokenizeAndStringify("NS_BEGIN(IMAGEIO_2D_DICOM) using namespace std; NS_END")); // #11045
+        ASSERT_NO_THROW(tokenizeAndStringify("NS_BEGIN(IMAGEIO_2D_DICOM) using namespace std; NS_END\n")); // #11045
 
         {
             const char code[] = "using namespace std;\n"
                                 "void f(const unique_ptr<int>& p) {\n"
                                 "    if (!p)\n"
                                 "        throw runtime_error(\"abc\");\n"
-                                "}";
+                                "}\n";
             expected = "void f ( const std :: unique_ptr < int > & p ) {\n"
                        "if ( ! p ) {\n"
                        "throw std :: runtime_error ( \"abc\" ) ; }\n"
                        "}";
-            TODO_ASSERT_EQUALS(expected,
-                               "void f ( const std :: unique_ptr < int > & p ) {\n"
-                               "if ( ! p ) {\n"
-                               "throw runtime_error ( \"abc\" ) ; }\n"
-                               "}",
-                               tokenizeAndStringify(code));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
 
         {
@@ -5222,134 +5593,145 @@ class TestTokenizer : public TestFixture {
                        "}";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
+
+        {
+            const char code[] = "using namespace std;\n"
+                                "string_view f() { return string(); }\n"
+                                "void move() {}\n"
+                                "void string() {}\n";
+            expected = "std :: string_view f ( ) { return std :: string ( ) ; }\n"
+                       "void move ( ) { }\n"
+                       "void string ( ) { }";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        }
     }
 
     void microsoftMemory() {
-        const char code1a[] = "void foo() { int a[10], b[10]; CopyMemory(a, b, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcpy ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code1a,dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
+        const char code1a[] = "void foo() { int a[10], b[10]; CopyMemory(a, b, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcpy ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code1a,settings2_win32a));
 
-        const char code1b[] = "void foo() { int a[10], b[10]; RtlCopyMemory(a, b, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcpy ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code1b,dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
+        const char code1b[] = "void foo() { int a[10], b[10]; RtlCopyMemory(a, b, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcpy ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code1b,settings2_win32a));
 
-        const char code1c[] = "void foo() { int a[10], b[10]; RtlCopyBytes(a, b, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcpy ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code1c,dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
+        const char code1c[] = "void foo() { int a[10], b[10]; RtlCopyBytes(a, b, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcpy ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code1c,settings2_win32a));
 
-        const char code2a[] = "void foo() { int a[10]; FillMemory(a, sizeof(a), 255); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 255 , sizeof ( a ) ) ; }", tokenizeAndStringify(code2a,dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
-        const char code2b[] = "void foo() { int a[10]; RtlFillMemory(a, sizeof(a), 255); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 255 , sizeof ( a ) ) ; }", tokenizeAndStringify(code2b,dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
-        const char code2c[] = "void foo() { int a[10]; RtlFillBytes(a, sizeof(a), 255); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 255 , sizeof ( a ) ) ; }", tokenizeAndStringify(code2c,dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
+        const char code2a[] = "void foo() { int a[10]; FillMemory(a, sizeof(a), 255); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 255 , sizeof ( a ) ) ; }", tokenizeAndStringify(code2a,settings2_win32a));
+        const char code2b[] = "void foo() { int a[10]; RtlFillMemory(a, sizeof(a), 255); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 255 , sizeof ( a ) ) ; }", tokenizeAndStringify(code2b,settings2_win32a));
+        const char code2c[] = "void foo() { int a[10]; RtlFillBytes(a, sizeof(a), 255); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 255 , sizeof ( a ) ) ; }", tokenizeAndStringify(code2c,settings2_win32a));
 
-        const char code3a[] = "void foo() { int a[10], b[10]; MoveMemory(a, b, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memmove ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code3a,dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
-        const char code3b[] = "void foo() { int a[10], b[10]; RtlMoveMemory(a, b, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memmove ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code3b,dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
+        const char code3a[] = "void foo() { int a[10], b[10]; MoveMemory(a, b, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memmove ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code3a,settings2_win32a));
+        const char code3b[] = "void foo() { int a[10], b[10]; RtlMoveMemory(a, b, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memmove ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code3b,settings2_win32a));
 
-        const char code4a[] = "void foo() { int a[10]; ZeroMemory(a, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4a,dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
-        const char code4b[] = "void foo() { int a[10]; RtlZeroMemory(a, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4b,dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
-        const char code4c[] = "void foo() { int a[10]; RtlZeroBytes(a, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4c,dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
-        const char code4d[] = "void foo() { int a[10]; RtlSecureZeroMemory(a, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4d,dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
+        const char code4a[] = "void foo() { int a[10]; ZeroMemory(a, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4a,settings2_win32a));
+        const char code4b[] = "void foo() { int a[10]; RtlZeroMemory(a, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4b,settings2_win32a));
+        const char code4c[] = "void foo() { int a[10]; RtlZeroBytes(a, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4c,settings2_win32a));
+        const char code4d[] = "void foo() { int a[10]; RtlSecureZeroMemory(a, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4d,settings2_win32a));
 
-        const char code5[] = "void foo() { int a[10], b[10]; RtlCompareMemory(a, b, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcmp ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code5,dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
+        const char code5[] = "void foo() { int a[10], b[10]; RtlCompareMemory(a, b, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcmp ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code5,settings2_win32a));
 
-        const char code6[] = "void foo() { ZeroMemory(f(1, g(a, b)), h(i, j(0, 1))); }";
-        ASSERT_EQUALS("void foo ( ) { memset ( f ( 1 , g ( a , b ) ) , 0 , h ( i , j ( 0 , 1 ) ) ) ; }", tokenizeAndStringify(code6,dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
+        const char code6[] = "void foo() { ZeroMemory(f(1, g(a, b)), h(i, j(0, 1))); }\n";
+        ASSERT_EQUALS("void foo ( ) { memset ( f ( 1 , g ( a , b ) ) , 0 , h ( i , j ( 0 , 1 ) ) ) ; }", tokenizeAndStringify(code6,settings2_win32a));
 
-        const char code7[] = "void foo() { FillMemory(f(1, g(a, b)), h(i, j(0, 1)), 255); }";
-        ASSERT_EQUALS("void foo ( ) { memset ( f ( 1 , g ( a , b ) ) , 255 , h ( i , j ( 0 , 1 ) ) ) ; }", tokenizeAndStringify(code7,dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
+        const char code7[] = "void foo() { FillMemory(f(1, g(a, b)), h(i, j(0, 1)), 255); }\n";
+        ASSERT_EQUALS("void foo ( ) { memset ( f ( 1 , g ( a , b ) ) , 255 , h ( i , j ( 0 , 1 ) ) ) ; }", tokenizeAndStringify(code7,settings2_win32a));
     }
 
     void microsoftString() {
-        const char code1a[] = "void foo() { _tprintf (_T(\"test\") _T(\"1\")); }";
-        ASSERT_EQUALS("void foo ( ) { printf ( \"test1\" ) ; }", tokenizeAndStringify(code1a, dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
-        const char code1b[] = "void foo() { _tprintf (_TEXT(\"test\") _TEXT(\"2\")); }";
-        ASSERT_EQUALS("void foo ( ) { printf ( \"test2\" ) ; }", tokenizeAndStringify(code1b, dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
-        const char code1c[] = "void foo() { _tprintf (TEXT(\"test\") TEXT(\"3\")); }";
-        ASSERT_EQUALS("void foo ( ) { printf ( \"test3\" ) ; }", tokenizeAndStringify(code1c, dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
-
-        const char code2a[] = "void foo() { _tprintf (_T(\"test\") _T(\"1\")); }";
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test1\" ) ; }", tokenizeAndStringify(code2a, dinit(TokenizeOptions, $.platform = Platform::Type::Win32W)));
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test1\" ) ; }", tokenizeAndStringify(code2a, dinit(TokenizeOptions, $.platform = Platform::Type::Win64)));
-        const char code2b[] = "void foo() { _tprintf (_TEXT(\"test\") _TEXT(\"2\")); }";
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test2\" ) ; }", tokenizeAndStringify(code2b, dinit(TokenizeOptions, $.platform = Platform::Type::Win32W)));
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test2\" ) ; }", tokenizeAndStringify(code2b, dinit(TokenizeOptions, $.platform = Platform::Type::Win64)));
-        const char code2c[] = "void foo() { _tprintf (TEXT(\"test\") TEXT(\"3\")); }";
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test3\" ) ; }", tokenizeAndStringify(code2c, dinit(TokenizeOptions, $.platform = Platform::Type::Win32W)));
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test3\" ) ; }", tokenizeAndStringify(code2c, dinit(TokenizeOptions, $.platform = Platform::Type::Win64)));
+        const char code1a[] = "void foo() { _tprintf (_T(\"test\") _T(\"1\")); }\n";
+        ASSERT_EQUALS("void foo ( ) { printf ( \"test1\" ) ; }", tokenizeAndStringify(code1a, settings2_win32a));
+        const char code1b[] = "void foo() { _tprintf (_TEXT(\"test\") _TEXT(\"2\")); }\n";
+        ASSERT_EQUALS("void foo ( ) { printf ( \"test2\" ) ; }", tokenizeAndStringify(code1b, settings2_win32a));
+        const char code1c[] = "void foo() { _tprintf (TEXT(\"test\") TEXT(\"3\")); }\n";
+        ASSERT_EQUALS("void foo ( ) { printf ( \"test3\" ) ; }", tokenizeAndStringify(code1c, settings2_win32a));
+
+        const char code2a[] = "void foo() { _tprintf (_T(\"test\") _T(\"1\")); }\n";
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test1\" ) ; }", tokenizeAndStringify(code2a, settings2_win32w));
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test1\" ) ; }", tokenizeAndStringify(code2a, settings2_win64));
+        const char code2b[] = "void foo() { _tprintf (_TEXT(\"test\") _TEXT(\"2\")); }\n";
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test2\" ) ; }", tokenizeAndStringify(code2b, settings2_win32w));
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test2\" ) ; }", tokenizeAndStringify(code2b, settings2_win64));
+        const char code2c[] = "void foo() { _tprintf (TEXT(\"test\") TEXT(\"3\")); }\n";
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test3\" ) ; }", tokenizeAndStringify(code2c, settings2_win32w));
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test3\" ) ; }", tokenizeAndStringify(code2c, settings2_win64));
     }
 
     void borland() {
         // __closure
         ASSERT_EQUALS("int ( * a ) ( ) ;",  // TODO VarId
-                      tokenizeAndStringify("int (__closure *a)();", dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
+                      tokenizeAndStringify("int (__closure *a)();\n", settings2_win32a));
 
         // __property
         ASSERT_EQUALS("class Fred { ; __property ; } ;",
-                      tokenizeAndStringify("class Fred { __property int x = { } };", dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
+                      tokenizeAndStringify("class Fred { __property int x = { } };\n", settings2_win32a));
     }
 
     void simplifySQL() {
         // Oracle PRO*C extensions for inline SQL. Just replace the SQL with "asm()" to fix wrong error messages
         // ticket: #1959
-        ASSERT_EQUALS("asm ( \"\"__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL SELECT A FROM B\"\" ) ;", tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL SELECT A FROM B;"));
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL"), SYNTAX);
+        ASSERT_EQUALS("asm ( \"\"__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL SELECT A FROM B\"\" ) ;", tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL SELECT A FROM B;\n"));
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL\n"), SYNTAX);
 
         ASSERT_EQUALS("asm ( \"\"__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL EXECUTE BEGIN Proc1 ( A ) ; END ; END - __CPPCHECK_EMBEDDED_SQL_EXEC__\"\" ) ; asm ( \"\"__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT\"\" ) ;",
-                      tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL EXECUTE BEGIN Proc1(A); END; END-__CPPCHECK_EMBEDDED_SQL_EXEC__; __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT;"));
+                      tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL EXECUTE BEGIN Proc1(A); END; END-__CPPCHECK_EMBEDDED_SQL_EXEC__; __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT;\n"));
         ASSERT_EQUALS("asm ( \"\"__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL UPDATE A SET B = C\"\" ) ; asm ( \"\"__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT\"\" ) ;",
-                      tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL UPDATE A SET B = C; __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT;"));
+                      tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL UPDATE A SET B = C; __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT;\n"));
         ASSERT_EQUALS("asm ( \"\"__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT\"\" ) ; asm ( \"\"__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL EXECUTE BEGIN Proc1 ( A ) ; END ; END - __CPPCHECK_EMBEDDED_SQL_EXEC__\"\" ) ;",
-                      tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT; __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL EXECUTE BEGIN Proc1(A); END; END-__CPPCHECK_EMBEDDED_SQL_EXEC__;"));
+                      tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT; __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL EXECUTE BEGIN Proc1(A); END; END-__CPPCHECK_EMBEDDED_SQL_EXEC__;\n"));
 
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("int f(){ __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL } int a;"), SYNTAX);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL int f(){"), SYNTAX);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL END-__CPPCHECK_EMBEDDED_SQL_EXEC__ int a;"), SYNTAX);
-        ASSERT_NO_THROW(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL UPDATE A SET B = :&b->b1, C = :c::c1;"));
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("int f(){ __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL } int a;\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL int f(){\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL END-__CPPCHECK_EMBEDDED_SQL_EXEC__ int a;\n"), SYNTAX);
+        ASSERT_NO_THROW(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL UPDATE A SET B = :&b->b1, C = :c::c1;\n"));
     }
 
     void simplifyCAlternativeTokens() {
-        ASSERT_EQUALS("void or ( ) ;", tokenizeAndStringify("void or(void);", dinit(TokenizeOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { if ( a && b ) { ; } }", tokenizeAndStringify("void f() { if (a and b); }", dinit(TokenizeOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { if ( a && b ) { ; } }", tokenizeAndStringify("void f() { if (a and b); }"));
-        ASSERT_EQUALS("void f ( ) { if ( a || b ) { ; } }", tokenizeAndStringify("void f() { if (a or b); }", dinit(TokenizeOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { if ( a || b ) { ; } }", tokenizeAndStringify("void f() { if (a or b); }"));
-        ASSERT_EQUALS("void f ( ) { if ( a & b ) { ; } }", tokenizeAndStringify("void f() { if (a bitand b); }", dinit(TokenizeOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { if ( a & b ) { ; } }", tokenizeAndStringify("void f() { if (a bitand b); }"));
-        ASSERT_EQUALS("void f ( ) { if ( a | b ) { ; } }", tokenizeAndStringify("void f() { if (a bitor b); }", dinit(TokenizeOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { if ( a | b ) { ; } }", tokenizeAndStringify("void f() { if (a bitor b); }"));
-        ASSERT_EQUALS("void f ( ) { if ( a ^ b ) { ; } }", tokenizeAndStringify("void f() { if (a xor b); }", dinit(TokenizeOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { if ( a ^ b ) { ; } }", tokenizeAndStringify("void f() { if (a xor b); }"));
-        ASSERT_EQUALS("void f ( ) { if ( ~ b ) { ; } }", tokenizeAndStringify("void f() { if (compl b); }", dinit(TokenizeOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { if ( ~ b ) { ; } }", tokenizeAndStringify("void f() { if (compl b); }"));
-        ASSERT_EQUALS("void f ( ) { if ( ! b ) { ; } }", tokenizeAndStringify("void f() { if (not b); }", dinit(TokenizeOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { if ( ! b ) { ; } }", tokenizeAndStringify("void f() { if (not b); }"));
-        ASSERT_EQUALS("void f ( ) const { if ( ! b ) { ; } }", tokenizeAndStringify("void f() const { if (not b); }"));
-        ASSERT_EQUALS("void f ( ) { if ( a != b ) { ; } }", tokenizeAndStringify("void f() { if (a not_eq b); }", dinit(TokenizeOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { if ( a != b ) { ; } }", tokenizeAndStringify("void f() { if (a not_eq b); }"));
+        ASSERT_EQUALS("void or ( ) ;", tokenizeAndStringify("void or(void);\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a && b ) { ; } }", tokenizeAndStringify("void f() { if (a and b); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a && b ) { ; } }", tokenizeAndStringify("void f() { if (a and b); }\n"));
+        ASSERT_EQUALS("void f ( ) { if ( a || b ) { ; } }", tokenizeAndStringify("void f() { if (a or b); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a || b ) { ; } }", tokenizeAndStringify("void f() { if (a or b); }\n"));
+        ASSERT_EQUALS("void f ( ) { if ( a & b ) { ; } }", tokenizeAndStringify("void f() { if (a bitand b); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a & b ) { ; } }", tokenizeAndStringify("void f() { if (a bitand b); }\n"));
+        ASSERT_EQUALS("void f ( ) { if ( a | b ) { ; } }", tokenizeAndStringify("void f() { if (a bitor b); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a | b ) { ; } }", tokenizeAndStringify("void f() { if (a bitor b); }\n"));
+        ASSERT_EQUALS("void f ( ) { if ( a ^ b ) { ; } }", tokenizeAndStringify("void f() { if (a xor b); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a ^ b ) { ; } }", tokenizeAndStringify("void f() { if (a xor b); }\n"));
+        ASSERT_EQUALS("void f ( ) { if ( ~ b ) { ; } }", tokenizeAndStringify("void f() { if (compl b); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( ~ b ) { ; } }", tokenizeAndStringify("void f() { if (compl b); }\n"));
+        ASSERT_EQUALS("void f ( ) { if ( ! b ) { ; } }", tokenizeAndStringify("void f() { if (not b); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( ! b ) { ; } }", tokenizeAndStringify("void f() { if (not b); }\n"));
+        ASSERT_EQUALS("void f ( ) const { if ( ! b ) { ; } }", tokenizeAndStringify("void f() const { if (not b); }\n"));
+        ASSERT_EQUALS("void f ( ) { if ( a != b ) { ; } }", tokenizeAndStringify("void f() { if (a not_eq b); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a != b ) { ; } }", tokenizeAndStringify("void f() { if (a not_eq b); }\n"));
         // #6201
-        ASSERT_EQUALS("void f ( ) { if ( ! c || ! memcmp ( a , b , s ) ) { ; } }", tokenizeAndStringify("void f() { if (!c or !memcmp(a, b, s)); }", dinit(TokenizeOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { if ( ! c || ! memcmp ( a , b , s ) ) { ; } }", tokenizeAndStringify("void f() { if (!c or !memcmp(a, b, s)); }"));
+        ASSERT_EQUALS("void f ( ) { if ( ! c || ! memcmp ( a , b , s ) ) { ; } }", tokenizeAndStringify("void f() { if (!c or !memcmp(a, b, s)); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( ! c || ! memcmp ( a , b , s ) ) { ; } }", tokenizeAndStringify("void f() { if (!c or !memcmp(a, b, s)); }\n"));
         // #6029
-        ASSERT_EQUALS("void f ( ) { if ( ! b ) { } }", tokenizeAndStringify("void f() { if (not b){} }", dinit(TokenizeOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { if ( ! b ) { } }", tokenizeAndStringify("void f() { if (not b){} }"));
+        ASSERT_EQUALS("void f ( ) { if ( ! b ) { } }", tokenizeAndStringify("void f() { if (not b){} }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( ! b ) { } }", tokenizeAndStringify("void f() { if (not b){} }\n"));
         // #6207
-        ASSERT_EQUALS("void f ( ) { if ( not = x ) { } }", tokenizeAndStringify("void f() { if (not=x){} }", dinit(TokenizeOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { if ( not = x ) { } }", tokenizeAndStringify("void f() { if (not=x){} }"));
+        ASSERT_EQUALS("void f ( ) { if ( not = x ) { } }", tokenizeAndStringify("void f() { if (not=x){} }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( not = x ) { } }", tokenizeAndStringify("void f() { if (not=x){} }\n"));
         // #8029
-        ASSERT_EQUALS("void f ( struct S * s ) { x = s . and + 1 ; }", tokenizeAndStringify("void f(struct S *s) { x = s->and + 1; }", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( struct S * s ) { x = s . and + 1 ; }", tokenizeAndStringify("void f(struct S *s) { x = s->and + 1; }\n", dinit(TokenizeOptions, $.cpp = false)));
         // #8745
-        ASSERT_EQUALS("void f ( ) { if ( x ) { or = 0 ; } }", tokenizeAndStringify("void f() { if (x) or = 0; }"));
+        ASSERT_EQUALS("void f ( ) { if ( x ) { or = 0 ; } }", tokenizeAndStringify("void f() { if (x) or = 0; }\n"));
         // #9324
         ASSERT_EQUALS("void f ( const char * str ) { while ( * str == '!' || * str == '[' ) { } }",
-                      tokenizeAndStringify("void f(const char *str) { while (*str=='!' or *str=='['){} }"));
+                      tokenizeAndStringify("void f(const char *str) { while (*str=='!' or *str=='['){} }\n"));
         // #9920
-        ASSERT_EQUALS("result = ch != s . end ( ) && * ch == ':' ;", tokenizeAndStringify("result = ch != s.end() and *ch == ':';", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("result = ch != s . end ( ) && * ch == ':' ;", tokenizeAndStringify("result = ch != s.end() and *ch == ':';\n", dinit(TokenizeOptions, $.cpp = false)));
 
         // #8975
         ASSERT_EQUALS("void foo ( ) {\n"
@@ -5360,59 +5742,73 @@ class TestTokenizer : public TestFixture {
                           "void foo() {\n"
                           "  char *or;\n"
                           "  while ((*or != 0) && (*or != '|')) or++;\n"
-                          "}", dinit(TokenizeOptions, $.cpp = false)));
+                          "}\n", dinit(TokenizeOptions, $.cpp = false)));
         // #10013
-        ASSERT_EQUALS("void f ( ) { x = ! 123 ; }", tokenizeAndStringify("void f() { x = not 123; }"));
+        ASSERT_EQUALS("void f ( ) { x = ! 123 ; }", tokenizeAndStringify("void f() { x = not 123; }\n"));
 
         { // #12476
             const char code[] = "struct S { int a, b; };"
                                 "void f(struct S* compl) {"
                                 "    compl->a = compl->b;"
-                                "}";
+                                "}\n";
             const char exp[] = "struct S { int a ; int b ; } ; void f ( struct S * compl ) { compl . a = compl . b ; }";
             ASSERT_EQUALS(exp, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
 
+        { // not used as parameter name in C
+            const char code[] = "static void foo(int not, int test) {"
+                                "    test = not;"
+                                "}\n";
+            const char exp[] = "static void foo ( int not , int test ) { test = not ; }";
+            ASSERT_EQUALS(exp, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
+        }
+
+        { // binary alt token as last parameter in C
+            const char code[] = "void f(int or) { if (or) {} }\n";
+            const char exp[] = "void f ( int or ) { if ( or ) { } }";
+            ASSERT_EQUALS(exp, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
+        }
+
         //ASSERT_EQUALS("", filter_valueflow(errout_str()));
         ignore_errout();
     }
 
     void simplifyCompoundStatements() {
-        ASSERT_EQUALS("; x = 123 ;", tokenizeAndStringify(";x=({123;});"));
-        ASSERT_EQUALS("; x = y ;", tokenizeAndStringify(";x=({y;});"));
+        ASSERT_EQUALS("; x = 123 ;", tokenizeAndStringify(";x=({123;});\n"));
+        ASSERT_EQUALS("; x = y ;", tokenizeAndStringify(";x=({y;});\n"));
         // #13419: Do not simplify compound statements in for loop
         ASSERT_EQUALS("void foo ( int x ) { for ( ; ( { { } ; x < 1 ; } ) ; ) { ; } }",
-                      tokenizeAndStringify("void foo(int x) { for (;({ {}; x<1; });); }"));
+                      tokenizeAndStringify("void foo(int x) { for (;({ {}; x<1; });); }\n"));
     }
 
     void simplifyOperatorName1() {
         // make sure C code doesn't get changed
-        const char code[] = "void operator () {}"
-                            "int main()"
-                            "{"
-                            "    operator();"
-                            "}";
-
-        const char result[] = "void operator ( ) { } "
-                              "int main ( ) "
-                              "{ "
-                              "operator ( ) ; "
+        const char code[] = "void operator () {}\n"
+                            "int main()\n"
+                            "{\n"
+                            "    operator();\n"
+                            "}\n";
+
+        const char result[] = "void operator ( ) { }\n"
+                              "int main ( )\n"
+                              "{\n"
+                              "operator ( ) ;\n"
                               "}";
 
         ASSERT_EQUALS(result, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void simplifyOperatorName2() {
-        const char code[] = "class Fred"
-                            "{"
-                            "    Fred(const Fred & f) { operator = (f); }"
-                            "    operator = ();"
-                            "}";
-
-        const char result[] = "class Fred "
-                              "{ "
-                              "Fred ( const Fred & f ) { operator= ( f ) ; } "
-                              "operator= ( ) ; "
+        const char code[] = "class Fred\n"
+                            "{\n"
+                            "    Fred(const Fred & f) { operator = (f); }\n"
+                            "    operator = ();\n"
+                            "}\n";
+
+        const char result[] = "class Fred\n"
+                              "{\n"
+                              "Fred ( const Fred & f ) { operator= ( f ) ; }\n"
+                              "operator= ( ) ;\n"
                               "}";
 
         ASSERT_EQUALS(result, tokenizeAndStringify(code));
@@ -5420,165 +5816,174 @@ class TestTokenizer : public TestFixture {
 
     void simplifyOperatorName3() {
         // #2615
-        const char code[] = "void f() {"
-                            "static_cast<ScToken*>(xResult.operator->())->GetMatrix();"
-                            "}";
-        const char result[] = "void f ( ) { static_cast < ScToken * > ( xResult . operator-> ( ) ) . GetMatrix ( ) ; }";
+        const char code[] = "void f() {\n"
+                            "static_cast<ScToken*>(xResult.operator->())->GetMatrix();\n"
+                            "}\n";
+        const char result[] = "void f ( ) {\n"
+                              "static_cast < ScToken * > ( xResult . operator-> ( ) ) . GetMatrix ( ) ;\n"
+                              "}";
         ASSERT_EQUALS(result, tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName4() {
-        const char code[] = "void operator==() { }";
+        const char code[] = "void operator==() { }\n";
         const char result[] = "void operator== ( ) { }";
         ASSERT_EQUALS(result, tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName5() {
-        const char code1[] = "std::istream & operator >> (std::istream & s, Fred &f);";
+        const char code1[] = "std::istream & operator >> (std::istream & s, Fred &f);\n";
         const char result1[] = "std :: istream & operator>> ( std :: istream & s , Fred & f ) ;";
         ASSERT_EQUALS(result1, tokenizeAndStringify(code1));
 
-        const char code2[] = "std::ostream & operator << (std::ostream & s, const Fred &f);";
+        const char code2[] = "std::ostream & operator << (std::ostream & s, const Fred &f);\n";
         const char result2[] = "std :: ostream & operator<< ( std :: ostream & s , const Fred & f ) ;";
         ASSERT_EQUALS(result2, tokenizeAndStringify(code2));
     }
 
     void simplifyOperatorName6() { // ticket #3195
-        const char code1[] = "value_type * operator ++ (int);";
+        const char code1[] = "value_type * operator ++ (int);\n";
         const char result1[] = "value_type * operator++ ( int ) ;";
         ASSERT_EQUALS(result1, tokenizeAndStringify(code1));
 
-        const char code2[] = "value_type * operator -- (int);";
+        const char code2[] = "value_type * operator -- (int);\n";
         const char result2[] = "value_type * operator-- ( int ) ;";
         ASSERT_EQUALS(result2, tokenizeAndStringify(code2));
     }
 
     void simplifyOperatorName7() { // ticket #4619
-        const char code1[] = "value_type * operator += (int);";
+        const char code1[] = "value_type * operator += (int);\n";
         const char result1[] = "value_type * operator+= ( int ) ;";
         ASSERT_EQUALS(result1, tokenizeAndStringify(code1));
     }
 
     void simplifyOperatorName8() { // ticket #5706
-        const char code1[] = "value_type * operator += (int) noexcept ;";
+        const char code1[] = "value_type * operator += (int) noexcept ;\n";
         const char result1[] = "value_type * operator+= ( int ) noexcept ( true ) ;";
         ASSERT_EQUALS(result1, tokenizeAndStringify(code1));
 
-        const char code2[] = "value_type * operator += (int) noexcept ( true ) ;";
+        const char code2[] = "value_type * operator += (int) noexcept ( true ) ;\n";
         const char result2[] = "value_type * operator+= ( int ) noexcept ( true ) ;";
         ASSERT_EQUALS(result2, tokenizeAndStringify(code2));
 
-        const char code3[] = "value_type * operator += (int) throw ( ) ;";
+        const char code3[] = "value_type * operator += (int) throw ( ) ;\n";
         const char result3[] = "value_type * operator+= ( int ) throw ( ) ;";
         ASSERT_EQUALS(result3, tokenizeAndStringify(code3));
 
-        const char code4[] = "value_type * operator += (int) const noexcept ;";
+        const char code4[] = "value_type * operator += (int) const noexcept ;\n";
         const char result4[] = "value_type * operator+= ( int ) const noexcept ( true ) ;";
         ASSERT_EQUALS(result4, tokenizeAndStringify(code4));
 
-        const char code5[] = "value_type * operator += (int) const noexcept ( true ) ;";
+        const char code5[] = "value_type * operator += (int) const noexcept ( true ) ;\n";
         const char result5[] = "value_type * operator+= ( int ) const noexcept ( true ) ;";
         ASSERT_EQUALS(result5, tokenizeAndStringify(code5));
 
-        const char code6[] = "value_type * operator += (int) const throw ( ) ;";
+        const char code6[] = "value_type * operator += (int) const throw ( ) ;\n";
         const char result6[] = "value_type * operator+= ( int ) const throw ( ) ;";
         ASSERT_EQUALS(result6, tokenizeAndStringify(code6));
 
-        const char code7[] = "value_type * operator += (int) const noexcept ( false ) ;";
+        const char code7[] = "value_type * operator += (int) const noexcept ( false ) ;\n";
         const char result7[] = "value_type * operator+= ( int ) const noexcept ( false ) ;";
         ASSERT_EQUALS(result7, tokenizeAndStringify(code7));
 
     }
 
     void simplifyOperatorName9() { // Ticket #5709
-        const char code[] = "struct R { R operator, ( R b ) ; } ;";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
+        const char code[] = "struct R { R operator,(R b); };\n";
+        const char expected[] = "struct R { R operator, ( R b ) ; } ;";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName10() { // #8746
-        const char code1[] = "using a::operator=;";
+        const char code1[] = "using a::operator=;\n";
         ASSERT_EQUALS("using a :: operator= ;", tokenizeAndStringify(code1));
 
-        const char code2[] = "{ return &Fred::operator!=; }";
+        const char code2[] = "{ return &Fred::operator!=; }\n";
         ASSERT_EQUALS("{ return & Fred :: operator!= ; }", tokenizeAndStringify(code2));
     }
 
     void simplifyOperatorName11() { // #8889
-        const char code[] = "auto operator = (const Fred & other) -> Fred & ;";
+        const char code[] = "auto operator = (const Fred & other) -> Fred & ;\n";
         ASSERT_EQUALS("auto operator= ( const Fred & other ) . Fred & ;", tokenizeAndStringify(code));
         ASSERT_EQUALS("[test.cpp:1:1]: (debug) auto token with no type. [autoNoType]\n", errout_str());
 
-        const char code1[] = "auto operator = (const Fred & other) -> Fred & { }";
+        const char code1[] = "auto operator = (const Fred & other) -> Fred & { }\n";
         ASSERT_EQUALS("auto operator= ( const Fred & other ) . Fred & { }", tokenizeAndStringify(code1));
         ASSERT_EQUALS("[test.cpp:1:1]: (debug) auto token with no type. [autoNoType]\n", errout_str());
 
-        const char code2[] = "template <typename T> void g(S<&T::operator+ >) {}";
+        const char code2[] = "template <typename T> void g(S<&T::operator+ >) {}\n";
         ASSERT_EQUALS("template < typename T > void g ( S < & T :: operator+ > ) { }", tokenizeAndStringify(code2));
         ASSERT_EQUALS("", errout_str());
 
-        const char code3[] = "template <typename T> void g(S<&T::operator int>) {}";
+        const char code3[] = "template <typename T> void g(S<&T::operator int>) {}\n";
         ASSERT_EQUALS("template < typename T > void g ( S < & T :: operatorint > ) { }", tokenizeAndStringify(code3));
         ASSERT_EQUALS("", errout_str());
 
-        const char code4[] = "template <typename T> void g(S<&T::template operator- <double> >) {}";
+        const char code4[] = "template <typename T> void g(S<&T::template operator- <double> >) {}\n";
         ASSERT_EQUALS("template < typename T > void g ( S < & T :: operator- < double > > ) { }", tokenizeAndStringify(code4));
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyOperatorName12() { // #9110
-        const char code[] = "namespace a {"
-                            "template <typename b> void operator+(b);"
-                            "}"
-                            "using a::operator+;";
-        ASSERT_EQUALS("namespace a { "
-                      "template < typename b > void operator+ ( b ) ; "
-                      "} "
+        const char code[] = "namespace a {\n"
+                            "template <typename b> void operator+(b);\n"
+                            "}\n"
+                            "using a::operator+;\n";
+        ASSERT_EQUALS("namespace a {\n"
+                      "template < typename b > void operator+ ( b ) ;\n"
+                      "}\n"
                       "using a :: operator+ ;",
                       tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName13() { // user defined literal
-        const char code[] = "unsigned long operator\"\"_numch(const char *ch, unsigned long size);";
+        const char code[] = "unsigned long operator\"\"_numch(const char *ch, unsigned long size);\n";
         ASSERT_EQUALS("unsigned long operator\"\"_numch ( const char * ch , unsigned long size ) ;",
                       tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName14() { // std::complex operator "" if
         {
-            const char code[] = "constexpr std::complex<float> operator\"\"if(long double __num);";
+            const char code[] = "constexpr std::complex<float> operator\"\"if(long double __num);\n";
             ASSERT_EQUALS("constexpr std :: complex < float > operator\"\"if ( long double __num ) ;",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "constexpr std::complex<float> operator\"\"if(long double __num) { }";
+            const char code[] = "constexpr std::complex<float> operator\"\"if(long double __num) { }\n";
             ASSERT_EQUALS("constexpr std :: complex < float > operator\"\"if ( long double __num ) { }",
                           tokenizeAndStringify(code));
         }
     }
 
     void simplifyOperatorName15() { // ticket #9468 syntaxError
-        const char code[] = "template <typename> struct a;"
-                            "template <typename> struct b {"
-                            "  typedef char c;"
-                            "  operator c();"
-                            "};"
-                            "template <> struct a<char> : b<char> { using b::operator char; };";
-        ASSERT_EQUALS("struct a<char> ; template < typename > struct a ; "
-                      "struct b<char> ; "
-                      "struct a<char> : b<char> { using b :: operatorchar ; } ; struct b<char> { "
-                      "operatorchar ( ) ; "
+        const char code[] = "template <typename> struct a;\n"
+                            "template <typename> struct b {\n"
+                            "  typedef char c;\n"
+                            "  operator c();\n"
+                            "};\n"
+                            "template <> struct a<char> : b<char> { using b::operator char; };\n";
+        ASSERT_EQUALS("struct a<char> ;\n"
+                      "template < typename > struct a ;\n"
+                      "struct b<char> ;\n"
+                      "\n"
+                      "\n"
+                      "\n"
+                      "struct a<char> : b<char> { using b :: operatorchar ; } ;\n"
+                      "struct b<char> {\n"
+                      "\n"
+                      "operatorchar ( ) ;\n"
                       "} ;",
                       tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName16() { // ticket #9472
         {
-            const char code[] = "class I : public A { iterator& operator++() override; };";
+            const char code[] = "class I : public A { iterator& operator++() override; };\n";
             ASSERT_EQUALS("class I : public A { iterator & operator++ ( ) override ; } ;",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "class I : public A { iterator& operator++() override { } };";
+            const char code[] = "class I : public A { iterator& operator++() override { } };\n";
             ASSERT_EQUALS("class I : public A { iterator & operator++ ( ) override { } } ;",
                           tokenizeAndStringify(code));
         }
@@ -5586,32 +5991,32 @@ class TestTokenizer : public TestFixture {
 
     void simplifyOperatorName17() {
         {
-            const char code[] = "template <class a> void b(a c, a d) { c.operator>() == d; }";
+            const char code[] = "template <class a> void b(a c, a d) { c.operator>() == d; }\n";
             ASSERT_EQUALS("template < class a > void b ( a c , a d ) { c . operator> ( ) == d ; }",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "template <class a> void b(a c, a d) { c.operator>() == (d + 1); }";
+            const char code[] = "template <class a> void b(a c, a d) { c.operator>() == (d + 1); }\n";
             ASSERT_EQUALS("template < class a > void b ( a c , a d ) { c . operator> ( ) == ( d + 1 ) ; }",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "template <class a> void b(a c, a d) { c.operator<() == d; }";
+            const char code[] = "template <class a> void b(a c, a d) { c.operator<() == d; }\n";
             ASSERT_EQUALS("template < class a > void b ( a c , a d ) { c . operator< ( ) == d ; }",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "template <class a> void b(a c, a d) { c.operator>() == (d + 1); }";
+            const char code[] = "template <class a> void b(a c, a d) { c.operator>() == (d + 1); }\n";
             ASSERT_EQUALS("template < class a > void b ( a c , a d ) { c . operator> ( ) == ( d + 1 ) ; }",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "template <class a> void b(a c, a d) { c.operator++() == d; }";
+            const char code[] = "template <class a> void b(a c, a d) { c.operator++() == d; }\n";
             ASSERT_EQUALS("template < class a > void b ( a c , a d ) { c . operator++ ( ) == d ; }",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "template <class a> void b(a c, a d) { c.operator++() == (d + 1); }";
+            const char code[] = "template <class a> void b(a c, a d) { c.operator++() == (d + 1); }\n";
             ASSERT_EQUALS("template < class a > void b ( a c , a d ) { c . operator++ ( ) == ( d + 1 ) ; }",
                           tokenizeAndStringify(code));
         }
@@ -5619,102 +6024,102 @@ class TestTokenizer : public TestFixture {
 
     void simplifyOperatorName18() { // global namespace
         {
-            const char code[] = "struct Fred { operator std::string() const { return std::string(\"Fred\"); } };";
+            const char code[] = "struct Fred { operator std::string() const { return std::string(\"Fred\"); } };\n";
             ASSERT_EQUALS("struct Fred { operatorstd::string ( ) const { return std :: string ( \"Fred\" ) ; } } ;",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "struct Fred { operator ::std::string() const { return ::std::string(\"Fred\"); } };";
+            const char code[] = "struct Fred { operator ::std::string() const { return ::std::string(\"Fred\"); } };\n";
             ASSERT_EQUALS("struct Fred { operator::std::string ( ) const { return :: std :: string ( \"Fred\" ) ; } } ;",
                           tokenizeAndStringify(code));
         }
     }
 
     void simplifyOperatorName19() {
-        const char code[] = "struct v {};"
-                            "enum E { e };"
-                            "struct s {"
-                            "  operator struct v() { return v(); };"
-                            "  operator enum E() { return e; }"
-                            "};"
-                            "void f() {"
-                            "  (void)&s::operator struct v;"
-                            "  (void)&s::operator enum E;"
-                            "}";
-        ASSERT_EQUALS("struct v { } ; "
-                      "enum E { e } ; "
-                      "struct s { "
-                      "operatorstructv ( ) { return v ( ) ; } ; "
-                      "operatorenumE ( ) { return e ; } "
-                      "} ; "
-                      "void f ( ) { "
-                      "( void ) & s :: operatorstructv ; "
-                      "( void ) & s :: operatorenumE ; "
+        const char code[] = "struct v {};\n"
+                            "enum E { e };\n"
+                            "struct s {\n"
+                            "  operator struct v() { return v(); };\n"
+                            "  operator enum E() { return e; }\n"
+                            "};\n"
+                            "void f() {\n"
+                            "  (void)&s::operator struct v;\n"
+                            "  (void)&s::operator enum E;\n"
+                            "}\n";
+        ASSERT_EQUALS("struct v { } ;\n"
+                      "enum E { e } ;\n"
+                      "struct s {\n"
+                      "operatorstructv ( ) { return v ( ) ; } ;\n"
+                      "operatorenumE ( ) { return e ; }\n"
+                      "} ;\n"
+                      "void f ( ) {\n"
+                      "( void ) & s :: operatorstructv ;\n"
+                      "( void ) & s :: operatorenumE ;\n"
                       "}",
                       tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName20() {
-        const char code[] = "void operator \"\" _a(const char *);"
-                            "namespace N {"
-                            "  using ::operator \"\" _a;"
-                            "  void operator \"\" _b(const char *);"
-                            "}";
-        ASSERT_EQUALS("void operator\"\"_a ( const char * ) ; "
-                      "namespace N { "
-                      "using :: operator\"\"_a ; "
-                      "void operator\"\"_b ( const char * ) ; "
+        const char code[] = "void operator \"\" _a(const char *);\n"
+                            "namespace N {\n"
+                            "  using ::operator \"\" _a;\n"
+                            "  void operator \"\" _b(const char *);\n"
+                            "}\n";
+        ASSERT_EQUALS("void operator\"\"_a ( const char * ) ;\n"
+                      "namespace N {\n"
+                      "using :: operator\"\"_a ;\n"
+                      "void operator\"\"_b ( const char * ) ;\n"
                       "}",
                       tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName21() {
-        const char code[] = "template<char...> void operator \"\" _h() {}"
-                            "template<> void operator \"\" _h<'a', 'b', 'c'>() {}"
-                            "template void operator \"\" _h<'a', 'b', 'c', 'd'>();";
-        ASSERT_EQUALS("void operator\"\"_h<'a','b','c'> ( ) ; "
-                      "void operator\"\"_h<'a','b','c','d'> ( ) ; "
-                      "void operator\"\"_h<'a','b','c'> ( ) { } "
+        const char code[] = "template<char...> void operator \"\" _h() {}\n"
+                            "template<> void operator \"\" _h<'a', 'b', 'c'>() {}\n"
+                            "template void operator \"\" _h<'a', 'b', 'c', 'd'>();\n";
+        ASSERT_EQUALS("void operator\"\"_h<'a','b','c'> ( ) ;\n"
+                      "void operator\"\"_h<'a','b','c','d'> ( ) ;\n"
+                      "void operator\"\"_h<'a','b','c'> ( ) { }\n"
                       "void operator\"\"_h<'a','b','c','d'> ( ) { }",
                       tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName22() {
-        const char code[] = "static RSLRelOp convertOperator(const Software::ComparisonOperator& op) {"
-                            "  if (op == &Software::operator==) return RSLEqual;"
-                            "return RSLNotEqual;"
-                            "}";
-        ASSERT_EQUALS("static RSLRelOp convertOperator ( const Software :: ComparisonOperator & op ) { "
-                      "if ( op == & Software :: operator== ) { return RSLEqual ; } "
-                      "return RSLNotEqual ; "
+        const char code[] = "static RSLRelOp convertOperator(const Software::ComparisonOperator& op) {\n"
+                            "  if (op == &Software::operator==) return RSLEqual;\n"
+                            "return RSLNotEqual;\n"
+                            "}\n";
+        ASSERT_EQUALS("static RSLRelOp convertOperator ( const Software :: ComparisonOperator & op ) {\n"
+                      "if ( op == & Software :: operator== ) { return RSLEqual ; }\n"
+                      "return RSLNotEqual ;\n"
                       "}",
                       tokenizeAndStringify(code));
         ASSERT_EQUALS(
-            "[test.cpp:1:116]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable RSLEqual [valueFlowBailoutIncompleteVar]\n",
+            "[test.cpp:2:43]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable RSLEqual [valueFlowBailoutIncompleteVar]\n",
             filter_valueflow(errout_str()));
     }
 
     void simplifyOperatorName23() {
         {
-            const char code[] = "double *vtkMatrix3x3::operator[](const unsigned int i) {"
-                                "  VTK_LEGACY_BODY(vtkMatrix3x3::operator[], \"VTK 7.0\");"
-                                "  return &(this->Element[i][0]);"
-                                "}";
-            ASSERT_EQUALS("double * vtkMatrix3x3 :: operator[] ( const unsigned int i ) { "
-                          "VTK_LEGACY_BODY ( vtkMatrix3x3 :: operator[] , \"VTK 7.0\" ) ; "
-                          "return & ( this . Element [ i ] [ 0 ] ) ; "
+            const char code[] = "double *vtkMatrix3x3::operator[](const unsigned int i) {\n"
+                                "  VTK_LEGACY_BODY(vtkMatrix3x3::operator[], \"VTK 7.0\");\n"
+                                "  return &(this->Element[i][0]);\n"
+                                "}\n";
+            ASSERT_EQUALS("double * vtkMatrix3x3 :: operator[] ( const unsigned int i ) {\n"
+                          "VTK_LEGACY_BODY ( vtkMatrix3x3 :: operator[] , \"VTK 7.0\" ) ;\n"
+                          "return & ( this . Element [ i ] [ 0 ] ) ;\n"
                           "}",
                           tokenizeAndStringify(code));
             ignore_errout();
         }
         {
-            const char code[] = "double *vtkMatrix3x3::operator,(const unsigned int i) {"
-                                "  VTK_LEGACY_BODY(vtkMatrix3x3::operator,, \"VTK 7.0\");"
-                                "  return &(this->Element[i][0]);"
-                                "}";
-            ASSERT_EQUALS("double * vtkMatrix3x3 :: operator, ( const unsigned int i ) { "
-                          "VTK_LEGACY_BODY ( vtkMatrix3x3 :: operator, , \"VTK 7.0\" ) ; "
-                          "return & ( this . Element [ i ] [ 0 ] ) ; "
+            const char code[] = "double *vtkMatrix3x3::operator,(const unsigned int i) {\n"
+                                "  VTK_LEGACY_BODY(vtkMatrix3x3::operator,, \"VTK 7.0\");\n"
+                                "  return &(this->Element[i][0]);\n"
+                                "}\n";
+            ASSERT_EQUALS("double * vtkMatrix3x3 :: operator, ( const unsigned int i ) {\n"
+                          "VTK_LEGACY_BODY ( vtkMatrix3x3 :: operator, , \"VTK 7.0\" ) ;\n"
+                          "return & ( this . Element [ i ] [ 0 ] ) ;\n"
                           "}",
                           tokenizeAndStringify(code));
             ignore_errout();
@@ -5723,35 +6128,37 @@ class TestTokenizer : public TestFixture {
 
     void simplifyOperatorName24() {
         {
-            const char code[] = "void foo() { int i = a.operator++() ? a.operator--() : 0; }";
+            const char code[] = "void foo() { int i = a.operator++() ? a.operator--() : 0; }\n";
             ASSERT_EQUALS("void foo ( ) { int i ; i = a . operator++ ( ) ? a . operator-- ( ) : 0 ; }",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "void foo() { int i = a.operator++(0) ? a.operator--(0) : 0; }";
+            const char code[] = "void foo() { int i = a.operator++(0) ? a.operator--(0) : 0; }\n";
             ASSERT_EQUALS("void foo ( ) { int i ; i = a . operator++ ( 0 ) ? a . operator-- ( 0 ) : 0 ; }",
                           tokenizeAndStringify(code));
         }
     }
 
     void simplifyOperatorName25() {
-        const char code[] = "bool negative(const Number &num) { return num.operator std::string()[0] == '-'; }";
+        const char code[] = "bool negative(const Number &num) { return num.operator std::string()[0] == '-'; }\n";
         ASSERT_EQUALS("bool negative ( const Number & num ) { return num . operatorstd::string ( ) [ 0 ] == '-' ; }",
                       tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName26() {
-        const char code[] = "void foo() {"
-                            "    x = y.operator *().z[123];"
-                            "}";
-        ASSERT_EQUALS("void foo ( ) { x = y . operator* ( ) . z [ 123 ] ; }",
+        const char code[] = "void foo() {\n"
+                            "    x = y.operator *().z[123];\n"
+                            "}\n";
+        ASSERT_EQUALS("void foo ( ) {\n"
+                      "x = y . operator* ( ) . z [ 123 ] ;\n"
+                      "}",
                       tokenizeAndStringify(code));
         ignore_errout();
     }
 
     void simplifyOperatorName27() {
         const char code[] = "int operator \"\" i (const char *, int);\n"
-                            "x = \"abc\"i;";
+                            "x = \"abc\"i;\n";
         ASSERT_EQUALS("int operator\"\"i ( const char * , int ) ;\n"
                       "x = operator\"\"i ( \"abc\" , 3 ) ;",
                       tokenizeAndStringify(code));
@@ -5759,7 +6166,7 @@ class TestTokenizer : public TestFixture {
 
     void simplifyOperatorName28() {
         const char code[] = "template<class... Ts> struct overloaded : Ts... { using Ts::operator()...; };\n"
-                            "int main() { }";
+                            "int main() { }\n";
         ASSERT_EQUALS("template < class ... Ts > struct overloaded : Ts ... { using Ts :: operator ( ) ... ; } ;\n"
                       "int main ( ) { }",
                       tokenizeAndStringify(code));
@@ -5768,7 +6175,7 @@ class TestTokenizer : public TestFixture {
 
     void simplifyOperatorName29() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP20).build();
-        ASSERT_EQUALS("auto operator<=> ( ) ;", tokenizeAndStringify("auto operator<=>();", settings));
+        ASSERT_EQUALS("auto operator<=> ( ) ;", tokenizeAndStringify("auto operator<=>();\n", settings));
     }
 
     void simplifyOperatorName30() { // #14151
@@ -5791,7 +6198,7 @@ class TestTokenizer : public TestFixture {
                             "    typedef T A[3];\n"
                             "    operator A& () { return x_; }\n"
                             "    A x_;\n"
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("template < typename T >\nstruct B {\n\nT ( & operatorT ( ) ) [ 3 ] { return x_ ; }\nT x_ [ 3 ] ;\n} ;", tokenizeAndStringify(code));
         ASSERT_EQUALS("", errout_str());
     }
@@ -5813,7 +6220,7 @@ class TestTokenizer : public TestFixture {
                             "\n"
                             "void foo(S x) {\n"
                             "    x(123);\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("struct S { void operator() ( int ) ; } ;\n"
                       "\n"
                       "void foo ( S x ) {\n"
@@ -5841,7 +6248,7 @@ class TestTokenizer : public TestFixture {
                             "    Func max;\n"
                             "    double y = 0;\n"
                             "    foo(0, max(y));\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("struct Func { double operator() ( double x ) const ; } ;\n"
                       "void foo ( double , double ) ;\n"
                       "void test ( ) {\n"
@@ -5853,40 +6260,40 @@ class TestTokenizer : public TestFixture {
     }
 
     void simplifyNullArray() {
-        ASSERT_EQUALS("* ( foo . bar [ 5 ] ) = x ;", tokenizeAndStringify("0[foo.bar[5]] = x;"));
+        ASSERT_EQUALS("* ( foo . bar [ 5 ] ) = x ;", tokenizeAndStringify("0[foo.bar[5]] = x;\n"));
     }
 
     void removeMacrosInGlobalScope() {
         // remove some unhandled macros in the global scope.
-        ASSERT_EQUALS("void f ( ) { }", tokenizeAndStringify("void f() NOTHROW { }"));
-        ASSERT_EQUALS("struct Foo { } ;", tokenizeAndStringify("struct __declspec(dllexport) Foo {};"));
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("ABA() namespace { int a ; }"), UNKNOWN_MACRO);
+        ASSERT_EQUALS("void f ( ) { }", tokenizeAndStringify("void f() NOTHROW { }\n"));
+        ASSERT_EQUALS("struct Foo { } ;", tokenizeAndStringify("struct __declspec(dllexport) Foo {};\n"));
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("ABA() namespace { int a ; }\n"), UNKNOWN_MACRO);
 
         // #3750
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("; AB(foo*) foo::foo() { }"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("; AB(foo*) foo::foo() { }\n"), UNKNOWN_MACRO);
 
         // #4834 - syntax error
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("A(B) foo() {}"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("A(B) foo() {}\n"), UNKNOWN_MACRO);
 
         // #3855
         ASSERT_EQUALS("; class foo { }",
-                      tokenizeAndStringify("; AB class foo { }"));
+                      tokenizeAndStringify("; AB class foo { }\n"));
         ASSERT_EQUALS("; CONST struct ABC abc ;",
-                      tokenizeAndStringify("; CONST struct ABC abc ;"));
+                      tokenizeAndStringify("; CONST struct ABC abc ;\n"));
 
         ASSERT_NO_THROW(tokenizeAndStringify("class A {\n"
                                              "  UNKNOWN_MACRO(A)\n" // <- this macro is ignored
                                              "private:\n"
                                              "  int x;\n"
-                                             "};"));
+                                             "};\n"));
 
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("MACRO(test) void test() { }"), UNKNOWN_MACRO); // #7931
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("MACRO(test) void test() { }\n"), UNKNOWN_MACRO); // #7931
 
         ASSERT_THROW_INTERNAL(tokenizeAndStringify("BEGIN_MESSAGE_MAP(CSetProgsAdvDlg, CResizableStandAloneDialog)\n"
                                                    "    ON_BN_CLICKED(IDC_ADDTOOL, OnBnClickedAddtool)\n"
                                                    "END_MESSAGE_MAP()\n"
                                                    "\n"
-                                                   "BOOL CSetProgsAdvDlg::OnInitDialog() {}"),
+                                                   "BOOL CSetProgsAdvDlg::OnInitDialog() {}\n"),
                               UNKNOWN_MACRO);
 
         ASSERT_EQUALS("struct S {\n"
@@ -5901,303 +6308,303 @@ class TestTokenizer : public TestFixture {
 
     void addSemicolonAfterUnknownMacro() {
         // #6975
-        ASSERT_EQUALS("void f ( ) { MACRO ( ) ; try { } }", tokenizeAndStringify("void f() { MACRO() try {} }"));
+        ASSERT_EQUALS("void f ( ) { MACRO ( ) ; try { } }", tokenizeAndStringify("void f() { MACRO() try {} }\n"));
         // #9376
-        ASSERT_EQUALS("MACRO ( ) ; using namespace foo ;", tokenizeAndStringify("MACRO() using namespace foo;"));
+        ASSERT_EQUALS("MACRO ( ) ; using namespace foo ;", tokenizeAndStringify("MACRO() using namespace foo;\n"));
     }
 
     void multipleAssignment() {
-        ASSERT_EQUALS("a = b = 0 ;", tokenizeAndStringify("a=b=0;"));
+        ASSERT_EQUALS("a = b = 0 ;", tokenizeAndStringify("a=b=0;\n"));
     }
 
     void platformWin() {
-        const char code[] = "BOOL f;"
-                            "BOOLEAN g;"
-                            "BYTE h;"
-                            "CHAR i;"
-                            "DWORD j;"
-                            "FLOAT k;"
-                            "INT l;"
-                            "INT32 m;"
-                            "INT64 n;"
-                            "LONG o;"
-                            "SHORT p;"
-                            "UCHAR q;"
-                            "UINT r;"
-                            "ULONG s;"
-                            "USHORT t;"
-                            "WORD u;"
-                            "VOID *v;"
-                            "LPBOOL w;"
-                            "PBOOL x;"
-                            "LPBYTE y;"
-                            "PBOOLEAN z;"
-                            "PBYTE A;"
-                            "LPCSTR B;"
-                            "PCSTR C;"
-                            "LPCVOID D;"
-                            "LPDWORD E;"
-                            "LPINT F;"
-                            "PINT G;"
-                            "LPLONG H;"
-                            "PLONG I;"
-                            "LPSTR J;"
-                            "PSTR K;"
-                            "PCHAR L;"
-                            "LPVOID M;"
-                            "PVOID N;"
-                            "BOOL _bool;"
-                            "HFILE hfile;"
-                            "LONG32 long32;"
-                            "LCID lcid;"
-                            "LCTYPE lctype;"
-                            "LGRPID lgrpid;"
-                            "LONG64 long64;"
-                            "PUCHAR puchar;"
-                            "LPCOLORREF lpcolorref;"
-                            "PDWORD pdword;"
-                            "PULONG pulong;"
-                            "SERVICE_STATUS_HANDLE service_status_hanlde;"
-                            "SC_LOCK sc_lock;"
-                            "SC_HANDLE sc_handle;"
-                            "HACCEL haccel;"
-                            "HCONV hconv;"
-                            "HCONVLIST hconvlist;"
-                            "HDDEDATA hddedata;"
-                            "HDESK hdesk;"
-                            "HDROP hdrop;"
-                            "HDWP hdwp;"
-                            "HENHMETAFILE henhmetafile;"
-                            "HHOOK hhook;"
-                            "HKL hkl;"
-                            "HMONITOR hmonitor;"
-                            "HSZ hsz;"
-                            "HWINSTA hwinsta;"
-                            "PWCHAR pwchar;"
-                            "PUSHORT pushort;"
-                            "LANGID langid;"
-                            "DWORD64 dword64;"
-                            "ULONG64 ulong64;"
-                            "LPWSTR lpcwstr;"
-                            "LPCWSTR lpcwstr;"
-                            "LPHANDLE lpHandle;"
-                            "PCWSTR pcwStr;"
-                            "PDWORDLONG pdWordLong;"
-                            "PDWORD_PTR pdWordPtr;"
-                            "PDWORD32 pdWord32;"
-                            "PDWORD64 pdWord64;"
-                            "LONGLONG ll;"
-                            "USN usn;"
-                            "PULONG64 puLong64;"
-                            "PULONG32 puLong32;"
-                            "PFLOAT ptrToFloat;";
-
-        const char expected[] = "int f ; "
-                                "unsigned char g ; "
-                                "unsigned char h ; "
-                                "char i ; "
-                                "unsigned long j ; "
-                                "float k ; "
-                                "int l ; "
-                                "int m ; "
-                                "long long n ; "
-                                "long o ; "
-                                "short p ; "
-                                "unsigned char q ; "
-                                "unsigned int r ; "
-                                "unsigned long s ; "
-                                "unsigned short t ; "
-                                "unsigned short u ; "
-                                "void * v ; "
-                                "int * w ; "
-                                "int * x ; "
-                                "unsigned char * y ; "
-                                "unsigned char * z ; "
-                                "unsigned char * A ; "
-                                "const char * B ; "
-                                "const char * C ; "
-                                "const void * D ; "
-                                "unsigned long * E ; "
-                                "int * F ; "
-                                "int * G ; "
-                                "long * H ; "
-                                "long * I ; "
-                                "char * J ; "
-                                "char * K ; "
-                                "char * L ; "
-                                "void * M ; "
-                                "void * N ; "
-                                "int _bool ; "
-                                "int hfile ; "
-                                "int long32 ; "
-                                "unsigned long lcid ; "
-                                "unsigned long lctype ; "
-                                "unsigned long lgrpid ; "
-                                "long long long64 ; "
-                                "unsigned char * puchar ; "
-                                "unsigned long * lpcolorref ; "
-                                "unsigned long * pdword ; "
-                                "unsigned long * pulong ; "
-                                "void * service_status_hanlde ; "
-                                "void * sc_lock ; "
-                                "void * sc_handle ; "
-                                "void * haccel ; "
-                                "void * hconv ; "
-                                "void * hconvlist ; "
-                                "void * hddedata ; "
-                                "void * hdesk ; "
-                                "void * hdrop ; "
-                                "void * hdwp ; "
-                                "void * henhmetafile ; "
-                                "void * hhook ; "
-                                "void * hkl ; "
-                                "void * hmonitor ; "
-                                "void * hsz ; "
-                                "void * hwinsta ; "
-                                "wchar_t * pwchar ; "
-                                "unsigned short * pushort ; "
-                                "unsigned short langid ; "
-                                "unsigned long long dword64 ; "
-                                "unsigned long long ulong64 ; "
-                                "wchar_t * lpcwstr ; "
-                                "const wchar_t * lpcwstr ; "
-                                "void * lpHandle ; "
-                                "const wchar_t * pcwStr ; "
-                                "long * pdWordLong ; "
-                                "long * pdWordPtr ; "
-                                "unsigned int * pdWord32 ; "
-                                "unsigned long * pdWord64 ; "
-                                "long long ll ; "
-                                "long long usn ; "
-                                "unsigned long long * puLong64 ; "
-                                "unsigned int * puLong32 ; "
+        const char code[] = "BOOL f;\n"
+                            "BOOLEAN g;\n"
+                            "BYTE h;\n"
+                            "CHAR i;\n"
+                            "DWORD j;\n"
+                            "FLOAT k;\n"
+                            "INT l;\n"
+                            "INT32 m;\n"
+                            "INT64 n;\n"
+                            "LONG o;\n"
+                            "SHORT p;\n"
+                            "UCHAR q;\n"
+                            "UINT r;\n"
+                            "ULONG s;\n"
+                            "USHORT t;\n"
+                            "WORD u;\n"
+                            "VOID *v;\n"
+                            "LPBOOL w;\n"
+                            "PBOOL x;\n"
+                            "LPBYTE y;\n"
+                            "PBOOLEAN z;\n"
+                            "PBYTE A;\n"
+                            "LPCSTR B;\n"
+                            "PCSTR C;\n"
+                            "LPCVOID D;\n"
+                            "LPDWORD E;\n"
+                            "LPINT F;\n"
+                            "PINT G;\n"
+                            "LPLONG H;\n"
+                            "PLONG I;\n"
+                            "LPSTR J;\n"
+                            "PSTR K;\n"
+                            "PCHAR L;\n"
+                            "LPVOID M;\n"
+                            "PVOID N;\n"
+                            "BOOL _bool;\n"
+                            "HFILE hfile;\n"
+                            "LONG32 long32;\n"
+                            "LCID lcid;\n"
+                            "LCTYPE lctype;\n"
+                            "LGRPID lgrpid;\n"
+                            "LONG64 long64;\n"
+                            "PUCHAR puchar;\n"
+                            "LPCOLORREF lpcolorref;\n"
+                            "PDWORD pdword;\n"
+                            "PULONG pulong;\n"
+                            "SERVICE_STATUS_HANDLE service_status_hanlde;\n"
+                            "SC_LOCK sc_lock;\n"
+                            "SC_HANDLE sc_handle;\n"
+                            "HACCEL haccel;\n"
+                            "HCONV hconv;\n"
+                            "HCONVLIST hconvlist;\n"
+                            "HDDEDATA hddedata;\n"
+                            "HDESK hdesk;\n"
+                            "HDROP hdrop;\n"
+                            "HDWP hdwp;\n"
+                            "HENHMETAFILE henhmetafile;\n"
+                            "HHOOK hhook;\n"
+                            "HKL hkl;\n"
+                            "HMONITOR hmonitor;\n"
+                            "HSZ hsz;\n"
+                            "HWINSTA hwinsta;\n"
+                            "PWCHAR pwchar;\n"
+                            "PUSHORT pushort;\n"
+                            "LANGID langid;\n"
+                            "DWORD64 dword64;\n"
+                            "ULONG64 ulong64;\n"
+                            "LPWSTR lpcwstr;\n"
+                            "LPCWSTR lpcwstr;\n"
+                            "LPHANDLE lpHandle;\n"
+                            "PCWSTR pcwStr;\n"
+                            "PDWORDLONG pdWordLong;\n"
+                            "PDWORD_PTR pdWordPtr;\n"
+                            "PDWORD32 pdWord32;\n"
+                            "PDWORD64 pdWord64;\n"
+                            "LONGLONG ll;\n"
+                            "USN usn;\n"
+                            "PULONG64 puLong64;\n"
+                            "PULONG32 puLong32;\n"
+                            "PFLOAT ptrToFloat;\n";
+
+        const char expected[] = "int f ;\n"
+                                "unsigned char g ;\n"
+                                "unsigned char h ;\n"
+                                "char i ;\n"
+                                "unsigned long j ;\n"
+                                "float k ;\n"
+                                "int l ;\n"
+                                "int m ;\n"
+                                "long long n ;\n"
+                                "long o ;\n"
+                                "short p ;\n"
+                                "unsigned char q ;\n"
+                                "unsigned int r ;\n"
+                                "unsigned long s ;\n"
+                                "unsigned short t ;\n"
+                                "unsigned short u ;\n"
+                                "void * v ;\n"
+                                "int * w ;\n"
+                                "int * x ;\n"
+                                "unsigned char * y ;\n"
+                                "unsigned char * z ;\n"
+                                "unsigned char * A ;\n"
+                                "const char * B ;\n"
+                                "const char * C ;\n"
+                                "const void * D ;\n"
+                                "unsigned long * E ;\n"
+                                "int * F ;\n"
+                                "int * G ;\n"
+                                "long * H ;\n"
+                                "long * I ;\n"
+                                "char * J ;\n"
+                                "char * K ;\n"
+                                "char * L ;\n"
+                                "void * M ;\n"
+                                "void * N ;\n"
+                                "int _bool ;\n"
+                                "int hfile ;\n"
+                                "int long32 ;\n"
+                                "unsigned long lcid ;\n"
+                                "unsigned long lctype ;\n"
+                                "unsigned long lgrpid ;\n"
+                                "long long long64 ;\n"
+                                "unsigned char * puchar ;\n"
+                                "unsigned long * lpcolorref ;\n"
+                                "unsigned long * pdword ;\n"
+                                "unsigned long * pulong ;\n"
+                                "void * service_status_hanlde ;\n"
+                                "void * sc_lock ;\n"
+                                "void * sc_handle ;\n"
+                                "void * haccel ;\n"
+                                "void * hconv ;\n"
+                                "void * hconvlist ;\n"
+                                "void * hddedata ;\n"
+                                "void * hdesk ;\n"
+                                "void * hdrop ;\n"
+                                "void * hdwp ;\n"
+                                "void * henhmetafile ;\n"
+                                "void * hhook ;\n"
+                                "void * hkl ;\n"
+                                "void * hmonitor ;\n"
+                                "void * hsz ;\n"
+                                "void * hwinsta ;\n"
+                                "wchar_t * pwchar ;\n"
+                                "unsigned short * pushort ;\n"
+                                "unsigned short langid ;\n"
+                                "unsigned long long dword64 ;\n"
+                                "unsigned long long ulong64 ;\n"
+                                "wchar_t * lpcwstr ;\n"
+                                "const wchar_t * lpcwstr ;\n"
+                                "void * lpHandle ;\n"
+                                "const wchar_t * pcwStr ;\n"
+                                "long * pdWordLong ;\n"
+                                "long * pdWordPtr ;\n"
+                                "unsigned int * pdWord32 ;\n"
+                                "unsigned long * pdWord64 ;\n"
+                                "long long ll ;\n"
+                                "long long usn ;\n"
+                                "unsigned long long * puLong64 ;\n"
+                                "unsigned int * puLong32 ;\n"
                                 "float * ptrToFloat ;";
 
         // These types should be defined the same on all Windows platforms
-        const std::string win32A = tokenizeAndStringifyWindows(code, Platform::Type::Win32A);
+        const std::string win32A = tokenizeAndStringify(code, settings_win32a);
         ASSERT_EQUALS(expected, win32A);
-        ASSERT_EQUALS(win32A, tokenizeAndStringifyWindows(code, Platform::Type::Win32W));
-        ASSERT_EQUALS(win32A, tokenizeAndStringifyWindows(code, Platform::Type::Win64));
+        ASSERT_EQUALS(win32A, tokenizeAndStringify(code, settings_win32w));
+        ASSERT_EQUALS(win32A, tokenizeAndStringify(code, settings_win32a));
     }
 
     void platformWin32A() {
-        const char code[] = "wchar_t wc;"
-                            "TCHAR c;"
-                            "PTSTR ptstr;"
-                            "LPTSTR lptstr;"
-                            "PCTSTR pctstr;"
-                            "LPCTSTR lpctstr;"
-                            "void foo() {"
-                            "    TCHAR tc = _T(\'c\'); "
-                            "    TCHAR src[10] = _T(\"123456789\");"
-                            "    TCHAR dst[10];"
-                            "    _tcscpy(dst, src);"
-                            "    dst[0] = 0;"
-                            "    _tcscat(dst, src);"
-                            "    LPTSTR d = _tcsdup(src);"
-                            "    _tprintf(_T(\"Hello world!\"));"
-                            "    _stprintf(dst, _T(\"Hello!\"));"
-                            "    _sntprintf(dst, sizeof(dst) / sizeof(TCHAR), _T(\"Hello world!\"));"
-                            "    _tscanf(_T(\"%s\"), dst);"
-                            "    _stscanf(dst, _T(\"%s\"), dst);"
-                            "}"
-                            "TBYTE tbyte;";
-        const char expected[] = "wchar_t wc ; "
-                                "char c ; "
-                                "char * ptstr ; "
-                                "char * lptstr ; "
-                                "const char * pctstr ; "
-                                "const char * lpctstr ; "
-                                "void foo ( ) { "
-                                "char tc ; tc = \'c\' ; "
-                                "char src [ 10 ] = \"123456789\" ; "
-                                "char dst [ 10 ] ; "
-                                "strcpy ( dst , src ) ; "
-                                "dst [ 0 ] = 0 ; "
-                                "strcat ( dst , src ) ; "
-                                "char * d ; d = strdup ( src ) ; "
-                                "printf ( \"Hello world!\" ) ; "
-                                "sprintf ( dst , \"Hello!\" ) ; "
-                                "_snprintf ( dst , sizeof ( dst ) / sizeof ( char ) , \"Hello world!\" ) ; "
-                                "scanf ( \"%s\" , dst ) ; "
-                                "sscanf ( dst , \"%s\" , dst ) ; "
-                                "} "
+        const char code[] = "wchar_t wc;\n"
+                            "TCHAR c;\n"
+                            "PTSTR ptstr;\n"
+                            "LPTSTR lptstr;\n"
+                            "PCTSTR pctstr;\n"
+                            "LPCTSTR lpctstr;\n"
+                            "void foo() {\n"
+                            "    TCHAR tc = _T(\'c\');\n"
+                            "    TCHAR src[10] = _T(\"123456789\");\n"
+                            "    TCHAR dst[10];\n"
+                            "    _tcscpy(dst, src);\n"
+                            "    dst[0] = 0;\n"
+                            "    _tcscat(dst, src);\n"
+                            "    LPTSTR d = _tcsdup(src);\n"
+                            "    _tprintf(_T(\"Hello world!\"));\n"
+                            "    _stprintf(dst, _T(\"Hello!\"));\n"
+                            "    _sntprintf(dst, sizeof(dst) / sizeof(TCHAR), _T(\"Hello world!\"));\n"
+                            "    _tscanf(_T(\"%s\"), dst);\n"
+                            "    _stscanf(dst, _T(\"%s\"), dst);\n"
+                            "}\n"
+                            "TBYTE tbyte;\n";
+        const char expected[] = "wchar_t wc ;\n"
+                                "char c ;\n"
+                                "char * ptstr ;\n"
+                                "char * lptstr ;\n"
+                                "const char * pctstr ;\n"
+                                "const char * lpctstr ;\n"
+                                "void foo ( ) {\n"
+                                "char tc ; tc = \'c\' ;\n"
+                                "char src [ 10 ] = \"123456789\" ;\n"
+                                "char dst [ 10 ] ;\n"
+                                "strcpy ( dst , src ) ;\n"
+                                "dst [ 0 ] = 0 ;\n"
+                                "strcat ( dst , src ) ;\n"
+                                "char * d ; d = strdup ( src ) ;\n"
+                                "printf ( \"Hello world!\" ) ;\n"
+                                "sprintf ( dst , \"Hello!\" ) ;\n"
+                                "_snprintf ( dst , sizeof ( dst ) / sizeof ( char ) , \"Hello world!\" ) ;\n"
+                                "scanf ( \"%s\" , dst ) ;\n"
+                                "sscanf ( dst , \"%s\" , dst ) ;\n"
+                                "}\n"
                                 "unsigned char tbyte ;";
-        ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, Platform::Type::Win32A));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, settings_win32a));
 
         const char code2[] = "LPCTSTR f(void* p) { return LPCTSTR(p); }\n" // #11430
-                             "LPCTSTR g() { return LPCTSTR{}; }";
+                             "LPCTSTR g() { return LPCTSTR{}; }\n";
         const char expected2[] = "const char * f ( void * p ) { return ( const char * ) ( p ) ; }\n"
                                  "const char * g ( ) { return ( const char * ) ( 0 ) ; }";
-        ASSERT_EQUALS(expected2, tokenizeAndStringifyWindows(code2, Platform::Type::Win32A));
+        ASSERT_EQUALS(expected2, tokenizeAndStringify(code2, settings_win32a));
     }
 
     void platformWin32W() {
-        const char code[] = "wchar_t wc;"
-                            "TCHAR c;"
-                            "PTSTR ptstr;"
-                            "LPTSTR lptstr;"
-                            "PCTSTR pctstr;"
-                            "LPCTSTR lpctstr;"
-                            "TBYTE tbyte;"
-                            "void foo() {"
-                            "    TCHAR tc = _T(\'c\');"
-                            "    TCHAR src[10] = _T(\"123456789\");"
-                            "    TCHAR dst[10];"
-                            "    _tcscpy(dst, src);"
-                            "    dst[0] = 0;"
-                            "    _tcscat(dst, src);"
-                            "    LPTSTR d = _tcsdup(src);"
-                            "    _tprintf(_T(\"Hello world!\"));"
-                            "    _stprintf(dst, _T(\"Hello!\"));"
-                            "    _sntprintf(dst, sizeof(dst) / sizeof(TCHAR), _T(\"Hello world!\"));"
-                            "    _tscanf(_T(\"%s\"), dst);"
-                            "    _stscanf(dst, _T(\"%s\"), dst);"
-                            "}";
-        const char expected[] = "wchar_t wc ; "
-                                "wchar_t c ; "
-                                "wchar_t * ptstr ; "
-                                "wchar_t * lptstr ; "
-                                "const wchar_t * pctstr ; "
-                                "const wchar_t * lpctstr ; "
-                                "unsigned wchar_t tbyte ; "
-                                "void foo ( ) { "
-                                "wchar_t tc ; tc = L\'c\' ; "
-                                "wchar_t src [ 10 ] = L\"123456789\" ; "
-                                "wchar_t dst [ 10 ] ; "
-                                "wcscpy ( dst , src ) ; "
-                                "dst [ 0 ] = 0 ; "
-                                "wcscat ( dst , src ) ; "
-                                "wchar_t * d ; d = wcsdup ( src ) ; "
-                                "wprintf ( L\"Hello world!\" ) ; "
-                                "swprintf ( dst , L\"Hello!\" ) ; "
-                                "_snwprintf ( dst , sizeof ( dst ) / sizeof ( wchar_t ) , L\"Hello world!\" ) ; "
-                                "wscanf ( L\"%s\" , dst ) ; "
-                                "swscanf ( dst , L\"%s\" , dst ) ; "
+        const char code[] = "wchar_t wc;\n"
+                            "TCHAR c;\n"
+                            "PTSTR ptstr;\n"
+                            "LPTSTR lptstr;\n"
+                            "PCTSTR pctstr;\n"
+                            "LPCTSTR lpctstr;\n"
+                            "TBYTE tbyte;\n"
+                            "void foo() {\n"
+                            "    TCHAR tc = _T(\'c\');\n"
+                            "    TCHAR src[10] = _T(\"123456789\");\n"
+                            "    TCHAR dst[10];\n"
+                            "    _tcscpy(dst, src);\n"
+                            "    dst[0] = 0;\n"
+                            "    _tcscat(dst, src);\n"
+                            "    LPTSTR d = _tcsdup(src);\n"
+                            "    _tprintf(_T(\"Hello world!\"));\n"
+                            "    _stprintf(dst, _T(\"Hello!\"));\n"
+                            "    _sntprintf(dst, sizeof(dst) / sizeof(TCHAR), _T(\"Hello world!\"));\n"
+                            "    _tscanf(_T(\"%s\"), dst);\n"
+                            "    _stscanf(dst, _T(\"%s\"), dst);\n"
+                            "}\n";
+        const char expected[] = "wchar_t wc ;\n"
+                                "wchar_t c ;\n"
+                                "wchar_t * ptstr ;\n"
+                                "wchar_t * lptstr ;\n"
+                                "const wchar_t * pctstr ;\n"
+                                "const wchar_t * lpctstr ;\n"
+                                "unsigned wchar_t tbyte ;\n"
+                                "void foo ( ) {\n"
+                                "wchar_t tc ; tc = L\'c\' ;\n"
+                                "wchar_t src [ 10 ] = L\"123456789\" ;\n"
+                                "wchar_t dst [ 10 ] ;\n"
+                                "wcscpy ( dst , src ) ;\n"
+                                "dst [ 0 ] = 0 ;\n"
+                                "wcscat ( dst , src ) ;\n"
+                                "wchar_t * d ; d = wcsdup ( src ) ;\n"
+                                "wprintf ( L\"Hello world!\" ) ;\n"
+                                "swprintf ( dst , L\"Hello!\" ) ;\n"
+                                "_snwprintf ( dst , sizeof ( dst ) / sizeof ( wchar_t ) , L\"Hello world!\" ) ;\n"
+                                "wscanf ( L\"%s\" , dst ) ;\n"
+                                "swscanf ( dst , L\"%s\" , dst ) ;\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, Platform::Type::Win32W));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, settings_win32w));
     }
 
     void platformWin32AStringCat() { //#5150
-        const char code[] = "TCHAR text[] = _T(\"123\") _T(\"456\") _T(\"789\");";
+        const char code[] = "TCHAR text[] = _T(\"123\") _T(\"456\") _T(\"789\");\n";
         const char expected[] = "char text [ 10 ] = \"123456789\" ;";
-        ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, Platform::Type::Win32A));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, settings_win32a));
     }
 
     void platformWin32WStringCat() { //#5150
-        const char code[] = "TCHAR text[] = _T(\"123\") _T(\"456\") _T(\"789\");";
+        const char code[] = "TCHAR text[] = _T(\"123\") _T(\"456\") _T(\"789\");\n";
         const char expected[] = "wchar_t text [ 10 ] = L\"123456789\" ;";
-        ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, Platform::Type::Win32W));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, settings_win32w));
     }
 
     void platformWinWithNamespace() {
-        const char code1[] = "UINT32 a; ::UINT32 b; foo::UINT32 c;";
+        const char code1[] = "UINT32 a; ::UINT32 b; foo::UINT32 c;\n";
         const char expected1[] = "unsigned int a ; unsigned int b ; foo :: UINT32 c ;";
-        ASSERT_EQUALS(expected1, tokenizeAndStringifyWindows(code1, Platform::Type::Win32A));
+        ASSERT_EQUALS(expected1, tokenizeAndStringify(code1, settings_win32a));
 
-        const char code2[] = "LPCVOID a; ::LPCVOID b; foo::LPCVOID c;";
+        const char code2[] = "LPCVOID a; ::LPCVOID b; foo::LPCVOID c;\n";
         const char expected2[] = "const void * a ; const void * b ; foo :: LPCVOID c ;";
-        ASSERT_EQUALS(expected2, tokenizeAndStringifyWindows(code2, Platform::Type::Win32A));
+        ASSERT_EQUALS(expected2, tokenizeAndStringify(code2, settings_win32w));
     }
 
     void isOneNumber() const {
@@ -6217,7 +6624,7 @@ class TestTokenizer : public TestFixture {
     }
 
     void simplifyStaticConst() {
-        const char code1[]     = "class foo { public: bool const static c ; }";
+        const char code1[]     = "class foo { public: bool const static c ; }\n";
         const char expected1[] = "class foo { public: static const bool c ; }";
         ASSERT_EQUALS(expected1, tokenizeAndStringify(code1));
 
@@ -6244,7 +6651,7 @@ class TestTokenizer : public TestFixture {
             "int long long signed static const i18;\n"
             "return i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9 + i10 + i11 + i12\n"
             "+ i13 + i14 + i15 + i16 + i17 + i18;\n"
-            "}";
+            "}\n";
         const char expected2[] =
             "long long f ( )\n"
             "{\n"
@@ -6271,114 +6678,115 @@ class TestTokenizer : public TestFixture {
             "}";
         ASSERT_EQUALS(expected2, tokenizeAndStringify(code2));
 
-        const char code3[] = "const unsigned long extern int i;";
+        const char code3[] = "const unsigned long extern int i;\n";
         const char expected3[] = "extern const unsigned long i ;";
         ASSERT_EQUALS(expected3, tokenizeAndStringify(code3));
     }
 
     void simplifyCPPAttribute() {
         ASSERT_EQUALS("int f ( ) ;",
-                      tokenizeAndStringify("[[deprecated]] int f();"));
+                      tokenizeAndStringify("[[deprecated]] int f();\n"));
 
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("[[deprecated]] int f();", dinit(TokenizeOptions, $.cpp = false)), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("[[deprecated]] int f();\n", dinit(TokenizeOptions, $.cpp = false)), SYNTAX);
 
         ASSERT_EQUALS("template < class T > int f ( ) { }",
-                      tokenizeAndStringify("template <class T> [[noreturn]] int f(){}"));
+                      tokenizeAndStringify("template <class T> [[noreturn]] int f(){}\n"));
 
         ASSERT_EQUALS("int f ( int i ) ;",
-                      tokenizeAndStringify("[[maybe_unused]] int f([[maybe_unused]] int i);"));
+                      tokenizeAndStringify("[[maybe_unused]] int f([[maybe_unused]] int i);\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct [[]] a;"));
+                      tokenizeAndStringify("struct [[]] a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct [[,]] a;"));
+                      tokenizeAndStringify("struct [[,]] a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct [[deprecated,]] a;"));
+                      tokenizeAndStringify("struct [[deprecated,]] a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct [[,,]] a;"));
+                      tokenizeAndStringify("struct [[,,]] a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct [[deprecated,,]] a;"));
+                      tokenizeAndStringify("struct [[deprecated,,]] a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct [[deprecated,maybe_unused,]] a;"));
+                      tokenizeAndStringify("struct [[deprecated,maybe_unused,]] a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct [[,,,]] a;"));
+                      tokenizeAndStringify("struct [[,,,]] a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct alignas(int) a;"));
+                      tokenizeAndStringify("struct alignas(int) a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct alignas ( alignof ( float ) ) a;"));
+                      tokenizeAndStringify("struct alignas ( alignof ( float ) ) a;\n"));
 
         ASSERT_EQUALS("char a [ 256 ] ;",
-                      tokenizeAndStringify("alignas(256) char a[256];"));
+                      tokenizeAndStringify("alignas(256) char a[256];\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct alignas(float) [[deprecated(reason)]] a;"));
+                      tokenizeAndStringify("struct alignas(float) [[deprecated(reason)]] a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct [[deprecated,maybe_unused]] alignas(double) [[trivial_abi]] a;"));
+                      tokenizeAndStringify("struct [[deprecated,maybe_unused]] alignas(double) [[trivial_abi]] a;\n"));
 
         ASSERT_EQUALS("void func5 ( const char * , ... ) ;",
-                      tokenizeAndStringify("[[noreturn]] void func5(const char*, ...);"));
+                      tokenizeAndStringify("[[noreturn]] void func5(const char*, ...);\n"));
 
         ASSERT_EQUALS("void func5 ( const char * , ... ) ;",
-                      tokenizeAndStringify("[[noreturn]] [[gnu::format(printf, 1, 2)]] void func5(const char*, ...);"));
+                      tokenizeAndStringify("[[noreturn]] [[gnu::format(printf, 1, 2)]] void func5(const char*, ...);\n"));
 
         ASSERT_EQUALS("void func5 ( const char * , ... ) ;",
-                      tokenizeAndStringify("[[gnu::format(printf, 1, 2)]] [[noreturn]] void func5(const char*, ...);"));
+                      tokenizeAndStringify("[[gnu::format(printf, 1, 2)]] [[noreturn]] void func5(const char*, ...);\n"));
 
         ASSERT_EQUALS("int func1 ( ) ;",
-                      tokenizeAndStringify("[[nodiscard]] int func1();"));
+                      tokenizeAndStringify("[[nodiscard]] int func1();\n"));
 
         ASSERT_EQUALS("int func1 ( ) ;",
-                      tokenizeAndStringify("[[nodiscard]] [[clang::optnone]] int func1();"));
+                      tokenizeAndStringify("[[nodiscard]] [[clang::optnone]] int func1();\n"));
 
         ASSERT_EQUALS("int func1 ( ) ;",
-                      tokenizeAndStringify("[[clang::optnone]] [[nodiscard]] int func1();"));
+                      tokenizeAndStringify("[[clang::optnone]] [[nodiscard]] int func1();\n"));
 
+        const Settings s = settingsBuilder(settings1).c(Standards::C23).build();
         ASSERT_EQUALS("void f ( int i ) { exit ( i ) ; }",
-                      tokenizeAndStringify("[[noreturn]] void f(int i) { exit(i); }", dinit(TokenizeOptions, $.cpp = false, $.cstd = Standards::C23)));
+                      tokenizeAndStringify("[[noreturn]] void f(int i) { exit(i); }\n", s, false));
     }
 
     void simplifyCaseRange() {
-        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case 1 : case 2 : case 3 : case 4 : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case 1 ... 4: } }"));
-        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case 4 ... 1 : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case 4 ... 1: } }"));
-        (void)tokenizeAndStringify("void f(int x) { switch(x) { case 1 ... 1000000: } }"); // Do not run out of memory
+        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case 1 : case 2 : case 3 : case 4 : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case 1 ... 4: } }\n"));
+        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case 4 ... 1 : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case 4 ... 1: } }\n"));
+        (void)tokenizeAndStringify("void f(int x) { switch(x) { case 1 ... 1000000: } }\n"); // Do not run out of memory
 
-        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case 'a' : case 98 : case 'c' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case 'a' ... 'c': } }"));
-        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case 'c' ... 'a' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case 'c' ... 'a': } }"));
+        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case 'a' : case 98 : case 'c' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case 'a' ... 'c': } }\n"));
+        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case 'c' ... 'a' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case 'c' ... 'a': } }\n"));
 
-        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case '[' : case 92 : case ']' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case '[' ... ']': } }"));
+        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case '[' : case 92 : case ']' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case '[' ... ']': } }\n"));
 
-        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case '&' : case 39 : case '(' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case '&' ... '(': } }"));
-        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case '\\x61' : case 98 : case '\\x63' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case '\\x61' ... '\\x63': } }"));
+        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case '&' : case 39 : case '(' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case '&' ... '(': } }\n"));
+        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case '\\x61' : case 98 : case '\\x63' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case '\\x61' ... '\\x63': } }\n"));
     }
 
     void simplifyEmptyNamespaces() {
-        ASSERT_EQUALS(";", tokenizeAndStringify("namespace { }"));
-        ASSERT_EQUALS(";", tokenizeAndStringify("namespace foo { }"));
-        ASSERT_EQUALS(";", tokenizeAndStringify("namespace foo { namespace { } }"));
-        ASSERT_EQUALS(";", tokenizeAndStringify("namespace { namespace { } }")); // Ticket #9512
-        ASSERT_EQUALS(";", tokenizeAndStringify("namespace foo { namespace bar { } }"));
+        ASSERT_EQUALS(";", tokenizeAndStringify("namespace { }\n"));
+        ASSERT_EQUALS(";", tokenizeAndStringify("namespace foo { }\n"));
+        ASSERT_EQUALS(";", tokenizeAndStringify("namespace foo { namespace { } }\n"));
+        ASSERT_EQUALS(";", tokenizeAndStringify("namespace { namespace { } }\n")); // Ticket #9512
+        ASSERT_EQUALS(";", tokenizeAndStringify("namespace foo { namespace bar { } }\n"));
     }
 
     void prepareTernaryOpForAST() {
-        ASSERT_EQUALS("a ? b : c ;", tokenizeAndStringify("a ? b : c;"));
+        ASSERT_EQUALS("a ? b : c ;", tokenizeAndStringify("a ? b : c;\n"));
 
-        ASSERT_EQUALS("a ? ( b , c ) : d ;", tokenizeAndStringify("a ? b , c : d;"));
-        ASSERT_EQUALS("a ? ( b , c ) : d ;", tokenizeAndStringify("a ? (b , c) : d;"));
+        ASSERT_EQUALS("a ? ( b , c ) : d ;", tokenizeAndStringify("a ? b , c : d;\n"));
+        ASSERT_EQUALS("a ? ( b , c ) : d ;", tokenizeAndStringify("a ? (b , c) : d;\n"));
 
-        ASSERT_EQUALS("a ? ( 1 ? ( a , b ) : 3 ) : d ;", tokenizeAndStringify("a ? 1 ? a, b : 3 : d;"));
+        ASSERT_EQUALS("a ? ( 1 ? ( a , b ) : 3 ) : d ;", tokenizeAndStringify("a ? 1 ? a, b : 3 : d;\n"));
 
-        ASSERT_EQUALS("a ? ( std :: map < int , int > ( ) ) : 0 ;", tokenizeAndStringify("typedef std::map<int,int> mymap; a ? mymap() : 0;"));
+        ASSERT_EQUALS("a ? ( std :: map < int , int > ( ) ) : 0 ;", tokenizeAndStringify("typedef std::map<int,int> mymap; a ? mymap() : 0;\n"));
 
-        ASSERT_EQUALS("a ? ( b < c ) : d > e", tokenizeAndStringify("a ? b < c : d > e"));
+        ASSERT_EQUALS("a ? ( b < c ) : d > e", tokenizeAndStringify("a ? b < c : d > e\n"));
     }
 
     enum class AstStyle : std :: uint8_t {
@@ -6386,34 +6794,43 @@ class TestTokenizer : public TestFixture {
         Z3
     };
 
+    enum class ListSimplification : std::uint8_t {
+        Partial,
+        Full
+    };
+
     template<size_t size>
-    std::string testAst(const char (&data)[size], AstStyle style = AstStyle::Simple) {
+    std::string testAst(const char (&data)[size], AstStyle style = AstStyle::Simple, ListSimplification ls = ListSimplification::Partial) {
         // tokenize given code..
-        TokenList tokenlist{settings0, Standards::Language::CPP};
+        TokenList tokenlist{settingsDefault, Standards::Language::CPP};
         tokenlist.appendFileIfNew("test.cpp");
         if (!tokenlist.createTokensFromString(data))
             return "ERROR";
 
         TokenizerTest tokenizer(std::move(tokenlist), *this);
-        tokenizer.combineStringAndCharLiterals();
-        tokenizer.combineOperators();
-        tokenizer.simplifySpaceshipOperator();
-        tokenizer.createLinks();
-        tokenizer.createLinks2();
-        tokenizer.simplifyCAlternativeTokens();
-        tokenizer.list.front()->assignIndexes();
-
-        // set varid..
-        for (Token *tok = tokenizer.list.front(); tok; tok = tok->next()) {
-            if (tok->str() == "var")
-                tok->varId(1);
-        }
+        if (ls == ListSimplification::Partial) {
+            tokenizer.combineStringAndCharLiterals();
+            tokenizer.combineOperators();
+            tokenizer.simplifySpaceshipOperator();
+            tokenizer.createLinks();
+            tokenizer.createLinks2();
+            tokenizer.simplifyCAlternativeTokens();
+            tokenizer.list.front()->assignIndexes();
+
+            // set varid..
+            for (Token *tok = tokenizer.list.front(); tok; tok = tok->next()) {
+                if (tok->str() == "var")
+                    tok->varId(1);
+            }
 
-        // Create AST..
-        tokenizer.prepareTernaryOpForAST();
-        tokenizer.list.createAst();
+            // Create AST..
+            tokenizer.prepareTernaryOpForAST();
+            tokenizer.list.createAst();
 
-        tokenizer.list.validateAst(false);
+            tokenizer.list.validateAst(false);
+        } else { // Full
+            tokenizer.simplifyTokens1("");
+        }
 
         // Basic AST validation
         for (const Token *tok = tokenizer.list.front(); tok; tok = tok->next()) {
@@ -6439,134 +6856,135 @@ class TestTokenizer : public TestFixture {
     }
 
     void astexpr() { // simple expressions with arithmetical ops
-        ASSERT_EQUALS("12+3+", testAst("1+2+3"));
-        ASSERT_EQUALS("12*3+", testAst("1*2+3"));
-        ASSERT_EQUALS("123*+", testAst("1+2*3"));
-        ASSERT_EQUALS("12*34*+", testAst("1*2+3*4"));
-        ASSERT_EQUALS("12*34*5*+", testAst("1*2+3*4*5"));
-        ASSERT_EQUALS("0(r.&", testAst("(&((typeof(x))0).r);"));
-        ASSERT_EQUALS("0(r.&", testAst("&((typeof(x))0).r;"));
-        ASSERT_EQUALS("0f1(||", testAst("; 0 || f(1);"));
+        ASSERT_EQUALS("12+3+", testAst("1+2+3\n"));
+        ASSERT_EQUALS("12*3+", testAst("1*2+3\n"));
+        ASSERT_EQUALS("123*+", testAst("1+2*3\n"));
+        ASSERT_EQUALS("12*34*+", testAst("1*2+3*4\n"));
+        ASSERT_EQUALS("12*34*5*+", testAst("1*2+3*4*5\n"));
+        ASSERT_EQUALS("0(r.&", testAst("(&((typeof(x))0).r);\n"));
+        ASSERT_EQUALS("0(r.&", testAst("&((typeof(x))0).r;\n"));
+        ASSERT_EQUALS("0f1(||", testAst("; 0 || f(1);\n"));
 
         // Various tests of precedence
-        ASSERT_EQUALS("ab::c+", testAst("a::b+c"));
-        ASSERT_EQUALS("abc+=", testAst("a=b+c"));
-        ASSERT_EQUALS("abc=,", testAst("a,b=c"));
-        ASSERT_EQUALS("a-1+", testAst("-a+1"));
-        ASSERT_EQUALS("ab++-c-", testAst("a-b++-c"));
-        ASSERT_EQUALS("ab<=>", testAst("a<=>b"));
+        ASSERT_EQUALS("ab::c+", testAst("a::b+c\n"));
+        ASSERT_EQUALS("abc+=", testAst("a=b+c\n"));
+        ASSERT_EQUALS("abc=,", testAst("a,b=c\n"));
+        ASSERT_EQUALS("a-1+", testAst("-a+1\n"));
+        ASSERT_EQUALS("ab++-c-", testAst("a-b++-c\n"));
+        ASSERT_EQUALS("ab<=>", testAst("a<=>b\n"));
 
         // sizeof
-        ASSERT_EQUALS("ab.sizeof", testAst("sizeof a.b"));
+        ASSERT_EQUALS("ab.sizeof", testAst("sizeof a.b\n"));
 
         // assignment operators
-        ASSERT_EQUALS("ab>>=", testAst("a>>=b;"));
-        ASSERT_EQUALS("ab<<=", testAst("a<<=b;"));
-        ASSERT_EQUALS("ab+=",  testAst("a+=b;"));
-        ASSERT_EQUALS("ab-=",  testAst("a-=b;"));
-        ASSERT_EQUALS("ab*=",  testAst("a*=b;"));
-        ASSERT_EQUALS("ab/=",  testAst("a/=b;"));
-        ASSERT_EQUALS("ab%=",  testAst("a%=b;"));
-        ASSERT_EQUALS("ab&=",  testAst("a&=b;"));
-        ASSERT_EQUALS("ab|=",  testAst("a|=b;"));
-        ASSERT_EQUALS("ab^=",  testAst("a^=b;"));
-
-        ASSERT_EQUALS("ab*c*.(+return", testAst("return a + ((*b).*c)();"));
+        ASSERT_EQUALS("ab>>=", testAst("a>>=b;\n"));
+        ASSERT_EQUALS("ab<<=", testAst("a<<=b;\n"));
+        ASSERT_EQUALS("ab+=",  testAst("a+=b;\n"));
+        ASSERT_EQUALS("ab-=",  testAst("a-=b;\n"));
+        ASSERT_EQUALS("ab*=",  testAst("a*=b;\n"));
+        ASSERT_EQUALS("ab/=",  testAst("a/=b;\n"));
+        ASSERT_EQUALS("ab%=",  testAst("a%=b;\n"));
+        ASSERT_EQUALS("ab&=",  testAst("a&=b;\n"));
+        ASSERT_EQUALS("ab|=",  testAst("a|=b;\n"));
+        ASSERT_EQUALS("ab^=",  testAst("a^=b;\n"));
+
+        ASSERT_EQUALS("ab*c*.(+return", testAst("return a + ((*b).*c)();\n"));
 
         // assignments are executed from right to left
-        ASSERT_EQUALS("abc==", testAst("a=b=c;"));
+        ASSERT_EQUALS("abc==", testAst("a=b=c;\n"));
 
         // ternary operator
-        ASSERT_EQUALS("ab0=c1=:?", testAst("a?b=0:c=1;"));
-        ASSERT_EQUALS("fabc,d:?=e,", testAst("f = a ? b, c : d, e;"));
-        ASSERT_EQUALS("fabc,de,:?=", testAst("f = (a ? (b, c) : (d, e));"));
-        ASSERT_EQUALS("fabc,de,:?=", testAst("f = (a ? b, c : (d, e));"));
-        ASSERT_EQUALS("ab35,4:?foo(:?return", testAst("return (a ? b ? (3,5) : 4 : foo());"));
-        ASSERT_EQUALS("check(result_type00,{invalid:?return", testAst("return check() ? result_type {0, 0} : invalid;"));
-        ASSERT_EQUALS("x01:?return", testAst("return x ? 0 : 1;"));
-        ASSERT_EQUALS("x00throw:?return", testAst("return x ? 0 : throw 0;")); // #9768
-        ASSERT_EQUALS("val0<1throwval:?return", testAst("return val < 0 ? throw 1 : val;")); // #8526
-        ASSERT_EQUALS("ix0<00throw:?=", testAst("int i = x < 0 ? 0 : throw 0;"));
-        ASSERT_EQUALS("pa[pb[<1-pa[pb[>:?return", testAst("return p[a] < p[b] ? -1 : p[a] > p[b];"));
-
-        ASSERT_EQUALS("a\"\"=", testAst("a=\"\""));
-        ASSERT_EQUALS("a\'\'=", testAst("a=\'\'"));
-        ASSERT_EQUALS("'X''a'>", testAst("('X' > 'a')"));
-        ASSERT_EQUALS("L'X'L'a'>", testAst("(L'X' > L'a')"));
-        ASSERT_EQUALS("u'X'u'a'>", testAst("(u'X' > u'a')"));
-        ASSERT_EQUALS("U'X'U'a'>", testAst("(U'X' > U'a')"));
-        ASSERT_EQUALS("u8'X'u8'a'>", testAst("(u8'X' > u8'a')"));
-
-        ASSERT_EQUALS("a0>bc/d:?", testAst("(a>0) ? (b/(c)) : d;"));
-        ASSERT_EQUALS("abc/+d+", testAst("a + (b/(c)) + d;"));
-        ASSERT_EQUALS("x1024x/0:?", testAst("void f() { x ? 1024 / x : 0; }"));
-
-        ASSERT_EQUALS("absizeofd(ef.+(=", testAst("a = b(sizeof(c d) + e.f)"));
-
-        ASSERT_EQUALS("a*b***", testAst("*a * **b;")); // Correctly distinguish between unary and binary operator*
+        ASSERT_EQUALS("ab0=c1=:?", testAst("a?b=0:c=1;\n"));
+        ASSERT_EQUALS("fabc,d:?=e,", testAst("f = a ? b, c : d, e;\n"));
+        ASSERT_EQUALS("fabc,de,:?=", testAst("f = (a ? (b, c) : (d, e));\n"));
+        ASSERT_EQUALS("fabc,de,:?=", testAst("f = (a ? b, c : (d, e));\n"));
+        ASSERT_EQUALS("ab35,4:?foo(:?return", testAst("return (a ? b ? (3,5) : 4 : foo());\n"));
+        ASSERT_EQUALS("check(result_type00,{invalid:?return", testAst("return check() ? result_type {0, 0} : invalid;\n"));
+        ASSERT_EQUALS("x01:?return", testAst("return x ? 0 : 1;\n"));
+        ASSERT_EQUALS("x00throw:?return", testAst("return x ? 0 : throw 0;\n")); // #9768
+        ASSERT_EQUALS("val0<1throwval:?return", testAst("return val < 0 ? throw 1 : val;\n")); // #8526
+        ASSERT_EQUALS("ix0<00throw:?=", testAst("int i = x < 0 ? 0 : throw 0;\n"));
+        ASSERT_EQUALS("pa[pb[<1-pa[pb[>:?return", testAst("return p[a] < p[b] ? -1 : p[a] > p[b];\n"));
+
+        ASSERT_EQUALS("a\"\"=", testAst("a=\"\"\n"));
+        ASSERT_EQUALS("a\'\'=", testAst("a=\'\'\n"));
+        ASSERT_EQUALS("'X''a'>", testAst("('X' > 'a')\n"));
+        ASSERT_EQUALS("L'X'L'a'>", testAst("(L'X' > L'a')\n"));
+        ASSERT_EQUALS("u'X'u'a'>", testAst("(u'X' > u'a')\n"));
+        ASSERT_EQUALS("U'X'U'a'>", testAst("(U'X' > U'a')\n"));
+        ASSERT_EQUALS("u8'X'u8'a'>", testAst("(u8'X' > u8'a')\n"));
+
+        ASSERT_EQUALS("a0>bc/d:?", testAst("(a>0) ? (b/(c)) : d;\n"));
+        ASSERT_EQUALS("abc/+d+", testAst("a + (b/(c)) + d;\n"));
+        ASSERT_EQUALS("x1024x/0:?", testAst("void f() { x ? 1024 / x : 0; }\n"));
+
+        ASSERT_EQUALS("absizeofd(ef.+(=", testAst("a = b(sizeof(c d) + e.f)\n"));
+
+        ASSERT_EQUALS("a*b***", testAst("*a * **b;\n")); // Correctly distinguish between unary and binary operator*
 
         // strings
-        ASSERT_EQUALS("f\"A\"1,(",testAst("f(\"A\" B, 1);"));
-        ASSERT_EQUALS("fA1,(",testAst("f(A \"B\", 1);"));
+        ASSERT_EQUALS("f\"A\"1,(",testAst("f(\"A\" B, 1);\n"));
+        ASSERT_EQUALS("fA1,(",testAst("f(A \"B\", 1);\n"));
 
         // C++ : type()
-        ASSERT_EQUALS("fint(0,(", testAst("f(int(),0);"));
-        ASSERT_EQUALS("f(0,(", testAst("f(int *(),0);"));  // typedef int* X; f(X(),0);
-        ASSERT_EQUALS("f((0,(", testAst("f((intp)int *(),0);"));
-        ASSERT_EQUALS("zx1(&y2(&|=", testAst("z = (x & (unsigned)1) | (y & (unsigned)2);")); // not type()
+        ASSERT_EQUALS("fint(0,(", testAst("f(int(),0);\n"));
+        ASSERT_EQUALS("f(0,(", testAst("f(int *(),0);\n"));  // typedef int* X; f(X(),0);
+        ASSERT_EQUALS("f((0,(", testAst("f((intp)int *(),0);\n"));
+        ASSERT_EQUALS("zx1(&y2(&|=", testAst("z = (x & (unsigned)1) | (y & (unsigned)2);\n")); // not type()
 
         // for
-        ASSERT_EQUALS("for;;(", testAst("for(;;)"));
-        ASSERT_EQUALS("fora0=a8<a++;;(", testAst("for(a=0;a<8;a++)"));
-        ASSERT_EQUALS("fori1=current0=,iNUM<=i++;;(", testAst("for(i = (1), current = 0; i <= (NUM); ++i)"));
-        ASSERT_EQUALS("foreachxy,((", testAst("for(each(x,y)){}"));  // it's not well-defined what this ast should be
-        ASSERT_EQUALS("forvar1(;;(", testAst("for(int var(1);;)"));
-        ASSERT_EQUALS("forab:(", testAst("for (int a : b);"));
-        ASSERT_EQUALS("forvarb:(", testAst("for (int *var : b);"));
-        ASSERT_EQUALS("forvard:(", testAst("for (a<b> var : d);"));
-        ASSERT_EQUALS("forvare:(", testAst("for (a::b<c> var : e);"));
-        ASSERT_EQUALS("forx*0=yz;;(", testAst("for(*x=0;y;z)"));
-        ASSERT_EQUALS("forx0=y(8<z;;(", testAst("for (x=0;(int)y<8;z);"));
-        ASSERT_EQUALS("forab,c:(", testAst("for (auto [a,b]: c);"));
-        ASSERT_EQUALS("fora*++;;(", testAst("for (++(*a);;);"));
-        ASSERT_EQUALS("foryz:(", testAst("for (decltype(x) *y : z);"));
-        ASSERT_EQUALS("for(tmpNULL!=tmptmpnext.=;;( tmpa=", testAst("for ( ({ tmp = a; }) ; tmp != NULL; tmp = tmp->next ) {}"));
-        ASSERT_EQUALS("forx0=x;;(", testAst("for (int x=0; x;);"));
-        ASSERT_EQUALS("forae*bc.({:(", testAst("for (a *e : {b->c()});"));
-        ASSERT_EQUALS("fori0=iasize.(<i++;;( asize.(", testAst("for (decltype(a.size()) i = 0; i < a.size(); ++i);"));
-        ASSERT_EQUALS("foria:( asize.(", testAst("for(decltype(a.size()) i:a);"));
-        ASSERT_EQUALS("forec0{([,(:( fb.return", testAst("for (auto e : c(0, [](auto f) { return f->b; }));")); // #10802
-        ASSERT_EQUALS("forvar1{;;(", testAst("for(int var{1};;)")); // #12867
+        ASSERT_EQUALS("for;;(", testAst("for(;;)\n"));
+        ASSERT_EQUALS("fora0=a8<a++;;(", testAst("for(a=0;a<8;a++)\n"));
+        ASSERT_EQUALS("fori1=current0=,iNUM<=i++;;(", testAst("for(i = (1), current = 0; i <= (NUM); ++i)\n"));
+        ASSERT_EQUALS("foreachxy,((", testAst("for(each(x,y)){}\n"));  // it's not well-defined what this ast should be
+        ASSERT_EQUALS("forvar1(;;(", testAst("for(int var(1);;)\n"));
+        ASSERT_EQUALS("forab:(", testAst("for (int a : b);\n"));
+        ASSERT_EQUALS("forvarb:(", testAst("for (int *var : b);\n"));
+        ASSERT_EQUALS("forvard:(", testAst("for (a<b> var : d);\n"));
+        ASSERT_EQUALS("forvare:(", testAst("for (a::b<c> var : e);\n"));
+        ASSERT_EQUALS("forx*0=yz;;(", testAst("for(*x=0;y;z)\n"));
+        ASSERT_EQUALS("forx0=y(8<z;;(", testAst("for (x=0;(int)y<8;z);\n"));
+        ASSERT_EQUALS("forab,c:(", testAst("for (auto [a,b]: c);\n"));
+        ASSERT_EQUALS("fora*++;;(", testAst("for (++(*a);;);\n"));
+        ASSERT_EQUALS("foryz:(", testAst("for (decltype(x) *y : z);\n"));
+        ASSERT_EQUALS("for(tmpNULL!=tmptmpnext.=;;( tmpa=", testAst("for ( ({ tmp = a; }) ; tmp != NULL; tmp = tmp->next ) {}\n"));
+        ASSERT_EQUALS("forx0=x;;(", testAst("for (int x=0; x;);\n"));
+        ASSERT_EQUALS("forae*bc.({:(", testAst("for (a *e : {b->c()});\n"));
+        ASSERT_EQUALS("fori0=iasize.(<i++;;( asize.(", testAst("for (decltype(a.size()) i = 0; i < a.size(); ++i);\n"));
+        ASSERT_EQUALS("foria:( asize.(", testAst("for(decltype(a.size()) i:a);\n"));
+        ASSERT_EQUALS("forec0{([,(:( fb.return", testAst("for (auto e : c(0, [](auto f) { return f->b; }));\n")); // #10802
+        ASSERT_EQUALS("forvar1{;;(", testAst("for(int var{1};;)\n")); // #12867
+        ASSERT_EQUALS("forxg{([(:( si.return", testAst("for (auto [x] : g([](S s) { return s.i; })) {}\n")); // #11861
 
         // for with initializer (c++20)
-        ASSERT_EQUALS("forab=ca:;(", testAst("for(a=b;int c:a)"));
+        ASSERT_EQUALS("forab=ca:;(", testAst("for(a=b;int c:a)\n"));
 
         // problems with multiple expressions
-        ASSERT_EQUALS("ax( whilex(", testAst("a(x) while (x)"));
-        ASSERT_EQUALS("ifx( i0= whilei(", testAst("if (x) { ({ int i = 0; while(i); }) };"));
-        ASSERT_EQUALS("ifx( BUG_ON{!( i0= whilei(", testAst("if (x) { BUG_ON(!({int i=0; while(i);})); }"));
-        ASSERT_EQUALS("v0= while{0!=( v0= while{0!=( v0=", testAst("({ v = 0; }); while (({ v = 0; }) != 0); while (({ v = 0; }) != 0);"));
+        ASSERT_EQUALS("ax( whilex(", testAst("a(x) while (x)\n"));
+        ASSERT_EQUALS("ifx( i0= whilei(", testAst("if (x) { ({ int i = 0; while(i); }) };\n"));
+        ASSERT_EQUALS("ifx( BUG_ON{!( i0= whilei(", testAst("if (x) { BUG_ON(!({int i=0; while(i);})); }\n"));
+        ASSERT_EQUALS("v0= while{0!=( v0= while{0!=( v0=", testAst("({ v = 0; }); while (({ v = 0; }) != 0); while (({ v = 0; }) != 0);\n"));
 
 
-        ASSERT_EQUALS("abc.1:?1+bd.1:?+=", testAst("a =(b.c ? : 1) + 1 + (b.d ? : 1);"));
+        ASSERT_EQUALS("abc.1:?1+bd.1:?+=", testAst("a =(b.c ? : 1) + 1 + (b.d ? : 1);\n"));
 
-        ASSERT_EQUALS("catch...(", testAst("try {} catch (...) {}"));
+        ASSERT_EQUALS("catch...(", testAst("try {} catch (...) {}\n"));
 
-        ASSERT_EQUALS("", testAst("void Foo(Bar&);"));
-        ASSERT_EQUALS("", testAst("void Foo(Bar&&);"));
+        ASSERT_EQUALS("", testAst("void Foo(Bar&);\n"));
+        ASSERT_EQUALS("", testAst("void Foo(Bar&&);\n"));
 
-        ASSERT_EQUALS("Barb&", testAst("void Foo(Bar& b);"));
-        ASSERT_EQUALS("Barb&&", testAst("void Foo(Bar&& b);"));
+        ASSERT_EQUALS("Barb&", testAst("void Foo(Bar& b);\n"));
+        ASSERT_EQUALS("Barb&&", testAst("void Foo(Bar&& b);\n"));
 
-        ASSERT_EQUALS("DerivedDerived::(", testAst("Derived::~Derived() {}"));
+        ASSERT_EQUALS("DerivedDerived::(", testAst("Derived::~Derived() {}\n"));
 
-        ASSERT_EQUALS("ifCA_FarReadfilenew(,sizeofobjtype(,(!(", testAst("if (!CA_FarRead(file, (void far *)new, sizeof(objtype)))")); // #5910 - don't hang if C code is parsed as C++
+        ASSERT_EQUALS("ifCA_FarReadfilenew(,sizeofobjtype(,(!(", testAst("if (!CA_FarRead(file, (void far *)new, sizeof(objtype)))\n")); // #5910 - don't hang if C code is parsed as C++
 
         // C++17: if (expr1; expr2)
-        ASSERT_EQUALS("ifx3=y;(", testAst("if (int x=3; y)"));
+        ASSERT_EQUALS("ifx3=y;(", testAst("if (int x=3; y)\n"));
 
-        ASSERT_EQUALS("xstdstring::decltypes(a::{=", testAst("auto x = std::string{ decltype(s)::a };"));
-        ASSERT_EQUALS("if0decltypest.(X::>(", testAst("if (0 > decltype(s.t)::X) {}"));
+        ASSERT_EQUALS("xstdstring::decltypes(a::{=", testAst("auto x = std::string{ decltype(s)::a };\n"));
+        ASSERT_EQUALS("if0decltypest.(X::>(", testAst("if (0 > decltype(s.t)::X) {}\n"));
     }
 
     void astexpr2() { // limit for large expressions
@@ -6709,190 +7127,190 @@ class TestTokenizer : public TestFixture {
     }
 
     void astnewdelete() {
-        ASSERT_EQUALS("aintnew=", testAst("a = new int;"));
-        ASSERT_EQUALS("aint4[new=", testAst("a = new int[4];"));
-        ASSERT_EQUALS("aFoobar(new=", testAst("a = new Foo(bar);"));
-        ASSERT_EQUALS("aFoobar(new=", testAst("a = new Foo(bar);"));
-        ASSERT_EQUALS("aFoo(new=", testAst("a = new Foo<bar>();"));
-        ASSERT_EQUALS("aXnew(", testAst("a (new (X));"));
-        ASSERT_EQUALS("aXnew5,(", testAst("a (new (X), 5);"));
-        ASSERT_EQUALS("adelete", testAst("delete a;"));
-        ASSERT_EQUALS("adelete", testAst("delete (a);"));
-        ASSERT_EQUALS("adelete", testAst("delete[] a;"));
-        ASSERT_EQUALS("ab.3c-(delete", testAst("delete[] a.b(3 - c);"));
-        ASSERT_EQUALS("aA1(new(bB2(new(,", testAst("a(new A(1)), b(new B(2))"));
-        ASSERT_EQUALS("Fred10[new", testAst(";new Fred[10];"));
-        ASSERT_EQUALS("adelete", testAst("void f() { delete a; }"));
-        ASSERT_EQUALS("Aa*A{new=", testAst("A* a = new A{};"));
-        ASSERT_EQUALS("Aa*A12,{new=", testAst("A* a = new A{ 1, 2 };"));
-        ASSERT_EQUALS("Sv0[(new", testAst("new S(v[0]);")); // #10929
-        ASSERT_EQUALS("SS::x(px0>intx[{newint1[{new:?(:", testAst("S::S(int x) : p(x > 0 ? new int[x]{} : new int[1]{}) {}")); // #10793
-        ASSERT_EQUALS("a0[T{new=", testAst("a[0] = new T{};"));
-        ASSERT_EQUALS("a0[T::{new=", testAst("a[0] = new ::T{};"));
-        ASSERT_EQUALS("a0[ST::{new=", testAst("a[0] = new S::T{};"));
-        ASSERT_EQUALS("intnewdelete", testAst("delete new int;")); // #11039
-        ASSERT_EQUALS("intnewdelete", testAst("void f() { delete new int; }"));
-        ASSERT_EQUALS("pint3[new1+=", testAst("p = (new int[3]) + 1;")); // #11327
-        ASSERT_EQUALS("aType2[T1T2,{new=", testAst("a = new Type *[2] {T1, T2};")); // #11745
-        ASSERT_EQUALS("pSthis(new=", testAst("p = new S*(this);")); // #10809
-        ASSERT_EQUALS("pint0{new=", testAst("p = new int*{ 0 };"));
-        ASSERT_EQUALS("pint5[{new=", testAst("p = new int* [5]{};"));
-        ASSERT_EQUALS("pint5[0{new=", testAst("p = new int* [5]{ 0 };"));
-        ASSERT_EQUALS("sSint(new::(new=", testAst("s = new S(::new int());")); // #12502
-        ASSERT_EQUALS("sS(new::=", testAst("s = ::new (ptr) S();")); // #12552
-        ASSERT_EQUALS("pdelete::return", testAst("return ::delete p;"));
-        ASSERT_EQUALS("gn--(delete", testAst("delete g(--n);"));
-        ASSERT_EQUALS("bdeletep1*p0*,deletep0*p1*,:?*return", testAst("return *(b ? (delete *p1, *p0) : (delete *p0, *p1));")); // #10662
+        ASSERT_EQUALS("aintnew=", testAst("a = new int;\n"));
+        ASSERT_EQUALS("aint4[new=", testAst("a = new int[4];\n"));
+        ASSERT_EQUALS("aFoobar(new=", testAst("a = new Foo(bar);\n"));
+        ASSERT_EQUALS("aFoobar(new=", testAst("a = new Foo(bar);\n"));
+        ASSERT_EQUALS("aFoo(new=", testAst("a = new Foo<bar>();\n"));
+        ASSERT_EQUALS("aXnew(", testAst("a (new (X));\n"));
+        ASSERT_EQUALS("aXnew5,(", testAst("a (new (X), 5);\n"));
+        ASSERT_EQUALS("adelete", testAst("delete a;\n"));
+        ASSERT_EQUALS("adelete", testAst("delete (a);\n"));
+        ASSERT_EQUALS("adelete", testAst("delete[] a;\n"));
+        ASSERT_EQUALS("ab.3c-(delete", testAst("delete[] a.b(3 - c);\n"));
+        ASSERT_EQUALS("aA1(new(bB2(new(,", testAst("a(new A(1)), b(new B(2))\n"));
+        ASSERT_EQUALS("Fred10[new", testAst(";new Fred[10];\n"));
+        ASSERT_EQUALS("adelete", testAst("void f() { delete a; }\n"));
+        ASSERT_EQUALS("Aa*A{new=", testAst("A* a = new A{};\n"));
+        ASSERT_EQUALS("Aa*A12,{new=", testAst("A* a = new A{ 1, 2 };\n"));
+        ASSERT_EQUALS("Sv0[(new", testAst("new S(v[0]);\n")); // #10929
+        ASSERT_EQUALS("SS::x(px0>intx[{newint1[{new:?(:", testAst("S::S(int x) : p(x > 0 ? new int[x]{} : new int[1]{}) {}\n")); // #10793
+        ASSERT_EQUALS("a0[T{new=", testAst("a[0] = new T{};\n"));
+        ASSERT_EQUALS("a0[T::{new=", testAst("a[0] = new ::T{};\n"));
+        ASSERT_EQUALS("a0[ST::{new=", testAst("a[0] = new S::T{};\n"));
+        ASSERT_EQUALS("intnewdelete", testAst("delete new int;\n")); // #11039
+        ASSERT_EQUALS("intnewdelete", testAst("void f() { delete new int; }\n"));
+        ASSERT_EQUALS("pint3[new1+=", testAst("p = (new int[3]) + 1;\n")); // #11327
+        ASSERT_EQUALS("aType2[T1T2,{new=", testAst("a = new Type *[2] {T1, T2};\n")); // #11745
+        ASSERT_EQUALS("pSthis(new=", testAst("p = new S*(this);\n")); // #10809
+        ASSERT_EQUALS("pint0{new=", testAst("p = new int*{ 0 };\n"));
+        ASSERT_EQUALS("pint5[{new=", testAst("p = new int* [5]{};\n"));
+        ASSERT_EQUALS("pint5[0{new=", testAst("p = new int* [5]{ 0 };\n"));
+        ASSERT_EQUALS("sSint(new::(new=", testAst("s = new S(::new int());\n")); // #12502
+        ASSERT_EQUALS("sS(new::=", testAst("s = ::new (ptr) S();\n")); // #12552
+        ASSERT_EQUALS("pdelete::return", testAst("return ::delete p;\n"));
+        ASSERT_EQUALS("gn--(delete", testAst("delete g(--n);\n"));
+        ASSERT_EQUALS("bdeletep1*p0*,deletep0*p1*,:?*return", testAst("return *(b ? (delete *p1, *p0) : (delete *p0, *p1));\n")); // #10662
 
         // placement new
-        ASSERT_EQUALS("X12,3,(new ab,c,", testAst("new (a,b,c) X(1,2,3);"));
-        ASSERT_EQUALS("aX::new=", testAst("a = new (b) ::X;"));
-        ASSERT_EQUALS("cCnew= abc:?", testAst("c = new(a ? b : c) C;"));
+        ASSERT_EQUALS("X12,3,(new ab,c,", testAst("new (a,b,c) X(1,2,3);\n"));
+        ASSERT_EQUALS("aX::new=", testAst("a = new (b) ::X;\n"));
+        ASSERT_EQUALS("cCnew= abc:?", testAst("c = new(a ? b : c) C;\n"));
 
         // invalid code (libreoffice), don't hang
         // #define SlideSorterViewShell
         // SfxViewFrame* pFrame;
         // new SlideSorterViewShell(pFrame,rViewShellBase,pParentWindow,pFrameViewArgument);
-        ASSERT_EQUALS("fxnewy,z,(", testAst("f(new (x,y,z));"));
+        ASSERT_EQUALS("fxnewy,z,(", testAst("f(new (x,y,z));\n"));
 
         // clang testsuite..
-        ASSERT_EQUALS("const0(new", testAst("new const auto (0);"));
-        ASSERT_EQUALS("autonew", testAst("new (auto) (0.0);"));
-        ASSERT_EQUALS("int3[4[5[new", testAst("new (int S::*[3][4][5]) ();"));
-        ASSERT_EQUALS("pSnew=", testAst("p=new (x)(S)(1,2);"));
-        ASSERT_EQUALS("inti[new(", testAst("(void)new (int[i]);"));
-        ASSERT_EQUALS("intp* pnew malloc4(", testAst("int*p; new (p) (malloc(4));"));
-        ASSERT_EQUALS("intnew", testAst("new (&w.x)(int*)(0);"));
-        ASSERT_EQUALS("&new", testAst("new (&w.x)(0);")); // <- the "(int*)" has been simplified
+        ASSERT_EQUALS("const0(new", testAst("new const auto (0);\n"));
+        ASSERT_EQUALS("autonew", testAst("new (auto) (0.0);\n"));
+        ASSERT_EQUALS("int3[4[5[new", testAst("new (int S::*[3][4][5]) ();\n"));
+        ASSERT_EQUALS("pSnew=", testAst("p=new (x)(S)(1,2);\n"));
+        ASSERT_EQUALS("inti[new(", testAst("(void)new (int[i]);\n"));
+        ASSERT_EQUALS("intp* pnew malloc4(", testAst("int*p; new (p) (malloc(4));\n"));
+        ASSERT_EQUALS("intnew", testAst("new (&w.x)(int*)(0);\n"));
+        ASSERT_EQUALS("&new", testAst("new (&w.x)(0);\n")); // <- the "(int*)" has been simplified
 
         // gcc testsuite..
-        ASSERT_EQUALS("char10[new(", testAst("(void)new(char*)[10];"));
+        ASSERT_EQUALS("char10[new(", testAst("(void)new(char*)[10];\n"));
     }
 
     void astpar() { // parentheses
-        ASSERT_EQUALS("12+3*", testAst("(1+2)*3"));
-        ASSERT_EQUALS("123+*", testAst("1*(2+3)"));
-        ASSERT_EQUALS("123+*4*", testAst("1*(2+3)*4"));
-        ASSERT_EQUALS("ifab.c&d==(", testAst("if((a.b&c)==d){}"));
+        ASSERT_EQUALS("12+3*", testAst("(1+2)*3\n"));
+        ASSERT_EQUALS("123+*", testAst("1*(2+3)\n"));
+        ASSERT_EQUALS("123+*4*", testAst("1*(2+3)*4\n"));
+        ASSERT_EQUALS("ifab.c&d==(", testAst("if((a.b&c)==d){}\n"));
 
-        ASSERT_EQUALS("pf.pf.12,(&&", testAst("((p.f) && (p.f)(1,2))"));
+        ASSERT_EQUALS("pf.pf.12,(&&", testAst("((p.f) && (p.f)(1,2))\n"));
 
-        ASSERT_EQUALS("forresdirGetFirst.file&_T(,(=;;(", testAst("for ((res = dir.GetFirst(&file, _T(" ")));;) {}"));
+        ASSERT_EQUALS("forresdirGetFirst.file&_T(,(=;;(", testAst("for ((res = dir.GetFirst(&file, _T(" ")));;) {}\n"));
 
         // problems with: if (x[y]==z)
-        ASSERT_EQUALS("ifa(0[1==(", testAst("if(a()[0]==1){}"));
-        ASSERT_EQUALS("ifbuff0[&(*1==(", testAst("if (*((DWORD*)&buff[0])==1){}"));
-        ASSERT_EQUALS("ifp*0[1==(", testAst("if((*p)[0]==1)"));
-        ASSERT_EQUALS("ifab.cd.[e==(", testAst("if(a.b[c.d]==e){}"));
+        ASSERT_EQUALS("ifa(0[1==(", testAst("if(a()[0]==1){}\n"));
+        ASSERT_EQUALS("ifbuff0[&(*1==(", testAst("if (*((DWORD*)&buff[0])==1){}\n"));
+        ASSERT_EQUALS("ifp*0[1==(", testAst("if((*p)[0]==1)\n"));
+        ASSERT_EQUALS("ifab.cd.[e==(", testAst("if(a.b[c.d]==e){}\n"));
 
-        ASSERT_EQUALS("iftpnote.i1-[note.0==tpnote.i1-[type.4>||(", testAst("if ((tp.note[i - 1].note == 0) || (tp.note[i - 1].type > 4)) {}"));
-        ASSERT_EQUALS("ab.i[j1+[", testAst("a.b[i][j+1]"));
+        ASSERT_EQUALS("iftpnote.i1-[note.0==tpnote.i1-[type.4>||(", testAst("if ((tp.note[i - 1].note == 0) || (tp.note[i - 1].type > 4)) {}\n"));
+        ASSERT_EQUALS("ab.i[j1+[", testAst("a.b[i][j+1]\n"));
 
         // problems with: x=expr
         ASSERT_EQUALS("(= x (( (. ([ a i) f)))",
-                      testAst("x = ((a[i]).f)();", AstStyle::Z3));
-        ASSERT_EQUALS("abc.de.++[=", testAst("a = b.c[++(d.e)];"));
-        ASSERT_EQUALS("abc(1+=", testAst("a = b(c**)+1;"));
-        ASSERT_EQUALS("abc.=", testAst("a = (b).c;"));
+                      testAst("x = ((a[i]).f)();\n", AstStyle::Z3));
+        ASSERT_EQUALS("abc.de.++[=", testAst("a = b.c[++(d.e)];\n"));
+        ASSERT_EQUALS("abc(1+=", testAst("a = b(c**)+1;\n"));
+        ASSERT_EQUALS("abc.=", testAst("a = (b).c;\n"));
 
         // casts
-        ASSERT_EQUALS("a1(2(+=",testAst("a=(t)1+(t)2;"));
-        ASSERT_EQUALS("a1(2+=",testAst("a=(t)1+2;"));
-        ASSERT_EQUALS("a1(2+=",testAst("a=(t*)1+2;"));
-        ASSERT_EQUALS("a1(2+=",testAst("a=(t&)1+2;"));
-        ASSERT_EQUALS("a1(2+=",testAst("a=(t&&)1+2;"));
-        ASSERT_EQUALS("ab::r&c(=", testAst("a::b& r = (a::b&)c;")); // #5261
-        ASSERT_EQUALS("ab10:?=", testAst("a=(b)?1:0;"));
-        ASSERT_EQUALS("ac5[new(=", testAst("a = (b*)(new c[5]);")); // #8786
-        ASSERT_EQUALS("a(4+", testAst("(int)(a) + 4;"));
+        ASSERT_EQUALS("a1(2(+=",testAst("a=(t)1+(t)2;\n"));
+        ASSERT_EQUALS("a1(2+=",testAst("a=(t)1+2;\n"));
+        ASSERT_EQUALS("a1(2+=",testAst("a=(t*)1+2;\n"));
+        ASSERT_EQUALS("a1(2+=",testAst("a=(t&)1+2;\n"));
+        ASSERT_EQUALS("a1(2+=",testAst("a=(t&&)1+2;\n"));
+        ASSERT_EQUALS("ab::r&c(=", testAst("a::b& r = (a::b&)c;\n")); // #5261
+        ASSERT_EQUALS("ab10:?=", testAst("a=(b)?1:0;\n"));
+        ASSERT_EQUALS("ac5[new(=", testAst("a = (b*)(new c[5]);\n")); // #8786
+        ASSERT_EQUALS("a(4+", testAst("(int)(a) + 4;\n"));
 
         // (cast){data}[index]
-        ASSERT_EQUALS("a&{(0[1[5[0=", testAst("(int (**)[i]){&a}[0][1][5] = 0;"));
-        ASSERT_EQUALS("ab12,{(0[,(", testAst("a(b, (int []){1,2}[0]);"));
-        ASSERT_EQUALS("TrivialDefCtora2[2[{1[1[n.0=", testAst("TrivialDefCtor{a[2][2]}[1][1].n = 0;"));
-        ASSERT_EQUALS("aT12,3,{1[=", testAst("a = T{1, 2, 3}[1];"));
+        ASSERT_EQUALS("a&{(0[1[5[0=", testAst("(int (**)[i]){&a}[0][1][5] = 0;\n"));
+        ASSERT_EQUALS("ab12,{(0[,(", testAst("a(b, (int []){1,2}[0]);\n"));
+        ASSERT_EQUALS("TrivialDefCtora2[2[{1[1[n.0=", testAst("TrivialDefCtor{a[2][2]}[1][1].n = 0;\n"));
+        ASSERT_EQUALS("aT12,3,{1[=", testAst("a = T{1, 2, 3}[1];\n"));
 
         // Type{data}()
-        ASSERT_EQUALS("ab{(=", testAst("a=b{}();"));
-        ASSERT_EQUALS("abc{((=", testAst("a=b(c{}());"));
-        ASSERT_EQUALS("xNULL!=0(x(:?", testAst("void f() { {} ((x != NULL) ? (void)0 : x()); }"));
+        ASSERT_EQUALS("ab{(=", testAst("a=b{}();\n"));
+        ASSERT_EQUALS("abc{((=", testAst("a=b(c{}());\n"));
+        ASSERT_EQUALS("xNULL!=0(x(:?", testAst("void f() { {} ((x != NULL) ? (void)0 : x()); }\n"));
 
         // ({..})
-        ASSERT_EQUALS("a{+d+ bc+", testAst("a+({b+c;})+d"));
-        ASSERT_EQUALS("a{d*+ bc+", testAst("a+({b+c;})*d"));
+        ASSERT_EQUALS("a{+d+ bc+", testAst("a+({b+c;})+d\n"));
+        ASSERT_EQUALS("a{d*+ bc+", testAst("a+({b+c;})*d\n"));
         ASSERT_EQUALS("xa{((= bc( yd{((= ef(",
-                      testAst("x=(int)(a({b(c);}));" // don't hang
-                              "y=(int)(d({e(f);}));"));
+                      testAst("x=(int)(a({b(c);}));\n" // don't hang
+                              "y=(int)(d({e(f);}));\n"));
         ASSERT_EQUALS("A{{,( x0= Bx1={x2={,(",  // TODO: This is not perfect!!
-                      testAst("A({},{x=0;});" // don't hang
-                              "B({x=1},{x=2});"));
+                      testAst("A({},{x=0;});\n" // don't hang
+                              "B({x=1},{x=2});\n"));
         ASSERT_EQUALS("xMACROtype.T=value.1=,{({=",
-                      testAst("x = { MACRO( { .type=T, .value=1 } ) }")); // don't hang: MACRO({..})
-        ASSERT_EQUALS("fori10=i{;;( i--", testAst("for (i=10;i;({i--;}) ) {}"));
+                      testAst("x = { MACRO( { .type=T, .value=1 } ) }\n")); // don't hang: MACRO({..})
+        ASSERT_EQUALS("fori10=i{;;( i--", testAst("for (i=10;i;({i--;}) ) {}\n"));
         ASSERT_EQUALS("c{1{,{2.3f{,(",
-                      testAst("c({{}, {1}}, {2.3f});"));
-        ASSERT_EQUALS("x{{= e0= assert0(", testAst("x = {({ int e = 0; assert(0); e; })};"));
+                      testAst("c({{}, {1}}, {2.3f});\n"));
+        ASSERT_EQUALS("x{{= e0= assert0(", testAst("x = {({ int e = 0; assert(0); e; })};\n"));
 
         // function pointer
-        TODO_ASSERT_EQUALS("todo", "va_argapvoid((,(*0=", testAst("*va_arg(ap, void(**) ()) = 0;"));
+        TODO_ASSERT_EQUALS("todo", "va_argapvoid((,(*0=", testAst("*va_arg(ap, void(**) ()) = 0;\n"));
 
         // struct/array initialization
-        ASSERT_EQUALS("name_bytes[bits~unusedBits>>unusedBits<<{=", testAst("const uint8_t name_bytes[] = { (~bits >> unusedBits) << unusedBits };"));
-        ASSERT_EQUALS("abuf.0{={=", testAst("a = { .buf = { 0 } };"));
-        ASSERT_EQUALS("ab2[a.0=b.0=,{a.0=b.0=,{,{=", testAst("struct AB ab[2] = { { .a=0, .b=0 }, { .a=0, .b=0 } };"));
-        ASSERT_EQUALS("tset{=", testAst("struct cgroup_taskset tset = {};"));
-        ASSERT_EQUALS("s1a&,{2b&,{,{=", testAst("s = { {1, &a}, {2, &b} };"));
-        ASSERT_EQUALS("s0[L.2[x={=", testAst("s = { [0].L[2] = x};"));
-        ASSERT_EQUALS("ac.0={(=", testAst("a = (b){.c=0,};")); // <- useless comma
-        ASSERT_EQUALS("xB[1y.z.1={(&=,{={=", testAst("x = { [B] = {1, .y = &(struct s) { .z=1 } } };"));
-        ASSERT_EQUALS("xab,c,{=", testAst("x={a,b,(c)};"));
-        ASSERT_EQUALS("x0fSa.1=b.2=,c.\"\"=,{(||=", testAst("x = 0 || f(S{.a = 1, .b = 2, .c = \"\" });"));
-        ASSERT_EQUALS("x0fSa.1{=b.2{,c.\"\"=,{(||=", testAst("x = 0 || f(S{.a = { 1 }, .b { 2 }, .c = \"\" });"));
-        ASSERT_EQUALS("a0\"\"abc12:?,{{,(", testAst("a(0, {{\"\", (abc) ? 1 : 2}});"));
-        ASSERT_EQUALS("a0\'\'abc12:?,{{,(", testAst("a(0, {{\'\', (abc) ? 1 : 2}});"));
-        ASSERT_EQUALS("x12,{34,{,{56,{78,{,{,{=", testAst("x = { { {1,2}, {3,4} }, { {5,6}, {7,8} } };"));
-        ASSERT_EQUALS("Sa.stdmove::s(=b.1=,{(", testAst("S({.a = std::move(s), .b = 1})"));
+        ASSERT_EQUALS("name_bytes[bits~unusedBits>>unusedBits<<{=", testAst("const uint8_t name_bytes[] = { (~bits >> unusedBits) << unusedBits };\n"));
+        ASSERT_EQUALS("abuf.0{={=", testAst("a = { .buf = { 0 } };\n"));
+        ASSERT_EQUALS("ab2[a.0=b.0=,{a.0=b.0=,{,{=", testAst("struct AB ab[2] = { { .a=0, .b=0 }, { .a=0, .b=0 } };\n"));
+        ASSERT_EQUALS("tset{=", testAst("struct cgroup_taskset tset = {};\n"));
+        ASSERT_EQUALS("s1a&,{2b&,{,{=", testAst("s = { {1, &a}, {2, &b} };\n"));
+        ASSERT_EQUALS("s0[L.2[x={=", testAst("s = { [0].L[2] = x};\n"));
+        ASSERT_EQUALS("ac.0={(=", testAst("a = (b){.c=0,};\n")); // <- useless comma
+        ASSERT_EQUALS("xB[1y.z.1={(&=,{={=", testAst("x = { [B] = {1, .y = &(struct s) { .z=1 } } };\n"));
+        ASSERT_EQUALS("xab,c,{=", testAst("x={a,b,(c)};\n"));
+        ASSERT_EQUALS("x0fSa.1=b.2=,c.\"\"=,{(||=", testAst("x = 0 || f(S{.a = 1, .b = 2, .c = \"\" });\n"));
+        ASSERT_EQUALS("x0fSa.1{=b.2{,c.\"\"=,{(||=", testAst("x = 0 || f(S{.a = { 1 }, .b { 2 }, .c = \"\" });\n"));
+        ASSERT_EQUALS("a0\"\"abc12:?,{{,(", testAst("a(0, {{\"\", (abc) ? 1 : 2}});\n"));
+        ASSERT_EQUALS("a0\'\'abc12:?,{{,(", testAst("a(0, {{\'\', (abc) ? 1 : 2}});\n"));
+        ASSERT_EQUALS("x12,{34,{,{56,{78,{,{,{=", testAst("x = { { {1,2}, {3,4} }, { {5,6}, {7,8} } };\n"));
+        ASSERT_EQUALS("Sa.stdmove::s(=b.1=,{(", testAst("S({.a = std::move(s), .b = 1})\n"));
 
         // struct initialization hang
         ASSERT_EQUALS("sbar.1{,{(={= forfieldfield++;;(",
                       testAst("struct S s = {.bar = (struct foo) { 1, { } } };\n"
-                              "void f(struct cmd *) { for (; field; field++) {} }"));
+                              "void f(struct cmd *) { for (; field; field++) {} }\n"));
 
         // template parentheses: <>
-        ASSERT_EQUALS("ab::c(de::(<=return", testAst("return a::b(c) <= d<double>::e();")); // #6195
+        ASSERT_EQUALS("ab::c(de::(<=return", testAst("return a::b(c) <= d<double>::e();\n")); // #6195
 
         // C++ initializer
-        ASSERT_EQUALS("Class{", testAst("Class{};"));
-        ASSERT_EQUALS("Class12,{", testAst("Class{1,2};"));
-        ASSERT_EQUALS("Class12,{", testAst("Class<X>{1,2};"));
-        ASSERT_EQUALS("abc{d:?=", testAst("a=b?c{}:d;"));
-        ASSERT_EQUALS("abc12,{d:?=", testAst("a=b?c{1,2}:d;"));
-        ASSERT_EQUALS("abc{d:?=", testAst("a=b?c<X>{}:d;"));
-        ASSERT_EQUALS("abc12,{d:?=", testAst("a=b?c<X>{1,2}:d;"));
-        ASSERT_EQUALS("a::12,{", testAst("::a{1,2};")); // operator precedence
-        ASSERT_EQUALS("Abc({newreturn", testAst("return new A {b(c)};"));
-        ASSERT_EQUALS("a{{return", testAst("return{{a}};"));
-        ASSERT_EQUALS("a{b{,{return", testAst("return{{a},{b}};"));
-        ASSERT_EQUALS("stdvector::{{,{return", testAst("return std::vector<std::vector<int> >{{},{}};"));
-        ASSERT_EQUALS("stdvector::{2{,{return", testAst("return std::vector<std::vector<int> >{{}, {2}};"));
-        ASSERT_EQUALS("forbstdvector::{{,{:(", testAst("for (auto b : std::vector<std::vector<int> >{{},{}});"));
-        ASSERT_EQUALS("forbstdvector::{2{,{:(", testAst("for (auto b : std::vector<std::vector<int> >{{}, {2}});"));
-        ASSERT_EQUALS("abR{{,P(,((", testAst("a(b(R{},{},P()));"));
-        ASSERT_EQUALS("f1{2{,3{,{x,(", testAst("f({{1},{2},{3}},x);"));
-        ASSERT_EQUALS("a1{ b2{", testAst("auto a{1}; auto b{2};"));
-        ASSERT_EQUALS("var1ab::23,{,{4ab::56,{,{,{", testAst("auto var{{1,a::b{2,3}}, {4,a::b{5,6}}};"));
-        ASSERT_EQUALS("var{{,{{,{", testAst("auto var{ {{},{}}, {} };"));
-        ASSERT_EQUALS("fXYabcfalse==CD:?,{,{(", testAst("f({X, {Y, abc == false ? C : D}});"));
-        ASSERT_EQUALS("stdvector::p0[{(return", testAst("return std::vector<int>({ p[0] });"));
-        ASSERT_EQUALS("vstdvector::{=", testAst("auto v = std::vector<int>{ };"));
+        ASSERT_EQUALS("Class{", testAst("Class{};\n"));
+        ASSERT_EQUALS("Class12,{", testAst("Class{1,2};\n"));
+        ASSERT_EQUALS("Class12,{", testAst("Class<X>{1,2};\n"));
+        ASSERT_EQUALS("abc{d:?=", testAst("a=b?c{}:d;\n"));
+        ASSERT_EQUALS("abc12,{d:?=", testAst("a=b?c{1,2}:d;\n"));
+        ASSERT_EQUALS("abc{d:?=", testAst("a=b?c<X>{}:d;\n"));
+        ASSERT_EQUALS("abc12,{d:?=", testAst("a=b?c<X>{1,2}:d;\n"));
+        ASSERT_EQUALS("a::12,{", testAst("::a{1,2};\n")); // operator precedence
+        ASSERT_EQUALS("Abc({newreturn", testAst("return new A {b(c)};\n"));
+        ASSERT_EQUALS("a{{return", testAst("return{{a}};\n"));
+        ASSERT_EQUALS("a{b{,{return", testAst("return{{a},{b}};\n"));
+        ASSERT_EQUALS("stdvector::{{,{return", testAst("return std::vector<std::vector<int> >{{},{}};\n"));
+        ASSERT_EQUALS("stdvector::{2{,{return", testAst("return std::vector<std::vector<int> >{{}, {2}};\n"));
+        ASSERT_EQUALS("forbstdvector::{{,{:(", testAst("for (auto b : std::vector<std::vector<int> >{{},{}});\n"));
+        ASSERT_EQUALS("forbstdvector::{2{,{:(", testAst("for (auto b : std::vector<std::vector<int> >{{}, {2}});\n"));
+        ASSERT_EQUALS("abR{{,P(,((", testAst("a(b(R{},{},P()));\n"));
+        ASSERT_EQUALS("f1{2{,3{,{x,(", testAst("f({{1},{2},{3}},x);\n"));
+        ASSERT_EQUALS("a1{ b2{", testAst("auto a{1}; auto b{2};\n"));
+        ASSERT_EQUALS("var1ab::23,{,{4ab::56,{,{,{", testAst("auto var{{1,a::b{2,3}}, {4,a::b{5,6}}};\n"));
+        ASSERT_EQUALS("var{{,{{,{", testAst("auto var{ {{},{}}, {} };\n"));
+        ASSERT_EQUALS("fXYabcfalse==CD:?,{,{(", testAst("f({X, {Y, abc == false ? C : D}});\n"));
+        ASSERT_EQUALS("stdvector::p0[{(return", testAst("return std::vector<int>({ p[0] });\n"));
+        ASSERT_EQUALS("vstdvector::{=", testAst("auto v = std::vector<int>{ };\n"));
 
         // Initialization with decltype(expr) instead of a type
-        ASSERT_EQUALS("decltypex((", testAst("decltype(x)();"));
-        ASSERT_EQUALS("decltypex({", testAst("decltype(x){};"));
-        ASSERT_EQUALS("decltypexy+(yx+(", testAst("decltype(x+y)(y+x);"));
-        ASSERT_EQUALS("decltypexy+(yx+{", testAst("decltype(x+y){y+x};"));
+        ASSERT_EQUALS("decltypex((", testAst("decltype(x)();\n"));
+        ASSERT_EQUALS("decltypex({", testAst("decltype(x){};\n"));
+        ASSERT_EQUALS("decltypexy+(yx+(", testAst("decltype(x+y)(y+x);\n"));
+        ASSERT_EQUALS("decltypexy+(yx+{", testAst("decltype(x+y){y+x};\n"));
         ASSERT_EQUALS("adecltypeac::(,decltypead::(,",
-                      testAst("template <typename a> void b(a &, decltype(a::c), decltype(a::d));"));
+                      testAst("template <typename a> void b(a &, decltype(a::c), decltype(a::d));\n"));
 
         ASSERT_NO_THROW(tokenizeAndStringify("struct A;\n" // #10839
                                              "struct B { A* hash; };\n"
@@ -6930,12 +7348,12 @@ class TestTokenizer : public TestFixture {
         (void)tokenizeAndStringify("void foo(const std::vector<std::string>& locations = {\"\"}) {\n"
                                    "    for (int i = 0; i <= 123; ++i)\n"
                                    "        x->emplace_back(y);\n"
-                                   "}");
+                                   "}\n");
         ignore_errout();
 
         ASSERT_NO_THROW(tokenizeAndStringify("void f() {\n" // #10831
                                              "    auto g = [](std::function<void()> h = []() {}) { };\n"
-                                             "}"));
+                                             "}\n"));
         ASSERT_EQUALS("", errout_str());
 
         ASSERT_NO_THROW(tokenizeAndStringify("void f() {\n" // #11379
@@ -6945,132 +7363,132 @@ class TestTokenizer : public TestFixture {
             "[test.cpp:2:15]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
             errout_str());
 
-        ASSERT_EQUALS("forinti(0=i5<=i++;;(", testAst("for (int (i) = 0; (i) <= 5; (i)++) {}")); // #13225
+        ASSERT_EQUALS("forinti(0=i5<=i++;;(", testAst("for (int (i) = 0; (i) <= 5; (i)++) {}\n")); // #13225
     }
 
     void astbrackets() { // []
-        ASSERT_EQUALS("a23+[4+", testAst("a[2+3]+4"));
-        ASSERT_EQUALS("a1[0[", testAst("a[1][0]"));
-        ASSERT_EQUALS("ab0[=", testAst("a=(b)[0];"));
-        ASSERT_EQUALS("abc.0[=", testAst("a=b.c[0];"));
-        ASSERT_EQUALS("ab0[1[=", testAst("a=b[0][1];"));
+        ASSERT_EQUALS("a23+[4+", testAst("a[2+3]+4\n"));
+        ASSERT_EQUALS("a1[0[", testAst("a[1][0]\n"));
+        ASSERT_EQUALS("ab0[=", testAst("a=(b)[0];\n"));
+        ASSERT_EQUALS("abc.0[=", testAst("a=b.c[0];\n"));
+        ASSERT_EQUALS("ab0[1[=", testAst("a=b[0][1];\n"));
     }
 
     void astvardecl() {
         // Variable declaration
-        ASSERT_EQUALS("a1[\"\"=", testAst("char a[1]=\"\";"));
-        ASSERT_EQUALS("charp*(3[char5[3[new=", testAst("char (*p)[3] = new char[5][3];"));
-        ASSERT_EQUALS("varp=", testAst("const int *var = p;"));
-        ASSERT_EQUALS("intrp0[*(&", testAst("int& r(*p[0]);"));
+        ASSERT_EQUALS("a1[\"\"=", testAst("char a[1]=\"\";\n"));
+        ASSERT_EQUALS("charp*(3[char5[3[new=", testAst("char (*p)[3] = new char[5][3];\n"));
+        ASSERT_EQUALS("varp=", testAst("const int *var = p;\n"));
+        ASSERT_EQUALS("intrp0[*(&", testAst("int& r(*p[0]);\n"));
 
         // #9127
         const char code1[] = "using uno::Ref;\n"
                              "Ref<X> r;\n"
-                             "int var(0);";
+                             "int var(0);\n";
         ASSERT_EQUALS("unoRef:: var0(", testAst(code1));
 
-        ASSERT_EQUALS("vary=", testAst("std::string var = y;"));
-        ASSERT_EQUALS("vary=", testAst("std::unique_ptr<int> var = y;")); // #14019
+        ASSERT_EQUALS("vary=", testAst("std::string var = y;\n"));
+        ASSERT_EQUALS("vary=", testAst("std::unique_ptr<int> var = y;\n")); // #14019
 
-        ASSERT_EQUALS("", testAst("void *(*var)(int);"));
-        ASSERT_EQUALS("", testAst("void *(*var[2])(int);"));
+        ASSERT_EQUALS("", testAst("void *(*var)(int);\n"));
+        ASSERT_EQUALS("", testAst("void *(*var[2])(int);\n"));
 
 
         // create ast for decltype
-        ASSERT_EQUALS("decltypex( var1=", testAst("decltype(x) var = 1;"));
-        ASSERT_EQUALS("a1bdecltypet((>2,(", testAst("a(1 > b(decltype(t)), 2);")); // #10271
-        ASSERT_EQUALS("decltypex({01:?", testAst("decltype(x){} ? 0 : 1;"));
+        ASSERT_EQUALS("decltypex( var1=", testAst("decltype(x) var = 1;\n"));
+        ASSERT_EQUALS("a1bdecltypet((>2,(", testAst("a(1 > b(decltype(t)), 2);\n")); // #10271
+        ASSERT_EQUALS("decltypex({01:?", testAst("decltype(x){} ? 0 : 1;\n"));
 
         ASSERT_EQUALS("Tp* Tt* forctp.=;;( tp.", testAst("struct T { T* p; };\n" // #10874
                                                          "void f(T * t) {\n"
                                                          "    for (decltype(t->p) (c) = t->p; ;) {}\n"
                                                          "}\n"));
         ASSERT_EQUALS("x0=a, stdtie::a(x=", testAst("int x = 0, a; std::tie(a) = x;\n"));
-        ASSERT_EQUALS("tmpa*=a*b*=,b*tmp=,", testAst("{ ((tmp) = (*a)), ((*a) = (*b)), ((*b) = (tmp)); }"));
-        ASSERT_EQUALS("a(*v=", testAst("(*(volatile unsigned int *)(a) = (v));"));
-        ASSERT_EQUALS("i(j=", testAst("(int&)(i) = j;"));
+        ASSERT_EQUALS("tmpa*=a*b*=,b*tmp=,", testAst("{ ((tmp) = (*a)), ((*a) = (*b)), ((*b) = (tmp)); }\n"));
+        ASSERT_EQUALS("a(*v=", testAst("(*(volatile unsigned int *)(a) = (v));\n"));
+        ASSERT_EQUALS("i(j=", testAst("(int&)(i) = j;\n"));
 
-        ASSERT_EQUALS("", testAst("void f(enum E* var){}"));
-        ASSERT_EQUALS("", testAst("void f(enum E*& var){}"));
-        ASSERT_EQUALS("", testAst("void f(bool& var){}"));
+        ASSERT_EQUALS("", testAst("void f(enum E* var){}\n"));
+        ASSERT_EQUALS("", testAst("void f(enum E*& var){}\n"));
+        ASSERT_EQUALS("", testAst("void f(bool& var){}\n"));
     }
 
     void astunaryop() { // unary operators
-        ASSERT_EQUALS("1a--+", testAst("1 + --a"));
-        ASSERT_EQUALS("1a--+", testAst("1 + a--"));
-        ASSERT_EQUALS("ab+!", testAst("!(a+b)"));
-        ASSERT_EQUALS("ab.++", testAst("++a.b;"));
-        ASSERT_EQUALS("ab.++", testAst("a.b++;"));
-        ASSERT_EQUALS("ab::++", testAst("a::b++;"));
-        ASSERT_EQUALS("c5[--*", testAst("*c[5]--;"));
-        ASSERT_EQUALS("xreturn", testAst("return x;"));
-        ASSERT_EQUALS("x(throw", testAst(";throw x();"));
-        ASSERT_EQUALS("a*bc:?return", testAst("return *a ? b : c;"));
-        ASSERT_EQUALS("xy*--=", testAst("x = -- * y;"));
-        ASSERT_EQUALS("x(throw", testAst(";throw (foo) x;")); // #9955
+        ASSERT_EQUALS("1a--+", testAst("1 + --a\n"));
+        ASSERT_EQUALS("1a--+", testAst("1 + a--\n"));
+        ASSERT_EQUALS("ab+!", testAst("!(a+b)\n"));
+        ASSERT_EQUALS("ab.++", testAst("++a.b;\n"));
+        ASSERT_EQUALS("ab.++", testAst("a.b++;\n"));
+        ASSERT_EQUALS("ab::++", testAst("a::b++;\n"));
+        ASSERT_EQUALS("c5[--*", testAst("*c[5]--;\n"));
+        ASSERT_EQUALS("xreturn", testAst("return x;\n"));
+        ASSERT_EQUALS("x(throw", testAst(";throw x();\n"));
+        ASSERT_EQUALS("a*bc:?return", testAst("return *a ? b : c;\n"));
+        ASSERT_EQUALS("xy*--=", testAst("x = -- * y;\n"));
+        ASSERT_EQUALS("x(throw", testAst(";throw (foo) x;\n")); // #9955
 
         // Unary :: operator
-        ASSERT_EQUALS("abcd::12,(e/:?=", testAst("a = b ? c : ::d(1,2) / e;"));
+        ASSERT_EQUALS("abcd::12,(e/:?=", testAst("a = b ? c : ::d(1,2) / e;\n"));
 
         // how is "--" handled here:
-        ASSERT_EQUALS("ab4<<c--+1:?", testAst("a ? (b << 4) + --c : 1"));
-        ASSERT_EQUALS("ab4<<c--+1:?", testAst("a ? (b << 4) + c-- : 1"));
-        ASSERT_EQUALS("ai[i= i--", testAst("a[i]=i; --i;"));
+        ASSERT_EQUALS("ab4<<c--+1:?", testAst("a ? (b << 4) + --c : 1\n"));
+        ASSERT_EQUALS("ab4<<c--+1:?", testAst("a ? (b << 4) + c-- : 1\n"));
+        ASSERT_EQUALS("ai[i= i--", testAst("a[i]=i; --i;\n"));
 
-        ASSERT_EQUALS("fint0{1&(", testAst("f(int{ 0 } & 1);")); // #11572
-        ASSERT_EQUALS("int0{1&return", testAst("int g() { return int{ 0 } & 1; }"));
+        ASSERT_EQUALS("fint0{1&(", testAst("f(int{ 0 } & 1);\n")); // #11572
+        ASSERT_EQUALS("int0{1&return", testAst("int g() { return int{ 0 } & 1; }\n"));
     }
 
     void astfunction() { // function calls
-        ASSERT_EQUALS("1f(+2+", testAst("1+f()+2"));
-        ASSERT_EQUALS("1f2(+3+", testAst("1+f(2)+3"));
-        ASSERT_EQUALS("1f23,(+4+", testAst("1+f(2,3)+4"));
-        ASSERT_EQUALS("1f2a&,(+", testAst("1+f(2,&a)"));
-        ASSERT_EQUALS("argv[", testAst("int f(char argv[]);"));
-        ASSERT_EQUALS("", testAst("void f();"));
-        ASSERT_EQUALS("", testAst("void f() {}"));
-        ASSERT_EQUALS("", testAst("int f() = delete;"));
-        ASSERT_EQUALS("", testAst("a::b f();"));
-        ASSERT_EQUALS("", testAst("a::b f() {}"));
-        ASSERT_EQUALS("", testAst("a::b f() = delete;"));
-        ASSERT_EQUALS("", testAst("int f() const = delete;"));
-        ASSERT_EQUALS("", testAst("extern unsigned f(const char *);"));
-        ASSERT_EQUALS("charformat*...,", testAst("extern void f(const char *format, ...);"));
-        ASSERT_EQUALS("int(int(void,", testAst("extern int for_each_commit_graft(int (*)(int*), void *);"));
-        ASSERT_EQUALS("for;;(", testAst("for (;;) {}"));
-        ASSERT_EQUALS("xsizeofvoid(=", testAst("x=sizeof(void*)"));
-        ASSERT_EQUALS("abc{d{,{(=", testAst("a = b({ c{}, d{} });"));
-        ASSERT_EQUALS("abc;(", testAst("a(b;c)"));
-        ASSERT_EQUALS("x{( forbc;;(", testAst("x({ for(a;b;c){} });"));
-        ASSERT_EQUALS("PT.(", testAst("P->~T();"));  // <- The "T" token::function() will be a destructor
-        ASSERT_EQUALS("double&(4[", testAst("void f(double(&)[4]) {}"));
-        ASSERT_EQUALS("voidu*", testAst("int* g ( void* (f) (void*), void* u);")); // #12475
-        ASSERT_EQUALS("f::(", testAst("::f();")); // #12544
-        ASSERT_EQUALS("(( f (, c ({ (= (. x) 0))))", testAst("f(c, { .x = 0 });", AstStyle::Z3)); // #12806
+        ASSERT_EQUALS("1f(+2+", testAst("1+f()+2\n"));
+        ASSERT_EQUALS("1f2(+3+", testAst("1+f(2)+3\n"));
+        ASSERT_EQUALS("1f23,(+4+", testAst("1+f(2,3)+4\n"));
+        ASSERT_EQUALS("1f2a&,(+", testAst("1+f(2,&a)\n"));
+        ASSERT_EQUALS("argv[", testAst("int f(char argv[]);\n"));
+        ASSERT_EQUALS("", testAst("void f();\n"));
+        ASSERT_EQUALS("", testAst("void f() {}\n"));
+        ASSERT_EQUALS("", testAst("int f() = delete;\n"));
+        ASSERT_EQUALS("", testAst("a::b f();\n"));
+        ASSERT_EQUALS("", testAst("a::b f() {}\n"));
+        ASSERT_EQUALS("", testAst("a::b f() = delete;\n"));
+        ASSERT_EQUALS("", testAst("int f() const = delete;\n"));
+        ASSERT_EQUALS("", testAst("extern unsigned f(const char *);\n"));
+        ASSERT_EQUALS("charformat*...,", testAst("extern void f(const char *format, ...);\n"));
+        ASSERT_EQUALS("int(int(void,", testAst("extern int for_each_commit_graft(int (*)(int*), void *);\n"));
+        ASSERT_EQUALS("for;;(", testAst("for (;;) {}\n"));
+        ASSERT_EQUALS("xsizeofvoid(=", testAst("x=sizeof(void*)\n"));
+        ASSERT_EQUALS("abc{d{,{(=", testAst("a = b({ c{}, d{} });\n"));
+        ASSERT_EQUALS("abc;(", testAst("a(b;c)\n"));
+        ASSERT_EQUALS("x{( forbc;;(", testAst("x({ for(a;b;c){} });\n"));
+        ASSERT_EQUALS("PT.(", testAst("P->~T();\n"));  // <- The "T" token::function() will be a destructor
+        ASSERT_EQUALS("double&(4[", testAst("void f(double(&)[4]) {}\n"));
+        ASSERT_EQUALS("voidu*", testAst("int* g ( void* (f) (void*), void* u);\n")); // #12475
+        ASSERT_EQUALS("f::(", testAst("::f();\n")); // #12544
+        ASSERT_EQUALS("(( f (, c ({ (= (. x) 0))))", testAst("f(c, { .x = 0 });\n", AstStyle::Z3)); // #12806
         ASSERT_EQUALS("(= it (( (. s insert) (, it ({ (, (, (= (. a) i) (= (. b) 2)) (= (. c) 3))))))",
-                      testAst("it = s.insert(it, { .a = i, .b = 2, .c = 3 });", AstStyle::Z3)); // #12815
+                      testAst("it = s.insert(it, { .a = i, .b = 2, .c = 3 });\n", AstStyle::Z3)); // #12815
     }
 
     void asttemplate() { // uninstantiated templates will have <,>,etc..
-        ASSERT_EQUALS("a(3==", testAst("a<int>()==3"));
+        ASSERT_EQUALS("a(3==", testAst("a<int>()==3\n"));
         ASSERT_EQUALS("", errout_str());
-        ASSERT_EQUALS("ab(== f(", testAst("a == b<c>(); f();"));
+        ASSERT_EQUALS("ab(== f(", testAst("a == b<c>(); f();\n"));
         ASSERT_EQUALS("", errout_str());
-        ASSERT_EQUALS("static_casta(i[", testAst("; static_cast<char*>(a)[i];")); // #6203
+        ASSERT_EQUALS("static_casta(i[", testAst("; static_cast<char*>(a)[i];\n")); // #6203
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS("reinterpret_castreinterpret_castptr(123&(",
-                      testAst(";reinterpret_cast<void*>(reinterpret_cast<unsigned>(ptr) & 123);")); // #7253
+                      testAst(";reinterpret_cast<void*>(reinterpret_cast<unsigned>(ptr) & 123);\n")); // #7253
         ASSERT_EQUALS("", errout_str());
-        ASSERT_EQUALS("bcd.(=", testAst(";a<int> && b = c->d();"));
+        ASSERT_EQUALS("bcd.(=", testAst(";a<int> && b = c->d();\n"));
         ASSERT_EQUALS("", errout_str());
 
         // This two unit tests were added to avoid a crash. The actual correct AST result for non-executable code has not been determined so far.
-        ASSERT_NO_THROW(testAst("class C : public ::a::b<bool> { };"));
+        ASSERT_NO_THROW(testAst("class C : public ::a::b<bool> { };\n"));
         ASSERT_EQUALS("", errout_str());
-        ASSERT_EQUALS("AB: abc+=", testAst("struct A : public B<C*> { void f() { a=b+c; } };"));
+        ASSERT_EQUALS("AB: abc+=", testAst("struct A : public B<C*> { void f() { a=b+c; } };\n"));
         ASSERT_EQUALS("", errout_str());
 
-        ASSERT_EQUALS("xfts(=", testAst("; auto x = f(ts...);"));
+        ASSERT_EQUALS("xfts(=", testAst("; auto x = f(ts...);\n"));
         ASSERT_EQUALS("", errout_str());
 
         ASSERT_EQUALS("dae(new= ifd(", testAst("template <typename a, typename... b>\n" // #10199
@@ -7104,43 +7522,44 @@ class TestTokenizer : public TestFixture {
 
     void astrequires()
     {
-        ASSERT_EQUALS("brequires{ac::||= ac::", testAst("template <class a> concept b = requires { a::c; } || a::c;"));
+        ASSERT_EQUALS("brequires{ac::||= ac::", testAst("template <class a> concept b = requires { a::c; } || a::c;\n"));
         ASSERT_EQUALS("crequires{ac::||= a{b{||",
-                      testAst("template <class a, class b> concept c = requires { a{} || b{}; } || a::c;"));
-        ASSERT_EQUALS("ifrequires{(", testAst("if (requires { true; }) {}")); // #13308
+                      testAst("template <class a, class b> concept c = requires { a{} || b{}; } || a::c;\n"));
+        ASSERT_EQUALS("ifrequires{(", testAst("if (requires { true; }) {}\n")); // #13308
+        ASSERT_EQUALS("Crequires({requires({||= sizeofT(4== sizeofT(8==", testAst("concept C = requires() { sizeof(T) == 4; } || requires() { sizeof(T) == 8; };\n"));
     }
 
     void astcast() {
-        ASSERT_EQUALS("ac&(=", testAst("a = (long)&c;"));
-        ASSERT_EQUALS("ac*(=", testAst("a = (Foo*)*c;"));
-        ASSERT_EQUALS("ac-(=", testAst("a = (long)-c;"));
-        ASSERT_EQUALS("ac~(=", testAst("a = (b)~c;"));
-        ASSERT_EQUALS("ac(=", testAst("a = (some<strange, type>)c;"));
-        ASSERT_EQUALS("afoveon_avgimage((foveon_avgimage((+=", testAst("a = foveon_avg(((short(*)[4]) image)) + foveon_avg(((short(*)[4]) image));"));
-        ASSERT_EQUALS("c(40<<return", testAst("return (long long)c << 40;"));
-        ASSERT_EQUALS("ab-(=", testAst("a = ((int)-b)")); // Multiple subsequent unary operators (cast and -)
-        ASSERT_EQUALS("xdouble123(i*(=", testAst("x = (int)(double(123)*i);"));
-        ASSERT_EQUALS("ac(=", testAst("a = (::b)c;"));
-        ASSERT_EQUALS("abcd,({(=", testAst("a = (s){b(c, d)};"));
-        ASSERT_EQUALS("xatoistr({(=", testAst("x = (struct X){atoi(str)};"));
-        ASSERT_EQUALS("xa.0=b.0=,c.0=,{(=", testAst("x = (struct abc) { .a=0, .b=0, .c=0 };"));
+        ASSERT_EQUALS("ac&(=", testAst("a = (long)&c;\n"));
+        ASSERT_EQUALS("ac*(=", testAst("a = (Foo*)*c;\n"));
+        ASSERT_EQUALS("ac-(=", testAst("a = (long)-c;\n"));
+        ASSERT_EQUALS("ac~(=", testAst("a = (b)~c;\n"));
+        ASSERT_EQUALS("ac(=", testAst("a = (some<strange, type>)c;\n"));
+        ASSERT_EQUALS("afoveon_avgimage((foveon_avgimage((+=", testAst("a = foveon_avg(((short(*)[4]) image)) + foveon_avg(((short(*)[4]) image));\n"));
+        ASSERT_EQUALS("c(40<<return", testAst("return (long long)c << 40;\n"));
+        ASSERT_EQUALS("ab-(=", testAst("a = ((int)-b)\n")); // Multiple subsequent unary operators (cast and -)
+        ASSERT_EQUALS("xdouble123(i*(=", testAst("x = (int)(double(123)*i);\n"));
+        ASSERT_EQUALS("ac(=", testAst("a = (::b)c;\n"));
+        ASSERT_EQUALS("abcd,({(=", testAst("a = (s){b(c, d)};\n"));
+        ASSERT_EQUALS("xatoistr({(=", testAst("x = (struct X){atoi(str)};\n"));
+        ASSERT_EQUALS("xa.0=b.0=,c.0=,{(=", testAst("x = (struct abc) { .a=0, .b=0, .c=0 };\n"));
 
-        ASSERT_EQUALS("yz.(return", testAst("return (x)(y).z;"));
+        ASSERT_EQUALS("yz.(return", testAst("return (x)(y).z;\n"));
 
-        ASSERT_EQUALS("fon!(restoring01:?,(", testAst("f((long) !on, restoring ? 0 : 1);"));
+        ASSERT_EQUALS("fon!(restoring01:?,(", testAst("f((long) !on, restoring ? 0 : 1);\n"));
 
-        ASSERT_EQUALS("esi.!(=", testAst("E e = (E)!s->i;")); // #10882
+        ASSERT_EQUALS("esi.!(=", testAst("E e = (E)!s->i;\n")); // #10882
 
-        ASSERT_EQUALS("xp(= 12>34:?", testAst("x = ( const char ( * ) [ 1 > 2 ? 3 : 4 ] ) p ;"));
+        ASSERT_EQUALS("xp(= 12>34:?", testAst("x = ( const char ( * ) [ 1 > 2 ? 3 : 4 ] ) p ;\n"));
 
-        ASSERT_EQUALS("f{(si.,(", testAst("f((struct S){ }, s->i);")); // #11606
+        ASSERT_EQUALS("f{(si.,(", testAst("f((struct S){ }, s->i);\n")); // #11606
 
         // not cast
-        ASSERT_EQUALS("AB||", testAst("(A)||(B)"));
-        ASSERT_EQUALS("abc[1&=", testAst("a = (b[c]) & 1;"));
-        ASSERT_EQUALS("abc::(=", testAst("a = (b::c)();"));
+        ASSERT_EQUALS("AB||", testAst("(A)||(B)\n"));
+        ASSERT_EQUALS("abc[1&=", testAst("a = (b[c]) & 1;\n"));
+        ASSERT_EQUALS("abc::(=", testAst("a = (b::c)();\n"));
 
-        ASSERT_EQUALS("pcharnew(=", testAst("p = (void *)(new char);"));
+        ASSERT_EQUALS("pcharnew(=", testAst("p = (void *)(new char);\n"));
     }
 
     void astlambda() {
@@ -7149,37 +7568,37 @@ class TestTokenizer : public TestFixture {
         // `-(
         //   `-{
 
-        ASSERT_EQUALS("x{(a&[( ai=", testAst("x([&a](int i){a=i;});"));
-        ASSERT_EQUALS("{([(return 0return", testAst("return [](){ return 0; }();"));
+        ASSERT_EQUALS("x{(a&[( ai=", testAst("x([&a](int i){a=i;});\n"));
+        ASSERT_EQUALS("{([(return 0return", testAst("return [](){ return 0; }();\n"));
 
         // noexcept (which if simplified to always have a condition by the time AST is created)
-        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) noexcept(true) { a=i; });"));
-        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) mutable noexcept(true) { a=i; });"));
-        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) const noexcept(true) { a=i; });"));
+        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) noexcept(true) { a=i; });\n"));
+        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) mutable noexcept(true) { a=i; });\n"));
+        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) const noexcept(true) { a=i; });\n"));
 
         // both mutable and constexpr (which is simplified to 'const' by the time AST is created)
-        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) const mutable { a=i; });"));
-        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) mutable const { a=i; });"));
-        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) const mutable noexcept(true) { a=i; });"));
-        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) mutable const noexcept(true) { a=i; });"));
+        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) const mutable { a=i; });\n"));
+        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) mutable const { a=i; });\n"));
+        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) const mutable noexcept(true) { a=i; });\n"));
+        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) mutable const noexcept(true) { a=i; });\n"));
 
         // ->
-        ASSERT_EQUALS("{([(return 0return", testAst("return []() -> int { return 0; }();"));
-        ASSERT_EQUALS("{(something[(return 0return", testAst("return [something]() -> int { return 0; }();"));
-        ASSERT_EQUALS("{([cd,(return 0return", testAst("return [](int a, int b) -> int { return 0; }(c, d);"));
-        ASSERT_EQUALS("{([return", testAst("return []() -> decltype(0) {};"));
-        ASSERT_EQUALS("x{(&[=", testAst("x = [&]()->std::string const & {};"));
-        ASSERT_EQUALS("f{([=", testAst("f = []() -> foo* {};"));
-        ASSERT_EQUALS("f{([=", testAst("f = []() -> foo&& {};"));
-        ASSERT_EQUALS("f{([=", testAst("f = [](void) mutable -> foo* {};"));
-        ASSERT_EQUALS("f{([=", testAst("f = []() mutable {};"));
+        ASSERT_EQUALS("{([(return 0return", testAst("return []() -> int { return 0; }();\n"));
+        ASSERT_EQUALS("{(something[(return 0return", testAst("return [something]() -> int { return 0; }();\n"));
+        ASSERT_EQUALS("{([cd,(return 0return", testAst("return [](int a, int b) -> int { return 0; }(c, d);\n"));
+        ASSERT_EQUALS("{([return", testAst("return []() -> decltype(0) {};\n"));
+        ASSERT_EQUALS("x{(&[=", testAst("x = [&]()->std::string const & {};\n"));
+        ASSERT_EQUALS("f{([=", testAst("f = []() -> foo* {};\n"));
+        ASSERT_EQUALS("f{([=", testAst("f = []() -> foo&& {};\n"));
+        ASSERT_EQUALS("f{([=", testAst("f = [](void) mutable -> foo* {};\n"));
+        ASSERT_EQUALS("f{([=", testAst("f = []() mutable {};\n"));
 
-        ASSERT_EQUALS("x{([= 0return", testAst("x = [](){return 0; };"));
+        ASSERT_EQUALS("x{([= 0return", testAst("x = [](){return 0; };\n"));
 
-        ASSERT_EQUALS("ab{&[(= cd=", testAst("a = b([&]{c=d;});"));
+        ASSERT_EQUALS("ab{&[(= cd=", testAst("a = b([&]{c=d;});\n"));
 
         // 8628
-        ASSERT_EQUALS("f{([( switchx( 1case y++", testAst("f([](){switch(x){case 1:{++y;}}});"));
+        ASSERT_EQUALS("f{([( switchx( 1case y++", testAst("f([](){switch(x){case 1:{++y;}}});\n"));
 
         ASSERT_EQUALS("{(=[{return ab=",
                       testAst("return {\n"
@@ -7198,31 +7617,32 @@ class TestTokenizer : public TestFixture {
                               "  [=]() -> int {\n"
                               "    a=b;\n"
                               "  }\n"
-                              "}"));
+                              "}\n"));
         ASSERT_EQUALS("{(=[{return ab=",
                       testAst("return {\n"
                               "  [=]() mutable consteval -> int {\n"
                               "    a=b;\n"
                               "  }\n"
-                              "}"));
+                              "}\n"));
 
         // daca@home hang
         ASSERT_EQUALS("a{(&[= 0return b{(=[= fori0=i10!=i++;;(",
                       testAst("a = [&]() -> std::pair<int, int> { return 0; };\n"
-                              "b = [=]() { for (i = 0; i != 10; ++i); };"));
+                              "b = [=]() { for (i = 0; i != 10; ++i); };\n"));
 
         // #9662
-        ASSERT_EQUALS("b{[{ stdunique_ptr::0nullptrnullptr:?{", testAst("auto b{[] { std::unique_ptr<void *>{0 ? nullptr : nullptr}; }};"));
-        ASSERT_EQUALS("{b{[=[", testAst("void a() { [b = [] { ; }] {}; }"));
+        ASSERT_EQUALS("b{[{ stdunique_ptr::0nullptrnullptr:?{", testAst("auto b{[] { std::unique_ptr<void *>{0 ? nullptr : nullptr}; }};\n"));
+        ASSERT_EQUALS("{b{[=[", testAst("void a() { [b = [] { ; }] {}; }\n"));
 
         // Lambda capture expression (C++14)
-        ASSERT_EQUALS("a{b1=[= c2=", testAst("a = [b=1]{c=2;};"));
+        ASSERT_EQUALS("a{b1=[= c2=", testAst("a = [b=1]{c=2;};\n"));
 
         // #9729
-        ASSERT_NO_THROW(tokenizeAndStringify("void foo() { bar([]() noexcept { if (0) {} }); }"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void foo() { bar([]() noexcept { if (0) {} }); }\n"));
         ASSERT_EQUALS("", errout_str());
 
         // #11128
+        const Settings s = settingsBuilder(settings1).cpp(Standards::CPP17).build();
         ASSERT_NO_THROW(tokenizeAndStringify("template <typename T>\n"
                                              "struct S;\n"
                                              "struct R;\n"
@@ -7232,7 +7652,7 @@ class TestTokenizer : public TestFixture {
                                              "        return y;\n"
                                              "    else\n"
                                              "        return z;\n"
-                                             "}\n", dinit(TokenizeOptions, $.cppstd = Standards::CPP17)));
+                                             "}\n", s));
         ignore_errout();
 
         // #10079 - createInnerAST bug..
@@ -7240,7 +7660,7 @@ class TestTokenizer : public TestFixture {
                       testAst("x = []() -> std::vector<uint8_t> {\n"
                               "    const auto y = z;\n"
                               "    switch (y) {}\n"
-                              "};"));
+                              "};\n"));
 
         // #11357
         ASSERT_NO_THROW(tokenizeAndStringify("void f(std::vector<int>& v, bool c) {\n"
@@ -7314,173 +7734,210 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("", errout_str());
 
         // #11378
-        ASSERT_EQUALS("gT{(&[{= 0return", testAst("auto g = T{ [&]() noexcept -> int { return 0; } };"));
+        ASSERT_EQUALS("gT{(&[{= 0return", testAst("auto g = T{ [&]() noexcept -> int { return 0; } };\n"));
 
-        ASSERT_EQUALS("sf.{(i[{={", testAst("void g(int i) { S s{ .f = { [i]() {} } }; }"));
+        ASSERT_EQUALS("sf.{(i[{={", testAst("void g(int i) { S s{ .f = { [i]() {} } }; }\n"));
 
-        ASSERT_EQUALS("{([", testAst("void f() { []() {}; }")); // #13471
+        ASSERT_EQUALS("{([", testAst("void f() { []() {}; }\n")); // #13471
+
+        ASSERT_EQUALS("x{=[= 0return", testAst("void f() { auto x = [=] -> int { return 0; }; }\n")); // #15008
     }
 
     void astcase() {
-        ASSERT_EQUALS("0case", testAst("case 0:"));
-        ASSERT_EQUALS("12+case", testAst("case 1+2:"));
-        ASSERT_EQUALS("xyz:?case", testAst("case (x?y:z):"));
-        ASSERT_EQUALS("switchx( 1case y++ 2case", testAst("switch(x){case 1:{++y;break;case 2:break;}}"));
-        ASSERT_EQUALS("switchi( 12<<~case 0return", testAst("switch (i) { case ~(1 << 2) : return 0; }")); // #13197
+        ASSERT_EQUALS("0case", testAst("case 0:\n"));
+        ASSERT_EQUALS("12+case", testAst("case 1+2:\n"));
+        ASSERT_EQUALS("xyz:?case", testAst("case (x?y:z):\n"));
+        ASSERT_EQUALS("switchx( 1case y++ 2case", testAst("switch(x){case 1:{++y;break;case 2:break;}}\n"));
+        ASSERT_EQUALS("switchi( 12<<~case 0return", testAst("switch (i) { case ~(1 << 2) : return 0; }\n")); // #13197
     }
 
     void astrefqualifier() {
-        ASSERT_EQUALS("", testAst("class a { auto b() -> int&; };"));
-        ASSERT_EQUALS("", testAst("class a { auto b() -> int&&; };"));
-        ASSERT_EQUALS("", testAst("class a { void b() &&; };"));
-        ASSERT_EQUALS("", testAst("class a { void b() &; };"));
-        ASSERT_EQUALS("", testAst("class a { void b() && = delete; };"));
-        ASSERT_EQUALS("", testAst("class a { void b() & = delete; };"));
-        ASSERT_EQUALS("", testAst("class a { void b() && {} };"));
-        ASSERT_EQUALS("", testAst("class a { void b() & {} };"));
+        ASSERT_EQUALS("", testAst("class a { auto b() -> int&; };\n"));
+        ASSERT_EQUALS("", testAst("class a { auto b() -> int&&; };\n"));
+        ASSERT_EQUALS("", testAst("class a { void b() &&; };\n"));
+        ASSERT_EQUALS("", testAst("class a { void b() &; };\n"));
+        ASSERT_EQUALS("", testAst("class a { void b() && = delete; };\n"));
+        ASSERT_EQUALS("", testAst("class a { void b() & = delete; };\n"));
+        ASSERT_EQUALS("", testAst("class a { void b() && {} };\n"));
+        ASSERT_EQUALS("", testAst("class a { void b() & {} };\n"));
     }
 
     void astthrowdelete() {
-        ASSERT_EQUALS("a(", testAst("class a { virtual ~a() throw() = delete; };"));
+        ASSERT_EQUALS("a(", testAst("class a { virtual ~a() throw() = delete; };\n"));
     }
 
     void asttrailingdecltype() {
-        ASSERT_EQUALS("Cc& csize.(", testAst("template<class C> constexpr auto s(const C &c) noexcept -> decltype(c.size()) {}"));
+        ASSERT_EQUALS("Cc& csize.(", testAst("template<class C> constexpr auto s(const C &c) noexcept -> decltype(c.size()) {}\n"));
         ASSERT_EQUALS("Cc& MakeSpancdata.(csize.(,(",
-                      testAst("template <typename C> constexpr auto MakeSpan(C &c) -> decltype(MakeSpan(c.data(), c.size())) {}"));
-        ASSERT_EQUALS("Eqeq&key_typek&, eqkk,(", testAst("auto KeyTypeCanBeEq(const Eq& eq, const key_type& k) -> decltype(eq(k, k));"));
-        ASSERT_EQUALS("h{([= si. {return", testAst("auto h = []() -> decltype(s.i) { return {}; };"));
+                      testAst("template <typename C> constexpr auto MakeSpan(C &c) -> decltype(MakeSpan(c.data(), c.size())) {}\n"));
+        ASSERT_EQUALS("Eqeq&key_typek&, eqkk,(", testAst("auto KeyTypeCanBeEq(const Eq& eq, const key_type& k) -> decltype(eq(k, k));\n"));
+        ASSERT_EQUALS("h{([= si. {return", testAst("auto h = []() -> decltype(s.i) { return {}; };\n"));
     }
     void astnoexcept() {
-        ASSERT_EQUALS("noexceptaswap.b((", testAst("void f() noexcept(noexcept(a.swap(b))) {}"));
-        ASSERT_EQUALS("{([ noexceptaswap.b((", testAst("[]() noexcept(noexcept(a.swap(b))) {}"));
+        ASSERT_EQUALS("noexceptaswap.b((", testAst("void f() noexcept(noexcept(a.swap(b))) {}\n"));
+        ASSERT_EQUALS("{([ noexceptaswap.b((", testAst("[]() noexcept(noexcept(a.swap(b))) {}\n"));
     }
 
     //Verify that returning a newly constructed object generates the correct AST even when the class name is scoped
     //Addresses https://trac.cppcheck.net/ticket/9700
     void astnewscoped() {
-        ASSERT_EQUALS("(return (new A))", testAst("return new A;", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (( A)))", testAst("return new A();", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (( A true)))", testAst("return new A(true);", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (:: A B)))", testAst("return new A::B;", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (( (:: A B))))", testAst("return new A::B();", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (( (:: A B) true)))", testAst("return new A::B(true);", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (:: (:: A B) C)))", testAst("return new A::B::C;", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (( (:: (:: A B) C))))", testAst("return new A::B::C();", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (( (:: (:: A B) C) true)))", testAst("return new A::B::C(true);", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (:: (:: (:: A B) C) D)))", testAst("return new A::B::C::D;", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (( (:: (:: (:: A B) C) D))))", testAst("return new A::B::C::D();", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (( (:: (:: (:: A B) C) D) true)))", testAst("return new A::B::C::D(true);", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new A))", testAst("return new A;\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (( A)))", testAst("return new A();\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (( A true)))", testAst("return new A(true);\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (:: A B)))", testAst("return new A::B;\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (( (:: A B))))", testAst("return new A::B();\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (( (:: A B) true)))", testAst("return new A::B(true);\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (:: (:: A B) C)))", testAst("return new A::B::C;\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (( (:: (:: A B) C))))", testAst("return new A::B::C();\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (( (:: (:: A B) C) true)))", testAst("return new A::B::C(true);\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (:: (:: (:: A B) C) D)))", testAst("return new A::B::C::D;\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (( (:: (:: (:: A B) C) D))))", testAst("return new A::B::C::D();\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (( (:: (:: (:: A B) C) D) true)))", testAst("return new A::B::C::D(true);\n", AstStyle::Z3));
     }
 
     void astdecltypescope() {
-        ASSERT_EQUALS("sizedecltypethism_P.(XSize::::{", testAst("size { decltype(this->m_P)::X::Size };"));
+        ASSERT_EQUALS("sizedecltypethism_P.(XSize::::{", testAst("size { decltype(this->m_P)::X::Size };\n"));
     }
 
     void astdesignatedinit() {
-        ASSERT_EQUALS("(( f ({ (= (. x) 1)))", testAst("f({ .x = 1 });", AstStyle::Z3));
+        ASSERT_EQUALS("(( f ({ (= (. x) 1)))", testAst("f({ .x = 1 });\n", AstStyle::Z3));
     }
 
     void astrvaluedecl() {
-        ASSERT_EQUALS("varstdmove::var(=", testAst("std::string&& var = std::move(var);"));
+        ASSERT_EQUALS("varstdmove::var(=", testAst("std::string&& var = std::move(var);\n"));
     }
 
     void astorkeyword() {
-        ASSERT_EQUALS("ifsp.\"\"==sp.0==||(", testAst("void f() { if (s.p == \"\" or s.p == 0) {} }"));
+        ASSERT_EQUALS("ifsp.\"\"==sp.0==||(", testAst("void f() { if (s.p == \"\" or s.p == 0) {} }\n"));
+    }
+
+    void astenumdecl() {
+        ASSERT_EQUALS("A0U=", testAst("enum class myclass : unsigned char { A = 0U, };\n"));
+        ASSERT_EQUALS("A0U=", testAst("enum myclass : unsigned char { A = 0U, };\n"));
+    }
+
+    void astcompound() {
+        ASSERT_EQUALS("sn0=={(tmp:?=", testAst("Str s = n == 0 ? (Str) { 0 } : tmp;\n")); // #14548
+        ASSERT_EQUALS("s(sstrlens(0:?,{(return", testAst("return (struct Str) { (unsigned char*)s, s ? strlen(s) : 0 };\n"));
+    }
+
+    void astfuncdecl() {
+        ASSERT_EQUALS("", testAst("bool operator==(const S& a, const S& b);\n", AstStyle::Simple, ListSimplification::Full));
+        ASSERT_EQUALS("", testAst("::int32_t f();\n"));
+        ASSERT_EQUALS("", testAst("void f(int&& var);\n"));
+    }
+
+    void astarrayinit() { // #11738
+        ASSERT_EQUALS("a2[12,{", testAst("int a[2]{ 1, 2 };\n"));
+        ASSERT_EQUALS("a2[2[ 12, 34,{", testAst("int a[2][2]{ { 1, 2 }, { 3, 4 } };\n"));
+    }
+
+    void astbracedinit() {
+        ASSERT_EQUALS("ab{", testAst("int &a { b };\n", AstStyle::Simple, ListSimplification::Full));
+        ASSERT_EQUALS("a0{", testAst("int &&a { 0 };\n", AstStyle::Simple, ListSimplification::Full));
+        ASSERT_EQUALS("anullptr{", testAst("int *a { nullptr };\n", AstStyle::Simple, ListSimplification::Full));
+    }
+
+    void astif() {
+        ASSERT_EQUALS( // #14967
+            "ifxx(&&(",
+            testAst("void f(int (*x)()) {\n"
+                    "    if (x && x()) {}\n"
+                    "}\n", AstStyle::Simple, ListSimplification::Full));
     }
 
 #define isStartOfExecutableScope(offset, code) isStartOfExecutableScope_(offset, code, __FILE__, __LINE__)
     template<size_t size>
     bool isStartOfExecutableScope_(int offset, const char (&code)[size], const char* file, int line) {
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         return Tokenizer::startOfExecutableScope(tokenizer.tokens()->tokAt(offset)) != nullptr;
     }
 
     void startOfExecutableScope() {
-        ASSERT(isStartOfExecutableScope(3, "void foo() { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() const { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() volatile { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() override { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() noexcept { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() NOEXCEPT { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() CONST NOEXCEPT { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() const noexcept { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() noexcept(true) { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() const noexcept(true) { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() throw() { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() THROW() { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() CONST THROW() { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() const throw() { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() throw(int) { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() const throw(int) { }"));
-        ASSERT(isStartOfExecutableScope(2, "foo() : a(1) { }"));
-        ASSERT(isStartOfExecutableScope(2, "foo() : a(1), b(2) { }"));
-        ASSERT(isStartOfExecutableScope(2, "foo() : a{1} { }"));
-        ASSERT(isStartOfExecutableScope(2, "foo() : a{1}, b{2} { }"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() const { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() volatile { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() override { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() noexcept { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() NOEXCEPT { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() CONST NOEXCEPT { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() const noexcept { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() noexcept(true) { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() const noexcept(true) { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() throw() { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() THROW() { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() CONST THROW() { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() const throw() { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() throw(int) { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() const throw(int) { }\n"));
+        ASSERT(isStartOfExecutableScope(2, "foo() : a(1) { }\n"));
+        ASSERT(isStartOfExecutableScope(2, "foo() : a(1), b(2) { }\n"));
+        ASSERT(isStartOfExecutableScope(2, "foo() : a{1} { }\n"));
+        ASSERT(isStartOfExecutableScope(2, "foo() : a{1}, b{2} { }\n"));
     }
 
     void removeMacroInClassDef() { // #6058
-        ASSERT_EQUALS("class Fred { } ;", tokenizeAndStringify("class DLLEXPORT Fred { } ;"));
-        ASSERT_EQUALS("class Fred : Base { } ;", tokenizeAndStringify("class Fred FINAL : Base { } ;"));
-        ASSERT_EQUALS("class Fred : Base { } ;", tokenizeAndStringify("class DLLEXPORT Fred final : Base { } ;")); // #11422
+        ASSERT_EQUALS("class Fred { } ;", tokenizeAndStringify("class DLLEXPORT Fred { } ;\n"));
+        ASSERT_EQUALS("class Fred : Base { } ;", tokenizeAndStringify("class Fred FINAL : Base { } ;\n"));
+        ASSERT_EQUALS("class Fred : Base { } ;", tokenizeAndStringify("class DLLEXPORT Fred final : Base { } ;\n")); // #11422
         // Regression for C code:
-        ASSERT_EQUALS("struct Fred { } ;", tokenizeAndStringify("struct DLLEXPORT Fred { } ;", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("struct Fred { } ;", tokenizeAndStringify("struct DLLEXPORT Fred { } ;\n", dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void sizeofAddParentheses() {
-        ASSERT_EQUALS("sizeof ( sizeof ( 1 ) ) ;", tokenizeAndStringify("sizeof sizeof 1;"));
-        ASSERT_EQUALS("sizeof ( a . b ) + 3 ;", tokenizeAndStringify("sizeof a.b+3;"));
-        ASSERT_EQUALS("sizeof ( a [ 2 ] . b ) + 3 ;", tokenizeAndStringify("sizeof a[2].b+3;"));
-        ASSERT_EQUALS("f ( 0 , sizeof ( ptr . bar ) ) ;", tokenizeAndStringify("f(0, sizeof ptr->bar );"));
-        ASSERT_EQUALS("sizeof ( a ) > sizeof ( & main ) ;", tokenizeAndStringify("sizeof a > sizeof &main;"));
+        ASSERT_EQUALS("sizeof ( sizeof ( 1 ) ) ;", tokenizeAndStringify("sizeof sizeof 1;\n"));
+        ASSERT_EQUALS("sizeof ( a . b ) + 3 ;", tokenizeAndStringify("sizeof a.b+3;\n"));
+        ASSERT_EQUALS("sizeof ( a [ 2 ] . b ) + 3 ;", tokenizeAndStringify("sizeof a[2].b+3;\n"));
+        ASSERT_EQUALS("f ( 0 , sizeof ( ptr . bar ) ) ;", tokenizeAndStringify("f(0, sizeof ptr->bar );\n"));
+        ASSERT_EQUALS("sizeof ( a ) > sizeof ( & main ) ;", tokenizeAndStringify("sizeof a > sizeof &main;\n"));
     }
 
     void reportUnknownMacros() {
         const char code1[] = "MY_UNKNOWN_IMP1(IInStream)\n"
-                             "STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize) { if (ptr); }";
+                             "STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize) { if (ptr); }\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code1), UNKNOWN_MACRO);
 
-        const char code2[] = "void foo() { dostuff(x 0); }";
+        const char code2[] = "void foo() { dostuff(x 0); }\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code2), UNKNOWN_MACRO);
 
-        const char code3[] = "f(\"1\" __stringify(48) \"1\");";
+        const char code3[] = "f(\"1\" __stringify(48) \"1\");\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code3), UNKNOWN_MACRO);
 
         const char code4[] = "struct Foo {\n"
                              "  virtual MACRO(int) f1() {}\n"
                              "  virtual MACRO(int) f2() {}\n"
-                             "};";
+                             "};\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code4), UNKNOWN_MACRO);
 
         const char code5[] = "void foo() {\n"
                              "  EVALUATE(123, int x=a; int y=b+c;);\n"
-                             "}";
+                             "}\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code5), UNKNOWN_MACRO);
 
-        const char code6[] = "void foo() { dostuff(a, .x=0); }";
+        const char code6[] = "void foo() { dostuff(a, .x=0); }\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code6), UNKNOWN_MACRO);
 
-        const char code7[] = "void foo() { dostuff(ZEND_NUM_ARGS() TSRMLS_CC, x, y); }"; // #9476
+        const char code7[] = "void foo() { dostuff(ZEND_NUM_ARGS() TSRMLS_CC, x, y); }\n"; // #9476
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code7), UNKNOWN_MACRO);
 
-        const char code8[] = "void foo() { a = [](int x, decltype(vec) y){}; }";
+        const char code8[] = "void foo() { a = [](int x, decltype(vec) y){}; }\n";
         ASSERT_NO_THROW(tokenizeAndStringify(code8));
 
-        const char code9[] = "void f(std::exception c) { b(M() c.what()); }";
+        const char code9[] = "void f(std::exception c) { b(M() c.what()); }\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code9), UNKNOWN_MACRO);
 
-        const char code10[] = "void f(std::exception c) { b(M() M() + N(c.what())); }";
+        const char code10[] = "void f(std::exception c) { b(M() M() + N(c.what())); }\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code10), UNKNOWN_MACRO);
 
-        const char code11[] = "struct B { B(B&&) noexcept {} ~B() noexcept {} };";
+        const char code11[] = "struct B { B(B&&) noexcept {} ~B() noexcept {} };\n";
         ASSERT_NO_THROW(tokenizeAndStringify(code11));
 
-        ASSERT_NO_THROW(tokenizeAndStringify("alignas(8) alignas(16) int x;")); // alignas is not unknown macro
+        ASSERT_NO_THROW(tokenizeAndStringify("alignas(8) alignas(16) int x;\n")); // alignas is not unknown macro
 
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { if(x) SYSTEM_ERROR }"), UNKNOWN_MACRO);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { dostuff(); SYSTEM_ERROR }"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { if(x) SYSTEM_ERROR }\n"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { dostuff(); SYSTEM_ERROR }\n"), UNKNOWN_MACRO);
 
         ASSERT_NO_THROW(tokenizeAndStringify("void f(void* q) {\n"
                                              "    g(&(S) { .p = (int*)q });\n"
@@ -7496,6 +7953,16 @@ class TestTokenizer : public TestFixture {
                                                    "    return std::string{ g() + \"abc\" MACRO \"def\" };\n"
                                                    "}\n"), UNKNOWN_MACRO);
 
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("namespace N {\n"
+                                                   "    struct C {\n"
+                                                   "        void f();\n"
+                                                   "    };\n"
+                                                   "    void C(abc)::f() {\n"
+                                                   "        X x;\n"
+                                                   "        N::Y([&] { x(); })->g();\n"
+                                                   "    }\n"
+                                                   "}\n"), UNKNOWN_MACRO);
+
         ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("static void handle_toggle(void (*proc) PROTO_XT_CALLBACK_ARGS, int var) {}\n"), // #13198
                                      UNKNOWN_MACRO,
                                      "There is an unknown macro here somewhere. Configuration is required. If PROTO_XT_CALLBACK_ARGS is a macro then please configure it.");
@@ -7505,8 +7972,8 @@ class TestTokenizer : public TestFixture {
 
     void findGarbageCode() { // Test Tokenizer::findGarbageCode()
         // C++ try/catch in global scope
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("try { }"), SYNTAX, "syntax error: keyword 'try' is not allowed in global scope");
-        ASSERT_NO_THROW(tokenizeAndStringify("void f() try { } catch (int) { }"));
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("try { }\n"), SYNTAX, "syntax error: keyword 'try' is not allowed in global scope");
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() try { } catch (int) { }\n"));
         ASSERT_NO_THROW(tokenizeAndStringify("struct S {\n" // #9716
                                              "    S();\n"
                                              "    int x, y;\n"
@@ -7521,61 +7988,61 @@ class TestTokenizer : public TestFixture {
                                              "    catch (...) { h(); }\n"));
 
         // before if|for|while|switch
-        ASSERT_NO_THROW(tokenizeAndStringify("void f() { do switch (a) {} while (1); }"));
-        ASSERT_NO_THROW(tokenizeAndStringify("void f() { label: switch (a) {} }"));
-        ASSERT_NO_THROW(tokenizeAndStringify("void f() { UNKNOWN_MACRO if (a) {} }"));
-        ASSERT_NO_THROW(tokenizeAndStringify("void f() { []() -> int * {}; }"));
-        ASSERT_NO_THROW(tokenizeAndStringify("void f() { const char* var = \"1\" \"2\"; }"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() { do switch (a) {} while (1); }\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() { label: switch (a) {} }\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() { UNKNOWN_MACRO if (a) {} }\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() { []() -> int * {}; }\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() { const char* var = \"1\" \"2\"; }\n"));
 
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { MACRO(switch); }"), UNKNOWN_MACRO);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { MACRO(x,switch); }"), UNKNOWN_MACRO);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { for_chain( if (!done) done = 1); }"), UNKNOWN_MACRO);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { for_chain( a, b, if (!done) done = 1); }"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { MACRO(switch); }\n"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { MACRO(x,switch); }\n"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { for_chain( if (!done) done = 1); }\n"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { for_chain( a, b, if (!done) done = 1); }\n"), UNKNOWN_MACRO);
 
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { if (retval==){} }"), SYNTAX, "syntax error: ==)");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { if (retval==){} }\n"), SYNTAX, "syntax error: ==)");
 
         // after (expr)
-        ASSERT_NO_THROW(tokenizeAndStringify("void f() { switch (a) int b; }"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() { switch (a) int b; }\n"));
 
-        ASSERT_NO_THROW(tokenizeAndStringify("S s = { .x=2, .y[0]=3 };"));
-        ASSERT_NO_THROW(tokenizeAndStringify("S s = { .ab.a=2, .ab.b=3 };"));
+        ASSERT_NO_THROW(tokenizeAndStringify("S s = { .x=2, .y[0]=3 };\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("S s = { .ab.a=2, .ab.b=3 };\n"));
 
-        ASSERT_NO_THROW(tokenizeAndStringify("extern \"C\" typedef void FUNC();"));
+        ASSERT_NO_THROW(tokenizeAndStringify("extern \"C\" typedef void FUNC();\n"));
 
         // Ticket #9572
         ASSERT_NO_THROW(tokenizeAndStringify("struct poc { "
                                              "  struct { int d; } port[1]; "
                                              "}; "
-                                             "struct poc p = { .port[0] = {.d = 3} };"));
+                                             "struct poc p = { .port[0] = {.d = 3} };\n"));
 
         // Ticket #9664
-        ASSERT_NO_THROW(tokenizeAndStringify("S s = { .x { 2 }, .y[0] { 3 } };"));
+        ASSERT_NO_THROW(tokenizeAndStringify("S s = { .x { 2 }, .y[0] { 3 } };\n"));
 
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("f(0, .x());"), SYNTAX); // #12823
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("f(0, .x());\n"), SYNTAX); // #12823
 
         // Ticket #11134
         ASSERT_NO_THROW(tokenizeAndStringify("struct my_struct { int x; }; "
                                              "std::string s; "
-                                             "func(my_struct{ .x=42 }, s.size());"));
+                                             "func(my_struct{ .x=42 }, s.size());\n"));
         ASSERT_NO_THROW(tokenizeAndStringify("struct my_struct { int x; int y; }; "
                                              "std::string s; "
-                                             "func(my_struct{ .x{42}, .y=3 }, s.size());"));
+                                             "func(my_struct{ .x{42}, .y=3 }, s.size());\n"));
         ASSERT_NO_THROW(tokenizeAndStringify("struct my_struct { int x; int y; }; "
                                              "std::string s; "
-                                             "func(my_struct{ .x=42, .y{3} }, s.size());"));
+                                             "func(my_struct{ .x=42, .y{3} }, s.size());\n"));
         ASSERT_NO_THROW(tokenizeAndStringify("struct my_struct { int x; }; "
                                              "void h() { "
                                              "  for (my_struct ms : { my_struct{ .x=5 } }) {} "
-                                             "}"));
+                                             "}\n"));
         ASSERT_NO_THROW(tokenizeAndStringify("struct my_struct { int x; int y; }; "
                                              "void h() { "
                                              "  for (my_struct ms : { my_struct{ .x=5, .y{42} } }) {} "
-                                             "}"));
+                                             "}\n"));
 
         ASSERT_NO_THROW(tokenizeAndStringify("template <typename T> void foo() {} "
                                              "void h() { "
                                              "  [func=foo<int>]{func();}(); "
-                                             "}"));
+                                             "}\n"));
         ASSERT_NO_THROW(tokenizeAndStringify("template <class T> constexpr int n = 1;\n"
                                              "template <class T> T a[n<T>];\n"));
 
@@ -7584,23 +8051,23 @@ class TestTokenizer : public TestFixture {
 
 
         // op op
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { dostuff (x==>y); }"), SYNTAX, "syntax error: == >");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { dostuff (x==>y); }\n"), SYNTAX, "syntax error: == >");
 
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { assert(a==()); }"), SYNTAX, "syntax error: ==()");
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { assert(a+()); }"), SYNTAX, "syntax error: +()");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { assert(a==()); }\n"), SYNTAX, "syntax error: ==()");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { assert(a+()); }\n"), SYNTAX, "syntax error: +()");
 
         // #9445 - typeof is not a keyword in C
-        ASSERT_NO_THROW(tokenizeAndStringify("void foo() { char *typeof, *value; }", dinit(TokenizeOptions, $.expand = false, $.cpp = false)));
+        ASSERT_NO_THROW(tokenizeAndStringify("void foo() { char *typeof, *value; }\n", dinit(TokenizeOptions, $.expand = false, $.cpp = false)));
 
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("enum : { };"), SYNTAX, "syntax error: Unexpected token '{'");
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("enum : 3 { };"), SYNTAX, "syntax error: Unexpected token '3'");
-        ASSERT_NO_THROW(tokenizeAndStringify("enum { E = int{} };"));
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("enum : { };\n"), SYNTAX, "syntax error: Unexpected token '{'");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("enum : 3 { };\n"), SYNTAX, "syntax error: Unexpected token '3'");
+        ASSERT_NO_THROW(tokenizeAndStringify("enum { E = int{} };\n"));
 
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("int a() { b((c)return 0) }"), SYNTAX, "syntax error");
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("int f() { MACRO(x) return 0; }"),
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("int a() { b((c)return 0) }\n"), SYNTAX, "syntax error");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("int f() { MACRO(x) return 0; }\n"),
                                      UNKNOWN_MACRO,
                                      "There is an unknown macro here somewhere. Configuration is required. If MACRO is a macro then please configure it.");
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("bool f() { unknown return 0; }"),
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("bool f() { unknown return 0; }\n"),
                                      UNKNOWN_MACRO,
                                      "There is an unknown macro here somewhere. Configuration is required. If unknown is a macro then please configure it.");
 
@@ -7661,27 +8128,73 @@ class TestTokenizer : public TestFixture {
                                      UNKNOWN_MACRO,
                                      "There is an unknown macro here somewhere. Configuration is required. If MACRO is a macro then please configure it.");
 
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("{ for (()()) }"), SYNTAX); // #11643
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("{ for (()()) }\n"), SYNTAX); // #11643
 
         ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f(const std::vector<std::string>& v) {\n" // #14326
                                                    "    for (const std::string&s : v)\n"
-                                                   "}"),
+                                                   "}\n"),
                               SYNTAX);
 
-        ASSERT_NO_THROW(tokenizeAndStringify("S* g = ::new(ptr) S();")); // #12552
-        ASSERT_NO_THROW(tokenizeAndStringify("void f(int* p) { return ::delete p; }"));
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f(T* p) {\n"
+                                                   "    g(p->x TSRMLS_CC);"
+                                                   "}\n"),
+                              UNKNOWN_MACRO);
+
+        ASSERT_NO_THROW(tokenizeAndStringify("S* g = ::new(ptr) S();\n")); // #12552
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int* p) { return ::delete p; }\n"));
 
         ASSERT_NO_THROW(tokenizeAndStringify("template <typename T, int N>\n" // #12659
-                                             "constexpr void f(T(&&a)[N]) {}"));
+                                             "constexpr void f(T(&&a)[N]) {}\n"));
 
-        ASSERT_NO_THROW(tokenizeAndStringify("typedef struct { typedef int T; } S;")); // #12700
+        ASSERT_NO_THROW(tokenizeAndStringify("typedef struct { typedef int T; } S;\n")); // #12700
 
         ASSERT_NO_THROW(tokenizeAndStringify("class A { bool restrict() const; };\n"
-                                             "bool A::restrict() const { return true; }")); // #12718
+                                             "bool A::restrict() const { return true; }\n")); // #12718
 
-        ASSERT_NO_THROW(tokenizeAndStringify("enum { E = sizeof(struct { int i; }) };")); // #13249
+        ASSERT_NO_THROW(tokenizeAndStringify("enum { E = sizeof(struct { int i; }) };\n")); // #13249
+
+        ASSERT_NO_THROW(tokenizeAndStringify("struct S { unsigned u:2, :30; };\n")); // #14393
+
+        ASSERT_NO_THROW(tokenizeAndStringify("struct S {};\n" // #14400
+                                             "auto f(bool b) -> struct S {\n"
+                                             "    if (b) {}\n"
+                                             "    return {};\n"
+                                             "};\n"));
+
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() {\n" // #14395
+                                             "    for (int i : [](int a, int b) { ++a; ++b; return std::vector<int>{a, b}; }(1, 2)) {}\n"
+                                             "}\n"));
+
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int* p) {\n" // #15014
+                                             "    *p = -*p;\n"
+                                             "}\n"));
+
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(void* h) {\n" // #15079
+                                             "    (void)::CloseHandle(h);\n"
+                                             "    int i = (int)::GetTickCount();\n"
+                                             "    g((unsigned char)::toupper(i));\n"
+                                             "}\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("int f(int i) {\n"
+                                             "    return (int)::abs(i);\n"
+                                             "}\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("namespace N { struct T {}; }\n"
+                                             "void f(void* p) {\n"
+                                             "    new (p) ::N::T;\n"
+                                             "}\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("struct S { using type = int; };\n"
+                                             "S s;\n"
+                                             "decltype(s)::type i;\n"));
+        {
+            const Settings s = settingsBuilder().cpp(Standards::CPP03).build();
+            ASSERT_NO_THROW(tokenizeAndStringify("struct S { typedef int type; };\n"
+                                                 "S s;\n"
+                                                 "decltype(s)::type i;\n", s));
+        }
 
         ignore_errout();
+
+        ASSERT_EQUALS(";", tokenizeAndStringify("typedef std::size_t size_t;\n")); // #14809
+        ASSERT_EQUALS("struct S { int i { 0 } ; } ;", tokenizeAndStringify("struct S { int i : 1{0}; };\n")); // #15070
     }
 
 
@@ -7899,7 +8412,7 @@ class TestTokenizer : public TestFixture {
                             "  });\n"
                             "}\n"));
 
-        ASSERT_NO_THROW(tokenizeAndStringify("a<b?0:1>()==3;"));
+        ASSERT_NO_THROW(tokenizeAndStringify("a<b?0:1>()==3;\n"));
 
         // #10336
         ASSERT_NO_THROW(tokenizeAndStringify("struct a {\n"
@@ -7953,14 +8466,14 @@ class TestTokenizer : public TestFixture {
     }
 
     void checkNamespaces() {
-        ASSERT_NO_THROW(tokenizeAndStringify("namespace x { namespace y { namespace z {}}}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("namespace x { namespace y { namespace z {}}}\n"));
     }
 
     void checkLambdas() {
-        ASSERT_NO_THROW(tokenizeAndStringify("auto f(int& i) { return [=, &i] {}; }"));
-        ASSERT_NO_THROW(tokenizeAndStringify("auto f(int& i) { return [&, i] {}; }"));
-        ASSERT_NO_THROW(tokenizeAndStringify("auto f(int& i) { return [&, i = std::move(i)] {}; }"));
-        ASSERT_NO_THROW(tokenizeAndStringify("auto f(int& i) { return [=, i = std::move(i)] {}; }"));
+        ASSERT_NO_THROW(tokenizeAndStringify("auto f(int& i) { return [=, &i] {}; }\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("auto f(int& i) { return [&, i] {}; }\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("auto f(int& i) { return [&, i = std::move(i)] {}; }\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("auto f(int& i) { return [=, i = std::move(i)] {}; }\n"));
         ASSERT_NO_THROW(tokenizeAndStringify("struct c {\n"
                                              "  void d() {\n"
                                              "    int a;\n"
@@ -8173,7 +8686,7 @@ class TestTokenizer : public TestFixture {
     }
 
     void noCrash3() {
-        ASSERT_NO_THROW(tokenizeAndStringify("void a(X<int> x, typename Y1::Y2<int, A::B::C, 2> y, Z z = []{});"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void a(X<int> x, typename Y1::Y2<int, A::B::C, 2> y, Z z = []{});\n"));
     }
 
     void noCrash4() {
@@ -8213,17 +8726,25 @@ class TestTokenizer : public TestFixture {
     }
 
     void checkConfiguration() {
-        ASSERT_THROW_INTERNAL_EQUALS(checkConfig("void f() { DEBUG(x();y()); }"),
+        ASSERT_THROW_INTERNAL_EQUALS(checkConfig("void f() { DEBUG(x();y()); }\n"),
                                      UNKNOWN_MACRO,
                                      "There is an unknown macro here somewhere. Configuration is required. If DEBUG is a macro then please configure it.");
     }
 
     void unknownMacroBeforeReturn() {
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("int f() { X return 0; }"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("int f() { X return 0; }\n"), UNKNOWN_MACRO);
     }
 
     void cppKeywordInCSource() {
-        ASSERT_NO_THROW(tokenizeAndStringify("int throw() {}", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_NO_THROW(tokenizeAndStringify("int throw() {}\n", dinit(TokenizeOptions, $.cpp = false)));
+
+        const char code[] = "void requires(const char*);\n" // #14613
+                            "void f() { requires(\"abc\"); }\n";
+        ASSERT_NO_THROW(tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
+        const Settings s_cpp17 = settingsBuilder().cpp(Standards::CPP17).build();
+        ASSERT_NO_THROW(tokenizeAndStringify(code, s_cpp17, true));
+        const Settings s_cpp20 = settingsBuilder().cpp(Standards::CPP20).build();
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(code, s_cpp20, true), AST);
     }
 
     void cppcast() {
@@ -8240,6 +8761,22 @@ class TestTokenizer : public TestFixture {
         }
     }
 
+    void ccast() {
+        const char code[] = "a = (int)x;\n" // #13579
+                            "int (*p)[10];\n"
+                            "b = (void (S::*)(int) const)&y;\n";
+
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
+
+        const Token* par = Token::findsimplematch(tokenizer.tokens(), "(");
+        ASSERT(par->isCast());
+        par = Token::findsimplematch(par->next(), "(");
+        ASSERT(!par->isCast());
+        par = Token::findsimplematch(par->next(), "(");
+        ASSERT(par->isCast());
+    }
+
 #define checkHdrs(...) checkHdrs_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     std::string checkHdrs_(const char* file, int line, const char (&code)[size], bool checkHeadersFlag) {
@@ -8250,7 +8787,7 @@ class TestTokenizer : public TestFixture {
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        return tokenizer.tokens()->stringifyList();
+        return tokenizer.tokens()->stringifyList(false, false, true, true, true);
     }
 
     void checkHeader1() {
@@ -8260,7 +8797,7 @@ class TestTokenizer : public TestFixture {
                             "    int a = 1;\n"
                             "    void f() { g(1); }\n"
                             "    template <typename T> void g(T x) { a = 2; }\n" // <- template is used and should be kept
-                            "};";
+                            "};\n";
 
         ASSERT_EQUALS("\n\n##file 1\n"
                       "1: struct A {\n"
@@ -8280,29 +8817,29 @@ class TestTokenizer : public TestFixture {
     }
 
     void removeExtraTemplateKeywords() {
-        const char code1[] = "typename GridView::template Codim<0>::Iterator iterator;";
+        const char code1[] = "typename GridView::template Codim<0>::Iterator iterator;\n";
         const char expected1[] = "GridView :: Codim < 0 > :: Iterator iterator ;";
         ASSERT_EQUALS(expected1, tokenizeAndStringify(code1));
 
-        const char code2[] = "typename GridView::template Codim<0>::Iterator it = gv.template begin<0>();";
+        const char code2[] = "typename GridView::template Codim<0>::Iterator it = gv.template begin<0>();\n";
         const char expected2[] = "GridView :: Codim < 0 > :: Iterator it ; it = gv . begin < 0 > ( ) ;";
         ASSERT_EQUALS(expected2, tokenizeAndStringify(code2));
     }
 
     void removeAlignas1() {
-        const char code[] = "alignas(float) unsigned char c[sizeof(float)];";
+        const char code[] = "alignas(float) unsigned char c[sizeof(float)];\n";
         const char expected[] = "unsigned char c [ sizeof ( float ) ] ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void removeAlignas2() { // Do not remove alignas and alignof in the same way
-        const char code[] = "static_assert( alignof( VertexC ) == 4 );";
+        const char code[] = "static_assert( alignof( VertexC ) == 4 );\n";
         const char expected[] = "static_assert ( alignof ( VertexC ) == 4 ) ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void removeAlignas3() {
-        const char code[] = "alignas(16) int x;";
+        const char code[] = "alignas(16) int x;\n";
         const char expected[] = "int x ;";
         // According to cppreference alignas() is a C23 macro; but it is often available when compiling C11.
         // Misra C has C11 examples with alignas.
@@ -8313,7 +8850,7 @@ class TestTokenizer : public TestFixture {
 
     void dumpAlignas() {
         SimpleTokenizer tokenizer(settingsDefault, *this, false);
-        ASSERT(tokenizer.tokenize("int alignas(8) alignas(16) x;"));
+        ASSERT(tokenizer.tokenize("int alignas(8) alignas(16) x;\n"));
         ASSERT(Token::simpleMatch(tokenizer.tokens(), "int x ;"));
         std::ostringstream ostr;
         tokenizer.dump(ostr);
@@ -8324,15 +8861,15 @@ class TestTokenizer : public TestFixture {
     void simplifyCoroutines() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP20).build();
 
-        const char code1[] = "generator<int> f() { co_yield start++; }";
+        const char code1[] = "generator<int> f() { co_yield start++; }\n";
         const char expected1[] = "generator < int > f ( ) { co_yield ( start ++ ) ; }";
         ASSERT_EQUALS(expected1, tokenizeAndStringify(code1, settings));
 
-        const char code2[] = "task<> f() { co_await foo(); }";
+        const char code2[] = "task<> f() { co_await foo(); }\n";
         const char expected2[] = "task < > f ( ) { co_await ( foo ( ) ) ; }";
         ASSERT_EQUALS(expected2, tokenizeAndStringify(code2, settings));
 
-        const char code3[] = "generator<int> f() { co_return 7; }";
+        const char code3[] = "generator<int> f() { co_return 7; }\n";
         const char expected3[] = "generator < int > f ( ) { co_return ( 7 ) ; }";
         ASSERT_EQUALS(expected3, tokenizeAndStringify(code3, settings));
     }
@@ -8340,41 +8877,41 @@ class TestTokenizer : public TestFixture {
     void simplifySpaceshipOperator() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP20).build();
 
-        ASSERT_EQUALS("; x <=> y ;", tokenizeAndStringify(";x<=>y;", settings));
+        ASSERT_EQUALS("; x <=> y ;", tokenizeAndStringify(";x<=>y;\n", settings));
     }
 
     void simplifyIfSwitchForInit1() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP17).build();
-        const char code[] = "void f() { if (a;b) {} }";
+        const char code[] = "void f() { if (a;b) {} }\n";
         ASSERT_EQUALS("void f ( ) { { a ; if ( b ) { } } }", tokenizeAndStringify(code, settings));
     }
 
     void simplifyIfSwitchForInit2() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP20).build();
-        const char code[] = "void f() { if (a;b) {} else {} }";
+        const char code[] = "void f() { if (a;b) {} else {} }\n";
         ASSERT_EQUALS("void f ( ) { { a ; if ( b ) { } else { } } }", tokenizeAndStringify(code, settings));
     }
 
     void simplifyIfSwitchForInit3() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP20).build();
-        const char code[] = "void f() { switch (a;b) {} }";
+        const char code[] = "void f() { switch (a;b) {} }\n";
         ASSERT_EQUALS("void f ( ) { { a ; switch ( b ) { } } }", tokenizeAndStringify(code, settings));
     }
 
     void simplifyIfSwitchForInit4() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP20).build();
-        const char code[] = "void f() { for (a;b:c) {} }";
+        const char code[] = "void f() { for (a;b:c) {} }\n";
         ASSERT_EQUALS("void f ( ) { { a ; for ( b : c ) { } } }", tokenizeAndStringify(code, settings));
     }
 
     void simplifyIfSwitchForInit5() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP20).build();
-        const char code[] = "void f() { if ([] { ; }) {} }";
+        const char code[] = "void f() { if ([] { ; }) {} }\n";
         ASSERT_EQUALS("void f ( ) { if ( [ ] { ; } ) { } }", tokenizeAndStringify(code, settings));
     }
 
     void newPlacementArgsCppInit() { // #13775
-        const char code[] = "::new(nullptr) int {};";
+        const char code[] = "::new(nullptr) int {};\n";
         SimpleTokenizer tokenizer(settings1, *this);
         tokenizer.tokenize(code);
         const Token *inttok = Token::findsimplematch(tokenizer.tokens(), "int");
@@ -8387,7 +8924,7 @@ class TestTokenizer : public TestFixture {
 
     void cpp20_default_bitfield_initializer() {
         const Settings s1 = settingsBuilder().cpp(Standards::CPP20).build();
-        const char code[] = "struct S { int a:2 = 0; };";
+        const char code[] = "struct S { int a:2 = 0; };\n";
         ASSERT_EQUALS("struct S { int a ; a = 0 ; } ;", tokenizeAndStringify(code, s1));
         const Settings s2 = settingsBuilder().cpp(Standards::CPP17).build();
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code, s2), SYNTAX);
@@ -8404,44 +8941,44 @@ class TestTokenizer : public TestFixture {
             ASSERT_LOC(tok->isCpp11init() == expected, file, line);
         };
 
-        testIsCpp11init("class X : public A<int>, C::D {};",
+        testIsCpp11init("class X : public A<int>, C::D {};\n",
                         "D {",
                         Token::Cpp11init::NOINIT);
 
-        testIsCpp11init("auto f() -> void {}",
+        testIsCpp11init("auto f() -> void {}\n",
                         "void {",
                         Token::Cpp11init::NOINIT);
-        testIsCpp11init("auto f() & -> void {}",
+        testIsCpp11init("auto f() & -> void {}\n",
                         "void {",
                         Token::Cpp11init::NOINIT);
-        testIsCpp11init("auto f() const noexcept(false) -> void {}",
+        testIsCpp11init("auto f() const noexcept(false) -> void {}\n",
                         "void {",
                         Token::Cpp11init::NOINIT);
-        testIsCpp11init("auto f() -> std::vector<int> { return {}; }",
+        testIsCpp11init("auto f() -> std::vector<int> { return {}; }\n",
                         "{ return",
                         Token::Cpp11init::NOINIT);
-        testIsCpp11init("auto f() -> std::vector<int> { return {}; }",
+        testIsCpp11init("auto f() -> std::vector<int> { return {}; }\n",
                         "vector",
                         Token::Cpp11init::NOINIT);
-        testIsCpp11init("auto f() -> std::vector<int> { return {}; }",
+        testIsCpp11init("auto f() -> std::vector<int> { return {}; }\n",
                         "std ::",
                         Token::Cpp11init::NOINIT);
 
-        testIsCpp11init("class X{};",
+        testIsCpp11init("class X{};\n",
                         "{ }",
                         Token::Cpp11init::NOINIT);
-        testIsCpp11init("class X{}", // forgotten ; so not properly recognized as a class
+        testIsCpp11init("class X{}\n", // forgotten ; so not properly recognized as a class
                         "{ }",
                         Token::Cpp11init::CPP11INIT);
 
-        testIsCpp11init("namespace abc::def { TEST(a, b) {} }",
+        testIsCpp11init("namespace abc::def { TEST(a, b) {} }\n",
                         "{ TEST",
                         Token::Cpp11init::NOINIT);
-        testIsCpp11init("namespace { TEST(a, b) {} }", // anonymous namespace
+        testIsCpp11init("namespace { TEST(a, b) {} }\n", // anonymous namespace
                         "{ TEST",
                         Token::Cpp11init::NOINIT);
 
-        testIsCpp11init("enum { e = decltype(s)::i };",
+        testIsCpp11init("enum { e = decltype(s)::i };\n",
                         "{ e",
                         Token::Cpp11init::NOINIT);
 
@@ -8513,6 +9050,14 @@ class TestTokenizer : public TestFixture {
                         "{ 1",
                         Token::Cpp11init::CPP11INIT);
 
+        testIsCpp11init("int a[2]{ 1, 2 }; \n",
+                        "{ 1",
+                        Token::Cpp11init::CPP11INIT);
+
+        testIsCpp11init("void f() { g([] { if (int x = 1; x) {} }); }\n", // #14790
+                        "{ int",
+                        Token::Cpp11init::NOINIT); // don't hang
+
         ASSERT_NO_THROW(tokenizeAndStringify("template<typename U> struct X {};\n" // don't crash
                                              "template<typename T> auto f(T t) -> X<decltype(t + 1)> {}\n"));
         ASSERT_EQUALS("[test.cpp:2:22]: (debug) auto token with no type. [autoNoType]\n", errout_str());
@@ -8618,14 +9163,11 @@ class TestTokenizer : public TestFixture {
     }
 
     void testDirectiveIncludeLocations() {
+        ScopedFile inc1("inc1.h", "#define macro2 val\n#include \"inc2.h\"\n#define macro4 val\n");
+        ScopedFile inc2("inc2.h", "#define macro3 val\n");
+        // TODO: preprocess?
         const char filedata[] = "#define macro1 val\n"
-                                "#file \"inc1.h\"\n"
-                                "#define macro2 val\n"
-                                "#file \"inc2.h\"\n"
-                                "#define macro3 val\n"
-                                "#endfile\n"
-                                "#define macro4 val\n"
-                                "#endfile\n"
+                                "#include \"inc1.h\"\n"
                                 "#define macro5 val\n";
         const char dumpdata[] = "  <directivelist>\n"
                                 "    <directive file=\"test.c\" linenr=\"1\" str=\"#define macro1 val\">\n"
@@ -8636,8 +9178,14 @@ class TestTokenizer : public TestFixture {
                                 "    </directive>\n"
                                 "    <directive file=\"test.c\" linenr=\"2\" str=\"#include &quot;inc1.h&quot;\">\n"
                                 "      <token column=\"1\" str=\"#\"/>\n"
-                                "      <token column=\"2\" str=\"file\"/>\n"
-                                "      <token column=\"7\" str=\"&quot;inc1.h&quot;\"/>\n"
+                                "      <token column=\"2\" str=\"include\"/>\n"
+                                "      <token column=\"10\" str=\"&quot;inc1.h&quot;\"/>\n"
+                                "    </directive>\n"
+                                "    <directive file=\"test.c\" linenr=\"3\" str=\"#define macro5 val\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"define\"/>\n"
+                                "      <token column=\"9\" str=\"macro5\"/>\n"
+                                "      <token column=\"16\" str=\"val\"/>\n"
                                 "    </directive>\n"
                                 "    <directive file=\"inc1.h\" linenr=\"1\" str=\"#define macro2 val\">\n"
                                 "      <token column=\"1\" str=\"#\"/>\n"
@@ -8647,14 +9195,8 @@ class TestTokenizer : public TestFixture {
                                 "    </directive>\n"
                                 "    <directive file=\"inc1.h\" linenr=\"2\" str=\"#include &quot;inc2.h&quot;\">\n"
                                 "      <token column=\"1\" str=\"#\"/>\n"
-                                "      <token column=\"2\" str=\"file\"/>\n"
-                                "      <token column=\"7\" str=\"&quot;inc2.h&quot;\"/>\n"
-                                "    </directive>\n"
-                                "    <directive file=\"inc2.h\" linenr=\"1\" str=\"#define macro3 val\">\n"
-                                "      <token column=\"1\" str=\"#\"/>\n"
-                                "      <token column=\"2\" str=\"define\"/>\n"
-                                "      <token column=\"9\" str=\"macro3\"/>\n"
-                                "      <token column=\"16\" str=\"val\"/>\n"
+                                "      <token column=\"2\" str=\"include\"/>\n"
+                                "      <token column=\"10\" str=\"&quot;inc2.h&quot;\"/>\n"
                                 "    </directive>\n"
                                 "    <directive file=\"inc1.h\" linenr=\"3\" str=\"#define macro4 val\">\n"
                                 "      <token column=\"1\" str=\"#\"/>\n"
@@ -8662,10 +9204,10 @@ class TestTokenizer : public TestFixture {
                                 "      <token column=\"9\" str=\"macro4\"/>\n"
                                 "      <token column=\"16\" str=\"val\"/>\n"
                                 "    </directive>\n"
-                                "    <directive file=\"test.c\" linenr=\"3\" str=\"#define macro5 val\">\n"
+                                "    <directive file=\"inc2.h\" linenr=\"1\" str=\"#define macro3 val\">\n"
                                 "      <token column=\"1\" str=\"#\"/>\n"
                                 "      <token column=\"2\" str=\"define\"/>\n"
-                                "      <token column=\"9\" str=\"macro5\"/>\n"
+                                "      <token column=\"9\" str=\"macro3\"/>\n"
                                 "      <token column=\"16\" str=\"val\"/>\n"
                                 "    </directive>\n"
                                 "  </directivelist>\n"
@@ -8765,7 +9307,7 @@ class TestTokenizer : public TestFixture {
     }
 
     void genericInIf() { // #13561
-        const char code[] = "  if (_Generic(s, char * : 1, const float * : (a ? b, c : d), volatile int * : 3, default : 0)) {}";
+        const char code[] = "  if (_Generic(s, char * : 1, const float * : (a ? b, c : d), volatile int * : 3, default : 0)) {}\n";
         const char ast[] = "(( if (( _Generic (, (, (, (, s 1) (? a (: (, b c) d))) 3) 0)))";
         ASSERT_EQUALS(ast, testAst(code, AstStyle::Z3));
     }
@@ -8803,24 +9345,24 @@ class TestTokenizer : public TestFixture {
                             "    if (fp_t const fp = s.g<fp_t>()) {}\n"
                             "}\n";
         ASSERT_NO_THROW(tokenizeAndStringify(code));
-        ASSERT_EQUALS("void ( * const f ) ( ) ;", tokenizeAndStringify("typedef void (*fp_t)(); fp_t const f;"));
+        ASSERT_EQUALS("void ( * const f ) ( ) ;", tokenizeAndStringify("typedef void (*fp_t)(); fp_t const f;\n"));
     }
 
     void simplifyPlatformTypes() {
         {
-            const char code[] = "size_t f();";
-            ASSERT_EQUALS("unsigned long f ( ) ;", tokenizeAndStringify(code, dinit(TokenizeOptions, $.platform = Platform::Type::Unix32)));
-            ASSERT_EQUALS("unsigned long f ( ) ;", tokenizeAndStringify(code, dinit(TokenizeOptions, $.platform = Platform::Type::Unix64)));
+            const char code[] = "size_t f();\n";
+            ASSERT_EQUALS("unsigned long f ( ) ;", tokenizeAndStringify(code, settings2_unix32));
+            ASSERT_EQUALS("unsigned long f ( ) ;", tokenizeAndStringify(code, settings2_unix64));
         }
         {
-            const char code[] = "ssize_t f();";
-            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, dinit(TokenizeOptions, $.platform = Platform::Type::Unix32)));
-            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, dinit(TokenizeOptions, $.platform = Platform::Type::Unix64)));
+            const char code[] = "ssize_t f();\n";
+            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, settings2_unix32));
+            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, settings2_unix64));
         }
         {
-            const char code[] = "std::ptrdiff_t f();";
-            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, dinit(TokenizeOptions, $.platform = Platform::Type::Unix32)));
-            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, dinit(TokenizeOptions, $.platform = Platform::Type::Unix64)));
+            const char code[] = "std::ptrdiff_t f();\n";
+            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, settings2_unix32));
+            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, settings2_unix64));
         }
     }
 
@@ -8839,7 +9381,7 @@ class TestTokenizer : public TestFixture {
                             "            i();\n"
                             "            break;\n"
                             "    }\n"
-                            "}";
+                            "}\n";
         SimpleTokenizer tokenizer(settingsDefault, *this, false);
         ASSERT(tokenizer.tokenize(code));
         std::ostringstream ostr;
@@ -8848,6 +9390,16 @@ class TestTokenizer : public TestFixture {
         ASSERT(dump.find(" isAttributeFallthrough=\"true\"") != std::string::npos);
     }
 
+    void dumpAttributeUsed() {
+        const char code[] = "static int x __attribute__((used));\n";
+        SimpleTokenizer tokenizer(settingsDefault, *this, false);
+        ASSERT(tokenizer.tokenize(code));
+        std::ostringstream ostr;
+        tokenizer.dump(ostr);
+        const std::string dump = ostr.str();
+        ASSERT(dump.find(" isAttributeUsed=\"true\"") != std::string::npos);
+    }
+
     void simplifyRedundantParentheses() {
         const char code[] = "int f(struct S s) {\n"
                             "    return g(1, &(int){ s.i });\n"
@@ -8857,7 +9409,7 @@ class TestTokenizer : public TestFixture {
     }
 
     void simplifyEnum1() {
-        const char code[] = "static enum {A,B} ab;";
+        const char code[] = "static enum {A,B} ab;\n";
         ASSERT_EQUALS("enum Anonymous0 { A , B } ; static enum Anonymous0 ab ;", tokenizeAndStringify(code));
         SimpleTokenizer tokenizer(settingsDefault, *this);
         tokenizer.tokenize(code);
@@ -8868,7 +9420,7 @@ class TestTokenizer : public TestFixture {
     }
 
     void simplifyEnum2() {
-        const char code[] = "enum AB {A,B}; enum AB static ab; ";
+        const char code[] = "enum AB {A,B}; enum AB static ab; \n";
         ASSERT_EQUALS("enum AB { A , B } ; static enum AB ab ;", tokenizeAndStringify(code));
         SimpleTokenizer tokenizer(settingsDefault, *this);
         tokenizer.tokenize(code);
diff --git a/test/testtokenlist.cpp b/test/testtokenlist.cpp
index 4e658743f92..0147365bd48 100644
--- a/test/testtokenlist.cpp
+++ b/test/testtokenlist.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,7 +65,7 @@ class TestTokenList : public TestFixture {
     }
 
     void inc() const {
-        const char code[] = "a++1;1++b;";
+        const char code[] = "a++1;1++b;\n";
 
         const SimpleTokenList tokenlist(code);
         ASSERT(Token::simpleMatch(tokenlist.front(), "a + + 1 ; 1 + + b ;"));
@@ -73,7 +73,7 @@ class TestTokenList : public TestFixture {
 
     void isKeyword() const {
 
-        const char code[] = "for a int delete true";
+        const char code[] = "for a int delete true\n";
 
         {
             const SimpleTokenList tokenlist(code, Standards::Language::C);
@@ -109,19 +109,19 @@ class TestTokenList : public TestFixture {
         }
 
         {
-            const char code2[] = "_Generic"; // C11 keyword
+            const char code2[] = "_Generic\n"; // C11 keyword
             const SimpleTokenList tokenlist(code2); // default settings use latest standard
             ASSERT_EQUALS(false, tokenlist.front()->isKeyword());
         }
 
         {
-            const char code2[] = "_Generic"; // C11 keyword
+            const char code2[] = "_Generic\n"; // C11 keyword
             const SimpleTokenList tokenlist(code2, Standards::Language::C); // default settings use latest standard
             ASSERT_EQUALS(true, tokenlist.front()->isKeyword());
         }
 
         {
-            const char code2[] = "_Generic"; // C11 keyword
+            const char code2[] = "_Generic\n"; // C11 keyword
             const Settings s = settingsBuilder().c(Standards::C89).build();
             TokenList tokenlist(s, Standards::Language::C);
             tokenlist.appendFileIfNew("a.c");
@@ -130,19 +130,19 @@ class TestTokenList : public TestFixture {
         }
 
         {
-            const char code2[] = "co_return"; // C++20 keyword
+            const char code2[] = "co_return\n"; // C++20 keyword
             const SimpleTokenList tokenlist(code2); // default settings use latest standard
             ASSERT_EQUALS(true, tokenlist.front()->isKeyword());
         }
 
         {
-            const char code2[] = "co_return"; // C++20 keyword
+            const char code2[] = "co_return\n"; // C++20 keyword
             const SimpleTokenList tokenlist(code2, Standards::Language::C); // default settings use latest standard
             ASSERT_EQUALS(false, tokenlist.front()->isKeyword());
         }
 
         {
-            const char code2[] = "noexcept"; // C++11 keyword
+            const char code2[] = "noexcept\n"; // C++11 keyword
             const Settings s = settingsBuilder().cpp(Standards::CPP03).build();
             TokenList tokenlist(s, Standards::Language::CPP);
             tokenlist.appendFileIfNew("a.cpp");
@@ -154,9 +154,9 @@ class TestTokenList : public TestFixture {
     void notokens() {
         // analyzing /usr/include/poll.h caused Path::identify() to be called with an empty filename from
         // TokenList::determineCppC() because there are no tokens
-        const char code[] = "#include <sys/poll.h>";
+        const char code[] = "#include <sys/poll.h>\n";
         std::vector<std::string> files;
-        simplecpp::TokenList tokens1(code, files, "poll.h", nullptr);
+        simplecpp::TokenList tokens1(code, files, "poll.h", {}, nullptr);
         Preprocessor preprocessor(tokens1, settingsDefault, *this, Path::identify(tokens1.getFiles()[0], false));
         simplecpp::OutputList outputList_pp;
         simplecpp::TokenList tokensP = preprocessor.preprocess("", files, outputList_pp);
@@ -166,7 +166,7 @@ class TestTokenList : public TestFixture {
     }
 
     void ast1() const {
-        const char code[] = "('Release|x64' == 'Release|x64');";
+        const char code[] = "('Release|x64' == 'Release|x64');\n";
 
         TokenList tokenlist(settingsDefault, Standards::Language::C);
         ASSERT(tokenlist.createTokensFromString(code));
diff --git a/test/testtokenrange.cpp b/test/testtokenrange.cpp
index e27e6c5b038..910567ac084 100644
--- a/test/testtokenrange.cpp
+++ b/test/testtokenrange.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -67,19 +67,19 @@ class TestTokenRange : public TestFixture {
     }
 
     void enumerationToEnd() const {
-        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const char code[] = "void a(){} void main(){ if(true){a();} }\n";
         const SimpleTokenList tokenList(code);
         ASSERT_EQUALS("", testTokenRange(ConstTokenRange{ tokenList.front(), nullptr }, tokenList.front(), nullptr));
     }
 
     void untilHelperToEnd() const {
-        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const char code[] = "void a(){} void main(){ if(true){a();} }\n";
         const SimpleTokenList tokenList(code);
         ASSERT_EQUALS("", testTokenRange(tokenList.front()->until(nullptr), tokenList.front(), nullptr));
     }
 
     void untilHelperPartWay() const {
-        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const char code[] = "void a(){} void main(){ if(true){a();} }\n";
         const SimpleTokenList tokenList(code);
         const Token* start = tokenList.front()->tokAt(4);
         const Token* end = start->tokAt(8);
@@ -87,7 +87,7 @@ class TestTokenRange : public TestFixture {
     }
 
     void partialEnumeration() const {
-        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const char code[] = "void a(){} void main(){ if(true){a();} }\n";
         const SimpleTokenList tokenList(code);
         const Token* start = tokenList.front()->tokAt(4);
         const Token* end = tokenList.front()->tokAt(10);
@@ -96,7 +96,7 @@ class TestTokenRange : public TestFixture {
 
     void scopeExample() {
         SimpleTokenizer tokenizer(settingsDefault, *this);
-        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const char code[] = "void a(){} void main(){ if(true){a();} }\n";
         ASSERT(tokenizer.tokenize(code));
 
         const SymbolDatabase* sd = tokenizer.getSymbolDatabase();
@@ -110,7 +110,7 @@ class TestTokenRange : public TestFixture {
     }
 
     void exampleAlgorithms() const {
-        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const char code[] = "void a(){} void main(){ if(true){a();} }\n";
         const SimpleTokenList tokenList(code);
         ConstTokenRange range{ tokenList.front(), nullptr };
         ASSERT_EQUALS(true, std::all_of(range.begin(), range.end(), [](const Token*) {
diff --git a/test/testtype.cpp b/test/testtype.cpp
index bf36182c59a..1b5b57f41ca 100644
--- a/test/testtype.cpp
+++ b/test/testtype.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -61,8 +61,8 @@ class TestType : public TestFixture {
         SimpleTokenizer tokenizer(settings1, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckType>(tokenizer, this);
+        CheckType check;
+        runChecks(check, tokenizer, *this);
     }
 
     // TODO: get rid of this
@@ -73,8 +73,8 @@ class TestType : public TestFixture {
         SimpleTokenizer tokenizer(settings1, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckType>(tokenizer, this);
+        CheckType check;
+        runChecks(check, tokenizer, *this);
     }
 
     struct CheckPOptions
@@ -93,8 +93,8 @@ class TestType : public TestFixture {
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check..
-        runChecks<CheckType>(tokenizer, this);
+        CheckType check;
+        runChecks(check, tokenizer, *this);
     }
 
     void checkTooBigShift_Unix32() {
@@ -103,16 +103,16 @@ class TestType : public TestFixture {
         // unsigned types getting promoted to int sizeof(int) = 4 bytes
         // and unsigned types having already a size of 4 bytes
         {
-            const std::string types[] = {"unsigned char", /*[unsigned]*/ "char", "bool", "unsigned short", "unsigned int", "unsigned long"};
+            const std::string types[] = {"unsigned char", "bool", "unsigned short", "unsigned int", "unsigned long"};
             for (const std::string& type : types) {
-                check(type + " f(" + type +" x) { return x << 31; }", dinit(CheckOptions, $.settings = &settings));
-                ASSERT_EQUALS("", errout_str());
-                check(type + " f(" + type +" x) { return x << 33; }", dinit(CheckOptions, $.settings = &settings));
-                ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 32-bit value by 33 bits is undefined behaviour\n", errout_str());
-                check(type + " f(int x) { return (x = (" + type + ")x << 32); }", dinit(CheckOptions, $.settings = &settings));
-                ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 32-bit value by 32 bits is undefined behaviour\n", errout_str());
-                check(type + " foo(" + type + " x) { return x << 31; }", dinit(CheckOptions, $.settings = &settings));
-                ASSERT_EQUALS("", errout_str());
+                check(type + " f(" + type +" x) { return x << 31; }\n", dinit(CheckOptions, $.settings = &settings));
+                ASSERT_EQUALS_MSG("", errout_str(), type);
+                check(type + " f(" + type +" x) { return x << 33; }\n", dinit(CheckOptions, $.settings = &settings));
+                ASSERT_EQUALS_MSG("[test.cpp:1]: (error) Shifting 32-bit value by 33 bits is undefined behaviour\n", errout_str(), type);
+                check(type + " f(int x) { return (x = (" + type + ")x << 32); }\n", dinit(CheckOptions, $.settings = &settings));
+                ASSERT_EQUALS_MSG("[test.cpp:1]: (error) Shifting 32-bit value by 32 bits is undefined behaviour\n", errout_str(), type);
+                check(type + " foo(" + type + " x) { return x << 31; }\n", dinit(CheckOptions, $.settings = &settings));
+                ASSERT_EQUALS_MSG("", errout_str(), type);
             }
         }
         // signed types getting promoted to int sizeof(int) = 4 bytes
@@ -121,68 +121,68 @@ class TestType : public TestFixture {
             const std::string types[] = {"signed char", "signed short", /*[signed]*/ "short", "wchar_t", /*[signed]*/ "int", "signed int", /*[signed]*/ "long", "signed long"};
             for (const std::string& type : types) {
                 // c++11
-                check(type + " f(" + type +" x) { return x << 33; }", dinit(CheckOptions, $.settings = &settings));
+                check(type + " f(" + type +" x) { return x << 33; }\n", dinit(CheckOptions, $.settings = &settings));
                 ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 32-bit value by 33 bits is undefined behaviour\n", errout_str());
-                check(type + " f(int x) { return (x = (" + type + ")x << 32); }", dinit(CheckOptions, $.settings = &settings));
+                check(type + " f(int x) { return (x = (" + type + ")x << 32); }\n", dinit(CheckOptions, $.settings = &settings));
                 ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 32-bit value by 32 bits is undefined behaviour\n", errout_str());
-                check(type + " foo(" + type + " x) { return x << 31; }", dinit(CheckOptions, $.settings = &settings));
+                check(type + " foo(" + type + " x) { return x << 31; }\n", dinit(CheckOptions, $.settings = &settings));
                 ASSERT_EQUALS("[test.cpp:1]: (error) Shifting signed 32-bit value by 31 bits is undefined behaviour\n", errout_str());
-                check(type + " foo(" + type + " x) { return x << 30; }", dinit(CheckOptions, $.settings = &settings));
+                check(type + " foo(" + type + " x) { return x << 30; }\n", dinit(CheckOptions, $.settings = &settings));
                 ASSERT_EQUALS("", errout_str());
 
                 // c++14
-                check(type + " foo(" + type + " x) { return x << 31; }", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
+                check(type + " foo(" + type + " x) { return x << 31; }\n", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
                 ASSERT_EQUALS("[test.cpp:1]: (portability) Shifting signed 32-bit value by 31 bits is implementation-defined behaviour\n", errout_str());
-                check(type + " f(int x) { return (x = (" + type + ")x << 32); }", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
+                check(type + " f(int x) { return (x = (" + type + ")x << 32); }\n", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
                 ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 32-bit value by 32 bits is undefined behaviour\n", errout_str());
             }
         }
         // 64 bit width types
         {
             // unsigned long long
-            check("unsigned long long foo(unsigned long long x) { return x << 64; }",dinit(CheckOptions, $.settings = &settings));
+            check("unsigned long long foo(unsigned long long x) { return x << 64; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("unsigned long long f(int x) { return (x = (unsigned long long)x << 64); }",dinit(CheckOptions, $.settings = &settings));
+            check("unsigned long long f(int x) { return (x = (unsigned long long)x << 64); }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("unsigned long long f(unsigned long long x) { return x << 63; }",dinit(CheckOptions, $.settings = &settings));
+            check("unsigned long long f(unsigned long long x) { return x << 63; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("", errout_str());
             // [signed] long long
-            check("long long foo(long long x) { return x << 64; }",dinit(CheckOptions, $.settings = &settings));
+            check("long long foo(long long x) { return x << 64; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("long long f(int x) { return (x = (long long)x << 64); }",dinit(CheckOptions, $.settings = &settings));
+            check("long long f(int x) { return (x = (long long)x << 64); }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("long long f(long long x) { return x << 63; }",dinit(CheckOptions, $.settings = &settings));
+            check("long long f(long long x) { return x << 63; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting signed 64-bit value by 63 bits is undefined behaviour\n", errout_str());
-            check("long long f(long long x) { return x << 62; }",dinit(CheckOptions, $.settings = &settings));
+            check("long long f(long long x) { return x << 62; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("", errout_str());
             // signed long long
-            check("signed long long foo(signed long long x) { return x << 64; }",dinit(CheckOptions, $.settings = &settings));
+            check("signed long long foo(signed long long x) { return x << 64; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("signed long long f(long long x) { return (x = (signed long long)x << 64); }",dinit(CheckOptions, $.settings = &settings));
+            check("signed long long f(long long x) { return (x = (signed long long)x << 64); }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("signed long long f(signed long long x) { return x << 63; }",dinit(CheckOptions, $.settings = &settings));
+            check("signed long long f(signed long long x) { return x << 63; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting signed 64-bit value by 63 bits is undefined behaviour\n", errout_str());
-            check("signed long long f(signed long long x) { return x << 62; }",dinit(CheckOptions, $.settings = &settings));
+            check("signed long long f(signed long long x) { return x << 62; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("", errout_str());
 
             // c++14
-            check("signed long long foo(signed long long x) { return x << 64; }", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
+            check("signed long long foo(signed long long x) { return x << 64; }\n", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("signed long long f(long long x) { return (x = (signed long long)x << 64); }", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
+            check("signed long long f(long long x) { return (x = (signed long long)x << 64); }\n", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("signed long long f(signed long long x) { return x << 63; }", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
+            check("signed long long f(signed long long x) { return x << 63; }\n", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
             ASSERT_EQUALS("[test.cpp:1]: (portability) Shifting signed 64-bit value by 63 bits is implementation-defined behaviour\n", errout_str());
-            check("signed long long f(signed long long x) { return x << 62; }",dinit(CheckOptions, $.settings = &settings));
+            check("signed long long f(signed long long x) { return x << 62; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("", errout_str());
         }
 
-        check("void f() { int x; x = 1 >> 64; }", dinit(CheckOptions, $.settings = &settings));
+        check("void f() { int x; x = 1 >> 64; }\n", dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 32-bit value by 64 bits is undefined behaviour\n", errout_str());
 
         check("void foo() {\n"
               "  QList<int> someList;\n"
               "  someList << 300;\n"
-              "}", dinit(CheckOptions, $.settings = &settings));
+              "}\n", dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #6793
@@ -190,14 +190,14 @@ class TestType : public TestFixture {
               "const unsigned int f = foo<31>(0);\n"
               "const unsigned int g = foo<100>(0);\n"
               "template<unsigned int I> int hoo(unsigned int x) { return x << 32; }\n"
-              "const unsigned int h = hoo<100>(0);", dinit(CheckOptions, $.settings = &settings));
+              "const unsigned int h = hoo<100>(0);\n", dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:4]: (error) Shifting 32-bit value by 32 bits is undefined behaviour\n"
                       "[test.cpp:1]: (error) Shifting 32-bit value by 100 bits is undefined behaviour\n", errout_str());
 
         // #7266: C++, shift in macro
         check("void f(unsigned int x) {\n"
               "    UINFO(x << 1234);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8640
@@ -207,7 +207,7 @@ class TestType : public TestFixture {
               "    constexpr const int shift[1] = {32};\n"
               "    constexpr const int ret = a << shift[0];\n" // shift too many bits
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5]: (error) Shifting 32-bit value by 32 bits is undefined behaviour\n"
                       "[test.cpp:5]: (error) Signed integer overflow for expression 'a<<shift[0]'.\n", errout_str());
 
@@ -218,7 +218,7 @@ class TestType : public TestFixture {
               "  if (k > 32)\n"
               "    return 0;\n"
               "  return rm>> k;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4] -> [test.cpp:6]: (warning) Shifting signed 32-bit value by 31 bits is undefined behaviour. See condition at line 4.\n",
             errout_str());
@@ -230,7 +230,7 @@ class TestType : public TestFixture {
               "    return 0;\n"
               "  else\n"
               "    return rm>> k;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4] -> [test.cpp:7]: (warning) Shifting signed 32-bit value by 31 bits is undefined behaviour. See condition at line 4.\n",
             errout_str());
@@ -242,20 +242,20 @@ class TestType : public TestFixture {
               "    return 0;\n"
               "  else\n"
               "    return rm>> k;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static long long f(int x, long long y) {\n"
               "    if (x >= 64)\n"
               "        return 0;\n"
               "    return -(y << (x-1));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    std::ofstream outfile;\n"
               "    outfile << vec_points[0](0) << static_cast<int>(d) << ' ';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(unsigned b, int len, unsigned char rem) {\n" // #10773
@@ -273,45 +273,45 @@ class TestType : public TestFixture {
     void checkIntegerOverflow() {
         const Settings settings = settingsBuilder().severity(Severity::warning).platform(Platform::Type::Unix32).build();
 
-        check("x = (int)0x10000 * (int)0x10000;", dinit(CheckOptions, $.settings = &settings));
+        check("x = (int)0x10000 * (int)0x10000;\n", dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:1:18]: (error) Signed integer overflow for expression '(int)0x10000*(int)0x10000'. [integerOverflow]\n", errout_str());
 
-        check("x = (long)0x10000 * (long)0x10000;", dinit(CheckOptions, $.settings = &settings));
+        check("x = (long)0x10000 * (long)0x10000;\n", dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:1:19]: (error) Signed integer overflow for expression '(long)0x10000*(long)0x10000'. [integerOverflow]\n", errout_str());
 
         check("void foo() {\n"
               "    int intmax = 0x7fffffff;\n"
               "    return intmax + 1;\n"
-              "}",dinit(CheckOptions, $.settings = &settings));
+              "}\n",dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:3:19]: (error) Signed integer overflow for expression 'intmax+1'. [integerOverflow]\n", errout_str());
 
         check("void foo() {\n"
               "    int intmax = 0x7fffffff;\n"
               "    return intmax - 1;\n"
-              "}",dinit(CheckOptions, $.settings = &settings));
+              "}\n",dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(signed int x) {\n"
               "   if (x==123456) {}\n"
               "   return x * x;\n"
-              "}",dinit(CheckOptions, $.settings = &settings));
+              "}\n",dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:13]: (warning) Either the condition 'x==123456' is redundant or there is signed integer overflow for expression 'x*x'. [integerOverflowCond]\n", errout_str());
 
         check("int foo(signed int x) {\n"
               "   if (x==123456) {}\n"
               "   return -123456 * x;\n"
-              "}",dinit(CheckOptions, $.settings = &settings));
+              "}\n",dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:19]: (warning) Either the condition 'x==123456' is redundant or there is signed integer underflow for expression '-123456*x'. [integerOverflowCond]\n", errout_str());
 
         check("int foo(signed int x) {\n"
               "   if (x==123456) {}\n"
               "   return 123456U * x;\n"
-              "}",dinit(CheckOptions, $.settings = &settings));
+              "}\n",dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int i) {\n" // #12117
               "    return (i == 31) ? 1 << i : 0;\n"
-              "}", dinit(CheckOptions, $.settings = &settings));
+              "}\n", dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:2:15] -> [test.cpp:2:26]: (warning) Shifting signed 32-bit value by 31 bits is undefined behaviour. See condition at line 2. [shiftTooManyBitsSigned]\n", errout_str());
 
         check("void f() {\n" // #13092
@@ -319,7 +319,7 @@ class TestType : public TestFixture {
               "    for (int i = 0; i < 10; i++) {\n"
               "        n = n * 47163 - 57412;\n"
               "    }\n"
-              "}", dinit(CheckOptions, $.settings = &settings));
+              "}\n", dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:4:15]: (error) Signed integer underflow for expression 'n*47163'. [integerOverflow]\n"
                       "[test.cpp:4:23]: (error) Signed integer underflow for expression 'n*47163-57412'. [integerOverflow]\n",
                       errout_str());
@@ -327,22 +327,22 @@ class TestType : public TestFixture {
 
     void signConversion() {
         const Settings settings = settingsBuilder().platform(Platform::Type::Unix64).build();
-        check("x = -4 * (unsigned)y;");
+        check("x = -4 * (unsigned)y;\n");
         ASSERT_EQUALS("[test.cpp:1:6]: (warning) Expression '-4' has a negative value. That is converted to an unsigned value and used in an unsigned calculation. [signConversion]\n", errout_str());
 
-        check("x = (unsigned)y * -4;");
+        check("x = (unsigned)y * -4;\n");
         ASSERT_EQUALS("[test.cpp:1:20]: (warning) Expression '-4' has a negative value. That is converted to an unsigned value and used in an unsigned calculation. [signConversion]\n", errout_str());
 
         check("unsigned int dostuff(int x) {\n" // x is signed
               "  if (x==0) {}\n"
               "  return (x-1)*sizeof(int);\n"
-              "}", dinit(CheckOptions, $.settings = &settings));
+              "}\n", dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:2:8] -> [test.cpp:3:12]: (warning) Expression 'x-1' can have a negative value. That is converted to an unsigned value and used in an unsigned calculation. [signConversionCond]\n", errout_str());
 
         check("unsigned int f1(signed int x, unsigned int y) {" // x is signed
               "  return x * y;\n"
               "}\n"
-              "void f2() { f1(-4,4); }");
+              "void f2() { f1(-4,4); }\n");
         ASSERT_EQUALS(
             "[test.cpp:1:57]: (warning) Expression 'x' can have a negative value. That is converted to an unsigned value and used in an unsigned calculation. [signConversion]\n",
             errout_str());
@@ -350,7 +350,7 @@ class TestType : public TestFixture {
         check("unsigned int f1(int x) {"
               "  return x * 5U;\n"
               "}\n"
-              "void f2() { f1(-4); }");
+              "void f2() { f1(-4); }\n");
         ASSERT_EQUALS(
             "[test.cpp:1:34]: (warning) Expression 'x' can have a negative value. That is converted to an unsigned value and used in an unsigned calculation. [signConversion]\n",
             errout_str());
@@ -358,19 +358,19 @@ class TestType : public TestFixture {
         check("unsigned int f1(int x) {" // #6168: FP for inner calculation
               "  return 5U * (1234 - x);\n" // <- signed subtraction, x is not sign converted
               "}\n"
-              "void f2() { f1(-4); }");
+              "void f2() { f1(-4); }\n");
         ASSERT_EQUALS("", errout_str());
 
         // Don't warn for + and -
         check("void f1(int x) {"
               "  a = x + 5U;\n"
               "}\n"
-              "void f2() { f1(-4); }");
+              "void f2() { f1(-4); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("size_t foo(size_t x) {\n"
               " return -2 * x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Expression '-2' has a negative value. That is converted to an unsigned value and used in an unsigned calculation. [signConversion]\n", errout_str());
 
         checkP("void f() {\n" // #12110 FP signConversion with integer overflow
@@ -465,6 +465,26 @@ class TestType : public TestFixture {
         check(code2, dinit(CheckOptions, $.settings = &settingsWin));
         ASSERT_EQUALS("[test.cpp:2:3]: (style) int result is returned as long long value. If the return value is long long to avoid loss of information, then you have loss of information. [truncLongCastReturn]\n", errout_str());
 
+        const char code3[] = "long f() {\n"
+                             "    int n = 1;\n"
+                             "    return n << 12;\n"
+                             "}\n";
+        check(code3, dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("", errout_str());
+
+        const char code4[] = "long f(int n) {\n"
+                             "    return n << 12;\n"
+                             "}\n";
+        check(code4, dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("[test.cpp:2:5]: (style) int result is returned as long value. If the return value is long to avoid loss of information, then you have loss of information. [truncLongCastReturn]\n", errout_str());
+
+        const char code5[] = "long f() {\n"
+                             "    unsigned int n = 1U << 20;\n"
+                             "    return n << 20;\n"
+                             "}\n";
+        check(code5, dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("[test.cpp:3:5]: (style) int result is returned as long value. If the return value is long to avoid loss of information, then you have loss of information. [truncLongCastReturn]\n", errout_str());
+
         // typedef
         check("size_t f(int x, int y) {\n"
               "  return x * y;\n"
@@ -483,42 +503,42 @@ class TestType : public TestFixture {
     }
 
     void checkFloatToIntegerOverflow() {
-        check("x = (int)1E100;");
+        check("x = (int)1E100;\n");
         ASSERT_EQUALS("[test.cpp:1:5]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
 
         check("void f(void) {\n"
               "  return (int)1E100;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
 
         check("void f(void) {\n"
               "  return (int)-1E100;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
 
         check("void f(void) {\n"
               "  return (short)1E6;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
 
         check("void f(void) {\n"
               "  return (unsigned char)256.0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
 
         check("void f(void) {\n"
               "  return (unsigned char)255.5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", removeFloat(errout_str()));
 
         check("void f(void) {\n"
               "  char c = 1234.5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
 
         check("char f(void) {\n"
               "  return 1234.5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
 
         checkP("#define TEST(b, f) b ? 5000 : (unsigned short)f\n" // #11685
@@ -588,15 +608,22 @@ class TestType : public TestFixture {
                "int f()\n"
                "{\n"
                "    fun(INT_MIN);\n"
-               "}", dinit(CheckPOptions, $.settings = &s));
+               "}\n", dinit(CheckPOptions, $.settings = &s));
         ASSERT_EQUALS("[test.cpp:3:17]: (error) Signed integer overflow for expression '-x'. [integerOverflow]\n", errout_str());
 
         checkP("void f() {\n" // #8399
                "    int32_t i = INT32_MAX;\n"
                "    i << 1;\n"
                "    i << 2;\n"
-               "}", dinit(CheckPOptions, $.settings = &s));
+               "}\n", dinit(CheckPOptions, $.settings = &s));
         ASSERT_EQUALS("[test.cpp:4:7]: (error) Signed integer overflow for expression 'i<<2'. [integerOverflow]\n", errout_str());
+
+        checkP("void g(int a) {\n" // #13342
+               "    int b = INT_MAX + a;\n"
+               "    printf(\"%d\", b); \n"
+               "}\n"
+               "void f() { g(1); }", dinit(CheckPOptions, $.settings = &s));
+        ASSERT_EQUALS("[test.cpp:2:21]: (error) Signed integer overflow for expression '2147483647+a'. [integerOverflow]\n", errout_str());
     }
 
     void shiftTooManyBits() { // #11496
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
index b3c988e5b00..4d1a913ed3a 100644
--- a/test/testuninitvar.cpp
+++ b/test/testuninitvar.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -76,10 +76,12 @@ class TestUninitVar : public TestFixture {
         TEST_CASE(uninitvar12); // #10218 - stream read
         TEST_CASE(uninitvar13); // #9772
         TEST_CASE(uninitvar14);
+        TEST_CASE(uninitvar15); // #13685
         TEST_CASE(uninitvar_unconditionalTry);
         TEST_CASE(uninitvar_funcptr); // #6404
         TEST_CASE(uninitvar_operator); // #6680
-        TEST_CASE(uninitvar_ternaryexpression); // #4683
+        TEST_CASE(uninitvar_ternaryexpression1); // #4683
+        TEST_CASE(uninitvar_ternaryexpression2); // #14729
         TEST_CASE(uninitvar_pointertoarray);
         TEST_CASE(uninitvar_cpp11ArrayInit); // #7010
         TEST_CASE(uninitvar_rangeBasedFor); // #7078
@@ -97,6 +99,7 @@ class TestUninitVar : public TestFixture {
         TEST_CASE(uninitvar_memberfunction);
         TEST_CASE(uninitvar_nonmember); // crash in ycmd test
         TEST_CASE(uninitvarDesignatedInitializers);
+        TEST_CASE(uninitvarMemberPointer);
 
         TEST_CASE(isVariableUsageDeref); // *p
         TEST_CASE(isVariableUsageDerefValueflow); // *p
@@ -124,7 +127,7 @@ class TestUninitVar : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for redundant code..
-        CheckUninitVar checkuninitvar(&tokenizer, &settings1, this);
+        CheckUninitVarImpl checkuninitvar(&tokenizer, settings1, *this);
         checkuninitvar.check();
     }
 
@@ -134,7 +137,7 @@ class TestUninitVar : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for redundant code..
-        CheckUninitVar checkuninitvar(&tokenizer, &settings, this);
+        CheckUninitVarImpl checkuninitvar(&tokenizer, settings, *this);
         checkuninitvar.check();
     }
 
@@ -145,13 +148,13 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void foo() {\n"
                        "    int a;\n"
                        "    b = c - a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo() {\n"
                        "    int a;\n"
                        "    b = a - c;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         // Ticket #6455 - some compilers allow const variables to be uninitialized
@@ -159,27 +162,27 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void foo() {\n"
                        "    const int a;\n"
                        "    b = c - a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
         // extracttests.enable
 
         checkUninitVar("void foo() {\n"
                        "    int *p;\n"
                        "    realloc(p,10);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo() {\n" // #5240
                        "    char *p = malloc(100);\n"
                        "    char *tmp = realloc(p,1000);\n"
                        "    if (!tmp) free(p);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo() {\n"
                        "    int *p = NULL;\n"
                        "    realloc(p,10);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // dereferencing uninitialized pointer..
@@ -188,7 +191,7 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    Foo *p;\n"
                        "    p->abcd();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: template<class T> struct Foo { void abcd(); };
@@ -196,7 +199,7 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    Foo<int> *p;\n"
                        "    p->abcd();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: struct Foo { void* a; };
@@ -204,90 +207,90 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    int a;\n"
                        "    p->a = malloc(4 * a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:23]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int *p;\n"
                        "    delete p;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int *p;\n"
                        "    delete [] p;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:15]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int *p;\n"
                        "    *p = 135;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int *p;\n"
                        "    p[0] = 135;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int *x;\n"
                        "    int y = *x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int *x;\n"
                        "    int &y(*x);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    int x;\n"
                        "    int *y = &x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    int *x;\n"
                        "    int *&y = x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    int x = xyz::x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    int a;\n"
                        "    a = 5 + a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    int a;\n"
                        "    a++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    extern int a;\n"
                        "    a++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: void bar(int);
@@ -295,28 +298,28 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    int a;\n"
                        "    bar(4 * a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int i;\n"
                        "    if (i);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int i;\n"
                        "    for (int x = 0; i < 10; x++);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:21]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int i;\n"
                        "    for (int x = 0; x < 10; i++);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:29]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo(int x)\n"
@@ -325,7 +328,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x)\n"
                        "        i = 0;\n"
                        "    i++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
@@ -333,7 +336,7 @@ class TestUninitVar : public TestFixture {
                        "    int ar[10];\n"
                        "    int i;\n"
                        "    ar[i] = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:8]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
@@ -341,13 +344,13 @@ class TestUninitVar : public TestFixture {
                        "    int x, y;\n"
                        "    x = (y = 10);\n"
                        "    int z = y * 2;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void foo() {\n"
                        "    int x, y;\n"
                        "    x = ((y) = 10);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #3597
@@ -355,27 +358,27 @@ class TestUninitVar : public TestFixture {
                        "    int a;\n"
                        "    int b = 1;\n"
                        "    (b += a) = 1;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f() {\n"
                        "    int a,b,c;\n"
                        "    a = b = c;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:0]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    Foo p;\n"
                        "    p.abcd();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    Foo p;\n"
                        "    int x = p.abcd();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown types
@@ -385,7 +388,7 @@ class TestUninitVar : public TestFixture {
                            "{\n"
                            "    A ret;\n"
                            "    return ret;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("void a()\n"
@@ -402,7 +405,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void f(float x) {\n"
                        "  union lf { long l; float f; } u_lf;\n"
                        "  float hx = (u_lf.f = (x), u_lf.l);\n"
-                       "}",
+                       "}\n",
                        dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
@@ -410,7 +413,7 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    int x[10];\n"
                        "    int *y = x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a()\n"
@@ -419,7 +422,7 @@ class TestUninitVar : public TestFixture {
                        "    int *y = &x;\n"
                        "    *y = 0;\n"
                        "    x++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a()\n"
@@ -428,7 +431,7 @@ class TestUninitVar : public TestFixture {
                        "    char *z = x;\n"
                        "    memset(z, 0, sizeof(x));\n"
                        "    memcpy(y, x, sizeof(x));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Handling >> and <<
@@ -437,26 +440,26 @@ class TestUninitVar : public TestFixture {
                            "    int ret;\n"
                            "    std::cin >> ret;\n"
                            "    ret++;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("void f(int b) {\n"
                            "    int a;\n"
                            "    std::cin >> b >> a;\n"
                            "    return a;"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("void f() {\n"
                            "    int ret[2];\n"
                            "    std::cin >> ret[0];\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("void f(int i) {\n"
                            "    int a;\n"
                            "    i >> a;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:3:10]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
             checkUninitVar("int a() {\n"
@@ -470,14 +473,14 @@ class TestUninitVar : public TestFixture {
                            "    Node node;\n"
                            "    int x;\n"
                            "    node[\"abcd\"] >> x;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("int a(FArchive &arc) {\n"   // #3060 (initialization through operator<<)
                            "    int *p;\n"
                            "    arc << p;\n" // <- TODO initialization?
                            "    return *p;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
             checkUninitVar("void a() {\n"
@@ -492,32 +495,32 @@ class TestUninitVar : public TestFixture {
                            "    int a;\n"
                            "    a << 1;\n"  // <- TODO initialization?
                            "    return a;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
             // #4673
             checkUninitVar("void f() {\n"
                            "    int a;\n"
                            "    std::cout << a;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:3:18]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
             checkUninitVar("void f(std::ostringstream& os) {\n"
                            "    int a;\n"
                            "    os << a;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:3:11]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
             checkUninitVar("void f() {\n"
                            "    int a;\n"
                            "    std::cout << 1 << a;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:3:23]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
             checkUninitVar("void f(std::ostringstream& os) {\n"
                            "    int a;\n"
                            "    os << 1 << a;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:3:16]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
             {
@@ -525,25 +528,25 @@ class TestUninitVar : public TestFixture {
                 checkUninitVar("void f() {\n"
                                "  char *p = new char[10];\n"
                                "  std::cout << (void *)p << 1;\n"
-                               "}");
+                               "}\n");
                 ASSERT_EQUALS("", errout_str());
 
                 checkUninitVar("void f() {\n"
                                "  char p[10];\n"
                                "  std::cout << (void *)p << 1;\n"
-                               "}");
+                               "}\n");
                 ASSERT_EQUALS("", errout_str());
 
                 checkUninitVar("void f() {\n"
                                "  char *p = new char[10];\n"
                                "  std::cout << p << 1;\n"
-                               "}");
+                               "}\n");
                 ASSERT_EQUALS("[test.cpp:3:16]: (error) Memory is allocated but not initialized: p [uninitdata]\n", errout_str());
 
                 checkUninitVar("void f() {\n" // #9696
                                "  int *p = new int[10];\n"
                                "  std::cout << p << 1;\n"
-                               "}");
+                               "}\n");
                 ASSERT_EQUALS("", errout_str());
 
                 checkUninitVar("void f() {\n"
@@ -553,7 +556,7 @@ class TestUninitVar : public TestFixture {
                                "  std::cout << c;\n"
                                "  wchar_t w[10];\n"
                                "  std::cout << w;\n"
-                               "}");
+                               "}\n");
                 ASSERT_EQUALS("[test.cpp:5:16]: (error) Uninitialized variable: c [legacyUninitvar]\n"
                               "[test.cpp:7:16]: (error) Uninitialized variable: w [legacyUninitvar]\n",
                               errout_str());
@@ -561,62 +564,69 @@ class TestUninitVar : public TestFixture {
                 checkUninitVar("void f() {\n"
                                "  char p[10];\n"
                                "  std::cout << p << 1;\n"
-                               "}");
+                               "}\n");
                 ASSERT_EQUALS("[test.cpp:3:16]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
                 checkUninitVar("void f() {\n"
                                "  char p[10];\n"
                                "  std::cout << *p << 1;\n"
-                               "}");
+                               "}\n");
                 ASSERT_EQUALS("[test.cpp:3:17]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
             }
+
+            checkUninitVar("void f() {\n" // #13908
+                           "    int* i = new int;\n"
+                           "    std::cout << i << \", \" << *i;\n"
+                           "    delete i;\n"
+                           "}\n");
+            ASSERT_EQUALS("[test.cpp:3:32]: (error) Memory is allocated but not initialized: i [uninitdata]\n", errout_str());
         }
 
         // #8494 : Overloaded & operator
         checkUninitVar("void f() {\n"
                        "  int x;\n"
                        "  a & x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int a) {\n"
                        "  int x;\n"
                        "  a & x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "  int a,b,c;\n"
                        "  ar & a & b & c;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a() {\n"   // asm
                        "    int x;\n"
                        "    asm();\n"
                        "    x++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a()\n"
                        "{\n"
                        "    int x[10];\n"
                        "    struct xyz xyz1 = { .x = x };\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a()\n"
                        "{\n"
                        "    struct S *s;\n"
                        "    s->x = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: s [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "   char *buf = malloc(100);\n"
                        "   struct ABC *abc = buf;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("class Fred {\n"
@@ -627,7 +637,7 @@ class TestUninitVar : public TestFixture {
                        "Fred::~Fred()\n"
                        "{\n"
                        "    fclose(f);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
@@ -635,7 +645,7 @@ class TestUninitVar : public TestFixture {
                        "    int c;\n"
                        "    ab(sizeof(xyz), &c);\n"
                        "    if (c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
@@ -643,7 +653,7 @@ class TestUninitVar : public TestFixture {
                        "    int c;\n"
                        "    a = (f2(&c));\n"
                        "    c++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int a)\n"
@@ -652,7 +662,7 @@ class TestUninitVar : public TestFixture {
                        "        char *p;\n"
                        "        *p = 0;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // +=
@@ -660,14 +670,14 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    int c;\n"
                        "    c += 2;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    int a[10];\n"
                        "    a[0] = 10 - a[1];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (error) Uninitialized variable: a[1] [legacyUninitvar]\n", errout_str());
 
         // goto/setjmp/longjmp..
@@ -683,7 +693,7 @@ class TestUninitVar : public TestFixture {
                        "\n"
                        "found:\n"
                        "    int a = b;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo()\n"
@@ -695,7 +705,7 @@ class TestUninitVar : public TestFixture {
                        "        return a;\n"
                        "    a = 1;\n"
                        "    longjmp(env, 1);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // macro_for..
@@ -709,7 +719,7 @@ class TestUninitVar : public TestFixture {
                        "  else\n"
                        "    retval = 2;\n"
                        "  return retval;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo()\n"
@@ -718,7 +728,7 @@ class TestUninitVar : public TestFixture {
                        "    goto exit;\n"
                        "    i++;\n"
                        "exit:\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo() {\n"
@@ -728,7 +738,7 @@ class TestUninitVar : public TestFixture {
                        "    x = a;\n"
                        "    y = 1;\n"
                        "    goto again;\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #3873 (false positive)
@@ -737,7 +747,7 @@ class TestUninitVar : public TestFixture {
                        "  if (!Range)\n"
                        "    Range = new MachineLoopRange(Loop, Allocator, *Indexes);\n"
                        "  return Range;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4040 - False positive
@@ -753,7 +763,7 @@ class TestUninitVar : public TestFixture {
                        "        iter = x;\n"
                        "    }\n"
                        "    return 1 + iter;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // C++11 style initialization
@@ -761,7 +771,7 @@ class TestUninitVar : public TestFixture {
                        "    int i = 0;\n"
                        "    int j{ i };\n"
                        "    return j;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #5646
@@ -769,7 +779,7 @@ class TestUninitVar : public TestFixture {
                        "  float source[2] = {3.1, 3.1};\n"
                        "  float (*sink)[2] = &source;\n"
                        "  return (*sink)[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #9296
@@ -777,14 +787,14 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    int x;\n"
                        "    int z = (x) & ~__round_mask(1, 1);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f(void)\n"
                        "{\n"
                        "    int x;\n"
                        "    int z = (x) | ~__round_mask(1, 1);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int __round_mask(int, int);\n"
@@ -792,7 +802,7 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    int x;\n"
                        "    int* z = &x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -803,7 +813,7 @@ class TestUninitVar : public TestFixture {
                        "  int x;\n"
                        "  a = x;\n"
                        "  b = x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
     }
 
@@ -812,7 +822,7 @@ class TestUninitVar : public TestFixture {
         const char code[] = "void f() {\n"
                             "    dfs a;\n"
                             "    return a;\n"
-                            "}";
+                            "}\n";
 
         // Assume dfs is a non POD type if file is C++
         checkUninitVar(code);
@@ -826,7 +836,7 @@ class TestUninitVar : public TestFixture {
                              "void f() {\n"
                              "    struct AB ab;\n"
                              "    return ab;\n"
-                             "}";
+                             "}\n";
         checkUninitVar(code2);
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n"
                       "[test.cpp:4:12]: (error) Uninitialized struct member: ab.b [uninitStructMember]\n", errout_str());
@@ -837,14 +847,14 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void f() {\n"
                        "    std::map<int,bool> x;\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #3906 - False positive for std::vector pointer
         checkUninitVar("void f() {\n"
                        "    std::vector<int> *x = NULL;\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -857,7 +867,7 @@ class TestUninitVar : public TestFixture {
             checkUninitVar("void f() {\n"
                            "  Fred _tm;\n"
                            "  _tm.dostuff();\n"
-                           "}", s);
+                           "}\n", s);
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -866,7 +876,7 @@ class TestUninitVar : public TestFixture {
                        "    A a,b;\n"
                        "    b[0] = 0;"
                        "    return a;\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -883,7 +893,7 @@ class TestUninitVar : public TestFixture {
                        "        _Bit_reference(_Bit_type * __x, _Bit_type __y)\n"
                        "         : _M_p(__x), _M_mask(__y) { }\n"
                        "    };\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -893,13 +903,13 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void foo() {\n"
                        "    int b;\n"
                        "    c = a | b;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: b [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo() {\n"
                        "    int b;\n"
                        "    c = b | a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: b [legacyUninitvar]\n", errout_str());
     }
 
@@ -912,7 +922,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x)\n"
                        "        p = new Foo;\n"
                        "    p->abcd();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo(int x)\n"
@@ -921,7 +931,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x==1);\n"
                        "    if (x==2);\n"
                        "    x = a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:9]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int foo() {\n"
@@ -929,7 +939,7 @@ class TestUninitVar : public TestFixture {
                        "    if (1)\n"
                        "        i = 11;\n"
                        "    return i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int bar(int x) {\n"
@@ -939,7 +949,7 @@ class TestUninitVar : public TestFixture {
                        "    else if ( x == 11 )\n"
                        "      n = 2;\n"
                        "    return n;\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         checkUninitVar("int foo()\n"
@@ -950,7 +960,7 @@ class TestUninitVar : public TestFixture {
                        "    else\n"
                        "        i = 33;\n"
                        "    return i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo(int x)\n" // #5503
@@ -961,7 +971,7 @@ class TestUninitVar : public TestFixture {
                        "    else if (x >= 2)\n" // condition is always true
                        "        i = 33;\n"
                        "    return i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo()\n"
@@ -975,7 +985,7 @@ class TestUninitVar : public TestFixture {
                        "        i = 33;\n"
                        "    }\n"
                        "    return i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo()\n"
@@ -991,7 +1001,7 @@ class TestUninitVar : public TestFixture {
                        "        i = 33;\n"
                        "    }\n"
                        "    return i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void foo(int x)\n"
@@ -1001,7 +1011,7 @@ class TestUninitVar : public TestFixture {
                        "        p = new Foo;\n"
                        "    if (x)\n"
                        "        p->abcd();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(int a)\n"
@@ -1019,7 +1029,7 @@ class TestUninitVar : public TestFixture {
                        "    if( n == 0) {\n"
                        "        a=condition;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
@@ -1027,20 +1037,20 @@ class TestUninitVar : public TestFixture {
                        "    C *c;\n"
                        "    if (fun(&c));\n"
                        "    c->Release();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    C c;\n"
                        "    if (fun(&c.d));\n"
                        "    return c;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "   char a[10];\n"
                        "   if (a[0] = x){}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo(int x)\n"
@@ -1051,7 +1061,7 @@ class TestUninitVar : public TestFixture {
                        "    else\n"
                        "        return 3;\n"
                        "    return i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #2207 - False positive
@@ -1062,7 +1072,7 @@ class TestUninitVar : public TestFixture {
                        "    if (!x)\n"
                        "        return;\n"
                        "    b = (c - a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo()\n"
@@ -1073,7 +1083,7 @@ class TestUninitVar : public TestFixture {
                        "    else\n"
                        "        throw 3;\n"
                        "    return ret;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int a)\n"
@@ -1084,7 +1094,7 @@ class TestUninitVar : public TestFixture {
                        "    else\n"
                        "        XYZ ret = 2;\n"  // XYZ may be an unexpanded macro so bailout the checking of "ret".
                        "    return ret;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:8:12]: (error) Uninitialized variable: ret [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f(int a, int b)\n"
@@ -1097,7 +1107,7 @@ class TestUninitVar : public TestFixture {
                        "      x = b;\n"
                        "   }\n"
                        "   return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(long verbose,bool bFlag)\n"
@@ -1110,7 +1120,7 @@ class TestUninitVar : public TestFixture {
                        "    if (verbose)\n"
                        "      std::cout << (12-t);\n"
                        "  }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int test(int cond1, int cond2) {\n"
@@ -1122,7 +1132,7 @@ class TestUninitVar : public TestFixture {
                        "  if (cond2) {\n"
                        "    int t = foo*foo;\n"
                        "  }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(int *pix) {\n"
@@ -1133,14 +1143,14 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "    if (pix)\n"
                        "        a = dest_x;\n" // <- not uninitialized
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ? :
         checkUninitVar("static void foo(int v) {\n"
                        "    int x;\n"
                        "    x = v <= 0 ? -1 : x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo()\n"
@@ -1152,19 +1162,19 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "    ret = ret <= 0 ? -1 :\n"
                        "          strcmp(msgid1, msgid2) == 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(int a, int b)\n"
                        "{\n"
                        "    int x; x = (a<b) ? 1 : 0;\n"
                        "    int y = y;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: y [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo() {\n" // pidgin-2.11.0/finch/libgnt/gnttree.c
                        "  int x = (x = bar()) ? x : 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ; { .. }
@@ -1177,7 +1187,7 @@ class TestUninitVar : public TestFixture {
                        "  else\n"
                        "    retval = 2;\n"
                        "  return retval;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
@@ -1188,7 +1198,7 @@ class TestUninitVar : public TestFixture {
                        "  }\n"
                        "\n"
                        "  { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ({ .. })
@@ -1197,7 +1207,7 @@ class TestUninitVar : public TestFixture {
                        "    if (abc) { x = 123; }\n"
                        "    else { a = ({b=c;}); x = 456; }\n"
                        "    ++x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #3098 - False negative uninitialized variable
@@ -1207,7 +1217,7 @@ class TestUninitVar : public TestFixture {
                        "    if(strcoll(c1,c2))\n"
                        "    {\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (error) Uninitialized variable: c1 [legacyUninitvar]\n"
                       "[test.cpp:4:19]: (error) Uninitialized variable: c2 [legacyUninitvar]\n", errout_str());
 
@@ -1216,26 +1226,26 @@ class TestUninitVar : public TestFixture {
                        "    if(strcoll(c1,c2))\n"
                        "    {\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    char *c1;\n"
                        "    c1=strcpy(c1,\"test\");\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:15]: (error) Uninitialized variable: c1 [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f(char *c1)\n"
                        "{\n"
                        "    c1=strcpy(c1,\"test\");\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "  X var;\n"
                        "  memset(var, 0, sizeof(var));\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f() {\n" // #8692
@@ -1296,8 +1306,8 @@ class TestUninitVar : public TestFixture {
                        "    for (int i = 0; i < 4; ++i) {\n"
                        "        int a;\n"
                        "        b(4*a);\n"
-                       "    }"
-                       "}");
+                       "    }\n"
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -1305,7 +1315,7 @@ class TestUninitVar : public TestFixture {
                        "    for (int i = 0; i < 4; ++i) {\n"
                        "        k = k + 2;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: k [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -1313,7 +1323,7 @@ class TestUninitVar : public TestFixture {
                        "    for (int i = 0; i < 4; ++i) {\n"
                        "        int sz = sizeof(sel);\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("enum ABCD { A, B, C, D };\n"
@@ -1323,7 +1333,7 @@ class TestUninitVar : public TestFixture {
                        "    for (i = 0; i < D; i++) {\n"
                        "        str[i] = 0;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void x() {\n"
@@ -1333,7 +1343,7 @@ class TestUninitVar : public TestFixture {
                        "        {\n"
                        "        }\n"
                        "    } while (tok2);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(void) {\n"
@@ -1346,7 +1356,7 @@ class TestUninitVar : public TestFixture {
                        "            x = 2;\n"
                        "        }\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(void) {\n"
@@ -1358,7 +1368,7 @@ class TestUninitVar : public TestFixture {
                        "            a = 1;\n"
                        "        }\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:24]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo(int n) {\n"
@@ -1368,7 +1378,7 @@ class TestUninitVar : public TestFixture {
                        "      f = one[i];\n"
                        "    one[rank] = -1;\n"
                        "  }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #2226: C++0x loop
@@ -1376,7 +1386,7 @@ class TestUninitVar : public TestFixture {
                        "    container c;\n"
                        "    for (iterator it : c) {\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #2345: False positive in sub-condition in if inside a loop
@@ -1387,7 +1397,7 @@ class TestUninitVar : public TestFixture {
                        "        { }\n"
                        "        x--;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
         // extracttests.start: struct PoolItem { bool operator!=(const PoolItem&) const; };
         checkUninitVar("void f(int x, const PoolItem& rPool) {\n"
@@ -1397,7 +1407,7 @@ class TestUninitVar : public TestFixture {
                        "        { }\n"
                        "        x--;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (error) Uninitialized variable: pItem [legacyUninitvar]\n", errout_str());
 
         // #2231 - conditional initialization in loop..
@@ -1412,7 +1422,7 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:11]: (error) Uninitialized variable: x\n", "", errout_str());
 
         // Ticket #2796
@@ -1423,7 +1433,7 @@ class TestUninitVar : public TestFixture {
                        "        else break;\n"
                        "        return x;\n"   // <- x is initialized
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Assignment in for. Ticket #3287
@@ -1432,7 +1442,7 @@ class TestUninitVar : public TestFixture {
                        "    if (b) for (c = in; *c == 0; ++c) {}\n"
                        "    else c = in + strlen(in) - 1;\n"
                        "    *c = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10273 - assignment in conditional code
@@ -1443,7 +1453,7 @@ class TestUninitVar : public TestFixture {
                        "        if (!(learn & PORT_LEARN_DISABLE))\n"
                        "            learn = 123;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:15]: (error) Uninitialized variable: learn [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: struct Entry { Entry *next; }; Entry *buckets[10];
@@ -1494,7 +1504,7 @@ class TestUninitVar : public TestFixture {
                        "        *p = 7;\n" // <<
                        "        p = new int(9);\n"
                        "    } while (*p != 8);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:11:10]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // #6952 - while-loop
@@ -1505,7 +1515,7 @@ class TestUninitVar : public TestFixture {
                        "        *p = 7;\n"
                        "        p = new int(9);\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // switch in loop
@@ -1521,7 +1531,7 @@ class TestUninitVar : public TestFixture {
                        "    };\n"
                        "    ++p\n"
                        "  }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1535,7 +1545,7 @@ class TestUninitVar : public TestFixture {
                        "        c++;\n"
                        "        break;\n"
                        "    };\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6:5]: (error) Uninitialized variable: c [uninitvar]\n", "", errout_str());
 
         checkUninitVar("char * f()\n"
@@ -1548,7 +1558,7 @@ class TestUninitVar : public TestFixture {
                        "        case 2: return ret;\n"
                        "    }\n"
                        "    return 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo(const int iVar, unsigned int slot, unsigned int pin)\n"
@@ -1571,7 +1581,7 @@ class TestUninitVar : public TestFixture {
                        "        }\n"
                        "    }\n"
                        "    return i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #1855 - switch(foo(&x))
@@ -1583,7 +1593,7 @@ class TestUninitVar : public TestFixture {
                        "        case 1:\n"
                        "            return x;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3231 - ({ switch .. })
@@ -1597,7 +1607,7 @@ class TestUninitVar : public TestFixture {
                        "        break;\n"
                        "    };\n"
                        "    })\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1607,7 +1617,7 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    char a[10];\n"
                        "    a[a[0]] = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (error) Uninitialized variable: a[0] [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f()\n"
@@ -1615,59 +1625,59 @@ class TestUninitVar : public TestFixture {
                        "    char a[10];\n"
                        "    *a = '\\0';\n"
                        "    int i = strlen(a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    char a, b[10];\n"
                        "    a = b[0] = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    char a[10], b[10];\n"
                        "    a[0] = b[0] = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    char a[10], *p;\n"
                        "    *(p = a) = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char a[10], *p;\n"
                        "    p = &(a[10]);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // array usage in ?: (tests that the isVariableUsed() works)
         checkUninitVar("void f() {\n"
                        "    char a[10], *p;\n"
                        "    p = c?a:0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "    char a[10], c;\n"
                        "    c = *(x?a:0);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char a[10], c;\n"
                        "    strcpy(dest, x?a:\"\");\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "  int a[2];\n"
                        "  y *= (x ? 1 : 2);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // passing array to library functions
@@ -1675,25 +1685,25 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    char c[50] = \"\";\n"
                        "    strcat(c, \"test\");\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(char *s2) {\n"
                        "    char s[20];\n"
                        "    strcpy(s2, s);\n"
-                       "};");
+                       "};\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Uninitialized variable: s [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char s[20];\n"
                        "    strcat(s, \"abc\");\n"
-                       "};");
+                       "};\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: s [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char s[20];\n"
                        "    strchr(s, ' ');\n"
-                       "};");
+                       "};\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: s [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo()\n"
@@ -1702,7 +1712,7 @@ class TestUninitVar : public TestFixture {
                        "        int s;\n"
                        "        GetField( y + 0, y + 1 );\n"
                        "        s = y[0] * y[1];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
@@ -1710,14 +1720,14 @@ class TestUninitVar : public TestFixture {
                        "        int a[2];\n"
                        "        init(a - 1);\n"
                        "        int b = a[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "        Fred a[2];\n"
                        "        Fred b = a[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo() {\n"
@@ -1738,40 +1748,40 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    int a[10];\n"
                        "    f(a[0]);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:7]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         // Ticket #2320
         checkUninitVar("void foo() {\n"
                        "        char a[2];\n"
                        "        unsigned long b = (unsigned long)(a+2) & ~7;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"   // Ticket #3050
                        "    char a[2];\n"
                        "    printf(\"%s\", a);\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: a [legacyUninitvar]\n", "", errout_str());
 
         checkUninitVar("void f() {\n"   // Ticket #5108 (fp)
                        "    const char *a;\n"
                        "    printf(\"%s\", a=\"abc\");\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"    // Ticket #3497
                        "    char header[1];\n"
                        "    *((unsigned char*)(header)) = 0xff;\n"
                        "    return header[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"    // Ticket #3497
                        "    char header[1];\n"
                        "    *((unsigned char*)((unsigned char *)(header))) = 0xff;\n"
                        "    return header[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -1781,7 +1791,7 @@ class TestUninitVar : public TestFixture {
                        "    abc.a = a;\n"
                        "    init(&abc);\n"
                        "    return a[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #3344
@@ -1790,7 +1800,7 @@ class TestUninitVar : public TestFixture {
                        "   char *buffer=(char*)malloc(128*sizeof(char));\n"
                        "   strcpy(strMsg,buffer);\n"
                        "   free(buffer);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (error) Memory is allocated but not initialized: buffer [uninitdata]\n", errout_str());
 
         checkUninitVar("void f(){\n"
@@ -1798,45 +1808,45 @@ class TestUninitVar : public TestFixture {
                        "   char *buffer=static_cast<char*>(malloc(128*sizeof(char)));\n"
                        "   strcpy(strMsg,buffer);\n"
                        "   free(buffer);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (error) Memory is allocated but not initialized: buffer [uninitdata]\n", errout_str());
 
         // #3845
         checkUninitVar("int foo() {\n"
                        "    int a[1] = {5};\n"
                        "    return a[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "    int a[2][2] = {{3,4}, {5,6}};\n"
                        "    return a[0][1];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "    int a[1];\n"
                        "    return a[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "    int a[2][2];\n"
                        "    return a[0][1];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "    int a[10];\n"
                        "    dostuff(a[0]);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // # 4740
         checkUninitVar("void f() {\n"
                        "    int *a[2][19];\n"
                        "    int **b = a[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6869 - FP when passing uninit array to function
@@ -1844,7 +1854,7 @@ class TestUninitVar : public TestFixture {
                        "void foo() {\n"
                        "  char x[10];\n"
                        "  bar(x);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // struct
@@ -1853,7 +1863,7 @@ class TestUninitVar : public TestFixture {
                        "void f() {\n"
                        "  struct Fred fred[10];\n"
                        "  fred[1].x = 0;\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("char f() {\n"
@@ -1896,7 +1906,7 @@ class TestUninitVar : public TestFixture {
                        "        vertices[i][1][2] = 4.0;\n"
                        "        vertices[i][1][3] = 5.0;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: vertices [legacyUninitvar]\n",
                       errout_str());
 
@@ -1912,7 +1922,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("double foo(bool flag) {\n"
                        "    double adIHPoint_local[4][4]{};\n"
                        "    function(*adIHPoint_local);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1921,96 +1931,96 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void f() {\n"
                        "    char *s = (char *)malloc(100);\n"
                        "    strcat(s, \"abc\");\n"
-                       "};");
+                       "};\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Memory is allocated but not initialized: s [uninitdata]\n", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    char *s1 = new char[10];\n"
                        "    char *s2 = new char[strlen(s1)];\n"
-                       "};");
+                       "};\n");
         ASSERT_EQUALS("[test.cpp:4:32]: (error) Memory is allocated but not initialized: s1 [uninitdata]\n", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    char *p = (char*)malloc(64);\n"
                        "    int x = p[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Memory is allocated but not initialized: p [uninitdata]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char *p = (char*)malloc(64);\n"
                        "    if (p[0]) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Memory is allocated but not initialized: p[0] [uninitdata]\n", errout_str());
 
         checkUninitVar("char f() {\n"
                        "    char *p = (char*)malloc(64);\n"
                        "    return p[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Memory is allocated but not initialized: p [uninitdata]\n", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    Fred *fred = new Fred;\n"
                        "    fred->foo();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct Fred { int i; Fred(int, float); };\n"
                        "void f() {\n"
                        "    Fred *fred = new Fred(1, 2);\n"
                        "    fred->foo();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    Fred *fred = malloc(sizeof(Fred));\n"
                        "    x(&fred->f);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    Fred *fred = malloc(sizeof(Fred));\n"
                        "    x(fred->f);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(char *s)\n"
                        "{\n"
                        "    char *a = malloc(100);\n"
                        "    *a = *s;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    char *a;\n"
                        "    if (a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    char *a = malloc(100);\n"
                        "    if (a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    ABC *abc = malloc(100);\n"
                        "    abc->a = 123;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    ABC *abc = malloc(100);\n"
                        "    abc->a.word = 123;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
@@ -2018,14 +2028,14 @@ class TestUninitVar : public TestFixture {
                        "    ABC *abc = malloc(100);\n"
                        "    abc->a = 123;\n"
                        "    abc->a += 123;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    ABC *abc = malloc(100);\n"
                        "    free(abc);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
@@ -2034,14 +2044,14 @@ class TestUninitVar : public TestFixture {
                        "    if (!s)\n"
                        "        return;\n"
                        "    char c = *s;\n"
-                       "}");
-        TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Memory is allocated but not initialized: s\n", "", errout_str());
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:6:15]: (error) Memory is allocated but not initialized: s [uninitdata]\n", errout_str());
 
         // #3708 - false positive when using ptr typedef
         checkUninitVar("void f() {\n"
                        "    uintptr_t x = malloc(100);\n"
                        "    uintptr_t y = x + 10;\n"  // <- not bad usage
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -2050,7 +2060,7 @@ class TestUninitVar : public TestFixture {
                        "  strm.next_out = buf;\n"
                        "  deflate(&strm, Z_FINISH);\n"
                        "  memcpy(body, buf, 10);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6451 - allocation in subscope
@@ -2066,7 +2076,7 @@ class TestUninitVar : public TestFixture {
                        "    else\n"
                        "        pNewStrm = new StgStrm(rIo);\n"
                        "    pNewStrm->Write();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6450 - calling a member function is allowed if memory was allocated by new
@@ -2077,7 +2087,7 @@ class TestUninitVar : public TestFixture {
                        "void processObjectRecord() {\n"
                        "    EMFPFont *font = new EMFPFont();\n"
                        "    font->Initialize();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7623 - new can also initialize the memory, don't warn in this case
@@ -2086,14 +2096,14 @@ class TestUninitVar : public TestFixture {
                        "    int* p2 = new int();\n"
                        "    int* arr = new int[5]();\n"
                        "    std::cout << *p1 << *p2 << arr[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // new in C code does not allocate..
         checkUninitVar("int main() {\n"
                        "    char * pBuf = new(10);\n"
                        "    a = *pBuf;\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("class A {};\n" // #10698
@@ -2139,6 +2149,111 @@ class TestUninitVar : public TestFixture {
                        "        *(p + i) = 0;\n"
                        "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        checkUninitVar("int* f() {\n" // #14448
+                       "    int* p = (int*)malloc(4);\n"
+                       "    if (!p)\n"
+                       "        return nullptr;\n"
+                       "    if (*p) {}\n"
+                       "    return p;\n"
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:5:9]: (error) Memory is allocated but not initialized: *p [uninitdata]\n", errout_str());
+
+        checkUninitVar("int* f() {\n"
+                       "    int* p = (int*)malloc(4);\n"
+                       "    if (p == nullptr)\n"
+                       "        return nullptr;\n"
+                       "    if (*p) {}\n"
+                       "    return p;\n"
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:5:9]: (error) Memory is allocated but not initialized: *p [uninitdata]\n", errout_str());
+
+        checkUninitVar("char* f(size_t nBytes, size_t nAlign) {\n" // #14485
+                       "    char* p = reinterpret_cast<char*>(malloc(nBytes));\n"
+                       "    if ((uintptr_t)p % nAlign != 0) {}\n"
+                       "    return p;\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkUninitVar("struct S { char c[10]; };\n" // #11290
+                       "S* f() {\n"
+                       "    S* s = (S*)malloc(sizeof(S));\n"
+                       "    sprintf(s->c, \"abc\");\n"
+                       "    return s;\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkUninitVar("int f() {\n" // #14719
+                       "    int* p = new int[]{ 1, 2 };\n"
+                       "    int i = p[0] + p[1];\n"
+                       "    delete[] p;\n"
+                       "    return i;\n"
+                       "}\n"
+                       "int g() {\n"
+                       "    int* p = new std::int32_t[]{ 1, 2 };\n"
+                       "    int i = p[0] + p[1];\n"
+                       "    delete[] p;\n"
+                       "    return i;\n"
+                       "}\n"
+                       "int h() {\n"
+                       "    int* p = new ::std::int32_t[]{ 1, 2 };\n"
+                       "    int i = p[0] + p[1];\n"
+                       "    delete[] p;\n"
+                       "    return i;\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #15005
+        checkUninitVar("void f() {\n"
+                       "    char *p = new char;\n"
+                       "    p += 1;\n"
+                       "    delete (p - 1);\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkUninitVar("void f() {\n"
+                       "    char *p = new char;\n"
+                       "    *p += 1;\n"
+                       "    delete p;\n"
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:3:6]: (error) Memory is allocated but not initialized: p [uninitdata]\n", errout_str());
+
+        checkUninitVar("void f() {\n"
+                       "    char *p = new char;\n"
+                       "    (*p)++;\n"
+                       "    delete p;\n"
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:3:7]: (error) Memory is allocated but not initialized: p [uninitdata]\n", errout_str());
+
+        checkUninitVar("void f() {\n"
+                       "    char *p = new char;\n"
+                       "    p[0]++;\n"
+                       "    delete p;\n"
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Memory is allocated but not initialized: p [uninitdata]\n", errout_str());
+
+        checkUninitVar("void f() {\n"
+                       "    char *buf = (char *)malloc(1);\n"
+                       "    if (!buf)\n"
+                       "        return NULL;\n"
+                       "    buf += buf[0];\n"
+                       "    free(buf);\n"
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:5:15]: (error) Memory is allocated but not initialized: buf[0] [uninitdata]\n", errout_str());
+
+        checkUninitVar("void g() {\n"
+                       "    int* p = new int;\n"
+                       "    p++;\n"
+                       "    delete (p - 1);\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkUninitVar("void g() {\n"
+                       "    int* p = new int;\n"
+                       "    ++p;\n"
+                       "    delete (p - 1);\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     // class / struct..
@@ -2147,7 +2262,7 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    int i;\n"
                        "    int a() { return i; }\n"
-                       "};");
+                       "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
@@ -2158,16 +2273,16 @@ class TestUninitVar : public TestFixture {
                        "            surface->MoveTo();\n"
                        "        }\n"
                        "    };\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    static const struct ab {\n"
                        "        int a,b;\n"
-                       "        int get_a() { return a; }"
+                       "        int get_a() { return a; }\n"
                        "    } x = { 0, 0 };\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
@@ -2180,13 +2295,13 @@ class TestUninitVar : public TestFixture {
                        "        i = 0;\n"
                        "    }\n"
                        "    return i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "    struct AB ab;\n"
                        "    x = ab.x = 12;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2197,7 +2312,7 @@ class TestUninitVar : public TestFixture {
                        "    enum AB { a, b };\n"
                        "    AB ab;\n"
                        "    if (ab);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (error) Uninitialized variable: ab [legacyUninitvar]\n", errout_str());
     }
 
@@ -2209,7 +2324,7 @@ class TestUninitVar : public TestFixture {
                        "    int &b = a;\n"
                        "    b = 0;\n"
                        "    int x = a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(struct blame_entry *ent)\n"
@@ -2217,14 +2332,14 @@ class TestUninitVar : public TestFixture {
                        "    struct origin *suspect = ent->suspect;\n"
                        "    char hex[41];\n"
                        "    strcpy(hex, sha1_to_hex(suspect->commit->object.sha1));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    const std::string s(x());\n"
                        "    strchr(s.c_str(), ',');\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6717
@@ -2233,7 +2348,7 @@ class TestUninitVar : public TestFixture {
                        "    thing it;\n"
                        "    int& referenced_int = it.value;\n"
                        "    referenced_int = 123;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2242,19 +2357,19 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("static int foo() {\n"
                        "    int ret;\n"
                        "    return ret;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: ret [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static int foo() {\n"
                        "    int ret;\n"
                        "    return ret+5;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: ret [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static int foo() {\n"
                        "    int ret;\n"
                        "    return ret = 5;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -2262,7 +2377,7 @@ class TestUninitVar : public TestFixture {
                            "    int ret;\n"
                            "    cin >> ret;\n"
                            "    return ret;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("static int foo() {\n"
@@ -2274,10 +2389,10 @@ class TestUninitVar : public TestFixture {
 
         // Ticket #6341- False negative
         {
-            checkUninitVar("wchar_t f() { int i; return btowc(i); }");
+            checkUninitVar("wchar_t f() { int i; return btowc(i); }\n");
             ASSERT_EQUALS("[test.cpp:1:35]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
-            checkUninitVar("wchar_t f(int i) { return btowc(i); }");
+            checkUninitVar("wchar_t f(int i) { return btowc(i); }\n");
             ASSERT_EQUALS("", errout_str());
 
             // Avoid a potential false positive (#6341)
@@ -2289,7 +2404,7 @@ class TestUninitVar : public TestFixture {
                 "int f() {\n"
                 "  int x;\n"
                 "  return setvalue(x);\n"
-                "}");
+                "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -2302,7 +2417,7 @@ class TestUninitVar : public TestFixture {
                            "        f = 0.0;\n"
                            "    }\n"
                            "    printf (\"%f\",f);\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:7:18]: (error) Uninitialized variable: f [legacyUninitvar]\n", errout_str());
 
             // Check for potential FP
@@ -2313,7 +2428,7 @@ class TestUninitVar : public TestFixture {
                            "        f = 0.0;\n"
                            "    }\n"
                            "    printf (\"%f\",f);\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -2321,7 +2436,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("int f(int x) {\n"
                        "    int y;\n"
                        "    return x ? 1 : y;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Uninitialized variable: y [legacyUninitvar]\n", errout_str());
 
         // Ticket #3106 - False positive
@@ -2329,13 +2444,13 @@ class TestUninitVar : public TestFixture {
             checkUninitVar("int f() {\n"
                            "    int i;\n"
                            "    return x(&i) ? i : 0;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("int f() {\n"
                            "    int i;\n"
                            "    return x() ? i : 0;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:3:16]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
         }
     }
@@ -2348,7 +2463,7 @@ class TestUninitVar : public TestFixture {
                        "    struct A msg = { .buf = {&key} };\n"
                        "    init(&msg);\n"
                        "    key++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #5660 - False positive
@@ -2357,7 +2472,7 @@ class TestUninitVar : public TestFixture {
                        "    int *res[] = {&result};\n"
                        "    foo(res);\n"
                        "    return result;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6873
@@ -2366,7 +2481,7 @@ class TestUninitVar : public TestFixture {
                        "    char *b[] = {a};\n"
                        "    foo(b);\n"
                        "    return atoi(a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // = { .. }
@@ -2375,7 +2490,7 @@ class TestUninitVar : public TestFixture {
                        "    int *p[] = { &a };\n"
                        "    *p[0] = 0;\n"
                        "    return a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
     }
@@ -2390,7 +2505,7 @@ class TestUninitVar : public TestFixture {
                        "    char a[100];\n"
                        "    strncpy(a, s, 20);\n"
                        "    strncat(a, s, 20);\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Dangerous usage of 'a' (strncpy doesn't always null-terminate it).\n", "", errout_str());
 
         checkUninitVar("void f()\n"
@@ -2398,7 +2513,7 @@ class TestUninitVar : public TestFixture {
                        "    char a[100];\n"
                        "    strncpy(a, \"hello\", 3);\n"
                        "    strncat(a, \"world\", 20);\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Dangerous usage of 'a' (strncpy doesn't always null-terminate it).\n", "", errout_str());
 
         checkUninitVar("void f()\n"
@@ -2406,7 +2521,7 @@ class TestUninitVar : public TestFixture {
                        "    char a[100];\n"
                        "    strncpy(a, \"hello\", sizeof(a));\n"
                        "    strncat(a, \"world\", 20);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3245 - false positive
@@ -2415,14 +2530,14 @@ class TestUninitVar : public TestFixture {
                            "    char a[100];\n"
                            "    strncpy(a,p,10);\n"
                            "    memcmp(a,q,10);\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("void f() {\n"
                            "    char a[100];\n"
                            "    strncpy(a,p,10);\n"
                            "    if (memcmp(a,q,10)==0);\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -2431,7 +2546,7 @@ class TestUninitVar : public TestFixture {
                        "    char buf[10];\n"
                        "    strncpy(buf, dev, 10);\n"
                        "    strncpy(str, buf, 10);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -2439,40 +2554,40 @@ class TestUninitVar : public TestFixture {
                        "  const char* source = \"You\";\n"
                        "  strncpy(dst, source, sizeof(dst));\n"
                        "  char value = dst[2];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     // valid and invalid use of 'int a(int x) { return x + x; }'
     void func_uninit_var() {
-        const std::string funca("int a(int x) { return x + x; }");
+        const std::string funca("int a(int x) { return x + x; }\n");
 
         checkUninitVar(funca +
                        "void b() {\n"
                        "    int x;\n"
                        "    a(x);\n"
-                       "}");
-        ASSERT_EQUALS("[test.cpp:3:7]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar(funca +
                        "void b() {\n"
                        "    int *p;\n"
                        "    a(*p);\n"
-                       "}");
-        ASSERT_EQUALS("[test.cpp:3:8]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:4:8]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
     }
 
 
     // valid and invalid use of 'void a(int *p) { *p = 0; }'
     void func_uninit_pointer() {
-        const std::string funca("void a(int *p) { *p = 0; }");
+        const std::string funca("void a(int *p) { *p = 0; }\n");
 
         // ok - initialized pointer
         checkUninitVar(funca +
                        "void b() {\n"
                        "    int buf[10];\n"
                        "    a(buf);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // not ok - uninitialized pointer
@@ -2480,32 +2595,32 @@ class TestUninitVar : public TestFixture {
                        "void b() {\n"
                        "    int *p;\n"
                        "    a(p);\n"
-                       "}");
-        ASSERT_EQUALS("[test.cpp:3:7]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
     }
 
     void uninitvar_typeof() {
         checkUninitVar("void f() {\n"
                        "    struct Fred *fred;\n"
                        "    typeof(fred->x);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    struct SData * s;\n"
                        "    ab(typeof(s->status));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    struct SData * s;\n"
                        "    TYPEOF(s->status);\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("", "[test.cpp:3:12]: (error) Uninitialized variable: s [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int *n = ({ typeof(*n) z;  (typeof(*n)*)z; })\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2513,25 +2628,25 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void foo() {\n"
                        "  int i;\n"
                        "  dostuff((int&)i, 0);\n" // <- cast is not use
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "  int i;\n"
                        "  return (int&)i + 2;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo() {\n"
                        "  int i;\n"
                        "  dostuff(*&i, 0);\n" // <- *& is not use
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "  int i;\n"
                        "  return *&i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
     }
 
@@ -2540,121 +2655,121 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    x++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: char str[10];
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    str[x] = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n" // #7736
                        "    int buf[12];\n"
                        "    printf (\"%d\", buf[0] );\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (error) Uninitialized variable: buf [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    int y = x & 3;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    int y = 3 & x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    x = 3 + x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    x = x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: struct ABC {int a;};
         checkUninitVar("void f() {\n"
                        "    struct ABC *abc;\n"
                        "    abc->a = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: abc [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f() {\n"
                        "    static int x;\n"
                        "    return ++x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f() {\n"
                        "    extern int x;\n"
                        "    return ++x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"  // #3926 - weird cast.
                        "    int x;\n"
                        "    *(((char *)&x) + 0) = 0;\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n" // #4737 - weird cast.
                        "    int x;\n"
                        "    do_something(&((char*)&x)[0], 1);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    char *p = (char*)&x + 1;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int i;\n"
                        "    i=f(), i!=2;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // using uninit var in condition
         checkUninitVar("void f(void) {\n"
                        "    int x;\n"
                        "    if (x) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    if (1 == (3 & x)) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         // ?:
         checkUninitVar("int f(int *ptr) {\n"
                        "    int a;\n"
                        "    int *p = ptr ? ptr : &a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int a) {\n"
                        "    int x;\n"
                        "    if (a==3) { x=2; }\n"
                        "    y = (a==3) ? x : a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // = ({ .. })
         checkUninitVar("void f() {\n"
                        "    int x = ({ 1 + 2; });\n"
                        "    int y = 1 + (x ? y : y);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:22]: (error) Uninitialized variable: y [legacyUninitvar]\n", errout_str());
 
         // >> => initialization / usage
@@ -2662,7 +2777,7 @@ class TestUninitVar : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    int x;\n"
                                 "    if (i >> x) { }\n"
-                                "}";
+                                "}\n";
             checkUninitVar(code);
             ASSERT_EQUALS("", errout_str());
 
@@ -2673,7 +2788,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void f() {\n"
                        "    int i, i2;\n"
                        "    strm >> i >> i2;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unconditional initialization
@@ -2682,7 +2797,7 @@ class TestUninitVar : public TestFixture {
                        "    if (a) { ret = 1; }\n"
                        "    else { {} ret = 2; }\n"
                        "    return ret;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f() {\n"
@@ -2690,7 +2805,7 @@ class TestUninitVar : public TestFixture {
                        "    if (a) { ret = 1; }\n"
                        "    else { s=foo(1,{2,3},4); ret = 2; }\n"
                        "    return ret;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // conditional initialization
@@ -2699,7 +2814,7 @@ class TestUninitVar : public TestFixture {
                        "    if (y == 1) { x = 1; }\n"
                        "    else { if (y == 2) { x = 1; } }\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -2708,7 +2823,7 @@ class TestUninitVar : public TestFixture {
                        "    else { if (y == 2) { x = 1; } }\n"
                        "    if (y == 3) { }\n"   // <- ignore condition
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         // initialization in condition
@@ -2716,7 +2831,7 @@ class TestUninitVar : public TestFixture {
                        "    int a;\n"
                        "    if (init(&a)) { }\n"
                        "    a++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return, break, continue, goto
@@ -2725,14 +2840,14 @@ class TestUninitVar : public TestFixture {
                        "    if (y == 1) { return; }\n"
                        "    else { x = 1; }\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    if (y == 1) { return; }\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f(int x) {\n"
@@ -2745,7 +2860,7 @@ class TestUninitVar : public TestFixture {
                        "out1:\n"
                        "out2:\n"
                        "    return ret;\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -2756,7 +2871,7 @@ class TestUninitVar : public TestFixture {
                        "        goto out;\n"
                        "    }\n"
                        "    i++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f() {\n"
@@ -2764,7 +2879,7 @@ class TestUninitVar : public TestFixture {
                        "    for (i=0;i<9;++i)\n"
                        "        if (foo) break;\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f() {\n"
@@ -2772,7 +2887,7 @@ class TestUninitVar : public TestFixture {
                        "    while (foo)\n"
                        "        if (bar) break;\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         // try/catch : don't warn about exception variable
@@ -2782,7 +2897,7 @@ class TestUninitVar : public TestFixture {
                        "        trace();\n"
                        "        e->Delete();\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n" // #5347
@@ -2790,7 +2905,7 @@ class TestUninitVar : public TestFixture {
                        "    } catch (const char* e) {\n"
                        "        A a = e;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // exit
@@ -2799,7 +2914,7 @@ class TestUninitVar : public TestFixture {
                        "    if (y == 1) { exit(0); }\n"
                        "    else { x = 1; }\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // strange code.. don't crash (#3415)
@@ -2807,14 +2922,14 @@ class TestUninitVar : public TestFixture {
                        "    int i;\n"
                        "    ({ if (0); });\n"
                        "    for_each(i) { }\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
 
         // if, if
         checkUninitVar("void f(int a) {\n"
                        "    int i;\n"
                        "    if (a) i = 0;\n"
                        "    if (a) i++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -2826,7 +2941,7 @@ class TestUninitVar : public TestFixture {
                        "        }\n"
                        "    }\n"
                        "    if (b) a++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -2834,41 +2949,41 @@ class TestUninitVar : public TestFixture {
                        "    if (x) { }\n"
                        "    else { if (y==2) { a=1; b=2; } }\n"
                        "    if (a) { ++b; }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void f(int x, int y) {\n"
                        "    int a;\n"
                        "    if (x == 0) { a = y; }\n"
                        "    if (x == 0 && (a == 1)) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void f() {\n"
                        "    int a=0, b;\n"
                        "    if (something) { a = dostuff(&b); }\n"
                        "    if (!a || b) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void f(int x, int y) {\n"
                        "    int a;\n"
                        "    if (x == 0 && (a == 1)) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:20]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int a;\n"
                        "    if (x) { a = 0; }\n"
                        "    if (x) { if (y) { a++; } }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int a;\n"
                        "    if (x) { a = 0; }\n"
                        "    if (x) { if (y) { } else { a++; } }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -2877,7 +2992,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x) ab = getAB();\n"
                        "    else ab.a = 0;\n"
                        "    if (ab.a == 1) b = ab.b;\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(void) {\n"
@@ -2888,7 +3003,7 @@ class TestUninitVar : public TestFixture {
                        "    if (i==1) { a = 0; }\n"
                        "    else { a = 1; }\n"
                        "    return a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int a) {\n" // #4560
@@ -2898,7 +3013,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x) y = 123;\n" // <- y is always initialized
                        "    else {}\n"
                        "    return y;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int a) {\n" // #6583
@@ -2907,7 +3022,7 @@ class TestUninitVar : public TestFixture {
                        "    else if (a == 2) x = 0;\n"
                        "    else exit(2);\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int a) {\n" // #4560
@@ -2917,7 +3032,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x) {}\n"
                        "    else y = 123;\n" // <- y is always initialized
                        "    return y;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n" // #3948
@@ -2925,7 +3040,7 @@ class TestUninitVar : public TestFixture {
                        "  if (x !=-1)\n"
                        "    value = getvalue();\n"
                        "  if (x == -1 || value > 300) {}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("enum t_err { ERR_NONE, ERR_BAD_ARGS };\n" // #9649
@@ -2938,7 +3053,7 @@ class TestUninitVar : public TestFixture {
                        "        ret = init_box(&box2, 20);\n"
                        "    if (ret == ERR_NONE)\n"
                        "        z = x + box2.value;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
@@ -2947,7 +3062,7 @@ class TestUninitVar : public TestFixture {
                        "    value = getvalue();\n"
                        "  if (x == 1)\n"
                        "    v = value;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:9]: (error) Uninitialized variable: value [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f(int x) {\n"
@@ -2956,7 +3071,7 @@ class TestUninitVar : public TestFixture {
                        "    value = getvalue();\n"
                        "  if (x == 32) {}\n"
                        "  else v = value;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (error) Uninitialized variable: value [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static int x;" // #4773
@@ -2966,7 +3081,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x) y = 123;\n"
                        "    else y = 456;\n"
                        "    return y;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static int x;" // #4773
@@ -2976,7 +3091,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x) y = 123;\n"
                        "    else y = 456;\n"
                        "    return y;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int a) {\n"
@@ -2986,7 +3101,7 @@ class TestUninitVar : public TestFixture {
                        "    if (!a) {}\n"
                        "    else if (x) {}\n"
                        "  }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // asm
@@ -2994,74 +3109,74 @@ class TestUninitVar : public TestFixture {
                        "    int x;\n"
                        "    asm();\n"
                        "    x++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // sizeof / typeof / offsetof / etc
         checkUninitVar("void f() {\n"
                        "    int i;\n"
                        "    sizeof(i+1);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int i;\n"
                        "    if (100 == sizeof(i+1));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    struct ABC *abc;\n"
                        "    int i = ARRAY_SIZE(abc.a);"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("", "[test.cpp:3:24]: (error) Uninitialized variable: abc [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int *abc;\n"
                        "    typeof(*abc);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    struct ABC *abc;\n"
                        "    return do_something(typeof(*abc));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    A *a;\n"
                        "    a = malloc(sizeof(*a));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // &
         checkUninitVar("void f() {\n"  // #4426 - address of uninitialized variable
                        "    int a,b;\n"
                        "    if (&a == &b);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"  // #4439 - cast address of uninitialized variable
                        "    int a;\n"
                        "    x((LPARAM)(RECT*)&a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int main() {\n"
                        "    int done;\n"
                        "    dostuff(1, (AuPointer) &done);\n" // <- It is not conclusive if the "&" is a binary or unary operator. Bailout.
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n" // #4778 - cast address of uninitialized variable
                        "    long a;\n"
                        "    &a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n" // #4717 - ({})
                        "    int a = ({ long b = (long)(123); 2 + b; });\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3072,7 +3187,7 @@ class TestUninitVar : public TestFixture {
                        "    int &x = buf[0];\n"
                        "    buf[0] = 0;\n"
                        "    x++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3082,14 +3197,14 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void f() {\n"
                        "    x<char> c;\n"
                        "    c << 2345;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ensure there is no false negative
         checkUninitVar("void f() {\n"
                        "    char c;\n"
                        "    char a = c << 2;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
     }
 
@@ -3119,7 +3234,7 @@ class TestUninitVar : public TestFixture {
                             "    dsmp_t type;\n"
                             "    int syncpos, len;\n"
                             "    Sync(syncpos, type, len);\n"
-                            "}";
+                            "}\n";
         checkUninitVar(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -3128,7 +3243,7 @@ class TestUninitVar : public TestFixture {
         const char code[] = "namespace Ns { class C; }\n"
                             "void f1() { char *p; *p = 0; }\n"
                             "class Ns::C* p;\n"
-                            "void f2() { char *p; *p = 0; }";
+                            "void f2() { char *p; *p = 0; }\n";
         checkUninitVar(code);
         ASSERT_EQUALS("[test.cpp:2:23]: (error) Uninitialized variable: p [legacyUninitvar]\n"
                       "[test.cpp:4:23]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
@@ -3148,7 +3263,7 @@ class TestUninitVar : public TestFixture {
                             "int global() {\n"
                             "    int bar = 1;\n"
                             "    return bar;\n"
-                            "}";
+                            "}\n";
         checkUninitVar(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -3158,7 +3273,7 @@ class TestUninitVar : public TestFixture {
                             "void foo () {\n"
                             "    int x;\n"
                             "    x = get(x) && x;\n"
-                            "}";
+                            "}\n";
         checkUninitVar(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -3167,7 +3282,7 @@ class TestUninitVar : public TestFixture {
         const char code[] = "void fp() {\n"
                             "  std::stringstream ss;\n"
                             "  for (int i; ss >> i;) {}\n"
-                            "}";
+                            "}\n";
         checkUninitVar(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -3189,7 +3304,7 @@ class TestUninitVar : public TestFixture {
                             "    free(ccb);\n"
                             " \n"
                             "  return rez;\n"
-                            "}";
+                            "}\n";
         checkUninitVar(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -3198,7 +3313,7 @@ class TestUninitVar : public TestFixture {
         const char code[] = "void f() {\n"
                             "    int b;\n"
                             "    *(&b) = 0;\n"
-                            "}";
+                            "}\n";
         checkUninitVar(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -3210,7 +3325,7 @@ class TestUninitVar : public TestFixture {
                        "    {\n"
                        "        return i;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f() {\n"
@@ -3218,7 +3333,7 @@ class TestUninitVar : public TestFixture {
                        "    try {\n"
                        "        return i;\n"
                        "    } catch(...) {}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f(bool x) {\n"
@@ -3258,20 +3373,20 @@ class TestUninitVar : public TestFixture {
                        "    Reference< XStorageBasedLibraryContainer >(*Factory)(const Reference< XComponentContext >&, const Reference< XStorageBasedDocument >&)\n"
                        "        = &DocumentDialogLibraryContainer::create;\n"
                        "    rxContainer.set((*Factory)(m_aContext, xDocument));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo() {\n"
                        "    void* x;\n"
                        "    int (*f)(int, int) = x;\n"
                        "    dostuff((*f)(a,b));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:26]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void getLibraryContainer() {\n"
                        "    Reference< XStorageBasedLibraryContainer >(*Factory)(const Reference< XComponentContext >&, const Reference< XStorageBasedDocument >&);\n"
                        "    rxContainer.set((*Factory)(m_aContext, xDocument));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (error) Uninitialized variable: Factory [legacyUninitvar]\n", errout_str());
 
         // extracttests.enable
@@ -3291,14 +3406,14 @@ class TestUninitVar : public TestFixture {
                        "  Sink s2;\n"
                        "  int n;\n"
                        "  foo >> s2.v >> n;\n" // Initialized by operator>>
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:16]: (error) Uninitialized struct member: s.v [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct Fred { int a; };\n"
                        "void foo() {\n"
                        "  Fred fred;\n"
                        "  std::cin >> fred.a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3311,7 +3426,7 @@ class TestUninitVar : public TestFixture {
                        "   int *b = 0;\n"
                        "   bar(a,b);\n" // <<
                        "   return 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:8]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         // non-pointer variable
@@ -3319,35 +3434,35 @@ class TestUninitVar : public TestFixture {
                        "void b() {\n"
                        "    char c;\n"
                        "    a(c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void a(char c);\n"  // value => error
                        "void b() {\n"
                        "    char c;\n"
                        "    a(c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void a(const char c);\n"  // const value => error
                        "void b() {\n"
                        "    char c;\n"
                        "    a(c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void a(char *c);\n"  // address => no error
                        "void b() {\n"
                        "    char c;\n"
                        "    a(&c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a(pstr s);\n"  // address => no error
                        "void b() {\n"
                        "    char c;\n"
                        "    a(&c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a(const char *c);\n"  // const address => data is not changed
@@ -3355,7 +3470,7 @@ class TestUninitVar : public TestFixture {
                        "    char c;\n"
                        "    a(&c);\n"  // <- no warning
                        "    c++;\n"  // <- uninitialized variable
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: c\n", "", errout_str());
 
         // pointer variable
@@ -3363,7 +3478,7 @@ class TestUninitVar : public TestFixture {
                        "void b() {\n"
                        "    char *c;\n"
                        "    a(*c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
 
@@ -3371,7 +3486,7 @@ class TestUninitVar : public TestFixture {
                        "void b() {\n"
                        "    char *c;\n"
                        "    a(c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("typedef struct { int a; int b; } AB;\n"
@@ -3379,42 +3494,42 @@ class TestUninitVar : public TestFixture {
                        "void b() {\n"
                        "    AB *ab;\n"
                        "    a(ab);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:7]: (error) Uninitialized variable: ab [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void a(const char *c);\n"  // const address => error
                        "void b() {\n"
                        "    char *c;\n"
                        "    a(c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void a(const char c[]);\n"  // const address => error
                        "void b() {\n"
                        "    char *c;\n"
                        "    a(c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void a(char **c);\n"  // address of pointer => no error
                        "void b() {\n"
                        "    char *c;\n"
                        "    a(&c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a(char *c);\n"  // address of pointer (suspicious cast to pointer) => no error
                        "void b() {\n"
                        "    char *c;\n"
                        "    a(&c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a(const char **c);\n"  // const address of pointer => no error
                        "void b() {\n"
                        "    const char *c;\n"
                        "    a(&c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // array
@@ -3422,14 +3537,14 @@ class TestUninitVar : public TestFixture {
                        "void f() {\n"
                        "    int x[10];\n"
                        "    calc(x,10);\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:14]: (error) Uninitialized variable: x [legacyUninitvar]\n",
                            "", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x[10];\n"
                        "    int &x0(*x);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ....
@@ -3439,25 +3554,25 @@ class TestUninitVar : public TestFixture {
                        "    struct ABC abc;\n"
                        "    clear(abc);\n"
                        "    return abc.a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void write_packet() {\n"
                        "    time_t now0;\n"
                        "    time(&now0);\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void write_packet() {\n"
                        "    time_t* now0;\n"
                        "    time(now0);\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:10]: (error) Uninitialized variable: now0 [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void write_packet() {\n"
                        "    char now0;\n"
                        "    strcmp(&now0, sth);\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:13]: (error) Uninitialized variable: now0 [legacyUninitvar]\n", errout_str());
 
         // #2775 - uninitialized struct pointer in subfunction
@@ -3469,7 +3584,7 @@ class TestUninitVar : public TestFixture {
                        "void b() {\n"
                        "    struct Fred *p;\n"
                        "    a(p);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:7:7]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // #2946 - FP array is initialized in subfunction
@@ -3480,14 +3595,14 @@ class TestUninitVar : public TestFixture {
                        "    char buf[10];\n"
                        "    a(buf);\n"
                        "    buf[1] = buf[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unknown macro
         checkUninitVar("void f() {\n"
                        "  struct listnode *item;\n"
                        "  list_for_each(item, &key_list) {}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3499,7 +3614,7 @@ class TestUninitVar : public TestFixture {
                        "        if (y != 0) return;\n"
                        "        i++;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -3509,7 +3624,7 @@ class TestUninitVar : public TestFixture {
                        "        if (y != 0) return;\n"
                        "        i++;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -3518,14 +3633,14 @@ class TestUninitVar : public TestFixture {
                        "    else y = get_value(i);\n"
                        "    if (y != 0) return;\n" // <- condition is always true if i is uninitialized
                        "    i++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "    int i;\n"
                        "    if (x) i = 0;\n"
                        "    if (!x || i>0) {}\n" // <- no error
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
@@ -3533,7 +3648,7 @@ class TestUninitVar : public TestFixture {
                        "    if (!x) { }\n"
                        "    else i = 0;\n"
                        "    if (x || i>0) {}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:14]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f(int x) {\n"
@@ -3541,7 +3656,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x) { }\n"
                        "    else i = 0;\n"
                        "    if (x || i>0) {}\n" // <- no error
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int x) {\n"
@@ -3549,7 +3664,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x) y = do_something();\n"
                        "    if (!x) return 0;\n"
                        "    return y;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int y;
@@ -3558,7 +3673,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x)\n"
                        "        a = y;\n"
                        "    return x ? 2*a : 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int x) {\n"
@@ -3566,13 +3681,13 @@ class TestUninitVar : public TestFixture {
                        "    if (x)\n"
                        "        a = y;\n"
                        "    return y ? 2*a : 3*a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:14]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         ASSERT_THROW_INTERNAL(checkUninitVar("void f() {\n" // Don't crash
                                              "    int a;\n"
                                              "    dostuff(\"ab\" cd \"ef\", x?a:z);\n" // <- No AST is created for ?
-                                             "}"), UNKNOWN_MACRO);
+                                             "}\n"), UNKNOWN_MACRO);
 
         // Unknown => bail out..
         checkUninitVar("void f(int x) {\n"
@@ -3580,7 +3695,7 @@ class TestUninitVar : public TestFixture {
                        "    if (a(x)) i = 0;\n"
                        "    if (b(x)) return;\n"
                        "    i++;\n" // <- no error if b(x) is always true when a(x) is false
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
@@ -3589,7 +3704,7 @@ class TestUninitVar : public TestFixture {
                        "    while (condition) {\n"
                        "        if (x) i++;\n" // <- no error
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
@@ -3598,7 +3713,7 @@ class TestUninitVar : public TestFixture {
                        "    while (condition) {\n"
                        "        i++;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
@@ -3610,10 +3725,21 @@ class TestUninitVar : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for redundant code..
-        CheckUninitVar checkuninitvar(&tokenizer, &settings, this);
+        CheckUninitVarImpl checkuninitvar(&tokenizer, settings, *this);
         (checkuninitvar.valueFlowUninit)();
     }
 
+    void uninitvar15() { // #13685
+        const char code[] = "int f() {\n"
+                            "    int x;\n"
+                            "    if (!({ int *p = &x; *p = 1; 1; }))\n"
+                            "        return 0;\n"
+                            "    return x;\n"
+                            "}\n";
+        valueFlowUninit(code, false);
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void valueFlowUninit2_value()
     {
         valueFlowUninit("void f() {\n"
@@ -3623,7 +3749,7 @@ class TestUninitVar : public TestFixture {
                         "        if (y != 0) return;\n"
                         "        i++;\n"
                         "    }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -3633,7 +3759,7 @@ class TestUninitVar : public TestFixture {
                         "        if (y != 0) return;\n"
                         "        i++;\n"
                         "    }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -3642,21 +3768,21 @@ class TestUninitVar : public TestFixture {
                         "    else y = get_value(i);\n"
                         "    if (y != 0) return;\n" // <- condition is always true if i is uninitialized
                         "    i++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
                         "    int i;\n"
                         "    if (!x) i = 0;\n"
                         "    if (!x || i>0) {}\n" // <- error
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:4:15]: (warning) Uninitialized variable: i [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
                         "    int i;\n"
                         "    if (x) i = 0;\n"
                         "    if (!x || i>0) {}\n" // <- no error
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
@@ -3664,7 +3790,7 @@ class TestUninitVar : public TestFixture {
                         "    if (!x) { }\n"
                         "    else i = 0;\n"
                         "    if (x || i>0) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:5:14]: (warning) Uninitialized variable: i [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
@@ -3672,7 +3798,7 @@ class TestUninitVar : public TestFixture {
                         "    if (x) { }\n"
                         "    else i = 0;\n"
                         "    if (x || i>0) {}\n" // <- no error
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(int x) {\n"
@@ -3680,7 +3806,7 @@ class TestUninitVar : public TestFixture {
                         "    if (x) y = do_something();\n"
                         "    if (!x) return 0;\n"
                         "    return y;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int y;
@@ -3689,7 +3815,7 @@ class TestUninitVar : public TestFixture {
                         "    if (x)\n"
                         "        a = y;\n"
                         "    return x ? 2*a : 0;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(int x, int y) {\n"
@@ -3697,13 +3823,13 @@ class TestUninitVar : public TestFixture {
                         "    if (x)\n"
                         "        a = y;\n"
                         "    return y ? 2*a : 3*a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:5:18]: (warning) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         ASSERT_THROW_INTERNAL(valueFlowUninit("void f() {\n" // Don't crash
                                               "    int a;\n"
                                               "    dostuff(\"ab\" cd \"ef\", x?a:z);\n" // <- No AST is created for ?
-                                              "}"), UNKNOWN_MACRO);
+                                              "}\n"), UNKNOWN_MACRO);
 
         // Unknown => bail out..
         valueFlowUninit("void f(int x) {\n"
@@ -3711,7 +3837,7 @@ class TestUninitVar : public TestFixture {
                         "    if (a(x)) i = 0;\n"
                         "    if (b(x)) return;\n"
                         "    i++;\n" // <- no error if b(x) is always true when a(x) is false
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
@@ -3720,7 +3846,7 @@ class TestUninitVar : public TestFixture {
                         "    while (condition) {\n"
                         "        if (x) i++;\n" // <- no error
                         "    }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
@@ -3729,13 +3855,13 @@ class TestUninitVar : public TestFixture {
                         "    while (condition) {\n"
                         "        i++;\n"
                         "    }\n"
-                        "}");
+                        "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         valueFlowUninit("void f ( void ){\n" // #9313 - FN
                         " int *p;\n"
                         " int a[ 2 ] = { [ 0 ] = *p++, [ 1 ] = 1 };\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:26]: (error) Uninitialized variable: p [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f(int height) {\n"
@@ -3757,7 +3883,7 @@ class TestUninitVar : public TestFixture {
                         "        break;\n"
                         "    }\n"
                         "    ++c;\n"
-                        "}", false);
+                        "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         // #12030
@@ -3827,122 +3953,122 @@ class TestUninitVar : public TestFixture {
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    x++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         // extracttests.start: char str[10];
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    str[x] = 0;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n" // #7736
                         "    int buf[12];\n"
                         "    printf (\"%d\", buf[0] );\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (error) Uninitialized variable: buf [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    int y = x & 3;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    int y = 3 & x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    x = 3 + x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    x = x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         // extracttests.start: struct ABC {int a;};
         valueFlowUninit("void f() {\n"
                         "    struct ABC *abc;\n"
                         "    abc->a = 0;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: abc [uninitvar]\n", errout_str());
 
         valueFlowUninit("int f() {\n"
                         "    static int x;\n"
                         "    return ++x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f() {\n"
                         "    extern int x;\n"
                         "    return ++x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #3926 - weird cast.
                         "    int x;\n"
                         "    *(((char *)&x) + 0) = 0;\n"
-                        "}",
+                        "}\n",
                         false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #4737 - weird cast.
                         "    int x;\n"
                         "    do_something(&((char*)&x)[0], 1);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    char *p = (char*)&x + 1;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int i;\n"
                         "    i=f(), i!=2;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // using uninit var in condition
         valueFlowUninit("void f(void) {\n"
                         "    int x;\n"
                         "    if (x) { }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    if (1 == (3 & x)) { }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         // ?:
         valueFlowUninit("int f(int *ptr) {\n"
                         "    int a;\n"
                         "    int *p = ptr ? ptr : &a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(int a) {\n"
                         "    int x;\n"
                         "    if (a==3) { x=2; }\n"
                         "    y = (a==3) ? x : a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // = ({ .. })
         valueFlowUninit("void f() {\n"
                         "    int x = ({ 1 + 2; });\n"
                         "    int y = 1 + (x ? y : y);\n"
-                        "}");
+                        "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3:14]: (error) Uninitialized variable: y [legacyUninitvar]\n", "", errout_str());
 
         // >> => initialization / usage
@@ -3950,7 +4076,7 @@ class TestUninitVar : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    int x;\n"
                                 "    if (i >> x) { }\n"
-                                "}";
+                                "}\n";
             valueFlowUninit(code, true);
             ASSERT_EQUALS("", errout_str());
 
@@ -3961,7 +4087,7 @@ class TestUninitVar : public TestFixture {
         valueFlowUninit("void f() {\n"
                         "    int i, i2;\n"
                         "    strm >> i >> i2;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unconditional initialization
@@ -3970,7 +4096,7 @@ class TestUninitVar : public TestFixture {
                         "    if (a) { ret = 1; }\n"
                         "    else { {} ret = 2; }\n"
                         "    return ret;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f() {\n"
@@ -3978,7 +4104,7 @@ class TestUninitVar : public TestFixture {
                         "    if (a) { ret = 1; }\n"
                         "    else { s=foo(1,{2,3},4); ret = 2; }\n"
                         "    return ret;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // conditional initialization
@@ -3987,7 +4113,7 @@ class TestUninitVar : public TestFixture {
                         "    if (y == 1) { x = 1; }\n"
                         "    else { if (y == 2) { x = 1; } }\n"
                         "    return x;\n"
-                        "}");
+                        "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", "", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -3996,7 +4122,7 @@ class TestUninitVar : public TestFixture {
                         "    else { if (y == 2) { x = 1; } }\n"
                         "    if (y == 3) { }\n" // <- ignore condition
                         "    return x;\n"
-                        "}");
+                        "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6:24]: (error) Uninitialized variable: x [legacyUninitvar]\n", "", errout_str());
 
         // initialization in condition
@@ -4004,7 +4130,7 @@ class TestUninitVar : public TestFixture {
                         "    int a;\n"
                         "    if (init(&a)) { }\n"
                         "    a++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return, break, continue, goto
@@ -4013,14 +4139,14 @@ class TestUninitVar : public TestFixture {
                         "    if (y == 1) { return; }\n"
                         "    else { x = 1; }\n"
                         "    return x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    if (y == 1) { return; }\n"
                         "    return x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("int f(int x) {\n"
@@ -4033,7 +4159,7 @@ class TestUninitVar : public TestFixture {
                         "out1:\n"
                         "out2:\n"
                         "    return ret;\n"
-                        "}",
+                        "}\n",
                         false);
         ASSERT_EQUALS("", errout_str());
 
@@ -4045,7 +4171,7 @@ class TestUninitVar : public TestFixture {
                         "        goto out;\n"
                         "    }\n"
                         "    i++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f() {\n"
@@ -4053,7 +4179,7 @@ class TestUninitVar : public TestFixture {
                         "    for (i=0;i<9;++i)\n"
                         "        if (foo) break;\n"
                         "    return x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("int f() {\n"
@@ -4061,7 +4187,7 @@ class TestUninitVar : public TestFixture {
                         "    while (foo)\n"
                         "        if (bar) break;\n"
                         "    return x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         // try/catch : don't warn about exception variable
@@ -4071,7 +4197,7 @@ class TestUninitVar : public TestFixture {
                         "        trace();\n"
                         "        e->Delete();\n"
                         "    }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #5347
@@ -4079,7 +4205,7 @@ class TestUninitVar : public TestFixture {
                         "    } catch (const char* e) {\n"
                         "        A a = e;\n"
                         "    }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // exit
@@ -4088,7 +4214,7 @@ class TestUninitVar : public TestFixture {
                         "    if (y == 1) { exit(0); }\n"
                         "    else { x = 1; }\n"
                         "    return x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // strange code.. don't crash (#3415)
@@ -4096,7 +4222,7 @@ class TestUninitVar : public TestFixture {
                         "    int i;\n"
                         "    ({ if (0); });\n"
                         "    for_each(i) { }\n"
-                        "}",
+                        "}\n",
                         false);
 
         // if, if
@@ -4104,7 +4230,7 @@ class TestUninitVar : public TestFixture {
                         "    int i;\n"
                         "    if (a) i = 0;\n"
                         "    if (a) i++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -4116,7 +4242,7 @@ class TestUninitVar : public TestFixture {
                         "        }\n"
                         "    }\n"
                         "    if (b) a++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -4124,27 +4250,27 @@ class TestUninitVar : public TestFixture {
                         "    if (x) { }\n"
                         "    else { if (y==2) { a=1; b=2; } }\n"
                         "    if (a) { ++b; }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void f(int x, int y) {\n"
                         "    int a;\n"
                         "    if (x == 0) { a = y; }\n"
                         "    if (x == 0 && (a == 1)) { }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void f() {\n"
                         "    int a=0, b;\n"
                         "    if (something) { a = dostuff(&b); }\n"
                         "    if (!a || b) { }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void f(int x, int y) {\n"
                         "    int a;\n"
                         "    if (x == 0 && (a == 1)) { }\n"
-                        "}",
+                        "}\n",
                         true);
         ASSERT_EQUALS("[test.cpp:3:20]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
@@ -4152,14 +4278,14 @@ class TestUninitVar : public TestFixture {
                         "    int a;\n"
                         "    if (x) { a = 0; }\n"
                         "    if (x) { if (y) { a++; } }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int a;\n"
                         "    if (x) { a = 0; }\n"
                         "    if (x) { if (y) { } else { a++; } }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -4168,7 +4294,7 @@ class TestUninitVar : public TestFixture {
                         "    if (x) ab = getAB();\n"
                         "    else ab.a = 0;\n"
                         "    if (ab.a == 1) b = ab.b;\n"
-                        "}",
+                        "}\n",
                         false);
         ASSERT_EQUALS("", errout_str());
 
@@ -4180,7 +4306,7 @@ class TestUninitVar : public TestFixture {
                         "    if (i==1) { a = 0; }\n"
                         "    else { a = 1; }\n"
                         "    return a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(int a) {\n" // #4560
@@ -4190,8 +4316,8 @@ class TestUninitVar : public TestFixture {
                         "    if (x) y = 123;\n" // <- y is always initialized
                         "    else {}\n"
                         "    return y;\n"
-                        "}");
-        TODO_ASSERT_EQUALS("", "[test.cpp:5:9] -> [test.cpp:7:12]: (warning) Uninitialized variable: y [uninitvar]\n", errout_str());
+                        "}\n");
+        ASSERT_EQUALS("", errout_str()); // #4560: escaping else keeps x known, so x is true and y is initialized
 
         valueFlowUninit("int f(int a) {\n" // #6583
                         "    int x;\n"
@@ -4199,7 +4325,7 @@ class TestUninitVar : public TestFixture {
                         "    else if (a == 2) x = 0;\n"
                         "    else exit(2);\n"
                         "    return x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(int a) {\n" // #4560
@@ -4209,15 +4335,16 @@ class TestUninitVar : public TestFixture {
                         "    if (x) {}\n"
                         "    else y = 123;\n" // <- y is always initialized
                         "    return y;\n"
-                        "}");
-        TODO_ASSERT_EQUALS("", "[test.cpp:5:9] -> [test.cpp:7:12]: (warning) Uninitialized variable: y [uninitvar]\n", errout_str());
+                        "}\n");
+        ASSERT_EQUALS("",
+                      errout_str()); // #4560: fork-based condition analysis tracks x==0 -> else branch -> y initialized
 
         valueFlowUninit("void f(int x) {\n" // #3948
                         "  int value;\n"
                         "  if (x !=-1)\n"
                         "    value = getvalue();\n"
                         "  if (x == -1 || value > 300) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("enum t_err { ERR_NONE, ERR_BAD_ARGS };\n" // #9649
@@ -4230,7 +4357,7 @@ class TestUninitVar : public TestFixture {
                         "        ret = init_box(&box2, 20);\n"
                         "    if (ret == ERR_NONE)\n"
                         "        z = x + box2.value;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
@@ -4239,7 +4366,7 @@ class TestUninitVar : public TestFixture {
                         "    value = getvalue();\n"
                         "  if (x == 1)\n"
                         "    v = value;\n"
-                        "}");
+                        "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6:9]: (error) Uninitialized variable: value [legacyUninitvar]\n", "", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
@@ -4248,7 +4375,7 @@ class TestUninitVar : public TestFixture {
                         "    value = getvalue();\n"
                         "  if (x == 32) {}\n"
                         "  else v = value;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:6:12]: (warning) Uninitialized variable: value [uninitvar]\n", errout_str());
 
         valueFlowUninit("static int x;" // #4773
@@ -4258,7 +4385,7 @@ class TestUninitVar : public TestFixture {
                         "    if (x) y = 123;\n"
                         "    else y = 456;\n"
                         "    return y;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static int x;" // #4773
@@ -4268,7 +4395,7 @@ class TestUninitVar : public TestFixture {
                         "    if (x) y = 123;\n"
                         "    else y = 456;\n"
                         "    return y;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int a) {\n"
@@ -4278,7 +4405,7 @@ class TestUninitVar : public TestFixture {
                         "    if (!a) {}\n"
                         "    else if (x) {}\n"
                         "  }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // asm
@@ -4286,75 +4413,75 @@ class TestUninitVar : public TestFixture {
                         "    int x;\n"
                         "    asm();\n"
                         "    x++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // sizeof / typeof / offsetof / etc
         valueFlowUninit("void f() {\n"
                         "    int i;\n"
                         "    sizeof(i+1);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int i;\n"
                         "    if (100 == sizeof(i+1));\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    struct ABC *abc;\n"
                         "    int i = ARRAY_SIZE(abc.a);"
-                        "}");
+                        "}\n");
         // FP ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int *abc;\n"
                         "    typeof(*abc);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    struct ABC *abc;\n"
                         "    return do_something(typeof(*abc));\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    A *a;\n"
                         "    a = malloc(sizeof(*a));\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // &
         valueFlowUninit("void f() {\n" // #4426 - address of uninitialized variable
                         "    int a,b;\n"
                         "    if (&a == &b);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #4439 - cast address of uninitialized variable
                         "    int a;\n"
                         "    x((LPARAM)(RECT*)&a);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit(
             "int main() {\n"
             "    int done;\n"
             "    dostuff(1, (AuPointer) &done);\n" // <- It is not conclusive if the "&" is a binary or unary operator. Bailout.
-            "}");
+            "}\n");
         TODO_ASSERT_EQUALS("", "[test.cpp:3:29]: (error) Uninitialized variable: done [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n" // #4778 - cast address of uninitialized variable
                         "    long a;\n"
                         "    &a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #4717 - ({})
                         "    int a = ({ long b = (long)(123); 2 + b; });\n"
-                        "}",
+                        "}\n",
                         false);
         ASSERT_EQUALS("", errout_str());
     }
@@ -4367,7 +4494,7 @@ class TestUninitVar : public TestFixture {
                         "void foo() {\n"
                         "  struct myst item;\n"
                         "  bar(&item);\n"
-                        "}", false);
+                        "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct myst { int a; };\n"
@@ -4376,7 +4503,7 @@ class TestUninitVar : public TestFixture {
                         "  struct myst item;\n"
                         "  bar(&item);\n"
                         "  a = item.a;\n" // <- item.a is not initialized
-                        "}", false);
+                        "}\n", false);
         ASSERT_EQUALS("[test.c:6:12]: (error) Uninitialized variable: item.a [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct myst { int a; };\n"
@@ -4385,14 +4512,14 @@ class TestUninitVar : public TestFixture {
                         "  struct myst item;\n"
                         "  bar(&item);\n"
                         "  a = item.a;\n"
-                        "}", false);
+                        "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int& r) {}\n" // #12536
                         "void g() {\n"
                         "    int i;\n"
                         "    f(i);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(int& i, int j, int k) {\n" // #12514
@@ -4403,7 +4530,7 @@ class TestUninitVar : public TestFixture {
                         "int main() {\n"
                         "    int i;\n"
                         "    return f(i, 1, 0);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:8:14] -> [test.cpp:4:12]: (warning) Uninitialized variable: i [uninitvar]\n", errout_str());
 
         valueFlowUninit("int f(int& i, int k) {\n"
@@ -4414,7 +4541,7 @@ class TestUninitVar : public TestFixture {
                         "int main() {\n"
                         "    int i;\n"
                         "    return f(i, 0);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:8:14] -> [test.cpp:4:12]: (warning) Uninitialized variable: i [uninitvar]\n", errout_str());
     }
 
@@ -4423,21 +4550,21 @@ class TestUninitVar : public TestFixture {
                        "void f(void) {\n"
                        "    struct AB ab;\n"
                        "    int a = ab.a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
                        "void f(void) {\n"
                        "    AB ab;\n"
                        "    int a = ab.a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
                        "void f(void) {\n"
                        "    struct AB ab;\n"
                        "    ab.a = ab.a + 1;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4463,7 +4590,7 @@ class TestUninitVar : public TestFixture {
                        "    struct AB ab;\n"
                        "    ab.a = 0;\n"
                        "    do_something(ab);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4477,7 +4604,7 @@ class TestUninitVar : public TestFixture {
                        "void f(void) {\n"
                        "    AB ab1;\n"
                        "    AB ab2 = { ab1.a, 0 };\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:20]: (error) Uninitialized struct member: ab1.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4516,7 +4643,7 @@ class TestUninitVar : public TestFixture {
                        "};\n"
                        "void test() {\n"
                        "    Element *element; element->f();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
@@ -4524,7 +4651,7 @@ class TestUninitVar : public TestFixture {
                        "};\n"
                        "void test() {\n"
                        "    Element *element; (*element).f();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
@@ -4532,7 +4659,7 @@ class TestUninitVar : public TestFixture {
                        "};\n"
                        "void test() {\n"
                        "    Element *element; element->v;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
@@ -4540,7 +4667,7 @@ class TestUninitVar : public TestFixture {
                        "};\n"
                        "void test() {\n"
                        "    Element *element; (*element).v;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
@@ -4548,7 +4675,7 @@ class TestUninitVar : public TestFixture {
                        "};\n"
                        "void test() {\n"
                        "    Element *element; element->f();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
@@ -4556,7 +4683,7 @@ class TestUninitVar : public TestFixture {
                        "};\n"
                        "void test() {\n"
                        "    Element *element; (*element).f();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
@@ -4564,7 +4691,7 @@ class TestUninitVar : public TestFixture {
                        "};\n"
                        "void test() {\n"
                        "    Element *element; element->v;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
@@ -4572,7 +4699,7 @@ class TestUninitVar : public TestFixture {
                        "};\n"
                        "void test() {\n"
                        "    Element *element; (*element).v;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"  // pass struct member by address
@@ -4588,7 +4715,7 @@ class TestUninitVar : public TestFixture {
                        "    Cstring res;\n"
                        "    if ( ! maybe() ) return;\n"  // <- fp goes away if this is removed
                        "    ( ((res).text = (void*)0), ((res).size = (res).alloc = 0) );\n"  // <- fp goes away if parentheses are removed
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -4676,7 +4803,7 @@ class TestUninitVar : public TestFixture {
                            "    struct AB ab;\n"
                            "    ab.set();\n"
                            "    x = ab;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("struct AB { int a; int get() const; };\n"
@@ -4684,7 +4811,7 @@ class TestUninitVar : public TestFixture {
                            "    struct AB ab;\n"
                            "    ab.get();\n"
                            "    x = ab;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:5:9]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
             checkUninitVar("struct AB { int a; void dostuff() {} };\n"
@@ -4692,7 +4819,7 @@ class TestUninitVar : public TestFixture {
                            "    struct AB ab;\n"
                            "    ab.dostuff();\n"
                            "    x = ab;\n"
-                           "}");
+                           "}\n");
             TODO_ASSERT_EQUALS("error", "", errout_str());
         }
 
@@ -4731,7 +4858,7 @@ class TestUninitVar : public TestFixture {
                        "    struct PIXEL p1;\n"
                        "    p1.color = 255;\n"
                        "    return p1.red;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4742,7 +4869,7 @@ class TestUninitVar : public TestFixture {
                        "      a = ab->a;\n"
                        "    }\n"
                        "  }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4752,7 +4879,7 @@ class TestUninitVar : public TestFixture {
                        "    ab = getab();\n"
                        "  }\n"
                        "  if (x == 0 && (ab != NULL || ab->a == 0)) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct A { int *x; };\n" // declarationId is 0 for "delete"
@@ -4760,7 +4887,7 @@ class TestUninitVar : public TestFixture {
                        "void bar(void) {\n"
                        "  struct A *delete = 0;\n"
                        "  foo( info, NULL );\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct ABC { int a; int b; int c; };\n"
@@ -4769,7 +4896,7 @@ class TestUninitVar : public TestFixture {
                        "  struct ABC abc;\n"
                        "  foo(123, &abc);\n"
                        "  return abc.b;\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized struct member: abc.a\n"
                            "[test.cpp:5]: (error) Uninitialized struct member: abc.b\n"
                            "[test.cpp:5]: (error) Uninitialized struct member: abc.c\n",
@@ -4780,13 +4907,13 @@ class TestUninitVar : public TestFixture {
                        "void foo() {\n"
                        "  struct ABC abc;\n"
                        "  dostuff((uint32_t *)&abc.a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(void) {\n"
                        "    struct tm t;\n"
                        "    t.tm_year = 123;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return
@@ -4850,20 +4977,20 @@ class TestUninitVar : public TestFixture {
                        "void f() {\n"
                        "    struct Fred fred;\n"
                        "    if (fred.a==1) {}\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:4:9]: (error) Uninitialized struct member: fred.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct S { int n; int m; };\n"
                        "void f(void) {\n"
                        " struct S s;\n"
                        " for (s.n = 0; s.n <= 10; s.n++) { }\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void test2() {\n"
                        "  struct { char type; } s_d;\n"
                        "  if (foo(&s_d.type)){}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // for
@@ -4871,21 +4998,21 @@ class TestUninitVar : public TestFixture {
                        "void f() {\n"
                        "    struct AB ab;\n"
                        "    while (x) { clear(ab); z = ab.a; }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct AB { int a; };\n"
                        "void f() {\n"
                        "    struct AB ab;\n"
                        "    while (x) { ab.a = ab.a + 1; }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:24]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; };\n"
                        "void f() {\n"
                        "    struct AB ab;\n"
                        "    while (x) { init(&ab); z = ab.a; }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // address of member
@@ -4893,7 +5020,7 @@ class TestUninitVar : public TestFixture {
                        "void f() {\n"
                        "    struct AB ab;\n"
                        "    int *p = ab.a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Reference
@@ -4903,7 +5030,7 @@ class TestUninitVar : public TestFixture {
                        "  int& x = a.x;\n"
                        "  x = 0;\n"
                        "  return a.x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // non static data-member initialization
@@ -4912,7 +5039,7 @@ class TestUninitVar : public TestFixture {
                        "    struct AB ab;\n"
                        "    int a = ab.a;\n"
                        "    int b = ab.b;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (error) Uninitialized struct member: ab.b [uninitStructMember]\n", errout_str());
 
         // STL class member
@@ -4923,7 +5050,7 @@ class TestUninitVar : public TestFixture {
                        "void foo() {\n"
                        "    A a;\n"
                        "    x = a.m;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown type (C++)
@@ -4934,7 +5061,7 @@ class TestUninitVar : public TestFixture {
                        "void foo() {\n"
                        "    A a;\n"
                        "    x = a.m;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown type (C)
@@ -4945,7 +5072,7 @@ class TestUninitVar : public TestFixture {
                        "void foo() {\n"
                        "    A a;\n"
                        "    x = a.m;\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:7:9]: (error) Uninitialized struct member: a.m [uninitStructMember]\n", errout_str());
 
         // Type with constructor
@@ -4957,7 +5084,7 @@ class TestUninitVar : public TestFixture {
                        "void foo() {\n"
                        "    A a;\n"
                        "    x = a.m;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #11002
@@ -4980,7 +5107,7 @@ class TestUninitVar : public TestFixture {
                        "  if (flag) {\n"
                        "    a = ab.a;\n"
                        "  }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct S { int x; };\n"
@@ -4995,7 +5122,7 @@ class TestUninitVar : public TestFixture {
                        "    S& r{ s };\n"
                        "    r.x = 0;\n"
                        "    return s;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct S { int i; };\n" // #12142
@@ -5025,7 +5152,7 @@ class TestUninitVar : public TestFixture {
                        "    while (a) {\n"
                        "        x = x + 1;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -5033,18 +5160,18 @@ class TestUninitVar : public TestFixture {
                        "    do {\n"
                        "        x = x + 1;\n"
                        "    } while (a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    for (int x = x; x < 10; x++) {}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: struct Element{Element*Next();};
         checkUninitVar("void f() {\n"
                        "    for (Element *ptr3 = ptr3->Next(); ptr3; ptr3 = ptr3->Next()) {}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:2:26]: (error) Uninitialized variable: ptr3 [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: int a;
@@ -5054,7 +5181,7 @@ class TestUninitVar : public TestFixture {
                        "        init(&x);\n"
                        "        x++;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -5063,7 +5190,7 @@ class TestUninitVar : public TestFixture {
                        "        if (b) x++;\n"
                        "        else x = 0;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -5071,13 +5198,13 @@ class TestUninitVar : public TestFixture {
                        "    for (int i = 0; i < 10; i += x) {\n"
                        "        x = y;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    for (int i = 0; i < 10; i += x) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:34]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f() {\n"
@@ -5085,14 +5212,14 @@ class TestUninitVar : public TestFixture {
                        "    for (i=0;i<9;++i)\n"
                        "        if (foo()) return i;\n"
                        "    return 9;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int i;\n"
                        "    do {} while (!getvalue(&i));\n"
                        "    i++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(void) {\n"
@@ -5104,7 +5231,7 @@ class TestUninitVar : public TestFixture {
                        "       }\n"
                        "   }\n"
                        "   return x;\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         checkUninitVar("int f(void) {\n"
@@ -5115,7 +5242,7 @@ class TestUninitVar : public TestFixture {
                        "       }\n"
                        "   }\n"
                        "   return 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: void do_something(int);
@@ -5125,7 +5252,7 @@ class TestUninitVar : public TestFixture {
                        "       int a = x+1;\n"
                        "       do_something(a);\n"
                        "   }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct AB {int a; int b;};\n"
@@ -5145,7 +5272,7 @@ class TestUninitVar : public TestFixture {
                        "        for (int i=0;i<10;i++)\n"
                        "            buffer[i] = 0;\n" // <- fp
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(){\n" // #4519 - fp: inline assembler in loop
@@ -5154,14 +5281,14 @@ class TestUninitVar : public TestFixture {
                        "        asm(\"foo\");\n"
                        "        if (x & 0xf1) { }\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void f(void) {\n"
                        "    struct ABC *abc;\n"
                        "    for (i = 0; i < 10; i++)\n"
                        "        x += sizeof(*abc);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(void) {\n" // #4879
@@ -5170,7 +5297,7 @@ class TestUninitVar : public TestFixture {
                        "        for (i = 0; i < 5; i++)\n"
                        "            a[i] = b[i];\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(void) {\n" // #5658
@@ -5179,7 +5306,7 @@ class TestUninitVar : public TestFixture {
                        "            foo = malloc(sizeof(*foo));\n"
                        "            foo->x = 0;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(void) {\n"
@@ -5187,28 +5314,28 @@ class TestUninitVar : public TestFixture {
                        "  while (x) {\n"
                        "    for (i=0,y=i;;){}\n"
                        "  }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "  char *p = (char *)malloc(256);\n"
                        "  while(*p && *p == '_')\n"
                        "    p++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Memory is allocated but not initialized: *p [uninitdata]\n", errout_str());
 
         // #6646 - init in for loop
         checkUninitVar("void f() {\n" // No FP
                        "  for (int i;;i++)\n"
                        "    dostuff(&i);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int a;
         checkUninitVar("void f() {\n" // No FN
                        "  for (int i;;i++)\n"
                        "    a=i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("namespace N {\n" // #7377
@@ -5246,7 +5373,7 @@ class TestUninitVar : public TestFixture {
                        "    void ff(void) { char *p; ::N1::Fred::f2(p); }\n"
                        "    void fg(void) { char *p; Foo::f1(p); }\n"
                        "    void fh(void) { char *p; Foo::f2(p); }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:39]: (error) Uninitialized variable: p [legacyUninitvar]\n"
                       "[test.cpp:8:45]: (error) Uninitialized variable: p [legacyUninitvar]\n"
                       "[test.cpp:13:33]: (error) Uninitialized variable: p [legacyUninitvar]\n"
@@ -5261,7 +5388,7 @@ class TestUninitVar : public TestFixture {
                        "void f(void) {\n"
                        "    char *p;\n"
                        "    fred.f1(p);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:8:13]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("class Fred {\n"
@@ -5284,7 +5411,7 @@ class TestUninitVar : public TestFixture {
                        "void f(void) {\n"
                        "    char *p;\n"
                        "    fred.wilma.barney.betty.f1(p);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:20:32]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
     }
 
@@ -5292,20 +5419,20 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("int f() {\n"
                        "    int *p = (int*)malloc(40);\n"
                        "    return *p;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Memory is allocated but not initialized: p [uninitdata]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int *p = (int*)malloc(40);\n"
                        "    int var = *p;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Memory is allocated but not initialized: p [uninitdata]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
                        "int f() {\n"
                        "    struct AB *ab = (AB*)malloc(sizeof(struct AB));\n"
                        "    return ab->a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Memory is allocated but not initialized: ab [uninitdata]\n"
                       "[test.cpp:4:12]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n",
                       errout_str());
@@ -5316,31 +5443,31 @@ class TestUninitVar : public TestFixture {
                        "  struct t_udf_file *newf;\n"
                        "  newf = malloc(sizeof(*newf));\n"
                        "  if (!newf) {};\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char *s = malloc(100);\n"
                        "    if (s != NULL) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char *p = malloc(100);\n"
                        "    p || assert_failed();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char *p = malloc(100);\n"
                        "    x = p;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int* f() {\n"
                        "    int *p = (int*)malloc(40);\n"
                        "    return p;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // function parameter (treat it as initialized until malloc is used)
@@ -5348,7 +5475,7 @@ class TestUninitVar : public TestFixture {
                        "    if (*p == 1) {}\n" // no error
                        "    p = (int*)malloc(256);\n"
                        "    return *p;\n" // error
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Memory is allocated but not initialized: p [uninitdata]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -5356,7 +5483,7 @@ class TestUninitVar : public TestFixture {
                        "    if (ab->a == 1) {}\n" // no error
                        "    ab = (AB*)malloc(sizeof(struct AB));\n"
                        "    return ab->a;\n" // error
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -5364,17 +5491,17 @@ class TestUninitVar : public TestFixture {
                        "void f() {\n"
                        "    struct AB *ab = (AB*)malloc(sizeof(struct AB));\n"
                        "    do_something(ab);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // analysis failed. varid 0.
         checkUninitVar("void *vlc_custom_create (vlc_object_t *parent, size_t length, const char *typename) {\n"
                        "  assert (length >= sizeof (vlc_object_t));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
-    void uninitvar_ternaryexpression() { // #4683
+    void uninitvar_ternaryexpression1() { // #4683
         checkUninitVar("struct B { int asd; };\n"
                        "int f() {\n"
                        "    int a=0;\n"
@@ -5384,7 +5511,15 @@ class TestUninitVar : public TestFixture {
                        "        b = p;\n"
                        "    }\n"
                        "    return a ? b->asd : 0;\n"
-                       "}");
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void uninitvar_ternaryexpression2() { // #14729
+        checkUninitVar("void f(bool b, int i) {\n"
+                       "    int *p = (int*) malloc(4);\n"
+                       "    int *q = b ? p : &i;\n"
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5394,19 +5529,19 @@ class TestUninitVar : public TestFixture {
                        "        expr->operate();\n"
                        "        expr->operate();\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int *item;\n"
                        "    for (item: itemList) {}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int buf[10];\n"
                        "    for (int &i: buf) { i = 0; }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5421,7 +5556,7 @@ class TestUninitVar : public TestFixture {
                        "  X::P_t P; "
                        "  P.p = 0; "
                        "  result.push_back(P); "
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5442,7 +5577,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("struct AB { int a; int b; };\n"
                        "void f() {\n"
                        "    struct AB *ab = (struct AB*)calloc(1, sizeof(*ab));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5461,7 +5596,7 @@ class TestUninitVar : public TestFixture {
                        "  using_planner_action = true;\n"
                        "}\n"
                        "if (using_planner_action) {}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5472,7 +5607,7 @@ class TestUninitVar : public TestFixture {
                             "  struct flex_array *group;\n"
                             "  struct cgroup_taskset tset = { };\n"
                             "  do { } while_each_thread(leader, tsk);\n"
-                            "}";
+                            "}\n";
         ASSERT_THROW_INTERNAL(checkUninitVar(code), SYNTAX);
     }
 
@@ -5482,7 +5617,7 @@ class TestUninitVar : public TestFixture {
                        "  char *dp;\n"
                        "  dp=(char *)d;\n"
                        "  init(dp);\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         // Unknown type
         TODO_ASSERT_EQUALS("", "[test.c:4:14]: (error) Uninitialized variable: d [legacyUninitvar]\n", errout_str());
     }
@@ -5494,11 +5629,12 @@ class TestUninitVar : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
+        const CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
 
         // Check code..
-        std::list<Check::FileInfo*> fileInfo;
-        Check& c = getCheck<CheckUninitVar>();
+        std::list<const Check::FileInfo*> fileInfo;
+        CheckUninitVar check;
+        Check& c = getCheck(check);
         fileInfo.push_back(c.getFileInfo(tokenizer, settings, ""));
         c.analyseWholeProgram(*ctu, fileInfo, settings, *this); // TODO: check result
         while (!fileInfo.empty()) {
@@ -5528,20 +5664,61 @@ class TestUninitVar : public TestFixture {
                         "    status s;\n"
                         "    s.x = 42;\n"
                         "    bar(&s);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:18:9] -> [test.cpp:12:13] -> [test.cpp:8:15]: (warning) Uninitialized variable: s->flag [uninitvar]\n", errout_str());
 
+        // A value narrowed by a nested condition (dimensions < 1 here) must survive the enclosing
+        // 'if' so a later correlated condition can be resolved: dimensions == 1 is then false, the
+        // function does not return, and the uninitialized read is reached.
+        valueFlowUninit("unsigned int g();\n"
+                        "void f(bool a) {\n"
+                        "    unsigned int dimensions = 0;\n"
+                        "    bool mightBeLarger;\n"
+                        "    if (a) {\n"
+                        "        dimensions = g();\n"
+                        "        if (dimensions >= 1)\n"
+                        "            mightBeLarger = false;\n"
+                        "    } else {\n"
+                        "        mightBeLarger = false;\n"
+                        "    }\n"
+                        "    if (dimensions == 1)\n"
+                        "        return;\n"
+                        "    if (!mightBeLarger) {}\n"
+                        "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:5:9] -> [test.cpp:7:24] -> [test.cpp:14:10]: (warning) Uninitialized variable: mightBeLarger [uninitvar]\n",
+            errout_str());
+
+        // Same shape, but the later condition (dimensions == 0) is implied by the narrowing, so the
+        // early return fires on the uninitialized path and there must be no warning.
+        valueFlowUninit("unsigned int g();\n"
+                        "void f(bool a) {\n"
+                        "    unsigned int dimensions = 0;\n"
+                        "    bool mightBeLarger;\n"
+                        "    if (a) {\n"
+                        "        dimensions = g();\n"
+                        "        if (dimensions >= 1)\n"
+                        "            mightBeLarger = false;\n"
+                        "    } else {\n"
+                        "        mightBeLarger = false;\n"
+                        "    }\n"
+                        "    if (dimensions == 0)\n"
+                        "        return;\n"
+                        "    if (!mightBeLarger) {}\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
         // Ticket #2207 - False negative
         valueFlowUninit("void foo() {\n"
                         "    int a;\n"
                         "    b = c - a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         valueFlowUninit("void foo() {\n"
                         "    int a;\n"
                         "    b = a - c;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         // Ticket #6455 - some compilers allow const variables to be uninitialized
@@ -5549,59 +5726,59 @@ class TestUninitVar : public TestFixture {
         valueFlowUninit("void foo() {\n"
                         "    const int a;\n"
                         "    b = c - a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
         // extracttests.enable
 
         valueFlowUninit("void foo() {\n"
                         "    int *p;\n"
                         "    realloc(p,10);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: p [uninitvar]\n", errout_str());
 
         valueFlowUninit("void foo() {\n" // #5240
                         "    char *p = malloc(100);\n"
                         "    char *tmp = realloc(p,1000);\n"
                         "    if (!tmp) free(p);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo() {\n"
                         "    int *p = NULL;\n"
                         "    realloc(p,10);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "  int x;\n"
                         "  switch (x) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("int f() {\n"
                         "  int x;\n"
                         "  init(x);\n"
                         "  return x;\n" // TODO: inconclusive ?
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #8172
                         "  char **x;\n"
                         "  if (2 < sizeof(*x)) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo() {\n" // #5259 - False negative
                         "    int a;\n"
                         "    int x[] = {a,2};\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         valueFlowUninit("void foo()\n"
                         "{\n"
                         "    int x;\n"
                         "    int *y = &x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo()\n"
@@ -5609,20 +5786,20 @@ class TestUninitVar : public TestFixture {
                         "    int *x;\n"
                         "    int *&y = x;\n"
                         "    y = nullptr;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo()\n"
                         "{\n"
                         "    int x = xyz::x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f()\n"
                         "{\n"
                         "    extern int a;\n"
                         "    a++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void foo()\n"
@@ -5630,27 +5807,27 @@ class TestUninitVar : public TestFixture {
                         "    int x, y;\n"
                         "    x = (y = 10);\n"
                         "    int z = y * 2;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void foo() {\n"
                         "    int x, y;\n"
                         "    x = ((y) = 10);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void foo()\n"
                         "{\n"
                         "    Foo p;\n"
                         "    p.abcd();\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void foo()\n"
                         "{\n"
                         "    Foo p;\n"
                         "    int x = p.abcd();\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // struct
@@ -5672,7 +5849,7 @@ class TestUninitVar : public TestFixture {
                         "    if (b)\n"
                         "        p = new S(io);\n"
                         "    p->Write();\n"
-                        "}");
+                        "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:10]: (warning) Uninitialized variable: p\n",
                            "[test.cpp:8:9] -> [test.cpp:10:5]: (warning) Uninitialized variable: p.rIo [uninitvar]\n",
                            errout_str());
@@ -5683,14 +5860,14 @@ class TestUninitVar : public TestFixture {
                             "{\n"
                             "    A ret;\n"
                             "    return ret;\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("", errout_str());
 
             // #3916 - avoid false positive
             valueFlowUninit("void f(float x) {\n"
                             "  union lf { long l; float f; } u_lf;\n"
                             "  float hx = (u_lf.f = (x), u_lf.l);\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -5698,7 +5875,7 @@ class TestUninitVar : public TestFixture {
                         "{\n"
                         "    int x[10];\n"
                         "    int *y = x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void a()\n"
@@ -5707,7 +5884,7 @@ class TestUninitVar : public TestFixture {
                         "    int *y = &x;\n"
                         "    *y = 0;\n"
                         "    x++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void a()\n"
@@ -5716,7 +5893,7 @@ class TestUninitVar : public TestFixture {
                         "    char *z = x;\n"
                         "    memset(z, 0, sizeof(x));\n"
                         "    memcpy(y, x, sizeof(x));\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Handling >> and <<
@@ -5725,28 +5902,28 @@ class TestUninitVar : public TestFixture {
                             "    int ret;\n"
                             "    std::cin >> ret;\n"
                             "    ret++;\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("", errout_str());
 
             valueFlowUninit("void f(int b) {\n"
                             "    int a;\n"
                             "    std::cin >> b >> a;\n"
                             "    return a;"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("", errout_str());
 
             valueFlowUninit("void foo() {\n"   // #3707
                             "    Node node;\n"
                             "    int x;\n"
                             "    node[\"abcd\"] >> x;\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("", errout_str());
 
             valueFlowUninit("int a(FArchive &arc) {\n"  // #3060 (initialization through operator<<)
                             "    int *p;\n"
                             "    arc << p;\n"  // <- TODO initialization?
                             "    return *p;\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: p [uninitvar]\n", errout_str());
 
             // #4320
@@ -5754,7 +5931,7 @@ class TestUninitVar : public TestFixture {
                             "    int a;\n"
                             "    a << 1;\n"
                             "    return a;\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
             // #9750
@@ -5766,7 +5943,7 @@ class TestUninitVar : public TestFixture {
                             "void test(std::istringstream& in) {\n"
                             "    S p;\n"
                             "    in >> p.one >> p.two;\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -5774,28 +5951,28 @@ class TestUninitVar : public TestFixture {
                         "void f() {\n"
                         "    S s;\n"
                         "    return s(1);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void a() {\n"   // asm
                         "    int x;\n"
                         "    asm();\n"
                         "    x++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void a()\n"
                         "{\n"
                         "    int x[10];\n"
                         "    struct xyz xyz1 = { .x = x };\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo()\n"
                         "{\n"
                         "   char *buf = malloc(100);\n"
                         "   struct ABC *abc = buf;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("class Fred {\n"
@@ -5806,7 +5983,7 @@ class TestUninitVar : public TestFixture {
                         "Fred::~Fred()\n"
                         "{\n"
                         "    fclose(f);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f()\n"
@@ -5814,7 +5991,7 @@ class TestUninitVar : public TestFixture {
                         "    int c;\n"
                         "    ab(sizeof(xyz), &c);\n"
                         "    if (c);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f()\n"
@@ -5822,7 +5999,7 @@ class TestUninitVar : public TestFixture {
                         "    int c;\n"
                         "    a = (f2(&c));\n"
                         "    c++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // goto/setjmp/longjmp..
@@ -5838,7 +6015,7 @@ class TestUninitVar : public TestFixture {
                         "\n"
                         "found:\n"
                         "    int a = b;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int foo()\n"
@@ -5850,14 +6027,14 @@ class TestUninitVar : public TestFixture {
                         "        return a;\n"
                         "    a = 1;\n"
                         "    longjmp(env, 1);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // range for..
         valueFlowUninit("void f() {\n"
                         "    X *item;\n"
                         "    for (item: itemList) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("X f() {\n"
@@ -5881,7 +6058,7 @@ class TestUninitVar : public TestFixture {
                         "  else\n"
                         "    retval = 2;\n"
                         "  return retval;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo(struct qb_list_head *list) {\n"
@@ -5893,7 +6070,7 @@ class TestUninitVar : public TestFixture {
         valueFlowUninit("void json_parse_nat_type_flags(json_t *root) {\n"
                         "    int index;\n"
                         "    json_array_foreach(root, index, value) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int foo()\n"
@@ -5902,7 +6079,7 @@ class TestUninitVar : public TestFixture {
                         "    goto exit;\n"
                         "    i++;\n"
                         "exit:\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int foo() {\n"
@@ -5912,7 +6089,7 @@ class TestUninitVar : public TestFixture {
                         "    x = a;\n"
                         "    y = 1;\n"
                         "    goto again;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4040 - False positive
@@ -5928,7 +6105,7 @@ class TestUninitVar : public TestFixture {
                         "        iter = x;\n"
                         "    }\n"
                         "    return 1 + iter;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // C++11 style initialization
@@ -5936,7 +6113,7 @@ class TestUninitVar : public TestFixture {
                         "    int i = 0;\n"
                         "    int j{ i };\n"
                         "    return j;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #5646
@@ -5944,7 +6121,7 @@ class TestUninitVar : public TestFixture {
                         "  float source[2] = {3.1, 3.1};\n"
                         "  float (*sink)[2] = &source;\n"
                         "  return (*sink)[0];\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #8755
@@ -5956,14 +6133,14 @@ class TestUninitVar : public TestFixture {
                         "        a = 1;\n"
                         "    if (b == 'x') {}\n"
                         "    if (a) {}\n"
-                        "}");
+                        "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:8]: (error) Uninitialized variable: a\n", "", errout_str());
 
         valueFlowUninit("void h() {\n"
                         "  int i;\n"
                         "  int* v = &i;\n"
                         "  sscanf(\"0\", \"%d\", v);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void test(int p) {\n"
@@ -5972,7 +6149,7 @@ class TestUninitVar : public TestFixture {
                         "        f = 0;\n"
                         "    if (p > 1)\n"
                         "        f += 1;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("unsigned char get();\n"
@@ -6068,14 +6245,14 @@ class TestUninitVar : public TestFixture {
                         "int main() {\n"
                         "    int me;\n"
                         "     dowork(me);\n" // <- me is uninitialized
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:7:13]: (error) Uninitialized variable: me [uninitvar]\n", errout_str());
 
         valueFlowUninit("int foo() {\n"
                         "  int x;\n"
                         "  int a = x;\n" // <- x is uninitialized
                         "  return a;\n" // <- a has been initialized
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         // #10468
@@ -6440,7 +6617,7 @@ class TestUninitVar : public TestFixture {
                         "    int a[1], b[1];\n"
                         "    while (a[0] = g()) {}\n"
                         "    if ((b[0] = g()) == 0) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(const char *x, char *y);\n" // #4527
@@ -6448,7 +6625,7 @@ class TestUninitVar : public TestFixture {
                         "    char a[1000];\n"
                         "    f(a, b);\n"
                         "    printf(\"%s\", a);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         valueFlowUninit("void usage(const char *);\n" // #10330
@@ -6468,7 +6645,7 @@ class TestUninitVar : public TestFixture {
                         "    if (user)\n"
                         "        pwd = getpwnam(user);\n"
                         "    if (pwd == NULL) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:15:9] -> [test.cpp:17:9]: (warning) Uninitialized variable: pwd [uninitvar]\n", errout_str());
 
         valueFlowUninit("size_t Read(unsigned char* buffer, size_t len);\n" // #11540
@@ -6631,6 +6808,44 @@ class TestUninitVar : public TestFixture {
                         "    return ret;\n"
                         "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("int f() {\n" // #12944
+                        "    int i;\n"
+                        "    auto x = [&]() { return i; };\n"
+                        "    i = 5;\n"
+                        "    return x();\n"
+                        "}\n"
+                        "int g() {\n"
+                        "    int i;\n"
+                        "    {\n"
+                        "        auto x = [&]() { return i; };\n"
+                        "        i = 5;\n"
+                        "        return x();\n"
+                        "    }\n"
+                        "}\n"
+                        "int h() {\n"
+                        "    int j;\n"
+                        "    return [&]() { return j; }();\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:17:27]: (error) Uninitialized variable: j [uninitvar]\n", errout_str());
+
+        valueFlowUninit("int f() {\n" // #14582
+                        "    int a[1];\n"
+                        "    static_cast<int*>(a)[0] = 0;\n"
+                        "    return a[0];\n"
+                        "}\n"
+                        "int g() {\n"
+                        "    int a[1];\n"
+                        "    ((int*)a)[0] = 0;\n"
+                        "    return a[0];\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("std::vector<int> f() {\n" // #15077
+                        "    const std::vector<int> a[1];\n"
+                        "    return a[0];\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void valueFlowUninitBreak() { // Do not show duplicate warnings about the same uninitialized value
@@ -6642,7 +6857,7 @@ class TestUninitVar : public TestFixture {
                         "    wcsstruct *x;\n"
                         "    memcpy(wcsin, x, sizeof(wcsstruct));\n" // <- warning
                         "    x->wcsprm = NULL;\n" // <- no warning
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:7:19]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct wcsstruct {\n"
@@ -6653,7 +6868,7 @@ class TestUninitVar : public TestFixture {
                         "    wcsstruct *x;\n"
                         "    sizeof(x);\n"
                         "    x->wcsprm = NULL;\n" // <- Warn
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct wcsstruct {\n"
@@ -6666,7 +6881,7 @@ class TestUninitVar : public TestFixture {
                         "    wcsstruct *x;\n"
                         "    x->wcsprm = NULL;\n" // <- warn here
                         "    init_wcs(x);\n" // <- no warning
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:9:5]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
     }
 
@@ -6681,7 +6896,7 @@ class TestUninitVar : public TestFixture {
                         "void f(void) {\n"
                         "    someType_t gVar;\n"
                         "    bar(&gVar);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:9:9]: (error) Uninitialized variable: &gVar [uninitvar]\n", errout_str());
 
         valueFlowUninit("typedef struct\n"
@@ -6691,7 +6906,7 @@ class TestUninitVar : public TestFixture {
                         "void f(void) {\n"
                         "        someType_t gVar;\n"
                         "        if(gVar.flags[1] == 42){}\n"
-                        "}");
+                        "}\n");
         // TODO : find bugs for member arrays
         TODO_ASSERT_EQUALS("[test.cpp:7]: (error) Uninitialized variable: gVar.flags\n", "", errout_str());
 
@@ -6701,7 +6916,7 @@ class TestUninitVar : public TestFixture {
                         "    char control[123];\n"
                         "  } u;\n"
                         "  char *x = u.control;\n" // <- no error
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct pc_data {\n"
@@ -6712,7 +6927,7 @@ class TestUninitVar : public TestFixture {
                         "void f() {\n"
                         "    struct pc_data *pcdata;\n"
                         "    if ( *pcdata->wampiryzm.strefa == '\\0' ) { }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:8:11]: (error) Uninitialized variable: pcdata [uninitvar]\n", errout_str());
 
         // # 9293
@@ -6725,7 +6940,7 @@ class TestUninitVar : public TestFixture {
                         "    struct S s1;\n"
                         "    int * x = &s1.x;\n"
                         "    struct S s2 = {*x, 0};\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:9:20]: (error) Uninitialized variable: *x [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct S {\n"
@@ -6738,7 +6953,7 @@ class TestUninitVar : public TestFixture {
                         "    struct S s2;\n"
                         "    int * x = &s1.x;\n"
                         "    s2.x = *x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:10:12]: (error) Uninitialized variable: *x [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f(bool * x) {\n"
@@ -6747,7 +6962,7 @@ class TestUninitVar : public TestFixture {
                         "void g() {\n"
                         "    bool b;\n"
                         "    f(&b);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(bool * x) {\n"
@@ -6757,7 +6972,7 @@ class TestUninitVar : public TestFixture {
                         "void g() {\n"
                         "    bool x;\n"
                         "    f(&x);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -6765,7 +6980,7 @@ class TestUninitVar : public TestFixture {
                         "    bool * x = &b;\n"
                         "    if (x != nullptr)\n"
                         "        x = 1;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct A { bool b; };"
@@ -6775,14 +6990,14 @@ class TestUninitVar : public TestFixture {
                         "void g() {\n"
                         "    A b;\n"
                         "    f(&b);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("std::string f() {\n"
                         "    std::ostringstream ostr;\n"
                         "    ostr << \"\";\n"
                         "    return ostr.str();\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
         // #9281
         valueFlowUninit("struct s {\n"
@@ -6797,7 +7012,7 @@ class TestUninitVar : public TestFixture {
                         "void a() {\n"
                         "    struct s s1;\n"
                         "    b(&s1);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // # 9290
@@ -6808,7 +7023,7 @@ class TestUninitVar : public TestFixture {
                         "    A * c;\n"
                         "    c->x = 42;\n"
                         "    return c->x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Uninitialized variable: c [uninitvar]\n",
                       errout_str());
 
@@ -6819,7 +7034,7 @@ class TestUninitVar : public TestFixture {
                         "    A c;\n"
                         "    c.x = 42;\n"
                         "    return c.x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct A {\n"
@@ -6832,7 +7047,7 @@ class TestUninitVar : public TestFixture {
                         "double b() {\n"
                         "    A c;\n"
                         "    return d(&c);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // # 9302
@@ -6845,7 +7060,7 @@ class TestUninitVar : public TestFixture {
                         "    vz.typ      = 42;\n"
                         "    if (pvz->typ == 0)\n"
                         "        return;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // # 9305
@@ -6861,7 +7076,7 @@ class TestUninitVar : public TestFixture {
                         "    set( pb);\n"
                         "    if (pb->x)\n"
                         "        return;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // # 9348
@@ -6872,7 +7087,7 @@ class TestUninitVar : public TestFixture {
                         "void g() {\n"
                         "  int i;\n"
                         "  f(&i);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // # 9631
@@ -6883,7 +7098,7 @@ class TestUninitVar : public TestFixture {
                         "  size_t bytesCopied;\n"
                         "  bool copied_all = true;\n"
                         "  g(&copied_all, 5, 6, &bytesCopied);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:7:24] -> [test.cpp:2:18]: (warning) Uninitialized variable: *buflen [uninitvar]\n", errout_str());
 
         // # 9953
@@ -6912,7 +7127,7 @@ class TestUninitVar : public TestFixture {
                         "    struct AB ab;\n"
                         "    ab.a = 0;\n"
                         "    do_something(ab);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -6921,7 +7136,7 @@ class TestUninitVar : public TestFixture {
                         "    struct AB ab;\n"
                         "    ab.a = 0;\n"
                         "    do_something(ab);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:6:18] -> [test.cpp:2:49]: (warning) Uninitialized variable: ab.b [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -6936,7 +7151,7 @@ class TestUninitVar : public TestFixture {
                         "void f(void) {\n"
                         "    AB ab1;\n"
                         "    AB ab2 = { ab1.a, 0 };\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:4:20]: (error) Uninitialized variable: ab1.a [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -6979,7 +7194,7 @@ class TestUninitVar : public TestFixture {
                         "};\n"
                         "void test() {\n"
                         "    Element *element; element->f();\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
@@ -6987,7 +7202,7 @@ class TestUninitVar : public TestFixture {
                         "};\n"
                         "void test() {\n"
                         "    Element *element; (*element).f();\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
@@ -6995,7 +7210,7 @@ class TestUninitVar : public TestFixture {
                         "};\n"
                         "void test() {\n"
                         "    Element *element; element->v;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
@@ -7003,7 +7218,7 @@ class TestUninitVar : public TestFixture {
                         "};\n"
                         "void test() {\n"
                         "    Element *element; (*element).v;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
@@ -7011,7 +7226,7 @@ class TestUninitVar : public TestFixture {
                         "};\n"
                         "void test() {\n"
                         "    Element *element; element->f();\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
@@ -7019,7 +7234,7 @@ class TestUninitVar : public TestFixture {
                         "};\n"
                         "void test() {\n"
                         "    Element *element; (*element).f();\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
@@ -7027,7 +7242,7 @@ class TestUninitVar : public TestFixture {
                         "};\n"
                         "void test() {\n"
                         "    Element *element; element->v;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
@@ -7035,7 +7250,7 @@ class TestUninitVar : public TestFixture {
                         "};\n"
                         "void test() {\n"
                         "    Element *element; (*element).v;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n" // pass struct member by address
@@ -7053,7 +7268,7 @@ class TestUninitVar : public TestFixture {
             "    Cstring res;\n"
             "    if ( ! maybe() ) return;\n"                                     // <- fp goes away if this is removed
             "    ( ((res).text = (void*)0), ((res).size = (res).alloc = 0) );\n" // <- fp goes away if parentheses are removed
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -7118,7 +7333,7 @@ class TestUninitVar : public TestFixture {
                             "    struct AB ab;\n"
                             "    ab.set();\n"
                             "    x = ab;\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("", errout_str());
 
             valueFlowUninit("struct AB { int a; int get() const; };\n"
@@ -7126,7 +7341,7 @@ class TestUninitVar : public TestFixture {
                             "    struct AB ab;\n"
                             "    ab.get();\n"
                             "    x = ab;\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: ab [uninitvar]\n", errout_str());
 
             valueFlowUninit("struct AB { int a; void dostuff() {} };\n"
@@ -7134,7 +7349,7 @@ class TestUninitVar : public TestFixture {
                             "    struct AB ab;\n"
                             "    ab.dostuff();\n"
                             "    x = ab;\n"
-                            "}");
+                            "}\n");
             TODO_ASSERT_EQUALS("error", "", errout_str());
         }
 
@@ -7175,7 +7390,7 @@ class TestUninitVar : public TestFixture {
                         "    struct PIXEL p1;\n"
                         "    p1.color = 255;\n"
                         "    return p1.red;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -7186,7 +7401,7 @@ class TestUninitVar : public TestFixture {
                         "      a = ab->a;\n"
                         "    }\n"
                         "  }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -7196,7 +7411,7 @@ class TestUninitVar : public TestFixture {
                         "    ab = getab();\n"
                         "  }\n"
                         "  if (x == 0 && (ab != NULL || ab->a == 0)) { }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct A { int *x; };\n" // declarationId is 0 for "delete"
@@ -7204,7 +7419,7 @@ class TestUninitVar : public TestFixture {
                         "void bar(void) {\n"
                         "  struct A *delete = 0;\n"
                         "  foo( info, NULL );\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct ABC { int a; int b; int c; };\n"
@@ -7213,20 +7428,20 @@ class TestUninitVar : public TestFixture {
                         "  struct ABC abc;\n"
                         "  foo(123, &abc);\n"
                         "  return abc.b;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: &abc [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct ABC { int a; int b; int c; };\n"
                         "void foo() {\n"
                         "  struct ABC abc;\n"
                         "  dostuff((uint32_t *)&abc.a);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(void) {\n"
                         "    struct tm t;\n"
                         "    t.tm_year = 123;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return
@@ -7294,7 +7509,7 @@ class TestUninitVar : public TestFixture {
                         "void f() {\n"
                         "    struct Fred fred;\n"
                         "    if (fred.a==1) {}\n"
-                        "}",
+                        "}\n",
                         false);
         ASSERT_EQUALS("[test.c:4:14]: (error) Uninitialized variable: fred.a [uninitvar]\n", errout_str());
 
@@ -7302,14 +7517,14 @@ class TestUninitVar : public TestFixture {
                         "void f(void) {\n"
                         " struct S s;\n"
                         " for (s.n = 0; s.n <= 10; s.n++) { }\n"
-                        "}",
+                        "}\n",
                         false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void test2() {\n"
                         "  struct { char type; } s_d;\n"
                         "  if (foo(&s_d.type)){}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // for
@@ -7317,21 +7532,21 @@ class TestUninitVar : public TestFixture {
                         "void f() {\n"
                         "    struct AB ab;\n"
                         "    while (x) { clear(ab); z = ab.a; }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; };\n"
                         "void f() {\n"
                         "    struct AB ab;\n"
                         "    while (x) { ab.a = ab.a + 1; }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:4:27]: (error) Uninitialized variable: ab.a [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct AB { int a; };\n"
                         "void f() {\n"
                         "    struct AB ab;\n"
                         "    while (x) { init(&ab); z = ab.a; }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // address of member
@@ -7339,7 +7554,7 @@ class TestUninitVar : public TestFixture {
                         "void f() {\n"
                         "    struct AB ab;\n"
                         "    int *p = ab.a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Reference
@@ -7349,7 +7564,7 @@ class TestUninitVar : public TestFixture {
                         "  int& x = a.x;\n"
                         "  x = 0;\n"
                         "  return a.x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // non static data-member initialization
@@ -7358,7 +7573,7 @@ class TestUninitVar : public TestFixture {
                         "    struct AB ab;\n"
                         "    int a = ab.a;\n"
                         "    int b = ab.b;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:16]: (error) Uninitialized variable: ab.b [uninitvar]\n", errout_str());
 
         // STL class member
@@ -7369,7 +7584,7 @@ class TestUninitVar : public TestFixture {
                         "void foo() {\n"
                         "    A a;\n"
                         "    x = a.m;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown type (C++)
@@ -7380,7 +7595,7 @@ class TestUninitVar : public TestFixture {
                         "void foo() {\n"
                         "    A a;\n"
                         "    x = a.m;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown type (C)
@@ -7391,7 +7606,7 @@ class TestUninitVar : public TestFixture {
                         "void foo() {\n"
                         "    A a;\n"
                         "    x = a.m;\n"
-                        "}",
+                        "}\n",
                         false);
         ASSERT_EQUALS("[test.c:7:11]: (error) Uninitialized variable: a.m [uninitvar]\n", errout_str());
 
@@ -7404,7 +7619,7 @@ class TestUninitVar : public TestFixture {
                         "void foo() {\n"
                         "    A a;\n"
                         "    x = a.m;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct S {\n"
@@ -7434,7 +7649,7 @@ class TestUninitVar : public TestFixture {
                         "   S s;\n"
                         "   s.t[0] = 1;\n"
                         "   f(&s);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct X {\n"
@@ -7699,6 +7914,21 @@ class TestUninitVar : public TestFixture {
                         "  return (&s)->y;\n"
                         "}\n");
         ASSERT_EQUALS("[test.cpp:5:16]: (error) Uninitialized variable: s.y [uninitvar]\n", errout_str());
+
+        valueFlowUninit("struct S { int* p; };\n" // #14640
+                        "void f() {\n"
+                        "    int x;\n"
+                        "    S s{ &x };\n"
+                        "    *s.p = 0;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("void f() {\n"
+                        "    int x;\n"
+                        "    std::vector<int*> v{ &x };\n"
+                        "    *v[0] = 0;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void valueFlowUninitForLoop()
@@ -7729,7 +7959,7 @@ class TestUninitVar : public TestFixture {
                         "void f() {\n"
                         "    C *c;\n"
                         "    if (c->x() == 4) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:6:9]: (error) Uninitialized variable: c [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct A { \n"
@@ -7751,7 +7981,7 @@ class TestUninitVar : public TestFixture {
                         "int main() {\n"
                         "  Foo* foo;\n"
                         "  foo->bar = 3;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:7:3]: (error) Uninitialized variable: foo [uninitvar]\n", errout_str());
     }
 
@@ -7761,7 +7991,7 @@ class TestUninitVar : public TestFixture {
                        "  char *b;\n"
                        "  extern int f(struct a *);\n"
                        "  return f(&(struct a){.b = 0});\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct a { int b, c; };\n"
@@ -7769,41 +7999,57 @@ class TestUninitVar : public TestFixture {
                        "  char *c;\n"
                        "  extern int f(struct a *);\n"
                        "  return f(&(struct a){.b = 0, .c = 0});\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
+    void uninitvarMemberPointer() {
+        checkUninitVar("void f()\n"
+                       "{\n"
+                       "  struct S {};\n"
+                       "  int S::* mp;\n"
+                       "  if (mp) {}\n"
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:5:7]: (error) Uninitialized variable: mp [legacyUninitvar]\n", errout_str());
+    }
+
     void isVariableUsageDeref() {
         // *p
         checkUninitVar("void f() {\n"
                        "    char a[10];\n"
                        "    char c = *a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: extern const int SIZE;
         checkUninitVar("void f() {\n"
                        "    char a[SIZE+10];\n"
                        "    char c = *a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char a[10];\n"
                        "    *a += 10;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "  int a[10][10];\n"
                        "  dostuff(*a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    void (*fp[1]) (void) = {function1};\n"
                        "    (*fp[0])();\n"
-                       "}");
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkUninitVar("void f() {\n" // #14708
+                       "    int a[1], b[1];\n"
+                       "    int* c[2]{ a, b };\n"
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7813,32 +8059,32 @@ class TestUninitVar : public TestFixture {
         valueFlowUninit("void f() {\n"
                         "    char a[10];\n"
                         "    char c = *a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Uninitialized variable: *a [uninitvar]\n", errout_str());
 
         // extracttests.start: extern const int SIZE;
         valueFlowUninit("void f() {\n"
                         "    char a[SIZE+10];\n"
                         "    char c = *a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Uninitialized variable: *a [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    char a[10];\n"
                         "    *a += 10;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: *a [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "  int a[10][10];\n"
                         "  dostuff(*a);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    void (*fp[1]) (void) = {function1};\n"
                         "    (*fp[0])();\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("template <typename T, int value> T Get() {return value;}\n"
@@ -7876,7 +8122,7 @@ class TestUninitVar : public TestFixture {
                         "    foo a;\n"
                         "    ((&a)->bar) =  reinterpret_cast<char*>(*p);\n"
                         "    if ((&a)->bar) ;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct foo{char *bar;};\n"
@@ -7884,7 +8130,7 @@ class TestUninitVar : public TestFixture {
                         "    foo a;\n"
                         "    ((&(a))->bar) =  reinterpret_cast<char*>(*p);\n"
                         "    if ((&a)->bar) ;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct A {\n" // #10200
@@ -7986,15 +8232,25 @@ class TestUninitVar : public TestFixture {
             "int main() {\n"
             "  int x;\n"
             "  f(&x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:6:4] -> [test.cpp:2:10]: (error) Using argument p that points at uninitialized variable x [ctuuninitvar]\n", errout_str());
 
+        ctu("void f(int *p) {\n"
+            "    a += *p;\n"
+            "}\n"
+            "int main() {\n"
+            "  int x;\n"
+            "  f(&x);\n"
+            "}\n");
+        ASSERT_EQUALS("[test.cpp:6:4] -> [test.cpp:2:11]: (error) Using argument p that points at uninitialized variable x [ctuuninitvar]\n", errout_str());
+
+
         ctu("void use(int *p) { a = *p + 3; }\n"
             "void call(int x, int *p) { x++; use(p); }\n"
             "int main() {\n"
             "  int x;\n"
             "  call(4,&x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:5:7] -> [test.cpp:2:33] -> [test.cpp:1:25]: (error) Using argument p that points at uninitialized variable x [ctuuninitvar]\n", errout_str());
 
         ctu("void dostuff(int *x, int *y) {\n"
@@ -8006,7 +8262,7 @@ class TestUninitVar : public TestFixture {
             "void f() {\n"
             "  int x;\n"
             "  dostuff(a, &x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         ctu("void dostuff(int *x, int *y) {\n"
@@ -8018,7 +8274,7 @@ class TestUninitVar : public TestFixture {
             "void f() {\n"
             "  int x;\n"
             "  dostuff(a, &x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         ctu("void f(int *p) {\n"
@@ -8027,7 +8283,7 @@ class TestUninitVar : public TestFixture {
             "int main() {\n"
             "  int x;\n"
             "  f(&x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         ctu("void f(int *v) {\n"
@@ -8036,7 +8292,7 @@ class TestUninitVar : public TestFixture {
             "int main() {\n"
             "  int x;\n"
             "  f(&x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         ctu("void increment(int& i) { ++i; }\n" // #6475
diff --git a/test/testunusedfunctions.cpp b/test/testunusedfunctions.cpp
index cf027e01d79..e38cfc25df0 100644
--- a/test/testunusedfunctions.cpp
+++ b/test/testunusedfunctions.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -86,6 +86,7 @@ class TestUnusedFunctions : public TestFixture {
         TEST_CASE(attributeUnused);
         TEST_CASE(attributeMaybeUnused);
         TEST_CASE(staticFunction);
+        TEST_CASE(unnamedArg);
     }
 
     struct CheckOptions
@@ -110,8 +111,8 @@ class TestUnusedFunctions : public TestFixture {
 
         // Check for unused functions..
         CheckUnusedFunctions checkUnusedFunctions;
-        checkUnusedFunctions.parseTokens(tokenizer, settings1);
-        (checkUnusedFunctions.check)(settings1, *this); // TODO: check result
+        checkUnusedFunctions.parseTokens(tokenizer, settings1.library);
+        (checkUnusedFunctions.check)(settings1.library, *this); // TODO: check result
     }
 
     // TODO: get rid of this
@@ -122,8 +123,8 @@ class TestUnusedFunctions : public TestFixture {
 
         // Check for unused functions..
         CheckUnusedFunctions checkUnusedFunctions;
-        checkUnusedFunctions.parseTokens(tokenizer, settings);
-        (checkUnusedFunctions.check)(settings, *this); // TODO: check result
+        checkUnusedFunctions.parseTokens(tokenizer, settings.library);
+        (checkUnusedFunctions.check)(settings.library, *this); // TODO: check result
     }
 
     void incondition() {
@@ -131,7 +132,7 @@ class TestUnusedFunctions : public TestFixture {
               "{\n"
               "    if (f1())\n"
               "    { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:5]: (style) The function 'f1' is never used. [unusedFunction]\n", errout_str());
     }
 
@@ -139,7 +140,7 @@ class TestUnusedFunctions : public TestFixture {
         check("int f1()\n"
               "{\n"
               "    return f1();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:5]: (style) The function 'f1' is never used. [unusedFunction]\n", errout_str());
     }
 
@@ -147,7 +148,7 @@ class TestUnusedFunctions : public TestFixture {
         check("char * foo()\n"
               "{\n"
               "    return foo();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:8]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
     }
 
@@ -165,7 +166,7 @@ class TestUnusedFunctions : public TestFixture {
               "}\n"
               "int main() {\n"
               "  indirectHello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -173,7 +174,7 @@ class TestUnusedFunctions : public TestFixture {
         check("void f1()\n"
               "{\n"
               "    void (*f)() = cond ? f1 : NULL;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'f1' is never used. [unusedFunction]\n", errout_str());
     }
 
@@ -186,7 +187,7 @@ class TestUnusedFunctions : public TestFixture {
               "\n"
               "void C::callback() {}\n" // <- not unused
               "\n"
-              "void C::start() { ev.set<C, &C::callback>(this); }");
+              "void C::start() { ev.set<C, &C::callback>(this); }\n");
         ASSERT_EQUALS("[test.cpp:9:9]: (style) The function 'start' is never used. [unusedFunction]\n", errout_str());
     }
 
@@ -195,7 +196,7 @@ class TestUnusedFunctions : public TestFixture {
               "{\n"
               "    if (cond) ;\n"
               "    else f1();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'f1' is never used. [unusedFunction]\n", errout_str());
     }
 
@@ -204,14 +205,14 @@ class TestUnusedFunctions : public TestFixture {
               "int main() {\n"
               "    f(&foo);\n"
               "    return 0\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() { }\n"
               "int main() {\n"
               "    f(&::foo);\n"
               "    return 0\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace abc {\n"
@@ -220,7 +221,7 @@ class TestUnusedFunctions : public TestFixture {
               "int main() {\n"
               "    f(&abc::foo);\n"
               "    return 0\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace abc {\n"
@@ -229,7 +230,7 @@ class TestUnusedFunctions : public TestFixture {
               "int main() {\n"
               "    f = &abc::foo;\n"
               "    return 0\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace abc {\n"
@@ -238,7 +239,7 @@ class TestUnusedFunctions : public TestFixture {
               "int main() {\n"
               "    f = &::abc::foo;\n"
               "    return 0\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace abc {\n"  // #3875
@@ -247,7 +248,7 @@ class TestUnusedFunctions : public TestFixture {
               "int main() {\n"
               "    f(abc::foo);\n"
               "    return 0\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template <class T> T f()\n" // #13117
@@ -269,7 +270,7 @@ class TestUnusedFunctions : public TestFixture {
               "{\n"
               "    foo<int>();\n"
               "    return 0\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -281,7 +282,7 @@ class TestUnusedFunctions : public TestFixture {
               "    f();\n"
               "}\n"
               "\n"
-              "void h() { g<int>(); h(); }");
+              "void h() { g<int>(); h(); }\n");
         ASSERT_EQUALS("[test.cpp:8:6]: (style) The function 'h' is never used. [unusedFunction]\n", errout_str());
     }
 
@@ -292,7 +293,7 @@ class TestUnusedFunctions : public TestFixture {
               "private:\n"
               "    template<typename T> void foo( T t ) const;\n"
               "};\n"
-              "template<typename T> void X::foo( T t ) const { }");
+              "template<typename T> void X::foo( T t ) const { }\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) The function 'bar' is never used. [unusedFunction]\n", errout_str());
     }
 
@@ -312,7 +313,7 @@ class TestUnusedFunctions : public TestFixture {
               "        call<int>(1, 2, 3);\n"
               "        test();\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:11:10]: (style) The function 'test' is never used. [unusedFunction]\n", errout_str());
     }
 
@@ -324,7 +325,7 @@ class TestUnusedFunctions : public TestFixture {
               "template <Filter fun>\n"
               "void g() { fun(); }\n"
               "\n"
-              "int main() { g<f>(); return 0;}");
+              "int main() { g<f>(); return 0;}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -402,45 +403,45 @@ class TestUnusedFunctions : public TestFixture {
     }
 
     void throwIsNotAFunction() {
-        check("struct A {void f() const throw () {}}; int main() {A a; a.f();}");
+        check("struct A {void f() const throw () {}}; int main() {A a; a.f();}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void unusedError() {
         check("void foo() {}\n"
-              "int main()");
+              "int main()\n");
         ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
 
         check("void foo() const {}\n"
-              "int main()");
+              "int main()\n");
         ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
 
         check("void foo() const throw() {}\n"
-              "int main()");
+              "int main()\n");
         ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
 
         check("void foo() throw() {}\n"
-              "int main()");
+              "int main()\n");
         ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
     }
 
     void unusedMain() {
-        check("int main() { }");
+        check("int main() { }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void initializationIsNotAFunction() {
         check("struct B: N::A {\n"
               "  B(): N::A() {};\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void operator1() {
-        check("struct Foo { void operator()(int a) {} };");
+        check("struct Foo { void operator()(int a) {} };\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("struct Foo { operator std::string(int a) {} };");
+        check("struct Foo { operator std::string(int a) {} };\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -458,56 +459,56 @@ class TestUnusedFunctions : public TestFixture {
     }
 
     void returnRef() {
-        check("int& foo() {return x;}");
+        check("int& foo() {return x;}\n");
         ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
     }
 
     void attribute() { // #3471 - FP __attribute__((constructor))
-        check("void __attribute__((constructor)) f() {}");
+        check("void __attribute__((constructor)) f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void __attribute__((constructor(1000))) f() {}");
+        check("void __attribute__((constructor(1000))) f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void __attribute__((destructor)) f() {}");
+        check("void __attribute__((destructor)) f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void __attribute__((destructor(1000))) f() {}");
+        check("void __attribute__((destructor(1000))) f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // alternate syntax
-        check("__attribute__((constructor)) void f() {}");
+        check("__attribute__((constructor)) void f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("__attribute__((constructor(1000))) void f() {}");
+        check("__attribute__((constructor(1000))) void f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("__attribute__((destructor)) void f() {}");
+        check("__attribute__((destructor)) void f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("__attribute__((destructor(1000))) void f() {}");
+        check("__attribute__((destructor(1000))) void f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // alternate syntax
         check("void f() __attribute__((constructor));\n"
-              "void f() { }");
+              "void f() { }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() __attribute__((constructor(1000)));\n"
-              "void f() { }");
+              "void f() { }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() __attribute__((destructor));\n"
-              "void f() { }");
+              "void f() { }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() __attribute__((destructor(1000)));\n"
-              "void f() { }");
+              "void f() { }\n");
         ASSERT_EQUALS("", errout_str());
 
         // Don't crash on wrong syntax
         check("int x __attribute__((constructor));\n"
-              "int y __attribute__((destructor));");
+              "int y __attribute__((destructor));\n");
 
         // #10661
         check("extern \"C\" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataSize) { return 0; }\n");
@@ -524,7 +525,7 @@ class TestUnusedFunctions : public TestFixture {
               "    A() : m_i(foo())\n"
               "    {}\n"
               "int m_i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8580
@@ -535,7 +536,7 @@ class TestUnusedFunctions : public TestFixture {
               "public:\n"
               "  A() : a(bar([] { return foo(); })) {}\n"
               "  const int a;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -549,7 +550,7 @@ class TestUnusedFunctions : public TestFixture {
               "    void (Foo::*ptr)();\n"
               "    ptr = (argc > 1 && !strcmp(argv[1], \"F2\")) ? &Foo::F2 : &Foo::F1;\n"
               "    (foo.*ptr)();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -593,7 +594,7 @@ class TestUnusedFunctions : public TestFixture {
     void multipleFiles() {
         CheckUnusedFunctions c;
 
-        const char code[] = "static void f() { }";
+        const char code[] = "static void f() { }\n";
 
         for (int i = 1; i <= 2; ++i) {
             const std::string fname = "test" + std::to_string(i) + ".cpp";
@@ -601,11 +602,11 @@ class TestUnusedFunctions : public TestFixture {
             SimpleTokenizer tokenizer{settings, *this, fname};
             ASSERT(tokenizer.tokenize(code));
 
-            c.parseTokens(tokenizer, settings);
+            c.parseTokens(tokenizer, settings.library);
         }
 
         // Check for unused functions..
-        (c.check)(settings, *this); // TODO: check result
+        (c.check)(settings.library, *this); // TODO: check result
 
         ASSERT_EQUALS("[test1.cpp:1:13]: (style) The function 'f' is never used. [unusedFunction]\n", errout_str());
     }
@@ -613,17 +614,17 @@ class TestUnusedFunctions : public TestFixture {
     void lineNumber() {
         check("void foo();\n"
               "void bar() {}\n"
-              "int main() {}");
+              "int main() {}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (style) The function 'bar' is never used. [unusedFunction]\n", errout_str());
     }
 
     void ignore_declaration() {
         check("void f();\n"
-              "void f() {}");
+              "void f() {}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (style) The function 'f' is never used. [unusedFunction]\n", errout_str());
 
         check("void f(void) {}\n"
-              "void (*list[])(void) = {f};");
+              "void (*list[])(void) = {f};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -634,7 +635,7 @@ class TestUnusedFunctions : public TestFixture {
               "};\n"
               "std::ostream & operator<<(std::ostream &os, const A&) {\n"
               "    os << \"This is class A\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A{};\n"
@@ -671,7 +672,7 @@ class TestUnusedFunctions : public TestFixture {
               "A operator ++ (const A &){ return A(); }\n"
               "A operator -- (const A &, const int){ return A(); }\n"
               "A operator -- (const A &){ return A(); }\n"
-              "A operator , (const A &, const A &){ return A(); }");
+              "A operator , (const A &, const A &){ return A(); }\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -685,39 +686,39 @@ class TestUnusedFunctions : public TestFixture {
               "}\n"
               "void * A::operator new[](std::size_t s) {\n"
               "    return malloc(s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void entrypointsWin() {
-        check("int WinMain() { }");
+        check("int WinMain() { }\n");
         ASSERT_EQUALS("[test.cpp:1:5]: (style) The function 'WinMain' is never used. [unusedFunction]\n", errout_str());
 
-        check("int _tmain() { }");
+        check("int _tmain() { }\n");
         ASSERT_EQUALS("[test.cpp:1:5]: (style) The function '_tmain' is never used. [unusedFunction]\n", errout_str());
 
         const Settings s = settingsBuilder(settings).library("windows.cfg").build();
 
-        check("int WinMain() { }", s);
+        check("int WinMain() { }\n", s);
         ASSERT_EQUALS("", errout_str());
 
-        check("int _tmain() { }", s);
+        check("int _tmain() { }\n", s);
         ASSERT_EQUALS("", errout_str());
     }
 
     void entrypointsWinU() {
-        check("int wWinMain() { }");
+        check("int wWinMain() { }\n");
         ASSERT_EQUALS("[test.cpp:1:5]: (style) The function 'wWinMain' is never used. [unusedFunction]\n", errout_str());
 
-        check("int _tmain() { }");
+        check("int _tmain() { }\n");
         ASSERT_EQUALS("[test.cpp:1:5]: (style) The function '_tmain' is never used. [unusedFunction]\n", errout_str());
 
         const Settings s = settingsBuilder(settings).library("windows.cfg").build();
 
-        check("int wWinMain() { }", s);
+        check("int wWinMain() { }\n", s);
         ASSERT_EQUALS("", errout_str());
 
-        check("int _tmain() { }", s);
+        check("int _tmain() { }\n", s);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -827,6 +828,16 @@ class TestUnusedFunctions : public TestFixture {
               "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:1:6]: (style) The function 'f' should have static linkage since it is not used outside of its translation unit. [staticFunction]\n", errout_str());
     }
+
+    void unnamedArg()
+    {
+        check("struct S {\n" // #12904
+              "    void Type() {}\n"
+              "};\n"
+              "[[unused]] void f(Type) {}\n"
+              "[[unused]] void g(Type, Type) {}\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) The function 'Type' is never used. [unusedFunction]\n", errout_str());
+    }
 };
 
 REGISTER_TEST(TestUnusedFunctions)
diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp
index 5a364347163..09623db97c5 100644
--- a/test/testunusedprivfunc.cpp
+++ b/test/testunusedprivfunc.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -58,7 +58,6 @@ class TestUnusedPrivateFunction : public TestFixture {
 
         TEST_CASE(classInClass);
         TEST_CASE(sameFunctionNames);
-        TEST_CASE(incompleteImplementation);
 
         TEST_CASE(derivedClass);   // skip warning for derived classes. It might be a virtual function.
 
@@ -76,7 +75,6 @@ class TestUnusedPrivateFunction : public TestFixture {
         TEST_CASE(testDoesNotIdentifyMethodAsMiddleFunctionArgument);
         TEST_CASE(testDoesNotIdentifyMethodAsLastFunctionArgument);
 
-        TEST_CASE(multiFile);
         TEST_CASE(unknownBaseTemplate); // ticket #2580
         TEST_CASE(hierarchy_loop); // ticket 5590
 
@@ -104,7 +102,7 @@ class TestUnusedPrivateFunction : public TestFixture {
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check for unused private functions..
-        CheckClass checkClass(&tokenizer, &settings1, this);
+        CheckClassImpl checkClass(&tokenizer, settings1, *this);
         checkClass.privateFunctions();
     }
 
@@ -121,7 +119,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "{ }\n"
               "\n"
               "unsigned int Fred::f()\n"
-              "{ }");
+              "{ }\n");
 
         ASSERT_EQUALS("[test.cpp:4:18] -> [test.cpp:12:20]: (style) Unused private function: 'Fred::f' [unusedPrivateFunction]\n", errout_str());
 
@@ -139,7 +137,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "{ }\n"
               "\n"
               "unsigned int Fred::f()\n"
-              "{ }");
+              "{ }\n");
 
         ASSERT_EQUALS("[p.h:4:18] -> [p.cpp:4:20]: (style) Unused private function: 'Fred::f' [unusedPrivateFunction]\n", errout_str());
 
@@ -155,7 +153,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "\n"
               "void Fred::f()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[p.h:4:6] -> [p.cpp:2:12]: (style) Unused private function: 'Fred::f' [unusedPrivateFunction]\n", errout_str());
 
         // Don't warn about include files which implementation we don't see
@@ -171,7 +169,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "\n"
               "int main()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -189,7 +187,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "\n"
               "A::A()\n"
-              "{ }");
+              "{ }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -204,7 +202,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "\n"
               "A::~A()\n"
-              "{ B(); }");
+              "{ B(); }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -219,7 +217,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "\n"
               "A::A() : _owner(false)\n"
-              "{ b(); }");
+              "{ b(); }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -230,14 +228,14 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    A() : lock(new Lock())\n"
               "    { }\n"
               "    Lock *lock;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void test6() { // ticket #2602 segmentation fault
         check("class A {\n"
               "    A& operator=(const A&);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -274,9 +272,9 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "\n"
               "Fred::Fred()\n"
-              "{}");
+              "{}\n");
 
-        ASSERT_EQUALS("[test.cpp:6:12] -> [test.cpp:6:12]: (style) Unused private function: 'Fred::get' [unusedPrivateFunction]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:6:12]: (style) Unused private function: 'Fred::get' [unusedPrivateFunction]\n", errout_str());
     }
 
 
@@ -293,7 +291,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    void callback(const& unsigned) const {}\n"
               "\n"
               "    Observer<UnusedPrivateFunctionMemberPointer, unsigned> mObserver;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -307,7 +305,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "\n"
               "private:\n"
               "    void f1() const {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -321,7 +319,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    void (*fptr)();\n"
               "};\n"
               "myclass::myclass() { fptr = &f; }\n"
-              "void myclass::f() {}");
+              "void myclass::f() {}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -333,7 +331,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    void (*f)();\n"
               "private:\n"
               "    static void func() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -346,7 +344,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    void test(void* f = a) {\n"
               "        f(\"test\");\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -387,7 +385,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    }\n"
               "\n"
               "    int numOfThreads;\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -400,7 +398,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "  double TotalWeighting() { return 123.0; }\n"  // called from constructor
               "public:\n"
               "  double totalWeighting_;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -408,8 +406,8 @@ class TestUnusedPrivateFunction : public TestFixture {
         check("class C {\n"
               "    C() = default;\n"
               "    void f() const { (void)this; }\n"
-              "};");
-        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:3:10]: (style) Unused private function: 'C::f' [unusedPrivateFunction]\n", errout_str());
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) Unused private function: 'C::f' [unusedPrivateFunction]\n", errout_str());
     }
 
 
@@ -425,8 +423,8 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    static void f()\n"
               "    { }\n"
-              "};");
-        ASSERT_EQUALS("[test.cpp:10:17] -> [test.cpp:10:17]: (style) Unused private function: 'A::f' [unusedPrivateFunction]\n", errout_str());
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:10:17]: (style) Unused private function: 'A::f' [unusedPrivateFunction]\n", errout_str());
 
         check("class A\n"
               "{\n"
@@ -444,7 +442,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "        B(A *a)\n"
               "        { a->f(); }\n"
               "    };\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"  // #6968 - outer definition
@@ -455,14 +453,14 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "class A::B {"
               "  B() { A a; a.f(); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class C {\n" // #13790
               "    class I { I() = default; };\n"
               "    void f() const { (void)this; }\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:3:10]: (style) Unused private function: 'C::f' [unusedPrivateFunction]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) Unused private function: 'C::f' [unusedPrivateFunction]\n", errout_str());
     }
 
 
@@ -478,25 +476,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    void f() { }\n"
               "    void f(int) { }\n"
-              "};");
-        ASSERT_EQUALS("", errout_str());
-    }
-
-    void incompleteImplementation() {
-        // The implementation for "A::a" is missing - so don't check if
-        // "A::b" is used or not
-        check("#file \"test.h\"\n"
-              "class A\n"
-              "{\n"
-              "public:\n"
-              "    A();\n"
-              "    void a();\n"
-              "private:\n"
-              "    void b();\n"
-              "};\n"
-              "#endfile\n"
-              "A::A() { }\n"
-              "void A::b() { }");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -508,7 +488,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    derived() : base() { }\n"
               "private:\n"
               "    void f();\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class base {\n"
@@ -520,8 +500,8 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    void foo() {}\n" // Skip for overrides of virtual functions of base
               "    void bar() {}\n" // Don't skip if no function is overridden
-              "};");
-        ASSERT_EQUALS("[test.cpp:9:10] -> [test.cpp:9:10]: (style) Unused private function: 'derived::bar' [unusedPrivateFunction]\n", errout_str());
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:9:10]: (style) Unused private function: 'derived::bar' [unusedPrivateFunction]\n", errout_str());
 
         check("class Base {\n"
               "private:\n"
@@ -539,7 +519,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "class Derived2: public Derived1 {\n"
               "private:\n"
               "    void func() {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Base {\n"
@@ -557,7 +537,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    Derived* f() {\n"
               "      return 0;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -567,7 +547,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    friend Bar;\n" // Unknown friend class
               "    void f() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Bar {\n"
@@ -577,7 +557,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    friend Bar;\n"
               "    void f();\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Bar {\n"
@@ -587,7 +567,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    friend Bar;\n"
               "    void f() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Bar {\n" // Friend class seen, f() not used in it
@@ -595,8 +575,8 @@ class TestUnusedPrivateFunction : public TestFixture {
               "class Foo {\n"
               "    friend Bar;\n"
               "    void f() { }\n"
-              "};");
-        ASSERT_EQUALS("[test.cpp:5:10] -> [test.cpp:5:10]: (style) Unused private function: 'Foo::f' [unusedPrivateFunction]\n", errout_str());
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:5:10]: (style) Unused private function: 'Foo::f' [unusedPrivateFunction]\n", errout_str());
 
         check("struct F;\n" // #10265
               "struct S {\n"
@@ -609,7 +589,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    bool operator()(const S& lhs, const S& rhs) const {\n"
               "        return lhs.f() < rhs.f();\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -623,7 +603,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "public:\n"
               "    Foo() { }\n"
               "    __property int x = {read=getx}\n"
-              "};", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+              "};\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -636,7 +616,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    }\n"
               "public:\n"
               "    Foo() { }\n"
-              "};", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+              "};\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -654,7 +634,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "template <class T>\n"
               "T A::getVal() const {\n"
               "    return internalGetVal();\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -670,7 +650,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    void startListening() {\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -682,120 +662,101 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    void startListening() {\n"
               "    }\n"
-              "};");
-        ASSERT_EQUALS("[test.cpp:8:10] -> [test.cpp:8:10]: (style) Unused private function: 'Fred::startListening' [unusedPrivateFunction]\n", errout_str());
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:8:10]: (style) Unused private function: 'Fred::startListening' [unusedPrivateFunction]\n", errout_str());
 
         // #5059
         check("class Fred {\n"
               "    void* operator new(size_t obj_size, size_t buf_size) {}\n"
-              "};");
+              "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:2]: (style) Unused private function: 'Fred::operatornew'\n", "", errout_str()); // No message for operators - we currently cannot check their usage
 
         check("class Fred {\n"
               "    void* operator new(size_t obj_size, size_t buf_size) {}\n"
               "public:\n"
               "    void* foo() { return new(size) Fred(); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void testDoesNotIdentifyMethodAsFirstFunctionArgument() {
-        check("void callback(void (*func)(int), int arg)"
-              "{"
-              "    (*func)(arg);"
-              "}"
-              "class MountOperation"
-              "{"
-              "    static void Completed(int i);"
-              "public:"
-              "    MountOperation(int i);"
-              "};"
-              "void MountOperation::Completed(int i)"
-              "{"
-              "    std::cerr << i << std::endl;"
-              "}"
-              "MountOperation::MountOperation(int i)"
-              "{"
-              "    callback(MountOperation::Completed, i);"
-              "}"
-              "int main(void)"
-              "{"
-              "    MountOperation aExample(10);"
-              "}"
+        check("void callback(void (*func)(int), int arg)\n"
+              "{\n"
+              "    (*func)(arg);\n"
+              "}\n"
+              "class MountOperation\n"
+              "{\n"
+              "    static void Completed(int i);\n"
+              "public:\n"
+              "    MountOperation(int i);\n"
+              "};\n"
+              "void MountOperation::Completed(int i)\n"
+              "{\n"
+              "    std::cerr << i << std::endl;\n"
+              "}\n"
+              "MountOperation::MountOperation(int i)\n"
+              "{\n"
+              "    callback(MountOperation::Completed, i);\n"
+              "}\n"
+              "int main(void)\n"
+              "{\n"
+              "    MountOperation aExample(10);\n"
+              "}\n"
               );
         ASSERT_EQUALS("", errout_str());
     }
 
     void testDoesNotIdentifyMethodAsMiddleFunctionArgument() {
-        check("void callback(char, void (*func)(int), int arg)"
-              "{"
-              "    (*func)(arg);"
-              "}"
-              "class MountOperation"
-              "{"
-              "    static void Completed(int i);"
-              "public:"
-              "    MountOperation(int i);"
-              "};"
-              "void MountOperation::Completed(int i)"
-              "{"
-              "    std::cerr << i << std::endl;"
-              "}"
-              "MountOperation::MountOperation(int i)"
-              "{"
-              "    callback('a', MountOperation::Completed, i);"
-              "}"
-              "int main(void)"
-              "{"
-              "    MountOperation aExample(10);"
-              "}"
+        check("void callback(char, void (*func)(int), int arg)\n"
+              "{\n"
+              "    (*func)(arg);\n"
+              "}\n"
+              "class MountOperation\n"
+              "{\n"
+              "    static void Completed(int i);\n"
+              "public:\n"
+              "    MountOperation(int i);\n"
+              "};\n"
+              "void MountOperation::Completed(int i)\n"
+              "{\n"
+              "    std::cerr << i << std::endl;\n"
+              "}\n"
+              "MountOperation::MountOperation(int i)\n"
+              "{\n"
+              "    callback('a', MountOperation::Completed, i);\n"
+              "}\n"
+              "int main(void)\n"
+              "{\n"
+              "    MountOperation aExample(10);\n"
+              "}\n"
               );
         ASSERT_EQUALS("", errout_str());
     }
 
     void testDoesNotIdentifyMethodAsLastFunctionArgument() {
-        check("void callback(int arg, void (*func)(int))"
-              "{"
-              "    (*func)(arg);"
-              "}"
-              "class MountOperation"
-              "{"
-              "    static void Completed(int i);"
-              "public:"
-              "    MountOperation(int i);"
-              "};"
-              "void MountOperation::Completed(int i)"
-              "{"
-              "    std::cerr << i << std::endl;"
-              "}"
-              "MountOperation::MountOperation(int i)"
-              "{"
-              "    callback(i, MountOperation::Completed);"
-              "}"
-              "int main(void)"
-              "{"
-              "    MountOperation aExample(10);"
-              "}"
-              );
-        ASSERT_EQUALS("", errout_str());
-    }
-
-    void multiFile() { // ticket #2567
-        check("#file \"test.h\"\n"
-              "struct Fred\n"
+        check("void callback(int arg, void (*func)(int))\n"
               "{\n"
-              "    Fred()\n"
-              "    {\n"
-              "        Init();\n"
-              "    }\n"
-              "private:\n"
-              "    void Init();\n"
+              "    (*func)(arg);\n"
+              "}\n"
+              "class MountOperation\n"
+              "{\n"
+              "    static void Completed(int i);\n"
+              "public:\n"
+              "    MountOperation(int i);\n"
               "};\n"
-              "#endfile\n"
-              "void Fred::Init()\n"
+              "void MountOperation::Completed(int i)\n"
               "{\n"
-              "}");
-
+              "    std::cerr << i << std::endl;\n"
+              "}\n"
+              "MountOperation::MountOperation(int i)\n"
+              "{\n"
+              "    callback(i, MountOperation::Completed);\n"
+              "}\n"
+              "int main(void)\n"
+              "{\n"
+              "    MountOperation aExample(10);\n"
+              "}\n"
+              );
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -806,7 +767,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    virtual void F() const;\n"
               "};\n"
-              "void Bla::F() const { }");
+              "void Bla::F() const { }\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -825,7 +786,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "void InfiniteA::foo() {\n"
               "    C a;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -835,7 +796,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    static int i;\n"
               "    static int F() const { return 1; }\n"
               "};\n"
-              "int Foo::i = Foo::F();");
+              "int Foo::i = Foo::F();\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Foo {\n"
@@ -843,16 +804,16 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    int F() const { return 1; }\n"
               "};\n"
               "Foo f;\n"
-              "int Foo::i = f.F();");
+              "int Foo::i = f.F();\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Foo {\n"
               "    static int i;\n"
               "    static int F() const { return 1; }\n"
               "};\n"
-              "int Foo::i = sth();"
-              "int i = F();");
-        ASSERT_EQUALS("[test.cpp:3:16] -> [test.cpp:3:16]: (style) Unused private function: 'Foo::F' [unusedPrivateFunction]\n", errout_str());
+              "int Foo::i = sth();\n"
+              "int i = F();\n");
+        ASSERT_EQUALS("[test.cpp:3:16]: (style) Unused private function: 'Foo::F' [unusedPrivateFunction]\n", errout_str());
     }
 
     void templateSimplification() { //ticket #6183
@@ -874,14 +835,14 @@ class TestUnusedPrivateFunction : public TestFixture {
               "int main() {\n"
               "    CTest::Greeting<bool>(true);\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void maybeUnused() {
         check("class C {\n"
               "    [[maybe_unused]] int f() { return 42; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class C {\n"
@@ -894,7 +855,7 @@ class TestUnusedPrivateFunction : public TestFixture {
     void attributeUnused() {
         check("class C {\n"
               "    __attribute__((unused)) int f() { return 42; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class C {\n"
diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
index 741f9b70b24..65ce7343da0 100644
--- a/test/testunusedvar.cpp
+++ b/test/testunusedvar.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -77,6 +77,10 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(structmember29); // #14075
         TEST_CASE(structmember30); // #14131
         TEST_CASE(structmember31); // #14130
+        TEST_CASE(structmember32); // #14483
+        TEST_CASE(structmember33);
+        TEST_CASE(structmember34);
+        TEST_CASE(structmember35);
         TEST_CASE(structmember_macro);
         TEST_CASE(structmember_template_argument); // #13887 - do not report that member used in template argument is unused
         TEST_CASE(classmember);
@@ -152,6 +156,9 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(localvar69);
         TEST_CASE(localvar70);
         TEST_CASE(localvar71);
+        TEST_CASE(localvar72);
+        TEST_CASE(localvar73);
+        TEST_CASE(localvar74);
         TEST_CASE(localvarloops); // loops
         TEST_CASE(localvaralias1);
         TEST_CASE(localvaralias2); // ticket #1637
@@ -195,6 +202,7 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(localvarreturn); // ticket #9167
         TEST_CASE(localvarmaybeunused);
         TEST_CASE(localvarrvalue); // ticket #13977
+        TEST_CASE(localvarreferencearray); // ticket #14637
 
         TEST_CASE(localvarthrow); // ticket #3687
 
@@ -217,6 +225,7 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(localvarStruct13); // #10398
         TEST_CASE(localvarStruct14);
         TEST_CASE(localvarStructArray);
+        TEST_CASE(localvarOverloadedSubscript);
         TEST_CASE(localvarUnion1);
 
         TEST_CASE(localvarOp);          // Usage with arithmetic operators
@@ -246,6 +255,7 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(localvarDelete);
         TEST_CASE(localvarLambda); // #8941, #8948
         TEST_CASE(localvarStructuredBinding); // #10368
+        TEST_CASE(localvarPtrToPtr);
 
         TEST_CASE(localvarCppInitialization);
         TEST_CASE(localvarCpp11Initialization);
@@ -259,7 +269,7 @@ class TestUnusedVar : public TestFixture {
 
         TEST_CASE(lambdaFunction); // #5078
         TEST_CASE(namespaces); // #7557
-        TEST_CASE(bracesInitCpp11);// #7895 - "int var{123}" initialization
+        TEST_CASE(bracesInitCpp11);// #7895 - "int var{123}\n" initialization
 
         TEST_CASE(argument);
         TEST_CASE(argumentClass);
@@ -268,6 +278,9 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(globalData);
 
         TEST_CASE(structuredBinding); // #13269
+
+        TEST_CASE(pointerCast1); // #14535
+        TEST_CASE(pointerCast2);
     }
 
     struct FunctionVariableUsageOptions
@@ -282,7 +295,7 @@ class TestUnusedVar : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for unused variables..
-        CheckUnusedVar checkUnusedVar(&tokenizer, &settings, this);
+        CheckUnusedVarImpl checkUnusedVar(&tokenizer, settings, *this);
         checkUnusedVar.checkFunctionVariableUsage();
     }
 
@@ -302,7 +315,7 @@ class TestUnusedVar : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for unused variables..
-        CheckUnusedVar checkUnusedVar(&tokenizer, &settings, this);
+        CheckUnusedVarImpl checkUnusedVar(&tokenizer, settings, *this);
         (checkUnusedVar.checkStructMemberUsage)();
     }
 
@@ -315,7 +328,7 @@ class TestUnusedVar : public TestFixture {
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check for unused variables..
-        CheckUnusedVar checkUnusedVar(&tokenizer, &settings, this);
+        CheckUnusedVarImpl checkUnusedVar(&tokenizer, settings, *this);
         (checkUnusedVar.checkStructMemberUsage)();
     }
 
@@ -328,7 +341,7 @@ class TestUnusedVar : public TestFixture {
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check for unused variables..
-        CheckUnusedVar checkUnusedVar(&tokenizer, &settings, this);
+        CheckUnusedVarImpl checkUnusedVar(&tokenizer, settings, *this);
         (checkUnusedVar.checkFunctionVariableUsage)();
     }
 
@@ -338,7 +351,7 @@ class TestUnusedVar : public TestFixture {
             "class A {};\n"
             "void f() {\n"
             "   A a;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (style) Unused variable: a [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -349,7 +362,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   B b;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: b [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -359,7 +372,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:6:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -369,7 +382,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   D d;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:6:6]: (style) Unused variable: d [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -379,7 +392,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   E e;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:6:6]: (style) Unused variable: e [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -390,7 +403,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -401,7 +414,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -413,7 +426,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:8:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -425,7 +438,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -437,7 +450,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -449,7 +462,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -461,7 +474,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         // non-empty constructor
@@ -475,7 +488,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         // constructor with hidden definition
@@ -489,7 +502,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "int main() {\n"
             "   A a;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // side-effect variable
@@ -507,7 +520,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   G g;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // side-effect variable in initialization list
@@ -526,7 +539,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   G g;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unknown variable type
@@ -537,7 +550,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   H h;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unknown variable type in initialization list
@@ -550,7 +563,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   H h;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unknown variable type used for initialization
@@ -563,7 +576,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -575,7 +588,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -586,7 +599,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -597,7 +610,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -608,7 +621,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -619,7 +632,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -658,7 +671,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // function forward declaration
@@ -671,7 +684,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return literal
@@ -684,7 +697,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:8:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // return variable without side effects
@@ -700,7 +713,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:11:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // return variable with side effects
@@ -716,7 +729,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return unknown variable
@@ -731,7 +744,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return variable is global, but not changed
@@ -747,7 +760,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:11:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // changing global variable in return
@@ -763,7 +776,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // changing global variable in function body
@@ -780,7 +793,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -796,7 +809,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -812,7 +825,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -828,7 +841,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // global variable use in function body without change
@@ -845,7 +858,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:12:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // changing global array variable in function body
@@ -862,7 +875,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -878,7 +891,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -894,7 +907,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // pointer arithmetic on global array
@@ -911,7 +924,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -927,7 +940,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -944,7 +957,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:13:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -961,7 +974,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:13:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -977,7 +990,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -992,7 +1005,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // changing local variable
@@ -1010,7 +1023,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:13:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // variable of user-defined class without side effects
@@ -1027,7 +1040,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:12:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // variable of user-defined class with side effects
@@ -1047,7 +1060,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unknown type variable
@@ -1063,7 +1076,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // nested clean function call
@@ -1080,7 +1093,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:12:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // nested side-effects function call
@@ -1100,7 +1113,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unknown nested function
@@ -1116,7 +1129,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // clean function recursion
@@ -1135,7 +1148,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:14:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // indirect clean function recursion
@@ -1157,7 +1170,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:17:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // side-effect function recursion
@@ -1178,7 +1191,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // multiple returns (side-effect & clean)
@@ -1194,7 +1207,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // multiple clean returns
@@ -1210,7 +1223,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:11:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // multiple side-effect returns
@@ -1226,7 +1239,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // argument return
@@ -1241,7 +1254,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:10:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // global variable modifying through function argument
@@ -1258,7 +1271,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // global variable modifying through local pointer
@@ -1276,7 +1289,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // global variable assigning to local pointer, but not modifying
@@ -1294,7 +1307,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:13:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // global struct variable modification
@@ -1311,7 +1324,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // global struct variable without modification
@@ -1328,7 +1341,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:12:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // global pointer to struct variable modification
@@ -1346,7 +1359,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // global pointer to struct variable without modification
@@ -1364,7 +1377,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:13:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
     }
 
@@ -1377,7 +1390,7 @@ class TestUnusedVar : public TestFixture {
                               "void foo() {\n"
                               "    Fred fred;\n"
                               "    throw fred;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1388,7 +1401,7 @@ class TestUnusedVar : public TestFixture {
                               "void foo() {\n"
                               "    Fred fred;\n"
                               "    throw fred;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1398,7 +1411,7 @@ class TestUnusedVar : public TestFixture {
                                "    int a;\n"
                                "    int b;\n"
                                "    int c;\n"
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) struct member 'abc::a' is never used. [unusedStructMember]\n"
                       "[test.cpp:4:9]: (style) struct member 'abc::b' is never used. [unusedStructMember]\n"
                       "[test.cpp:5:9]: (style) struct member 'abc::c' is never used. [unusedStructMember]\n", errout_str());
@@ -1408,7 +1421,7 @@ class TestUnusedVar : public TestFixture {
                                "    int a;\n"
                                "    int b;\n"
                                "    int c;\n"
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) union member 'abc::a' is never used. [unusedStructMember]\n"
                       "[test.cpp:4:9]: (style) union member 'abc::b' is never used. [unusedStructMember]\n"
                       "[test.cpp:5:9]: (style) union member 'abc::c' is never used. [unusedStructMember]\n", errout_str());
@@ -1424,7 +1437,7 @@ class TestUnusedVar : public TestFixture {
                                "void f() {\n"
                                "    union DoubleInt di;\n"
                                "    di.asIntel.hi = 3;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (style) union member 'DoubleInt::asDouble' is never used. [unusedStructMember]\n"
                       "[test.cpp:3:14]: (style) union member 'DoubleInt::asInt' is never used. [unusedStructMember]\n",
                       errout_str());
@@ -1444,7 +1457,7 @@ class TestUnusedVar : public TestFixture {
                                "    int a = abc.a;\n"
                                "    int b = abc.b;\n"
                                "    int c = abc.c;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1463,7 +1476,7 @@ class TestUnusedVar : public TestFixture {
                                "    int a = abc[0].a;\n"
                                "    int b = abc[0].b;\n"
                                "    int c = abc[0].c;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1477,7 +1490,7 @@ class TestUnusedVar : public TestFixture {
                                "{\n"
                                "    ABC abc;\n"
                                "    if (abc.a == 2);\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1497,7 +1510,7 @@ class TestUnusedVar : public TestFixture {
                                "{\n"
                                "    struct AB ab;\n"
                                "    ab.reset();\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1511,7 +1524,7 @@ class TestUnusedVar : public TestFixture {
                                "void foo(char *buf)\n"
                                "{\n"
                                "    struct AB *ab = (struct AB *)&buf[10];\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct AB\n"
@@ -1523,7 +1536,7 @@ class TestUnusedVar : public TestFixture {
                                "void foo(char *buf)\n"
                                "{\n"
                                "    struct AB *ab = (AB *)&buf[10];\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1537,7 +1550,7 @@ class TestUnusedVar : public TestFixture {
                                "void foo(struct AB *ab)\n"
                                "{\n"
                                "    ab->a = 0;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (style) struct member 'AB::b' is never used. [unusedStructMember]\n", errout_str());
 
         checkStructMemberUsage("struct AB\n"
@@ -1549,7 +1562,7 @@ class TestUnusedVar : public TestFixture {
                                "void foo(struct AB _shuge *ab)\n"
                                "{\n"
                                "    ab->a = 0;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (style) struct member 'AB::b' is never used. [unusedStructMember]\n", errout_str());
     }
 
@@ -1563,7 +1576,7 @@ class TestUnusedVar : public TestFixture {
                                "void foo(char *ab)\n"
                                "{\n"
                                "    ((AB *)ab)->b = 0;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1573,7 +1586,7 @@ class TestUnusedVar : public TestFixture {
                                "};\n"
                                "\n"
                                "struct derived : public base {"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1581,19 +1594,19 @@ class TestUnusedVar : public TestFixture {
         // Fred may have some useful side-effects
         checkStructMemberUsage("struct abc {\n"
                                "    Fred fred;\n"
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void structmember11() { // #4168
         checkStructMemberUsage("struct abc { int x; };\n"
                                "struct abc s = {0};\n"
-                               "void f() { do_something(&s); }");
+                               "void f() { do_something(&s); }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct abc { int x; };\n"
                                "struct abc s = {0};\n"
-                               "void f() { }");
+                               "void f() { }\n");
         TODO_ASSERT_EQUALS("abc::x is not used", "", errout_str());
     }
 
@@ -1613,14 +1626,14 @@ class TestUnusedVar : public TestFixture {
                                "{\n"
                                "    printf(\"var.struct1.a = %d\", var.struct1.a);\n"
                                "    return 1;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void structmember13() { // #3088 - struct members required by hardware
         checkStructMemberUsage("struct S {\n"
                                "  int x;\n"
-                               "} __attribute__((packed));");
+                               "} __attribute__((packed));\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1628,7 +1641,7 @@ class TestUnusedVar : public TestFixture {
         checkStructMemberUsage("struct bstr { char *bstart; size_t len; };\n"
                                "struct bstr bstr0(void) {\n"
                                "  return (struct bstr){\"hello\",6};\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1639,7 +1652,7 @@ class TestUnusedVar : public TestFixture {
         simplecpp::Location loc;
         loc.line = 1;
         directives.emplace_back(tokenList, loc, "#pragma pack(1)");
-        checkStructMemberUsage("\nstruct Foo { int x; int y; };", dinit(CheckStructMemberUsageOptions, $.directives = &directives));
+        checkStructMemberUsage("\nstruct Foo { int x; int y; };\n", dinit(CheckStructMemberUsageOptions, $.directives = &directives));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1654,7 +1667,7 @@ class TestUnusedVar : public TestFixture {
                                "void foo()\n"
                                "{\n"
                                "    ab.b = 0;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // global linkage => no false positive
@@ -1667,7 +1680,7 @@ class TestUnusedVar : public TestFixture {
                                "void foo()\n"
                                "{\n"
                                "    ab.b = 0;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // static linkage => error message
@@ -1680,7 +1693,7 @@ class TestUnusedVar : public TestFixture {
                                "void foo()\n"
                                "{\n"
                                "    ab.b = 0;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) struct member 'AB::a' is never used. [unusedStructMember]\n", errout_str());
 
         checkStructMemberUsage("struct A\n"
@@ -1691,7 +1704,7 @@ class TestUnusedVar : public TestFixture {
                                "int foo()\n"
                                "{\n"
                                "    return A::a;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1700,14 +1713,14 @@ class TestUnusedVar : public TestFixture {
                                "  uint8_t message_type;\n"
                                "}\n"
                                "\n"
-                               "input.skip(sizeof(Header));");
+                               "input.skip(sizeof(Header));\n");
         ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct Header {\n"
                                "  uint8_t message_type;\n"
                                "}\n"
                                "\n"
-                               "input.skip(sizeof(struct Header));");
+                               "input.skip(sizeof(struct Header));\n");
         ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct S { int a, b, c; };\n" // #6561
@@ -1920,7 +1933,7 @@ class TestUnusedVar : public TestFixture {
         ASSERT_EQUALS("[test.cpp:10:9]: (style) struct member 'S::f' is never used. [unusedStructMember]\n", errout_str());
 
         checkStructMemberUsage("struct A { int i; };\n"
-                               "struct B { struct A* pA; };");
+                               "struct B { struct A* pA; };\n");
         ASSERT_EQUALS("[test.cpp:1:16]: (style) struct member 'A::i' is never used. [unusedStructMember]\n"
                       "[test.cpp:2:22]: (style) struct member 'B::pA' is never used. [unusedStructMember]\n",
                       errout_str());
@@ -2055,6 +2068,11 @@ class TestUnusedVar : public TestFixture {
                                "    int i3 __attribute__((unused)) {};\n"
                                "};\n");
         ASSERT_EQUALS("", errout_str());
+
+        checkStructMemberUsage("struct S {\n"
+                               "    int a __attribute__((unused)), b;\n"
+                               "};\n");
+        ASSERT_EQUALS("[test.cpp:2:36]: (style) struct member 'S::b' is never used. [unusedStructMember]\n", errout_str());
     }
 
     void structmember31() { // #14130
@@ -2066,6 +2084,46 @@ class TestUnusedVar : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void structmember32() { // #14483
+        checkStructMemberUsage("struct S {\n"
+                               "  int S::* mp;\n"
+                               "};\n");
+        ASSERT_EQUALS("[test.cpp:2:12]: (style) struct member 'S::mp' is never used. [unusedStructMember]\n", errout_str());
+    }
+
+    void structmember33() {
+        checkStructMemberUsage("struct S {\n"
+                               "  int A::B<int>::C::* mp;\n"
+                               "};\n");
+        ASSERT_EQUALS("[test.cpp:2:23]: (style) struct member 'S::mp' is never used. [unusedStructMember]\n", errout_str());
+    }
+
+    void structmember34() {
+        checkStructMemberUsage("struct S {\n" // #14785
+                               "  std::int32_t i;\n"
+                               "};\n");
+        ASSERT_EQUALS("[test.cpp:2:16]: (style) struct member 'S::i' is never used. [unusedStructMember]\n", errout_str());
+
+        checkStructMemberUsage("struct S {\n" // #14786
+                               "  std::unique_ptr<int> p;\n"
+                               "};\n");
+        ASSERT_EQUALS("[test.cpp:2:24]: (style) struct member 'S::p' is never used. [unusedStructMember]\n", errout_str());
+    }
+
+    void structmember35() {
+        checkStructMemberUsage("struct S { int i; };\n"
+                               "int f() { return g<S>(); }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkStructMemberUsage("struct S { int i; };\n"
+                               "int f() { A<S> *a = nullptr; (void) a; }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkStructMemberUsage("struct S { int i; };\n"
+                               "int f() { const std::vector<S> a {}; (void) a; }\n");
+        ASSERT_EQUALS("[test.cpp:1:16]: (style) struct member 'S::i' is never used. [unusedStructMember]\n", errout_str());
+    }
+
     void structmember_macro() {
         checkStructMemberUsageP("#define S(n) struct n { int a, b, c; };\n"
                                 "S(unused);\n");
@@ -2077,7 +2135,7 @@ class TestUnusedVar : public TestFixture {
                                "struct B {\n"
                                "    constexpr int x = 20;\n" // <- not unused
                                "    A<uint32_t, x> a;\n" // <- unused
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("[test.cpp:4:20]: (style) struct member 'B::a' is never used. [unusedStructMember]\n", errout_str());
     }
 
@@ -2154,16 +2212,15 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:9]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i(0);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         // if a is undefined then Cppcheck can't determine if "int i(a)" is a
@@ -2172,14 +2229,14 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i(a);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int j = 0;\n"
                               "    int i(j);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2187,7 +2244,7 @@ class TestUnusedVar : public TestFixture {
                               "    int j = 0;\n"
                               "    int & i = j;\n"
                               "    x(j);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2195,7 +2252,7 @@ class TestUnusedVar : public TestFixture {
                               "    int j = 0;\n"
                               "    const int & i = j;\n"
                               "    x(j);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:19]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2203,7 +2260,7 @@ class TestUnusedVar : public TestFixture {
                               "    int j = 0;\n"
                               "    int & i(j);\n"
                               "    x(j);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2211,53 +2268,51 @@ class TestUnusedVar : public TestFixture {
                               "    int j = 0;\n"
                               "    const int & i(j);\n"
                               "    x(j);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int * j = Data;\n"
                               "    int * i(j);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int * j = Data;\n"
                               "    const int * i(j);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    bool i = false;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:10]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    bool i = true;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:10]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char *i;\n"
                               "    i = fgets();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         // undefined variables are not reported because they may be classes with constructors
         functionVariableUsage("undefined foo()\n"
                               "{\n"
                               "    undefined i = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (information) --check-library: Provide <type-checks><unusedvar> configuration for undefined [checkLibraryCheckType]\n", errout_str());
 
         functionVariableUsage("undefined foo()\n"
@@ -2266,129 +2321,118 @@ class TestUnusedVar : public TestFixture {
                               "}\n",
                               dinit(FunctionVariableUsageOptions, $.cpp = false));
         ASSERT_EQUALS(
-            "[test.c:3:17]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.c:3:15]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.c:3:17]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i = undefined;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:9]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int * i = Data;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:13]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:13]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    void * i = Data;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:14]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:14]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const void * i = Data;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:20]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:18]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:20]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    struct S * i = DATA;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:18]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:16]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:18]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const struct S * i = DATA;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:24]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:22]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:24]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    struct S & i = j;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const struct S & i = j;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:24]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    undefined * i = X;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:19]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:17]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:19]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i = 0;\n"
                               "    int j = i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:11]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:4:9]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:4:11]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i[10] = { 0 };\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo(int n)\n"
                               "{\n"
                               "    int i[n] = { 0 };\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char i[10] = \"123456789\";\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char *i = \"123456789\";\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:13]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:13]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:9]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2398,7 +2442,7 @@ class TestUnusedVar : public TestFixture {
                               "        std::cout<<code<<std::endl;\n"
                               "        code += 2;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2409,7 +2453,7 @@ class TestUnusedVar : public TestFixture {
                               "        code += 2;\n"
                               "        d = code;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:24]: (style) Variable 'd' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:7:11]: (style) Variable 'd' is assigned a value that is never used. [unreadVariable]\n",
                       errout_str());
@@ -2423,7 +2467,7 @@ class TestUnusedVar : public TestFixture {
                               "        g(d);\n"
                               "        d = code;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2437,7 +2481,7 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "        d = code;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2449,7 +2493,7 @@ class TestUnusedVar : public TestFixture {
                               "        a=b;\n"
                               "        b=tmp;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2459,7 +2503,7 @@ class TestUnusedVar : public TestFixture {
                               "        std::cout<<code<<std::endl;\n"
                               "        code += 2;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2470,7 +2514,7 @@ class TestUnusedVar : public TestFixture {
                               "        code += 2;\n"
                               "        d += code;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (style) Variable 'd' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:7:11]: (style) Variable 'd' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
@@ -2483,7 +2527,7 @@ class TestUnusedVar : public TestFixture {
                               "        g(d);\n"
                               "        d += code;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2497,7 +2541,7 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "        d += code;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2509,7 +2553,7 @@ class TestUnusedVar : public TestFixture {
                               "        a=b;\n"
                               "        b=tmp;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2519,7 +2563,7 @@ class TestUnusedVar : public TestFixture {
                               "        std::cout<<code<<std::endl;\n"
                               "        code += 2;\n"
                               "    } while(code < 20);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2530,7 +2574,7 @@ class TestUnusedVar : public TestFixture {
                               "        code += 2;\n"
                               "        d += code;\n"
                               "    } while(code < 20);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (style) Variable 'd' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:7:11]: (style) Variable 'd' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
@@ -2543,7 +2587,7 @@ class TestUnusedVar : public TestFixture {
                               "        g(d);\n"
                               "        d += code;\n"
                               "    } while(code < 20);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2557,7 +2601,7 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "        d += code;\n"
                               "    } while(code < 20);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2569,7 +2613,7 @@ class TestUnusedVar : public TestFixture {
                               "        a=b;\n"
                               "        b=tmp;\n"
                               "    } while( a!=30 );\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2581,7 +2625,7 @@ class TestUnusedVar : public TestFixture {
                               "            code += 2;\n"
                               "        }\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2593,7 +2637,7 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "        code += 2;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2605,7 +2649,7 @@ class TestUnusedVar : public TestFixture {
                               "            code += 2;\n"
                               "        }\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2617,15 +2661,14 @@ class TestUnusedVar : public TestFixture {
                               "            code += 2;\n"
                               "        }\n"
                               "    } while(code < 20);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(int j = 0) {\n" // #5985 - default function parameters should not affect checking results
                               "    int i = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:2:9]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:2:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
         // extracttests.enable
     }
@@ -2637,14 +2680,14 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int i;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Variable 'i' is not assigned a value. [unassignedVariable]\n", errout_str());
 
         functionVariableUsage("bool foo()\n"
                               "{\n"
                               "    bool i;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Variable 'i' is not assigned a value. [unassignedVariable]\n", errout_str());
 
         // undefined variables are not reported because they may be classes with constructors
@@ -2652,7 +2695,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    undefined i;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("undefined foo()\n"
@@ -2667,35 +2710,35 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    undefined * i;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Variable 'i' is not assigned a value. [unassignedVariable]\n", errout_str());
 
         functionVariableUsage("int *foo()\n"
                               "{\n"
                               "    int * i;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'i' is not assigned a value. [unassignedVariable]\n", errout_str());
 
         functionVariableUsage("const int *foo()\n"
                               "{\n"
                               "    const int * i;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Variable 'i' is not assigned a value. [unassignedVariable]\n", errout_str());
 
         functionVariableUsage("struct S *foo()\n"
                               "{\n"
                               "    struct S * i;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) Variable 'i' is not assigned a value. [unassignedVariable]\n", errout_str());
 
         functionVariableUsage("const struct S *foo()\n"
                               "{\n"
                               "    const struct S * i;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:22]: (style) Variable 'i' is not assigned a value. [unassignedVariable]\n", errout_str());
 
         // assume f() can write a
@@ -2703,7 +2746,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10];\n"
                               "    f(a[0]);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // assume f() can write a
@@ -2711,7 +2754,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10];\n"
                               "    f(a[0], 0);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // assume f() can write a
@@ -2719,7 +2762,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10];\n"
                               "    f(0, a[0]);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // assume f() can write a
@@ -2727,7 +2770,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10];\n"
                               "    f(0, a[0], 0);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // f() can not write a (not supported yet)
@@ -2736,7 +2779,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10];\n"
                               "    f(a[0]);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'a' is not assigned a value.\n",
                            "", errout_str());
 
@@ -2746,7 +2789,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10];\n"
                               "    f(a[0]);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(int * i);\n"
@@ -2754,7 +2797,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10];\n"
                               "    f(a+1);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
         // extracttests.enable
     }
@@ -2766,7 +2809,7 @@ class TestUnusedVar : public TestFixture {
                               "    if ( abc )\n"
                               "        ;\n"
                               "    else i = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -2775,14 +2818,14 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int i = 0;\n"
                               "    f(i);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i = 0;\n"
                               "    f(&i);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2791,7 +2834,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a = 0;\n"
                               "    b = (char)a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2800,7 +2843,7 @@ class TestUnusedVar : public TestFixture {
                               "    int b[10];\n"
                               "    for (int i=0;i<10;++i)\n"
                               "        b[i] = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (style) Variable 'b[i]' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo() {\n"
@@ -2808,14 +2851,14 @@ class TestUnusedVar : public TestFixture {
                               "    int b[10];\n"
                               "    for (int i=0;i<10;++i)\n"
                               "        b[i] = ++a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:14]: (style) Variable 'b[i]' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "    int b[10];\n"
                               "    for (int i=0;i<10;++i)\n"
                               "        *(b+i) = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (style) Variable '*(b+i)' is assigned a value that is never used.\n", "", errout_str());
 
         functionVariableUsage("void f() {\n" // #11832, #11923
@@ -2829,25 +2872,25 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i[2];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    void * i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const void * i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         // extracttests.start: struct A {int x;};
@@ -2855,68 +2898,68 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    A * i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    struct A * i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const struct A * i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:22]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int * i[2];\n"
-                              "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const int * i[2];\n"
-                              "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:17]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    void * i[2];\n"
-                              "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const void * i[2];\n"
-                              "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:18]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    struct A * i[2];\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const struct A * i[2];\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
 
         functionVariableUsage("void foo(int n)\n"
                               "{\n"
                               "    int i[n];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i = 0;\n"
                               "    int &j = i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:3:9]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
                       errout_str());
@@ -2925,7 +2968,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int i;\n"
                               "    int &j = i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
@@ -2934,7 +2977,7 @@ class TestUnusedVar : public TestFixture {
                               "    int i;\n"
                               "    int &j = i;\n"
                               "    j = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'i' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -2944,48 +2987,48 @@ class TestUnusedVar : public TestFixture {
                               "    double i = 0.0;\n"
                               "    const double j = i;\n"
                               "    return j;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    A * i;\n"
                               "    i->f();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char * i;\n"
                               "    if (i);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char * i = 0;\n"
                               "    if (i);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char * i = new char[10];\n"
                               "    if (i);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char *i;\n"
                               "    f(i);\n"
-                              "}");
+                              "}\n");
 
         functionVariableUsage("int a;\n"
                               "void foo()\n"
                               "{\n"
                               "    return &a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int a[10];\n"
@@ -2994,7 +3037,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *p = a;\n"
                               "    for (int i = 0; i < 10; i++)\n"
                               "        p[i] = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int a[10];\n"
@@ -3003,7 +3046,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *p = &a[0];\n"
                               "    for (int i = 0; i < 10; i++)\n"
                               "        p[i] = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -3012,7 +3055,7 @@ class TestUnusedVar : public TestFixture {
                               "    int x;\n"
                               "    a[0] = 0;\n"
                               "    x = a[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         // extracttests.start: int f();
@@ -3020,7 +3063,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a, b, c;\n"
                               "    a = b = c = f();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:4:11]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:4:15]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n",
@@ -3029,7 +3072,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("int * foo()\n"
                               "{\n"
                               "    return &undefined[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3040,7 +3083,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    for (int i = 0; i < 10; )\n"
                               "        a[i++] = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:16]: (style) Variable 'a[i++]' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -3053,7 +3096,7 @@ class TestUnusedVar : public TestFixture {
                               "    } else {\n"
                               "        int i;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n"
                       "[test.cpp:5:13]: (style) Unused variable: i [unusedVariable]\n"
                       "[test.cpp:7:13]: (style) Unused variable: i [unusedVariable]\n", errout_str());
@@ -3065,7 +3108,7 @@ class TestUnusedVar : public TestFixture {
                               "        int i;\n"
                               "    else\n"
                               "        int i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n"
                       "[test.cpp:5:13]: (style) Unused variable: i [unusedVariable]\n"
                       "[test.cpp:7:13]: (style) Unused variable: i [unusedVariable]\n", errout_str());
@@ -3078,11 +3121,10 @@ class TestUnusedVar : public TestFixture {
                               "    } else {\n"
                               "        int i = 0;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:7:15]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n"
-                      "[test.cpp:5:13]: (style) Unused variable: i [unusedVariable]\n"
-                      "[test.cpp:7:13]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:5:13]: (style) Unused variable: i [unusedVariable]\n",
                       errout_str());
 
         functionVariableUsage("void foo(int x)\n"
@@ -3094,7 +3136,7 @@ class TestUnusedVar : public TestFixture {
                               "        int i;\n"
                               "    }\n"
                               "    i = 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:9:7]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:5:13]: (style) Unused variable: i [unusedVariable]\n"
                       "[test.cpp:7:13]: (style) Unused variable: i [unusedVariable]\n", errout_str());
@@ -3110,7 +3152,7 @@ class TestUnusedVar : public TestFixture {
                               "        return;\n"
                               "    }\n"
                               "    x = a;\n"  // redundant assignment
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:6:11]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:9:7]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
@@ -3126,7 +3168,7 @@ class TestUnusedVar : public TestFixture {
                               "    else\n"
                               "        return;\n"
                               "    x = a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:10:7]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -3136,7 +3178,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a, b, c, d, e, f;\n"
                               "    a = b = c = d = e = f = 15;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:7]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
             "[test.cpp:4:11]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
@@ -3151,7 +3193,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a, b, c = 0;\n"
                               "    a = b = c;\n"
                               "\n"
-                              "}");
+                              "}\n");
 
         TODO_ASSERT_EQUALS(
             "[test.cpp:4:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
@@ -3169,7 +3211,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int x;\n"
                               "    x = obj->ySize / 8;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -3178,7 +3220,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int a[10];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n", errout_str());
     }
 
@@ -3189,7 +3231,7 @@ class TestUnusedVar : public TestFixture {
                               "    int b[a];\n"
                               "    b[0] = 0;\n"
                               "    return b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
@@ -3198,7 +3240,7 @@ class TestUnusedVar : public TestFixture {
                               "    int * b[a];\n"
                               "    b[0] = &c;\n"
                               "    return *b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int * foo()\n"
@@ -3207,7 +3249,7 @@ class TestUnusedVar : public TestFixture {
                               "    const int * b[a];\n"
                               "    b[0] = &c;\n"
                               "    return b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct B * foo()\n"
@@ -3216,7 +3258,7 @@ class TestUnusedVar : public TestFixture {
                               "    struct B * b[a];\n"
                               "    b[0] = &c;\n"
                               "    return b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("const struct B * foo()\n"
@@ -3225,7 +3267,7 @@ class TestUnusedVar : public TestFixture {
                               "    const struct B * b[a];\n"
                               "    b[0] = &c;\n"
                               "    return b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3235,7 +3277,7 @@ class TestUnusedVar : public TestFixture {
                               "    char buf[5];\n"
                               "    char *ptr = buf;\n"
                               "    *(ptr++) = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'buf' is assigned a value that is never used.\n", "", errout_str());
 
         // #3910
@@ -3244,7 +3286,7 @@ class TestUnusedVar : public TestFixture {
                               "    char *data[2];\n"
                               "    data[0] = buf;\n"
                               "    do_something(data);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n"
@@ -3254,7 +3296,7 @@ class TestUnusedVar : public TestFixture {
                               "    data[0] = buf1;\n"
                               "    data[1] = buf2;\n"
                               "    do_something(data);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3271,7 +3313,7 @@ class TestUnusedVar : public TestFixture {
                               "    line_start = ptr;\n"
                               "    data->info = k;\n"
                               "    line_start = ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:10:16]: (style) Variable 'line_start' is assigned a value that is never used. [unreadVariable]\n", errout_str());
         // extracttests.enable
     }
@@ -3280,7 +3322,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("A::A(int iValue) {\n"
                               "    UserDefinedException* pe = new UserDefinedException();\n"
                               "    throw pe;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3289,7 +3331,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    int c;\n"
                               "    c = *(a);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:2:9]: (style) Variable 'a' is not assigned a value. [unassignedVariable]\n", errout_str());
     }
@@ -3300,7 +3342,7 @@ class TestUnusedVar : public TestFixture {
                               "    char c1 = 'c';\n"
                               "    char c2[] = { c1 };\n"
                               "    a(c2);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3309,7 +3351,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    char buffer[1024];\n"
                               "    bar((void *)buffer);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3320,7 +3362,7 @@ class TestUnusedVar : public TestFixture {
                               "    h = 0 ? u : v;\n"
                               "    i = 1 ? u : v;\n"
                               "    return h + i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3331,8 +3373,16 @@ class TestUnusedVar : public TestFixture {
                               "    int b[10];\n"
                               "    a = b[c] = 0;\n"
                               "    return a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:14]: (style) Variable 'b[c]' is assigned a value that is never used. [unreadVariable]\n", errout_str());
+
+        functionVariableUsage("int f() {\n" // #14769
+                              "    int i = 2;\n"
+                              "    const int *a, *c;\n"
+                              "    a = c = &i;\n"
+                              "    return *a;\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvar24() { // ticket #1803
@@ -3342,7 +3392,7 @@ class TestUnusedVar : public TestFixture {
                               "    {\n"
                               "        throw *this;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3353,7 +3403,7 @@ class TestUnusedVar : public TestFixture {
                               "    const char*edge = ppos? \" +\" : pneg ? \" -\" : \"\";\n"
                               "    printf(\"This should be a '+' -> %s\\n\", edge);\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3362,7 +3412,7 @@ class TestUnusedVar : public TestFixture {
                               "    const Fred &fred = getfred();\n"
                               "    int *p = fred.x();\n"
                               "    *p = 0;"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3370,7 +3420,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f(struct s *ptr) {\n"
                               "    int param = 1;\n"
                               "    ptr->param = param++;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (style) Variable 'param' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -3379,7 +3429,7 @@ class TestUnusedVar : public TestFixture {
                               "    char* pos = buffer;\n"
                               "    int size = value;\n"
                               "    *(int*)pos = size;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3388,7 +3438,7 @@ class TestUnusedVar : public TestFixture {
                               "    float s_ranges[] = { 0, 256 };\n"
                               "    float* ranges[] = { s_ranges };\n"
                               "    cout << ranges[0][0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3396,7 +3446,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    Engine *engine = e;\n"
                               "    x->engine = engine->clone();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3404,7 +3454,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    int x = 0;\n"
                               "    a.x = x - b;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3414,33 +3464,33 @@ class TestUnusedVar : public TestFixture {
                               "    int x;\n"
                               "    fstream &f = getfile();\n"
                               "    f >> x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #4596 - if (c >>= x) {}
         functionVariableUsage("void f(int x) {\n"
                               "    C c;\n" // possibly some stream class
                               "    if (c >>= x) {}\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (information) --check-library: Provide <type-checks><unusedvar> configuration for C [checkLibraryCheckType]\n", errout_str());
 
         functionVariableUsage("void f(int x) {\n"
                               "    C c;\n"
                               "    if (c >>= x) {}\n"
-                              "}", dinit(FunctionVariableUsageOptions, $.cpp = false));
+                              "}\n", dinit(FunctionVariableUsageOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:11]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    int x, y;\n"
                               "    std::cin >> x >> y;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #8494
         functionVariableUsage("void f(C c) {\n"
                               "  int x;\n"
                               "  c & x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3450,7 +3500,7 @@ class TestUnusedVar : public TestFixture {
                               "    while (0 != (abc = abc->next())) {\n"
                               "        ++nOldNum;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3461,7 +3511,7 @@ class TestUnusedVar : public TestFixture {
                               "    } else {\n"
                               "        j -= i;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3469,7 +3519,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    int a, b;\n"
                               "    x(1,a,b);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3478,32 +3528,32 @@ class TestUnusedVar : public TestFixture {
                               "    int a, b;\n"
                               "    a = 2 * (b = 3);\n"
                               "    return a + b;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int f() {\n" // ticket #4318
                               "    int a,b;\n"
                               "    x(a, b=2);\n"  // <- if param2 is passed-by-reference then b might be used in x
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n" // ticket #6147
                               "    int a = 0;\n"
                               "    bar(a=a+2);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n" // ticket #6147
                               "    int a = 0;\n"
                               "    bar(a=2);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         functionVariableUsage("void bar(int);\n"
                               "int foo() {\n"
                               "    int a = 0;\n"
                               "    bar(a=a+2);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
@@ -3511,7 +3561,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    int a = 2;\n"
                               "    ints.at(a) = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3521,7 +3571,7 @@ class TestUnusedVar : public TestFixture {
                               "    const std::string s1(sizeof_(code));\n"
                               "    const std::string s2 = sizeof_(code);\n"
                               "    return(s1+s2);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3529,7 +3579,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    int a = 1;\n"
                               "    foo(x*a);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3537,7 +3587,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("int f() {\n"
                               "    int a = 1;\n"
                               "    return x & a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3547,7 +3597,7 @@ class TestUnusedVar : public TestFixture {
                               "    int x = 1;\n"
                               "    int y = FOO::VALUE * x;\n"
                               "    return y;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3559,7 +3609,7 @@ class TestUnusedVar : public TestFixture {
                               "    const float floatA = 2.2f;\n"
                               "    const float floatTot = g_float * floatA;\n"
                               "    SomeTestFunc(floatTot);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("float g_float = 1;\n"
@@ -3569,7 +3619,7 @@ class TestUnusedVar : public TestFixture {
                               "    const float floatB = 2.2f;\n"
                               "    const float floatTot = floatB * g_float;\n"
                               "    SomeTestFunc(floatTot);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("float g_float = 1;\n"
@@ -3579,7 +3629,7 @@ class TestUnusedVar : public TestFixture {
                               "    const float floatC = 2.2f;\n"
                               "    float floatTot = g_float * floatC;\n"
                               "    SomeTestFunc(floatTot);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3605,7 +3655,7 @@ class TestUnusedVar : public TestFixture {
                               "        piArray[uiIndex] = -1234;\n"
                               "    }\n"
                               "    delete [] piArray;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int f() {\n" // #9877
@@ -3613,7 +3663,7 @@ class TestUnusedVar : public TestFixture {
                               "    MACRO(2U, x.size())\n"
                               "    int i = 0;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3621,7 +3671,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void func() {\n"
                               "    int *sp_mem[2] = { global1, global2 };\n"
                               "    sp_mem[0][3] = 123;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3630,7 +3680,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a = 123;\n"
                               "    int b = (short)-a;;\n"
                               "    return b;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3639,7 +3689,7 @@ class TestUnusedVar : public TestFixture {
                               "    int i = 0;\n"
                               "    int j{i};\n"
                               "    return j;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(bool b, bool c, double& r) {\n"
@@ -3659,17 +3709,17 @@ class TestUnusedVar : public TestFixture {
                               "    std::mutex m;\n"
                               "    std::unique_lock<std::mutex> l{ m };\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int func() {\n"
                               "    std::shared_lock<std::shared_timed_mutex> lock( m );\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n" // #10490
                               "    std::shared_lock lock = GetLock();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
@@ -3699,7 +3749,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    int (SfxUndoManager::*retrieveCount)(bool) const\n"
                               "        = (flag) ? &SfxUndoManager::foo : &SfxUndoManager::bar;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Variable 'retrieveCount' is assigned a value that is never used. [unreadVariable]\n", errout_str());
         // extracttests.enable
     }
@@ -3707,7 +3757,7 @@ class TestUnusedVar : public TestFixture {
     void localvar48() { // #6954
         functionVariableUsage("void foo() {\n"
                               "  long (*pKoeff)[256] = new long[9][256];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3728,10 +3778,9 @@ class TestUnusedVar : public TestFixture {
                               "}\n"
                               "void A::DoSomething(void) {\n"
                               "    const std::string x = Bar();\n"  // <- warning
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:16:25]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:16:23]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:16:25]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
     }
 
@@ -3740,13 +3789,13 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo() {\n"
                               "  char buf1[10];\n"
                               "  dostuff(cond?buf1:buf2);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "  char buf1[10];\n"
                               "  dostuff(cond?buf2:buf1);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6542 - ternary operator
@@ -3754,7 +3803,7 @@ class TestUnusedVar : public TestFixture {
                               "  char buf1[10], buf2[10];\n"
                               "  char *p = c ? buf1 : buf2;\n"
                               "  dostuff(p);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3763,13 +3812,13 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo(const Token *var) {\n"
                               "  const Token *tok = nameToken();\n"
                               "  tok = tok->next();\n"  // read+write
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (style) Variable 'tok' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "  int x = 4;\n"
                               "  x = 15 + x;\n"  // read+write
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -3778,7 +3827,7 @@ class TestUnusedVar : public TestFixture {
                               "  std::vector<int> data;\n"
                               "  data[2] = 32;\n"
                               "  return data;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3791,7 +3840,7 @@ class TestUnusedVar : public TestFixture {
                               "      continue;\n"
                               "    }\n"
                               "  }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo(int a, int loop) {\n"
@@ -3803,7 +3852,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "  }\n"
                               "  return x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3811,7 +3860,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("Padding fun() {\n"
                               "  Distance d = DISTANCE;\n"
                               "  return (Padding){ d, d, d, d };\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3827,7 +3876,7 @@ class TestUnusedVar : public TestFixture {
                               "            data[x] = 0;\n"
                               "        }\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:6:15]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n",
                       errout_str());
@@ -3838,7 +3887,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int x = 31;\n"
                               "    mask[x] |= 123;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3847,7 +3896,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int x = 0;\n"
                               "    x++;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -3855,13 +3904,13 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    int x = 0;\n"
                               "    if (--x > 0) {}\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    int x = 0;\n"
                               "    if (x-- > 0) {}\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -3869,7 +3918,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("Response foo() {\n"
                               "    const std::vector<char> cmanifest = z;\n"
                               "    return {.a = cmanifest, .b =0};\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3879,7 +3928,7 @@ class TestUnusedVar : public TestFixture {
                               "        auto& p = m_points[i];\n"
                               "        p += scale;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(int c[]) {\n" // #10597
@@ -3915,8 +3964,7 @@ class TestUnusedVar : public TestFixture {
                               "    return i;\n"
                               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:18]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:2:16]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:2:18]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("int f() {\n"
@@ -3924,8 +3972,7 @@ class TestUnusedVar : public TestFixture {
                               "    return j;\n"
                               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:2:9]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:2:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void f() {\n" // #10846
@@ -3939,7 +3986,7 @@ class TestUnusedVar : public TestFixture {
                               "  int x=3;\n"             // <- set but not used
                               "  goto y;\n"
                               "  y:return;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -4049,12 +4096,42 @@ class TestUnusedVar : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void localvar72() {
+        functionVariableUsage("void f()\n"
+                              "{\n"
+                              "  struct S {};\n"
+                              "  int S::* mp;\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:12]: (style) Unused variable: mp [unusedVariable]\n", errout_str());
+    }
+
+    void localvar73() {
+        functionVariableUsage("struct S { S(); ~S(); };\n"
+                              "void f() {\n"
+                              "    auto a{ S() };\n"
+                              "    auto const &b{ S() };\n"
+                              "    const auto &&c{ S() };\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void localvar74() {
+        functionVariableUsage("struct S { void (*fp)(); };\n"
+                              "void g();\n"
+                              "void f() {\n"
+                              "    S s;\n"
+                              "    s.fp = g;\n"
+                              "    s.fp();\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void localvarloops() {
         // loops
         functionVariableUsage("void fun(int c) {\n"
                               "  int x;\n"
                               "  while (c) { x=10; }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void dostuff(int x);\n"
@@ -4064,7 +4141,7 @@ class TestUnusedVar : public TestFixture {
                               "    dostuff(x);\n"
                               "    if (y) { x=10; break; }\n"
                               "  }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:6:15]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void dostuff(int &x);\n"
@@ -4074,7 +4151,7 @@ class TestUnusedVar : public TestFixture {
                               "    dostuff(x);\n"
                               "    if (y) { x=10; break; }\n"
                               "  }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:6:15]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void fun() {\n"
@@ -4083,13 +4160,13 @@ class TestUnusedVar : public TestFixture {
                               "    dostuff(x);\n"
                               "    x = 10;\n"
                               "  }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void fun() {\n"
                               "  int x = 0;\n"
                               "  while (x < 10) { x = x + 1; }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void fun()\n"
@@ -4097,7 +4174,7 @@ class TestUnusedVar : public TestFixture {
                               "    int   status = 0;\n"
                               "    for (ind = 0; ((ind < nrArgs) && (status < 10)); ind++)\n"
                               "        status = x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f()\n"
@@ -4105,7 +4182,7 @@ class TestUnusedVar : public TestFixture {
                               "    int sum = 0U;\n"
                               "    for (i = 0U; i < 2U; i++)\n"
                               "        sum += 123;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (style) Variable 'sum' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:5:13]: (style) Variable 'sum' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
@@ -4170,20 +4247,18 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a;\n"
                               "    int *b = &a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n"
-                      "[test.cpp:4:10]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n",
                       errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int a[10];\n"
                               "    int *b = a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n"
-                      "[test.cpp:4:10]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n",
                       errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4191,7 +4266,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    int *b = &a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4201,7 +4276,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    char *b = (char *)&a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4211,7 +4286,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    char *b = (char *)(&a);\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4221,7 +4296,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    const char *b = (const char *)&a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4231,7 +4306,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    const char *b = (const char *)(&a);\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4241,7 +4316,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    char *b = static_cast<char *>(&a);\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4251,7 +4326,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    const char *b = static_cast<const char *>(&a);\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4261,20 +4336,18 @@ class TestUnusedVar : public TestFixture {
                               "void foo()\n"
                               "{\n"
                               "    int *b = &a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:12]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:4:10]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:4:12]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         // a is not a local variable and b is aliased to it
         functionVariableUsage("void foo(int a)\n"
                               "{\n"
                               "    int *b = &a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:12]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:10]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:12]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         // a is not a local variable and b is aliased to it
@@ -4285,10 +4358,9 @@ class TestUnusedVar : public TestFixture {
                               "    {\n"
                               "        int *b = &a;\n"
                               "    }\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS(
-            "[test.cpp:6:16]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:6:14]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:6:16]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("int a;\n"
@@ -4296,14 +4368,14 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int *b = &a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(int a)\n"
                               "{\n"
                               "    int *b = &a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class A\n"
@@ -4314,7 +4386,7 @@ class TestUnusedVar : public TestFixture {
                               "        int *b = &a;\n"
                               "        *b = 0;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4322,7 +4394,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    int *b = a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4332,7 +4404,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    char *b = (char *)a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4342,7 +4414,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    char *b = (char *)(a);\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4352,7 +4424,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    const char *b = (const char *)a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4362,7 +4434,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    const char *b = (const char *)(a);\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4372,7 +4444,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    char *b = static_cast<char *>(a);\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4382,7 +4454,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    const char *b = static_cast<const char *>(a);\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4392,7 +4464,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int *b = a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int a[10];\n"
@@ -4401,7 +4473,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = a;\n"
                               "    int *c = b;\n"
                               "    *c = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4409,7 +4481,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = a;\n"
                               "    int *c = b;\n"
                               "    *c = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4417,7 +4489,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = a;\n"
                               "    int *c = b;\n"
                               "    *c = b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int a[10];
@@ -4426,7 +4498,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = a;\n"
                               "    int c = b[0];\n"
                               "    x(c);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4434,7 +4506,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = a;\n"
                               "    int c = b[0];\n"
                               "    x(c);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int a[10];\n"
@@ -4442,28 +4514,28 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int *b = &a[0];\n"
                               "    a[0] = b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int *b = &a[0];\n"
                               "    a[0] = b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int *b = a;\n"
                               "    a[0] = b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(int a[10])\n"
                               "{\n"
                               "    int *b = a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class A\n"
@@ -4474,7 +4546,7 @@ class TestUnusedVar : public TestFixture {
                               "        int *b = a;\n"
                               "        *b = 0;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4483,7 +4555,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = a;\n"
                               "    int *c = b;\n"
                               "    *c = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (style) Variable 'a' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -4495,10 +4567,9 @@ class TestUnusedVar : public TestFixture {
                               "    int *c = a;\n"
                               "    int *d = b;\n"
                               "    *d = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n"
-                      "[test.cpp:5:10]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n",
                       errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4508,7 +4579,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *c = a;\n"
                               "    c = b;\n"
                               "    *c = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n",
                       errout_str());
 
@@ -4521,7 +4592,7 @@ class TestUnusedVar : public TestFixture {
                               "    *c = 0;\n"
                               "    c = a;\n"
                               "    *c = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:9]: (style) Variable 'a' is assigned a value that is never used.\n"
                            "[test.cpp:7]: (style) Variable 'b' is assigned a value that is never used.\n",
                            "",
@@ -4531,7 +4602,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10], * b = a + 10;\n"
                               "    b[-10] = 1;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'b[-10]' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -4541,11 +4612,10 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10], * b = a + 10;\n"
                               "    b[-10] = 0;\n"
                               "    int * c = b - 10;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS(
             "[test.cpp:4:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
-            "[test.cpp:5:13]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:5:11]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:5:13]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4553,7 +4623,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10], * b = a + 10;\n"
                               "    int * c = b - 10;\n"
                               "    c[1] = 3;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'c[1]' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -4563,7 +4633,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10], * b = a + 10;\n"
                               "    int * c = b - 10;\n"
                               "    c[1] = c[0];\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'c[1]' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -4574,7 +4644,7 @@ class TestUnusedVar : public TestFixture {
                               "    b[0] = &a[0];\n"
                               "    int *d = b[0];\n"
                               "    return *d;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n" // #4022 - FP (a is assigned a value that is never used)
@@ -4583,7 +4653,7 @@ class TestUnusedVar : public TestFixture {
                               "    b[0] = &a[0];\n"
                               "    int d = b[0].value;\n"
                               "    return d;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct S { char c[100]; };\n"
@@ -4592,7 +4662,7 @@ class TestUnusedVar : public TestFixture {
                               "    char a[100];\n"
                               "    struct S * s = (struct S *)a;\n"
                               "    s->c[0] = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct S { char c[100]; };\n"
@@ -4600,10 +4670,9 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    char a[100];\n"
                               "    struct S * s = (struct S *)a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:18]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:4:10]: (style) Unused variable: a [unusedVariable]\n"
-                      "[test.cpp:5:16]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:4:10]: (style) Unused variable: a [unusedVariable]\n",
                       errout_str());
 
         functionVariableUsage("struct S { char c[100]; };\n"
@@ -4611,10 +4680,9 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    char a[100];\n"
                               "    const struct S * s = (const struct S *)a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:24]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:4:10]: (style) Unused variable: a [unusedVariable]\n"
-                      "[test.cpp:5:22]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:4:10]: (style) Unused variable: a [unusedVariable]\n",
                       errout_str());
 
         functionVariableUsage("struct S { char c[100]; };\n"
@@ -4622,10 +4690,9 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    char a[100];\n"
                               "    struct S * s = static_cast<struct S *>(a);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:18]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:4:10]: (style) Unused variable: a [unusedVariable]\n"
-                      "[test.cpp:5:16]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:4:10]: (style) Unused variable: a [unusedVariable]\n",
                       errout_str());
 
         functionVariableUsage("struct S { char c[100]; };\n"
@@ -4633,10 +4700,9 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    char a[100];\n"
                               "    const struct S * s = static_cast<const struct S *>(a);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:24]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:4:10]: (style) Unused variable: a [unusedVariable]\n"
-                      "[test.cpp:5:22]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:4:10]: (style) Unused variable: a [unusedVariable]\n",
                       errout_str());
 
         functionVariableUsage("int a[10];\n"
@@ -4649,7 +4715,7 @@ class TestUnusedVar : public TestFixture {
                               "    d = a;\n"
                               "    d = c;\n"
                               "    *d = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (style) Unused variable: b [unusedVariable]\n",
                       errout_str());
 
@@ -4662,7 +4728,7 @@ class TestUnusedVar : public TestFixture {
                               "    d = b; *d = 0;\n"
                               "    d = a; *d = 0;\n"
                               "    d = c; *d = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:7]: (style) Variable 'b' is assigned a value that is never used.\n"
                            "[test.cpp:9]: (style) Variable 'c' is assigned a value that is never used.\n",
                            "",
@@ -4674,7 +4740,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int * a;\n"
                               "    x(a);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4685,7 +4751,7 @@ class TestUnusedVar : public TestFixture {
                               "    char          szDisplayName[MAX_PATH];\n"
                               "    info.pszDisplayName = szDisplayName;\n"
                               "    SHBrowseForFolder(&info);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4694,10 +4760,9 @@ class TestUnusedVar : public TestFixture {
                               "void foo()\n"
                               "{\n"
                               "    int * a = &ab.a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:4:11]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:4:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("struct AB { int a; int b; } ab;\n"
@@ -4705,7 +4770,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int * a = &ab.a;\n"
                               "    *a = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct AB { int a; int b; };\n"
@@ -4713,10 +4778,9 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    struct AB ab;\n"
                               "    int * a = &ab.a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:4:15]: (style) Variable 'ab' is not assigned a value. [unassignedVariable]\n"
-                      "[test.cpp:5:11]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:4:15]: (style) Variable 'ab' is not assigned a value. [unassignedVariable]\n",
                       errout_str());
 
         functionVariableUsage("struct AB { int a; int b; };\n"
@@ -4725,7 +4789,7 @@ class TestUnusedVar : public TestFixture {
                               "    struct AB ab;\n"
                               "    int * a = &ab.a;\n"
                               "    *a = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4736,7 +4800,7 @@ class TestUnusedVar : public TestFixture {
                               "    char *p = &buf[0];\n"
                               "    *p++ = 0;\n"
                               "    return buf[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("char foo()\n"
@@ -4745,7 +4809,7 @@ class TestUnusedVar : public TestFixture {
                               "    char *p = &buf[1];\n"
                               "    *p-- = 0;\n"
                               "    return buf[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("char foo()\n"
@@ -4754,7 +4818,7 @@ class TestUnusedVar : public TestFixture {
                               "    char *p = &buf[0];\n"
                               "    *++p = 0;\n"
                               "    return buf[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("char foo()\n"
@@ -4763,7 +4827,7 @@ class TestUnusedVar : public TestFixture {
                               "    char *p = &buf[1];\n"
                               "    *--p = 0;\n"
                               "    return buf[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4780,7 +4844,7 @@ class TestUnusedVar : public TestFixture {
                               "        srcdata = vdata;\n"
                               "    }\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4793,7 +4857,7 @@ class TestUnusedVar : public TestFixture {
                               "        srcdata = vdata;\n"
                               "    }\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (style) Variable 'buf' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -4808,7 +4872,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    srcdata = vdata;\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (style) Variable 'buf' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -4822,7 +4886,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    srcdata = vdata;\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Unused variable: buf [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4834,7 +4898,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    srcdata = buf;\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4849,7 +4913,7 @@ class TestUnusedVar : public TestFixture {
                               "        srcdata = vdata;\n"
                               "    }\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4863,7 +4927,7 @@ class TestUnusedVar : public TestFixture {
                               "        srcdata = vdata;\n"
                               "    }\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:7]: (style) Variable 'buf' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -4879,7 +4943,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    srcdata = vdata;\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:7]: (style) Variable 'buf' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -4894,7 +4958,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    srcdata = vdata;\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Unused variable: buf [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4907,7 +4971,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    srcdata = buf;\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (style) Unused variable: vdata [unusedVariable]\n", errout_str());
     }
 
@@ -4918,7 +4982,7 @@ class TestUnusedVar : public TestFixture {
                               "    char **cp;\n"
                               "    cp = c;\n"
                               "    *cp = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4939,7 +5003,7 @@ class TestUnusedVar : public TestFixture {
                               "    else\n"
                               "        pb = b4;\n"
                               "    b(pb);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4960,7 +5024,7 @@ class TestUnusedVar : public TestFixture {
                               "        pb = b4;\n"
                               "    }\n"
                               "    b(pb);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4983,7 +5047,7 @@ class TestUnusedVar : public TestFixture {
                               "        pb = b4;\n"
                               "    }\n"
                               "    b(pb);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -5002,7 +5066,7 @@ class TestUnusedVar : public TestFixture {
                               "        pb = b3;\n"
                               "    pb = b4;\n"
                               "    b(pb);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Unused variable: b1 [unusedVariable]\n"
                       "[test.cpp:4:10]: (style) Unused variable: b2 [unusedVariable]\n"
                       "[test.cpp:5:10]: (style) Unused variable: b3 [unusedVariable]\n", errout_str());
@@ -5027,7 +5091,7 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "    }\n"
                               "    b(pb);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -5052,7 +5116,7 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "    }\n"
                               "    b(pb);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -5079,7 +5143,7 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "    }\n"
                               "    b(pb);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -5101,7 +5165,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    pb = b4;\n"
                               "    b(pb);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Unused variable: b1 [unusedVariable]\n"
                       "[test.cpp:4:10]: (style) Unused variable: b2 [unusedVariable]\n"
                       "[test.cpp:5:10]: (style) Unused variable: b3 [unusedVariable]\n", errout_str());
@@ -5113,7 +5177,7 @@ class TestUnusedVar : public TestFixture {
                               "    Foo foo;\n"
                               "    Foo &ref = foo;\n"
                               "    ref[0] = 123;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5123,7 +5187,7 @@ class TestUnusedVar : public TestFixture {
                               "    Foo &ref = foo;\n"
                               "    int *x = &ref.x();\n"
                               "    *x = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5131,7 +5195,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f(Foo &foo) {\n"
                               "    std::set<int>::iterator x = foo.dostuff();\n"
                               "    *(x) = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5140,14 +5204,14 @@ class TestUnusedVar : public TestFixture {
                               "    int a[4];\n"
                               "    int *b = (int*)((int*)a+1);\n"
                               "    x(b);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int f(void) {\n" // #4628
                               "    int x=1,y;\n"
                               "    y = (x * a) / 100;\n"
                               "    return y;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5156,14 +5220,14 @@ class TestUnusedVar : public TestFixture {
                               "    char a[4];\n"
                               "    p = a;\n"
                               "    strcpy(p, \"x\");\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(char *p) {\n"
                               "    char a[4];\n"
                               "    p = a;\n"
                               "    strcpy(p, \"x\");\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("a is assigned value that is never used", "", errout_str());
     }
 
@@ -5172,20 +5236,20 @@ class TestUnusedVar : public TestFixture {
                               "void f() {\n"
                               "    char a[4], *p=a;\n"
                               "    p = dostuff(p);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Variable 'p' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("char * dostuff(char *&p);\n"
                               "void f() {\n"
                               "    char a[4], *p=a;\n"
                               "    p = dostuff(p);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str()); // TODO: we can warn in this special case; variable is local and there are no function calls after the assignment
 
         functionVariableUsage("void f() {\n"
                               "    char a[4], *p=a;\n"
                               "    p = dostuff(p);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str()); // TODO: we can warn in this special case; variable is local and there are no function calls after the assignment
     }
 
@@ -5195,7 +5259,7 @@ class TestUnusedVar : public TestFixture {
                               "  int *p = &x;\n"
                               "  int *p2[1] = {p};\n"
                               "  dostuff(p2);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5204,7 +5268,7 @@ class TestUnusedVar : public TestFixture {
                               "  auto x = dostuff();\n"
                               "  p = x;\n"
                               "  x->data[0] = 9;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5213,7 +5277,7 @@ class TestUnusedVar : public TestFixture {
                               "  int x;\n"
                               "  unknown_type p = &x;\n"
                               "  *p = 9;\n"
-                              "}", dinit(FunctionVariableUsageOptions, $.cpp = false));
+                              "}\n", dinit(FunctionVariableUsageOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5229,7 +5293,7 @@ class TestUnusedVar : public TestFixture {
                               "            break;\n"
                               "        }\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(const std::vector<int>& v) {\n" // #13303
@@ -5318,7 +5382,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    asm();\n"
                               "    b = a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5327,7 +5391,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    static const struct{ int x, y, w, h; } bounds = {1,2,3,4};\n"
                               "    return bounds.x + bounds.y + bounds.w + bounds.h;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5336,10 +5400,9 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    struct ABC { int a, b, c; };\n"
                               "    struct ABC abc = { 1, 2, 3 };\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:20]: (style) Variable 'abc' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:4:16]: (style) Variable 'abc' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:4:20]: (style) Variable 'abc' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
     }
 
@@ -5351,7 +5414,7 @@ class TestUnusedVar : public TestFixture {
                               "    do {\n"
                               "        func();\n"
                               "    } while(a--);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (style) Unused variable: x\n"
                            "[test.cpp:4]: (style) Unused variable: z\n", "", errout_str());
     }
@@ -5361,13 +5424,13 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("int foo() {\n"
                               "    A a;\n"
                               "    return a.i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n"
@@ -5382,7 +5445,7 @@ class TestUnusedVar : public TestFixture {
                               "int foo() {\n"
                               "    A a;\n"
                               "    return a.i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct A { int i; };\n"
@@ -5390,17 +5453,16 @@ class TestUnusedVar : public TestFixture {
                               "    A a;\n"
                               "    a.i = 0;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (style) Variable 'a.i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("struct A { int i; };\n"
                               "int foo() {\n"
                               "    A a = { 0 };\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:9]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:7]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:9]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         // extracttests.disable
@@ -5408,10 +5470,9 @@ class TestUnusedVar : public TestFixture {
                               "int foo() {\n"
                               "    A a = { 0 };\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:9]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:7]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:9]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         // extracttests.enable
@@ -5419,42 +5480,42 @@ class TestUnusedVar : public TestFixture {
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct A { int i; };\n"
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (style) Unused variable: a [unusedVariable]\n", errout_str());
 
         functionVariableUsage("class A { int i; };\n"
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (style) Unused variable: a [unusedVariable]\n", errout_str());
 
         functionVariableUsage("class A { int i; public: A(); { } };\n"
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class A { unknown i; };\n"
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class A : public Fred { int i; };\n"
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class Fred {char c;};\n"
@@ -5462,7 +5523,7 @@ class TestUnusedVar : public TestFixture {
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Unused variable: a [unusedVariable]\n", errout_str());
     }
 
@@ -5473,7 +5534,7 @@ class TestUnusedVar : public TestFixture {
                               "    Type & get() { return t; }\n"
                               "private:\n"
                               "    Type t;\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5487,7 +5548,7 @@ class TestUnusedVar : public TestFixture {
                               "  args = &aatt;\n"
                               "  aatt.text = tmp;\n"
                               "  dostuff(args);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: void dostuff(int*);
@@ -5501,7 +5562,7 @@ class TestUnusedVar : public TestFixture {
                               "  int *p = &aatt.b;\n"
                               "  aatt.a = 123;\n"
                               "  dostuff(p);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:9:10]: (style) Variable 'aatt.a' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("struct AB {\n"
@@ -5514,7 +5575,7 @@ class TestUnusedVar : public TestFixture {
                               "  int &a = ab.a;\n"
                               "  ab.a = 123;\n"
                               "  dostuff(a);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5533,7 +5594,7 @@ class TestUnusedVar : public TestFixture {
                               "      struct s test;\n"
                               "      test.raw = 0x100;\n"
                               "      dostuff(test.fld1, test.fld2);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5543,7 +5604,7 @@ class TestUnusedVar : public TestFixture {
                               "void foo() {\n"
                               "      struct XY xy(get());\n"
                               "      return xy.x + xy.y;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5554,7 +5615,7 @@ class TestUnusedVar : public TestFixture {
                               "    struct S s;\n"
                               "    s.x = 3;\n"
                               "    memcpy (&s, &s2, sizeof (S));\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (style) Variable 's.x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -5566,7 +5627,7 @@ class TestUnusedVar : public TestFixture {
                               "    Point p;\n"
                               "    p.x = 42;\n"
                               "    return scale(&p).y;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5576,7 +5637,7 @@ class TestUnusedVar : public TestFixture {
                               "void Set() {\n"
                               "    S s;\n"
                               "    s.Ref() = true;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5615,10 +5676,34 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    struct X x[10];\n"
                               "    x[0].a = 5;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (style) Variable 'x[0].a' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
+    void localvarOverloadedSubscript() {
+        functionVariableUsage("struct A { B &operator [](size_t i); }\n"
+                              "struct B { int x; };\n"
+                              "void f(B *b) {\n"
+                              "    A a(b);\n"
+                              "    a[0].b = 0;\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("struct S {\n" // #9995
+                              "    int& operator[](int i) { return r[i]; }\n"
+                              "    std::map<int, int>& r;\n"
+                              "};\n"
+                              "struct T {\n"
+                              "    std::map<int, int>& m;\n"
+                              "    S get() { return { m }; }\n"
+                              "};\n"
+                              "void f(T& t) {\n"
+                              "    S s = t.get();\n"
+                              "    s[1] = 0;\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void localvarUnion1() {
         // #9707
         functionVariableUsage("static short read(FILE *fp) {\n"
@@ -5627,7 +5712,7 @@ class TestUnusedVar : public TestFixture {
                               "    x.c[0] = fgetuc(fp);\n"
                               "    x.c[1] = fgetuc(fp);\n"
                               "    return x.s;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5638,7 +5723,7 @@ class TestUnusedVar : public TestFixture {
                              "{\n"
                              "    int tmp = 10;\n"
                              "    return 123 " + std::string(1, *p) + " tmp;\n"
-                             "}");
+                             "}\n");
             functionVariableUsage(code.c_str());
             ASSERT_EQUALS("", errout_str());
         }
@@ -5649,7 +5734,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int tmp = 10;\n"
                               "    return ~tmp;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5660,7 +5745,7 @@ class TestUnusedVar : public TestFixture {
                               "    if ( tmp )\n"
                               "        return 1;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("bool argsMatch(const Token *first, const Token *second) {\n" // #6145
@@ -5688,7 +5773,7 @@ class TestUnusedVar : public TestFixture {
                               "    int tmp2 = 2;\n"
                               "    int tmp3 = 3;\n"
                               "    return tmp1 ? tmp2 : tmp3;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5699,10 +5784,9 @@ class TestUnusedVar : public TestFixture {
                               "        return 2;\n"
                               "    else\n"
                               "        return 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:15]: (style) Variable 'y' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:13]: (style) Variable 'y' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:15]: (style) Variable 'y' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("int foo(int x)\n"
@@ -5711,7 +5795,7 @@ class TestUnusedVar : public TestFixture {
                               "        return y;\n"
                               "    else\n"
                               "        return 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo(int x)\n"
@@ -5720,7 +5804,7 @@ class TestUnusedVar : public TestFixture {
                               "        return 2;\n"
                               "    else\n"
                               "        return y;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int f(int i) {\n" // #11788
@@ -5761,14 +5845,14 @@ class TestUnusedVar : public TestFixture {
                               "    int a = 1;\n"
                               "    int b = 2;\n"
                               "    a |= b;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:5:7]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "    int a = 1;\n"
                               "    (b).x += a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n"
@@ -5776,7 +5860,7 @@ class TestUnusedVar : public TestFixture {
                               "    b[0] = x;\n"
                               "    a += b[0];\n"
                               "    return a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(int *start, int *stop) {\n"
@@ -5784,14 +5868,14 @@ class TestUnusedVar : public TestFixture {
                               "  if (length < 10000)\n"
                               "    length = 10000;\n"
                               "  *stop -= length;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(int a) {\n"
                               "  int x = 3;\n"
                               "  a &= ~x;\n"
                               "  return a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.disable
@@ -5799,14 +5883,14 @@ class TestUnusedVar : public TestFixture {
                               "  Fred fred;\n"
                               "  int *a; a = b;\n"
                               "  fred += a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (information) --check-library: Provide <type-checks><unusedvar> configuration for Fred [checkLibraryCheckType]\n", errout_str());
         // extracttests.enable
 
         functionVariableUsage("void f(std::pair<int,int> x) {\n"
                               "  std::pair<int,int> fred;\n"  // class with library configuration
                               "  fred = x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8]: (style) Variable 'fred' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -5815,13 +5899,29 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a = 1;\n"
                               "    for (;a;);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "    for (int i = 0; (pci = cdi_list_get(pciDevices, i)); i++)\n"
                               "    {}\n"
-                              "}");
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("void f(const int* b, int x) {\n" // #11125
+                              "    int a[6];\n"
+                              "    int i = 0;\n"
+                              "    for (int j = 0; j < 6; ++j) {\n"
+                              "        if (b[j] != 0) {\n"
+                              "            a[i] = j;\n"
+                              "            ++i;\n"
+                              "        }\n"
+                              "    }\n"
+                              "    if (i > 1) {\n"
+                              "        a[i] = a[0];\n"
+                              "        (void)a[x];\n"
+                              "    }\n"
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5833,7 +5933,7 @@ class TestUnusedVar : public TestFixture {
                               "        if (i==x) return x;\n"
                               "        i = x;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5154 - MSVC 'for each'
@@ -5841,7 +5941,7 @@ class TestUnusedVar : public TestFixture {
                               "  std::map<int,int> ints;\n"
                               "  ints[0]= 1;\n"
                               "  for each(std::pair<int,int> i in ints) { x += i.first; }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5850,7 +5950,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int var = 1;\n"
                               "    return 1 >> var;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5859,14 +5959,14 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    QList<int *> ints;\n"
                               "    ints << 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n" // #4320
                               "    int x;\n"
                               "    x << 1;\n"
                               "    return x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5876,7 +5976,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a = 1;\n"
                               "    int b = static_cast<int>(a);\n"
                               "    return b;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5887,7 +5987,7 @@ class TestUnusedVar : public TestFixture {
                               "        int a;\n"
                               "        int f() { return a; }\n"
                               "    } b;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5895,45 +5995,51 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool test __attribute__((unused));\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool test __attribute__((unused)) = true;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool __attribute__((unused)) test;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool __attribute__((unused)) test = true;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool test __attribute__((used));\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool __attribute__((used)) test;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    char a[1] __attribute__((unused));\n"
                               "    char b[1][2] __attribute__((unused));\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("int foo()\n"
+                              "{\n"
+                              "    int x __attribute__((unused)), y;\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:36]: (style) Unused variable: y [unusedVariable]\n", errout_str());
     }
 
     void localvarFunction() {
@@ -5943,7 +6049,7 @@ class TestUnusedVar : public TestFixture {
                               "  function_type fn;\n"
                               "  fn = reinterpret_cast<function_type>(dlsym(h, \"try_allocation\"));\n"
                               "  fn();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5954,7 +6060,7 @@ class TestUnusedVar : public TestFixture {
                               "    static const int ci;\n"
                               "    static std::string s;\n"
                               "    static const std::string cs;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) Unused variable: i [unusedVariable]\n"
                       "[test.cpp:4:22]: (style) Unused variable: ci [unusedVariable]\n"
                       "[test.cpp:5:24]: (style) Unused variable: s [unusedVariable]\n"
@@ -5964,14 +6070,14 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    static int i = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
                       errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    static int i(0);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -5980,7 +6086,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    static int j = 0;\n"
                               "    static int i(j);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:10]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -5992,7 +6098,7 @@ class TestUnusedVar : public TestFixture {
                               "    static int c[] = { 5, 6, 7, 8 };\n"
                               "    b[1] = 1;\n"
                               "    return x ? a : c;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6:16]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -6002,7 +6108,7 @@ class TestUnusedVar : public TestFixture {
                               "    static int i = 0;\n"
                               "    if(i < foo())\n"
                               "        i += 5;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n"
@@ -6012,14 +6118,14 @@ class TestUnusedVar : public TestFixture {
                               "        x = 0;\n"
                               "    else\n"
                               "        x++;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(int value) {\n"
                               "    static int array[16] = {0};\n"
                               "    if(array[value]) {}\n"
                               "    array[value] = 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int fun() {\n" // #11310
@@ -6044,7 +6150,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo() {\n"
                               "    extern int i;\n"
                               "    i = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6053,14 +6159,14 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    void* ptr = malloc(16);\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char* ptr = new char[16];\n"
                               "    delete[] ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         // extracttests.disable
@@ -6069,14 +6175,14 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    char* ptr = new ( nothrow ) char[16];\n"
                               "    delete[] ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char* ptr = new ( std::nothrow ) char[16];\n"
                               "    delete[] ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         // extracttests.enable
@@ -6085,7 +6191,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    char* ptr = new char;\n"
                               "    delete ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -6093,7 +6199,7 @@ class TestUnusedVar : public TestFixture {
                               "    void* ptr = malloc(16);\n"
                               "    ptr[0] = 123;\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -6101,7 +6207,7 @@ class TestUnusedVar : public TestFixture {
                               "    char* ptr = new char[16];\n"
                               "    ptr[0] = 123;\n"
                               "    delete[] ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -6109,7 +6215,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* fred = new Fred;\n"
                               "    std::cout << \"test\" << std::endl;\n"
                               "    delete fred;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct Fred { int a; };\n"
@@ -6118,7 +6224,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* fred = new Fred;\n"
                               "    std::cout << \"test\" << std::endl;\n"
                               "    delete fred;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Variable 'fred' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("struct Fred { int a; Fred() : a(0) {} };\n"
@@ -6127,7 +6233,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* fred = new Fred;\n"
                               "    std::cout << \"test\" << std::endl;\n"
                               "    delete fred;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Variable 'fred' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -6135,7 +6241,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* fred = malloc(sizeof(Fred));\n"
                               "    std::cout << \"test\" << std::endl;\n"
                               "    free(fred);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (style) Variable 'fred' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
 
@@ -6143,7 +6249,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    char* ptr = names[i];\n"
                               "    delete[] ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6153,7 +6259,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    Fred* ptr = (Fred*)malloc(sizeof(Fred));\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:31]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
@@ -6162,7 +6268,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* ptr = (Fred*)malloc(sizeof(Fred));\n"
                               "    ptr->i = 0;\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
@@ -6170,7 +6276,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    struct Fred* ptr = (Fred*)malloc(sizeof(Fred));\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:38]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
@@ -6179,7 +6285,7 @@ class TestUnusedVar : public TestFixture {
                               "    struct Fred* ptr = (Fred*)malloc(sizeof(Fred));\n"
                               "    ptr->i = 0;\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
@@ -6187,7 +6293,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    Fred* ptr = new Fred();\n"
                               "    delete ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         // extracttests.disable
@@ -6197,7 +6303,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    Fred* ptr = new (nothrow ) Fred();\n"
                               "    delete ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
@@ -6205,7 +6311,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    Fred* ptr = new (std::nothrow) Fred();\n"
                               "    delete ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         // extracttests.enable
@@ -6216,7 +6322,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* ptr = new Fred();\n"
                               "    ptr->i = 0;\n"
                               "    delete ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
@@ -6224,7 +6330,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    struct Fred* ptr = new Fred();\n"
                               "    delete ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
@@ -6233,7 +6339,7 @@ class TestUnusedVar : public TestFixture {
                               "    struct Fred* ptr = new Fred();\n"
                               "    ptr->i = 0;\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class Fred { public: int i; };\n"
@@ -6241,7 +6347,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    Fred* ptr = (Fred*)malloc(sizeof(Fred));\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:31]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("class Fred { public: int i; };\n"
@@ -6250,7 +6356,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* ptr = (Fred*)malloc(sizeof(Fred));\n"
                               "    ptr->i = 0;\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class Fred { public: int i; };\n"
@@ -6258,7 +6364,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    Fred* ptr = new Fred();\n"
                               "    delete ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("class Fred { public: int i; };\n"
@@ -6267,7 +6373,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* ptr = new Fred();\n"
                               "    ptr->i = 0;\n"
                               "    delete ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6278,7 +6384,7 @@ class TestUnusedVar : public TestFixture {
                               "    int* p = data;\n"
                               "    for ( int i = 0; i < 10; ++i )\n"
                               "        p++;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'p' is modified but its new value is never used.\n",
                            "",
                            errout_str());
@@ -6288,7 +6394,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo() {\n"
                               "    int p[5];\n"
                               "    *p = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6297,7 +6403,7 @@ class TestUnusedVar : public TestFixture {
                               "    int p[5][5];\n"
                               "    p[0][0] = 0;\n"
                               "    return p[0][0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6306,7 +6412,7 @@ class TestUnusedVar : public TestFixture {
                               "    int p[5][5];\n"
                               "    *((int*)p[0]) = 0;\n"
                               "    return p[0][0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6316,7 +6422,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *pp[0];\n"
                               "    p[0] = 1;\n"
                               "    *pp[0] = p[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6324,24 +6430,24 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("int foo() {\n"
                               "    int p[5][5];\n"
                               "    dostuff(*p);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n"
                               "    int p[5];\n"
                               "    dostuff(*p);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n"
                               "    int p[5][5][5];\n"
                               "    dostuff(**p);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n" // #11872
                               "    char v[1][2];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Unused variable: v [unusedVariable]\n", errout_str());
     }
 
@@ -6359,51 +6465,49 @@ class TestUnusedVar : public TestFixture {
     void localvarstring1() { // ticket #1597
         functionVariableUsage("void foo() {\n"
                               "    std::string s;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Unused variable: s [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "    std::string s;\n"
                               "    s = \"foo\";\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "    std::string s = \"foo\";\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:19]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:2:17]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:2:19]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo() {\n" // #8901
                               "    const std::string s = \"foo\";\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:25]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:2:23]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:2:25]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("std::string foo() {\n"
                               "    std::string s;\n" // Class instances are initialized. Assignment is not necessary
                               "    return s;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("std::string foo() {\n"
                               "    std::string s = \"foo\";\n"
                               "    return s;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::string s(\"foo\");\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::string s{ \"foo\" };\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -6411,7 +6515,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo() {\n"
                               "    std::string s;\n"
                               "    int i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Unused variable: s [unusedVariable]\n"
                       "[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", errout_str());
     }
@@ -6419,10 +6523,9 @@ class TestUnusedVar : public TestFixture {
     void localvarconst1() {
         functionVariableUsage("void foo() {\n"
                               "    const bool b = true;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:18]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:2:16]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:2:18]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
     }
 
@@ -6430,7 +6533,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo() {\n"
                               "    const int N = 10;\n"
                               "    struct X { int x[N]; };\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6445,27 +6548,27 @@ class TestUnusedVar : public TestFixture {
                               "        bar() {}\n"
                               "    };\n"
                               "    return MyInt;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void localvarmaybeunused() {
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] int x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("[[nodiscard]] int getX() { return 4; }\n"
                               "int main() {\n"
                               "    [[maybe_unused]] int x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("[[nodiscard]] int getX() { return 4; }\n"
                               "int main() {\n"
                               "    [[maybe_unused]] int x = getX();\n"
                               "    x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("[[nodiscard]] int getX() { return 4; }\n"
@@ -6473,72 +6576,72 @@ class TestUnusedVar : public TestFixture {
                               "    [[maybe_unused]] int x = getX();\n"
                               "    x = getX();\n"
                               "    std::cout << x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] const int x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] const int& x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] const int* x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] int& x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] int* x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] auto x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] auto&& x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] int x[] = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] constexpr volatile static int x = 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        functionVariableUsage("[[maybe_unused]] inline int x = 1;");
+        functionVariableUsage("[[maybe_unused]] inline int x = 1;\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] [[anotherattribute]] const int* = 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] char a[1];\n"
                               "    [[maybe_unused]] char b[1][2];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    std::string a [[maybe_unused]];\n"
                               "    f();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6551,11 +6654,21 @@ class TestUnusedVar : public TestFixture {
         ASSERT_EQUALS("[test.cpp:3:21]: (style) Variable 'm' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
+    void localvarreferencearray() { // ticket #14637
+        functionVariableUsage("int f() {\n"
+                              "        int a[1];\n"
+                              "        int(&r)[1] = a;\n"
+                              "        r[0] = 0;\n"
+                              "        return r[0];\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void localvarthrow() { // ticket #3687
         functionVariableUsage("void foo() {\n"
-                              "    try {}"
+                              "    try {}\n"
                               "    catch(Foo& bar) {}\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6564,41 +6677,40 @@ class TestUnusedVar : public TestFixture {
 
         functionVariableUsage("void f() {\n"
                               "    std::string x = foo();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:19]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:2:17]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:2:19]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::vector<int> x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (style) Unused variable: x [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::vector<int> x(100);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::vector<MyClass> x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:26]: (style) Unused variable: x [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::lock_guard<MyClass> lock(mutex_);\n" // Has a side-effect #4385
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    pLocker = std::shared_ptr<jfxLocker>(new jfxLocker(m_lock, true));\n" // Could have side-effects (#4355)
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::mutex m;\n"
                               "    std::unique_lock<std::mutex> lock(m);\n" // #4624
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n" // #7732
@@ -6642,13 +6754,13 @@ class TestUnusedVar : public TestFixture {
     void localVarClass() {
         functionVariableUsage("void f() {\n"
                               "    Fred f;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class C { int x; };\n"
                               "void f() {\n"
                               "    C c;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         functionVariableUsage("class ExampleClass\n" // #10000
@@ -6671,13 +6783,41 @@ class TestUnusedVar : public TestFixture {
                               "void foo()\n"
                               "{\n"
                               "   ExampleClass ex(1, 2, 3, 4);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:20:19]: (style) Variable 'ex' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("class C { public: C(int); ~C(); };\n"
                               "void f() {\n"
                               "    C c(12);\n"
-                              "}");
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #14643
+        functionVariableUsage("class S { S(int); };\n"
+                              "void f() { S s = 0; }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #10965
+        functionVariableUsage("class A {\n"
+                              "public:\n"
+                              "    A();\n"
+                              "};\n"
+                              "extern A cb();\n"
+                              "void f() { const A c = cb(); }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #11704
+        functionVariableUsage("class S {\n"
+                              "public:\n"
+                              "    S();\n"
+                              "};\n"
+                              "class C {\n"
+                              "    S &s();\n"
+                              "    void f() {\n"
+                              "        const S s1 = s(); // warning\n"
+                              "        const S s2; // no warning\n"
+                              "    }\n"
+                              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6708,7 +6848,7 @@ class TestUnusedVar : public TestFixture {
                               "    auto a2 = std::unique_ptr<A>(new A());\n"
                               "}\n");
         ASSERT_EQUALS("[test.cpp:7:12]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:8:13]: (style) Variable 'a2' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:8:13]: (style) Variable 'a2' is assigned a value that is never used. [unreadVariable]\n",
                       errout_str());
 
         functionVariableUsage("void g();\n" // #11094
@@ -6734,6 +6874,13 @@ class TestUnusedVar : public TestFixture {
                               "    p = nullptr;\n"
                               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("struct S { S(); };\n" // #14160
+                              "void f() {\n"
+                              "    auto p = std::make_unique<S>();\n"
+                              "    auto q = std::make_unique<U>();\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     // ticket #3104 - false positive when variable is read with "if (NOT var)"
@@ -6741,7 +6888,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    bool x = foo();\n"
                               "    if (NOT x) { }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6751,7 +6898,7 @@ class TestUnusedVar : public TestFixture {
                               "    if (m_errorflags & flag) {\n"
                               "        return 1;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6765,7 +6912,7 @@ class TestUnusedVar : public TestFixture {
                               "        default: ptr=def; break;\n"
                               "    }\n"
                               "    return ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str()); // Don't write an error that "a" is not used
 
         functionVariableUsage("void x() {\n"
@@ -6783,7 +6930,7 @@ class TestUnusedVar : public TestFixture {
                               "    for (iIndice = 1; iIndice <= (pnodeCurrent->usLen / 2); iIndice++) {\n"
                               "        *pcData = gacHexChar[(*pcOctet >> 4) & 0x0F];\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str()); // Don't write an error that "fValeur" is not used
     }
 
@@ -6793,13 +6940,13 @@ class TestUnusedVar : public TestFixture {
                               "    foo(p);\n"
                               "    free(p);\n"
                               "    p = NULL;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(Foo *p) {\n"
                               "    free(p);\n"
                               "    p = (Foo *)NULL;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n" // #11079
@@ -6840,7 +6987,7 @@ class TestUnusedVar : public TestFixture {
                               "    goto label;\n"
                               " }\n"
                               " return false;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:7]: (style) Variable 'X' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         // #4558
@@ -6853,7 +7000,7 @@ class TestUnusedVar : public TestFixture {
                               " if (i<3)\n"
                               "     goto start;\n"
                               " return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6861,14 +7008,14 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("int foo() {\n"
                               "    auto f = []{return 1};\n"
                               "    return f();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n"
                               "    auto f = []{return 1};\n"
                               "    auto g = []{return 1};\n"
                               "    return f() + g();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(std::vector<int>& v) {\n"
@@ -6878,7 +7025,7 @@ class TestUnusedVar : public TestFixture {
                               "        n += 2;\n"
                               "        return r;\n"
                               "    });\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int f() {\n" // #8433
@@ -6918,11 +7065,21 @@ class TestUnusedVar : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void localvarPtrToPtr() {
+        functionVariableUsage("int main() {\n"
+                              "  int *p, **pp = &p;\n"
+                              "  int i = 123;\n"
+                              "  *pp = &i;\n"
+                              "  return *p;\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void localvarCppInitialization() {
         functionVariableUsage("void foo() {\n"
                               "    int buf[6];\n"
                               "    Data data(buf);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (information) --check-library: Provide <type-checks><unusedvar> configuration for Data [checkLibraryCheckType]\n", errout_str());
     }
 
@@ -6931,7 +7088,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo() {\n"
                               "    int myNewValue{ 3u };\n"
                               "    myManager.theDummyTable.addRow(UnsignedIndexValue{ myNewValue }, DummyRowData{ false });\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
@@ -6950,7 +7107,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void reset() {\n"
                               "    for (auto & e : array)\n"
                               "        e = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6960,13 +7117,13 @@ class TestUnusedVar : public TestFixture {
                               "  do {\n"
                               "    dostuff(a);\n"
                               "  } while((a += x) < 30);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n"
                               "    int var = 1;\n"
                               "    while (var = var >> 1) { }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6975,13 +7132,13 @@ class TestUnusedVar : public TestFixture {
                               "void foo() {\n"
                               "  const int x = 0;\n"
                               "  f<x>();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "  constexpr std::size_t ArraySize(5);\n"
                               "  std::array<int, ArraySize> X; X.dostuff();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n" // #10686
@@ -7008,29 +7165,54 @@ class TestUnusedVar : public TestFixture {
                               "    S<0> s;\n"
                               "}\n");
         ASSERT_EQUALS("[test.cpp:6:10]: (style) Unused variable: s [unusedVariable]\n", errout_str());
+
+        functionVariableUsage("template <typename T>\n" // #14783
+                              "struct A {\n"
+                              "    A() = default;\n"
+                              "};\n"
+                              "void f() {\n"
+                              "    A<int> a;\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:12]: (style) Unused variable: a [unusedVariable]\n", errout_str());
+
+        functionVariableUsage("template <typename T>\n" // #14784
+                              "struct A {\n"
+                              "    A() {}\n"
+                              "};\n"
+                              "void f() {\n"
+                              "    A<int> a;\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:12]: (style) Unused variable: a [unusedVariable]\n", errout_str());
     }
 
     void localvarFuncPtr() {
         functionVariableUsage("int main() {\n"
                               "    void(*funcPtr)(void)(x);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'funcPtr' is assigned a value never used.\n", "", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    void(*funcPtr)(void);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Unused variable: funcPtr [unusedVariable]\n", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    void(*funcPtr)(void)(x);\n"
                               "    funcPtr();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    void(*funcPtr)(void) = x;\n"
                               "    funcPtr();\n"
-                              "}");
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #14661
+        functionVariableUsage("int main() {\n"
+                              "    void (*const funcPtr[])(void) = {x};\n"
+                              "    funcPtr[0]();\n"
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7039,14 +7221,14 @@ class TestUnusedVar : public TestFixture {
                               "  int x = 0;\n"
                               "  dostuff(&x);\n"
                               "  x = 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "  int x = 0;\n"
                               "  dostuff(std::ref(x));\n"
                               "  x = 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7060,7 +7242,7 @@ class TestUnusedVar : public TestFixture {
                               "    buf = tmp;"
                               ""
                               "    delete [] buf;"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7070,7 +7252,7 @@ class TestUnusedVar : public TestFixture {
                               "    double sum = 0.0;\n"
                               "    for (int i = 0; i<n; ++i)\n"
                               "        pdD[i] = (sum += pdD[i]);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7078,7 +7260,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("SAL_WNODEPRECATED_DECLARATIONS_PUSH\n"
                               "void convertToTokenArray() {\n"
                               "}\n"
-                              "SAL_WNODEPRECATED_DECLARATIONS_POP"); // #4033
+                              "SAL_WNODEPRECATED_DECLARATIONS_POP\n"); // #4033
     }
 
     void crash2() {
@@ -7088,7 +7270,8 @@ class TestUnusedVar : public TestFixture {
                               "struct Y<0> {};\n"
                               "void f() {\n"
                               "    Y y;\n"
-                              "}"); // #4695
+                              "}\n"); // #4695
+        ASSERT_EQUALS("[test.cpp:6:7]: (style) Unused variable: y [unusedVariable]\n", errout_str());
     }
 
     void crash3() {
@@ -7111,7 +7294,7 @@ class TestUnusedVar : public TestFixture {
                               "          }\n"
                               "   }\n"
                               "   return j;\n"
-                              "}"); // #4585
+                              "}\n"); // #4585
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7129,7 +7312,7 @@ class TestUnusedVar : public TestFixture {
                               "  };\n"
                               "  do_something();\n"
                               "  do_something();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -7137,20 +7320,20 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f(std::vector<int> ints) {\n"
                               "  int x = 0;\n"
                               "  std::for_each(ints.begin(), ints.end(), [&x](int i){ dostuff(x); x = i; });\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(std::vector<int> ints) {\n"
                               "  int x = 0;\n"
                               "  std::for_each(ints.begin(), ints.end(), [&x](int i){ x += i; });\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3:5]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", "", errout_str());
 
         functionVariableUsage("int f(const std::vector<int>& v) {\n"
                               "    auto it = std::find_if(v.begin(), v.end(), [&](int i) { return i > 0 && i < 7; });\n"
                               "    std::unordered_map<std::string, std::vector<int*>> exprs;\n"
                               "    return *it;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:56]: (style) Unused variable: exprs [unusedVariable]\n", errout_str());
     }
 
@@ -7168,7 +7351,7 @@ class TestUnusedVar : public TestFixture {
                               "     }\n"
                               "     return value;\n"
                               "  }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7178,7 +7361,7 @@ class TestUnusedVar : public TestFixture {
             " static int fpUnread{0};\n"
             " const int var{fpUnread++};\n"
             " return var;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7186,19 +7369,19 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage(
             "void fun(Value value) {\n"
             " value[10] = 123;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "void fun(std::string s) {\n"
             " s[10] = 123;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:2:8]: (style) Variable 's[10]' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage(
             "void fun(short data[2]) {\n"
             "  data[2] = 1;\n"
-            "}"
+            "}\n"
             );
         ASSERT_EQUALS("", errout_str());
 
@@ -7206,7 +7389,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage(
             "void A::b(Date& result) {"
             "  result = 12;\n"
-            "}"
+            "}\n"
             );
         ASSERT_EQUALS("", errout_str());
 
@@ -7215,14 +7398,14 @@ class TestUnusedVar : public TestFixture {
             functionVariableUsage( // assume unknown argument type is reference
                 "void fun(Date result) {"
                 "  result.x = 12;\n"
-                "}"
+                "}\n"
                 );
             ASSERT_EQUALS("", errout_str());
 
             functionVariableUsage( // there is no reference type in C
                 "void fun(Date result) {"
                 "  result.x = 12;\n"
-                "}",
+                "}\n",
                 dinit(FunctionVariableUsageOptions, $.cpp = false)
                 );
             ASSERT_EQUALS("[test.c:1:35]: (style) Variable 'result.x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
@@ -7231,7 +7414,7 @@ class TestUnusedVar : public TestFixture {
                 "struct Date { int x; };\n"
                 "void fun(Date result) {"
                 "  result.x = 12;\n"
-                "}"
+                "}\n"
                 );
             ASSERT_EQUALS("[test.cpp:2:35]: (style) Variable 'result.x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
         }
@@ -7241,7 +7424,7 @@ class TestUnusedVar : public TestFixture {
             "void fun() {"
             "  struct FOO foo;\n"
             "  foo.x = 123;\n"
-            "}"
+            "}\n"
             );
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Variable 'foo.x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
@@ -7250,7 +7433,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage(
             "void foo(std::insert_iterator<C> it) {\n"
             "  it = 123;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7265,7 +7448,7 @@ class TestUnusedVar : public TestFixture {
             "        else\n"
             "            (*pos).second = number;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7274,7 +7457,7 @@ class TestUnusedVar : public TestFixture {
             "struct Data { unsigned int n; };\n"
             "int main() {\n"
             "  (*(volatile struct Data*)0x4200).n = 1;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7283,7 +7466,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage(
             "void f(void) {\n"
             "    ((uint8_t *) (uint16_t)0x1000)[0] = 0x42;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7322,6 +7505,24 @@ class TestUnusedVar : public TestFixture {
                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
+
+    void pointerCast1() { // #14535
+        functionVariableUsage("void f(int* p)\n"
+                              "{\n"
+                              "    int* p2 = p;\n"
+                              "    ((int *)(p2))[0] = 0;\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void pointerCast2() {
+        functionVariableUsage("void f(int* p)\n"
+                              "{\n"
+                              "    int* p2 = p;\n"
+                              "    static_cast<int*>(p2)[0] = 0;\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
 };
 
 REGISTER_TEST(TestUnusedVar)
diff --git a/test/testutils.cpp b/test/testutils.cpp
index 37c1030000d..8e91108c3f4 100644
--- a/test/testutils.cpp
+++ b/test/testutils.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,6 +44,7 @@ class TestUtils : public TestFixture {
         TEST_CASE(splitString);
         TEST_CASE(as_const);
         TEST_CASE(memoize);
+        TEST_CASE(endsWith);
     }
 
     void isValidGlobPattern() const {
@@ -222,26 +223,64 @@ class TestUtils : public TestFixture {
 
     void strToInt() {
         ASSERT_EQUALS(1, ::strToInt<int>("1"));
+        ASSERT_EQUALS(1, ::strToInt<int>("+1"));
         ASSERT_EQUALS(-1, ::strToInt<int>("-1"));
         ASSERT_EQUALS(1, ::strToInt<std::size_t>("1"));
-        ASSERT_THROW_EQUALS_2(::strToInt<int>(""), std::runtime_error, "converting '' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<std::size_t>(""), std::runtime_error, "converting '' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<int>(" "), std::runtime_error, "converting ' ' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<std::size_t>(" "), std::runtime_error, "converting ' ' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<unsigned int>("-1"), std::runtime_error, "converting '-1' to integer failed - needs to be positive");
-        ASSERT_THROW_EQUALS_2(::strToInt<int>("1ms"), std::runtime_error, "converting '1ms' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<int>("1.0"), std::runtime_error, "converting '1.0' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<int>("one"), std::runtime_error, "converting 'one' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<unsigned int>("1ms"), std::runtime_error, "converting '1ms' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<unsigned int>("1.0"), std::runtime_error, "converting '1.0' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<unsigned int>("one"), std::runtime_error, "converting 'one' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<int>(std::to_string(static_cast<int64_t>(std::numeric_limits<int>::max()) + 1)), std::runtime_error, "converting '2147483648' to integer failed - out of range (limits)");
-        ASSERT_THROW_EQUALS_2(::strToInt<int>(std::to_string(static_cast<int64_t>(std::numeric_limits<int>::min()) - 1)), std::runtime_error, "converting '-2147483649' to integer failed - out of range (limits)");
-        ASSERT_THROW_EQUALS_2(::strToInt<int8_t>(std::to_string(static_cast<int64_t>(std::numeric_limits<int8_t>::max()) + 1)), std::runtime_error, "converting '128' to integer failed - out of range (limits)");
-        ASSERT_THROW_EQUALS_2(::strToInt<int8_t>(std::to_string(static_cast<int64_t>(std::numeric_limits<int8_t>::min()) - 1)), std::runtime_error, "converting '-129' to integer failed - out of range (limits)");
-        ASSERT_THROW_EQUALS_2(::strToInt<unsigned int>(std::to_string(static_cast<uint64_t>(std::numeric_limits<unsigned int>::max()) + 1)), std::runtime_error, "converting '4294967296' to integer failed - out of range (limits)");
-        ASSERT_THROW_EQUALS_2(::strToInt<int>("9223372036854775808"), std::runtime_error, "converting '9223372036854775808' to integer failed - out of range (stoll)"); // LLONG_MAX + 1
-        ASSERT_THROW_EQUALS_2(::strToInt<std::size_t>("18446744073709551616"), std::runtime_error, "converting '18446744073709551616' to integer failed - out of range (stoull)"); // ULLONG_MAX + 1
+        ASSERT_EQUALS(1, ::strToInt<std::size_t>("+1"));
+        ASSERT_EQUALS(0, ::strToInt<int>("0"));
+        ASSERT_EQUALS(0, ::strToInt<int>("+0"));
+        ASSERT_EQUALS(0, ::strToInt<int>("-0"));
+        ASSERT_EQUALS(0, ::strToInt<std::size_t>("0"));
+        ASSERT_EQUALS(0, ::strToInt<std::size_t>("+0"));
+        ASSERT_THROW_EQUALS(::strToInt<int>(""), std::runtime_error, "converting '' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<std::size_t>(""), std::runtime_error, "converting '' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<int>(" "), std::runtime_error, "converting ' ' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<std::size_t>(" "), std::runtime_error, "converting ' ' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("-1"), std::runtime_error, "converting '-1' to integer failed - needs to be positive");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("-0"), std::runtime_error, "converting '-0' to integer failed - needs to be positive");
+        ASSERT_THROW_EQUALS(::strToInt<std::size_t>("-1"), std::runtime_error, "converting '-1' to integer failed - needs to be positive");
+        ASSERT_THROW_EQUALS(::strToInt<std::size_t>("-0"), std::runtime_error, "converting '-0' to integer failed - needs to be positive");
+        ASSERT_THROW_EQUALS(::strToInt<int>("1ms"), std::runtime_error, "converting '1ms' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("1.0"), std::runtime_error, "converting '1.0' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("+1.0"), std::runtime_error, "converting '+1.0' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("-1.0"), std::runtime_error, "converting '-1.0' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("1U"), std::runtime_error, "converting '1U' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("1L"), std::runtime_error, "converting '1L' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("1Z"), std::runtime_error, "converting '1Z' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("01"), std::runtime_error, "converting '01' to integer failed - not an integer");
+        ASSERT_THROW_EQUALS(::strToInt<int>("0x1"), std::runtime_error, "converting '0x1' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("0b1"), std::runtime_error, "converting '0b1' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("one"), std::runtime_error, "converting 'one' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<int>(" 1"), std::runtime_error, "converting ' 1' to integer failed - not an integer");
+        ASSERT_THROW_EQUALS(::strToInt<int>("\t1"), std::runtime_error, "converting '\t1' to integer failed - not an integer");
+        ASSERT_THROW_EQUALS(::strToInt<int>("1 "), std::runtime_error, "converting '1 ' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("1\t"), std::runtime_error, "converting '1\t' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("+ 1"), std::runtime_error, "converting '+ 1' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("O1"), std::runtime_error, "converting 'O1' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("1ms"), std::runtime_error, "converting '1ms' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("1.0"), std::runtime_error, "converting '1.0' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("+1.0"), std::runtime_error, "converting '+1.0' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("-1.0"), std::runtime_error, "converting '-1.0' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("1U"), std::runtime_error, "converting '1U' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("1L"), std::runtime_error, "converting '1L' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("1Z"), std::runtime_error, "converting '1Z' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("01"), std::runtime_error, "converting '01' to integer failed - not an integer");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("0x1"), std::runtime_error, "converting '0x1' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("0b1"), std::runtime_error, "converting '0b1' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("one"), std::runtime_error, "converting 'one' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>(" 1"), std::runtime_error, "converting ' 1' to integer failed - not an integer");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("\t1"), std::runtime_error, "converting '\t1' to integer failed - not an integer");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("1 "), std::runtime_error, "converting '1 ' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("1\t"), std::runtime_error, "converting '1\t' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("- 1"), std::runtime_error, "converting '- 1' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("O1"), std::runtime_error, "converting 'O1' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<int>(std::to_string(static_cast<int64_t>(std::numeric_limits<int>::max()) + 1)), std::runtime_error, "converting '2147483648' to integer failed - out of range (limits)");
+        ASSERT_THROW_EQUALS(::strToInt<int>(std::to_string(static_cast<int64_t>(std::numeric_limits<int>::min()) - 1)), std::runtime_error, "converting '-2147483649' to integer failed - out of range (limits)");
+        ASSERT_THROW_EQUALS(::strToInt<int8_t>(std::to_string(static_cast<int64_t>(std::numeric_limits<int8_t>::max()) + 1)), std::runtime_error, "converting '128' to integer failed - out of range (limits)");
+        ASSERT_THROW_EQUALS(::strToInt<int8_t>(std::to_string(static_cast<int64_t>(std::numeric_limits<int8_t>::min()) - 1)), std::runtime_error, "converting '-129' to integer failed - out of range (limits)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>(std::to_string(static_cast<uint64_t>(std::numeric_limits<unsigned int>::max()) + 1)), std::runtime_error, "converting '4294967296' to integer failed - out of range (limits)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("9223372036854775808"), std::runtime_error, "converting '9223372036854775808' to integer failed - out of range (stoll)"); // LLONG_MAX + 1
+        ASSERT_THROW_EQUALS(::strToInt<std::size_t>("18446744073709551616"), std::runtime_error, "converting '18446744073709551616' to integer failed - out of range (stoull)"); // ULLONG_MAX + 1
 
         {
             long tmp;
@@ -310,25 +349,25 @@ class TestUtils : public TestFixture {
             long tmp;
             std::string err;
             ASSERT(!::strToInt("1ms", tmp, &err));
-            ASSERT_EQUALS("not an integer", err);
+            ASSERT_EQUALS("not an integer (pos)", err);
         }
         {
             long tmp;
             std::string err;
             ASSERT(!::strToInt("1.0", tmp, &err));
-            ASSERT_EQUALS("not an integer", err);
+            ASSERT_EQUALS("not an integer (pos)", err);
         }
         {
             long tmp;
             std::string err;
             ASSERT(!::strToInt("one", tmp, &err));
-            ASSERT_EQUALS("not an integer", err);
+            ASSERT_EQUALS("not an integer (invalid_argument)", err);
         }
         {
             std::size_t tmp;
             std::string err;
             ASSERT(!::strToInt("1ms", tmp, &err));
-            ASSERT_EQUALS("not an integer", err);
+            ASSERT_EQUALS("not an integer (pos)", err);
         }
         {
             long tmp;
@@ -541,10 +580,9 @@ class TestUtils : public TestFixture {
             ASSERT(c.written);
         }
         {
-            C c;
-            C* cp = &c;
-            utils::as_const(cp)->f(); // (correctly) calls non-const version
-            ASSERT(c.written);
+            int i = 0;
+            auto cr = utils::as_const(i); // TODO: does nothing and should not be allowed
+            (void)cr;
         }
     }
 
@@ -563,6 +601,17 @@ class TestUtils : public TestFixture {
         ASSERT_EQUALS(1, callF());
         ASSERT_EQUALS(1, count);
     }
+
+    void endsWith() const
+    {
+        ASSERT(::endsWith("test", "test"));
+        ASSERT(::endsWith("test2", "2"));
+        ASSERT(::endsWith("test test", "test"));
+        ASSERT(::endsWith("test", "t"));
+        ASSERT(!::endsWith("", "test"));
+        ASSERT(!::endsWith("tes", "test"));
+        ASSERT(!::endsWith("2test", "2"));
+    }
 };
 
 REGISTER_TEST(TestUtils)
diff --git a/test/testvaarg.cpp b/test/testvaarg.cpp
index 36e1d2cb038..4b08c2316d3 100644
--- a/test/testvaarg.cpp
+++ b/test/testvaarg.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,8 +38,8 @@ class TestVaarg : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckVaarg>(tokenizer, this);
+        CheckVaarg check;
+        runChecks(check, tokenizer, *this);
     }
 
     void run() override {
@@ -57,21 +57,21 @@ class TestVaarg : public TestFixture {
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr, szFormat);\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) 'szFormat' given to va_start() is not last named argument of the function. Did you intend to pass 'nSize'? [va_start_wrongParameter]\n", errout_str());
 
         check("void Format(char* szFormat, char* szBuffer, size_t nSize, ...) {\n"
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) 'szBuffer' given to va_start() is not last named argument of the function. Did you intend to pass 'nSize'? [va_start_wrongParameter]\n", errout_str());
 
         check("void Format(char* szFormat, char* szBuffer, size_t nSize, ...) {\n"
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr, nSize);\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int main(int argc, char *argv[]) {\n"
@@ -80,14 +80,14 @@ class TestVaarg : public TestFixture {
               "        va_start(argp, format);\n"
               "        c = va_arg(argp, int);\n"
               "    };\n"
-              "}"); // Don't crash (#6032)
+              "}\n"); // Don't crash (#6032)
         ASSERT_EQUALS("[test.cpp:6:5]: (error) va_list 'argp' was opened but not closed by va_end(). [va_end_missing]\n", errout_str());
 
         check("void Format(char* szFormat, char* szBuffer, size_t nSize, ...) {\n"
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr);\n"
               "    va_end(arg_ptr);\n"
-              "}"); // Don't crash if less than expected arguments are given.
+              "}\n"); // Don't crash if less than expected arguments are given.
         ASSERT_EQUALS("", errout_str());
 
         check("void assertf_fail(const char *assertion, const char *file, int line, const char *func, const char* msg, ...) {\n"
@@ -99,7 +99,7 @@ class TestVaarg : public TestFixture {
               "                va_end(args);\n"
               "        }\n"
               "    };\n"
-              "}"); // Inner class (#6453)
+              "}\n"); // Inner class (#6453)
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -108,14 +108,14 @@ class TestVaarg : public TestFixture {
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (error) Using reference 'szBuffer' as parameter for va_start() results in undefined behaviour. [va_start_referencePassed]\n", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -124,7 +124,7 @@ class TestVaarg : public TestFixture {
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6186
@@ -136,13 +136,13 @@ class TestVaarg : public TestFixture {
               "    } catch(...) {\n"
               "        va_end(arg_ptr);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr, szBuffer);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:1]: (error) va_list 'arg_ptr' was opened but not closed by va_end(). [va_end_missing]\n", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
@@ -150,7 +150,7 @@ class TestVaarg : public TestFixture {
               "    va_start(arg_ptr, szBuffer);\n"
               "    if(sth) return;\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:19]: (error) va_list 'arg_ptr' was opened but not closed by va_end(). [va_end_missing]\n", errout_str());
 
         // #8124
@@ -164,7 +164,7 @@ class TestVaarg : public TestFixture {
               "        return va_arg(ap, const char*);\n"
               "    });\n"
               "    va_end(ap);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int n, ...)\n"
@@ -176,7 +176,7 @@ class TestVaarg : public TestFixture {
               "    {\n"
               "        return va_arg(ap, const char*);\n"
               "    });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:1]: (error) va_list 'ap' was opened but not closed by va_end(). [va_end_missing]\n", errout_str());
     }
 
@@ -184,19 +184,19 @@ class TestVaarg : public TestFixture {
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
               "    va_list arg_ptr;\n"
               "    return va_arg(arg_ptr, float);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (error) va_list 'arg_ptr' used before va_start() was called. [va_list_usedBeforeStarted]\n", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
               "    va_list arg_ptr;\n"
               "    foo(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) va_list 'arg_ptr' used before va_start() was called. [va_list_usedBeforeStarted]\n", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
               "    va_list arg_ptr;\n"
               "    va_copy(f, arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) va_list 'arg_ptr' used before va_start() was called. [va_list_usedBeforeStarted]\n", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
@@ -204,13 +204,13 @@ class TestVaarg : public TestFixture {
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
               "    return va_arg(arg_ptr, float);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:19]: (error) va_list 'arg_ptr' used before va_start() was called. [va_list_usedBeforeStarted]\n", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
               "    va_list arg_ptr;\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) va_list 'arg_ptr' used before va_start() was called. [va_list_usedBeforeStarted]\n", errout_str());
 
 
@@ -221,7 +221,7 @@ class TestVaarg : public TestFixture {
               "    va_start(arg_ptr, szBuffer);\n"
               "    foo(va_arg(arg_ptr, float));\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6066
@@ -230,7 +230,7 @@ class TestVaarg : public TestFixture {
               "    va_copy(v2, v1);\n"
               "    foo(va_arg(v1, float));\n"
               "    va_end(v2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7527
@@ -246,7 +246,7 @@ class TestVaarg : public TestFixture {
               "        int data = va_arg(vargs, int);\n"
               "        va_end(vargs);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7533
@@ -262,7 +262,7 @@ class TestVaarg : public TestFixture {
               "        break;\n"
               "    }\n"
               "    va_end(args);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void action_push(int type, ...) {\n"
@@ -278,7 +278,7 @@ class TestVaarg : public TestFixture {
               "        va_end(args);\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void action_push(int type, ...) {\n"
@@ -293,7 +293,7 @@ class TestVaarg : public TestFixture {
               "        va_end(args);\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:13:1]: (error) va_list 'args' was opened but not closed by va_end(). [va_end_missing]\n", errout_str());
 
         // #8043
@@ -308,7 +308,7 @@ class TestVaarg : public TestFixture {
               "    sdscatvprintf(curarg, _format, _cpy);\n"
               "    va_end(_cpy);\n"
               "format_err:\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -318,7 +318,7 @@ class TestVaarg : public TestFixture {
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) va_start() or va_copy() called subsequently on 'arg_ptr' without va_end() in between. [va_start_subsequentCalls]\n", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
@@ -326,7 +326,7 @@ class TestVaarg : public TestFixture {
               "    va_start(vl1, szBuffer);\n"
               "    va_copy(vl1, vl1);\n"
               "    va_end(vl1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) va_start() or va_copy() called subsequently on 'vl1' without va_end() in between. [va_start_subsequentCalls]\n", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
@@ -335,7 +335,7 @@ class TestVaarg : public TestFixture {
               "    va_end(arg_ptr);\n"
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -344,7 +344,7 @@ class TestVaarg : public TestFixture {
               "  BG_TChar * f;\n"
               "  va_start(args,f);\n"
               "  BG_TString result(f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7559
@@ -356,7 +356,7 @@ class TestVaarg : public TestFixture {
               "  }\n"
               "  va_start(va, name);\n"
               "  va_end(va);\n"
-              "}");
+              "}\n");
     }
 };
 
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
index 79ad6e45b30..b8496c863d5 100644
--- a/test/testvalueflow.cpp
+++ b/test/testvalueflow.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,16 +43,9 @@ class TestValueFlow : public TestFixture {
     TestValueFlow() : TestFixture("TestValueFlow") {}
 
 private:
-    /*const*/ Settings settings = settingsBuilder().library("std.cfg").build();
+    const Settings settings = settingsBuilder().library("std.cfg").build();
 
     void run() override {
-        // strcpy, abort cfg
-        constexpr char cfg[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"strcpy\"> <arg nr=\"1\"><not-null/></arg> </function>\n"
-                               "  <function name=\"abort\"> <noreturn>true</noreturn> </function>\n" // abort is a noreturn function
-                               "</def>";
-        settings = settingsBuilder(settings).libraryxml(cfg).build();
 
         mNewTemplate = true;
         TEST_CASE(valueFlowNumber);
@@ -137,6 +130,7 @@ class TestValueFlow : public TestFixture {
         TEST_CASE(valueFlowConditionExpressions);
 
         TEST_CASE(valueFlowContainerSize);
+        TEST_CASE(valueFlowContainerSizeIterator);
         TEST_CASE(valueFlowContainerElement);
 
         TEST_CASE(valueFlowDynamicBufferSize);
@@ -320,7 +314,7 @@ class TestValueFlow : public TestFixture {
     }
 
 #define testValueOfX(...) testValueOfX_(__FILE__, __LINE__, __VA_ARGS__)
-    bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, int value, const Settings *s = nullptr) {
+    bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, MathLib::bigint value, const Settings *s = nullptr) {
         const Settings *settings1 = s ? s : &settings;
 
         // Tokenize..
@@ -436,9 +430,10 @@ class TestValueFlow : public TestFixture {
         return false;
     }
 
-    bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, int value, ValueFlow::Value::ValueType type) {
+    bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, int value, ValueFlow::Value::ValueType type, const Settings* s = nullptr) {
+        const Settings& curSettings = s ? *s : settings;
         // Tokenize..
-        SimpleTokenizer tokenizer(settings, *this);
+        SimpleTokenizer tokenizer(curSettings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
@@ -516,6 +511,22 @@ class TestValueFlow : public TestFixture {
         return values;
     }
 
+    // The expression of the container recorded by the container size value of the token. The
+    // container token has to be resolved while the tokenizer is alive.
+#define containerOfSizeValue(...) containerOfSizeValue_(__FILE__, __LINE__, __VA_ARGS__)
+    std::string containerOfSizeValue_(const char* file, int line, const char code[], const char tokstr[]) {
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
+        const Token* tok = Token::findmatch(tokenizer.tokens(), tokstr);
+        if (!tok)
+            return "";
+        const std::list<ValueFlow::Value>& values = tok->values();
+        const auto it = std::find_if(values.cbegin(), values.cend(), [](const ValueFlow::Value& v) {
+            return v.isContainerSizeValue() && v.container;
+        });
+        return it == values.cend() ? "" : it->container->expressionString();
+    }
+
 #define lifetimeValues(...) lifetimeValues_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     std::vector<std::string> lifetimeValues_(const char* file, int line, const char (&code)[size], const char tokstr[]) {
@@ -569,35 +580,36 @@ class TestValueFlow : public TestFixture {
     }
 
     void valueFlowNumber() {
-        ASSERT_EQUALS(123, valueOfTok("x=123;", "123").intvalue);
-        ASSERT_EQUALS_DOUBLE(192.0, valueOfTok("x=0x0.3p10;", "0x0.3p10").floatValue, 1e-5); // 3 * 16^-1 * 2^10 = 192
-        ASSERT(std::fabs(valueOfTok("x=0.5;", "0.5").floatValue - 0.5) < 0.1);
-        ASSERT_EQUALS(10, valueOfTok("enum {A=10,B=15}; x=A+0;", "+").intvalue);
-        ASSERT_EQUALS(0, valueOfTok("x=false;", "false").intvalue);
-        ASSERT_EQUALS(1, valueOfTok("x=true;", "true").intvalue);
-        ASSERT_EQUALS(0, valueOfTok("x(NULL);", "NULL").intvalue);
-        ASSERT_EQUALS(static_cast<int>('a'), valueOfTok("x='a';", "'a'").intvalue);
-        ASSERT_EQUALS(static_cast<int>('\n'), valueOfTok("x='\\n';", "'\\n'").intvalue);
-        TODO_ASSERT_EQUALS(0xFFFFFFFF00000000, 0, valueOfTok("x=0xFFFFFFFF00000000;", "0xFFFFFFFF00000000").intvalue); // #7701
-        ASSERT_EQUALS_DOUBLE(16, valueOfTok("x=(double)16;", "(").floatValue, 1e-5);
-        ASSERT_EQUALS_DOUBLE(0.0625, valueOfTok("x=1/(double)16;", "/").floatValue, 1e-5);
+        ASSERT_EQUALS(123, valueOfTok("x=123;\n", "123").intvalue);
+        ASSERT_EQUALS_DOUBLE(192.0, valueOfTok("x=0x0.3p10;\n", "0x0.3p10").floatValue, 1e-5); // 3 * 16^-1 * 2^10 = 192
+        ASSERT(std::fabs(valueOfTok("x=0.5;\n", "0.5").floatValue - 0.5) < 0.1);
+        ASSERT_EQUALS(10, valueOfTok("enum {A=10,B=15}; x=A+0;\n", "+").intvalue);
+        ASSERT_EQUALS(0, valueOfTok("x=false;\n", "false").intvalue);
+        ASSERT_EQUALS(1, valueOfTok("x=true;\n", "true").intvalue);
+        ASSERT_EQUALS(0, valueOfTok("x(NULL);\n", "NULL").intvalue);
+        ASSERT_EQUALS(static_cast<int>('a'), valueOfTok("x='a';\n", "'a'").intvalue);
+        ASSERT_EQUALS(static_cast<int>('\n'), valueOfTok("x='\\n';\n", "'\\n'").intvalue);
+        TODO_ASSERT_EQUALS(0xFFFFFFFF00000000, 0, valueOfTok("x=0xFFFFFFFF00000000;\n", "0xFFFFFFFF00000000").intvalue); // #7701
+        ASSERT_EQUALS_DOUBLE(16, valueOfTok("x=(double)16;\n", "(").floatValue, 1e-5);
+        ASSERT_EQUALS_DOUBLE(0.0625, valueOfTok("x=1/(double)16;\n", "/").floatValue, 1e-5);
 
         const Settings settingsC23 = settingsBuilder().c(Standards::C23).build();
-        ASSERT_EQUALS(1, valueOfTok("x=true;", "true", &settingsC23, false).intvalue);
-        ASSERT_EQUALS(0, valueOfTok("x=false;", "false", &settingsC23, false).intvalue);
+        ASSERT_EQUALS(1, valueOfTok("x=true;\n", "true", &settingsC23, false).intvalue);
+        ASSERT_EQUALS(0, valueOfTok("x=false;\n", "false", &settingsC23, false).intvalue);
 
         const Settings settingsC17 = settingsBuilder().c(Standards::C17).build();
-        ASSERT(!valueOfTok("x=true;", "true", &settingsC17, false).isKnown());
-        ASSERT(!valueOfTok("x=false;", "false", &settingsC17, false).isKnown());
+        ASSERT(!valueOfTok("x=true;\n", "true", &settingsC17, false).isKnown());
+        ASSERT(!valueOfTok("x=false;\n", "false", &settingsC17, false).isKnown());
 
         // scope
         {
             const char code[] = "namespace N { enum E {e0,e1}; }\n"
-                                "void foo() { x = N::e1; }";
+                                "void foo() { x = N::e1; }\n";
             ASSERT_EQUALS(1, valueOfTok(code, "::").intvalue);
         }
 
-        ASSERT_EQUALS(63, valueOfTok("x = 3 * uint32_t{21};", "*").intvalue);
+        ASSERT_EQUALS(63, valueOfTok("x = 3 * uint32_t{21};\n", "*").intvalue);
+        ASSERT_EQUALS(123, valueOfTok("x = +123;\n", "=").intvalue);
     }
 
     void valueFlowString() {
@@ -608,7 +620,7 @@ class TestValueFlow : public TestFixture {
                 "    static const char *x;\n"
                 "    if (a) x = \"123\";\n"
                 "    return x;\n"
-                "}";
+                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4, "\"123\"", ValueFlow::Value::ValueType::TOK));
 
         // valueFlowSubFunction
@@ -616,85 +628,85 @@ class TestValueFlow : public TestFixture {
                 "  f(x);\n"
                 "}\n"
                 "\n"
-                "void test() { dostuff(\"abc\"); }";
+                "void test() { dostuff(\"abc\"); }\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2, "\"abc\"", ValueFlow::Value::ValueType::TOK));
     }
 
     void valueFlowTypeTraits()
     {
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<void>{};", "{", 1));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<void>::value;", ":: value", 1));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void_v<void>;", "::", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<void>{};\n", "{", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<void>::value;\n", ":: value", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void_v<void>;\n", "::", 1));
 
         // is_void
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<int>{};", "{", 0));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<void*>{};", "{", 0));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<const void>{};", "{", 1));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<volatile void>{};", "{", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<int>{};\n", "{", 0));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<void*>{};\n", "{", 0));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<const void>{};\n", "{", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<volatile void>{};\n", "{", 1));
 
         // is_lvalue_reference
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_lvalue_reference<int>{};", "{", 0));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_lvalue_reference<int&>{};", "{", 1));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_lvalue_reference<int&&>{};", "{", 0));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_lvalue_reference<int>{};\n", "{", 0));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_lvalue_reference<int&>{};\n", "{", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_lvalue_reference<int&&>{};\n", "{", 0));
 
         // is_rvalue_reference
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_rvalue_reference<int>{};", "{", 0));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_rvalue_reference<int&>{};", "{", 0));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_rvalue_reference<int&&>{};", "{", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_rvalue_reference<int>{};\n", "{", 0));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_rvalue_reference<int&>{};\n", "{", 0));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_rvalue_reference<int&&>{};\n", "{", 1));
 
         // is_reference
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_reference<int>{};", "{", 0));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_reference<int&>{};", "{", 1));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_reference<int&&>{};", "{", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_reference<int>{};\n", "{", 0));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_reference<int&>{};\n", "{", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_reference<int&&>{};\n", "{", 1));
 
         {
             const char* code;
             code = "void bar();\n"
-                   "void foo() { std::is_void<decltype(bar())>::value; }";
+                   "void foo() { std::is_void<decltype(bar())>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
 
             code = "int bar();\n"
-                   "void foo() { std::is_void<decltype(bar())>::value; }";
+                   "void foo() { std::is_void<decltype(bar())>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
 
             code = "void bar();\n"
-                   "void foo() { std::is_void<decltype(bar)>::value; }";
+                   "void foo() { std::is_void<decltype(bar)>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
 
             code = "class A;\n"
-                   "void foo() { std::is_lvalue_reference<A>::value; }";
+                   "void foo() { std::is_lvalue_reference<A>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
 
             code = "class A;\n"
-                   "void foo() { std::is_lvalue_reference<A&>::value; }";
+                   "void foo() { std::is_lvalue_reference<A&>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
 
             code = "class A;\n"
-                   "void foo() { std::is_lvalue_reference<A&&>::value; }";
+                   "void foo() { std::is_lvalue_reference<A&&>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
 
             code = "class A;\n"
-                   "void foo() { std::is_rvalue_reference<A>::value; }";
+                   "void foo() { std::is_rvalue_reference<A>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
 
             code = "class A;\n"
-                   "void foo() { std::is_rvalue_reference<A&>::value; }";
+                   "void foo() { std::is_rvalue_reference<A&>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
 
             code = "class A;\n"
-                   "void foo() { std::is_rvalue_reference<A&&>::value; }";
+                   "void foo() { std::is_rvalue_reference<A&&>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
 
             code = "class A;\n"
-                   "void foo() { std::is_reference<A>::value; }";
+                   "void foo() { std::is_reference<A>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
 
             code = "class A;\n"
-                   "void foo() { std::is_reference<A&>::value; }";
+                   "void foo() { std::is_reference<A&>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
 
             code = "class A;\n"
-                   "void foo() { std::is_reference<A&&>::value; }";
+                   "void foo() { std::is_reference<A&&>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
 
             code = "void foo() {\n"
@@ -759,7 +771,7 @@ class TestValueFlow : public TestFixture {
                 "    static char ret[10];\n"
                 "    if (a) x = &ret[0];\n"
                 "    return x;\n"
-                "}";
+                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 5, "& ret [ 0 ]", ValueFlow::Value::ValueType::TOK));
 
         // dead pointer
@@ -767,13 +779,13 @@ class TestValueFlow : public TestFixture {
                 "  int *x;\n"
                 "  if (cond) { int i; x = &i; }\n"
                 "  *x = 0;\n"  // <- x can point at i
-                "}";
+                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4, "& i", ValueFlow::Value::ValueType::TOK));
 
         code  = "void f() {\n"
                 "  struct X *x;\n"
                 "  x = &x[1];\n"
-                "}";
+                "}\n";
         values = tokenValues(code, "&");
         values.remove_if(&isNotTokValue);
         ASSERT_EQUALS(true, values.empty());
@@ -908,6 +920,19 @@ class TestValueFlow : public TestFixture {
             ASSERT_EQUALS(true, lifetimes.size() == 1);
             ASSERT_EQUALS(true, lifetimes.front() == "a");
         }
+        {
+            const char code[] = "void f(const char *s, size_t len) {\n"
+                                "    char buf[10];\n"
+                                "    {\n"
+                                "        char *tmp = buf;\n"
+                                "        s = strcpy(tmp, s);\n"
+                                "    }\n"
+                                "    if (s[len] == '\0') {}\n"
+                                "}\n";
+            lifetimes = lifetimeValues(code, "s [");
+            ASSERT_EQUALS(true, lifetimes.size() == 1);
+            ASSERT_EQUALS(true, lifetimes.front() == "buf");
+        }
     }
 
     void valueFlowArrayElement() {
@@ -916,38 +941,38 @@ class TestValueFlow : public TestFixture {
         code  = "void f() {\n"
                 "    const int x[] = {43,23,12};\n"
                 "    return x;\n"
-                "}";
+                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, "{ 43 , 23 , 12 }", ValueFlow::Value::ValueType::TOK));
 
         code  = "void f() {\n"
                 "    const char x[] = \"abcd\";\n"
                 "    return x;\n"
-                "}";
+                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, "\"abcd\"", ValueFlow::Value::ValueType::TOK));
 
         code  = "void f() {\n"
                 "    char x[32] = \"abcd\";\n"
                 "    return x;\n"
-                "}";
+                "}\n";
         TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 3U, "\"abcd\"", ValueFlow::Value::ValueType::TOK));
 
         code = "void f() {\n"
                "  int a[10];\n"
                "  int *x = a;\n" // <- a value is a
                "  *x = 0;\n"     // .. => x value is a
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4, "a", ValueFlow::Value::ValueType::TOK));
 
         code  = "char f() {\n"
                 "    const char *x = \"abcd\";\n"
                 "    return x[0];\n"
-                "}";
+                "}\n";
         ASSERT_EQUALS(static_cast<int>('a'), valueOfTok(code, "[").intvalue);
 
         code  = "char f() {\n"
                 "    const char *x = \"\";\n"
                 "    return x[0];\n"
-                "}";
+                "}\n";
         ASSERT_EQUALS(0, valueOfTok(code, "[").intvalue);
 
         code = "int g() { return 3; }\n"
@@ -972,28 +997,28 @@ class TestValueFlow : public TestFixture {
                "   X x;\n"
                "   g(std::move(x));\n"
                "   y=x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "void f() {\n"
                "   X x;\n"
                "   g(std::forward<X>(x));\n"
                "   y=x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, ValueFlow::Value::MoveKind::ForwardedVariable));
 
         code = "void f() {\n"
                "   X x;\n"
                "   g(std::move(x).getA());\n"   // Only parts of x might be moved out
                "   y=x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "void f() {\n"
                "   X x;\n"
                "   g(std::forward<X>(x).getA());\n" // Only parts of x might be moved out
                "   y=x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, ValueFlow::Value::MoveKind::ForwardedVariable));
 
         code = "void f() {\n"
@@ -1001,7 +1026,7 @@ class TestValueFlow : public TestFixture {
                "   g(std::move(x));\n"
                "   x.clear();\n"
                "   y=x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "void f() {\n"
@@ -1009,28 +1034,28 @@ class TestValueFlow : public TestFixture {
                "   g(std::move(x));\n"
                "   y=x->y;\n"
                "   z=x->z;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 5U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "void f(int i) {\n"
                "    X x;\n"
                "    z = g(std::move(x));\n"
                "    y = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "void f(int i) {\n"
                "    X x;\n"
                "    y = g(std::move(x),\n"
                "          x.size());\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "void f(int i) {\n"
                "    X x;\n"
                "    x = g(std::move(x));\n"
                "    y = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "A f(int i) {\n"
@@ -1038,7 +1063,7 @@ class TestValueFlow : public TestFixture {
                "    if (i)"
                "        return g(std::move(x));\n"
                "    return h(std::move(x));\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "struct X {\n"
@@ -1052,13 +1077,13 @@ class TestValueFlow : public TestFixture {
                "   X x;\n"
                "   g(std::move(x)).foo([=](int value) mutable {;});\n"
                "   X y=x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 11U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "void f(int x) {\n"
                "   g(std::move(x));\n"
                "   y=x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "void g(std::string);\n"
@@ -1077,63 +1102,71 @@ class TestValueFlow : public TestFixture {
                "  }\n"
                "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 13U, ValueFlow::Value::MoveKind::MovedVariable));
+
+        code = "struct S { int f(int); };\n" // #11751
+               "S g(S);\n"
+               "void h() {\n"
+               "    S x;\n"
+               "    g(std::move(x)).f(1);\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfX(code, 5U, ValueFlow::Value::MoveKind::MovedVariable));
     }
 
     void valueFlowCalculations() {
         const char *code;
 
         // Different operators
-        ASSERT_EQUALS(5, valueOfTok("3 +  (a ? b : 2);", "+").intvalue);
-        ASSERT_EQUALS(1, valueOfTok("3 -  (a ? b : 2);", "-").intvalue);
-        ASSERT_EQUALS(6, valueOfTok("3 *  (a ? b : 2);", "*").intvalue);
-        ASSERT_EQUALS(6, valueOfTok("13 / (a ? b : 2);", "/").intvalue);
-        ASSERT_EQUALS(1, valueOfTok("13 % (a ? b : 2);", "%").intvalue);
-        ASSERT_EQUALS(0, valueOfTok("3 == (a ? b : 2);", "==").intvalue);
-        ASSERT_EQUALS(1, valueOfTok("3 != (a ? b : 2);", "!=").intvalue);
-        ASSERT_EQUALS(1, valueOfTok("3 >  (a ? b : 2);", ">").intvalue);
-        ASSERT_EQUALS(1, valueOfTok("3 >= (a ? b : 2);", ">=").intvalue);
-        ASSERT_EQUALS(0, valueOfTok("3 <  (a ? b : 2);", "<").intvalue);
-        ASSERT_EQUALS(0, valueOfTok("3 <= (a ? b : 2);", "<=").intvalue);
-
-        ASSERT_EQUALS(1, valueOfTok("(UNKNOWN_TYPE)1;","(").intvalue);
-        ASSERT(tokenValues("(UNKNOWN_TYPE)1000;","(").empty()); // don't know if there is truncation, sign extension
-        ASSERT_EQUALS(255, valueOfTok("(unsigned char)~0;", "(").intvalue);
-        ASSERT_EQUALS(0, valueOfTok("(int)0;", "(").intvalue);
-        ASSERT_EQUALS(3, valueOfTok("(int)(1+2);", "(").intvalue);
-        ASSERT_EQUALS(0, valueOfTok("(UNKNOWN_TYPE*)0;","(").intvalue);
-        ASSERT_EQUALS(100, valueOfTok("(int)100.0;", "(").intvalue);
-        ASSERT_EQUALS(10, valueOfTok("x = static_cast<int>(10);", "( 10 )").intvalue);
-        ASSERT_EQUALS(0, valueOfTok("x = sizeof (struct {int a;}) * 0;", "*").intvalue);
+        ASSERT_EQUALS(5, valueOfTok("3 +  (a ? b : 2);\n", "+").intvalue);
+        ASSERT_EQUALS(1, valueOfTok("3 -  (a ? b : 2);\n", "-").intvalue);
+        ASSERT_EQUALS(6, valueOfTok("3 *  (a ? b : 2);\n", "*").intvalue);
+        ASSERT_EQUALS(6, valueOfTok("13 / (a ? b : 2);\n", "/").intvalue);
+        ASSERT_EQUALS(1, valueOfTok("13 % (a ? b : 2);\n", "%").intvalue);
+        ASSERT_EQUALS(0, valueOfTok("3 == (a ? b : 2);\n", "==").intvalue);
+        ASSERT_EQUALS(1, valueOfTok("3 != (a ? b : 2);\n", "!=").intvalue);
+        ASSERT_EQUALS(1, valueOfTok("3 >  (a ? b : 2);\n", ">").intvalue);
+        ASSERT_EQUALS(1, valueOfTok("3 >= (a ? b : 2);\n", ">=").intvalue);
+        ASSERT_EQUALS(0, valueOfTok("3 <  (a ? b : 2);\n", "<").intvalue);
+        ASSERT_EQUALS(0, valueOfTok("3 <= (a ? b : 2);\n", "<=").intvalue);
+
+        ASSERT_EQUALS(1, valueOfTok("(UNKNOWN_TYPE)1;\n","(").intvalue);
+        ASSERT(tokenValues("(UNKNOWN_TYPE)1000;\n","(").empty()); // don't know if there is truncation, sign extension
+        ASSERT_EQUALS(255, valueOfTok("(unsigned char)~0;\n", "(").intvalue);
+        ASSERT_EQUALS(0, valueOfTok("(int)0;\n", "(").intvalue);
+        ASSERT_EQUALS(3, valueOfTok("(int)(1+2);\n", "(").intvalue);
+        ASSERT_EQUALS(0, valueOfTok("(UNKNOWN_TYPE*)0;\n","(").intvalue);
+        ASSERT_EQUALS(100, valueOfTok("(int)100.0;\n", "(").intvalue);
+        ASSERT_EQUALS(10, valueOfTok("x = static_cast<int>(10);\n", "( 10 )").intvalue);
+        ASSERT_EQUALS(0, valueOfTok("x = sizeof (struct {int a;}) * 0;\n", "*").intvalue);
 
         // Don't calculate or crash if there is UB or invalid operations
-        ASSERT(tokenValues(";-1<<10;","<<").empty());
-        ASSERT(tokenValues(";10<<-1;","<<").empty());
-        ASSERT(tokenValues(";10<<64;","<<").empty());
-        ASSERT(tokenValues(";-1>>10;",">>").empty());
-        ASSERT(tokenValues(";10>>-1;",">>").empty());
-        ASSERT(tokenValues(";10>>64;",">>").empty());
-        ASSERT_EQUALS(tokenValues(";1%-1;","%").size(), 1);
-        ASSERT_EQUALS(tokenValues(";1%-10;","%").size(), 1);
-        ASSERT_EQUALS(tokenValues(";1.5%-1;","%").size(), 1);
-        ASSERT_EQUALS(tokenValues(";1.5%-10;","%").size(), 1);
-        ASSERT(tokenValues(";1%-1.5;","%").empty());
-        ASSERT(tokenValues(";1%-10.5;","%").empty());
-        ASSERT(tokenValues(";1.5%-1.5;","%").empty());
-        ASSERT(tokenValues(";1.5%-10.5;","%").empty());
-        ASSERT(tokenValues(";1/-1;","/").empty());
-        ASSERT(tokenValues(";1/-10;","/").empty());
-        ASSERT(tokenValues(";1.5/-1;","/").empty());
-        ASSERT(tokenValues(";1.5/-10;","/").empty());
-        ASSERT(tokenValues(";1/-1.5;","/").empty());
-        ASSERT(tokenValues(";1/-10.5;","/").empty());
-        ASSERT(tokenValues(";1.5/-1.5;","/").empty());
-        ASSERT(tokenValues(";1.5/-10.5;","/").empty());
-        ASSERT(tokenValues(";1/0;","/").empty());
-        ASSERT(tokenValues(";1/0;","/").empty());
-        ASSERT(tokenValues(";1.5/0;","/").empty());
-        ASSERT(tokenValues(";1.5/0;","/").empty());
-        ASSERT(tokenValues(";((-1) * 9223372036854775807LL - 1) / (-1);", "/").empty()); // #12109
-        ASSERT_EQUALS(tokenValues(";((-1) * 9223372036854775807LL - 1) % (-1);", "%").size(), 1); // #12109
+        ASSERT(tokenValues(";-1<<10;\n","<<").empty());
+        ASSERT(tokenValues(";10<<-1;\n","<<").empty());
+        ASSERT(tokenValues(";10<<64;\n","<<").empty());
+        ASSERT(tokenValues(";-1>>10;\n",">>").empty());
+        ASSERT(tokenValues(";10>>-1;\n",">>").empty());
+        ASSERT(tokenValues(";10>>64;\n",">>").empty());
+        ASSERT_EQUALS(tokenValues(";1%-1;\n","%").size(), 1);
+        ASSERT_EQUALS(tokenValues(";1%-10;\n","%").size(), 1);
+        ASSERT_EQUALS(tokenValues(";1.5%-1;\n","%").size(), 1);
+        ASSERT_EQUALS(tokenValues(";1.5%-10;\n","%").size(), 1);
+        ASSERT(tokenValues(";1%-1.5;\n","%").empty());
+        ASSERT(tokenValues(";1%-10.5;\n","%").empty());
+        ASSERT(tokenValues(";1.5%-1.5;\n","%").empty());
+        ASSERT(tokenValues(";1.5%-10.5;\n","%").empty());
+        ASSERT(tokenValues(";1/-1;\n","/").empty());
+        ASSERT(tokenValues(";1/-10;\n","/").empty());
+        ASSERT(tokenValues(";1.5/-1;\n","/").empty());
+        ASSERT(tokenValues(";1.5/-10;\n","/").empty());
+        ASSERT(tokenValues(";1/-1.5;\n","/").empty());
+        ASSERT(tokenValues(";1/-10.5;\n","/").empty());
+        ASSERT(tokenValues(";1.5/-1.5;\n","/").empty());
+        ASSERT(tokenValues(";1.5/-10.5;\n","/").empty());
+        ASSERT(tokenValues(";1/0;\n","/").empty());
+        ASSERT(tokenValues(";1/0;\n","/").empty());
+        ASSERT(tokenValues(";1.5/0;\n","/").empty());
+        ASSERT(tokenValues(";1.5/0;\n","/").empty());
+        ASSERT(tokenValues(";((-1) * 9223372036854775807LL - 1) / (-1);\n", "/").empty()); // #12109
+        ASSERT_EQUALS(tokenValues(";((-1) * 9223372036854775807LL - 1) % (-1);\n", "%").size(), 1); // #12109
 
         code = "float f(const uint16_t& value) {\n"
                "    const uint16_t uVal = value; \n"
@@ -1144,27 +1177,27 @@ class TestValueFlow : public TestFixture {
         // calculation using 1,2 variables/values
         code  = "void f(int x) {\n"
                 "    a = x+456;\n"
-                "    if (x==123) {}"
-                "}";
+                "    if (x==123) {}\n"
+                "}\n";
         ASSERT_EQUALS(579, valueOfTok(code, "+").intvalue);
 
         code  = "void f(int x, int y) {\n"
                 "    a = x+y;\n"
-                "    if (x==123 || y==456) {}"
-                "}";
+                "    if (x==123 || y==456) {}\n"
+                "}\n";
         ASSERT_EQUALS(0, valueOfTok(code, "+").intvalue);
 
         code  = "void f(int x) {\n"
                 "    a = x+x;\n"
-                "    if (x==123) {}"
-                "}";
+                "    if (x==123) {}\n"
+                "}\n";
         ASSERT_EQUALS(246, valueOfTok(code, "+").intvalue);
 
         code  = "void f(int x, int y) {\n"
                 "    a = x*x;\n"
                 "    if (x==2) {}\n"
                 "    if (x==4) {}\n"
-                "}";
+                "}\n";
         std::list<ValueFlow::Value> values = tokenValues(code,"*");
         ASSERT_EQUALS(2U, values.size());
         ASSERT_EQUALS(4, values.front().intvalue);
@@ -1173,7 +1206,7 @@ class TestValueFlow : public TestFixture {
         code  = "void f(int x) {\n"
                 "    if (x == 3) {}\n"
                 "    a = x * (1 - x - 1);\n"
-                "}";
+                "}\n";
         ASSERT_EQUALS(-9, valueOfTok(code, "*").intvalue);
 
         // addition of different variables with known values
@@ -1207,24 +1240,43 @@ class TestValueFlow : public TestFixture {
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(123, values.empty() ? 0 : values.front().intvalue);
 
+        code = "x = true ? 2 : 3;\n"; // #14369
+        values = tokenValues(code, "?");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(2, values.empty() ? 0 : values.front().intvalue);
+
+        code = "x = false ? 2 : 3;\n"; // #14369
+        values = tokenValues(code, "?");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(3, values.empty() ? 0 : values.front().intvalue);
+
         code  = "int f() {\n"
                 "    const int i = 1;\n"
                 "    int x = i < 0 ? 0 : 1;\n"
                 "    return x;\n"
-                "}";
+                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 1));
 
         // ~
-        code  = "x = ~0U;";
+        code  = "x = ~0U;\n";
         values = tokenValues(code,"~");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(~0U, values.back().intvalue);
 
+        // #15015
+        code  = "void f(unsigned u) {\n"
+                "    if (~u) {}\n"
+                "}";
+        values = tokenValues(code, "~");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(-1, values.back().intvalue);
+        ASSERT(values.back().isImpossible());
+
         // !
         code  = "void f(int x) {\n"
                 "    a = !x;\n"
                 "    if (x==0) {}\n"
-                "}";
+                "}\n";
         values = removeImpossible(tokenValues(code, "!"));
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(1, values.back().intvalue);
@@ -1233,59 +1285,65 @@ class TestValueFlow : public TestFixture {
         code  = "void f(int x) {\n"
                 "    a = -x;\n"
                 "    if (x==10) {}\n"
-                "}";
+                "}\n";
         values = tokenValues(code,"-");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(-10, values.back().intvalue);
 
+        code = "bool f(unsigned a) {\n" // #14848
+               "    bool x = -a < 1;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfXKnown(code, 3U, 1));
+
         // Logical and
         code = "void f(bool b) {\n"
                "   bool x = false && b;\n"
                "   bool a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
 
         code = "void f(bool b) {\n"
                "   bool x = b && false;\n"
                "   bool a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
 
         code = "void f(bool b) {\n"
                "   bool x = true && b;\n"
                "   bool a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 1));
 
         code = "void f(bool b) {\n"
                "   bool x = b && true;\n"
                "   bool a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 1));
 
         // Logical or
         code = "void f(bool b) {\n"
                "   bool x = true || b;\n"
                "   bool a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 1));
 
         code = "void f(bool b) {\n"
                "   bool x = b || true;\n"
                "   bool a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 1));
 
         code = "void f(bool b) {\n"
                "   bool x = false || b;\n"
                "   bool a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
         code = "void f(bool b) {\n"
                "   bool x = b || false;\n"
                "   bool a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
         code = "void f(int i) {\n"
@@ -1321,7 +1379,7 @@ class TestValueFlow : public TestFixture {
                 "void callf() {\n"
                 "    f(1,1);\n"
                 "    f(10,10);\n"
-                "}";
+                "}\n";
         values = tokenValues(code, "+");
         ASSERT_EQUALS(true, values.empty());
         if (!values.empty()) {
@@ -1331,6 +1389,13 @@ class TestValueFlow : public TestFixture {
             ASSERT_EQUALS(22, values.back().intvalue);
         }
 
+        code  = "void f() {\n" // #15032
+                "    char c = -1;\n"
+                "    if (~c == -256) {}\n"
+                "}\n";
+        const int expected = std::numeric_limits<char>::is_signed ? 0 : -256;
+        ASSERT_EQUALS(true, testKnownValueOfTok(code, "~", expected));
+
         // #10251 starship operator
         code  = "struct X {};\n"
                 "auto operator<=>(const X & a, const X & b) -> decltype(1 <=> 2) {\n"
@@ -1339,22 +1404,22 @@ class TestValueFlow : public TestFixture {
         ASSERT_NO_THROW(tokenValues(code, "<=>"));
 
         // Comparison of string
-        values = removeImpossible(tokenValues("f(\"xyz\" == \"xyz\");", "==")); // implementation defined
+        values = removeImpossible(tokenValues("f(\"xyz\" == \"xyz\");\n", "==")); // implementation defined
         ASSERT_EQUALS(0U, values.size()); // <- no value
 
-        values = removeImpossible(tokenValues("f(\"xyz\" == 0);", "=="));
+        values = removeImpossible(tokenValues("f(\"xyz\" == 0);\n", "=="));
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(0, values.front().intvalue);
 
-        values = removeImpossible(tokenValues("f(0 == \"xyz\");", "=="));
+        values = removeImpossible(tokenValues("f(0 == \"xyz\");\n", "=="));
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(0, values.front().intvalue);
 
-        values = removeImpossible(tokenValues("f(\"xyz\" != 0);", "!="));
+        values = removeImpossible(tokenValues("f(\"xyz\" != 0);\n", "!="));
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(1, values.front().intvalue);
 
-        values = removeImpossible(tokenValues("f(0 != \"xyz\");", "!="));
+        values = removeImpossible(tokenValues("f(0 != \"xyz\");\n", "!="));
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(1, values.front().intvalue);
     }
@@ -1367,7 +1432,7 @@ class TestValueFlow : public TestFixture {
         code  = "void f() {\n"
                 "    char a[10];"
                 "    x = sizeof(*a);\n"
-                "}";
+                "}\n";
         values = tokenValues(code,"( *");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(1, values.back().intvalue);
@@ -1375,22 +1440,46 @@ class TestValueFlow : public TestFixture {
         code  = "void f() {\n"
                 "    char a[10];"
                 "    x = sizeof(a[0]);\n"
-                "}";
+                "}\n";
         values = tokenValues(code,"( a");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(1, values.back().intvalue);
 
         code = "enum testEnum : uint32_t { a };\n"
-               "sizeof(testEnum);";
+               "sizeof(testEnum);\n";
         values = tokenValues(code,"( testEnum");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(4, values.back().intvalue);
 
+        code = "char& r = i;\n"
+               "sizeof(r);\n";
+        values = tokenValues(code, "( r");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(1, values.back().intvalue);
+
+        code = "char* p;\n"
+               "sizeof(p);\n";
+        values = tokenValues(code, "( p");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(settings.platform.sizeof_pointer, values.back().intvalue);
+
+        code = "char*& pr = p;\n"
+               "sizeof(pr);\n";
+        values = tokenValues(code, "( pr");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(settings.platform.sizeof_pointer, values.back().intvalue);
+
+        code = "struct { char& r; char* p; } s{ x, y };\n"
+               "sizeof(s);\n";
+        values = tokenValues(code, "( s");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(2 * settings.platform.sizeof_pointer, values.back().intvalue);
+
 #define CHECK3(A, B, C)                          \
     do {                                     \
         code = "void f() {\n"                    \
                "    x = sizeof(" A ");\n"        \
-               "}";                              \
+               "}\n";                              \
         values = tokenValues(code,"( " C " )");  \
         ASSERT_EQUALS(1U, values.size());        \
         ASSERT_EQUALS(B, values.back().intvalue); \
@@ -1428,7 +1517,7 @@ class TestValueFlow : public TestFixture {
         code  = "void f() {\n"
                 "    struct S *a[10];"
                 "    x = sizeof(a) / sizeof(a[0]);\n"
-                "}";
+                "}\n";
         values = tokenValues(code,"/");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(10, values.back().intvalue);
@@ -1437,7 +1526,7 @@ class TestValueFlow : public TestFixture {
                 "    struct S { int i; };\n"
                 "    const S a[] = { 1, 2 };\n"
                 "    x = sizeof(a) / ( sizeof(a[0]) );\n"
-                "}";
+                "}\n";
         values = tokenValues(code, "/");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(2, values.back().intvalue);
@@ -1447,7 +1536,7 @@ class TestValueFlow : public TestFixture {
         code = "enum " A " E " B " { E0, E1 };\n" \
                "void f() {\n"                     \
                "    x = sizeof(" C ");\n"         \
-               "}";                               \
+               "}\n";                               \
         values = tokenValues(code,"( " C " )");   \
         ASSERT_EQUALS(1U, values.size());         \
         ASSERT_EQUALS(D, values.back().intvalue); \
@@ -1473,7 +1562,7 @@ class TestValueFlow : public TestFixture {
         CHECK("", ": signed long long", "E", settings.platform.sizeof_long_long);
         CHECK("", ": unsigned long long", "E", settings.platform.sizeof_long_long);
         CHECK("", ": wchar_t", "E", settings.platform.sizeof_wchar_t);
-        CHECK("", ": size_t", "E", settings.platform.sizeof_size_t);
+        CHECK("", ": size_t\n", "E", settings.platform.sizeof_size_t);
 
         // enumerators
         CHECK("", "", "E0", settings.platform.sizeof_int);
@@ -1495,7 +1584,7 @@ class TestValueFlow : public TestFixture {
         CHECK("", ": signed long long", "E0", settings.platform.sizeof_long_long);
         CHECK("", ": unsigned long long", "E0", settings.platform.sizeof_long_long);
         CHECK("", ": wchar_t", "E0", settings.platform.sizeof_wchar_t);
-        CHECK("", ": size_t", "E0", settings.platform.sizeof_size_t);
+        CHECK("", ": size_t\n", "E0", settings.platform.sizeof_size_t);
 
         // class typed enumerators
         CHECK("class", ": char", "E :: E0", 1U);
@@ -1514,7 +1603,7 @@ class TestValueFlow : public TestFixture {
         CHECK("class", ": signed long long", "E :: E0", settings.platform.sizeof_long_long);
         CHECK("class", ": unsigned long long", "E :: E0", settings.platform.sizeof_long_long);
         CHECK("class", ": wchar_t", "E :: E0", settings.platform.sizeof_wchar_t);
-        CHECK("class", ": size_t", "E :: E0", settings.platform.sizeof_size_t);
+        CHECK("class", ": size_t\n", "E :: E0", settings.platform.sizeof_size_t);
 #undef CHECK
 
 #define CHECK(A, B)                                   \
@@ -1523,7 +1612,7 @@ class TestValueFlow : public TestFixture {
                "void f() {\n"                         \
                "    E arrE[] = { E0, E1 };\n"         \
                "    x = sizeof(arrE);\n"              \
-               "}";                                   \
+               "}\n";                                   \
         values = tokenValues(code,"( arrE )");        \
         ASSERT_EQUALS(1U, values.size());             \
         ASSERT_EQUALS(B * 2ULL, values.back().intvalue); \
@@ -1549,7 +1638,7 @@ class TestValueFlow : public TestFixture {
         CHECK(": signed long long", settings.platform.sizeof_long_long);
         CHECK(": unsigned long long", settings.platform.sizeof_long_long);
         CHECK(": wchar_t", settings.platform.sizeof_wchar_t);
-        CHECK(": size_t", settings.platform.sizeof_size_t);
+        CHECK(": size_t\n", settings.platform.sizeof_size_t);
 #undef CHECK
 
 #define CHECK(A, B)                                   \
@@ -1558,7 +1647,7 @@ class TestValueFlow : public TestFixture {
                "void f() {\n"                         \
                "    E arrE[] = { E::E0, E::E1 };\n"   \
                "    x = sizeof(arrE);\n"              \
-               "}";                                   \
+               "}\n";                                   \
         values = tokenValues(code,"( arrE )");        \
         ASSERT_EQUALS(1U, values.size());             \
         ASSERT_EQUALS(B * 2ULL, values.back().intvalue); \
@@ -1584,16 +1673,16 @@ class TestValueFlow : public TestFixture {
         CHECK(": signed long long", settings.platform.sizeof_long_long);
         CHECK(": unsigned long long", settings.platform.sizeof_long_long);
         CHECK(": wchar_t", settings.platform.sizeof_wchar_t);
-        CHECK(": size_t", settings.platform.sizeof_size_t);
+        CHECK(": size_t\n", settings.platform.sizeof_size_t);
 #undef CHECK
 
         code = "uint16_t arr[10];\n"
-               "x = sizeof(arr);";
+               "x = sizeof(arr);\n";
         values = tokenValues(code,"( arr )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(10 * sizeof(std::uint16_t), values.back().intvalue);
 
-        code = "int sz = sizeof(int32_t[10][20]);";
+        code = "int sz = sizeof(int32_t[10][20]);\n";
         values = tokenValues(code, "=");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(sizeof(std::int32_t) * 10 * 20, values.back().intvalue);
@@ -1601,7 +1690,7 @@ class TestValueFlow : public TestFixture {
         code = "struct X { float a; float b; };\n"
                "void f() {\n"
                "    x = sizeof(X);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(8, values.back().intvalue);
@@ -1609,7 +1698,7 @@ class TestValueFlow : public TestFixture {
         code = "struct X { char a; char b; };\n"
                "void f() {\n"
                "    x = sizeof(X);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(2, values.back().intvalue);
@@ -1617,7 +1706,7 @@ class TestValueFlow : public TestFixture {
         code = "struct X { char a; float b; };\n"
                "void f() {\n"
                "    x = sizeof(X);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(8, values.back().intvalue);
@@ -1625,7 +1714,7 @@ class TestValueFlow : public TestFixture {
         code = "struct X { char a; char b; float c; };\n"
                "void f() {\n"
                "    x = sizeof(X);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(8, values.back().intvalue);
@@ -1633,7 +1722,7 @@ class TestValueFlow : public TestFixture {
         code = "struct X { float a; char b; };\n"
                "void f() {\n"
                "    x = sizeof(X);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(8, values.back().intvalue);
@@ -1641,7 +1730,7 @@ class TestValueFlow : public TestFixture {
         code = "struct X { float a; char b; char c; };\n"
                "void f() {\n"
                "    x = sizeof(X);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(8, values.back().intvalue);
@@ -1650,7 +1739,7 @@ class TestValueFlow : public TestFixture {
                "struct X { A a; char b; };\n"
                "void f() {\n"
                "    x = sizeof(X);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(12, values.back().intvalue);
@@ -1658,7 +1747,7 @@ class TestValueFlow : public TestFixture {
         code = "struct X { A a; int b; A c; };\n"
                "void f() {\n"
                "    x = sizeof(X);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(-1, values.back().intvalue);
@@ -1668,7 +1757,7 @@ class TestValueFlow : public TestFixture {
                "void f() {\n"
                "    x = sizeof(X);\n"
                "    subx = sizeof(SubX);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(1, values.back().intvalue);
@@ -1721,7 +1810,7 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "    int a[N + 1];"
                "    x = sizeof(a) / sizeof(a[0]);\n"
-               "}";
+               "}\n";
         values = tokenValues(code,"/");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(-1, values.back().intvalue);
@@ -1738,10 +1827,41 @@ class TestValueFlow : public TestFixture {
                "};\n"
                "int f() {\n"
                "    return sizeof(D);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( D )");
         ASSERT_EQUALS(1U, values.size());
         TODO_ASSERT_EQUALS(2 * settings.platform.sizeof_pointer, 1, values.back().intvalue);
+
+        code = "int f() {\n" // #11335
+               "    int* a[2];"
+               "    return sizeof(a);\n"
+               "}\n";
+        values = tokenValues(code, "( a");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(2 * settings.platform.sizeof_pointer, values.back().intvalue);
+        ASSERT_EQUALS_ENUM(ValueFlow::Value::ValueKind::Known, values.back().valueKind);
+
+        code = "struct S { std::array<int, 3> a; };\n"
+               "x = sizeof(S);\n";
+        values = tokenValues(code, "( S");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(3 * settings.platform.sizeof_int, values.back().intvalue);
+        ASSERT_EQUALS_ENUM(ValueFlow::Value::ValueKind::Known, values.back().valueKind);
+
+        code = "std::array<int, 3> a;\n"
+               "x = sizeof(a);\n";
+        values = tokenValues(code, "( a");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(3 * settings.platform.sizeof_int, values.back().intvalue);
+        ASSERT_EQUALS_ENUM(ValueFlow::Value::ValueKind::Known, values.back().valueKind);
+
+        code = "int f(char c) {\n" // #15033
+               "    return sizeof(+c);\n"
+               "}\n";
+        values = tokenValues(code, "( +");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(settings.platform.sizeof_int, values.back().intvalue);
+        ASSERT_EQUALS_ENUM(ValueFlow::Value::ValueKind::Known, values.back().valueKind);
     }
 
     void valueFlowComma()
@@ -1767,6 +1887,16 @@ class TestValueFlow : public TestFixture {
                "}\n";
         values = tokenValues(code, ",");
         ASSERT_EQUALS(0U, values.size());
+
+        code = "void f() {\n"
+               "    int a = 4;\n"
+               "    if (g(), a) {}\n"
+               "}\n";
+        values = tokenValues(code, ",");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT(values.front().isKnown());
+        ASSERT(values.front().isIntValue());
+        ASSERT_EQUALS(4, values.front().intvalue);
     }
 
     void valueFlowErrorPath() {
@@ -1783,7 +1913,7 @@ class TestValueFlow : public TestFixture {
                "  int x = y;\n"
                "  a = x;\n"
                "  y += 12;\n"
-               "  if (y == 32) {}"
+               "  if (y == 32) {}\n"
                "}\n";
         ASSERT_EQUALS("2,x is assigned 'y' here.\n"
                       "5,Assuming that condition 'y==32' is not redundant\n"
@@ -1818,45 +1948,45 @@ class TestValueFlow : public TestFixture {
         code = "void f(int x) {\n"
                "    int a = x;\n"
                "    if (x == 123) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 123));
 
         code = "void f(unsigned int x) {\n"
                "    int a = x;\n"
                "    if (x >= 1) {}\n"
-               "}";
+               "}\n";
         TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 2U, 1));
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
 
         code = "void f(unsigned int x) {\n"
                "    int a = x;\n"
                "    if (x > 0) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
 
         code = "void f(unsigned int x) {\n"
                "    int a = x;\n"
                "    if (x > 1) {}\n" // not zero => don't consider > condition
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 1));
 
         code = "void f(int x) {\n" // not unsigned => don't consider > condition
                "    int a = x;\n"
                "    if (x > 0) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 0));
 
         code = "void f(int *x) {\n"
                "    *x = 100;\n"
                "    if (x) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
 
         code = "extern const int x;\n"
                "void f() {\n"
                "    int a = x;\n"
                "    if (x == 123) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         // after loop
@@ -1878,26 +2008,26 @@ class TestValueFlow : public TestFixture {
         code = "void f(int x) {\n"
                "   x = 2 + x;\n"
                "   if (x == 65);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 65));
 
         code = "void f(int x) {\n"
                "   x = y = 2 + x;\n"
                "   if (x == 65);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 65));
 
         code = "void f(int x) {\n"
                "   a[x++] = 0;\n"
                "   if (x == 5);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 5));
 
         code = "void f(int x) {\n"
                "   a = x;\n"
                "   x++;\n"
                "   if (x == 4);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 3));
 
         // compound assignment += , -= , ...
@@ -1905,7 +2035,7 @@ class TestValueFlow : public TestFixture {
                "   a = x;\n"
                "   x += 2;\n"
                "   if (x == 4);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 2));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 2));
 
@@ -1913,7 +2043,7 @@ class TestValueFlow : public TestFixture {
                "   a = x;\n"
                "   x -= 2;\n"
                "   if (x == 4);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 6));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 6));
 
@@ -1921,7 +2051,7 @@ class TestValueFlow : public TestFixture {
                "   a = x;\n"
                "   x *= 2;\n"
                "   if (x == 42);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 21));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 21));
 
@@ -1929,7 +2059,7 @@ class TestValueFlow : public TestFixture {
                "   a = x;\n"
                "   x /= 5;\n"
                "   if (x == 42);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 210));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 210));
 
@@ -1937,7 +2067,7 @@ class TestValueFlow : public TestFixture {
         bailout("void f(int x) {\n"
                 "    x = y;\n"
                 "    if (x == 123) {}\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:9]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable y [valueFlowBailoutIncompleteVar]\n",
             errout_str());
@@ -1950,7 +2080,7 @@ class TestValueFlow : public TestFixture {
                "    if (!x || \n"  // <- x can be 0
                "        a/x) {}\n" // <- x can't be 0
                "    if (x==0) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
@@ -1958,14 +2088,14 @@ class TestValueFlow : public TestFixture {
                "  ((x=ret())&&\n"
                "   (*x==0));\n"  // <- x is not 0
                "  if (x==0) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
         code = "void f(int *x) {\n"
                "  int a = (x && *x == '1');\n"
                "  int b = a ? atoi(x) : 0;\n"  // <- x is not 0
                "  if (x==0) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
     }
 
@@ -1976,7 +2106,7 @@ class TestValueFlow : public TestFixture {
                "  a = x;\n"
                "  setx(x);\n"
                "  if (x == 1) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX((std::string("void setx(int x);")+code).c_str(), 2U, 1));
         ASSERT_EQUALS(false, testValueOfX((std::string("void setx(int &x);")+code).c_str(), 2U, 1));
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 1));
@@ -1984,7 +2114,7 @@ class TestValueFlow : public TestFixture {
         code = "void f(char* x) {\n"
                "  strcpy(x,\"abc\");\n"
                "  if (x) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
 
         code = "void addNewFunction(Scope**scope, const Token**tok);\n"
@@ -1992,14 +2122,14 @@ class TestValueFlow : public TestFixture {
                "  x->functionList.back();\n"
                "  addNewFunction(&x,&tok);\n" // address-of, x can be changed by subfunction
                "  if (x) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
         code = "void g(int&);"
                "void f(int x) {\n"
                "   g(x);\n"
                "   if (x == 5);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 5));
     }
 
@@ -2009,25 +2139,25 @@ class TestValueFlow : public TestFixture {
         code = "void f(int x) {\n" // loop condition, x is not assigned inside loop => use condition
                "  a = x;\n"  // x can be 37
                "  while (x == 37) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 37));
 
         code = "void f(int x) {\n" // loop condition, x is assigned inside loop => don't use condition
                "  a = x;\n"  // don't assume that x can be 37
                "  while (x != 37) { x++; }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 37));
 
         code = "void f(int x) {\n"
                "  a = x;\n"
                "  for (; x!=1; x++) { }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 1));
 
         code = "void f(menu *x) {\n"
                "  a = x->parent;\n"
                "  for (i=0;(i<10) && (x!=0); i++) { x = x->next; }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 0));
 
         code = "void f(int x) {\n"  // condition inside loop, x is NOT assigned inside loop => use condition
@@ -2035,7 +2165,7 @@ class TestValueFlow : public TestFixture {
                "    do {\n"
                "        if (x==76) {}\n"
                "    } while (1);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 76));
 
         code = "void f(int x) {\n"  // conditions inside loop, x is assigned inside do-while => don't use condition
@@ -2043,7 +2173,7 @@ class TestValueFlow : public TestFixture {
                "    do {\n"
                "        if (x!=76) { x=do_something(); }\n"
                "    } while (1);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 76));
 
         code = "void f(X x) {\n"  // conditions inside loop, x is assigned inside do-while => don't use condition
@@ -2052,7 +2182,7 @@ class TestValueFlow : public TestFixture {
                "        BUGON(x==0)\n"
                "        x = x.next;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 0));
 
         code = "struct S {\n" // #12848
@@ -2078,7 +2208,7 @@ class TestValueFlow : public TestFixture {
 
         bailout("void f(int x) {\n"
                 "    y = ((x<0) ? x : ((x==2)?3:4));\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable y [valueFlowBailoutIncompleteVar]\n",
             errout_str());
@@ -2086,26 +2216,26 @@ class TestValueFlow : public TestFixture {
         bailout("int f(int x) {\n"
                 "  int r = x ? 1 / x : 0;\n"
                 "  if (x == 0) {}\n"
-                "}");
+                "}\n");
 
         code = "void f(int x) {\n"
                "    int a =v x;\n"
                "    a = b ? x/2 : 20/x;\n"
                "    if (x == 123) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 123));
 
         code = "void f(const s *x) {\n"
                "  x->a = 0;\n"
                "  if (x ? x->a : 0) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
 
         code = "void f(int x, int y) {\n"
                "    a = x;\n"
                "    if (y){}\n"
                "    if (x==123){}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 123));
     }
 
@@ -2115,13 +2245,13 @@ class TestValueFlow : public TestFixture {
         code = "void f(int *x) {\n"
                "    sizeof(x[0]);\n"
                "    if (x==63){}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 63));
 
         code = "void f(int *x) {\n"
                "    char a[sizeof x.y];\n"
                "    if (x==0){}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 0));
     }
 
@@ -2134,7 +2264,7 @@ class TestValueFlow : public TestFixture {
                "      (a(x->name, html)) &&\n"
                "      (a(x->name, body))) {}\n"
                "  if (x != NULL) { }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
@@ -2143,7 +2273,7 @@ class TestValueFlow : public TestFixture {
         bailout("void f(int x) {\n"
                 "    if (x != 123) { b = x; }\n"
                 "    if (x == 123) {}\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:21]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable b [valueFlowBailoutIncompleteVar]\n",
             errout_str());
@@ -2152,14 +2282,14 @@ class TestValueFlow : public TestFixture {
                "  a = x;\n"
                "  if (abc) { x = 1; }\n" // <- condition must be false if x is 7 in next line
                "  if (x == 7) { }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 7));
 
         code = "void f(int x, bool abc) {\n"
                "  a = x;\n"
                "  if (abc) { x = 7; }\n" // <- condition is probably true
                "  if (x == 7) { }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 7));
     }
 
@@ -2171,7 +2301,7 @@ class TestValueFlow : public TestFixture {
                "void f() {\n"
                "    int a = x;\n"
                "    if (x == 123) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code,3,123));
 
         // bailout when there is function call
@@ -2180,7 +2310,7 @@ class TestValueFlow : public TestFixture {
                "    int a = x;\n"
                "    clear();\n"  // <- x might be assigned
                "    if (x == 234) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code,3,234));
     }
 
@@ -2192,7 +2322,7 @@ class TestValueFlow : public TestFixture {
                 "    case 1: a=x; break;\n"
                 "    case 2: if (x==5) {} break;\n"
                 "    };\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:13]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a [valueFlowBailoutIncompleteVar]\n",
             errout_str());
@@ -2202,7 +2332,7 @@ class TestValueFlow : public TestFixture {
                 "    case 1: a=x; return 1;\n"
                 "    case 2: if (x==5) {} break;\n"
                 "    };\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:13]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a [valueFlowBailoutIncompleteVar]\n",
             errout_str());
@@ -2214,7 +2344,7 @@ class TestValueFlow : public TestFixture {
                 "void f(int x) {\n"
                 "    a = x;\n"
                 "    M;\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS_WITHOUT_LINENUMBERS(
             "[test.cpp:3]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a\n"
             "[test.cpp:4]: (debug) valueflow.cpp:1260:(valueFlow) bailout: variable 'x', condition is defined in macro\n"
@@ -2225,7 +2355,7 @@ class TestValueFlow : public TestFixture {
                 "void f(int *x) {\n"
                 "    a = x;\n"
                 "    FREE(x);\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS_WITHOUT_LINENUMBERS(
             "[test.cpp:3]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a\n"
             "[test.cpp:4]: (debug) valueflow.cpp:1260:(valueFlow) bailout: variable 'x', condition is defined in macro\n"
@@ -2240,7 +2370,7 @@ class TestValueFlow : public TestFixture {
                 "    a=x;\n"   // <- x is not 123
                 "out:"
                 "    if (x==123){}\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS_WITHOUT_LINENUMBERS(
             "[test.cpp:3]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a\n"
             "[test.cpp:2]: (debug) valueflow.cpp::(valueFlow) bailout: valueFlowAfterCondition: bailing in conditional block\n"
@@ -2257,7 +2387,7 @@ class TestValueFlow : public TestFixture {
                 "\n"
                 "out:\n"
                 "    if (abc) {}\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS_WITHOUT_LINENUMBERS(
             "[test.cpp:3]: (debug) valueflow.cpp:6730:(valueFlow) bailout: valueFlowAfterCondition: bailing in conditional block\n"
             "[test.cpp:3]: (debug) valueflow.cpp:6730:(valueFlow) bailout: valueFlowAfterCondition: bailing in conditional block\n", // duplicate
@@ -2271,14 +2401,14 @@ class TestValueFlow : public TestFixture {
                "    int x = a;\n"
                "    if (a == 123) {}\n"
                "    int b = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
 
         code = "void f(int a) {\n"
                "    int x = a;\n"
                "    if (a != 123) {}\n"
                "    int b = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
     }
 
@@ -2312,38 +2442,38 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "    int x = 123;\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         code = "void f() {\n"
                "    bool x = 32;\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 1));
 
         code = "void f() {\n"
                "    int x = 123;\n"
                "    a = sizeof(x);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 123));
 
         code = "void f() {\n"
                "    int x = 123;\n"
                "    a = 2 + x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         code = "void f() {\n"
                "    const int x(321);\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 321));
 
         code = "void f() {\n"
                "    int x = 9;\n"
                "    --x;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 9));
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 8));
         ASSERT_EQUALS("2,Assignment 'x=9', assigned value is 9\n"
@@ -2354,54 +2484,54 @@ class TestValueFlow : public TestFixture {
                "    int x = value ? 6 : 0;\n"
                "    x =\n"
                "        1 + x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 7));
 
         code = "void f() {\n"
                "    int x = 0;\n"
                "    y = x += z;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n"
                "    static int x = 2;\n"
                "    x++;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 2));
 
         code = "void f() {\n"
                "    static int x = 2;\n"
                "    a >> x;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 2));
 
         code = "void f() {\n"
                "    static int x = 0;\n"
                "    if (x==0) x = getX();\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         // truncation
         code = "int f() {\n"
                "  int x = 1.5;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 1));
 
         code = "int f() {\n"
                "  unsigned char x = 0x123;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0x23));
 
         code = "int f() {\n"
                "  signed char x = 0xfe;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, -2));
 
         // function
@@ -2409,14 +2539,14 @@ class TestValueFlow : public TestFixture {
                "    char *x = 0;\n"
                "    int success = getx((char**)&x);\n"
                "    if (success) x[0] = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n"
                "    char *x = 0;\n"
                "    getx(reinterpret_cast<void **>(&x));\n"
                "    *x = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         // lambda
@@ -2454,14 +2584,14 @@ class TestValueFlow : public TestFixture {
                "    int x = 8;\n"
                "    a = ((x > 10) ?\n"
                "        x : 0);\n" // <- x is not 8
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 8));
 
         code = "void f() {\n" // #6973
                "    char *x = \"\";\n"
                "    a = ((x[0] == 'U') ?\n"
                "        x[1] : 0);\n" // <- x is not ""
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, "\"\"", ValueFlow::Value::ValueType::TOK));
 
         code = "void f() {\n" // #6973
@@ -2484,7 +2614,7 @@ class TestValueFlow : public TestFixture {
                "  t *x = 0;\n"
                "  y = (a ? 1 : x\n" // <- x is 0
                "       && x->y ? 1 : 2);" // <- x is not 0
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
@@ -2492,7 +2622,7 @@ class TestValueFlow : public TestFixture {
                "  t *x = 0;\n"
                "  y = (a ? 1 : !x\n" // <- x is 0
                "       || x->y ? 1 : 2);" // <- x is not 0
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
@@ -2501,14 +2631,14 @@ class TestValueFlow : public TestFixture {
                "    int x = 123;\n"
                "    if (condition) return;\n"
                "    a = 2 + x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
 
         code = "void f() {\n"
                "    int x = 1;\n"
                "    if (condition) x = 2;\n"
                "    a = 2 + x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 1));
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 2));
 
@@ -2517,7 +2647,7 @@ class TestValueFlow : public TestFixture {
                "    if (condition1) x = 456;\n"
                "    if (condition2) x = 789;\n"
                "    a = 2 + x;\n" // <- either assignment "x=123" is redundant or x can be 123 here.
-               "}";
+               "}\n";
         TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 5U, 123));
 
         code = "void f(int a) {\n"
@@ -2527,7 +2657,7 @@ class TestValueFlow : public TestFixture {
                "    else\n"
                "        ++x;\n"
                "    return 2 + x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
 
         code = "void f() {\n"
@@ -2535,7 +2665,7 @@ class TestValueFlow : public TestFixture {
                "    if (condition1) x = 2;\n"
                "    else return;\n"
                "    a = 2 + x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 1));
 
         code = "void f(){\n"
@@ -2550,21 +2680,21 @@ class TestValueFlow : public TestFixture {
                "  X *x = getx();\n"
                "  if(0) { x = 0; }\n"
                "  else { x->y = 1; }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n" // #6239
                "  int x = 4;\n"
                "  if(1) { x = 0; }\n"
                "  a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 4));
 
         code = "void f() {\n"
                "    int x = 32;\n"
                "    if (x>=32) return;\n"
                "    a[x]=0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 32));
 
         code = "void f() {\n"
@@ -2573,7 +2703,7 @@ class TestValueFlow : public TestFixture {
                "        a[x] = 0;\n"  // <- should have possible value 32
                "        return;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 32));
 
         code = "void f() {\n"
@@ -2581,7 +2711,7 @@ class TestValueFlow : public TestFixture {
                "    if (x==33) goto fail;\n"
                "    a[x]=0;\n"
                "fail:\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 33));
 
         code = "void f() {\n"
@@ -2589,7 +2719,7 @@ class TestValueFlow : public TestFixture {
                "    if (a==1) { z=x+12; }\n"
                "    if (a==2) { z=x+32; }\n"
                "    z = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 32));
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 32));
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 32));
@@ -2600,14 +2730,14 @@ class TestValueFlow : public TestFixture {
                "        x = getx();\n"
                "    }\n"
                "    y = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 0));
 
         code = "void f(int y) {\n" // alias
                "  int x = y;\n"
                "  if (y == 54) {}\n"
                "  else { a = x; }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 54));
 
         code = "void f () {\n"
@@ -2617,7 +2747,7 @@ class TestValueFlow : public TestFixture {
                "        return 1;\n"
                "    }\n"
                "    a = x->y;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 7U, 0));
 
         code = "void f () {\n"
@@ -2628,7 +2758,7 @@ class TestValueFlow : public TestFixture {
                "    }\n"
                "    a = x->y;\n"
                "label:\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 7U, 0));
 
         code = "void f() {\n" // #5752 - FP
@@ -2636,14 +2766,14 @@ class TestValueFlow : public TestFixture {
                "    if (x && *x == 123) {\n"
                "        getx(*x);\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n"
                "    int x = 0;\n"
                "    if (!x) {}\n"
                "    else { y = x; }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n" // #6118 - FP
@@ -2651,7 +2781,7 @@ class TestValueFlow : public TestFixture {
                "    x = x & 0x1;\n"
                "    if (x == 0) { x = 2; }\n"
                "    y = 42 / x;\n" // <- x is 2
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 2));
 
@@ -2660,7 +2790,7 @@ class TestValueFlow : public TestFixture {
                "    x = x & 0x1;\n"
                "    if (x == 0) { x += 2; }\n"
                "    y = 42 / x;\n" // <- x is 2
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 2));
 
@@ -2673,7 +2803,7 @@ class TestValueFlow : public TestFixture {
                "    if (!x) exit(1);\n"
                "\n"
                "    a = x->a;\n" // <- x can't be 0
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 9U, 0));
 
         code = "void f(int i) {\n"
@@ -2697,14 +2827,14 @@ class TestValueFlow : public TestFixture {
         code = "void f(int a) {\n"
                "    int x = a;\n"
                "    if (a!=132) { b = x; }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 132));
 
         code = "void f(int a) {\n"
                "    int x = a;\n"
                "    b = x;\n" // <- line 3
                "    if (a!=132) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 132));
 
         code = "void f() {\n"
@@ -2713,7 +2843,7 @@ class TestValueFlow : public TestFixture {
                "    else { a = 0; }\n"
                "    int x = a;\n"
                "    if (a > 0) { a = b / x; }\n" // <- line 6
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 0)); // x is not 0 at line 6
 
         code = "void f(int x1) {\n" // #6086
@@ -2722,7 +2852,7 @@ class TestValueFlow : public TestFixture {
                "    return;\n"
                "  }\n"
                "  a = x;\n"  // <- x is not 3
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 3));
 
         code = "int f(int *x) {\n" // #5980
@@ -2733,13 +2863,13 @@ class TestValueFlow : public TestFixture {
                "    };\n"
                "  }\n"
                "  return *x;\n"  // <- x is not 0
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 8U, 0));
 
         code = "void f(int a) {\n" // #6826
                "    int x = a ? a : 87;\n"
                "    if (a && x) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 87));
 
         code = "void f() {\n"
@@ -2748,7 +2878,7 @@ class TestValueFlow : public TestFixture {
                "    if (first >= 0) { a = x; }\n" // <- x is not 0
                "    first++; x=3;\n"
                "  } while (1);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 3));
 
@@ -2760,7 +2890,7 @@ class TestValueFlow : public TestFixture {
                "    *px = 1;\n"
                "  }\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 7U, 2));
 
         code = "int f(void) {\n"
@@ -2770,7 +2900,7 @@ class TestValueFlow : public TestFixture {
                "    rx = 1;\n"
                "  }\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 7U, 5));
 
         // break
@@ -2793,7 +2923,7 @@ class TestValueFlow : public TestFixture {
                "    case B: x = 34; break;\n"
                "  }\n"
                "  v = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 7U, 12));
         ASSERT_EQUALS(true, testValueOfX(code, 7U, 34));
 
@@ -2806,7 +2936,7 @@ class TestValueFlow : public TestFixture {
                "  switch (ab) {\n"
                "    case A: v = x; break;\n" // <- x is not 34
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 8U, 34));
 
         // while/for
@@ -3041,7 +3171,7 @@ class TestValueFlow : public TestFixture {
                "  if (y)\n"
                "    x = 10;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 10));
 
         code = "namespace A { int x; }\n"
@@ -3049,7 +3179,7 @@ class TestValueFlow : public TestFixture {
                "  if (y)\n"
                "    A::x = 10;\n"
                "  return A::x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 10));
 
         // member variable
@@ -3060,7 +3190,7 @@ class TestValueFlow : public TestFixture {
                "      x = 10;\n"
                "    return x;\n"
                "  }\n"
-               "};";
+               "};\n";
         ASSERT_EQUALS(true, testValueOfX(code, 6U, 10));
 
         code = "void f(int i) {\n"
@@ -3084,34 +3214,105 @@ class TestValueFlow : public TestFixture {
                "    constexpr int x(123);\n"
                "    constexpr int y(x*x);\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 4U, 123));
 
         code = "void f() {\n"
                "    static const int x(123);\n"
                "    static const int y(x*x);\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 4U, 123));
 
         code = "void f() {\n"
                "    static int x(123);\n"
                "    static int y(x*x);\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
 
-        code = "bool f() {\n" // #13208
-               "    struct S {\n"
-               "        bool b = true;\n"
-               "        bool get() const { return b; }\n"
-               "    };\n"
-               "    S s;\n"
-               "    s.b = false;\n"
-               "    bool x = s.get();\n"
-               "    return x;\n"
+        code = "bool f() {\n" // #13208
+               "    struct S {\n"
+               "        bool b = true;\n"
+               "        bool get() const { return b; }\n"
+               "    };\n"
+               "    S s;\n"
+               "    s.b = false;\n"
+               "    bool x = s.get();\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfXKnown(code, 9U, 1));
+
+        code = "int32_t f() {\n"
+               "    const int32_t x = 0xffffffff;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 3U, -1));
+
+        code = "A* f() {\n" // #14864
+               "    A* x{};\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 3U, 0));
+
+        code = "A* f() {\n"
+               "    A* x{ nullptr };\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 3U, 0));
+
+        code = "bool f();\n" // a modification after a conditional escape must still be seen
+               "void g() {\n"
+               "    bool x = false;\n"
+               "    if (f()) {\n"
+               "        if (f()) return;\n"
+               "        if (f()) x = true;\n"
+               "    }\n"
+               "    if (x) {}\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 8U, 0));
+        ASSERT_EQUALS(false, testValueOfXKnown(code, 8U, 0));
+
+        code = "bool f();\n"
+               "void g() {\n"
+               "    bool x = false;\n"
+               "    if (f()) {\n"
+               "        if (f()) return;\n"
+               "        x = true;\n"
+               "    }\n"
+               "    if (x) {}\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 8U, 0));
+        ASSERT_EQUALS(false, testValueOfXKnown(code, 8U, 0));
+
+        code = "bool f();\n" // the branch always escapes - keep the known value
+               "void g() {\n"
+               "    bool x = false;\n"
+               "    if (f()) { x = true; return; }\n"
+               "    if (x) {}\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 5U, 0));
+
+        code = "struct S {\n" // #13844
+               "    int x{};\n"
+               "    template <typename T>\n"
+               "    void f(T t) {\n"
+               "        x = 0;\n"
+               "        t();\n"
+               "        if (x == 0) {}\n"
+               "    }\n"
+               "};\n";
+        ASSERT_EQUALS(false, testValueOfXKnown(code, 7U, 0));
+
+        code = "int g() { return 0; }\n"
+               "int f() {\n"
+               "  int (*x)() = g;\n"
+               "  return x();\n"
                "}\n";
-        ASSERT_EQUALS(false, testValueOfXKnown(code, 9U, 1));
+        auto values = tokenValues(code, "x (");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT(values.front().isImpossible());
+        ASSERT_EQUALS(0, values.front().intvalue);
     }
 
     void valueFlowAfterSwap()
@@ -3124,7 +3325,7 @@ class TestValueFlow : public TestFixture {
                "    std::swap(a, b);\n"
                "    int x = a;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 6U, 2));
         ASSERT_EQUALS(false, testValueOfXKnown(code, 6U, 1));
 
@@ -3134,7 +3335,7 @@ class TestValueFlow : public TestFixture {
                "    std::swap(a, b);\n"
                "    int x = b;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 6U, 1));
         ASSERT_EQUALS(false, testValueOfXKnown(code, 6U, 2));
 
@@ -3166,21 +3367,21 @@ class TestValueFlow : public TestFixture {
                "    if (x == 123) {\n"
                "        a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         code = "void f(int x) {\n"
                "    if (x != 123) {\n"
                "        a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 123));
 
         code = "void f(int x) {\n"
                "    if (x > 123) {\n"
                "        a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 124));
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 123));
 
@@ -3188,7 +3389,7 @@ class TestValueFlow : public TestFixture {
                "    if (x < 123) {\n"
                "        a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 122));
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 123));
 
@@ -3198,7 +3399,7 @@ class TestValueFlow : public TestFixture {
                "    if (123 < x) {\n"
                "        a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 124));
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 123));
 
@@ -3206,7 +3407,7 @@ class TestValueFlow : public TestFixture {
                "    if (123 > x) {\n"
                "        a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 122));
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 123));
 
@@ -3214,13 +3415,13 @@ class TestValueFlow : public TestFixture {
         code = "void f(int x) {\n"
                "    if (x == 123) {}\n"
                "    else a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 123));
 
         code = "void f(int x) {\n"
                "    if (x != 123) {}\n"
                "    else a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         // after if
@@ -3229,7 +3430,7 @@ class TestValueFlow : public TestFixture {
                "        x++;\n"
                "    }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 10));
         TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 5U, 11));
 
@@ -3237,78 +3438,78 @@ class TestValueFlow : public TestFixture {
         code = "void f(int x) {\n"
                "    if (!x) { a = x; }\n"
                "    else a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
 
         code = "void f(int x, int y) {\n"
                "    if (!(x&&y)) { return; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
         code = "void f(int x) {\n"
                "    if (!x) { { throw new string(); }; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
         code = "void f(int x) {\n"
                "    if (x != 123) { throw " "; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         code = "void f(int x) {\n"
                "    if (x != 123) { }\n"
                "    else { throw " "; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 123));
         code = "void f(int x) {\n"
                "    if (x == 123) { }\n"
                "    else { throw " "; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
 
 
         code = "void f(int x) {\n"
                "    if (x < 123) { }\n"
                "    else { a = x; }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         code = "void f(int x) {\n"
                "    if (x < 123) { throw \"\"; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         code = "void f(int x) {\n"
                "    if (x < 123) { }\n"
                "    else { throw \"\"; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 122));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 123));
 
         code = "void f(int x) {\n"
                "    if (x > 123) { }\n"
                "    else { a = x; }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         code = "void f(int x) {\n"
                "    if (x > 123) { throw \"\"; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         code = "void f(int x) {\n"
                "    if (x > 123) { }\n"
                "    else { throw \"\"; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 124));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 123));
 
@@ -3316,7 +3517,7 @@ class TestValueFlow : public TestFixture {
                "    if (x < 123) { return; }\n"
                "    else { return; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 124));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 123));
 
@@ -3325,7 +3526,7 @@ class TestValueFlow : public TestFixture {
                "    if (x) { a = x; }\n"  // <- x is not 0
                "    else { b = x; }\n"    // <- x is 0
                "    c = x;\n"             // <- x might be 0
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 0));
         ASSERT_EQUALS(true,  testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(true,  testValueOfX(code, 4U, 0));
@@ -3334,32 +3535,32 @@ class TestValueFlow : public TestFixture {
         code = "void f(int x) {\n"
                "    while (x != 3) {}\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 3));
 
         code = "void f(int x) {\n"
                "    while (11 != (x = dostuff())) {}\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 11));
 
         code = "void f(int x) {\n"
                "    while (11 != (x = dostuff()) && y) {}\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 11));
 
         code = "void f(int x) {\n"
                "    while (x = dostuff()) {}\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
 
         code = "void f(const Token *x) {\n" // #5866
                "    x = x->next();\n"
                "    while (x) { x = x->next(); }\n"
                "    if (x->str()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 0));
 
         code = "void f(const Token *x) {\n"
@@ -3383,7 +3584,7 @@ class TestValueFlow : public TestFixture {
                "    a = x;\n"  // <- TODO, x can be 2
                "  else\n"
                "    b = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 2));
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 2));
 
@@ -3393,7 +3594,7 @@ class TestValueFlow : public TestFixture {
                "  if (x == 7) { y = 1; }\n"
                "  if (!y)\n"
                "    a = x;\n" // <- x can not be 7 here
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 7));
 
         code = "void f(struct X *x) {\n"
@@ -3410,13 +3611,13 @@ class TestValueFlow : public TestFixture {
         code = "void f(int x) {\n"
                "  a = (x != 3 ||\n"
                "       x);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 3));
 
         code = "void f(int x) {\n"
                "  a = (x == 4 &&\n"
                "       x);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 4));
 
         // protected usage with &&
@@ -3424,7 +3625,7 @@ class TestValueFlow : public TestFixture {
                "    if (x) {}\n"
                "    for (; x &&\n"
                "         x->str() != y; x = x->next()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
@@ -3432,7 +3633,7 @@ class TestValueFlow : public TestFixture {
                "    if (x) {}\n"
                "    if (x &&\n"
                "        x->str() != y) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
@@ -3442,7 +3643,7 @@ class TestValueFlow : public TestFixture {
                "    if (z) return; else return;\n"
                "  }\n"
                "  a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 5));
 
         code = "void f(int x) {\n" // #6730
@@ -3450,14 +3651,14 @@ class TestValueFlow : public TestFixture {
                "    if (z) continue; else throw e;\n"
                "  }\n"
                "  a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 5));
 
         // TODO: float
         code = "void f(float x) {\n"
                "  if (x == 0.5) {}\n"
                "  a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
         // aliased variable
@@ -3468,7 +3669,7 @@ class TestValueFlow : public TestFixture {
                "    calc(data);\n"
                "    a = x;\n"  // <- x might be changed by calc
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 0));
 
         code = "int* g();\n"
@@ -3485,15 +3686,15 @@ class TestValueFlow : public TestFixture {
         code = "void foo(const volatile int &x) {\n"
                "    if (x==1) {\n"
                "        return x;\n"
-               "    }"
-               "}";
+               "    }\n"
+               "}\n";
         ASSERT_EQUALS(false, testValueOfXKnown(code, 3U, 1));
 
         code = "void foo(const std::atomic<int> &x) {\n"
                "    if (x==2) {\n"
                "        return x;\n"
-               "    }"
-               "}";
+               "    }\n"
+               "}\n";
         ASSERT_EQUALS(false, testValueOfXKnown(code, 3U, 2));
 
         code = "int f(int i, int j) {\n"
@@ -3732,6 +3933,44 @@ class TestValueFlow : public TestFixture {
                "    return x;\n"
                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 0));
+
+        // if the guarded block calls an unknown, possibly noreturn function
+        // then the condition value is lowered to inconclusive after the block
+        code = "int f(int x) {\n"
+               "    if (x == 0)\n"
+               "        g();\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXInconclusive(code, 4U, 0));
+
+        // .. also when the guard is in the else branch
+        code = "int f(int x) {\n"
+               "    if (x != 0)\n"
+               "        ;\n"
+               "    else\n"
+               "        g();\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXInconclusive(code, 6U, 0));
+
+        // a declared function is assumed to return
+        code = "void g();\n"
+               "int f(int x) {\n"
+               "    if (x == 0)\n"
+               "        g();\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 5U, 0));
+        ASSERT_EQUALS(false, testValueOfXInconclusive(code, 5U, 0));
+
+        // a noreturn function conclusively escapes
+        code = "int f(int x) {\n"
+               "    if (x == 0)\n"
+               "        abort();\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
+        ASSERT_EQUALS(true, testValueOfXImpossible(code, 4U, 0));
     }
 
     void valueFlowAfterConditionTernary()
@@ -3790,7 +4029,7 @@ class TestValueFlow : public TestFixture {
                "        int x = p[0];\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
 
         code = "void f(int y) {\n"
@@ -3798,7 +4037,7 @@ class TestValueFlow : public TestFixture {
                "        int x = y+1;\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
 
         code = "void f(int y) {\n"
@@ -3806,7 +4045,7 @@ class TestValueFlow : public TestFixture {
                "        int x = y+2;\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 124));
 
         code = "void f(int y, int z) {\n"
@@ -3814,7 +4053,7 @@ class TestValueFlow : public TestFixture {
                "        int x = y+z;\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
 
         code = "void f(int y, int z) {\n"
@@ -3823,7 +4062,7 @@ class TestValueFlow : public TestFixture {
                "        int x = y+z;\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 123));
 
         code = "void f(int y) {\n"
@@ -3831,7 +4070,7 @@ class TestValueFlow : public TestFixture {
                "        int x = y++;\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 123));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 124));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 125));
@@ -3886,28 +4125,28 @@ class TestValueFlow : public TestFixture {
         code = "int f(int x, int y) {\n"
                "    if (x!=0) {}\n"
                "      return y/x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
 
         code = "int f(int x, int y) {\n"
                "    if (!!(x != 0)) {\n"
                "      return y/x;\n"
                "}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
         code = "int f(int x, int y) {\n"
                "    if (!!!(x != 0)) {\n"
                "      return y/x;\n"
                "}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
 
         code = "int f(int x, int y) {\n"
                "    if (!!!!(x != 0)) {\n"
                "      return y/x;\n"
                "}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
     }
 
@@ -3918,7 +4157,7 @@ class TestValueFlow : public TestFixture {
                "    int x = 123;\n"
                "    x += 43;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 166));
         ASSERT_EQUALS("2,Assignment 'x=123', assigned value is 123\n"
                       "3,Compound assignment '+=', assigned value is 166\n",
@@ -3928,36 +4167,44 @@ class TestValueFlow : public TestFixture {
                "    int x = 123;\n"
                "    x /= 0;\n" // don't crash when evaluating x/=0
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 123));
 
         code = "float f() {\n"
                "    float x = 123.45f;\n"
                "    x += 67;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, static_cast<double>(123.45f) + 67, 0.01));
 
         code = "double f() {\n"
                "    double x = 123.45;\n"
                "    x += 67;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123.45 + 67, 0.01));
 
         code = "void f() {\n"
                "    int x = 123;\n"
                "    x >>= 1;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 61));
 
         code = "int f() {\n"
                "    int x = 123;\n"
                "    x <<= 1;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 246));
+
+        code = "int64_t f() {\n"
+               "    const int64_t val = 1LL << 33;\n"
+               "    int64_t x = val;\n"
+               "    x += val;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 5U, 1LL << 34));
     }
 
     void valueFlowForwardCorrelatedVariables() {
@@ -3967,7 +4214,7 @@ class TestValueFlow : public TestFixture {
                "  bool zero(x==0);\n"
                "  if (zero) a = x;\n"  // <- x is 0
                "  else b = x;\n"  // <- x is not 0
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
@@ -3993,7 +4240,7 @@ class TestValueFlow : public TestFixture {
                "  int x = 0;\n"
                "  if (b) x = 1;\n"
                "  else b = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 4U, 0));
 
         code = "void f(int i) {\n"
@@ -4018,7 +4265,7 @@ class TestValueFlow : public TestFixture {
                "  int x=1;\n"
                "  C c(x);\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 8U, 1));
 
         code = "class C {\n"
@@ -4029,7 +4276,7 @@ class TestValueFlow : public TestFixture {
                "  int x=1;\n"
                "  C c(x);\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 8U, 1));
 
         code = "int f(int *);\n"
@@ -4038,7 +4285,7 @@ class TestValueFlow : public TestFixture {
                "  int x = 11;\n"
                "  c = (a && f(&x));\n"
                "  if (x == 42) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 11));
 
         code = "void f() {\n"
@@ -4061,21 +4308,21 @@ class TestValueFlow : public TestFixture {
                "  int x=5;\n"
                "  a = b ? init1(&x) : init2(&x);\n"
                "  return 1 + x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 5));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 5));
 
         code = "int f(int *p) {\n" // #9008 - gcc ternary ?:
                "  if (p) return;\n"
                "  x = *p ? : 1;\n" // <- no explicit expr0
-               "}";
+               "}\n";
         (void)testValueOfX(code, 1U, 0); // do not crash
 
         code = "void f(int a) {\n" // #8784
                "    int x = 13;\n"
                "    if (a == 1) x = 26;\n"
                "    return a == 1 ? x : 0;\n"  // <- x is 26
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 13));
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 26));
 
@@ -4086,6 +4333,15 @@ class TestValueFlow : public TestFixture {
                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 0));
         ASSERT_EQUALS(false, testValueOfXImpossible(code, 4U, 0));
+
+        code = "double f(double d, bool b) {\n" // #14734
+               "    double s = 0.0;\n"
+               "    if (b)\n"
+               "        s += d;\n"
+               "    return s > 0.0 ? s : 0.0;\n"
+               "}\n";
+        auto values = tokenValues(code, "s :", ValueFlow::Value::ValueType::FLOAT);
+        ASSERT_EQUALS(0, values.size());
     }
 
     void valueFlowForwardLambda() {
@@ -4096,7 +4352,7 @@ class TestValueFlow : public TestFixture {
                "  auto f = [&](){ a=x; }\n"  // x is not 1
                "  x = 2;\n"
                "  f();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 1));
         TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 3U, 2));
 
@@ -4104,7 +4360,7 @@ class TestValueFlow : public TestFixture {
                "  int x=3;\n"
                "  auto f = [&](){ a=x; }\n"  // todo: x is 3
                "  f();\n"
-               "}";
+               "}\n";
         TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 3U, 3));
 
         code = "void f() {\n"
@@ -4113,7 +4369,7 @@ class TestValueFlow : public TestFixture {
                "  x = 1;\n"
                "  f();\n"
                "  int a = x;\n" // x is actually 2
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 1));
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 3));
     }
@@ -4158,21 +4414,21 @@ class TestValueFlow : public TestFixture {
         code = "int f(int a) {\n"
                "  int x = a & 0x80;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code,3U,0));
         ASSERT_EQUALS(true, testValueOfX(code,3U,0x80));
 
         code = "int f(int a) {\n"
                "  int x = a & 0x80 ? 1 : 2;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code,3U,0));
         ASSERT_EQUALS(false, testValueOfX(code,3U,0x80));
 
         code = "int f() {\n"
                "  int x = (19 - 3) & 15;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code,3U,0));
         ASSERT_EQUALS(false, testValueOfX(code,3U,16));
     }
@@ -4306,73 +4562,73 @@ class TestValueFlow : public TestFixture {
         code = "int f(int a) {\n"
                "  int x = (a & 0xff) >> 16;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code,3U,0,&s));
 
         code = "int f(unsigned int a) {\n"
                "  int x = (a % 123) >> 16;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code,3U,0,&s));
 
         code = "int f(int y) {\n"
                "  int x = (y & 0xFFFFFFF) >> 31;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3u, 0));
 
         code = "int f(int y) {\n"
                "  int x = (y & 0xFFFFFFF) >> 32;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3u, 0,&s));
 
         code = "int f(short y) {\n"
                "  int x = (y & 0xFFFFFF) >> 31;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3u, 0,&s));
 
         code = "int f(short y) {\n"
                "  int x = (y & 0xFFFFFF) >> 32;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3u, 0,&s));
 
         code = "int f(long y) {\n"
                "  int x = (y & 0xFFFFFF) >> 63;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3u, 0,&s));
 
         code = "int f(long y) {\n"
                "  int x = (y & 0xFFFFFF) >> 64;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3u, 0,&s));
 
         code = "int f(long long y) {\n"
                "  int x = (y & 0xFFFFFF) >> 63;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3u, 0,&s));
 
         code = "int f(long long y) {\n"
                "  int x = (y & 0xFFFFFF) >> 64;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3u, 0,&s));
 
         code = "int f(long long y) {\n"
                "  int x = (y & 0xFFFFFF) >> 121;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3u, 0,&s));
 
         code = "int f(long long y) {\n"
                "  int x = (y & 0xFFFFFF) >> 128;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3u, 0,&s));
     }
 
@@ -4384,7 +4640,7 @@ class TestValueFlow : public TestFixture {
                "  struct Foo foo;\n"
                "  foo.x = 1;\n"
                "  x = 0 + foo.x;\n" // <- foo.x is 1
-               "}";
+               "}\n";
         values = removeSymbolicTok(tokenValues(code, "+"));
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(true, values.front().isKnown());
@@ -4397,7 +4653,7 @@ class TestValueFlow : public TestFixture {
                "  int y = 10;\n"
                "  while (s.x < y)\n" // s.x does not have known value
                "    s.x++;\n"
-               "}";
+               "}\n";
         values = removeImpossible(tokenValues(code, "<"));
         ASSERT_EQUALS(1, values.size());
         ASSERT(values.front().isPossible());
@@ -4409,7 +4665,7 @@ class TestValueFlow : public TestFixture {
                "  int y = 10;\n"
                "  while (s.x < y)\n" // s.x has a known value
                "    y--;\n"
-               "}";
+               "}\n";
         values = tokenValues(code, ". x <");
         ASSERT(values.size() == 1 &&
                values.front().isKnown() &&
@@ -4422,7 +4678,7 @@ class TestValueFlow : public TestFixture {
                "  if (foo)\n"
                "    hints.x = 2;\n"
                "  x = 0 + foo.x;\n" // <- foo.x is possible 1, possible 2
-               "}";
+               "}\n";
         values = removeSymbolicTok(tokenValues(code, "+"));
         TODO_ASSERT_EQUALS(2U, 0U, values.size()); // should be 2
 
@@ -4437,7 +4693,7 @@ class TestValueFlow : public TestFixture {
                "  }\n"
                "  if (*b > 0) {\n" // *b does not have known value
                "  }\n"
-               "}";
+               "}\n";
         values = removeImpossible(tokenValues(code, ">"));
         ASSERT_EQUALS(1, values.size());
         ASSERT(values.front().isPossible());
@@ -4450,7 +4706,7 @@ class TestValueFlow : public TestFixture {
                "        if (pvd.descr_type == 0xff) {}\n"
                "        dostuff(&pvd);\n"
                "    } while (condition);\n"
-               "}";
+               "}\n";
         values = removeImpossible(tokenValues(code, "=="));
         ASSERT_EQUALS(1, values.size());
         ASSERT(values.front().isPossible());
@@ -4460,7 +4716,7 @@ class TestValueFlow : public TestFixture {
         code = "struct S { int x; };\n" // #9036
                "void foo(struct S s) {\n"
                "    for (s.x = 0; s.x < 127; s.x++) {}\n"
-               "}";
+               "}\n";
         values = removeImpossible(tokenValues(code, "<"));
         values.remove_if([&](const ValueFlow::Value& v) {
             return !v.isKnown();
@@ -4475,7 +4731,7 @@ class TestValueFlow : public TestFixture {
                             "    case 14: a=x+2; break;\n"  // <- x is 14
                             "    };\n"
                             "    a = x;\n"  // <- x can be 14
-                            "}";
+                            "}\n";
         ASSERT_EQUALS(true, testConditionalValueOfX(code, 2U, 14));
         TODO_ASSERT_EQUALS(true, false, testConditionalValueOfX(code, 4U, 14));
         TODO_ASSERT_EQUALS(true, false, testConditionalValueOfX(code, 6U, 14));
@@ -4496,7 +4752,7 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "    for (int x = 0; x < 10; x++)\n"
                "        a[x] = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 9));
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 10));
@@ -4506,7 +4762,7 @@ class TestValueFlow : public TestFixture {
                "    for (x = 2; x < 1; x++)\n"
                "        a[x] = 0;\n" // <- not 2
                "    b = x;\n" // 2
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 2));
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 2));
 
@@ -4515,7 +4771,7 @@ class TestValueFlow : public TestFixture {
                "    for (x = 2; x < 1; ++x)\n"
                "        a[x] = 0;\n" // <- not 2
                "    b = x;\n" // 2
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 2));
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 2));
 
@@ -4524,26 +4780,26 @@ class TestValueFlow : public TestFixture {
                "    int x;\n"
                "    for (x = 1; x < B; ++x)\n"
                "        a[x] = 0;\n" // <- not 1
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 1));
 
         code = "void f(int a) {\n"
                "    for (int x = a; x < 10; x++)\n"
                "        a[x] = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 9));
 
         code = "void f() {\n"
                "    for (int x = 0; x < 5; x += 2)\n"
                "        a[x] = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 4));
 
         code = "void f() {\n"
                "    for (int x = 0; x < 10; x = x + 2)\n"
                "        a[x] = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 8));
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 10));
@@ -4551,14 +4807,14 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "    for (int x = 0; x < 10; x = x / 0)\n"
                "        a[x] = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0)); // don't crash
 
         code = "void f() {\n"
                "    for (int x = 0; x < 10; x++)\n"
                "        x<4 ?\n"
                "        a[x] : 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 9));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 9));
@@ -4567,13 +4823,13 @@ class TestValueFlow : public TestFixture {
                "    for (int x = 0; x < 10; x++)\n"
                "        x==0 ?\n"
                "        0 : a[x];\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n" // #5223
                "    for (int x = 0; x < 300 && x < 18; x++)\n"
                "        x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 17));
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 299));
@@ -4582,7 +4838,7 @@ class TestValueFlow : public TestFixture {
                "    int x;\n"
                "    for (int i = 0; x = bar[i]; i++)\n"
                "        x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n"
@@ -4590,28 +4846,28 @@ class TestValueFlow : public TestFixture {
                "    int x;\n"
                "    for (x = 0; abc[x] != '\\0'; x++) {}\n"
                "    a[x] = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 3));
 
         code = "void f() {\n" // #5939
                "    int x;\n"
                "    for (int x = 0; (x = do_something()) != 0;)\n"
                "        x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n"
                "    int x;\n"
                "    for (int x = 0; x < 10 && y = do_something();)\n"
                "        x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n"
                "    int x,y;\n"
                "    for (x = 0, y = 0; x < 10, y < 10; x++, y++)\n" // usage of ,
                "        x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 0));
 
         code = "void foo(double recoveredX) {\n"
@@ -4637,7 +4893,7 @@ class TestValueFlow : public TestFixture {
         code = "void foo() {\n"
                "  for (int x = 0; x < 10; x++) {\n"
                "    if (x > 1\n"
-               "        && x) {}" // <- x is not 0
+               "        && x) {}\n" // <- x is not 0
                "  }\n"
                "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
@@ -4647,7 +4903,7 @@ class TestValueFlow : public TestFixture {
         code = "void foo() {\n"
                "  for (int x = 0; x < 10; x++) {\n"
                "    if (x < value\n"
-               "        && x) {}" // <- maybe x is not 9
+               "        && x) {}\n" // <- maybe x is not 9
                "  }\n"
                "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 9));
@@ -4656,7 +4912,7 @@ class TestValueFlow : public TestFixture {
         code = "void foo() {\n"
                "  for (int x = 0; x < 10; x++) {\n"
                "    if (x == 0\n"
-               "        || x) {}" // <- x is not 0
+               "        || x) {}\n" // <- x is not 0
                "  }\n"
                "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
@@ -4692,7 +4948,7 @@ class TestValueFlow : public TestFixture {
                "    abort();\n"
                "  }\n"
                "  a = x;\n" // <- x can't be 5
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 7U, 5));
 
         code = "void f() {\n"
@@ -4701,7 +4957,7 @@ class TestValueFlow : public TestFixture {
                "  if (x < 5) {}\n"
                "  else return;\n"
                "  a = x;\n" // <- x can't be 5
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 5));
 
         // assert after for loop..
@@ -4721,7 +4977,7 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "  for(int i = 0; i < 20; i++)\n"
                "    n = (int)(i < 10 || abs(negWander) < abs(negTravel));\n"
-               "}";
+               "}\n";
         (void)testValueOfX(code,0,0); // <- don't hang
 
         // crash (daca@home)
@@ -4734,7 +4990,7 @@ class TestValueFlow : public TestFixture {
                "            if (z[n] && strncmp(&z[n+i], \"-->\", 3) == 0) ;\n"
                "        }\n"
                "    }\n"
-               "}";
+               "}\n";
         (void)testValueOfX(code,0,0); // <- don't crash
 
         // conditional code in loop
@@ -4746,7 +5002,7 @@ class TestValueFlow : public TestFixture {
                "      else { a = x; }\n" // <- x is not 10
                "    }\n"
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 10));
 
         // #7886 - valueFlowForLoop must be called after valueFlowAfterAssign
@@ -4755,14 +5011,14 @@ class TestValueFlow : public TestFixture {
                "  int x,y;\n"
                "  for(x=0,y=0; x < sz && y < 10; x++)\n"
                "    a = x;\n" // <- max value is 3
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 3));
 
         code = "void f() {\n"
                "    int x;\n"
                "    for (x = 0; x < 10; x++)\n"
                "        x;\n"
-               "}";
+               "}\n";
         std::list<ValueFlow::Value> values = tokenValues(code, "x <");
         ASSERT(std::none_of(values.cbegin(), values.cend(), std::mem_fn(&ValueFlow::Value::isUninitValue)));
 
@@ -4922,6 +5178,39 @@ class TestValueFlow : public TestFixture {
         ++it;
         ASSERT_EQUALS(0, it->intvalue);
         ASSERT(it->isPossible());
+
+        code = "void g(int*);\n"
+               "void f(int* a) {\n"
+               "    for (int i = 0; i < 5; ++i) {\n"
+               "        g(&a[i]);\n"
+               "    }\n"
+               "}\n";
+        values = tokenValues(code, "i ]");
+        ASSERT_EQUALS(4, values.size());
+        it = values.begin();
+        ASSERT_EQUALS(0, it->intvalue);
+        ASSERT(it->isPossible());
+        ++it;
+        ASSERT_EQUALS(-1, it->intvalue);
+        ASSERT(it->isImpossible());
+        ++it;
+        ASSERT_EQUALS(4, it->intvalue);
+        ASSERT(it->isPossible());
+        ++it;
+        ASSERT_EQUALS(5, it->intvalue);
+        ASSERT(it->isImpossible());
+
+        code = "int a[5];\n" // #14998
+               "int f() {\n"
+               "    int i;\n"
+               "    for (i = 0; true; ++i) {\n"
+               "        if (i == 4)\n"
+               "            break;\n"
+               "    }\n"
+               "    return a[i];\n"
+               "}\n";
+        values = tokenValues(code, "i ]");
+        ASSERT(values.empty());
     }
 
     void valueFlowSubFunction() {
@@ -4937,7 +5226,7 @@ class TestValueFlow : public TestFixture {
                "}\n"
                "void g(){\n"
                "    f(42);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 17));
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 42));
         ASSERT_EQUALS(true, testValueOfX(code, 7U, 0));
@@ -5055,7 +5344,7 @@ class TestValueFlow : public TestFixture {
                "}\n"
                "void f2() {\n"
                "    x = 10 - f1(2);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(7, valueOfTok(code, "-").intvalue);
         ASSERT_EQUALS(true, valueOfTok(code, "-").isKnown());
 
@@ -5064,12 +5353,12 @@ class TestValueFlow : public TestFixture {
                "}\n"
                "void f2() {\n"
                "    x = 2 * add(10+1,4);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(30, valueOfTok(code, "*").intvalue);
         ASSERT_EQUALS(true, valueOfTok(code, "*").isKnown());
 
         code = "int one() { return 1; }\n"
-               "void f() { x = 2 * one(); }";
+               "void f() { x = 2 * one(); }\n";
         ASSERT_EQUALS(2, valueOfTok(code, "*").intvalue);
         ASSERT_EQUALS(true, valueOfTok(code, "*").isKnown());
 
@@ -5078,7 +5367,7 @@ class TestValueFlow : public TestFixture {
                "}\n"
                "void f2() {\n"
                "    x = 2 * add(1,add(2,3));\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(12, valueOfTok(code, "*").intvalue);
         ASSERT_EQUALS(true, valueOfTok(code, "*").isKnown());
 
@@ -5087,7 +5376,7 @@ class TestValueFlow : public TestFixture {
                "        return g(std::move(x));\n"
                "    g(x);\n"
                "    return 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "class A\n"
@@ -5098,7 +5387,7 @@ class TestValueFlow : public TestFixture {
                "    void f2() {\n"
                "        x = 10 - f1(2);\n"
                "    }\n"
-               "};";
+               "};\n";
         ASSERT_EQUALS(7, valueOfTok(code, "-").intvalue);
         ASSERT_EQUALS(true, valueOfTok(code, "-").isKnown());
 
@@ -5110,7 +5399,7 @@ class TestValueFlow : public TestFixture {
                "    void f2() {\n"
                "        x = 10 - f1(2);\n"
                "    }\n"
-               "};";
+               "};\n";
         TODO_ASSERT_EQUALS(7, 0, valueOfTok(code, "-").intvalue);
         ASSERT_EQUALS(false, valueOfTok(code, "-").isKnown());
 
@@ -5242,8 +5531,14 @@ class TestValueFlow : public TestFixture {
 
         code = "class continuous_src_time {\n"
                "    continuous_src_time(std::complex<double> f, double st = 0.0, double et = infinity) {}\n"
-               "};";
+               "};\n";
         (void)testValueOfX(code, 2U, 2); // Don't crash (#6494)
+
+        code = "struct S {\n" // #14693
+               "    int i;\n"
+               "    explicit S(std::string&& s = {}) : i(0) {}\n"
+               "};\n";
+        ASSERT_EQUALS(false, testKnownValueOfTok(code, "{ } )", 0));
     }
 
     bool isNotKnownValues(const char code[], const char str[]) {
@@ -5257,13 +5552,13 @@ class TestValueFlow : public TestFixture {
         const char *code;
         ValueFlow::Value value;
 
-        ASSERT(valueOfTok("x = 1;", "1").isKnown());
+        ASSERT(valueOfTok("x = 1;\n", "1").isKnown());
 
         // after assignment
         code = "void f() {\n"
                "  int x = 1;\n"
                "  return x + 2;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "+");
         ASSERT_EQUALS(3, value.intvalue);
         ASSERT(value.isKnown());
@@ -5272,7 +5567,7 @@ class TestValueFlow : public TestFixture {
             code = "void f() {\n"
                    "  int x = 15;\n"
                    "  if (x == 15) { x += 7; }\n" // <- condition is true
-                   "}";
+                   "}\n";
             value = valueOfTok(code, "==");
             ASSERT_EQUALS(1, value.intvalue);
             ASSERT(value.isKnown());
@@ -5292,7 +5587,7 @@ class TestValueFlow : public TestFixture {
                "  int x;\n"
                "  if (ab) { x = 7; }\n"
                "  return x + 2;\n" // <- possible value
-               "}";
+               "}\n";
         value = valueOfTok(code, "+");
         ASSERT_EQUALS(9, value.intvalue);
         ASSERT(value.isPossible());
@@ -5301,7 +5596,7 @@ class TestValueFlow : public TestFixture {
                "  int x = 0;\n"
                "  if (c) {} else { x++; }\n"
                "  return x + 2;\n" // <- possible value
-               "}";
+               "}\n";
         ASSERT(isNotKnownValues(code, "+"));
 
         code = "void f() {\n"
@@ -5376,7 +5671,7 @@ class TestValueFlow : public TestFixture {
                "    a = x+2;\n"
                "    dostuff();\n"
                "  }\n"
-               "}";
+               "}\n";
         ASSERT(isNotKnownValues(code, "+"));
 
         code = "void f() {\n"
@@ -5402,7 +5697,7 @@ class TestValueFlow : public TestFixture {
                "    }\n"
                "  }\n"
                "  if (!x) {}\n"  // <- possible value
-               "}";
+               "}\n";
         ASSERT(isNotKnownValues(code, "!"));
 
         code = "void f() {\n" // #8356
@@ -5410,7 +5705,7 @@ class TestValueFlow : public TestFixture {
                "  for(int x = 3; !b && x < 10; x++) {\n" // <- b has known value
                "    for(int y = 4; !b && y < 20; y++) {}\n"
                "  }\n"
-               "}";
+               "}\n";
         value = valueOfTok(code, "!");
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT(value.isKnown());
@@ -5423,7 +5718,7 @@ class TestValueFlow : public TestFixture {
                "    break;\n"
                "  }\n"
                "  if (!x) {}\n"  // <- possible value
-               "}";
+               "}\n";
         ASSERT(isNotKnownValues(code, "!"));
 
         code = "void f() {\n" // #7049
@@ -5434,7 +5729,7 @@ class TestValueFlow : public TestFixture {
                "  case 2:\n"
                "    if (!x) {}\n" // <- possible value
                "  }\n"
-               "}";
+               "}\n";
         ASSERT(isNotKnownValues(code, "!"));
 
         code = "void f() {\n"
@@ -5442,7 +5737,7 @@ class TestValueFlow : public TestFixture {
                "  while (!x) {\n" // <- possible value
                "    scanf(\"%d\", &x);\n"
                "  }\n"
-               "}";
+               "}\n";
         value = valueOfTok(code, "!");
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT(value.isPossible());
@@ -5450,7 +5745,7 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "  int x = 0;\n"
                "  do { } while (++x < 12);\n" // <- possible value
-               "}";
+               "}\n";
         ASSERT(isNotKnownValues(code, "<"));
 
         code = "void f() {\n"
@@ -5465,7 +5760,7 @@ class TestValueFlow : public TestFixture {
                "  int x = 0;\n"
                "a:\n"
                "  a = x + 1;\n" // <- possible value
-               "}";
+               "}\n";
         value = valueOfTok(code, "+");
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT(value.isPossible());
@@ -5475,7 +5770,7 @@ class TestValueFlow : public TestFixture {
                "  if (!x) {\n"
                "    a = x+1;\n" // <- known value
                "  }\n"
-               "}";
+               "}\n";
         value = valueOfTok(code, "+");
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT(value.isKnown());
@@ -5484,7 +5779,7 @@ class TestValueFlow : public TestFixture {
                "  if (a && 4==x && y) {\n"
                "    a = x+12;\n" // <- known value
                "  }\n"
-               "}";
+               "}\n";
         value = valueOfTok(code, "+");
         ASSERT_EQUALS(16, value.intvalue);
         ASSERT(value.isKnown());
@@ -5493,7 +5788,7 @@ class TestValueFlow : public TestFixture {
         code = "int f(int x) {\n"
                "  if (x == 4) {}\n"
                "  return x + 1;\n" // <- possible value
-               "}";
+               "}\n";
         value = valueOfTok(code, "+");
         ASSERT_EQUALS(5, value.intvalue);
         ASSERT(value.isPossible());
@@ -5501,7 +5796,7 @@ class TestValueFlow : public TestFixture {
         code = "int f(int x) {\n"
                "  if (x < 2) {}\n"
                "  else if (x >= 2) {}\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, ">=");
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT(value.isKnown());
@@ -5509,7 +5804,7 @@ class TestValueFlow : public TestFixture {
         code = "int f(int x) {\n"
                "  if (x < 2) {}\n"
                "  else if (x > 2) {}\n" // <- possible value
-               "}";
+               "}\n";
         ASSERT(isNotKnownValues(code, ">"));
 
         // known and possible value
@@ -5517,22 +5812,22 @@ class TestValueFlow : public TestFixture {
                "    int x = 1;\n"
                "    int y = 2 + x;\n" // <- known value, don't care about condition
                "    if (x == 2) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true,  testValueOfX(code, 3U, 1)); // value of x can be 1
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 2)); // value of x can't be 2
 
         code = "bool f() {\n"
                "  const int s( 4 );"
                "  return s == 4;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT(value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
 
         code = "bool f() {\n"
-               "  const int s{ 4 };"
+               "  const int s{ 4 };\n"
                "  return s == 4;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT(value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5540,7 +5835,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  const int s = int( 4 );"
                "  return s == 4;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT(value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5548,7 +5843,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  const int s = int{ 4 };"
                "  return s == 4;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT(value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5556,7 +5851,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  const int s = int{};"
                "  return s == 0;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5564,7 +5859,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  const int s = int();"
                "  return s == 0;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5572,7 +5867,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  const int s{};"
                "  return s == 0;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5580,7 +5875,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  int* p{};\n"
                "  return p == nullptr;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5588,7 +5883,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  int* p{ nullptr };\n"
                "  return p == nullptr;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5596,7 +5891,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  int* p{ 0 };\n"
                "  return p == nullptr;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5604,7 +5899,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  int* p = {};\n"
                "  return p == nullptr;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5612,7 +5907,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  int i = {};\n"
                "  return i == 0;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5620,7 +5915,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  int* p = { 0 };\n"
                "  return p == nullptr;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5628,20 +5923,20 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  int i = { 1 };\n"
                "  return i == 1;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
 
         // calculation with known result
-        code = "int f(int x) { a = x & 0; }"; // <- & is 0
+        code = "int f(int x) { a = x & 0; }\n"; // <- & is 0
         value = valueOfTok(code, "&");
         ASSERT_EQUALS(0, value.intvalue);
         ASSERT(value.isKnown());
 
         // template parameters are not known
         code = "template <int X> void f() { a = X; }\n"
-               "f<1>();";
+               "f<1>();\n";
         value = valueOfTok(code, "1");
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT_EQUALS(false, value.isKnown());
@@ -5654,25 +5949,23 @@ class TestValueFlow : public TestFixture {
         ASSERT_EQUALS(false, value.isKnown());
 
         // #13959
-        const Settings settingsOld = settings;
-        settings.standards.c = Standards::C23;
+        const Settings settingsC23 = settingsBuilder(settings).c(Standards::C23).build();
         code = "void f(int* p) {\n"
                "    if (p == nullptr)\n"
                "        return;\n"
                "    if (p) {}\n"
                "}\n";
-        value = valueOfTok(code, "p ) { }", &settings, /*cpp*/ false);
+        value = valueOfTok(code, "p ) { }", &settingsC23, /*cpp*/ false);
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT_EQUALS(true, value.isKnown());
 
-        settings.standards.c = Standards::C17;
-        value = valueOfTok(code, "p ) { }", &settings, /*cpp*/ false);
+        const Settings settingsC17 = settingsBuilder(settings).c(Standards::C17).build();
+        value = valueOfTok(code, "p ) { }", &settingsC17, /*cpp*/ false);
         ASSERT(value == ValueFlow::Value());
-        settings = settingsOld;
     }
 
     void valueFlowSizeofForwardDeclaredEnum() {
-        const char *code = "enum E; sz=sizeof(E);";
+        const char *code = "enum E; sz=sizeof(E);\n";
         (void)valueOfTok(code, "="); // Don't crash (#7775)
     }
 
@@ -5683,14 +5976,14 @@ class TestValueFlow : public TestFixture {
                "void f() {\n"
                "    x = 4;\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 4));
 
         code = "int x;\n"
                "void f() {\n"
                "    if (x == 4) {}\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 4));
 
         code = "int x;\n"
@@ -5698,7 +5991,7 @@ class TestValueFlow : public TestFixture {
                "    x = 42;\n"
                "    unknownFunction();\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 42));
     }
 
@@ -5708,7 +6001,7 @@ class TestValueFlow : public TestFixture {
         code = "const int x = 321;\n"
                "void f() {\n"
                "  a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 321));
 
         code = "void f(const int x = 1) {\n"
@@ -5731,41 +6024,41 @@ class TestValueFlow : public TestFixture {
         code = "static int x = 321;\n"
                "void f() {\n"
                "  a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 321));
 
         code = "static int x = 321;\n"
                "void f() {\n"
                "  a = x;\n"
-               "}"
+               "}\n"
                "void other() { x=a; }\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 321));
 
         code = "static int x = 321;\n"
                "void f() {\n"
                "  a = x;\n"
-               "}"
+               "}\n"
                "void other() { p = &x; }\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 321));
 
         code = "static int x = 321;\n"
                "void f() {\n"
                "  a = x;\n"
-               "}"
+               "}\n"
                "void other() { x++; }\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 321));
 
         code = "static int x = 321;\n"
                "void f() {\n"
                "  a = x;\n"
-               "}"
+               "}\n"
                "void other() { foo(x); }\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 321));
 
         code = "static int x = 1;\n" // compound assignment
                "void f() {\n"
                "  a = x;\n"
-               "}"
+               "}\n"
                "void other() { x += b; }\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 1));
     }
@@ -5775,7 +6068,7 @@ class TestValueFlow : public TestFixture {
                            "    int x = 42;\n"
                            "    asm(\"\");\n"
                            "    a = x;\n"
-                           "}";
+                           "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 42));
     }
 
@@ -5788,23 +6081,53 @@ class TestValueFlow : public TestFixture {
                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 1));
 
-        code = "void f(int a) {\n"
-               "    bool x = a != a;\n"
-               "    bool b = x;\n"
+        code = "void f(int a) {\n"
+               "    bool x = a != a;\n"
+               "    bool b = x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
+
+        code = "void f(int a) {\n"
+               "    int x = a - a;\n"
+               "    int b = x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
+
+        code = "void f(float a) {\n"
+               "    bool x = a == a;\n"
+               "    bool b = x;\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfX(code, 3U, 1));
+
+        code = "int f(int a) {\n"
+               "    int x = a ^ a;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
+
+        code = "int f(int a) {\n"
+               "    int x = a /= a;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 1));
+
+        code = "int f(int a) {\n"
+               "    int x = a -= a;\n"
+               "    return x;\n"
                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
 
-        code = "void f(int a) {\n"
-               "    int x = a - a;\n"
-               "    int b = x;\n"
+        code = "int f(int a) {\n"
+               "    int x = a %= a;\n"
+               "    return x;\n"
                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
 
-        code = "void f(float a) {\n"
-               "    bool x = a == a;\n"
-               "    bool b = x;\n"
+        code = "int f(int a) {\n"
+               "    int x = a ^= a;\n"
+               "    return x;\n"
                "}\n";
-        ASSERT_EQUALS(false, testValueOfX(code, 3U, 1));
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
     }
 
     void valueFlowUninit() {
@@ -5814,21 +6137,21 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "    int x;\n"
                "    switch (x) {}\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "x )");
         ASSERT_EQUALS(true, values.size()==1U && values.front().isUninitValue());
 
         code = "void f() {\n"
                "    const C *c;\n"
                "    if (c->x() == 4) {}\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "c .");
         ASSERT_EQUALS(true, values.size()==1U && values.front().isUninitValue());
 
         code = "void f() {\n"
                "    C *c;\n"
                "    if (c->x() == 4) {}\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "c .");
         ASSERT_EQUALS(true, values.size()==1U && values.front().isUninitValue());
 
@@ -5836,7 +6159,7 @@ class TestValueFlow : public TestFixture {
                "    int **x;\n"
                "    y += 10;\n"
                "    x = dostuff(sizeof(*x)*y);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(0U, tokenValues(code, "x )").size());
 
         // initialization
@@ -5844,7 +6167,7 @@ class TestValueFlow : public TestFixture {
                "  int x;\n"
                "  *((int *)(&x)) = 12;\n"
                "  a = x + 1;\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "x +");
         ASSERT_EQUALS(true, values.empty());
         // ASSERT_EQUALS(1U, values.size());
@@ -5867,7 +6190,7 @@ class TestValueFlow : public TestFixture {
         code = "void foo() {\n"
                "    int x;\n"
                "    f(x=3), return x+3;\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "x +");
         ASSERT_EQUALS(true, values.empty());
         // ASSERT_EQUALS(1U, values.size());
@@ -5880,15 +6203,15 @@ class TestValueFlow : public TestFixture {
                "  if (is >> x) {\n"
                "    a = x;\n"
                "  }\n"
-               "}";
-        values = tokenValues(code, "x ; }");
+               "}\n";
+        values = tokenValues(code, "x ; }\n");
         ASSERT_EQUALS(true, values.empty());
 
         // return (#8173)
         code = "int repeat() {\n"
                "  const char *n;\n"
                "  return((n=42) && *n == 'A');\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "n ==");
         values.remove_if(&isNotUninitValue);
         ASSERT_EQUALS(true, values.empty());
@@ -5902,7 +6225,7 @@ class TestValueFlow : public TestFixture {
                "  else\n"
                "    x = 1;\n"
                "  if (x>1) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 8U, 1));
 
         // #8348 - noreturn else
@@ -5922,8 +6245,8 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "    int x;\n"
                "    a & x;\n"
-               "}";
-        values = tokenValues(code, "x ; }");
+               "}\n";
+        values = tokenValues(code, "x ; }\n");
         ASSERT_EQUALS(true, values.empty());
 
         code = "void b(bool d, bool e) {\n"
@@ -5934,7 +6257,7 @@ class TestValueFlow : public TestFixture {
                "    goto;\n"
                "  c++;\n"
                "}\n";
-        values = tokenValues(code, "c ++ ; }");
+        values = tokenValues(code, "c ++ ; }\n");
         ASSERT_EQUALS(true, values.empty());
 
         code = "void b(bool d, bool e) {\n"
@@ -5945,7 +6268,7 @@ class TestValueFlow : public TestFixture {
                "    return;\n"
                "  c++;\n"
                "}\n";
-        values = tokenValues(code, "c ++ ; }");
+        values = tokenValues(code, "c ++ ; }\n");
         ASSERT_EQUALS(true, values.empty());
 
         code = "void b(bool d, bool e) {\n"
@@ -5956,7 +6279,7 @@ class TestValueFlow : public TestFixture {
                "    exit();\n"
                "  c++;\n"
                "}\n";
-        values = tokenValues(code, "c ++ ; }");
+        values = tokenValues(code, "c ++ ; }\n");
         ASSERT_EQUALS(true, values.empty());
 
         code = "void b(bool d, bool e) {\n"
@@ -5968,9 +6291,9 @@ class TestValueFlow : public TestFixture {
                "  c++;\n"
                "}\n";
         values = tokenValues(code, "c ++ ; }");
-        TODO_ASSERT_EQUALS(true, false, values.size() == 2);
-        // ASSERT_EQUALS(true, values.front().isUninitValue() || values.back().isUninitValue());
-        // ASSERT_EQUALS(true, values.front().isPossible() || values.back().isPossible());
+        ASSERT_EQUALS(true, values.size() == 2);
+        ASSERT_EQUALS(true, values.front().isUninitValue() || values.back().isUninitValue());
+        ASSERT_EQUALS(true, values.front().isPossible() || values.back().isPossible());
         // ASSERT_EQUALS(true, values.front().intvalue == 0 || values.back().intvalue == 0);
 
         code = "void b(bool d, bool e) {\n"
@@ -5991,7 +6314,7 @@ class TestValueFlow : public TestFixture {
                "  int szHdr;\n"
                "  idx = (A<0x80) ? (szHdr = 0) : dostuff(A, (int *)&(szHdr));\n"
                "  d = szHdr;\n" // szHdr can be 0.
-               "}";
+               "}\n";
         values = tokenValues(code, "szHdr ; }");
         TODO_ASSERT_EQUALS(1, 0, values.size());
         if (values.size() == 1) {
@@ -6002,7 +6325,7 @@ class TestValueFlow : public TestFixture {
                "  int szHdr;\n"
                "  idx = ((aKey<0x80) ? ((szHdr)=aKey), 1 : sqlite3GetVarint32(&(szHdr)));\n"
                "  d = szHdr;\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "szHdr ; }");
         ASSERT_EQUALS(0, values.size());
 
@@ -6013,7 +6336,7 @@ class TestValueFlow : public TestFixture {
                "    MyStruct x;\n"
                "    fread(((char *)&x) + 0, sizeof(x), f);\n"
                "    if (x.value < 432) {}\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "x . value");
         ASSERT_EQUALS(0, values.size());
 
@@ -6087,7 +6410,7 @@ class TestValueFlow : public TestFixture {
                "    int n;\n"
                "    for (int i = 0; i < 4; i = n)\n" // <- n is initialized in the loop body
                "        n = 10;\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "n )", ValueFlow::Value::ValueType::UNINIT);
         ASSERT_EQUALS(0, values.size());
 
@@ -6109,7 +6432,7 @@ class TestValueFlow : public TestFixture {
                "  int x;\n"
                "  if (false || init(&x)) {}\n"
                "  int b = x+1;\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "x + 1", ValueFlow::Value::ValueType::UNINIT);
         ASSERT_EQUALS(0, values.size());
 
@@ -6193,7 +6516,7 @@ class TestValueFlow : public TestFixture {
                "    size_t bytesCopied;\n"
                "    bool copied_all = true;\n"
                "    g(&copied_all, &bytesCopied);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "buflen >=", ValueFlow::Value::ValueType::UNINIT);
         ASSERT_EQUALS(1, values.size());
 
@@ -6212,6 +6535,14 @@ class TestValueFlow : public TestFixture {
                "}\n";
         values = tokenValues(code, "x > 5", ValueFlow::Value::ValueType::UNINIT);
         ASSERT_EQUALS(0, values.size());
+
+        code = "void f() {\n" // #11152
+               "  char b[10];\n"
+               "  sprintf(b, \"abc\");\n"
+               "  printf(\"%s\", b);\n"
+               "}\n";
+        values = tokenValues(code, "b )", ValueFlow::Value::ValueType::UNINIT);
+        ASSERT_EQUALS(0, values.size());
     }
 
     void valueFlowConditionExpressions() {
@@ -6350,7 +6681,7 @@ class TestValueFlow : public TestFixture {
                "\n"
                "    this->FileIndex = 1 ;\n"
                "    if ( this->FileIndex < 0 ) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, valueOfTok(code, "<").intvalue == 1);
 
         code = "int f(int p) {\n"
@@ -6451,6 +6782,11 @@ class TestValueFlow : public TestFixture {
                "    return x;\n"
                "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 5U, 0));
+
+        code = "void f() {\n"
+               "    if (int* x = {}) {}\n"
+               "}\n";
+        ASSERT_EQUALS(true, testKnownValueOfTok(code, "=", 0));
     }
 
     static std::string isPossibleContainerSizeValue(std::list<ValueFlow::Value> values,
@@ -6530,33 +6866,33 @@ class TestValueFlow : public TestFixture {
         code = "void f(const std::list<int> &ints) {\n"
                "  if (!static_cast<bool>(ints.empty()))\n"
                "    ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "ints . front"), 0));
 
         // valueFlowContainerReverse
         code = "void f(const std::list<int> &ints) {\n"
                "  ints.front();\n" // <- container can be empty
                "  if (ints.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "ints . front"), 0));
 
         code = "void f(const std::list<int> &ints) {\n"
                "  ints.front();\n" // <- container can be empty
                "  if (ints.size()==0) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "ints . front"), 0));
 
         code = "void f(std::list<int> ints) {\n"
                "  ints.front();\n" // <- no container size
                "  ints.pop_back();\n"
                "  if (ints.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "ints . front"), 1));
 
         code = "void f(std::vector<int> v) {\n"
                "  v[10] = 0;\n" // <- container size can be 10
                "  if (v.size() == 10) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "v ["), 10));
 
         code = "void f(std::vector<std::string> params) {\n"
@@ -6569,7 +6905,7 @@ class TestValueFlow : public TestFixture {
                "    if (params.size() < 2) { }\n" // <- condition
                "    break;\n"
                "  }\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "params [ 2 ]").empty());
 
         // valueFlowAfterCondition
@@ -6605,40 +6941,40 @@ class TestValueFlow : public TestFixture {
         code = "void f(const std::list<int> &ints) {\n"
                "  if (ints.empty()) {}\n"
                "  ints.front();\n" // <- container can be empty
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "ints . front"), 0));
 
         code = "void f(const std::list<int> &ints) {\n"
                "  if (ints.empty()) { continue; }\n"
                "  ints.front();\n" // <- no container size
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "ints . front"), 0));
 
         code = "void f(const std::list<int> &ints) {\n"
                "  if (ints.empty()) { ints.push_back(0); }\n"
                "  ints.front();\n" // <- container is not empty
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "ints . front").empty());
 
         code = "void f(const std::list<int> &ints) {\n"
                "  if (ints.empty()) {\n"
                "    ints.front();\n" // <- container is empty
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "ints . front"), 0));
 
         code = "void f(const std::list<int> &ints) {\n"
                "  if (ints.size() == 3) {\n"
                "    ints.front();\n" // <- container size is 3
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "ints . front"), 3));
 
         code = "void f(const std::list<int> &ints) {\n"
                "  if (ints.size() <= 3) {\n"
                "    ints.front();\n" // <- container size is 3
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "ints . front"), 3, false));
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "ints . front"), 4, false));
 
@@ -6646,7 +6982,7 @@ class TestValueFlow : public TestFixture {
                "  if (ints.size() >= 3) {\n"
                "    ints.front();\n" // <- container size is 3
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "ints . front"), 3, false));
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "ints . front"), 2, false));
 
@@ -6654,7 +6990,7 @@ class TestValueFlow : public TestFixture {
                "  if (ints.size() < 3) {\n"
                "    ints.front();\n" // <- container size is 2
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "ints . front"), 2, false));
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "ints . front"), 3, false));
 
@@ -6662,7 +6998,7 @@ class TestValueFlow : public TestFixture {
                "  if (ints.size() > 3) {\n"
                "    ints.front();\n" // <- container size is 4
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "ints . front"), 4, false));
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "ints . front"), 3, false));
 
@@ -6670,103 +7006,103 @@ class TestValueFlow : public TestFixture {
                "  if (ints.empty() == false) {\n"
                "    ints.front();\n" // <- container is not empty
                "  }\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "ints . front").empty());
 
         code = "void f(const std::vector<int> &v) {\n"
                "  if (v.empty()) {}\n"
                "  if (!v.empty() && v[10]==0) {}\n" // <- no container size for 'v[10]'
-               "}";
+               "}\n";
         ASSERT(removeImpossible(tokenValues(code, "v [")).empty());
 
         code = "void f() {\n"
                "  std::list<int> ints;\n"  // No value => ints is empty
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "ints . front"), 0));
 
         code = "void f() {\n"
                "  std::array<int,10> ints;\n" // Array size is 10
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("values.size():2", isKnownContainerSizeValue(tokenValues(code, "ints . front"), 10)); // uninit value
 
         code = "void f() {\n"
                "  std::string s;\n"
                "  cin >> s;\n"
                "  s[0];\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "s [").empty());
 
         code = "void f() {\n"
                "  std::string s = \"abc\";\n" // size of s is 3
                "  s.size();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "s . size"), 3));
 
         code = "void f(const char* p) {\n"
                "  if (p == nullptr) return;\n"
                "  std::string s { p };\n" // size of s is unknown
                "  s.front();\n"
-               "}";
+               "}\n";
         ASSERT(removeSymbolicTok(tokenValues(code, "s . front")).empty());
 
         code = "void f() {\n"
                "  std::string s = { 'a', 'b', 'c' };\n" // size of s is 3
                "  s.size();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "s . size"), 3));
 
         code = "void f() {\n"
                "  std::string s=\"abc\";\n" // size of s is 3
                "  s += unknown;\n"
                "  s.size();\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "s . size").empty());
 
         code = "void f() {\n"
                "  std::string s=\"abc\";\n" // size of s is 3
                "  s += \"def\";\n" // size of s => 6
                "  s.size();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "s . size"), 6));
 
         code = "void f(std::string s) {\n"
                "    if (s == \"hello\")\n"
                "        s[40] = c;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "s ["), 5));
 
         code = "void f(std::string s) {\n"
                "    s[40] = c;\n"
                "    if (s == \"hello\") {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "s ["), 5));
 
         code = "void f(std::string s) {\n"
                "    if (s != \"hello\") {}\n"
                "    s[40] = c;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "s ["), 5));
 
         code = "void f(std::string s) {\n"
                "    if (s != \"hello\")\n"
                "        s[40] = c;\n"
-               "}";
+               "}\n";
         ASSERT(!isImpossibleContainerSizeValue(tokenValues(code, "s ["), 5).empty());
 
         code = "void f() {\n"
                "    static std::string s;\n"
                "    if (s.size() == 0)\n"
                "        s = x;\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "s . size").empty());
 
         code = "void f() {\n"
                "    const uint8_t data[] = { 1, 2, 3 };\n"
                "    std::vector<uint8_t> v{ data, data + sizeof(data) };\n"
                "    v.size();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "v . size"), 3, false));
 
         // valueFlowContainerForward, loop
@@ -6774,7 +7110,7 @@ class TestValueFlow : public TestFixture {
                "    std::stack<Token *> links;\n"
                "    while (!links.empty() || indentlevel)\n"
                "        links.push(tok);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "links . empty"), 0));
 
         // valueFlowContainerForward, function call
@@ -6782,14 +7118,14 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  f(x);\n"
                "  x.front();\n" // <- unknown container size
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void f() {\n" // #8689
                "  std::list<int> x;\n"
                "  f<ns::a>(x);\n"
                "  x.front();\n" // <- unknown container size
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void g(std::list<int>&);\n"
@@ -6797,7 +7133,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void g(std::list<int>*);\n"
@@ -6805,7 +7141,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(&x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void g(std::list<int>* const);\n" // #9434
@@ -6813,7 +7149,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(&x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void g(const std::list<int>&);\n"
@@ -6821,7 +7157,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "x . front"), 0));
 
         code = "void g(std::list<int>);\n"
@@ -6829,7 +7165,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "x . front"), 0));
 
         code = "void g(int&);\n"
@@ -6837,7 +7173,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x[0]);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "x . front"), 0));
 
         code = "void g(int&);\n"
@@ -6845,7 +7181,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x.back());\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "x . front"), 0));
 
         code = "void g(std::list<int>&) {}\n"
@@ -6853,7 +7189,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "x . front"), 0));
 
         code = "void g(std::list<int>& y) { y.push_back(1); }\n"
@@ -6861,7 +7197,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void g(std::list<int>*) {}\n"
@@ -6869,7 +7205,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(&x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "x . front"), 0));
 
         code = "void g(std::list<int>* y) { y->push_back(1); }\n"
@@ -6877,7 +7213,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(&x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void h(std::list<int>&);\n"
@@ -6886,7 +7222,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void h(const std::list<int>&);\n"
@@ -6895,7 +7231,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "x . front"), 0));
 
         code = "void h(const std::list<int>&);\n"
@@ -6904,14 +7240,14 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void f(std::vector<int> ints) {\n" // #8697
                "  if (ints.empty())\n"
                "    abort() << 123;\n"
                "  ints[0] = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "ints ["), 0));
 
         code = "struct A {\n"  // forward, nested function call, #9424
@@ -6927,7 +7263,7 @@ class TestValueFlow : public TestFixture {
                "    std::vector<unsigned char> v;\n"
                "    ptr->getMessage (&v);\n"
                "    if (v.size () > 0) {}\n" // <- v has unknown size!
-               "}";
+               "}\n";
         ASSERT_EQUALS(0U, tokenValues(code, "v . size ( )").size());
 
         // if
@@ -6946,46 +7282,46 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "  std::string s = \"abcd\";\n"
                "  s.size();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(4, tokenValues(code, "( ) ;").front().intvalue);
 
         code = "void f() {\n"
                "  std::string s;\n"
                "  s.empty();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(1, tokenValues(code, "( ) ;").front().intvalue);
 
         // Calculations
         code = "void f() {\n"
                "  std::string s = \"abcd\";\n"
                "  x = s + s;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "+"), 8));
 
         code = "void f(const std::vector<int> &ints) {\n"
                "  ints.clear();\n"
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "ints . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 0));
 
         code = "void f(const std::vector<int> &ints) {\n"
                "  ints.resize(3);\n"
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "ints . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 3));
 
         code = "void f(const std::vector<int> &ints) {\n"
                "  ints.resize(3);\n"
                "  ints.push_back(3);\n"
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "ints . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 4));
 
         code = "void f(const std::vector<int> &ints) {\n"
                "  ints.resize(3);\n"
                "  ints.pop_back();\n"
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "ints . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 2));
 
         code = "int f(bool b) {\n"
@@ -7014,21 +7350,21 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "  std::vector<int> ints{};\n"
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("",
                       isKnownContainerSizeValue(tokenValues(code, "ints . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 0));
 
         code = "void f() {\n"
                "  std::vector<int> ints{};\n"
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("",
                       isKnownContainerSizeValue(tokenValues(code, "ints . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 0));
 
         code = "void f() {\n"
                "  std::vector<int> ints{1};\n"
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("",
                       isKnownContainerSizeValue(tokenValues(code, "ints . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 1));
 
@@ -7036,14 +7372,14 @@ class TestValueFlow : public TestFixture {
                "  std::vector<int> ints{1};\n"
                "  std::vector<int> ints2{ints.begin(), ints.end()};\n"
                "  ints2.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(
             "", isKnownContainerSizeValue(tokenValues(code, "ints2 . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 1));
 
         code = "void f() {\n"
                "  std::vector<int> ints = {};\n"
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("",
                       isKnownContainerSizeValue(tokenValues(code, "ints . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 0));
 
@@ -7208,7 +7544,7 @@ class TestValueFlow : public TestFixture {
                "}\n";
         ASSERT_EQUALS(
             true,
-            removeImpossible(tokenValues(code, "v [ 0 ] != 0 ) { }", ValueFlow::Value::ValueType::CONTAINER_SIZE)).empty());
+            removeImpossible(tokenValues(code, "v [ 0 ] != 0 ) { }\n", ValueFlow::Value::ValueType::CONTAINER_SIZE)).empty());
 
         code = "std::vector<int> f() {\n"
                "    std::vector<int> v;\n"
@@ -7222,13 +7558,13 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "  std::vector<int> v(3);\n"
                "  v.size();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "v . size"), 3));
 
         code = "void f() {\n"
                "  std::vector<int> v({ 1, 2, 3 });\n"
                "  v.size();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "v . size"), 3));
 
         code = "int f() {\n"
@@ -7269,16 +7605,16 @@ class TestValueFlow : public TestFixture {
                "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 4U, 0));
 
-        code = "std::vector<int> f() { return std::vector<int>(); }";
+        code = "std::vector<int> f() { return std::vector<int>(); }\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "( ) ;"), 0));
 
-        code = "std::vector<int> f() { return std::vector<int>{}; }";
+        code = "std::vector<int> f() { return std::vector<int>{}; }\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "{ } ;"), 0));
 
-        code = "std::vector<int> f() { return {}; }";
+        code = "std::vector<int> f() { return {}; }\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "{ } ;"), 0));
 
-        code = "int f() { auto a = std::array<int, 2>{}; return a[1]; }";
+        code = "int f() { auto a = std::array<int, 2>{}; return a[1]; }\n";
         ASSERT_EQUALS("values.size():0", isKnownContainerSizeValue(tokenValues(code, "a ["), 0));
 
         code = "void g(std::vector<int>* w) {\n"
@@ -7347,44 +7683,44 @@ class TestValueFlow : public TestFixture {
         code = "void f(const std::string& a) {\n" // #12994
                "    std::string b = a + \"123\";\n"
                "    if (b.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "b ."), 2));
 
         code = "void f(const std::string& a) {\n"
                "    std::string b = \"123\" + a;\n"
                "    if (b.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "b ."), 2));
 
         code = "void f(const std::string& a, const std::string& b) {\n"
                "    std::string c = a + b + \"123\";\n"
                "    if (c.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "c ."), 2));
 
         code = "void f(const std::string& a) {\n"
                "    std::string b = a + \"123\" + \"456\";\n"
                "    if (b.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "b ."), 5));
 
         code = "void f(const std::string& a) {\n"
                "    std::string b = \"123\" + a + \"456\";\n"
                "    if (b.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "b ."), 5));
 
         code = "void f(const std::string& a, const std::string& b) {\n"
                "    std::string c = \"123\" + a + b;\n"
                "    if (c.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "c ."), 2));
 
         code = "void f(const std::string& a) {\n"
                "    std::string s;\n"
                "    s.append(a);\n"
                "    if (s.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "s . empty"), 0));
 
         code = "int f(const std::string& str) {\n"
@@ -7392,20 +7728,187 @@ class TestValueFlow : public TestFixture {
                "    std::vector<std::string> v{ std::istream_iterator<std::string>(iss), {} };\n"
                "    auto x = v.size();\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfXKnown(code, 5U, 2));
 
         code = "auto f() {\n" // #13450
                "    auto v = std::vector<std::vector<S*>>(3, std::vector<S*>());\n"
                "    return v[2];\n"
-               "}";
+               "}\n";
         ASSERT(isKnownContainerSizeValue(tokenValues(code, "v ["), 3).empty());
 
         code = "auto f() {\n" // #13654
                "    std::array<uint8_t, 6 * sizeof(uint16_t)> a{};\n"
                "    return a[0];\n"
-               "}";
+               "}\n";
         ASSERT(!isKnownContainerSizeValue(tokenValues(code, "a ["), 6).empty());
+
+        code = "void f(const char a[]) {\n" // #14518
+               "    std::string s(a);\n"
+               "    if (s.empty()) {}\n"
+               "}\n";
+        ASSERT(!isKnownContainerSizeValue(tokenValues(code, "s ."), 0).empty());
+
+        code = "void g(std::map<int, int>* p) {\n" // #14721
+               "    (*p)[1] = 2;\n"
+               "}\n"
+               "void f() {\n"
+               "    std::map<int, int> m;\n"
+               "    g(&m);\n"
+               "    if (m.empty()) {}\n"
+               "}\n";
+        ASSERT(!isKnownContainerSizeValue(tokenValues(code, "m ."), 0).empty());
+
+        // the pointer returned by data() carries the container size
+        code = "int f() {\n"
+               "    std::vector<int> v(3);\n"
+               "    int* p = v.data();\n"
+               "    return p[1];\n"
+               "}\n";
+        ASSERT_EQUALS("",
+                      isKnownContainerSizeValue(tokenValues(code, "p [", ValueFlow::Value::ValueType::CONTAINER_SIZE), 3));
+
+        // ..which is invalidated when the container size changes
+        code = "int f() {\n"
+               "    std::vector<int> v(3);\n"
+               "    int* p = v.data();\n"
+               "    v.push_back(1);\n"
+               "    return p[1];\n"
+               "}\n";
+        ASSERT_EQUALS(0U, tokenValues(code, "p [", ValueFlow::Value::ValueType::CONTAINER_SIZE).size());
+
+        // the buffer of c_str() includes the null terminator
+        code = "const char* f() {\n"
+               "    std::string s = \"abc\";\n"
+               "    const char* p = s.c_str();\n"
+               "    return p + 3;\n"
+               "}\n";
+        ASSERT_EQUALS("",
+                      isKnownContainerSizeValue(tokenValues(code, "p +", ValueFlow::Value::ValueType::CONTAINER_SIZE), 4));
+
+        code = "const char* f() {\n"
+               "    std::string s = \"abc\";\n"
+               "    return s.c_str();\n"
+               "}\n";
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "( ) ;", ValueFlow::Value::ValueType::CONTAINER_SIZE), 4));
+
+        // the size value of a data() pointer records the container the size belongs to
+        code = "int* f() {\n"
+               "    std::vector<int> v(3);\n"
+               "    return v.data();\n"
+               "}\n";
+        ASSERT_EQUALS("",
+                      isKnownContainerSizeValue(tokenValues(code, "( ) ;", ValueFlow::Value::ValueType::CONTAINER_SIZE),
+                                                3));
+        ASSERT_EQUALS("v", containerOfSizeValue(code, "( ) ;"));
+
+        // an empty associative container implies that its default-inserted elements are empty as well
+        code = "void f(const std::string& k) {\n"
+               "    std::map<std::string, std::vector<int>> m;\n"
+               "    m[k].front();\n"
+               "}\n";
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "[ k ] . front", ValueFlow::Value::ValueType::CONTAINER_SIZE),
+                                      0));
+        ASSERT_EQUALS("m[k]", containerOfSizeValue(code, "[ k ] . front"));
+
+        // ..also for nested associative containers..
+        code = "void f(int a, int b) {\n"
+               "    std::map<int, std::map<int, std::vector<int>>> m;\n"
+               "    m[a][b].front();\n"
+               "}\n";
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "[ b ] . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 0));
+
+        // ..but not for non-associative containers..
+        code = "void f(int i) {\n"
+               "    std::vector<std::vector<int>> v;\n"
+               "    v[i].front();\n"
+               "}\n";
+        ASSERT_EQUALS(0U, tokenValues(code, "[ i ] . front", ValueFlow::Value::ValueType::CONTAINER_SIZE).size());
+
+        // ..nor when the container is not empty..
+        code = "void f(std::map<std::string, std::vector<int>>& m, const std::string& k) {\n"
+               "    if (m.size() == 1)\n"
+               "        m[k].front();\n"
+               "}\n";
+        ASSERT_EQUALS(0U, tokenValues(code, "[ k ] . front", ValueFlow::Value::ValueType::CONTAINER_SIZE).size());
+
+        // ..nor when the container was modified
+        code = "void f(const std::string& k) {\n"
+               "    std::map<std::string, std::vector<int>> m;\n"
+               "    m[\"a\"].push_back(1);\n"
+               "    m[k].front();\n"
+               "}\n";
+        ASSERT_EQUALS(0U, tokenValues(code, "[ k ] . front", ValueFlow::Value::ValueType::CONTAINER_SIZE).size());
+    }
+
+    void valueFlowContainerSizeIterator() {
+        const char* code;
+
+        // valueFlowForwardConst: the container size is added to iterators of a const container
+        code = "void f() {\n"
+               "    const std::vector<int> v{1, 2, 3};\n"
+               "    auto it = v.begin();\n"
+               "    if (it != v.end()) {}\n"
+               "}\n";
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "it !=", ValueFlow::Value::ValueType::CONTAINER_SIZE), 3));
+
+        // ..also to iterators created in place
+        code = "void f() {\n"
+               "    const std::deque<int> d{1, 2, 3, 4, 5, 6};\n"
+               "    if (std::equal(d.cbegin(), d.cend(), d.cbegin())) {}\n"
+               "}\n";
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "( ) ,", ValueFlow::Value::ValueType::CONTAINER_SIZE), 6));
+
+        // ..and to iterators of containers with a static size
+        code = "void f() {\n"
+               "    std::array<int, 5> a;\n"
+               "    auto it = a.begin();\n"
+               "    if (it != a.end()) {}\n"
+               "}\n";
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "it !=", ValueFlow::Value::ValueType::CONTAINER_SIZE), 5));
+
+        // the size of another container is not added to the iterator
+        code = "void f(std::vector<int>& w) {\n"
+               "    const std::vector<int> v{1, 2, 3};\n"
+               "    auto it = w.begin();\n"
+               "    if (it != w.end()) {}\n"
+               "}\n";
+        ASSERT(tokenValues(code, "it !=", ValueFlow::Value::ValueType::CONTAINER_SIZE).empty());
+
+        // iterators created from the container carry the container size
+        code = "bool f() {\n"
+               "    std::vector<int> v(3);\n"
+               "    return v.begin() != v.end();\n"
+               "}\n";
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "( ) !=", ValueFlow::Value::ValueType::CONTAINER_SIZE), 3));
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "( ) ;", ValueFlow::Value::ValueType::CONTAINER_SIZE), 3));
+
+        // the size value records the container it belongs to
+        code = "void f() {\n"
+               "    std::vector<int> v(3);\n"
+               "    auto it = v.begin();\n"
+               "    if (it != v.end()) {}\n"
+               "}\n";
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "it !=", ValueFlow::Value::ValueType::CONTAINER_SIZE), 3));
+        ASSERT_EQUALS("v", containerOfSizeValue(code, "it !="));
     }
 
     void valueFlowContainerElement()
@@ -7437,56 +7940,55 @@ class TestValueFlow : public TestFixture {
     void valueFlowDynamicBufferSize() {
         const char *code;
 
-        const Settings settingsOld = settings; // TODO: get rid of this
-        settings = settingsBuilder(settings).library("posix.cfg").library("bsd.cfg").build();
+        const Settings settingsCfg = settingsBuilder(settings).library("posix.cfg").library("bsd.cfg").build();
 
         code = "void* f() {\n"
                "  void* x = malloc(10);\n"
                "  return x;\n"
-               "}";
-        ASSERT_EQUALS(true, testValueOfX(code, 3U, 10,  ValueFlow::Value::ValueType::BUFFER_SIZE));
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 10, ValueFlow::Value::ValueType::BUFFER_SIZE, &settingsCfg));
 
         code = "void* f() {\n"
                "  void* x = calloc(4, 5);\n"
                "  return x;\n"
-               "}";
-        ASSERT_EQUALS(true, testValueOfX(code, 3U, 20,  ValueFlow::Value::ValueType::BUFFER_SIZE));
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 20,  ValueFlow::Value::ValueType::BUFFER_SIZE, &settingsCfg));
 
         code = "void* f() {\n"
                "  const char* y = \"abcd\";\n"
                "  const char* x = strdup(y);\n"
                "  return x;\n"
-               "}";
-        ASSERT_EQUALS(true, testValueOfX(code, 4U, 5,  ValueFlow::Value::ValueType::BUFFER_SIZE));
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 5,  ValueFlow::Value::ValueType::BUFFER_SIZE, &settingsCfg));
 
         code = "void* f() {\n"
                "  void* y = malloc(10);\n"
                "  void* x = realloc(y, 20);\n"
                "  return x;\n"
-               "}";
-        ASSERT_EQUALS(true, testValueOfX(code, 4U, 20,  ValueFlow::Value::ValueType::BUFFER_SIZE));
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 20,  ValueFlow::Value::ValueType::BUFFER_SIZE, &settingsCfg));
 
         code = "void* f() {\n"
                "  void* y = calloc(10, 4);\n"
                "  void* x = reallocarray(y, 20, 5);\n"
                "  return x;\n"
-               "}";
-        ASSERT_EQUALS(true, testValueOfX(code, 4U, 100,  ValueFlow::Value::ValueType::BUFFER_SIZE));
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 100,  ValueFlow::Value::ValueType::BUFFER_SIZE, &settingsCfg));
 
         code = "struct A {};\n" // #14305
                "void* f() {\n"
                "  A* x = new A();\n"
                "  return x;\n"
-               "}";
-        ASSERT_EQUALS(true, testValueOfX(code, 4U, 1, ValueFlow::Value::ValueType::BUFFER_SIZE));
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 1, ValueFlow::Value::ValueType::BUFFER_SIZE, &settingsCfg));
 
         code = "struct A {};\n"
                "void* f() {\n"
                "  void* x = new A;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         {
-            auto values = tokenValues(code, "x ; }");
+            auto values = tokenValues(code, "x ; }", &settingsCfg);
             ASSERT_EQUALS(1, values.size());
             ASSERT(values.front().isSymbolicValue());
             // TODO: add BUFFER_SIZE value = 1
@@ -7496,10 +7998,26 @@ class TestValueFlow : public TestFixture {
                "void* f() {\n"
                "  B* x = new B();\n"
                "  return x;\n"
-               "}";
-        ASSERT_EQUALS(true, testValueOfX(code, 4U, 4, ValueFlow::Value::ValueType::BUFFER_SIZE));
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 4, ValueFlow::Value::ValueType::BUFFER_SIZE, &settingsCfg));
+
+        code = "void f()\n"
+               "{\n"
+               "    void *x = ::operator new(0);\n"
+               "    (void) x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 0, ValueFlow::Value::ValueType::BUFFER_SIZE));
 
-        settings = settingsOld;
+        code = "void f(int *x)\n"
+               "{\n"
+               "	*x = 1;\n"
+               "}\n"
+               "void g(void)\n"
+               "{\n"
+               "	int *ptr = malloc(1234);\n"
+               "	f(ptr);\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 1234, ValueFlow::Value::ValueType::BUFFER_SIZE));
     }
 
     void valueFlowSafeFunctionParameterValues() {
@@ -7510,7 +8028,7 @@ class TestValueFlow : public TestFixture {
 
         code = "short f(short x) {\n"
                "  return x + 0;\n"
-               "}";
+               "}\n";
         values = removeSymbolicTok(tokenValues(code, "+", &s));
         ASSERT_EQUALS(2, values.size());
         ASSERT_EQUALS(-0x8000, values.front().intvalue);
@@ -7518,7 +8036,7 @@ class TestValueFlow : public TestFixture {
 
         code = "short f(std::string x) {\n"
                "  return x[10];\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "x [", &s);
         ASSERT_EQUALS(2, values.size());
         ASSERT_EQUALS(0, values.front().intvalue);
@@ -7526,7 +8044,7 @@ class TestValueFlow : public TestFixture {
 
         code = "int f(float x) {\n"
                "  return x;\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "x ;", &s);
         ASSERT_EQUALS(2, values.size());
         ASSERT(values.front().floatValue < -1E20);
@@ -7534,7 +8052,7 @@ class TestValueFlow : public TestFixture {
 
         code = "short f(__cppcheck_low__(0) __cppcheck_high__(100) short x) {\n"
                "  return x + 0;\n"
-               "}";
+               "}\n";
         values = removeSymbolicTok(tokenValues(code, "+", &s));
         ASSERT_EQUALS(2, values.size());
         ASSERT_EQUALS(0, values.front().intvalue);
@@ -7542,7 +8060,7 @@ class TestValueFlow : public TestFixture {
 
         code = "unsigned short f(unsigned short x) [[expects: x <= 100]] {\n"
                "  return x + 0;\n"
-               "}";
+               "}\n";
         values = removeSymbolicTok(tokenValues(code, "+", &s));
         values.remove_if([](const ValueFlow::Value& v) {
             return v.isImpossible();
@@ -7567,7 +8085,7 @@ class TestValueFlow : public TestFixture {
         /*const*/ Settings s = settingsBuilder().library("std.cfg").build();
         s.checkUnknownFunctionReturn.insert("rand");
 
-        code = "x = rand();";
+        code = "x = rand();\n";
         values = tokenValues(code, "(", &s);
         ASSERT_EQUALS(2, values.size());
         ASSERT_EQUALS(INT_MIN, values.front().intvalue);
@@ -7577,7 +8095,7 @@ class TestValueFlow : public TestFixture {
     void valueFlowUnknownFunctionReturnMalloc() { // #4626
         const char *code;
 
-        code = "ptr = malloc(10);";
+        code = "ptr = malloc(10);\n";
         const auto& values = tokenValues(code, "(");
         ASSERT_EQUALS(1, values.size());
         ASSERT_EQUALS(true, values.front().isIntValue());
@@ -7647,7 +8165,7 @@ class TestValueFlow : public TestFixture {
         code = "void f(int& r) {\n" // #13515
                "    [0].p = &r;\n"
                "}\n";
-        (void)valueOfTok(code, "=");
+        ASSERT_THROW_INTERNAL(valueOfTok(code, "="), AST);
     }
 
     void valueFlowCrash() {
@@ -7780,7 +8298,7 @@ class TestValueFlow : public TestFixture {
                "  std::tuple<float, float, float, float> t4(5.2f, 3.1f, 2.4f, 9.1f), t5(4, 6, 9, 27);\n"
                "  t4 = t5;\n"
                "  ASSERT(!(t4 < t5) && t4 <= t5);\n"
-               "}";
+               "}\n";
         (void)valueOfTok(code, "<=");
 
         code = "void f() {\n"
@@ -8038,6 +8556,22 @@ class TestValueFlow : public TestFixture {
                "    auto b = a;\n"
                "}\n";
         (void)valueOfTok(code, "b");
+
+        code = "namespace O {}\n" // #14952
+               "namespace N {\n"
+               "    using namespace O;\n"
+               "    enum class E { E0 };\n"
+               "    auto E0 = E::E0;\n"
+               "    struct S {\n"
+               "        E f() const { return E0; }\n"
+               "    };\n"
+               "}\n";
+        (void)valueOfTok(code, "E0");
+
+        code = "void f() {\n" // #14980
+               "    OpNew *newp = &operator new;\n"
+               "}\n";
+        (void)valueOfTok(code, "&");
     }
 
     void valueFlowHang() {
@@ -8262,6 +8796,75 @@ class TestValueFlow : public TestFixture {
                "    static T f[64];\n"
                "};\n";
         (void)valueOfTok(code, "(");
+
+        // fork explosion on many opaque conditions; bounded by maxForwardConditionForks
+        code = "int g(int);\n"
+               "bool h(int);\n"
+               "void f() {\n"
+               "    int x = 0;\n"
+               "    if (h(0)) g(x);\n"
+               "    if (h(1)) g(x);\n"
+               "    if (h(2)) g(x);\n"
+               "    if (h(3)) g(x);\n"
+               "    if (h(4)) g(x);\n"
+               "    if (h(5)) g(x);\n"
+               "    if (h(6)) g(x);\n"
+               "    if (h(7)) g(x);\n"
+               "    if (h(8)) g(x);\n"
+               "    if (h(9)) g(x);\n"
+               "    if (h(10)) g(x);\n"
+               "    if (h(11)) g(x);\n"
+               "    if (h(12)) g(x);\n"
+               "    if (h(13)) g(x);\n"
+               "    if (h(14)) g(x);\n"
+               "    if (h(15)) g(x);\n"
+               "    if (h(16)) g(x);\n"
+               "    if (h(17)) g(x);\n"
+               "    if (h(18)) g(x);\n"
+               "    if (h(19)) g(x);\n"
+               "    if (h(20)) g(x);\n"
+               "    if (h(21)) g(x);\n"
+               "    if (h(22)) g(x);\n"
+               "    if (h(23)) g(x);\n"
+               "    if (h(24)) g(x);\n"
+               "    if (h(25)) g(x);\n"
+               "    if (h(26)) g(x);\n"
+               "    if (h(27)) g(x);\n"
+               "    if (h(28)) g(x);\n"
+               "    if (h(29)) g(x);\n"
+               "    if (h(30)) g(x);\n"
+               "    if (h(31)) g(x);\n"
+               "    if (h(32)) g(x);\n"
+               "    if (h(33)) g(x);\n"
+               "    if (h(34)) g(x);\n"
+               "    if (h(35)) g(x);\n"
+               "    if (h(36)) g(x);\n"
+               "    if (h(37)) g(x);\n"
+               "    if (h(38)) g(x);\n"
+               "    if (h(39)) g(x);\n"
+               "    if (h(40)) g(x);\n"
+               "    if (h(41)) g(x);\n"
+               "    if (h(42)) g(x);\n"
+               "    if (h(43)) g(x);\n"
+               "    if (h(44)) g(x);\n"
+               "    if (h(45)) g(x);\n"
+               "    if (h(46)) g(x);\n"
+               "    if (h(47)) g(x);\n"
+               "    if (h(48)) g(x);\n"
+               "    if (h(49)) g(x);\n"
+               "    if (h(50)) g(x);\n"
+               "    if (h(51)) g(x);\n"
+               "    if (h(52)) g(x);\n"
+               "    if (h(53)) g(x);\n"
+               "    if (h(54)) g(x);\n"
+               "    if (h(55)) g(x);\n"
+               "    if (h(56)) g(x);\n"
+               "    if (h(57)) g(x);\n"
+               "    if (h(58)) g(x);\n"
+               "    if (h(59)) g(x);\n"
+               "    (void)x;\n"
+               "}\n";
+        (void)valueOfTok(code, "x");
     }
 
     void valueFlowCrashConstructorInitialization() { // #9577
@@ -8275,7 +8878,7 @@ class TestValueFlow : public TestFixture {
                "    if (path != standard)\n"
                "    {\n"
                "    }\n"
-               "}";
+               "}\n";
         (void)valueOfTok(code, "path");
 
         code = "void Error()\n"
@@ -8287,7 +8890,7 @@ class TestValueFlow : public TestFixture {
                "    if (path != standard)\n"
                "    {\n"
                "    }\n"
-               "}";
+               "}\n";
         (void)valueOfTok(code, "path");
 
         code = "struct S {\n"
@@ -8321,7 +8924,7 @@ class TestValueFlow : public TestFixture {
                           "  }\n"
                           "\n"
                           "  return 0;\n"
-                          "}";
+                          "}\n";
 
         ASSERT_EQUALS(false, testValueOfXKnown(code, 4U, 1));
     }
@@ -8686,21 +9289,21 @@ class TestValueFlow : public TestFixture {
                "    if (x == y) {\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 3U, "y", 0));
 
         code = "void f(int x, int y) {\n"
                "    if (x != y) {\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfXImpossible(code, 3U, "y", 0));
 
         code = "void f(int x, int y) {\n"
                "    if (x < y) {\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, "y", -1));
         ASSERT_EQUALS(true, testValueOfXImpossible(code, 3U, "y", 0));
 
@@ -8708,7 +9311,7 @@ class TestValueFlow : public TestFixture {
                "    if (x <= y) {\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, "y", 0));
         ASSERT_EQUALS(true, testValueOfXImpossible(code, 3U, "y", 1));
 
@@ -8716,7 +9319,7 @@ class TestValueFlow : public TestFixture {
                "    if (x > y) {\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, "y", 1));
         ASSERT_EQUALS(true, testValueOfXImpossible(code, 3U, "y", 0));
 
@@ -8724,7 +9327,7 @@ class TestValueFlow : public TestFixture {
                "    if (x >= y) {\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, "y", 0));
         ASSERT_EQUALS(true, testValueOfXImpossible(code, 3U, "y", -1));
 
@@ -8839,6 +9442,15 @@ class TestValueFlow : public TestFixture {
                "    return x;\n"
                "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, "malloc(10)", 0));
+
+        code = "struct S {\n" // #14891
+               "    void f() const {\n"
+               "        const int* p = a;\n"
+               "        if (*p) {}\n"
+               "    }\n"
+               "    int a[3];\n"
+               "};\n";
+        ASSERT(tokenValues(code, "* p )").empty());
     }
 
     void valueFlowSymbolicIdentity()
@@ -8904,6 +9516,18 @@ class TestValueFlow : public TestFixture {
                "    return x;\n"
                "}\n";
         ASSERT_EQUALS(false, testValueOfXKnown(code, 3U, "a", 0));
+
+        code = "void f(int n) {\n"
+               "    int x = 0 - n;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfX(code, 3U, "n", ValueFlow::Value::ValueType::SYMBOLIC));
+
+        code = "void f(int n) {\n"
+               "    int x = n - 0;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, "n", ValueFlow::Value::ValueType::SYMBOLIC));
     }
 
     void valueFlowSymbolicStrlen()
@@ -9106,6 +9730,19 @@ class TestValueFlow : public TestFixture {
                "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 1));
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 0));
+
+        code = "bool f() {\n"
+               "    std::string s1, s2;\n"
+               "    bool x = (s1 == s2);\n"
+               "    return x;\n"
+               "}\n"
+               "bool g() {\n"
+               "    std::string s1, s2;\n"
+               "    bool x = (s1 != s2);\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 4U, 1));
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 9U, 0));
     }
 
     void valueFlowBailoutIncompleteVar() {
@@ -9171,7 +9808,7 @@ class TestValueFlow : public TestFixture {
 #define testBitfields(...) testBitfields_(__FILE__, __LINE__, __VA_ARGS__)
     void testBitfields_(const char *file, int line, const std::string &structBody, std::size_t expectedSize) {
         const Settings settingsUnix64 = settingsBuilder().platform(Platform::Type::Unix64).build();
-        const std::string code = "struct S { " + structBody + " }; const std::size_t size = sizeof(S);";
+        const std::string code = "struct S { " + structBody + " }; const std::size_t size = sizeof(S);\n";
         const auto values = tokenValues(code.c_str(), "( S", &settingsUnix64);
         ASSERT_LOC(!values.empty(), file, line);
         ASSERT_EQUALS_LOC(expectedSize, values.back().intvalue, file, line);
diff --git a/test/testvarid.cpp b/test/testvarid.cpp
index 6f1ea052abe..b65d35db489 100644
--- a/test/testvarid.cpp
+++ b/test/testvarid.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -101,6 +101,8 @@ class TestVarID : public TestFixture {
         TEST_CASE(varid69);
         TEST_CASE(varid70); // #12660 - function
         TEST_CASE(varid71); // #12676 - wrong varid in uninstantiated templated constructor
+        TEST_CASE(varid72);
+        TEST_CASE(varid73);
         TEST_CASE(varid_for_1);
         TEST_CASE(varid_for_2);
         TEST_CASE(varid_for_3);
@@ -148,6 +150,8 @@ class TestVarID : public TestFixture {
         TEST_CASE(varid_in_class26);
         TEST_CASE(varid_in_class27);
         TEST_CASE(varid_in_class28);
+        TEST_CASE(varid_in_class29);
+        TEST_CASE(varid_in_class30);
         TEST_CASE(varid_namespace_1);   // #7272
         TEST_CASE(varid_namespace_2);   // #7000
         TEST_CASE(varid_namespace_3);   // #8627
@@ -157,6 +161,7 @@ class TestVarID : public TestFixture {
         TEST_CASE(varid_initList);
         TEST_CASE(varid_initListWithBaseTemplate);
         TEST_CASE(varid_initListWithScope);
+        TEST_CASE(varid_initListWithLambda);
         TEST_CASE(varid_operator);
         TEST_CASE(varid_throw);
         TEST_CASE(varid_unknown_macro);     // #2638 - unknown macro is not type
@@ -218,6 +223,7 @@ class TestVarID : public TestFixture {
         TEST_CASE(varidclass18);
         TEST_CASE(varidclass19);  // initializer list
         TEST_CASE(varidclass20);   // #7578: int (*p)[2]
+        TEST_CASE(varidclass21);
         TEST_CASE(varid_classnameshaddowsvariablename); // #3990
         TEST_CASE(varid_classnametemplate); // #10221
 
@@ -234,6 +240,8 @@ class TestVarID : public TestFixture {
         TEST_CASE(usingNamespace1);
         TEST_CASE(usingNamespace2);
         TEST_CASE(usingNamespace3);
+        TEST_CASE(usingNamespace4);
+        TEST_CASE(usingNamespace5);
 
         TEST_CASE(setVarIdStructMembers1);
 
@@ -259,6 +267,7 @@ class TestVarID : public TestFixture {
         TEST_CASE(exprid12);
         TEST_CASE(exprid13);
         TEST_CASE(exprid14);
+        TEST_CASE(exprid15);
 
         TEST_CASE(structuredBindings);
     }
@@ -540,7 +549,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "    std::string str(\"test\");\n"
             "    str.clear();\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: void func ( )\n"
                                 "2: {\n"
@@ -566,7 +575,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "    int abc;\n"
             "    struct abc abc1;\n"
-            "}", dinit(TokenizeOptions, $.cpp = false));
+            "}\n", dinit(TokenizeOptions, $.cpp = false));
 
         const char expected[] = "1: void foo ( )\n"
                                 "2: {\n"
@@ -578,7 +587,7 @@ class TestVarID : public TestFixture {
     }
 
     void varid11() {
-        const std::string actual = tokenize("class Foo;");
+        const std::string actual = tokenize("class Foo;\n");
 
         const char expected[] = "1: class Foo ;\n";
 
@@ -590,7 +599,7 @@ class TestVarID : public TestFixture {
             "static void a()\n"
             "{\n"
             "    class Foo *foo;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: static void a ( )\n"
                                 "2: {\n"
@@ -625,7 +634,7 @@ class TestVarID : public TestFixture {
             "A a;\n"
             "B b;\n"
             "b * a;\n"
-            "}", dinit(TokenizeOptions, $.cpp = false));
+            "}\n", dinit(TokenizeOptions, $.cpp = false));
 
         const char expected[] = "1: void foo ( )\n"
                                 "2: {\n"
@@ -643,7 +652,7 @@ class TestVarID : public TestFixture {
                 "struct S {\n"
                 "    struct T {\n"
                 "    } t;\n"
-                "} s;", dinit(TokenizeOptions, $.cpp = false));
+                "} s;\n", dinit(TokenizeOptions, $.cpp = false));
 
             const char expected[] = "1: struct S {\n"
                                     "2: struct T {\n"
@@ -658,7 +667,7 @@ class TestVarID : public TestFixture {
                 "struct S {\n"
                 "    struct T {\n"
                 "    } t;\n"
-                "};", dinit(TokenizeOptions, $.cpp = false));
+                "};\n", dinit(TokenizeOptions, $.cpp = false));
 
             const char expected[] = "1: struct S {\n"
                                     "2: struct T {\n"
@@ -884,7 +893,7 @@ class TestVarID : public TestFixture {
         const char code2[] = "void f() {\n"
                              "  int  *p;\n"
                              "  void bar(int *p);\n"
-                             "}";
+                             "}\n";
         const char expected2[] = "1: void f ( ) {\n"
                                  "2: int * p@1 ;\n"
                                  "3: void bar ( int * p ) ;\n"
@@ -910,17 +919,21 @@ class TestVarID : public TestFixture {
 
     void varid37() {
         {
-            const char code[] = "void blah() {"
-                                "    Bar bar(*x);"
-                                "}";
-            ASSERT_EQUALS("1: void blah ( ) { Bar bar@1 ( * x ) ; }\n",
+            const char code[] = "void blah() {\n"
+                                "    Bar bar(*x);\n"
+                                "}\n";
+            ASSERT_EQUALS("1: void blah ( ) {\n"
+                          "2: Bar bar@1 ( * x ) ;\n"
+                          "3: }\n",
                           tokenize(code));
         }
         {
-            const char code[] = "void blah() {"
-                                "    Bar bar(&x);"
-                                "}";
-            ASSERT_EQUALS("1: void blah ( ) { Bar bar@1 ( & x ) ; }\n",
+            const char code[] = "void blah() {\n"
+                                "    Bar bar(&x);\n"
+                                "}\n";
+            ASSERT_EQUALS("1: void blah ( ) {\n"
+                          "2: Bar bar@1 ( & x ) ;\n"
+                          "3: }\n",
                           tokenize(code));
         }
     }
@@ -946,18 +959,18 @@ class TestVarID : public TestFixture {
     }
 
     void varid40() {
-        const char code[] ="extern \"C\" int (*a())();";
+        const char code[] ="extern \"C\" int (*a())();\n";
         ASSERT_EQUALS("1: int * a ( ) ;\n",
                       tokenize(code));
     }
 
     void varid41() {
-        const char code1[] = "union evt; void f(const evt & event);";
+        const char code1[] = "union evt; void f(const evt & event);\n";
         ASSERT_EQUALS("1: union evt ; void f ( const evt & event@1 ) ;\n",
                       tokenize(code1));
         ASSERT_THROW_INTERNAL(tokenize(code1, dinit(TokenizeOptions, $.cpp = false)), SYNTAX);
 
-        const char code2[] = "struct evt; void f(const evt & event);";
+        const char code2[] = "struct evt; void f(const evt & event);\n";
         ASSERT_EQUALS("1: struct evt ; void f ( const evt & event@1 ) ;\n",
                       tokenize(code2));
         ASSERT_THROW_INTERNAL(tokenize(code2, dinit(TokenizeOptions, $.cpp = false)), SYNTAX);
@@ -968,7 +981,7 @@ class TestVarID : public TestFixture {
                             "class Fred {\n"
                             "public:\n"
                             "     struct fruit::banana Bananas[25];\n"
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("1: namespace fruit { struct banana { } ; } ;\n"
                       "2: class Fred {\n"
                       "3: public:\n"
@@ -978,25 +991,25 @@ class TestVarID : public TestFixture {
     }
 
     void varid43() {
-        const char code[] ="int main(int flag) { if(a & flag) { return 1; } }";
+        const char code[] ="int main(int flag) { if(a & flag) { return 1; } }\n";
         ASSERT_EQUALS("1: int main ( int flag@1 ) { if ( a & flag@1 ) { return 1 ; } }\n",
                       tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varid44() {
-        const char code[] ="class A:public B,public C,public D {};";
+        const char code[] ="class A:public B,public C,public D {};\n";
         ASSERT_EQUALS("1: class A : public B , public C , public D { } ;\n",
                       tokenize(code));
     }
 
     void varid45() { // #3466
-        const char code[] ="void foo() { B b(this); A a(this, b); }";
+        const char code[] ="void foo() { B b(this); A a(this, b); }\n";
         ASSERT_EQUALS("1: void foo ( ) { B b@1 ( this ) ; A a@2 ( this , b@1 ) ; }\n",
                       tokenize(code));
     }
 
     void varid46() { // #3756
-        const char code[] ="void foo() { int t; x = (struct t *)malloc(); f(t); }";
+        const char code[] ="void foo() { int t; x = (struct t *)malloc(); f(t); }\n";
         ASSERT_EQUALS("1: void foo ( ) { int t@1 ; x = ( struct t * ) malloc ( ) ; f ( t@1 ) ; }\n",
                       tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
@@ -1004,7 +1017,7 @@ class TestVarID : public TestFixture {
     void varid47() { // function parameters
         // #3768
         {
-            const char code[] ="void f(std::string &string, std::string &len) {}";
+            const char code[] ="void f(std::string &string, std::string &len) {}\n";
             ASSERT_EQUALS("1: void f ( std :: string & string@1 , std :: string & len@2 ) { }\n",
                           tokenize(code));
         }
@@ -1022,25 +1035,25 @@ class TestVarID : public TestFixture {
     }
 
     void varid48() {  // #3785 - return (a*b)
-        const char code[] ="int X::f(int b) const { return(a*b); }";
+        const char code[] ="int X::f(int b) const { return(a*b); }\n";
         ASSERT_EQUALS("1: int X :: f ( int b@1 ) const { return ( a * b@1 ) ; }\n",
                       tokenize(code));
     }
 
     void varid49() {  // #3799 - void f(std::vector<int>)
-        const char code[] ="void f(std::vector<int>)";
+        const char code[] ="void f(std::vector<int>)\n";
         ASSERT_EQUALS("1: void f ( std :: vector < int > )\n",
                       tokenize(code));
     }
 
     void varid50() {  // #3760 - explicit
-        const char code[] ="class A { explicit A(const A&); };";
+        const char code[] ="class A { explicit A(const A&); };\n";
         ASSERT_EQUALS("1: class A { explicit A ( const A & ) ; } ;\n",
                       tokenize(code));
     }
 
     void varid51() {  // don't set varid on template function
-        const char code[] ="T t; t.x<0>();";
+        const char code[] ="T t; t.x<0>();\n";
         ASSERT_EQUALS("1: T t@1 ; t@1 . x < 0 > ( ) ;\n",
                       tokenize(code));
     }
@@ -1048,7 +1061,7 @@ class TestVarID : public TestFixture {
     void varid52() {
         const char code[] ="A<B<C>::D> e;\n"
                             "B< C<> > b[10];\n"
-                            "B<C<>> c[10];";
+                            "B<C<>> c[10];\n";
         ASSERT_EQUALS("1: A < B < C > :: D > e@1 ;\n"
                       "2: B < C < > > b@2 [ 10 ] ;\n"
                       "3: B < C < > > c@3 [ 10 ] ;\n",
@@ -1057,74 +1070,67 @@ class TestVarID : public TestFixture {
 
     void varid53() { // #4172 - Template instantiation: T<&functionName> list[4];
         ASSERT_EQUALS("1: A < & f > list@1 [ 4 ] ;\n",
-                      tokenize("A<&f> list[4];"));
+                      tokenize("A<&f> list[4];\n"));
     }
 
     void varid54() { // hang
         // Original source code: libgc
-        (void)tokenize("STATIC ptr_t GC_approx_sp(void) { word sp; sp = (word)&sp; return((ptr_t)sp); }");
+        (void)tokenize("STATIC ptr_t GC_approx_sp(void) { word sp; sp = (word)&sp; return((ptr_t)sp); }\n");
     }
 
     void varid55() { // Ticket #5868
-        const char code[] =     "typedef struct foo {} foo; "
-                            "void bar1(struct foo foo) {} "
-                            "void baz1(foo foo) {} "
-                            "void bar2(struct foo& foo) {} "
-                            "void baz2(foo& foo) {} "
-                            "void bar3(struct foo* foo) {} "
-                            "void baz3(foo* foo) {}";
-        const char expected[] = "1: "
-                                "struct foo { } ; "
-                                "void bar1 ( struct foo foo@1 ) { } "
-                                "void baz1 ( struct foo foo@2 ) { } "
-                                "void bar2 ( struct foo & foo@3 ) { } "
-                                "void baz2 ( struct foo & foo@4 ) { } "
-                                "void bar3 ( struct foo * foo@5 ) { } "
-                                "void baz3 ( struct foo * foo@6 ) { }\n";
+        const char code[] = "typedef struct foo {} foo;\n"
+                            "void bar1(struct foo foo) {}\n"
+                            "void baz1(foo foo) {}\n"
+                            "void bar2(struct foo& foo) {}\n"
+                            "void baz2(foo& foo) {}\n"
+                            "void bar3(struct foo* foo) {}\n"
+                            "void baz3(foo* foo) {}\n";
+        const char expected[] = "1: struct foo { } ;\n"
+                                "2: void bar1 ( struct foo foo@1 ) { }\n"
+                                "3: void baz1 ( struct foo foo@2 ) { }\n"
+                                "4: void bar2 ( struct foo & foo@3 ) { }\n"
+                                "5: void baz2 ( struct foo & foo@4 ) { }\n"
+                                "6: void bar3 ( struct foo * foo@5 ) { }\n"
+                                "7: void baz3 ( struct foo * foo@6 ) { }\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void varid56() { // Ticket #6548 - function with a throw()
-        const char code1[] = "void fred(int x) throw() {}"
-                             "void wilma() { x++; }";
-        const char expected1[] = "1: "
-                                 "void fred ( int x@1 ) throw ( ) { } "
-                                 "void wilma ( ) { x ++ ; }\n";
+        const char code1[] = "void fred(int x) throw() {}\n"
+                             "void wilma() { x++; }\n";
+        const char expected1[] = "1: void fred ( int x@1 ) throw ( ) { }\n"
+                                 "2: void wilma ( ) { x ++ ; }\n";
         ASSERT_EQUALS(expected1, tokenize(code1));
 
-        const char code2[] = "void fred(int x) const throw(EXCEPT) {}"
-                             "void wilma() { x++; }";
-        const char expected2[] = "1: "
-                                 "void fred ( int x@1 ) const throw ( EXCEPT ) { } "
-                                 "void wilma ( ) { x ++ ; }\n";
+        const char code2[] = "void fred(int x) const throw(EXCEPT) {}\n"
+                             "void wilma() { x++; }\n";
+        const char expected2[] = "1: void fred ( int x@1 ) const throw ( EXCEPT ) { }\n"
+                                 "2: void wilma ( ) { x ++ ; }\n";
         ASSERT_EQUALS(expected2, tokenize(code2));
 
-        const char code3[] = "void fred(int x) throw() ABCD {}"
-                             "void wilma() { x++; }";
-        const char expected3[] = "1: "
-                                 "void fred ( int x@1 ) throw ( ) { } "
-                                 "void wilma ( ) { x ++ ; }\n";
+        const char code3[] = "void fred(int x) throw() ABCD {}\n"
+                             "void wilma() { x++; }\n";
+        const char expected3[] = "1: void fred ( int x@1 ) throw ( ) { }\n"
+                                 "2: void wilma ( ) { x ++ ; }\n";
         ASSERT_EQUALS(expected3, tokenize(code3));
 
-        const char code4[] = "void fred(int x) noexcept() {}"
-                             "void wilma() { x++; }";
-        const char expected4[] = "1: "
-                                 "void fred ( int x@1 ) noexcept ( ) { } "
-                                 "void wilma ( ) { x ++ ; }\n";
+        const char code4[] = "void fred(int x) noexcept() {}\n"
+                             "void wilma() { x++; }\n";
+        const char expected4[] = "1: void fred ( int x@1 ) noexcept ( ) { }\n"
+                                 "2: void wilma ( ) { x ++ ; }\n";
         ASSERT_EQUALS(expected4, tokenize(code4));
 
-        const char code5[] = "void fred(int x) noexcept {}"
-                             "void wilma() { x++; }";
-        const char expected5[] = "1: "
-                                 "void fred ( int x@1 ) noexcept ( true ) { } "
-                                 "void wilma ( ) { x ++ ; }\n";
+        const char code5[] = "void fred(int x) noexcept {}\n"
+                             "void wilma() { x++; }\n";
+        const char expected5[] = "1: void fred ( int x@1 ) noexcept ( true ) { }\n"
+                                 "2: void wilma ( ) { x ++ ; }\n";
         ASSERT_EQUALS(expected5, tokenize(code5));
 
-        const char code6[] = "void fred(int x) noexcept ( false ) {}"
-                             "void wilma() { x++; }";
-        const char expected6[] = "1: "
-                                 "void fred ( int x@1 ) noexcept ( false ) { } "
-                                 "void wilma ( ) { x ++ ; }\n";
+        const char code6[] = "void fred(int x) noexcept ( false ) {}\n"
+                             "void wilma() { x++; }\n";
+        const char expected6[] = "1: void fred ( int x@1 ) noexcept ( false ) { }\n"
+                                 "2: void wilma ( ) { x ++ ; }\n";
         ASSERT_EQUALS(expected6, tokenize(code6));
     }
 
@@ -1180,7 +1186,7 @@ class TestVarID : public TestFixture {
         const char code[] = "class DLLSYM B;\n"
                             "struct B {\n"
                             "    ~B() {}\n"
-                            "};";
+                            "};\n";
         const char expected[] = "1: class DLLSYM B@1 ;\n" // In this line, we cannot really do better...
                                 "2: struct B {\n"
                                 "3: ~ B@1 ( ) { }\n" // ...but here we could
@@ -1194,13 +1200,13 @@ class TestVarID : public TestFixture {
 
     void varid60() { // #7267 - cast
         ASSERT_EQUALS("1: a = ( x y ) 10 ;\n",
-                      tokenize("a=(x y)10;"));
+                      tokenize("a=(x y)10;\n"));
     }
 
     void varid61() {
         const char code[] = "void foo(int b) {\n"
                             "  void bar(int a, int b) {}\n"
-                            "}";
+                            "}\n";
         const char expected[] = "1: void foo ( int b@1 ) {\n"
                                 "2: void bar ( int a@2 , int b@3 ) { }\n"
                                 "3: }\n";
@@ -1214,41 +1220,41 @@ class TestVarID : public TestFixture {
                             "        int x;\n"
                             "        bar(r, r * x);\n"
                             "    }\n"
-                            "}";
+                            "}\n";
         // Ensure that there is only one variable id for "x"
         ASSERT_EQUALS("same varid", compareVaridsForVariable(code, "x"));
     }
 
     void varid63() {
-        const char code[] = "void f(boost::optional<int> const& x) {}";
+        const char code[] = "void f(boost::optional<int> const& x) {}\n";
         const char expected[] = "1: void f ( const boost :: optional < int > & x@1 ) { }\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void varid64() {
-        const char code[] = "extern const char (*x[256]);";
+        const char code[] = "extern const char (*x[256]);\n";
         const char expected[] = "1: extern const char ( * x@1 [ 256 ] ) ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void varid65() { // #10936
         {
-            const char code[] = "extern int (*p);";
+            const char code[] = "extern int (*p);\n";
             const char expected[] = "1: extern int ( * p@1 ) ;\n";
             ASSERT_EQUALS(expected, tokenize(code));
         }
         {
-            const char code[] = "extern int (i);";
+            const char code[] = "extern int (i);\n";
             const char expected[] = "1: extern int ( i@1 ) ;\n";
             ASSERT_EQUALS(expected, tokenize(code));
         }
         {
-            const char code[] = "int (*p);";
+            const char code[] = "int (*p);\n";
             const char expected[] = "1: int ( * p@1 ) ;\n";
             ASSERT_EQUALS(expected, tokenize(code));
         }
         {
-            const char code[] = "int (i);";
+            const char code[] = "int (i);\n";
             const char expected[] = "1: int ( i@1 ) ;\n";
             ASSERT_EQUALS(expected, tokenize(code));
         }
@@ -1275,7 +1281,7 @@ class TestVarID : public TestFixture {
 
     void varid67() { // #11711
         const char code1[] = "int *x;\n"
-                             "_Generic(*x, int: foo, default: bar)();";
+                             "_Generic(*x, int: foo, default: bar)();\n";
         const char expected1[] = "1: int * x@1 ;\n"
                                  "2: _Generic ( * x@1 , int : foo , default : bar ) ( ) ;\n";
         ASSERT_EQUALS(expected1, tokenize(code1, dinit(TokenizeOptions, $.cpp = false)));
@@ -1286,7 +1292,7 @@ class TestVarID : public TestFixture {
                              "char* str_chars(struct S* s);\n"
                              "void f(struct S strOut) {\n"
                              "	 switch (str_chars(&strOut)[0])  {}\n"
-                             "}";
+                             "}\n";
         const char expected1[] = "1: struct S { } ;\n"
                                  "2: char * str_chars ( struct S * s@1 ) ;\n"
                                  "3: void f ( struct S strOut@2 ) {\n"
@@ -1299,7 +1305,7 @@ class TestVarID : public TestFixture {
     void varid69() {
         const char code1[] = "void f() {\n"
                              "    auto g = [](int&, int& r, int i) {};\n"
-                             "}";
+                             "}\n";
         const char expected1[] = "1: void f ( ) {\n"
                                  "2: auto g@1 ; g@1 = [ ] ( int & , int & r@2 , int i@3 ) { } ;\n"
                                  "3: }\n";
@@ -1325,7 +1331,7 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected2, tokenize(code2));
 
         const char code3[] = "extern void (*arr[10])(uint32_t some);\n";
-        const char expected3[] = "1: extern void ( * arr@1 [ 10 ] ) ( uint32_t some@2 ) ;\n";
+        const char expected3[] = "1: extern void ( * arr@1 [ 10 ] ) ( uint32_t ) ;\n";
         ASSERT_EQUALS(expected3, tokenize(code3));
 
         const char code4[] = "_Static_assert(sizeof((struct S){0}.i) == 4);\n"; // #12729
@@ -1399,10 +1405,24 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
+    void varid72() {
+        const char code1[] = "static_assert(true && true);\n"; // #14386
+        const char expected1[] = "1: static_assert ( true && true ) ;\n";
+        ASSERT_EQUALS(expected1, tokenize(code1));
+    }
+
+    void varid73() {
+        const char code[] = "namespace a { int x; };\n"
+                            "namespace b { int x = a::x; };\n";
+        const char expected[]  = "1: namespace a { int x@1 ; } ;\n"
+                                 "2: namespace b { int x@2 ; x@2 = a :: x@1 ; } ;\n";
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
     void varid_for_1() {
         const char code[] = "void foo(int a, int b) {\n"
                             "  for (int a=1,b=2;;) {}\n"
-                            "}";
+                            "}\n";
         const char expected[] = "1: void foo ( int a@1 , int b@2 ) {\n"
                                 "2: for ( int a@3 = 1 , b@4 = 2 ; ; ) { }\n"
                                 "3: }\n";
@@ -1412,7 +1432,7 @@ class TestVarID : public TestFixture {
     void varid_for_2() {
         const char code[] = "void foo(int a, int b) {\n"
                             "  for (int a=f(x,y,z),b=2;;) {}\n"
-                            "}";
+                            "}\n";
         const char expected[] = "1: void foo ( int a@1 , int b@2 ) {\n"
                                 "2: for ( int a@3 = f ( x , y , z ) , b@4 = 2 ; ; ) { }\n"
                                 "3: }\n";
@@ -1445,7 +1465,7 @@ class TestVarID : public TestFixture {
         const char code[] = "void f() {\n"
                             "    delete d;\n"
                             "    throw t;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "1: void f ( ) {\n"
                                 "2: delete d@1 ;\n"
@@ -1460,27 +1480,27 @@ class TestVarID : public TestFixture {
                             "unsigned long bits, int wake, int delete, struct extent_state **cached_state, "
                             "gfp_t mask) {\n"
                             "  struct extent_state *state;\n"
-                            "}"
+                            "}\n"
                             "int clear_extent_dirty() {\n"
                             "  return clear_extent_bit(tree, start, end, EXTENT_DIRTY | EXTENT_DELALLOC | "
                             "                          EXTENT_DO_ACCOUNTING, 0, 0, NULL, mask);\n"
-                            "}";
+                            "}\n";
         ASSERT_NO_THROW(tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varid_cpp_keywords_in_c_code3() { // #12120
-        const char code[] = "const struct class *p;";
+        const char code[] = "const struct class *p;\n";
         const char expected[] = "1: const struct class * p@1 ;\n";
         ASSERT_EQUALS(expected, tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varid_cpp_keywords_in_c_code4() { // #12120
         {
-            const char code[] = "int false = 0;";
+            const char code[] = "int false = 0;\n";
             ASSERT_THROW_INTERNAL_EQUALS(tokenize(code, dinit(TokenizeOptions, $.cpp = true)), INTERNAL, "Internal error. VarId set for bool literal.");
         }
         {
-            const char code[] = "int false = 0;";
+            const char code[] = "int false = 0;\n";
             ASSERT_EQUALS("1: int false@1 ; false@1 = 0 ;\n", tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
         }
     }
@@ -1489,7 +1509,7 @@ class TestVarID : public TestFixture {
         const char code[] ="void f() {\n"
                             "    int x;\n"
                             "    x = a(y*x,10);\n"
-                            "}";
+                            "}\n";
         const char expected[] = "1: void f ( ) {\n"
                                 "2: int x@1 ;\n"
                                 "3: x@1 = a ( y * x@1 , 10 ) ;\n"
@@ -1501,7 +1521,7 @@ class TestVarID : public TestFixture {
         // #2491
         const char code[] ="void f(int b) {\n"
                             "    x(a*b,10);\n"
-                            "}";
+                            "}\n";
         const std::string expected1("1: void f ( int b@1 ) {\n"
                                     "2: x ( a * b");
         const std::string expected2(" , 10 ) ;\n"
@@ -1514,7 +1534,7 @@ class TestVarID : public TestFixture {
         const char code[] ="void f() {\n"
                             "    int a = 0;\n"
                             "    int b = c - (foo::bar * a);\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "1: void f ( ) {\n"
                                 "2: int a@1 ; a@1 = 0 ;\n"
@@ -1526,16 +1546,16 @@ class TestVarID : public TestFixture {
 
     void varidFunctionCall4() {
         // Ticket #3280
-        const char code1[] = "void f() { int x; fun(a,b*x); }";
+        const char code1[] = "void f() { int x; fun(a,b*x); }\n";
         ASSERT_EQUALS("1: void f ( ) { int x@1 ; fun ( a , b * x@1 ) ; }\n",
                       tokenize(code1, dinit(TokenizeOptions, $.cpp = false)));
-        const char code2[] = "void f(int a) { int x; fun(a,b*x); }";
+        const char code2[] = "void f(int a) { int x; fun(a,b*x); }\n";
         ASSERT_EQUALS("1: void f ( int a@1 ) { int x@2 ; fun ( a@1 , b * x@2 ) ; }\n",
                       tokenize(code2, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varidFunctionCall5() {
-        const char code[] = "void foo() { (f(x[2]))(x[2]); }";
+        const char code[] = "void foo() { (f(x[2]))(x[2]); }\n";
         ASSERT_EQUALS("1: void foo ( ) { f ( x [ 2 ] ) ( x [ 2 ] ) ; }\n",
                       tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
@@ -1550,7 +1570,7 @@ class TestVarID : public TestFixture {
             "std::list<boost::wave::token_id> tokens;\n"
             "static std::vector<CvsProcess*> ex1;\n"
             "extern std::vector<CvsProcess*> ex2;\n"
-            "std::map<int, 1> m;");
+            "std::map<int, 1> m;\n");
 
         const char expected[] = "1: list < int > ints@1 ;\n"
                                 "2: list < int > :: iterator it@2 ;\n"
@@ -1566,7 +1586,7 @@ class TestVarID : public TestFixture {
     }
 
     void varidStl2() {
-        const std::string actual = tokenize("std::bitset<static_cast<int>(2)> x;");
+        const std::string actual = tokenize("std::bitset<static_cast<int>(2)> x;\n");
 
         const char expected[] = "1: std :: bitset < static_cast < int > ( 2 ) > x@1 ;\n";
 
@@ -1575,7 +1595,7 @@ class TestVarID : public TestFixture {
 
     void varid_newauto() {
         ASSERT_EQUALS("1: void f ( ) { const new auto ( 0 ) ; }\n",
-                      tokenize("void f(){new const auto(0);}"));
+                      tokenize("void f(){new const auto(0);}\n"));
     }
 
     void varid_delete() {
@@ -1584,7 +1604,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "  int *a;\n"
             "  delete a;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: void f ( )\n"
                                 "2: {\n"
@@ -1635,7 +1655,7 @@ class TestVarID : public TestFixture {
                 "void f3(const std::string &s)\n"
                 "{\n"
                 "    s.size();\n"
-                "}");
+                "}\n");
 
             const char expected[] = "1: void f1 ( int & p@1 )\n"
                                     "2: {\n"
@@ -1654,13 +1674,13 @@ class TestVarID : public TestFixture {
         }
 
         {
-            const std::string actual = tokenize("void f(struct foobar);", dinit(TokenizeOptions, $.cpp = false));
+            const std::string actual = tokenize("void f(struct foobar);\n", dinit(TokenizeOptions, $.cpp = false));
             const char expected[] = "1: void f ( struct foobar ) ;\n";
             ASSERT_EQUALS(expected, actual);
         }
 
         {
-            const std::string actual = tokenize("bool f(X x, int=3);");
+            const std::string actual = tokenize("bool f(X x, int=3);\n");
             const char expected[] = "1: bool f ( X x@1 , int = 3 ) ;\n";
             ASSERT_EQUALS(expected, actual);
         }
@@ -1697,7 +1717,7 @@ class TestVarID : public TestFixture {
     }
 
     void varid_sizeof() {
-        const char code[] = "x = sizeof(a*b);";
+        const char code[] = "x = sizeof(a*b);\n";
         const char expected[] = "1: x = sizeof ( a * b ) ;\n";
         ASSERT_EQUALS(expected, tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
@@ -1709,7 +1729,7 @@ class TestVarID : public TestFixture {
             "    std::vector<int> b;\n"
             "    std::vector<int> &a = b;\n"
             "    std::vector<int> *c = &b;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: void f ( )\n"
                                 "2: {\n"
@@ -1729,7 +1749,7 @@ class TestVarID : public TestFixture {
                 "public:\n"
                 "    std::string name1;\n"
                 "    std::string name2;\n"
-                "};");
+                "};\n");
 
             const char expected[] = "1: class Foo\n"
                                     "2: {\n"
@@ -1755,7 +1775,7 @@ class TestVarID : public TestFixture {
                 "    POINT pOutput = { 0 , 0 };\n"
                 "    int x = pOutput.x;\n"
                 "    int y = pOutput.y;\n"
-                "}");
+                "}\n");
 
             const char expected[] = "1: class foo\n"
                                     "2: {\n"
@@ -1790,7 +1810,7 @@ class TestVarID : public TestFixture {
             "void Bar::f()\n"
             "{\n"
             "    foo.x = x;\n"
-            "}");
+            "}\n");
         const char expected[] = "1: struct Foo {\n"
                                 "2: int x@1 ;\n"
                                 "3: } ;\n"
@@ -1814,7 +1834,7 @@ class TestVarID : public TestFixture {
                             "        Bar x(*this);\n"  // <- ..
                             "    }\n"
                             "    int x;\n"   // <- .. don't assign same varid
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("1: class Foo {\n"
                       "2: void blah ( ) {\n"
                       "3: Bar x@1 ( * this ) ;\n"
@@ -1826,7 +1846,7 @@ class TestVarID : public TestFixture {
     void varid_in_class4() {
         const char code[] = "class Foo {\n"
                             "public: class C;\n"
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("1: class Foo {\n"
                       "2: public: class C ;\n"
                       "3: } ;\n",
@@ -1836,7 +1856,7 @@ class TestVarID : public TestFixture {
     void varid_in_class5() {
         const char code[] = "struct Foo {\n"
                             "    std::vector<::X> v;\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("1: struct Foo {\n"
                       "2: std :: vector < :: X > v@1 ;\n"
                       "3: }\n",
@@ -1849,7 +1869,7 @@ class TestVarID : public TestFixture {
                             "        std::stringstream sst;\n"
                             "        sst.str();\n"
                             "    }\n"
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: void f ( const char * str@1 ) const {\n"
                       "3: std :: stringstream sst@2 ;\n"
@@ -1865,7 +1885,7 @@ class TestVarID : public TestFixture {
                             "        abc.a = 0;\n"
                             "    }\n"
                             "    struct ABC abc;\n"
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: void f ( ) {\n"
                       "3: abc@1 . a@2 = 0 ;\n"
@@ -1880,7 +1900,7 @@ class TestVarID : public TestFixture {
                             "  UNKNOWN_MACRO(A)\n"
                             "private:\n"
                             "  int x;\n"
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: UNKNOWN_MACRO ( A )\n"
                       "3: private:\n"
@@ -1897,7 +1917,7 @@ class TestVarID : public TestFixture {
                              "};\n"
                              "void A::setVar() {\n"
                              "  this->var = var;\n"
-                             "}";
+                             "}\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: int var@1 ;\n"
                       "3: public:\n"
@@ -1914,7 +1934,7 @@ class TestVarID : public TestFixture {
                              "};\n"
                              "void Foo::Clone(FooBase& g) {\n"
                              "    g->m_bar = m_bar;\n"
-                             "}";
+                             "}\n";
         ASSERT_EQUALS("1: class Foo : public FooBase {\n"
                       "2: void Clone ( FooBase & g@1 ) ;\n"
                       "3: short m_bar@2 ;\n"
@@ -1932,7 +1952,7 @@ class TestVarID : public TestFixture {
                             "};\n"
                             "void Foo::Clone(FooBase& g) {\n"
                             "    ((FooBase)g)->m_bar = m_bar;\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("1: class Foo : public FooBase {\n"
                       "2: void Clone ( FooBase & g@1 ) ;\n"
                       "3: short m_bar@2 ;\n"
@@ -1947,7 +1967,7 @@ class TestVarID : public TestFixture {
         const char code1[] = "class Foo {\n"
                              "    union { float a; int b; };\n"
                              "    void f() { a=0; }\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class Foo {\n"
                       "2: union { float a@1 ; int b@2 ; } ;\n"
                       "3: void f ( ) { a@1 = 0 ; }\n"
@@ -1957,7 +1977,7 @@ class TestVarID : public TestFixture {
         const char code2[] = "class Foo {\n"
                              "    void f() { a=0; }\n"
                              "    union { float a; int b; };\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class Foo {\n"
                       "2: void f ( ) { a@1 = 0 ; }\n"
                       "3: union { float a@1 ; int b@2 ; } ;\n"
@@ -1973,7 +1993,7 @@ class TestVarID : public TestFixture {
                              "    };\n"
                              "    g(abcd);\n"
                              "    h(a, b, c, d);\n"
-                             "}";
+                             "}\n";
         ASSERT_EQUALS("1: void f ( ) {\n"
                       "2: union {\n"
                       "3: struct {\n"
@@ -1990,7 +2010,7 @@ class TestVarID : public TestFixture {
         const char code4[] = "class Foo {\n"
                              "    void f(float a) { this->a = a; }\n"
                              "    union { float a; int b; };\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class Foo {\n"
                       "2: void f ( float a@1 ) { this . a@2 = a@1 ; }\n"
                       "3: union { float a@2 ; int b@3 ; } ;\n"
@@ -2002,7 +2022,7 @@ class TestVarID : public TestFixture {
         const char code[] = "class Foo {\n"
                             "private:\n"
                             "    void f(void);\n"
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("1: class Foo {\n"
                       "2: private:\n"
                       "3: void f ( ) ;\n"
@@ -2011,13 +2031,13 @@ class TestVarID : public TestFixture {
     }
 
     void varid_in_class13() {
-        const char code1[] = "struct a { char typename; };";
+        const char code1[] = "struct a { char typename; };\n";
         ASSERT_EQUALS("1: struct a { char typename@1 ; } ;\n",
                       tokenize(code1, dinit(TokenizeOptions, $.cpp = false)));
         ASSERT_EQUALS("1: struct a { char typename ; } ;\n",  // not valid C++ code
                       tokenize(code1));
 
-        const char code2[] = "struct a { char typename[2]; };";
+        const char code2[] = "struct a { char typename[2]; };\n";
         ASSERT_EQUALS("1: struct a { char typename@1 [ 2 ] ; } ;\n",
                       tokenize(code2, dinit(TokenizeOptions, $.cpp = false)));
         ASSERT_EQUALS("1: struct a { char typename [ 2 ] ; } ;\n",  // not valid C++ code
@@ -2097,7 +2117,7 @@ class TestVarID : public TestFixture {
                              "    FOO Set(BAR);\n"
                              "    int method_with_class(B<B> b);\n"
                              "    bool function(std::map<int, int, MYless> & m);\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class Fred {\n"
                       "2: int method_with_internal ( X & ) ;\n"
                       "3: int method_with_internal ( X * ) ;\n"
@@ -2115,7 +2135,7 @@ class TestVarID : public TestFixture {
                              "SomeType someVar1(i, i);\n"
                              "SomeType someVar2(j, j);\n"
                              "SomeType someVar3(j, 1);\n"
-                             "SomeType someVar4(new bar);";
+                             "SomeType someVar4(new bar);\n";
         ASSERT_EQUALS("1: int i@1 ;\n"
                       "2: SomeType someVar1@2 ( i@1 , i@1 ) ;\n"
                       "3: SomeType someVar2 ( j , j ) ;\n" // This one could be a function
@@ -2133,7 +2153,7 @@ class TestVarID : public TestFixture {
                             "};\n"
                             "A::B::B() :\n"
                             "    i(0)\n"
-                            "{}";
+                            "{}\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: class B ;\n"
                       "3: } ;\n"
@@ -2153,7 +2173,7 @@ class TestVarID : public TestFixture {
                             "};\n"
                             "Fred::~Fred() {\n"
                             "    free(str1);\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("1: class Fred {\n"
                       "2: char * str1@1 ;\n"
                       "3: ~ Fred ( ) ;\n"
@@ -2171,7 +2191,7 @@ class TestVarID : public TestFixture {
                             "    cacheEntry();\n"
                             "};\n"
                             "\n"
-                            "template<class C> cacheEntry<C>::cacheEntry() : m_key() {}";
+                            "template<class C> cacheEntry<C>::cacheEntry() : m_key() {}\n";
 
         ASSERT_EQUALS("1: template < class C > class cacheEntry {\n"
                       "2: protected:\n"
@@ -2191,7 +2211,7 @@ class TestVarID : public TestFixture {
                             "};\n"
                             "\n"
                             "template <typename t1,typename t2>\n"
-                            "A::B<t1,t2>::B() : x(9) {}";
+                            "A::B<t1,t2>::B() : x(9) {}\n";
 
         const char expected[] = "1: template < typename t1 , typename t2 >\n"
                                 "2: class A :: B {\n"
@@ -2373,6 +2393,40 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
+    void varid_in_class29() {
+        const char code[] = "struct S {\n" // #14486
+                            "    const int& r;\n"
+                            "    explicit S(const int& r) : r(r) {}\n"
+                            "    static void f() {\n"
+                            "        struct T : std::vector<int> {\n"
+                            "            bool g() const { return empty(); }\n"
+                            "        };\n"
+                            "    }\n"
+                            "};\n";
+        const char expected[] = "1: struct S {\n"
+                                "2: const int & r@1 ;\n"
+                                "3: explicit S ( const int & r@2 ) : r@1 ( r@2 ) { }\n"
+                                "4: static void f ( ) {\n"
+                                "5: struct T : std :: vector < int > {\n"
+                                "6: bool g ( ) const { return empty ( ) ; }\n"
+                                "7: } ;\n"
+                                "8: }\n"
+                                "9: } ;\n";
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
+    void varid_in_class30() {
+        const char code[] = "void* p;\n" // #13443
+                            "struct S {\n"
+                            "    void p();\n"
+                            "};\n";
+        const char expected[] = "1: void * p@1 ;\n"
+                                "2: struct S {\n"
+                                "3: void p ( ) ;\n"
+                                "4: } ;\n";
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
     void varid_namespace_1() { // #7272
         const char code[] = "namespace Blah {\n"
                             "  struct foo { int x;};\n"
@@ -2380,7 +2434,7 @@ class TestVarID : public TestFixture {
                             "    int x;\n"
                             "    union { char y; };\n"
                             "  };\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("1: namespace Blah {\n"
                       "2: struct foo { int x@1 ; } ;\n"
                       "3: struct bar {\n"
@@ -2402,7 +2456,7 @@ class TestVarID : public TestFixture {
                             "\n"
                             "void C::dostuff() {\n"
                             "   X = 0;\n"  // X@2
-                            "}";
+                            "}\n";
 
         const std::string actual = tokenize(code);
 
@@ -2433,7 +2487,7 @@ class TestVarID : public TestFixture {
                             "void Bar::f() {\n"
                             "  type = 0;\n"  // <- ... and here
                             "}\n"
-                            "}";
+                            "}\n";
 
         const std::string actual = tokenize(code);
 
@@ -2448,7 +2502,7 @@ class TestVarID : public TestFixture {
                             "    void dostuff();\n"
                             "  };\n"
                             "  void bar::dostuff() { int x2 = x * 2; }\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("1: namespace X {\n"
                       "2: struct foo { int x@1 ; } ;\n"
                       "3: struct bar : public foo {\n"
@@ -2467,7 +2521,7 @@ class TestVarID : public TestFixture {
                             "    };\n"
                             "    void bar::dostuff() { int x2 = x * 2; }\n"
                             "  }\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("1: namespace X {\n"
                       "2: struct foo { int x@1 ; } ;\n"
                       "3: namespace Y {\n"
@@ -2489,7 +2543,7 @@ class TestVarID : public TestFixture {
                             "            std::map<Vec2i, int>::iterator iter;\n"
                             "        }\n"
                             "    }\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("1: namespace N {\n"
                       "2: namespace O {\n"
                       "3: U :: U ( int * map@1 ) : id ( 0 ) {\n"
@@ -2506,7 +2560,7 @@ class TestVarID : public TestFixture {
         const char code1[] = "class A {\n"
                              "  A() : x(0) {}\n"
                              "  int x;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: A ( ) : x@1 ( 0 ) { }\n"
                       "3: int x@1 ;\n"
@@ -2516,7 +2570,7 @@ class TestVarID : public TestFixture {
         const char code2[] = "class A {\n"
                              "  A(int x) : x(x) {}\n"
                              "  int x;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: A ( int x@1 ) : x@2 ( x@1 ) { }\n"
                       "3: int x@2 ;\n"
@@ -2527,7 +2581,7 @@ class TestVarID : public TestFixture {
                              "  A(int x);\n"
                              "  int x;\n"
                              "};\n"
-                             "A::A(int x) : x(x) {}";
+                             "A::A(int x) : x(x) {}\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: A ( int x@1 ) ;\n"
                       "3: int x@2 ;\n"
@@ -2548,7 +2602,7 @@ class TestVarID : public TestFixture {
         const char code5[] = "class A {\n"
                              "  A(int x) noexcept : x(x) {}\n"
                              "  int x;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: A ( int x@1 ) noexcept ( true ) : x@2 ( x@1 ) { }\n"
                       "3: int x@2 ;\n"
@@ -2558,7 +2612,7 @@ class TestVarID : public TestFixture {
         const char code6[] = "class A {\n"
                              "  A(int x) noexcept(true) : x(x) {}\n"
                              "  int x;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: A ( int x@1 ) noexcept ( true ) : x@2 ( x@1 ) { }\n"
                       "3: int x@2 ;\n"
@@ -2568,7 +2622,7 @@ class TestVarID : public TestFixture {
         const char code7[] = "class A {\n"
                              "  A(int x) noexcept(false) : x(x) {}\n"
                              "  int x;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: A ( int x@1 ) noexcept ( false ) : x@2 ( x@1 ) { }\n"
                       "3: int x@2 ;\n"
@@ -2578,7 +2632,7 @@ class TestVarID : public TestFixture {
         const char code8[] = "class Foo : public Bar {\n"
                              "  explicit Foo(int i) : Bar(mi = i) { }\n"
                              "  int mi;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class Foo : public Bar {\n"
                       "2: explicit Foo ( int i@1 ) : Bar ( mi@2 = i@1 ) { }\n"
                       "3: int mi@2 ;\n"
@@ -2589,7 +2643,7 @@ class TestVarID : public TestFixture {
         const char code9[] = "class A {\n"
                              "  A(int x) : y(a?0:1), x(x) {}\n"
                              "  int x, y;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: A ( int x@1 ) : y@3 ( a ? 0 : 1 ) , x@2 ( x@1 ) { }\n"
                       "3: int x@2 ; int y@3 ;\n"
@@ -2602,7 +2656,7 @@ class TestVarID : public TestFixture {
                               "  A(const Matrix &m) throw (e);\n"
                               "};\n"
                               "A::A(const Matrix &m) throw (e) : work(0)\n"
-                              "{}";
+                              "{}\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: double * work@1 ;\n"
                       "3: A ( const Matrix & m@2 ) throw ( e ) ;\n"
@@ -2614,7 +2668,7 @@ class TestVarID : public TestFixture {
         const char code11[] = "struct S {\n" // #12733
                               "    explicit S(int& r) : a{ int{ 1 } }, b{ r } {}\n"
                               "    int a, &b;\n"
-                              "};";
+                              "};\n";
         ASSERT_EQUALS("1: struct S {\n"
                       "2: explicit S ( int & r@1 ) : a@2 { int { 1 } } , b@3 { r@1 } { }\n"
                       "3: int a@2 ; int & b@3 ;\n"
@@ -2664,13 +2718,37 @@ class TestVarID : public TestFixture {
                       "10: D < T ... > d@2 ;\n"
                       "11: } ;\n",
                       tokenize(code13));
+
+        const char code14[] = "struct S {\n" // #15062
+                              "    int x;\n"
+                              "    int* p;\n"
+                              "    S(int* p) : x(f(0, {0})), p(p) {}\n"
+                              "    S(int* p, int) : x(f(0, {{1}, 2})), p(p) {}\n"
+                              "};\n"
+                              "struct T {\n"
+                              "    int* p;\n"
+                              "    int g();\n"
+                              "};\n"
+                              "int T::g() { return *p; }\n";
+        ASSERT_EQUALS("1: struct S {\n"
+                      "2: int x@1 ;\n"
+                      "3: int * p@2 ;\n"
+                      "4: S ( int * p@3 ) : x@1 ( f ( 0 , { 0 } ) ) , p@2 ( p@3 ) { }\n"
+                      "5: S ( int * p@4 , int ) : x@1 ( f ( 0 , { { 1 } , 2 } ) ) , p@2 ( p@4 ) { }\n"
+                      "6: } ;\n"
+                      "7: struct T {\n"
+                      "8: int * p@5 ;\n"
+                      "9: int g ( ) ;\n"
+                      "10: } ;\n"
+                      "11: int T :: g ( ) { return * p@5 ; }\n",
+                      tokenize(code14));
     }
 
     void varid_initListWithBaseTemplate() {
         const char code1[] = "class A : B<C,D> {\n"
                              "  A() : B<C,D>(), x(0) {}\n"
                              "  int x;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A : B < C , D > {\n"
                       "2: A ( ) : B < C , D > ( ) , x@1 ( 0 ) { }\n"
                       "3: int x@1 ;\n"
@@ -2680,7 +2758,7 @@ class TestVarID : public TestFixture {
         const char code2[] = "class A : B<C,D> {\n"
                              "  A(int x) : x(x) {}\n"
                              "  int x;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A : B < C , D > {\n"
                       "2: A ( int x@1 ) : x@2 ( x@1 ) { }\n"
                       "3: int x@2 ;\n"
@@ -2691,7 +2769,7 @@ class TestVarID : public TestFixture {
                              "  A(int x);\n"
                              "  int x;\n"
                              "};\n"
-                             "A::A(int x) : x(x) {}";
+                             "A::A(int x) : x(x) {}\n";
         ASSERT_EQUALS("1: class A : B < C , D > {\n"
                       "2: A ( int x@1 ) ;\n"
                       "3: int x@2 ;\n"
@@ -2715,7 +2793,7 @@ class TestVarID : public TestFixture {
                              "};\n"
                              "BCLass::BCLass() : Ticket<void>() {\n"
                              "  member = 0;\n"
-                             "}";
+                             "}\n";
         ASSERT_EQUALS("1: class BCLass : public Ticket < void > {\n"
                       "2: BCLass ( ) ;\n"
                       "3: PClass * member@1 ;\n"
@@ -2730,7 +2808,7 @@ class TestVarID : public TestFixture {
         const char code1[] = "class A : public B::C {\n"
                              "  A() : B::C(), x(0) {}\n"
                              "  int x;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A : public B :: C {\n"
                       "2: A ( ) : B :: C ( ) , x@1 ( 0 ) { }\n"
                       "3: int x@1 ;\n"
@@ -2738,6 +2816,82 @@ class TestVarID : public TestFixture {
                       tokenize(code1));
     }
 
+    void varid_initListWithLambda() {
+        const char code1[] = "struct S {\n"
+                             "    int x;\n"
+                             "    int* p;\n"
+                             "    S(int* p) : x([p] { return *p; }()), p(p) {}\n"
+                             "    S(int* p, int* q) : x([p](int* q) { return *p + *q; }(q)), p(q) {}\n"
+                             "    S(int* p, char) : x([p]() noexcept { int v = *p; return v; }()), p{p} {}\n"
+                             "};\n"
+                             "struct T {\n"
+                             "    int* p;\n"
+                             "    int g();\n"
+                             "};\n"
+                             "int T::g() { return *p; }\n";
+        ASSERT_EQUALS("1: struct S {\n"
+                      "2: int x@1 ;\n"
+                      "3: int * p@2 ;\n"
+                      "4: S ( int * p@3 ) : x@1 ( [ p@3 ] { return * p@3 ; } ( ) ) , p@2 ( p@3 ) { }\n"
+                      "5: S ( int * p@4 , int * q@5 ) : x@1 ( [ p@4 ] ( int * q@6 ) { return * p@4 + * q@6 ; } ( q@5 ) ) , p@2 ( q@5 ) { }\n"
+                      "6: S ( int * p@7 , char ) : x@1 ( [ p@7 ] ( ) noexcept ( true ) { int v@8 ; v@8 = * p@7 ; return v@8 ; } ( ) ) , p@2 { p@7 } { }\n"
+                      "7: } ;\n"
+                      "8: struct T {\n"
+                      "9: int * p@9 ;\n"
+                      "10: int g ( ) ;\n"
+                      "11: } ;\n"
+                      "12: int T :: g ( ) { return * p@9 ; }\n",
+                      tokenize(code1));
+
+        const char code2[] = "struct S {\n"
+                             "    int x;\n"
+                             "    int* p;\n"
+                             "    S(int* p) : x(*[p]() -> int* { return p; }()), p(p) {}\n"
+                             "};\n";
+        ASSERT_EQUALS("1: struct S {\n"
+                      "2: int x@1 ;\n"
+                      "3: int * p@2 ;\n"
+                      "4: S ( int * p@3 ) : x@1 ( * [ p@3 ] ( ) . int * { return p@3 ; } ( ) ) , p@2 ( p@3 ) { }\n"
+                      "5: } ;\n",
+                      tokenize(code2));
+
+        const char code3[] = "enum { N = 2 };\n" // no lambda
+                             "struct S {\n"
+                             "    int* q;\n"
+                             "    S(int b) : q(new int[2]{ N * b, 1 }) {}\n"
+                             "};\n"
+                             "struct T {\n"
+                             "    std::vector<int>** r;\n"
+                             "    T(std::vector<int>* c) : r(new std::vector<int>*[2]{ N * c, c }) {}\n"
+                             "};\n"
+                             "struct U {\n"
+                             "    int** r;\n"
+                             "    U(int* c) : r(new (std::nothrow) int*[2]{ N * c, c }) {}\n"
+                             "};\n"
+                             "struct V {\n"
+                             "    int** r;\n"
+                             "    V(int* c) : r(new decltype(c)*[2]{ N * c, c }) {}\n"
+                             "};\n";
+        ASSERT_EQUALS("1: enum Anonymous0 { N = 2 } ;\n"
+                      "2: struct S {\n"
+                      "3: int * q@1 ;\n"
+                      "4: S ( int b@2 ) : q@1 ( new int [ 2 ] { N * b@2 , 1 } ) { }\n"
+                      "5: } ;\n"
+                      "6: struct T {\n"
+                      "7: std :: vector < int > * * r@3 ;\n"
+                      "8: T ( std :: vector < int > * c@4 ) : r@3 ( new std :: vector < int > * [ 2 ] { N * c@4 , c@4 } ) { }\n"
+                      "9: } ;\n"
+                      "10: struct U {\n"
+                      "11: int * * r@5 ;\n"
+                      "12: U ( int * c@6 ) : r@5 ( new ( std :: nothrow ) int * [ 2 ] { N * c@6 , c@6 } ) { }\n"
+                      "13: } ;\n"
+                      "14: struct V {\n"
+                      "15: int * * r@7 ;\n"
+                      "16: V ( int * c@8 ) : r@7 ( new decltype ( c@8 ) * [ 2 ] { N * c@8 , c@8 } ) { }\n"
+                      "17: } ;\n",
+                      tokenize(code3));
+    }
+
     void varid_operator() {
         {
             const std::string actual = tokenize(
@@ -2745,7 +2899,7 @@ class TestVarID : public TestFixture {
                 "{\n"
                 "public:\n"
                 "    void operator=(const Foo &);\n"
-                "};");
+                "};\n");
 
             const char expected[] = "1: class Foo\n"
                                     "2: {\n"
@@ -2759,7 +2913,7 @@ class TestVarID : public TestFixture {
             const std::string actual = tokenize(
                 "struct Foo {\n"
                 "    void * operator new [](int);\n"
-                "};");
+                "};\n");
             const char expected[] = "1: struct Foo {\n"
                                     "2: void * operatornew[] ( int ) ;\n"
                                     "3: } ;\n";
@@ -2771,7 +2925,7 @@ class TestVarID : public TestFixture {
     void varid_throw() {  // ticket #1723
         const std::string actual = tokenize(
             "UserDefinedException* pe = new UserDefinedException();\n"
-            "throw pe;");
+            "throw pe;\n");
 
         const char expected[] = "1: UserDefinedException * pe@1 ; pe@1 = new UserDefinedException ( ) ;\n"
                                 "2: throw pe@1 ;\n";
@@ -2785,7 +2939,7 @@ class TestVarID : public TestFixture {
                             "    int a[10];\n"
                             "    AAA\n"
                             "    a[0] = 0;\n"
-                            "}";
+                            "}\n";
         const char expected[] = "1: void f ( ) {\n"
                                 "2: int a@1 [ 10 ] ;\n"
                                 "3: AAA\n"
@@ -2796,8 +2950,8 @@ class TestVarID : public TestFixture {
 
     void varid_using() {
         // #3648
-        const char code[] = "using std::size_t;";
-        const char expected[] = "1: using unsigned long ;\n";
+        const char code[] = "using std::size_t;\n";
+        const char expected[] = "1: ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
@@ -2805,7 +2959,7 @@ class TestVarID : public TestFixture {
         const char code[] = "void f() {\n"
                             "    try { dostuff(); }\n"
                             "    catch (exception &e) { }\n"
-                            "}";
+                            "}\n";
         const char expected[] = "1: void f ( ) {\n"
                                 "2: try { dostuff ( ) ; }\n"
                                 "3: catch ( exception & e@1 ) { }\n"
@@ -2814,20 +2968,20 @@ class TestVarID : public TestFixture {
     }
 
     void varid_functionPrototypeTemplate() {
-        ASSERT_EQUALS("1: function < void ( ) > fptr@1 ;\n", tokenize("function<void(void)> fptr;"));
+        ASSERT_EQUALS("1: function < void ( ) > fptr@1 ;\n", tokenize("function<void(void)> fptr;\n"));
     }
 
     void varid_templatePtr() {
-        ASSERT_EQUALS("1: std :: map < int , FooTemplate < int > * > dummy_member@1 [ 1 ] ;\n", tokenize("std::map<int, FooTemplate<int>*> dummy_member[1];"));
+        ASSERT_EQUALS("1: std :: map < int , FooTemplate < int > * > dummy_member@1 [ 1 ] ;\n", tokenize("std::map<int, FooTemplate<int>*> dummy_member[1];\n"));
     }
 
     void varid_templateNamespaceFuncPtr() {
-        ASSERT_EQUALS("1: KeyListT < float , & NIFFile :: getFloat > mKeyList@1 [ 4 ] ;\n", tokenize("KeyListT<float, &NIFFile::getFloat> mKeyList[4];"));
+        ASSERT_EQUALS("1: KeyListT < float , & NIFFile :: getFloat > mKeyList@1 [ 4 ] ;\n", tokenize("KeyListT<float, &NIFFile::getFloat> mKeyList[4];\n"));
     }
 
     void varid_templateArray() {
         ASSERT_EQUALS("1: VertexArrayIterator < float [ 2 ] > attrPos@1 ; attrPos@1 = m_AttributePos . GetIterator < float [ 2 ] > ( ) ;\n",
-                      tokenize("VertexArrayIterator<float[2]> attrPos = m_AttributePos.GetIterator<float[2]>();"));
+                      tokenize("VertexArrayIterator<float[2]> attrPos = m_AttributePos.GetIterator<float[2]>();\n"));
     }
 
     void varid_templateParameter() {
@@ -2860,7 +3014,7 @@ class TestVarID : public TestFixture {
 
     void varid_templateUsing() { // #5781 #7273
         const char code[] = "template<class T> using X = Y<T,4>;\n"
-                            "X<int> x;";
+                            "X<int> x;\n";
         ASSERT_EQUALS("2: Y < int , 4 > x@1 ;\n",
                       tokenize(code));
     }
@@ -2879,62 +3033,62 @@ class TestVarID : public TestFixture {
     }
 
     void varid_not_template_in_condition() {
-        const char code1[] = "void f() { if (x<a||x>b); }";
+        const char code1[] = "void f() { if (x<a||x>b); }\n";
         ASSERT_EQUALS("1: void f ( ) { if ( x < a || x > b ) { ; } }\n", tokenize(code1));
 
-        const char code2[] = "void f() { if (1+x<a||x>b); }";
+        const char code2[] = "void f() { if (1+x<a||x>b); }\n";
         ASSERT_EQUALS("1: void f ( ) { if ( 1 + x < a || x > b ) { ; } }\n", tokenize(code2));
 
-        const char code3[] = "void f() { if (x<a||x>b+1); }";
+        const char code3[] = "void f() { if (x<a||x>b+1); }\n";
         ASSERT_EQUALS("1: void f ( ) { if ( x < a || x > b + 1 ) { ; } }\n", tokenize(code3));
 
-        const char code4[] = "void f() { if ((x==13) && (x<a||x>b)); }";
+        const char code4[] = "void f() { if ((x==13) && (x<a||x>b)); }\n";
         ASSERT_EQUALS("1: void f ( ) { if ( ( x == 13 ) && ( x < a || x > b ) ) { ; } }\n", tokenize(code4));
     }
 
     void varid_cppcast() {
         ASSERT_EQUALS("1: const_cast < int * > ( code ) [ 0 ] = 0 ;\n",
-                      tokenize("const_cast<int *>(code)[0] = 0;"));
+                      tokenize("const_cast<int *>(code)[0] = 0;\n"));
 
         ASSERT_EQUALS("1: dynamic_cast < int * > ( code ) [ 0 ] = 0 ;\n",
-                      tokenize("dynamic_cast<int *>(code)[0] = 0;"));
+                      tokenize("dynamic_cast<int *>(code)[0] = 0;\n"));
 
         ASSERT_EQUALS("1: reinterpret_cast < int * > ( code ) [ 0 ] = 0 ;\n",
-                      tokenize("reinterpret_cast<int *>(code)[0] = 0;"));
+                      tokenize("reinterpret_cast<int *>(code)[0] = 0;\n"));
 
         ASSERT_EQUALS("1: static_cast < int * > ( code ) [ 0 ] = 0 ;\n",
-                      tokenize("static_cast<int *>(code)[0] = 0;"));
+                      tokenize("static_cast<int *>(code)[0] = 0;\n"));
     }
 
     void varid_variadicFunc() {
-        ASSERT_EQUALS("1: int foo ( ... ) ;\n", tokenize("int foo(...);"));
+        ASSERT_EQUALS("1: int foo ( ... ) ;\n", tokenize("int foo(...);\n"));
     }
 
     void varid_typename() {
-        ASSERT_EQUALS("1: template < int d , class A , class B > struct S { } ;\n", tokenize("template<int d, class A, class B> struct S {};"));
+        ASSERT_EQUALS("1: template < int d , class A , class B > struct S { } ;\n", tokenize("template<int d, class A, class B> struct S {};\n"));
 
-        ASSERT_EQUALS("1: template < int d , typename A , typename B > struct S { } ;\n", tokenize("template<int d, typename A, typename B> struct S {};"));
+        ASSERT_EQUALS("1: template < int d , typename A , typename B > struct S { } ;\n", tokenize("template<int d, typename A, typename B> struct S {};\n"));
 
-        ASSERT_EQUALS("1: A a@1 ;\n", tokenize("typename A a;"));
+        ASSERT_EQUALS("1: A a@1 ;\n", tokenize("typename A a;\n"));
     }
 
     void varid_rvalueref() {
-        ASSERT_EQUALS("1: int && a@1 ;\n", tokenize("int&& a;"));
+        ASSERT_EQUALS("1: int && a@1 ;\n", tokenize("int&& a;\n"));
 
-        ASSERT_EQUALS("1: void foo ( int && a@1 ) { }\n", tokenize("void foo(int&& a) {}"));
+        ASSERT_EQUALS("1: void foo ( int && a@1 ) { }\n", tokenize("void foo(int&& a) {}\n"));
 
         ASSERT_EQUALS("1: class C {\n"
                       "2: C ( int && a@1 ) ;\n"
                       "3: } ;\n",
                       tokenize("class C {\n"
                                "    C(int&& a);\n"
-                               "};"));
+                               "};\n"));
 
-        ASSERT_EQUALS("1: void foo ( int && ) ;\n", tokenize("void foo(int&&);"));
+        ASSERT_EQUALS("1: void foo ( int && ) ;\n", tokenize("void foo(int&&);\n"));
     }
 
     void varid_arrayFuncPar() {
-        ASSERT_EQUALS("1: void check ( const char fname@1 [ ] = 0 ) { }\n", tokenize("void check( const char fname[] = 0) { }"));
+        ASSERT_EQUALS("1: void check ( const char fname@1 [ ] = 0 ) { }\n", tokenize("void check( const char fname[] = 0) { }\n"));
     }
 
     void varid_sizeofPassed() {
@@ -2947,7 +3101,7 @@ class TestVarID : public TestFixture {
                                "    const char* argv[] = { \"./test_runner\", \"TestClass\" };\n"
                                "    options args(sizeof argv / sizeof argv[0], argv);\n"
                                "    args.which_test();\n"
-                               "}"));
+                               "}\n"));
     }
 
     void varid_classInFunction() {
@@ -2962,7 +3116,7 @@ class TestVarID : public TestFixture {
                                "        void reportErr(ErrorLogger::ErrorMessage &msg) {\n"
                                "        }\n"
                                "    };\n"
-                               "}"));
+                               "}\n"));
     }
 
     void varid_pointerToArray() {
@@ -2987,7 +3141,7 @@ class TestVarID : public TestFixture {
                                "    int f2(int i) { return a4[i]; }\n"
                                "    int f3(int(&a5)[10], int i) { return a5[i]; }\n"
                                "};\n"
-                               "int f4(int(&a6)[10], int i) { return a6[i]; }"));
+                               "int f4(int(&a6)[10], int i) { return a6[i]; }\n"));
     }
 
     void varid_cpp11initialization() {
@@ -3000,15 +3154,15 @@ class TestVarID : public TestFixture {
                                "std::vector<int> vec{1, 2, 3};\n"
                                "namespace n { int z; };\n"
                                "int& j{i};\n"
-                               "int k{1}, l{2};"));
+                               "int k{1}, l{2};\n"));
 
         // #6030
         ASSERT_EQUALS("1: struct S3 : public S1 , public S2 { } ;\n",
-                      tokenize("struct S3 : public S1, public S2 { };"));
+                      tokenize("struct S3 : public S1, public S2 { };\n"));
 
         // #6058
         ASSERT_EQUALS("1: class Scope { } ;\n",
-                      tokenize("class CPPCHECKLIB Scope { };"));
+                      tokenize("class CPPCHECKLIB Scope { };\n"));
 
         // #6073 #6253
         ASSERT_EQUALS("1: class A : public B , public C :: D , public E < F > :: G < H > {\n"
@@ -3022,7 +3176,12 @@ class TestVarID : public TestFixture {
                                "    A(int i): B{i}, C::D{i}, E<F>::G<H>{i} ,i{i} {\n"
                                "        int j{i};\n"
                                "    }\n"
-                               "};"));
+                               "};\n"));
+
+        ASSERT_EQUALS("1: struct Sx { int i@1 ; } ;\n" // #14733
+                      "2: struct Sx sx@2 { 0 } ;\n",
+                      tokenize("struct Sx { int i; };\n"
+                               "struct Sx sx{ 0 }; \n"));
     }
 
     void varid_inheritedMembers() {
@@ -3043,7 +3202,7 @@ class TestVarID : public TestFixture {
                                "};\n"
                                "void B::f() {\n"
                                "    a = 0;\n"
-                               "}"));
+                               "}\n"));
 
         ASSERT_EQUALS("1: class A {\n"
                       "2: int a@1 ;\n"
@@ -3062,7 +3221,7 @@ class TestVarID : public TestFixture {
                                "};\n"
                                "void B::f() {\n"
                                "    a = 0;\n"
-                               "}"));
+                               "}\n"));
 
         ASSERT_EQUALS("1: class A {\n"
                       "2: int a@1 ;\n"
@@ -3081,7 +3240,7 @@ class TestVarID : public TestFixture {
                                "};\n"
                                "void B::f() {\n"
                                "    a = 0;\n"
-                               "}"));
+                               "}\n"));
 
         ASSERT_EQUALS("1: class A {\n"
                       "2: int a@1 ;\n"
@@ -3098,7 +3257,7 @@ class TestVarID : public TestFixture {
                                "    void f() {\n"
                                "        a = 0;\n"
                                "    }\n"
-                               "};"));
+                               "};\n"));
     }
 
     void varid_header() {
@@ -3109,7 +3268,7 @@ class TestVarID : public TestFixture {
                       tokenizeHeader("class A;\n"
                                      "struct B {\n"
                                      "    void setData(const A & a);\n"
-                                     "}; ", "test.h"));
+                                     "}; \n", "test.h"));
         ASSERT_EQUALS("1: class A ;\n"
                       "2: struct B {\n"
                       "3: void setData ( const A & a@1 ) ;\n"
@@ -3117,7 +3276,7 @@ class TestVarID : public TestFixture {
                       tokenizeHeader("class A;\n"
                                      "struct B {\n"
                                      "    void setData(const A & a);\n"
-                                     "}; ", "test.hpp"));
+                                     "}; \n", "test.hpp"));
         ASSERT_EQUALS("1: void f ( )\n"
                       "2: {\n"
                       "3: int class@1 ;\n"
@@ -3125,7 +3284,7 @@ class TestVarID : public TestFixture {
                       tokenizeHeader("void f()\n"
                                      "{\n"
                                      "    int class;\n"
-                                     "}", "test.h"));
+                                     "}\n", "test.h"));
     }
 
     void varid_rangeBasedFor() {
@@ -3136,7 +3295,7 @@ class TestVarID : public TestFixture {
                       tokenize("void reset(Foo array) {\n"
                                "    for (auto& e : array)\n"
                                "        foo(e);\n"
-                               "};"));
+                               "};\n"));
 
         ASSERT_EQUALS("1: void reset ( Foo array@1 ) {\n"
                       "2: for ( auto e@2 : array@1 ) {\n"
@@ -3145,7 +3304,7 @@ class TestVarID : public TestFixture {
                       tokenize("void reset(Foo array) {\n"
                                "    for (auto e : array)\n"
                                "        foo(e);\n"
-                               "};"));
+                               "};\n"));
 
         // Labels are no variables
         ASSERT_EQUALS("1: void foo ( ) {\n"
@@ -3165,7 +3324,7 @@ class TestVarID : public TestFixture {
                                "        delta = 1;\n"
                                "        break;\n"
                                "    }\n"
-                               "}", dinit(TokenizeOptions, $.cpp = false)));
+                               "}\n", dinit(TokenizeOptions, $.cpp = false)));
 
         ASSERT_EQUALS("1: int * f ( ) {\n" // #11838
                       "2: int * label@1 ; label@1 = 0 ;\n"
@@ -3176,7 +3335,7 @@ class TestVarID : public TestFixture {
                                "    int* label = 0;\n"
                                "label:\n"
                                "    return label;\n"
-                               "}"));
+                               "}\n"));
     }
 
     void varid_structinit() { // #6406
@@ -3185,21 +3344,21 @@ class TestVarID : public TestFixture {
                       "3: }\n",
                       tokenize("void foo() {\n"
                                "  struct ABC abc = {.a=0,.b=1};\n"
-                               "}"));
+                               "}\n"));
 
         ASSERT_EQUALS("1: void foo ( ) {\n"
                       "2: struct ABC abc@1 ; abc@1 = { . a@2 = abc@1 . a@2 , . b@3 = abc@1 . b@3 } ;\n"
                       "3: }\n",
                       tokenize("void foo() {\n"
                                "  struct ABC abc = {.a=abc.a,.b=abc.b};\n"
-                               "}"));
+                               "}\n"));
 
         ASSERT_EQUALS("1: void foo ( ) {\n"
                       "2: struct ABC abc@1 ; abc@1 = { . a@2 { abc@1 . a@2 } , . b@3 = { abc@1 . b@3 } } ;\n"
                       "3: }\n",
                       tokenize("void foo() {\n"
                                "  struct ABC abc = {.a { abc.a },.b= { abc.b } };\n"
-                               "}"));
+                               "}\n"));
 
         ASSERT_EQUALS("1: struct T { int a@1 ; } ;\n" // #13123
                       "2: void f ( int a@2 ) {\n"
@@ -3228,10 +3387,10 @@ class TestVarID : public TestFixture {
 
     void varid_arrayinit() {
         // #7579 - no variable declaration in rhs
-        ASSERT_EQUALS("1: void foo ( int * a@1 ) { int b@2 [ 1 ] = { x * a@1 [ 0 ] } ; }\n", tokenize("void foo(int*a) { int b[] = { x*a[0] }; }"));
+        ASSERT_EQUALS("1: void foo ( int * a@1 ) { int b@2 [ 1 ] = { x * a@1 [ 0 ] } ; }\n", tokenize("void foo(int*a) { int b[] = { x*a[0] }; }\n"));
 
         // #12402
-        ASSERT_EQUALS("1: void f ( ) { void ( * p@1 [ 1 ] ) ( int ) = { [ ] ( int i@2 ) { } } ; }\n", tokenize("void f() { void (*p[1])(int) = { [](int i) {} }; }"));
+        ASSERT_EQUALS("1: void f ( ) { void ( * p@1 [ 1 ] ) ( int ) = { [ ] ( int i@2 ) { } } ; }\n", tokenize("void f() { void (*p[1])(int) = { [](int i) {} }; }\n"));
     }
 
     void varid_lambda_arg() {
@@ -3239,7 +3398,7 @@ class TestVarID : public TestFixture {
         {
             const char code[] = "static void func(int ec) {\n"
                                 "    func2([](const std::error_code& ec) { return ec; });\n"
-                                "}";
+                                "}\n";
             const char exp[] = "1: static void func ( int ec@1 ) {\n"
                                "2: func2 ( [ ] ( const std :: error_code & ec@2 ) { return ec@2 ; } ) ;\n"
                                "3: }\n";
@@ -3248,7 +3407,7 @@ class TestVarID : public TestFixture {
         {
             const char code[] = "static void func(int ec) {\n"
                                 "    func2([](int x, const std::error_code& ec) { return x + ec; });\n"
-                                "}";
+                                "}\n";
             const char exp[] = "1: static void func ( int ec@1 ) {\n"
                                "2: func2 ( [ ] ( int x@2 , const std :: error_code & ec@3 ) { return x@2 + ec@3 ; } ) ;\n"
                                "3: }\n";
@@ -3297,7 +3456,7 @@ class TestVarID : public TestFixture {
             const char code[] = "static void func() {\n"
                                 "    auto x = []() mutable {};\n"
                                 "    dostuff(x);\n"
-                                "}";
+                                "}\n";
             const char exp[] = "1: static void func ( ) {\n"
                                "2: auto x@1 ; x@1 = [ ] ( ) mutable { } ;\n"
                                "3: dostuff ( x@1 ) ;\n"
@@ -3321,7 +3480,7 @@ class TestVarID : public TestFixture {
                             "};\n"
                             "auto Fred::foo(const Fred & other) -> Fred & {\n"
                             "    return *this;\n"
-                            "}";
+                            "}\n";
         const char exp[] = "1: struct Fred {\n"
                            "2: auto foo ( const Fred & other@1 ) . Fred & ;\n"
                            "3: auto bar ( const Fred & other@2 ) . Fred & {\n"
@@ -3335,7 +3494,7 @@ class TestVarID : public TestFixture {
     }
 
     void varid_trailing_return2() { // #9066
-        const char code[] = "auto func(int arg) -> bar::quux {}";
+        const char code[] = "auto func(int arg) -> bar::quux {}\n";
         const char exp[] = "1: auto func ( int arg@1 ) . bar :: quux { }\n";
         ASSERT_EQUALS(exp, tokenize(code));
     }
@@ -3370,7 +3529,7 @@ class TestVarID : public TestFixture {
                             "    x+y+z;\n"
                             "  }\n"
                             "  x+y+z;\n"
-                            "}";
+                            "}\n";
         const char exp[] = "1: void f ( ) {\n"
                            "2: for ( auto [ x@1 , y@2 , z@3 ] : xyz ) {\n"
                            "3: x@1 + y@2 + z@3 ;\n"
@@ -3383,7 +3542,7 @@ class TestVarID : public TestFixture {
     void varid_not() { // #9689 'not x'
         const char code[] = "void foo(int x) const {\n"
                             "  if (not x) {}\n"
-                            "}";
+                            "}\n";
         const char exp[] = "1: void foo ( int x@1 ) const {\n"
                            "2: if ( ! x@1 ) { }\n"
                            "3: }\n";
@@ -3399,7 +3558,7 @@ class TestVarID : public TestFixture {
                       tokenize("void f(int x) {\n"
                                "  if (int x = 0) { x; }\n"
                                "  x;\n"
-                               "}"));
+                               "}\n"));
         // if, else
         ASSERT_EQUALS("1: void f ( int x@1 ) {\n"
                       "2: if ( int x@2 = 0 ) { x@2 ; }\n"
@@ -3410,7 +3569,7 @@ class TestVarID : public TestFixture {
                                "  if (int x = 0) { x; }\n"
                                "  else { x; }\n"
                                "  x;\n"
-                               "}"));
+                               "}\n"));
         // if, else if
         ASSERT_EQUALS("1: void f ( int x@1 ) {\n"
                       "2: if ( int x@2 = 0 ) { x@2 ; }\n"
@@ -3421,7 +3580,7 @@ class TestVarID : public TestFixture {
                                "  if (int x = 0) x;\n"
                                "  else if (void* x = &x) x;\n"
                                "  x;\n"
-                               "}"));
+                               "}\n"));
         // if, else if, else
         ASSERT_EQUALS("1: void f ( int x@1 ) {\n"
                       "2: if ( int x@2 = 0 ) { x@2 ; }\n"
@@ -3434,7 +3593,7 @@ class TestVarID : public TestFixture {
                                "  else if (void* x = &x) x;\n"
                                "  else x;\n"
                                "  x;\n"
-                               "}"));
+                               "}\n"));
 
         ASSERT_EQUALS("1: const char * f ( int * ) ;\n" // #12924
                       "2: void g ( int i@1 ) {\n"
@@ -3455,7 +3614,7 @@ class TestVarID : public TestFixture {
                             "  memset(::a, 123, 5);\n"
                             "  memset(Z::b.a, 123, 5);\n"
                             "  memset(::Z::b.a, 123, 5);\n"
-                            "}";
+                            "}\n";
 
         const char exp[] = "1: int a@1 [ 5 ] ;\n"
                            "2: namespace Z { struct B { int a@2 [ 5 ] ; } ; struct B b@3 ; }\n"
@@ -3467,6 +3626,66 @@ class TestVarID : public TestFixture {
                            "8: memset ( :: Z :: b@3 . a , 123 , 5 ) ;\n"
                            "9: }\n";
         ASSERT_EQUALS(exp, tokenize(code));
+
+        const char code2[] = "double d(int);\n" // #15098
+                             "void g(double d);\n"
+                             "void f() {\n"
+                             "    int i = 1;\n"
+                             "    double d = 0;\n"
+                             "    if (d == ::d(i)) {\n"
+                             "        d = ::d(2);\n"
+                             "    }\n"
+                             "}\n";
+        const char exp2[] = "1: double d ( int ) ;\n"
+                            "2: void g ( double d@1 ) ;\n"
+                            "3: void f ( ) {\n"
+                            "4: int i@2 ; i@2 = 1 ;\n"
+                            "5: double d@3 ; d@3 = 0 ;\n"
+                            "6: if ( d@3 == :: d ( i@2 ) ) {\n"
+                            "7: d@3 = :: d ( 2 ) ;\n"
+                            "8: }\n"
+                            "9: }\n";
+        ASSERT_EQUALS(exp2, tokenize(code2));
+
+        const char code3[] = "double d(int);\n"
+                             "void g(int, double d);\n"
+                             "void f() {\n"
+                             "    int i = 1;\n"
+                             "    double d = 0;\n"
+                             "    if (d == ::d(i)) {\n"
+                             "        d = ::d(2);\n"
+                             "    }\n"
+                             "}\n";
+        const char exp3[] = "1: double d ( int ) ;\n"
+                            "2: void g ( int , double d@1 ) ;\n"
+                            "3: void f ( ) {\n"
+                            "4: int i@2 ; i@2 = 1 ;\n"
+                            "5: double d@3 ; d@3 = 0 ;\n"
+                            "6: if ( d@3 == :: d ( i@2 ) ) {\n"
+                            "7: d@3 = :: d ( 2 ) ;\n"
+                            "8: }\n"
+                            "9: }\n";
+        ASSERT_EQUALS(exp3, tokenize(code3));
+
+        const char code4[] = "double d(int);\n"
+                             "void g(int, double d) { (void)d; }\n"
+                             "void f() {\n"
+                             "    int i = 1;\n"
+                             "    double d = 0;\n"
+                             "    if (d == ::d(i)) {\n"
+                             "        d = ::d(2);\n"
+                             "    }\n"
+                             "}\n";
+        const char exp4[] = "1: double d ( int ) ;\n"
+                            "2: void g ( int , double d@1 ) { ( void ) d@1 ; }\n"
+                            "3: void f ( ) {\n"
+                            "4: int i@2 ; i@2 = 1 ;\n"
+                            "5: double d@3 ; d@3 = 0 ;\n"
+                            "6: if ( d@3 == :: d ( i@2 ) ) {\n"
+                            "7: d@3 = :: d ( 2 ) ;\n"
+                            "8: }\n"
+                            "9: }\n";
+        ASSERT_EQUALS(exp4, tokenize(code4));
     }
 
     void varid_function_pointer_args() {
@@ -3490,11 +3709,27 @@ class TestVarID : public TestFixture {
 
         const char code3[] = "void f (void (*g) (int i, IN int n)) {}\n";
         ASSERT_EQUALS("1: void f ( void ( * g@1 ) ( int , IN int ) ) { }\n", tokenize(code3));
+
+        const char code4[] = "void f() {\n" // #14439
+                             "    int* p;\n"
+                             "    void (*a[1])(int* p) = { 0 };\n"
+                             "}\n";
+        ASSERT_EQUALS("1: void f ( ) {\n"
+                      "2: int * p@1 ;\n"
+                      "3: void ( * a@2 [ 1 ] ) ( int * ) = { 0 } ;\n"
+                      "4: }\n",
+                      tokenize(code4));
+
+        const char code5[] = "int *p;\n"
+                             "void (*a[1])(int* p) = { 0 } ;\n";
+        ASSERT_EQUALS("1: int * p@1 ;\n"
+                      "2: void ( * a@2 [ 1 ] ) ( int * ) = { 0 } ;\n"
+                      , tokenize(code5));
     }
 
     void varid_alignas() {
         const char code[] = "extern alignas(16) int x;\n"
-                            "alignas(16) int x;";
+                            "alignas(16) int x;\n";
         const char expected[] = "1: extern alignas ( 16 ) int x@1 ;\n"
                                 "2: alignas ( 16 ) int x@2 ;\n";
         ASSERT_EQUALS(expected, tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
@@ -3517,7 +3752,7 @@ class TestVarID : public TestFixture {
             "Fred::foo1()\n"
             "{\n"
             "    i = 0;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: class Fred\n"
                                 "2: {\n"
@@ -3553,7 +3788,7 @@ class TestVarID : public TestFixture {
             "void Fred::f()\n"
             "{\n"
             "    i = 0;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: class Fred\n"
                                 "2: { void f ( ) ; } ;\n"
@@ -3585,7 +3820,7 @@ class TestVarID : public TestFixture {
             "void A::f()\n"
             "{\n"
             "    i = 0;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: class Fred\n"
                                 "2: { int i@1 ; void f ( ) ; } ;\n"
@@ -3613,7 +3848,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "    if (i) { }\n"
             "    i = 0;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: class Fred\n"
                                 "2: { int i@1 ; void f ( ) ; } ;\n"
@@ -3635,7 +3870,7 @@ class TestVarID : public TestFixture {
             "    A *a;\n"
             "    B() : a(new A)\n"
             "    { }\n"
-            "};");
+            "};\n");
 
         const char expected[] = "1: class A { } ;\n"
                                 "2: class B\n"
@@ -3660,7 +3895,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "  char buf[2];\n"
             "  A::buf[10] = 0;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: class A\n"
                                 "2: {\n"
@@ -3683,7 +3918,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "  char buf[2];\n"
             "  A::buf[10] = 0;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: int main ( )\n"
                                 "2: {\n"
@@ -3723,7 +3958,7 @@ class TestVarID : public TestFixture {
                             "}\n"
                             "void Fred::f(Str &cl) {\n"
                             "    sizeof(cl);\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "1: class A {\n"
                                 "2: public:\n"
@@ -3813,7 +4048,7 @@ class TestVarID : public TestFixture {
         {
             const char code[] ="class A {\n"
                                 "friend class B;\n"
-                                "}";
+                                "}\n";
 
             const char expected[] = "1: class A {\n"
                                     "2: friend class B ;\n"
@@ -3825,7 +4060,7 @@ class TestVarID : public TestFixture {
         {
             const char code[] ="class A {\n"
                                 "private: friend class B;\n"
-                                "}";
+                                "}\n";
 
             const char expected[] = "1: class A {\n"
                                     "2: private: friend class B ;\n"
@@ -3841,7 +4076,7 @@ class TestVarID : public TestFixture {
                             "    int b;\n"
                             "    A();\n"
                             "};\n"
-                            "A::A() : a(0) { b = 1; }";
+                            "A::A() : a(0) { b = 1; }\n";
         const char expected[] = "1: class A {\n"
                                 "2: int a@1 ;\n"
                                 "3: int b@2 ;\n"
@@ -3861,7 +4096,7 @@ class TestVarID : public TestFixture {
                             "};\n"
                             "void A::setPFun(int mode) {\n"
                             "    pFun = &A::funcNorm;\n"
-                            "}";
+                            "}\n";
         const char expected[] = "1: struct A ;\n"
                                 "2:\n"
                                 "3: struct A {\n"
@@ -3881,7 +4116,7 @@ class TestVarID : public TestFixture {
                             "    A(int i): B(i), C::D(i), i(i) {\n"
                             "        int j(i);\n"
                             "    }\n"
-                            "};";
+                            "};\n";
         const char expected[] = "1: class A : public B , public C :: D {\n"
                                 "2: int i@1 ;\n"
                                 "3: A ( int i@2 ) : B ( i@2 ) , C :: D ( i@2 ) , i@1 ( i@2 ) {\n"
@@ -3894,7 +4129,7 @@ class TestVarID : public TestFixture {
                              "    std::vector<int> v;\n"
                              "    int i;\n"
                              "    S(int i) : v({ 0 }), i(i) {}\n"
-                             "};";
+                             "};\n";
         const char expected2[] = "1: struct S {\n"
                                  "2: std :: vector < int > v@1 ;\n"
                                  "3: int i@2 ;\n"
@@ -3909,7 +4144,7 @@ class TestVarID : public TestFixture {
                             "    int b;\n"
                             "    A();\n"
                             "};\n"
-                            "A::A() : a{0} { b = 1; }";
+                            "A::A() : a{0} { b = 1; }\n";
         const char expected[] = "1: class A {\n"
                                 "2: int a@1 ;\n"
                                 "3: int b@2 ;\n"
@@ -3924,7 +4159,7 @@ class TestVarID : public TestFixture {
                             "  int a;\n"
                             "  A();\n"
                             "};\n"
-                            "A::A() : ::B(), a(0) {}";
+                            "A::A() : ::B(), a(0) {}\n";
         const char expected[] = "1: class A : public :: B {\n"
                                 "2: int a@1 ;\n"
                                 "3: A ( ) ;\n"
@@ -3938,7 +4173,7 @@ class TestVarID : public TestFixture {
                             "  int (*p)[2];\n"
                             "  S();\n"
                             "};\n"
-                            "S::S() { p[0] = 0; }";
+                            "S::S() { p[0] = 0; }\n";
         const char expected[] = "1: struct S {\n"
                                 "2: int ( * p@1 ) [ 2 ] ;\n"
                                 "3: S ( ) ;\n"
@@ -3947,6 +4182,14 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
+    void varidclass21() {
+        const char code[] = "struct T { static bool b; };\n" // #14972
+                            "bool T::b(!false);\n";
+        const char expected[] = "1: struct T { static bool b@1 ; } ;\n"
+                                "2: bool T :: b@1 ( ! false ) ;\n";
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
     void varidenum1() {
         const char code[] = "const int eStart = 6;\n"
                             "enum myEnum {\n"
@@ -4085,7 +4328,7 @@ class TestVarID : public TestFixture {
                             "}\n"
                             "int main() {\n"
                             "    return foo(A::buf);\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "1: namespace A {\n"
                                 "2: char buf@1 [ 20 ] ;\n"
@@ -4105,7 +4348,7 @@ class TestVarID : public TestFixture {
                             "}\n"
                             "int main() {\n"
                             "  return foo(A::B::buf);\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "1: namespace A {\n"
                                 "2: namespace B {\n"
@@ -4153,7 +4396,7 @@ class TestVarID : public TestFixture {
                             "    }\n"
                             "}\n"
                             "using namespace A::B;\n"
-                            "C::C() : m(42) {}";
+                            "C::C() : m(42) {}\n";
 
         const char expected[] = "1: namespace A {\n"
                                 "2: namespace B {\n"
@@ -4169,12 +4412,54 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
+    void usingNamespace4() {
+        // the innermost scope name is matched by the qualification of the member, after a template argument list
+        const char code[] = "namespace A {\n"
+                            "    namespace B {\n"
+                            "        template<class T> struct C {\n"
+                            "            struct D { int x; void f(); };\n"
+                            "        };\n"
+                            "    }\n"
+                            "}\n"
+                            "using namespace A;\n"
+                            "template<class T> void B::C<T>::D::f() { x = 0; }\n";
+
+        const char expected[] = "1: namespace A {\n"
+                                "2: namespace B {\n"
+                                "3: template < class T > struct C {\n"
+                                "4: struct D { int x@1 ; void f ( ) ; } ;\n"
+                                "5: } ;\n"
+                                "6: }\n"
+                                "7: }\n"
+                                "8: using namespace A ;\n"
+                                "9: template < class T > void B :: C < T > :: D :: f ( ) { x@1 = 0 ; }\n";
+
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
+    void usingNamespace5() {
+        // the innermost scope name is matched by the "using namespace"
+        const char code[] = "namespace A {\n"
+                            "    namespace B { int x; }\n"
+                            "}\n"
+                            "using namespace A::B;\n"
+                            "void f() { x = 0; }\n";
+
+        const char expected[] = "1: namespace A {\n"
+                                "2: namespace B { int x@1 ; }\n"
+                                "3: }\n"
+                                "4: using namespace A :: B ;\n"
+                                "5: void f ( ) { x@1 = 0 ; }\n";
+
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
     void setVarIdStructMembers1() {
         const char code[] = "void f(Foo foo)\n"
                             "{\n"
                             "    foo.size = 0;\n"
                             "    return ((uint8_t)(foo).size);\n"
-                            "}";
+                            "}\n";
         const char expected[] = "1: void f ( Foo foo@1 )\n"
                                 "2: {\n"
                                 "3: foo@1 . size@2 = 0 ;\n"
@@ -4184,37 +4469,37 @@ class TestVarID : public TestFixture {
     }
 
     void decltype1() {
-        const char code[] = "void foo(int x, decltype(A::b) *p);";
+        const char code[] = "void foo(int x, decltype(A::b) *p);\n";
         const char expected[] = "1: void foo ( int x@1 , decltype ( A :: b ) * p@2 ) ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void decltype2() {
-        const char code[] = "int x; decltype(x) y;";
+        const char code[] = "int x; decltype(x) y;\n";
         const char expected[] = "1: int x@1 ; decltype ( x@1 ) y@2 ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void typeof1() {
-        const char code[] = "int x; typeof(x) y;";
+        const char code[] = "int x; typeof(x) y;\n";
         const char expected[] = "1: int x@1 ; typeof ( x@1 ) y@2 ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void typeof2() {
-        const char code[] = "int x; typeof(x) *y;";
+        const char code[] = "int x; typeof(x) *y;\n";
         const char expected[] = "1: int x@1 ; typeof ( x@1 ) * y@2 ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void typeof3() {
-        const char code[] = "int x; const typeof(x) *const y;";
+        const char code[] = "int x; const typeof(x) *const y;\n";
         const char expected[] = "1: int x@1 ; const typeof ( x@1 ) * const y@2 ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void typeof4() {
-        const char code[] = "int x; __typeof(x) y;";
+        const char code[] = "int x; __typeof(x) y;\n";
         const char expected[] = "1: int x@1 ; __typeof ( x@1 ) y@2 ;\n";
         TokenizeOptions options;
         options.cpp = false;
@@ -4339,7 +4624,7 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected, tokenizeExpr(code));
 
         const char code2[] = "struct S { std::function<void()>* p; };\n"
-                             "S f() { return S{ std::make_unique<std::function<void()>>([]() {}).release()}; }";
+                             "S f() { return S{ std::make_unique<std::function<void()>>([]() {}).release()}; }\n";
         const char expected2[] = "1: struct S { std :: function < void ( ) > * p ; } ;\n"
                                  "2: S f ( ) { return S@UNIQUE {@UNIQUE std ::@UNIQUE make_unique < std :: function < void ( ) > > (@UNIQUE [ ] ( ) { } ) .@UNIQUE release (@UNIQUE ) } ; }\n";
         ASSERT_EQUALS(expected2, tokenizeExpr(code2));
@@ -4447,7 +4732,7 @@ class TestVarID : public TestFixture {
                           "2: struct T { struct S s ; } ;\n"
                           "3: struct U { struct T t ; } ;\n"
                           "4: void f ( ) {\n"
-                          "5: struct U u@4 ; u@4 = { .@UNIQUE t@5 = { . s = { . s = 1 } } } ;\n"
+                          "5: struct U u@4 ; u@4 = { .@UNIQUE t@5 = { .@UNIQUE s@6 = { .@UNIQUE s@7 = 1 } } } ;\n"
                           "6: }\n";
         ASSERT_EQUALS(exp, tokenizeExpr(code));
     }
@@ -4465,8 +4750,26 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(exp, tokenize(code, s)); // don't crash
     }
 
+    void exprid15()
+    {
+        // #14717
+        const char code[] = "#define MAX(a, b) (((a) > (b)) ? (a) : (b))\n"
+                            "\n"
+                            "void f(char *d) {\n"
+                            "    const char *p = &d[0];\n"
+                            "    int a = 1 / MAX(1, p[0]);\n"
+                            "    a = 1 / MAX(1, p[1]);\n"
+                            "}\n";
+        const char exp[] = "3: void f ( char * d ) {\n"
+                           "4: const char * p@2 ; p@2 =@UNIQUE &@UNIQUE d@1 [@UNIQUE 0 ] ;\n"
+                           "5: int a@3 ; a@3 =@UNIQUE 1 /@UNIQUE $( $( 1 $>@UNIQUE $( p@2 [@9 0 ] $) $) $?@UNIQUE $( 1 $) $:@UNIQUE $( p@2 [@9 0 ] $) $) ;\n"
+                           "6: a@3 =@UNIQUE 1 /@UNIQUE $( $( 1 $>@UNIQUE $( p@2 [@15 1 ] $) $) $?@UNIQUE $( 1 $) $:@UNIQUE $( p@2 [@15 1 ] $) $) ;\n"
+                           "7: }\n";
+        ASSERT_EQUALS(exp, tokenizeExpr(code));
+    }
+
     void structuredBindings() {
-        const char code[] = "int foo() { auto [x,y] = xy(); return x+y; }";
+        const char code[] = "int foo() { auto [x,y] = xy(); return x+y; }\n";
         ASSERT_EQUALS("1: int foo ( ) { auto [ x@1 , y@2 ] = xy ( ) ; return x@1 + y@2 ; }\n",
                       tokenize(code));
     }
diff --git a/test/tools/donate_cpu_lib_test.py b/test/tools/donate_cpu_lib_test.py
index e00a3d296a0..9c569276a19 100644
--- a/test/tools/donate_cpu_lib_test.py
+++ b/test/tools/donate_cpu_lib_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
 # Cppcheck - A tool for static C/C++ code analysis
-# Copyright (C) 2007-2022 Cppcheck team.
+# Copyright (C) 2007-2026 Cppcheck team.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -58,6 +58,7 @@ def test_library_includes(tmpdir):
     _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'opengl'], '#include\t  <GL/glut.h>')
     _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'nspr'], '#include\t"prtypes.h"')
     _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'lua'], '#include  \t<lua.h>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'microsoft_gsl'], '#include <gsl/gsl>')
 
 def test_match_multiple_time(tmpdir):
     libinc = LibraryIncludes()
diff --git a/test/tools/donate_cpu_server_test.py b/test/tools/donate_cpu_server_test.py
index a9d9074a339..fdb5b415a76 100644
--- a/test/tools/donate_cpu_server_test.py
+++ b/test/tools/donate_cpu_server_test.py
@@ -15,3 +15,32 @@ def test_parse_req():
     _test_parse_req("GET /head-uninitvar?pkgs=1 HTTP/1.1", '/head-uninitvar', {'pkgs': '1'})
     _test_parse_req("GET /crash.html?pkgs=1 HTTP/1.1", '/crash.html', {'pkgs': '1'})
     _test_parse_req("GET /head-uninitvar?pkgs=1&pkgs2=2 HTTP/1.1", '/head-uninitvar', {'pkgs': '1', 'pkgs2': '2'})
+
+class _Connection:
+    def __init__(self):
+        self.data = b''
+
+    def send(self, data):
+        self.data += data
+        return len(data)
+
+    def close(self):
+        pass
+
+def _http_get(result_path, url):
+    conn = _Connection()
+    donate_cpu_server.HttpClientThread(conn, 'GET {} HTTP/1.1'.format(url), str(result_path), []).run()
+    return conn.data.decode('utf-8')
+
+def test_file_outside_result_path(tmp_path):
+    result_path = tmp_path / 'donated-results'
+    result_path.mkdir()
+    (result_path / 'pkg').write_text('result data')
+    (tmp_path / 'secret.txt').write_text('secret data')
+
+    resp = _http_get(result_path, '/pkg')
+    assert resp.startswith('HTTP/1.1 200 OK') and resp.endswith('result data')
+
+    resp = _http_get(result_path, '/../secret.txt')
+    assert resp.startswith('HTTP/1.1 404 Not Found')
+    assert 'secret data' not in resp
diff --git a/test/tools/htmlreport/test_htmlreport.py b/test/tools/htmlreport/test_htmlreport.py
index 6f8713f4f55..d5ac11aa16b 100755
--- a/test/tools/htmlreport/test_htmlreport.py
+++ b/test/tools/htmlreport/test_htmlreport.py
@@ -107,6 +107,58 @@ def testAddTimestamp(self):
 
             output_directory.cleanup()
 
+    def testSeverityFilterBar(self):
+        with runCheck(
+            xml_filename=os.path.join(TEST_TOOLS_DIR, 'example.xml'),
+        ) as (report, output_directory):
+            self.assertIn('onclick="toggleSeverity(this)"', report)
+            output_directory.cleanup()
+
+    def testEscape(self):
+        with tempfile.TemporaryDirectory() as source_directory:
+            source_filename = os.path.join(source_directory, '<b>escape.c')
+            with open(source_filename, 'w') as source_file:
+                source_file.write('#error <b>escape</b>\n')
+
+            with runCheck(
+                source_filename,
+                xml_version='2'
+            ) as (report, output_directory):
+                self.assertIn('&lt;b&gt;escape.c', report)
+                self.assertNotIn('<b>', report)
+
+                with open(os.path.join(output_directory.name, '0.html')) as input_file:
+                    detail_contents = input_file.read()
+                    self.assertIn('&lt;b&gt;escape.c', detail_contents)
+                    self.assertIn('&lt;--- #error &lt;b&gt;escape&lt;/b&gt;', detail_contents)
+                    self.assertNotIn('<b>', detail_contents)
+
+                with open(os.path.join(output_directory.name, 'stats.html')) as input_file:
+                    stats_contents = input_file.read()
+                    self.assertIn('&lt;b&gt;escape.c', stats_contents)
+                    self.assertNotIn('<b>', stats_contents)
+
+                output_directory.cleanup()
+
+    def testPremiumLicenseMessage(self):
+        with tempfile.TemporaryDirectory() as tmpdir:
+            xml_filename = os.path.join(tmpdir, 'premium.xml')
+            with open(xml_filename, 'w') as f:
+                f.write('<?xml version="1.0" encoding="UTF-8"?>\n'
+                        '<results version="2"><cppcheck version="2.18"/><errors>\n'
+                        '<error id="premium-licenseExpiresSoon" severity="information" msg="license will expire" verbose="license will expire">\n'
+                        '<location file="Cppcheck Premium" line="0" column="0"/>\n'
+                        '</error>\n'
+                        '</errors></results>\n')
+            output_directory = os.path.join(tmpdir, 'out')
+            p = subprocess.run([*HTML_REPORT_BIN, '--file=' + xml_filename, '--report-dir=' + output_directory],
+                               capture_output=True, text=True, check=True)
+            self.assertNotIn('not found', p.stderr)
+            with open(os.path.join(output_directory, 'index.html')) as index_file:
+                report = index_file.read()
+            self.assertIn('license will expire', report)
+            self.assertNotIn('0.html#line-0', report)
+
 
 @contextlib.contextmanager
 def runCheck(source_filename=None, xml_version='1', xml_filename=None, checkers_filename=None):
diff --git a/test/tools/test_matchcompiler.py b/test/tools/test_matchcompiler.py
index 104601df7e3..543f7fae0a3 100755
--- a/test/tools/test_matchcompiler.py
+++ b/test/tools/test_matchcompiler.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 #
 # Cppcheck - A tool for static C/C++ code analysis
-# Copyright (C) 2007-2021 Cppcheck team.
+# Copyright (C) 2007-2025 Cppcheck team.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tools/bisect/bisect.sh b/tools/bisect/bisect.sh
index cf0d4cd5b96..067cd9606aa 100644
--- a/tools/bisect/bisect.sh
+++ b/tools/bisect/bisect.sh
@@ -26,7 +26,7 @@ mkdir -p "$bisect_dir" || exit 1
 cd "$bisect_dir" || exit 1
 
 if [ ! -d 'cppcheck' ]; then
-  git clone https://github.com/danmar/cppcheck.git || exit 1
+  git clone https://github.com/cppcheck-opensource/cppcheck.git || exit 1
 fi
 
 bisect_repo_dir="$bisect_dir/cppcheck"
diff --git a/tools/check-errorids.sh b/tools/check-errorids.sh
index ffef62fea42..8bd343411cc 100755
--- a/tools/check-errorids.sh
+++ b/tools/check-errorids.sh
@@ -23,7 +23,7 @@ echo ''
 echo 'no test coverage:'
 $SCRIPT_DIR/../cppcheck --errorlist | grep -h -o -P 'id=\"[a-zA-Z0-9_]*\"' | sed 's/\id=//' | tr -d '\"' | sort -u | \
 while read -r id; do
-  grep -h -o -P "\[$id\]\\\\n\"" $SCRIPT_DIR/../test/*.cpp > /dev/null
+  grep -h -o -P "\[$id\][\\\\n]*\"" $SCRIPT_DIR/../test/*.cpp > /dev/null
   # shellcheck disable=SC2181
   if [ $? -ne 0 ]; then
     echo $id
diff --git a/tools/ci.py b/tools/ci.py
deleted file mode 100644
index c50ed35822d..00000000000
--- a/tools/ci.py
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/env python3
-
-# continuous integration
-# build daily reports (doxygen,coverage,etc)
-
-import datetime
-import time
-import subprocess
-import pexpect
-import glob
-import sys
-
-
-# Upload file to sourceforge web server using scp
-def upload(file_to_upload, destination):
-    try:
-        password = sys.argv[1]
-        child = pexpect.spawn(
-            'scp ' + file_to_upload + ' danielmarjamaki,cppcheck@web.sourceforge.net:' + destination)
-        # child.expect(
-        #    'danielmarjamaki,cppcheck@web.sourceforge.net\'s password:')
-        child.expect('Password:')
-        child.sendline(password)
-        child.interact()
-    except (IOError, OSError, pexpect.TIMEOUT):
-        pass
-
-
-# git push
-def gitpush():
-    try:
-        password = sys.argv[1]
-        child = pexpect.spawn('git push')
-        child.expect("Enter passphrase for key '/home/daniel/.ssh/id_rsa':")
-        child.sendline(password)
-        child.interact()
-    except (IOError, OSError, pexpect.TIMEOUT):
-        pass
-
-
-def iconv(filename):
-    with subprocess.Popen(['file', '-i', filename],
-                          stdout=subprocess.PIPE, stderr=subprocess.STDOUT) as p:
-        # TODO: handle p.returncode?
-        stdout, _ = p.communicate()
-    if 'charset=iso-8859-1' in stdout:
-        # TODO: handle exitcode?
-        subprocess.call(
-            ["iconv", filename, "--from=ISO-8859-1", "--to=UTF-8", "-o", filename])
-
-
-# Generate daily webreport
-def generate_webreport():
-    for filename in glob.glob('*/*.cpp'):
-        iconv(filename)
-    # TODO: handle exitcode?
-    subprocess.call(
-        ["git", "commit", "-a", "-m", '"automatic conversion from iso-8859-1 formatting to utf-8"'])
-    gitpush()
-
-    # TODO: handle exitcode?
-    subprocess.call(["rm", "-rf", "devinfo"])
-    # TODO: handle exitcode?
-    subprocess.call(['nice', "./webreport.sh"])
-    upload('-r devinfo', 'htdocs/')
-    # TODO: handle exitcode?
-    subprocess.call(["make", "clean"])
-    # TODO: handle exitcode?
-    subprocess.call(["rm", "-rf", "devinfo"])
-
-
-# Perform a git pull.
-def gitpull():
-    try:
-        password = sys.argv[1]
-        child = pexpect.spawn('git pull')
-        child.expect("Enter passphrase for key '/home/daniel/.ssh/id_rsa':")
-        child.sendline(password)
-        child.expect('Already up-to-date.')
-        child.interact()
-
-    except (IOError, OSError, pexpect.TIMEOUT):
-        pass
-    except pexpect.EOF:
-        return True
-
-    return False
-
-
-t0 = None
-while True:
-    if datetime.date.today() != t0:
-        print("generate daily reports")
-        t0 = datetime.date.today()
-        gitpull()
-        generate_webreport()
-    time.sleep(60)
diff --git a/tools/dmake/dmake.cpp b/tools/dmake/dmake.cpp
index 100e32b6b5b..f9e638385e7 100644
--- a/tools/dmake/dmake.cpp
+++ b/tools/dmake/dmake.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -250,7 +250,7 @@ static int write_vcxproj(const std::string &proj_name, const std::function<void(
     return EXIT_SUCCESS;
 }
 
-enum ClType : std::uint8_t { Compile, Include, Precompile };
+enum ClType : std::uint8_t { Compile, Include, Precompile, NoPch };
 
 static std::string make_vcxproj_cl_entry(const std::string& file, ClType type)
 {
@@ -271,6 +271,18 @@ static std::string make_vcxproj_cl_entry(const std::string& file, ClType type)
         outstr += "    </ClCompile>\r\n";
         return outstr;
     }
+    if (type == NoPch) {
+        outstr += R"(    <ClCompile Include=")";
+        outstr += file;
+        outstr += R"(">)";
+        outstr += "\r\n";
+        outstr += R"(      <PrecompiledHeader>NotUsing</PrecompiledHeader>)";
+        outstr += "\r\n";
+        outstr += R"(      <ForcedIncludeFiles></ForcedIncludeFiles>)";
+        outstr += "\r\n";
+        outstr += "    </ClCompile>\r\n";
+        return outstr;
+    }
     outstr += "    <";
     outstr += (type == Compile) ? "ClCompile" : "ClInclude";
     outstr += R"( Include=")";
@@ -285,6 +297,7 @@ static std::vector<std::string> prioritizelib(const std::vector<std::string>& li
     std::map<std::string, std::size_t> priorities;
     std::size_t prio = libfiles.size();
     for (const auto &l : libfiles) {
+        // cppcheck-suppress useStlAlgorithm - std::transform is cumbersome
         priorities.emplace(l, prio--);
     }
     priorities["lib/valueflow.cpp"] = 1000;
@@ -483,12 +496,15 @@ int main(int argc, char **argv)
     }
     libfiles_h.emplace("analyzer.h");
     libfiles_h.emplace("calculate.h");
+    libfiles_h.emplace("check.h");
     libfiles_h.emplace("config.h");
     libfiles_h.emplace("filesettings.h");
     libfiles_h.emplace("findtoken.h");
     libfiles_h.emplace("json.h");
     libfiles_h.emplace("matchcompiler.h");
+    libfiles_h.emplace("refthunk.h");
     libfiles_h.emplace("precompiled.h");
+    libfiles_h.emplace("rule.h");
     libfiles_h.emplace("smallvector.h");
     libfiles_h.emplace("sourcelocation.h");
     libfiles_h.emplace("tokenrange.h");
@@ -542,12 +558,12 @@ int main(int argc, char **argv)
     });
 
     write_vcxproj("lib/cppcheck.vcxproj", [&](std::string &outstr){
-        outstr += make_vcxproj_cl_entry(R"(..\externals\simplecpp\simplecpp.cpp)", Compile);
-        outstr += make_vcxproj_cl_entry(R"(..\externals\tinyxml2\tinyxml2.cpp)", Compile);
+        outstr += make_vcxproj_cl_entry(R"(..\externals\simplecpp\simplecpp.cpp)", NoPch);
+        outstr += make_vcxproj_cl_entry(R"(..\externals\tinyxml2\tinyxml2.cpp)", NoPch);
 
         for (const std::string &libfile: libfiles_prio) {
             const std::string l = libfile.substr(4);
-            outstr += make_vcxproj_cl_entry(l, l == "check.cpp" ? Precompile : Compile);
+            outstr += make_vcxproj_cl_entry(l, l == "checkimpl.cpp" ? Precompile : Compile);
         }
     }, [&](std::string &outstr){
         outstr += make_vcxproj_cl_entry(R"(..\externals\simplecpp\simplecpp.h)", Include);
@@ -759,6 +775,15 @@ int main(int argc, char **argv)
          << "    $(error invalid HAVE_RULES value '$(HAVE_RULES)')\n"
          << "endif\n\n";
 
+    fout << "# older make versions do not support # in $(shell) and newer ones handle the escape sequence literally\n"
+         << "REQUIRE_ESCAPE=$(shell echo \"\\#define DEF\" | $(CXX) -c -xc - 2> /dev/null && echo \"1\" || echo \"0\")\n"
+         << "ifeq ($(REQUIRE_ESCAPE),1)\n"
+         << "    HAVE_EXECINFO_H=$(shell echo \"\\#include <execinfo.h>\" | $(CXX) -c -xc - 2> /dev/null && echo \"1\" || echo \"0\")\n"
+         << "else\n"
+         << "    HAVE_EXECINFO_H=$(shell echo \"#include <execinfo.h>\" | $(CXX) -c -xc - 2> /dev/null && echo \"1\" || echo \"0\")\n"
+         << "endif\n"
+         << "override CPPFLAGS += -DHAVE_EXECINFO_H=$(HAVE_EXECINFO_H)\n\n";
+
     fout << "override CXXFLAGS += $(CXXOPTS)\n";
     fout << "override CPPFLAGS += $(CPPOPTS)\n";
     fout << "override LDFLAGS += $(LDOPTS)\n\n";
diff --git a/tools/donate-cpu-server.py b/tools/donate-cpu-server.py
index d8afaba2be3..a45b319dcf5 100755
--- a/tools/donate-cpu-server.py
+++ b/tools/donate-cpu-server.py
@@ -26,10 +26,10 @@
 # Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/
 # Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic
 # changes)
-SERVER_VERSION = "1.3.67"
+SERVER_VERSION = "1.3.70"
 
 # TODO: fetch from GitHub tags
-OLD_VERSION = '2.19.0'
+OLD_VERSION = '2.22.0'
 
 HEAD_MARKER = 'head results:'
 INFO_MARKER = 'info messages:'
@@ -1275,8 +1275,9 @@ def run(self):
                 text = clientsReport(self.resultPath)
                 httpGetResponse(self.connection, text, 'text/html')
             else:
-                filename = self.resultPath + url
-                if not os.path.isfile(filename):
+                result_path = os.path.normpath(self.resultPath)
+                filename = os.path.normpath(result_path + url)
+                if os.path.commonpath([result_path, filename]) != result_path or not os.path.isfile(filename):
                     print_ts('HTTP/1.1 404 Not Found')
                     self.connection.send(b'HTTP/1.1 404 Not Found\r\n\r\n')
                 else:
diff --git a/tools/donate_cpu_lib.py b/tools/donate_cpu_lib.py
index 2f2cea803ae..ed345cb10c9 100644
--- a/tools/donate_cpu_lib.py
+++ b/tools/donate_cpu_lib.py
@@ -16,12 +16,12 @@
 # Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/
 # Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic
 # changes)
-CLIENT_VERSION = "1.3.69"
+CLIENT_VERSION = "1.4.0"
 
 # Timeout for analysis with Cppcheck in seconds
 CPPCHECK_TIMEOUT = 30 * 60
 
-CPPCHECK_REPO_URL = "https://github.com/danmar/cppcheck.git"
+CPPCHECK_REPO_URL = "https://github.com/cppcheck-opensource/cppcheck.git"
 
 # Return code that is used to mark a timed out analysis
 RETURN_CODE_TIMEOUT = -999
@@ -133,7 +133,7 @@ def checkout_cppcheck_version(repo_path, version, cppcheck_path):
         hash_old = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'], cwd=cppcheck_path).strip()
 
         print('Pulling {}'.format(version))
-        # --rebase is a workaround for a dropped commit - see https://github.com/danmar/cppcheck/pull/6904
+        # --rebase is a workaround for a dropped commit - see https://github.com/cppcheck-opensource/cppcheck/pull/6904
         # TODO: drop the commit in question
         # TOD: remove --rebase
         subprocess.check_call(['git', 'pull', '--rebase'], cwd=cppcheck_path)
@@ -684,7 +684,8 @@ def upload_nodata(package):
 
 class LibraryIncludes:
     def __init__(self):
-        include_mappings = {'boost': ['<boost/'],
+        include_mappings = {'avr': ['<avr/'],
+                            'boost': ['<boost/'],
                             'bsd': ['<sys/queue.h>', '<sys/tree.h>', '<sys/uio.h>','<bsd/', '<fts.h>', '<db.h>', '<err.h>', '<vis.h>'],
                             'cairo': ['<cairo.h>'],
                             'cppunit': ['<cppunit/'],
@@ -701,6 +702,7 @@ def __init__(self):
                             'mfc': ['<afx.h>', '<afxwin.h>', '<afxext.h>'],
                             'microsoft_atl': ['<atlbase.h>'],
                             'microsoft_sal': ['<sal.h>'],
+                            'microsoft_unittest': ['<CppUnitTest.h>'],
                             'motif': ['<X11/', '<Xm/'],
                             'nspr': ['<prtypes.h>', '"prtypes.h"'],
                             'ntl': ['<ntl/', '"ntl/'],
@@ -713,12 +715,15 @@ def __init__(self):
                             'qt': ['<QAbstractSeries>', '<QAction>', '<QActionGroup>', '<QApplication>', '<QByteArray>', '<QChartView>', '<QClipboard>', '<QCloseEvent>', '<QColor>', '<QColorDialog>', '<QComboBox>', '<QCoreApplication>', '<QCryptographicHash>', '<QDate>', '<QDateTime>', '<QDateTimeAxis>', '<QDebug>', '<QDesktopServices>', '<QDialog>', '<QDialogButtonBox>', '<QDir>', '<QElapsedTimer>', '<QFile>', '<QFileDialog>', '<QFileInfo>', '<QFileInfoList>', '<QFlags>', '<QFont>', '<QFormLayout>', '<QHelpContentWidget>', '<QHelpEngine>', '<QHelpIndexWidget>', '<QImageReader>', '<QInputDialog>', '<QKeyEvent>', '<QLabel>', '<QLineSeries>', '<QList>', '<qlist.h>', '<QLocale>', '<QMainWindow>', '<QMap>', '<QMenu>', '<QMessageBox>', '<QMetaType>', '<QMimeData>', '<QMimeDatabase>', '<QMimeType>', '<QMutex>', '<QObject>', '<qobjectdefs.h>', '<QPainter>', '<QPlainTextEdit>', '<QPrintDialog>', '<QPrinter>', '<QPrintPreviewDialog>', '<QProcess>', '<QPushButton>', '<QQueue>', '<QReadWriteLock>', '<QRegularExpression>', '<QRegularExpressionValidator>', '<QSet>', '<QSettings>', '<QShortcut>', '<QSignalMapper>', '<QStandardItemModel>', '<QString>', '<qstring.h>', '<QStringList>', '<QSyntaxHighlighter>', '<QTest>', '<QTextBrowser>', '<QTextDocument>', '<QTextEdit>', '<QTextStream>', '<QThread>', '<QTimer>', '<QTranslator>', '<QTreeView>', '<QtWidgets>', '<QUrl>', '<QValueAxis>', '<QVariant>', '<QWaitCondition>', '<QWidget>', '<QXmlStreamReader>', '<QXmlStreamWriter>', '<QtGui'],
                             'ruby': ['<ruby.h>', '<ruby/', '"ruby.h"'],
                             'sdl': ['<SDL.h>', '<SDL/SDL.h>', '<SDL2/SDL.h>'],
-                            #'selinux': ['<selinux/'],
+                            'selinux': ['<selinux/'],
+                            'sfml': ['<SFML/'],
                             'sqlite3': ['<sqlite3.h>', '"sqlite3.h"'],
                             'tinyxml2': ['<tinyxml2', '"tinyxml2'],
                             'wxsqlite3': ['<wx/wxsqlite3', '"wx/wxsqlite3'],
                             'wxwidgets': ['<wx/', '"wx/'],
+                            'zephyr': ['<zephyr/'],
                             'zlib': ['<zlib.h>'],
+                            'microsoft_gsl': ['<gsl/gsl>'],
                             }
 
         self.__library_includes_re = {}
diff --git a/tools/generate-baseline-suppressions.py b/tools/generate-baseline-suppressions.py
new file mode 100755
index 00000000000..762a2ef3642
--- /dev/null
+++ b/tools/generate-baseline-suppressions.py
@@ -0,0 +1,54 @@
+#!/usr/bin/env python3
+"""Convert a cppcheck XML results file into a cppcheck XML suppressions file.
+
+Usage: generate-baseline-suppressions.py <results.xml> <suppressions.xml>
+
+Each <error> in the results file that has a non-zero "hash" attribute is
+converted into a <suppress> entry using the error's id, the file of its
+first <location> (the primary location used by cppcheck's suppression
+matching) and the hash.
+"""
+import sys
+import xml.etree.ElementTree as ET
+
+
+def convert(results_path, suppressions_path):
+    tree = ET.parse(results_path)
+    root = tree.getroot()
+    errors_el = root.find('errors')
+
+    seen = set()
+    suppressions = []
+    for error in errors_el.findall('error'):
+        error_id = error.get('id')
+        error_hash = error.get('hash')
+        location = error.find('location')
+        if error_id is None or location is None:
+            continue
+        if not error_hash or error_hash == '0':
+            continue
+        file_name = location.get('file')
+        key = (error_id, file_name, error_hash)
+        if key in seen:
+            continue
+        seen.add(key)
+        suppressions.append(key)
+
+    out_root = ET.Element('suppressions')
+    for error_id, file_name, error_hash in suppressions:
+        suppress = ET.SubElement(out_root, 'suppress')
+        ET.SubElement(suppress, 'id').text = error_id
+        ET.SubElement(suppress, 'fileName').text = file_name
+        ET.SubElement(suppress, 'hash').text = error_hash
+
+    ET.indent(out_root, space='  ')
+    out_tree = ET.ElementTree(out_root)
+    out_tree.write(suppressions_path, encoding='UTF-8', xml_declaration=True)
+    print(f'Wrote {len(suppressions)} suppression(s) to {suppressions_path}')
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 3:
+        print(f'Usage: {sys.argv[0]} <results.xml> <suppressions.xml>', file=sys.stderr)
+        sys.exit(1)
+    convert(sys.argv[1], sys.argv[2])
diff --git a/tools/get_checkers.py b/tools/get_checkers.py
index e2c9719bbfd..275c4623140 100644
--- a/tools/get_checkers.py
+++ b/tools/get_checkers.py
@@ -2,8 +2,17 @@
 import glob
 import os
 import re
+import sys
 import requests
 
+try:
+    from tqdm import tqdm
+except ImportError:
+    # Fallback: passthrough iterator if tqdm is not installed
+    def tqdm(iterable, total=None, desc=None, **kwargs):
+        if desc:
+            print(desc, file=sys.stderr)
+        return iterable
 
 def print_checkers(glob_pattern:str):
     checkers = {}
@@ -49,11 +58,6 @@ def print_checkers(glob_pattern:str):
 print_checkers(os.path.expanduser('~/cppchecksolutions/cppcheck/lib/*.cpp'))
 print("    };\n")
 
-print('    const std::map<std::string, std::string> premiumCheckers{')
-print_checkers(os.path.expanduser('~/cppchecksolutions/addon/src/*.cpp'))
-print('    };')
-
-
 print("""
     const char Req[] = "Required";
     const char Adv[] = "Advisory";
@@ -271,6 +275,8 @@ def print_checkers(glob_pattern:str):
         {7,5,2,Req},
         {7,5,3,Req},
         {7,5,4,Adv},
+        {8,0,1,Req},
+        {8,3,1,Req},
         {8,4,1,Req},
         {8,4,2,Req},
         {8,4,3,Req},
@@ -308,9 +314,9 @@ def print_checkers(glob_pattern:str):
         {14,7,2,Req},
         {14,7,3,Req},
         {14,8,1,Req},
-        {14,8,2,Req},
-        {15,0,1,Req},
-        {15,0,2,Req},
+        {14,8,2,Adv},
+        {15,0,1,Doc},
+        {15,0,2,Adv},
         {15,0,3,Req},
         {15,1,1,Req},
         {15,1,2,Req},
@@ -453,8 +459,8 @@ def print_checkers(glob_pattern:str):
         {9,3,1,Req},
         {9,4,1,Req},
         {9,4,2,Req},
-        {9,5,2,Adv},
-        {9,5,3,Req},
+        {9,5,1,Adv},
+        {9,5,2,Req},
         {9,6,1,Adv},
         {9,6,2,Req},
         {9,6,3,Req},
@@ -491,6 +497,7 @@ def print_checkers(glob_pattern:str):
         {15,1,3,Req},
         {15,1,4,Adv},
         {15,1,5,Req},
+        {16,5,1,Req},
         {16,5,2,Req},
         {16,6,1,Adv},
         {17,8,1,Req},
@@ -914,44 +921,65 @@ def print_checkers(glob_pattern:str):
 };
 """)
 
+# SEI CERT is available as markdown files at
+# https://github.com/cmu-sei/secure-coding-standards
+CERT_REPO = 'cmu-sei/secure-coding-standards'
+CERT_BRANCH = 'main'
+
+# Cache git tree
+_cert_tree = None
+
+def listCertFiles(content_subdir:str):
+    """Lists the rules and recommendation files for one part of the standard."""
+    global _cert_tree
+    if _cert_tree is None:
+        url = 'https://api.github.com/repos/%s/git/trees/%s?recursive=1' % (CERT_REPO, CERT_BRANCH)
+        _cert_tree = requests.get(url, timeout=50).json()['tree']
+    prefix = 'content/' + content_subdir
+    files = []
+    for entry in _cert_tree:
+        path = entry['path']
+        if entry['type'] != 'blob' or not path.startswith(prefix) or not path.endswith('.md'):
+            continue
+        if 'index' in path.rsplit('/', 1)[-1].lower():
+            continue
+        files.append(path)
+    return sorted(files)
 
-def getCertCInfo(main_url:str):
+def printCertCInfo(content_subdir:str):
     """Fetches CERT C rules information."""
-    # Fetching the CERT C rules page
-    r = requests.get(main_url, timeout=30)
-    mainpage = r.text
-    for line in mainpage.split('\n'):
-        res = re.search(r'<a href="(/confluence/[^"]+)">(Rule|Rec.) \d\d[.] [A-Za-z ]+ [(][A-Z][A-Z][A-Z][)]', line)
+    paths = listCertFiles(content_subdir)
+    rules = {}
+    for path in tqdm(paths, total=len(paths), desc=f'Fetching {content_subdir}', file=sys.stderr):
+        raw = 'https://raw.githubusercontent.com/%s/%s/%s' % (CERT_REPO, CERT_BRANCH, path)
+        text = requests.get(raw, timeout=30).text
+        res = re.search(r'^#\s+([A-Z]{3}\d{2}-C(?:PP)?)\b', text, re.MULTILINE)
         if res is None:
             continue
-        r = requests.get('https://wiki.sei.cmu.edu' + res.group(1), timeout=30)
-        text = r.text.replace('\n', '').replace('<tr>', '\n').replace('</tr>', '\n')
-        rules = []
-        for line in text.split('\n'):
-            if not line.startswith('<td'):
-                continue
-            #print(line)
-            res = re.match(r'[^>]+>([A-Z][A-Z][A-Z][0-9][0-9]-CP*)<.*>(L[1-3])<.+', line)
-            if res:
-                if res.group(1) == 'EXP40-C' and 'EXP39-C' not in rules:
-                    print('    {"EXP39-C", "L2"},')
-                print('    {"%s", "%s"},' % (res.group(1), res.group(2)))
-                rules.append(res.group(1))
-        if 'EXP45-C' in rules:
-            if 'EXP46-C' not in rules:
-                print('    {"EXP46-C", "L2"},')
-            if 'EXP47-C' not in rules:
-                print('    {"EXP47-C", "L2"},')
+        head = re.search(r'^#{0,4}\s*Risk Assessments?\s*$', text, re.MULTILINE)
+        if head is None:
+            continue
+        section = text[head.end():]
+        nexthead = re.search(r'^#{1,4}\s+\S', section, re.MULTILINE)
+        if nexthead:
+            section = section[:nexthead.start()]
+        level = re.search(r'\bL[1-3]\b', section)
+        if level is None:
+            continue
+        rules[res.group(1)] = level.group(0)
+    for rule_id, level in dict(sorted(rules.items())).items():
+        print('    {"%s", "%s"},' % (rule_id, level))
+
 
 
 print('std::vector<checkers::Info> checkers::certCInfo{')
-getCertCInfo('https://wiki.sei.cmu.edu/confluence/display/c/2+Rules')
+printCertCInfo('4.sei-cert-c-coding-standard/03.rules/')
 print('    // Recommendations')
-getCertCInfo('https://wiki.sei.cmu.edu/confluence/display/c/3+Recommendations')
+printCertCInfo('4.sei-cert-c-coding-standard/08.recommendations/')
 print('};')
 print('')
 print('std::vector<checkers::Info> checkers::certCppInfo{')
-getCertCInfo('https://wiki.sei.cmu.edu/confluence/pages/viewpage.action?pageId=88046682')
+printCertCInfo('5.sei-cert-cpp-coding-standard/3.rules/')
 print('};')
 print('')
 
diff --git a/tools/matchcompiler.py b/tools/matchcompiler.py
index bb03b6822e2..143400f7ea8 100755
--- a/tools/matchcompiler.py
+++ b/tools/matchcompiler.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 #
 # Cppcheck - A tool for static C/C++ code analysis
-# Copyright (C) 2007-2021 Cppcheck team.
+# Copyright (C) 2007-2025 Cppcheck team.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tools/readme.md b/tools/readme.md
index 4f914b3cce6..249a0c0bfc6 100644
--- a/tools/readme.md
+++ b/tools/readme.md
@@ -83,3 +83,21 @@ message.
 
 Script to compare the error IDs in the expected `testrunner` output (without executing it) with the `--errorlist` output.
 It will report missing test coverage for an ID and missing IDs in the `--errorlist` output.
+
+### * tools/generate-baseline-suppressions.py
+
+Script that converts a Cppcheck XML results file (`--xml`) into a Cppcheck XML suppressions file, so that
+existing warnings can be suppressed as a baseline and only new warnings are reported afterwards. For each
+`<error>` in the results file that has a non-zero `hash` attribute, it writes a `<suppress>` entry with the
+error's id, the file of its first `<location>` and the hash. Usage:
+```shell
+$ cppcheck --xml --xml-version=2 ./src 2> results.xml
+$ python tools/generate-baseline-suppressions.py results.xml suppressions.xml
+```
+The generated `suppressions.xml` can then be passed to Cppcheck with `--suppress-xml=suppressions.xml`.
+
+### * tools/tweak-compile-commands.py
+
+Script to tweak `-isystem`/`--sysroot`/`-I` options in a `compile_commands.json` file, for example to make
+implicit `--sysroot`-relative `-isystem` paths explicit, convert `-isystem` to `-I`, or remove unwanted include
+paths. See `tools/tweak-compile-commands.md` for details.
diff --git a/tools/release-check-premium-ids.py b/tools/release-check-premium-ids.py
new file mode 100755
index 00000000000..2b28da9928b
--- /dev/null
+++ b/tools/release-check-premium-ids.py
@@ -0,0 +1,114 @@
+#!/usr/bin/env python3
+#
+# Automates the release checklist item in `createrelease`:
+#
+#   # Check every isPremiumEnabled call: TODO write helper script
+#   # - every id should be in --errorlist
+#   # - premiumaddon: check coverage.py
+#
+# Two checks are performed:
+#
+#  1. Every id passed to isPremiumEnabled("...") in lib/ must be a real,
+#     known Cppcheck error id (i.e. it must show up in `cppcheck
+#     --errorlist`). Otherwise the premium check can never actually be
+#     turned on/off since its id does not exist.
+#
+#  2. Every Cppcheck id referenced by the premium addon's compliance
+#     mapping tables (MISRA/CERT/AUTOSAR/CWE -> Cppcheck id, generated by
+#     `coverage.py --id`) must also show up in `cppcheck --errorlist`.
+#     Otherwise the mapping refers to an id that has been renamed or
+#     removed.
+#
+# A warning is printed for every id that fails a check; exit status is 1
+# if any warning was printed, 0 otherwise.
+#
+# Usage:
+#   tools/release-check-premium-ids.py [path-to-addon/coverage]
+#
+# The addon/coverage directory defaults to ../addon/coverage (relative to
+# this repo, i.e. a checkout of the premium addon repo next to this one).
+# If it can't be found, check 2 is skipped.
+
+import argparse
+import glob
+import os
+import re
+import subprocess
+import sys
+
+REPO_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+CPPCHECK_BIN = os.path.join(REPO_DIR, 'cppcheck')
+
+ID_RE = re.compile(r' id="([^"]*)"')
+IS_PREMIUM_ENABLED_RE = re.compile(r'isPremiumEnabled\s*\(\s*"([^"]*)"')
+
+warning_count = 0
+
+
+def warn(message):
+    global warning_count
+    warning_count += 1
+    print('warning: ' + message, file=sys.stderr)
+
+
+def get_errorlist_ids():
+    out = subprocess.check_output([CPPCHECK_BIN, '--errorlist'], universal_newlines=True)
+    return set(ID_RE.findall(out))
+
+
+def get_is_premium_enabled_ids():
+    ids = set()
+    for filename in glob.glob(os.path.join(REPO_DIR, 'lib', '*.cpp')) + glob.glob(os.path.join(REPO_DIR, 'lib', '*.h')):
+        with open(filename, 'rt', encoding='utf-8') as f:
+            ids.update(IS_PREMIUM_ENABLED_RE.findall(f.read()))
+    return ids
+
+
+def get_addon_coverage_ids(addon_coverage_dir):
+    coverage_py = os.path.join(addon_coverage_dir, 'coverage.py')
+    if not os.path.isfile(coverage_py):
+        print(f"(skipped premium addon coverage.py check: '{coverage_py}' not found)", file=sys.stderr)
+        return None
+
+    ids_files = glob.glob(os.path.join(addon_coverage_dir, 'ids-*.txt'))
+    for f in ids_files:
+        os.remove(f)
+
+    env = dict(os.environ, CPPCHECK_REPO=REPO_DIR)
+    subprocess.check_call(['python3', 'coverage.py', '--id'], cwd=addon_coverage_dir, env=env, stdout=subprocess.DEVNULL)
+
+    ids = set()
+    ids_files = glob.glob(os.path.join(addon_coverage_dir, 'ids-*.txt'))
+    for filename in ids_files:
+        with open(filename, 'rt', encoding='utf-8') as f:
+            ids.update(line.strip() for line in f if line.strip())
+        os.remove(filename)
+    return ids
+
+
+def main():
+    parser = argparse.ArgumentParser(description='Check that isPremiumEnabled() ids and premium addon coverage ids are known Cppcheck error ids.')
+    parser.add_argument('addon_coverage_dir', nargs='?', default=os.path.join(REPO_DIR, '..', 'addon', 'coverage'),
+                         help='path to the premium addon coverage/ directory (default: ../addon/coverage)')
+    args = parser.parse_args()
+
+    if not os.access(CPPCHECK_BIN, os.X_OK):
+        print(f"error: '{CPPCHECK_BIN}' not found or not executable, build it first (make -j$(nproc))", file=sys.stderr)
+        return 1
+
+    errorlist_ids = get_errorlist_ids()
+
+    for id_ in sorted(get_is_premium_enabled_ids() - errorlist_ids):
+        warn(f'isPremiumEnabled("{id_}") but there is no such id in --errorlist')
+
+    addon_coverage_dir = os.path.realpath(args.addon_coverage_dir)
+    addon_ids = get_addon_coverage_ids(addon_coverage_dir)
+    if addon_ids is not None:
+        for id_ in sorted(addon_ids - errorlist_ids):
+            warn(f'premium addon coverage.py references id "{id_}" but there is no such id in --errorlist')
+
+    return 1 if warning_count else 0
+
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/tools/release-trac-fixed-open-tickets.py b/tools/release-trac-fixed-open-tickets.py
new file mode 100755
index 00000000000..4510e0fcb62
--- /dev/null
+++ b/tools/release-trac-fixed-open-tickets.py
@@ -0,0 +1,143 @@
+#!/usr/bin/env python3
+"""Check that Trac tickets referenced by commits since the last tag are closed.
+
+Runs `git log <latest tag>..HEAD`, extracts referenced Trac ticket numbers
+from each commit message (e.g. "Fix #15028", "Trac #5935", "ticket 8442"),
+looks up each ticket's status on trac.cppcheck.net, and prints the full
+commit message for any commit whose ticket is not closed.
+"""
+
+import argparse
+import csv
+import io
+import re
+import subprocess
+import sys
+import urllib.error
+import urllib.request
+
+TRAC_BASE = 'https://trac.cppcheck.net'
+
+# Applied (in order) to the commit message with the trailing GitHub PR
+# reference (e.g. "(#8851)") stripped from the subject line.
+TICKET_PATTERNS = [
+    re.compile(r'\btrac\s*#?\s*(\d+)\b', re.IGNORECASE),
+    re.compile(r'\bticket\s*#?\s*(\d+)\b', re.IGNORECASE),
+    re.compile(r'#(\d+)\b'),
+]
+
+# GitHub appends "(#NNNN)" (the PR number) to the end of squash-merged
+# commit subjects; strip it so it isn't mistaken for a Trac ticket ref.
+PR_SUFFIX = re.compile(r'\s*\(#\d+\)\s*$')
+
+
+def latest_tag():
+    r = subprocess.run(
+        ['git', 'describe', '--tags', '--abbrev=0'],
+        capture_output=True, text=True, check=False,
+    )
+    if r.returncode == 0:
+        return r.stdout.strip()
+
+    # 'git describe' requires the tag to be an ancestor of HEAD, which can
+    # fail on a shallow clone. Fall back to the highest version tag.
+    print('Warning: git describe failed, falling back to highest version tag '
+          f'({r.stderr.strip()})', file=sys.stderr)
+    r = subprocess.run(
+        ['git', 'tag', '--sort=-v:refname'],
+        capture_output=True, text=True, check=True,
+    )
+    tags = r.stdout.splitlines()
+    if not tags:
+        print('Error: no tags found', file=sys.stderr)
+        sys.exit(1)
+    return tags[0]
+
+
+def get_commits(rev_range):
+    out = subprocess.run(
+        ['git', 'log', rev_range, '--format=%H%x1f%B%x1e'],
+        capture_output=True, text=True, check=True,
+    ).stdout
+    commits = []
+    for chunk in out.split('\x1e'):
+        chunk = chunk.strip('\n')
+        if not chunk:
+            continue
+        h, msg = chunk.split('\x1f', 1)
+        commits.append((h, msg))
+    return commits
+
+
+def extract_ticket_numbers(message):
+    # Ticket references live in the commit subject; the body can contain
+    # unrelated "#N" text (e.g. stack trace frames like "#0 0x...") that
+    # would otherwise be mistaken for ticket refs.
+    subject = message.splitlines()[0] if message else ''
+    subject = PR_SUFFIX.sub('', subject)
+    found = []
+    for pat in TICKET_PATTERNS:
+        for m in pat.finditer(subject):
+            n = m.group(1)
+            if n not in found:
+                found.append(n)
+    return found
+
+
+def ticket_status(ticket_id, cache):
+    if ticket_id in cache:
+        return cache[ticket_id]
+    url = f'{TRAC_BASE}/ticket/{ticket_id}?format=csv'
+    try:
+        with urllib.request.urlopen(url, timeout=15) as resp:
+            data = resp.read().decode('utf-8-sig')
+    except urllib.error.URLError as e:
+        print(f'Warning: failed to fetch ticket #{ticket_id}: {e}', file=sys.stderr)
+        cache[ticket_id] = None
+        return None
+    row = next(csv.DictReader(io.StringIO(data)), None)
+    status = row['status'] if row else None
+    cache[ticket_id] = status
+    return status
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument('--from-tag', help='starting tag/rev (default: latest tag)')
+    parser.add_argument('--to', default='HEAD', help='ending rev (default: HEAD)')
+    args = parser.parse_args()
+
+    from_rev = args.from_tag or latest_tag()
+    rev_range = f'{from_rev}..{args.to}'
+    print(f'Checking commits in {rev_range}', file=sys.stderr)
+
+    commits = get_commits(rev_range)
+    cache = {}
+    checked_tickets = set()
+    open_commits = 0
+
+    for h, msg in commits:
+        tickets = extract_ticket_numbers(msg)
+        for t in tickets:
+            checked_tickets.add(t)
+            status = ticket_status(t, cache)
+            if status is None:
+                print(f'--- Ticket #{t} status UNKNOWN (commit {h[:10]}) ---')
+                print(msg.rstrip('\n'))
+                print()
+                open_commits += 1
+            elif status != 'closed':
+                print(f'--- Ticket #{t} is OPEN (status: {status}) (commit {h[:10]}) ---')
+                print(msg.rstrip('\n'))
+                print()
+                open_commits += 1
+
+    print(f'Checked {len(checked_tickets)} ticket(s) referenced in {len(commits)} commit(s).', file=sys.stderr)
+    if open_commits:
+        print(f'{open_commits} commit(s) reference a ticket that is not closed.', file=sys.stderr)
+        sys.exit(1)
+    print('All referenced tickets are closed.', file=sys.stderr)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/tools/test-my-pr.py b/tools/test-my-pr.py
index 4a40f544ee1..0a630c57c90 100755
--- a/tools/test-my-pr.py
+++ b/tools/test-my-pr.py
@@ -8,9 +8,13 @@
 import donate_cpu_lib as lib
 import argparse
 import glob
+import gzip
+import natsort
 import os
 import sys
 import random
+import re
+import requests
 import subprocess
 
 
@@ -20,14 +24,108 @@ def format_float(a, b=1):
     return 'N/A'
 
 
+def ftp_get(url):
+    try:
+        response = requests.get(url, timeout=300)
+        response.raise_for_status()
+        return response.content
+    except requests.RequestException as err:
+        print('Failed to fetch {}: {}'.format(url, err))
+    return None
+
+
+def latestvername(names):
+    s = natsort.natsorted(names, key=lambda x: x[x.index('_')+1:x.index('.orig.tar')])
+    return s[-1]
+
+
+def getpackages():
+    debian = 'https://ftp.debian.org/debian/'
+
+    data = ftp_get(debian + 'ls-lR.gz')
+    if data is None:
+        print('Failed to fetch ls-lR.gz')
+        sys.exit(1)
+
+    lines = gzip.decompress(data).decode('utf-8', errors='replace').splitlines()
+
+    # Example content in ls-lR:
+    #./pool/main/0/0xffff:
+    #total 1452
+    #-rw-r--r-- 2 dak debadmin  6524 Dec 25  2016 0xffff_0.7-2.debian.tar.xz
+    #-rw-r--r-- 2 dak debadmin  1791 Dec 25  2016 0xffff_0.7-2.dsc
+    #-rw-r--r-- 2 dak debadmin 57168 Dec 25  2016 0xffff_0.7-2_amd64.deb
+    #-rw-r--r-- 2 dak debadmin 48578 Dec 26  2016 0xffff_0.7-2_arm64.deb
+    #-rw-r--r-- 2 dak debadmin 56730 Dec 26  2016 0xffff_0.7-2_armel.deb
+    #-rw-r--r-- 2 dak debadmin 57296 Dec 26  2016 0xffff_0.7-2_armhf.deb
+    #-rw-r--r-- 2 dak debadmin 60254 Dec 26  2016 0xffff_0.7-2_i386.deb
+    #-rw-r--r-- 2 dak debadmin 53130 Dec 26  2016 0xffff_0.7-2_mips.deb
+    #-rw-r--r-- 2 dak debadmin 52542 Dec 26  2016 0xffff_0.7-2_mips64el.deb
+    #-rw-r--r-- 2 dak debadmin 53712 Dec 26  2016 0xffff_0.7-2_mipsel.deb
+    #-rw-r--r-- 2 dak debadmin 51908 Dec 26  2016 0xffff_0.7-2_ppc64el.deb
+    #-rw-r--r-- 2 dak debadmin 53548 Dec 26  2016 0xffff_0.7-2_s390x.deb
+    #-rw-r--r-- 2 dak debadmin 65248 Dec 25  2016 0xffff_0.7.orig.tar.gz
+    #-rw-r--r-- 2 dak debadmin  6884 Jul 19 19:08 0xffff_0.8-1.debian.tar.xz
+    #-rw-r--r-- 2 dak debadmin  1807 Jul 19 19:08 0xffff_0.8-1.dsc
+    #-rw-r--r-- 2 dak debadmin 58908 Jul 19 19:08 0xffff_0.8-1_amd64.deb
+    #-rw-r--r-- 2 dak debadmin 51340 Jul 19 19:58 0xffff_0.8-1_arm64.deb
+    #-rw-r--r-- 2 dak debadmin 57612 Jul 19 20:13 0xffff_0.8-1_armel.deb
+    #-rw-r--r-- 2 dak debadmin 58584 Jul 19 19:58 0xffff_0.8-1_armhf.deb
+    #-rw-r--r-- 2 dak debadmin 57544 Jul 19 20:23 0xffff_0.8-1_hurd-i386.deb
+    #-rw-r--r-- 2 dak debadmin 62048 Jul 19 23:54 0xffff_0.8-1_i386.deb
+    #-rw-r--r-- 2 dak debadmin 55080 Jul 23 19:07 0xffff_0.8-1_kfreebsd-amd64.deb
+    #-rw-r--r-- 2 dak debadmin 58392 Jul 23 19:07 0xffff_0.8-1_kfreebsd-i386.deb
+    #-rw-r--r-- 2 dak debadmin 54144 Jul 19 22:28 0xffff_0.8-1_mips.deb
+    #-rw-r--r-- 2 dak debadmin 53648 Jul 20 00:56 0xffff_0.8-1_mips64el.deb
+    #-rw-r--r-- 2 dak debadmin 54740 Jul 19 22:58 0xffff_0.8-1_mipsel.deb
+    #-rw-r--r-- 2 dak debadmin 57424 Jul 19 19:58 0xffff_0.8-1_ppc64el.deb
+    #-rw-r--r-- 2 dak debadmin 53764 Jul 19 22:28 0xffff_0.8-1_s390x.deb
+    #-rw-r--r-- 2 dak debadmin 64504 Jul 19 19:08 0xffff_0.8.orig.tar.gz
+    #
+
+    path = None
+    previous_path = ''
+    archives = []
+    filename = None
+    filenames = []
+    for line in lines:
+        line = line.strip()
+        if len(line) < 4:
+            if filename:
+                res1 = re.match(r'(.*)-[0-9.]+$', path)
+                if res1 is None:
+                    res1 = re.match(r'(.*)[-.][0-9.]+$', path)
+                res2 = re.match(r'(.*)-[0-9.]+$', previous_path)
+                if res2 is None:
+                    res2 = re.match(r'(.*)[-.][0-9.]+$', previous_path)
+                if res1 is None or res2 is None or res1.group(1) != res2.group(1):
+                    archives.append(path + '/' + latestvername(filenames))
+                else:
+                    archives[-1] = path + '/' + latestvername(filenames)
+            if path:
+                previous_path = path
+            path = None
+            filename = None
+            filenames = []
+        elif line.startswith('./pool/main/'):
+            path = debian + line[2:-1]
+        elif path and line.endswith(('.orig.tar.gz', '.orig.tar.bz2', '.orig.tar.xz')):
+            filename = line[1 + line.rfind(' '):]
+            filenames.append(filename)
+
+    return archives
+
+
+
+
 if __name__ == "__main__":
     __my_script_name = os.path.splitext(os.path.basename(sys.argv[0]))[0]
     __work_path = os.path.expanduser(os.path.join('~', 'cppcheck-' + __my_script_name + '-workfolder'))
 
     parser = argparse.ArgumentParser(description='Run this script from your branch with proposed Cppcheck patch to verify your patch against current main. It will compare output of testing bunch of opensource packages')
     parser.add_argument('-j', default=1, type=int, help='Concurency execution threads')
+    parser.add_argument('-n', '--max-packages', default=256, type=int, help='Maximum number of packages to test')
     package_group = parser.add_mutually_exclusive_group()
-    package_group.add_argument('-p', default=256, type=int, help='Count of packages to check')
     package_group.add_argument('--packages', nargs='+', help='Check specific packages and then stop.')
     package_group.add_argument('--packages-path', default=None, type=str, help='Check packages in path.')
     parser.add_argument('-o', default='my_check_diff.log', help='Filename of result inside a working path dir')
@@ -40,6 +138,18 @@ def format_float(a, b=1):
 
     print(args)
 
+    if args.packages_path:
+        # You can download packages using daca2-download.py
+        args.packages = glob.glob(os.path.join(args.packages_path, '*.tar.xz'))
+        random.shuffle(args.packages)
+    elif args.packages is None:
+        args.packages = getpackages()
+        random.shuffle(args.packages)
+
+    packages_to_process = min(args.max_packages, len(args.packages))
+
+    print('\n'.join(args.packages[:20]))
+
     if not lib.check_requirements():
         print("Error: Check requirements")
         sys.exit(1)
@@ -100,35 +210,17 @@ def format_float(a, b=1):
         print('Failed to compile your version of Cppcheck')
         sys.exit(1)
 
-    if args.packages_path:
-        # You can download packages using daca2-download.py
-        args.packages = glob.glob(os.path.join(args.packages_path, '*.tar.xz'))
-        args.p = len(args.packages)
-        packages_idxs = list(range(args.p))
-        random.shuffle(packages_idxs)
-    elif args.packages:
-        args.p = len(args.packages)
-        packages_idxs = []
-    else:
-        packages_count = lib.get_packages_count()
-        if not packages_count:
-            print("network or server might be temporarily down..")
-            sys.exit(1)
-
-        packages_idxs = list(range(packages_count))
-        random.shuffle(packages_idxs)
-
     packages_processed = 0
     crashes = []
     timeouts = []
 
-    while (packages_processed < args.p and len(packages_idxs) > 0) or args.packages:
-        if args.packages:
-            package = args.packages.pop()
-        else:
-            package = lib.get_package(packages_idxs.pop())
+    while packages_processed < packages_to_process and args.packages:
+        package = args.packages.pop()
+        packages_processed += 1
+        print('Processing package {} of {}'.format(packages_processed, packages_to_process))
 
-        if package.startswith('ftp://') or package.startswith('http://'):
+
+        if package.startswith('ftp://') or package.startswith('https://'):
             tgz = lib.download_package(work_path, package, None)
             if tgz is None:
                 print("No package downloaded")
@@ -211,9 +303,6 @@ def format_float(a, b=1):
                     format_float(time_your), format_float(time_your, time_main),
                     package_width=package_width, timing_width=timing_width))
 
-        packages_processed += 1
-        print(str(packages_processed) + ' of ' + str(args.p) + ' packages processed\n')
-
     with open(result_file, 'a') as myfile:
         myfile.write('\n\ncrashes\n')
         myfile.write('\n'.join(crashes))
diff --git a/tools/triage/main.cpp b/tools/triage/main.cpp
index 89564a19b2c..81898fc7d7e 100644
--- a/tools/triage/main.cpp
+++ b/tools/triage/main.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2022 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/tools/triage/mainwindow.cpp b/tools/triage/mainwindow.cpp
index ce95ff82d8d..18b6bb09533 100644
--- a/tools/triage/mainwindow.cpp
+++ b/tools/triage/mainwindow.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -77,10 +77,11 @@ MainWindow::MainWindow(QWidget *parent) :
     srcFiles{"*.cpp", "*.cxx", "*.cc", "*.c++", "*.C", "*.c", "*.cl"}
 {
     ui->setupUi(this);
+    // NOLINTNEXTLINE(bugprone-random-generator-seed) - the random numbers are not used in a security context so this should be sufficient
     std::srand(static_cast<unsigned int>(std::time(nullptr)));
     QDir workFolder(WORK_FOLDER);
     if (!workFolder.exists()) {
-        workFolder.mkdir(WORK_FOLDER);
+        (void)workFolder.mkdir(WORK_FOLDER);
     }
 
     ui->results->setContextMenuPolicy(Qt::CustomContextMenu);
@@ -136,7 +137,7 @@ void MainWindow::load(QTextStream &textStream)
         QString line = textStream.readLine();
         if (line.isNull())
             break;
-        if (line.startsWith("ftp://") || (line.startsWith(DACA2_PACKAGES) && line.endsWith(".tar.xz"))) {
+        if (line.startsWith("ftp://") || line.startsWith("https://") || (line.startsWith(DACA2_PACKAGES) && line.endsWith(".tar.xz"))) {
             local = line.startsWith(DACA2_PACKAGES) && line.endsWith(".tar.xz");
             url = line;
             if (!errorMessage.isEmpty())
@@ -180,12 +181,12 @@ void MainWindow::refreshResults()
     filter(ui->version->currentText());
 }
 
-void MainWindow::filter(const QString& filter)
+void MainWindow::filter(const QString& filterStr)
 {
     QStringList allErrors;
 
     for (const QString &errorItem : mAllErrors) {
-        if (filter.isEmpty()) {
+        if (filterStr.isEmpty()) {
             allErrors << errorItem;
             continue;
         }
@@ -194,7 +195,7 @@ void MainWindow::filter(const QString& filter)
         if (lines.size() < 2)
             continue;
 
-        if (lines[1].startsWith(filter))
+        if (lines[1].startsWith(filterStr))
             allErrors << errorItem;
     }
 
@@ -292,7 +293,7 @@ void MainWindow::showResult(QListWidgetItem *item)
 {
     ui->statusBar->clearMessage();
     const bool local = item->text().startsWith(DACA2_PACKAGES);
-    if (!item->text().startsWith("ftp://") && !local)
+    if (!item->text().startsWith("ftp://") && !item->text().startsWith("https://") && !local)
         return;
     const QStringList lines = item->text().split("\n");
     if (lines.size() < 2)
diff --git a/tools/triage/mainwindow.h b/tools/triage/mainwindow.h
index 999740fb59d..263d9953e60 100644
--- a/tools/triage/mainwindow.h
+++ b/tools/triage/mainwindow.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2026 Cppcheck team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@ class MainWindow : public QMainWindow {
 public slots:
     void loadFile();
     void loadFromClipboard();
-    void filter(const QString& filter);
+    void filter(const QString& filterStr);
     void showResult(QListWidgetItem *item);
     void refreshResults();
     void fileTreeFilter(const QString &str);
diff --git a/tools/triage/triage.pro b/tools/triage/triage.pro
index 1bda43f40a7..d11a2784d5d 100644
--- a/tools/triage/triage.pro
+++ b/tools/triage/triage.pro
@@ -1,17 +1,18 @@
-lessThan(QT_MAJOR_VERSION, 5): error(requires >= Qt 5 (You used: $$QT_VERSION))
 QT += core gui widgets
 TARGET = triage
 TEMPLATE = app
-QMAKE_CXXFLAGS += -std=c++11
-INCLUDEPATH += ../../gui
+QMAKE_CXXFLAGS += -std=c++17
+INCLUDEPATH += ../../gui ../../lib
 MOC_DIR = temp
 OBJECTS_DIR = temp
 UI_DIR = temp
-SOURCES += main.cpp\
+SOURCES += main.cpp \
         mainwindow.cpp \
         ../../gui/codeeditorstyle.cpp \
-        ../../gui/codeeditor.cpp
+        ../../gui/codeeditor.cpp \
+        ../../lib/utils.cpp
 HEADERS  += mainwindow.h \
         ../../gui/codeeditorstyle.h \
-        ../../gui/codeeditor.h
+        ../../gui/codeeditor.h \
+        ../../lib/utils.h
 FORMS    += mainwindow.ui
diff --git a/tools/tweak-compile-commands.md b/tools/tweak-compile-commands.md
new file mode 100644
index 00000000000..25514872d8f
--- /dev/null
+++ b/tools/tweak-compile-commands.md
@@ -0,0 +1,167 @@
+# tweak-compile-commands.py
+
+## NAME
+
+tweak-compile-commands.py - tweak `-isystem`/`--sysroot`/`-I` options in a `compile_commands.json` file
+
+## SYNOPSIS
+
+```
+tools/tweak-compile-commands.py COMPILE_COMMANDS [-o OUTPUT | -i]
+                                         [--isystem-to-i] [--exclude-folder FOLDER ...]
+                                         [--remove-include-path PATH ...]
+```
+
+## DESCRIPTION
+
+In many cases the system headers should not be included in Cppcheck
+analysis, it is preferable to use `--library` instead. The headers
+do not provide the knowledge needed for static analysis, i.e. they
+can say what types the arguments to a function has but the header
+do not provide the semantics of the functions.
+
+However sometimes you do want to include system headers in Cppcheck
+analysis. And you need to have handling of `--sysroot` and
+`-isystem`. This script will tweak the compile_commands.json file.
+
+### SYSROOT
+
+Example build command such as:
+
+```
+gcc --sysroot /a/b -isystem /opt/x -c foo.c
+```
+
+gcc searches both `/opt/x` *and* `/a/b/opt/x` for headers.
+
+`tweak-compile-commands.py` rewrites each build command in a
+`compile_commands.json` file so this implicit behaviour is spelled out
+explicitly: for every command that has a `--sysroot` argument, every
+existing `-isystem PATH` argument gets a matching, explicit
+`-isystem SYSROOT/PATH` argument added right after it, and the `--sysroot`
+argument is then removed (it is no longer needed since the sysroot-relative
+paths are now spelled out explicitly). Commands without a `--sysroot`
+argument are left unchanged.
+
+### ISYSTEM
+
+The script has an option `--isystem-to-i`, this tells the script to
+convert `-isystem` arguments to `-I`.
+
+The option `--exclude-folder` can be used to skip certain folders. Use
+that for a folder if Cppcheck option `--library` can be used instead.
+
+### REMOVE -I
+
+The script also has `--remove-include-path`, the script will remove
+any `-I PATH` argument whose path contains a given string. This is
+useful for stripping include paths that Cppcheck should not see at all.
+
+## ARGUMENTS
+
+`COMPILE_COMMANDS`
+: Path to the `compile_commands.json` file to read.
+
+## OPTIONS
+
+`-o OUTPUT`, `--output OUTPUT`
+: Write the result to `OUTPUT` instead of stdout. Cannot be combined with
+  `-i`.
+
+`-i`, `--in-place`
+: Overwrite `COMPILE_COMMANDS` with the result. Cannot be combined with
+  `-o`.
+
+`--isystem-to-i`
+: Also convert `-isystem PATH` arguments to `-I PATH`, except for paths
+  excluded with `--exclude-folder`. Has no effect on its own if not given
+  (the sysroot tweak still applies).
+
+`--exclude-folder FOLDER`
+: When used with `--isystem-to-i`, keep any `-isystem` argument as
+  `-isystem` (instead of converting it to `-I`) if `FOLDER` is one of the
+  path's folder components (an exact match of a path segment, not a
+  substring). May be given multiple times. Ignored if `--isystem-to-i` is
+  not given.
+
+`--remove-include-path PATH`
+: Remove any `-I` argument whose path contains `PATH` as a substring. May be
+  given multiple times; a path is removed if it matches any of them.
+  Independent of `--isystem-to-i`/`--exclude-folder`, and applies after them,
+  so a path converted from `-isystem` to `-I` can also be removed by this
+  option.
+
+With neither `-o` nor `-i`, the resulting JSON is written to stdout, and
+the input file is left untouched. A summary (`tweaked N of M entries`) is
+always printed to stderr.
+
+## EXAMPLES
+
+Preview the sysroot tweak without touching any file:
+
+```
+$ tools/tweak-compile-commands.py compile_commands.json
+```
+
+Apply the sysroot tweak in place:
+
+```
+$ tools/tweak-compile-commands.py -i compile_commands.json
+```
+
+Apply the sysroot tweak and convert `-isystem` to `-I`, keeping any path
+that goes through a `lib1` or `lib2` folder as `-isystem`:
+
+```
+$ tools/tweak-compile-commands.py -i compile_commands.json \
+      --isystem-to-i --exclude-folder lib1 --exclude-folder lib2
+```
+
+Given this input entry:
+
+```json
+{
+  "command": "gcc --sysroot /a/b -isystem /opt/x -isystem /path/lib1/include -c foo.c -o foo.o"
+}
+```
+
+the last command above produces:
+
+```json
+{
+  "command": "gcc -I /opt/x -I /a/b/opt/x -isystem /path/lib1/include -isystem /a/b/path/lib1/include -c foo.c -o foo.o"
+}
+```
+
+Note that `/path/lib1/include` is kept as `-isystem` (matching
+`--exclude-folder lib1`), and so is its sysroot-relative duplicate
+`/a/b/path/lib1/include`, since it also contains a `lib1` folder component.
+
+Remove all `-I` include paths that go through `/path/lib1`:
+
+```
+$ tools/tweak-compile-commands.py -i compile_commands.json \
+      --remove-include-path /path/lib1
+```
+
+Given this input entry:
+
+```json
+{
+  "command": "gcc -I /opt/x -I /path/lib1/include -c foo.c -o foo.o"
+}
+```
+
+the command above produces:
+
+```json
+{
+  "command": "gcc -I /opt/x -c foo.c -o foo.o"
+}
+```
+
+## EXIT STATUS
+
+Exits with a non-zero status and a traceback if `COMPILE_COMMANDS` cannot
+be read or does not contain valid JSON. Otherwise exits 0, even if no
+entries needed changes.
diff --git a/tools/tweak-compile-commands.py b/tools/tweak-compile-commands.py
new file mode 100755
index 00000000000..4e57cfaf33f
--- /dev/null
+++ b/tools/tweak-compile-commands.py
@@ -0,0 +1,237 @@
+#!/usr/bin/env python3
+#
+# Tweaks a compile_commands.json file: for every build command that has a
+# --sysroot argument, each existing -isystem argument gets a matching extra
+# -isystem argument pointing into the sysroot, and the --sysroot argument
+# itself is then removed. This is useful when a compiler resolves -isystem
+# paths relative to --sysroot internally (as part of its built-in search
+# path handling) but a tool consuming compile_commands.json (such as
+# Cppcheck) does not, so the sysroot-relative path needs to be spelled out
+# explicitly instead.
+#
+# Example:
+#   --sysroot /a/b -isystem /opt/x
+#   =>
+#   -isystem /opt/x -isystem /a/b/opt/x
+#
+# Optionally, --isystem-to-i converts -isystem arguments to -I, which can be
+# useful since Cppcheck otherwise treats -isystem headers as "system"
+# headers and skips some checks in them. Paths whose folder name matches one
+# of the --exclude-folder values are left as -isystem. For example, with
+# --isystem-to-i --exclude-folder lib1:
+#   -isystem /opt/x -isystem /path/lib1/include
+#   =>
+#   -I /opt/x -isystem /path/lib1/include
+#
+# Optionally, --remove-include-path removes -I arguments whose path contains
+# the given path. For example, with --remove-include-path /path/lib1:
+#   -I /opt/x -I /path/lib1/include
+#   =>
+#   -I /opt/x
+#
+# Usage:
+#   tools/tweak-compile-commands.py compile_commands.json -o out.json
+#   tools/tweak-compile-commands.py -i compile_commands.json
+#   tools/tweak-compile-commands.py -i compile_commands.json --isystem-to-i --exclude-folder lib1
+#   tools/tweak-compile-commands.py -i compile_commands.json --remove-include-path /path/lib1
+#
+# With neither -o nor -i, the result is written to stdout.
+
+import argparse
+import json
+import shlex
+import sys
+
+
+def find_sysroot(tokens):
+    for i, tok in enumerate(tokens):
+        if tok == '--sysroot' and i + 1 < len(tokens):
+            return tokens[i + 1]
+        if tok.startswith('--sysroot='):
+            return tok[len('--sysroot='):]
+    return None
+
+
+def join_sysroot(sysroot, path):
+    return sysroot.rstrip('/') + '/' + path.lstrip('/')
+
+
+def remove_sysroot_arg(tokens):
+    result = []
+    i = 0
+    n = len(tokens)
+    while i < n:
+        tok = tokens[i]
+        if tok == '--sysroot' and i + 1 < n:
+            i += 2
+            continue
+        if tok.startswith('--sysroot='):
+            i += 1
+            continue
+        result.append(tok)
+        i += 1
+    return result
+
+
+def add_isystem_sysroot(tokens, sysroot):
+    result = []
+    i = 0
+    n = len(tokens)
+    while i < n:
+        tok = tokens[i]
+        if tok == '-isystem' and i + 1 < n:
+            path = tokens[i + 1]
+            result.append(tok)
+            result.append(path)
+            result.append('-isystem')
+            result.append(join_sysroot(sysroot, path))
+            i += 2
+            continue
+        if tok.startswith('-isystem') and tok != '-isystem':
+            path = tok[len('-isystem'):]
+            result.append(tok)
+            result.append('-isystem' + join_sysroot(sysroot, path))
+            i += 1
+            continue
+        result.append(tok)
+        i += 1
+    return result
+
+
+def is_excluded(path, exclude_folders):
+    parts = path.replace('\\', '/').split('/')
+    return any(part in exclude_folders for part in parts if part)
+
+
+def convert_isystem_to_i(tokens, exclude_folders):
+    result = []
+    i = 0
+    n = len(tokens)
+    while i < n:
+        tok = tokens[i]
+        if tok == '-isystem' and i + 1 < n:
+            path = tokens[i + 1]
+            result.append(tok if is_excluded(path, exclude_folders) else '-I')
+            result.append(path)
+            i += 2
+            continue
+        if tok.startswith('-isystem') and tok != '-isystem':
+            path = tok[len('-isystem'):]
+            result.append(tok if is_excluded(path, exclude_folders) else '-I' + path)
+            i += 1
+            continue
+        result.append(tok)
+        i += 1
+    return result
+
+
+def matches_remove_path(path, remove_paths):
+    normalized = path.replace('\\', '/')
+    return any(remove_path.replace('\\', '/') in normalized for remove_path in remove_paths)
+
+
+def remove_include_paths(tokens, remove_paths):
+    result = []
+    i = 0
+    n = len(tokens)
+    while i < n:
+        tok = tokens[i]
+        if tok == '-I' and i + 1 < n:
+            path = tokens[i + 1]
+            if matches_remove_path(path, remove_paths):
+                i += 2
+                continue
+            result.append(tok)
+            result.append(path)
+            i += 2
+            continue
+        if tok.startswith('-I') and tok != '-I':
+            path = tok[len('-I'):]
+            if matches_remove_path(path, remove_paths):
+                i += 1
+                continue
+            result.append(tok)
+            i += 1
+            continue
+        result.append(tok)
+        i += 1
+    return result
+
+
+def tweak_entry(entry, isystem_to_i, exclude_folders, remove_include_path):
+    if 'command' in entry:
+        tokens = shlex.split(entry['command'])
+    elif 'arguments' in entry:
+        tokens = entry['arguments']
+    else:
+        return False
+
+    changed = False
+
+    sysroot = find_sysroot(tokens)
+    if sysroot is not None:
+        tokens = add_isystem_sysroot(tokens, sysroot)
+        tokens = remove_sysroot_arg(tokens)
+        changed = True
+
+    if isystem_to_i:
+        new_tokens = convert_isystem_to_i(tokens, exclude_folders)
+        if new_tokens != tokens:
+            tokens = new_tokens
+            changed = True
+
+    if remove_include_path:
+        new_tokens = remove_include_paths(tokens, remove_include_path)
+        if new_tokens != tokens:
+            tokens = new_tokens
+            changed = True
+
+    if not changed:
+        return False
+
+    if 'command' in entry:
+        entry['command'] = shlex.join(tokens)
+    else:
+        entry['arguments'] = tokens
+    return True
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description='Add sysroot-relative -isystem arguments to build commands in a compile_commands.json file.')
+    parser.add_argument('compile_commands', help='path to the compile_commands.json file to read')
+    group = parser.add_mutually_exclusive_group()
+    group.add_argument('-o', '--output', help='write the result to this file instead of stdout')
+    group.add_argument('-i', '--in-place', action='store_true', help='overwrite the input file with the result')
+    parser.add_argument('--isystem-to-i', action='store_true',
+                         help='convert -isystem arguments to -I (except excluded folders)')
+    parser.add_argument('--exclude-folder', action='append', default=[], metavar='FOLDER',
+                         help='folder name to keep as -isystem when using --isystem-to-i; can be given multiple times')
+    parser.add_argument('--remove-include-path', action='append', default=[], metavar='PATH',
+                         help='remove -I arguments whose path contains PATH; can be given multiple times')
+    args = parser.parse_args()
+
+    with open(args.compile_commands, encoding='utf-8') as f:
+        entries = json.load(f)
+
+    changed = 0
+    for entry in entries:
+        if tweak_entry(entry, args.isystem_to_i, args.exclude_folder, args.remove_include_path):
+            changed += 1
+
+    out = json.dumps(entries, indent=2) + '\n'
+
+    if args.in_place:
+        with open(args.compile_commands, 'w', encoding='utf-8') as f:
+            f.write(out)
+    elif args.output:
+        with open(args.output, 'w', encoding='utf-8') as f:
+            f.write(out)
+    else:
+        sys.stdout.write(out)
+
+    print('tweaked {} of {} entries'.format(changed, len(entries)), file=sys.stderr)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/valgrind/testrunner.supp b/valgrind/testrunner.supp
index 98e30d241ce..558e74a2aca 100644
--- a/valgrind/testrunner.supp
+++ b/valgrind/testrunner.supp
@@ -14,3 +14,9 @@
    obj:*
    obj:*
 }
+{
+   TestRegEx::partialmatch false positive
+   Memcheck:Cond
+   obj:*
+   obj:*
+}
diff --git a/webreport.sh b/webreport.sh
deleted file mode 100755
index af9aec46aae..00000000000
--- a/webreport.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-./generate_coverage_report
-
-rm -rf devinfo
-mkdir devinfo
-
-mv coverage_report devinfo/
-
-doxygen 2> devinfo/doxygen-errors.txt
-mv doxyoutput/html devinfo/doxyoutput
-
-cd addons || exit 1
-doxygen cppcheckdata.doxyfile
-mv html ../devinfo/cppcheckdata
-cd ..
-
-# Detect duplicate code..
-~/pmd-4.2.6/bin/cpd.sh lib/ > devinfo/cpd.txt
-#java -jar ~/simian-2.4.0/bin/simian-2.4.0.jar -language=c++ -reportDuplicateText -threshold=10 lib/*.cpp lib/*.h > devinfo/simian.txt
-
diff --git a/win_installer/config.wxi b/win_installer/config.wxi
index 7bc613d1669..ae7fc8329f3 100644
--- a/win_installer/config.wxi
+++ b/win_installer/config.wxi
@@ -9,6 +9,6 @@
   <?define AddonsDir = "files\addons" ?>
   <?define QtDllDir = "files" ?>
 
-  <?define CrtMergeModule = "$(env.VCINSTALLDIR)Redist\MSVC\v143\MergeModules\Microsoft_VC143_CRT_x64.msm" ?>
+  <?define CrtMergeModule = "$(env.VCINSTALLDIR)Redist\MSVC\v145\MergeModules\Microsoft_VC145_CRT_x64.msm" ?>
   <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
 </Include>
diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 7b5cc45614a..fe59fd6ea06 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -107,6 +107,7 @@
               <File Id='lua.cfg' Name='lua.cfg' Source='$(var.CfgsDir)\lua.cfg' />
               <File Id='mfc.cfg' Name='mfc.cfg' Source='$(var.CfgsDir)\mfc.cfg' />
               <File Id='microsoft_atl.cfg' Name='microsoft_atl.cfg' Source='$(var.CfgsDir)\microsoft_atl.cfg' />
+              <File Id='microsoft_gsl.cfg' Name='microsoft_gsl.cfg' Source='$(var.CfgsDir)\microsoft_gsl.cfg' />
               <File Id='microsoft_sal.cfg' Name='microsoft_sal.cfg' Source='$(var.CfgsDir)\microsoft_sal.cfg' />
               <File Id='microsoft_unittest.cfg' Name='microsoft_unittest.cfg' Source='$(var.CfgsDir)\microsoft_unittest.cfg' />
               <File Id='motif.cfg' Name='motif.cfg' Source='$(var.CfgsDir)\motif.cfg' />
@@ -139,6 +140,9 @@
               <File Id='aix_ppc64.xml' Name='aix_ppc64.xml' Source='$(var.PtfsDir)\aix_ppc64.xml' />
               <File Id='arm32wchar_t2.xml' Name='arm32-wchar_t2.xml' Source='$(var.PtfsDir)\arm32-wchar_t2.xml' />
               <File Id='arm32wchar_t4.xml' Name='arm32-wchar_t4.xml' Source='$(var.PtfsDir)\arm32-wchar_t4.xml' />
+              <File Id='arm64linux.xml' Name='arm64-linux.xml' Source='$(var.PtfsDir)\arm64-linux.xml' />
+              <File Id='arm64macos.xml' Name='arm64-macos.xml' Source='$(var.PtfsDir)\arm64-macos.xml' />
+              <File Id='arm64windows.xml' Name='arm64-windows.xml' Source='$(var.PtfsDir)\arm64-windows.xml' />
               <File Id='arm64wchar_t2.xml' Name='arm64-wchar_t2.xml' Source='$(var.PtfsDir)\arm64-wchar_t2.xml' />
               <File Id='arm64wchar_t4.xml' Name='arm64-wchar_t4.xml' Source='$(var.PtfsDir)\arm64-wchar_t4.xml' />
               <File Id='avr8.xml' Name='avr8.xml' Source='$(var.PtfsDir)\avr8.xml' />
@@ -149,6 +153,8 @@
               <File Id='mips32.xml' Name='mips32.xml' Source='$(var.PtfsDir)\mips32.xml' />
               <File Id='cray_sv1.xml' Name='cray_sv1.xml' Source='$(var.PtfsDir)\cray_sv1.xml' />
               <File Id='msp430_eabi_large_datamodel.xml' Name='msp430_eabi_large_datamodel.xml' Source='$(var.PtfsDir)\msp430_eabi_large_datamodel.xml' />
+              <File Id='riscv32.xml' Name='riscv32.xml' Source='$(var.PtfsDir)\riscv32.xml' />
+              <File Id='riscv64.xml' Name='riscv64.xml' Source='$(var.PtfsDir)\riscv64.xml' />
             </Component>
           </Directory>
           <Directory Id='AddonsFolder' Name='addons'>
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index d07ce1136c9..7a607f481ef 100644
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-  <?define ProductName = "Cppcheck $(var.Platform) 2.19 dev" ?>
+  <?define ProductName = "Cppcheck $(var.Platform) 2.23 dev" ?>
   <?define ProductNameShort = "Cppcheck" ?>
-  <?define ProductVersion = "2.18.99" ?>
+  <?define ProductVersion = "2.22.99" ?>
 
   <?define ProductManufacturer = "The Cppcheck team" ?>
   <?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>